From df7817d05563b061b58fca5810760bfdbc20a228 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 27 Feb 2023 11:46:16 +0000
Subject: [PATCH 001/375] Remove dead code

---
 kernels/ZendEngine3/memory.c | 11 -----------
 kernels/ZendEngine3/memory.h |  1 -
 2 files changed, 12 deletions(-)

diff --git a/kernels/ZendEngine3/memory.c b/kernels/ZendEngine3/memory.c
index ac1f012fd0..4fb7271bb2 100755
--- a/kernels/ZendEngine3/memory.c
+++ b/kernels/ZendEngine3/memory.c
@@ -306,17 +306,6 @@ int zephir_cleanup_fcache(void *pDest, int num_args, va_list args, zend_hash_key
 
 	memcpy(&scope, &ZSTR_VAL(hash_key->key)[(len -1) - 2 * sizeof(zend_class_entry**)], sizeof(zend_class_entry*));
 
-/*
-#ifndef ZEPHIR_RELEASE
-	{
-		zend_class_entry *cls;
-		memcpy(&cls, &hash_key->arKey[len - sizeof(zend_class_entry**)], sizeof(zend_class_entry*));
-
-		fprintf(stderr, "func: %s, cls: %s, scope: %s [%u]\n", (*entry)->f->common.function_name, (cls ? cls->name : "N/A"), (scope ? scope->name : "N/A"), (uint)(*entry)->times);
-	}
-#endif
-*/
-
 	if ((*entry)->type != ZEND_INTERNAL_FUNCTION || (scope && scope->type != ZEND_INTERNAL_CLASS)) {
 		return ZEND_HASH_APPLY_REMOVE;
 	}
diff --git a/kernels/ZendEngine3/memory.h b/kernels/ZendEngine3/memory.h
index 269ed60920..76407bb5ae 100755
--- a/kernels/ZendEngine3/memory.h
+++ b/kernels/ZendEngine3/memory.h
@@ -175,7 +175,6 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 	do { \
 		zval *orig_ptr = z; \
 		ZEPHIR_SEPARATE(orig_ptr); \
-		/*zephir_memory_observe(orig_ptr);*/ \
 	} while (0)
 
 #endif

From 01dde90f0350ff8d8743859fed56fdaa733acf2b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 27 Feb 2023 11:52:10 +0000
Subject: [PATCH 002/375] Remove .ci/memcheck.sh

---
 .ci/memcheck.sh | 43 -------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100755 .ci/memcheck.sh

diff --git a/.ci/memcheck.sh b/.ci/memcheck.sh
deleted file mode 100755
index f5ce496833..0000000000
--- a/.ci/memcheck.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# This file is part of the Zephir.
-#
-# (c) Phalcon Team <team@zephir-lang.com>
-#
-# For the full copyright and license information, please view
-# the LICENSE file that was distributed with this source code.
-
-if [ "$(command -v valgrind 2>/dev/null)" = "" ]; then
-  (>&2 echo "Valgring does not exist. Can not check for memory leaks.")
-  (>&2 echo "Aborting.")
-  exit 1
-fi
-
-# Correctly show the stack frames for extensions compiled as shared libraries
-export ZEND_DONT_UNLOAD_MODULES=1
-
-# Disable Zend memory manager before running PHP with valgrind
-export USE_ZEND_ALLOC=0
-
-# Do not stop testing on failures
-export PHPUNIT_DONT_EXIT=1
-
-if [ "$(php-config --vernum)" -lt "70200" ]; then
-  test_suite="Extension_Php70"
-else
-  test_suite="Extension_Php72"
-fi
-
-valgrind \
-  --read-var-info=yes \
-  --error-exitcode=1 \
-  --fullpath-after= \
-  --track-origins=yes \
-  --leak-check=full \
-  --num-callers=20 \
-  --run-libc-freeres=no \
-  php \
-    -d "extension=ext/modules/stub.so" \
-      "vendor/bin/simple-phpunit" \
-      --no-coverage \
-      --testsuite "$test_suite"

From 6773f19d9b272cafee96b9a30f9b152c28e982ea Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <Jeckerson@users.noreply.github.com>
Date: Tue, 28 Feb 2023 10:27:43 +0000
Subject: [PATCH 003/375] Update action.yml

---
 .github/workflows/build-win-ext/action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build-win-ext/action.yml b/.github/workflows/build-win-ext/action.yml
index 113c334a48..128782e8bf 100644
--- a/.github/workflows/build-win-ext/action.yml
+++ b/.github/workflows/build-win-ext/action.yml
@@ -46,7 +46,6 @@ runs:
       shell: powershell
       run: |
         Write-Output "::group::Install dependencies"
-        mkdir ${{ env.CACHE_DIR }}\Choco
         choco install --no-progress -y --cache-location=${{ env.CACHE_DIR }}\Choco re2c
         Write-Output "::endgroup::"
 

From 82e7ded0525e1258e1c6a58eb016dc1d39daad4f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:42:28 +0000
Subject: [PATCH 004/375] #2407 - Add docker files for PHP8.3

---
 docker-compose.yml    | 10 ++++++++++
 docker/8.3/.bashrc    |  5 +++++
 docker/8.3/Dockerfile | 25 +++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 docker/8.3/.bashrc
 create mode 100644 docker/8.3/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 3bb2269d9a..be657105b7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,3 +42,13 @@ services:
       - "USER=Zephir"
     volumes:
       - .:/srv
+
+  zephir-8.3:
+    container_name: phalcon-zephir-8.3
+    hostname: zephir-83
+    build: docker/8.3
+    working_dir: /srv
+    environment:
+      - "USER=Zephir"
+    volumes:
+      - .:/srv
diff --git a/docker/8.3/.bashrc b/docker/8.3/.bashrc
new file mode 100644
index 0000000000..fd3a636e58
--- /dev/null
+++ b/docker/8.3/.bashrc
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+alias test-ext='php -d extension=ext/modules/stub.so vendor/bin/phpunit --bootstrap tests/ext-bootstrap.php --testsuite Extension'
+alias test-zephir='php vendor/bin/phpunit --colors=always --testsuite Zephir'
+alias test-all='test-ext; test-zephir'
diff --git a/docker/8.3/Dockerfile b/docker/8.3/Dockerfile
new file mode 100644
index 0000000000..3bc4b87b45
--- /dev/null
+++ b/docker/8.3/Dockerfile
@@ -0,0 +1,25 @@
+FROM composer:latest as composer
+FROM php:8.3.0beta3-fpm
+
+RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
+ENV MAKEFLAGS="-j${CPU_CORES}"
+
+RUN apt update -y && apt install -y \
+    wget \
+    zip \
+    git \
+    apt-utils \
+    sudo \
+    libicu-dev \
+    libgmp-dev \
+    libzip-dev && \
+    pecl install psr zephir_parser
+
+RUN docker-php-ext-install zip gmp intl mysqli && \
+    docker-php-ext-enable psr zephir_parser
+
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+# Bash script with helper aliases
+COPY ./.bashrc /root/.bashrc
+
+CMD ["php-fpm"]

From e01feca194a77cc996a4bcd87712adafa42b5fda Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:47:26 +0000
Subject: [PATCH 005/375] #2407 - Remove unused `unlink_recursive()` function

---
 Library/functions.php | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/Library/functions.php b/Library/functions.php
index 910128f3e3..98c997c68e 100644
--- a/Library/functions.php
+++ b/Library/functions.php
@@ -16,31 +16,6 @@
 use const PHP_INT_SIZE;
 use const PHP_OS;
 use const PHP_ZTS;
-use const SCANDIR_SORT_ASCENDING;
-
-/**
- * Attempts to remove recursively the directory with all subdirectories and files.
- *
- * A E_WARNING level error will be generated on failure.
- *
- * @param string $path
- */
-function unlink_recursive($path)
-{
-    if (is_dir($path)) {
-        $objects = array_diff(scandir($path, SCANDIR_SORT_ASCENDING), ['.', '..']);
-
-        foreach ($objects as $object) {
-            if (is_dir("{$path}/{$object}")) {
-                unlink_recursive("{$path}/{$object}");
-            } else {
-                unlink("{$path}/{$object}");
-            }
-        }
-
-        rmdir($path);
-    }
-}
 
 /**
  * Camelize a string.

From be5ed57337865234224acca83b23ab9beb749cca Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:51:45 +0000
Subject: [PATCH 006/375] #2407 - Remove docker files of PHP7.4

---
 docker-compose.yml    | 10 ----------
 docker/7.4/.bashrc    |  5 -----
 docker/7.4/Dockerfile | 25 -------------------------
 3 files changed, 40 deletions(-)
 delete mode 100644 docker/7.4/.bashrc
 delete mode 100644 docker/7.4/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index be657105b7..449c29c99b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,16 +3,6 @@
 version: '3'
 
 services:
-  zephir-7.4:
-    container_name: phalcon-zephir-7.4
-    hostname: zephir-74
-    build: docker/7.4
-    working_dir: /srv
-    environment:
-      - "USER=Zephir"
-    volumes:
-      - .:/srv
-
   zephir-8.0:
     container_name: phalcon-zephir-8.0
     hostname: zephir-80
diff --git a/docker/7.4/.bashrc b/docker/7.4/.bashrc
deleted file mode 100644
index fd3a636e58..0000000000
--- a/docker/7.4/.bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-alias test-ext='php -d extension=ext/modules/stub.so vendor/bin/phpunit --bootstrap tests/ext-bootstrap.php --testsuite Extension'
-alias test-zephir='php vendor/bin/phpunit --colors=always --testsuite Zephir'
-alias test-all='test-ext; test-zephir'
diff --git a/docker/7.4/Dockerfile b/docker/7.4/Dockerfile
deleted file mode 100644
index a8e41fe611..0000000000
--- a/docker/7.4/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM composer:latest as composer
-FROM php:7.4-fpm
-
-RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
-ENV MAKEFLAGS="-j${CPU_CORES}"
-
-RUN apt update -y && apt install -y \
-    wget \
-    zip \
-    git \
-    apt-utils \
-    sudo \
-    libicu-dev \
-    libgmp-dev \
-    libzip-dev && \
-    pecl install psr zephir_parser
-
-RUN docker-php-ext-install zip gmp intl mysqli && \
-    docker-php-ext-enable psr zephir_parser
-
-COPY --from=composer /usr/bin/composer /usr/local/bin/composer
-# Bash script with helper aliases
-COPY ./.bashrc /root/.bashrc
-
-CMD ["php-fpm"]

From faa52dcab055ea8214f35f380de4377e81e460cd Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:52:41 +0000
Subject: [PATCH 007/375] #2407 - Make minimum supported PHP version from `7.4`
 to `8.0`

---
 composer.json |   2 +-
 composer.lock | 278 +++++++++++++++++++++++++-------------------------
 2 files changed, 142 insertions(+), 138 deletions(-)

diff --git a/composer.json b/composer.json
index 974932b774..9c796720a8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4.1",
+        "php": ">=8.0",
         "ext-ctype": "*",
         "ext-hash": "*",
         "ext-json": "*",
diff --git a/composer.lock b/composer.lock
index da93b3b90a..84653db5d7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3f5dd4044a9111ddb52745217aa41362",
+    "content-hash": "12ba06c84bf00534e75ea0d79e22a65b",
     "packages": [
         {
             "name": "monolog/monolog",
@@ -110,22 +110,27 @@
         },
         {
             "name": "psr/container",
-            "version": "1.1.2",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.4.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -152,9 +157,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.2"
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
             },
-            "time": "2021-11-05T16:50:12+00:00"
+            "time": "2021-11-05T16:47:00+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -258,16 +263,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.19",
+            "version": "v5.4.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "dccb8d251a9017d5994c988b034d3e18aaabf740"
+                "reference": "f4f71842f24c2023b91237c72a365306f3c58827"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/dccb8d251a9017d5994c988b034d3e18aaabf740",
-                "reference": "dccb8d251a9017d5994c988b034d3e18aaabf740",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827",
+                "reference": "f4f71842f24c2023b91237c72a365306f3c58827",
                 "shasum": ""
             },
             "require": {
@@ -332,12 +337,12 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "cli",
-                "command line",
+                "command-line",
                 "console",
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.19"
+                "source": "https://github.com/symfony/console/tree/v5.4.28"
             },
             "funding": [
                 {
@@ -353,29 +358,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:32:19+00:00"
+            "time": "2023-08-07T06:12:30+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.2",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.0.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -404,7 +409,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2"
             },
             "funding": [
                 {
@@ -420,20 +425,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.19",
+            "version": "v5.4.26",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "abf49cc084c087d94b4cb939c3f3672971784e0c"
+                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abf49cc084c087d94b4cb939c3f3672971784e0c",
-                "reference": "abf49cc084c087d94b4cb939c3f3672971784e0c",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac",
+                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac",
                 "shasum": ""
             },
             "require": {
@@ -489,7 +494,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.19"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26"
             },
             "funding": [
                 {
@@ -505,24 +510,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:32:19+00:00"
+            "time": "2023-07-06T06:34:20+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.2",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "psr/event-dispatcher": "^1"
             },
             "suggest": {
@@ -531,7 +536,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -568,7 +573,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2"
             },
             "funding": [
                 {
@@ -584,20 +589,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
                 "shasum": ""
             },
             "require": {
@@ -612,7 +617,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -650,7 +655,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -666,20 +671,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
+                "reference": "875e90aeea2777b6f135677f618529449334a612"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
+                "reference": "875e90aeea2777b6f135677f618529449334a612",
                 "shasum": ""
             },
             "require": {
@@ -691,7 +696,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -731,7 +736,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -747,20 +752,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
                 "shasum": ""
             },
             "require": {
@@ -772,7 +777,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -815,7 +820,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -831,20 +836,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+                "reference": "42292d99c55abe617799667f454222c54c60e229"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
+                "reference": "42292d99c55abe617799667f454222c54c60e229",
                 "shasum": ""
             },
             "require": {
@@ -859,7 +864,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -898,7 +903,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -914,20 +919,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-07-28T09:04:16+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9"
+                "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
-                "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5",
+                "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5",
                 "shasum": ""
             },
             "require": {
@@ -936,7 +941,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -977,7 +982,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -993,20 +998,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
+            "version": "v1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
                 "shasum": ""
             },
             "require": {
@@ -1015,7 +1020,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.27-dev"
+                    "dev-main": "1.28-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1060,7 +1065,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
             },
             "funding": [
                 {
@@ -1076,26 +1081,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2023-01-26T09:26:14+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.2",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
+                "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
+                "php": ">=8.0.2",
+                "psr/container": "^2.0"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -1106,7 +1110,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.0-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -1143,7 +1147,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.0.2"
             },
             "funding": [
                 {
@@ -1159,38 +1163,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-30T19:17:29+00:00"
+            "time": "2022-05-30T19:17:58+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.19",
+            "version": "v6.0.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb"
+                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/0a01071610fd861cc160dfb7e2682ceec66064cb",
-                "reference": "0a01071610fd861cc160dfb7e2682ceec66064cb",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a",
+                "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": ">=3.0"
+                "symfony/translation-contracts": "<2.0"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -1229,7 +1232,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.19"
+                "source": "https://github.com/symfony/string/tree/v6.0.19"
             },
             "funding": [
                 {
@@ -1245,7 +1248,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-01T08:32:19+00:00"
+            "time": "2023-01-01T08:36:10+00:00"
         }
     ],
     "packages-dev": [
@@ -1321,16 +1324,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.0",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
                 "shasum": ""
             },
             "require": {
@@ -1368,7 +1371,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
             },
             "funding": [
                 {
@@ -1376,20 +1379,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-03T13:19:32+00:00"
+            "time": "2023-03-08T13:26:56+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.3",
+            "version": "v4.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
-                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
                 "shasum": ""
             },
             "require": {
@@ -1430,9 +1433,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
             },
-            "time": "2023-01-16T22:05:37+00:00"
+            "time": "2023-08-13T19:53:39+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1547,23 +1550,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.24",
+            "version": "9.2.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
-                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1",
+                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.14",
+                "nikic/php-parser": "^4.15",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -1578,8 +1581,8 @@
                 "phpunit/phpunit": "^9.3"
             },
             "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
             },
             "type": "library",
             "extra": {
@@ -1612,7 +1615,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27"
             },
             "funding": [
                 {
@@ -1620,7 +1624,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-26T08:26:55+00:00"
+            "time": "2023-07-26T13:44:30+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2265,16 +2269,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d"
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d",
-                "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
                 "shasum": ""
             },
             "require": {
@@ -2319,7 +2323,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
             },
             "funding": [
                 {
@@ -2327,7 +2331,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:10:38+00:00"
+            "time": "2023-05-07T05:35:17+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -2471,16 +2475,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "5.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
+                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
                 "shasum": ""
             },
             "require": {
@@ -2523,7 +2527,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
             },
             "funding": [
                 {
@@ -2531,7 +2535,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2023-08-02T09:26:13+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -2986,7 +2990,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4.1",
+        "php": ">=8.0",
         "ext-ctype": "*",
         "ext-hash": "*",
         "ext-json": "*",
@@ -3001,5 +3005,5 @@
         "ext-pdo_sqlite": "*",
         "ext-zip": "*"
     },
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }

From c26fd79e289eb7f587ef71a6caa09ed82eb3222f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:54:30 +0000
Subject: [PATCH 008/375] #2407 - Remove `MethodCallWarmUp` class and it's
 calss

---
 Library/ClassMethod.php        |  5 -----
 Library/CompilationContext.php |  7 -------
 Library/MethodCallWarmUp.php   | 38 ----------------------------------
 3 files changed, 50 deletions(-)
 delete mode 100644 Library/MethodCallWarmUp.php

diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 6071068c4c..1ee25f0a40 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -1593,11 +1593,6 @@ public function compile(CompilationContext $compilationContext): void
          */
         $compilationContext->currentMethod = $this;
 
-        /**
-         * Initialize the method warm-up to null
-         */
-        $compilationContext->methodWarmUp = null;
-
         /**
          * Assign pre-made compilation passes.
          */
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index db3b7d1622..915e0044a0 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -84,13 +84,6 @@ class CompilationContext
      */
     public ?ClassMethod $currentMethod = null;
 
-    /**
-     * Methods warm-up.
-     *
-     * @var MethodCallWarmUp|null
-     */
-    public ?MethodCallWarmUp $methodWarmUp = null;
-
     /**
      * Represents the c-headers added to the file.
      *
diff --git a/Library/MethodCallWarmUp.php b/Library/MethodCallWarmUp.php
deleted file mode 100644
index 46d4d8223c..0000000000
--- a/Library/MethodCallWarmUp.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir;
-
-/**
- * MethodCallWarmUp.
- *
- * List of methods that require warm up
- */
-class MethodCallWarmUp
-{
-    private $warmUps = [];
-
-    /**
-     * @param ClassDefinition $classDefinition
-     * @param ClassMethod     $method
-     */
-    public function add(ClassDefinition $classDefinition, ClassMethod $method)
-    {
-        $this->warmUps[] = [
-            $classDefinition,
-            $method,
-        ];
-    }
-
-    public function get()
-    {
-    }
-}

From c3b08ecff171dbb531ac1d95de97845e750817df Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:55:33 +0000
Subject: [PATCH 009/375] #2407 - Bump `ZEPHIR_PARSER_VERSION` to `1.6.0`

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 213579decb..9657cb401a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ on:
 
 env:
   RE2C_VERSION: 2.2
-  ZEPHIR_PARSER_VERSION: 1.5.3
+  ZEPHIR_PARSER_VERSION: 1.6.0
   PSR_VERSION: 1.2.0
   CACHE_DIR: .cache
 

From 57eea2dfeb437792d7d462e28179baf70e8cb617 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:55:57 +0000
Subject: [PATCH 010/375] #2407 - Change PHP version to `8.0`

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9657cb401a..bdb7723698 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,7 @@ jobs:
         env:
           PHP_CS_FIXER_VERSION: 3.2.0
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           coverage: none
           tools: php-cs-fixer:${{ env.PHP_CS_FIXER_VERSION }}, phpcs
 

From e051dc921b0898f2062bb7a379e3f89abc317fe6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 21:56:38 +0000
Subject: [PATCH 011/375] #2407 - Adjust matrix of PHP versions

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bdb7723698..b5002f44c1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0' , '8.1', '8.2' ]
+        php: [ '8.0' , '8.1', '8.2', '8.3' ]
         ts: [ 'ts', 'nts' ]
         arch: [ 'x64' ]
 
@@ -83,7 +83,7 @@ jobs:
           - { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
           - { php: '8.1', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
           - { php: '8.1', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
-          # Disabled due PSR extension wasn't complied for 8.2
+          # Disabled due PSR extension wasn't complied for >=8.2
           #- { php: '8.2', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
           #- { php: '8.2', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
 

From 8c4045bef35d9db191ab112a3259feac738330fc Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 22:03:34 +0000
Subject: [PATCH 012/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 Library/Cache/MethodCache.php      |  8 --------
 Library/Classes/Entry.php          |  2 --
 Library/Code/Builder/Struct.php    |  2 +-
 Library/Compiler/FileInterface.php |  2 --
 Library/EventsManager.php          |  3 ---
 Library/Expression.php             |  9 +--------
 Library/FunctionCall.php           |  2 +-
 Library/FunctionDefinition.php     | 12 ++----------
 Library/GlobalConstant.php         | 16 ++++------------
 Library/HeadersManager.php         |  2 --
 Library/MethodCall.php             |  2 --
 Library/SymbolTable.php            | 27 +++------------------------
 Library/Variable.php               | 17 +----------------
 13 files changed, 13 insertions(+), 91 deletions(-)

diff --git a/Library/Cache/MethodCache.php b/Library/Cache/MethodCache.php
index 66238021c2..5b731a1ec3 100644
--- a/Library/Cache/MethodCache.php
+++ b/Library/Cache/MethodCache.php
@@ -17,7 +17,6 @@
 use ReflectionException;
 use Zephir\ClassDefinition;
 use Zephir\CompilationContext;
-use Zephir\MethodCallWarmUp;
 use Zephir\Passes\CallGathererPass;
 use Zephir\Variable;
 
@@ -148,13 +147,6 @@ public function get(CompilationContext $compilationContext, string $methodName,
             $cacheable = false;
         }
 
-        // Recursive methods require warm-up
-        if ($compilationContext->currentMethod == $method) {
-            if (!$compilationContext->methodWarmUp) {
-                $compilationContext->methodWarmUp = new MethodCallWarmUp();
-            }
-        }
-
         if ('this_ptr' != $caller->getName()) {
             $associatedClass = $caller->getAssociatedClass();
             if ($this->isClassCacheable($associatedClass)) {
diff --git a/Library/Classes/Entry.php b/Library/Classes/Entry.php
index 2b1466cea2..47ded83a52 100644
--- a/Library/Classes/Entry.php
+++ b/Library/Classes/Entry.php
@@ -14,7 +14,6 @@
 namespace Zephir\Classes;
 
 use ReflectionClass;
-use ReflectionException;
 use Zephir\ClassDefinition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
@@ -75,7 +74,6 @@ public function __construct(string $className, CompilationContext $compilationCo
      * @return string
      *
      * @throws Exception
-     * @throws ReflectionException
      */
     public function get(): string
     {
diff --git a/Library/Code/Builder/Struct.php b/Library/Code/Builder/Struct.php
index 1d5c9472a1..7f62238fbf 100644
--- a/Library/Code/Builder/Struct.php
+++ b/Library/Code/Builder/Struct.php
@@ -86,7 +86,7 @@ public function __toString(): string
      *
      * @throws InvalidArgumentException
      */
-    public function addProperty(string $field, array $global)
+    public function addProperty(string $field, array $global): void
     {
         if (!isset($global['type']) || !is_string($global['type'])) {
             throw new InvalidArgumentException('Property type must be string');
diff --git a/Library/Compiler/FileInterface.php b/Library/Compiler/FileInterface.php
index 6485c41d01..588e2d19e7 100644
--- a/Library/Compiler/FileInterface.php
+++ b/Library/Compiler/FileInterface.php
@@ -15,8 +15,6 @@
 use Zephir\Compiler;
 
 /**
- * FileInterface.
- *
  * Provides a common interface for compiler files
  */
 interface FileInterface
diff --git a/Library/EventsManager.php b/Library/EventsManager.php
index 6db0dff1e4..b9c33e1262 100644
--- a/Library/EventsManager.php
+++ b/Library/EventsManager.php
@@ -11,9 +11,6 @@
 
 namespace Zephir;
 
-/**
- * Class EventsManager.
- */
 class EventsManager
 {
     /**
diff --git a/Library/Expression.php b/Library/Expression.php
index 817612f408..8199d1816c 100644
--- a/Library/Expression.php
+++ b/Library/Expression.php
@@ -78,17 +78,10 @@ class Expression
     protected bool $expecting = true;
     protected bool $readOnly = false;
     protected bool $evalMode = false;
-    protected array $expression = [];
     protected ?Variable $expectingVariable = null;
 
-    /**
-     * Expression constructor.
-     *
-     * @param array $expression
-     */
-    public function __construct(array $expression)
+    public function __construct(protected array $expression)
     {
-        $this->expression = $expression;
     }
 
     /**
diff --git a/Library/FunctionCall.php b/Library/FunctionCall.php
index e7c9ec1d9a..5bd9eee123 100644
--- a/Library/FunctionCall.php
+++ b/Library/FunctionCall.php
@@ -77,7 +77,7 @@ public function getReflector($funcName)
      *
      * @return bool
      */
-    public function isBuiltInFunction($functionName)
+    public function isBuiltInFunction(string $functionName)
     {
         switch ($functionName) {
             case 'memstr':
diff --git a/Library/FunctionDefinition.php b/Library/FunctionDefinition.php
index 53116f1c75..814222700e 100644
--- a/Library/FunctionDefinition.php
+++ b/Library/FunctionDefinition.php
@@ -14,17 +14,10 @@
 namespace Zephir;
 
 /**
- * FunctionDefinition.
- *
  * Represents a function
  */
 class FunctionDefinition extends ClassMethod
 {
-    /**
-     * The namespace of the function.
-     */
-    private string $namespace;
-
     /**
      * Whether the function is declared in a global or namespaced scope.
      *
@@ -35,7 +28,7 @@ class FunctionDefinition extends ClassMethod
     /**
      * FunctionDefinition constructor.
      *
-     * @param string                     $namespace
+     * @param string                     $namespace The namespace of the function.
      * @param string                     $name
      * @param ClassMethodParameters|null $parameters
      * @param StatementsBlock|null       $statements
@@ -43,14 +36,13 @@ class FunctionDefinition extends ClassMethod
      * @param array|null                 $expression
      */
     public function __construct(
-        string $namespace,
+        private string $namespace,
         string $name,
         ClassMethodParameters $parameters = null,
         StatementsBlock $statements = null,
         array $returnType = null,
         array $expression = null
     ) {
-        $this->namespace = $namespace;
         $this->name = $name;
         $this->parameters = $parameters;
         $this->statements = $statements;
diff --git a/Library/GlobalConstant.php b/Library/GlobalConstant.php
index 6a5a330a51..f818b9d2dc 100644
--- a/Library/GlobalConstant.php
+++ b/Library/GlobalConstant.php
@@ -12,23 +12,15 @@
 namespace Zephir;
 
 /**
- * GlobalConstant.
+ * Creates a new global constant.
  *
  * Global constants are allocated one time at extension initialization
  * and are referenced across the C code saving memory
  */
 class GlobalConstant
 {
-    protected $name;
-
-    /**
-     * Creates a new global constant.
-     *
-     * @param string $name
-     */
-    public function __construct($name)
+    public function __construct(protected string $name)
     {
-        $this->name = $name;
     }
 
     /**
@@ -36,7 +28,7 @@ public function __construct($name)
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -46,7 +38,7 @@ public function getName()
      *
      * @return bool
      */
-    public function isTemporal()
+    public function isTemporal(): bool
     {
         return false;
     }
diff --git a/Library/HeadersManager.php b/Library/HeadersManager.php
index 10d078cd18..c6a7ad9a1d 100644
--- a/Library/HeadersManager.php
+++ b/Library/HeadersManager.php
@@ -12,8 +12,6 @@
 namespace Zephir;
 
 /**
- * Class HeadersManager.
- *
  * Manages the c-headers that must be added to a file
  */
 class HeadersManager
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index 2046bc120a..d840a8ffec 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -15,8 +15,6 @@
 use Zephir\Exception\CompilerException;
 
 /**
- * MethodCall.
- *
  * Call methods in a non-static context
  */
 class MethodCall extends Call
diff --git a/Library/SymbolTable.php b/Library/SymbolTable.php
index 7fe44386e9..dbd29a72f0 100644
--- a/Library/SymbolTable.php
+++ b/Library/SymbolTable.php
@@ -16,8 +16,6 @@
 use Zephir\Variable\Globals;
 
 /**
- * Zephir\SymbolTable.
- *
  * A symbol table stores all the variables defined in a method, their data types and default values.
  */
 class SymbolTable
@@ -37,22 +35,12 @@ class SymbolTable
      */
     protected $localContext;
 
-    /**
-     * @var CompilationContext
-     */
-    protected $compilationContext;
-
     /**
      * @var Globals
      */
     protected $globalsManager;
 
-    /**
-     * SymbolTable.
-     *
-     * @param CompilationContext $compilationContext
-     */
-    public function __construct(CompilationContext $compilationContext)
+    public function __construct(protected CompilationContext $compilationContext)
     {
         $this->globalsManager = new Globals();
 
@@ -85,7 +73,7 @@ public function resolveVariableToBranch($name, CompilationContext $compilationCo
 
         do {
             $currentId = $currentBranch->getUniqueId();
-            if (isset($this->branchVariables[$currentId]) && isset($this->branchVariables[$currentId][$name])) {
+            if (isset($this->branchVariables[$currentId][$name])) {
                 return $currentBranch;
             }
             $currentBranch = $currentBranch->getParentBranch();
@@ -222,7 +210,7 @@ public function getVariable($name, CompilationContext $compilationContext = null
     public function getVariables()
     {
         $ret = [];
-        foreach ($this->branchVariables as $branchId => $vars) {
+        foreach ($this->branchVariables as $vars) {
             foreach ($vars as $var) {
                 $ret[$var->getName()] = $var;
             }
@@ -231,15 +219,6 @@ public function getVariables()
         return $ret;
     }
 
-    public function getVariablesByBranch($branchId)
-    {
-        if (isset($this->branchVariables[$branchId])) {
-            return $this->branchVariables[$branchId];
-        }
-
-        return null;
-    }
-
     /**
      * Return a variable in the symbol table, it will be used for a read operation.
      *
diff --git a/Library/Variable.php b/Library/Variable.php
index f0abe51c91..95ce6e1c37 100644
--- a/Library/Variable.php
+++ b/Library/Variable.php
@@ -40,13 +40,6 @@ class Variable implements TypeAwareInterface
      */
     protected $name;
 
-    /**
-     * Branch where the variable was declared.
-     *
-     * @var Branch|null
-     */
-    protected $branch;
-
     /**
      * Branch where the variable was initialized for the first time.
      */
@@ -164,14 +157,7 @@ class Variable implements TypeAwareInterface
         'object' => 1,
     ];
 
-    /**
-     * Variable constructor.
-     *
-     * @param string $type
-     * @param string $name
-     * @param Branch $branch
-     */
-    public function __construct(string $type, string $name, Branch $branch = null)
+    public function __construct(string $type, string $name, protected ?Branch $branch = null)
     {
         $this->globalsManager = new Globals();
 
@@ -181,7 +167,6 @@ public function __construct(string $type, string $name, Branch $branch = null)
 
         $this->type = $type;
         $this->name = $name;
-        $this->branch = $branch;
     }
 
     /**

From 356c2561ca5545a9e990bbf30449b77bb247e57c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 28 Aug 2023 22:05:27 +0000
Subject: [PATCH 013/375] #2407 - Remove `EventsManager` class and it's usage

---
 Library/ClassDefinition.php    | 17 ------------
 Library/CompilationContext.php |  5 ----
 Library/EventsManager.php      | 48 ----------------------------------
 3 files changed, 70 deletions(-)
 delete mode 100644 Library/EventsManager.php

diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php
index 52a24656f6..bad769a004 100644
--- a/Library/ClassDefinition.php
+++ b/Library/ClassDefinition.php
@@ -142,11 +142,6 @@ final class ClassDefinition extends AbstractClassDefinition
      */
     protected array $originalNode = [];
 
-    /**
-     * @var EventsManager
-     */
-    protected EventsManager $eventsManager;
-
     /**
      * @var bool
      */
@@ -174,8 +169,6 @@ public function __construct(string $namespace, string $name, ?string $shortName
         $this->namespace = $namespace;
         $this->name = $name;
         $this->shortName = $shortName ?: $name;
-
-        $this->eventsManager = new EventsManager();
     }
 
     /**
@@ -218,16 +211,6 @@ public function isExternal(): bool
         return $this->external;
     }
 
-    /**
-     * Get eventsManager for class definition.
-     *
-     * @return EventsManager
-     */
-    public function getEventsManager(): EventsManager
-    {
-        return $this->eventsManager;
-    }
-
     /**
      * Set the class' type (class/interface).
      *
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 915e0044a0..bb34cb4098 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -23,11 +23,6 @@
  */
 class CompilationContext
 {
-    /**
-     * @var EventsManager|null
-     */
-    public ?EventsManager $eventsManager = null;
-
     /**
      * Compiler.
      *
diff --git a/Library/EventsManager.php b/Library/EventsManager.php
deleted file mode 100644
index b9c33e1262..0000000000
--- a/Library/EventsManager.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir;
-
-class EventsManager
-{
-    /**
-     * @var array
-     */
-    private $listeners = [];
-
-    /**
-     * Attaches a listener to a specific event type.
-     *
-     * @param $event
-     * @param $callback
-     */
-    public function listen($event, $callback)
-    {
-        if (!isset($this->listeners[$event])) {
-            $this->listeners[$event] = [];
-        }
-
-        $this->listeners[$event][] = $callback;
-    }
-
-    /**
-     * Triggers an event for the specified event type.
-     *
-     * @param $event
-     * @param array $param
-     */
-    public function dispatch($event, array $param = [])
-    {
-        foreach ($this->listeners[$event] as $listener) {
-            \call_user_func_array($listener, $param);
-        }
-    }
-}

From 999cfa47ed443542e4507497c4b4c75aa53c3ae1 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 29 Aug 2023 09:42:24 +0100
Subject: [PATCH 014/375] #2407 - Remove unused `IsAnnotated` class

---
 .../ReturnType/Specification/IsAnnotated.php  | 29 -------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsAnnotated.php

diff --git a/Library/FunctionLike/ReturnType/Specification/IsAnnotated.php b/Library/FunctionLike/ReturnType/Specification/IsAnnotated.php
deleted file mode 100644
index 5ba517b7e5..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsAnnotated.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-
-final class IsAnnotated extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return ReturnType\TypeInterface::TYPE_ANNOTATION == $type->getType();
-    }
-}

From 004ae2ed2400987c045e4e0de2fb280416c038f7 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 29 Aug 2023 09:57:47 +0100
Subject: [PATCH 015/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 .../Backends/ZendEngine3/StringsManager.php   |   2 +-
 Library/BranchGraph.php                       |  10 --
 Library/BranchManager.php                     |   8 --
 Library/CacheManager.php                      |   6 +-
 Library/Call.php                              |  30 +----
 Library/ClassDefinition.php                   |   2 +-
 Library/ClassMethod.php                       |   1 -
 Library/ClassMethodParameters.php             |   2 -
 Library/ClassProperty.php                     | 115 +++++++-----------
 Library/CodePrinter.php                       |  59 ---------
 Library/CompilationContext.php                |  10 +-
 Library/CompiledExpression.php                |  12 +-
 Library/Compiler.php                          |   3 +-
 Library/CompilerFile.php                      |  12 +-
 Library/CompilerFileAnonymous.php             |   2 +-
 Library/Console/Command/AbstractCommand.php   |   2 +-
 Library/Console/Command/BuildCommand.php      |   2 -
 Library/Console/Command/CleanCommand.php      |   2 -
 Library/Console/Command/CompileCommand.php    |   4 +-
 Library/Detectors/WriteDetector.php           |  18 +--
 Library/Documentation.php                     |   6 +-
 Library/Documentation/File/ClassFile.php      |  30 +----
 Library/Documentation/File/ClassesFile.php    |  23 +---
 .../EventListener/ConsoleErrorListener.php    |   3 +-
 Library/Expression.php                        |   2 +-
 Library/FunctionLike/ReturnType/CastHint.php  |  83 ++-----------
 .../Specification/ArrayCompatible.php         |  11 +-
 .../Specification/IntCompatible.php           |  26 +---
 .../FunctionLike/ReturnType/TypeInterface.php |   2 +-
 .../Logger/Formatter/CompilerFormatter.php    |   4 +-
 Library/MethodCall.php                        |   7 +-
 Library/Parser/Manager.php                    |  38 +-----
 Library/Passes/LocalContextPass.php           |  10 +-
 Library/Passes/LoopBreakPass.php              |  10 +-
 Library/Passes/MutateGathererPass.php         |  70 +++--------
 Library/Passes/SkipVariantInit.php            |  36 +++---
 Library/Statements/BreakStatement.php         |   7 +-
 Library/Statements/ContinueStatement.php      |   7 +-
 Library/Statements/DeclareStatement.php       |  29 +----
 Library/Statements/DoWhileStatement.php       |  19 +--
 Library/Statements/EchoStatement.php          |   9 +-
 Library/Statements/ForStatement.php           |  74 ++++++-----
 Library/Statements/LoopStatement.php          |  12 +-
 Library/StatementsBlock.php                   |  15 +--
 Library/StringsManager.php                    |  12 +-
 Library/Variable.php                          |   2 +-
 46 files changed, 230 insertions(+), 619 deletions(-)

diff --git a/Library/Backends/ZendEngine3/StringsManager.php b/Library/Backends/ZendEngine3/StringsManager.php
index a1e19c70ea..7400d52b71 100644
--- a/Library/Backends/ZendEngine3/StringsManager.php
+++ b/Library/Backends/ZendEngine3/StringsManager.php
@@ -27,7 +27,7 @@ class StringsManager extends BaseStringsManager
      *
      * @param string $key
      */
-    public function addConcatKey($key)
+    public function addConcatKey(string $key): void
     {
         $this->concatKeys[$key] = true;
     }
diff --git a/Library/BranchGraph.php b/Library/BranchGraph.php
index 5c765f7338..94be28d76c 100644
--- a/Library/BranchGraph.php
+++ b/Library/BranchGraph.php
@@ -49,14 +49,4 @@ public function addLeaf(Branch $branch): void
             }
         }
     }
-
-    /**
-     * Returns the tree's root node.
-     *
-     * @return BranchGraphNode
-     */
-    public function getRoot(): BranchGraphNode
-    {
-        return $this->root;
-    }
 }
diff --git a/Library/BranchManager.php b/Library/BranchManager.php
index 9cf041daa8..0c6379a7e0 100644
--- a/Library/BranchManager.php
+++ b/Library/BranchManager.php
@@ -84,12 +84,4 @@ public function setRootBranch(Branch $branch)
     {
         $this->rootBranch = $branch;
     }
-
-    /**
-     * @return Branch|null
-     */
-    public function getRootBranch()
-    {
-        return $this->rootBranch;
-    }
 }
diff --git a/Library/CacheManager.php b/Library/CacheManager.php
index cd2317308f..058d2b0cc3 100644
--- a/Library/CacheManager.php
+++ b/Library/CacheManager.php
@@ -54,7 +54,7 @@ class CacheManager
      *
      * @param CallGathererPass|null $gatherer
      */
-    public function setGatherer(?CallGathererPass $gatherer = null)
+    public function setGatherer(?CallGathererPass $gatherer = null): void
     {
         $this->gatherer = $gatherer;
     }
@@ -76,7 +76,7 @@ public function getClassEntryCache(): ClassEntryCache
     /**
      * Creates or returns an existing function cache.
      *
-     * @return FunctionCache
+     * @return FunctionCache|null
      */
     public function getFunctionCache(): ?FunctionCache
     {
@@ -90,7 +90,7 @@ public function getFunctionCache(): ?FunctionCache
     /**
      * Creates or returns an existing method cache.
      *
-     * @return MethodCache
+     * @return MethodCache|null
      */
     public function getMethodCache(): ?MethodCache
     {
diff --git a/Library/Call.php b/Library/Call.php
index 2f1d7a3ce9..18da25c5cb 100644
--- a/Library/Call.php
+++ b/Library/Call.php
@@ -79,7 +79,7 @@ class Call
      *
      * @param CompilationContext $compilationContext
      */
-    public function processExpectedReturn(CompilationContext $compilationContext)
+    public function processExpectedReturn(CompilationContext $compilationContext): void
     {
         $expr = $this->expression;
         $expression = $expr->getExpression();
@@ -300,34 +300,6 @@ public function getResolvedParams(array $parameters, CompilationContext $compila
         $codePrinter = $compilationContext->codePrinter;
         $exprParams = $this->getResolvedParamsAsExpr($parameters, $compilationContext, $expression);
 
-        /**
-         * Static typed parameters in final/private methods are promotable to read only parameters
-         * Recursive calls with static typed methods also also promotable.
-         */
-        $readOnlyParameters = [];
-        if (\is_object($calleeDefinition)) {
-            if ($calleeDefinition instanceof ClassMethod) {
-                if ($calleeDefinition->isFinal() || $calleeDefinition->isPrivate() || $calleeDefinition->isInternal() || $compilationContext->currentMethod === $calleeDefinition) {
-                    foreach ($calleeDefinition->getParameters() as $position => $parameter) {
-                        if (isset($parameter['data-type'])) {
-                            switch ($parameter['data-type']) {
-                                case 'int':
-                                case 'uint':
-                                case 'double':
-                                case 'long':
-                                case 'char':
-                                case 'uchar':
-                                case 'boolean':
-                                case 'bool':
-                                    $readOnlyParameters[$position] = true;
-                                    break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
         $params = [];
         $types = [];
         $dynamicTypes = [];
diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php
index bad769a004..4107d21c04 100644
--- a/Library/ClassDefinition.php
+++ b/Library/ClassDefinition.php
@@ -416,7 +416,7 @@ public function getImplementedInterfaceDefinitions(): array
     public function getDependencies(): array
     {
         $dependencies = [];
-        if ($this->extendsClassDefinition && $this->extendsClassDefinition instanceof self) {
+        if ($this->extendsClassDefinition instanceof self) {
             $dependencies[] = $this->extendsClassDefinition;
         }
 
diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 1ee25f0a40..6f55470ff9 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -1784,7 +1784,6 @@ public function compile(CompilationContext $compilationContext): void
                 if (isset($parameter['cast'])) {
                     $symbol->setDynamicTypes('object');
                     $symbol->setClassTypes($compilationContext->getFullName($parameter['cast']['value']));
-                    $classCastChecks[] = [$symbol, $parameter];
                 } else {
                     if (isset($parameter['data-type'])) {
                         if ('variable' === $parameter['data-type']) {
diff --git a/Library/ClassMethodParameters.php b/Library/ClassMethodParameters.php
index 9337d68128..da36d86acb 100644
--- a/Library/ClassMethodParameters.php
+++ b/Library/ClassMethodParameters.php
@@ -21,8 +21,6 @@
 use function count;
 
 /**
- * Class Method Parameters
- *
  * Represents the parameters defined in a method.
  */
 class ClassMethodParameters implements Countable, Iterator, ArrayAccess
diff --git a/Library/ClassProperty.php b/Library/ClassProperty.php
index a4a0ee9436..039641043d 100644
--- a/Library/ClassProperty.php
+++ b/Library/ClassProperty.php
@@ -11,51 +11,31 @@
 
 namespace Zephir;
 
+use ReflectionException;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\BinaryOperator;
 use Zephir\Expression\Builder\Statements\LetStatement as ExpressionLetStatement;
 
+use function in_array;
+use function is_array;
+
 /**
  * Represents a property class
  */
 class ClassProperty
 {
-    /**
-     * @var ClassDefinition
-     */
-    protected ClassDefinition $classDefinition;
-
-    protected $visibility;
-
-    protected $name;
-
-    protected $defaultValue;
-
-    protected $docblock;
-
-    protected $original;
-
-    /**
-     * @param ClassDefinition $classDefinition
-     * @param array           $visibility
-     * @param string          $name
-     * @param mixed           $defaultValue
-     * @param string          $docBlock
-     * @param array           $original
-     */
-    public function __construct(ClassDefinition $classDefinition, $visibility, $name, $defaultValue, $docBlock, $original)
-    {
+    public function __construct(
+        protected ClassDefinition $classDefinition,
+        protected array $visibility,
+        protected string $name,
+        protected ?array $defaultValue,
+        protected string $docBlock,
+        protected array $original,
+    ) {
         $this->checkVisibility($visibility, $name, $original);
 
-        $this->classDefinition = $classDefinition;
-        $this->visibility = $visibility;
-        $this->name = $name;
-        $this->defaultValue = $defaultValue;
-        $this->docblock = $docBlock;
-        $this->original = $original;
-
-        if (!\is_array($this->defaultValue)) {
+        if (!is_array($this->defaultValue)) {
             $this->defaultValue = [];
             $this->defaultValue['type'] = 'null';
             $this->defaultValue['value'] = null;
@@ -67,7 +47,7 @@ public function __construct(ClassDefinition $classDefinition, $visibility, $name
      *
      * @return ClassDefinition
      */
-    public function getClassDefinition()
+    public function getClassDefinition(): ClassDefinition
     {
         return $this->classDefinition;
     }
@@ -77,7 +57,7 @@ public function getClassDefinition()
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -85,7 +65,7 @@ public function getName()
     /**
      * @return mixed
      */
-    public function getValue()
+    public function getValue(): mixed
     {
         if ('array' == $this->defaultValue['type']) {
             $result = [];
@@ -108,7 +88,7 @@ public function getType()
     /**
      * @return mixed
      */
-    public function getOriginal()
+    public function getOriginal(): mixed
     {
         return $this->original;
     }
@@ -122,15 +102,15 @@ public function getOriginal()
      *
      * @throws CompilerException
      */
-    public function checkVisibility($visibility, $name, $original)
+    public function checkVisibility($visibility, $name, $original): void
     {
-        if (\in_array('public', $visibility) && \in_array('protected', $visibility)) {
+        if (in_array('public', $visibility) && in_array('protected', $visibility)) {
             throw new CompilerException("Property '$name' cannot be 'public' and 'protected' at the same time", $original);
         }
-        if (\in_array('public', $visibility) && \in_array('private', $visibility)) {
+        if (in_array('public', $visibility) && in_array('private', $visibility)) {
             throw new CompilerException("Property '$name' cannot be 'public' and 'private' at the same time", $original);
         }
-        if (\in_array('private', $visibility) && \in_array('protected', $visibility)) {
+        if (in_array('private', $visibility) && in_array('protected', $visibility)) {
             throw new CompilerException("Property '$name' cannot be 'protected' and 'private' at the same time", $original);
         }
     }
@@ -177,9 +157,9 @@ public function getVisibilityAccessor()
      *
      * @return string
      */
-    public function getDocBlock()
+    public function getDocBlock(): string
     {
-        return $this->docblock;
+        return $this->docBlock;
     }
 
     /**
@@ -187,9 +167,9 @@ public function getDocBlock()
      *
      * @return bool
      */
-    public function isStatic()
+    public function isStatic(): bool
     {
-        return \in_array('static', $this->visibility);
+        return in_array('static', $this->visibility);
     }
 
     /**
@@ -197,9 +177,9 @@ public function isStatic()
      *
      * @return bool
      */
-    public function isPublic()
+    public function isPublic(): bool
     {
-        return \in_array('public', $this->visibility);
+        return in_array('public', $this->visibility);
     }
 
     /**
@@ -207,9 +187,9 @@ public function isPublic()
      *
      * @return bool
      */
-    public function isProtected()
+    public function isProtected(): bool
     {
-        return \in_array('protected', $this->visibility);
+        return in_array('protected', $this->visibility);
     }
 
     /**
@@ -217,9 +197,9 @@ public function isProtected()
      *
      * @return bool
      */
-    public function isPrivate()
+    public function isPrivate(): bool
     {
-        return \in_array('private', $this->visibility);
+        return in_array('private', $this->visibility);
     }
 
     /**
@@ -227,9 +207,10 @@ public function isPrivate()
      *
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
+     * @throws Exception
+     * @throws ReflectionException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         switch ($this->defaultValue['type']) {
             case 'long':
@@ -242,7 +223,7 @@ public function compile(CompilationContext $compilationContext)
 
             case 'array':
             case 'empty-array':
-                $this->initializeArray($compilationContext);
+                $this->initializeArray();
                 // no break
             case 'null':
                 $this->declareProperty($compilationContext, $this->defaultValue['type'], null);
@@ -265,7 +246,7 @@ public function compile(CompilationContext $compilationContext)
      *
      * @param array $statements
      */
-    protected function removeInitializationStatements(&$statements)
+    protected function removeInitializationStatements(array &$statements): void
     {
         foreach ($statements as $index => $statement) {
             if (!$this->isStatic()) {
@@ -328,14 +309,14 @@ protected function getLetStatement()
      *
      * @return bool|string
      */
-    protected function getBooleanCode($value)
+    protected function getBooleanCode($value): bool|string
     {
-        if ($value && ('true' == $value || true === $value)) {
+        if ('true' == $value || true === $value) {
             return '1';
-        } else {
-            if ('false' == $value || false === $value) {
-                return '0';
-            }
+        }
+
+        if ('false' == $value || false === $value) {
+            return '0';
         }
 
         return (bool) $value;
@@ -351,7 +332,7 @@ protected function getBooleanCode($value)
      * @throws Exception
      * @throws CompilerException
      */
-    protected function declareProperty(CompilationContext $compilationContext, $type, $value)
+    protected function declareProperty(CompilationContext $compilationContext, $type, $value): void
     {
         $codePrinter = $compilationContext->codePrinter;
 
@@ -435,7 +416,7 @@ protected function declareProperty(CompilationContext $compilationContext, $type
         }
     }
 
-    private function initializeArray($compilationContext)
+    private function initializeArray(): void
     {
         $classDefinition = $this->classDefinition;
         $parentClassDefinition = $classDefinition->getExtendsClassDefinition();
@@ -464,13 +445,7 @@ private function initializeArray($compilationContext)
 
                 $this->removeInitializationStatements($statements);
                 if ($needLetStatementAdded) {
-                    $newStatements = [];
-
-                    /*
-                     * Start from let statement
-                     */
-                    $newStatements[] = $letStatement;
-
+                    $newStatements = [$letStatement];
                     foreach ($statements as $statement) {
                         $newStatements[] = $statement;
                     }
diff --git a/Library/CodePrinter.php b/Library/CodePrinter.php
index 0c4aa3a25b..93910aac00 100644
--- a/Library/CodePrinter.php
+++ b/Library/CodePrinter.php
@@ -26,17 +26,6 @@ class CodePrinter
 
     protected int $currentPrints = 0;
 
-    /**
-     * Adds a line to the output without the automatic line feed.
-     *
-     * @param string $code
-     */
-    public function outputNoLineFeed(string $code): void
-    {
-        $this->lastLine = $code;
-        $this->code .= str_repeat("\t", $this->level).$code;
-    }
-
     /**
      * Add code to the output at the beginning.
      *
@@ -49,29 +38,6 @@ public function preOutput(string $code): void
         ++$this->currentPrints;
     }
 
-    /**
-     * Adds a line to the output without the automatic line feed.
-     *
-     * @param string $code
-     */
-    public function preOutputNoLineFeed(string $code): void
-    {
-        $this->lastLine = $code;
-        $this->code = str_repeat("\t", $this->level).$code.$this->code;
-    }
-
-    /**
-     * Adds code to the output without the indentation level.
-     *
-     * @param string $code
-     */
-    public function preOutputNoLevel(string $code): void
-    {
-        $this->lastLine = $code;
-        $this->code = $code.PHP_EOL.$this->code;
-        ++$this->currentPrints;
-    }
-
     /**
      * Add code to the output without indentation.
      *
@@ -121,18 +87,6 @@ public function outputDocBlock($docblock, bool $replaceTab = true): void
         ++$this->currentPrints;
     }
 
-    /**
-     * Adds code to the output without the indentation level.
-     *
-     * @param string $code
-     */
-    public function outputNoLevel(string $code): void
-    {
-        $this->lastLine = $code;
-        $this->code .= $code.PHP_EOL;
-        ++$this->currentPrints;
-    }
-
     /**
      * Adds a blank line to the output
      * Optionally controlling if the blank link must be added if the
@@ -193,11 +147,6 @@ public function decreaseLevel(): void
         --$this->level;
     }
 
-    public function setLevel(int $level): void
-    {
-        $this->level = $level;
-    }
-
     /**
      * Returns the output in the buffer.
      *
@@ -227,12 +176,4 @@ public function clear(): void
         $this->lastLine = '';
         $this->level = 0;
     }
-
-    public function duplicate(): self
-    {
-        $printer = new self();
-        $printer->setLevel($this->level);
-
-        return $printer;
-    }
 }
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index bb34cb4098..95dd041ed2 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -75,7 +75,7 @@ class CompilationContext
     /**
      * Current method or function that being compiled.
      *
-     * @var ClassMethod|FunctionDefinition|null
+     * @var ClassMethod|null
      */
     public ?ClassMethod $currentMethod = null;
 
@@ -94,21 +94,21 @@ class CompilationContext
     public ?StringsManager $stringsManager = null;
 
     /**
-     * Tells if the the compilation is being made inside a cycle/loop.
+     * Tells if the compilation is being made inside a cycle/loop.
      *
      * @var int
      */
     public int $insideCycle = 0;
 
     /**
-     * Tells if the the compilation is being made inside a try/catch block.
+     * Tells if the compilation is being made inside a try/catch block.
      *
      * @var int
      */
     public int $insideTryCatch = 0;
 
     /**
-     * Tells if the the compilation is being made inside a switch.
+     * Tells if the compilation is being made inside a switch.
      *
      * @var int
      */
@@ -192,7 +192,7 @@ class CompilationContext
      */
     public function getFullName(string $className): string
     {
-        $isFunction = $this->currentMethod && $this->currentMethod instanceof FunctionDefinition;
+        $isFunction = $this->currentMethod instanceof FunctionDefinition;
         $namespace = $isFunction ? $this->currentMethod->getNamespace() : $this->classDefinition->getNamespace();
 
         return fqcn($className, $namespace, $this->aliasManager);
diff --git a/Library/CompiledExpression.php b/Library/CompiledExpression.php
index 46442c1b60..ebb9431ebc 100644
--- a/Library/CompiledExpression.php
+++ b/Library/CompiledExpression.php
@@ -76,7 +76,7 @@ public function getOriginal(): ?array
      */
     public function getBooleanCode(): string
     {
-        if ($this->code && ('true' == $this->code || true === $this->code)) {
+        if ('true' === $this->code || true === $this->code) {
             return '1';
         }
 
@@ -97,16 +97,6 @@ public function isIntCompatibleType(): bool
         return in_array($this->type, ['int', 'uint', 'long', 'ulong', 'char', 'uchar'], true);
     }
 
-    /**
-     * Checks if the compiled expression is a char or compatible type.
-     *
-     * @return bool
-     */
-    public function isCharCompatibleType(): bool
-    {
-        return in_array($this->type, ['char', 'uchar'], true);
-    }
-
     /**
      * Resolves an expression
      *
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 601465ecf7..5c8a23b1cc 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -194,9 +194,8 @@ public function setPrototypesPath(string $prototypesPath): void
     /**
      * Resolves path to the internal prototypes.
      *
-     * @return string
+     * @return string|null
      *
-     * @throws IllegalStateException in case of absence internal prototypes directory
      */
     private function resolvePrototypesPath(): ?string
     {
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index e634da6fd8..80afb793d1 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -146,11 +146,6 @@ public function getClassDefinition()
         return $this->classDefinition;
     }
 
-    public function getFunctionDefinitions()
-    {
-        return $this->functionDefinitions;
-    }
-
     /**
      * Sets if the class belongs to an external dependency or not.
      *
@@ -244,6 +239,7 @@ public function compileClass(CompilationContext $compilationContext): void
      *
      * @param CompilationContext $compilationContext
      * @param FunctionDefinition $functionDefinition
+     * @throws Exception
      */
     public function compileFunction(CompilationContext $compilationContext, FunctionDefinition $functionDefinition)
     {
@@ -858,7 +854,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
         }
 
         /**
-         * If the file does not exists we create it for the first time
+         * If the file does not exist we create it for the first time
          */
         if (!file_exists($filePath)) {
             file_put_contents($filePath, $codePrinter->getOutput());
@@ -954,10 +950,10 @@ public function getFilePath(): string
      *
      * @throws CompilerException
      */
-    protected function processShortcuts(array $property, ClassDefinition $classDefinition)
+    protected function processShortcuts(array $property, ClassDefinition $classDefinition): void
     {
         foreach ($property['shortcuts'] as $shortcut) {
-            if ('_' == substr($property['name'], 0, 1)) {
+            if (str_starts_with($property['name'], '_')) {
                 $name = substr($property['name'], 1);
             } else {
                 $name = $property['name'];
diff --git a/Library/CompilerFileAnonymous.php b/Library/CompilerFileAnonymous.php
index b4b54557ef..89711ace2a 100644
--- a/Library/CompilerFileAnonymous.php
+++ b/Library/CompilerFileAnonymous.php
@@ -64,7 +64,7 @@ public function getClassDefinition(): ClassDefinition
      *
      * @param bool $external
      */
-    public function setIsExternal($external)
+    public function setIsExternal($external): void
     {
         $this->external = (bool) $external;
     }
diff --git a/Library/Console/Command/AbstractCommand.php b/Library/Console/Command/AbstractCommand.php
index cc43e6120e..25b8afcdae 100644
--- a/Library/Console/Command/AbstractCommand.php
+++ b/Library/Console/Command/AbstractCommand.php
@@ -22,7 +22,7 @@ abstract class AbstractCommand extends Command
     /**
      * @param bool $mergeArgs
      */
-    public function mergeApplicationDefinition($mergeArgs = true)
+    public function mergeApplicationDefinition(bool $mergeArgs = true): void
     {
         parent::mergeApplicationDefinition($mergeArgs);
 
diff --git a/Library/Console/Command/BuildCommand.php b/Library/Console/Command/BuildCommand.php
index 9e2740d655..6d45ca491c 100644
--- a/Library/Console/Command/BuildCommand.php
+++ b/Library/Console/Command/BuildCommand.php
@@ -21,8 +21,6 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
- * Build Command
- *
  * Generates/Compiles/Installs a Zephir extension.
  */
 final class BuildCommand extends AbstractCommand
diff --git a/Library/Console/Command/CleanCommand.php b/Library/Console/Command/CleanCommand.php
index b620c1d3ad..070f601ab5 100644
--- a/Library/Console/Command/CleanCommand.php
+++ b/Library/Console/Command/CleanCommand.php
@@ -22,8 +22,6 @@
 use function Zephir\is_windows;
 
 /**
- * Zephir\Console\Command\CleanCommand.
- *
  * Cleans any object files created by the extension.
  */
 final class CleanCommand extends AbstractCommand
diff --git a/Library/Console/Command/CompileCommand.php b/Library/Console/Command/CompileCommand.php
index fc82d98caa..c53372f917 100644
--- a/Library/Console/Command/CompileCommand.php
+++ b/Library/Console/Command/CompileCommand.php
@@ -22,8 +22,6 @@
 use Zephir\Exception\CompilerException;
 
 /**
- * Compile Command
- *
  * Compile a Zephir extension.
  */
 final class CompileCommand extends AbstractCommand
@@ -52,7 +50,7 @@ protected function configure()
             ->setHelp($this->getDevelopmentModeHelp().PHP_EOL.$this->getZflagsHelp());
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
diff --git a/Library/Detectors/WriteDetector.php b/Library/Detectors/WriteDetector.php
index a16cf941ef..2bebfdc0bb 100644
--- a/Library/Detectors/WriteDetector.php
+++ b/Library/Detectors/WriteDetector.php
@@ -32,9 +32,9 @@ class WriteDetector
 
     public const DETECT_ALL = 255;
 
-    protected $detectionFlags = 0;
+    protected int $detectionFlags = 0;
 
-    protected $mutations = [];
+    protected array $mutations = [];
 
     /**
      * Do the detection pass on a single variable.
@@ -44,7 +44,7 @@ class WriteDetector
      *
      * @return bool
      */
-    public function detect($variable, array $statements)
+    public function detect(string $variable, array $statements)
     {
         $this->passStatementBlock($statements);
 
@@ -56,7 +56,7 @@ public function detect($variable, array $statements)
      *
      * @param int $flags
      */
-    public function setDetectionFlags($flags)
+    public function setDetectionFlags(int $flags): void
     {
         $this->detectionFlags = $flags;
     }
@@ -68,7 +68,7 @@ public function setDetectionFlags($flags)
      *
      * @return WriteDetector
      */
-    public function increaseMutations($variable): self
+    public function increaseMutations(string $variable): self
     {
         if (isset($this->mutations[$variable])) {
             ++$this->mutations[$variable];
@@ -86,7 +86,7 @@ public function increaseMutations($variable): self
      *
      * @return int
      */
-    public function getNumberOfMutations($variable)
+    public function getNumberOfMutations(string $variable): int
     {
         if (isset($this->mutations[$variable])) {
             return $this->mutations[$variable];
@@ -100,7 +100,7 @@ public function getNumberOfMutations($variable)
      *
      * @param array $statement
      */
-    public function passLetStatement(array $statement)
+    public function passLetStatement(array $statement): void
     {
         foreach ($statement['assignments'] as $assignment) {
             if (isset($assignment['expr'])) {
@@ -142,7 +142,7 @@ public function passCall(array $expression)
      *
      * @param array $expression
      */
-    public function passArray(array $expression)
+    public function passArray(array $expression): void
     {
         foreach ($expression['left'] as $item) {
             $usePass = self::DETECT_ARRAY_USE == ($this->detectionFlags & self::DETECT_ARRAY_USE);
@@ -202,7 +202,7 @@ public function declareVariables(array $statement): void
      *
      * @param array $expression
      */
-    public function passExpression(array $expression)
+    public function passExpression(array $expression): void
     {
         switch ($expression['type']) {
             case 'bool':
diff --git a/Library/Documentation.php b/Library/Documentation.php
index 416f83b712..44691f507c 100644
--- a/Library/Documentation.php
+++ b/Library/Documentation.php
@@ -132,7 +132,7 @@ public function findThemePathByName($name)
 
         foreach ($this->themesDirectories as $themeDir) {
             $path = rtrim($themeDir, '\\/').\DIRECTORY_SEPARATOR.$name;
-            if (0 !== strpos($path, 'phar://')) {
+            if (!str_starts_with($path, 'phar://')) {
                 $path = realpath($path);
             }
 
@@ -151,7 +151,7 @@ public function build()
     {
         foreach ($this->classes as $class) {
             // class files (class/ns1/n2/class.html)
-            $cfile = new File\ClassFile($this->config, $class);
+            $cfile = new File\ClassFile($class);
             $this->theme->drawFile($cfile);
 
             // class source file (source/ns1/n2/class.html)
@@ -160,7 +160,7 @@ public function build()
         }
 
         // classes file (classes.html)
-        $file = new File\ClassesFile($this->config, $this->classes);
+        $file = new File\ClassesFile($this->classes);
         $this->theme->drawFile($file);
 
         $namespaceAccessor = new NamespaceAccessor($this->classes);
diff --git a/Library/Documentation/File/ClassFile.php b/Library/Documentation/File/ClassFile.php
index 5c47251b95..8ec64417d4 100644
--- a/Library/Documentation/File/ClassFile.php
+++ b/Library/Documentation/File/ClassFile.php
@@ -18,37 +18,18 @@
 
 class ClassFile implements FileInterface
 {
-    /**
-     * @var ClassDefinition
-     */
-    protected $class;
+    protected ClassDefinition $class;
 
-    /**
-     * @var CompilerFile
-     */
-    protected $compilerFile;
-
-    public function __construct($config, CompilerFile $class)
+    public function __construct(protected CompilerFile $compilerFile)
     {
-        $this->compilerFile = $class;
-        $this->class = $class->getClassDefinition();
+        $this->class = $compilerFile->getClassDefinition();
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getTemplateName(): string
     {
         return 'class.phtml';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return array
-     */
     public function getData(): array
     {
         $nsPieces = explode('\\', $this->class->getNamespace());
@@ -75,11 +56,6 @@ public function getData(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getOutputFile(): string
     {
         return Documentation::classUrl($this->class);
diff --git a/Library/Documentation/File/ClassesFile.php b/Library/Documentation/File/ClassesFile.php
index 4035b1dfe5..56ec601f94 100644
--- a/Library/Documentation/File/ClassesFile.php
+++ b/Library/Documentation/File/ClassesFile.php
@@ -16,31 +16,15 @@
 
 class ClassesFile implements FileInterface
 {
-    /**
-     * @var ClassDefinition
-     */
-    protected $classes;
-
-    public function __construct($config, $classList)
+    public function __construct(protected ClassDefinition $classes)
     {
-        $this->classes = $classList;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getTemplateName(): string
     {
         return 'classes.phtml';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return array
-     */
     public function getData(): array
     {
         return [
@@ -48,11 +32,6 @@ public function getData(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getOutputFile(): string
     {
         return 'classes.html';
diff --git a/Library/EventListener/ConsoleErrorListener.php b/Library/EventListener/ConsoleErrorListener.php
index 7c1d56acae..39a5e7841f 100644
--- a/Library/EventListener/ConsoleErrorListener.php
+++ b/Library/EventListener/ConsoleErrorListener.php
@@ -25,14 +25,13 @@ public function onCommandError(ConsoleErrorEvent $event): void
             return;
         }
 
-        $exitCode = $event->getExitCode();
         $throwable = $event->getError();
 
         $event->setError(
             new CompilerException(
                 $event->getError()->getMessage(),
                 $throwable instanceof ExceptionInterface ? $throwable->getExtra() : null,
-                $exitCode,
+                $event->getExitCode(),
                 $event->getError()
             )
         );
diff --git a/Library/Expression.php b/Library/Expression.php
index 8199d1816c..6237876872 100644
--- a/Library/Expression.php
+++ b/Library/Expression.php
@@ -470,7 +470,7 @@ public function compile(CompilationContext $compilationContext): CompiledExpress
                 $expr->setExpectReturn($this->expecting, $this->expectingVariable);
                 $resolved = $expr->compile($compilationContext);
                 if (($compilationContext->codePrinter->getNumberPrints() - $numberPrints) <= 1) {
-                    if (false !== strpos($resolved->getCode(), ' ')) {
+                    if (str_contains($resolved->getCode(), ' ')) {
                         return new CompiledExpression($resolved->getType(), '('.$resolved->getCode().')', $expression);
                     }
                 }
diff --git a/Library/FunctionLike/ReturnType/CastHint.php b/Library/FunctionLike/ReturnType/CastHint.php
index a321b3e823..1f036beb6f 100644
--- a/Library/FunctionLike/ReturnType/CastHint.php
+++ b/Library/FunctionLike/ReturnType/CastHint.php
@@ -13,100 +13,41 @@
 
 final class CastHint implements TypeInterface
 {
-    /**
-     * @var string
-     */
-    private $dataType;
-
-    /**
-     * @var string
-     */
-    private $value;
-
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * @var bool
-     */
-    private $collection;
-
-    /**
-     * Real return type constructor.
-     *
-     * @param string      $dataType
-     * @param string|null $value
-     * @param string|null $type
-     * @param int|bool    $collection
-     */
-    public function __construct($dataType, $value, $type = null, $collection = false)
-    {
-        $this->dataType = $dataType;
-        $this->value = $value;
+    public function __construct(
+        private string $dataType,
+        private ?string $value = null,
+        private ?string $type = null,
+        private bool $collection = false
+    ) {
         $this->type = $type ?: TypeInterface::TYPE_PARAMETER;
-        $this->collection = (bool) $collection;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getDataType()
+    public function getDataType(): string
     {
         return $this->dataType;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string|null
-     */
-    public function getValue()
+    public function getValue(): ?string
     {
         return $this->value;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * The cast hint is always not mandatory.
-     *
-     * @return mixed
-     */
-    public function isMandatory()
+    public function isMandatory(): bool
     {
         return false;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function isCollection()
+    public function isCollection(): bool
     {
         return $this->collection;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function isRealType()
+    public function isRealType(): bool
     {
         return false;
     }
diff --git a/Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php b/Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php
index 8ddf7435f2..6d6680efd0 100644
--- a/Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php
+++ b/Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php
@@ -16,17 +16,10 @@
 
 final class ArrayCompatible extends ReturnType\CompositeSpecification
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
+    public function isSatisfiedBy(ReturnType\TypeInterface $type): bool
     {
         if ($type->isRealType()) {
-            return Types::T_ARRAY == $type->getDataType();
+            return Types::T_ARRAY === $type->getDataType();
         }
 
         return $type->isCollection();
diff --git a/Library/FunctionLike/ReturnType/Specification/IntCompatible.php b/Library/FunctionLike/ReturnType/Specification/IntCompatible.php
index 2828284c74..dff00ba38d 100644
--- a/Library/FunctionLike/ReturnType/Specification/IntCompatible.php
+++ b/Library/FunctionLike/ReturnType/Specification/IntCompatible.php
@@ -16,29 +16,15 @@
 
 final class IntCompatible extends ReturnType\CompositeSpecification
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
+    public function isSatisfiedBy(ReturnType\TypeInterface $type): bool
     {
-        if (false == $type->isRealType()) {
+        if (!$type->isRealType()) {
             return false;
         }
 
-        switch ($type->getDataType()) {
-            case Types::T_INT:
-            case Types::T_UINT:
-            case Types::T_CHAR:
-            case Types::T_UCHAR:
-            case Types::T_LONG:
-            case Types::T_ULONG:
-                return true;
-            default:
-                return false;
-        }
+        return match ($type->getDataType()) {
+            Types::T_INT, Types::T_UINT, Types::T_CHAR, Types::T_UCHAR, Types::T_LONG, Types::T_ULONG => true,
+            default => false,
+        };
     }
 }
diff --git a/Library/FunctionLike/ReturnType/TypeInterface.php b/Library/FunctionLike/ReturnType/TypeInterface.php
index a4c849247b..d06fbce8c5 100644
--- a/Library/FunctionLike/ReturnType/TypeInterface.php
+++ b/Library/FunctionLike/ReturnType/TypeInterface.php
@@ -34,7 +34,7 @@ public function getType();
     public function getDataType();
 
     /**
-     * Gets casted return type.
+     * Gets cast return type.
      *
      * @return string|null
      */
diff --git a/Library/Logger/Formatter/CompilerFormatter.php b/Library/Logger/Formatter/CompilerFormatter.php
index edb940f9bc..f8d5fe3374 100644
--- a/Library/Logger/Formatter/CompilerFormatter.php
+++ b/Library/Logger/Formatter/CompilerFormatter.php
@@ -119,7 +119,7 @@ private function replacePlaceholders(array $vars, $output)
             $placeholder = '%'.$var.'%';
             $realValue = $this->stringify($val);
 
-            if (false === strpos($output, $placeholder)) {
+            if (!str_contains($output, $placeholder)) {
                 continue;
             }
 
@@ -148,7 +148,7 @@ private function replacePlaceholders(array $vars, $output)
      */
     private function cleanExtraPlaceholders(string $output): string
     {
-        if (false !== strpos($output, '%')) {
+        if (str_contains($output, '%')) {
             $output = preg_replace('/%(?:extra|context)\..+?%/', '', $output);
             $output = preg_replace('/ %type%\n/', "\n", $output);
             $output = preg_replace('/on line %line%/', '', $output);
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index d840a8ffec..66ae65c099 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -37,10 +37,13 @@ class MethodCall extends Call
     /**
      * Compiles a method call.
      *
-     * @param Expression         $expr
+     * @param Expression $expr
      * @param CompilationContext $compilationContext
+     * @return mixed|CompiledExpression
+     * @throws Exception
+     * @throws \ReflectionException
      */
-    public function compile(Expression $expr, CompilationContext $compilationContext)
+    public function compile(Expression $expr, CompilationContext $compilationContext): mixed
     {
         $expression = $expr->getExpression();
 
diff --git a/Library/Parser/Manager.php b/Library/Parser/Manager.php
index 8d746db18a..70cf7160cf 100644
--- a/Library/Parser/Manager.php
+++ b/Library/Parser/Manager.php
@@ -13,32 +13,14 @@
 
 class Manager
 {
-    const MINIMUM_PARSER_VERSION = '1.5.0';
-    const PARSER_HOME_PAGE = 'https://github.com/zephir-lang/php-zephir-parser';
+    public const MINIMUM_PARSER_VERSION = '1.5.0';
+    public const PARSER_HOME_PAGE = 'https://github.com/zephir-lang/php-zephir-parser';
 
-    /**
-     * Zephir Parser.
-     *
-     * @var Parser
-     */
-    protected $parser;
-
-    /**
-     * Manager constructor.
-     *
-     * @param Parser $parser The Zephir Parser
-     */
-    public function __construct(Parser $parser)
+    public function __construct(protected Parser $parser)
     {
-        $this->parser = $parser;
     }
 
-    /**
-     * Get Zephir Parser.
-     *
-     * @return Parser
-     */
-    public function getParser()
+    public function getParser(): Parser
     {
         return $this->parser;
     }
@@ -48,21 +30,13 @@ public function getParser()
      *
      * @return bool
      */
-    public function isAvailable()
+    public function isAvailable(): bool
     {
         return $this->parser->isAvailable() &&
             version_compare(self::MINIMUM_PARSER_VERSION, $this->parser->getVersion(), '<=');
     }
 
-    /**
-     * @return string|null
-     */
-    public function getParserVersion()
-    {
-        return $this->parser->getVersion();
-    }
-
-    public function requirements()
+    public function requirements(): string
     {
         $template = <<<EOF
 
diff --git a/Library/Passes/LocalContextPass.php b/Library/Passes/LocalContextPass.php
index 206c4e3d18..3817f1e606 100644
--- a/Library/Passes/LocalContextPass.php
+++ b/Library/Passes/LocalContextPass.php
@@ -28,15 +28,15 @@
  */
 class LocalContextPass
 {
-    protected $variables = [];
+    protected array $variables = [];
 
-    protected $mutations = [];
+    protected array $mutations = [];
 
-    protected $uses = [];
+    protected array $uses = [];
 
-    protected $lastCallLine = false;
+    protected bool $lastCallLine = false;
 
-    protected $lastUnsetLine = false;
+    protected bool $lastUnsetLine = false;
 
     /**
      * Do the compilation pass.
diff --git a/Library/Passes/LoopBreakPass.php b/Library/Passes/LoopBreakPass.php
index 99528b4b74..e700f682cf 100644
--- a/Library/Passes/LoopBreakPass.php
+++ b/Library/Passes/LoopBreakPass.php
@@ -14,26 +14,24 @@
 use Zephir\StatementsBlock;
 
 /**
- * LoopBreakPass.
- *
  * This pass checks if the statement block related to a 'loop' loop has at least a 'break'
  * statement disallowing full infinite loops
  */
 class LoopBreakPass
 {
-    protected $hasBreak = false;
+    protected bool $hasBreak = false;
 
     /**
      * Do the compilation pass.
      *
      * @param StatementsBlock $block
      */
-    public function pass(StatementsBlock $block)
+    public function pass(StatementsBlock $block): void
     {
         $this->passStatementBlock($block->getStatements());
     }
 
-    public function passStatementBlock(array $statements)
+    public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
             switch ($statement['type']) {
@@ -55,7 +53,7 @@ public function passStatementBlock(array $statements)
         }
     }
 
-    public function hasBreak()
+    public function hasBreak(): bool
     {
         return $this->hasBreak;
     }
diff --git a/Library/Passes/MutateGathererPass.php b/Library/Passes/MutateGathererPass.php
index e7cdc4a212..7ac8c3af09 100644
--- a/Library/Passes/MutateGathererPass.php
+++ b/Library/Passes/MutateGathererPass.php
@@ -14,28 +14,26 @@
 use Zephir\StatementsBlock;
 
 /**
- * MutateGathererPass.
- *
  * Counts variables mutated inside a specific statement block
  * Non-mutated variables can be promoted to use an inline cache
  */
 class MutateGathererPass
 {
-    protected $variables = [];
+    protected array $variables = [];
 
-    protected $mutations = [];
+    protected array $mutations = [];
 
     /**
      * Do the compilation pass.
      *
      * @param StatementsBlock $block
      */
-    public function pass(StatementsBlock $block)
+    public function pass(StatementsBlock $block): void
     {
         $this->passStatementBlock($block->getStatements());
     }
 
-    public function declareVariables(array $statement)
+    public function declareVariables(array $statement): void
     {
         foreach ($statement['variables'] as $variable) {
             if (!isset($this->variables[$variable['variable']])) {
@@ -51,7 +49,7 @@ public function declareVariables(array $statement)
      *
      * @return MutateGathererPass
      */
-    public function increaseMutations($variable)
+    public function increaseMutations(string $variable): static
     {
         if (isset($this->mutations[$variable])) {
             ++$this->mutations[$variable];
@@ -62,28 +60,12 @@ public function increaseMutations($variable)
         return $this;
     }
 
-    /**
-     * Returns the number of assignment instructions that mutated a variable.
-     *
-     * @param string $variable
-     *
-     * @return int
-     */
-    public function getNumberOfMutations($variable)
-    {
-        if (isset($this->mutations[$variable])) {
-            return $this->mutations[$variable];
-        }
-
-        return 0;
-    }
-
     /**
      * Pass let statements.
      *
      * @param array $statement
      */
-    public function passLetStatement(array $statement)
+    public function passLetStatement(array $statement): void
     {
         foreach ($statement['assignments'] as $assignment) {
             if (isset($assignment['expr'])) {
@@ -98,7 +80,7 @@ public function passLetStatement(array $statement)
      *
      * @param array $expression
      */
-    public function passCall(array $expression)
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -116,7 +98,7 @@ public function passCall(array $expression)
      *
      * @param array $expression
      */
-    public function passArray(array $expression)
+    public function passArray(array $expression): void
     {
         foreach ($expression['left'] as $item) {
             if ('variable' != $item['value']['type']) {
@@ -130,7 +112,7 @@ public function passArray(array $expression)
      *
      * @param array $expression
      */
-    public function passNew(array $expression)
+    public function passNew(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -146,7 +128,7 @@ public function passNew(array $expression)
      *
      * @param array $expression
      */
-    public function passExpression(array $expression)
+    public function passExpression(array $expression): void
     {
         switch ($expression['type']) {
             case 'bool':
@@ -197,6 +179,13 @@ public function passExpression(array $expression)
                 break;
 
             case 'typeof':
+            case 'minus':
+            case 'list':
+            case 'array-access':
+            case 'static-property-access':
+            case 'property-string-access':
+            case 'property-dynamic-access':
+            case 'property-access':
             case 'not':
                 $this->passExpression($expression['left']);
                 break;
@@ -215,14 +204,6 @@ public function passExpression(array $expression)
                 $this->passNew($expression);
                 break;
 
-            case 'property-access':
-            case 'property-dynamic-access':
-            case 'property-string-access':
-            case 'static-property-access':
-            case 'array-access':
-                $this->passExpression($expression['left']);
-                break;
-
             case 'isset':
             case 'empty':
             case 'instanceof':
@@ -241,14 +222,6 @@ public function passExpression(array $expression)
                 $this->passExpression($expression['right']);
                 break;
 
-            case 'minus':
-                $this->passExpression($expression['left']);
-                break;
-
-            case 'list':
-                $this->passExpression($expression['left']);
-                break;
-
             case 'cast':
             case 'type-hint':
                 $this->passExpression($expression['right']);
@@ -265,7 +238,7 @@ public function passExpression(array $expression)
      *
      * @param array $statements
      */
-    public function passStatementBlock(array $statements)
+    public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
             switch ($statement['type']) {
@@ -341,6 +314,7 @@ public function passStatementBlock(array $statements)
                     }
                     break;
 
+                case 'throw':
                 case 'return':
                     if (isset($statement['expr'])) {
                         $this->passExpression($statement['expr']);
@@ -369,12 +343,6 @@ public function passStatementBlock(array $statements)
                     }
                     break;
 
-                case 'throw':
-                    if (isset($statement['expr'])) {
-                        $this->passExpression($statement['expr']);
-                    }
-                    break;
-
                 case 'fetch':
                     $this->passExpression($statement['expr']);
                     break;
diff --git a/Library/Passes/SkipVariantInit.php b/Library/Passes/SkipVariantInit.php
index e6ad7beb83..2843a5a5c0 100644
--- a/Library/Passes/SkipVariantInit.php
+++ b/Library/Passes/SkipVariantInit.php
@@ -13,27 +13,25 @@
 
 use Zephir\StatementsBlock;
 
+use function count;
+
 /**
- * SkipVariantInit.
- *
  * In 'if'/'else' statements sometimes dynamical variables are initialized in every branch
  * Same case in 'switch' statements
  */
 class SkipVariantInit
 {
-    protected $branches = [];
-
-    protected $variablesToSkip = [];
+    protected array $branches = [];
 
-    protected $ignoredVariables;
+    protected array $variablesToSkip = [];
 
     /**
      * Do the compilation pass.
      *
-     * @param int             $branchNumber
+     * @param int $branchNumber
      * @param StatementsBlock $block
      */
-    public function pass($branchNumber, StatementsBlock $block)
+    public function pass(int $branchNumber, StatementsBlock $block): void
     {
         $this->passStatementBlock($branchNumber, $block->getStatements());
         $this->branches[$branchNumber] = 0;
@@ -42,10 +40,10 @@ public function pass($branchNumber, StatementsBlock $block)
     /**
      * Check assignment types for possible skip.
      *
-     * @param int   $branchNumber
+     * @param int $branchNumber
      * @param array $statement
      */
-    public function passLetStatement($branchNumber, $statement)
+    public function passLetStatement(int $branchNumber, array $statement): void
     {
         foreach ($statement['assignments'] as $assignment) {
             if ('variable' == $assignment['assign-type']) {
@@ -68,17 +66,15 @@ public function passLetStatement($branchNumber, $statement)
         }
     }
 
-    public function passStatementBlock($branchNumber, array $statements)
+    public function passStatementBlock($branchNumber, array $statements): void
     {
         foreach ($statements as $statement) {
             if (!isset($statement['type'])) {
                 continue;
             }
 
-            switch ($statement['type']) {
-                case 'let':
-                    $this->passLetStatement($branchNumber, $statement);
-                    break;
+            if ($statement['type'] === 'let') {
+                $this->passLetStatement($branchNumber, $statement);
             }
         }
     }
@@ -88,11 +84,11 @@ public function passStatementBlock($branchNumber, array $statements)
      *
      * @return array
      */
-    public function getVariables()
+    public function getVariables(): array
     {
         $variableStats = [];
 
-        foreach ($this->variablesToSkip as $branchNumber => $variables) {
+        foreach ($this->variablesToSkip as $variables) {
             foreach ($variables as $variable => $one) {
                 if (!isset($variableStats[$variable])) {
                     $variableStats[$variable] = 1;
@@ -103,7 +99,7 @@ public function getVariables()
         }
 
         $variables = [];
-        $numberBranches = \count($this->branches);
+        $numberBranches = count($this->branches);
         foreach ($variableStats as $variable => $number) {
             if ($number == $numberBranches) {
                 $variables[] = $variable;
@@ -114,10 +110,10 @@ public function getVariables()
     }
 
     /**
-     * @param int   $branchNumber
+     * @param int $branchNumber
      * @param array $variablesToSkip
      */
-    public function setVariablesToSkip($branchNumber, $variablesToSkip)
+    public function setVariablesToSkip(int $branchNumber, array $variablesToSkip): void
     {
         $this->variablesToSkip[$branchNumber] = $variablesToSkip;
     }
diff --git a/Library/Statements/BreakStatement.php b/Library/Statements/BreakStatement.php
index 5876df9cc0..f0e0e3bbde 100644
--- a/Library/Statements/BreakStatement.php
+++ b/Library/Statements/BreakStatement.php
@@ -14,11 +14,6 @@
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
 
-/**
- * BreakStatement.
- *
- * Break statement
- */
 class BreakStatement extends StatementAbstract
 {
     /**
@@ -26,7 +21,7 @@ class BreakStatement extends StatementAbstract
      *
      * @throws CompilerException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         if ($compilationContext->insideCycle || $compilationContext->insideSwitch) {
             $compilationContext->codePrinter->output('break;');
diff --git a/Library/Statements/ContinueStatement.php b/Library/Statements/ContinueStatement.php
index dcccf2d09b..1313f57ecb 100644
--- a/Library/Statements/ContinueStatement.php
+++ b/Library/Statements/ContinueStatement.php
@@ -14,11 +14,6 @@
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
 
-/**
- * ContinueStatement.
- *
- * Continue statement
- */
 class ContinueStatement extends StatementAbstract
 {
     /**
@@ -26,7 +21,7 @@ class ContinueStatement extends StatementAbstract
      *
      * @throws CompilerException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         if ($compilationContext->insideCycle) {
             $compilationContext->codePrinter->output('continue;');
diff --git a/Library/Statements/DeclareStatement.php b/Library/Statements/DeclareStatement.php
index 6095d2ca86..61aabe1c58 100644
--- a/Library/Statements/DeclareStatement.php
+++ b/Library/Statements/DeclareStatement.php
@@ -16,8 +16,6 @@
 use Zephir\Expression\Builder\BuilderFactory;
 
 /**
- * DeclareStatement.
- *
  * This creates variables in the current symbol table
  */
 class DeclareStatement extends StatementAbstract
@@ -27,7 +25,7 @@ class DeclareStatement extends StatementAbstract
      *
      * @throws CompilerException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $statement = $this->statement;
 
@@ -46,11 +44,11 @@ public function compile(CompilationContext $compilationContext)
 
             $currentType = $statement['data-type'];
 
-            /*
+            /**
              * Replace original data type by the pre-processed infered type
              */
             if ($typeInference) {
-                if ('variable' == $currentType) {
+                if ('variable' === $currentType) {
                     $type = $typeInference->getInferedType($varName);
                     if (\is_string($type)) {
                         $currentType = $type;
@@ -76,19 +74,16 @@ public function compile(CompilationContext $compilationContext)
             $symbolVariable = $symbolTable->addVariable($currentType, $varName, $compilationContext);
             $varName = $symbolVariable->getName();
 
-            /*
+            /**
              * Set the node where the variable is declared
              */
             $symbolVariable->setOriginal($variable);
-
             $symbolVariable->setIsInitialized(true, $compilationContext);
-            //$symbolVariable->increaseMutates();
 
-            if ('variable' == $currentType) {
+            if ('variable' === $currentType) {
                 $symbolVariable->setMustInitNull(true);
                 $symbolVariable->setLocalOnly(false);
             }
-            //$symbolVariable->increaseVariantIfNull();
 
             if (isset($variable['expr'])) {
                 $builder = BuilderFactory::getInstance();
@@ -104,18 +99,4 @@ public function compile(CompilationContext $compilationContext)
             }
         }
     }
-
-    /**
-     * throw exception for invalid default type.
-     *
-     * @param $defaultType
-     * @param $dateType
-     * @param $variable
-     *
-     * @throws CompilerException
-     */
-    public static function invalidDefaultTypeException($defaultType, $dateType, $variable)
-    {
-        throw new CompilerException('Invalid default type: '.$defaultType.' for data type: '.$dateType, $variable);
-    }
 }
diff --git a/Library/Statements/DoWhileStatement.php b/Library/Statements/DoWhileStatement.php
index 1654a64be1..bf33f534d4 100644
--- a/Library/Statements/DoWhileStatement.php
+++ b/Library/Statements/DoWhileStatement.php
@@ -11,33 +11,35 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Optimizers\EvalExpression;
 use Zephir\StatementsBlock;
 
 /**
- * DoWhileStatement.
- *
  * DoWhile statement, the same as in PHP/C
  */
 class DoWhileStatement extends StatementAbstract
 {
     /**
      * @param CompilationContext $compilationContext
+     * @throws ReflectionException
+     * @throws Exception
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $exprRaw = $this->statement['expr'];
         $codePrinter = $compilationContext->codePrinter;
 
         $codePrinter->output('do {');
 
-        /*
+        /**
          * Variables are initialized in a different way inside cycle
          */
         ++$compilationContext->insideCycle;
 
-        /*
+        /**
          * Compile statements in the 'while' block
          */
         if (isset($this->statement['statements'])) {
@@ -46,16 +48,15 @@ public function compile(CompilationContext $compilationContext)
         }
 
         $compilationContext->codePrinter->increaseLevel();
-        $expr = new EvalExpression();
-        $condition = $expr->optimize($exprRaw, $compilationContext);
+        $condition = (new EvalExpression())->optimize($exprRaw, $compilationContext);
         $compilationContext->codePrinter->decreaseLevel();
 
-        /*
+        /**
          * Restore the cycle counter
          */
         --$compilationContext->insideCycle;
 
-        /*
+        /**
          * Compound conditions can be evaluated in a single line of the C-code
          */
         $codePrinter->output('} while ('.$condition.');');
diff --git a/Library/Statements/EchoStatement.php b/Library/Statements/EchoStatement.php
index 216efe6032..87f442fb8c 100644
--- a/Library/Statements/EchoStatement.php
+++ b/Library/Statements/EchoStatement.php
@@ -11,15 +11,15 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
 use function Zephir\add_slashes;
 
 /**
- * EchoStatement.
- *
  * Produce output according to the type
  */
 class EchoStatement extends StatementAbstract
@@ -27,9 +27,10 @@ class EchoStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
+     * @throws ReflectionException
+     * @throws Exception
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         foreach ($this->statement['expressions'] as $echoExpr) {
             $expr = new Expression($echoExpr);
diff --git a/Library/Statements/ForStatement.php b/Library/Statements/ForStatement.php
index f528947fbb..ecd1ab2bf2 100644
--- a/Library/Statements/ForStatement.php
+++ b/Library/Statements/ForStatement.php
@@ -11,8 +11,10 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Detectors\ForValueUseDetector;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
@@ -23,22 +25,19 @@
 
 use function Zephir\add_slashes;
 
-/**
- * ForStatement.
- *
- * For statement
- */
 class ForStatement extends StatementAbstract
 {
     /**
      * Compiles a for statement that use a 'range' as expression.
      *
-     * @param array              $exprRaw
+     * @param array $exprRaw
      * @param CompilationContext $compilationContext
      *
      * @return bool
+     * @throws ReflectionException
+     * @throws Exception
      */
-    public function compileRange($exprRaw, CompilationContext $compilationContext)
+    public function compileRange(array $exprRaw, CompilationContext $compilationContext): bool
     {
         if (!\count($exprRaw['parameters'])) {
             return false;
@@ -70,7 +69,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
         $codePrinter = $compilationContext->codePrinter;
         $exprBuilder = BuilderFactory::getInstance();
 
-        /*
+        /**
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
@@ -93,7 +92,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
             $tempVariable = $compilationContext->symbolTable->addTemp($rangeVariable->getType(), $compilationContext);
         }
 
-        /*
+        /**
          * Create a copy of the current value in the end of the range to avoid modify the range
          * inside the cycle
          */
@@ -122,7 +121,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
         $statement->compile($compilationContext);
 
         if ($this->statement['reverse']) {
-            /*
+            /**
              * Create an implicit 'let' operation for the initialize expression
              */
             $builderLet->setAssignments([$exprBuilder->operators()
@@ -136,7 +135,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
             ]);
             $statement = new LetStatement($builderLet->build());
         } else {
-            /*
+            /**
              * Create an implicit 'let' operation for the initialize expression
              */
             $builderLet->setAssignments([$exprBuilder->operators()
@@ -153,7 +152,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
 
         $statement->compile($compilationContext);
 
-        /*
+        /**
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
@@ -181,7 +180,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
         $codePrinter->output('if ('.$condition.') {');
         $codePrinter->increaseLevel();
 
-        /*
+        /**
          * Inside a cycle
          */
         ++$compilationContext->insideCycle;
@@ -286,11 +285,11 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
         $codePrinter->output("\t".$flagVariable->getName().' = 1;');
         $codePrinter->output('}');
 
-        /*
+        /**
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
-            /*
+            /**
              * Check for anonymous variables
              */
             if ('_' != $this->statement['key']) {
@@ -326,11 +325,11 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
             $statement->compile($compilationContext);
         }
 
-        /*
+        /**
          * Initialize 'value' variable
          */
         if (isset($this->statement['value'])) {
-            /*
+            /**
              * Check for anonymous variables
              */
             if ('_' != $this->statement['value']) {
@@ -368,7 +367,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
 
         $codePrinter->decreaseLevel();
 
-        /*
+        /**
          * Compile statements in the 'for' block
          */
         if (isset($this->statement['statements'])) {
@@ -381,32 +380,30 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
             $st->compile($compilationContext);
         }
 
-        /*
+        /**
          * Restore the cycle counter
          */
         --$compilationContext->insideCycle;
 
         $codePrinter->output('}');
-
         $codePrinter->decreaseLevel();
-
         $codePrinter->output('}');
     }
 
     /**
      * Compiles a 'for' statement that use an 'iterator' as expression.
      *
-     * @param array              $exprRaw
+     * @param array $exprRaw
      * @param CompilationContext $compilationContext
      *
      * @return bool
+     * @throws Exception
+     * @throws ReflectionException
      */
-    public function compileIterator(array $exprRaw, CompilationContext $compilationContext)
+    public function compileIterator(array $exprRaw, CompilationContext $compilationContext): bool
     {
         $iteratorVariable = $compilationContext->symbolTable->getTempVariableForWrite('zend_object_iterator', $compilationContext);
-
         $compilationContext->headersManager->add('kernel/iterator');
-
         $codePrinter = $compilationContext->codePrinter;
 
         /**
@@ -426,7 +423,7 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
                 break;
         }
 
-        /*
+        /**
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
@@ -448,7 +445,7 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
             $keyVariable->setDynamicTypes('undefined');
         }
 
-        /*
+        /**
          * Initialize 'value' variable
          */
         if (isset($this->statement['value'])) {
@@ -470,7 +467,7 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
             $variable->setDynamicTypes('undefined');
         }
 
-        /*
+        /**
          * Variables are initialized in a different way inside cycle
          */
         ++$compilationContext->insideCycle;
@@ -496,7 +493,7 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
             $codePrinter->decreaseLevel();
         }
 
-        /*
+        /**
          * Compile statements in the 'for' block
          */
         if (isset($this->statement['statements'])) {
@@ -509,7 +506,7 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
             $st->compile($compilationContext);
         }
 
-        /*
+        /**
          * Restore the cycle counter
          */
         --$compilationContext->insideCycle;
@@ -525,9 +522,11 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
      * - Every key must be an integer or compatible
      * - Every value must be a char/integer or compatible.
      *
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
-     * @param Variable           $exprVariable
+     * @param Variable $exprVariable
+     * @throws Exception
+     * @throws ReflectionException
      */
     public function compileStringTraverse($expression, CompilationContext $compilationContext, $exprVariable)
     {
@@ -692,13 +691,11 @@ public function compileHashTraverse($expression, CompilationContext $compilation
             $variable->setDynamicTypes('undefined');
         }
 
-        /*
+        /**
          * Variables are initialized in a different way inside cycle
          */
         ++$compilationContext->insideCycle;
 
-//         $compilationContext->headersManager->add('kernel/hash');
-
         $duplicateHash = '0';
         $duplicateKey = true;
 
@@ -717,7 +714,7 @@ public function compileHashTraverse($expression, CompilationContext $compilation
                 $duplicateHash = '1';
             }
 
-            /*
+            /**
              * Detect if the key is modified or passed to an external scope
              */
             if (isset($this->statement['key'])) {
@@ -741,7 +738,7 @@ public function compileHashTraverse($expression, CompilationContext $compilation
             $compilationContext
         );
 
-        /*
+        /**
          * Restore the cycle counter
          */
         --$compilationContext->insideCycle;
@@ -750,7 +747,8 @@ public function compileHashTraverse($expression, CompilationContext $compilation
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
+     * @throws Exception
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext)
     {
diff --git a/Library/Statements/LoopStatement.php b/Library/Statements/LoopStatement.php
index 525182745c..67dfda1526 100644
--- a/Library/Statements/LoopStatement.php
+++ b/Library/Statements/LoopStatement.php
@@ -13,13 +13,12 @@
 
 use Zephir\Branch;
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\LoopBreakPass;
 use Zephir\StatementsBlock;
 
 /**
- * LoopStatement.
- *
  * Loop statement, infinite loop
  */
 class LoopStatement extends StatementAbstract
@@ -27,18 +26,19 @@ class LoopStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
+     * @throws \ReflectionException
+     * @throws Exception
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $compilationContext->codePrinter->output('while (1) {');
 
-        /*
+        /**
          * Variables are initialized in a different way inside cycle
          */
         ++$compilationContext->insideCycle;
 
-        /*
+        /**
          * Compile statements in the 'loop' block
          */
         if (!isset($this->statement['statements'])) {
diff --git a/Library/StatementsBlock.php b/Library/StatementsBlock.php
index 5067263589..9722a40601 100644
--- a/Library/StatementsBlock.php
+++ b/Library/StatementsBlock.php
@@ -38,8 +38,6 @@
  */
 class StatementsBlock
 {
-    protected $statements;
-
     protected ?bool $unreachable = null;
 
     protected $debug = false;
@@ -53,15 +51,8 @@ class StatementsBlock
      */
     protected $lastStatement;
 
-    /**
-     * StatementsBlock constructor.
-     *
-     * @param array $statements
-     */
-    public function __construct(array $statements)
+    public function __construct(protected $statements)
     {
-        $this->statements = $statements;
-
         $debug = false;
         if (getenv('ZEPHIR_DEBUG')) {
             // Do not use this feature for typical use case.
@@ -80,13 +71,13 @@ public function __construct(array $statements)
     }
 
     /**
-     * Sets whether the statements blocks belongs to a loop.
+     * Sets whether the statements block belongs to a loop.
      *
      * @param bool $loop
      *
      * @return StatementsBlock
      */
-    public function isLoop($loop)
+    public function isLoop(bool $loop): static
     {
         $this->loop = $loop;
 
diff --git a/Library/StringsManager.php b/Library/StringsManager.php
index f94a7bbd2f..2e007e3965 100644
--- a/Library/StringsManager.php
+++ b/Library/StringsManager.php
@@ -34,7 +34,7 @@ abstract class StringsManager
      *
      * @param string $key
      */
-    public function addConcatKey(string $key)
+    public function addConcatKey(string $key): void
     {
         $this->concatKeys[$key] = true;
     }
@@ -45,14 +45,4 @@ public function addConcatKey(string $key)
      * @return void
      */
     abstract public function genConcatCode(): void;
-
-    /**
-     * Obtains the existing concatenation keys.
-     *
-     * @return array
-     */
-    public function getConcatKeys(): array
-    {
-        return $this->concatKeys;
-    }
 }
diff --git a/Library/Variable.php b/Library/Variable.php
index 95ce6e1c37..2e2227c8fc 100644
--- a/Library/Variable.php
+++ b/Library/Variable.php
@@ -148,7 +148,7 @@ class Variable implements TypeAwareInterface
      *
      * @var array
      */
-    protected $complexTypes = [
+    protected array $complexTypes = [
         'variable' => 1,
         'string' => 1,
         'array' => 1,

From 3cfc8519cd3ac19a1ff791150727b20696d7f4cc Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 29 Aug 2023 11:37:44 +0100
Subject: [PATCH 016/375] #2407 - Simplify condition

---
 tests/Extension/ExitDieTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Extension/ExitDieTest.php b/tests/Extension/ExitDieTest.php
index c704df77fc..fb5896289f 100644
--- a/tests/Extension/ExitDieTest.php
+++ b/tests/Extension/ExitDieTest.php
@@ -107,7 +107,7 @@ private function prepareOutput(array $output): string
             return '(empty output)';
         }
 
-        if (isset($output[0]) && !empty($output[0])) {
+        if (!empty($output[0])) {
             return $output[0];
         }
 

From fec8f761588721199e3aebc9659fd8cb23e17ad3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 11:05:37 +0100
Subject: [PATCH 017/375] #2407 - Simplify declaration

---
 Library/Backends/BackendFactory.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Library/Backends/BackendFactory.php b/Library/Backends/BackendFactory.php
index 837481a1bb..12c4b01518 100644
--- a/Library/Backends/BackendFactory.php
+++ b/Library/Backends/BackendFactory.php
@@ -51,8 +51,7 @@ public function createBackend()
      */
     private function resolveBackendClass(): string
     {
-        $parser = new ArgvInput();
-        $backend = $parser->getParameterOption('--backend', null);
+        $backend = (new ArgvInput())->getParameterOption('--backend', null);
 
         if (null === $backend) {
             // Do not use this feature for typical use case.

From 25ce077e2092666d9b5225295306bb31bda3a292 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 11:06:21 +0100
Subject: [PATCH 018/375] #2407 - Adjust definition

---
 Library/ClassProperty.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Library/ClassProperty.php b/Library/ClassProperty.php
index 039641043d..84f7c87dbe 100644
--- a/Library/ClassProperty.php
+++ b/Library/ClassProperty.php
@@ -30,8 +30,8 @@ public function __construct(
         protected array $visibility,
         protected string $name,
         protected ?array $defaultValue,
-        protected string $docBlock,
-        protected array $original,
+        protected ?string $docBlock = null,
+        protected ?array $original = null,
     ) {
         $this->checkVisibility($visibility, $name, $original);
 
@@ -96,13 +96,11 @@ public function getOriginal(): mixed
     /**
      * Checks for visibility congruence.
      *
-     * @param array  $visibility
+     * @param array $visibility
      * @param string $name
-     * @param array  $original
-     *
-     * @throws CompilerException
+     * @param array|null $original
      */
-    public function checkVisibility($visibility, $name, $original): void
+    public function checkVisibility(array $visibility, string $name, ?array $original = null): void
     {
         if (in_array('public', $visibility) && in_array('protected', $visibility)) {
             throw new CompilerException("Property '$name' cannot be 'public' and 'protected' at the same time", $original);
@@ -122,7 +120,7 @@ public function checkVisibility($visibility, $name, $original): void
      *
      * @return string
      */
-    public function getVisibilityAccessor()
+    public function getVisibilityAccessor(): string
     {
         $modifiers = [];
 
@@ -155,9 +153,9 @@ public function getVisibilityAccessor()
     /**
      * Returns the docblock related to the property.
      *
-     * @return string
+     * @return string|null
      */
-    public function getDocBlock(): string
+    public function getDocBlock(): ?string
     {
         return $this->docBlock;
     }
@@ -422,10 +420,10 @@ private function initializeArray(): void
         $parentClassDefinition = $classDefinition->getExtendsClassDefinition();
 
         if (!$this->isStatic()) {
-            $constructParentMethod = $parentClassDefinition ? $parentClassDefinition->getInitMethod() : null;
+            $constructParentMethod = $parentClassDefinition?->getInitMethod();
             $constructMethod = $classDefinition->getInitMethod();
         } else {
-            $constructParentMethod = $parentClassDefinition ? $parentClassDefinition->getStaticInitMethod() : null;
+            $constructParentMethod = $parentClassDefinition?->getStaticInitMethod();
             $constructMethod = $classDefinition->getStaticInitMethod();
         }
 

From 6af9e8a2e27997476c5ce39219f8d7301df6908f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 11:07:22 +0100
Subject: [PATCH 019/375] #2407 - Remove dead code

---
 Library/Statements/ForStatement.php | 10 ++++------
 tests/fixtures/exit.php             |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Library/Statements/ForStatement.php b/Library/Statements/ForStatement.php
index ecd1ab2bf2..e2639a38eb 100644
--- a/Library/Statements/ForStatement.php
+++ b/Library/Statements/ForStatement.php
@@ -388,6 +388,8 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
         $codePrinter->output('}');
         $codePrinter->decreaseLevel();
         $codePrinter->output('}');
+
+        return true;
     }
 
     /**
@@ -396,11 +398,11 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
      * @param array $exprRaw
      * @param CompilationContext $compilationContext
      *
-     * @return bool
+     * @return void
      * @throws Exception
      * @throws ReflectionException
      */
-    public function compileIterator(array $exprRaw, CompilationContext $compilationContext): bool
+    public function compileIterator(array $exprRaw, CompilationContext $compilationContext): void
     {
         $iteratorVariable = $compilationContext->symbolTable->getTempVariableForWrite('zend_object_iterator', $compilationContext);
         $compilationContext->headersManager->add('kernel/iterator');
@@ -418,10 +420,6 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
         }
 
         $exprVariable = $compilationContext->symbolTable->getVariableForRead($expression->getCode(), $compilationContext, $this->statement['expr']);
-        switch ($exprVariable->getType()) {
-            case 'variable':
-                break;
-        }
 
         /**
          * Initialize 'key' variable
diff --git a/tests/fixtures/exit.php b/tests/fixtures/exit.php
index 22bec8f9e5..58fd7d9493 100644
--- a/tests/fixtures/exit.php
+++ b/tests/fixtures/exit.php
@@ -8,6 +8,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+
 use Stub\ExitDie;
 
 if (!extension_loaded('stub')) {

From 03a167619d3042f84feb51267797c7edbed1c90c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 11:07:41 +0100
Subject: [PATCH 020/375] #2407 - Revert removed `getNumberOfMutations()`
 method

---
 Library/Passes/MutateGathererPass.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Library/Passes/MutateGathererPass.php b/Library/Passes/MutateGathererPass.php
index 7ac8c3af09..587f01e9c7 100644
--- a/Library/Passes/MutateGathererPass.php
+++ b/Library/Passes/MutateGathererPass.php
@@ -233,6 +233,18 @@ public function passExpression(array $expression): void
         }
     }
 
+    /**
+     * Returns the number of assignment instructions that mutated a variable.
+     *
+     * @param string $variable
+     *
+     * @return int
+     */
+    public function getNumberOfMutations(string $variable): int
+    {
+        return $this->mutations[$variable] ?? 0;
+    }
+
     /**
      * Pass statement block.
      *

From ed4ed64dfe8fc702521be91fab9ea387c0b6d643 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 11:45:35 +0100
Subject: [PATCH 021/375] #2407 - Remove all usages of `isZE3()` method

---
 Library/Backends/ZendEngine2/Backend.php      | 22 +++----------------
 Library/Backends/ZendEngine3/Backend.php      | 10 ---------
 Library/BaseBackend.php                       |  7 ------
 Library/Cache/StaticMethodCache.php           | 20 +++--------------
 Library/ClassDefinition.php                   | 12 ++++------
 Library/ClassMethod.php                       | 18 +++++----------
 Library/Compiler.php                          |  8 +++----
 Library/FunctionCall.php                      |  3 +--
 .../Operators/Other/InstanceOfOperator.php    |  2 +-
 Library/Statements/TryCatchStatement.php      |  6 +----
 10 files changed, 22 insertions(+), 86 deletions(-)

diff --git a/Library/Backends/ZendEngine2/Backend.php b/Library/Backends/ZendEngine2/Backend.php
index e317542532..57f83a765e 100644
--- a/Library/Backends/ZendEngine2/Backend.php
+++ b/Library/Backends/ZendEngine2/Backend.php
@@ -31,16 +31,6 @@ class Backend extends BaseBackend
 {
     protected $name = 'ZendEngine2';
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function isZE3()
-    {
-        return false;
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -963,12 +953,8 @@ public function checkStrictType($type, $var, CompilationContext $context)
                 $conditions[] = $cond.'IS_LONG';
                 break;
             case 'bool':
-                if (!$this->isZE3()) {
-                    $conditions[] = $cond.'IS_BOOL';
-                } else {
-                    $conditions[] = $cond.'IS_TRUE';
-                    $conditions[] = $cond.'IS_FALSE';
-                }
+                $conditions[] = $cond.'IS_TRUE';
+                $conditions[] = $cond.'IS_FALSE';
                 break;
             case 'double':
                 $conditions[] = $cond.'IS_DOUBLE';
@@ -1031,9 +1017,7 @@ public function checkStrictType($type, $var, CompilationContext $context)
                 $codePrinter->output('if (EXPECTED(Z_TYPE_P('.$parameterCode.') == IS_STRING)) {');
                 $codePrinter->increaseLevel();
                 $targetVar = $var['name'];
-                if ($this->isZE3()) {
-                    $targetVar = '&'.$targetVar;
-                }
+                $targetVar = '&'.$targetVar;
                 $codePrinter->output('zephir_get_strval('.$targetVar.', '.$var['name'].'_param);');
                 $codePrinter->decreaseLevel();
                 $codePrinter->output('} else {');
diff --git a/Library/Backends/ZendEngine3/Backend.php b/Library/Backends/ZendEngine3/Backend.php
index 61c53b8cea..6775f05fdc 100644
--- a/Library/Backends/ZendEngine3/Backend.php
+++ b/Library/Backends/ZendEngine3/Backend.php
@@ -31,16 +31,6 @@ class Backend extends BackendZendEngine2
 {
     protected $name = 'ZendEngine3';
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function isZE3()
-    {
-        return true;
-    }
-
     /**
      * {@inheritdoc}
      *
diff --git a/Library/BaseBackend.php b/Library/BaseBackend.php
index cebe1eba59..9a45e42db7 100644
--- a/Library/BaseBackend.php
+++ b/Library/BaseBackend.php
@@ -49,13 +49,6 @@ public function __construct(Config $config, $kernelsPath, $templatesPath)
         $this->templatesPath = $templatesPath;
     }
 
-    /**
-     * TODO: This should not be used, temporary (until its completely refactored).
-     *
-     * @return bool
-     */
-    abstract public function isZE3();
-
     public function getName()
     {
         return $this->name;
diff --git a/Library/Cache/StaticMethodCache.php b/Library/Cache/StaticMethodCache.php
index 6b88dc831a..bedc9de9fc 100644
--- a/Library/Cache/StaticMethodCache.php
+++ b/Library/Cache/StaticMethodCache.php
@@ -66,27 +66,13 @@ public function get(CompilationContext $compilationContext, $method, bool $allow
             }
         }
 
-        $mustBeCached = false;
-        if (!$compilationContext->insideCycle) {
-            if (!($method instanceof ReflectionMethod)) {
-                $classDefinition = $method->getClassDefinition();
-                if (!$classDefinition->isBundled() && $allowNtsCache) {
-                    $mustBeCached = !$compilationContext->backend->isZE3();
-                } else {
-                    if (!$method->isPrivate() && !$method->isFinal()) {
-                        return 'NULL, 0';
-                    }
-                }
-            } else {
-                if (!$method->isPrivate() && !$method->isFinal()) {
-                    return 'NULL, 0';
-                }
-            }
+        if (!$compilationContext->insideCycle && !$method->isPrivate() && !$method->isFinal()) {
+            return 'NULL, 0';
         }
 
         $functionCache = $compilationContext->symbolTable->getTempVariableForWrite('zephir_fcall_cache_entry', $compilationContext);
 
-        if ($method->isPrivate() || $method->isFinal() || $mustBeCached) {
+        if ($method->isPrivate() || $method->isFinal()) {
             $cacheSlot = SlotsCache::getMethodSlot($method);
         } else {
             $cacheSlot = '0';
diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php
index 4107d21c04..09521adbdf 100644
--- a/Library/ClassDefinition.php
+++ b/Library/ClassDefinition.php
@@ -1296,8 +1296,8 @@ public function compile(CompilationContext $compilationContext): void
                 $compilationContext
             );
 
-            $argInfo->setBooleanDefinition($this->compiler->backend->isZE3() ? '_IS_BOOL' : 'IS_BOOL');
-            $argInfo->setRichFormat($this->compiler->backend->isZE3());
+            $argInfo->setBooleanDefinition('_IS_BOOL');
+            $argInfo->setRichFormat(true);
 
             $argInfo->render();
         }
@@ -1314,9 +1314,7 @@ public function compile(CompilationContext $compilationContext): void
             foreach ($methods as $method) {
                 if (self::TYPE_CLASS === $this->getType()) {
                     if (!$method->isInternal()) {
-                        $richFormat = $this->compiler->backend->isZE3() &&
-                            $method->isReturnTypesHintDetermined() &&
-                            $method->areReturnTypesCompatible();
+                        $richFormat = $method->isReturnTypesHintDetermined() && $method->areReturnTypesCompatible();
 
                         if ($richFormat || $method->hasParameters()) {
                             $codePrinter->output(
@@ -1358,9 +1356,7 @@ public function compile(CompilationContext $compilationContext): void
                         }
                     }
                 } else {
-                    $richFormat = $this->compiler->backend->isZE3() &&
-                            $method->isReturnTypesHintDetermined() &&
-                            $method->areReturnTypesCompatible();
+                    $richFormat = $method->isReturnTypesHintDetermined() && $method->areReturnTypesCompatible();
 
                     if ($method->isStatic()) {
                         if ($richFormat || $method->hasParameters()) {
diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 6f55470ff9..4852563186 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -1690,19 +1690,15 @@ public function compile(CompilationContext $compilationContext): void
                         case 'mixed':
                             $symbol = $symbolTable->addVariable($parameter['data-type'], $parameter['name'], $compilationContext);
                             /* TODO: Move this to the respective backend, which requires refactoring how this works */
-                            if ($compilationContext->backend->isZE3()) {
-                                $symbol->setIsDoublePointer(true);
-                                $substituteVars[$parameter['name']] = $symbolTable->addVariable('variable', $parameter['name'].'_sub', $compilationContext);
-                            }
+                            $symbol->setIsDoublePointer(true);
+                            $substituteVars[$parameter['name']] = $symbolTable->addVariable('variable', $parameter['name'].'_sub', $compilationContext);
                             break;
 
                         default:
                             $symbol = $symbolTable->addVariable($parameter['data-type'], $parameter['name'], $compilationContext);
                             $symbolParam = $symbolTable->addVariable('variable', $parameter['name'].'_param', $compilationContext);
                             /* TODO: Move this to the respective backend, which requires refactoring how this works */
-                            if ($compilationContext->backend->isZE3()) {
-                                $symbolParam->setIsDoublePointer(true);
-                            }
+                            $symbolParam->setIsDoublePointer(true);
 
                             if ('string' == $parameter['data-type'] || 'array' == $parameter['data-type']) {
                                 $symbol->setMustInitNull(true);
@@ -1928,11 +1924,9 @@ public function compile(CompilationContext $compilationContext): void
                 $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
                 $initCode .= "\t".$compilationContext->backend->ifVariableValueUndefined($targetVar, $compilationContext, false, false).PHP_EOL;
 
-                if ($compilationContext->backend->isZE3()) {
-                    if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
-                        $substituteVar = $substituteVars[$parameter['name']];
-                        $initCode .= "\t\t".$targetVar->getName().' = &'.$substituteVar->getName().';'.PHP_EOL;
-                    }
+                if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
+                    $substituteVar = $substituteVars[$parameter['name']];
+                    $initCode .= "\t\t".$targetVar->getName().' = &'.$substituteVar->getName().';'.PHP_EOL;
                 }
                 $initCode .= $this->assignDefaultValue($parameter, $compilationContext);
 
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 5c8a23b1cc..1c4f125138 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -1884,17 +1884,15 @@ public function generateFunctionInformation(): array
 
             $headerPrinter->output('PHP_FUNCTION('.$funcName.');');
 
-            $argInfo->setBooleanDefinition($this->backend->isZE3() ? '_IS_BOOL' : 'IS_BOOL');
-            $argInfo->setRichFormat($this->backend->isZE3());
+            $argInfo->setBooleanDefinition('_IS_BOOL');
+            $argInfo->setRichFormat(true);
 
             $argInfo->render();
 
             /** Generate FE's */
             $paramData = 'NULL';
 
-            $richFormat = $this->backend->isZE3() &&
-                $func->isReturnTypesHintDetermined() &&
-                $func->areReturnTypesCompatible();
+            $richFormat = $func->isReturnTypesHintDetermined() && $func->areReturnTypesCompatible();
 
             if ($richFormat || $func->hasParameters()) {
                 $paramData = $argInfoName;
diff --git a/Library/FunctionCall.php b/Library/FunctionCall.php
index 5bd9eee123..61f418f23f 100644
--- a/Library/FunctionCall.php
+++ b/Library/FunctionCall.php
@@ -269,12 +269,11 @@ protected function markReferences(
             if ($numberParameters > 0) {
                 $n = 1;
                 $funcParameters = $reflector->getParameters();
-                $isZendEngine3 = $compilationContext->backend->isZE3();
                 foreach ($funcParameters as $parameter) {
                     if ($numberParameters >= $n) {
                         if ($parameter->isPassedByReference()) {
                             /* TODO hack, fix this better */
-                            if ($isZendEngine3 && '&' == $parameters[$n - 1][0]) {
+                            if ('&' === $parameters[$n - 1][0]) {
                                 $parameters[$n - 1] = substr($parameters[$n - 1], 1);
                             }
 
diff --git a/Library/Operators/Other/InstanceOfOperator.php b/Library/Operators/Other/InstanceOfOperator.php
index 1a7bc683e0..c124e1357e 100644
--- a/Library/Operators/Other/InstanceOfOperator.php
+++ b/Library/Operators/Other/InstanceOfOperator.php
@@ -131,7 +131,7 @@ private function prepareBackendSpecificCode($variable, CompilationContext $conte
     {
         return strtr('Z_STRVAL_P(:p:name), Z_STRLEN_P(:p:name)', [
             ':name' => $variable,
-            ':p' => $context->backend->isZE3() ? '&' : '',
+            ':p' => '&',
         ]);
     }
 }
diff --git a/Library/Statements/TryCatchStatement.php b/Library/Statements/TryCatchStatement.php
index 5625d05086..c2f5cf4f87 100644
--- a/Library/Statements/TryCatchStatement.php
+++ b/Library/Statements/TryCatchStatement.php
@@ -76,11 +76,7 @@ public function compile(CompilationContext $compilationContext)
                     $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $compilationContext);
                 }
 
-                if ($compilationContext->backend->isZE3()) {
-                    $assignExceptionVarStmt = $exprBuilder->statements()->rawC('ZEPHIR_CPY_WRT(&'.$variable->getName().', &'.$exc_var->getName().');');
-                } else {
-                    $assignExceptionVarStmt = $exprBuilder->statements()->rawC('ZEPHIR_CPY_WRT('.$variable->getName().', '.$exc_var->getName().');');
-                }
+                $assignExceptionVarStmt = $exprBuilder->statements()->rawC('ZEPHIR_CPY_WRT(&'.$variable->getName().', &'.$exc_var->getName().');');
 
                 /*
                  * TODO:, use a builder here

From e51d4043c51606bb39667a163b8bd62022ee9e79 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 13:49:50 +0100
Subject: [PATCH 022/375] #2407 - Merge Zend Engine Backends with it's kernels

---
 .php-cs-fixer.dist.php                        |    2 +-
 .../ZendEngine3 => Backend}/Backend.php       |  717 +++++++++-
 .../ZendEngine3 => Backend}/FcallManager.php  |    2 +-
 .../StringsManager.php                        |    5 +-
 .../VariablesManager.php                      |   25 +-
 Library/Backends/BackendFactory.php           |   78 --
 Library/Backends/ZendEngine2/Backend.php      | 1196 -----------------
 Library/BaseBackend.php                       |  345 -----
 Library/CompilationContext.php                |    5 +-
 Library/Compiler.php                          |   14 +-
 Library/Console/Command/ApiCommand.php        |    7 -
 Library/Console/Command/BuildCommand.php      |   14 +-
 Library/Console/Command/CompileCommand.php    |   12 +-
 Library/Console/Command/GenerateCommand.php   |   17 -
 Library/Console/Command/InitCommand.php       |   25 +-
 Library/Console/Command/StubsCommand.php      |   13 +-
 .../FunctionCall/StripcslashesOptimizer.php   |    6 +-
 .../FunctionCall/StripslashesOptimizer.php    |    6 +-
 {kernels/ZendEngine3 => kernel}/README.md     |    0
 {kernels/ZendEngine3 => kernel}/array.c       |    0
 {kernels/ZendEngine3 => kernel}/array.h       |    0
 {kernels/ZendEngine3 => kernel}/backtrace.c   |    0
 {kernels/ZendEngine3 => kernel}/backtrace.h   |    0
 {kernels/ZendEngine3 => kernel}/debug.c       |    0
 {kernels/ZendEngine3 => kernel}/debug.h       |    0
 {kernels/ZendEngine3 => kernel}/exception.c   |    0
 {kernels/ZendEngine3 => kernel}/exception.h   |    0
 {kernels/ZendEngine3 => kernel}/exit.c        |    0
 {kernels/ZendEngine3 => kernel}/exit.h        |    0
 {kernels/ZendEngine3 => kernel}/fcall.c       |    0
 {kernels/ZendEngine3 => kernel}/fcall.h       |    0
 {kernels/ZendEngine3 => kernel}/file.c        |    0
 {kernels/ZendEngine3 => kernel}/file.h        |    0
 {kernels/ZendEngine3 => kernel}/filter.c      |    0
 {kernels/ZendEngine3 => kernel}/filter.h      |    0
 {kernels/ZendEngine3 => kernel}/globals.h     |    0
 {kernels/ZendEngine3 => kernel}/iterator.c    |    0
 {kernels/ZendEngine3 => kernel}/iterator.h    |    0
 {kernels/ZendEngine3 => kernel}/main.c        |    0
 {kernels/ZendEngine3 => kernel}/main.h        |    0
 {kernels/ZendEngine3 => kernel}/math.c        |    0
 {kernels/ZendEngine3 => kernel}/math.h        |    0
 {kernels/ZendEngine3 => kernel}/memory.c      |    0
 {kernels/ZendEngine3 => kernel}/memory.h      |    0
 {kernels/ZendEngine3 => kernel}/object.c      |    0
 {kernels/ZendEngine3 => kernel}/object.h      |    0
 {kernels/ZendEngine3 => kernel}/operators.c   |    0
 {kernels/ZendEngine3 => kernel}/operators.h   |    0
 {kernels/ZendEngine3 => kernel}/require.c     |    0
 {kernels/ZendEngine3 => kernel}/require.h     |    0
 {kernels/ZendEngine3 => kernel}/string.c      |    0
 {kernels/ZendEngine3 => kernel}/string.h      |    0
 {kernels/ZendEngine3 => kernel}/time.c        |    0
 {kernels/ZendEngine3 => kernel}/time.h        |    0
 {kernels/ZendEngine3 => kernel}/variables.c   |    0
 {kernels/ZendEngine3 => kernel}/variables.h   |    0
 templates/{ZendEngine3 => engine}/clean       |    0
 templates/{ZendEngine3 => engine}/config.m4   |    0
 templates/{ZendEngine3 => engine}/config.w32  |    0
 templates/{ZendEngine3 => engine}/ext.h       |    0
 .../{ZendEngine3 => engine}/ext_config.h      |    0
 templates/{ZendEngine3 => engine}/install     |    0
 templates/{ZendEngine3 => engine}/php_ext.h   |    0
 .../{ZendEngine3 => engine}/php_project.h     |    0
 .../pkg-config-check.m4                       |    0
 .../{ZendEngine3 => engine}/pkg-config.m4     |    0
 templates/{ZendEngine3 => engine}/project.c   |    0
 templates/{ZendEngine3 => engine}/project.h   |    0
 .../Backends/ZendEngine3/BackendTest.php      |    2 +-
 .../CompilerFile/CheckDependenciesTest.php    |    4 +-
 tests/sharness/t0002-generate.sh              |    6 +-
 zephir                                        |    5 +-
 72 files changed, 714 insertions(+), 1792 deletions(-)
 rename Library/{Backends/ZendEngine3 => Backend}/Backend.php (59%)
 rename Library/{Backends/ZendEngine3 => Backend}/FcallManager.php (99%)
 rename Library/{Backends/ZendEngine3 => Backend}/StringsManager.php (98%)
 rename Library/{Backends/ZendEngine3 => Backend}/VariablesManager.php (89%)
 delete mode 100644 Library/Backends/BackendFactory.php
 delete mode 100644 Library/Backends/ZendEngine2/Backend.php
 delete mode 100644 Library/BaseBackend.php
 rename {kernels/ZendEngine3 => kernel}/README.md (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/array.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/array.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/backtrace.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/backtrace.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/debug.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/debug.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/exception.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/exception.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/exit.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/exit.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/fcall.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/fcall.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/file.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/file.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/filter.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/filter.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/globals.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/iterator.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/iterator.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/main.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/main.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/math.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/math.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/memory.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/memory.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/object.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/object.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/operators.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/operators.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/require.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/require.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/string.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/string.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/time.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/time.h (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/variables.c (100%)
 mode change 100755 => 100644
 rename {kernels/ZendEngine3 => kernel}/variables.h (100%)
 mode change 100755 => 100644
 rename templates/{ZendEngine3 => engine}/clean (100%)
 rename templates/{ZendEngine3 => engine}/config.m4 (100%)
 rename templates/{ZendEngine3 => engine}/config.w32 (100%)
 rename templates/{ZendEngine3 => engine}/ext.h (100%)
 rename templates/{ZendEngine3 => engine}/ext_config.h (100%)
 rename templates/{ZendEngine3 => engine}/install (100%)
 rename templates/{ZendEngine3 => engine}/php_ext.h (100%)
 rename templates/{ZendEngine3 => engine}/php_project.h (100%)
 rename templates/{ZendEngine3 => engine}/pkg-config-check.m4 (100%)
 rename templates/{ZendEngine3 => engine}/pkg-config.m4 (100%)
 rename templates/{ZendEngine3 => engine}/project.c (100%)
 rename templates/{ZendEngine3 => engine}/project.h (100%)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index d65f15480c..53e460990f 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -31,7 +31,7 @@
         'ext',
         'ide',
         'config/class-entries',
-        'templates/ZendEngine3',
+        'templates/engine',
         'templates/Api',
         'tests/ext-bootstrap',
         'tests/fixtures',
diff --git a/Library/Backends/ZendEngine3/Backend.php b/Library/Backend/Backend.php
similarity index 59%
rename from Library/Backends/ZendEngine3/Backend.php
rename to Library/Backend/Backend.php
index 6775f05fdc..45e2442e75 100644
--- a/Library/Backends/ZendEngine3/Backend.php
+++ b/Library/Backend/Backend.php
@@ -9,15 +9,16 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Zephir\Backends\ZendEngine3;
+namespace Zephir\Backend;
 
-use Zephir\Backends\ZendEngine2\Backend as BackendZendEngine2;
 use Zephir\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Compiler;
+use Zephir\Config;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Fcall\FcallManagerInterface;
 use Zephir\FunctionDefinition;
@@ -27,24 +28,99 @@
 
 use function Zephir\add_slashes;
 
-class Backend extends BackendZendEngine2
+class Backend
 {
-    protected $name = 'ZendEngine3';
+    protected FcallManagerInterface $fcallManager;
 
     /**
-     * {@inheritdoc}
+     * BaseBackend constructor.
+     *
+     * @param Config $config
+     * @param string $kernelsPath
+     * @param string $templatesPath
+     */
+    public function __construct(protected Config $config, protected string $kernelsPath, protected string $templatesPath)
+    {
+        $this->fcallManager = new FcallManager();
+    }
+
+    /**
+     * Resolves the path to the source kernel files of the backend.
      *
-     * @return FcallManagerInterface
+     * @return string
      */
-    public function getFcallManager()
+    public function getInternalKernelPath(): string
     {
-        if (!$this->fcallManager) {
-            $this->setFcallManager(new FcallManager());
+        return $this->kernelsPath;
+    }
+
+    /**
+     * Resolves the path to the source template file of the backend.
+     *
+     * @param string $filename
+     *
+     * @return string
+     */
+    public function getTemplateFileContents(string $filename): string
+    {
+        $templatePath = rtrim((string) $this->config->get('templatepath', 'backend'), '\\/');
+        if (empty($templatepath)) {
+            $templatePath = $this->templatesPath;
         }
 
+        return file_get_contents("$templatePath/engine/$filename");
+    }
+
+    public function getFcallManager(): FcallManagerInterface
+    {
         return $this->fcallManager;
     }
 
+    public function declareVariables($method, $typeToVariables, CompilationContext $compilationContext)
+    {
+        $varInitCode = [];
+        $additionalCode = $method ? $this->onPreInitVar($method, $compilationContext) : '';
+
+        foreach ($typeToVariables as $type => $variables) {
+            list($pointer, $code) = $this->getTypeDefinition($type);
+            $code .= ' ';
+            $groupVariables = [];
+
+            /**
+             * @var Variable[]
+             */
+            foreach ($variables as $variable) {
+                $nextCode = $this->generateInitCode($groupVariables, $type, $pointer, $variable);
+                if ($nextCode && $additionalCode) {
+                    $additionalCode .= PHP_EOL.$nextCode;
+                } else {
+                    $additionalCode .= $nextCode;
+                }
+            }
+
+            $varInitCode[] = $code.implode(', ', $groupVariables).';';
+        }
+
+        /* Keep order consistent with previous zephir versions (BC-only) */
+        $varInitCode = array_reverse($varInitCode);
+        if ($additionalCode) {
+            $varInitCode[] = $additionalCode;
+        }
+
+        return $varInitCode;
+    }
+
+    public function initVar(Variable $variable, CompilationContext $context, $useCodePrinter = true, $second = false): string
+    {
+        $macro = !$second ? 'ZEPHIR_INIT_VAR' : 'ZEPHIR_INIT_NVAR';
+        $code = $macro.'('.$this->getVariableCode($variable).');';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($code);
+        }
+
+        return $code;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -82,14 +158,6 @@ public function getBoolCode(Variable $variable, CompilationContext $context, $us
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getStringsManager()
-    {
-        return new StringsManager();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -277,17 +345,16 @@ public function onPreInitVar(ClassMethod $method, CompilationContext $context):
 
     public function onPreCompile(ClassMethod $method, CompilationContext $context)
     {
-        $codePrinter = $context->codePrinter;
-        /*
+        /**
          * Initialize the properties within create_object, handler code
          */
-        if (preg_match('/^zephir_init_properties/', $method->getName())) {
-            $codePrinter->increaseLevel();
-            $codePrinter->output('{');
-            $codePrinter->increaseLevel();
-            $codePrinter->output('zval local_this_ptr, *this_ptr = &local_this_ptr;');
-            $codePrinter->output('ZEPHIR_CREATE_OBJECT(this_ptr, class_type);');
-            $codePrinter->decreaseLevel();
+        if (str_starts_with($method->getName(), 'zephir_init_properties')) {
+            $context->codePrinter->increaseLevel();
+            $context->codePrinter->output('{');
+            $context->codePrinter->increaseLevel();
+            $context->codePrinter->output('zval local_this_ptr, *this_ptr = &local_this_ptr;');
+            $context->codePrinter->output('ZEPHIR_CREATE_OBJECT(this_ptr, class_type);');
+            $context->codePrinter->decreaseLevel();
         }
     }
 
@@ -567,6 +634,31 @@ public function returnString($value, CompilationContext $context, $useCodePrinte
         return $this->returnHelper('RETURN_MM_STRING', $value, $context, $useCodePrinter);
     }
 
+    public function assignLong(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
+    {
+        return $this->assignHelper('ZVAL_LONG', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
+    }
+
+    public function assignDouble(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
+    {
+        return $this->assignHelper('ZVAL_DOUBLE', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
+    }
+
+    public function assignBool(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
+    {
+        return $this->assignHelper('ZVAL_BOOL', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
+    }
+
+    public function assignNull(Variable $variable, CompilationContext $context, $useCodePrinter = true)
+    {
+        $output = 'ZVAL_NULL('.$this->getVariableCode($variable).');';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
+
+        return $output;
+    }
+
     public function createClosure(Variable $variable, $classDefinition, CompilationContext $context)
     {
         $symbol = $this->getVariableCode($variable);
@@ -672,7 +764,26 @@ public function arrayIsset(Variable $var, $resolvedExpr, $expression, Compilatio
             }
         }
 
-        return parent::arrayIsset($var, $resolvedExpr, $expression, $context);
+        return $this->arrayIsset2($var, $resolvedExpr, $expression, $context);
+    }
+
+    public function arrayIsset2(Variable $var, $resolvedExpr, $expression, CompilationContext $context)
+    {
+        if (!($resolvedExpr instanceof Variable)) {
+            if ('string' == $resolvedExpr->getType()) {
+                return new CompiledExpression('bool', 'zephir_array_isset_string('.$this->getVariableCode($var).', SS("'.$resolvedExpr->getCode().'"))', $expression);
+            } else {
+                return new CompiledExpression('bool', 'zephir_array_isset_long('.$this->getVariableCode($var).', '.$resolvedExpr->getCode().')', $expression);
+            }
+        }
+
+        if ('int' == $resolvedExpr->getType() || 'long' == $resolvedExpr->getType()) {
+            return new CompiledExpression('bool', 'zephir_array_isset_long('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
+        } elseif ('variable' == $resolvedExpr->getType() || 'string' == $resolvedExpr->getType() || 'mixed' === $resolvedExpr->getType()) {
+            return new CompiledExpression('bool', 'zephir_array_isset('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
+        }
+
+        throw new CompilerException('['.$resolvedExpr->getType().']', $expression);
     }
 
     public function arrayIssetFetch(Variable $target, Variable $var, $resolvedExpr, $flags, $expression, CompilationContext $context)
@@ -684,7 +795,30 @@ public function arrayIssetFetch(Variable $target, Variable $var, $resolvedExpr,
             }
         }
 
-        return parent::arrayIssetFetch($target, $var, $resolvedExpr, $flags, $expression, $context);
+        return $this->arrayIssetFetch2($target, $var, $resolvedExpr, $flags, $expression, $context);
+    }
+
+    public function arrayIssetFetch2(Variable $target, Variable $var, $resolvedExpr, $flags, $expression, CompilationContext $context)
+    {
+        $code = $this->getVariableCodePointer($target).', '.$this->getVariableCode($var);
+
+        if (!($resolvedExpr instanceof Variable)) {
+            if ('string' === $resolvedExpr->getType()) {
+                return new CompiledExpression('bool', 'zephir_array_isset_string_fetch('.$code.', SS("'.$resolvedExpr->getCode().'"), '.$flags.')', $expression);
+            } elseif (in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
+                return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$resolvedExpr->getCode().', '.$flags.')', $expression);
+            } else {
+                $resolvedExpr = $context->symbolTable->getVariableForRead($resolvedExpr->getCode(), $context);
+            }
+        }
+
+        if (in_array($resolvedExpr->getType(), ['int', 'long'])) {
+            return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
+        } elseif (in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
+            return new CompiledExpression('bool', 'zephir_array_isset_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
+        }
+
+        throw new CompilerException('arrayIssetFetch ['.$resolvedExpr->getType().']', $expression);
     }
 
     public function propertyIsset(Variable $var, $key, CompilationContext $context)
@@ -702,7 +836,48 @@ public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationCo
             return;
         }
 
-        parent::arrayUnset($variable, $exprIndex, $flags, $context);
+        $this->arrayUnset2($variable, $exprIndex, $flags, $context);
+    }
+
+    public function arrayUnset2(Variable $variable, $exprIndex, $flags, CompilationContext $context)
+    {
+        $context->headersManager->add('kernel/array');
+        $variableCode = $this->getVariableCodePointer($variable);
+        switch ($exprIndex->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $context->codePrinter->output('zephir_array_unset_long('.$variableCode.', '.$exprIndex->getCode().', '.$flags.');');
+                break;
+
+            case 'string':
+                $context->codePrinter->output('zephir_array_unset_string('.$variableCode.', SS("'.$exprIndex->getCode().'"), '.$flags.');');
+                break;
+
+            case 'variable':
+                $variableIndex = $context->symbolTable->getVariableForRead($exprIndex->getCode(), $context, $exprIndex->getOriginal());
+                $indexCode = $this->getVariableCode($variableIndex);
+                switch ($variableIndex->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                        $context->codePrinter->output('zephir_array_unset_long('.$variableCode.', '.$indexCode.', '.$flags.');');
+                        break;
+
+                    case 'string':
+                    case 'variable':
+                    case 'mixed':
+                        $context->codePrinter->output('zephir_array_unset('.$variableCode.', '.$indexCode.', '.$flags.');');
+                        break;
+
+                    default:
+                        throw new CompilerException('Variable type: '.$variableIndex->getType().' cannot be used as array index without cast');
+                }
+                break;
+
+            default:
+                throw new CompilerException('Cannot use expression: '.$exprIndex->getType().' as array index without cast');
+        }
     }
 
     public function fetchGlobal(Variable $globalVar, CompilationContext $compilationContext, $useCodePrinter = true)
@@ -781,13 +956,14 @@ public function fetchProperty(
     }
 
     /**
-     * @param Variable        $symbolVariable
+     * @param Variable $symbolVariable
      * @param ClassDefinition $classDefinition
      * @param $property
-     * @param bool               $readOnly
+     * @param bool $readOnly
      * @param CompilationContext $context
+     * @throws Exception
      */
-    public function fetchStaticProperty(Variable $symbolVariable, $classDefinition, $property, $readOnly, CompilationContext $context)
+    public function fetchStaticProperty(Variable $symbolVariable, $classDefinition, $property, $readOnly, CompilationContext $context): void
     {
         // TODO: maybe optimizations as well as above
         $context->codePrinter->output(
@@ -805,13 +981,12 @@ public function fetchStaticProperty(Variable $symbolVariable, $classDefinition,
     /**
      * @param $value
      * @param CompilationContext $context
-     * @param bool               $usePointer
      *
      * @throws CompilerException
      *
      * @return bool|string|Variable
      */
-    public function resolveValue($value, CompilationContext $context, $usePointer = false)
+    public function resolveValue($value, CompilationContext $context): Variable|bool|string
     {
         if ($value instanceof GlobalConstant) {
             switch ($value->getName()) {
@@ -825,9 +1000,7 @@ public function resolveValue($value, CompilationContext $context, $usePointer =
                     $value = 'false';
                     break;
                 default:
-                    throw new CompilerException(
-                        $this->name.': Unknown constant '.$value->getName()
-                    );
+                    throw new CompilerException('Unknown constant '.$value->getName());
             }
         }
 
@@ -904,26 +1077,26 @@ public function updateProperty(Variable $variable, $property, $value, Compilatio
         );
     }
 
-    public function updateStaticProperty($classEntry, $property, $value, CompilationContext $context)
+    public function updateStaticProperty($classEntry, $property, $value, CompilationContext $context): void
     {
         // TODO(serghei): Sort out as well as above
         $value = $this->resolveValue($value, $context);
         $context->codePrinter->output('zephir_update_static_property_ce('.$classEntry.', ZEND_STRL("'.$property.'"), '.$value.');');
     }
 
-    public function addStaticProperty($classEntry, $property, $value, CompilationContext $context)
+    public function addStaticProperty($classEntry, $property, $value, CompilationContext $context): void
     {
         $value = $this->resolveValue($value, $context);
         $context->codePrinter->output('zephir_add_static_property_ce('.$classEntry.', ZEND_STRL("'.$property.'"), '.$value.');');
     }
 
-    public function subStaticProperty($classEntry, $property, $value, CompilationContext $context)
+    public function subStaticProperty($classEntry, $property, $value, CompilationContext $context): void
     {
         $value = $this->resolveValue($value, $context);
         $context->codePrinter->output('zephir_sub_static_property_ce('.$classEntry.', ZEND_STRL("'.$property.'"), '.$value.');');
     }
 
-    public function assignArrayProperty(Variable $variable, $property, $key, $value, CompilationContext $context)
+    public function assignArrayProperty(Variable $variable, $property, $key, $value, CompilationContext $context): void
     {
         $resolveValue = $this->resolveValue($value, $context);
         if (isset($key)) {
@@ -953,13 +1126,6 @@ public function callMethod($symbolVariable, Variable $variable, $methodName, $ca
         }
     }
 
-    public function setSymbolIfSeparated(Variable $variableTempSeparated, Variable $variable, CompilationContext $context)
-    {
-        $context->codePrinter->output('if ('.$variableTempSeparated->getName().') {');
-        $context->codePrinter->output("\t".'ZEPHIR_SET_SYMBOL(&EG(symbol_table), "'.$variable->getName().'", &'.$variable->getName().');');
-        $context->codePrinter->output('}');
-    }
-
     public function copyOnWrite(Variable $target, $var, CompilationContext $context)
     {
         if ('EG(exception)' == $var) {
@@ -1143,7 +1309,7 @@ public function destroyIterator(Variable $iteratorVariable, CompilationContext $
     public function ifVariableValueUndefined(Variable $var, CompilationContext $context, $useBody = false, $useCodePrinter = true)
     {
         if ($var->isDoublePointer()) {
-            return parent::ifVariableValueUndefined($var, $context, $useBody, $useCodePrinter);
+            return $this->ifVariableValueUndefined2($var, $context, $useBody, $useCodePrinter);
         }
         $body = 'ZEPHIR_IS_EMPTY('.$this->getVariableCode($var).')';
         $output = 'if ('.$body.') {';
@@ -1154,6 +1320,17 @@ public function ifVariableValueUndefined(Variable $var, CompilationContext $cont
         return $useBody ? $body : $output;
     }
 
+    public function ifVariableValueUndefined2(Variable $var, CompilationContext $context, $onlyBody = false, $useCodePrinter = true)
+    {
+        $body = '!'.$var->getName();
+        $output = 'if ('.$body.') {';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
+
+        return $onlyBody ? $body : $output;
+    }
+
     public function fetchClassEntry($str)
     {
         return 'zephir_get_internal_ce(SL("'.$str.'"))';
@@ -1199,4 +1376,446 @@ public function initArray(Variable $variable, CompilationContext $context, ?int
 
         $context->codePrinter->output($output);
     }
+
+    public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context)
+    {
+        $variable = $this->getVariableCodePointer($variable);
+        $itemVariable = $this->getVariableCode($itemVariable);
+        $context->codePrinter->output('zephir_concat_self('.$variable.', '.$itemVariable.');');
+    }
+
+    public function updateArray(Variable $symbolVariable, $key, $value, CompilationContext $compilationContext, $flags = null)
+    {
+        $value = $this->resolveValue($value, $compilationContext, true);
+        if (!isset($flags)) {
+            $flags = 'PH_COPY';
+        }
+
+        if ($key instanceof Variable) {
+            switch ($key->getType()) {
+                case 'string':
+                case 'variable':
+                    $compilationContext->codePrinter->output('zephir_array_update_zval('.$this->getVariableCodePointer($symbolVariable).', '.$this->getVariableCode($key).', '.$value.', '.$flags.');');
+                    break;
+
+                case 'int':
+                case 'uint':
+                case 'long':
+                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCodePointer($symbolVariable).', '.$key->getName().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
+                    break;
+
+                default:
+                    throw new CompilerException('updateArray: Found a variable with unsupported type '.$key->getType());
+            }
+        } elseif ($key instanceof CompiledExpression) {
+            switch ($key->getType()) {
+                case 'string':
+                    $compilationContext->codePrinter->output('zephir_array_update_string('.$this->getVariableCodePointer($symbolVariable).', SL("'.$key->getCode().'"), '.$value.', '.$flags.');');
+                    break;
+
+                case 'int':
+                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCodePointer($symbolVariable).', '.$key->getCode().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
+                    break;
+
+                case 'variable':
+                    $this->updateArray($symbolVariable, $compilationContext->symbolTable->getVariableForRead($key->getCode()), $value, $compilationContext, $flags);
+                    break;
+
+                default:
+                    throw new CompilerException('updateArray: Found an expression with unsupported type '.$key->getType());
+            }
+        } else {
+            throw new CompilerException('?');
+        }
+    }
+
+    public function initObject(Variable $variable, $ce, CompilationContext $context, $useCodePrinter = true)
+    {
+        $variableAccess = $this->getVariableCode($variable);
+        if (!isset($ce)) {
+            $output = 'object_init('.$variableAccess.');';
+        } else {
+            $output = 'object_init_ex('.$variableAccess.', '.$ce.');';
+        }
+
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
+
+        return $output;
+    }
+
+    public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayAccess, CompilationContext $context, $useCodePrinter = true)
+    {
+        $context->headersManager->add('kernel/array');
+        $isVariable = $index instanceof Variable;
+
+        switch ($index->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $type = 'long';
+                break;
+
+            /* Types which map to the same */
+            case 'variable':
+            case 'mixed':
+            case 'string':
+                $type = $index->getType();
+                break;
+
+            default:
+                throw new CompilerException(
+                    sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
+                    $arrayAccess['right']
+                );
+        }
+        if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
+            $output = 'zephir_array_fetch('.$this->getVariableCodePointer($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
+        } else {
+            if ($isVariable) {
+                $indexAccess = $this->getVariableCode($index);
+            } else {
+                $indexAccess = $index->getCode();
+                if ('string' == $type) {
+                    $indexAccess = 'SL("'.$indexAccess.'")';
+                }
+            }
+            $output = 'zephir_array_fetch_'.$type.'('.$this->getVariableCodePointer($var).', '.$this->getVariableCode($src).', '.$indexAccess.', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
+        }
+
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
+
+        return $output;
+    }
+
+    public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExprs, CompilationContext $compilationContext)
+    {
+        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+
+        $symbol = $this->resolveValue($symbolVariable, $compilationContext, true);
+        $varCode = $this->getVariableCodePointer($variable);
+        $compilationContext->codePrinter->output(
+            sprintf(
+                'zephir_array_update_multi(%s, %s, SL("%s"), %d, %s);',
+                $varCode,
+                $symbol,
+                $keys,
+                $numberParams,
+                implode(', ', $offsetItems)
+            )
+        );
+    }
+
+    public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext)
+    {
+        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
+
+        $compilationContext->codePrinter->output(
+            sprintf(
+                'zephir_update_property_array_multi(%s, SL("%s"), %s, SL("%s"), %d, %s);',
+                $variable->getName(),
+                $propertyName,
+                $valueVariable,
+                $keys,
+                $numberParams,
+                implode(', ', $offsetItems)
+            )
+        );
+    }
+
+    public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext)
+    {
+        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
+
+        $offsetStr = $offsetItems ? ', '.implode(', ', $offsetItems) : '';
+        $compilationContext->codePrinter->output(
+            sprintf(
+                'zephir_update_static_property_array_multi_ce(%s, SL("%s"), %s, SL("%s"), %d%s);',
+                $classEntry,
+                $propertyName,
+                $valueVariable,
+                $keys,
+                $numberParams,
+                $offsetStr
+            )
+        );
+    }
+
+    public function checkConstructor(Variable $var, CompilationContext $context)
+    {
+        $context->codePrinter->output('if (zephir_has_constructor('.$this->getVariableCode($var).')) {');
+    }
+
+    public function callDynamicFunction($symbolVariable, Variable $variable, CompilationContext $context, $params = [], $cache = 'NULL', $cacheSlot = 0)
+    {
+        $paramStr = null != $params ? ', '.implode(', ', $params) : '';
+        if (!isset($symbolVariable)) {
+            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION(NULL, '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
+        } elseif ('return_value' == $symbolVariable->getName()) {
+            $context->codePrinter->output('ZEPHIR_RETURN_CALL_ZVAL_FUNCTION('.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
+        } else {
+            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION('.$this->getVariableCodePointer($symbolVariable).', '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
+        }
+    }
+
+    public function zvalOperator($zvalOperator, Variable $expected, Variable $variableLeft, Variable $variableRight, CompilationContext $compilationContext)
+    {
+        $expected = $this->getVariableCode($expected);
+        $op1 = $this->getVariableCode($variableLeft);
+        $op2 = $this->getVariableCode($variableRight);
+
+        $compilationContext->codePrinter->output($zvalOperator.'('.$expected.', '.$op1.', '.$op2.');');
+    }
+
+    public function checkStrictType($type, $var, CompilationContext $context)
+    {
+        $codePrinter = $context->codePrinter;
+        $conditions = [];
+
+        $inputParamVariable = $context->symbolTable->getVariableForWrite($var['name'], $context);
+        $inputParamCode = $this->getVariableCode($inputParamVariable);
+        $cond = 'Z_TYPE_P('.$inputParamCode.') != ';
+        if ($context->symbolTable->hasVariable($var['name'].'_param')) {
+            $parameterVariable = $context->symbolTable->getVariableForWrite($var['name'].'_param', $context);
+            $parameterCode = $context->backend->getVariableCode($parameterVariable);
+            $cond = 'Z_TYPE_P('.$parameterCode.') != ';
+        }
+
+        switch ($type) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $conditions[] = $cond.'IS_LONG';
+                break;
+            case 'bool':
+                $conditions[] = $cond.'IS_TRUE';
+                $conditions[] = $cond.'IS_FALSE';
+                break;
+            case 'double':
+                $conditions[] = $cond.'IS_DOUBLE';
+                break;
+            case 'string':
+            case 'ulong':
+                $conditions[] = $cond.'IS_STRING';
+                $conditions[] = $cond.'IS_NULL';
+                break;
+            case 'array':
+                break;
+            case 'object':
+            case 'resource':
+                $conditions[] = $cond.'IS_'.strtoupper($type);
+                break;
+            case 'callable':
+                $conditions[] = 'zephir_is_callable('.$inputParamCode.') != 1';
+                break;
+            default:
+                throw new CompilerException('Unknown type '.$type);
+        }
+
+        /* Generate verification code */
+        if (\count($conditions)) {
+            $codePrinter->output('if (UNEXPECTED('.implode(' && ', $conditions).')) {');
+            $codePrinter->increaseLevel();
+
+            $exceptionMessage = sprintf('SL("Parameter \'%s\' must be of the type %s")', $var['name'], $type);
+            $codePrinter->output(
+                sprintf(
+                    'zephir_throw_exception_string(spl_ce_InvalidArgumentException, %s);',
+                    $exceptionMessage
+                )
+            );
+
+            $codePrinter->output('RETURN_MM_NULL();');
+            $codePrinter->decreaseLevel();
+            $codePrinter->output('}');
+        }
+
+        /* Assign param */
+        switch ($type) {
+            case 'int':
+            case 'long':
+                $codePrinter->output($var['name'].' = Z_LVAL_P('.$parameterCode.');');
+                break;
+            case 'uint':
+                $codePrinter->output($var['name'].' = ZEND_ABS(Z_LVAL_P('.$parameterCode.'));');
+                break;
+            case 'bool':
+                $codePrinter->output($var['name'].' = '.$this->getBoolCode($parameterVariable, $context, false).';');
+                break;
+            case 'double':
+                $codePrinter->output($var['name'].' = Z_DVAL_P('.$parameterCode.');');
+                break;
+            case 'string':
+            case 'ulong':
+                $context->headersManager->add('kernel/operators');
+                $context->symbolTable->mustGrownStack(true);
+                $codePrinter->output('if (EXPECTED(Z_TYPE_P('.$parameterCode.') == IS_STRING)) {');
+                $codePrinter->increaseLevel();
+                $targetVar = $var['name'];
+                $targetVar = '&'.$targetVar;
+                $codePrinter->output('zephir_get_strval('.$targetVar.', '.$var['name'].'_param);');
+                $codePrinter->decreaseLevel();
+                $codePrinter->output('} else {');
+                $codePrinter->increaseLevel();
+                $this->initVar($inputParamVariable, $context);
+                $codePrinter->decreaseLevel();
+                $codePrinter->output('}');
+                break;
+            case 'array':
+                $context->backend->assignZval($inputParamVariable, $parameterVariable, $context);
+                break;
+            case 'object':
+            case 'resource':
+            case 'callable':
+            case 'mixed':
+                break;
+            default:
+                throw new CompilerException('Unknown type: '.$type);
+        }
+    }
+
+    /**
+     * Assign value to variable helper.
+     *
+     * @param string               $macro
+     * @param string               $variableName
+     * @param string|Variable|null $value
+     * @param CompilationContext   $context
+     * @param bool                 $useCodePrinter
+     *
+     * @return string
+     */
+    protected function assignHelper(
+        string $macro,
+        string $variableName,
+               $value,
+        CompilationContext $context,
+        bool $useCodePrinter
+    ): string {
+        if ($value === null && $macro === 'ZVAL_STRING') {
+            return '';
+        }
+
+        if ($value instanceof Variable) {
+            $value = $value->getName();
+        } else {
+            $value = 'ZVAL_STRING' === $macro ? '"'.$value.'"' : $value;
+        }
+
+        $output = $macro.'('.$variableName.', '.$value.');';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
+
+        return $output;
+    }
+
+    protected function returnHelper(string $macro, $value, CompilationContext $context, $useCodePrinter, $doCopy = null): string
+    {
+        if ($value instanceof Variable) {
+            $value = $value->getName();
+        } elseif ($macro === 'RETURN_MM_STRING' && !preg_match('/^ZEPHIR_GLOBAL/', $value)) {
+            $value = '"'.$value.'"';
+        }
+
+        $copyStr = '';
+        if (true === $doCopy) {
+            $copyStr = ', 1';
+        } elseif (false === $doCopy) {
+            $copyStr = ', 0';
+        } elseif (isset($doCopy)) {
+            $copyStr = ', '.$doCopy;
+        }
+
+        $output = $macro.'('.$value.$copyStr.');';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
+
+        return $output;
+    }
+
+    /**
+     * Resolve expressions.
+     *
+     * @param CompiledExpression[]|string[] $offsetExprs
+     * @param CompilationContext            $compilationContext
+     *
+     * @throws CompilerException
+     *
+     * @return array
+     */
+    private function resolveOffsetExprs($offsetExprs, CompilationContext $compilationContext)
+    {
+        $keys = '';
+        $offsetItems = [];
+        $numberParams = 0;
+
+        foreach ($offsetExprs as $offsetExpr) {
+            if ('a' == $offsetExpr) {
+                $keys .= 'a';
+                ++$numberParams;
+                continue;
+            }
+            switch ($offsetExpr->getType()) {
+                case 'int':
+                case 'uint':
+                case 'long':
+                case 'ulong':
+                    $keys .= 'l';
+                    $offsetItems[] = $offsetExpr->getCode();
+                    ++$numberParams;
+                    break;
+
+                case 'string':
+                    $keys .= 's';
+                    $offsetItems[] = 'SL("'.$offsetExpr->getCode().'")';
+                    $numberParams += 2;
+                    break;
+
+                case 'variable':
+                    $variableIndex = $compilationContext->symbolTable->getVariableForRead(
+                        $offsetExpr->getCode(),
+                        $compilationContext,
+                        null
+                    );
+
+                    switch ($variableIndex->getType()) {
+                        case 'int':
+                        case 'uint':
+                        case 'long':
+                        case 'ulong':
+                            $keys .= 'l';
+                            $offsetItems[] = $this->getVariableCode($variableIndex);
+                            ++$numberParams;
+                            break;
+                        case 'string':
+                        case 'variable':
+                            $keys .= 'z';
+                            $offsetItems[] = $this->getVariableCode($variableIndex);
+                            ++$numberParams;
+                            break;
+                        default:
+                            throw new CompilerException(
+                                sprintf('Variable: %s cannot be used as array index', $variableIndex->getType()),
+                                $offsetExpr->getOriginal()
+                            );
+                    }
+                    break;
+
+                default:
+                    throw new CompilerException(
+                        sprintf('Value: %s cannot be used as array index', $offsetExpr->getType()),
+                        $offsetExpr->getOriginal()
+                    );
+            }
+        }
+
+        return [$keys, $offsetItems, $numberParams];
+    }
 }
diff --git a/Library/Backends/ZendEngine3/FcallManager.php b/Library/Backend/FcallManager.php
similarity index 99%
rename from Library/Backends/ZendEngine3/FcallManager.php
rename to Library/Backend/FcallManager.php
index 5647c3f2d5..a48e4f4b23 100644
--- a/Library/Backends/ZendEngine3/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Zephir\Backends\ZendEngine3;
+namespace Zephir\Backend;
 
 use Zephir\CodePrinter;
 use Zephir\Fcall\FcallManagerInterface;
diff --git a/Library/Backends/ZendEngine3/StringsManager.php b/Library/Backend/StringsManager.php
similarity index 98%
rename from Library/Backends/ZendEngine3/StringsManager.php
rename to Library/Backend/StringsManager.php
index 7400d52b71..29c6942bcd 100644
--- a/Library/Backends/ZendEngine3/StringsManager.php
+++ b/Library/Backend/StringsManager.php
@@ -11,10 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Zephir\Backends\ZendEngine3;
+namespace Zephir\Backend;
 
 use Zephir\StringsManager as BaseStringsManager;
-
 use function Zephir\file_put_contents_ex;
 
 /**
@@ -66,7 +65,6 @@ public function genConcatCode(): void
             $useCopy = [];
             $avars = [];
             $zvars = [];
-            $svars = [];
             $lengths = [];
             $sparams = [];
             $lparams = [];
@@ -78,7 +76,6 @@ public function genConcatCode(): void
                     $params[] = 'const char *op'.$n.', uint32_t op'.$n.'_len';
                     $lparams[] = 'op'.$n.', sizeof(op'.$n.')-1';
                     $lengths[] = 'op'.$n.'_len';
-                    $svars[] = $n;
                     $avars[$n] = 's';
                 } else {
                     $params[] = 'zval *op'.$n;
diff --git a/Library/Backends/ZendEngine3/VariablesManager.php b/Library/Backend/VariablesManager.php
similarity index 89%
rename from Library/Backends/ZendEngine3/VariablesManager.php
rename to Library/Backend/VariablesManager.php
index a6b62356a5..dd12119955 100644
--- a/Library/Backends/ZendEngine3/VariablesManager.php
+++ b/Library/Backend/VariablesManager.php
@@ -9,16 +9,17 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Zephir\Backends\ZendEngine3;
+namespace Zephir\Backend;
 
 use Zephir\CompilationContext as Context;
 use Zephir\Exception\CompilerException as Exception;
 use Zephir\Types;
 use Zephir\Variable;
+use function Zephir\Backend\ZendEngine3\add_slashes;
 
 class VariablesManager
 {
-    const RESERVED_NAMES = [
+    public const RESERVED_NAMES = [
         'this_ptr',
         'return_value',
         'return_value_ptr',
@@ -38,7 +39,7 @@ class VariablesManager
      *
      * @return void
      */
-    public function initializeDefaults(Variable $variable, array $value, Context $context)
+    public function initializeDefaults(Variable $variable, array $value, Context $context): void
     {
         switch ($variable->getType()) {
             case Types::T_VARIABLE:
@@ -63,9 +64,9 @@ public function initializeDefaults(Variable $variable, array $value, Context $co
      *
      * @return void
      */
-    private function initDynamicVar(Variable $variable, array $value, Context $context)
+    private function initDynamicVar(Variable $variable, array $value, Context $context): void
     {
-        /* These ones are system variables, do not add default values.
+        /* These are system variables, do not add default values.
            Also see: https://github.com/zephir-lang/zephir/issues/1660 */
         if (\in_array($variable->getName(), self::RESERVED_NAMES, true)) {
             return;
@@ -111,7 +112,7 @@ private function initDynamicVar(Variable $variable, array $value, Context $conte
                 break;
 
             default:
-                throw $this->invalidDefaulTypeException($variable, $value);
+                throw $this->invalidDefaultTypeException($variable, $value);
         }
     }
 
@@ -125,7 +126,7 @@ private function initDynamicVar(Variable $variable, array $value, Context $conte
      *
      * @return void
      */
-    private function initStringVar(Variable $variable, array $value, Context $context)
+    private function initStringVar(Variable $variable, array $value, Context $context): void
     {
         $context->symbolTable->mustGrownStack(true);
         $context->backend->initVar($variable, $context);
@@ -141,7 +142,7 @@ private function initStringVar(Variable $variable, array $value, Context $contex
                 break;
 
             default:
-                throw $this->invalidDefaulTypeException($variable, $value);
+                throw $this->invalidDefaultTypeException($variable, $value);
         }
     }
 
@@ -155,7 +156,7 @@ private function initStringVar(Variable $variable, array $value, Context $contex
      *
      * @return void
      */
-    private function initArrayVar(Variable $variable, array $value, Context $context)
+    private function initArrayVar(Variable $variable, array $value, Context $context): void
     {
         $context->symbolTable->mustGrownStack(true);
         $context->backend->initVar($variable, $context);
@@ -171,7 +172,7 @@ private function initArrayVar(Variable $variable, array $value, Context $context
                 break;
 
             default:
-                throw $this->invalidDefaulTypeException($variable, $value);
+                throw $this->invalidDefaultTypeException($variable, $value);
         }
     }
 
@@ -183,7 +184,7 @@ private function initArrayVar(Variable $variable, array $value, Context $context
      *
      * @return Exception
      */
-    private function invalidDefaulTypeException(Variable $variable, array $value): Exception
+    private function invalidDefaultTypeException(Variable $variable, array $value): Exception
     {
         new Exception(
             sprintf(
@@ -204,7 +205,7 @@ private function invalidDefaulTypeException(Variable $variable, array $value): E
      *
      * @return void
      */
-    private function validateCharValue(array $value)
+    private function validateCharValue(array $value): void
     {
         if (\strlen($value['value']) > 2) {
             throw new Exception(
diff --git a/Library/Backends/BackendFactory.php b/Library/Backends/BackendFactory.php
deleted file mode 100644
index 12c4b01518..0000000000
--- a/Library/Backends/BackendFactory.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir\Backends;
-
-use Symfony\Component\Console\Input\ArgvInput;
-use Zephir\BaseBackend;
-use Zephir\Config;
-use Zephir\Exception\IllegalStateException;
-
-final class BackendFactory
-{
-    private Config $config;
-    private string $kernelsPath;
-    private string $templatesPath;
-
-    public function __construct(Config $config, string $kernelsPath, string $templatesPath)
-    {
-        $this->config = $config;
-        $this->kernelsPath = $kernelsPath;
-        $this->templatesPath = $templatesPath;
-    }
-
-    public function createBackend()
-    {
-        $backendClassName = $this->resolveBackendClass();
-
-        return new $backendClassName(
-            $this->config,
-            $this->kernelsPath,
-            $this->templatesPath
-        );
-    }
-
-    /**
-     * Resolve backend class.
-     *
-     * @throws IllegalStateException
-     *
-     * @return string
-     */
-    private function resolveBackendClass(): string
-    {
-        $backend = (new ArgvInput())->getParameterOption('--backend', null);
-
-        if (null === $backend) {
-            // Do not use this feature for typical use case.
-            // Overriding backend using env var provided only for
-            // testing purposes and may be removed in the future.
-            // You SHOULD NOT rely on this possibility.
-            if (getenv('ZEPHIR_BACKEND')) {
-                $backend = getenv('ZEPHIR_BACKEND');
-            }
-        }
-
-        if (null === $backend) {
-            $backend = BaseBackend::getActiveBackend();
-        }
-
-        $className = "Zephir\\Backends\\{$backend}\\Backend";
-
-        if (!class_exists($className) || 'ZendEngine2' === $backend) {
-            throw new IllegalStateException(sprintf('Backend class "%s" does not exist.', $backend));
-        }
-
-        return $className;
-    }
-}
diff --git a/Library/Backends/ZendEngine2/Backend.php b/Library/Backends/ZendEngine2/Backend.php
deleted file mode 100644
index 57f83a765e..0000000000
--- a/Library/Backends/ZendEngine2/Backend.php
+++ /dev/null
@@ -1,1196 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Backends\ZendEngine2;
-
-use Zephir\BaseBackend;
-use Zephir\ClassMethod;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Compiler;
-use Zephir\Exception\CompilerException;
-use Zephir\Fcall\FcallManagerInterface;
-use Zephir\GlobalConstant;
-use Zephir\Variable;
-
-use function in_array;
-
-/**
- * NOTE: ZendEngine2 backend is no longer supported
- * and this class will be removed in the future.
- */
-class Backend extends BaseBackend
-{
-    protected $name = 'ZendEngine2';
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return FcallManagerInterface
-     */
-    public function getFcallManager()
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getVariableCodePointer(Variable $variable)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getVariableCode(Variable $variable): string
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function getBoolCode(Variable $variable, CompilationContext $context, $useCodePrinter = true)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStringsManager()
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function getTypeDefinition($type)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getTypeofCondition(
-        Variable $variableVariable,
-        string $operator,
-        string $value,
-        CompilationContext $context
-    ): string {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function onPreInitVar(ClassMethod $method, CompilationContext $context): string
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function onPreCompile(ClassMethod $method, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function onPostCompile(ClassMethod $method, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initializeVariableDefaults(array $variables, CompilationContext $context): string
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function declareConstant($type, $name, $value, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function declareVariables($method, $typeToVariables, CompilationContext $compilationContext)
-    {
-        $varInitCode = [];
-        $additionalCode = $method ? $this->onPreInitVar($method, $compilationContext) : '';
-
-        foreach ($typeToVariables as $type => $variables) {
-            list($pointer, $code) = $this->getTypeDefinition($type);
-            $code .= ' ';
-            $groupVariables = [];
-
-            /**
-             * @var Variable[]
-             */
-            foreach ($variables as $variable) {
-                $nextCode = $this->generateInitCode($groupVariables, $type, $pointer, $variable);
-                if ($nextCode && $additionalCode) {
-                    $additionalCode .= PHP_EOL.$nextCode;
-                } else {
-                    $additionalCode .= $nextCode;
-                }
-            }
-
-            $varInitCode[] = $code.implode(', ', $groupVariables).';';
-        }
-        /* Keep order consistent with previous zephir versions (BC-only) */
-        $varInitCode = array_reverse($varInitCode);
-        if ($additionalCode) {
-            $varInitCode[] = $additionalCode;
-        }
-
-        return $varInitCode;
-    }
-
-    public function initVar(Variable $variable, CompilationContext $context, $useCodePrinter = true, $second = false)
-    {
-        $macro = !$second ? 'ZEPHIR_INIT_VAR' : 'ZEPHIR_INIT_NVAR';
-        $code = $macro.'('.$this->getVariableCode($variable).');';
-        if ($useCodePrinter) {
-            $context->codePrinter->output($code);
-        }
-
-        return $code;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getInternalSignature(ClassMethod $method, CompilationContext $context): string
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param Variable           $variable
-     * @param string|Variable    $value
-     * @param CompilationContext $context
-     * @param bool               $useCodePrinter
-     *
-     * @return string
-     */
-    public function assignString(
-        Variable $variable,
-        $value,
-        CompilationContext $context,
-        bool $useCodePrinter = true
-    ): string {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function returnString($value, CompilationContext $context, $useCodePrinter = true, $doCopy = true)
-    {
-        return $this->returnHelper('RETURN_MM_STRING', $value, $context, $useCodePrinter, $doCopy);
-    }
-
-    public function assignLong(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
-    {
-        return $this->assignHelper('ZVAL_LONG', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
-    }
-
-    public function assignDouble(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
-    {
-        return $this->assignHelper('ZVAL_DOUBLE', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
-    }
-
-    public function assignBool(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
-    {
-        return $this->assignHelper('ZVAL_BOOL', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
-    }
-
-    public function assignNull(Variable $variable, CompilationContext $context, $useCodePrinter = true)
-    {
-        $output = 'ZVAL_NULL('.$this->getVariableCode($variable).');';
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $output;
-    }
-
-    public function assignZval(Variable $variable, $code, CompilationContext $context)
-    {
-        $code = $this->resolveValue($code, $context);
-        $context->codePrinter->output($this->getVariableCode($variable).' = '.$code.';');
-    }
-
-    public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context)
-    {
-        $variable = $this->getVariableCodePointer($variable);
-        $itemVariable = $this->getVariableCode($itemVariable);
-        $context->codePrinter->output('zephir_concat_self('.$variable.', '.$itemVariable.');');
-    }
-
-    public function initArray(Variable $variable, CompilationContext $context, int $size = null)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function createClosure(Variable $variable, $classDefinition, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function addArrayEntry(Variable $variable, $key, $value, CompilationContext $context, $statement = null, $useCodePrinter = true)
-    {
-        $type = null;
-        $keyType = 'assoc';
-        if (!isset($key)) {
-            $keyType = 'append';
-        } elseif ($key instanceof CompiledExpression) {
-            $typeKey = $key->getType();
-            if ('variable' == $typeKey) {
-                $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
-                $typeKey = $var->getType();
-            }
-            if (in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
-                $keyType = 'index';
-            }
-        }
-
-        if ('null' == $value) {
-            if (!isset($key)) {
-                $context->codePrinter->output('zephir_array_append('.$this->getVariableCodePointer($variable).', ZEPHIR_GLOBAL(global_null), PH_SEPARATE, "'.Compiler::getShortUserPath($statement['file']).'", '.$statement['line'].');');
-
-                return;
-            }
-        }
-        switch ($value->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-                $type = 'long';
-                break;
-            case 'double':
-                $type = 'double';
-                break;
-            case 'string':
-                $type = 'stringl';
-                break;
-            case 'variable':
-            case 'array':
-                $type = 'zval';
-                break;
-        }
-        if (!$type) {
-            throw new CompilerException('Unknown type mapping: '.$value->getType());
-        }
-
-        if (isset($key)) {
-            if ('variable' == $key->getType()) {
-                $keyStr = 'string' == $typeKey ? 'Z_STRVAL_P('.$this->getVariableCode($var).'), Z_STRLEN_P('.$this->getVariableCode($var).') + 1' : $this->getVariableCode($var);
-            } else {
-                $keyStr = 'string' == $key->getType() ? 'SS("'.$key->getCode().'")' : $key->getCode();
-            }
-        }
-        if ('stringl' == $type) {
-            if ($value instanceof Variable) {
-                $valueStr = 'Z_STRVAL_P('.$this->getVariableCode($value).'), Z_STRLEN_P('.$this->getVariableCode($value).')';
-            } else {
-                $valueStr = 'SL("'.$value->getCode().'")';
-            }
-        } elseif ('zval' == $type) {
-            $valueStr = $this->getVariableCode($value);
-        } else {
-            $valueStr = $value->getCode();
-        }
-        $doCopy = 'stringl' == $type ? ', 1' : '';
-
-        if ('assoc' == $keyType) {
-            $output = 'add_assoc_'.$type.'_ex('.$this->getVariableCode($variable).', '.$keyStr.', '.$valueStr.$doCopy.');';
-        } elseif ('append' == $keyType) {
-            $output = 'zephir_array_append('.$this->getVariableCodePointer($variable).', '.$this->resolveValue($value, $context).', PH_SEPARATE, "'.Compiler::getShortUserPath($statement['file']).'", '.$statement['line'].');';
-        } else {
-            $output = 'add_index_'.$type.'('.$this->getVariableCode($variable).', '.$keyStr.', '.$valueStr.$doCopy.');';
-        }
-
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $output;
-    }
-
-    public function updateArray(Variable $symbolVariable, $key, $value, CompilationContext $compilationContext, $flags = null)
-    {
-        $value = $this->resolveValue($value, $compilationContext, true);
-        if (!isset($flags)) {
-            $flags = 'PH_COPY';
-        }
-
-        if ($key instanceof Variable) {
-            switch ($key->getType()) {
-                case 'string':
-                case 'variable':
-                    $compilationContext->codePrinter->output('zephir_array_update_zval('.$this->getVariableCodePointer($symbolVariable).', '.$this->getVariableCode($key).', '.$value.', '.$flags.');');
-                    break;
-
-                case 'int':
-                case 'uint':
-                case 'long':
-                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCodePointer($symbolVariable).', '.$key->getName().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
-                    break;
-
-                default:
-                    throw new CompilerException('updateArray: Found a variable with unsupported type '.$key->getType());
-            }
-        } elseif ($key instanceof CompiledExpression) {
-            switch ($key->getType()) {
-                case 'string':
-                    $compilationContext->codePrinter->output('zephir_array_update_string('.$this->getVariableCodePointer($symbolVariable).', SL("'.$key->getCode().'"), '.$value.', '.$flags.');');
-                    break;
-
-                case 'int':
-                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCodePointer($symbolVariable).', '.$key->getCode().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
-                    break;
-
-                case 'variable':
-                    $this->updateArray($symbolVariable, $compilationContext->symbolTable->getVariableForRead($key->getCode()), $value, $compilationContext, $flags);
-                    break;
-
-                default:
-                    throw new CompilerException('updateArray: Found an expression with unsupported type '.$key->getType());
-            }
-        } else {
-            throw new CompilerException('?');
-        }
-    }
-
-    public function initObject(Variable $variable, $ce, CompilationContext $context, $useCodePrinter = true)
-    {
-        $variableAccess = $this->getVariableCode($variable);
-        if (!isset($ce)) {
-            $output = 'object_init('.$variableAccess.');';
-        } else {
-            $output = 'object_init_ex('.$variableAccess.', '.$ce.');';
-        }
-
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $output;
-    }
-
-    public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayAccess, CompilationContext $context, $useCodePrinter = true)
-    {
-        $context->headersManager->add('kernel/array');
-        $isVariable = $index instanceof Variable;
-
-        switch ($index->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $type = 'long';
-                break;
-
-            /* Types which map to the same */
-            case 'variable':
-            case 'mixed':
-            case 'string':
-                $type = $index->getType();
-                break;
-
-            default:
-                throw new CompilerException(
-                    sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
-                    $arrayAccess['right']
-                );
-        }
-        if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
-            $output = 'zephir_array_fetch('.$this->getVariableCodePointer($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
-        } else {
-            if ($isVariable) {
-                $indexAccess = $this->getVariableCode($index);
-            } else {
-                $indexAccess = $index->getCode();
-                if ('string' == $type) {
-                    $indexAccess = 'SL("'.$indexAccess.'")';
-                }
-            }
-            $output = 'zephir_array_fetch_'.$type.'('.$this->getVariableCodePointer($var).', '.$this->getVariableCode($src).', '.$indexAccess.', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
-        }
-
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $output;
-    }
-
-    public function arrayIsset(Variable $var, $resolvedExpr, $expression, CompilationContext $context)
-    {
-        if (!($resolvedExpr instanceof Variable)) {
-            if ('string' == $resolvedExpr->getType()) {
-                return new CompiledExpression('bool', 'zephir_array_isset_string('.$this->getVariableCode($var).', SS("'.$resolvedExpr->getCode().'"))', $expression);
-            } else {
-                return new CompiledExpression('bool', 'zephir_array_isset_long('.$this->getVariableCode($var).', '.$resolvedExpr->getCode().')', $expression);
-            }
-        }
-
-        if ('int' == $resolvedExpr->getType() || 'long' == $resolvedExpr->getType()) {
-            return new CompiledExpression('bool', 'zephir_array_isset_long('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
-        } elseif ('variable' == $resolvedExpr->getType() || 'string' == $resolvedExpr->getType() || 'mixed' === $resolvedExpr->getType()) {
-            return new CompiledExpression('bool', 'zephir_array_isset('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
-        }
-
-        throw new CompilerException('['.$resolvedExpr->getType().']', $expression);
-    }
-
-    public function arrayIssetFetch(Variable $target, Variable $var, $resolvedExpr, $flags, $expression, CompilationContext $context)
-    {
-        $code = $this->getVariableCodePointer($target).', '.$this->getVariableCode($var);
-
-        if (!($resolvedExpr instanceof Variable)) {
-            if ('string' === $resolvedExpr->getType()) {
-                return new CompiledExpression('bool', 'zephir_array_isset_string_fetch('.$code.', SS("'.$resolvedExpr->getCode().'"), '.$flags.')', $expression);
-            } elseif (in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
-                return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$resolvedExpr->getCode().', '.$flags.')', $expression);
-            } else {
-                $resolvedExpr = $context->symbolTable->getVariableForRead($resolvedExpr->getCode(), $context);
-            }
-        }
-
-        if (in_array($resolvedExpr->getType(), ['int', 'long'])) {
-            return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
-        } elseif (in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
-            return new CompiledExpression('bool', 'zephir_array_isset_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
-        }
-
-        throw new CompilerException('arrayIssetFetch ['.$resolvedExpr->getType().']', $expression);
-    }
-
-    public function propertyIsset(Variable $var, $key, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationContext $context)
-    {
-        $context->headersManager->add('kernel/array');
-        $variableCode = $this->getVariableCodePointer($variable);
-        switch ($exprIndex->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $context->codePrinter->output('zephir_array_unset_long('.$variableCode.', '.$exprIndex->getCode().', '.$flags.');');
-                break;
-
-            case 'string':
-                $context->codePrinter->output('zephir_array_unset_string('.$variableCode.', SS("'.$exprIndex->getCode().'"), '.$flags.');');
-                break;
-
-            case 'variable':
-                $variableIndex = $context->symbolTable->getVariableForRead($exprIndex->getCode(), $context, $exprIndex->getOriginal());
-                $indexCode = $this->getVariableCode($variableIndex);
-                switch ($variableIndex->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                        $context->codePrinter->output('zephir_array_unset_long('.$variableCode.', '.$indexCode.', '.$flags.');');
-                        break;
-
-                    case 'string':
-                    case 'variable':
-                    case 'mixed':
-                        $context->codePrinter->output('zephir_array_unset('.$variableCode.', '.$indexCode.', '.$flags.');');
-                        break;
-
-                    default:
-                        throw new CompilerException('Variable type: '.$variableIndex->getType().' cannot be used as array index without cast');
-                }
-                break;
-
-            default:
-                throw new CompilerException('Cannot use expression: '.$exprIndex->getType().' as array index without cast');
-        }
-    }
-
-    public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExprs, CompilationContext $compilationContext)
-    {
-        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-
-        $symbol = $this->resolveValue($symbolVariable, $compilationContext, true);
-        $varCode = $this->getVariableCodePointer($variable);
-        $compilationContext->codePrinter->output(
-            sprintf(
-                'zephir_array_update_multi(%s, %s, SL("%s"), %d, %s);',
-                $varCode,
-                $symbol,
-                $keys,
-                $numberParams,
-                implode(', ', $offsetItems)
-            )
-        );
-    }
-
-    public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext)
-    {
-        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
-
-        $compilationContext->codePrinter->output(
-            sprintf(
-                'zephir_update_property_array_multi(%s, SL("%s"), %s, SL("%s"), %d, %s);',
-                $variable->getName(),
-                $propertyName,
-                $valueVariable,
-                $keys,
-                $numberParams,
-                implode(', ', $offsetItems)
-            )
-        );
-    }
-
-    public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext)
-    {
-        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
-
-        $offsetStr = $offsetItems ? ', '.implode(', ', $offsetItems) : '';
-        $compilationContext->codePrinter->output(
-            sprintf(
-                'zephir_update_static_property_array_multi_ce(%s, SL("%s"), %s, SL("%s"), %d%s);',
-                $classEntry,
-                $propertyName,
-                $valueVariable,
-                $keys,
-                $numberParams,
-                $offsetStr
-            )
-        );
-    }
-
-    public function fetchGlobal(Variable $globalVar, CompilationContext $compilationContext, $useCodePrinter = true)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function fetchClass(Variable $zendClassEntry, $className, $guarded, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function fetchProperty(
-        Variable $symbolVariable,
-        Variable $variableVariable,
-        $property,
-        $readOnly,
-        CompilationContext $context
-    ) {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function fetchStaticProperty(
-        Variable $symbolVariable,
-        $classDefinition,
-        $property,
-        $readOnly,
-        CompilationContext $context
-    ) {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function resolveValue($value, CompilationContext $context, $usePointer = false)
-    {
-        if ('null' == $value) {
-            $value = ($usePointer ? '&' : '').'ZEPHIR_GLOBAL(global_null)';
-        } elseif ('true' == $value) {
-            $value = ($usePointer ? '&' : '').'ZEPHIR_GLOBAL(global_true)';
-        } elseif ('false' == $value) {
-            $value = ($usePointer ? '&' : '').'ZEPHIR_GLOBAL(global_false)';
-        } elseif ($value instanceof GlobalConstant) {
-            return ($usePointer ? '&' : '').$value->getName();
-        } elseif ($value instanceof CompiledExpression) {
-            if ('array' == $value->getType()) {
-                $var = $context->symbolTable->getVariableForWrite($value->getCode(), $context, null);
-                $value = $usePointer ? $this->getVariableCodePointer($var) : $this->getVariableCode($var);
-            } elseif ('variable' == $value->getType()) {
-                $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context);
-            } else {
-                return $value->getCode();
-            }
-        }
-        if ($value instanceof Variable) {
-            $value = $usePointer ? $this->getVariableCodePointer($value) : $this->getVariableCode($value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param Variable           $variable
-     * @param string|Variable    $property
-     * @param mixed              $value
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    public function updateProperty(Variable $variable, $property, $value, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function updateStaticProperty($classEntry, $property, $value, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function addStaticProperty($classEntry, $property, $value, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function subStaticProperty($classEntry, $property, $value, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function assignArrayProperty(Variable $variable, $property, $key, $value, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function checkConstructor(Variable $var, CompilationContext $context)
-    {
-        $context->codePrinter->output('if (zephir_has_constructor('.$this->getVariableCode($var).')) {');
-    }
-
-    public function callMethod($symbolVariable, Variable $variable, $methodName, $cachePointer, $params, CompilationContext $context)
-    {
-        $paramStr = null != $params ? ', '.implode(', ', $params) : '';
-        $macro = 'CALL_METHOD';
-        if ($methodName instanceof Variable) {
-            $macro = 'CALL_METHOD_ZVAL';
-            $methodName = $this->getVariableCode($methodName);
-        } else {
-            $methodName = '"'.$methodName.'"';
-        }
-        if (!isset($symbolVariable)) {
-            $context->codePrinter->output('ZEPHIR_'.$macro.'(NULL, '.$variable->getName().', '.$methodName.', '.$cachePointer.$paramStr.');');
-        } elseif ('return_value' == $symbolVariable->getName()) {
-            $context->codePrinter->output('ZEPHIR_RETURN_'.$macro.'('.$variable->getName().', '.$methodName.', '.$cachePointer.$paramStr.');');
-        } else {
-            $context->codePrinter->output('ZEPHIR_'.$macro.'(&'.$symbolVariable->getName().', '.$variable->getName().', '.$methodName.', '.$cachePointer.$paramStr.');');
-        }
-    }
-
-    public function callDynamicFunction($symbolVariable, Variable $variable, CompilationContext $context, $params = [], $cache = 'NULL', $cacheSlot = 0)
-    {
-        $paramStr = null != $params ? ', '.implode(', ', $params) : '';
-        if (!isset($symbolVariable)) {
-            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION(NULL, '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
-        } elseif ('return_value' == $symbolVariable->getName()) {
-            $context->codePrinter->output('ZEPHIR_RETURN_CALL_ZVAL_FUNCTION('.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
-        } else {
-            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION('.$this->getVariableCodePointer($symbolVariable).', '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
-        }
-    }
-
-    public function zvalOperator($zvalOperator, Variable $expected, Variable $variableLeft, Variable $variableRight, CompilationContext $compilationContext)
-    {
-        $expected = $this->getVariableCode($expected);
-        $op1 = $this->getVariableCode($variableLeft);
-        $op2 = $this->getVariableCode($variableRight);
-
-        $compilationContext->codePrinter->output($zvalOperator.'('.$expected.', '.$op1.', '.$op2.');');
-    }
-
-    public function maybeSeparate(Variable $variableTempSeparated, Variable $variable, CompilationContext $context)
-    {
-        $context->codePrinter->output($variableTempSeparated->getName().' = zephir_maybe_separate_zval('.$this->getVariableCodePointer($variable).');');
-    }
-
-    public function setSymbolIfSeparated(Variable $variableTempSeparated, Variable $variable, CompilationContext $context)
-    {
-        $context->codePrinter->output('if ('.$variableTempSeparated->getName().') {');
-        $context->codePrinter->output("\t".'ZEND_SET_SYMBOL(&EG(symbol_table), "'.$variable->getName().'", '.$variable->getName().');');
-        $context->codePrinter->output('}');
-    }
-
-    public function copyOnWrite(Variable $target, $var, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function forStatement(Variable $exprVariable, $keyVariable, $variable, $duplicateKey, $duplicateHash, $statement, $statementBlock, CompilationContext $compilationContext)
-    {
-        /*
-         * Create a hash table and hash pointer temporary variables.
-         */
-        $arrayPointer = $compilationContext->symbolTable->addTemp('HashPosition', $compilationContext);
-        $arrayHash = $compilationContext->symbolTable->addTemp('HashTable', $compilationContext);
-        /*
-         * Create a temporary zval to fetch the items from the hash.
-         */
-        $compilationContext->headersManager->add('kernel/fcall');
-        $compilationContext->symbolTable->mustGrownStack(true);
-        if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_LAST_CALL_STATUS')) {
-            $callStatus = new Variable('int', 'ZEPHIR_LAST_CALL_STATUS', $compilationContext->branchManager->getCurrentBranch());
-            $callStatus->setIsInitialized(true, $compilationContext);
-            $callStatus->increaseUses();
-            $callStatus->setReadOnly(true);
-            $compilationContext->symbolTable->addRawVariable($callStatus);
-        }
-        $tempVariable = $compilationContext->symbolTable->addTemp('variable', $compilationContext);
-        $tempVariable->setIsDoublePointer(true);
-        $tempValidVariable = $compilationContext->symbolTable->addTemp('variable', $compilationContext);
-        $tempValidVariable->setMustInitNull(true);
-        $codePrinter = $compilationContext->codePrinter;
-
-        $codePrinter->output('if (Z_TYPE_P('.$this->getVariableCode($exprVariable).') == IS_ARRAY) {');
-        $codePrinter->increaseLevel();
-
-        $reverse = $statement['reverse'] ? 1 : 0;
-
-        $codePrinter->output('zephir_is_iterable('.$this->getVariableCode($exprVariable).', &'.$arrayHash->getName().', &'.$arrayPointer->getName().', '.$duplicateHash.', '.$reverse.', "'.Compiler::getShortUserPath($statement['file']).'", '.$statement['line'].');');
-
-        $codePrinter->output('for (');
-        $codePrinter->output('  ; zend_hash_get_current_data_ex('.$arrayHash->getName().', (void**) &'.$tempVariable->getName().', &'.$arrayPointer->getName().') == SUCCESS');
-        if ($reverse) {
-            $codePrinter->output('  ; zend_hash_move_backwards_ex('.$arrayHash->getName().', &'.$arrayPointer->getName().')');
-        } else {
-            $codePrinter->output('  ; zend_hash_move_forward_ex('.$arrayHash->getName().', &'.$arrayPointer->getName().')');
-        }
-        $codePrinter->output(') {');
-
-        if (isset($keyVariable)) {
-            if ($duplicateKey) {
-                $compilationContext->symbolTable->mustGrownStack(true);
-                $codePrinter->output("\t".'ZEPHIR_GET_HMKEY('.$keyVariable->getName().', '.$arrayHash->getName().', '.$arrayPointer->getName().');');
-            } else {
-                $codePrinter->output("\t".'ZEPHIR_GET_HKEY('.$keyVariable->getName().', '.$arrayHash->getName().', '.$arrayPointer->getName().');');
-            }
-        }
-
-        if (isset($variable)) {
-            $compilationContext->symbolTable->mustGrownStack(true);
-            $codePrinter->output("\t".'ZEPHIR_GET_HVALUE('.$variable->getName().', '.$tempVariable->getName().');');
-        }
-
-        /*
-         * Compile statements in the 'for' block
-         */
-        if (isset($statement['statements'])) {
-            $statementBlock->isLoop(true);
-            if (isset($statement['key'])) {
-                $statementBlock->getMutateGatherer()->increaseMutations($statement['key']);
-            }
-            $statementBlock->getMutateGatherer()->increaseMutations($statement['value']);
-            $statementBlock->compile($compilationContext);
-        }
-
-        $codePrinter->output('}');
-        /* Make sure to free the duplicated hash table */
-        if ($duplicateHash) {
-            $codePrinter->output('zend_hash_destroy('.$arrayHash->getName().');');
-            $codePrinter->output('FREE_HASHTABLE('.$arrayHash->getName().');');
-        }
-        $codePrinter->decreaseLevel();
-
-        $codePrinter->output('} else {');
-        $codePrinter->increaseLevel();
-
-        $codePrinter->output('ZEPHIR_CALL_METHOD(NULL, '.$this->getVariableCode($exprVariable).', "rewind", NULL, 0);');
-        $codePrinter->output('zephir_check_call_status();');
-
-        $codePrinter->output('while (1) {');
-        $codePrinter->increaseLevel();
-        $compilationContext->headersManager->add('kernel/operators');
-
-        $codePrinter->output('ZEPHIR_CALL_METHOD(&'.$tempValidVariable->getName().', '.$this->getVariableCode($exprVariable).', "valid", NULL, 0);');
-        $codePrinter->output('zephir_check_call_status();');
-        $codePrinter->output('if (!zephir_is_true('.$tempValidVariable->getName().')) {');
-        $codePrinter->increaseLevel();
-        $codePrinter->output('break;');
-        $codePrinter->decreaseLevel();
-        $codePrinter->output('}');
-
-        if (isset($keyVariable)) {
-            $codePrinter->output('ZEPHIR_CALL_METHOD(&'.$this->getVariableCode($keyVariable).', '.$this->getVariableCode($exprVariable).', "key", NULL, 0);');
-            $codePrinter->output('zephir_check_call_status();');
-        }
-
-        if (isset($variable)) {
-            $codePrinter->output('ZEPHIR_CALL_METHOD(&'.$this->getVariableCode($variable).', '.$this->getVariableCode($exprVariable).', "current", NULL, 0);');
-            $codePrinter->output('zephir_check_call_status();');
-        }
-
-        if (isset($statement['statements'])) {
-            $statementBlock->isLoop(true);
-            if (isset($statement['key'])) {
-                $statementBlock->getMutateGatherer()->increaseMutations($statement['key']);
-            }
-            $statementBlock->getMutateGatherer()->increaseMutations($statement['value']);
-            $statementBlock->compile($compilationContext);
-        }
-
-        $codePrinter->output('ZEPHIR_CALL_METHOD(NULL, '.$this->getVariableCode($exprVariable).', "next", NULL, 0);');
-        $codePrinter->output('zephir_check_call_status();');
-
-        $codePrinter->decreaseLevel();
-        $codePrinter->output('}');
-
-        $codePrinter->decreaseLevel();
-        $codePrinter->output('}');
-    }
-
-    public function forStatementIterator(Variable $iteratorVariable, Variable $targetVariable, CompilationContext $compilationContext)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function destroyIterator(Variable $iteratorVariable, CompilationContext $context)
-    {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    public function ifVariableValueUndefined(Variable $var, CompilationContext $context, $onlyBody = false, $useCodePrinter = true)
-    {
-        $body = '!'.$var->getName();
-        $output = 'if ('.$body.') {';
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $onlyBody ? $body : $output;
-    }
-
-    public function checkStrictType($type, $var, CompilationContext $context)
-    {
-        $codePrinter = $context->codePrinter;
-        $conditions = [];
-
-        $inputParamVariable = $context->symbolTable->getVariableForWrite($var['name'], $context);
-        $inputParamCode = $this->getVariableCode($inputParamVariable);
-        $cond = 'Z_TYPE_P('.$inputParamCode.') != ';
-        if ($context->symbolTable->hasVariable($var['name'].'_param')) {
-            $parameterVariable = $context->symbolTable->getVariableForWrite($var['name'].'_param', $context);
-            $parameterCode = $context->backend->getVariableCode($parameterVariable);
-            $cond = 'Z_TYPE_P('.$parameterCode.') != ';
-        }
-
-        switch ($type) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $conditions[] = $cond.'IS_LONG';
-                break;
-            case 'bool':
-                $conditions[] = $cond.'IS_TRUE';
-                $conditions[] = $cond.'IS_FALSE';
-                break;
-            case 'double':
-                $conditions[] = $cond.'IS_DOUBLE';
-                break;
-            case 'string':
-            case 'ulong':
-                $conditions[] = $cond.'IS_STRING';
-                $conditions[] = $cond.'IS_NULL';
-                break;
-            case 'array':
-                break;
-            case 'object':
-            case 'resource':
-                $conditions[] = $cond.'IS_'.strtoupper($type);
-                break;
-            case 'callable':
-                $conditions[] = 'zephir_is_callable('.$inputParamCode.') != 1';
-                break;
-            default:
-                throw new CompilerException('Unknown type '.$type);
-        }
-
-        /* Generate verification code */
-        if (\count($conditions)) {
-            $codePrinter->output('if (UNEXPECTED('.implode(' && ', $conditions).')) {');
-            $codePrinter->increaseLevel();
-
-            $exceptionMessage = sprintf('SL("Parameter \'%s\' must be of the type %s")', $var['name'], $type);
-            $codePrinter->output(
-                sprintf(
-                    'zephir_throw_exception_string(spl_ce_InvalidArgumentException, %s);',
-                    $exceptionMessage
-                )
-            );
-
-            $codePrinter->output('RETURN_MM_NULL();');
-            $codePrinter->decreaseLevel();
-            $codePrinter->output('}');
-        }
-
-        /* Assign param */
-        switch ($type) {
-            case 'int':
-            case 'long':
-                $codePrinter->output($var['name'].' = Z_LVAL_P('.$parameterCode.');');
-                break;
-            case 'uint':
-                $codePrinter->output($var['name'].' = ZEND_ABS(Z_LVAL_P('.$parameterCode.'));');
-                break;
-            case 'bool':
-                $codePrinter->output($var['name'].' = '.$this->getBoolCode($parameterVariable, $context, false).';');
-                break;
-            case 'double':
-                $codePrinter->output($var['name'].' = Z_DVAL_P('.$parameterCode.');');
-                break;
-            case 'string':
-            case 'ulong':
-                $context->headersManager->add('kernel/operators');
-                $context->symbolTable->mustGrownStack(true);
-                $codePrinter->output('if (EXPECTED(Z_TYPE_P('.$parameterCode.') == IS_STRING)) {');
-                $codePrinter->increaseLevel();
-                $targetVar = $var['name'];
-                $targetVar = '&'.$targetVar;
-                $codePrinter->output('zephir_get_strval('.$targetVar.', '.$var['name'].'_param);');
-                $codePrinter->decreaseLevel();
-                $codePrinter->output('} else {');
-                $codePrinter->increaseLevel();
-                $this->initVar($inputParamVariable, $context);
-                $codePrinter->decreaseLevel();
-                $codePrinter->output('}');
-                break;
-            case 'array':
-                $context->backend->assignZval($inputParamVariable, $parameterVariable, $context);
-                break;
-            case 'object':
-            case 'resource':
-            case 'callable':
-            case 'mixed':
-                break;
-            default:
-                throw new CompilerException('Unknown type: '.$type);
-        }
-    }
-
-    public function fetchClassEntry($str)
-    {
-        return 'zephir_get_internal_ce(SS("'.$str.'"))';
-    }
-
-    public function getScalarTempVariable(
-        string $type,
-        CompilationContext $compilationContext,
-        $isLocal = false
-    ): Variable {
-        throw new CompilerException(
-            'ZendEngine2 backend is no longer supported'
-        );
-    }
-
-    /**
-     * Assign value to variable helper.
-     *
-     * @param string               $macro
-     * @param string               $variableName
-     * @param string|Variable|null $value
-     * @param CompilationContext   $context
-     * @param bool                 $useCodePrinter
-     *
-     * @return string
-     */
-    protected function assignHelper(
-        string $macro,
-        string $variableName,
-        $value,
-        CompilationContext $context,
-        bool $useCodePrinter
-    ): string {
-        if ($value === null && $macro === 'ZVAL_STRING') {
-            return '';
-        }
-
-        if ($value instanceof Variable) {
-            $value = $value->getName();
-        } else {
-            $value = 'ZVAL_STRING' === $macro ? '"'.$value.'"' : $value;
-        }
-
-        $output = $macro.'('.$variableName.', '.$value.');';
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $output;
-    }
-
-    protected function returnHelper(string $macro, $value, CompilationContext $context, $useCodePrinter, $doCopy = null): string
-    {
-        if ($value instanceof Variable) {
-            $value = $value->getName();
-        } elseif ($macro === 'RETURN_MM_STRING' && !preg_match('/^ZEPHIR_GLOBAL/', $value)) {
-            $value = '"'.$value.'"';
-        }
-
-        $copyStr = '';
-        if (true === $doCopy) {
-            $copyStr = ', 1';
-        } elseif (false === $doCopy) {
-            $copyStr = ', 0';
-        } elseif (isset($doCopy)) {
-            $copyStr = ', '.$doCopy;
-        }
-
-        $output = $macro.'('.$value.$copyStr.');';
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Resolve expressions.
-     *
-     * @param CompiledExpression[]|string[] $offsetExprs
-     * @param CompilationContext            $compilationContext
-     *
-     * @throws CompilerException
-     *
-     * @return array
-     */
-    private function resolveOffsetExprs($offsetExprs, CompilationContext $compilationContext)
-    {
-        $keys = '';
-        $offsetItems = [];
-        $numberParams = 0;
-
-        foreach ($offsetExprs as $offsetExpr) {
-            if ('a' == $offsetExpr) {
-                $keys .= 'a';
-                ++$numberParams;
-                continue;
-            }
-            switch ($offsetExpr->getType()) {
-                case 'int':
-                case 'uint':
-                case 'long':
-                case 'ulong':
-                    $keys .= 'l';
-                    $offsetItems[] = $offsetExpr->getCode();
-                    ++$numberParams;
-                    break;
-
-                case 'string':
-                    $keys .= 's';
-                    $offsetItems[] = 'SL("'.$offsetExpr->getCode().'")';
-                    $numberParams += 2;
-                    break;
-
-                case 'variable':
-                    $variableIndex = $compilationContext->symbolTable->getVariableForRead(
-                        $offsetExpr->getCode(),
-                        $compilationContext,
-                        null
-                    );
-
-                    switch ($variableIndex->getType()) {
-                        case 'int':
-                        case 'uint':
-                        case 'long':
-                        case 'ulong':
-                            $keys .= 'l';
-                            $offsetItems[] = $this->getVariableCode($variableIndex);
-                            ++$numberParams;
-                            break;
-                        case 'string':
-                        case 'variable':
-                            $keys .= 'z';
-                            $offsetItems[] = $this->getVariableCode($variableIndex);
-                            ++$numberParams;
-                            break;
-                        default:
-                            throw new CompilerException(
-                                sprintf('Variable: %s cannot be used as array index', $variableIndex->getType()),
-                                $offsetExpr->getOriginal()
-                            );
-                    }
-                    break;
-
-                default:
-                    throw new CompilerException(
-                        sprintf('Value: %s cannot be used as array index', $offsetExpr->getType()),
-                        $offsetExpr->getOriginal()
-                    );
-            }
-        }
-
-        return [$keys, $offsetItems, $numberParams];
-    }
-}
diff --git a/Library/BaseBackend.php b/Library/BaseBackend.php
deleted file mode 100644
index 9a45e42db7..0000000000
--- a/Library/BaseBackend.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir;
-
-use Zephir\Fcall\FcallAwareInterface;
-use Zephir\Fcall\FcallManagerInterface;
-
-abstract class BaseBackend implements FcallAwareInterface
-{
-    /** @var Config */
-    protected $config;
-
-    /**
-     * The name of the backend (e.g. ZendEngine2).
-     *
-     * @var string
-     */
-    protected $name;
-
-    /** @var FcallManagerInterface */
-    protected $fcallManager;
-
-    /** @var string */
-    protected $kernelsPath;
-
-    /** @var string */
-    protected $templatesPath;
-
-    /**
-     * BaseBackend constructor.
-     *
-     * @param Config $config
-     * @param string $kernelsPath
-     * @param string $templatesPath
-     */
-    public function __construct(Config $config, $kernelsPath, $templatesPath)
-    {
-        $this->config = $config;
-        $this->kernelsPath = $kernelsPath;
-        $this->templatesPath = $templatesPath;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Resolves the path to the source kernel files of the backend.
-     *
-     * @return string
-     */
-    public function getInternalKernelPath(): string
-    {
-        return "$this->kernelsPath/{$this->name}";
-    }
-
-    /**
-     * Resolves the path to the source template files of the backend.
-     *
-     * @return string
-     */
-    public function getInternalTemplatePath(): string
-    {
-        return "$this->templatesPath/{$this->name}";
-    }
-
-    /**
-     * Resolves the path to the source template file of the backend.
-     *
-     * @param string $filename
-     *
-     * @return string
-     */
-    public function getTemplateFileContents(string $filename): string
-    {
-        $templatePath = rtrim((string) $this->config->get('templatepath', 'backend'), '\\/');
-        if (empty($templatepath)) {
-            $templatePath = $this->templatesPath;
-        }
-
-        return file_get_contents("{$templatePath}/{$this->name}/{$filename}");
-    }
-
-    /**
-     * @return StringsManager
-     */
-    abstract public function getStringsManager();
-
-    abstract public function getTypeDefinition($type);
-
-    /**
-     * Checks the type of a variable using the ZendEngine constants.
-     *
-     * @param Variable           $variableVariable
-     * @param string             $operator
-     * @param string             $value
-     * @param CompilationContext $context
-     *
-     * @return string
-     */
-    abstract public function getTypeofCondition(
-        Variable $variableVariable,
-        string $operator,
-        string $value,
-        CompilationContext $context
-    ): string;
-
-    /**
-     * Initialize variable defaults.
-     *
-     * @param Variable[]         $variables
-     * @param CompilationContext $context
-     *
-     * @return string
-     */
-    abstract public function initializeVariableDefaults(array $variables, CompilationContext $context): string;
-
-    abstract public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable);
-
-    /**
-     * Returns the signature of an internal method.
-     *
-     * @param ClassMethod        $method
-     * @param CompilationContext $context
-     *
-     * @return string
-     */
-    abstract public function getInternalSignature(ClassMethod $method, CompilationContext $context): string;
-
-    abstract public function checkStrictType($type, $var, CompilationContext $context);
-
-    abstract public function getBoolCode(Variable $variable, CompilationContext $context, $useCodePrinter = true);
-
-    /**
-     * Creates a temporary variable to be used to point to a heap variable.
-     *
-     * @param string             $type
-     * @param CompilationContext $compilationContext
-     * @param bool               $isLocal
-     *
-     * @return Variable
-     */
-    abstract public function getScalarTempVariable(
-        string $type,
-        CompilationContext $compilationContext,
-        $isLocal = true
-    ): Variable;
-
-    abstract public function declareConstant($type, $name, $value, CompilationContext $context);
-
-    /**
-     * Assign value to variable.
-     *
-     * @param Variable             $variable
-     * @param string|Variable|null $value
-     * @param CompilationContext   $context
-     * @param bool                 $useCodePrinter
-     *
-     * @return string
-     */
-    abstract public function assignString(
-        Variable $variable,
-        $value,
-        CompilationContext $context,
-        bool $useCodePrinter = true
-    ): string;
-
-    abstract public function assignLong(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true);
-
-    abstract public function assignDouble(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true);
-
-    abstract public function assignBool(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true);
-
-    abstract public function assignNull(Variable $variable, CompilationContext $context, $useCodePrinter = true);
-
-    abstract public function assignZval(Variable $variable, $code, CompilationContext $context);
-
-    abstract public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context);
-
-    abstract public function returnString($value, CompilationContext $context, $useCodePrinter = true);
-
-    /**
-     * Generate the code to initialize array typed variable.
-     *
-     * @param Variable           $variable
-     * @param CompilationContext $context
-     * @param int                $size
-     *
-     * @return void
-     */
-    abstract public function initArray(Variable $variable, CompilationContext $context, int $size = null);
-
-    abstract public function createClosure(Variable $variable, $classDefinition, CompilationContext $context);
-
-    abstract public function addArrayEntry(Variable $variable, $key, $value, CompilationContext $context, $statement = null, $useCodePrinter = true);
-
-    abstract public function updateArray(Variable $symbolVariable, $key, $value, CompilationContext $compilationContext, $flags = null);
-
-    abstract public function initObject(Variable $variable, $ce, CompilationContext $context, $useCodePrinter = true);
-
-    abstract public function initVar(Variable $variable, CompilationContext $context, $useCodePrinter = true, $second = false);
-
-    abstract public function zvalOperator($zvalOperator, Variable $expected, Variable $variableLeft, Variable $variableRight, CompilationContext $compilationContext);
-
-    abstract public function fetchGlobal(Variable $globalVar, CompilationContext $compilationContext, $useCodePrinter = true);
-
-    abstract public function fetchClass(Variable $var, $name, $guarded, CompilationContext $context);
-
-    /**
-     * Fetch object's property.
-     *
-     * @param Variable           $symbolVariable
-     * @param Variable           $variableVariable
-     * @param Variable|string    $property
-     * @param bool               $readOnly
-     * @param CompilationContext $context
-     */
-    abstract public function fetchProperty(
-        Variable $symbolVariable,
-        Variable $variableVariable,
-        $property,
-        $readOnly,
-        CompilationContext $context
-    );
-
-    abstract public function fetchStaticProperty(Variable $symbolVariable, $classDefinition, $property, $readOnly, CompilationContext $context);
-
-    /**
-     * Update object property.
-     *
-     * object->property = value
-     *
-     * @param Variable           $variable
-     * @param string|Variable    $property
-     * @param mixed              $value
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    abstract public function updateProperty(Variable $variable, $property, $value, CompilationContext $context);
-
-    abstract public function updateStaticProperty($classEntry, $property, $value, CompilationContext $context);
-
-    abstract public function addStaticProperty($classEntry, $property, $value, CompilationContext $context);
-
-    abstract public function subStaticProperty($classEntry, $property, $value, CompilationContext $context);
-
-    abstract public function assignArrayProperty(Variable $variable, $property, $key, $value, CompilationContext $context);
-
-    abstract public function checkConstructor(Variable $var, CompilationContext $context);
-
-    /* Method calling */
-    abstract public function callDynamicFunction($symbolVariable, Variable $variable, CompilationContext $compilationContext, $params = [], $cache = 'NULL', $cacheSlot = 0);
-
-    abstract public function callMethod($symbolVariable, Variable $variable, $methodName, $cachePointer, $params, CompilationContext $context);
-
-    /* Read from array */
-    abstract public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayAccess, CompilationContext $context, $useCodePrinter = true);
-
-    abstract public function arrayIsset(Variable $var, $resolvedExpr, $expression, CompilationContext $context);
-
-    abstract public function arrayIssetFetch(Variable $target, Variable $var, $resolvedExpr, $flags, $expression, CompilationContext $context);
-
-    abstract public function propertyIsset(Variable $var, $key, CompilationContext $context);
-
-    /* Unset array */
-    abstract public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationContext $context);
-
-    /* Array update multi */
-    abstract public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExprs, CompilationContext $context);
-
-    abstract public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $propertyName, $offsetExprs, CompilationContext $context);
-
-    abstract public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext);
-
-    abstract public function maybeSeparate(Variable $variableTempSeparated, Variable $variable, CompilationContext $context);
-
-    abstract public function setSymbolIfSeparated(Variable $variableTempSeparated, Variable $variable, CompilationContext $context);
-
-    abstract public function fetchClassEntry($str);
-
-    abstract public function copyOnWrite(Variable $target, $var, CompilationContext $context);
-
-    abstract public function ifVariableValueUndefined(Variable $var, CompilationContext $context, $onlyBody = false, $useCodePrinter = true);
-
-    /* For statement */
-    abstract public function forStatement(Variable $exprVariable, $keyVariable, $variable, $duplicateKey, $duplicateHash, $statement, $statementBlock, CompilationContext $context);
-
-    abstract public function forStatementIterator(Variable $iteratorVariable, Variable $targetVariable, CompilationContext $compilationContext);
-
-    abstract public function destroyIterator(Variable $iteratorVariable, CompilationContext $context);
-
-    abstract public function onPreInitVar(ClassMethod $method, CompilationContext $context): string;
-
-    abstract public function onPreCompile(ClassMethod $method, CompilationContext $context);
-
-    abstract public function onPostCompile(ClassMethod $method, CompilationContext $context);
-
-    /**
-     * @param Variable $variable
-     *
-     * @return string
-     */
-    abstract public function getVariableCode(Variable $variable): string;
-
-    /**
-     * Get a double pointer to the variable.
-     *
-     * @param Variable $variable
-     *
-     * @return string
-     */
-    abstract public function getVariableCodePointer(Variable $variable);
-
-    abstract public function resolveValue($value, CompilationContext $context, $usePointer = false);
-
-    public static function getActiveBackend()
-    {
-        if (version_compare(PHP_VERSION, '7.0', '>=')) {
-            return 'ZendEngine3';
-        }
-
-        return 'ZendEngine2';
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param FcallManagerInterface $fcallManager
-     */
-    public function setFcallManager(FcallManagerInterface $fcallManager)
-    {
-        $this->fcallManager = $fcallManager;
-    }
-}
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 95dd041ed2..1e839ce79d 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -14,6 +14,7 @@
 namespace Zephir;
 
 use Psr\Log\LoggerInterface;
+use Zephir\Backend\Backend;
 use Zephir\Cache\FunctionCache;
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
@@ -179,9 +180,9 @@ class CompilationContext
     /**
      * The current backend.
      *
-     * @var BaseBackend|null
+     * @var Backend|null
      */
-    public ?BaseBackend $backend = null;
+    public ?Backend $backend = null;
 
     /**
      * Transform class/interface name to FQN format.
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 1c4f125138..dfb978150d 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -19,6 +19,8 @@
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use ReflectionException;
+use Zephir\Backend\Backend;
+use Zephir\Backend\StringsManager;
 use Zephir\Code\Builder\Struct;
 use Zephir\Compiler\CompilerFileFactory;
 use Zephir\Compiler\FileInterface;
@@ -30,13 +32,11 @@
 use Zephir\Exception\RuntimeException;
 use Zephir\Fcall\FcallManagerInterface;
 use Zephir\FileSystem\FileSystemInterface;
-
 use function count;
 use function dirname;
 use function extension_loaded;
 use function is_array;
 use function is_string;
-
 use const DIRECTORY_SEPARATOR;
 
 final class Compiler
@@ -44,9 +44,9 @@ final class Compiler
     use LoggerAwareTrait;
 
     /**
-     * @var BaseBackend
+     * @var Backend
      */
-    public BaseBackend $backend;
+    public Backend $backend;
 
     /**
      * @var FunctionDefinition[]
@@ -151,7 +151,7 @@ final class Compiler
      * Compiler constructor.
      *
      * @param Config              $config
-     * @param BaseBackend         $backend
+     * @param Backend         $backend
      * @param Parser\Manager      $manager
      * @param FileSystemInterface $filesystem
      * @param CompilerFileFactory $compilerFileFactory
@@ -160,7 +160,7 @@ final class Compiler
      */
     public function __construct(
         Config $config,
-        BaseBackend $backend,
+        Backend $backend,
         Parser\Manager $manager,
         FileSystemInterface $filesystem,
         CompilerFileFactory $compilerFileFactory
@@ -172,7 +172,7 @@ public function __construct(
         $this->compilerFileFactory = $compilerFileFactory;
         $this->logger = new NullLogger();
 
-        $this->stringManager = $this->backend->getStringsManager();
+        $this->stringManager = new StringsManager();
         $this->fcallManager = $this->backend->getFcallManager();
 
         try {
diff --git a/Library/Console/Command/ApiCommand.php b/Library/Console/Command/ApiCommand.php
index e19477ac6b..578ff463dc 100644
--- a/Library/Console/Command/ApiCommand.php
+++ b/Library/Console/Command/ApiCommand.php
@@ -99,13 +99,6 @@ protected function createDefinition(): InputDefinition
     {
         return new InputDefinition(
             [
-                new InputOption(
-                    'backend',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Used backend to generate HTML API for the extension',
-                    'ZendEngine3'
-                ),
                 new InputOption(
                     'path',
                     'p',
diff --git a/Library/Console/Command/BuildCommand.php b/Library/Console/Command/BuildCommand.php
index 6d45ca491c..a7f10a0aac 100644
--- a/Library/Console/Command/BuildCommand.php
+++ b/Library/Console/Command/BuildCommand.php
@@ -47,7 +47,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $arguments = [
             'command' => 'generate',
-            '--backend' => $input->getOption('backend'),
         ];
 
         try {
@@ -64,7 +63,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $arguments = [
             'command' => 'compile',
-            '--backend' => $input->getOption('backend'),
             '--dev' => $this->isDevelopmentModeEnabled($input),
         ];
 
@@ -96,17 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     protected function createDefinition(): InputDefinition
     {
-        return new InputDefinition(
-            [
-                new InputOption(
-                    'backend',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Used backend to build extension',
-                    'ZendEngine3'
-                ),
-            ]
-        );
+        return new InputDefinition([]);
     }
 
     /**
diff --git a/Library/Console/Command/CompileCommand.php b/Library/Console/Command/CompileCommand.php
index c53372f917..d5e7bcf695 100644
--- a/Library/Console/Command/CompileCommand.php
+++ b/Library/Console/Command/CompileCommand.php
@@ -73,17 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
     protected function createDefinition(): InputDefinition
     {
-        return new InputDefinition(
-            [
-                new InputOption(
-                    'backend',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Used backend to compile extension',
-                    'ZendEngine3'
-                ),
-            ]
-        );
+        return new InputDefinition([]);
     }
 
     /**
diff --git a/Library/Console/Command/GenerateCommand.php b/Library/Console/Command/GenerateCommand.php
index 8ca92df7e3..a05cd17d86 100644
--- a/Library/Console/Command/GenerateCommand.php
+++ b/Library/Console/Command/GenerateCommand.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Console\Command;
 
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -48,7 +47,6 @@ protected function configure()
         $this
             ->setName('generate')
             ->setDescription('Generates C code from the Zephir code without compiling it')
-            ->setDefinition($this->createDefinition())
             ->addOption('trace', 't', InputOption::VALUE_NONE, 'Show trace message output (in case of exception error)')
             ->setHelp(sprintf('%s.', $this->getDescription()).PHP_EOL.PHP_EOL.$this->getZflagsHelp());
     }
@@ -101,19 +99,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-
-    protected function createDefinition(): InputDefinition
-    {
-        return new InputDefinition(
-            [
-                new InputOption(
-                    'backend',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Used backend to generate extension',
-                    'ZendEngine3'
-                ),
-            ]
-        );
-    }
 }
diff --git a/Library/Console/Command/InitCommand.php b/Library/Console/Command/InitCommand.php
index 63f1bf2105..ccda306918 100644
--- a/Library/Console/Command/InitCommand.php
+++ b/Library/Console/Command/InitCommand.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Zephir\BaseBackend;
+use Zephir\Backend\Backend;
 use Zephir\Config;
 
 use function chdir;
@@ -30,7 +30,6 @@
 use function is_readable;
 use function mkdir;
 use function preg_match;
-
 use const DIRECTORY_SEPARATOR;
 
 /**
@@ -40,11 +39,11 @@
  */
 final class InitCommand extends AbstractCommand
 {
-    private BaseBackend $backend;
+    private Backend $backend;
     private Config $config;
     private LoggerInterface $logger;
 
-    public function __construct(BaseBackend $backend, Config $config, LoggerInterface $logger)
+    public function __construct(Backend $backend, Config $config, LoggerInterface $logger)
     {
         $this->backend = $backend;
         $this->config = $config;
@@ -53,7 +52,7 @@ public function __construct(BaseBackend $backend, Config $config, LoggerInterfac
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('init')
@@ -62,7 +61,7 @@ protected function configure()
             ->setHelp(sprintf('%s.', $this->getDescription()));
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $namespace = $this->sanitizeNamespace($input->getArgument('namespace'));
 
@@ -87,7 +86,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Copy the latest kernel files
         $this->recursiveProcess($this->backend->getInternalKernelPath(), 'ext/kernel');
-
         // Dump initial configuration on project creation
         $this->config->dumpToFile();
 
@@ -103,13 +101,6 @@ protected function createDefinition(): InputDefinition
                     InputArgument::REQUIRED,
                     'The extension namespace'
                 ),
-                new InputOption(
-                    'backend',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Used backend to create extension',
-                    'ZendEngine3'
-                ),
             ]
         );
     }
@@ -139,9 +130,9 @@ private function sanitizeNamespace(string $namespace): string
      * @param string|null $pattern
      * @param string      $callback
      *
-     * @return bool
+     * @return void
      */
-    private function recursiveProcess(string $src, string $dst, ?string $pattern = null, string $callback = 'copy'): bool
+    private function recursiveProcess(string $src, string $dst, ?string $pattern = null, string $callback = 'copy'): void
     {
         $success = true;
         $iterator = new DirectoryIterator($src);
@@ -167,7 +158,5 @@ private function recursiveProcess(string $src, string $dst, ?string $pattern = n
                 $success = $success && $callback($pathName, $path);
             }
         }
-
-        return $success;
     }
 }
diff --git a/Library/Console/Command/StubsCommand.php b/Library/Console/Command/StubsCommand.php
index 6e0d6602ae..3613595b4a 100644
--- a/Library/Console/Command/StubsCommand.php
+++ b/Library/Console/Command/StubsCommand.php
@@ -15,7 +15,6 @@
 
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zephir\Compiler;
@@ -66,16 +65,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     protected function createDefinition(): InputDefinition
     {
-        return new InputDefinition(
-            [
-                new InputOption(
-                    'backend',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Used backend to generate stubs for the extension',
-                    'ZendEngine3'
-                ),
-            ]
-        );
+        return new InputDefinition([]);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php b/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
index e1031cf49a..102130fd20 100644
--- a/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -64,11 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        if ('ZendEngine2' == $context->backend->getName()) {
-            $context->codePrinter->output('zephir_stripcslashes('.$symbol.', '.$resolvedParams[0].');');
-        } else {
-            $context->codePrinter->output('zephir_stripcslashes('.$symbol.', '.$resolvedParams[0].');');
-        }
+        $context->codePrinter->output('zephir_stripcslashes('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/Library/Optimizers/FunctionCall/StripslashesOptimizer.php b/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
index 1095fe306b..6bf84bbce6 100644
--- a/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -63,11 +63,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        if ('ZendEngine2' == $context->backend->getName()) {
-            $context->codePrinter->output('zephir_stripslashes('.$symbol.', '.$resolvedParams[0].');');
-        } else {
-            $context->codePrinter->output('zephir_stripslashes('.$symbol.', '.$resolvedParams[0].');');
-        }
+        $context->codePrinter->output('zephir_stripslashes('.$symbol.', '.$resolvedParams[0].');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/kernels/ZendEngine3/README.md b/kernel/README.md
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/README.md
rename to kernel/README.md
diff --git a/kernels/ZendEngine3/array.c b/kernel/array.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/array.c
rename to kernel/array.c
diff --git a/kernels/ZendEngine3/array.h b/kernel/array.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/array.h
rename to kernel/array.h
diff --git a/kernels/ZendEngine3/backtrace.c b/kernel/backtrace.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/backtrace.c
rename to kernel/backtrace.c
diff --git a/kernels/ZendEngine3/backtrace.h b/kernel/backtrace.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/backtrace.h
rename to kernel/backtrace.h
diff --git a/kernels/ZendEngine3/debug.c b/kernel/debug.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/debug.c
rename to kernel/debug.c
diff --git a/kernels/ZendEngine3/debug.h b/kernel/debug.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/debug.h
rename to kernel/debug.h
diff --git a/kernels/ZendEngine3/exception.c b/kernel/exception.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/exception.c
rename to kernel/exception.c
diff --git a/kernels/ZendEngine3/exception.h b/kernel/exception.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/exception.h
rename to kernel/exception.h
diff --git a/kernels/ZendEngine3/exit.c b/kernel/exit.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/exit.c
rename to kernel/exit.c
diff --git a/kernels/ZendEngine3/exit.h b/kernel/exit.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/exit.h
rename to kernel/exit.h
diff --git a/kernels/ZendEngine3/fcall.c b/kernel/fcall.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/fcall.c
rename to kernel/fcall.c
diff --git a/kernels/ZendEngine3/fcall.h b/kernel/fcall.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/fcall.h
rename to kernel/fcall.h
diff --git a/kernels/ZendEngine3/file.c b/kernel/file.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/file.c
rename to kernel/file.c
diff --git a/kernels/ZendEngine3/file.h b/kernel/file.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/file.h
rename to kernel/file.h
diff --git a/kernels/ZendEngine3/filter.c b/kernel/filter.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/filter.c
rename to kernel/filter.c
diff --git a/kernels/ZendEngine3/filter.h b/kernel/filter.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/filter.h
rename to kernel/filter.h
diff --git a/kernels/ZendEngine3/globals.h b/kernel/globals.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/globals.h
rename to kernel/globals.h
diff --git a/kernels/ZendEngine3/iterator.c b/kernel/iterator.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/iterator.c
rename to kernel/iterator.c
diff --git a/kernels/ZendEngine3/iterator.h b/kernel/iterator.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/iterator.h
rename to kernel/iterator.h
diff --git a/kernels/ZendEngine3/main.c b/kernel/main.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/main.c
rename to kernel/main.c
diff --git a/kernels/ZendEngine3/main.h b/kernel/main.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/main.h
rename to kernel/main.h
diff --git a/kernels/ZendEngine3/math.c b/kernel/math.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/math.c
rename to kernel/math.c
diff --git a/kernels/ZendEngine3/math.h b/kernel/math.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/math.h
rename to kernel/math.h
diff --git a/kernels/ZendEngine3/memory.c b/kernel/memory.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/memory.c
rename to kernel/memory.c
diff --git a/kernels/ZendEngine3/memory.h b/kernel/memory.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/memory.h
rename to kernel/memory.h
diff --git a/kernels/ZendEngine3/object.c b/kernel/object.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/object.c
rename to kernel/object.c
diff --git a/kernels/ZendEngine3/object.h b/kernel/object.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/object.h
rename to kernel/object.h
diff --git a/kernels/ZendEngine3/operators.c b/kernel/operators.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/operators.c
rename to kernel/operators.c
diff --git a/kernels/ZendEngine3/operators.h b/kernel/operators.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/operators.h
rename to kernel/operators.h
diff --git a/kernels/ZendEngine3/require.c b/kernel/require.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/require.c
rename to kernel/require.c
diff --git a/kernels/ZendEngine3/require.h b/kernel/require.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/require.h
rename to kernel/require.h
diff --git a/kernels/ZendEngine3/string.c b/kernel/string.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/string.c
rename to kernel/string.c
diff --git a/kernels/ZendEngine3/string.h b/kernel/string.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/string.h
rename to kernel/string.h
diff --git a/kernels/ZendEngine3/time.c b/kernel/time.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/time.c
rename to kernel/time.c
diff --git a/kernels/ZendEngine3/time.h b/kernel/time.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/time.h
rename to kernel/time.h
diff --git a/kernels/ZendEngine3/variables.c b/kernel/variables.c
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/variables.c
rename to kernel/variables.c
diff --git a/kernels/ZendEngine3/variables.h b/kernel/variables.h
old mode 100755
new mode 100644
similarity index 100%
rename from kernels/ZendEngine3/variables.h
rename to kernel/variables.h
diff --git a/templates/ZendEngine3/clean b/templates/engine/clean
similarity index 100%
rename from templates/ZendEngine3/clean
rename to templates/engine/clean
diff --git a/templates/ZendEngine3/config.m4 b/templates/engine/config.m4
similarity index 100%
rename from templates/ZendEngine3/config.m4
rename to templates/engine/config.m4
diff --git a/templates/ZendEngine3/config.w32 b/templates/engine/config.w32
similarity index 100%
rename from templates/ZendEngine3/config.w32
rename to templates/engine/config.w32
diff --git a/templates/ZendEngine3/ext.h b/templates/engine/ext.h
similarity index 100%
rename from templates/ZendEngine3/ext.h
rename to templates/engine/ext.h
diff --git a/templates/ZendEngine3/ext_config.h b/templates/engine/ext_config.h
similarity index 100%
rename from templates/ZendEngine3/ext_config.h
rename to templates/engine/ext_config.h
diff --git a/templates/ZendEngine3/install b/templates/engine/install
similarity index 100%
rename from templates/ZendEngine3/install
rename to templates/engine/install
diff --git a/templates/ZendEngine3/php_ext.h b/templates/engine/php_ext.h
similarity index 100%
rename from templates/ZendEngine3/php_ext.h
rename to templates/engine/php_ext.h
diff --git a/templates/ZendEngine3/php_project.h b/templates/engine/php_project.h
similarity index 100%
rename from templates/ZendEngine3/php_project.h
rename to templates/engine/php_project.h
diff --git a/templates/ZendEngine3/pkg-config-check.m4 b/templates/engine/pkg-config-check.m4
similarity index 100%
rename from templates/ZendEngine3/pkg-config-check.m4
rename to templates/engine/pkg-config-check.m4
diff --git a/templates/ZendEngine3/pkg-config.m4 b/templates/engine/pkg-config.m4
similarity index 100%
rename from templates/ZendEngine3/pkg-config.m4
rename to templates/engine/pkg-config.m4
diff --git a/templates/ZendEngine3/project.c b/templates/engine/project.c
similarity index 100%
rename from templates/ZendEngine3/project.c
rename to templates/engine/project.c
diff --git a/templates/ZendEngine3/project.h b/templates/engine/project.h
similarity index 100%
rename from templates/ZendEngine3/project.h
rename to templates/engine/project.h
diff --git a/tests/Zephir/Backends/ZendEngine3/BackendTest.php b/tests/Zephir/Backends/ZendEngine3/BackendTest.php
index 41b8b6fd29..bd5bbd39df 100644
--- a/tests/Zephir/Backends/ZendEngine3/BackendTest.php
+++ b/tests/Zephir/Backends/ZendEngine3/BackendTest.php
@@ -14,7 +14,7 @@
 namespace Zephir\Test\Backends\ZendEngine3;
 
 use PHPUnit\Framework\TestCase;
-use Zephir\Backends\ZendEngine3\Backend;
+use Zephir\Backend\Backend;
 use Zephir\CompilationContext;
 use Zephir\Config;
 use Zephir\Variable;
diff --git a/tests/Zephir/CompilerFile/CheckDependenciesTest.php b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
index 1201582e70..14175745f0 100644
--- a/tests/Zephir/CompilerFile/CheckDependenciesTest.php
+++ b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
@@ -17,7 +17,7 @@
 use Psr\Log\Test\TestLogger;
 use ReflectionException;
 use Zephir\AliasManager;
-use Zephir\Backends\ZendEngine3\Backend;
+use Zephir\Backend\Backend;
 use Zephir\Compiler;
 use Zephir\CompilerFile;
 use Zephir\Config;
@@ -34,7 +34,7 @@ public function testExtendsClassThatDoesNotExist(): void
     {
         $logger = new TestLogger();
         $config = new Config();
-        $backend = new Backend($config, 'kernels', 'templates');
+        $backend = new Backend($config, 'kernel', 'templates');
         $disk = new HardDisk(realpath('..').'/tests/output');
         $compilerFactory = new Compiler\CompilerFileFactory($config, $disk, $logger);
 
diff --git a/tests/sharness/t0002-generate.sh b/tests/sharness/t0002-generate.sh
index 651f4ccb2a..fff3dddc4f 100755
--- a/tests/sharness/t0002-generate.sh
+++ b/tests/sharness/t0002-generate.sh
@@ -9,7 +9,7 @@ source ./setup.sh
 test_expect_success "Should correctly specify ARGINFO" "
   cd $FIXTURESDIR/typehints &&
   zephirc fullclean 2>&1 >/dev/null &&
-  zephirc generate --backend=ZendEngine3 2>&1 >/dev/null &&
+  zephirc generate 2>&1 >/dev/null &&
   test_cmp ext/typehints.c expected3.c &&
   test_cmp ext/typehints/args.zep.h expected_args3.h &&
   test_cmp ext/typehints/retval.zep.h expected_retval3.h &&
@@ -19,7 +19,7 @@ test_expect_success "Should correctly specify ARGINFO" "
 test_expect_success "Life Cycle Test" "
   cd $FIXTURESDIR/lifecycle &&
   zephirc fullclean 2>&1 >/dev/null &&
-  zephirc generate --backend=ZendEngine3 2>&1 >/dev/null &&
+  zephirc generate 2>&1 >/dev/null &&
   test_cmp ext/lifecycle.c expected3.c
 "
 
@@ -27,7 +27,7 @@ test_expect_success "Life Cycle Test" "
 test_expect_success "Should generate valid code with inheritance of prototype interfaces" "
   cd $FIXTURESDIR/protodir &&
   zephirc fullclean 2>&1 >/dev/null &&
-  zephirc generate --backend=ZendEngine3 2>&1 >/dev/null &&
+  zephirc generate 2>&1 >/dev/null &&
   test_cmp ext/protodir/connectionexception.zep.h connectionexception.h
 "
 
diff --git a/zephir b/zephir
index 22e654a3db..76e90909f4 100755
--- a/zephir
+++ b/zephir
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
-use Zephir\Backends\BackendFactory;
+use Zephir\Backend\Backend;
 use Zephir\Compiler;
 use Zephir\Config;
 use Zephir\Console\Application;
@@ -107,8 +107,7 @@ $logger = new Logger('zephir', [
     $consoleStdOutHandler,
 ]);
 $compilerFactory = new Compiler\CompilerFileFactory($config, $disk, $logger);
-$backend = (new BackendFactory($config, $rootPath.'/kernels', $rootPath.'/templates'))
-    ->createBackend();
+$backend = new Backend($config, $rootPath.'/kernel', $rootPath.'/templates');
 
 $compiler = new Compiler($config, $backend, new Manager($parser), $disk, $compilerFactory);
 $compiler->setPrototypesPath($rootPath.'/prototypes');

From e9a8831f3d3360c6a8baffedee3ea3504a7df6f1 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 13:55:27 +0100
Subject: [PATCH 023/375] #2407 - Adjust test case

---
 tests/Zephir/Backends/ZendEngine3/BackendTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Zephir/Backends/ZendEngine3/BackendTest.php b/tests/Zephir/Backends/ZendEngine3/BackendTest.php
index bd5bbd39df..dbe6ce76ca 100644
--- a/tests/Zephir/Backends/ZendEngine3/BackendTest.php
+++ b/tests/Zephir/Backends/ZendEngine3/BackendTest.php
@@ -41,7 +41,7 @@ public function stringDataProvider(): array
      */
     public function testShouldEscapeStringWithRegexp(string $testString, string $expectedString): void
     {
-        $backend = new Backend(new Config(), null, null);
+        $backend = new Backend(new Config(), '', '');
         $variable = new Variable('variable', 'name');
         $context = new CompilationContext();
 

From 0c1d61e28b53107182fb7e03ef2a2ca03ca7a083 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Thu, 31 Aug 2023 14:12:02 +0100
Subject: [PATCH 024/375] #2407 - Remove wrapped method
 `getVariableCodePointer()`

---
 Library/Backend/Backend.php                   | 36 +++++++------------
 Library/FunctionCall.php                      |  2 +-
 Library/MethodCall.php                        |  2 +-
 Library/Operators/Other/FetchOperator.php     |  4 +--
 .../Operators/Other/RequireOnceOperator.php   |  2 +-
 Library/Operators/Other/RequireOperator.php   |  2 +-
 .../FunctionCall/StrReplaceOptimizer.php      |  2 +-
 .../FunctionCall/VarDumpOptimizer.php         |  2 +-
 .../FunctionCall/VarExportOptimizer.php       |  2 +-
 Library/StaticCall.php                        |  8 ++---
 10 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 45e2442e75..767647f547 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -33,8 +33,6 @@ class Backend
     protected FcallManagerInterface $fcallManager;
 
     /**
-     * BaseBackend constructor.
-     *
      * @param Config $config
      * @param string $kernelsPath
      * @param string $templatesPath
@@ -135,16 +133,6 @@ public function getVariableCode(Variable $variable): string
         return '&'.$variable->getName();
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * TODO: Do we need this method at all?
-     */
-    public function getVariableCodePointer(Variable $variable)
-    {
-        return $this->getVariableCode($variable);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -800,7 +788,7 @@ public function arrayIssetFetch(Variable $target, Variable $var, $resolvedExpr,
 
     public function arrayIssetFetch2(Variable $target, Variable $var, $resolvedExpr, $flags, $expression, CompilationContext $context)
     {
-        $code = $this->getVariableCodePointer($target).', '.$this->getVariableCode($var);
+        $code = $this->getVariableCode($target).', '.$this->getVariableCode($var);
 
         if (!($resolvedExpr instanceof Variable)) {
             if ('string' === $resolvedExpr->getType()) {
@@ -829,7 +817,7 @@ public function propertyIsset(Variable $var, $key, CompilationContext $context)
     public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationContext $context)
     {
         $context->headersManager->add('kernel/array');
-        $variableCode = $this->getVariableCodePointer($variable);
+        $variableCode = $this->getVariableCode($variable);
         if ('string' == $exprIndex->getType()) {
             $context->codePrinter->output('zephir_array_unset_string('.$variableCode.', SL("'.$exprIndex->getCode().'"), '.$flags.');');
 
@@ -842,7 +830,7 @@ public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationCo
     public function arrayUnset2(Variable $variable, $exprIndex, $flags, CompilationContext $context)
     {
         $context->headersManager->add('kernel/array');
-        $variableCode = $this->getVariableCodePointer($variable);
+        $variableCode = $this->getVariableCode($variable);
         switch ($exprIndex->getType()) {
             case 'int':
             case 'uint':
@@ -1379,7 +1367,7 @@ public function initArray(Variable $variable, CompilationContext $context, ?int
 
     public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context)
     {
-        $variable = $this->getVariableCodePointer($variable);
+        $variable = $this->getVariableCode($variable);
         $itemVariable = $this->getVariableCode($itemVariable);
         $context->codePrinter->output('zephir_concat_self('.$variable.', '.$itemVariable.');');
     }
@@ -1395,13 +1383,13 @@ public function updateArray(Variable $symbolVariable, $key, $value, CompilationC
             switch ($key->getType()) {
                 case 'string':
                 case 'variable':
-                    $compilationContext->codePrinter->output('zephir_array_update_zval('.$this->getVariableCodePointer($symbolVariable).', '.$this->getVariableCode($key).', '.$value.', '.$flags.');');
+                    $compilationContext->codePrinter->output('zephir_array_update_zval('.$this->getVariableCode($symbolVariable).', '.$this->getVariableCode($key).', '.$value.', '.$flags.');');
                     break;
 
                 case 'int':
                 case 'uint':
                 case 'long':
-                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCodePointer($symbolVariable).', '.$key->getName().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
+                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCode($symbolVariable).', '.$key->getName().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
                     break;
 
                 default:
@@ -1410,11 +1398,11 @@ public function updateArray(Variable $symbolVariable, $key, $value, CompilationC
         } elseif ($key instanceof CompiledExpression) {
             switch ($key->getType()) {
                 case 'string':
-                    $compilationContext->codePrinter->output('zephir_array_update_string('.$this->getVariableCodePointer($symbolVariable).', SL("'.$key->getCode().'"), '.$value.', '.$flags.');');
+                    $compilationContext->codePrinter->output('zephir_array_update_string('.$this->getVariableCode($symbolVariable).', SL("'.$key->getCode().'"), '.$value.', '.$flags.');');
                     break;
 
                 case 'int':
-                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCodePointer($symbolVariable).', '.$key->getCode().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
+                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCode($symbolVariable).', '.$key->getCode().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
                     break;
 
                 case 'variable':
@@ -1471,7 +1459,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
                 );
         }
         if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
-            $output = 'zephir_array_fetch('.$this->getVariableCodePointer($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
+            $output = 'zephir_array_fetch('.$this->getVariableCode($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
         } else {
             if ($isVariable) {
                 $indexAccess = $this->getVariableCode($index);
@@ -1481,7 +1469,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
                     $indexAccess = 'SL("'.$indexAccess.'")';
                 }
             }
-            $output = 'zephir_array_fetch_'.$type.'('.$this->getVariableCodePointer($var).', '.$this->getVariableCode($src).', '.$indexAccess.', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
+            $output = 'zephir_array_fetch_'.$type.'('.$this->getVariableCode($var).', '.$this->getVariableCode($src).', '.$indexAccess.', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
         }
 
         if ($useCodePrinter) {
@@ -1496,7 +1484,7 @@ public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExp
         list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
 
         $symbol = $this->resolveValue($symbolVariable, $compilationContext, true);
-        $varCode = $this->getVariableCodePointer($variable);
+        $varCode = $this->getVariableCode($variable);
         $compilationContext->codePrinter->output(
             sprintf(
                 'zephir_array_update_multi(%s, %s, SL("%s"), %d, %s);',
@@ -1559,7 +1547,7 @@ public function callDynamicFunction($symbolVariable, Variable $variable, Compila
         } elseif ('return_value' == $symbolVariable->getName()) {
             $context->codePrinter->output('ZEPHIR_RETURN_CALL_ZVAL_FUNCTION('.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
         } else {
-            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION('.$this->getVariableCodePointer($symbolVariable).', '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
+            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION('.$this->getVariableCode($symbolVariable).', '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
         }
     }
 
diff --git a/Library/FunctionCall.php b/Library/FunctionCall.php
index 61f418f23f..f6ea9c2887 100644
--- a/Library/FunctionCall.php
+++ b/Library/FunctionCall.php
@@ -443,7 +443,7 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
              * We don't know the exact dynamic type returned by the method call
              */
             $symbolVariable->setDynamicTypes('undefined');
-            $symbol = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
         /**
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index 66ae65c099..47995a1653 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -746,7 +746,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             } else {
                 //TODO: also move to backend
                 if ($isExpecting) {
-                    $symbolCode = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+                    $symbolCode = $compilationContext->backend->getVariableCode($symbolVariable);
                 }
                 $variableCode = $compilationContext->backend->getVariableCode($variableVariable);
                 $paramCount = \count($params);
diff --git a/Library/Operators/Other/FetchOperator.php b/Library/Operators/Other/FetchOperator.php
index 4bb93c1f57..b5076c3057 100644
--- a/Library/Operators/Other/FetchOperator.php
+++ b/Library/Operators/Other/FetchOperator.php
@@ -136,7 +136,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $property = $expression['right']['right']['value'];
 
                 $compilationContext->headersManager->add('kernel/object');
-                $symbol = $compilationContext->backend->getVariableCodePointer($variable);
+                $symbol = $compilationContext->backend->getVariableCode($variable);
                 $evalSymbol = $compilationContext->backend->getVariableCode($evalVariable);
 
                 return new CompiledExpression('bool', 'zephir_fetch_property('.$symbol.', '.$evalSymbol.', SL("'.$property.'"), PH_SILENT_CC)', $expression);
@@ -178,7 +178,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 $compilationContext->headersManager->add('kernel/object');
 
-                $symbol = $compilationContext->backend->getVariableCodePointer($variable);
+                $symbol = $compilationContext->backend->getVariableCode($variable);
                 $evalSymbol = $compilationContext->backend->getVariableCode($evalVariable);
                 $evalPropertySymbol = $compilationContext->backend->getVariableCode($evalVariableProperty);
 
diff --git a/Library/Operators/Other/RequireOnceOperator.php b/Library/Operators/Other/RequireOnceOperator.php
index d68f38b7d2..a28c72e4c3 100644
--- a/Library/Operators/Other/RequireOnceOperator.php
+++ b/Library/Operators/Other/RequireOnceOperator.php
@@ -68,7 +68,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         if ($symbolVariable) {
             $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&'.$symbolVariable->getName().');');
-            $symbol = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
             $codePrinter->output('if (zephir_require_once_zval_ret('.$symbol.', '.$exprVar.') == FAILURE) {');
         } else {
             $codePrinter->output('if (zephir_require_once_zval('.$exprVar.') == FAILURE) {');
diff --git a/Library/Operators/Other/RequireOperator.php b/Library/Operators/Other/RequireOperator.php
index 29ce296d2c..3f237536b1 100644
--- a/Library/Operators/Other/RequireOperator.php
+++ b/Library/Operators/Other/RequireOperator.php
@@ -68,7 +68,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         if ($symbolVariable) {
             $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&'.$symbolVariable->getName().');');
-            $symbol = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
             $codePrinter->output('if (zephir_require_zval_ret('.$symbol.', '.$exprVar.') == FAILURE) {');
         } else {
             $codePrinter->output('if (zephir_require_zval('.$exprVar.') == FAILURE) {');
diff --git a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php b/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
index 4b6e666a1f..0e6535308e 100644
--- a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
@@ -70,7 +70,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             }
         }
 
-        $symbol = $context->backend->getVariableCodePointer($symbolVariable);
+        $symbol = $context->backend->getVariableCode($symbolVariable);
 
         $context->codePrinter->output('zephir_fast_str_replace('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].');');
 
diff --git a/Library/Optimizers/FunctionCall/VarDumpOptimizer.php b/Library/Optimizers/FunctionCall/VarDumpOptimizer.php
index a628fedfee..2e3f204ab2 100644
--- a/Library/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/Library/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -86,7 +86,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);
             }
 
-            $symbol = $context->backend->getVariableCodePointer($variable);
+            $symbol = $context->backend->getVariableCode($variable);
             $context->codePrinter->output('zephir_var_dump('.$symbol.');');
         }
 
diff --git a/Library/Optimizers/FunctionCall/VarExportOptimizer.php b/Library/Optimizers/FunctionCall/VarExportOptimizer.php
index bd92e6cab0..f99f0c3d4f 100644
--- a/Library/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/Library/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -99,7 +99,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);
         }
-        $variableSymbol = $context->backend->getVariableCodePointer($variable);
+        $variableSymbol = $context->backend->getVariableCode($variable);
 
         /*
          * let a = var_export(val);
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index 86329d27e8..38052a1682 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -301,7 +301,7 @@ protected function call(
         }
 
         if ($symbolVariable) {
-            $symbol = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
         $paramCount = count($params);
@@ -462,7 +462,7 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
         }
 
         if ($symbolVariable) {
-            $symbol = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
         $paramCount = count($params);
@@ -556,7 +556,7 @@ protected function callFromDynamicClass($methodName, array $expression, $symbolV
         $classEntry = $classEntryVariable->getName();
 
         if ($symbolVariable) {
-            $symbol = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
         if (!count($params)) {
@@ -652,7 +652,7 @@ protected function callFromDynamicClassDynamicMethod(array $expression, $symbolV
         }
 
         if ($symbolVariable) {
-            $symbol = $compilationContext->backend->getVariableCodePointer($symbolVariable);
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
         if (!count($params)) {

From 3d469651f3cc6e93567e163ef860dbe462bebab8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 2 Sep 2023 20:17:33 +0100
Subject: [PATCH 025/375] #2407 - Mass code refactor and reformat

---
 Library/Backend/Backend.php                   |  91 +++------
 Library/Backend/FcallManager.php              |   8 +-
 Library/Backend/StringsManager.php            |  10 +-
 Library/BranchManager.php                     |  29 ++-
 Library/CacheManager.php                      |   2 +-
 Library/Call.php                              |  10 +-
 Library/ClassMethod.php                       |   3 +-
 Library/CompilationContext.php                |   6 +-
 Library/Console/Application.php               |  14 +-
 Library/Console/Command/InitCommand.php       |   1 -
 Library/Documentation.php                     |   6 +-
 Library/Documentation/Annotation.php          |  13 +-
 Library/Documentation/Docblock.php            |  12 +-
 Library/Documentation/File/IndexFile.php      |  25 +--
 Library/Documentation/File/NamespaceFile.php  |  14 +-
 Library/Documentation/File/NamespacesFile.php |  23 +--
 Library/Documentation/File/SourceFile.php     |  15 +-
 Library/Documentation/NamespaceAccessor.php   |   2 +-
 Library/Documentation/Template.php            |   4 +-
 Library/Documentation/Theme.php               |  21 --
 .../Exception/ExceptionExtraAwareTrait.php    |   3 -
 .../Exception/IllegalOperationException.php   |   3 -
 Library/Exception/IllegalStateException.php   |   3 -
 .../Exception/InvalidArgumentException.php    |   3 -
 Library/Exception/InvalidCallException.php    |   3 -
 Library/Exception/LogicException.php          |   2 +-
 Library/Exception/NotImplementedException.php |   2 -
 Library/Exception/OutOfBoundsException.php    |  20 --
 Library/Exception/ParseException.php          |   2 -
 Library/Exception/RuntimeException.php        |   2 -
 .../Exception/UnknownPropertyException.php    |   3 -
 Library/Exception/ValidationException.php     |  19 --
 .../Expression/Builder/AbstractBuilder.php    |   3 -
 Library/Expression/Builder/BuilderFactory.php |   3 -
 .../Builder/Factory/OperatorsFactory.php      |   9 +-
 .../Builder/Factory/StatementsFactory.php     |  48 +----
 .../Builder/Operators/AbstractOperator.php    |   3 -
 .../Operators/AssignPropertyOperator.php      |  20 +-
 .../Operators/AssignVariableOperator.php      |  15 --
 .../Builder/Operators/BinaryOperator.php      |   2 -
 .../Builder/Operators/RawOperator.php         |   3 -
 .../Builder/Operators/UnaryOperator.php       |   2 -
 Library/Expression/Builder/RawExpression.php  |   2 -
 .../Builder/Statements/AbstractStatement.php  |   3 -
 .../Statements/CallFunctionStatement.php      |   6 +-
 .../Statements/CallMethodStatement.php        |   2 -
 .../Statements/CallStaticStatement.php        |   2 -
 .../Builder/Statements/IfStatement.php        |   2 -
 .../Builder/Statements/LetStatement.php       |   2 -
 .../Builder/Statements/RawStatement.php       |   3 -
 .../Builder/Statements/StatementsBlock.php    |   2 -
 Library/Expression/NativeArray.php            |  12 +-
 Library/Expression/NativeArrayAccess.php      |  10 +-
 Library/Expression/PropertyAccess.php         |  36 ++--
 Library/Expression/PropertyDynamicAccess.php  |  17 +-
 Library/Expression/Reference.php              | 127 ++----------
 Library/Expression/StaticConstantAccess.php   |  88 ++++----
 Library/Expression/StaticPropertyAccess.php   |  53 ++---
 Library/Fcall/FcallAwareInterface.php         |  32 ---
 Library/Fcall/FcallManagerInterface.php       |   5 -
 Library/LiteralCompiledExpression.php         |   2 +-
 Library/MethodCall.php                        |  12 +-
 Library/Operators/AbstractOperator.php        |  45 +++--
 .../Comparison/ComparisonBaseOperator.php     |   6 +-
 Library/Operators/Logical/AndOperator.php     |   2 +
 Library/Operators/Other/CloneOperator.php     |   1 -
 Library/Operators/Other/IssetOperator.php     |   2 +-
 Library/Statements/ForStatement.php           |   3 +-
 Library/Statements/IfStatement.php            |  21 +-
 .../Let/ObjectPropertyArrayIndexAppend.php    |  19 +-
 Library/Statements/ReturnStatement.php        |   2 -
 Library/Statements/StatementAbstract.php      |  39 +---
 Library/Statements/SwitchStatement.php        |  16 +-
 Library/Statements/ThrowStatement.php         |   6 +-
 Library/Statements/TryCatchStatement.php      |  19 +-
 Library/StaticCall.php                        |  25 +--
 Library/Variable.php                          | 190 ++++++++----------
 77 files changed, 380 insertions(+), 916 deletions(-)
 delete mode 100644 Library/Exception/OutOfBoundsException.php
 delete mode 100644 Library/Exception/ValidationException.php
 delete mode 100644 Library/Fcall/FcallAwareInterface.php

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 767647f547..1b2687b174 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -26,6 +26,7 @@
 use Zephir\Variable;
 use Zephir\Variable\Globals;
 
+use function in_array;
 use function Zephir\add_slashes;
 
 class Backend
@@ -74,10 +75,10 @@ public function getFcallManager(): FcallManagerInterface
         return $this->fcallManager;
     }
 
-    public function declareVariables($method, $typeToVariables, CompilationContext $compilationContext)
+    public function declareVariables($method, $typeToVariables)
     {
         $varInitCode = [];
-        $additionalCode = $method ? $this->onPreInitVar($method, $compilationContext) : '';
+        $additionalCode = $method ? $this->onPreInitVar($method) : '';
 
         foreach ($typeToVariables as $type => $variables) {
             list($pointer, $code) = $this->getTypeDefinition($type);
@@ -119,24 +120,18 @@ public function initVar(Variable $variable, CompilationContext $context, $useCod
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getVariableCode(Variable $variable): string
     {
         if ($variable->isDoublePointer() ||
-            \in_array($variable->getName(), ['this_ptr', 'return_value']) ||
-            \in_array($variable->getType(), ['int', 'long'])) {
+            in_array($variable->getName(), ['this_ptr', 'return_value']) ||
+            in_array($variable->getType(), ['int', 'long'])) {
             return $variable->getName();
         }
 
         return '&'.$variable->getName();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getBoolCode(Variable $variable, CompilationContext $context, $useCodePrinter = true)
+    public function getBoolCode(Variable $variable, CompilationContext $context, $useCodePrinter = true): string
     {
         $code = '(Z_TYPE_P('.$this->getVariableCode($variable).') == IS_TRUE)';
         if ($useCodePrinter) {
@@ -146,9 +141,6 @@ public function getBoolCode(Variable $variable, CompilationContext $context, $us
         return $code;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getTypeDefinition($type): array
     {
         switch ($type) {
@@ -252,12 +244,9 @@ public function getTypeDefinition($type): array
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param Variable           $variableVariable
      * @param string             $operator
      * @param string             $value
-     * @param CompilationContext $context
      *
      * @throws CompilerException
      *
@@ -267,7 +256,6 @@ public function getTypeofCondition(
         Variable $variableVariable,
         string $operator,
         string $value,
-        CompilationContext $context
     ): string {
         $variableName = $this->getVariableCode($variableVariable);
 
@@ -319,10 +307,7 @@ public function getTypeofCondition(
         return $condition;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function onPreInitVar(ClassMethod $method, CompilationContext $context): string
+    public function onPreInitVar(ClassMethod $method): string
     {
         if (!$method instanceof FunctionDefinition && !$method->isInternal()) {
             return "zval *this_ptr = getThis();\n"; //TODO: think about a better way to solve this.
@@ -360,7 +345,7 @@ public function onPostCompile(ClassMethod $method, CompilationContext $context)
 
     public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable)
     {
-        $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
+        $isComplex = in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
 
         if ($isComplex && !$variable->isDoublePointer()) { /* && $variable->mustInitNull() */
             $groupVariables[] = $variable->getName();
@@ -441,8 +426,6 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param Variable[]         $variables
      * @param CompilationContext $context
      *
@@ -522,8 +505,6 @@ public function declareConstant($type, $name, $value, CompilationContext $contex
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param ClassMethod        $method
      * @param CompilationContext $context
      *
@@ -574,8 +555,6 @@ public function getInternalSignature(ClassMethod $method, CompilationContext $co
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param Variable             $variable
      * @param string|Variable|null $value
      * @param CompilationContext   $context
@@ -617,7 +596,7 @@ public function assignZval(Variable $variable, $code, CompilationContext $contex
         }
     }
 
-    public function returnString($value, CompilationContext $context, $useCodePrinter = true, $doCopy = true)
+    public function returnString($value, CompilationContext $context, $useCodePrinter = true)
     {
         return $this->returnHelper('RETURN_MM_STRING', $value, $context, $useCodePrinter);
     }
@@ -668,7 +647,7 @@ public function addArrayEntry(Variable $variable, $key, $value, CompilationConte
                 $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
                 $typeKey = $var->getType();
             }
-            if (\in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
+            if (in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
                 $keyType = 'index';
             }
         }
@@ -809,7 +788,7 @@ public function arrayIssetFetch2(Variable $target, Variable $var, $resolvedExpr,
         throw new CompilerException('arrayIssetFetch ['.$resolvedExpr->getType().']', $expression);
     }
 
-    public function propertyIsset(Variable $var, $key, CompilationContext $context)
+    public function propertyIsset(Variable $var, $key)
     {
         return new CompiledExpression('bool', 'zephir_isset_property('.$this->getVariableCode($var).', SL("'.$key.'"))', null);
     }
@@ -893,8 +872,6 @@ public function fetchClass(Variable $zendClassEntry, $className, $guarded, Compi
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param Variable           $symbolVariable
      * @param Variable           $variableVariable
      * @param Variable|string    $property
@@ -1028,8 +1005,6 @@ public function resolveValue($value, CompilationContext $context): Variable|bool
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param Variable           $variable
      * @param string|Variable    $property
      * @param mixed              $value
@@ -1037,7 +1012,7 @@ public function resolveValue($value, CompilationContext $context): Variable|bool
      *
      * @return void
      */
-    public function updateProperty(Variable $variable, $property, $value, CompilationContext $context)
+    public function updateProperty(Variable $variable, $property, $value, CompilationContext $context): void
     {
         $value = $this->resolveValue($value, $context);
 
@@ -1094,7 +1069,7 @@ public function assignArrayProperty(Variable $variable, $property, $key, $value,
         }
     }
 
-    public function callMethod($symbolVariable, Variable $variable, $methodName, $cachePointer, $params, CompilationContext $context)
+    public function callMethod($symbolVariable, Variable $variable, $methodName, $cachePointer, $params, CompilationContext $context): void
     {
         $paramStr = null != $params ? ', '.implode(', ', $params) : '';
         $macro = 'CALL_METHOD';
@@ -1104,6 +1079,7 @@ public function callMethod($symbolVariable, Variable $variable, $methodName, $ca
         } else {
             $methodName = '"'.$methodName.'"';
         }
+
         if (!isset($symbolVariable)) {
             $context->codePrinter->output('ZEPHIR_'.$macro.'(NULL, '.$this->getVariableCode($variable).', '.$methodName.', '.$cachePointer.$paramStr.');');
         } elseif ('return_value' == $symbolVariable->getName()) {
@@ -1114,9 +1090,9 @@ public function callMethod($symbolVariable, Variable $variable, $methodName, $ca
         }
     }
 
-    public function copyOnWrite(Variable $target, $var, CompilationContext $context)
+    public function copyOnWrite(Variable $target, $var, CompilationContext $context): void
     {
-        if ('EG(exception)' == $var) {
+        if ('EG(exception)' === $var) {
             $context->codePrinter->output('ZVAL_OBJ('.$this->getVariableCode($target).', EG(exception));');
             $context->codePrinter->output('Z_ADDREF_P('.$this->getVariableCode($target).');');
 
@@ -1275,26 +1251,16 @@ public function forStatement(Variable $exprVariable, $keyVariable, $variable, $d
         $codePrinter->output('}');
 
         /* Since we do not observe, still do cleanup */
-        if (isset($variable)) {
-            $variable->initVariant($compilationContext);
-        }
-        if (isset($keyVariable)) {
-            $keyVariable->initVariant($compilationContext);
-        }
+        $variable?->initVariant($compilationContext);
+        $keyVariable?->initVariant($compilationContext);
     }
 
-    public function forStatementIterator(Variable $iteratorVariable, Variable $targetVariable, CompilationContext $compilationContext)
-    {
-        $compilationContext->symbolTable->mustGrownStack(true);
-        $compilationContext->codePrinter->output('ZEPHIR_ITERATOR_COPY('.$this->getVariableCode($targetVariable).', '.$iteratorVariable->getName().');');
-    }
-
-    public function destroyIterator(Variable $iteratorVariable, CompilationContext $context)
+    public function destroyIterator(Variable $iteratorVariable, CompilationContext $context): void
     {
         $context->codePrinter->output('zend_iterator_dtor('.$iteratorVariable->getName().');');
     }
 
-    public function ifVariableValueUndefined(Variable $var, CompilationContext $context, $useBody = false, $useCodePrinter = true)
+    public function ifVariableValueUndefined(Variable $var, CompilationContext $context, $useBody = false, $useCodePrinter = true): string
     {
         if ($var->isDoublePointer()) {
             return $this->ifVariableValueUndefined2($var, $context, $useBody, $useCodePrinter);
@@ -1308,7 +1274,7 @@ public function ifVariableValueUndefined(Variable $var, CompilationContext $cont
         return $useBody ? $body : $output;
     }
 
-    public function ifVariableValueUndefined2(Variable $var, CompilationContext $context, $onlyBody = false, $useCodePrinter = true)
+    public function ifVariableValueUndefined2(Variable $var, CompilationContext $context, $onlyBody = false, $useCodePrinter = true): string
     {
         $body = '!'.$var->getName();
         $output = 'if ('.$body.') {';
@@ -1319,24 +1285,20 @@ public function ifVariableValueUndefined2(Variable $var, CompilationContext $con
         return $onlyBody ? $body : $output;
     }
 
-    public function fetchClassEntry($str)
+    public function fetchClassEntry(string $str): string
     {
         return 'zephir_get_internal_ce(SL("'.$str.'"))';
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param string             $type
      * @param CompilationContext $compilationContext
-     * @param bool               $isLocal
      *
      * @return Variable
      */
     public function getScalarTempVariable(
         string $type,
         CompilationContext $compilationContext,
-        $isLocal = true
     ): Variable {
         return $compilationContext->symbolTable->getTempNonTrackedVariable($type, $compilationContext);
     }
@@ -1707,7 +1669,7 @@ protected function returnHelper(string $macro, $value, CompilationContext $conte
     {
         if ($value instanceof Variable) {
             $value = $value->getName();
-        } elseif ($macro === 'RETURN_MM_STRING' && !preg_match('/^ZEPHIR_GLOBAL/', $value)) {
+        } elseif ($macro === 'RETURN_MM_STRING' && !str_starts_with($value, 'ZEPHIR_GLOBAL')) {
             $value = '"'.$value.'"';
         }
 
@@ -1734,11 +1696,10 @@ protected function returnHelper(string $macro, $value, CompilationContext $conte
      * @param CompiledExpression[]|string[] $offsetExprs
      * @param CompilationContext            $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return array
+     * @throws CompilerException
      */
-    private function resolveOffsetExprs($offsetExprs, CompilationContext $compilationContext)
+    private function resolveOffsetExprs(array $offsetExprs, CompilationContext $compilationContext): array
     {
         $keys = '';
         $offsetItems = [];
@@ -1750,6 +1711,7 @@ private function resolveOffsetExprs($offsetExprs, CompilationContext $compilatio
                 ++$numberParams;
                 continue;
             }
+
             switch ($offsetExpr->getType()) {
                 case 'int':
                 case 'uint':
@@ -1770,7 +1732,6 @@ private function resolveOffsetExprs($offsetExprs, CompilationContext $compilatio
                     $variableIndex = $compilationContext->symbolTable->getVariableForRead(
                         $offsetExpr->getCode(),
                         $compilationContext,
-                        null
                     );
 
                     switch ($variableIndex->getType()) {
diff --git a/Library/Backend/FcallManager.php b/Library/Backend/FcallManager.php
index a48e4f4b23..5b53197395 100644
--- a/Library/Backend/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -13,17 +13,13 @@
 
 use Zephir\CodePrinter;
 use Zephir\Fcall\FcallManagerInterface;
+
 use function Zephir\file_put_contents_ex;
 
 class FcallManager implements FcallManagerInterface
 {
     protected array $requiredMacros = [];
 
-    public function macroIsRequired($macro): bool
-    {
-        return isset($this->requiredMacros[$macro]);
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -47,7 +43,7 @@ public function getMacro($static, $doReturn, $paramCount)
 
         $macroName = 'ZEPHIR_'.($scope ? $scope.'_' : '').$mode.$paramCount;
 
-        if (!$this->macroIsRequired($macroName)) {
+        if (!isset($this->requiredMacros[$macroName])) {
             $this->requiredMacros[$macroName] = [$scope, $mode, $paramCount];
         }
 
diff --git a/Library/Backend/StringsManager.php b/Library/Backend/StringsManager.php
index 29c6942bcd..70ef092ebd 100644
--- a/Library/Backend/StringsManager.php
+++ b/Library/Backend/StringsManager.php
@@ -14,6 +14,8 @@
 namespace Zephir\Backend;
 
 use Zephir\StringsManager as BaseStringsManager;
+
+use function strlen;
 use function Zephir\file_put_contents_ex;
 
 /**
@@ -59,7 +61,7 @@ public function genConcatCode(): void
         $macros = [];
         ksort($this->concatKeys, SORT_STRING);
         foreach ($this->concatKeys as $key => $one) {
-            $len = \strlen($key);
+            $len = strlen($key);
             $params = [];
             $zvalCopy = [];
             $useCopy = [];
@@ -94,7 +96,7 @@ public function genConcatCode(): void
 
             $proto = 'void zephir_concat_'.$key.'(zval *result, '.implode(', ', $params).', int self_var)';
 
-            $codeh .= ''.$proto.';'.PHP_EOL;
+            $codeh .= $proto.';'.PHP_EOL;
 
             $code .= $proto.'{'.PHP_EOL.PHP_EOL;
 
@@ -118,7 +120,7 @@ public function genConcatCode(): void
 
             $code .= "\t".'length = '.implode(' + ', $lengths).';'.PHP_EOL;
             $code .= "\t".'if (self_var) {'.PHP_EOL;
-            $code .= ''.PHP_EOL;
+            $code .= PHP_EOL;
             $code .= "\t\t".'if (Z_TYPE_P(result) != IS_STRING) {'.PHP_EOL;
             $code .= "\t\t\t".'use_copy = zend_make_printable_zval(result, &result_copy);'.PHP_EOL;
             $code .= "\t\t\t".'if (use_copy) {'.PHP_EOL;
@@ -128,7 +130,7 @@ public function genConcatCode(): void
             $code .= "\t\t".'offset = Z_STRLEN_P(result);'.PHP_EOL;
             $code .= "\t\t".'length += offset;'.PHP_EOL;
             $code .= "\t\t".'Z_STR_P(result) = zend_string_realloc(Z_STR_P(result), length, 0);'.PHP_EOL;
-            $code .= ''.PHP_EOL;
+            $code .= PHP_EOL;
             $code .= "\t".'} else {'.PHP_EOL;
             $code .= "\t\t".'ZVAL_STR(result, zend_string_alloc(length, 0));'.PHP_EOL;
             $code .= "\t".'}'.PHP_EOL.PHP_EOL;
diff --git a/Library/BranchManager.php b/Library/BranchManager.php
index 0c6379a7e0..f5fd84ce9e 100644
--- a/Library/BranchManager.php
+++ b/Library/BranchManager.php
@@ -9,39 +9,36 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 /**
- * BranchManager.
- *
- * Records every branch created within a method allowing analyze conditional variable assignment
+ * Records every branch created within a method allowing to analyze conditional variable assignment
  */
 class BranchManager
 {
-    /** @var Branch|null */
-    protected $currentBranch;
+    protected ?Branch $currentBranch = null;
 
-    protected $level = 0;
+    protected int $level = 0;
 
-    protected $uniqueId = 1;
+    protected int $uniqueId = 1;
 
-    /** @var Branch|null */
-    protected $rootBranch;
+    protected ?Branch $rootBranch;
 
     /**
      * Sets the current active branch in the manager.
      *
      * @param Branch $branch
      */
-    public function addBranch(Branch $branch)
+    public function addBranch(Branch $branch): void
     {
         if ($this->currentBranch) {
             $branch->setParentBranch($this->currentBranch);
-            $this->currentBranch = $branch;
-        } else {
-            $this->currentBranch = $branch;
         }
 
+        $this->currentBranch = $branch;
+
         $branch->setUniqueId($this->uniqueId);
         $branch->setLevel($this->level);
 
@@ -58,7 +55,7 @@ public function addBranch(Branch $branch)
      *
      * @param Branch $branch
      */
-    public function removeBranch(Branch $branch)
+    public function removeBranch(Branch $branch): void
     {
         $parentBranch = $branch->getParentBranch();
         $this->currentBranch = $parentBranch;
@@ -70,7 +67,7 @@ public function removeBranch(Branch $branch)
      *
      * @return Branch|null
      */
-    public function getCurrentBranch()
+    public function getCurrentBranch(): ?Branch
     {
         return $this->currentBranch;
     }
@@ -80,7 +77,7 @@ public function getCurrentBranchId()
         return $this->currentBranch->getUniqueId();
     }
 
-    public function setRootBranch(Branch $branch)
+    public function setRootBranch(Branch $branch): void
     {
         $this->rootBranch = $branch;
     }
diff --git a/Library/CacheManager.php b/Library/CacheManager.php
index 058d2b0cc3..02cbb8efe0 100644
--- a/Library/CacheManager.php
+++ b/Library/CacheManager.php
@@ -104,7 +104,7 @@ public function getMethodCache(): ?MethodCache
     /**
      * Creates or returns an existing method cache.
      *
-     * @return StaticMethodCache
+     * @return StaticMethodCache|null
      */
     public function getStaticMethodCache(): ?StaticMethodCache
     {
diff --git a/Library/Call.php b/Library/Call.php
index 18da25c5cb..5ba45d1349 100644
--- a/Library/Call.php
+++ b/Library/Call.php
@@ -488,7 +488,7 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
                 case 'int':
                 case 'uint':
                 case 'long':
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext, true);
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
                     $compilationContext->backend->assignLong($parameterVariable, $compiledExpression->getCode(), $compilationContext);
                     $this->temporalVariables[] = $parameterVariable;
                     $params[] = '&'.$parameterVariable->getName();
@@ -520,7 +520,7 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
                     break;
 
                 case 'double':
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext, true);
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
                     $codePrinter->output('ZVAL_DOUBLE(&'.$parameterVariable->getName().', '.$compiledExpression->getCode().');');
                     $this->temporalVariables[] = $parameterVariable;
                     $params[] = '&'.$parameterVariable->getName();
@@ -559,7 +559,7 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
                         case 'uint':
                         case 'long':
                         case 'ulong':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext, true);
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
                             $codePrinter->output('ZVAL_LONG(&'.$parameterTempVariable->getName().', '.$compiledExpression->getCode().');');
                             $params[] = '&'.$parameterTempVariable->getName();
                             $types[] = $parameterTempVariable->getType();
@@ -589,7 +589,7 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
                             break;
 
                         case 'double':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext, true);
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
                             $codePrinter->output('ZVAL_DOUBLE(&'.$parameterTempVariable->getName().', '.$compiledExpression->getCode().');');
                             $params[] = '&'.$parameterTempVariable->getName();
                             $types[] = $parameterTempVariable->getType();
@@ -598,7 +598,7 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
                             break;
 
                         case 'bool':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext, true);
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
                             $compilationContext->backend->assignBool($parameterTempVariable, '('.$parameterVariable->getName().' ? 1 : 0)', $compilationContext);
                             $params[] = $compilationContext->backend->getVariableCode($parameterTempVariable);
                             $dynamicTypes[] = $parameterTempVariable->getType();
diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 4852563186..a7e793a93a 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -2128,8 +2128,7 @@ public function compile(CompilationContext $compilationContext): void
                 PHP_EOL."\t",
                 $compilationContext->backend->declareVariables(
                     $this,
-                    $usedVariables,
-                    $compilationContext
+                    $usedVariables
                 )
             )
         );
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 1e839ce79d..1b0580cd48 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
 
+use function in_array;
+
 /**
  * This class encapsulates important entities required during compilation
  */
@@ -209,7 +211,7 @@ public function getFullName(string $className): string
      */
     public function classLookup(string $className, array $statement = null): ClassDefinition
     {
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $this->getFullName($className);
             if ($this->compiler->isClass($className)) {
                 return $this->compiler->getClassDefinition($className);
@@ -218,7 +220,7 @@ public function classLookup(string $className, array $statement = null): ClassDe
             throw new CompilerException("Cannot locate class '{$className}'", $statement);
         }
 
-        if (\in_array($className, ['self', 'static'])) {
+        if (in_array($className, ['self', 'static'])) {
             return $this->classDefinition;
         }
 
diff --git a/Library/Console/Application.php b/Library/Console/Application.php
index 32cfa2d96d..de663fa1f4 100644
--- a/Library/Console/Application.php
+++ b/Library/Console/Application.php
@@ -50,7 +50,7 @@ public function __construct()
      *
      * @return string
      */
-    public function getHelp()
+    public function getHelp(): string
     {
         return Zephir::LOGO.parent::getHelp();
     }
@@ -77,7 +77,7 @@ public function getVersion(): string
     {
         $version = explode('-', parent::getVersion());
 
-        if (isset($version[1]) && 0 === strpos($version[1], '$')) {
+        if (isset($version[1]) && str_starts_with($version[1], '$')) {
             return "{$version[0]}-source";
         }
 
@@ -131,7 +131,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         try {
             // Makes ArgvInput::getFirstArgument() able to distinguish an option from an argument.
             $input->bind($this->getDefinition());
-        } catch (ExceptionInterface $e) {
+        } catch (ExceptionInterface) {
             // Errors must be ignored, full binding/validation happens later when the command is known.
         }
 
@@ -152,11 +152,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
 
         try {
             return parent::doRun($input, $output);
-        } catch (CommandNotFoundException $e) {
-            fprintf(STDERR, $e->getMessage().PHP_EOL);
-
-            return 1;
-        } catch (RuntimeException $e) {
+        } catch (CommandNotFoundException|RuntimeException $e) {
             fprintf(STDERR, $e->getMessage().PHP_EOL);
 
             return 1;
@@ -168,7 +164,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
      *
      * @return Command[] An array of default Command instances
      */
-    protected function getDefaultCommands()
+    protected function getDefaultCommands(): array
     {
         return [new HelpCommand(), new ListCommand()];
     }
diff --git a/Library/Console/Command/InitCommand.php b/Library/Console/Command/InitCommand.php
index ccda306918..e9685daaab 100644
--- a/Library/Console/Command/InitCommand.php
+++ b/Library/Console/Command/InitCommand.php
@@ -19,7 +19,6 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Zephir\Backend\Backend;
 use Zephir\Config;
diff --git a/Library/Documentation.php b/Library/Documentation.php
index 44691f507c..9d604421db 100644
--- a/Library/Documentation.php
+++ b/Library/Documentation.php
@@ -170,7 +170,7 @@ public function build()
 
         foreach ($byNamespace as $namespaceName => $nh) {
             // namespace files (namespace/ns1/n2/namespace.html)
-            $nfile = new File\NamespaceFile($this->config, $nh);
+            $nfile = new File\NamespaceFile($nh);
             $this->theme->drawFile($nfile);
         }
 
@@ -184,11 +184,11 @@ public function build()
         $this->theme->drawFile($sitemapFile);
 
         // namespaces files (namespaces.html)
-        $nsfile = new File\NamespacesFile($this->config, $namespaceAccessor);
+        $nsfile = new File\NamespacesFile($namespaceAccessor);
         $this->theme->drawFile($nsfile);
 
         // index (index.html)
-        $indexfile = new File\IndexFile($this->config, $namespaceAccessor);
+        $indexfile = new File\IndexFile($namespaceAccessor);
         $this->theme->drawFile($indexfile);
 
         $this->theme->buildStaticDirectory();
diff --git a/Library/Documentation/Annotation.php b/Library/Documentation/Annotation.php
index 7e0231b45d..43f81b8323 100644
--- a/Library/Documentation/Annotation.php
+++ b/Library/Documentation/Annotation.php
@@ -12,21 +12,14 @@
 namespace Zephir\Documentation;
 
 /**
- * Annotation.
- *
  * A parsed Annotation
  */
 class Annotation
 {
-    protected $name;
-
-    protected $string;
-
-    protected $contentParsed = false;
+    protected bool $contentParsed = false;
 
-    public function __construct(string $name, string $string)
+    public function __construct(protected string $name, protected string $string)
     {
-        $this->name = $name;
         $this->string = trim($string);
     }
 
@@ -35,7 +28,7 @@ public function getString(): string
         return $this->string;
     }
 
-    public function setString(string $string)
+    public function setString(string $string): void
     {
         $this->string = $string;
     }
diff --git a/Library/Documentation/Docblock.php b/Library/Documentation/Docblock.php
index f6ebd296de..2d66ccadc0 100644
--- a/Library/Documentation/Docblock.php
+++ b/Library/Documentation/Docblock.php
@@ -12,8 +12,6 @@
 namespace Zephir\Documentation;
 
 /**
- * Annotation.
- *
  * A parsed Annotation
  */
 class Docblock
@@ -21,17 +19,17 @@ class Docblock
     /**
      * @var string
      */
-    protected $description;
+    protected string $description;
 
     /**
      * @var Annotation[]
      */
-    protected $annotations = [];
+    protected array $annotations = [];
 
     /**
      * @var string
      */
-    protected $summary;
+    protected string $summary;
 
     /**
      * @return string
@@ -110,7 +108,7 @@ public function getSummary(): string
     /**
      * @param string $summary
      */
-    public function setSummary(string $summary)
+    public function setSummary(string $summary): void
     {
         $this->summary = $summary;
     }
@@ -133,7 +131,7 @@ public function generate(): string
             $docBlock .= PHP_EOL.' *';
             $docBlock .= PHP_EOL.' *';
 
-            foreach ((array) explode("\n", $descriptionBlock) as $line) {
+            foreach (explode("\n", $descriptionBlock) as $line) {
                 $docBlock .= PHP_EOL.' * '.trim($line);
             }
 
diff --git a/Library/Documentation/File/IndexFile.php b/Library/Documentation/File/IndexFile.php
index a90f729b28..e2f0595fea 100644
--- a/Library/Documentation/File/IndexFile.php
+++ b/Library/Documentation/File/IndexFile.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\File;
 
 use Zephir\Documentation\FileInterface;
@@ -16,31 +18,15 @@
 
 class IndexFile implements FileInterface
 {
-    /**
-     * @var NamespaceAccessor
-     */
-    protected $namespaceAccessor;
-
-    public function __construct($config, NamespaceAccessor $namespaceAccessor)
+    public function __construct(protected NamespaceAccessor $namespaceAccessor)
     {
-        $this->namespaceAccessor = $namespaceAccessor;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getTemplateName(): string
     {
         return 'index.phtml';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return array
-     */
     public function getData(): array
     {
         return [
@@ -50,11 +36,6 @@ public function getData(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getOutputFile(): string
     {
         return 'index.html';
diff --git a/Library/Documentation/File/NamespaceFile.php b/Library/Documentation/File/NamespaceFile.php
index 9eb3f21438..0316f6d7cf 100644
--- a/Library/Documentation/File/NamespaceFile.php
+++ b/Library/Documentation/File/NamespaceFile.php
@@ -11,26 +11,14 @@
 
 namespace Zephir\Documentation\File;
 
-use Zephir\CompilerFile;
 use Zephir\Documentation;
 use Zephir\Documentation\FileInterface;
 use Zephir\Documentation\NamespaceHelper;
 
 class NamespaceFile implements FileInterface
 {
-    /**
-     * @var NamespaceHelper
-     */
-    protected $namespaceHelper;
-
-    /**
-     * @var CompilerFile
-     */
-    protected $compilerFile;
-
-    public function __construct($config, NamespaceHelper $nh)
+    public function __construct(protected NamespaceHelper $namespaceHelper)
     {
-        $this->namespaceHelper = $nh;
     }
 
     /**
diff --git a/Library/Documentation/File/NamespacesFile.php b/Library/Documentation/File/NamespacesFile.php
index 1ac54c9861..5a58c8a371 100644
--- a/Library/Documentation/File/NamespacesFile.php
+++ b/Library/Documentation/File/NamespacesFile.php
@@ -16,31 +16,15 @@
 
 class NamespacesFile implements FileInterface
 {
-    /**
-     * @var NamespaceAccessor
-     */
-    protected $namespaceAccessor;
-
-    public function __construct($config, NamespaceAccessor $namespaceAccessor)
+    public function __construct(protected NamespaceAccessor $namespaceAccessor)
     {
-        $this->namespaceAccessor = $namespaceAccessor;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getTemplateName(): string
     {
         return 'namespaces.phtml';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return array
-     */
     public function getData(): array
     {
         return [
@@ -50,11 +34,6 @@ public function getData(): array
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getOutputFile(): string
     {
         return 'namespaces.html';
diff --git a/Library/Documentation/File/SourceFile.php b/Library/Documentation/File/SourceFile.php
index 37e03662db..069ff8c23e 100644
--- a/Library/Documentation/File/SourceFile.php
+++ b/Library/Documentation/File/SourceFile.php
@@ -16,26 +16,13 @@
 
 class SourceFile extends ClassFile
 {
-    /**
-     * @var ClassDefinition
-     */
-    protected $class;
+    protected ClassDefinition $class;
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getTemplateName(): string
     {
         return 'source.phtml';
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
     public function getOutputFile(): string
     {
         return Documentation::sourceUrl($this->class);
diff --git a/Library/Documentation/NamespaceAccessor.php b/Library/Documentation/NamespaceAccessor.php
index 0825adce75..a2de18db50 100644
--- a/Library/Documentation/NamespaceAccessor.php
+++ b/Library/Documentation/NamespaceAccessor.php
@@ -48,7 +48,7 @@ public function build()
         $byNamespace = [];
         $tree = [];
 
-        foreach ($this->classes as $className => $class) {
+        foreach ($this->classes as $class) {
             $ns = explode('\\', $class->getClassDefinition()->getNamespace());
             $actualStr = '';
             foreach ($ns as $n) {
diff --git a/Library/Documentation/Template.php b/Library/Documentation/Template.php
index 19e893ce55..1e95855b79 100644
--- a/Library/Documentation/Template.php
+++ b/Library/Documentation/Template.php
@@ -24,7 +24,6 @@ class Template
     protected $nestedLevel;
     protected $pathToRoot = './';
     protected $themeOptions;
-    protected $theme;
     /**
      * @var Config
      */
@@ -40,14 +39,13 @@ class Template
      *
      * @throws Exception
      */
-    public function __construct(Theme $theme, array $data, string $template, int $nestedLevel = 0)
+    public function __construct(protected Theme $theme, array $data, string $template, int $nestedLevel = 0)
     {
         // todo clean buffer before exception
         if ($nestedLevel > 800) {
             throw new Exception('Recursive inclusion detected in theme creation');
         }
 
-        $this->theme = $theme;
         $this->data = $data;
         $this->template = $template;
         $this->nestedLevel = $nestedLevel;
diff --git a/Library/Documentation/Theme.php b/Library/Documentation/Theme.php
index 4e6ee9c633..ad942b7204 100644
--- a/Library/Documentation/Theme.php
+++ b/Library/Documentation/Theme.php
@@ -61,27 +61,6 @@ public function __construct($themeDir, $outputDir, $themeConfig, $config, Docume
         }
     }
 
-    private function __namespaceTreeHelper(NamespaceHelper $ns)
-    {
-        $output = [
-            'classes' => [],
-            'namespaces' => [],
-        ];
-
-        $subNs = $ns->getNamespaces();
-        $subCs = $ns->getClasses();
-
-        foreach ($subCs as $c) {
-            $output['classes'][] = $c->getClassDefinition()->getCompleteName();
-        }
-
-        foreach ($subNs as $sns) {
-            $output['namespaces'][$sns->getFullNamespace()] = $this->__namespaceTreeHelper($sns);
-        }
-
-        return $output;
-    }
-
     /**
      * from : https://stackoverflow.com/questions/2050859/copy-entire-contents-of-a-directory-to-another-using-php.
      *
diff --git a/Library/Exception/ExceptionExtraAwareTrait.php b/Library/Exception/ExceptionExtraAwareTrait.php
index 470f55c1dc..4edf38baef 100644
--- a/Library/Exception/ExceptionExtraAwareTrait.php
+++ b/Library/Exception/ExceptionExtraAwareTrait.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Exception;
 
-/**
- * Zephir\Exception\ExceptionInterface.
- */
 trait ExceptionExtraAwareTrait
 {
     /**
diff --git a/Library/Exception/IllegalOperationException.php b/Library/Exception/IllegalOperationException.php
index 0255fa4143..4e96e1861a 100644
--- a/Library/Exception/IllegalOperationException.php
+++ b/Library/Exception/IllegalOperationException.php
@@ -13,9 +13,6 @@
 
 use Zephir\TypeAwareInterface;
 
-/**
- * Zephir\Exception\IllegalOperationException.
- */
 class IllegalOperationException extends CompilerException
 {
     /**
diff --git a/Library/Exception/IllegalStateException.php b/Library/Exception/IllegalStateException.php
index d0ad8ff935..62de88d15d 100644
--- a/Library/Exception/IllegalStateException.php
+++ b/Library/Exception/IllegalStateException.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Exception;
 
-/**
- * Zephir\Exception\IllegalStateException.
- */
 class IllegalStateException extends RuntimeException
 {
 }
diff --git a/Library/Exception/InvalidArgumentException.php b/Library/Exception/InvalidArgumentException.php
index c940e61c23..68002b5bf9 100644
--- a/Library/Exception/InvalidArgumentException.php
+++ b/Library/Exception/InvalidArgumentException.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Exception;
 
-/**
- * Zephir\Exception\InvalidArgumentException.
- */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
     use ExceptionExtraAwareTrait;
diff --git a/Library/Exception/InvalidCallException.php b/Library/Exception/InvalidCallException.php
index d8b07680f2..6cda337ea1 100644
--- a/Library/Exception/InvalidCallException.php
+++ b/Library/Exception/InvalidCallException.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Exception;
 
-/**
- * Zephir\Exception\InvalidCallException.
- */
 class InvalidCallException extends LogicException
 {
 }
diff --git a/Library/Exception/LogicException.php b/Library/Exception/LogicException.php
index 5a961bffef..556edc6acc 100644
--- a/Library/Exception/LogicException.php
+++ b/Library/Exception/LogicException.php
@@ -15,7 +15,7 @@
  * Zephir\Exception\LogicException.
  *
  * Exception that represents error in the program logic.
- * This kind of exceptions should directly lead to a fix in your code.
+ * This kind of exception should directly lead to a fix in your code.
  */
 class LogicException extends \LogicException implements ExceptionInterface
 {
diff --git a/Library/Exception/NotImplementedException.php b/Library/Exception/NotImplementedException.php
index 69cb57d676..44d3ed252f 100644
--- a/Library/Exception/NotImplementedException.php
+++ b/Library/Exception/NotImplementedException.php
@@ -12,8 +12,6 @@
 namespace Zephir\Exception;
 
 /**
- * Zephir\Exception\NotImplementedException.
- *
  * Thrown to indicate that a block of code has not been implemented.
  * Represents the case where the author has yet to implement
  * the logic at this point in the program.
diff --git a/Library/Exception/OutOfBoundsException.php b/Library/Exception/OutOfBoundsException.php
deleted file mode 100644
index 29338b14aa..0000000000
--- a/Library/Exception/OutOfBoundsException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Exception;
-
-/**
- * Zephir\Exception\OutOfBoundsException.
- */
-class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
-{
-    use ExceptionExtraAwareTrait;
-}
diff --git a/Library/Exception/ParseException.php b/Library/Exception/ParseException.php
index aabd21e535..320e0338e5 100644
--- a/Library/Exception/ParseException.php
+++ b/Library/Exception/ParseException.php
@@ -12,8 +12,6 @@
 namespace Zephir\Exception;
 
 /**
- * Zephir\Exception\ParseException.
- *
  * Exceptions generated by parsing actions
  */
 class ParseException extends RuntimeException
diff --git a/Library/Exception/RuntimeException.php b/Library/Exception/RuntimeException.php
index 4772baf94d..c98d827b67 100644
--- a/Library/Exception/RuntimeException.php
+++ b/Library/Exception/RuntimeException.php
@@ -12,8 +12,6 @@
 namespace Zephir\Exception;
 
 /**
- * Zephir\Exception\RuntimeException.
- *
  * Exception thrown if an error which can only be found on runtime occurs.
  */
 class RuntimeException extends \RuntimeException implements ExceptionInterface
diff --git a/Library/Exception/UnknownPropertyException.php b/Library/Exception/UnknownPropertyException.php
index a6790ce85c..c4a7c117e7 100644
--- a/Library/Exception/UnknownPropertyException.php
+++ b/Library/Exception/UnknownPropertyException.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Exception;
 
-/**
- * Zephir\Exception\UnknownPropertyException.
- */
 class UnknownPropertyException extends LogicException
 {
 }
diff --git a/Library/Exception/ValidationException.php b/Library/Exception/ValidationException.php
deleted file mode 100644
index e2b0876685..0000000000
--- a/Library/Exception/ValidationException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Exception;
-
-/**
- * Zephir\Exception\ValidationException.
- */
-class ValidationException extends InvalidArgumentException
-{
-}
diff --git a/Library/Expression/Builder/AbstractBuilder.php b/Library/Expression/Builder/AbstractBuilder.php
index 53be021693..af821e05dc 100644
--- a/Library/Expression/Builder/AbstractBuilder.php
+++ b/Library/Expression/Builder/AbstractBuilder.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Expression\Builder;
 
-/**
- * Class AbstractBuilder.
- */
 abstract class AbstractBuilder
 {
     private $file = null;
diff --git a/Library/Expression/Builder/BuilderFactory.php b/Library/Expression/Builder/BuilderFactory.php
index 9132a0dd64..3eca0a0bb1 100644
--- a/Library/Expression/Builder/BuilderFactory.php
+++ b/Library/Expression/Builder/BuilderFactory.php
@@ -14,9 +14,6 @@
 use Zephir\Expression\Builder\Factory\OperatorsFactory;
 use Zephir\Expression\Builder\Factory\StatementsFactory;
 
-/**
- * Zephir\Expression\Builder\BuilderFactory.
- */
 class BuilderFactory
 {
     /** @var OperatorsFactory */
diff --git a/Library/Expression/Builder/Factory/OperatorsFactory.php b/Library/Expression/Builder/Factory/OperatorsFactory.php
index c5d4ccd9ed..6b84dfaa68 100644
--- a/Library/Expression/Builder/Factory/OperatorsFactory.php
+++ b/Library/Expression/Builder/Factory/OperatorsFactory.php
@@ -21,9 +21,6 @@
 use Zephir\Expression\Builder\Operators\RawOperator;
 use Zephir\Expression\Builder\Operators\UnaryOperator;
 
-/**
- * Class OperatorsFactory.
- */
 class OperatorsFactory
 {
     protected BuilderFactory $factory;
@@ -42,7 +39,7 @@ public function __construct(BuilderFactory $factory)
      *
      * @return AssignVariableOperator
      */
-    public function assignVariable($variable = null, AbstractBuilder $expression = null)
+    public function assignVariable($variable = null, AbstractBuilder $expression = null): AssignVariableOperator
     {
         return new AssignVariableOperator($variable, $expression);
     }
@@ -54,7 +51,7 @@ public function assignVariable($variable = null, AbstractBuilder $expression = n
      *
      * @return AssignPropertyOperator
      */
-    public function assignProperty($variable = null, $property = null, AbstractBuilder $expression = null)
+    public function assignProperty($variable = null, $property = null, AbstractBuilder $expression = null): AssignPropertyOperator
     {
         $assignProperty = new AssignPropertyOperator($variable, $property, $expression);
         $assignProperty->setType($assignProperty::TYPE_ASSIGN_OBJECT_PROPERTY);
@@ -69,7 +66,7 @@ public function assignProperty($variable = null, $property = null, AbstractBuild
      *
      * @return AssignPropertyOperator
      */
-    public function assignStaticProperty($variable = null, $property = null, AbstractBuilder $expression = null)
+    public function assignStaticProperty($variable = null, $property = null, AbstractBuilder $expression = null): AssignPropertyOperator
     {
         $assignProperty = $this->assignProperty($variable, $property, $expression);
         $assignProperty->setType($assignProperty::TYPE_ASSIGN_STATIC_PROPERTY);
diff --git a/Library/Expression/Builder/Factory/StatementsFactory.php b/Library/Expression/Builder/Factory/StatementsFactory.php
index 99190f963c..e2dd8e4175 100644
--- a/Library/Expression/Builder/Factory/StatementsFactory.php
+++ b/Library/Expression/Builder/Factory/StatementsFactory.php
@@ -17,8 +17,6 @@
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\AbstractOperator;
 use Zephir\Expression\Builder\Statements\CallFunctionStatement;
-use Zephir\Expression\Builder\Statements\CallMethodStatement;
-use Zephir\Expression\Builder\Statements\CallStaticStatement;
 use Zephir\Expression\Builder\Statements\IfStatement;
 use Zephir\Expression\Builder\Statements\LetStatement;
 use Zephir\Expression\Builder\Statements\RawStatement;
@@ -26,14 +24,8 @@
 
 class StatementsFactory
 {
-    protected BuilderFactory $factory;
-
-    /**
-     * @param BuilderFactory $factory
-     */
-    public function __construct(BuilderFactory $factory)
+    public function __construct(protected BuilderFactory $factory)
     {
-        $this->factory = $factory;
     }
 
     /**
@@ -48,31 +40,6 @@ public function functionCall($name, $parameters = null, $type = CallFunctionStat
         return new CallFunctionStatement($name, $parameters, $type);
     }
 
-    /**
-     * @param $variable
-     * @param $name
-     * @param null $parameters
-     * @param int  $type
-     *
-     * @return CallMethodStatement
-     */
-    public function methodCall($variable, $name, $parameters = null, $type = CallMethodStatement::TYPE_CALL_DIRECT)
-    {
-        return new CallMethodStatement($variable, $name, $parameters, $type);
-    }
-
-    /**
-     * @param $class
-     * @param $method
-     * @param null $parameters
-     *
-     * @return CallStaticStatement
-     */
-    public function staticCall($class, $method, $parameters = null)
-    {
-        return new CallStaticStatement($class, $method, $parameters);
-    }
-
     /**
      * @param array|null $statements
      *
@@ -118,19 +85,6 @@ public function returnX(AbstractBuilder $expression)
         ]);
     }
 
-    /**
-     * @param AbstractBuilder $expression
-     *
-     * @return RawStatement
-     */
-    public function throwX(AbstractBuilder $expression)
-    {
-        return $this->raw([
-            'type' => 'throw',
-            'expr' => $expression,
-        ]);
-    }
-
     /**
      * @param string $value
      *
diff --git a/Library/Expression/Builder/Operators/AbstractOperator.php b/Library/Expression/Builder/Operators/AbstractOperator.php
index 67a10a8ee9..8b67ee940a 100644
--- a/Library/Expression/Builder/Operators/AbstractOperator.php
+++ b/Library/Expression/Builder/Operators/AbstractOperator.php
@@ -13,9 +13,6 @@
 
 use Zephir\Expression\Builder\AbstractBuilder;
 
-/**
- * Class AbstractOperator.
- */
 abstract class AbstractOperator extends AbstractBuilder
 {
 }
diff --git a/Library/Expression/Builder/Operators/AssignPropertyOperator.php b/Library/Expression/Builder/Operators/AssignPropertyOperator.php
index b921870749..20c77bb247 100644
--- a/Library/Expression/Builder/Operators/AssignPropertyOperator.php
+++ b/Library/Expression/Builder/Operators/AssignPropertyOperator.php
@@ -13,16 +13,13 @@
 
 use Zephir\Expression\Builder\AbstractBuilder;
 
-/**
- * Class AssignPropertyOperator.
- */
 class AssignPropertyOperator extends AssignVariableOperator
 {
     // a -> property = expr
-    const TYPE_ASSIGN_OBJECT_PROPERTY = 'object-property';
+    public const TYPE_ASSIGN_OBJECT_PROPERTY = 'object-property';
 
     // a :: property = expr
-    const TYPE_ASSIGN_STATIC_PROPERTY = 'static-property';
+    public const TYPE_ASSIGN_STATIC_PROPERTY = 'static-property';
 
     private $property;
     private $type = self::TYPE_ASSIGN_OBJECT_PROPERTY;
@@ -44,7 +41,7 @@ public function __construct($variable = null, $property = null, AbstractBuilder
     /**
      * @return string
      */
-    public function getProperty()
+    public function getProperty(): string
     {
         return $this->property;
     }
@@ -54,7 +51,7 @@ public function getProperty()
      *
      * @return $this
      */
-    public function setProperty($property)
+    public function setProperty(string $property): static
     {
         $this->property = $property;
 
@@ -64,7 +61,7 @@ public function setProperty($property)
     /**
      * @return string
      */
-    public function getType()
+    public function getType(): string
     {
         return $this->type;
     }
@@ -74,17 +71,14 @@ public function getType()
      *
      * @return AssignPropertyOperator
      */
-    public function setType($type)
+    public function setType(string $type): static
     {
         $this->type = $type;
 
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function preBuild()
+    protected function preBuild(): array
     {
         $expression = parent::preBuild();
         $expression['assign-type'] = $this->getType();
diff --git a/Library/Expression/Builder/Operators/AssignVariableOperator.php b/Library/Expression/Builder/Operators/AssignVariableOperator.php
index 2a9424be5d..a054158c18 100644
--- a/Library/Expression/Builder/Operators/AssignVariableOperator.php
+++ b/Library/Expression/Builder/Operators/AssignVariableOperator.php
@@ -13,9 +13,6 @@
 
 use Zephir\Expression\Builder\AbstractBuilder;
 
-/**
- * Class AssignVariableOperator.
- */
 class AssignVariableOperator extends AbstractOperator
 {
     // =
@@ -101,18 +98,6 @@ public function getOperator()
         return $this->operator;
     }
 
-    /**
-     * @param $operator
-     *
-     * @return $this
-     */
-    public function setOperator($operator)
-    {
-        $this->operator = $operator;
-
-        return $this;
-    }
-
     /**
      * @return mixed
      */
diff --git a/Library/Expression/Builder/Operators/BinaryOperator.php b/Library/Expression/Builder/Operators/BinaryOperator.php
index 9e934dc100..052de4e484 100644
--- a/Library/Expression/Builder/Operators/BinaryOperator.php
+++ b/Library/Expression/Builder/Operators/BinaryOperator.php
@@ -14,8 +14,6 @@
 use Zephir\Expression\Builder\AbstractBuilder;
 
 /**
- * BinaryOperator.
- *
  * Allows to manually build a binary operator AST node
  */
 class BinaryOperator extends AbstractOperator
diff --git a/Library/Expression/Builder/Operators/RawOperator.php b/Library/Expression/Builder/Operators/RawOperator.php
index 17805751d5..8201e97a3c 100644
--- a/Library/Expression/Builder/Operators/RawOperator.php
+++ b/Library/Expression/Builder/Operators/RawOperator.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Expression\Builder\Operators;
 
-/**
- * Class RawOperator.
- */
 class RawOperator extends AbstractOperator
 {
     /**
diff --git a/Library/Expression/Builder/Operators/UnaryOperator.php b/Library/Expression/Builder/Operators/UnaryOperator.php
index a0f6168a3f..4cf870eb6a 100644
--- a/Library/Expression/Builder/Operators/UnaryOperator.php
+++ b/Library/Expression/Builder/Operators/UnaryOperator.php
@@ -14,8 +14,6 @@
 use Zephir\Expression\Builder\AbstractBuilder;
 
 /**
- * UnaryOperator.
- *
  * Allows to manually build a unary operator AST node
  */
 class UnaryOperator extends AbstractOperator
diff --git a/Library/Expression/Builder/RawExpression.php b/Library/Expression/Builder/RawExpression.php
index a46d5b1067..a5e1c44502 100644
--- a/Library/Expression/Builder/RawExpression.php
+++ b/Library/Expression/Builder/RawExpression.php
@@ -12,8 +12,6 @@
 namespace Zephir\Expression\Builder;
 
 /**
- * RawExpression.
- *
  * Allows to use a raw expression in a builder
  */
 class RawExpression extends AbstractBuilder
diff --git a/Library/Expression/Builder/Statements/AbstractStatement.php b/Library/Expression/Builder/Statements/AbstractStatement.php
index 2423dcb04b..1cc60c21d5 100644
--- a/Library/Expression/Builder/Statements/AbstractStatement.php
+++ b/Library/Expression/Builder/Statements/AbstractStatement.php
@@ -13,9 +13,6 @@
 
 use Zephir\Expression\Builder\AbstractBuilder;
 
-/**
- * Class AbstractStatement.
- */
 abstract class AbstractStatement extends AbstractBuilder
 {
 }
diff --git a/Library/Expression/Builder/Statements/CallFunctionStatement.php b/Library/Expression/Builder/Statements/CallFunctionStatement.php
index 0778dc0b06..b45056202c 100644
--- a/Library/Expression/Builder/Statements/CallFunctionStatement.php
+++ b/Library/Expression/Builder/Statements/CallFunctionStatement.php
@@ -14,8 +14,6 @@
 use Zephir\FunctionCall;
 
 /**
- * CallFunctionStatement.
- *
  * Allows to manually build a function call AST node
  */
 class CallFunctionStatement extends AbstractStatement
@@ -42,9 +40,9 @@ class CallFunctionStatement extends AbstractStatement
     /**
      * @param string|null $name
      * @param array|null  $parameters
-     * @param int         $typeCall
+     * @param int $typeCall
      */
-    public function __construct($name = null, array $parameters = null, $typeCall = self::TYPE_CALL_DIRECT)
+    public function __construct(string $name = null, array $parameters = null, int $typeCall = self::TYPE_CALL_DIRECT)
     {
         if (null !== $name) {
             $this->setName($name);
diff --git a/Library/Expression/Builder/Statements/CallMethodStatement.php b/Library/Expression/Builder/Statements/CallMethodStatement.php
index 1dc31db2a4..cc3920262b 100644
--- a/Library/Expression/Builder/Statements/CallMethodStatement.php
+++ b/Library/Expression/Builder/Statements/CallMethodStatement.php
@@ -12,8 +12,6 @@
 namespace Zephir\Expression\Builder\Statements;
 
 /**
- * CallMethodStatement.
- *
  * Allows to manually build a method call AST node
  */
 class CallMethodStatement extends CallFunctionStatement
diff --git a/Library/Expression/Builder/Statements/CallStaticStatement.php b/Library/Expression/Builder/Statements/CallStaticStatement.php
index 6ebc3d153d..4133020430 100644
--- a/Library/Expression/Builder/Statements/CallStaticStatement.php
+++ b/Library/Expression/Builder/Statements/CallStaticStatement.php
@@ -12,8 +12,6 @@
 namespace Zephir\Expression\Builder\Statements;
 
 /**
- * CallStaticStatement.
- *
  * Allows to manually build a static function call AST node
  */
 class CallStaticStatement extends AbstractStatement
diff --git a/Library/Expression/Builder/Statements/IfStatement.php b/Library/Expression/Builder/Statements/IfStatement.php
index 09b8c50c69..1bb7eafff7 100644
--- a/Library/Expression/Builder/Statements/IfStatement.php
+++ b/Library/Expression/Builder/Statements/IfStatement.php
@@ -14,8 +14,6 @@
 use Zephir\Expression\Builder\Operators\AbstractOperator;
 
 /**
- * IfStatement.
- *
  * Allows to manually build a 'if' statement AST node
  */
 class IfStatement extends AbstractStatement
diff --git a/Library/Expression/Builder/Statements/LetStatement.php b/Library/Expression/Builder/Statements/LetStatement.php
index d26952c9aa..2201513a0c 100644
--- a/Library/Expression/Builder/Statements/LetStatement.php
+++ b/Library/Expression/Builder/Statements/LetStatement.php
@@ -12,8 +12,6 @@
 namespace Zephir\Expression\Builder\Statements;
 
 /**
- * LetStatement.
- *
  * Allows to manually build a 'let' statement AST node
  */
 class LetStatement extends AbstractStatement
diff --git a/Library/Expression/Builder/Statements/RawStatement.php b/Library/Expression/Builder/Statements/RawStatement.php
index e68dc163d3..a38ece28fb 100644
--- a/Library/Expression/Builder/Statements/RawStatement.php
+++ b/Library/Expression/Builder/Statements/RawStatement.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Expression\Builder\Statements;
 
-/**
- * Class RawStatement.
- */
 class RawStatement extends AbstractStatement
 {
     /**
diff --git a/Library/Expression/Builder/Statements/StatementsBlock.php b/Library/Expression/Builder/Statements/StatementsBlock.php
index 013c242dd1..2a30ea4480 100644
--- a/Library/Expression/Builder/Statements/StatementsBlock.php
+++ b/Library/Expression/Builder/Statements/StatementsBlock.php
@@ -14,8 +14,6 @@
 use Zephir\Expression\Builder\AbstractBuilder;
 
 /**
- * StatementsBlock.
- *
  * Allows to manually build a statements block AST node
  */
 class StatementsBlock extends AbstractBuilder
diff --git a/Library/Expression/NativeArray.php b/Library/Expression/NativeArray.php
index 72c87e03f7..071a9aeb49 100644
--- a/Library/Expression/NativeArray.php
+++ b/Library/Expression/NativeArray.php
@@ -45,7 +45,7 @@ class NativeArray
      * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -61,16 +61,6 @@ public function setReadOnly(bool $readOnly): void
         $this->readOnly = $readOnly;
     }
 
-    /**
-     * Sets whether the expression must be resolved in "noisy" mode.
-     *
-     * @param bool $noisy
-     */
-    public function setNoisy(bool $noisy): void
-    {
-        $this->noisy = $noisy;
-    }
-
     /**
      * Resolves an item to be added in an array.
      *
diff --git a/Library/Expression/NativeArrayAccess.php b/Library/Expression/NativeArrayAccess.php
index 8fc2d54ded..83cc2a21ab 100644
--- a/Library/Expression/NativeArrayAccess.php
+++ b/Library/Expression/NativeArrayAccess.php
@@ -24,11 +24,9 @@
  */
 class NativeArrayAccess
 {
-    /** @var bool */
-    protected $expecting = true;
+    protected bool $expecting = true;
 
-    /** @var bool */
-    protected $readOnly = false;
+    protected bool $readOnly = false;
 
     /** @var Variable|null */
     protected $expectingVariable;
@@ -278,11 +276,11 @@ protected function accessDimensionArray($expression, Variable $variableVariable,
                         $symbolVariable->observeVariant($compilationContext);
                         $this->readOnly = false;
                     } else {
-                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext, $expression);
+                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
                     }
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
             }
         }
 
diff --git a/Library/Expression/PropertyAccess.php b/Library/Expression/PropertyAccess.php
index 35edb3685f..b1603a983f 100644
--- a/Library/Expression/PropertyAccess.php
+++ b/Library/Expression/PropertyAccess.php
@@ -18,31 +18,26 @@
 use Zephir\Variable;
 
 /**
- * Zephir\Expression\PropertyAccess.
- *
  * Resolves expressions that read properties
  */
 class PropertyAccess
 {
-    /** @var bool */
-    protected $expecting = true;
+    protected bool $expecting = true;
 
-    /** @var bool */
-    protected $readOnly = false;
+    protected bool $readOnly = false;
 
     protected $expectingVariable;
 
-    /** @var bool */
-    protected $noisy = true;
+    protected bool $noisy = true;
 
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool     $expecting
-     * @param Variable $expectingVariable
+     * @param bool $expecting
+     * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn($expecting, Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -140,7 +135,7 @@ public function compile($expression, CompilationContext $compilationContext)
             }
         }
 
-        /*
+        /**
          * Having a proper propertyDefinition we can check if the property is readable
          * according to its modifiers
          */
@@ -150,7 +145,7 @@ public function compile($expression, CompilationContext $compilationContext)
             }
 
             if (!$propertyDefinition->isPublic()) {
-                /*
+                /**
                  * Protected variables only can be read in the class context
                  * where they were declared
                  */
@@ -184,7 +179,7 @@ public function compile($expression, CompilationContext $compilationContext)
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
 
-                /*
+                /**
                  * If a variable is assigned once in the method, we try to promote it
                  * to a read only variable
                  */
@@ -201,13 +196,12 @@ public function compile($expression, CompilationContext $compilationContext)
                     }
                 }
 
-                /*
-                 * Variable is not read only or it wasn't promoted
+                /**
+                 * Variable is not read only, or it wasn't promoted
                  */
                 if (!$readOnly) {
                     if ('return_value' != $symbolVariable->getName()) {
                         $symbolVariable->observeVariant($compilationContext);
-                        $this->readOnly = false;
                     } else {
                         $makeSymbolVariable = true;
                     }
@@ -227,24 +221,22 @@ public function compile($expression, CompilationContext $compilationContext)
             if ($readOnly) {
                 $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext);
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
             }
         }
 
-        /*
+        /**
          * Variable that receives a property value must be polymorphic
          */
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException('Cannot use variable: '.$symbolVariable->getType().' to assign property value', $expression);
         }
 
-        /*
+        /**
          * At this point, we don't know the exact dynamic type fetched from the property
          */
         $symbolVariable->setDynamicTypes('undefined');
-
         $compilationContext->headersManager->add('kernel/object');
-
         $compilationContext->backend->fetchProperty($symbolVariable, $variableVariable, $property, $readOnly, $compilationContext);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Expression/PropertyDynamicAccess.php b/Library/Expression/PropertyDynamicAccess.php
index 433e0e7f2b..31218d182d 100644
--- a/Library/Expression/PropertyDynamicAccess.php
+++ b/Library/Expression/PropertyDynamicAccess.php
@@ -20,20 +20,17 @@
 use function Zephir\add_slashes;
 
 /**
- * Zephir\Expression\PropertyDynamicAccess.
- *
  * Resolves expressions that read properties with a dynamic variable as property
  */
 class PropertyDynamicAccess
 {
-    protected $expecting = true;
+    protected bool $expecting = true;
 
-    protected $readOnly = false;
+    protected bool $readOnly = false;
 
     protected $expectingVariable;
 
-    /** @var bool */
-    protected $noisy = true;
+    protected bool $noisy = true;
 
     /**
      * Sets if the variable must be resolved into a direct variable symbol
@@ -108,7 +105,7 @@ public function compile($expression, CompilationContext $compilationContext)
                 throw new CompilerException('Variable type: '.$propertyAccess['right']['type'].' cannot be used as object', $propertyAccess['left']);
         }
 
-        /*
+        /**
          * Resolves the symbol that expects the value
          */
         if ($this->expecting) {
@@ -117,14 +114,14 @@ public function compile($expression, CompilationContext $compilationContext)
                 if ('return_value' != $symbolVariable->getName()) {
                     $symbolVariable->observeVariant($compilationContext);
                 } else {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext, $expression);
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
             }
         }
 
-        /*
+        /**
          * Variable that receives a property value must be polymorphic
          */
         if ($symbolVariable && !$symbolVariable->isVariable()) {
diff --git a/Library/Expression/Reference.php b/Library/Expression/Reference.php
index cf5a23425e..55803254e4 100644
--- a/Library/Expression/Reference.php
+++ b/Library/Expression/Reference.php
@@ -13,12 +13,12 @@
 
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\GlobalConstant;
 use Zephir\Variable;
 
 /**
@@ -49,6 +49,14 @@ class Reference
      */
     protected ?Variable $expectingVariable = null;
 
+    private array $validTypes = [
+        'variable',
+        'string',
+        'object',
+        'array',
+        'callable',
+    ];
+
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
@@ -56,7 +64,7 @@ class Reference
      * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -72,115 +80,16 @@ public function setReadOnly(bool $readOnly): void
         $this->readOnly = $readOnly;
     }
 
-    /**
-     * Resolves an item to be added in an array.
-     *
-     * @param CompiledExpression $exprCompiled
-     * @param CompilationContext $compilationContext
-     *
-     * @return GlobalConstant|Variable
-     *
-     * @throws Exception
-     */
-    public function getArrayValue(CompiledExpression $exprCompiled, CompilationContext $compilationContext)
-    {
-        $codePrinter = $compilationContext->codePrinter;
-
-        switch ($exprCompiled->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $codePrinter->output('ZVAL_LONG('.$tempVar->getName().', '.$exprCompiled->getCode().');');
-
-                return $tempVar;
-
-            case 'char':
-            case 'uchar':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $codePrinter->output('ZVAL_LONG('.$tempVar->getName().', \''.$exprCompiled->getCode().'\');');
-
-                return $tempVar;
-
-            case 'double':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $codePrinter->output('ZVAL_DOUBLE('.$tempVar->getName().', '.$exprCompiled->getCode().');');
-
-                return $tempVar;
-
-            case 'bool':
-                if ('true' === $exprCompiled->getCode()) {
-                    return new GlobalConstant('ZEPHIR_GLOBAL(global_true)');
-                }
-
-                if ('false' === $exprCompiled->getCode()) {
-                    return new GlobalConstant('ZEPHIR_GLOBAL(global_false)');
-                }
-
-                throw new Exception('?');
-                break;
-
-            case 'null':
-                return new GlobalConstant('ZEPHIR_GLOBAL(global_null)');
-
-            case 'string':
-            case 'ulong':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $codePrinter->output('ZVAL_STRING('.$tempVar->getName().', "'.$exprCompiled->getCode().'", 1);');
-
-                return $tempVar;
-
-            case 'array':
-                return $compilationContext->symbolTable->getVariableForRead($exprCompiled->getCode(), $compilationContext, $exprCompiled->getOriginal());
-
-            case 'variable':
-                $itemVariable = $compilationContext->symbolTable->getVariableForRead($exprCompiled->getCode(), $compilationContext, $exprCompiled->getOriginal());
-                switch ($itemVariable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $codePrinter->output('ZVAL_LONG('.$tempVar->getName().', '.$itemVariable->getName().');');
-
-                        return $tempVar;
-
-                    case 'double':
-                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $codePrinter->output('ZVAL_DOUBLE('.$tempVar->getName().', '.$itemVariable->getName().');');
-
-                        return $tempVar;
-
-                    case 'bool':
-                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $codePrinter->output('ZVAL_BOOL('.$tempVar->getName().', '.$itemVariable->getName().');');
-
-                        return $tempVar;
-
-                    case 'string':
-                    case 'variable':
-                    case 'array':
-                        return $itemVariable;
-
-                    default:
-                        throw new CompilerException('Unknown '.$itemVariable->getType(), $itemVariable);
-                }
-                break;
-
-            default:
-                throw new CompilerException('Unknown', $exprCompiled);
-        }
-    }
-
     /**
      * Compiles a reference to a value.
      *
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -204,20 +113,12 @@ public function compile(array $expression, CompilationContext $compilationContex
         $leftExpr->setReadOnly($this->readOnly);
         $left = $leftExpr->compile($compilationContext);
 
-        $validTypes = [
-            'variable',
-            'string',
-            'object',
-            'array',
-            'callable',
-        ];
-
-        if (!in_array($left->getType(), $validTypes)) {
+        if (!in_array($left->getType(), $this->validTypes)) {
             throw new CompilerException('Cannot obtain a reference from type: '.$left->getType(), $expression);
         }
 
         $leftVariable = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression);
-        if (!in_array($leftVariable->getType(), $validTypes)) {
+        if (!in_array($leftVariable->getType(), $this->validTypes)) {
             throw new CompilerException('Cannot obtain reference from variable type: '.$leftVariable->getType(), $expression);
         }
 
diff --git a/Library/Expression/StaticConstantAccess.php b/Library/Expression/StaticConstantAccess.php
index 4ab9fe5f13..7d8b4c078e 100644
--- a/Library/Expression/StaticConstantAccess.php
+++ b/Library/Expression/StaticConstantAccess.php
@@ -9,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\ClassConstant;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -18,30 +21,28 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable;
 
+use function gettype;
+use function in_array;
+
 /**
- * StaticConstantAccess.
- *
  * Resolves class constants
  */
 class StaticConstantAccess
 {
-    /** @var bool */
-    protected $expecting = true;
+    protected bool $expecting = true;
 
-    /** @var bool */
-    protected $readOnly = false;
+    protected bool $readOnly = false;
 
-    /** @var Variable|null */
-    protected $expectingVariable;
+    protected ?Variable $expectingVariable = null;
 
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool          $expecting
+     * @param bool $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn($expecting, Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -52,32 +53,32 @@ public function setExpectReturn($expecting, Variable $expectingVariable = null)
      *
      * @param bool $readOnly
      */
-    public function setReadOnly($readOnly)
+    public function setReadOnly(bool $readOnly): void
     {
-        $this->readOnly = (bool) $readOnly;
+        $this->readOnly = $readOnly;
     }
 
     /**
      * Access a static constant class.
      *
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException|Exception
-     *
      * @return CompiledExpression
+     * @throws Exception
+     * @throws ReflectionException
      */
-    public function compile(array $expression, CompilationContext $compilationContext)
+    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
         $compiler = &$compilationContext->compiler;
         $className = $expression['left']['value'];
         $constant = $expression['right']['value'];
 
-        /*
+        /**
          * Fetch the class definition according to the class where the constant
          * is supposed to be declared
          */
-        if (!\in_array($className, ['this', 'self', 'static', 'parent'])) {
+        if (!in_array($className, ['this', 'self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className) || $compiler->isInterface($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -89,30 +90,28 @@ public function compile(array $expression, CompilationContext $compilationContex
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static', 'this'])) {
+            if (in_array($className, ['self', 'static', 'this'])) {
                 $classDefinition = $compilationContext->classDefinition;
-            } else {
-                if ('parent' == $className) {
-                    $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
-                    if (!$extendsClass) {
-                        throw new CompilerException(
-                            sprintf(
-                                'Cannot find constant called "%s" on parent because class %s does not extend any class',
-                                $constant,
-                                $classDefinition->getCompleteName()
-                            ),
-                            $expression
-                        );
-                    } else {
-                        $classDefinition = $classDefinition->getExtendsClassDefinition();
-                    }
+            } elseif ('parent' === $className) {
+                $classDefinition = $compilationContext->classDefinition;
+                $extendsClass = $classDefinition->getExtendsClass();
+                if (!$extendsClass) {
+                    throw new CompilerException(
+                        sprintf(
+                            'Cannot find constant called "%s" on parent because class %s does not extend any class',
+                            $constant,
+                            $classDefinition->getCompleteName()
+                        ),
+                        $expression
+                    );
+                } else {
+                    $classDefinition = $classDefinition->getExtendsClassDefinition();
                 }
             }
         }
 
-        /*
-         * Constants are resolved to their values at compile time
+        /**
+         * Constants are resolved to their values at compile time,
          * so we need to check that they effectively do exist
          */
         if (!$classDefinition->hasConstant($constant)) {
@@ -126,11 +125,11 @@ public function compile(array $expression, CompilationContext $compilationContex
             );
         }
 
-        /*
+        /**
          * We can optimize the reading of constants by avoiding query their value every time
          */
         if (!$compilationContext->config->get('static-constant-class-folding', 'optimizations')) {
-            /*
+            /**
              * Resolves the symbol that expects the value
              */
             if ($this->expecting) {
@@ -152,7 +151,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 );
             }
 
-            /*
+            /**
              * Variable that receives property accesses must be polymorphic
              */
             if (!$symbolVariable->isVariable()) {
@@ -163,9 +162,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             }
 
             $symbolVariable->setDynamicTypes('undefined');
-
             $compilationContext->headersManager->add('kernel/object');
-
             $compilationContext->codePrinter->output(
                 sprintf(
                     'zephir_get_class_constant(%s, %s, SS("%s"));',
@@ -186,8 +183,8 @@ public function compile(array $expression, CompilationContext $compilationContex
             $type = $constantDefinition->getValueType();
         } else {
             $value = $constantDefinition;
-            $type = \gettype($value);
-            if ('integer' == $type) {
+            $type = gettype($value);
+            if ('integer' === $type) {
                 $type = 'int';
             }
         }
@@ -209,9 +206,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                 return new CompiledExpression('null', null, $expression);
         }
 
-        /*
-         * Return the value as a literal expression
-         */
         return new CompiledExpression($type, $value, $expression);
     }
 }
diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
index 56970fee8e..80347e9428 100644
--- a/Library/Expression/StaticPropertyAccess.php
+++ b/Library/Expression/StaticPropertyAccess.php
@@ -9,36 +9,39 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable;
 
+use function in_array;
+
 /**
- * Zephir\Expression\StaticPropertyAccess.
- *
  * Resolves class static properties
  */
 class StaticPropertyAccess
 {
-    protected $expecting = true;
+    protected bool $expecting = true;
 
-    protected $readOnly = false;
+    protected bool $readOnly = false;
 
-    /** @var Variable|null */
-    protected $expectingVariable;
+    protected ?Variable $expectingVariable = null;
 
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool          $expecting
+     * @param bool $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn($expecting, Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -49,7 +52,7 @@ public function setExpectReturn($expecting, Variable $expectingVariable = null)
      *
      * @param bool $readOnly
      */
-    public function setReadOnly($readOnly)
+    public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
@@ -57,22 +60,24 @@ public function setReadOnly($readOnly)
     /**
      * Access a static property.
      *
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
+     * @throws ReflectionException
+     * @throws Exception
      */
-    public function compile($expression, CompilationContext $compilationContext)
+    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
         $className = $expression['left']['value'];
         $compiler = $compilationContext->compiler;
         $property = $expression['right']['value'];
 
-        /*
+        /**
          * Fetch the class definition according to the class where the constant
          * is supposed to be declared
          */
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -84,13 +89,12 @@ public function compile($expression, CompilationContext $compilationContext)
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
-                if ('parent' == $className) {
+                if ('parent' === $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
-                    if (!$extendsClass) {
+                    if (!$classDefinition->getExtendsClass()) {
                         throw new CompilerException('Cannot access static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $expression);
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
@@ -121,13 +125,13 @@ public function compile($expression, CompilationContext $compilationContext)
             }
         }
 
-        /*
+        /**
          * Resolves the symbol that expects the value
          */
         if ($this->expecting) {
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
-                if ('return_value' == $symbolVariable->getName()) {
+                if ('return_value' === $symbolVariable->getName()) {
                     $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext);
                 }
             } else {
@@ -137,7 +141,7 @@ public function compile($expression, CompilationContext $compilationContext)
             $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext);
         }
 
-        /*
+        /**
          * Variable that receives property accesses must be polymorphic
          */
         if (!$symbolVariable->isVariable()) {
@@ -145,15 +149,12 @@ public function compile($expression, CompilationContext $compilationContext)
         }
 
         $symbolVariable->setDynamicTypes('undefined');
-
         $compilationContext->headersManager->add('kernel/object');
 
-        $readOnly = $this->readOnly;
-        if (!$readOnly) {
-            if ('return_value' != $symbolVariable->getName()) {
-                $symbolVariable->observeVariant($compilationContext);
-            }
+        if (!$this->readOnly && 'return_value' != $symbolVariable->getName()) {
+            $symbolVariable->observeVariant($compilationContext);
         }
+
         $compilationContext->backend->fetchStaticProperty($symbolVariable, $classDefinition, $property, $this->readOnly, $compilationContext);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/Library/Fcall/FcallAwareInterface.php b/Library/Fcall/FcallAwareInterface.php
deleted file mode 100644
index 307a754048..0000000000
--- a/Library/Fcall/FcallAwareInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Fcall;
-
-/**
- * Zephir\Fcall\FcallAwareInterface.
- */
-interface FcallAwareInterface
-{
-    /**
-     * Sets the FcallManager.
-     *
-     * @param FcallManagerInterface $fcallManager
-     */
-    public function setFcallManager(FcallManagerInterface $fcallManager);
-
-    /**
-     * Returns currently used FcallManager.
-     *
-     * @return FcallManagerInterface
-     */
-    public function getFcallManager();
-}
diff --git a/Library/Fcall/FcallManagerInterface.php b/Library/Fcall/FcallManagerInterface.php
index 1af5aa596a..ab02c599b5 100644
--- a/Library/Fcall/FcallManagerInterface.php
+++ b/Library/Fcall/FcallManagerInterface.php
@@ -11,13 +11,8 @@
 
 namespace Zephir\Fcall;
 
-/**
- * Zephir\Fcall\FcallManagerInterface.
- */
 interface FcallManagerInterface
 {
-    public function macroIsRequired($macro);
-
     /**
      * Resolve internal fcall attributes to a suitable macro and ensure that it's generated during compilation.
      *
diff --git a/Library/LiteralCompiledExpression.php b/Library/LiteralCompiledExpression.php
index f8c20af30a..8c6ea22cab 100644
--- a/Library/LiteralCompiledExpression.php
+++ b/Library/LiteralCompiledExpression.php
@@ -14,7 +14,7 @@
 /**
  * LiteralCompiledExpression.
  *
- * This represent a compiled expression as CompiledExpression, but the contents of
+ * This represents a compiled expression as CompiledExpression, but the contents of
  * the resolved code is potentially a simple literal expression
  */
 class LiteralCompiledExpression extends CompiledExpression
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index 47995a1653..cceadf303e 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -11,6 +11,7 @@
 
 namespace Zephir;
 
+use ReflectionException;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 
@@ -41,7 +42,7 @@ class MethodCall extends Call
      * @param CompilationContext $compilationContext
      * @return mixed|CompiledExpression
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(Expression $expr, CompilationContext $compilationContext): mixed
     {
@@ -670,7 +671,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                         }
                                         break;
 
-                                    /*
+                                    /**
                                      * Passing polymorphic variables to static typed parameters
                                      * could lead to potential unexpected type coercions
                                      */
@@ -826,12 +827,13 @@ public function compile(Expression $expr, CompilationContext $compilationContext
      * Examine internal class information and returns the method called.
      *
      * @param CompilationContext $compilationContext
-     * @param Variable           $caller
-     * @param string             $methodName
+     * @param Variable $caller
+     * @param string $methodName
      *
      * @return array
+     * @throws ReflectionException
      */
-    private function getRealCalledMethod(CompilationContext $compilationContext, Variable $caller, $methodName)
+    private function getRealCalledMethod(CompilationContext $compilationContext, Variable $caller, string $methodName): array
     {
         $compiler = $compilationContext->compiler;
 
diff --git a/Library/Operators/AbstractOperator.php b/Library/Operators/AbstractOperator.php
index 50e49f3c5b..037f5066ef 100644
--- a/Library/Operators/AbstractOperator.php
+++ b/Library/Operators/AbstractOperator.php
@@ -35,7 +35,7 @@ abstract class AbstractOperator
      * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -81,33 +81,24 @@ public function getExpectedNonLiteral(CompilationContext $compilationContext, ar
      * store the result.
      *
      * @param CompilationContext $compilationContext
-     * @param array              $expression
-     * @param bool               $init
+     * @param array $expression
+     * @param bool $init
      *
-     * @return Variable
+     * @return Variable|null
      */
     public function getExpected(CompilationContext $compilationContext, array $expression, bool $init = true): ?Variable
     {
-        $symbolVariable = $this->expectingVariable;
+        if (!$this->expecting) {
+            return $this->expectingVariable;
+        }
 
-        if ($this->expecting) {
-            if (\is_object($symbolVariable)) {
-                if ('variable' === $symbolVariable->getType()) {
-                    if (!$init) {
-                        return $symbolVariable;
-                    }
-                    $symbolVariable->initVariant($compilationContext);
-                } else {
-                    if (!$this->readOnly) {
-                        if (!$this->literalOnly) {
-                            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
-                        } else {
-                            $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite('variable', $compilationContext);
-                        }
-                    } else {
-                        $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite('variable', $compilationContext);
-                    }
+        $symbolVariable = $this->expectingVariable;
+        if (\is_object($symbolVariable)) {
+            if ('variable' === $symbolVariable->getType()) {
+                if (!$init) {
+                    return $symbolVariable;
                 }
+                $symbolVariable->initVariant($compilationContext);
             } else {
                 if (!$this->readOnly) {
                     if (!$this->literalOnly) {
@@ -119,6 +110,16 @@ public function getExpected(CompilationContext $compilationContext, array $expre
                     $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite('variable', $compilationContext);
                 }
             }
+        } else {
+            if (!$this->readOnly) {
+                if (!$this->literalOnly) {
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+                } else {
+                    $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite('variable', $compilationContext);
+                }
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite('variable', $compilationContext);
+            }
         }
 
         return $symbolVariable;
diff --git a/Library/Operators/Comparison/ComparisonBaseOperator.php b/Library/Operators/Comparison/ComparisonBaseOperator.php
index d9c49f3113..a09fbbbbe3 100644
--- a/Library/Operators/Comparison/ComparisonBaseOperator.php
+++ b/Library/Operators/Comparison/ComparisonBaseOperator.php
@@ -152,7 +152,7 @@ public function optimizeTypeOf(array $expr, CompilationContext $compilationConte
                 break;
 
             case 'variable':
-                $condition = $compilationContext->backend->getTypeofCondition($variableVariable, $operator, $value, $compilationContext);
+                $condition = $compilationContext->backend->getTypeofCondition($variableVariable, $operator, $value);
                 break;
 
             default:
@@ -231,7 +231,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case 'mixed':
                             case 'string':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $condition = $compilationContext->backend->getTypeofCondition($variableRight, $this->operator, 'null', $compilationContext);
+                                $condition = $compilationContext->backend->getTypeofCondition($variableRight, $this->operator, 'null');
 
                                 return new CompiledExpression('bool', $condition, $expression);
 
@@ -595,7 +595,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                         switch ($right->getType()) {
                             case 'null':
-                                $condition = $compilationContext->backend->getTypeofCondition($variable, $this->operator, 'null', $compilationContext);
+                                $condition = $compilationContext->backend->getTypeofCondition($variable, $this->operator, 'null');
 
                                 return new CompiledExpression('bool', $condition, $expression['left']);
 
diff --git a/Library/Operators/Logical/AndOperator.php b/Library/Operators/Logical/AndOperator.php
index 29b4e55040..0ce42886df 100644
--- a/Library/Operators/Logical/AndOperator.php
+++ b/Library/Operators/Logical/AndOperator.php
@@ -14,6 +14,7 @@
 namespace Zephir\Operators\Logical;
 
 use Exception;
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -32,6 +33,7 @@ class AndOperator extends LogicalBaseOperator
      *
      * @return CompiledExpression
      *
+     * @throws ReflectionException
      * @throws \Zephir\Exception
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
diff --git a/Library/Operators/Other/CloneOperator.php b/Library/Operators/Other/CloneOperator.php
index 742430d903..56e1a91350 100644
--- a/Library/Operators/Other/CloneOperator.php
+++ b/Library/Operators/Other/CloneOperator.php
@@ -64,7 +64,6 @@ public function compile(array $expression, CompilationContext $compilationContex
         }
 
         $symbolVariable->setDynamicTypes('object');
-
         $symbolVariable->setIsInitialized(true, $compilationContext);
 
         /* Inherit the dynamic type data from the cloned object */
diff --git a/Library/Operators/Other/IssetOperator.php b/Library/Operators/Other/IssetOperator.php
index 061ce042a4..4ed034dd7b 100644
--- a/Library/Operators/Other/IssetOperator.php
+++ b/Library/Operators/Other/IssetOperator.php
@@ -123,7 +123,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $variableCode = $compilationContext->backend->getVariableCode($variable);
 
                 if ('property-access' === $left['type']) {
-                    return $compilationContext->backend->propertyIsset($variable, $left['right']['value'], $compilationContext);
+                    return $compilationContext->backend->propertyIsset($variable, $left['right']['value']);
                 }
 
                 $expr = new Expression($left['right']);
diff --git a/Library/Statements/ForStatement.php b/Library/Statements/ForStatement.php
index e2639a38eb..3354a89d9b 100644
--- a/Library/Statements/ForStatement.php
+++ b/Library/Statements/ForStatement.php
@@ -485,7 +485,8 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
             $codePrinter->increaseLevel();
             $codePrinter->output('{');
             $codePrinter->increaseLevel();
-            $compilationContext->backend->forStatementIterator($iteratorVariable, $variable, $compilationContext);
+            $compilationContext->symbolTable->mustGrownStack(true);
+            $compilationContext->codePrinter->output('ZEPHIR_ITERATOR_COPY('.$compilationContext->backend->getVariableCode($variable).', '.$iteratorVariable->getName().');');
             $codePrinter->decreaseLevel();
             $codePrinter->output('}');
             $codePrinter->decreaseLevel();
diff --git a/Library/Statements/IfStatement.php b/Library/Statements/IfStatement.php
index f079af883b..df1756947e 100644
--- a/Library/Statements/IfStatement.php
+++ b/Library/Statements/IfStatement.php
@@ -11,36 +11,37 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\Branch;
 use Zephir\CompilationContext;
 use Zephir\Detectors\ReadDetector;
+use Zephir\Exception;
 use Zephir\Optimizers\EvalExpression;
 use Zephir\Passes\SkipVariantInit;
 use Zephir\StatementsBlock;
 
 /**
- * IfStatement.
- *
  * 'If' statement, the same as in PHP/C
  */
 class IfStatement extends StatementAbstract
 {
     /**
      * @param CompilationContext $compilationContext
+     * @throws ReflectionException
+     * @throws Exception
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $exprRaw = $this->statement['expr'];
 
         $expr = new EvalExpression();
         $condition = $expr->optimize($exprRaw, $compilationContext);
 
-        /*
+        /**
          * This pass tries to move dynamic variable initialization out of the if/else branch
          */
         if (isset($this->statement['statements']) && (isset($this->statement['else_statements']) || isset($this->statement['elseif_statements']))) {
             $readDetector = new ReadDetector();
-
             $skipVariantInit = new SkipVariantInit();
 
             $skipVariantInit->setVariablesToSkip(0, $expr->getUsedVariables());
@@ -73,7 +74,7 @@ public function compile(CompilationContext $compilationContext)
             foreach ($skipVariantInit->getVariables() as $variable) {
                 if ($symbolTable->hasVariable($variable)) {
                     $symbolVariable = $symbolTable->getVariable($variable);
-                    if ('variable' == $symbolVariable->getType()) {
+                    if ('variable' === $symbolVariable->getType()) {
                         if (!$readDetector->detect($variable, $exprRaw)) {
                             $symbolVariable->initVariant($compilationContext);
                             $symbolVariable->skipInitVariant(2);
@@ -96,7 +97,7 @@ public function compile(CompilationContext $compilationContext)
             }
         }
 
-        /*
+        /**
          * Compile statements in the 'if' block
          */
         if (isset($this->statement['statements'])) {
@@ -105,11 +106,11 @@ public function compile(CompilationContext $compilationContext)
             $branch->setRelatedStatement($this);
         }
 
-        /*
+        /**
          * Compile statements in the 'elseif' block
          */
         if (isset($this->statement['elseif_statements'])) {
-            foreach ($this->statement['elseif_statements'] as $key => $statement) {
+            foreach ($this->statement['elseif_statements'] as $statement) {
                 if (!isset($statement['statements'])) {
                     continue;
                 }
@@ -121,7 +122,7 @@ public function compile(CompilationContext $compilationContext)
             }
         }
 
-        /*
+        /**
          * Compile statements in the 'else' block
          */
         if (isset($this->statement['else_statements'])) {
diff --git a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php b/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
index cb0f51d753..b7d02416b0 100644
--- a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -13,13 +13,12 @@
 
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Variable as ZephirVariable;
 
 /**
- * ObjectPropertyArrayIndexAppend.
- *
  * Updates object properties dynamically
  */
 class ObjectPropertyArrayIndexAppend extends ArrayIndex
@@ -43,21 +42,21 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             throw new CompilerException('Attempt to use variable type: '.$symbolVariable->getType().' as object', $statement);
         }
 
-        $this->_assignPropertyArrayMultipleIndex($variable, $symbolVariable, $resolvedExpr, $compilationContext, $statement);
+        $this->_assignPropertyArrayMultipleIndex($symbolVariable, $resolvedExpr, $compilationContext, $statement);
     }
 
     /**
      * Compiles x->y[a][b][] = {expr} (multiple offset assignment).
      *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
+     * @param ZephirVariable $symbolVariable
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
-     * @param array              $statement
+     * @param array $statement
      *
-     * @throws CompilerException
+     * @throws \ReflectionException
+     * @throws Exception
      */
-    protected function _assignPropertyArrayMultipleIndex($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
+    protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
     {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
@@ -94,7 +93,7 @@ protected function _assignPropertyArrayMultipleIndex($variable, ZephirVariable $
             $offsetExprs[] = $resolvedIndex;
         }
 
-        /*
+        /**
          * Check if the property to update is defined
          */
         if ('this' == $symbolVariable->getRealName()) {
@@ -103,7 +102,7 @@ protected function _assignPropertyArrayMultipleIndex($variable, ZephirVariable $
                 throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
             }
         } else {
-            /*
+            /**
              * If we know the class related to a variable we could check if the property
              * is defined on that class
              */
diff --git a/Library/Statements/ReturnStatement.php b/Library/Statements/ReturnStatement.php
index a411c5816d..c536999c60 100644
--- a/Library/Statements/ReturnStatement.php
+++ b/Library/Statements/ReturnStatement.php
@@ -22,8 +22,6 @@
 use function Zephir\add_slashes;
 
 /**
- * ReturnStatement.
- *
  * Return statement is used to assign variables
  */
 final class ReturnStatement extends StatementAbstract
diff --git a/Library/Statements/StatementAbstract.php b/Library/Statements/StatementAbstract.php
index 96f75c5954..56428c4b48 100644
--- a/Library/Statements/StatementAbstract.php
+++ b/Library/Statements/StatementAbstract.php
@@ -14,48 +14,15 @@
 use Zephir\CompilationContext;
 use Zephir\Optimizers\EvalExpression;
 
-/**
- * Zephir\Statements\StatementAbstract.
- */
 abstract class StatementAbstract
 {
-    protected $statement;
-
-    protected $uniqueId;
-
-    /** @var EvalExpression|null */
-    protected $evalExpression;
-
-    protected static $uniqueGenerator;
+    protected ?EvalExpression $evalExpression;
 
-    /**
-     * StatementAbstract construct.
-     *
-     * @param array $statement
-     */
-    public function __construct(array $statement)
+    public function __construct(protected array $statement)
     {
-        $this->statement = $statement;
     }
 
-    /**
-     * Generates a uniqueId for those instructions that need it.
-     *
-     * @return int
-     */
-    public function getUniqueId()
-    {
-        if (!$this->uniqueId) {
-            $this->uniqueId = self::$uniqueGenerator++;
-        }
-
-        return $this->uniqueId;
-    }
-
-    /**
-     * @return EvalExpression|null
-     */
-    public function getEvalExpression()
+    public function getEvalExpression(): ?EvalExpression
     {
         return $this->evalExpression;
     }
diff --git a/Library/Statements/SwitchStatement.php b/Library/Statements/SwitchStatement.php
index 29cc6fe92b..bff0c62b27 100644
--- a/Library/Statements/SwitchStatement.php
+++ b/Library/Statements/SwitchStatement.php
@@ -13,21 +13,23 @@
 
 use Zephir\Branch;
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Expression;
 use Zephir\Optimizers\EvalExpression;
 use Zephir\StatementsBlock;
+use function count;
 
 /**
- * SwitchStatement.
- *
  * Switch statement, the same as in PHP/C
  */
 class SwitchStatement extends StatementAbstract
 {
     /**
      * @param CompilationContext $compilationContext
+     * @throws \ReflectionException
+     * @throws Exception
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $exprRaw = $this->statement['expr'];
 
@@ -113,14 +115,14 @@ public function compile(CompilationContext $compilationContext)
                 }
             }
 
-            /*
+            /**
              * In the second round we generate the conditions with their blocks
              * grouping 'cases' without a statement block using an 'or'
              */
             foreach ($blocks as $block) {
                 $expressions = $block['expr'];
 
-                if (1 == \count($expressions)) {
+                if (1 == count($expressions)) {
                     $condition = $evalExpr->optimize($expressions[0], $compilationContext);
                     $codePrinter->output('if ('.$condition.') {');
                 } else {
@@ -142,7 +144,7 @@ public function compile(CompilationContext $compilationContext)
 
             $compilationContext->codePrinter->decreaseLevel();
 
-            /*
+            /**
              * The default block is resolved at the end of the 'switch'
              */
             if ($defaultBlock) {
@@ -165,7 +167,7 @@ public function normalizeClauses($clauses)
             }
         }
 
-        if ($defaultIndex === \count($clauses) - 1) {
+        if ($defaultIndex === count($clauses) - 1) {
             return $clauses;
         }
 
diff --git a/Library/Statements/ThrowStatement.php b/Library/Statements/ThrowStatement.php
index 70a7e38322..06bca5ad52 100644
--- a/Library/Statements/ThrowStatement.php
+++ b/Library/Statements/ThrowStatement.php
@@ -27,8 +27,6 @@
 use function Zephir\fqcn;
 
 /**
- * ThrowStatement.
- *
  * Throws exceptions
  */
 class ThrowStatement extends StatementAbstract
@@ -39,7 +37,7 @@ class ThrowStatement extends StatementAbstract
      * @throws Exception
      * @throws ReflectionException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $compilationContext->headersManager->add('kernel/exception');
 
@@ -47,7 +45,7 @@ public function compile(CompilationContext $compilationContext)
         $statement = $this->statement;
         $expr = $statement['expr'];
 
-        /*
+        /**
          * This optimizes throw new Exception("hello")
          */
         if (!$compilationContext->insideTryCatch) {
diff --git a/Library/Statements/TryCatchStatement.php b/Library/Statements/TryCatchStatement.php
index c2f5cf4f87..197222ce17 100644
--- a/Library/Statements/TryCatchStatement.php
+++ b/Library/Statements/TryCatchStatement.php
@@ -18,16 +18,11 @@
 use Zephir\StatementsBlock;
 
 /**
- * TryCatchStatement.
- *
  * Try/Catch statement the same as in PHP
  */
 class TryCatchStatement extends StatementAbstract
 {
-    /**
-     * @param CompilationContext $compilationContext
-     */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $codePrinter = $compilationContext->codePrinter;
 
@@ -46,7 +41,7 @@ public function compile(CompilationContext $compilationContext)
         $codePrinter->outputBlankLine();
         $codePrinter->output('try_end_'.$currentTryCatch.':');
 
-        /*
+        /**
          * If 'try' is the latest statement add a 'dummy' statement to avoid compilation errors
          */
         $codePrinter->outputBlankLine();
@@ -54,7 +49,7 @@ public function compile(CompilationContext $compilationContext)
         --$compilationContext->insideTryCatch;
 
         if (isset($this->statement['catches'])) {
-            /*
+            /**
              * Check if there was an exception
              */
             $codePrinter->output('if (EG(exception)) {');
@@ -78,20 +73,16 @@ public function compile(CompilationContext $compilationContext)
 
                 $assignExceptionVarStmt = $exprBuilder->statements()->rawC('ZEPHIR_CPY_WRT(&'.$variable->getName().', &'.$exc_var->getName().');');
 
-                /*
+                /**
                  * TODO:, use a builder here
                  */
                 $variable->setIsInitialized(true, $compilationContext);
                 $variable->setMustInitNull(true);
 
-                /*
+                /**
                  * Check if any of the classes in the catch block match the thrown exception
                  */
                 foreach ($catch['classes'] as $class) {
-                    $assignExceptVar = $exprBuilder->statements()->let([
-                        $exprBuilder->operators()->assignVariable($variable->getName(), $exprBuilder->variable($variable->getName())),
-                    ]);
-
                     $ifs[] = $exprBuilder->statements()->ifX()
                         ->setCondition(
                             $exprBuilder->operators()->binary(
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index 38052a1682..1c28f9cdd0 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -20,8 +20,6 @@
 use function is_string;
 
 /**
- * StaticCall.
- *
  * Call methods in a static context
  */
 class StaticCall extends Call
@@ -413,16 +411,17 @@ protected function callParent($methodName, array $expression, $symbolVariable, $
     }
 
     /**
-     * Calls static methods on the some class context.
+     * Calls static methods on some class context.
      *
-     * @param string             $methodName
-     * @param array              $expression
-     * @param Variable           $symbolVariable
-     * @param bool               $mustInit
-     * @param bool               $isExpecting
-     * @param ClassDefinition    $classDefinition
+     * @param string $methodName
+     * @param array $expression
+     * @param Variable $symbolVariable
+     * @param bool $mustInit
+     * @param bool $isExpecting
+     * @param ClassDefinition $classDefinition
      * @param CompilationContext $compilationContext
-     * @param ClassMethod        $method
+     * @param ClassMethod $method
+     * @throws Exception
      */
     protected function callFromClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, ClassDefinition $classDefinition, CompilationContext $compilationContext, ClassMethod $method)
     {
@@ -446,15 +445,13 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
             $symbolVariable->trackVariant($compilationContext);
         }
 
-        if ($method) {
-            $method = $method->getOptimizedMethod();
-        }
+        $method = $method->getOptimizedMethod();
 
         /**
          * Check if the  method call can have an inline cache.
          */
         $methodCache = $compilationContext->cacheManager->getStaticMethodCache();
-        $cachePointer = $methodCache->get($compilationContext, isset($method) ? $method : null);
+        $cachePointer = $methodCache->get($compilationContext, $method);
 
         $params = [];
         if (isset($expression['parameters']) && count($expression['parameters'])) {
diff --git a/Library/Variable.php b/Library/Variable.php
index 2e2227c8fc..404b61967e 100644
--- a/Library/Variable.php
+++ b/Library/Variable.php
@@ -15,35 +15,27 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Globals;
 
+use function in_array;
+use function is_string;
+
 /**
- * Variable.
- *
  * This represents a variable in a symbol table
  */
 class Variable implements TypeAwareInterface
 {
-    const BRANCH_MAGIC = '$$';
-    /**
-     * Variable's type.
-     */
-    protected $type;
+    public const BRANCH_MAGIC = '$$';
 
     /**
      * Current dynamic type of the variable.
      *
      * @var array
      */
-    protected $dynamicTypes = ['unknown' => true];
-
-    /**
-     * Variable's name.
-     */
-    protected $name;
+    protected array $dynamicTypes = ['unknown' => true];
 
     /**
      * Branch where the variable was initialized for the first time.
      */
-    protected $initBranch = false;
+    protected bool $initBranch = false;
 
     /**
      * Compiled variable's name.
@@ -53,65 +45,65 @@ class Variable implements TypeAwareInterface
     /**
      * Number of times the variable has been read.
      */
-    protected $numberUses = 0;
+    protected int $numberUses = 0;
 
     /**
      * Whether the variable is temporal or not.
      */
-    protected $temporal = false;
+    protected bool $temporal = false;
 
     /**
      * Temporal variables are marked as idle.
      */
-    protected $idle = false;
+    protected bool $idle = false;
 
     /**
      * Reusable temporary variables?
      */
-    protected $reusable = true;
+    protected bool $reusable = true;
 
     /**
      * Number of mutations to the variable.
      */
-    protected $numberMutates = 0;
+    protected int $numberMutates = 0;
 
     /**
      * Whether the variable has received any assignment.
      */
-    protected $initialized = false;
+    protected bool $initialized = false;
 
-    protected $initBranches = [];
+    protected array $initBranches = [];
 
-    protected $isExternal = false;
+    protected bool $isExternal = false;
 
-    protected $variantInits = 0;
+    protected int $variantInits = 0;
 
-    protected $mustInitNull = false;
+    protected bool $mustInitNull = false;
 
-    protected $readOnly = false;
+    protected bool $readOnly = false;
 
-    protected $localOnly = false;
+    protected bool $localOnly = false;
 
-    protected $memoryTracked = true;
+    protected bool $memoryTracked = true;
 
-    protected $doublePointer = false;
+    protected bool $doublePointer = false;
 
     protected $defaultInitValue;
 
     /**
      * Class types.
      */
-    protected $classTypes = [];
+    protected array $classTypes = [];
 
     /**
      * Associated class.
      */
-    protected $associatedClass;
+    protected ClassDefinition $associatedClass;
 
     /**
      * Initialization skips.
      */
-    protected $numberSkips = 0;
+    protected int $numberSkips = 0;
 
     /**
      * AST node where the variable was originally declared or created.
@@ -131,7 +123,7 @@ class Variable implements TypeAwareInterface
     /**
      * Whether the variable was used or not.
      */
-    protected $used = true;
+    protected bool $used = true;
 
     /**
      * Last AST node where the variable was used.
@@ -141,7 +133,7 @@ class Variable implements TypeAwareInterface
     /**
      * @var Globals
      */
-    protected $globalsManager;
+    protected Globals $globalsManager;
 
     /**
      * Complex variable type, they may need special treatment.
@@ -157,16 +149,10 @@ class Variable implements TypeAwareInterface
         'object' => 1,
     ];
 
-    public function __construct(string $type, string $name, protected ?Branch $branch = null)
+    public function __construct(protected string $type, protected string $name, protected ?Branch $branch = null)
     {
         $this->globalsManager = new Globals();
-
-        if (\in_array($type, ['callable', 'object', 'resource'], true)) {
-            $type = 'variable';
-        }
-
-        $this->type = $type;
-        $this->name = $name;
+        $this->type = in_array($type, ['callable', 'object', 'resource'], true) ? 'variable' : $type;
     }
 
     /**
@@ -184,7 +170,7 @@ public function getInitBranch()
      *
      * @return Branch[]
      */
-    public function getInitBranches()
+    public function getInitBranches(): array
     {
         return $this->initBranches;
     }
@@ -194,7 +180,7 @@ public function getInitBranches()
      *
      * @param string $type
      */
-    public function setType(string $type)
+    public function setType(string $type): void
     {
         $this->type = $type;
     }
@@ -214,7 +200,7 @@ public function getType(): string
      *
      * @param bool $localOnly
      */
-    public function setLocalOnly(bool $localOnly)
+    public function setLocalOnly(bool $localOnly): void
     {
         $this->localOnly = $localOnly;
     }
@@ -224,7 +210,7 @@ public function setLocalOnly(bool $localOnly)
      *
      * @return bool
      */
-    public function isLocalOnly()
+    public function isLocalOnly(): bool
     {
         return $this->localOnly;
     }
@@ -234,7 +220,7 @@ public function isLocalOnly()
      *
      * @param bool $doublePointer
      */
-    public function setIsDoublePointer(bool $doublePointer)
+    public function setIsDoublePointer(bool $doublePointer): void
     {
         $this->doublePointer = $doublePointer;
     }
@@ -242,7 +228,7 @@ public function setIsDoublePointer(bool $doublePointer)
     /**
      * Returns the variable.
      */
-    public function isDoublePointer()
+    public function isDoublePointer(): bool
     {
         return $this->doublePointer;
     }
@@ -306,7 +292,7 @@ public function isReadOnly()
      *
      * @param bool $temporal
      */
-    public function setTemporal(bool $temporal)
+    public function setTemporal(bool $temporal): void
     {
         $this->temporal = $temporal;
     }
@@ -316,7 +302,7 @@ public function setTemporal(bool $temporal)
      *
      * @return bool
      */
-    public function isTemporal()
+    public function isTemporal(): bool
     {
         return $this->temporal;
     }
@@ -326,7 +312,7 @@ public function isTemporal()
      *
      * @param bool $idle
      */
-    public function setIdle(bool $idle)
+    public function setIdle(bool $idle): void
     {
         $this->idle = false;
 
@@ -342,7 +328,7 @@ public function setIdle(bool $idle)
      *
      * @return bool
      */
-    public function isIdle()
+    public function isIdle(): bool
     {
         return $this->idle;
     }
@@ -352,7 +338,7 @@ public function isIdle()
      *
      * @param bool $reusable
      */
-    public function setReusable(bool $reusable)
+    public function setReusable(bool $reusable): void
     {
         $this->reusable = $reusable;
     }
@@ -362,7 +348,7 @@ public function setReusable(bool $reusable)
      *
      * @return bool
      */
-    public function isReusable()
+    public function isReusable(): bool
     {
         return $this->reusable;
     }
@@ -434,7 +420,7 @@ public function getBranch()
      *
      * @param array $node
      */
-    public function setOriginal(array $node)
+    public function setOriginal(array $node): void
     {
         $this->node = $node;
     }
@@ -444,15 +430,13 @@ public function setOriginal(array $node)
      *
      * @return array
      */
-    public function getOriginal()
+    public function getOriginal(): array
     {
-        $node = $this->node;
-
-        if (!$node) {
-            $node = ['file' => 'unknown', 'line' => 0, 'char' => 0];
+        if ($this->node) {
+            return $this->node;
         }
 
-        return $node;
+        return ['file' => 'unknown', 'line' => 0, 'char' => 0];
     }
 
     /**
@@ -460,16 +444,16 @@ public function getOriginal()
      *
      * @param array|string $classTypes
      */
-    public function setClassTypes($classTypes)
+    public function setClassTypes(array|string $classTypes): void
     {
         if ($classTypes) {
-            if (\is_string($classTypes)) {
-                if (!\in_array($classTypes, $this->classTypes)) {
+            if (is_string($classTypes)) {
+                if (!in_array($classTypes, $this->classTypes)) {
                     $this->classTypes[] = $classTypes;
                 }
             } else {
                 foreach ($classTypes as $classType) {
-                    if (!\in_array($classType, $this->classTypes)) {
+                    if (!in_array($classType, $this->classTypes)) {
                         $this->classTypes[] = $classType;
                     }
                 }
@@ -482,7 +466,7 @@ public function setClassTypes($classTypes)
      *
      * @return array
      */
-    public function getClassTypes()
+    public function getClassTypes(): array
     {
         return $this->classTypes;
     }
@@ -502,7 +486,7 @@ public function setAssociatedClass($associatedClass)
      *
      * @return ClassDefinition
      */
-    public function getAssociatedClass()
+    public function getAssociatedClass(): ClassDefinition
     {
         return $this->associatedClass;
     }
@@ -512,17 +496,17 @@ public function getAssociatedClass()
      *
      * @param array|string $types
      */
-    public function setDynamicTypes($types)
+    public function setDynamicTypes($types): void
     {
         if ($types) {
             unset($this->dynamicTypes['unknown']);
 
-            if (\is_string($types)) {
+            if (is_string($types)) {
                 if (!isset($this->dynamicTypes[$types])) {
                     $this->dynamicTypes[$types] = true;
                 }
             } else {
-                foreach ($types as $type => $one) {
+                foreach ($types as $one) {
                     if (!isset($this->dynamicTypes[$one])) {
                         $this->dynamicTypes[$one] = true;
                     }
@@ -536,7 +520,7 @@ public function setDynamicTypes($types)
      *
      * @return array
      */
-    public function getDynamicTypes()
+    public function getDynamicTypes(): array
     {
         return $this->dynamicTypes;
     }
@@ -548,9 +532,9 @@ public function getDynamicTypes()
      *
      * @return bool
      */
-    public function hasAnyDynamicType($types)
+    public function hasAnyDynamicType(array|string $types): bool
     {
-        if (\is_string($types)) {
+        if (is_string($types)) {
             $types = [$types];
         }
 
@@ -570,7 +554,7 @@ public function hasAnyDynamicType($types)
      *
      * @return bool
      */
-    public function hasDifferentDynamicType(array $types)
+    public function hasDifferentDynamicType(array $types): bool
     {
         $number = 0;
         foreach ($types as $type) {
@@ -585,7 +569,7 @@ public function hasDifferentDynamicType(array $types)
     /**
      * Increase the number of uses a variable may have.
      */
-    public function increaseUses()
+    public function increaseUses(): void
     {
         ++$this->numberUses;
     }
@@ -593,7 +577,7 @@ public function increaseUses()
     /**
      * Increase the number of mutations a variable may have.
      */
-    public function increaseMutates()
+    public function increaseMutates(): void
     {
         ++$this->numberMutates;
     }
@@ -603,7 +587,7 @@ public function increaseMutates()
      *
      * @return int
      */
-    public function getNumberUses()
+    public function getNumberUses(): int
     {
         return $this->numberUses;
     }
@@ -613,7 +597,7 @@ public function getNumberUses()
      *
      * @return int
      */
-    public function getNumberMutations()
+    public function getNumberMutations(): int
     {
         return $this->numberMutates;
     }
@@ -625,7 +609,7 @@ public function getNumberMutations()
      * @param bool               $initialized
      * @param CompilationContext $compilationContext
      */
-    public function setIsInitialized(bool $initialized, CompilationContext $compilationContext)
+    public function setIsInitialized(bool $initialized, CompilationContext $compilationContext): void
     {
         $this->initialized = $initialized;
 
@@ -645,7 +629,7 @@ public function setIsInitialized(bool $initialized, CompilationContext $compilat
      *
      * @return bool
      */
-    public function isInitialized()
+    public function isInitialized(): bool
     {
         return $this->initialized;
     }
@@ -655,7 +639,7 @@ public function isInitialized()
      *
      * @param bool $isExternal
      */
-    public function setIsExternal(bool $isExternal)
+    public function setIsExternal(bool $isExternal): void
     {
         $this->isExternal = $isExternal;
         $this->variantInits = 1;
@@ -666,7 +650,7 @@ public function setIsExternal(bool $isExternal)
      *
      * @return bool
      */
-    public function isExternal()
+    public function isExternal(): bool
     {
         return $this->isExternal;
     }
@@ -676,7 +660,7 @@ public function isExternal()
      *
      * @return bool
      */
-    public function mustInitNull()
+    public function mustInitNull(): bool
     {
         return $this->mustInitNull;
     }
@@ -686,7 +670,7 @@ public function mustInitNull()
      *
      * @param mixed $mustInitNull
      */
-    public function setMustInitNull($mustInitNull)
+    public function setMustInitNull($mustInitNull): void
     {
         $this->mustInitNull = (bool) $mustInitNull;
     }
@@ -760,7 +744,7 @@ public function separate(CompilationContext $compilationContext)
      *
      * @param int $numberSkips
      */
-    public function skipInitVariant($numberSkips)
+    public function skipInitVariant(int $numberSkips): void
     {
         $this->numberSkips += $numberSkips;
     }
@@ -770,17 +754,17 @@ public function skipInitVariant($numberSkips)
      *
      * @return int
      */
-    public function getSkipVariant()
+    public function getSkipVariant(): int
     {
         return $this->numberSkips;
     }
 
-    /*
+    /**
      * Allocate memory for variable and init it null val
      *
      * @param CompilationContext $compilationContext
      */
-    public function initNonReferenced(CompilationContext $compilationContext)
+    public function initNonReferenced(CompilationContext $compilationContext): void
     {
         $compilationContext->headersManager->add('kernel/memory');
         $compilationContext->codePrinter->output('ZEPHIR_INIT_ZVAL_NREF('.$this->getName().');');
@@ -791,7 +775,7 @@ public function initNonReferenced(CompilationContext $compilationContext)
      *
      * @return int
      */
-    public function getVariantInits()
+    public function getVariantInits(): int
     {
         return $this->variantInits;
     }
@@ -799,7 +783,7 @@ public function getVariantInits()
     /**
      * Increase the number of times the variable has been initialized.
      */
-    public function increaseVariantIfNull()
+    public function increaseVariantIfNull(): void
     {
         ++$this->variantInits;
     }
@@ -817,12 +801,12 @@ public function initVariant(CompilationContext $compilationContext)
             return;
         }
 
-        /*
+        /**
          * Variables are allocated for the first time using ZEPHIR_INIT_VAR
-         * the second, third, etc times are allocated using ZEPHIR_INIT_NVAR
+         * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
          * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
          */
-        if ('this_ptr' != $this->getName() && 'return_value' != $this->getName()) {
+        if ('this_ptr' !== $this->getName() && 'return_value' !== $this->getName()) {
             if (false === $this->initBranch) {
                 $this->initBranch = $compilationContext->currentBranch;
             }
@@ -1042,7 +1026,7 @@ public function isSuperGlobal()
      *
      * @return bool
      */
-    public function isLocalStatic()
+    public function isLocalStatic(): bool
     {
         return $this->isExternal && $this->localOnly;
     }
@@ -1052,9 +1036,9 @@ public function isLocalStatic()
      *
      * @return bool
      */
-    public function isVariable()
+    public function isVariable(): bool
     {
-        return 'variable' == $this->type;
+        return 'variable' === $this->type;
     }
 
     /**
@@ -1072,7 +1056,7 @@ public function isMixed(): bool
      *
      * @return bool
      */
-    public function isBoolean()
+    public function isBoolean(): bool
     {
         return 'bool' == $this->type;
     }
@@ -1082,7 +1066,7 @@ public function isBoolean()
      *
      * @return bool
      */
-    public function isString()
+    public function isString(): bool
     {
         return 'string' == $this->type;
     }
@@ -1112,9 +1096,9 @@ public function isDouble()
      *
      * @return bool
      */
-    public function isArray()
+    public function isArray(): bool
     {
-        return 'array' == $this->type;
+        return 'array' === $this->type;
     }
 
     /**
@@ -1122,7 +1106,7 @@ public function isArray()
      *
      * @return bool
      */
-    public function isNotVariable()
+    public function isNotVariable(): bool
     {
         return !$this->isVariable();
     }
@@ -1132,7 +1116,7 @@ public function isNotVariable()
      *
      * @return bool
      */
-    public function isNotVariableAndString()
+    public function isNotVariableAndString(): bool
     {
         return !$this->isVariable() && !$this->isString();
     }
@@ -1142,7 +1126,7 @@ public function isNotVariableAndString()
      *
      * @return bool
      */
-    public function isNotVariableAndMixedAndString()
+    public function isNotVariableAndMixedAndString(): bool
     {
         return !$this->isVariable() && !$this->isMixed() && !$this->isString();
     }
@@ -1152,7 +1136,7 @@ public function isNotVariableAndMixedAndString()
      *
      * @return bool
      */
-    public function isNotVariableAndArray()
+    public function isNotVariableAndArray(): bool
     {
         return !$this->isVariable() && !$this->isArray();
     }

From c618155c2a277587663e2ac6976769e665db30e5 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 2 Sep 2023 20:40:21 +0100
Subject: [PATCH 026/375] #2407 - Add return types

---
 Library/Backend/FcallManager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Backend/FcallManager.php b/Library/Backend/FcallManager.php
index 5b53197395..0711366c08 100644
--- a/Library/Backend/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -29,7 +29,7 @@ class FcallManager implements FcallManagerInterface
      *
      * @return string
      */
-    public function getMacro($static, $doReturn, $paramCount)
+    public function getMacro($static, $doReturn, $paramCount): string
     {
         $scope = $static ? 'STATIC' : '';
         $mode = 'CALL_INTERNAL_METHOD_NORETURN_P';
@@ -50,7 +50,7 @@ public function getMacro($static, $doReturn, $paramCount)
         return $macroName;
     }
 
-    public function genFcallCode()
+    public function genFcallCode(): void
     {
         $codePrinter = new CodePrinter();
 

From 05527e845c922ba181215e80fa05053a625fed4c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 2 Sep 2023 22:49:56 +0100
Subject: [PATCH 027/375] #2407 - Refactor `Variable` class

---
 Library/Variable.php          | 252 ++++++++++++++--------------------
 tests/Zephir/VariableTest.php |   4 -
 2 files changed, 105 insertions(+), 151 deletions(-)

diff --git a/Library/Variable.php b/Library/Variable.php
index 404b61967e..66fc6c86e8 100644
--- a/Library/Variable.php
+++ b/Library/Variable.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 use ReflectionClass;
@@ -23,6 +25,10 @@
  */
 class Variable implements TypeAwareInterface
 {
+    public const VAR_THIS_POINTER = 'this_ptr';
+
+    public const VAR_RETURN_VALUE = 'return_value';
+
     public const BRANCH_MAGIC = '$$';
 
     /**
@@ -40,7 +46,7 @@ class Variable implements TypeAwareInterface
     /**
      * Compiled variable's name.
      */
-    protected $lowName;
+    protected string $lowName = '';
 
     /**
      * Number of times the variable has been read.
@@ -88,17 +94,11 @@ class Variable implements TypeAwareInterface
 
     protected bool $doublePointer = false;
 
-    protected $defaultInitValue;
+    protected mixed $defaultInitValue = null;
 
-    /**
-     * Class types.
-     */
     protected array $classTypes = [];
 
-    /**
-     * Associated class.
-     */
-    protected ClassDefinition $associatedClass;
+    protected ?ClassDefinition $associatedClass = null;
 
     /**
      * Initialization skips.
@@ -108,17 +108,17 @@ class Variable implements TypeAwareInterface
     /**
      * AST node where the variable was originally declared or created.
      */
-    protected $node;
+    protected ?array $node = null;
 
     /**
      * Possible constant value assigned to the variable.
      */
-    protected $possibleValue;
+    protected mixed $possibleValue = null;
 
     /**
      * Branch where the variable got its last possible value.
      */
-    protected $possibleValueBranch;
+    protected mixed $possibleValueBranch = null;
 
     /**
      * Whether the variable was used or not.
@@ -128,27 +128,13 @@ class Variable implements TypeAwareInterface
     /**
      * Last AST node where the variable was used.
      */
-    protected $usedNode;
+    protected ?array $usedNode = null;
 
     /**
      * @var Globals
      */
     protected Globals $globalsManager;
 
-    /**
-     * Complex variable type, they may need special treatment.
-     *
-     * @var array
-     */
-    protected array $complexTypes = [
-        'variable' => 1,
-        'string' => 1,
-        'array' => 1,
-        'resource' => 1,
-        'callable' => 1,
-        'object' => 1,
-    ];
-
     public function __construct(protected string $type, protected string $name, protected ?Branch $branch = null)
     {
         $this->globalsManager = new Globals();
@@ -158,9 +144,9 @@ public function __construct(protected string $type, protected string $name, prot
     /**
      * Get init branch.
      *
-     * @return bool|int
+     * @return bool
      */
-    public function getInitBranch()
+    public function getInitBranch(): bool
     {
         return $this->initBranch;
     }
@@ -238,7 +224,7 @@ public function isDoublePointer(): bool
      *
      * @return string
      */
-    public function getRealName()
+    public function getRealName(): string
     {
         return $this->name;
     }
@@ -248,13 +234,9 @@ public function getRealName()
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
-        if ($this->lowName) {
-            return $this->lowName;
-        }
-
-        return $this->name;
+        return $this->lowName ?: $this->name;
     }
 
     /**
@@ -262,7 +244,7 @@ public function getName()
      *
      * @param string $lowName
      */
-    public function setLowName(string $lowName)
+    public function setLowName(string $lowName): void
     {
         $this->lowName = $lowName;
     }
@@ -272,7 +254,7 @@ public function setLowName(string $lowName)
      *
      * @param bool $readOnly
      */
-    public function setReadOnly(bool $readOnly)
+    public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
@@ -282,7 +264,7 @@ public function setReadOnly(bool $readOnly)
      *
      * @return bool
      */
-    public function isReadOnly()
+    public function isReadOnly(): bool
     {
         return $this->readOnly;
     }
@@ -359,7 +341,7 @@ public function isReusable(): bool
      * @param bool       $used
      * @param array|null $node
      */
-    public function setUsed(bool $used, array $node = null)
+    public function setUsed(bool $used, array $node = null): void
     {
         $this->used = $used;
         $this->usedNode = $node;
@@ -370,17 +352,15 @@ public function setUsed(bool $used, array $node = null)
      *
      * @return bool
      */
-    public function isUsed()
+    public function isUsed(): bool
     {
         return $this->used;
     }
 
     /**
      * Returns the last node where the variable was assigned or used.
-     *
-     * @return array
      */
-    public function getLastUsedNode()
+    public function getLastUsedNode(): ?array
     {
         return $this->usedNode;
     }
@@ -390,7 +370,7 @@ public function getLastUsedNode()
      *
      * @param bool $memoryTracked
      */
-    public function setMemoryTracked(bool $memoryTracked)
+    public function setMemoryTracked(bool $memoryTracked): void
     {
         $this->memoryTracked = $memoryTracked;
     }
@@ -400,7 +380,7 @@ public function setMemoryTracked(bool $memoryTracked)
      *
      * @return bool
      */
-    public function isMemoryTracked()
+    public function isMemoryTracked(): bool
     {
         return $this->memoryTracked;
     }
@@ -410,7 +390,7 @@ public function isMemoryTracked()
      *
      * @return Branch|null
      */
-    public function getBranch()
+    public function getBranch(): ?Branch
     {
         return $this->branch;
     }
@@ -446,17 +426,17 @@ public function getOriginal(): array
      */
     public function setClassTypes(array|string $classTypes): void
     {
-        if ($classTypes) {
-            if (is_string($classTypes)) {
-                if (!in_array($classTypes, $this->classTypes)) {
-                    $this->classTypes[] = $classTypes;
-                }
-            } else {
-                foreach ($classTypes as $classType) {
-                    if (!in_array($classType, $this->classTypes)) {
-                        $this->classTypes[] = $classType;
-                    }
-                }
+        if (is_string($classTypes)) {
+            if (!in_array($classTypes, $this->classTypes)) {
+                $this->classTypes[] = $classTypes;
+            }
+
+            return;
+        }
+
+        foreach ($classTypes as $classType) {
+            if (!in_array($classType, $this->classTypes)) {
+                $this->classTypes[] = $classType;
             }
         }
     }
@@ -474,9 +454,9 @@ public function getClassTypes(): array
     /**
      * Sets the PHP class related to variable.
      *
-     * @param ClassDefinition|ReflectionClass $associatedClass
+     * @param ReflectionClass|ClassDefinition $associatedClass
      */
-    public function setAssociatedClass($associatedClass)
+    public function setAssociatedClass(ReflectionClass|ClassDefinition $associatedClass): void
     {
         $this->associatedClass = $associatedClass;
     }
@@ -484,9 +464,9 @@ public function setAssociatedClass($associatedClass)
     /**
      * Returns the class related to the variable.
      *
-     * @return ClassDefinition
+     * @return ClassDefinition|null
      */
-    public function getAssociatedClass(): ClassDefinition
+    public function getAssociatedClass(): ?ClassDefinition
     {
         return $this->associatedClass;
     }
@@ -496,21 +476,17 @@ public function getAssociatedClass(): ClassDefinition
      *
      * @param array|string $types
      */
-    public function setDynamicTypes($types): void
+    public function setDynamicTypes(array|string $types): void
     {
-        if ($types) {
-            unset($this->dynamicTypes['unknown']);
+        unset($this->dynamicTypes['unknown']);
 
-            if (is_string($types)) {
-                if (!isset($this->dynamicTypes[$types])) {
-                    $this->dynamicTypes[$types] = true;
-                }
-            } else {
-                foreach ($types as $one) {
-                    if (!isset($this->dynamicTypes[$one])) {
-                        $this->dynamicTypes[$one] = true;
-                    }
-                }
+        if (is_string($types)) {
+            $types = [$types];
+        }
+
+        foreach ($types as $type) {
+            if (!isset($this->dynamicTypes[$type])) {
+                $this->dynamicTypes[$type] = true;
             }
         }
     }
@@ -563,7 +539,7 @@ public function hasDifferentDynamicType(array $types): bool
             }
         }
 
-        return 0 == $number;
+        return 0 === $number;
     }
 
     /**
@@ -668,11 +644,11 @@ public function mustInitNull(): bool
     /**
      * Set if the variable must be initialized to null.
      *
-     * @param mixed $mustInitNull
+     * @param bool $mustInitNull
      */
-    public function setMustInitNull($mustInitNull): void
+    public function setMustInitNull(bool $mustInitNull): void
     {
-        $this->mustInitNull = (bool) $mustInitNull;
+        $this->mustInitNull = $mustInitNull;
     }
 
     /**
@@ -680,7 +656,7 @@ public function setMustInitNull($mustInitNull): void
      *
      * @param mixed $value
      */
-    public function setDefaultInitValue($value)
+    public function setDefaultInitValue(mixed $value): void
     {
         $this->defaultInitValue = $value;
     }
@@ -688,7 +664,7 @@ public function setDefaultInitValue($value)
     /**
      * Sets an automatic safe default init value according to its type.
      */
-    public function enableDefaultAutoInitValue()
+    public function enableDefaultAutoInitValue(): void
     {
         switch ($this->type) {
             case 'char':
@@ -722,7 +698,7 @@ public function enableDefaultAutoInitValue()
      *
      * @return mixed
      */
-    public function getDefaultInitValue()
+    public function getDefaultInitValue(): mixed
     {
         return $this->defaultInitValue;
     }
@@ -732,9 +708,9 @@ public function getDefaultInitValue()
      *
      * @param CompilationContext $compilationContext
      */
-    public function separate(CompilationContext $compilationContext)
+    public function separate(CompilationContext $compilationContext): void
     {
-        if ('this_ptr' != $this->getName() && 'return_value' != $this->getName()) {
+        if (!in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
             $compilationContext->codePrinter->output('ZEPHIR_SEPARATE('.$compilationContext->backend->getVariableCode($this).');');
         }
     }
@@ -793,7 +769,7 @@ public function increaseVariantIfNull(): void
      *
      * @param CompilationContext $compilationContext
      */
-    public function initVariant(CompilationContext $compilationContext)
+    public function initVariant(CompilationContext $compilationContext): void
     {
         if ($this->numberSkips) {
             --$this->numberSkips;
@@ -806,9 +782,9 @@ public function initVariant(CompilationContext $compilationContext)
          * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
          * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
          */
-        if ('this_ptr' !== $this->getName() && 'return_value' !== $this->getName()) {
-            if (false === $this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch;
+        if (self::VAR_THIS_POINTER !== $this->getName() && self::VAR_RETURN_VALUE !== $this->getName()) {
+            if (!$this->initBranch) {
+                $this->initBranch = $compilationContext->currentBranch === 0;
             }
 
             $compilationContext->headersManager->add('kernel/memory');
@@ -820,7 +796,7 @@ public function initVariant(CompilationContext $compilationContext)
                     $compilationContext->backend->initVar($this, $compilationContext, true, true);
                 } else {
                     if ($this->variantInits > 0) {
-                        if (0 === $this->initBranch) {
+                        if (!$this->initBranch) {
                             $compilationContext->codePrinter->output('ZEPHIR_INIT_BNVAR('.$this->getName().');');
                         } else {
                             $this->mustInitNull = true;
@@ -849,7 +825,7 @@ public function initVariant(CompilationContext $compilationContext)
      *
      * @param CompilationContext $compilationContext
      */
-    public function trackVariant(CompilationContext $compilationContext)
+    public function trackVariant(CompilationContext $compilationContext): void
     {
         if ($this->numberSkips) {
             --$this->numberSkips;
@@ -857,14 +833,14 @@ public function trackVariant(CompilationContext $compilationContext)
             return;
         }
 
-        /*
+        /**
          * Variables are allocated for the first time using ZEPHIR_INIT_VAR
-         * the second, third, etc times are allocated using ZEPHIR_INIT_NVAR
+         * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
          * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
          */
-        if ('this_ptr' != $this->getName() && 'return_value' != $this->getName()) {
-            if (false === $this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch;
+        if (self::VAR_THIS_POINTER !== $this->getName() && self::VAR_RETURN_VALUE !== $this->getName()) {
+            if (!$this->initBranch) {
+                $this->initBranch = $compilationContext->currentBranch === 0;
             }
 
             if (!$this->isLocalOnly()) {
@@ -873,7 +849,7 @@ public function trackVariant(CompilationContext $compilationContext)
                     $this->mustInitNull = true;
                 } else {
                     if ($this->variantInits > 0) {
-                        if (1 !== $this->initBranch) {
+                        if (!$this->initBranch) {
                             $this->mustInitNull = true;
                         }
                     }
@@ -894,7 +870,7 @@ public function trackVariant(CompilationContext $compilationContext)
      *
      * @param CompilationContext $compilationContext
      */
-    public function initComplexLiteralVariant(CompilationContext $compilationContext)
+    public function initComplexLiteralVariant(CompilationContext $compilationContext): void
     {
         if ($this->numberSkips) {
             --$this->numberSkips;
@@ -902,9 +878,9 @@ public function initComplexLiteralVariant(CompilationContext $compilationContext
             return;
         }
 
-        if ('this_ptr' != $this->getName() && 'return_value' != $this->getName()) {
-            if (false === $this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch;
+        if (self::VAR_THIS_POINTER != $this->getName() && self::VAR_RETURN_VALUE != $this->getName()) {
+            if (!$this->initBranch) {
+                $this->initBranch = $compilationContext->currentBranch === 0;
             }
 
             $compilationContext->headersManager->add('kernel/memory');
@@ -924,6 +900,7 @@ public function initComplexLiteralVariant(CompilationContext $compilationContext
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&'.$this->getName().');');
                 }
             }
+
             ++$this->variantInits;
         }
     }
@@ -933,7 +910,7 @@ public function initComplexLiteralVariant(CompilationContext $compilationContext
      *
      * @param CompilationContext $compilationContext
      */
-    public function observeVariant(CompilationContext $compilationContext)
+    public function observeVariant(CompilationContext $compilationContext): void
     {
         if ($this->numberSkips) {
             --$this->numberSkips;
@@ -942,9 +919,9 @@ public function observeVariant(CompilationContext $compilationContext)
         }
 
         $name = $this->getName();
-        if ('this_ptr' != $name && 'return_value' != $name) {
-            if (false === $this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch;
+        if (self::VAR_THIS_POINTER != $name && self::VAR_RETURN_VALUE != $name) {
+            if (!$this->initBranch) {
+                $this->initBranch = $compilationContext->currentBranch === 0;
             }
 
             $compilationContext->headersManager->add('kernel/memory');
@@ -968,7 +945,7 @@ public function observeVariant(CompilationContext $compilationContext)
      *
      * @param CompilationContext $compilationContext
      */
-    public function observeOrNullifyVariant(CompilationContext $compilationContext)
+    public function observeOrNullifyVariant(CompilationContext $compilationContext): void
     {
         if ($this->numberSkips) {
             --$this->numberSkips;
@@ -976,47 +953,30 @@ public function observeOrNullifyVariant(CompilationContext $compilationContext)
             return;
         }
 
-        $name = $this->getName();
-        if ('this_ptr' != $name && 'return_value' != $name) {
-            if (false === $this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch;
-            }
-
-            $compilationContext->headersManager->add('kernel/memory');
-            $compilationContext->symbolTable->mustGrownStack(true);
-            /**
-             * TODO: Do we need this?
-             * $compilationContext->codePrinter->output('ZEPHIR_OBS_NVAR(' . $this->getName() . ');');.
-             *
-             * TODO: What about else?
-             * $compilationContext->codePrinter->output('ZEPHIR_OBS_VAR(' . $this->getName() . ');');
-             */
-            if ($this->variantInits > 0 || $compilationContext->insideCycle) {
-                $this->mustInitNull = true;
-            }
+        if (in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
+            return;
+        }
 
-            ++$this->variantInits;
+        if (!$this->initBranch) {
+            $this->initBranch = $compilationContext->currentBranch === 0;
+        }
 
-            $this->setMustInitNull(true);
+        $compilationContext->headersManager->add('kernel/memory');
+        $compilationContext->symbolTable->mustGrownStack(true);
+        if ($this->variantInits > 0 || $compilationContext->insideCycle) {
+            $this->mustInitNull = true;
         }
-    }
 
-    /**
-     * Whether the variable is of a complex type.
-     *
-     * @return bool
-     */
-    public function isComplex()
-    {
-        return isset($this->complexTypes[$this->type]);
+        ++$this->variantInits;
+        $this->setMustInitNull(true);
     }
 
     /**
-     * Checks if a variable is a superglobal.
+     * Checks if a variable is a super global.
      *
      * @return bool
      */
-    public function isSuperGlobal()
+    public function isSuperGlobal(): bool
     {
         return $this->isExternal && $this->globalsManager->isSuperGlobal($this->name);
     }
@@ -1058,7 +1018,7 @@ public function isMixed(): bool
      */
     public function isBoolean(): bool
     {
-        return 'bool' == $this->type;
+        return 'bool' === $this->type;
     }
 
     /**
@@ -1068,7 +1028,7 @@ public function isBoolean(): bool
      */
     public function isString(): bool
     {
-        return 'string' == $this->type;
+        return 'string' === $this->type;
     }
 
     /**
@@ -1076,9 +1036,9 @@ public function isString(): bool
      *
      * @return bool
      */
-    public function isInt()
+    public function isInt(): bool
     {
-        return 'int' == $this->type;
+        return 'int' === $this->type;
     }
 
     /**
@@ -1086,9 +1046,9 @@ public function isInt()
      *
      * @return bool
      */
-    public function isDouble()
+    public function isDouble(): bool
     {
-        return 'double' == $this->type;
+        return 'double' === $this->type;
     }
 
     /**
@@ -1147,7 +1107,7 @@ public function isNotVariableAndArray(): bool
      * @param CompiledExpression $possibleValue
      * @param CompilationContext $compilationContext
      */
-    public function setPossibleValue(CompiledExpression $possibleValue, CompilationContext $compilationContext)
+    public function setPossibleValue(CompiledExpression $possibleValue, CompilationContext $compilationContext): void
     {
         $this->possibleValue = $possibleValue;
         $this->possibleValueBranch = $compilationContext->branchManager->getCurrentBranch();
@@ -1158,17 +1118,15 @@ public function setPossibleValue(CompiledExpression $possibleValue, CompilationC
      *
      * @return mixed
      */
-    public function getPossibleValue()
+    public function getPossibleValue(): mixed
     {
         return $this->possibleValue;
     }
 
     /**
      * Returns the branch where the variable was assigned for the last time.
-     *
-     * @return Branch
      */
-    public function getPossibleValueBranch()
+    public function getPossibleValueBranch(): ?Branch
     {
         return $this->possibleValueBranch;
     }
diff --git a/tests/Zephir/VariableTest.php b/tests/Zephir/VariableTest.php
index 7e2b4ff9f4..58cff493e6 100644
--- a/tests/Zephir/VariableTest.php
+++ b/tests/Zephir/VariableTest.php
@@ -74,7 +74,6 @@ public function testShouldSetProperties(): void
         $this->assertTrue($this->zephirVar->isVariable());
         $this->assertFalse($this->zephirVar->isLocalStatic());
         $this->assertFalse($this->zephirVar->isSuperGlobal());
-        $this->assertTrue($this->zephirVar->isComplex());
         $this->assertFalse($this->zephirVar->isBoolean());
         $this->assertFalse($this->zephirVar->isString());
         $this->assertFalse($this->zephirVar->isInt());
@@ -175,9 +174,6 @@ public function testShouldSetProperties(): void
         $superglobalVar->setIsExternal(true);
         $this->assertTrue($superglobalVar->isSuperGlobal());
 
-        $this->zephirVar->setType('int');
-        $this->assertFalse($this->zephirVar->isComplex());
-
         $this->zephirVar->setType('bool');
         $this->assertTrue($this->zephirVar->isBoolean());
 

From c2dfc39b0a151ee1125c36a148e341de1d27ec87 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 22:53:02 +0100
Subject: [PATCH 028/375] #2407 - Remove `Plus` class

---
 .../ReturnType/CompositeSpecification.php     | 12 ----
 Library/FunctionLike/ReturnType/Plus.php      | 55 -------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 Library/FunctionLike/ReturnType/Plus.php

diff --git a/Library/FunctionLike/ReturnType/CompositeSpecification.php b/Library/FunctionLike/ReturnType/CompositeSpecification.php
index f25434a76f..69fbec701d 100644
--- a/Library/FunctionLike/ReturnType/CompositeSpecification.php
+++ b/Library/FunctionLike/ReturnType/CompositeSpecification.php
@@ -27,18 +27,6 @@ public function either(SpecificationInterface $spec)
         return new Either($this, $spec);
     }
 
-    /**
-     * Creates a new logical AND specification.
-     *
-     * @param SpecificationInterface $spec
-     *
-     * @return Plus
-     */
-    public function plus(SpecificationInterface $spec)
-    {
-        return new Plus($this, $spec);
-    }
-
     /**
      * Creates a new logical NOT specification.
      *
diff --git a/Library/FunctionLike/ReturnType/Plus.php b/Library/FunctionLike/ReturnType/Plus.php
deleted file mode 100644
index f3bd0be1d1..0000000000
--- a/Library/FunctionLike/ReturnType/Plus.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-use Zephir\FunctionLike\ReturnType;
-
-final class Plus extends CompositeSpecification
-{
-    /**
-     * Left Specification.
-     *
-     * @var SpecificationInterface
-     */
-    protected $left;
-
-    /**
-     * Right Specification.
-     *
-     * @var SpecificationInterface
-     */
-    protected $right;
-
-    /**
-     * A composite wrapper of two specifications.
-     *
-     * @param SpecificationInterface $left
-     * @param SpecificationInterface $right
-     */
-    public function __construct(SpecificationInterface $left, SpecificationInterface $right)
-    {
-        $this->left = $left;
-        $this->right = $right;
-    }
-
-    /**
-     * Checks if the composite AND of specifications passes.
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return $this->left->isSatisfiedBy($type) && $this->right->isSatisfiedBy($type);
-    }
-}

From 1c429d28e3cf9a93e55027897551b1ad735ebaf2 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 23:02:54 +0100
Subject: [PATCH 029/375] #2407 - Remove unused `Collection` class

---
 .../FunctionLike/ReturnType/Collection.php    | 322 ----------
 .../ReturnType/CollectionTest.php             | 567 ------------------
 2 files changed, 889 deletions(-)
 delete mode 100644 Library/FunctionLike/ReturnType/Collection.php
 delete mode 100644 tests/Zephir/FunctionLike/ReturnType/CollectionTest.php

diff --git a/Library/FunctionLike/ReturnType/Collection.php b/Library/FunctionLike/ReturnType/Collection.php
deleted file mode 100644
index b1198d1e6e..0000000000
--- a/Library/FunctionLike/ReturnType/Collection.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir\FunctionLike\ReturnType;
-
-use SplObjectStorage;
-use Zephir\Exception\InvalidArgumentException;
-
-use function count;
-
-final class Collection extends SplObjectStorage
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param TypeInterface $returnType
-     *
-     * @return string
-     */
-    #[\ReturnTypeWillChange]
-    public function getHash($returnType)
-    {
-        return $returnType->getDataType();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param TypeInterface $returnType The return type instance
-     * @param array         $definition The definition to associate with the return type instance
-     *
-     * @return $this
-     *
-     * @throws InvalidArgumentException
-     */
-    #[\ReturnTypeWillChange]
-    public function attach($returnType, $definition = null)
-    {
-        if (!$returnType instanceof TypeInterface) {
-            $wrong = \is_object($returnType) ? 'instance of '.\get_class($returnType) : \gettype($returnType);
-
-            throw new InvalidArgumentException(
-                sprintf('Expecting an instance of %s, got %s', TypeInterface::class, $wrong)
-            );
-        }
-
-        parent::attach($returnType, $definition);
-
-        return $this;
-    }
-
-    /**
-     * Checks if the collection has return-type or cast hints.
-     *
-     * @return bool
-     */
-    public function hasReturnTypes(): bool
-    {
-        if (0 === $this->count() || $this->onlyVoid()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Gets all return types satisfied by specification.
-     *
-     * @param SpecificationInterface $spec
-     *
-     * @return TypeInterface[]
-     */
-    public function getTypesBySpecification(SpecificationInterface $spec): array
-    {
-        $types = [];
-
-        foreach ($this as $type) {
-            /** @var TypeInterface $type */
-            if ($spec->isSatisfiedBy($type)) {
-                $types[] = $type;
-            }
-        }
-
-        return $types;
-    }
-
-    /**
-     * Checks whether at least one return type hint is null compatible.
-     *
-     * @return bool
-     */
-    public function areReturnTypesNullCompatible(): bool
-    {
-        return $this->isSatisfiedByTypeSpec(new Specification\IsNull());
-    }
-
-    /**
-     * Checks whether at least one return type hint is integer compatible.
-     *
-     * @return bool
-     */
-    public function areReturnTypesIntCompatible(): bool
-    {
-        return $this->isSatisfiedByTypeSpec(new Specification\IntCompatible());
-    }
-
-    /**
-     * Checks whether at least one return type hint is double compatible.
-     *
-     * @return bool
-     */
-    public function areReturnTypesDoubleCompatible(): bool
-    {
-        return $this->isSatisfiedByTypeSpec(new Specification\IsDouble());
-    }
-
-    /**
-     * Checks whether at least one return type hint is bool compatible.
-     *
-     * @return bool
-     */
-    public function areReturnTypesBoolCompatible(): bool
-    {
-        return $this->isSatisfiedByTypeSpec(new Specification\IsBool());
-    }
-
-    /**
-     * Checks whether at least one return type hint is string compatible.
-     *
-     * @return bool
-     */
-    public function areReturnTypesStringCompatible(): bool
-    {
-        return $this->isSatisfiedByTypeSpec(new Specification\StringCompatible());
-    }
-
-    /**
-     * Checks whether at least one return type hint is string compatible.
-     *
-     * @return bool
-     */
-    public function areReturnTypesArrayCompatible(): bool
-    {
-        return $this->isSatisfiedByTypeSpec(new Specification\ArrayCompatible());
-    }
-
-    /**
-     * Checks whether at least one return type hint is object compatible.
-     *
-     * @return bool
-     */
-    public function areReturnTypesObjectCompatible(): bool
-    {
-        return count($this->getObjectLikeReturnTypes()) > 0;
-    }
-
-    /**
-     * Get object like return types.
-     *
-     * @return TypeInterface[]
-     */
-    public function getObjectLikeReturnTypes()
-    {
-        return $this->getTypesBySpecification(new Specification\ObjectLike());
-    }
-
-    /**
-     * Checks if the collection has only void.
-     */
-    public function onlyVoid()
-    {
-        return $this->isSatisfiedByTypeSpec(new Specification\IsVoid()) && 1 == $this->count();
-    }
-
-    /**
-     * Checks if the collection has only special types.
-     */
-    public function onlySpecial()
-    {
-        if (0 == $this->count()) {
-            return false;
-        }
-
-        $found = $this->getTypesBySpecification(new Specification\IsSpecial());
-
-        return count($found) == $this->count();
-    }
-
-    /**
-     * Checks whether all return types hint are well known.
-     *
-     * @return bool
-     */
-    public function areReturnTypesWellKnown(): bool
-    {
-        if (0 === $this->count() || $this->isSatisfiedByTypeSpec(new Specification\IsSpecial())) {
-            return false;
-        }
-
-        $spec =
-            (new Specification\ObjectLike())
-            ->either(new Specification\ArrayCompatible())
-            ->either(new Specification\IntCompatible())
-            ->either(new Specification\StringCompatible())
-            ->either(new Specification\IsBool())
-            ->either(new Specification\IsDouble())
-            ->either(new Specification\IsNull())
-            // TODO: Please double check this
-            ->either(new Specification\IsVoid());
-
-        $found = $this->getTypesBySpecification($spec);
-
-        return count($found) == $this->count();
-    }
-
-    /**
-     * Checks if the collection have compatible return types.
-     *
-     * @return bool
-     */
-    public function areReturnTypesCompatible(): bool
-    {
-        $numberOfReturnTypes = $this->count();
-
-        if (0 == $numberOfReturnTypes || 1 == $numberOfReturnTypes) {
-            return true;
-        }
-
-        // <Class_1> | <Class_2> | ... | <Class_n>
-        $classes = $this->getObjectLikeReturnTypes();
-
-        // <Class> | <Class_1[]> | <Class_1[]> | ... | <Class_n[]>
-        $collections = $this->getTypesBySpecification(new Specification\IsCollection());
-        if (count($collections) > 0 && $this->areReturnTypesObjectCompatible()) {
-            return false;
-        }
-
-        $summ =
-            // array | <Class_1[]> | <Class_2[]> | ... | <Class_n[]>
-            (int) $this->areReturnTypesArrayCompatible() +
-
-            // char | uchar | int | uint | long | ulong
-            (int) $this->areReturnTypesIntCompatible() +
-
-            // bool
-            (int) $this->areReturnTypesBoolCompatible() +
-
-            // istring | string
-            (int) $this->areReturnTypesStringCompatible() +
-
-            // double
-            (int) $this->areReturnTypesDoubleCompatible();
-
-        // T1 | T2 | ... | Tn
-        if ($summ > 1) {
-            return false;
-        }
-
-        // <Class_1> | <T1>
-        if ($this->areReturnTypesObjectCompatible() && $summ > 0) {
-            return false;
-        }
-
-        // null
-        $null = (int) $this->areReturnTypesNullCompatible();
-
-        // <T1> | null
-        // <Class_1> | null
-        // <Class_1[]> | null
-        if (1 == $null && 2 == $this->count()) {
-            return true;
-        }
-
-        // T1 | T2 | ... | Tn | null
-        if (1 == $null && $null + $summ != $this->count()) {
-            return false;
-        }
-
-        return 1 == $summ;
-    }
-
-    /**
-     * Returns an array of cast hinted return types (if any).
-     *
-     * @return TypeInterface[]
-     */
-    public function getCastHintedReturnTypes(): array
-    {
-        return $this->getTypesBySpecification(new Not(new Specification\IsReal()));
-    }
-
-    /**
-     * Returns an array of real return types (if any).
-     *
-     * @return TypeInterface[]
-     */
-    public function getRealReturnTypes(): array
-    {
-        return $this->getTypesBySpecification(new Specification\IsReal());
-    }
-
-    private function isSatisfiedByTypeSpec(SpecificationInterface $spec): bool
-    {
-        if (0 === $this->count()) {
-            return false;
-        }
-
-        $found = $this->getTypesBySpecification($spec);
-
-        return count($found) > 0;
-    }
-}
diff --git a/tests/Zephir/FunctionLike/ReturnType/CollectionTest.php b/tests/Zephir/FunctionLike/ReturnType/CollectionTest.php
deleted file mode 100644
index f68247d3a8..0000000000
--- a/tests/Zephir/FunctionLike/ReturnType/CollectionTest.php
+++ /dev/null
@@ -1,567 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Test\FunctionLike\ReturnType;
-
-use PHPUnit\Framework\TestCase;
-use Zephir\Exception\InvalidArgumentException;
-use Zephir\FunctionLike\ReturnType\CastHint;
-use Zephir\FunctionLike\ReturnType\Collection;
-use Zephir\FunctionLike\ReturnType\RealType;
-use Zephir\Types;
-
-final class CollectionTest extends TestCase
-{
-    public function testShouldThrowExceptionOnInvalidAttachedObject(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage(
-            'Expecting an instance of Zephir\FunctionLike\ReturnType\TypeInterface, got instance of stdClass'
-        );
-
-        $collection = new Collection();
-        $collection->attach(new \stdClass());
-    }
-
-    public function testShouldThrowExceptionOnInvalidAttachedValue(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage(
-            'Expecting an instance of Zephir\FunctionLike\ReturnType\TypeInterface, got array'
-        );
-
-        $collection = new Collection();
-        $collection->attach([]);
-    }
-
-    public function testShouldAttachTypes(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_INT));
-        $this->assertCount(1, $collection);
-
-        $collection->attach(new RealType(Types::T_INT));
-        $this->assertCount(1, $collection);
-
-        $collection->attach(new RealType(Types::T_STRING));
-        $this->assertCount(2, $collection);
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertCount(3, $collection);
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertCount(4, $collection);
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class2'));
-        $this->assertCount(4, $collection);
-    }
-
-    public function testShouldDetectOnlyVoid(): void
-    {
-        $collection = new Collection();
-
-        $this->assertFalse($collection->onlyVoid());
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertTrue($collection->onlyVoid());
-
-        $collection->attach(new RealType(Types::T_INT));
-        $this->assertFalse($collection->onlyVoid());
-    }
-
-    public function testShouldCheckIfTheCollectionHasRealTypeOrCastHints(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->hasReturnTypes());
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertFalse($collection->hasReturnTypes());
-
-        $collection->attach(new RealType(Types::T_INT));
-        $this->assertTrue($collection->hasReturnTypes());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertTrue($collection->hasReturnTypes());
-    }
-
-    public function testShouldDetectWhetherReturnTypesAreNullCompatible(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesNullCompatible());
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertFalse($collection->areReturnTypesNullCompatible());
-
-        $collection->attach(new RealType(Types::T_NULL));
-        $this->assertTrue($collection->areReturnTypesNullCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new RealType(Types::T_NULL));
-        $this->assertTrue($collection->areReturnTypesNullCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertFalse($collection->areReturnTypesNullCompatible());
-    }
-
-    public function testShouldDetectWhetherReturnTypesAreSpecial(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->onlySpecial());
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertFalse($collection->onlySpecial());
-
-        $collection->attach(new CastHint(Types::T_NUMBER, null));
-        $this->assertFalse($collection->onlySpecial());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_NUMBER, null));
-        $this->assertTrue($collection->onlySpecial());
-
-        $collection->attach(new CastHint(Types::T_RESOURCE, null));
-        $collection->attach(new CastHint(Types::T_VARIABLE, null));
-        $collection->attach(new CastHint(Types::T_CALLABLE, null));
-        $collection->attach(new CastHint(Types::T_ITERABLE, null));
-        $this->assertTrue($collection->onlySpecial());
-
-        $collection->attach(new CastHint(Types::T_OBJECT, null));
-        $this->assertFalse($collection->onlySpecial());
-    }
-
-    /**
-     * @dataProvider intCompatibleProvider
-     *
-     * @param string $type
-     * @param bool   $expected
-     */
-    public function testShouldDetectWhetherReturnTypesAreIntCompatible(string $type, bool $expected): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesIntCompatible());
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertFalse($collection->areReturnTypesIntCompatible());
-
-        $collection->attach(new RealType($type));
-        $this->assertSame($expected, $collection->areReturnTypesIntCompatible());
-    }
-
-    public function testShouldDetectWhetherReturnTypesAreDoubleCompatible(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesDoubleCompatible());
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertFalse($collection->areReturnTypesDoubleCompatible());
-
-        $collection->attach(new RealType(Types::T_DOUBLE));
-        $this->assertTrue($collection->areReturnTypesDoubleCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new RealType(Types::T_DOUBLE));
-        $this->assertTrue($collection->areReturnTypesDoubleCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertFalse($collection->areReturnTypesDoubleCompatible());
-    }
-
-    public function testShouldDetectWhetherReturnTypesAreBoolCompatible(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesBoolCompatible());
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertFalse($collection->areReturnTypesBoolCompatible());
-
-        $collection->attach(new RealType(Types::T_BOOL));
-        $this->assertTrue($collection->areReturnTypesBoolCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new RealType(Types::T_BOOL));
-        $this->assertTrue($collection->areReturnTypesBoolCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertFalse($collection->areReturnTypesBoolCompatible());
-    }
-
-    /**
-     * @dataProvider stringCompatibleProvider
-     *
-     * @param string $type
-     * @param bool   $expected
-     */
-    public function testShouldDetectWhetherReturnTypesAreStringCompatible(string $type, bool $expected): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesStringCompatible());
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertFalse($collection->areReturnTypesStringCompatible());
-
-        $collection->attach(new RealType($type));
-        $this->assertSame($expected, $collection->areReturnTypesStringCompatible());
-    }
-
-    public function testShouldDetectWhetherReturnTypesAreArrayCompatible(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesArrayCompatible());
-
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertFalse($collection->areReturnTypesArrayCompatible());
-
-        $collection->attach(new RealType(Types::T_ARRAY));
-        $this->assertTrue($collection->areReturnTypesArrayCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new RealType(Types::T_ARRAY));
-        $this->assertTrue($collection->areReturnTypesArrayCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1', null, true));
-        $this->assertTrue($collection->areReturnTypesArrayCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertFalse($collection->areReturnTypesArrayCompatible());
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1', null, true));
-        $this->assertFalse($collection->areReturnTypesArrayCompatible());
-
-        $collection->attach(new CastHint(Types::T_UNDEFINED, 'Class2', null, false));
-        $this->assertFalse($collection->areReturnTypesArrayCompatible());
-
-        $collection->attach(new CastHint(Types::T_UNDEFINED, 'Class3', null, true));
-        $this->assertFalse($collection->areReturnTypesArrayCompatible());
-    }
-
-    public function testShouldDetectWhetherReturnTypesAreObjectCompatible(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesObjectCompatible());
-
-        $collection->attach(new CastHint(Types::T_UNDEFINED, 'Class1'));
-        $this->assertFalse($collection->areReturnTypesObjectCompatible());
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class2'));
-        $this->assertTrue($collection->areReturnTypesObjectCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertTrue($collection->areReturnTypesObjectCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1', null, true));
-        $this->assertFalse($collection->areReturnTypesObjectCompatible());
-
-        $collection = new Collection();
-        $collection->attach(new RealType(Types::T_VOID));
-        $this->assertFalse($collection->areReturnTypesObjectCompatible());
-    }
-
-    public function testShouldDetectWellKnownTypes(): void
-    {
-        $collection = new Collection();
-        $this->assertFalse($collection->areReturnTypesWellKnown());
-
-        $wellKnown = [
-            Types::T_INT,
-            Types::T_UINT,
-            Types::T_CHAR,
-            Types::T_UCHAR,
-            Types::T_LONG,
-            Types::T_ULONG,
-            Types::T_DOUBLE,
-            Types::T_NULL,
-            Types::T_BOOL,
-            Types::T_STRING,
-            Types::T_ISTRING,
-            Types::T_VOID,
-            Types::T_ARRAY,
-        ];
-
-        foreach ($wellKnown as $type) {
-            $collection->attach(new RealType($type));
-        }
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertTrue($collection->areReturnTypesWellKnown());
-
-        $collection->attach(new RealType(Types::T_FLOAT));
-        $this->assertFalse($collection->areReturnTypesWellKnown());
-
-        $otherTypes = [
-            Types::T_FLOAT,
-            Types::T_NUMBER,
-            Types::T_VARIABLE,
-            Types::T_MIXED,
-            Types::T_CALLABLE,
-            Types::T_ITERABLE,
-            Types::T_RESOURCE,
-            Types::T_UNDEFINED,
-        ];
-
-        $collection = new Collection();
-
-        foreach ($otherTypes as $type) {
-            $collection->attach(new RealType($type));
-        }
-
-        $this->assertFalse($collection->areReturnTypesWellKnown());
-
-        foreach ($wellKnown as $type) {
-            $collection->attach(new RealType($type));
-        }
-
-        $this->assertFalse($collection->areReturnTypesWellKnown());
-    }
-
-    /**
-     * @dataProvider compatibleTypesProvider
-     *
-     * @param string $type
-     */
-    public function testShouldDetectCompatibleTypesForTrivialCases(string $type): void
-    {
-        $collection = new Collection();
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType($type));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-    }
-
-    public function intCompatibleProvider(): array
-    {
-        $expected = [
-            true, true, true, true, true, true,
-            false, false, false, false, false,
-            false, false, false, false, false,
-            false, false, false, false, false, false,
-        ];
-
-        return array_map(
-            function ($type, $expected) {
-                return [$type[0], $expected];
-            },
-            $this->compatibleTypesProvider(),
-            $expected
-        );
-    }
-
-    public function stringCompatibleProvider(): array
-    {
-        $expected = [
-            false, false, false, false, false,
-            false, false, false, false, false, false,
-            true, true,
-            false, false, false, false, false,
-            false, false, false, false,
-        ];
-
-        return array_map(
-            function ($type, $expected) {
-                return [$type[0], $expected];
-            },
-            $this->compatibleTypesProvider(),
-            $expected
-        );
-    }
-
-    public function compatibleTypesProvider(): array
-    {
-        return [
-            'int' => [Types::T_INT],
-            'iunt' => [Types::T_UINT],
-            'char' => [Types::T_CHAR],
-            'uchar' => [Types::T_UCHAR],
-            'long' => [Types::T_LONG],
-            'ulong' => [Types::T_ULONG],
-            'double' => [Types::T_DOUBLE],
-            'float' => [Types::T_FLOAT],
-            'null' => [Types::T_NULL],
-            'number' => [Types::T_NUMBER],
-            'bool' => [Types::T_BOOL],
-            'string' => [Types::T_STRING],
-            'istring' => [Types::T_ISTRING],
-            'void' => [Types::T_VOID],
-            'variable' => [Types::T_VARIABLE],
-            'mixed' => [Types::T_MIXED],
-            'array' => [Types::T_ARRAY],
-            'object' => [Types::T_OBJECT],
-            'callable' => [Types::T_CALLABLE],
-            'iterable' => [Types::T_ITERABLE],
-            'resource' => [Types::T_RESOURCE],
-            'undefined' => [Types::T_UNDEFINED],
-        ];
-    }
-
-    public function testShouldDetectCompatibleTypesForObjectLike(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new CastHint(Types::T_RESOURCE, null, null, true));
-        $this->assertFalse($collection->areReturnTypesCompatible());
-    }
-
-    public function testShouldDetectCompatibleTypesForCollections(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1', null, true));
-        $collection->attach(new RealType(Types::T_ARRAY));
-
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection = new Collection();
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $collection->attach(new RealType(Types::T_ARRAY));
-
-        $this->assertFalse($collection->areReturnTypesCompatible());
-    }
-
-    public function testShouldDetectCompatibleTypesForIntegers(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_CHAR));
-        $collection->attach(new RealType(Types::T_UCHAR));
-        $collection->attach(new RealType(Types::T_INT));
-        $collection->attach(new RealType(Types::T_UINT));
-        $collection->attach(new RealType(Types::T_LONG));
-        $collection->attach(new RealType(Types::T_ULONG));
-
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType(Types::T_ARRAY));
-        $this->assertFalse($collection->areReturnTypesCompatible());
-    }
-
-    public function testShouldDetectCompatibleTypesForBool(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_BOOL));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType(Types::T_CHAR));
-        $this->assertFalse($collection->areReturnTypesCompatible());
-    }
-
-    public function testShouldDetectCompatibleTypesForString(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_STRING));
-        $collection->attach(new RealType(Types::T_ISTRING));
-
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType(Types::T_BOOL));
-        $this->assertFalse($collection->areReturnTypesCompatible());
-    }
-
-    public function testShouldDetectCompatibleTypesForDouble(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_DOUBLE));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType(Types::T_STRING));
-        $this->assertFalse($collection->areReturnTypesCompatible());
-    }
-
-    public function testShouldDetectCompatibleTypesForKnownTypes(): void
-    {
-        $collection = new Collection();
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType(Types::T_NULL));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType(Types::T_ARRAY));
-        $this->assertFalse($collection->areReturnTypesCompatible());
-
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_ARRAY));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new RealType(Types::T_CHAR));
-        $collection->attach(new RealType(Types::T_BOOL));
-        $collection->attach(new RealType(Types::T_STRING));
-        $collection->attach(new RealType(Types::T_DOUBLE));
-
-        $this->assertFalse($collection->areReturnTypesCompatible());
-
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_ISTRING));
-        $collection->attach(new RealType(Types::T_NULL));
-
-        $this->assertTrue($collection->areReturnTypesCompatible());
-
-        $collection->attach(new CastHint(Types::T_RESOURCE, null));
-        $this->assertFalse($collection->areReturnTypesCompatible());
-
-        $collection = new Collection();
-
-        $collection->attach(new RealType(Types::T_NULL));
-        $this->assertTrue($collection->areReturnTypesCompatible());
-    }
-
-    public function testShouldGetOnlyRealTypes(): void
-    {
-        $collection = new Collection();
-        $this->assertCount(0, $collection->getRealReturnTypes());
-
-        $collection->attach(new RealType(Types::T_ARRAY));
-        $this->assertCount(1, $collection->getRealReturnTypes());
-
-        $collection->attach(new RealType(Types::T_CHAR));
-        $collection->attach(new RealType(Types::T_BOOL));
-        $collection->attach(new RealType(Types::T_STRING));
-        $collection->attach(new RealType(Types::T_DOUBLE));
-        $this->assertCount(5, $collection->getRealReturnTypes());
-
-        $collection->attach(new CastHint(Types::T_RESOURCE, null));
-        $this->assertCount(5, $collection->getRealReturnTypes());
-    }
-
-    public function testShouldGetOnlyCastHint(): void
-    {
-        $collection = new Collection();
-        $this->assertCount(0, $collection->getCastHintedReturnTypes());
-
-        $collection->attach(new CastHint(Types::T_RESOURCE, null));
-        $this->assertCount(1, $collection->getCastHintedReturnTypes());
-
-        $collection->attach(new RealType(Types::T_ARRAY));
-        $this->assertCount(1, $collection->getCastHintedReturnTypes());
-
-        $collection->attach(new CastHint(Types::T_OBJECT, 'Class1'));
-        $collection->attach(new CastHint(Types::T_CALLABLE, null, null, true));
-        $this->assertCount(3, $collection->getCastHintedReturnTypes());
-    }
-}

From cba7ee77c1e248a2465ac8d35484b4439b37a796 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 23:10:17 +0100
Subject: [PATCH 030/375] #2407 - Remove FunctionLike/ directory

---
 Library/FunctionLike/ReturnType/CastHint.php  |  54 --------
 .../ReturnType/CompositeSpecification.php     |  48 -------
 Library/FunctionLike/ReturnType/Either.php    |  55 --------
 Library/FunctionLike/ReturnType/Factory.php   |  78 -----------
 Library/FunctionLike/ReturnType/Not.php       |  44 -------
 Library/FunctionLike/ReturnType/RealType.php  | 106 ---------------
 .../Specification/ArrayCompatible.php         |  27 ----
 .../Specification/IntCompatible.php           |  30 -----
 .../ReturnType/Specification/IsBool.php       |  30 -----
 .../ReturnType/Specification/IsCollection.php |  29 -----
 .../ReturnType/Specification/IsDouble.php     |  30 -----
 .../ReturnType/Specification/IsNull.php       |  30 -----
 .../ReturnType/Specification/IsReal.php       |  29 -----
 .../ReturnType/Specification/IsSpecial.php    |  44 -------
 .../ReturnType/Specification/IsVoid.php       |  30 -----
 .../ReturnType/Specification/ObjectLike.php   |  34 -----
 .../Specification/StringCompatible.php        |  40 ------
 .../ReturnType/SpecificationInterface.php     |  26 ----
 .../FunctionLike/ReturnType/TypeInterface.php |  63 ---------
 .../FunctionLike/ReturnType/CastHintTest.php  |  82 ------------
 .../FunctionLike/ReturnType/FactoryTest.php   | 122 ------------------
 .../FunctionLike/ReturnType/RealTypeTest.php  |  79 ------------
 22 files changed, 1110 deletions(-)
 delete mode 100644 Library/FunctionLike/ReturnType/CastHint.php
 delete mode 100644 Library/FunctionLike/ReturnType/CompositeSpecification.php
 delete mode 100644 Library/FunctionLike/ReturnType/Either.php
 delete mode 100644 Library/FunctionLike/ReturnType/Factory.php
 delete mode 100644 Library/FunctionLike/ReturnType/Not.php
 delete mode 100644 Library/FunctionLike/ReturnType/RealType.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IntCompatible.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsBool.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsCollection.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsDouble.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsNull.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsReal.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsSpecial.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/IsVoid.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/ObjectLike.php
 delete mode 100644 Library/FunctionLike/ReturnType/Specification/StringCompatible.php
 delete mode 100644 Library/FunctionLike/ReturnType/SpecificationInterface.php
 delete mode 100644 Library/FunctionLike/ReturnType/TypeInterface.php
 delete mode 100644 tests/Zephir/FunctionLike/ReturnType/CastHintTest.php
 delete mode 100644 tests/Zephir/FunctionLike/ReturnType/FactoryTest.php
 delete mode 100644 tests/Zephir/FunctionLike/ReturnType/RealTypeTest.php

diff --git a/Library/FunctionLike/ReturnType/CastHint.php b/Library/FunctionLike/ReturnType/CastHint.php
deleted file mode 100644
index 1f036beb6f..0000000000
--- a/Library/FunctionLike/ReturnType/CastHint.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-final class CastHint implements TypeInterface
-{
-    public function __construct(
-        private string $dataType,
-        private ?string $value = null,
-        private ?string $type = null,
-        private bool $collection = false
-    ) {
-        $this->type = $type ?: TypeInterface::TYPE_PARAMETER;
-    }
-
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    public function getDataType(): string
-    {
-        return $this->dataType;
-    }
-
-    public function getValue(): ?string
-    {
-        return $this->value;
-    }
-
-    public function isMandatory(): bool
-    {
-        return false;
-    }
-
-    public function isCollection(): bool
-    {
-        return $this->collection;
-    }
-
-    public function isRealType(): bool
-    {
-        return false;
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/CompositeSpecification.php b/Library/FunctionLike/ReturnType/CompositeSpecification.php
deleted file mode 100644
index 69fbec701d..0000000000
--- a/Library/FunctionLike/ReturnType/CompositeSpecification.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-use Zephir\FunctionLike\ReturnType;
-
-abstract class CompositeSpecification implements SpecificationInterface
-{
-    /**
-     * Creates a new logical OR composite specification.
-     *
-     * @param SpecificationInterface $spec
-     *
-     * @return Either
-     */
-    public function either(SpecificationInterface $spec)
-    {
-        return new Either($this, $spec);
-    }
-
-    /**
-     * Creates a new logical NOT specification.
-     *
-     * @return Not
-     */
-    public function not()
-    {
-        return new Not($this);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    abstract public function isSatisfiedBy(ReturnType\TypeInterface $type);
-}
diff --git a/Library/FunctionLike/ReturnType/Either.php b/Library/FunctionLike/ReturnType/Either.php
deleted file mode 100644
index 6dae122968..0000000000
--- a/Library/FunctionLike/ReturnType/Either.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-use Zephir\FunctionLike\ReturnType;
-
-final class Either extends CompositeSpecification
-{
-    /**
-     * Left Specification.
-     *
-     * @var SpecificationInterface
-     */
-    protected $left;
-
-    /**
-     * Right Specification.
-     *
-     * @var SpecificationInterface
-     */
-    protected $right;
-
-    /**
-     * A composite wrapper of two specifications.
-     *
-     * @param SpecificationInterface $left
-     * @param SpecificationInterface $right
-     */
-    public function __construct(SpecificationInterface $left, SpecificationInterface $right)
-    {
-        $this->left = $left;
-        $this->right = $right;
-    }
-
-    /**
-     * Returns the evaluation of both wrapped specifications as a logical OR.
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return $this->left->isSatisfiedBy($type) || $this->right->isSatisfiedBy($type);
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Factory.php b/Library/FunctionLike/ReturnType/Factory.php
deleted file mode 100644
index 951aa7793a..0000000000
--- a/Library/FunctionLike/ReturnType/Factory.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-use Zephir\Types;
-
-final class Factory
-{
-    /**
-     * @param array $ir
-     *
-     * @return TypeInterface
-     */
-    public function create(array $ir)
-    {
-        if (!isset($ir['cast'])) {
-            return $this->createRealType(
-                isset($ir['data-type']) ? $ir['data-type'] : Types::T_UNDEFINED,
-                $ir
-            );
-        }
-
-        return $this->createCastHint(
-            isset($ir['cast']['type']) ? $ir['cast']['type'] : Types::T_UNDEFINED,
-            $ir
-        );
-    }
-
-    /**
-     * @param array $ir
-     *
-     * @return TypeInterface
-     */
-    public function createVoid(array $ir)
-    {
-        return $this->createRealType(Types::T_VOID, $ir);
-    }
-
-    /**
-     * @param string $dataType
-     * @param array  $ir
-     *
-     * @return TypeInterface|RealType
-     */
-    protected function createRealType($dataType, array $ir)
-    {
-        return new RealType(
-            $dataType,
-            isset($ir['mandatory']) && $ir['mandatory'],
-            isset($ir['type']) ? $ir['type'] : null
-        );
-    }
-
-    /**
-     * @param string $dataType
-     * @param array  $ir
-     *
-     * @return TypeInterface|CastHint
-     */
-    protected function createCastHint($dataType, array $ir)
-    {
-        return new CastHint(
-            $dataType,
-            isset($ir['cast']['value']) ? $ir['cast']['value'] : null,
-            isset($ir['type']) ? $ir['type'] : null,
-            isset($ir['collection']) && $ir['collection']
-        );
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Not.php b/Library/FunctionLike/ReturnType/Not.php
deleted file mode 100644
index da10763237..0000000000
--- a/Library/FunctionLike/ReturnType/Not.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-use Zephir\FunctionLike\ReturnType;
-
-final class Not extends CompositeSpecification
-{
-    /**
-     * @var SpecificationInterface
-     */
-    protected $spec;
-
-    /**
-     * Creates a new specification wrapping another.
-     *
-     * @param SpecificationInterface $spec
-     */
-    public function __construct(SpecificationInterface $spec)
-    {
-        $this->spec = $spec;
-    }
-
-    /**
-     * Returns the negated result of the wrapped specification.
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return false == $this->spec->isSatisfiedBy($type);
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/RealType.php b/Library/FunctionLike/ReturnType/RealType.php
deleted file mode 100644
index d4337ed164..0000000000
--- a/Library/FunctionLike/ReturnType/RealType.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-final class RealType implements TypeInterface
-{
-    /**
-     * @var string
-     */
-    private $dataType;
-
-    /**
-     * @var bool
-     */
-    private $mandatory;
-
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * Real return type constructor.
-     *
-     * @param string      $dataType
-     * @param bool        $mandatory
-     * @param string|null $type
-     */
-    public function __construct($dataType, $mandatory = false, $type = null)
-    {
-        $this->dataType = $dataType;
-        $this->mandatory = (bool) $mandatory;
-        $this->type = $type ?: TypeInterface::TYPE_PARAMETER;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getDataType()
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Getting values for a real data types is not supported.
-     */
-    public function getValue()
-    {
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return mixed
-     */
-    public function isMandatory()
-    {
-        return $this->mandatory;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Checking, whether the return type is the collection for a real data types is not supported.
-     *
-     * @return bool
-     */
-    public function isCollection()
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function isRealType()
-    {
-        return true;
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php b/Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php
deleted file mode 100644
index 6d6680efd0..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/ArrayCompatible.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class ArrayCompatible extends ReturnType\CompositeSpecification
-{
-    public function isSatisfiedBy(ReturnType\TypeInterface $type): bool
-    {
-        if ($type->isRealType()) {
-            return Types::T_ARRAY === $type->getDataType();
-        }
-
-        return $type->isCollection();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IntCompatible.php b/Library/FunctionLike/ReturnType/Specification/IntCompatible.php
deleted file mode 100644
index dff00ba38d..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IntCompatible.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class IntCompatible extends ReturnType\CompositeSpecification
-{
-    public function isSatisfiedBy(ReturnType\TypeInterface $type): bool
-    {
-        if (!$type->isRealType()) {
-            return false;
-        }
-
-        return match ($type->getDataType()) {
-            Types::T_INT, Types::T_UINT, Types::T_CHAR, Types::T_UCHAR, Types::T_LONG, Types::T_ULONG => true,
-            default => false,
-        };
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IsBool.php b/Library/FunctionLike/ReturnType/Specification/IsBool.php
deleted file mode 100644
index a37ff78434..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsBool.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class IsBool extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return $type->isRealType() && Types::T_BOOL == $type->getDataType();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IsCollection.php b/Library/FunctionLike/ReturnType/Specification/IsCollection.php
deleted file mode 100644
index 270f1f20ea..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsCollection.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-
-final class IsCollection extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return false == $type->isRealType() && true == $type->isCollection();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IsDouble.php b/Library/FunctionLike/ReturnType/Specification/IsDouble.php
deleted file mode 100644
index 4082a07c58..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsDouble.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class IsDouble extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return $type->isRealType() && Types::T_DOUBLE == $type->getDataType();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IsNull.php b/Library/FunctionLike/ReturnType/Specification/IsNull.php
deleted file mode 100644
index 03ebd96473..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsNull.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class IsNull extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return $type->isRealType() && Types::T_NULL == $type->getDataType();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IsReal.php b/Library/FunctionLike/ReturnType/Specification/IsReal.php
deleted file mode 100644
index 61ef53fc41..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsReal.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-
-final class IsReal extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return $type->isRealType();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IsSpecial.php b/Library/FunctionLike/ReturnType/Specification/IsSpecial.php
deleted file mode 100644
index 64e35344d7..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsSpecial.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-/**
- * Special types specification.
- *
- * Used only for type hinting.
- */
-final class IsSpecial extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        switch ($type->getDataType()) {
-            case Types::T_NUMBER:
-            case Types::T_RESOURCE:
-            case Types::T_VARIABLE:
-            case Types::T_CALLABLE:
-            case Types::T_ITERABLE:
-                return true;
-            default:
-                return false;
-        }
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/IsVoid.php b/Library/FunctionLike/ReturnType/Specification/IsVoid.php
deleted file mode 100644
index 16b9bb1432..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/IsVoid.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class IsVoid extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        return $type->isRealType() && Types::T_VOID == $type->getDataType();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/ObjectLike.php b/Library/FunctionLike/ReturnType/Specification/ObjectLike.php
deleted file mode 100644
index c4a9456a22..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/ObjectLike.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class ObjectLike extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        if (true == $type->isRealType()) {
-            return false;
-        }
-
-        return Types::T_OBJECT == $type->getDataType() && false === $type->isCollection();
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/Specification/StringCompatible.php b/Library/FunctionLike/ReturnType/Specification/StringCompatible.php
deleted file mode 100644
index bdc81dfce5..0000000000
--- a/Library/FunctionLike/ReturnType/Specification/StringCompatible.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType\Specification;
-
-use Zephir\FunctionLike\ReturnType;
-use Zephir\Types;
-
-final class StringCompatible extends ReturnType\CompositeSpecification
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type)
-    {
-        if (false == $type->isRealType()) {
-            return false;
-        }
-
-        switch ($type->getDataType()) {
-            case Types::T_STRING:
-            case Types::T_ISTRING:
-                return true;
-            default:
-                return false;
-        }
-    }
-}
diff --git a/Library/FunctionLike/ReturnType/SpecificationInterface.php b/Library/FunctionLike/ReturnType/SpecificationInterface.php
deleted file mode 100644
index cd5eabbc66..0000000000
--- a/Library/FunctionLike/ReturnType/SpecificationInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-use Zephir\FunctionLike\ReturnType;
-
-interface SpecificationInterface
-{
-    /**
-     * Checks if given type meets all criteria.
-     *
-     * @param ReturnType\TypeInterface $type
-     *
-     * @return bool
-     */
-    public function isSatisfiedBy(ReturnType\TypeInterface $type);
-}
diff --git a/Library/FunctionLike/ReturnType/TypeInterface.php b/Library/FunctionLike/ReturnType/TypeInterface.php
deleted file mode 100644
index d06fbce8c5..0000000000
--- a/Library/FunctionLike/ReturnType/TypeInterface.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\FunctionLike\ReturnType;
-
-interface TypeInterface
-{
-    const TYPE_PARAMETER = 'return-type-parameter';
-    const TYPE_ANNOTATION = 'return-type-annotation';
-
-    /**
-     * Gets the intermediate type.
-     *
-     * In most cases this will be a "return-type-parameter"
-     * string except for some rare cases.
-     *
-     * @return string
-     */
-    public function getType();
-
-    /**
-     * Gets return data type name.
-     *
-     * @return string
-     */
-    public function getDataType();
-
-    /**
-     * Gets cast return type.
-     *
-     * @return string|null
-     */
-    public function getValue();
-
-    /**
-     * Is return type mandatory.
-     *
-     * @return mixed
-     */
-    public function isMandatory();
-
-    /**
-     * Is the return value a collection.
-     *
-     * @return bool
-     */
-    public function isCollection();
-
-    /**
-     * Is the return type a real type or it is just a cast hint.
-     *
-     * @return bool
-     */
-    public function isRealType();
-}
diff --git a/tests/Zephir/FunctionLike/ReturnType/CastHintTest.php b/tests/Zephir/FunctionLike/ReturnType/CastHintTest.php
deleted file mode 100644
index 4df7cd526d..0000000000
--- a/tests/Zephir/FunctionLike/ReturnType/CastHintTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Test\FunctionLike\ReturnType;
-
-use PHPUnit\Framework\TestCase;
-use Zephir\FunctionLike\ReturnType\CastHint;
-use Zephir\FunctionLike\ReturnType\TypeInterface;
-use Zephir\Types;
-
-final class CastHintTest extends TestCase
-{
-    public function testShouldReturnType(): void
-    {
-        $type = new CastHint(Types::T_OBJECT, 'Class1');
-        $this->assertEquals(TypeInterface::TYPE_PARAMETER, $type->getType());
-
-        $type = new CastHint(Types::T_OBJECT, 'Class2', TypeInterface::TYPE_ANNOTATION);
-        $this->assertEquals(TypeInterface::TYPE_ANNOTATION, $type->getType());
-
-        $type = new CastHint(Types::T_OBJECT, 'Class3', 'return-type-custom');
-        $this->assertEquals('return-type-custom', $type->getType());
-    }
-
-    public function testShouldReturnDataType(): void
-    {
-        $type = new CastHint(Types::T_OBJECT, 'Class1');
-        $this->assertEquals(Types::T_OBJECT, $type->getDataType());
-
-        $type = new CastHint(Types::T_UNDEFINED, 'Class2');
-        $this->assertEquals(Types::T_UNDEFINED, $type->getDataType());
-    }
-
-    public function testShouldReturnValue(): void
-    {
-        $type = new CastHint(Types::T_OBJECT, 'Class1');
-        $this->assertEquals('Class1', $type->getValue());
-
-        $type = new CastHint(Types::T_OBJECT, '\A\Namespaced\Class\Foo');
-        $this->assertEquals('\A\Namespaced\Class\Foo', $type->getValue());
-    }
-
-    public function testShouldAlwaysBeNotMandatory(): void
-    {
-        $type = new CastHint(Types::T_OBJECT, 'Class1');
-        $this->assertFalse($type->isMandatory());
-
-        $type = new CastHint(Types::T_OBJECT, 'Class2', TypeInterface::TYPE_ANNOTATION);
-        $this->assertFalse($type->isMandatory());
-    }
-
-    public function testShouldDetectCollectionNature(): void
-    {
-        $type = new CastHint(Types::T_OBJECT, 'Class1');
-        $this->assertFalse($type->isCollection());
-
-        $type = new CastHint(Types::T_OBJECT, 'Class1', TypeInterface::TYPE_ANNOTATION, true);
-        $this->assertTrue($type->isCollection());
-
-        $type = new CastHint(Types::T_OBJECT, 'Class1', TypeInterface::TYPE_PARAMETER, true);
-        $this->assertTrue($type->isCollection());
-
-        $type = new CastHint(Types::T_OBJECT, 'Class1', TypeInterface::TYPE_PARAMETER, false);
-        $this->assertFalse($type->isCollection());
-    }
-
-    public function testShouldAlwaysBeRealType(): void
-    {
-        $type = new CastHint(Types::T_OBJECT, 'Class1');
-        $this->assertFalse($type->isRealType());
-    }
-}
diff --git a/tests/Zephir/FunctionLike/ReturnType/FactoryTest.php b/tests/Zephir/FunctionLike/ReturnType/FactoryTest.php
deleted file mode 100644
index 86fe79124d..0000000000
--- a/tests/Zephir/FunctionLike/ReturnType/FactoryTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Test\FunctionLike\ReturnType;
-
-use PHPUnit\Framework\TestCase;
-use Zephir\FunctionLike\ReturnType\CastHint;
-use Zephir\FunctionLike\ReturnType\Factory;
-use Zephir\FunctionLike\ReturnType\RealType;
-use Zephir\FunctionLike\ReturnType\TypeInterface;
-use Zephir\Types;
-
-final class FactoryTest extends TestCase
-{
-    /**
-     * @dataProvider realTypeDataProvider
-     *
-     * @param array $ir
-     */
-    public function testShouldCreateRealType(array $ir): void
-    {
-        $factory = new Factory();
-        $this->assertInstanceOf(RealType::class, $factory->create($ir));
-    }
-
-    public function realTypeDataProvider(): array
-    {
-        return [
-            [
-                [
-                    'data-type' => Types::T_STRING,
-                    'mandatory' => 0,
-                    'type' => TypeInterface::TYPE_PARAMETER,
-                ],
-            ],
-            [
-                [
-                    'data-type' => Types::T_DOUBLE,
-                    'mandatory' => 1,
-                    'type' => TypeInterface::TYPE_ANNOTATION,
-                ],
-            ],
-            [
-                [
-                    Types::T_INT,
-                ],
-            ],
-            [
-                [
-                    Types::T_UNDEFINED,
-                ],
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider castHintDataProvider
-     *
-     * @param array $ir
-     */
-    public function testShouldCreateCastHint(array $ir): void
-    {
-        $factory = new Factory();
-        $this->assertInstanceOf(CastHint::class, $factory->create($ir));
-    }
-
-    public function castHintDataProvider(): array
-    {
-        return [
-            [
-                [
-                    'cast' => [
-                        'type' => Types::T_VARIABLE,
-                        'mandatory' => 0,
-                    ],
-                    'type' => TypeInterface::TYPE_PARAMETER,
-                ],
-            ],
-            [
-                [
-                    'cast' => [
-                        'type' => Types::T_VARIABLE,
-                        'value' => 'Class1',
-                    ],
-                    'type' => TypeInterface::TYPE_ANNOTATION,
-                    'collection' => 0,
-                ],
-            ],
-            [
-                [
-                    'cast' => [
-                        'value' => 'Class1',
-                    ],
-                    'collection' => 1,
-                ],
-            ],
-            [
-                [
-                    'cast' => [
-                        'value' => null,
-                    ],
-                    'type' => Types::T_INT,
-                ],
-            ],
-            [
-                [
-                    'cast' => [],
-                ],
-            ],
-        ];
-    }
-}
diff --git a/tests/Zephir/FunctionLike/ReturnType/RealTypeTest.php b/tests/Zephir/FunctionLike/ReturnType/RealTypeTest.php
deleted file mode 100644
index f2dc8275c6..0000000000
--- a/tests/Zephir/FunctionLike/ReturnType/RealTypeTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Test\FunctionLike\ReturnType;
-
-use PHPUnit\Framework\TestCase;
-use Zephir\FunctionLike\ReturnType\RealType;
-use Zephir\FunctionLike\ReturnType\TypeInterface;
-use Zephir\Types;
-
-final class RealTypeTest extends TestCase
-{
-    public function testShouldReturnType(): void
-    {
-        $type = new RealType(Types::T_STRING);
-        $this->assertEquals(TypeInterface::TYPE_PARAMETER, $type->getType());
-
-        $type = new RealType(Types::T_STRING, false, TypeInterface::TYPE_ANNOTATION);
-        $this->assertEquals(TypeInterface::TYPE_ANNOTATION, $type->getType());
-
-        $type = new RealType(Types::T_STRING, false, 'return-type-custom');
-        $this->assertEquals('return-type-custom', $type->getType());
-    }
-
-    public function testShouldReturnMandatoryStatus(): void
-    {
-        $type = new RealType(Types::T_STRING);
-        $this->assertFalse($type->isMandatory());
-
-        $type = new RealType(Types::T_STRING, false);
-        $this->assertFalse($type->isMandatory());
-
-        $type = new RealType(Types::T_STRING, true);
-        $this->assertTrue($type->isMandatory());
-    }
-
-    public function testShouldAlwaysHaveNullableValue(): void
-    {
-        $type = new RealType(Types::T_STRING);
-        $this->assertNull($type->getValue());
-    }
-
-    public function testShouldAlwaysBeNotACollection(): void
-    {
-        $type = new RealType(Types::T_STRING);
-        $this->assertFalse($type->isCollection());
-
-        $type = new RealType(Types::T_ARRAY);
-        $this->assertFalse($type->isCollection());
-    }
-
-    public function testShouldReturnDataType(): void
-    {
-        $type = new RealType(Types::T_STRING);
-        $this->assertEquals(Types::T_STRING, $type->getDataType());
-
-        $type = new RealType(Types::T_INT, false, TypeInterface::TYPE_ANNOTATION);
-        $this->assertEquals(Types::T_INT, $type->getDataType());
-
-        $type = new RealType(Types::T_VOID, true, 'return-type-custom');
-        $this->assertEquals(Types::T_VOID, $type->getDataType());
-    }
-
-    public function testShouldAlwaysBeRealType(): void
-    {
-        $type = new RealType(Types::T_STRING);
-        $this->assertTrue($type->isRealType());
-    }
-}

From a0e215f91ffc2680149c89b83fafa441dbced47a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 23:25:45 +0100
Subject: [PATCH 031/375] #2407 - Refactor `Globals` class and add tests

---
 Library/Variable/Globals.php          | 79 +++++----------------------
 tests/Zephir/Variable/GlobalsTest.php | 34 ++++++++++++
 2 files changed, 49 insertions(+), 64 deletions(-)
 create mode 100644 tests/Zephir/Variable/GlobalsTest.php

diff --git a/Library/Variable/Globals.php b/Library/Variable/Globals.php
index 22b2a4669f..d41b7c64ea 100644
--- a/Library/Variable/Globals.php
+++ b/Library/Variable/Globals.php
@@ -14,78 +14,29 @@
 namespace Zephir\Variable;
 
 /**
- * Zephir\Variable\Globals.
- *
  * Represents a central knowledge base on global variables.
  */
-class Globals
+final class Globals
 {
     /**
-     * The variables passed to the current script via the URL parameters.
-     */
-    const GET = '_GET';
-
-    /**
-     * The variables passed to the current script via the HTTP POST method.
-     */
-    const POST = '_POST';
-
-    /**
-     * An array in which the environment variable names are element keys,
-     * and the environment variable value strings are element values.
-     */
-    const ENV = '_ENV';
-
-    /**
-     * The variables passed to the current script via HTTP Cookies.
-     */
-    const COOKIE = '_COOKIE';
-
-    /**
-     * Server and execution environment information, such as headers, paths, and script locations.
-     */
-    const SERVER = '_SERVER';
-
-    /**
-     * The session variables available to the current script.
-     */
-    const SESSION = '_SESSION';
-
-    /**
-     * By default contains the contents of $_COOKIE, $_GET, and $_POST.
-     */
-    const REQUEST = '_REQUEST';
-
-    /**
-     * The items uploaded to the current script via the HTTP POST method.
-     */
-    const FILES = '_FILES';
-
-    /**
-     * Names of superglobal variables.
-     *
-     * @var array
-     */
-    protected $superglobals = [
-        self::GET => 1,
-        self::POST => 1,
-        self::ENV => 1,
-        self::COOKIE => 1,
-        self::SERVER => 1,
-        self::SESSION => 1,
-        self::REQUEST => 1,
-        self::FILES => 1,
+     * Names of super global variables.
+     */
+    protected array $superGlobals = [
+        '_GET',     // The variables passed to the current script via the URL parameters.
+        '_POST',    // The variables passed to the current script via the HTTP POST method.
+        '_ENV',     // An array in which the environment variable names are element keys, and the environment variable value strings are element values.
+        '_COOKIE',  // The variables passed to the current script via HTTP Cookies.
+        '_SERVER',  // Server and execution environment information, such as headers, paths, and script locations.
+        '_SESSION', // The session variables available to the current script.
+        '_REQUEST', // By default, contains the contents of $_COOKIE, $_GET, and $_POST.
+        '_FILES',   // The items uploaded to the current script via the HTTP POST method.
     ];
 
     /**
-     * Checks if a variable is a superglobal.
-     *
-     * @param string $name
-     *
-     * @return bool
+     * Checks if a variable is a super global.
      */
-    public function isSuperGlobal($name)
+    public function isSuperGlobal(string $name): bool
     {
-        return isset($this->superglobals[$name]);
+        return in_array($name, $this->superGlobals, true);
     }
 }
diff --git a/tests/Zephir/Variable/GlobalsTest.php b/tests/Zephir/Variable/GlobalsTest.php
new file mode 100644
index 0000000000..62d5ac1836
--- /dev/null
+++ b/tests/Zephir/Variable/GlobalsTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Test\Variable;
+
+use PHPUnit\Framework\TestCase;
+use Zephir\Variable\Globals;
+
+final class GlobalsTest extends TestCase
+{
+    public function testIsSuperGlobal(): void
+    {
+        $globals = new Globals();
+
+        $this->assertTrue($globals->isSuperGlobal('_GET'));
+        $this->assertTrue($globals->isSuperGlobal('_POST'));
+        $this->assertTrue($globals->isSuperGlobal('_COOKIE'));
+        $this->assertTrue($globals->isSuperGlobal('_SERVER'));
+        $this->assertTrue($globals->isSuperGlobal('_ENV'));
+        $this->assertTrue($globals->isSuperGlobal('_FILES'));
+        $this->assertTrue($globals->isSuperGlobal('_REQUEST'));
+        $this->assertFalse($globals->isSuperGlobal('foo'));
+    }
+}

From 511f790195756688207a036932c29b5c184aa24d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 23:26:27 +0100
Subject: [PATCH 032/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 Library/Backend/Backend.php                   |  19 +-
 Library/Call.php                              |   4 +-
 Library/ClassConstant.php                     |  23 +-
 Library/ClassMethod.php                       |  74 +-----
 Library/CompiledExpression.php                |  17 +-
 Library/Detectors/ForValueUseDetector.php     |   2 +
 Library/Detectors/WriteDetector.php           |   8 +-
 .../Annotation/ReturnAnnotation.php           |   4 +-
 Library/Documentation/Template.php            |  66 ------
 Library/Exception/CompilerException.php       |   6 +-
 .../Exception/ExceptionExtraAwareTrait.php    |  12 +-
 Library/Exception/FileSystemException.php     |   3 -
 Library/Exception/LogicException.php          |   2 -
 Library/Expression/NativeArrayAccess.php      |  34 +--
 Library/Expression/PropertyAccess.php         |   6 +-
 Library/MethodCall.php                        |   6 +-
 .../Operators/Logical/LogicalBaseOperator.php |  16 +-
 Library/Operators/Other/RequireOperator.php   |   6 +-
 Library/Statements/ForStatement.php           |   6 +-
 Library/Statements/Let/StaticProperty.php     |  15 +-
 Library/StaticCall.php                        | 217 ++++++++----------
 Library/SymbolTable.php                       |  58 +++--
 Library/Variable.php                          |   8 +-
 tests/Zephir/AliasManagerTest.php             |   4 +-
 24 files changed, 209 insertions(+), 407 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 1b2687b174..68ed2cae0f 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -316,7 +316,7 @@ public function onPreInitVar(ClassMethod $method): string
         return '';
     }
 
-    public function onPreCompile(ClassMethod $method, CompilationContext $context)
+    public function onPreCompile(ClassMethod $method, CompilationContext $context): void
     {
         /**
          * Initialize the properties within create_object, handler code
@@ -331,15 +331,14 @@ public function onPreCompile(ClassMethod $method, CompilationContext $context)
         }
     }
 
-    public function onPostCompile(ClassMethod $method, CompilationContext $context)
+    public function onPostCompile(ClassMethod $method, CompilationContext $context): void
     {
-        $codePrinter = $context->codePrinter;
-        if (preg_match('/^zephir_init_properties/', $method->getName())) {
-            $codePrinter->increaseLevel();
-            $codePrinter->output('return Z_OBJ_P(this_ptr);');
-            $codePrinter->decreaseLevel();
-            $codePrinter->output('}');
-            $codePrinter->decreaseLevel();
+        if (str_starts_with($method->getName(), 'zephir_init_properties')) {
+            $context->codePrinter->increaseLevel();
+            $context->codePrinter->output('return Z_OBJ_P(this_ptr);');
+            $context->codePrinter->decreaseLevel();
+            $context->codePrinter->output('}');
+            $context->codePrinter->decreaseLevel();
         }
     }
 
@@ -347,7 +346,7 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
     {
         $isComplex = in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
 
-        if ($isComplex && !$variable->isDoublePointer()) { /* && $variable->mustInitNull() */
+        if ($isComplex && !$variable->isDoublePointer()) {
             $groupVariables[] = $variable->getName();
             switch ($variable->getRealname()) {
                 case '__$null':
diff --git a/Library/Call.php b/Library/Call.php
index 5ba45d1349..5644c47023 100644
--- a/Library/Call.php
+++ b/Library/Call.php
@@ -133,12 +133,12 @@ public function processExpectedObservedReturn(CompilationContext $compilationCon
             if (\is_object($symbolVariable)) {
                 $readDetector = new ReadDetector();
                 if ($readDetector->detect($symbolVariable->getName(), $expression)) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext, $expression);
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
                 } else {
                     $mustInit = true;
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
             }
         }
 
diff --git a/Library/ClassConstant.php b/Library/ClassConstant.php
index 6626ff1714..92576fbb9a 100644
--- a/Library/ClassConstant.php
+++ b/Library/ClassConstant.php
@@ -13,7 +13,7 @@
 
 namespace Zephir;
 
-use Zephir\Exception\CompilerException;
+use ReflectionException;
 use Zephir\Expression\Constants;
 use Zephir\Expression\StaticConstantAccess;
 
@@ -38,8 +38,6 @@ class ClassConstant
     protected ?string $docblock = null;
 
     /**
-     * ClassConstant constructor.
-     *
      * @param string      $name
      * @param array       $value
      * @param string|null $docBlock
@@ -64,8 +62,6 @@ public function getName(): string
     /**
      * Returns the constant's value.
      *
-     * TODO: Rewrite name
-     *
      * @return array
      */
     public function getValue(): array
@@ -88,9 +84,9 @@ public function getValueType(): string
      *
      * @return mixed
      */
-    public function getValueValue()
+    public function getValueValue(): mixed
     {
-        return $this->value['value'] ?? false;
+        return $this->value['value'] ?? null;
     }
 
     /**
@@ -119,12 +115,12 @@ public function getType(): string
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
+     * @throws ReflectionException
      */
-    public function processValue(CompilationContext $compilationContext)
+    public function processValue(CompilationContext $compilationContext): void
     {
         if ('constant' === $this->value['type']) {
-            $constant = new Constants();
-            $compiledExpression = $constant->compile($this->value, $compilationContext);
+            $compiledExpression = (new Constants())->compile($this->value, $compilationContext);
 
             $this->value = [
                 'type' => $compiledExpression->getType(),
@@ -135,8 +131,7 @@ public function processValue(CompilationContext $compilationContext)
         }
 
         if ('static-constant-access' === $this->value['type']) {
-            $staticConstantAccess = new StaticConstantAccess();
-            $compiledExpression = $staticConstantAccess->compile($this->value, $compilationContext);
+            $compiledExpression = (new StaticConstantAccess())->compile($this->value, $compilationContext);
 
             $this->value = [
                 'type' => $compiledExpression->getType(),
@@ -150,15 +145,13 @@ public function processValue(CompilationContext $compilationContext)
      *
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
      * @throws Exception
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
         $this->processValue($compilationContext);
-
         $constantValue = $this->value['value'] ?? null;
-
         $compilationContext->backend->declareConstant(
             $this->value['type'],
             $this->getName(),
diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index a7e793a93a..228f1bc38e 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -440,16 +440,6 @@ public function setIsStatic(bool $static): void
         $this->isStatic = $static;
     }
 
-    /**
-     * Sets if the method is internal or not.
-     *
-     * @param bool $internal
-     */
-    public function setIsInternal(bool $internal): void
-    {
-        $this->isInternal = $internal;
-    }
-
     /**
      * Sets if the method is bundled or not.
      *
@@ -556,7 +546,7 @@ public function getOptimizedMethod(): self
      *
      * @param string $name
      */
-    public function setName(string $name)
+    public function setName(string $name): void
     {
         $this->name = $name;
     }
@@ -573,8 +563,6 @@ public function getName(): string
 
     /**
      * Returns the raw docblock.
-     *
-     * @return string
      */
     public function getDocBlock(): ?string
     {
@@ -607,21 +595,11 @@ public function getParsedDocBlock(): ?Docblock
      *
      * @return mixed
      */
-    public function getLine()
+    public function getLine(): mixed
     {
         return $this->expression['line'];
     }
 
-    /**
-     * the ending line of the method in the source file.
-     *
-     * @return mixed
-     */
-    public function getLastLine()
-    {
-        return $this->expression['last-line'];
-    }
-
     /**
      * Returns the parameters.
      *
@@ -780,20 +758,6 @@ public function getNumberOfRequiredParameters(): int
         return $required;
     }
 
-    /**
-     * Returns the number of required parameters the method has.
-     *
-     * @return string
-     */
-    public function getInternalParameters(): string
-    {
-        if ($this->parameters === null) {
-            return '';
-        }
-
-        return $this->parameters->count().', ...';
-    }
-
     /**
      * Checks whether the method has a specific modifier.
      *
@@ -900,16 +864,6 @@ public function isMixed(): bool
         return $this->mixed;
     }
 
-    /**
-     * Checks if the method is inline.
-     *
-     * @return bool
-     */
-    public function isInline(): bool
-    {
-        return in_array('inline', $this->visibility);
-    }
-
     /**
      * Checks if the method is private.
      *
@@ -1038,26 +992,6 @@ public function getShortcutName()
         return $this->expression['name'];
     }
 
-    /**
-     * Returns the local context pass information.
-     *
-     * @return LocalContextPass
-     */
-    public function getLocalContextPass(): LocalContextPass
-    {
-        return $this->localContext;
-    }
-
-    /**
-     * Returns the static type inference pass information.
-     *
-     * @return StaticTypeInference
-     */
-    public function getStaticTypeInferencePass(): StaticTypeInference
-    {
-        return $this->typeInference;
-    }
-
     /**
      * Returns the call gatherer pass information.
      *
@@ -2312,8 +2246,8 @@ public function isReturnTypesHintDetermined(): bool
                     continue;
                 }
 
-                /*
-                 * TODO: Probable we should detect return type more more carefully.
+                /**
+                 * TODO: Probably we should detect return type more more carefully.
                  * It is hard to process return type from the annotations at this time.
                  * Thus we just return false here.
                  */
diff --git a/Library/CompiledExpression.php b/Library/CompiledExpression.php
index ebb9431ebc..ebe2d11366 100644
--- a/Library/CompiledExpression.php
+++ b/Library/CompiledExpression.php
@@ -21,22 +21,13 @@
  */
 class CompiledExpression implements TypeAwareInterface
 {
-    protected string $type;
-
-    protected ?string $code;
-
-    protected ?array $originalExpr;
-
     /**
      * @param string      $type
-     * @param string|null $code
+     * @param mixed $code
      * @param array|null  $originalExpr
      */
-    public function __construct(string $type, ?string $code, ?array $originalExpr = null)
+    public function __construct(protected string $type, protected mixed $code, protected ?array $originalExpr = null)
     {
-        $this->type = $type;
-        $this->code = $code;
-        $this->originalExpr = $originalExpr;
     }
 
     /**
@@ -52,9 +43,9 @@ public function getType(): string
     /**
      * Returns the code produced by the compiled expression.
      *
-     * @return string|null
+     * @return mixed
      */
-    public function getCode(): ?string
+    public function getCode(): mixed
     {
         return $this->code;
     }
diff --git a/Library/Detectors/ForValueUseDetector.php b/Library/Detectors/ForValueUseDetector.php
index de0cb35bfa..3bb6e40343 100644
--- a/Library/Detectors/ForValueUseDetector.php
+++ b/Library/Detectors/ForValueUseDetector.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Detectors;
 
 /**
diff --git a/Library/Detectors/WriteDetector.php b/Library/Detectors/WriteDetector.php
index 2bebfdc0bb..be4400643a 100644
--- a/Library/Detectors/WriteDetector.php
+++ b/Library/Detectors/WriteDetector.php
@@ -44,7 +44,7 @@ class WriteDetector
      *
      * @return bool
      */
-    public function detect(string $variable, array $statements)
+    public function detect(string $variable, array $statements): bool
     {
         $this->passStatementBlock($statements);
 
@@ -123,7 +123,7 @@ public function passLetStatement(array $statement): void
      *
      * @param array $expression
      */
-    public function passCall(array $expression)
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -159,7 +159,7 @@ public function passArray(array $expression): void
      *
      * @param array $expression
      */
-    public function passNew(array $expression)
+    public function passNew(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -306,7 +306,7 @@ public function passExpression(array $expression): void
      *
      * @param array $statements
      */
-    public function passStatementBlock(array $statements)
+    public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
             switch ($statement['type']) {
diff --git a/Library/Documentation/Annotation/ReturnAnnotation.php b/Library/Documentation/Annotation/ReturnAnnotation.php
index 8c69583da0..6bda8943d0 100644
--- a/Library/Documentation/Annotation/ReturnAnnotation.php
+++ b/Library/Documentation/Annotation/ReturnAnnotation.php
@@ -18,8 +18,8 @@
  */
 class ReturnAnnotation extends Annotation
 {
-    protected $returnType;
-    protected $description;
+    protected string $returnType;
+    protected string $description;
 
     public function getReturnType(): string
     {
diff --git a/Library/Documentation/Template.php b/Library/Documentation/Template.php
index 1e95855b79..f20e7679de 100644
--- a/Library/Documentation/Template.php
+++ b/Library/Documentation/Template.php
@@ -66,53 +66,6 @@ private function getTemplatePath($fileName)
         return $inputFilename;
     }
 
-    /**
-     * Set a variable that will be accessible in the template.
-     *
-     * @param $name
-     * @param $value
-     */
-    public function setVar($name, $value)
-    {
-        $this->data[$name] = $value;
-    }
-
-    /**
-     * get a variable set with setVar().
-     *
-     * @param $name
-     *
-     * @return bool
-     */
-    public function getVar($name)
-    {
-        return isset($this->data[$name]) ? $this->data[$name] : null;
-    }
-
-    /**
-     * find the value in the project configuration (e.g the version).
-     *
-     * @param string $name the name of the config to get
-     */
-    public function projectConfig($name)
-    {
-        if (isset($this->projectConfig)) {
-            return $this->projectConfig->get($name);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * find the value of an option of the theme.
-     *
-     * @param string $name the name of the option to get
-     */
-    public function themeOption($name)
-    {
-        return isset($this->themeOptions[$name]) ? $this->themeOptions[$name] : null;
-    }
-
     /**
      * set the config of the project (it usually wraps the version, the theme config, etc...).
      *
@@ -133,20 +86,6 @@ public function setThemeOptions($themeOptions)
         $this->themeOptions = $themeOptions;
     }
 
-    /**
-     * get a value from the theme config (theme.json file placed inside the theme directory).
-     */
-    public function getAssets()
-    {
-        $css = $this->theme->getThemeInfoExtendAware('css');
-        $js = $this->theme->getThemeInfoExtendAware('javascript');
-
-        return [
-            'css' => $css,
-            'javascript' => $js,
-        ];
-    }
-
     /**
      * the path to root for the hyperlink in the templates.
      *
@@ -189,11 +128,6 @@ public function getPathToRoot()
         return $this->pathToRoot;
     }
 
-    public function asset($name)
-    {
-        return $this->getPathToRoot().'asset/'.rtrim($name);
-    }
-
     public function write($outputFile)
     {
         $content = $this->parse();
diff --git a/Library/Exception/CompilerException.php b/Library/Exception/CompilerException.php
index f2209fda04..d4cb81eb49 100644
--- a/Library/Exception/CompilerException.php
+++ b/Library/Exception/CompilerException.php
@@ -12,8 +12,6 @@
 namespace Zephir\Exception;
 
 /**
- * Zephir\Exception\CompilerException.
- *
  * Exceptions generated by the compiler
  */
 class CompilerException extends RuntimeException
@@ -21,12 +19,12 @@ class CompilerException extends RuntimeException
     /**
      * CompilerException constructor.
      *
-     * @param string                $message  the Exception message to throw [optional]
+     * @param string $message  the Exception message to throw [optional]
      * @param array|null            $extra    extra info [optional]
      * @param int                   $code     the Exception code [optional]
      * @param \Exception|\Throwable $previous the previous throwable used for the exception chaining [optional]
      */
-    public function __construct($message = '', $extra = null, $code = 0, $previous = null)
+    public function __construct(string $message = '', $extra = null, $code = 0, $previous = null)
     {
         if (\is_array($extra) && isset($extra['file'])) {
             $message .= ' in '.$extra['file'].' on line '.$extra['line'];
diff --git a/Library/Exception/ExceptionExtraAwareTrait.php b/Library/Exception/ExceptionExtraAwareTrait.php
index 4edf38baef..6b5f3f148f 100644
--- a/Library/Exception/ExceptionExtraAwareTrait.php
+++ b/Library/Exception/ExceptionExtraAwareTrait.php
@@ -15,27 +15,21 @@ trait ExceptionExtraAwareTrait
 {
     /**
      * Extra info.
-     *
-     * @var array
      */
-    protected $extra = [];
+    protected ?array $extra = [];
 
     /**
-     * {@inheritdoc}
-     *
      * @return array
      */
-    public function getExtra()
+    public function getExtra(): array
     {
         return $this->extra;
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @return string
      */
-    public function getErrorRegion()
+    public function getErrorRegion(): string
     {
         $region = '';
         $extra = $this->getExtra();
diff --git a/Library/Exception/FileSystemException.php b/Library/Exception/FileSystemException.php
index 96977003bc..5b871e2198 100644
--- a/Library/Exception/FileSystemException.php
+++ b/Library/Exception/FileSystemException.php
@@ -11,9 +11,6 @@
 
 namespace Zephir\Exception;
 
-/**
- * Zephir\Exception\FileSystemException.
- */
 class FileSystemException extends RuntimeException
 {
 }
diff --git a/Library/Exception/LogicException.php b/Library/Exception/LogicException.php
index 556edc6acc..0bc8fa7d21 100644
--- a/Library/Exception/LogicException.php
+++ b/Library/Exception/LogicException.php
@@ -12,8 +12,6 @@
 namespace Zephir\Exception;
 
 /**
- * Zephir\Exception\LogicException.
- *
  * Exception that represents error in the program logic.
  * This kind of exception should directly lead to a fix in your code.
  */
diff --git a/Library/Expression/NativeArrayAccess.php b/Library/Expression/NativeArrayAccess.php
index 83cc2a21ab..a4fde9f071 100644
--- a/Library/Expression/NativeArrayAccess.php
+++ b/Library/Expression/NativeArrayAccess.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression;
 
 use ReflectionException;
@@ -28,20 +30,18 @@ class NativeArrayAccess
 
     protected bool $readOnly = false;
 
-    /** @var Variable|null */
-    protected $expectingVariable;
+    protected ?Variable $expectingVariable;
 
-    /** @var bool */
-    protected $noisy = true;
+    protected bool $noisy = true;
 
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool     $expecting
-     * @param Variable $expectingVariable
+     * @param bool $expecting
+     * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn($expecting, Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -52,7 +52,7 @@ public function setExpectReturn($expecting, Variable $expectingVariable = null)
      *
      * @param bool $readOnly
      */
-    public function setReadOnly($readOnly)
+    public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
@@ -62,7 +62,7 @@ public function setReadOnly($readOnly)
      *
      * @param bool $noisy
      */
-    public function setNoisy($noisy)
+    public function setNoisy(bool $noisy): void
     {
         $this->noisy = $noisy;
     }
@@ -73,9 +73,9 @@ public function setNoisy($noisy)
      * @param $expression
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     * @throws Exception
+     * @throws ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
@@ -130,7 +130,7 @@ public function compile($expression, CompilationContext $compilationContext)
      * @throws ReflectionException
      * @throws Exception
      */
-    protected function accessStringOffset(array $expression, Variable $variableVariable, CompilationContext $compilationContext)
+    protected function accessStringOffset(array $expression, Variable $variableVariable, CompilationContext $compilationContext): CompiledExpression
     {
         if ($this->expecting) {
             if ($this->expectingVariable) {
@@ -182,15 +182,15 @@ protected function accessStringOffset(array $expression, Variable $variableVaria
     }
 
     /**
-     * @param array              $expression
-     * @param Variable           $variableVariable
+     * @param array $expression
+     * @param Variable $variableVariable
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     * @throws Exception
+     * @throws ReflectionException
      */
-    protected function accessDimensionArray($expression, Variable $variableVariable, CompilationContext $compilationContext)
+    protected function accessDimensionArray(array $expression, Variable $variableVariable, CompilationContext $compilationContext): CompiledExpression
     {
         $arrayAccess = $expression;
 
diff --git a/Library/Expression/PropertyAccess.php b/Library/Expression/PropertyAccess.php
index b1603a983f..0165825db4 100644
--- a/Library/Expression/PropertyAccess.php
+++ b/Library/Expression/PropertyAccess.php
@@ -58,7 +58,7 @@ public function setReadOnly($readOnly)
      *
      * @param bool $noisy
      */
-    public function setNoisy($noisy)
+    public function setNoisy(bool $noisy): void
     {
         $this->noisy = $noisy;
     }
@@ -101,7 +101,7 @@ public function compile($expression, CompilationContext $compilationContext)
         $classDefinition = null;
         $currentClassDefinition = $compilationContext->classDefinition;
 
-        /*
+        /**
          * If the property is accessed on 'this', we check if the method does exist
          */
         if ('this' == $variableVariable->getRealName()) {
@@ -112,7 +112,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
             $propertyDefinition = $classDefinition->getProperty($property);
         } else {
-            /*
+            /**
              * If we know the class related to a variable we could check if the property
              * is defined on that class
              */
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index cceadf303e..a1c905e940 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -99,7 +99,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
         $type = $expression['call-type'];
 
-        /*
+        /**
          * In normal method calls and dynamic string method calls we just use the name given by the user
          */
         if (self::CALL_NORMAL == $type || self::CALL_DYNAMIC_STRING == $type) {
@@ -136,12 +136,11 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         if ($isExpecting) {
             $symbolVariable = $expr->getExpectingVariable();
             if (\is_object($symbolVariable)) {
-                $readDetector = new ReadDetector($expression);
+                $readDetector = new ReadDetector();
                 if ($caller == $symbolVariable || $readDetector->detect($symbolVariable->getName(), $expression)) {
                     $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
                         'variable',
                         $compilationContext,
-                        $expression
                     );
                 } else {
                     $mustInit = true;
@@ -150,7 +149,6 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
                     'variable',
                     $compilationContext,
-                    $expression
                 );
             }
         }
diff --git a/Library/Operators/Logical/LogicalBaseOperator.php b/Library/Operators/Logical/LogicalBaseOperator.php
index b6d91e9879..6fa832e923 100644
--- a/Library/Operators/Logical/LogicalBaseOperator.php
+++ b/Library/Operators/Logical/LogicalBaseOperator.php
@@ -82,10 +82,10 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 switch ($right->getType()) {
                     case 'int':
                     case 'double':
-                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$this->bitOperator.' (('.$right->getCode().') ? 1 : 0))', $expression);
+                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' (('.$right->getCode().') ? 1 : 0))', $expression);
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$right->getBooleanCode().')', $expression);
 
                     case 'variable':
                         $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
@@ -166,7 +166,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                 return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->operator.' '.$right->getCode().')', $expression);
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$right->getBooleanCode().')', $expression);
 
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
@@ -175,7 +175,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                         return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$variableRight->getName().')', $expression);
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
@@ -200,7 +200,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                 return new CompiledExpression('bool', $variableLeft->getName().' '.$this->operator.' '.$right->getCode(), $expression);
 
                             case 'bool':
-                                return new CompiledExpression('bool', $variableLeft->getName().' '.$this->bitOperator.''.$right->getBooleanCode(), $expression);
+                                return new CompiledExpression('bool', $variableLeft->getName().' '.$right->getBooleanCode(), $expression);
 
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
@@ -212,7 +212,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                         return new CompiledExpression('bool', $variableLeft->getName().' '.$this->operator.'  '.$variableRight->getName(), $expression);
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', $variableLeft->getName().' '.$this->bitOperator.''.$variableRight->getName(), $expression);
+                                        return new CompiledExpression('bool', $variableLeft->getName().' '.$variableRight->getName(), $expression);
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
@@ -237,7 +237,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                 return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->operator.' '.$right->getCode(), $expression);
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->bitOperator.''.$right->getBooleanCode(), $expression);
+                                return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$right->getBooleanCode(), $expression);
 
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
@@ -252,7 +252,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                         return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->operator.' ('.$variableRight->getName().' && Z_STRLEN_P('.$variableRight->getName().'))', $expression);
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->bitOperator.' '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$variableRight->getName(), $expression);
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
diff --git a/Library/Operators/Other/RequireOperator.php b/Library/Operators/Other/RequireOperator.php
index 3f237536b1..6dd7af44ea 100644
--- a/Library/Operators/Other/RequireOperator.php
+++ b/Library/Operators/Other/RequireOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -25,12 +26,13 @@
 class RequireOperator extends AbstractOperator
 {
     /**
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -58,7 +60,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $symbolVariable = false;
         if ($this->isExpecting()) {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext, $expression);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
         }
 
         $compilationContext->headersManager->add('kernel/memory');
diff --git a/Library/Statements/ForStatement.php b/Library/Statements/ForStatement.php
index 3354a89d9b..a002d6a624 100644
--- a/Library/Statements/ForStatement.php
+++ b/Library/Statements/ForStatement.php
@@ -617,12 +617,12 @@ public function compileStringTraverse($expression, CompilationContext $compilati
         $compilationContext->headersManager->add('kernel/operators');
         $codePrinter->output("\t".$variable->getName().' = ZEPHIR_STRING_OFFSET('.$stringVariableCode.', '.$tempVariable->getName().');');
 
-        /*
+        /**
          * Variables are initialized in a different way inside cycle
          */
         ++$compilationContext->insideCycle;
 
-        /*
+        /**
          * Compile statements in the 'for' block
          */
         if (isset($this->statement['statements'])) {
@@ -749,7 +749,7 @@ public function compileHashTraverse($expression, CompilationContext $compilation
      * @throws Exception
      * @throws ReflectionException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $exprRaw = $this->statement['expr'];
 
diff --git a/Library/Statements/Let/StaticProperty.php b/Library/Statements/Let/StaticProperty.php
index 0e0dc83bbe..01258407c7 100644
--- a/Library/Statements/Let/StaticProperty.php
+++ b/Library/Statements/Let/StaticProperty.php
@@ -9,18 +9,18 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
-use Zephir\Exception\IllegalOperationException;
 use Zephir\Expression;
 
 /**
- * StaticProperty.
- *
  * Updates static properties
  */
 class StaticProperty
@@ -28,14 +28,13 @@ class StaticProperty
     /**
      * Compiles ClassName::foo = {expr}.
      *
-     * @param string             $className
-     * @param string             $property
+     * @param string $className
+     * @param string $property
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
-     * @param array              $statement
+     * @param array $statement
      *
-     * @throws CompilerException
-     * @throws IllegalOperationException
+     * @throws ReflectionException
      */
     public function assignStatic(
         string $className,
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index 1c28f9cdd0..1fda946469 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -27,11 +27,12 @@ class StaticCall extends Call
     /**
      * Compiles a static method call.
      *
-     * @param Expression         $expr
+     * @param Expression $expr
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
+     * @throws Exception
      * @throws ReflectionException
      */
     public function compile(Expression $expr, CompilationContext $compilationContext): CompiledExpression
@@ -51,19 +52,19 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         if ($isExpecting) {
             $symbolVariable = $expr->getExpectingVariable();
             if (\is_object($symbolVariable)) {
-                $readDetector = new ReadDetector($expression);
+                $readDetector = new ReadDetector();
                 if ($readDetector->detect($symbolVariable->getName(), $expression)) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext, $expression);
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
                 } else {
                     $mustInit = true;
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
             }
         }
 
         /**
-         * Method calls only return zvals so we need to validate the target variable is also a zval
+         * Method calls only return zvals, so we need to validate the target variable is also a zval
          */
         if ($isExpecting) {
             /**
@@ -240,14 +241,15 @@ public function compile(Expression $expr, CompilationContext $compilationContext
     /**
      * Calls static methods on the 'self/static' context.
      *
-     * @param string             $context            SELF / STATIC
-     * @param string             $methodName
-     * @param array              $expression
-     * @param Variable|null      $symbolVariable
-     * @param bool               $mustInit
-     * @param bool               $isExpecting
+     * @param string $context SELF / STATIC
+     * @param string $methodName
+     * @param array $expression
+     * @param bool $mustInit
+     * @param bool $isExpecting
      * @param CompilationContext $compilationContext
-     * @param ClassMethod|null   $method
+     * @param Variable|null $symbolVariable
+     * @param ClassMethod|null $method
+     * @throws Exception
      */
     protected function call(
         string $context,
@@ -258,7 +260,7 @@ protected function call(
         CompilationContext $compilationContext,
         ?Variable $symbolVariable = null,
         ?ClassMethod $method = null
-    ) {
+    ): void {
         if (!in_array($context, ['SELF', 'STATIC'])) {
             $context = 'SELF';
         }
@@ -293,17 +295,14 @@ protected function call(
             $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
         }
 
-        $isInternal = false;
-        if (isset($method)) {
-            $isInternal = $method->isInternal();
-        }
-
         if ($symbolVariable) {
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
         $paramCount = count($params);
         $paramsStr = $paramCount ? ', '.implode(', ', $params) : '';
+
+        $isInternal = isset($method) && $method->isInternal();
         if (!$isInternal) {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
@@ -343,16 +342,17 @@ protected function call(
     /**
      * Calls static methods on the 'parent' context.
      *
-     * @param string             $methodName
-     * @param array              $expression
-     * @param Variable           $symbolVariable
-     * @param bool               $mustInit
-     * @param bool               $isExpecting
-     * @param ClassDefinition    $classDefinition
+     * @param string $methodName
+     * @param array $expression
+     * @param Variable $symbolVariable
+     * @param bool $mustInit
+     * @param bool $isExpecting
+     * @param ClassDefinition $classDefinition
      * @param CompilationContext $compilationContext
-     * @param ClassMethod        $method
+     * @param ClassMethod $method
+     * @throws Exception
      */
-    protected function callParent($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, ClassDefinition $classDefinition, CompilationContext $compilationContext, ClassMethod $method)
+    protected function callParent(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, ClassDefinition $classDefinition, CompilationContext $compilationContext, ClassMethod $method)
     {
         $codePrinter = $compilationContext->codePrinter;
         $classCe = $classDefinition->getClassEntry($compilationContext);
@@ -504,77 +504,42 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
     /**
      * Calls static methods on using a dynamic variable as class.
      *
-     * @param string             $methodName
+     * @param string $methodName
      * @param array              $expression
      * @param Variable           $symbolVariable
      * @param bool               $mustInit
      * @param bool               $isExpecting
      * @param CompilationContext $compilationContext
      */
-    protected function callFromDynamicClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, CompilationContext $compilationContext)
+    protected function callFromDynamicClass(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, CompilationContext $compilationContext): void
     {
-        $codePrinter = $compilationContext->codePrinter;
-
-        /**
-         * Call static methods must grown the stack
-         */
-        $compilationContext->symbolTable->mustGrownStack(true);
-
-        if ($mustInit) {
-            $symbolVariable->setMustInitNull(true);
-            $symbolVariable->trackVariant($compilationContext);
-        }
-
-        $cachePointer = 'NULL, 0';
-
-        $params = [];
-        if (isset($expression['parameters']) && count($expression['parameters'])) {
-            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
-        }
-
-        /**
-         * Obtain the class entry from the variable.
-         */
-        $classNameVariable = $compilationContext->symbolTable->getVariableForRead($expression['class'], $compilationContext, $expression);
-        if ($classNameVariable->isNotVariableAndString()) {
-            throw new CompilerException('Only dynamic/string variables can be used in dynamic classes', $expression);
-        }
-
-        $compilationContext->headersManager->add('kernel/object');
-
-        $classEntryVariable = $compilationContext->symbolTable->addTemp('zend_class_entry', $compilationContext);
-        $codePrinter->output(
-            sprintf(
-                '%s = zephir_fetch_class(%s);',
-                $classEntryVariable->getName(),
-                $compilationContext->backend->getVariableCode($classNameVariable)
-            )
-        );
-        $classEntry = $classEntryVariable->getName();
+        list($params, $classEntry) = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
 
         if ($symbolVariable) {
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
+        $cachePointer = 'NULL, 0';
+
         if (!count($params)) {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
+                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_CE_STATIC('.$symbol.', '.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
+                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC('.$symbol.', '.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_CE_STATIC(NULL, '.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
+                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC(NULL, '.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
             }
         } else {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_CE_STATIC('.$symbol.', '.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC('.$symbol.', '.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_CE_STATIC(NULL, '.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC(NULL, '.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
             }
         }
 
@@ -582,7 +547,7 @@ protected function callFromDynamicClass($methodName, array $expression, $symbolV
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $compilationContext->codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
         }
 
         $this->addCallStatusOrJump($compilationContext);
@@ -591,54 +556,15 @@ protected function callFromDynamicClass($methodName, array $expression, $symbolV
     /**
      * Calls static methods on using a dynamic variable as class and a dynamic method.
      *
-     * @param array              $expression
-     * @param Variable           $symbolVariable
-     * @param bool               $mustInit
-     * @param bool               $isExpecting
+     * @param array $expression
+     * @param Variable $symbolVariable
+     * @param bool $mustInit
+     * @param bool $isExpecting
      * @param CompilationContext $compilationContext
      */
-    protected function callFromDynamicClassDynamicMethod(array $expression, $symbolVariable, $mustInit, $isExpecting, CompilationContext $compilationContext)
+    protected function callFromDynamicClassDynamicMethod(array $expression, $symbolVariable, bool $mustInit, bool $isExpecting, CompilationContext $compilationContext): void
     {
-        $codePrinter = $compilationContext->codePrinter;
-
-        /**
-         * Call static methods must grown the stack
-         */
-        $compilationContext->symbolTable->mustGrownStack(true);
-
-        if ($mustInit) {
-            $symbolVariable->setMustInitNull(true);
-            $symbolVariable->trackVariant($compilationContext);
-        }
-
-        $cachePointer = 'NULL, 0';
-
-        $params = [];
-        if (isset($expression['parameters']) && count($expression['parameters'])) {
-            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
-        }
-
-        /**
-         * Obtain the class entry from the variable.
-         */
-        $classNameVariable = $compilationContext->symbolTable->getVariableForRead($expression['class'], $compilationContext, $expression);
-        if ($classNameVariable->isNotVariableAndString()) {
-            throw new CompilerException('Only dynamic/string variables can be used in dynamic classes', $expression);
-        }
-
-        $compilationContext->headersManager->add('kernel/object');
-
-        $classEntryVariable = $compilationContext->symbolTable->addTemp('zend_class_entry', $compilationContext);
-
-        $codePrinter->output(
-            sprintf(
-                '%s = zephir_fetch_class(%s);',
-                $classEntryVariable->getName(),
-                $compilationContext->backend->getVariableCode($classNameVariable)
-            )
-        );
-
-        $classEntry = $classEntryVariable->getName();
+        list($params, $classEntry) = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
 
         /**
          * Obtain the method name from the variable.
@@ -652,25 +578,27 @@ protected function callFromDynamicClassDynamicMethod(array $expression, $symbolV
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
+        $cachePointer = 'NULL, 0';
+
         if (!count($params)) {
             if ($isExpecting) {
                 if ('return_value' === $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL('.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
+                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL('.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL('.$symbol.', '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
+                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL('.$symbol.', '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
+                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
             }
         } else {
             if ($isExpecting) {
                 if ('return_value' === $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL('.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
+                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL('.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL('.$symbol.', '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
+                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL('.$symbol.', '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
+                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
             }
         }
 
@@ -678,9 +606,48 @@ protected function callFromDynamicClassDynamicMethod(array $expression, $symbolV
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $compilationContext->codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
         }
 
         $this->addCallStatusOrJump($compilationContext);
     }
+
+    private function fetchClassParams(array $expression, CompilationContext $compilationContext, Variable $symbolVariable, bool $mustInit): array
+    {
+        /**
+         * Call static methods must grow the stack
+         */
+        $compilationContext->symbolTable->mustGrownStack(true);
+
+        if ($mustInit) {
+            $symbolVariable->setMustInitNull(true);
+            $symbolVariable->trackVariant($compilationContext);
+        }
+
+        $params = [];
+        if (!empty($expression['parameters'])) {
+            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
+        }
+
+        /**
+         * Obtain the class entry from the variable.
+         */
+        $classNameVariable = $compilationContext->symbolTable->getVariableForRead($expression['class'], $compilationContext, $expression);
+        if ($classNameVariable->isNotVariableAndString()) {
+            throw new CompilerException('Only dynamic/string variables can be used in dynamic classes', $expression);
+        }
+
+        $compilationContext->headersManager->add('kernel/object');
+        $classEntryVariable = $compilationContext->symbolTable->addTemp('zend_class_entry', $compilationContext);
+
+        $compilationContext->codePrinter->output(
+            sprintf(
+                '%s = zephir_fetch_class(%s);',
+                $classEntryVariable->getName(),
+                $compilationContext->backend->getVariableCode($classNameVariable)
+            )
+        );
+
+        return [$params, $classEntryVariable->getName()];
+    }
 }
diff --git a/Library/SymbolTable.php b/Library/SymbolTable.php
index dbd29a72f0..81ba89bb9e 100644
--- a/Library/SymbolTable.php
+++ b/Library/SymbolTable.php
@@ -20,12 +20,12 @@
  */
 class SymbolTable
 {
-    protected $mustGrownStack = false;
+    protected bool $mustGrownStack = false;
 
     /** @var Variable[][] */
     protected $branchVariables = [];
 
-    protected $tempVarCount = 0;
+    protected int $tempVarCount = 0;
 
     /** @var Variable[][][][] */
     protected $branchTempVariables = [];
@@ -67,7 +67,7 @@ public function __construct(protected CompilationContext $compilationContext)
         $this->branchVariables[1]['return_value_ptr'] = $returnValue;
     }
 
-    public function resolveVariableToBranch($name, CompilationContext $compilationContext)
+    public function resolveVariableToBranch($name, CompilationContext $compilationContext): ?Branch
     {
         $currentBranch = $compilationContext->branchManager->getCurrentBranch();
 
@@ -87,7 +87,7 @@ public function resolveVariableToBranch($name, CompilationContext $compilationCo
      *
      * @param LocalContextPass $localContext
      */
-    public function setLocalContext(LocalContextPass $localContext)
+    public function setLocalContext(LocalContextPass $localContext): void
     {
         $this->localContext = $localContext;
     }
@@ -95,17 +95,17 @@ public function setLocalContext(LocalContextPass $localContext)
     /**
      * Check if a variable is declared in the current symbol table.
      *
-     * @param string             $name
-     * @param CompilationContext $compilationContext
+     * @param string $name
+     * @param CompilationContext|null $compilationContext
      *
      * @return bool
      */
-    public function hasVariable($name, CompilationContext $compilationContext = null)
+    public function hasVariable(string $name, CompilationContext $compilationContext = null): bool
     {
         return false !== $this->getVariable($name, $compilationContext ?: $this->compilationContext);
     }
 
-    public function hasVariableInBranch($name, Branch $compareBranch, CompilationContext $compilationContext = null)
+    public function hasVariableInBranch($name, Branch $compareBranch, CompilationContext $compilationContext = null): bool
     {
         $branch = $this->resolveVariableToBranch($name, $compilationContext ?: $this->compilationContext);
 
@@ -139,7 +139,7 @@ public function addVariable(
 
         $variable = new Variable($type, $varName, $currentBranch);
 
-        /*
+        /**
          * Checks whether a variable can be optimized to be static or not
          */
         if ('variable' == $type && $this->localContext && $this->localContext->shouldBeLocal($name)) {
@@ -346,7 +346,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                     if (!$found) {
                         /**
                          * Check if last assignment
-                         * Variable was initialized in a sub-branch and it's being used in a parent branch.
+                         * Variable was initialized in a sub-branch, and it's being used in a parent branch.
                          */
                         $possibleBadAssignment = false;
 
@@ -362,7 +362,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                                 }
                             } else {
                                 /*
-                                 * Variable is assigned just once and it's assigned in a conditional branch
+                                 * Variable is assigned just once, and it's assigned in a conditional branch
                                  */
                                 if (Branch::TYPE_CONDITIONAL_TRUE == $branches[0]->getType()) {
                                     $evalExpression = $branches[0]->getRelatedStatement()->getEvalExpression();
@@ -465,19 +465,17 @@ public function getVariableForWrite($name, CompilationContext $compilationContex
 
     /**
      * Return a variable in the symbol table, it will be used for a mutating operation
-     * This method implies mutation of one of the members of the variable but no the variables it self.
+     * This method implies mutation of one of the members of the variable but no the variables itself.
      *
-     * @param string             $name
+     * @param string $name
      * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws CompilerException
+     * @param array|null $statement
      *
      * @return Variable
      */
-    public function getVariableForUpdate($name, CompilationContext $compilationContext, array $statement = null)
+    public function getVariableForUpdate(string $name, CompilationContext $compilationContext, array $statement = null)
     {
-        /*
+        /**
          * Create superglobals just in time
          */
         if ($this->globalsManager->isSuperGlobal($name)) {
@@ -506,7 +504,7 @@ public function getVariableForUpdate($name, CompilationContext $compilationConte
         $variable->increaseUses();
         $variable->increaseMutates();
 
-        /*
+        /**
          * Saves the last place where the variable was mutated
          * We discard mutations inside loops because iterations could use the value
          * and Zephir only provides top-down compilation
@@ -521,7 +519,7 @@ public function getVariableForUpdate($name, CompilationContext $compilationConte
      *
      * @param bool $mustGrownStack
      */
-    public function mustGrownStack($mustGrownStack)
+    public function mustGrownStack(bool $mustGrownStack): void
     {
         $this->mustGrownStack = $mustGrownStack;
     }
@@ -531,7 +529,7 @@ public function mustGrownStack($mustGrownStack)
      *
      * @return bool
      */
-    public function getMustGrownStack()
+    public function getMustGrownStack(): bool
     {
         return $this->mustGrownStack;
     }
@@ -539,7 +537,7 @@ public function getMustGrownStack()
     /**
      * @return int
      */
-    public function getNextTempVar()
+    public function getNextTempVar(): int
     {
         return $this->tempVarCount++;
     }
@@ -564,13 +562,13 @@ public function getTempVariable(string $type, CompilationContext $compilationCon
     /**
      * Creates a temporary variable to be used in a write operation.
      *
-     * @param string             $type
+     * @param string $type
      * @param CompilationContext $context
      * @param mixed              $init
      *
      * @return Variable
      */
-    public function getTempVariableForWrite($type, CompilationContext $context, $init = true)
+    public function getTempVariableForWrite(string $type, CompilationContext $context, $init = true): Variable
     {
         $variable = $this->reuseTempVariable($type, 'heap');
         if (\is_object($variable)) {
@@ -848,8 +846,8 @@ public function markTemporalVariablesIdle(CompilationContext $compilationContext
             return;
         }
 
-        foreach ($this->branchTempVariables[$branchId] as $location => $typeVariables) {
-            foreach ($typeVariables as $type => $variables) {
+        foreach ($this->branchTempVariables[$branchId] as $typeVariables) {
+            foreach ($typeVariables as $variables) {
                 foreach ($variables as $variable) {
                     $pos = strpos($variable->getName(), Variable::BRANCH_MAGIC);
                     $otherBranchId = 1;
@@ -871,7 +869,7 @@ public function markTemporalVariablesIdle(CompilationContext $compilationContext
      *
      * @return int
      */
-    public function getExpectedMutations($variable)
+    public function getExpectedMutations(string $variable): int
     {
         if ($this->localContext) {
             return $this->localContext->getNumberOfMutations($variable);
@@ -887,7 +885,7 @@ public function getExpectedMutations($variable)
      *
      * @return int
      */
-    public function getLastCallLine()
+    public function getLastCallLine(): int
     {
         if ($this->localContext) {
             return $this->localContext->getLastCallLine();
@@ -903,7 +901,7 @@ public function getLastCallLine()
      *
      * @return int
      */
-    public function getLastUnsetLine()
+    public function getLastUnsetLine(): int
     {
         if ($this->localContext) {
             return $this->localContext->getLastUnsetLine();
@@ -920,7 +918,7 @@ public function getLastUnsetLine()
      * @param Variable           $variable
      * @param CompilationContext $compilationContext
      */
-    protected function registerTempVariable($type, $location, Variable $variable, CompilationContext $compilationContext = null)
+    protected function registerTempVariable($type, $location, Variable $variable, CompilationContext $compilationContext = null): void
     {
         $compilationContext = $compilationContext ?: $this->compilationContext;
         $branchId = $compilationContext->branchManager->getCurrentBranchId();
diff --git a/Library/Variable.php b/Library/Variable.php
index 66fc6c86e8..a581d86ed1 100644
--- a/Library/Variable.php
+++ b/Library/Variable.php
@@ -98,7 +98,7 @@ class Variable implements TypeAwareInterface
 
     protected array $classTypes = [];
 
-    protected ?ClassDefinition $associatedClass = null;
+    protected ClassDefinition|ReflectionClass|null $associatedClass = null;
 
     /**
      * Initialization skips.
@@ -463,10 +463,8 @@ public function setAssociatedClass(ReflectionClass|ClassDefinition $associatedCl
 
     /**
      * Returns the class related to the variable.
-     *
-     * @return ClassDefinition|null
      */
-    public function getAssociatedClass(): ?ClassDefinition
+    public function getAssociatedClass(): ClassDefinition|ReflectionClass|null
     {
         return $this->associatedClass;
     }
@@ -796,7 +794,7 @@ public function initVariant(CompilationContext $compilationContext): void
                     $compilationContext->backend->initVar($this, $compilationContext, true, true);
                 } else {
                     if ($this->variantInits > 0) {
-                        if (!$this->initBranch) {
+                        if ($this->initBranch) {
                             $compilationContext->codePrinter->output('ZEPHIR_INIT_BNVAR('.$this->getName().');');
                         } else {
                             $this->mustInitNull = true;
diff --git a/tests/Zephir/AliasManagerTest.php b/tests/Zephir/AliasManagerTest.php
index 70e4c66fcb..65f76767e6 100644
--- a/tests/Zephir/AliasManagerTest.php
+++ b/tests/Zephir/AliasManagerTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Test;
 
 use PHPUnit\Framework\TestCase;

From 27dfde99121e8320e664d3cdb8bbf7fd8b17330f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 23:31:07 +0100
Subject: [PATCH 033/375] #2407 - Move `ConsoleErrorListener` inside Console/
 directory

---
 Library/Console/Application.php                              | 5 ++---
 .../ConsoleErrorListener.php => Console/ErrorListener.php}   | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename Library/{EventListener/ConsoleErrorListener.php => Console/ErrorListener.php} (93%)

diff --git a/Library/Console/Application.php b/Library/Console/Application.php
index de663fa1f4..5232d00547 100644
--- a/Library/Console/Application.php
+++ b/Library/Console/Application.php
@@ -30,7 +30,6 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Throwable;
 use Zephir\Console\Command\ListCommand;
-use Zephir\EventListener\ConsoleErrorListener;
 use Zephir\Zephir;
 
 final class Application extends BaseApplication
@@ -40,7 +39,7 @@ public function __construct()
         parent::__construct('Zephir', Zephir::VERSION);
 
         $dispatcher = new EventDispatcher();
-        $dispatcher->addListener(ConsoleEvents::ERROR, [new ConsoleErrorListener(), 'onCommandError']);
+        $dispatcher->addListener(ConsoleEvents::ERROR, [new ErrorListener(), 'onCommandError']);
 
         $this->setDispatcher($dispatcher);
     }
@@ -114,7 +113,7 @@ public function getLongVersion(): string
      *
      * @throws Exception|Throwable
      */
-    public function doRun(InputInterface $input, OutputInterface $output)
+    public function doRun(InputInterface $input, OutputInterface $output): int
     {
         if (true === $input->hasParameterOption(['--dumpversion', '-dumpversion'], true)) {
             $output->writeln($this->getVersion());
diff --git a/Library/EventListener/ConsoleErrorListener.php b/Library/Console/ErrorListener.php
similarity index 93%
rename from Library/EventListener/ConsoleErrorListener.php
rename to Library/Console/ErrorListener.php
index 39a5e7841f..ca9028d8d3 100644
--- a/Library/EventListener/ConsoleErrorListener.php
+++ b/Library/Console/ErrorListener.php
@@ -11,13 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Zephir\EventListener;
+namespace Zephir\Console;
 
 use Symfony\Component\Console\Event\ConsoleErrorEvent;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\ExceptionInterface;
 
-class ConsoleErrorListener
+class ErrorListener
 {
     public function onCommandError(ConsoleErrorEvent $event): void
     {

From 7333687d8eadd4f68e8e1bd905353c77b0d4a09a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 23:45:38 +0100
Subject: [PATCH 034/375] #2407 - Remove `BranchGraph` & `BranchGraphNode`
 classes

---
 Library/BranchGraph.php        | 52 --------------------
 Library/BranchGraphNode.php    | 86 ----------------------------------
 Library/CompilationContext.php |  2 -
 Library/SymbolTable.php        | 82 ++++++++++++++------------------
 4 files changed, 34 insertions(+), 188 deletions(-)
 delete mode 100644 Library/BranchGraph.php
 delete mode 100644 Library/BranchGraphNode.php

diff --git a/Library/BranchGraph.php b/Library/BranchGraph.php
deleted file mode 100644
index 94be28d76c..0000000000
--- a/Library/BranchGraph.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir;
-
-/**
- * Represents a group of branch nodes
- */
-class BranchGraph
-{
-    protected ?BranchGraphNode $root = null;
-
-    protected array $branchMap = [];
-
-    /**
-     * Adds a leaf to the branch tree.
-     *
-     * @param Branch $branch
-     */
-    public function addLeaf(Branch $branch): void
-    {
-        $branchNode = $this->branchMap[$branch->getUniqueId()] ?? new BranchGraphNode($branch);
-        $branchNode->increase();
-
-        $tempBranch = $branch->getParentBranch();
-        while ($tempBranch) {
-            if (isset($this->branchMap[$tempBranch->getUniqueId()])) {
-                $parentBranchNode = $this->branchMap[$tempBranch->getUniqueId()];
-            } else {
-                $parentBranchNode = new BranchGraphNode($tempBranch);
-                $this->branchMap[$tempBranch->getUniqueId()] = $parentBranchNode;
-            }
-
-            $parentBranchNode->insert($branchNode);
-            $branchNode = $parentBranchNode;
-            $tempBranch = $tempBranch->getParentBranch();
-            if (!$tempBranch) {
-                $this->root = $parentBranchNode;
-            }
-        }
-    }
-}
diff --git a/Library/BranchGraphNode.php b/Library/BranchGraphNode.php
deleted file mode 100644
index f206c8f07c..0000000000
--- a/Library/BranchGraphNode.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir;
-
-use function count;
-use function in_array;
-
-/**
- * Allows visualizing assignments for a specific variable in every branch used.
- */
-class BranchGraphNode
-{
-    /**
-     * @var int
-     */
-    protected int $increase = 0;
-
-    /**
-     * @var Branch[]
-     */
-    protected array $branches = [];
-
-    /**
-     * @var Branch
-     */
-    protected Branch $branch;
-
-    /**
-     * @param Branch $branch
-     */
-    public function __construct(Branch $branch)
-    {
-        $this->branch = $branch;
-    }
-
-    /**
-     * Inserts a node in the branch graph.
-     *
-     * @param BranchGraphNode $branch
-     */
-    public function insert(self $branch): void
-    {
-        if (!in_array($branch, $this->branches)) {
-            $this->branches[] = $branch;
-        }
-    }
-
-    /**
-     * Increases the branch graph level.
-     */
-    public function increase(): void
-    {
-        ++$this->increase;
-    }
-
-    /**
-     * Generates an ASCII visualization of the branch.
-     *
-     * @param int $padding
-     */
-    public function show(int $padding = 0): void
-    {
-        echo str_repeat('    ', $padding), $this->branch->getUniqueId(), ':' , $this->increase;
-
-        if (count($this->branches) > 0) {
-            echo ':', PHP_EOL;
-            /** @var BranchGraphNode $node */
-            foreach ($this->branches as $node) {
-                $node->show($padding + 1);
-            }
-        } else {
-            echo PHP_EOL;
-        }
-    }
-}
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 1b0580cd48..27f807e840 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -146,8 +146,6 @@ class CompilationContext
 
     /**
      * Manages both function and method call caches.
-     *
-     * @var CacheManager|null
      */
     public ?CacheManager $cacheManager = null;
 
diff --git a/Library/SymbolTable.php b/Library/SymbolTable.php
index 81ba89bb9e..4624fb3e3f 100644
--- a/Library/SymbolTable.php
+++ b/Library/SymbolTable.php
@@ -9,12 +9,16 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\LocalContextPass;
 use Zephir\Variable\Globals;
 
+use function count;
+
 /**
  * A symbol table stores all the variables defined in a method, their data types and default values.
  */
@@ -22,23 +26,18 @@ class SymbolTable
 {
     protected bool $mustGrownStack = false;
 
-    /** @var Variable[][] */
-    protected $branchVariables = [];
+    protected array $branchVariables = [];
 
     protected int $tempVarCount = 0;
 
-    /** @var Variable[][][][] */
-    protected $branchTempVariables = [];
+    protected array $branchTempVariables = [];
 
     /**
      * @var LocalContextPass
      */
     protected $localContext;
 
-    /**
-     * @var Globals
-     */
-    protected $globalsManager;
+    protected Globals $globalsManager;
 
     public function __construct(protected CompilationContext $compilationContext)
     {
@@ -162,7 +161,7 @@ public function addVariable(
      *
      * @return Variable
      */
-    public function addRawVariable(Variable $variable)
+    public function addRawVariable(Variable $variable): Variable
     {
         if (!isset($this->branchVariables[1])) {
             $this->branchVariables[1] = [];
@@ -176,7 +175,7 @@ public function addRawVariable(Variable $variable)
      * Returns a variable in the symbol table.
      *
      * @param $name
-     * @param CompilationContext $compilationContext
+     * @param CompilationContext|null $compilationContext
      *
      * @return bool|Variable
      */
@@ -299,7 +298,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                     /** @var Branch[] $branches */
                     $branches = array_reverse($initBranches);
 
-                    if (1 == \count($branches)) {
+                    if (1 == count($branches)) {
                         if (Branch::TYPE_CONDITIONAL_TRUE == $branches[0]->getType()) {
                             if (true === $branches[0]->isUnreachable()) {
                                 throw new CompilerException('Initialization of variable "'.$name.'" depends on unreachable branch, consider initialize it at its declaration', $statement);
@@ -348,26 +347,28 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                          * Check if last assignment
                          * Variable was initialized in a sub-branch, and it's being used in a parent branch.
                          */
-                        $possibleBadAssignment = false;
-
-                        if ($currentBranch->getLevel() < $branches[0]->getLevel()) {
-                            $possibleBadAssignment = true;
-                        }
-
-                        if ($possibleBadAssignment) {
-                            if (\count($branches) > 1) {
-                                $graph = new BranchGraph();
-                                foreach ($branches as $branch) {
-                                    $graph->addLeaf($branch);
+                        $possibleBadAssignment = $currentBranch->getLevel() < $branches[0]->getLevel();
+                        if ($possibleBadAssignment && count($branches) === 1) {
+                            /**
+                             * Variable is assigned just once, and it's assigned in a conditional branch
+                             */
+                            if (Branch::TYPE_CONDITIONAL_TRUE == $branches[0]->getType()) {
+                                $evalExpression = $branches[0]->getRelatedStatement()->getEvalExpression();
+
+                                if (true === $evalExpression->isUnreachable()) {
+                                    throw new CompilerException("Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration", $statement);
+                                } else {
+                                    $variable->enableDefaultAutoInitValue();
+                                    $compilationContext->logger->warning(
+                                        "Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration",
+                                        ['conditional-initialization', $statement]
+                                    );
                                 }
                             } else {
-                                /*
-                                 * Variable is assigned just once, and it's assigned in a conditional branch
-                                 */
-                                if (Branch::TYPE_CONDITIONAL_TRUE == $branches[0]->getType()) {
+                                if (Branch::TYPE_CONDITIONAL_FALSE == $branches[0]->getType()) {
                                     $evalExpression = $branches[0]->getRelatedStatement()->getEvalExpression();
 
-                                    if (true === $evalExpression->isUnreachable()) {
+                                    if (true === $evalExpression->isUnreachableElse()) {
                                         throw new CompilerException("Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration", $statement);
                                     } else {
                                         $variable->enableDefaultAutoInitValue();
@@ -376,20 +377,6 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                                             ['conditional-initialization', $statement]
                                         );
                                     }
-                                } else {
-                                    if (Branch::TYPE_CONDITIONAL_FALSE == $branches[0]->getType()) {
-                                        $evalExpression = $branches[0]->getRelatedStatement()->getEvalExpression();
-
-                                        if (true === $evalExpression->isUnreachableElse()) {
-                                            throw new CompilerException("Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration", $statement);
-                                        } else {
-                                            $variable->enableDefaultAutoInitValue();
-                                            $compilationContext->logger->warning(
-                                                "Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration",
-                                                ['conditional-initialization', $statement]
-                                            );
-                                        }
-                                    }
                                 }
                             }
                         }
@@ -449,7 +436,7 @@ public function getVariableForWrite($name, CompilationContext $compilationContex
         $variable->increaseUses();
         $variable->increaseMutates();
 
-        /*
+        /**
          * Saves the last place where the variable was mutated
          * We discard mutations inside loops because iterations could use the value
          * and Zephir only provides top-down compilation
@@ -932,13 +919,12 @@ protected function registerTempVariable($type, $location, Variable $variable, Co
     /**
      * Reuse variables marked as idle after leave a branch.
      *
-     * @param string             $type
-     * @param string             $location
-     * @param CompilationContext $compilationContext
-     *
-     * @return Variable
+     * @param string $type
+     * @param string $location
+     * @param CompilationContext|null $compilationContext
+     * @return Variable|null
      */
-    protected function reuseTempVariable(string $type, $location, CompilationContext $compilationContext = null)
+    protected function reuseTempVariable(string $type, string $location, CompilationContext $compilationContext = null): ?Variable
     {
         $compilationContext = $compilationContext ?: $this->compilationContext;
         $branchId = $compilationContext->branchManager->getCurrentBranchId();

From 4b58280bfb59a5f845a2339dacecf1921d9db5d3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Sep 2023 23:54:28 +0100
Subject: [PATCH 035/375] #2407 - Refactor `LocalContextPass` class

---
 Library/Passes/LocalContextPass.php | 135 ++++++++++------------------
 1 file changed, 49 insertions(+), 86 deletions(-)

diff --git a/Library/Passes/LocalContextPass.php b/Library/Passes/LocalContextPass.php
index 3817f1e606..f160bbde3e 100644
--- a/Library/Passes/LocalContextPass.php
+++ b/Library/Passes/LocalContextPass.php
@@ -9,19 +9,23 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Passes;
 
 use Zephir\StatementsBlock;
 
+use function constant;
+use function defined;
+use function gettype;
+
 /**
- * LocalContextPass.
- *
  * This pass tries to check whether variables only do exist in the local context of the method block
- * or if they're used externally which will unallow variables to be placed in the stack
+ * or if they're used externally which will un allow variables to be placed in the stack
  *
  * This pass also tracks the number of initializations a variable may have, this allows
  * to mark variables as read-only after their last initialization. The number of
- * mutations is relative, since assignments inside cycles/loops may perform a n-number of
+ * mutations is relative, since assignments inside cycles/loops may perform an n-number of
  * mutations
  *
  * @see https://en.wikipedia.org/wiki/Escape_analysis
@@ -34,21 +38,21 @@ class LocalContextPass
 
     protected array $uses = [];
 
-    protected bool $lastCallLine = false;
+    protected int $lastCallLine = 0;
 
-    protected bool $lastUnsetLine = false;
+    protected int $lastUnsetLine = 0;
 
     /**
      * Do the compilation pass.
      *
      * @param StatementsBlock $block
      */
-    public function pass(StatementsBlock $block)
+    public function pass(StatementsBlock $block): void
     {
         $this->passStatementBlock($block->getStatements());
     }
 
-    public function declareVariables(array $statement)
+    public function declareVariables(array $statement): void
     {
         if (isset($statement['data-type'])) {
             if ('variable' != $statement['data-type']) {
@@ -73,7 +77,7 @@ public function declareVariables(array $statement)
      *
      * @param string $variable
      */
-    public function markVariableNoLocal($variable)
+    public function markVariableNoLocal(string $variable): void
     {
         if (isset($this->variables[$variable])) {
             $this->variables[$variable] = false;
@@ -84,9 +88,9 @@ public function markVariableNoLocal($variable)
      * Marks the latest use/read of a variable.
      *
      * @param string $variable
-     * @param array  $node
+     * @param array $node
      */
-    public function markLastUse($variable, $node)
+    public function markLastUse(string $variable, array $node): void
     {
         if (isset($node['line'])) {
             $this->uses[$variable] = $node['line'];
@@ -100,15 +104,9 @@ public function markLastUse($variable, $node)
      *
      * @return bool
      */
-    public function shouldBeLocal($variable)
+    public function shouldBeLocal(string $variable): bool
     {
-        if (isset($this->variables[$variable])) {
-            if ($this->variables[$variable]) {
-                return true;
-            }
-        }
-
-        return false;
+        return !empty($this->variables[$variable]);
     }
 
     /**
@@ -116,7 +114,7 @@ public function shouldBeLocal($variable)
      *
      * @param string $variable
      */
-    public function increaseMutations($variable)
+    public function increaseMutations(string $variable): void
     {
         if (isset($this->mutations[$variable])) {
             ++$this->mutations[$variable];
@@ -132,29 +130,9 @@ public function increaseMutations($variable)
      *
      * @return int
      */
-    public function getNumberOfMutations($variable)
-    {
-        if (isset($this->mutations[$variable])) {
-            return $this->mutations[$variable];
-        }
-
-        return 0;
-    }
-
-    /**
-     * Returns the latest line where a variable was read.
-     *
-     * @param string $variable
-     *
-     * @return int
-     */
-    public function getLastVariableUseLine($variable)
+    public function getNumberOfMutations(string $variable): int
     {
-        if (isset($this->uses[$variable])) {
-            return $this->uses[$variable];
-        }
-
-        return 0;
+        return $this->mutations[$variable] ?? 0;
     }
 
     /**
@@ -162,7 +140,7 @@ public function getLastVariableUseLine($variable)
      *
      * @return int
      */
-    public function getLastCallLine()
+    public function getLastCallLine(): int
     {
         return $this->lastCallLine;
     }
@@ -172,12 +150,12 @@ public function getLastCallLine()
      *
      * @return int
      */
-    public function getLastUnsetLine()
+    public function getLastUnsetLine(): int
     {
         return $this->lastUnsetLine;
     }
 
-    public function passLetStatement(array $statement)
+    public function passLetStatement(array $statement): void
     {
         foreach ($statement['assignments'] as $assignment) {
             if (isset($assignment['expr'])) {
@@ -225,8 +203,8 @@ public function passLetStatement(array $statement)
                             break;
 
                         case 'constant':
-                            if (\defined($assignment['expr']['value'])) {
-                                if ('string' == \gettype(\constant($assignment['expr']['value']))) {
+                            if (defined($assignment['expr']['value'])) {
+                                if ('string' === gettype(constant($assignment['expr']['value']))) {
                                     $this->markVariableNoLocal($assignment['variable']);
                                 }
                             }
@@ -255,10 +233,8 @@ public function passLetStatement(array $statement)
                 case 'array-index':
                 case 'object-property-array-index':
                 case 'object-property-append':
-                    switch ($assignment['expr']['type']) {
-                        case 'variable':
-                            $this->markVariableNoLocal($assignment['expr']['value']);
-                            break;
+                    if ($assignment['expr']['type'] == 'variable') {
+                        $this->markVariableNoLocal($assignment['expr']['value']);
                     }
                     $this->markVariableNoLocal($assignment['variable']);
                     break;
@@ -280,7 +256,7 @@ public function passLetStatement(array $statement)
         }
     }
 
-    public function passCall(array $expression)
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -293,7 +269,7 @@ public function passCall(array $expression)
         }
     }
 
-    public function passArray(array $expression)
+    public function passArray(array $expression): void
     {
         foreach ($expression['left'] as $item) {
             if ('variable' == $item['value']['type']) {
@@ -304,7 +280,7 @@ public function passArray(array $expression)
         }
     }
 
-    public function passNew(array $expression)
+    public function passNew(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -317,7 +293,7 @@ public function passNew(array $expression)
         }
     }
 
-    public function passExpression(array $expression)
+    public function passExpression(array $expression): void
     {
         switch ($expression['type']) {
             case 'bool':
@@ -377,6 +353,23 @@ public function passExpression(array $expression)
 
             case 'typeof':
             case 'bitwise_not':
+            case 'array-access':
+            case 'static-property-access':
+            case 'property-string-access':
+            case 'short-ternary':
+            case 'property-dynamic-access':
+            case 'property-access':
+            case 'ternary':
+            case 'unlikely':
+            case 'likely':
+            case 'clone':
+            case 'require_once':
+            case 'list':
+            case 'minus':
+            case 'require':
+            case 'instanceof':
+            case 'empty':
+            case 'isset':
             case 'not':
                 $this->passExpression($expression['left']);
                 break;
@@ -404,42 +397,12 @@ public function passExpression(array $expression)
                 $this->passNew($expression);
                 break;
 
-            case 'property-access':
-            case 'property-dynamic-access':
-            case 'property-string-access':
-            case 'static-property-access':
-            case 'array-access':
-                $this->passExpression($expression['left']);
-                break;
-
-            case 'isset':
-            case 'empty':
-            case 'instanceof':
-            case 'require':
-            case 'require_once':
-            case 'clone':
-            case 'likely':
-            case 'unlikely':
-            /* do special pass later */
-            case 'ternary':
-            case 'short-ternary':
-                $this->passExpression($expression['left']);
-                break;
-
             case 'fetch':
                 $this->increaseMutations($expression['left']['value']);
                 $this->markVariableNoLocal($expression['left']['value']);
                 $this->passExpression($expression['right']);
                 break;
 
-            case 'minus':
-                $this->passExpression($expression['left']);
-                break;
-
-            case 'list':
-                $this->passExpression($expression['left']);
-                break;
-
             case 'cast':
             case 'type-hint':
                 $this->passExpression($expression['right']);
@@ -451,7 +414,7 @@ public function passExpression(array $expression)
         }
     }
 
-    public function passStatementBlock(array $statements)
+    public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
             switch ($statement['type']) {

From 2c1a0c5f7fb310e0b29ad3aa7d58071dcb0f2edb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 11:18:04 +0100
Subject: [PATCH 036/375] #2407 - Remove unused method `getAllMethodCalls()`

---
 Library/Passes/CallGathererPass.php | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/Library/Passes/CallGathererPass.php b/Library/Passes/CallGathererPass.php
index 52807cf31e..2ddcfb3b85 100644
--- a/Library/Passes/CallGathererPass.php
+++ b/Library/Passes/CallGathererPass.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Passes;
 
 use Zephir\CompilationContext;
@@ -84,27 +86,17 @@ public function getNumberOfMethodCalls(string $className, string $methodName): i
         return 0;
     }
 
-    /**
-     * Returns all the method calls.
-     *
-     * @return array
-     */
-    public function getAllMethodCalls(): array
-    {
-        return $this->methodCalls;
-    }
-
     /**
      * Do the compilation pass.
      *
      * @param StatementsBlock $block
      */
-    public function pass(StatementsBlock $block)
+    public function pass(StatementsBlock $block): void
     {
         $this->passStatementBlock($block->getStatements());
     }
 
-    public function passLetStatement(array $statement)
+    public function passLetStatement(array $statement): void
     {
         foreach ($statement['assignments'] as $assignment) {
             if (isset($assignment['expr'])) {
@@ -113,7 +105,7 @@ public function passLetStatement(array $statement)
         }
     }
 
-    public function passCall(array $expression)
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -122,14 +114,14 @@ public function passCall(array $expression)
         }
     }
 
-    public function passArray(array $expression)
+    public function passArray(array $expression): void
     {
         foreach ($expression['left'] as $item) {
             $this->passExpression($item['value']);
         }
     }
 
-    public function passNew(array $expression)
+    public function passNew(array $expression): void
     {
         if (!$expression['dynamic']) {
             $className = $this->compilationContext->getFullName($expression['class']);
@@ -147,7 +139,7 @@ public function passNew(array $expression)
         }
     }
 
-    public function passNewType(array $expression)
+    public function passNewType(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -156,7 +148,7 @@ public function passNewType(array $expression)
         }
     }
 
-    public function passExpression(array $expression)
+    public function passExpression(array $expression): void
     {
         switch ($expression['type']) {
             case 'bool':
@@ -285,7 +277,7 @@ public function passExpression(array $expression)
         }
     }
 
-    public function passStatementBlock(array $statements)
+    public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
             switch ($statement['type']) {

From 86deafd1506503a10598c2be481613792423e69e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 11:42:27 +0100
Subject: [PATCH 037/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 Library/Code/Builder/Struct.php     | 40 +++--------------------------
 Library/Compiler.php                |  8 +++---
 Library/Passes/CallGathererPass.php | 22 +++-------------
 Library/Stubs/Generator.php         | 17 ++----------
 4 files changed, 13 insertions(+), 74 deletions(-)

diff --git a/Library/Code/Builder/Struct.php b/Library/Code/Builder/Struct.php
index 7f62238fbf..c411d5e047 100644
--- a/Library/Code/Builder/Struct.php
+++ b/Library/Code/Builder/Struct.php
@@ -16,27 +16,11 @@
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Exception\RuntimeException;
 
-use function is_string;
-
 /**
  * Represents an internal extension global structure
  */
 class Struct
 {
-    /**
-     * Struct name
-     *
-     * @var string
-     */
-    protected string $name;
-
-    /**
-     * Struct simple name
-     *
-     * @var string
-     */
-    protected string $simpleName;
-
     /**
      * Struct members definition
      *
@@ -50,25 +34,13 @@ class Struct
      */
     protected array $properties = [];
 
-    /**
-     * @param string $name
-     * @param string $simpleName
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(string $name, string $simpleName)
+    public function __construct(protected string $name, protected string $simpleName)
     {
         if (empty($name)) {
             throw new InvalidArgumentException('Struct name must not be empty');
         }
-
-        $this->name = $name;
-        $this->simpleName = $simpleName;
     }
 
-    /**
-     * @return string
-     */
     public function __toString(): string
     {
         $code = 'typedef struct '.$this->name.' { '.PHP_EOL;
@@ -82,21 +54,17 @@ public function __toString(): string
 
     /**
      * @param string $field
-     * @param array  $global
+     * @param string  $type
      *
      * @throws InvalidArgumentException
      */
-    public function addProperty(string $field, array $global): void
+    public function addProperty(string $field, string $type): void
     {
-        if (!isset($global['type']) || !is_string($global['type'])) {
-            throw new InvalidArgumentException('Property type must be string');
-        }
-
         if (isset($this->properties[$field])) {
             throw new InvalidArgumentException('Property was defined more than once');
         }
 
-        $this->properties[$field] = $this->convertToCType($global['type']);
+        $this->properties[$field] = $this->convertToCType($type);
     }
 
     /**
diff --git a/Library/Compiler.php b/Library/Compiler.php
index dfb978150d..36b9ed2ba1 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -1313,17 +1313,17 @@ public function processExtensionGlobals(string $namespace): array
              * Process compound structures
              */
             foreach ($structures as $structureName => $internalStructure) {
-                if (preg_match('/^[0-9a-zA-Z\_]$/', $structureName)) {
+                if (preg_match('/^[0-9a-zA-Z_]$/', $structureName)) {
                     throw new Exception("Struct name: '".$structureName."' contains invalid characters");
                 }
 
                 $structBuilder = new Struct('_zephir_struct_'.$structureName, $structureName);
                 foreach ($internalStructure as $field => $global) {
-                    if (preg_match('/^[0-9a-zA-Z\_]$/', $field)) {
+                    if (preg_match('/^[0-9a-zA-Z_]$/', $field)) {
                         throw new Exception("Struct field name: '".$field."' contains invalid characters");
                     }
 
-                    $structBuilder->addProperty($field, $global);
+                    $structBuilder->addProperty($field, $global['type']);
 
                     $isModuleGlobal = (int) !empty($global['module']);
                     $globalsDefault[$isModuleGlobal][] = $structBuilder->getCDefault($field, $global, $namespace);
@@ -1342,7 +1342,7 @@ public function processExtensionGlobals(string $namespace): array
              * Process single variables
              */
             foreach ($variables as $name => $global) {
-                if (preg_match('/^[0-9a-zA-Z\_]$/', $name)) {
+                if (preg_match('/^[0-9a-zA-Z_]$/', $name)) {
                     throw new Exception("Extension global variable name: '".$name."' contains invalid characters");
                 }
 
diff --git a/Library/Passes/CallGathererPass.php b/Library/Passes/CallGathererPass.php
index 2ddcfb3b85..5a8af0da8b 100644
--- a/Library/Passes/CallGathererPass.php
+++ b/Library/Passes/CallGathererPass.php
@@ -31,16 +31,8 @@ class CallGathererPass
 
     protected array $methodCalls = [];
 
-    protected CompilationContext $compilationContext;
-
-    /**
-     * CallGathererPass constructor.
-     *
-     * @param CompilationContext $compilationContext
-     */
-    public function __construct(CompilationContext $compilationContext)
+    public function __construct(protected CompilationContext $compilationContext)
     {
-        $this->compilationContext = $compilationContext;
     }
 
     /**
@@ -62,11 +54,7 @@ public function getCompilationContext(): CompilationContext
      */
     public function getNumberOfFunctionCalls(string $funcName): int
     {
-        if (isset($this->functionCalls[$funcName])) {
-            return $this->functionCalls[$funcName];
-        }
-
-        return 0;
+        return $this->functionCalls[$funcName] ?? 0;
     }
 
     /**
@@ -79,11 +67,7 @@ public function getNumberOfFunctionCalls(string $funcName): int
      */
     public function getNumberOfMethodCalls(string $className, string $methodName): int
     {
-        if (isset($this->methodCalls[$className][$methodName])) {
-            return $this->methodCalls[$className][$methodName];
-        }
-
-        return 0;
+        return $this->methodCalls[$className][$methodName] ?? 0;
     }
 
     /**
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index 22b8e41548..5e0ab0fe47 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -25,9 +25,6 @@
 use function array_key_exists;
 use function in_array;
 
-/**
- * Stubs Generator.
- */
 class Generator
 {
     /**
@@ -41,18 +38,11 @@ class Generator
         'scoped',
         'deprecated',
     ];
-
-    /**
-     * @var CompilerFile[]
-     */
-    protected array $files;
-
     /**
      * @param CompilerFile[] $files
      */
-    public function __construct(array $files)
+    public function __construct(protected array $files)
     {
-        $this->files = $files;
     }
 
     /**
@@ -454,10 +444,7 @@ protected function wrapPHPValue(array $parameter): string
     private function fetchDocBlock(?string $docBlock, string $indent): string
     {
         $docBlock = (new DocBlock($docBlock, $indent))->__toString();
-        if ($docBlock) {
-            return $docBlock.PHP_EOL;
-        }
 
-        return '';
+        return $docBlock ? $docBlock.PHP_EOL : '';
     }
 }

From 4db8792191e1678558d69cb9aede68d9e243c1f1 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 11:44:42 +0100
Subject: [PATCH 038/375] #2407 - Remove unused `PropertyAccessor` trait

---
 Library/Support/PropertyAccessor.php | 52 ----------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 Library/Support/PropertyAccessor.php

diff --git a/Library/Support/PropertyAccessor.php b/Library/Support/PropertyAccessor.php
deleted file mode 100644
index fa4a0c208b..0000000000
--- a/Library/Support/PropertyAccessor.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Support;
-
-use Zephir\Exception\InvalidCallException;
-use Zephir\Exception\UnknownPropertyException;
-
-/**
- * Zephir\Support\PropertyAccessor.
- */
-trait PropertyAccessor
-{
-    /**
-     * Gets the internal Object's property.
-     *
-     * Do not call this method directly as it is a PHP magic method that
-     * will be implicitly called when executing `$value = $object->property;`.
-     *
-     * @param string $name
-     *
-     * @throws InvalidCallException
-     * @throws UnknownPropertyException
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $getter = 'get'.ucfirst($name);
-        $setter = 'set'.ucfirst($name);
-
-        if (method_exists($this, $getter)) {
-            return $this->$getter();
-        } elseif (method_exists($this, $setter)) {
-            throw new InvalidCallException(
-                sprintf('Getting write-only property: %s::%s', static::class, $name)
-            );
-        }
-
-        throw new UnknownPropertyException(
-            sprintf('Getting unknown property: %s::%s', static::class, $name)
-        );
-    }
-}

From b67d6d316e05ac5aa5fecd6cb0f42db4ed7ff2da Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 12:13:08 +0100
Subject: [PATCH 039/375] #2407 - Remove unused exception classes

---
 Library/Exception/BadMethodCallException.php  | 20 ------------------
 Library/Exception/ContainerException.php      | 21 -------------------
 Library/Exception/InvalidCallException.php    | 16 --------------
 .../Exception/UnknownPropertyException.php    | 16 --------------
 4 files changed, 73 deletions(-)
 delete mode 100644 Library/Exception/BadMethodCallException.php
 delete mode 100644 Library/Exception/ContainerException.php
 delete mode 100644 Library/Exception/InvalidCallException.php
 delete mode 100644 Library/Exception/UnknownPropertyException.php

diff --git a/Library/Exception/BadMethodCallException.php b/Library/Exception/BadMethodCallException.php
deleted file mode 100644
index 0c4d903d2c..0000000000
--- a/Library/Exception/BadMethodCallException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Exception;
-
-/**
- * Zephir\Exception\BadMethodCallException.
- */
-class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
-{
-    use ExceptionExtraAwareTrait;
-}
diff --git a/Library/Exception/ContainerException.php b/Library/Exception/ContainerException.php
deleted file mode 100644
index 2f775a3141..0000000000
--- a/Library/Exception/ContainerException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Exception;
-
-use Psr\Container\ContainerExceptionInterface;
-
-/**
- * Zephir\Exception\ContainerException.
- */
-class ContainerException extends RuntimeException implements ContainerExceptionInterface
-{
-}
diff --git a/Library/Exception/InvalidCallException.php b/Library/Exception/InvalidCallException.php
deleted file mode 100644
index 6cda337ea1..0000000000
--- a/Library/Exception/InvalidCallException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Exception;
-
-class InvalidCallException extends LogicException
-{
-}
diff --git a/Library/Exception/UnknownPropertyException.php b/Library/Exception/UnknownPropertyException.php
deleted file mode 100644
index c4a7c117e7..0000000000
--- a/Library/Exception/UnknownPropertyException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Exception;
-
-class UnknownPropertyException extends LogicException
-{
-}

From 8bdc6825ee88e823e96e5ed72f59a35f50afee44 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 14:02:15 +0100
Subject: [PATCH 040/375] #2407 - Remove unused method `setStrict()`

---
 Library/Operators/Other/TypeHintOperator.php | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/Library/Operators/Other/TypeHintOperator.php b/Library/Operators/Other/TypeHintOperator.php
index a9ffeb9cd7..1696d30933 100644
--- a/Library/Operators/Other/TypeHintOperator.php
+++ b/Library/Operators/Other/TypeHintOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -22,27 +23,16 @@
 
 class TypeHintOperator extends AbstractOperator
 {
-    private bool $strict = false;
-
-    /**
-     * Sets if the type hint is strict or not.
-     *
-     * @param $strict
-     */
-    public function setStrict($strict)
-    {
-        $this->strict = (bool) $strict;
-    }
-
     /**
      * Performs type-hint compilation.
      *
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -50,7 +40,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         $expr->setReadOnly(true);
         $resolved = $expr->compile($compilationContext);
 
-        if ('variable' != $resolved->getType()) {
+        if ('variable' !== $resolved->getType()) {
             throw new CompilerException('Type-Hints only can be applied to dynamic variables.', $expression);
         }
 

From 5578e4c959a60d684ce4e8445d9244f84bd9722f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 14:09:24 +0100
Subject: [PATCH 041/375] #2407 - Remove unused class `PlusOperator`

---
 Library/Expression/NativeArray.php       |  2 -
 Library/Operators/Unary/PlusOperator.php | 77 ------------------------
 2 files changed, 79 deletions(-)
 delete mode 100644 Library/Operators/Unary/PlusOperator.php

diff --git a/Library/Expression/NativeArray.php b/Library/Expression/NativeArray.php
index 071a9aeb49..71e9605a25 100644
--- a/Library/Expression/NativeArray.php
+++ b/Library/Expression/NativeArray.php
@@ -34,8 +34,6 @@ class NativeArray
 
     protected bool $readOnly = false;
 
-    protected bool $noisy = true;
-
     protected ?Variable $expectingVariable = null;
 
     /**
diff --git a/Library/Operators/Unary/PlusOperator.php b/Library/Operators/Unary/PlusOperator.php
deleted file mode 100644
index 134d058e9e..0000000000
--- a/Library/Operators/Unary/PlusOperator.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir\Operators\Unary;
-
-use ReflectionException;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception;
-use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-use Zephir\Operators\AbstractOperator;
-
-class PlusOperator extends AbstractOperator
-{
-    /**
-     * Compile expression.
-     *
-     * @param $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     *
-     * @throws Exception
-     * @throws ReflectionException
-     */
-    public function compile($expression, CompilationContext $compilationContext): CompiledExpression
-    {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression');
-        }
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly($this->readOnly);
-        $left = $leftExpr->compile($compilationContext);
-
-        switch ($left->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-                return new CompiledExpression($left->getType(), '+'.$left->getCode(), $expression);
-
-            case 'variable':
-                $variable = $compilationContext->symbolTable->getVariable($left->getCode());
-                switch ($variable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'double':
-                        return new CompiledExpression($variable->getType(), '+'.$variable->getName(), $expression);
-
-                    case 'variable':
-                        return new CompiledExpression('variable', $variable->getName(), $expression);
-
-                    default:
-                        throw new CompilerException("Cannot operate plus with variable of '".$left->getType()."' type");
-                }
-                break;
-
-            default:
-                throw new CompilerException("Cannot operate plus with '".$left->getType()."' type");
-        }
-    }
-}

From 52167042793c989ff114ee9252399cbe3763c105 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 14:09:37 +0100
Subject: [PATCH 042/375] #2407 - Refactor Types classes

---
 Library/Types/AbstractType.php | 39 +++++++++++++++-------------------
 Library/Types/ArrayType.php    | 34 ++++++++++++-----------------
 Library/Types/CharType.php     | 20 ++++++++++-------
 Library/Types/DoubleType.php   | 12 ++++-------
 Library/Types/IntType.php      | 12 ++++-------
 Library/Types/IstringType.php  |  7 +++---
 Library/Types/StringType.php   | 12 ++++-------
 7 files changed, 57 insertions(+), 79 deletions(-)

diff --git a/Library/Types/AbstractType.php b/Library/Types/AbstractType.php
index e8c9c81db0..7c52906e15 100644
--- a/Library/Types/AbstractType.php
+++ b/Library/Types/AbstractType.php
@@ -9,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Types;
 
+use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -23,23 +26,22 @@ abstract class AbstractType
 {
     /**
      * The array of methods in zephir mapped to PHP internal methods.
-     *
-     * @var array
      */
-    protected $methodMap = [];
+    protected array $methodMap = [];
 
     /**
      * Intercepts calls to built-in methods.
      *
-     * @param string             $methodName
-     * @param object             $caller
+     * @param string $methodName
+     * @param object $caller
      * @param CompilationContext $compilationContext
-     * @param Call               $call
-     * @param array              $expression
+     * @param Call $call
+     * @param array $expression
      *
      * @return bool|CompiledExpression
      *
-     * @throws CompilerException|Exception
+     * @throws Exception
+     * @throws ReflectionException
      */
     public function invokeMethod(
         $methodName,
@@ -48,19 +50,19 @@ public function invokeMethod(
         Call $call,
         array $expression
     ) {
-        /*
+        /**
          * Checks first whether the method exist in the array type definition
          */
         if (method_exists($this, $methodName)) {
             return $this->{$methodName}($caller, $compilationContext, $call, $expression);
         }
 
-        /*
+        /**
          * Check the method map
          */
         if (isset($this->methodMap[$methodName])) {
             $paramNumber = $this->getNumberParam($methodName);
-            if (0 == $paramNumber) {
+            if (0 === $paramNumber) {
                 if (isset($expression['parameters'])) {
                     $parameters = $expression['parameters'];
                     array_unshift($parameters, ['parameter' => $caller]);
@@ -71,7 +73,7 @@ public function invokeMethod(
                 if (isset($expression['parameters'])) {
                     $parameters = [];
                     foreach ($expression['parameters'] as $number => $parameter) {
-                        if ($number == $paramNumber) {
+                        if ($number === $paramNumber) {
                             $parameters[] = null;
                         }
                         $parameters[] = $parameter;
@@ -104,24 +106,17 @@ public function invokeMethod(
      *
      * @return string
      */
-    abstract public function getTypeName();
+    abstract public function getTypeName(): string;
 
-    /**
-     * @return array
-     */
-    public function getMethodMap()
+    public function getMethodMap(): array
     {
         return $this->methodMap;
     }
 
     /**
      * Returns the number of the parameter where the object must be bound.
-     *
-     * @param $methodName
-     *
-     * @return int
      */
-    protected function getNumberParam($methodName)
+    protected function getNumberParam(string $methodName): int
     {
         return 0;
     }
diff --git a/Library/Types/ArrayType.php b/Library/Types/ArrayType.php
index 4b2882bff8..f050a0d53d 100644
--- a/Library/Types/ArrayType.php
+++ b/Library/Types/ArrayType.php
@@ -11,8 +11,11 @@
 
 namespace Zephir\Types;
 
+use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Types;
@@ -22,10 +25,7 @@
  */
 class ArrayType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
-    public $methodMap = [
+    public array $methodMap = [
         'join' => 'join',
         'reversed' => 'array_reverse',
         'rev' => 'array_reverse',
@@ -71,10 +71,7 @@ class ArrayType extends AbstractType
         'reduce' => 'array_reduce',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getTypeName()
+    public function getTypeName(): string
     {
         return Types::T_ARRAY;
     }
@@ -82,12 +79,14 @@ public function getTypeName()
     /**
      * Transforms calls to method "join" to function calls to "join".
      *
-     * @param object             $caller
+     * @param object $caller
      * @param CompilationContext $compilationContext
-     * @param Call               $call
-     * @param array              $expression
+     * @param Call $call
+     * @param array $expression
      *
-     * @return bool|\Zephir\CompiledExpression
+     * @return bool|CompiledExpression
+     * @throws ReflectionException
+     * @throws Exception
      */
     public function join($caller, CompilationContext $compilationContext, Call $call, array $expression)
     {
@@ -103,15 +102,8 @@ public function join($caller, CompilationContext $compilationContext, Call $call
         return $expression->compile($compilationContext);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function getNumberParam($methodName)
+    protected function getNumberParam(string $methodName): int
     {
-        if ('map' == $methodName) {
-            return 1;
-        }
-
-        return 0;
+        return 'map' === $methodName ? 1 : 0;
     }
 }
diff --git a/Library/Types/CharType.php b/Library/Types/CharType.php
index 385fcd6330..f77a09ae83 100644
--- a/Library/Types/CharType.php
+++ b/Library/Types/CharType.php
@@ -9,20 +9,22 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Types;
 
+use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Types;
 
 class CharType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getTypeName()
+    public function getTypeName(): string
     {
         return Types::T_CHAR;
     }
@@ -30,12 +32,14 @@ public function getTypeName()
     /**
      * Transforms calls to method "toHex" to sprintf('%X') call.
      *
-     * @param object             $caller
+     * @param object $caller
      * @param CompilationContext $compilationContext
-     * @param Call               $call
-     * @param array              $expression
+     * @param Call $call
+     * @param array $expression
      *
-     * @return bool|mixed|\Zephir\CompiledExpression
+     * @return bool|mixed|CompiledExpression
+     * @throws ReflectionException
+     * @throws Exception
      */
     public function toHex($caller, CompilationContext $compilationContext, Call $call, array $expression)
     {
diff --git a/Library/Types/DoubleType.php b/Library/Types/DoubleType.php
index b9c0003027..5ad3f5998b 100644
--- a/Library/Types/DoubleType.php
+++ b/Library/Types/DoubleType.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Types;
 
 use Zephir\Types;
@@ -18,10 +20,7 @@
  */
 class DoubleType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
-    public $methodMap = [
+    public array $methodMap = [
         'abs' => 'abs',
         'tobinary' => 'decbin',
         'tohex' => 'dechex',
@@ -38,10 +37,7 @@ class DoubleType extends AbstractType
         'log' => 'log',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getTypeName()
+    public function getTypeName(): string
     {
         return Types::T_DOUBLE;
     }
diff --git a/Library/Types/IntType.php b/Library/Types/IntType.php
index 6feb53d059..251de2f54f 100644
--- a/Library/Types/IntType.php
+++ b/Library/Types/IntType.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Types;
 
 use Zephir\Types;
@@ -18,10 +20,7 @@
  */
 class IntType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
-    public $methodMap = [
+    public array $methodMap = [
         'abs' => 'abs',
         'tobinary' => 'decbin',
         'tohex' => 'dechex',
@@ -38,10 +37,7 @@ class IntType extends AbstractType
         'log' => 'log',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getTypeName()
+    public function getTypeName(): string
     {
         return Types::T_INT;
     }
diff --git a/Library/Types/IstringType.php b/Library/Types/IstringType.php
index ad4ad03c32..9d7fa0390c 100644
--- a/Library/Types/IstringType.php
+++ b/Library/Types/IstringType.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Types;
 
 use Zephir\Types;
@@ -18,10 +20,7 @@
  */
 class IstringType extends StringType
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function getTypeName()
+    public function getTypeName(): string
     {
         return Types::T_ISTRING;
     }
diff --git a/Library/Types/StringType.php b/Library/Types/StringType.php
index b18a7d5539..b365041e7b 100644
--- a/Library/Types/StringType.php
+++ b/Library/Types/StringType.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Types;
 
 use Zephir\Types;
@@ -20,10 +22,7 @@
  */
 class StringType extends AbstractType
 {
-    /**
-     * {@inheritdoc}
-     */
-    public $methodMap = [
+    public array $methodMap = [
         'index' => 'strpos',
         'trim' => 'trim',
         'trimleft' => 'ltrim',
@@ -51,10 +50,7 @@ class StringType extends AbstractType
         'uncamelize' => 'uncamelize',
     ];
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getTypeName()
+    public function getTypeName(): string
     {
         return Types::T_STRING;
     }

From 748036a55035195f11a3e912a06bdf526f01f539 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 21:19:14 +0100
Subject: [PATCH 043/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 Library/CompilationContext.php                | 16 +----
 Library/Compiler.php                          | 70 ++++---------------
 Library/Compiler/CompilerFileFactory.php      |  9 +--
 Library/CompilerFileAnonymous.php             |  8 +--
 Library/Config.php                            |  2 +-
 .../Operators/Bitwise/BitwiseBaseOperator.php | 34 ++++-----
 .../Operators/Bitwise/BitwiseNotOperator.php  |  8 ++-
 .../CompilerFile/CheckDependenciesTest.php    |  3 +-
 8 files changed, 44 insertions(+), 106 deletions(-)

diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 27f807e840..9a5c3c64ae 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -26,11 +26,6 @@
  */
 class CompilationContext
 {
-    /**
-     * Compiler.
-     *
-     * @var Compiler|null
-     */
     public ?Compiler $compiler = null;
 
     /**
@@ -150,7 +145,7 @@ class CompilationContext
     public ?CacheManager $cacheManager = null;
 
     /**
-     * Manages class renamings using keyword 'use'.
+     * Manages class renaming using keyword 'use'.
      *
      * @var AliasManager|null
      */
@@ -201,13 +196,8 @@ public function getFullName(string $className): string
 
     /**
      * Lookup a class from a given class name.
-     *
-     * @param string     $className
-     * @param array|null $statement
-     *
-     * @return ClassDefinition
      */
-    public function classLookup(string $className, array $statement = null): ClassDefinition
+    public function classLookup(string $className, array $statement = null): AbstractClassDefinition
     {
         if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $this->getFullName($className);
@@ -215,7 +205,7 @@ public function classLookup(string $className, array $statement = null): ClassDe
                 return $this->compiler->getClassDefinition($className);
             }
 
-            throw new CompilerException("Cannot locate class '{$className}'", $statement);
+            throw new CompilerException("Cannot locate class '$className'", $statement);
         }
 
         if (in_array($className, ['self', 'static'])) {
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 36b9ed2ba1..5ee59e604c 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -32,6 +32,7 @@
 use Zephir\Exception\RuntimeException;
 use Zephir\Fcall\FcallManagerInterface;
 use Zephir\FileSystem\FileSystemInterface;
+use Zephir\Parser\Manager;
 use function count;
 use function dirname;
 use function extension_loaded;
@@ -43,11 +44,6 @@ final class Compiler
 {
     use LoggerAwareTrait;
 
-    /**
-     * @var Backend
-     */
-    public Backend $backend;
-
     /**
      * @var FunctionDefinition[]
      */
@@ -102,16 +98,6 @@ final class Compiler
      */
     private array $extraFiles = [];
 
-    /**
-     * @var Config
-     */
-    private Config $config;
-
-    /**
-     * @var Parser\Manager
-     */
-    private Parser\Manager $parserManager;
-
     /**
      * @var StringsManager
      */
@@ -137,41 +123,14 @@ final class Compiler
      */
     private ?string $templatesPath;
 
-    /**
-     * @var FileSystemInterface
-     */
-    private FileSystemInterface $filesystem;
-
-    /**
-     * @var CompilerFileFactory
-     */
-    private CompilerFileFactory $compilerFileFactory;
-
-    /**
-     * Compiler constructor.
-     *
-     * @param Config              $config
-     * @param Backend         $backend
-     * @param Parser\Manager      $manager
-     * @param FileSystemInterface $filesystem
-     * @param CompilerFileFactory $compilerFileFactory
-     *
-     * @throws RuntimeException
-     */
     public function __construct(
-        Config $config,
-        Backend $backend,
-        Parser\Manager $manager,
-        FileSystemInterface $filesystem,
-        CompilerFileFactory $compilerFileFactory
+        private Config $config,
+        public Backend $backend,
+        private Manager $parserManager,
+        private FileSystemInterface $filesystem,
+        private CompilerFileFactory $compilerFileFactory,
     ) {
-        $this->config = $config;
-        $this->backend = $backend;
-        $this->parserManager = $manager;
-        $this->filesystem = $filesystem;
-        $this->compilerFileFactory = $compilerFileFactory;
         $this->logger = new NullLogger();
-
         $this->stringManager = new StringsManager();
         $this->fcallManager = $this->backend->getFcallManager();
 
@@ -268,11 +227,10 @@ public function getParserManager(): Parser\Manager
      * Adds a function to the function definitions.
      *
      * @param FunctionDefinition $func
-     * @param array|null         $statement
+     * @param array $statement
      *
-     * @throws CompilerException
      */
-    public function addFunction(FunctionDefinition $func, array $statement = [])
+    public function addFunction(FunctionDefinition $func, array $statement = []): void
     {
         $funcName = strtolower($func->getInternalName());
         if (isset($this->functionDefinitions[$funcName])) {
@@ -431,7 +389,7 @@ public function getClassDefinition(string $className)
      * @param CompilerFileAnonymous $file
      * @param ClassDefinition       $classDefinition
      */
-    public function addClassDefinition(CompilerFileAnonymous $file, ClassDefinition $classDefinition)
+    public function addClassDefinition(CompilerFileAnonymous $file, ClassDefinition $classDefinition): void
     {
         $this->definitions[$classDefinition->getCompleteName()] = $classDefinition;
         $this->anonymousFiles[$classDefinition->getCompleteName()] = $file;
@@ -485,7 +443,7 @@ public function getConstant(string $name)
      *
      * @param array $globals
      */
-    public function setExtensionGlobals(array $globals)
+    public function setExtensionGlobals(array $globals): void
     {
         foreach ($globals as $key => $value) {
             $this->globals[$key] = $value;
@@ -505,7 +463,7 @@ public function isExtensionGlobal(string $name): bool
     }
 
     /**
-     * Returns a extension global by its name.
+     * Returns an extension global by its name.
      *
      * @param string $name
      *
@@ -563,7 +521,7 @@ public function getPhpIncludeDirs(): string
     /**
      * Pre-compile headers to speed up compilation.
      */
-    public function preCompileHeaders()
+    public function preCompileHeaders(): void
     {
         if (is_windows()) {
             // TODO: Add Windows support
@@ -1490,11 +1448,11 @@ public function processCodeInjection(array $entries, string $section = 'request'
 
         if (isset($entries[$section])) {
             foreach ($entries[$section] as $entry) {
-                if (isset($entry['code']) && !empty($entry['code'])) {
+                if (!empty($entry['code'])) {
                     $codes[] = $entry['code'].';';
                 }
 
-                if (isset($entry['include']) && !empty($entry['include'])) {
+                if (!empty($entry['include'])) {
                     $includes[] = '#include "'.$entry['include'].'"';
                 }
             }
diff --git a/Library/Compiler/CompilerFileFactory.php b/Library/Compiler/CompilerFileFactory.php
index 1b2b1659b0..43ba265102 100644
--- a/Library/Compiler/CompilerFileFactory.php
+++ b/Library/Compiler/CompilerFileFactory.php
@@ -21,15 +21,8 @@
 
 final class CompilerFileFactory
 {
-    private Config $config;
-    private FileSystemInterface $filesystem;
-    private LoggerInterface $logger;
-
-    public function __construct(Config $config, FileSystemInterface $filesystem, LoggerInterface $logger)
+    public function __construct(private Config $config, private FileSystemInterface $filesystem, private LoggerInterface $logger)
     {
-        $this->config = $config;
-        $this->filesystem = $filesystem;
-        $this->logger = $logger;
     }
 
     /**
diff --git a/Library/CompilerFileAnonymous.php b/Library/CompilerFileAnonymous.php
index 89711ace2a..81c51b7ed1 100644
--- a/Library/CompilerFileAnonymous.php
+++ b/Library/CompilerFileAnonymous.php
@@ -96,21 +96,21 @@ private function compileClass(CompilationContext $compilationContext)
 
         $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
 
-        $code = ''.PHP_EOL;
+        $code = PHP_EOL;
         $code .= '#ifdef HAVE_CONFIG_H'.PHP_EOL;
         $code .= '#include "'.$separators.'ext_config.h"'.PHP_EOL;
         $code .= '#endif'.PHP_EOL;
-        $code .= ''.PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include <php.h>'.PHP_EOL;
         $code .= '#include "'.$separators.'php_ext.h"'.PHP_EOL;
         $code .= '#include "'.$separators.'ext.h"'.PHP_EOL;
-        $code .= ''.PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include <Zend/zend_operators.h>'.PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>'.PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>'.PHP_EOL;
-        $code .= ''.PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include "kernel/main.h"'.PHP_EOL;
 
diff --git a/Library/Config.php b/Library/Config.php
index 73aeaf59b0..a678d640b9 100644
--- a/Library/Config.php
+++ b/Library/Config.php
@@ -335,7 +335,7 @@ public function jsonSerialize(): array
      *
      * @throws Exception
      */
-    protected function populate()
+    protected function populate(): void
     {
         if (!file_exists('config.json')) {
             return;
diff --git a/Library/Operators/Bitwise/BitwiseBaseOperator.php b/Library/Operators/Bitwise/BitwiseBaseOperator.php
index 3d27040aee..e7e82b2a0d 100644
--- a/Library/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/Library/Operators/Bitwise/BitwiseBaseOperator.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Bitwise;
 
 use Zephir\CompilationContext;
@@ -34,12 +36,12 @@ class BitwiseBaseOperator extends AbstractOperator
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
-     * @return bool|CompiledExpression
+     * @return null|CompiledExpression
      */
-    public function optimizeConstantFolding(array $expression, CompilationContext $compilationContext)
+    public function optimizeConstantFolding(array $expression, CompilationContext $compilationContext): ?CompiledExpression
     {
         if (!$compilationContext->config->get('constant-folding', 'optimizations')) {
-            return false;
+            return null;
         }
 
         switch ($expression['left']['type']) {
@@ -51,7 +53,7 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
                 //continue to next switch
                 break;
             default:
-                return false;
+                return null;
                 break;
         }
 
@@ -64,7 +66,7 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
                 //continue to operator switch
                 break;
             default:
-                return false;
+                return null;
                 break;
         }
 
@@ -88,12 +90,10 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
                 return new CompiledExpression('int', $expression['left']['value'] >> $expression['right']['value'], $expression);
         }
 
-        return false;
+        return null;
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
@@ -113,7 +113,7 @@ public function compile($expression, CompilationContext $compilationContext)
          * Check for constant folding optimizations.
          */
         $optimized = $this->optimizeConstantFolding($expression, $compilationContext);
-        if ($optimized) {
+        if ($optimized !== null) {
             return $optimized;
         }
 
@@ -153,10 +153,8 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'int':
                             case 'uint':
                             case 'long':
-                            case 'ulong':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
-
                             case 'bool':
+                            case 'ulong':
                                 return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
 
                             case 'double':
@@ -196,10 +194,8 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'int':
                             case 'uint':
                             case 'long':
-                            case 'ulong':
-                                return new CompiledExpression('int', '((int) ('.$left->getBooleanCode().') '.$this->operator.' '.$variableRight->getName().')', $expression);
-
                             case 'bool':
+                            case 'ulong':
                                 return new CompiledExpression('int', '((int) ('.$left->getBooleanCode().') '.$this->operator.' '.$variableRight->getName().')', $expression);
 
                             case 'double':
@@ -242,10 +238,8 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'int':
                             case 'uint':
                             case 'long':
-                            case 'ulong':
-                                return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' '.$variableRight->getName().')', $expression);
-
                             case 'bool':
+                            case 'ulong':
                                 return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' '.$variableRight->getName().')', $expression);
 
                             case 'double':
@@ -302,10 +296,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'long':
                                     case 'ulong':
                                     case 'char':
-                                    case 'uchar':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
-
                                     case 'bool':
+                                    case 'uchar':
                                         return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
 
                                     case 'double':
diff --git a/Library/Operators/Bitwise/BitwiseNotOperator.php b/Library/Operators/Bitwise/BitwiseNotOperator.php
index b40be4dc06..f0666a57d7 100644
--- a/Library/Operators/Bitwise/BitwiseNotOperator.php
+++ b/Library/Operators/Bitwise/BitwiseNotOperator.php
@@ -9,10 +9,14 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Bitwise;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
@@ -23,9 +27,9 @@ class BitwiseNotOperator extends AbstractOperator
      * @param $expression
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     * @throws ReflectionException
+     * @throws Exception
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
diff --git a/tests/Zephir/CompilerFile/CheckDependenciesTest.php b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
index 14175745f0..cf88d15bda 100644
--- a/tests/Zephir/CompilerFile/CheckDependenciesTest.php
+++ b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
@@ -19,6 +19,7 @@
 use Zephir\AliasManager;
 use Zephir\Backend\Backend;
 use Zephir\Compiler;
+use Zephir\Compiler\CompilerFileFactory;
 use Zephir\CompilerFile;
 use Zephir\Config;
 use Zephir\FileSystem\HardDisk;
@@ -36,7 +37,7 @@ public function testExtendsClassThatDoesNotExist(): void
         $config = new Config();
         $backend = new Backend($config, 'kernel', 'templates');
         $disk = new HardDisk(realpath('..').'/tests/output');
-        $compilerFactory = new Compiler\CompilerFileFactory($config, $disk, $logger);
+        $compilerFactory = new CompilerFileFactory($config, $disk, $logger);
 
         $compiler = new Compiler($config, $backend, new Manager(new Parser()), $disk, $compilerFactory);
 

From e95cc32ad01310e967e95cb748bddb3335f90cca Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Sep 2023 21:28:57 +0100
Subject: [PATCH 044/375] #2407 - Update phpdoc

---
 Library/Operators/Other/FetchOperator.php  | 2 --
 Library/Operators/Other/LikelyOperator.php | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Operators/Other/FetchOperator.php b/Library/Operators/Other/FetchOperator.php
index b5076c3057..c3fa062454 100644
--- a/Library/Operators/Other/FetchOperator.php
+++ b/Library/Operators/Other/FetchOperator.php
@@ -21,8 +21,6 @@
 use Zephir\Operators\AbstractOperator;
 
 /**
- * FetchOperator.
- *
  * Fetch is a special operator that checks if an expression 'isset' and then obtain the value
  * without calculating the hash key twice
  */
diff --git a/Library/Operators/Other/LikelyOperator.php b/Library/Operators/Other/LikelyOperator.php
index 25412ecc13..e6cc5418d2 100644
--- a/Library/Operators/Other/LikelyOperator.php
+++ b/Library/Operators/Other/LikelyOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -26,12 +27,13 @@
 class LikelyOperator extends AbstractOperator
 {
     /**
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {

From a199684f37e3f24a5058a8616ee6f813c2e9cfa6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 5 Sep 2023 09:20:53 +0100
Subject: [PATCH 045/375] #2407 - Fix variable name

---
 Library/Backend/Backend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 68ed2cae0f..6d4b5169e3 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -63,7 +63,7 @@ public function getInternalKernelPath(): string
     public function getTemplateFileContents(string $filename): string
     {
         $templatePath = rtrim((string) $this->config->get('templatepath', 'backend'), '\\/');
-        if (empty($templatepath)) {
+        if (empty($templatePath)) {
             $templatePath = $this->templatesPath;
         }
 

From d443ac2b6ee8c485424a1d0fa5ecdd7e346d5944 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 5 Sep 2023 09:28:07 +0100
Subject: [PATCH 046/375] #2407 - Remove `invalidDefaultTypeException()` method
 with its usages

---
 Library/Backend/VariablesManager.php | 29 ----------------------------
 1 file changed, 29 deletions(-)

diff --git a/Library/Backend/VariablesManager.php b/Library/Backend/VariablesManager.php
index dd12119955..9294c3b5c2 100644
--- a/Library/Backend/VariablesManager.php
+++ b/Library/Backend/VariablesManager.php
@@ -110,9 +110,6 @@ private function initDynamicVar(Variable $variable, array $value, Context $conte
             case 'empty-array':
                 $context->backend->initArray($variable, $context);
                 break;
-
-            default:
-                throw $this->invalidDefaultTypeException($variable, $value);
         }
     }
 
@@ -140,9 +137,6 @@ private function initStringVar(Variable $variable, array $value, Context $contex
             case Types::T_NULL:
                 $context->backend->assignString($variable, null, $context);
                 break;
-
-            default:
-                throw $this->invalidDefaultTypeException($variable, $value);
         }
     }
 
@@ -170,32 +164,9 @@ private function initArrayVar(Variable $variable, array $value, Context $context
             case 'empty-array':
                 $context->backend->initArray($variable, $context);
                 break;
-
-            default:
-                throw $this->invalidDefaultTypeException($variable, $value);
         }
     }
 
-    /**
-     * Create a compiler exception with 'Invalid default type' message.
-     *
-     * @param Variable $variable
-     * @param array    $value
-     *
-     * @return Exception
-     */
-    private function invalidDefaultTypeException(Variable $variable, array $value): Exception
-    {
-        new Exception(
-            sprintf(
-                'Invalid default type: %s for data type: %s',
-                $value['type'],
-                $variable->getType()
-            ),
-            $variable->getOriginal()
-        );
-    }
-
     /**
      * Validate 'char' value type.
      *

From 4bd015835e0221c98cd2365446594981aa7aab8e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 6 Sep 2023 21:06:19 +0100
Subject: [PATCH 047/375] #2407 - Move `docker/` directory into `.docker/`

---
 {docker => .docker}/8.0/.bashrc    | 0
 {docker => .docker}/8.0/Dockerfile | 2 +-
 {docker => .docker}/8.1/.bashrc    | 0
 {docker => .docker}/8.1/Dockerfile | 2 +-
 {docker => .docker}/8.2/.bashrc    | 0
 {docker => .docker}/8.2/Dockerfile | 2 +-
 {docker => .docker}/8.3/.bashrc    | 0
 {docker => .docker}/8.3/Dockerfile | 2 +-
 docker-compose.yml                 | 8 ++++----
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename {docker => .docker}/8.0/.bashrc (100%)
 rename {docker => .docker}/8.0/Dockerfile (94%)
 rename {docker => .docker}/8.1/.bashrc (100%)
 rename {docker => .docker}/8.1/Dockerfile (94%)
 rename {docker => .docker}/8.2/.bashrc (100%)
 rename {docker => .docker}/8.2/Dockerfile (94%)
 rename {docker => .docker}/8.3/.bashrc (100%)
 rename {docker => .docker}/8.3/Dockerfile (94%)

diff --git a/docker/8.0/.bashrc b/.docker/8.0/.bashrc
similarity index 100%
rename from docker/8.0/.bashrc
rename to .docker/8.0/.bashrc
diff --git a/docker/8.0/Dockerfile b/.docker/8.0/Dockerfile
similarity index 94%
rename from docker/8.0/Dockerfile
rename to .docker/8.0/Dockerfile
index 847ea05e03..42cff4e91b 100644
--- a/docker/8.0/Dockerfile
+++ b/.docker/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.0-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
diff --git a/docker/8.1/.bashrc b/.docker/8.1/.bashrc
similarity index 100%
rename from docker/8.1/.bashrc
rename to .docker/8.1/.bashrc
diff --git a/docker/8.1/Dockerfile b/.docker/8.1/Dockerfile
similarity index 94%
rename from docker/8.1/Dockerfile
rename to .docker/8.1/Dockerfile
index 4e001b9f04..08ba38e352 100644
--- a/docker/8.1/Dockerfile
+++ b/.docker/8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.1-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
diff --git a/docker/8.2/.bashrc b/.docker/8.2/.bashrc
similarity index 100%
rename from docker/8.2/.bashrc
rename to .docker/8.2/.bashrc
diff --git a/docker/8.2/Dockerfile b/.docker/8.2/Dockerfile
similarity index 94%
rename from docker/8.2/Dockerfile
rename to .docker/8.2/Dockerfile
index 69174c95e8..eecd0a7ede 100644
--- a/docker/8.2/Dockerfile
+++ b/.docker/8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.2-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
diff --git a/docker/8.3/.bashrc b/.docker/8.3/.bashrc
similarity index 100%
rename from docker/8.3/.bashrc
rename to .docker/8.3/.bashrc
diff --git a/docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
similarity index 94%
rename from docker/8.3/Dockerfile
rename to .docker/8.3/Dockerfile
index 3bc4b87b45..1899dd3203 100644
--- a/docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:latest as composer
+FROM composer:latest AS composer
 FROM php:8.3.0beta3-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
diff --git a/docker-compose.yml b/docker-compose.yml
index 449c29c99b..ef4d26b18f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
   zephir-8.0:
     container_name: phalcon-zephir-8.0
     hostname: zephir-80
-    build: docker/8.0
+    build: .docker/8.0
     working_dir: /srv
     environment:
       - "USER=Zephir"
@@ -16,7 +16,7 @@ services:
   zephir-8.1:
     container_name: phalcon-zephir-8.1
     hostname: zephir-81
-    build: docker/8.1
+    build: .docker/8.1
     working_dir: /srv
     environment:
       - "USER=Zephir"
@@ -26,7 +26,7 @@ services:
   zephir-8.2:
     container_name: phalcon-zephir-8.2
     hostname: zephir-82
-    build: docker/8.2
+    build: .docker/8.2
     working_dir: /srv
     environment:
       - "USER=Zephir"
@@ -36,7 +36,7 @@ services:
   zephir-8.3:
     container_name: phalcon-zephir-8.3
     hostname: zephir-83
-    build: docker/8.3
+    build: .docker/8.3
     working_dir: /srv
     environment:
       - "USER=Zephir"

From 3b1fb8197b792b72ed23b376a91ccbb4f3696f01 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 6 Sep 2023 23:09:23 +0100
Subject: [PATCH 048/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 Library/Backend/Backend.php                   | 14 +++---
 Library/Backend/FcallManager.php              |  2 +
 Library/Backend/VariablesManager.php          |  2 +
 Library/Builder/FunctionCallBuilder.php       | 28 ++++--------
 .../Builder/Operators/CastOperatorBuilder.php | 16 +++----
 .../Statements/AbstractStatementBuilder.php   |  2 -
 .../Builder/Statements/IfStatementBuilder.php | 21 +++------
 .../Statements/LetStatementBuilder.php        | 18 +-------
 Library/Builder/StatementsBlockBuilder.php    |  8 +---
 Library/Cache/FunctionCache.php               | 10 +----
 Library/Cache/MethodCache.php                 |  8 +---
 Library/Classes/Entry.php                     | 14 +-----
 Library/CompilationContext.php                | 40 -----------------
 Library/CompiledExpression.php                |  5 ---
 Library/Compiler/CompilerFileFactory.php      |  7 ++-
 Library/Detectors/WriteDetector.php           |  6 +--
 Library/Documentation/NamespaceHelper.php     | 45 +++++--------------
 Library/Documentation/Template.php            | 29 ++++++------
 Library/HeadersManager.php                    | 10 ++---
 Library/Statements/ForStatement.php           |  9 ++--
 Library/StatementsBlock.php                   |  5 ---
 21 files changed, 74 insertions(+), 225 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 6d4b5169e3..74107bb5a5 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Backend;
 
 use Zephir\ClassDefinition;
@@ -33,13 +35,11 @@ class Backend
 {
     protected FcallManagerInterface $fcallManager;
 
-    /**
-     * @param Config $config
-     * @param string $kernelsPath
-     * @param string $templatesPath
-     */
-    public function __construct(protected Config $config, protected string $kernelsPath, protected string $templatesPath)
-    {
+    public function __construct(
+        protected Config $config,
+        protected string $kernelsPath,
+        protected string $templatesPath
+    ) {
         $this->fcallManager = new FcallManager();
     }
 
diff --git a/Library/Backend/FcallManager.php b/Library/Backend/FcallManager.php
index 0711366c08..6401de07cd 100644
--- a/Library/Backend/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Backend;
 
 use Zephir\CodePrinter;
diff --git a/Library/Backend/VariablesManager.php b/Library/Backend/VariablesManager.php
index 9294c3b5c2..9eaf4b6053 100644
--- a/Library/Backend/VariablesManager.php
+++ b/Library/Backend/VariablesManager.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Backend;
 
 use Zephir\CompilationContext as Context;
diff --git a/Library/Builder/FunctionCallBuilder.php b/Library/Builder/FunctionCallBuilder.php
index a06def7b3a..395c788610 100644
--- a/Library/Builder/FunctionCallBuilder.php
+++ b/Library/Builder/FunctionCallBuilder.php
@@ -18,18 +18,6 @@
  */
 class FunctionCallBuilder
 {
-    protected string $name;
-
-    protected array $parameters;
-
-    protected int $type;
-
-    protected ?string $file;
-
-    protected int $line = 0;
-
-    protected int $char = 0;
-
     /**
      * @param string      $name
      * @param array       $parameters
@@ -38,14 +26,14 @@ class FunctionCallBuilder
      * @param int         $line
      * @param int         $char
      */
-    public function __construct(string $name, array $parameters, int $type = 1, ?string $file = null, int $line = 0, int $char = 0)
-    {
-        $this->name = $name;
-        $this->parameters = $parameters;
-        $this->type = $type;
-        $this->file = $file;
-        $this->line = $line;
-        $this->char = $char;
+    public function __construct(
+        protected string $name,
+        protected array $parameters,
+        protected int $type = 1,
+        protected ?string $file = null,
+        protected int $line = 0,
+        protected int $char = 0,
+    ) {
     }
 
     /**
diff --git a/Library/Builder/Operators/CastOperatorBuilder.php b/Library/Builder/Operators/CastOperatorBuilder.php
index 714d089497..a67aa4a32b 100644
--- a/Library/Builder/Operators/CastOperatorBuilder.php
+++ b/Library/Builder/Operators/CastOperatorBuilder.php
@@ -24,15 +24,13 @@ class CastOperatorBuilder extends AbstractOperatorBuilder
 
     protected FunctionCallBuilder $rightOperand;
 
-    /**
-     * @param string              $left
-     * @param FunctionCallBuilder $right
-     * @param string|null         $file
-     * @param int                 $line
-     * @param int                 $char
-     */
-    public function __construct(string $left, FunctionCallBuilder $right, ?string $file = null, int $line = 0, int $char = 0)
-    {
+    public function __construct(
+        string $left,
+        FunctionCallBuilder $right,
+        ?string $file = null,
+        int $line = 0,
+        int $char = 0
+    ) {
         $this->leftOperand = $left;
         $this->rightOperand = $right;
         $this->file = $file;
diff --git a/Library/Builder/Statements/AbstractStatementBuilder.php b/Library/Builder/Statements/AbstractStatementBuilder.php
index a788fbc70e..9ec1a69a04 100644
--- a/Library/Builder/Statements/AbstractStatementBuilder.php
+++ b/Library/Builder/Statements/AbstractStatementBuilder.php
@@ -17,8 +17,6 @@ abstract class AbstractStatementBuilder
 {
     /**
      * Returns a builder definition.
-     *
-     * @return array
      */
     abstract public function get(): array;
 }
diff --git a/Library/Builder/Statements/IfStatementBuilder.php b/Library/Builder/Statements/IfStatementBuilder.php
index ae469a1291..44c36ea48f 100644
--- a/Library/Builder/Statements/IfStatementBuilder.php
+++ b/Library/Builder/Statements/IfStatementBuilder.php
@@ -21,22 +21,11 @@
  */
 class IfStatementBuilder extends AbstractStatementBuilder
 {
-    private AbstractOperatorBuilder $evalExpr;
-
-    private StatementsBlockBuilder $ifBlock;
-
-    private ?StatementsBlockBuilder $elseBlock;
-
-    /**
-     * @param AbstractOperatorBuilder     $evalExpr
-     * @param StatementsBlockBuilder      $ifBlock
-     * @param StatementsBlockBuilder|null $elseBlock
-     */
-    public function __construct(AbstractOperatorBuilder $evalExpr, StatementsBlockBuilder $ifBlock, StatementsBlockBuilder $elseBlock = null)
-    {
-        $this->evalExpr = $evalExpr;
-        $this->ifBlock = $ifBlock;
-        $this->elseBlock = $elseBlock;
+    public function __construct(
+        private AbstractOperatorBuilder $evalExpr,
+        private StatementsBlockBuilder $ifBlock,
+        private ?StatementsBlockBuilder $elseBlock = null
+    ) {
     }
 
     /**
diff --git a/Library/Builder/Statements/LetStatementBuilder.php b/Library/Builder/Statements/LetStatementBuilder.php
index faf656e47b..721ce2a292 100644
--- a/Library/Builder/Statements/LetStatementBuilder.php
+++ b/Library/Builder/Statements/LetStatementBuilder.php
@@ -18,24 +18,8 @@
  */
 class LetStatementBuilder extends AbstractStatementBuilder
 {
-    /**
-     * List of assignments
-     *
-     * @var array
-     */
-    private array $assignments;
-
-    /**
-     * Expression
-     *
-     * @var mixed
-     */
-    private $expr;
-
-    public function __construct(array $assignments, $expr)
+    public function __construct(private array $assignments, private mixed $expr)
     {
-        $this->assignments = $assignments;
-        $this->expr = $expr;
     }
 
     /**
diff --git a/Library/Builder/StatementsBlockBuilder.php b/Library/Builder/StatementsBlockBuilder.php
index b0a02bfb44..fac1c5233c 100644
--- a/Library/Builder/StatementsBlockBuilder.php
+++ b/Library/Builder/StatementsBlockBuilder.php
@@ -18,14 +18,8 @@
  */
 class StatementsBlockBuilder
 {
-    protected array $statements;
-
-    protected bool $raw;
-
-    public function __construct(array $statements, bool $raw = false)
+    public function __construct(protected array $statements, protected bool $raw = false)
     {
-        $this->statements = $statements;
-        $this->raw = $raw;
     }
 
     /**
diff --git a/Library/Cache/FunctionCache.php b/Library/Cache/FunctionCache.php
index e44fa9c884..d8528ce6e0 100644
--- a/Library/Cache/FunctionCache.php
+++ b/Library/Cache/FunctionCache.php
@@ -37,16 +37,8 @@ class FunctionCache
 {
     protected array $cache = [];
 
-    protected ?CallGathererPass $gatherer = null;
-
-    /**
-     * FunctionCache constructor.
-     *
-     * @param CallGathererPass|null $gatherer
-     */
-    public function __construct(CallGathererPass $gatherer = null)
+    public function __construct(protected ?CallGathererPass $gatherer = null)
     {
-        $this->gatherer = $gatherer;
     }
 
     /**
diff --git a/Library/Cache/MethodCache.php b/Library/Cache/MethodCache.php
index 5b731a1ec3..185a505b5e 100644
--- a/Library/Cache/MethodCache.php
+++ b/Library/Cache/MethodCache.php
@@ -41,14 +41,8 @@ class MethodCache
 {
     protected array $cache = [];
 
-    protected ?CallGathererPass $gatherer = null;
-
-    /**
-     * @param CallGathererPass|null $gatherer
-     */
-    public function __construct(CallGathererPass $gatherer = null)
+    public function __construct(protected ?CallGathererPass $gatherer = null)
     {
-        $this->gatherer = $gatherer;
     }
 
     /**
diff --git a/Library/Classes/Entry.php b/Library/Classes/Entry.php
index 47ded83a52..2bcd1151f0 100644
--- a/Library/Classes/Entry.php
+++ b/Library/Classes/Entry.php
@@ -34,11 +34,6 @@ class Entry
      */
     private string $classname;
 
-    /**
-     * @var CompilationContext
-     */
-    private CompilationContext $compilationContext;
-
     /**
      * @var bool
      */
@@ -51,15 +46,8 @@ class Entry
      */
     private array $classEntries;
 
-    /**
-     * Entry constructor.
-     *
-     * @param string             $className
-     * @param CompilationContext $compilationContext
-     */
-    public function __construct(string $className, CompilationContext $compilationContext)
+    public function __construct(string $className, private CompilationContext $compilationContext)
     {
-        $this->compilationContext = $compilationContext;
         $this->classname = $this->compilationContext->getFullName($className);
 
         $this->classEntries = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 9a5c3c64ae..78edd195f8 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -30,92 +30,66 @@ class CompilationContext
 
     /**
      * Current code printer.
-     *
-     * @var CodePrinter|null
      */
     public ?CodePrinter $codePrinter = null;
 
     /**
      * Whether the current method is static or not.
-     *
-     * @var bool
      */
     public bool $staticContext = false;
 
     /**
      * Code printer for the header.
-     *
-     * @var CodePrinter|null
      */
     public ?CodePrinter $headerPrinter = null;
 
     /**
      * Current symbol table.
-     *
-     * @var SymbolTable|null
      */
     public ?SymbolTable $symbolTable = null;
 
     /**
      * Type inference data.
-     *
-     * @var StaticTypeInference|null
      */
     public ?StaticTypeInference $typeInference = null;
 
     /**
      * Represents the class currently being compiled.
-     *
-     * @var ClassDefinition|null
      */
     public ?ClassDefinition $classDefinition = null;
 
     /**
      * Current method or function that being compiled.
-     *
-     * @var ClassMethod|null
      */
     public ?ClassMethod $currentMethod = null;
 
     /**
      * Represents the c-headers added to the file.
-     *
-     * @var HeadersManager|null
      */
     public ?HeadersManager $headersManager = null;
 
     /**
      * Represents interned strings and concatenations made in the project.
-     *
-     * @var StringsManager|null
      */
     public ?StringsManager $stringsManager = null;
 
     /**
      * Tells if the compilation is being made inside a cycle/loop.
-     *
-     * @var int
      */
     public int $insideCycle = 0;
 
     /**
      * Tells if the compilation is being made inside a try/catch block.
-     *
-     * @var int
      */
     public int $insideTryCatch = 0;
 
     /**
      * Tells if the compilation is being made inside a switch.
-     *
-     * @var int
      */
     public int $insideSwitch = 0;
 
     /**
      * Current cycle/loop block.
-     *
-     * @var array
      */
     public array $cycleBlocks = [];
 
@@ -127,15 +101,11 @@ class CompilationContext
 
     /**
      * Global consecutive for try/catch blocks.
-     *
-     * @var int
      */
     public int $currentTryCatch = 0;
 
     /**
      * Helps to create graphs of conditional/jump branches in a specific method.
-     *
-     * @var BranchManager|null
      */
     public ?BranchManager $branchManager = null;
 
@@ -146,36 +116,26 @@ class CompilationContext
 
     /**
      * Manages class renaming using keyword 'use'.
-     *
-     * @var AliasManager|null
      */
     public ?AliasManager $aliasManager = null;
 
     /**
      * Function Cache.
-     *
-     * @var FunctionCache|null
      */
     public ?FunctionCache $functionCache = null;
 
     /**
      * Global config.
-     *
-     * @var Config|null
      */
     public ?Config $config = null;
 
     /**
      * Global logger.
-     *
-     * @var LoggerInterface|null
      */
     public ?LoggerInterface $logger = null;
 
     /**
      * The current backend.
-     *
-     * @var Backend|null
      */
     public ?Backend $backend = null;
 
diff --git a/Library/CompiledExpression.php b/Library/CompiledExpression.php
index ebe2d11366..dadc5db02c 100644
--- a/Library/CompiledExpression.php
+++ b/Library/CompiledExpression.php
@@ -21,11 +21,6 @@
  */
 class CompiledExpression implements TypeAwareInterface
 {
-    /**
-     * @param string      $type
-     * @param mixed $code
-     * @param array|null  $originalExpr
-     */
     public function __construct(protected string $type, protected mixed $code, protected ?array $originalExpr = null)
     {
     }
diff --git a/Library/Compiler/CompilerFileFactory.php b/Library/Compiler/CompilerFileFactory.php
index 43ba265102..6d24349fa0 100644
--- a/Library/Compiler/CompilerFileFactory.php
+++ b/Library/Compiler/CompilerFileFactory.php
@@ -21,8 +21,11 @@
 
 final class CompilerFileFactory
 {
-    public function __construct(private Config $config, private FileSystemInterface $filesystem, private LoggerInterface $logger)
-    {
+    public function __construct(
+        private Config $config,
+        private FileSystemInterface $filesystem,
+        private LoggerInterface $logger,
+    ) {
     }
 
     /**
diff --git a/Library/Detectors/WriteDetector.php b/Library/Detectors/WriteDetector.php
index be4400643a..f2de68ba01 100644
--- a/Library/Detectors/WriteDetector.php
+++ b/Library/Detectors/WriteDetector.php
@@ -88,11 +88,7 @@ public function increaseMutations(string $variable): self
      */
     public function getNumberOfMutations(string $variable): int
     {
-        if (isset($this->mutations[$variable])) {
-            return $this->mutations[$variable];
-        }
-
-        return 0;
+        return $this->mutations[$variable] ?? 0;
     }
 
     /**
diff --git a/Library/Documentation/NamespaceHelper.php b/Library/Documentation/NamespaceHelper.php
index 37544591bd..30b75d1718 100644
--- a/Library/Documentation/NamespaceHelper.php
+++ b/Library/Documentation/NamespaceHelper.php
@@ -15,18 +15,14 @@
 
 class NamespaceHelper
 {
-    protected $fullNamespace;
+    protected string $endNamespace;
+    protected string $parentName;
 
-    protected $endNamespace;
-    protected $parentName;
+    protected array $classes = [];
+    protected array $namespaces = [];
 
-    protected $classes = [];
-    protected $namespaces = [];
-
-    public function __construct($fullNamespace)
+    public function __construct(protected string $fullNamespace)
     {
-        $this->fullNamespace = $fullNamespace;
-
         $ex = explode('\\', $fullNamespace);
         $this->endNamespace = $ex[\count($ex) - 1];
 
@@ -35,51 +31,32 @@ public function __construct($fullNamespace)
         $this->parentName = implode('\\', $ex);
     }
 
-    public function addClass(CompilerFile $c)
+    public function addClass(CompilerFile $c): void
     {
         $this->classes[] = $c;
     }
 
-    public function addNamespace(self $n)
-    {
-        if (!isset($this->namespaces[$n->getFullNamespace()])) {
-            $this->namespaces[$n->getFullNamespace()] = $n;
-        }
-    }
-
-    public function getFullNamespace()
+    public function getFullNamespace(): string
     {
         return $this->fullNamespace;
     }
 
-    /**
-     * @return string
-     */
-    public function getShortName()
+    public function getShortName(): string
     {
         return $this->endNamespace;
     }
 
-    /**
-     * @return string
-     */
-    public function getParentName()
+    public function getParentName(): string
     {
         return $this->parentName;
     }
 
-    /**
-     * @return CompilerFile[]
-     */
-    public function getClasses()
+    public function getClasses(): array
     {
         return $this->classes;
     }
 
-    /**
-     * @return NamespaceHelper[]
-     */
-    public function getNamespaces()
+    public function getNamespaces(): array
     {
         return $this->namespaces;
     }
diff --git a/Library/Documentation/Template.php b/Library/Documentation/Template.php
index f20e7679de..fb8ca61fe0 100644
--- a/Library/Documentation/Template.php
+++ b/Library/Documentation/Template.php
@@ -19,10 +19,7 @@
 
 class Template
 {
-    protected $template;
-    protected $data;
-    protected $nestedLevel;
-    protected $pathToRoot = './';
+    protected string $pathToRoot = './';
     protected $themeOptions;
     /**
      * @var Config
@@ -39,16 +36,16 @@ class Template
      *
      * @throws Exception
      */
-    public function __construct(protected Theme $theme, array $data, string $template, int $nestedLevel = 0)
-    {
+    public function __construct(
+        protected Theme $theme,
+        protected array $data,
+        protected string $template,
+        protected int $nestedLevel = 0,
+    ) {
         // todo clean buffer before exception
         if ($nestedLevel > 800) {
             throw new Exception('Recursive inclusion detected in theme creation');
         }
-
-        $this->data = $data;
-        $this->template = $template;
-        $this->nestedLevel = $nestedLevel;
     }
 
     private function getTemplatePath($fileName)
@@ -71,7 +68,7 @@ private function getTemplatePath($fileName)
      *
      * @param array $projectConfig
      */
-    public function setProjectConfig($projectConfig)
+    public function setProjectConfig($projectConfig): void
     {
         $this->projectConfig = $projectConfig;
     }
@@ -81,7 +78,7 @@ public function setProjectConfig($projectConfig)
      *
      * @param array $themeOptions
      */
-    public function setThemeOptions($themeOptions)
+    public function setThemeOptions($themeOptions): void
     {
         $this->themeOptions = $themeOptions;
     }
@@ -91,7 +88,7 @@ public function setThemeOptions($themeOptions)
      *
      * @param string $pathToRoot
      */
-    public function setPathToRoot($pathToRoot)
+    public function setPathToRoot(string $pathToRoot): void
     {
         $this->pathToRoot = $pathToRoot;
     }
@@ -103,7 +100,7 @@ public function setPathToRoot($pathToRoot)
      *
      * @return string the relative path to the url
      */
-    public function url($url)
+    public function url(string $url): string
     {
         if (\is_string($url)) {
             if ('/' == $url[0]) {
@@ -123,12 +120,12 @@ public function url($url)
     /**
      * @return string
      */
-    public function getPathToRoot()
+    public function getPathToRoot(): string
     {
         return $this->pathToRoot;
     }
 
-    public function write($outputFile)
+    public function write($outputFile): void
     {
         $content = $this->parse();
         file_put_contents($outputFile, $content);
diff --git a/Library/HeadersManager.php b/Library/HeadersManager.php
index c6a7ad9a1d..d83645ffbe 100644
--- a/Library/HeadersManager.php
+++ b/Library/HeadersManager.php
@@ -31,21 +31,21 @@ class HeadersManager
      *
      * @var array
      */
-    protected $headers = [];
+    protected array $headers = [];
 
     /**
      * List of headers.
      *
      * @var array
      */
-    protected $headersFirst = [];
+    protected array $headersFirst = [];
 
     /**
      * List of headers.
      *
      * @var array
      */
-    protected $headersLast = [];
+    protected array $headersLast = [];
 
     /**
      * Adds a header path to the manager.
@@ -79,10 +79,8 @@ public function add($path, $position = 0)
 
     /**
      * Returns a set of headers merged.
-     *
-     * @return array
      */
-    public function get()
+    public function get(): array
     {
         return array_merge($this->headersFirst, $this->headers, $this->headersLast);
     }
diff --git a/Library/Statements/ForStatement.php b/Library/Statements/ForStatement.php
index a002d6a624..b85dec19aa 100644
--- a/Library/Statements/ForStatement.php
+++ b/Library/Statements/ForStatement.php
@@ -647,13 +647,12 @@ public function compileStringTraverse($expression, CompilationContext $compilati
      * - A key must be a zval
      * - A value must be a zval
      *
-     * @param array              $expression
      * @param CompilationContext $compilationContext
      * @param Variable           $exprVariable
      */
-    public function compileHashTraverse($expression, CompilationContext $compilationContext, Variable $exprVariable)
+    public function compileHashTraverse(CompilationContext $compilationContext, Variable $exprVariable): void
     {
-        /*
+        /**
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
@@ -671,7 +670,7 @@ public function compileHashTraverse($expression, CompilationContext $compilation
             $keyVariable->setDynamicTypes('undefined');
         }
 
-        /*
+        /**
          * Initialize 'value' variable
          */
         if (isset($this->statement['value'])) {
@@ -793,7 +792,7 @@ public function compile(CompilationContext $compilationContext): void
         switch ($exprVariable->getType()) {
             case 'variable':
             case 'array':
-                $this->compileHashTraverse($expression, $compilationContext, $exprVariable);
+                $this->compileHashTraverse($compilationContext, $exprVariable);
                 break;
 
             case 'string':
diff --git a/Library/StatementsBlock.php b/Library/StatementsBlock.php
index 9722a40601..c29c9e112a 100644
--- a/Library/StatementsBlock.php
+++ b/Library/StatementsBlock.php
@@ -62,11 +62,6 @@ public function __construct(protected $statements)
             $debug = getenv('ZEPHIR_DEBUG');
         }
 
-        // TODO: Add container support
-        // elseif ($this->container->has('ZEPHIR_DEBUG')) {
-        //     $debug = $this->container->get('ZEPHIR_DEBUG');
-        // }
-
         $this->debug = filter_var($debug, FILTER_VALIDATE_BOOLEAN);
     }
 

From d61394a10ac8e8d1fd3c9e1879d760ec1cbbb4db Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 11:20:59 +0100
Subject: [PATCH 049/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 Library/ClassMethod.php | 345 +++++-----------------------------------
 1 file changed, 43 insertions(+), 302 deletions(-)

diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 228f1bc38e..92d3bea737 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -13,6 +13,7 @@
 
 namespace Zephir;
 
+use ReflectionException;
 use Zephir\Classes\Entry as ClassEntry;
 use Zephir\Detectors\WriteDetector;
 use Zephir\Documentation\Docblock;
@@ -22,9 +23,11 @@
 use Zephir\Passes\LocalContextPass;
 use Zephir\Passes\StaticTypeInference;
 
+use function array_key_exists;
 use function count;
 use function in_array;
 use function is_array;
+use function is_object;
 
 /**
  * Represents a class method
@@ -33,52 +36,15 @@ class ClassMethod
 {
     public bool $optimizable = true;
 
-    /**
-     * @var ClassDefinition|null
-     */
-    protected ?ClassDefinition $classDefinition = null;
-
-    /**
-     * @var array
-     */
-    protected array $visibility = [];
-
-    /**
-     * @var string
-     */
-    protected string $name;
-
-    /**
-     * @var ClassMethodParameters|null
-     */
-    protected ?ClassMethodParameters $parameters = null;
-
-    /**
-     * @var StatementsBlock|null
-     */
-    protected ?StatementsBlock $statements = null;
-
-    /**
-     * @var string|null
-     */
-    protected ?string $docblock = null;
-
-    /**
-     * @var Docblock|null
-     */
     protected ?Docblock $parsedDocblock = null;
 
     /**
      * Types returned by the method.
-     *
-     * @var array
      */
     protected array $returnTypes = [];
 
     /**
      * Zend MAY_BE_* types.
-     *
-     * @var array|string[]
      */
     protected array $mayBeArgTypes = [
         'int' => 'MAY_BE_LONG',
@@ -87,8 +53,6 @@ class ClassMethod
 
     /**
      * Raw-types returned by the method.
-     *
-     * @var array|null
      */
     protected ?array $returnTypesRaw = null;
 
@@ -99,8 +63,6 @@ class ClassMethod
 
     /**
      * Whether the variable is void.
-     *
-     * @var bool
      */
     protected bool $void = false;
 
@@ -108,126 +70,68 @@ class ClassMethod
      * Whether the variable is mixed.
      *
      * Only for PHP >= 8.0
-     *
-     * @var bool
      */
     protected bool $mixed = false;
 
     /**
      * Whether the method is public or not.
-     *
-     * @var bool
      */
     protected bool $isPublic = true;
 
     /**
      * Whether the method is static or not.
-     *
-     * @var bool
      */
     protected bool $isStatic = false;
 
     /**
      * Whether the method is final or not.
-     *
-     * @var bool
      */
     protected bool $isFinal = false;
 
     /**
      * Whether the method is abstract or not.
-     *
-     * @var bool
      */
     protected bool $isAbstract = false;
 
     /**
      * Whether the method is internal or not.
-     *
-     * @var bool
      */
     protected bool $isInternal = false;
 
     /**
      * Whether the method is bundled with PHP or not.
-     *
-     * @var bool
      */
     protected bool $isBundled = false;
 
     /**
      * Whether the method is an initializer or not.
-     *
-     * @var bool
      */
     protected bool $isInitializer = false;
 
-    /**
-     * @var array|null
-     */
-    protected ?array $expression = null;
-
-    /**
-     * @var array|null
-     */
-    protected ?array $staticVariables = null;
-
-    /**
-     * LocalContextPass.
-     *
-     * @var LocalContextPass|null
-     */
     protected ?LocalContextPass $localContext = null;
 
     /**
      * Static Type Inference Pass.
-     *
-     * @var StaticTypeInference|null
      */
     protected ?StaticTypeInference $typeInference = null;
 
     /**
      * Call Gatherer Pass.
-     *
-     * @var CallGathererPass|null
      */
     protected ?CallGathererPass $callGathererPass = null;
 
-    /**
-     * ClassMethod constructor.
-     *
-     * @param ClassDefinition            $classDefinition
-     * @param array                      $visibility
-     * @param string                     $name
-     * @param ClassMethodParameters|null $parameters
-     * @param StatementsBlock|null       $statements
-     * @param string|null                $docblock
-     * @param array|null                 $returnType
-     * @param array|null                 $expression
-     * @param array|null                 $staticVariables
-     */
     public function __construct(
-        ClassDefinition $classDefinition,
-        array $visibility,
-        string $name,
-        ?ClassMethodParameters $parameters = null,
-        ?StatementsBlock $statements = null,
-        ?string $docblock = null,
+        protected ClassDefinition $classDefinition,
+        protected array $visibility,
+        protected string $name,
+        protected ?ClassMethodParameters $parameters = null,
+        protected ?StatementsBlock $statements = null,
+        protected ?string $docblock = null,
         ?array $returnType = null,
-        ?array $expression = null,
-        ?array $staticVariables = null
+        protected ?array $expression = null,
+        protected array $staticVariables = []
     ) {
         $this->checkVisibility($visibility, $name, $expression);
-
-        $this->classDefinition = $classDefinition;
-        $this->visibility = $visibility;
-        $this->name = $name;
-        $this->parameters = $parameters;
-        $this->statements = $statements;
-        $this->docblock = $docblock;
-        $this->expression = $expression;
-        $this->staticVariables = $staticVariables;
-
         $this->setReturnTypes($returnType);
     }
 
@@ -348,8 +252,6 @@ public function hasReturnTypesRaw(): bool
 
     /**
      * Getter for statements block.
-     *
-     * @return StatementsBlock $statements Statements block
      */
     public function getStatementsBlock(): StatementsBlock
     {
@@ -358,8 +260,6 @@ public function getStatementsBlock(): StatementsBlock
 
     /**
      * Setter for statements block.
-     *
-     * @param StatementsBlock $statementsBlock
      */
     public function setStatementsBlock(StatementsBlock $statementsBlock): void
     {
@@ -368,8 +268,6 @@ public function setStatementsBlock(StatementsBlock $statementsBlock): void
 
     /**
      * Checks whether the method is empty.
-     *
-     * @return bool
      */
     public function isEmpty(): bool
     {
@@ -379,10 +277,6 @@ public function isEmpty(): bool
     /**
      * Checks for visibility congruence.
      *
-     * @param array  $visibility
-     * @param string $name
-     * @param array  $original
-     *
      * @throws CompilerException
      */
     public function checkVisibility(array $visibility, string $name, array $original = null): void
@@ -432,8 +326,6 @@ public function checkVisibility(array $visibility, string $name, array $original
 
     /**
      * Sets if the method is internal or not.
-     *
-     * @param bool $static
      */
     public function setIsStatic(bool $static): void
     {
@@ -442,8 +334,6 @@ public function setIsStatic(bool $static): void
 
     /**
      * Sets if the method is bundled or not.
-     *
-     * @param bool $bundled
      */
     public function setIsBundled(bool $bundled): void
     {
@@ -452,8 +342,6 @@ public function setIsBundled(bool $bundled): void
 
     /**
      * Sets if the method is an initializer or not.
-     *
-     * @param bool $initializer
      */
     public function setIsInitializer(bool $initializer): void
     {
@@ -462,8 +350,6 @@ public function setIsInitializer(bool $initializer): void
 
     /**
      * Returns the class definition where the method was declared.
-     *
-     * @return ClassDefinition|null
      */
     public function getClassDefinition(): ?ClassDefinition
     {
@@ -473,10 +359,6 @@ public function getClassDefinition(): ?ClassDefinition
     /**
      * Generate internal method's based on the equivalent PHP methods,
      * allowing bypassing php userspace for internal method calls.
-     *
-     * @param CompilationContext $compilationContext
-     *
-     * @return $this
      */
     public function setupOptimized(CompilationContext $compilationContext): self
     {
@@ -543,8 +425,6 @@ public function getOptimizedMethod(): self
 
     /**
      * Sets the method name.
-     *
-     * @param string $name
      */
     public function setName(string $name): void
     {
@@ -553,8 +433,6 @@ public function setName(string $name): void
 
     /**
      * Returns the method name.
-     *
-     * @return string
      */
     public function getName(): string
     {
@@ -571,8 +449,6 @@ public function getDocBlock(): ?string
 
     /**
      * Returns the parsed docblock.
-     *
-     * @return Docblock|null
      */
     public function getParsedDocBlock(): ?Docblock
     {
@@ -592,8 +468,6 @@ public function getParsedDocBlock(): ?Docblock
 
     /**
      * the starting line of the method in the source file.
-     *
-     * @return mixed
      */
     public function getLine(): mixed
     {
@@ -602,8 +476,6 @@ public function getLine(): mixed
 
     /**
      * Returns the parameters.
-     *
-     * @return ClassMethodParameters|null
      */
     public function getParameters(): ?ClassMethodParameters
     {
@@ -612,8 +484,6 @@ public function getParameters(): ?ClassMethodParameters
 
     /**
      * Checks if the method has return-type or cast hints.
-     *
-     * @return bool
      */
     public function hasReturnTypes(): bool
     {
@@ -622,8 +492,6 @@ public function hasReturnTypes(): bool
 
     /**
      * Checks whether at least one return type hint is null compatible.
-     *
-     * @return bool
      */
     public function areReturnTypesNullCompatible(): bool
     {
@@ -632,8 +500,6 @@ public function areReturnTypesNullCompatible(): bool
 
     /**
      * Checks whether at least one return type hint is integer compatible.
-     *
-     * @return bool
      */
     public function areReturnTypesIntCompatible(): bool
     {
@@ -650,8 +516,6 @@ public function areReturnTypesIntCompatible(): bool
 
     /**
      * Checks whether at least one return type hint is double compatible.
-     *
-     * @return bool
      */
     public function areReturnTypesDoubleCompatible(): bool
     {
@@ -660,8 +524,6 @@ public function areReturnTypesDoubleCompatible(): bool
 
     /**
      * Checks whether at least one return type hint is bool compatible.
-     *
-     * @return bool
      */
     public function areReturnTypesBoolCompatible(): bool
     {
@@ -670,8 +532,6 @@ public function areReturnTypesBoolCompatible(): bool
 
     /**
      * Checks whether at least one return type hint is false compatible.
-     *
-     * @return bool
      */
     public function areReturnTypesFalseCompatible(): bool
     {
@@ -680,8 +540,6 @@ public function areReturnTypesFalseCompatible(): bool
 
     /**
      * Checks whether at least one return type hint is string compatible.
-     *
-     * @return bool
      */
     public function areReturnTypesStringCompatible(): bool
     {
@@ -695,8 +553,6 @@ public function areReturnTypesObjectCompatible(): bool
 
     /**
      * Returned type hints by the method.
-     *
-     * @return array
      */
     public function getReturnTypes(): array
     {
@@ -705,8 +561,6 @@ public function getReturnTypes(): array
 
     /**
      * Returned class-type hints by the method.
-     *
-     * @return array
      */
     public function getReturnClassTypes(): array
     {
@@ -715,8 +569,6 @@ public function getReturnClassTypes(): array
 
     /**
      * Returns the number of parameters the method has.
-     *
-     * @return bool
      */
     public function hasParameters(): bool
     {
@@ -725,8 +577,6 @@ public function hasParameters(): bool
 
     /**
      * Returns the number of parameters the method has.
-     *
-     * @return int
      */
     public function getNumberOfParameters(): int
     {
@@ -739,8 +589,6 @@ public function getNumberOfParameters(): int
 
     /**
      * Returns the number of required parameters the method has.
-     *
-     * @return int
      */
     public function getNumberOfRequiredParameters(): int
     {
@@ -760,10 +608,6 @@ public function getNumberOfRequiredParameters(): int
 
     /**
      * Checks whether the method has a specific modifier.
-     *
-     * @param string $modifier
-     *
-     * @return bool
      */
     public function hasModifier(string $modifier): bool
     {
@@ -772,8 +616,6 @@ public function hasModifier(string $modifier): bool
 
     /**
      * Returns method visibility modifiers.
-     *
-     * @return array
      */
     public function getVisibility(): array
     {
@@ -789,8 +631,6 @@ public function isDeprecated(): bool
      * Returns the C-modifier flags.
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getModifiers(): string
     {
@@ -846,8 +686,6 @@ public function getModifiers(): string
 
     /**
      * Checks if the method must not return any value.
-     *
-     * @return bool
      */
     public function isVoid(): bool
     {
@@ -856,8 +694,6 @@ public function isVoid(): bool
 
     /**
      * Checks if the methods return type is `mixed`.
-     *
-     * @return bool
      */
     public function isMixed(): bool
     {
@@ -866,8 +702,6 @@ public function isMixed(): bool
 
     /**
      * Checks if the method is private.
-     *
-     * @return bool
      */
     public function isPrivate(): bool
     {
@@ -876,8 +710,6 @@ public function isPrivate(): bool
 
     /**
      * Checks if the method is protected.
-     *
-     * @return bool
      */
     public function isProtected(): bool
     {
@@ -886,8 +718,6 @@ public function isProtected(): bool
 
     /**
      * Checks if the method is public.
-     *
-     * @return bool
      */
     public function isPublic(): bool
     {
@@ -896,8 +726,6 @@ public function isPublic(): bool
 
     /**
      * Checks is abstract method?
-     *
-     * @return bool
      */
     public function isAbstract(): bool
     {
@@ -906,8 +734,6 @@ public function isAbstract(): bool
 
     /**
      * Checks whether the method is static.
-     *
-     * @return bool
      */
     public function isStatic(): bool
     {
@@ -916,8 +742,6 @@ public function isStatic(): bool
 
     /**
      * Checks whether the method is final.
-     *
-     * @return bool
      */
     public function isFinal(): bool
     {
@@ -926,8 +750,6 @@ public function isFinal(): bool
 
     /**
      * Checks whether the method is internal.
-     *
-     * @return bool
      */
     public function isInternal(): bool
     {
@@ -936,8 +758,6 @@ public function isInternal(): bool
 
     /**
      * Checks whether the method is bundled.
-     *
-     * @return bool
      */
     public function isBundled(): bool
     {
@@ -946,8 +766,6 @@ public function isBundled(): bool
 
     /**
      * Checks whether the method is an initializer.
-     *
-     * @return bool
      */
     public function isInitializer(): bool
     {
@@ -956,8 +774,6 @@ public function isInitializer(): bool
 
     /**
      * Check whether the current method is a constructor.
-     *
-     * @return bool
      */
     public function isConstructor(): bool
     {
@@ -966,17 +782,12 @@ public function isConstructor(): bool
 
     /**
      * Checks if method is a shortcut.
-     *
-     * @return bool
      */
     public function isShortcut(): bool
     {
         return $this->expression && 'shortcut' === $this->expression['type'];
     }
 
-    /**
-     * @return array|string[]
-     */
     public function getMayBeArgTypes(): array
     {
         return $this->mayBeArgTypes;
@@ -984,18 +795,14 @@ public function getMayBeArgTypes(): array
 
     /**
      * Return shortcut method name.
-     *
-     * @return mixed
      */
-    public function getShortcutName()
+    public function getShortcutName(): mixed
     {
         return $this->expression['name'];
     }
 
     /**
      * Returns the call gatherer pass information.
-     *
-     * @return CallGathererPass
      */
     public function getCallGathererPass(): CallGathererPass
     {
@@ -1004,11 +811,6 @@ public function getCallGathererPass(): CallGathererPass
 
     /**
      * Replace macros.
-     *
-     * @param SymbolTable $symbolTable
-     * @param string      $containerCode
-     *
-     * @return string
      */
     public function removeMemoryStackReferences(SymbolTable $symbolTable, string $containerCode): string
     {
@@ -1036,20 +838,15 @@ public function removeMemoryStackReferences(SymbolTable $symbolTable, string $co
         $containerCode = str_replace('RETURN_MM_EMPTY_ARRAY', 'RETURN_EMPTY_ARRAY', $containerCode);
         $containerCode = str_replace('RETURN_MM_MEMBER', 'RETURN_MEMBER', $containerCode);
         $containerCode = str_replace('RETURN_MM()', 'return', $containerCode);
-        $containerCode = preg_replace('/[ \t]+ZEPHIR_MM_RESTORE\(\);'.PHP_EOL.'/s', '', $containerCode);
 
-        return $containerCode;
+        return preg_replace('/[ \t]+ZEPHIR_MM_RESTORE\(\);'.PHP_EOL.'/s', '', $containerCode);
     }
 
     /**
      * Assigns a default value.
      *
-     * @param array              $parameter
-     * @param CompilationContext $compilationContext
-     *
-     * @return string
-     *
      * @throws Exception
+     * @throws ReflectionException
      */
     public function assignDefaultValue(array $parameter, CompilationContext $compilationContext): string
     {
@@ -1268,7 +1065,7 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                     case 'empty-array':
                     case 'array':
                         $compilationContext->backend->initVar($paramVariable, $compilationContext);
-                        $compilationContext->backend->initArray($paramVariable, $compilationContext, null);
+                        $compilationContext->backend->initArray($paramVariable, $compilationContext);
                         break;
 
                     default:
@@ -1358,7 +1155,7 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                         $compilationContext->symbolTable->mustGrownStack(true);
                         $compilationContext->headersManager->add('kernel/memory');
                         $compilationContext->backend->initVar($symbolVariable, $compilationContext);
-                        $compilationContext->backend->initArray($symbolVariable, $compilationContext, null);
+                        $compilationContext->backend->initArray($symbolVariable, $compilationContext);
                         break;
 
                     default:
@@ -1380,12 +1177,7 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
      *
      * TODO: rewrite this to build ifs and throw from builders
      *
-     * @param array              $parameter
-     * @param CompilationContext $compilationContext
-     *
      * @throws CompilerException
-     *
-     * @return string
      */
     public function checkStrictType(array $parameter, CompilationContext $compilationContext): string
     {
@@ -1408,12 +1200,7 @@ public function checkStrictType(array $parameter, CompilationContext $compilatio
     /**
      * Assigns a zval value to a static low-level type.
      *
-     * @param array              $parameter
-     * @param CompilationContext $compilationContext
-     *
      * @throws CompilerException
-     *
-     * @return string
      */
     public function assignZvalValue(array $parameter, CompilationContext $compilationContext): string
     {
@@ -1463,8 +1250,6 @@ public function assignZvalValue(array $parameter, CompilationContext $compilatio
     /**
      * Pre-compiles the method making compilation pass data (static inference, local-context-pass) available to other methods.
      *
-     * @param CompilationContext $compilationContext
-     *
      * @throws CompilerException
      */
     public function preCompile(CompilationContext $compilationContext): void
@@ -1473,7 +1258,7 @@ public function preCompile(CompilationContext $compilationContext): void
         $typeInference = null;
         $callGathererPass = null;
 
-        if (\is_object($this->statements)) {
+        if (is_object($this->statements)) {
             $compilationContext->currentMethod = $this;
 
             /**
@@ -1516,9 +1301,8 @@ public function preCompile(CompilationContext $compilationContext): void
     /**
      * Compiles the method.
      *
-     * @param CompilationContext $compilationContext
-     *
      * @throws Exception
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -1555,16 +1339,14 @@ public function compile(CompilationContext $compilationContext): void
             $symbolTable->setLocalContext($this->localContext);
         }
 
-        if ($this->staticVariables !== null) {
-            foreach ($this->staticVariables as $var) {
-                $localVar = clone $var;
-                $localVar->setIsExternal(true);
-                $localVar->setLocalOnly(true);
-                $localVar->setDynamicTypes($localVar->getType());
-                $localVar->setType('variable');
-                $localVar->setIsDoublePointer(false);
-                $symbolTable->addRawVariable($localVar);
-            }
+        foreach ($this->staticVariables as $var) {
+            $localVar = clone $var;
+            $localVar->setIsExternal(true);
+            $localVar->setLocalOnly(true);
+            $localVar->setDynamicTypes($localVar->getType());
+            $localVar->setType('variable');
+            $localVar->setIsDoublePointer(false);
+            $symbolTable->addRawVariable($localVar);
         }
 
         /**
@@ -1610,7 +1392,6 @@ public function compile(CompilationContext $compilationContext): void
             /**
              * Round 1. Create variables in parameters in the symbol table.
              */
-            $classCastChecks = [];
             $substituteVars = [];
             foreach ($this->parameters->getParameters() as $parameter) {
                 $symbolParam = null;
@@ -1656,12 +1437,12 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 if (!empty($parameter['const'])) {
                     $symbol->setReadOnly(true);
-                    if (\is_object($symbolParam)) {
+                    if (is_object($symbolParam)) {
                         $symbolParam->setReadOnly(true);
                     }
                 }
 
-                if (\is_object($symbolParam)) {
+                if (is_object($symbolParam)) {
                     /**
                      * Parameters are marked as 'external'
                      */
@@ -1731,7 +1512,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Compile the block of statements if any
          */
-        if (\is_object($this->statements)) {
+        if (is_object($this->statements)) {
             $compilationContext->staticContext = $this->hasModifier('static');
 
             /**
@@ -1770,7 +1551,7 @@ public function compile(CompilationContext $compilationContext): void
              * variable is modified so as do the proper separation.
              */
             $parametersToSeparate = [];
-            if (\is_object($this->statements)) {
+            if (is_object($this->statements)) {
                 if (!$this->localContext instanceof LocalContextPass) {
                     $writeDetector = new WriteDetector();
                 }
@@ -1838,19 +1619,10 @@ public function compile(CompilationContext $compilationContext): void
                 $mandatory = $parameter['mandatory'] ?? 0;
                 $dataType = $this->getParamDataType($parameter);
 
-                switch ($dataType) {
-                    case 'object':
-                    case 'callable':
-                    case 'resource':
-                    case 'variable':
-                    case 'mixed':
-                        $name = $parameter['name'];
-                        break;
-
-                    default:
-                        $name = $parameter['name'].'_param';
-                        break;
-                }
+                $name = match ($dataType) {
+                    'object', 'callable', 'resource', 'variable', 'mixed' => $parameter['name'],
+                    default => $parameter['name'] . '_param',
+                };
 
                 /**
                  * Assign the default value according to the variable's type.
@@ -1871,7 +1643,7 @@ public function compile(CompilationContext $compilationContext): void
                         $initCode .= "\t\t".'ZEPHIR_SEPARATE_PARAM('.$name.');'.PHP_EOL;
                     } else {
                         if ($mandatory) {
-                            $initCode .= $this->checkStrictType($parameter, $compilationContext, $mandatory);
+                            $initCode .= $this->checkStrictType($parameter, $compilationContext);
                         } else {
                             $initCode .= "\t".$this->assignZvalValue($parameter, $compilationContext);
                         }
@@ -1954,16 +1726,11 @@ public function compile(CompilationContext $compilationContext): void
          * Check if there are unused variables.
          */
         $usedVariables = [];
-        $classDefinition = $this->getClassDefinition();
-        if ($classDefinition) {
-            $completeName = $classDefinition->getCompleteName();
-        } else {
-            $completeName = '[unknown]';
-        }
+        $completeName = $this->getClassDefinition()?->getCompleteName() ?: '[unknown]';
 
         foreach ($symbolTable->getVariables() as $variable) {
             if ($variable->getNumberUses() <= 0) {
-                if (false == $variable->isExternal()) {
+                if (!$variable->isExternal()) {
                     $compilationContext->logger->warning(
                         'Variable "'.$variable->getName().'" declared but not used in '.$completeName.'::'.$this->getName(),
                         ['unused-variable', $variable->getOriginal()]
@@ -2072,7 +1839,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Finalize the method compilation
          */
-        if (\is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
+        if (is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
             /**
              * If the last statement is not a 'return' or 'throw' we need to
              * restore the memory stack if needed.
@@ -2119,10 +1886,6 @@ public function compile(CompilationContext $compilationContext): void
 
     /**
      * Simple method to check if one of the paths are returning the right expected type.
-     *
-     * @param array $statement
-     *
-     * @return bool
      */
     public function hasChildReturnStatementType(array $statement): bool
     {
@@ -2164,9 +1927,6 @@ public function hasChildReturnStatementType(array $statement): bool
         return false;
     }
 
-    /**
-     * @return string
-     */
     public function getInternalName(): string
     {
         $classDefinition = $this->getClassDefinition();
@@ -2176,10 +1936,6 @@ public function getInternalName(): string
 
     /**
      * Returns arginfo name for current method.
-     *
-     * @param ClassDefinition|null $classDefinition
-     *
-     * @return string
      */
     public function getArgInfoName(?ClassDefinition $classDefinition = null): string
     {
@@ -2207,13 +1963,11 @@ public function getArgInfoName(?ClassDefinition $classDefinition = null): string
      *
      * - TRUE: function foo() -> void;
      * - TRUE: function foo() -> null;
-     * - TRUE: function foo() -> bool|string|..;
+     * - TRUE: function foo() -> bool|string|...;
      * - TRUE: function foo() -> <\stdClass>;
      * - FALSE: function foo();
      * - FALSE: function foo() -> var;
      * - FALSE: function foo() -> resource|callable;
-     *
-     * @return bool
      */
     public function isReturnTypesHintDetermined(): bool
     {
@@ -2241,7 +1995,7 @@ public function isReturnTypesHintDetermined(): bool
                     $this->areReturnTypesStringCompatible() ||
                     $this->areReturnTypesFalseCompatible() ||
                     $this->areReturnTypesObjectCompatible() ||
-                    \array_key_exists('array', $this->getReturnTypes())
+                    array_key_exists('array', $this->getReturnTypes())
                 ) {
                     continue;
                 }
@@ -2260,18 +2014,16 @@ public function isReturnTypesHintDetermined(): bool
 
     /**
      * Checks if method's return type is nullable object `?object`.
-     *
-     * @return bool
      */
     public function isReturnTypeNullableObject(): bool
     {
-        return count($this->returnTypes) === 2 && isset($this->returnTypes['object']) && isset($this->returnTypes['null']);
+        return count($this->returnTypes) === 2 &&
+               isset($this->returnTypes['object']) &&
+               isset($this->returnTypes['null']);
     }
 
     /**
      * Checks if method's return type is object `object`.
-     *
-     * @return bool
      */
     public function isReturnTypeObject(): bool
     {
@@ -2280,8 +2032,6 @@ public function isReturnTypeObject(): bool
 
     /**
      * Checks if the method have compatible return types.
-     *
-     * @return bool
      */
     public function areReturnTypesCompatible(): bool
     {
@@ -2316,11 +2066,6 @@ public function areReturnTypesCompatible(): bool
     /**
      * Determine Z_PARAM_*
      *
-     * @param array              $parameter
-     * @param CompilationContext $compilationContext
-     *
-     * @return string
-     *
      * @throws Exception
      */
     public function detectParam(array $parameter, CompilationContext $compilationContext): string
@@ -2428,10 +2173,6 @@ public function detectParam(array $parameter, CompilationContext $compilationCon
 
     /**
      * Get data type of method's parameter
-     *
-     * @param array $parameter
-     *
-     * @return string
      */
     private function getParamDataType(array $parameter): string
     {

From 274b98a0aa201dd3e66ddbda3aa69385880c9a59 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 11:54:01 +0100
Subject: [PATCH 050/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 Library/Backend/Backend.php                 |  6 +-
 Library/Builder/FunctionCallBuilder.php     | 11 ---
 Library/Builder/StatementsBlockBuilder.php  |  2 -
 Library/Cache/ClassEntryCache.php           |  6 --
 Library/Cache/FunctionCache.php             |  6 --
 Library/Cache/MethodCache.php               | 10 +--
 Library/Cache/SlotsCache.php                | 12 ---
 Library/Cache/StaticMethodCache.php         | 12 +--
 Library/ClassMethod.php                     | 16 ++--
 Library/Classes/Entry.php                   | 17 +---
 Library/Code/Builder/Struct.php             |  7 --
 Library/Compiler.php                        | 14 ++--
 Library/Compiler/CompilerFileFactory.php    |  6 --
 Library/Detectors/WriteDetector.php         | 29 -------
 Library/Expression/Reference.php            | 11 ---
 Library/Expression/StaticPropertyAccess.php |  9 ---
 Library/FileSystem/HardDisk.php             | 86 +++------------------
 Library/FunctionDefinition.php              | 25 +-----
 Library/StaticCall.php                      |  2 +-
 19 files changed, 39 insertions(+), 248 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 74107bb5a5..913314fb8a 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -29,6 +29,7 @@
 use Zephir\Variable\Globals;
 
 use function in_array;
+use function strlen;
 use function Zephir\add_slashes;
 
 class Backend
@@ -398,8 +399,9 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
                     break;
 
                 case 'char':
-                    if (\strlen($defaultValue) > 4) {
-                        if (\strlen($defaultValue) > 10) {
+                    $defaultValue = (string)$defaultValue;
+                    if (strlen($defaultValue) > 4) {
+                        if (strlen($defaultValue) > 10) {
                             throw new CompilerException("Invalid char literal: '".substr($defaultValue, 0, 10)."...'", $variable->getOriginal());
                         } else {
                             throw new CompilerException("Invalid char literal: '".$defaultValue."'", $variable->getOriginal());
diff --git a/Library/Builder/FunctionCallBuilder.php b/Library/Builder/FunctionCallBuilder.php
index 395c788610..3cad886d9b 100644
--- a/Library/Builder/FunctionCallBuilder.php
+++ b/Library/Builder/FunctionCallBuilder.php
@@ -18,14 +18,6 @@
  */
 class FunctionCallBuilder
 {
-    /**
-     * @param string      $name
-     * @param array       $parameters
-     * @param int         $type
-     * @param string|null $file
-     * @param int         $line
-     * @param int         $char
-     */
     public function __construct(
         protected string $name,
         protected array $parameters,
@@ -36,9 +28,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @return array
-     */
     public function get(): array
     {
         return [
diff --git a/Library/Builder/StatementsBlockBuilder.php b/Library/Builder/StatementsBlockBuilder.php
index fac1c5233c..5d155c0bf8 100644
--- a/Library/Builder/StatementsBlockBuilder.php
+++ b/Library/Builder/StatementsBlockBuilder.php
@@ -24,8 +24,6 @@ public function __construct(protected array $statements, protected bool $raw = f
 
     /**
      * Returns a builder definition.
-     *
-     * @return array
      */
     public function get(): array
     {
diff --git a/Library/Cache/ClassEntryCache.php b/Library/Cache/ClassEntryCache.php
index b652400c4a..d49dcc4560 100644
--- a/Library/Cache/ClassEntryCache.php
+++ b/Library/Cache/ClassEntryCache.php
@@ -25,12 +25,6 @@ class ClassEntryCache
 
     /**
      * Retrieves/Creates a class entry cache.
-     *
-     * @param string             $className
-     * @param bool               $dynamic
-     * @param CompilationContext $compilationContext
-     *
-     * @return Variable
      */
     public function get(string $className, bool $dynamic, CompilationContext $compilationContext): Variable
     {
diff --git a/Library/Cache/FunctionCache.php b/Library/Cache/FunctionCache.php
index d8528ce6e0..85f9aa16cf 100644
--- a/Library/Cache/FunctionCache.php
+++ b/Library/Cache/FunctionCache.php
@@ -43,12 +43,6 @@ public function __construct(protected ?CallGathererPass $gatherer = null)
 
     /**
      * Retrieves/Creates a function cache for a function call.
-     *
-     * @param string             $functionName
-     * @param CompilationContext $compilationContext
-     * @param bool               $exists
-     *
-     * @return string
      */
     public function get(string $functionName, CompilationContext $compilationContext, bool $exists): string
     {
diff --git a/Library/Cache/MethodCache.php b/Library/Cache/MethodCache.php
index 185a505b5e..ea9b471a95 100644
--- a/Library/Cache/MethodCache.php
+++ b/Library/Cache/MethodCache.php
@@ -48,12 +48,6 @@ public function __construct(protected ?CallGathererPass $gatherer = null)
     /**
      * Retrieves/Creates a function cache for a method call.
      *
-     * @param CompilationContext $compilationContext
-     * @param string             $methodName
-     * @param Variable           $caller
-     *
-     * @return string
-     *
      * @throws ReflectionException
      */
     public function get(CompilationContext $compilationContext, string $methodName, Variable $caller): string
@@ -62,7 +56,7 @@ public function get(CompilationContext $compilationContext, string $methodName,
 
         $numberPoly = 0;
 
-        if ('this' == $caller->getRealName()) {
+        if ('this' === $caller->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
             if ($classDefinition->hasMethod($methodName)) {
                 ++$numberPoly;
@@ -141,7 +135,7 @@ public function get(CompilationContext $compilationContext, string $methodName,
             $cacheable = false;
         }
 
-        if ('this_ptr' != $caller->getName()) {
+        if ('this_ptr' !== $caller->getName()) {
             $associatedClass = $caller->getAssociatedClass();
             if ($this->isClassCacheable($associatedClass)) {
                 $staticCacheable = true;
diff --git a/Library/Cache/SlotsCache.php b/Library/Cache/SlotsCache.php
index eb211d71d7..c54d5611be 100644
--- a/Library/Cache/SlotsCache.php
+++ b/Library/Cache/SlotsCache.php
@@ -55,10 +55,6 @@ public static function getFunctionSlot(string $functionName): int
 
     /**
      * Returns or creates a cache slot for a function.
-     *
-     * @param string $functionName
-     *
-     * @return int
      */
     public static function getExistingFunctionSlot(string $functionName): int
     {
@@ -67,10 +63,6 @@ public static function getExistingFunctionSlot(string $functionName): int
 
     /**
      * Returns or creates a cache slot for a method.
-     *
-     * @param ClassMethod $method
-     *
-     * @return int
      */
     public static function getMethodSlot(ClassMethod $method): int
     {
@@ -93,10 +85,6 @@ public static function getMethodSlot(ClassMethod $method): int
 
     /**
      * Returns a cache slot for a method.
-     *
-     * @param ClassMethod $method
-     *
-     * @return int
      */
     public static function getExistingMethodSlot(ClassMethod $method): int
     {
diff --git a/Library/Cache/StaticMethodCache.php b/Library/Cache/StaticMethodCache.php
index bedc9de9fc..faf119048f 100644
--- a/Library/Cache/StaticMethodCache.php
+++ b/Library/Cache/StaticMethodCache.php
@@ -12,7 +12,6 @@
 namespace Zephir\Cache;
 
 use ReflectionMethod;
-use Zephir\ClassMethod;
 use Zephir\CompilationContext;
 
 /**
@@ -36,16 +35,7 @@ class StaticMethodCache
 {
     protected array $cache = [];
 
-    /**
-     * MethodCache.
-     *
-     * @param CompilationContext                $compilationContext
-     * @param ClassMethod|ReflectionMethod|null $method
-     * @param bool                              $allowNtsCache
-     *
-     * @return string
-     */
-    public function get(CompilationContext $compilationContext, $method, bool $allowNtsCache = true): string
+    public function get(CompilationContext $compilationContext, $method): string
     {
         if ($method === null) {
             return 'NULL, 0';
diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 92d3bea737..4ef87cb07d 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -120,17 +120,24 @@ class ClassMethod
      */
     protected ?CallGathererPass $callGathererPass = null;
 
+    protected array $staticVariables = [];
+
+    protected ?ClassDefinition $classDefinition = null;
+
     public function __construct(
-        protected ClassDefinition $classDefinition,
+        ClassDefinition $classDefinition,
         protected array $visibility,
         protected string $name,
         protected ?ClassMethodParameters $parameters = null,
         protected ?StatementsBlock $statements = null,
         protected ?string $docblock = null,
         ?array $returnType = null,
-        protected ?array $expression = null,
-        protected array $staticVariables = []
+        protected ?array $expression = [],
+        array $staticVariables = [],
     ) {
+        $this->classDefinition = $classDefinition;
+        $this->staticVariables = $staticVariables;
+
         $this->checkVisibility($visibility, $name, $expression);
         $this->setReturnTypes($returnType);
     }
@@ -237,9 +244,6 @@ public function setReturnTypes(?array $returnType = null): void
         }
     }
 
-    /**
-     * @return array
-     */
     public function getReturnTypesRaw(): array
     {
         return $this->returnTypesRaw;
diff --git a/Library/Classes/Entry.php b/Library/Classes/Entry.php
index 2bcd1151f0..698df3e8f0 100644
--- a/Library/Classes/Entry.php
+++ b/Library/Classes/Entry.php
@@ -29,27 +29,19 @@ class Entry
      * Class name
      *
      * As it was passed: partially or fully.
-     *
-     * @var string
      */
     private string $classname;
 
-    /**
-     * @var bool
-     */
     private bool $isInternal = false;
 
     /**
      * Loaded via config/class-entries.php
-     *
-     * @var array
      */
     private array $classEntries;
 
     public function __construct(string $className, private CompilationContext $compilationContext)
     {
         $this->classname = $this->compilationContext->getFullName($className);
-
         $this->classEntries = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
 
         foreach ($this->classEntries as $key => $val) {
@@ -59,8 +51,6 @@ public function __construct(string $className, private CompilationContext $compi
     }
 
     /**
-     * @return string
-     *
      * @throws Exception
      */
     public function get(): string
@@ -129,12 +119,7 @@ public function isInternal(): bool
     }
 
     /**
-     * Detect if start of namespace class
-     * belongs to project namespace.
-     *
-     * @param string $className
-     *
-     * @return bool
+     * Detect if start of namespace class belongs to project namespace.
      */
     private function isInternalClass(string $className): bool
     {
diff --git a/Library/Code/Builder/Struct.php b/Library/Code/Builder/Struct.php
index c411d5e047..b9528f64f2 100644
--- a/Library/Code/Builder/Struct.php
+++ b/Library/Code/Builder/Struct.php
@@ -29,8 +29,6 @@ class Struct
      *     key value;
      * }
      * ```
-     *
-     * @var array
      */
     protected array $properties = [];
 
@@ -157,12 +155,7 @@ public function getInitEntry(string $name, array $global, string $namespace): st
 
     /**
      * Generates the internal c-type according to the php's type.
-     *
-     * @param string $type
-     *
      * @throws InvalidArgumentException
-     *
-     * @return string
      */
     protected function convertToCType(string $type): string
     {
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 5ee59e604c..8d3f87d757 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -183,8 +183,6 @@ public function setOptimizersPath(string $optimizersPath): void
     /**
      * Resolves path to the internal optimizers.
      *
-     * @return string
-     *
      * @throws IllegalStateException in case of absence internal optimizers directory
      */
     private function resolveOptimizersPath(): ?string
@@ -834,16 +832,16 @@ public function compile(bool $development = false, ?int $jobs = null): void
         }
 
         $currentDir = getcwd();
-        if (file_exists("{$currentDir}/compile.log")) {
-            unlink("{$currentDir}/compile.log");
+        if (file_exists("$currentDir/compile.log")) {
+            unlink("$currentDir/compile.log");
         }
 
-        if (file_exists("{$currentDir}/compile-errors.log")) {
-            unlink("{$currentDir}/compile-errors.log");
+        if (file_exists("$currentDir/compile-errors.log")) {
+            unlink("$currentDir/compile-errors.log");
         }
 
-        if (file_exists("{$currentDir}/ext/modules/{$namespace}.so")) {
-            unlink("{$currentDir}/ext/modules/{$namespace}.so");
+        if (file_exists("$currentDir/ext/modules/{$namespace}.so")) {
+            unlink("$currentDir/ext/modules/{$namespace}.so");
         }
 
         if (is_windows()) {
diff --git a/Library/Compiler/CompilerFileFactory.php b/Library/Compiler/CompilerFileFactory.php
index 6d24349fa0..8dbeb42d60 100644
--- a/Library/Compiler/CompilerFileFactory.php
+++ b/Library/Compiler/CompilerFileFactory.php
@@ -32,16 +32,10 @@ public function __construct(
      * Creates CompilerFile instance.
      *
      * NOTE: Each instance of CompilerFile must have its own AliasManager instance.
-     *
-     * @param string $className
-     * @param string $filePath
-     *
-     * @return FileInterface
      */
     public function create(string $className, string $filePath): FileInterface
     {
         $compiler = new CompilerFile($this->config, new AliasManager(), $this->filesystem);
-
         $compiler->setClassName($className);
         $compiler->setFilePath($filePath);
         $compiler->setLogger($this->logger);
diff --git a/Library/Detectors/WriteDetector.php b/Library/Detectors/WriteDetector.php
index f2de68ba01..3f18987d03 100644
--- a/Library/Detectors/WriteDetector.php
+++ b/Library/Detectors/WriteDetector.php
@@ -38,11 +38,6 @@ class WriteDetector
 
     /**
      * Do the detection pass on a single variable.
-     *
-     * @param string $variable
-     * @param array  $statements
-     *
-     * @return bool
      */
     public function detect(string $variable, array $statements): bool
     {
@@ -53,8 +48,6 @@ public function detect(string $variable, array $statements): bool
 
     /**
      * Sets detection flags.
-     *
-     * @param int $flags
      */
     public function setDetectionFlags(int $flags): void
     {
@@ -63,10 +56,6 @@ public function setDetectionFlags(int $flags): void
 
     /**
      * Increase the number of mutations a variable has inside a statement block.
-     *
-     * @param string $variable
-     *
-     * @return WriteDetector
      */
     public function increaseMutations(string $variable): self
     {
@@ -81,10 +70,6 @@ public function increaseMutations(string $variable): self
 
     /**
      * Returns the number of assignment instructions that mutated a variable.
-     *
-     * @param string $variable
-     *
-     * @return int
      */
     public function getNumberOfMutations(string $variable): int
     {
@@ -93,8 +78,6 @@ public function getNumberOfMutations(string $variable): int
 
     /**
      * Pass let statements.
-     *
-     * @param array $statement
      */
     public function passLetStatement(array $statement): void
     {
@@ -116,8 +99,6 @@ public function passLetStatement(array $statement): void
 
     /**
      * Pass call expressions.
-     *
-     * @param array $expression
      */
     public function passCall(array $expression): void
     {
@@ -135,8 +116,6 @@ public function passCall(array $expression): void
 
     /**
      * Pass array expressions.
-     *
-     * @param array $expression
      */
     public function passArray(array $expression): void
     {
@@ -152,8 +131,6 @@ public function passArray(array $expression): void
 
     /**
      * Pass "new" expressions.
-     *
-     * @param array $expression
      */
     public function passNew(array $expression): void
     {
@@ -171,8 +148,6 @@ public function passNew(array $expression): void
 
     /**
      * Pass "declare" statement.
-     *
-     * @param array $statement
      */
     public function declareVariables(array $statement): void
     {
@@ -195,8 +170,6 @@ public function declareVariables(array $statement): void
 
     /**
      * Pass expressions.
-     *
-     * @param array $expression
      */
     public function passExpression(array $expression): void
     {
@@ -299,8 +272,6 @@ public function passExpression(array $expression): void
 
     /**
      * Pass statement block.
-     *
-     * @param array $statements
      */
     public function passStatementBlock(array $statements): void
     {
diff --git a/Library/Expression/Reference.php b/Library/Expression/Reference.php
index 55803254e4..28bd4b122c 100644
--- a/Library/Expression/Reference.php
+++ b/Library/Expression/Reference.php
@@ -30,22 +30,16 @@ class Reference
 {
     /**
      * Expecting the value
-     *
-     * @var bool
      */
     protected bool $expecting = true;
 
     /**
      * Result of the evaluated expression is read only or not
-     *
-     * @var bool
      */
     protected bool $readOnly = false;
 
     /**
      * Expecting variable
-     *
-     * @var Variable|null
      */
     protected ?Variable $expectingVariable = null;
 
@@ -83,11 +77,6 @@ public function setReadOnly(bool $readOnly): void
     /**
      * Compiles a reference to a value.
      *
-     * @param array $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     *
      * @throws Exception
      * @throws ReflectionException
      */
diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
index 80347e9428..50a95d28e5 100644
--- a/Library/Expression/StaticPropertyAccess.php
+++ b/Library/Expression/StaticPropertyAccess.php
@@ -37,9 +37,6 @@ class StaticPropertyAccess
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
-     *
-     * @param bool $expecting
-     * @param Variable|null $expectingVariable
      */
     public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
@@ -49,8 +46,6 @@ public function setExpectReturn(bool $expecting, Variable $expectingVariable = n
 
     /**
      * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
      */
     public function setReadOnly(bool $readOnly): void
     {
@@ -60,10 +55,6 @@ public function setReadOnly(bool $readOnly): void
     /**
      * Access a static property.
      *
-     * @param array $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
      * @throws ReflectionException
      * @throws Exception
      */
diff --git a/Library/FileSystem/HardDisk.php b/Library/FileSystem/HardDisk.php
index b046773222..c9f3c04e9f 100644
--- a/Library/FileSystem/HardDisk.php
+++ b/Library/FileSystem/HardDisk.php
@@ -29,13 +29,8 @@
  */
 class HardDisk implements FileSystemInterface
 {
-    /** @var string */
-    private string $localPath;
-
     /**
      * Initialize checker
-     *
-     * @var bool
      */
     private bool $initialized = false;
 
@@ -43,20 +38,13 @@ class HardDisk implements FileSystemInterface
      * Root or base path
      *
      * Path to where all cached files and folders are collected.
-     *
-     * @var string
      */
     private string $basePath;
 
     /**
-     * HardDisk constructor.
-     *
-     * @param string $basePath
-     * @param string $localPath
-     *
      * @throws InvalidArgumentException
      */
-    public function __construct(string $basePath, string $localPath = Zephir::VERSION)
+    public function __construct(string $basePath, private string $localPath = Zephir::VERSION)
     {
         $this->basePath = $this->rightTrimPath($basePath);
         $this->localPath = $this->rightTrimPath($localPath);
@@ -66,19 +54,11 @@ public function __construct(string $basePath, string $localPath = Zephir::VERSIO
         }
     }
 
-    /**
-     * @param string $path
-     *
-     * @return string
-     */
     private function rightTrimPath(string $path): string
     {
         return rtrim($path, '\\/');
     }
 
-    /**
-     * @return bool
-     */
     public function isInitialized(): bool
     {
         return $this->initialized;
@@ -86,19 +66,12 @@ public function isInitialized(): bool
 
     /**
      * Start File System
-     *
-     * @throws RuntimeException
      */
-    public function initialize()
+    public function initialize(): void
     {
         $this->initialized = true;
     }
 
-    /**
-     * @param string $path
-     *
-     * @return bool
-     */
     public function exists(string $path): bool
     {
         if ('.' === $path || empty($path)) {
@@ -110,11 +83,6 @@ public function exists(string $path): bool
         return is_file($this->basePath.DIRECTORY_SEPARATOR.$path);
     }
 
-    /**
-     * @param string $path
-     *
-     * @return bool
-     */
     public function makeDirectory(string $path): bool
     {
         if ('.' === $path || empty($path)) {
@@ -136,11 +104,6 @@ public function makeDirectory(string $path): bool
         return is_dir($path);
     }
 
-    /**
-     * @param string $path
-     *
-     * @return array
-     */
     public function file(string $path): array
     {
         $contents = file_get_contents($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
@@ -148,49 +111,27 @@ public function file(string $path): array
         return preg_split("/\r\n|\n|\r/", $contents);
     }
 
-    /**
-     * @param string $path
-     *
-     * @return int
-     */
     public function modificationTime(string $path): int
     {
         return filemtime($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
     }
 
-    /**
-     * @param string $path
-     *
-     * @return string
-     */
     public function read(string $path): string
     {
         return file_get_contents($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
     }
 
-    /**
-     * @param string $path
-     */
-    public function delete(string $path)
+    public function delete(string $path): void
     {
         unlink($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
     }
 
-    /**
-     * @param string $path
-     * @param string $data
-     */
-    public function write(string $path, string $data)
+    public function write(string $path, string $data): void
     {
         file_put_contents($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}", $data);
     }
 
-    /**
-     * @param string $command
-     * @param string $descriptor
-     * @param string $destination
-     */
-    public function system(string $command, string $descriptor, string $destination)
+    public function system(string $command, string $descriptor, string $destination): void
     {
         // fallback
         $redirect = "{$this->localPath}/{$destination}";
@@ -209,12 +150,7 @@ public function system(string $command, string $descriptor, string $destination)
         }
     }
 
-    /**
-     * @param string $path
-     *
-     * @return mixed
-     */
-    public function requireFile(string $path)
+    public function requireFile(string $path): mixed
     {
         if (!empty($this->basePath)) {
             return require "{$this->basePath}/{$this->localPath}/{$path}";
@@ -234,7 +170,10 @@ public function clean(): void
             return;
         }
 
-        $contents = $this->listDirectoryRecursively($this->basePath.DIRECTORY_SEPARATOR.$this->localPath, RecursiveIteratorIterator::CHILD_FIRST);
+        $contents = $this->listDirectoryRecursively(
+            $this->basePath.DIRECTORY_SEPARATOR.$this->localPath,
+            RecursiveIteratorIterator::CHILD_FIRST,
+        );
 
         /** @var SplFileInfo $file */
         foreach ($contents as $file) {
@@ -287,11 +226,6 @@ public function getHashFile(string $algorithm, string $sourceFile, bool $useCach
         return file_get_contents($cacheFile);
     }
 
-    /**
-     * @param string $path
-     *
-     * @return string
-     */
     public function normalizePath(string $path): string
     {
         return str_replace(['\\', ':', '/'], '_', $path);
diff --git a/Library/FunctionDefinition.php b/Library/FunctionDefinition.php
index 814222700e..cea01ef91b 100644
--- a/Library/FunctionDefinition.php
+++ b/Library/FunctionDefinition.php
@@ -20,34 +20,17 @@ class FunctionDefinition extends ClassMethod
 {
     /**
      * Whether the function is declared in a global or namespaced scope.
-     *
-     * @var bool
      */
     private bool $isGlobal = false;
 
-    /**
-     * FunctionDefinition constructor.
-     *
-     * @param string                     $namespace The namespace of the function.
-     * @param string                     $name
-     * @param ClassMethodParameters|null $parameters
-     * @param StatementsBlock|null       $statements
-     * @param array|null                 $returnType
-     * @param array|null                 $expression
-     */
     public function __construct(
         private string $namespace,
-        string $name,
-        ClassMethodParameters $parameters = null,
-        StatementsBlock $statements = null,
+        protected string $name,
+        protected ?ClassMethodParameters $parameters = null,
+        protected ?StatementsBlock $statements = null,
         array $returnType = null,
-        array $expression = null
+        protected array $expression = [],
     ) {
-        $this->name = $name;
-        $this->parameters = $parameters;
-        $this->statements = $statements;
-        $this->expression = $expression;
-
         $this->setReturnTypes($returnType);
     }
 
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index 1fda946469..5649508a2f 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -288,7 +288,7 @@ protected function call(
          * Check if the  method call can have an inline cache.
          */
         $methodCache = $compilationContext->cacheManager->getStaticMethodCache();
-        $cachePointer = $methodCache->get($compilationContext, $method ?? null, false);
+        $cachePointer = $methodCache->get($compilationContext, $method ?? null);
 
         $params = [];
         if (isset($expression['parameters']) && count($expression['parameters'])) {

From 3e0da01714d3fa485f1be4ec2542787d8c3d4ea2 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 11:57:30 +0100
Subject: [PATCH 051/375] #2407 - Adjust type definition

---
 Library/FunctionDefinition.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/FunctionDefinition.php b/Library/FunctionDefinition.php
index cea01ef91b..125c5b5491 100644
--- a/Library/FunctionDefinition.php
+++ b/Library/FunctionDefinition.php
@@ -29,7 +29,7 @@ public function __construct(
         protected ?ClassMethodParameters $parameters = null,
         protected ?StatementsBlock $statements = null,
         array $returnType = null,
-        protected array $expression = [],
+        protected ?array $expression = [],
     ) {
         $this->setReturnTypes($returnType);
     }

From 4104c0050192b5407f9727f653bca9c77d847772 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 12:57:12 +0100
Subject: [PATCH 052/375] #2407 - Rename namespace to `Zephir\Class\Entry`

Since PHP8.0 it is possible to define namespace with `class` name
---
 Library/{Classes => Class}/Entry.php            | 2 +-
 Library/ClassDefinition.php                     | 2 +-
 Library/ClassMethod.php                         | 2 +-
 Library/Operators/Other/InstanceOfOperator.php  | 2 +-
 Library/Operators/Other/NewInstanceOperator.php | 2 +-
 Library/Statements/ThrowStatement.php           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename Library/{Classes => Class}/Entry.php (99%)

diff --git a/Library/Classes/Entry.php b/Library/Class/Entry.php
similarity index 99%
rename from Library/Classes/Entry.php
rename to Library/Class/Entry.php
index 698df3e8f0..0ebbf33c1f 100644
--- a/Library/Classes/Entry.php
+++ b/Library/Class/Entry.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Zephir\Classes;
+namespace Zephir\Class;
 
 use ReflectionClass;
 use Zephir\ClassDefinition;
diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php
index 09521adbdf..52a37eeab0 100644
--- a/Library/ClassDefinition.php
+++ b/Library/ClassDefinition.php
@@ -15,7 +15,7 @@
 
 use ReflectionClass;
 use ReflectionException;
-use Zephir\Classes\Entry;
+use Zephir\Class\Entry;
 use Zephir\Documentation\Docblock;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 4ef87cb07d..982e94810c 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -14,7 +14,7 @@
 namespace Zephir;
 
 use ReflectionException;
-use Zephir\Classes\Entry as ClassEntry;
+use Zephir\Class\Entry as ClassEntry;
 use Zephir\Detectors\WriteDetector;
 use Zephir\Documentation\Docblock;
 use Zephir\Documentation\DocblockParser;
diff --git a/Library/Operators/Other/InstanceOfOperator.php b/Library/Operators/Other/InstanceOfOperator.php
index c124e1357e..f309ad2035 100644
--- a/Library/Operators/Other/InstanceOfOperator.php
+++ b/Library/Operators/Other/InstanceOfOperator.php
@@ -14,7 +14,7 @@
 namespace Zephir\Operators\Other;
 
 use ReflectionException;
-use Zephir\Classes\Entry;
+use Zephir\Class\Entry;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
diff --git a/Library/Operators/Other/NewInstanceOperator.php b/Library/Operators/Other/NewInstanceOperator.php
index f459fbab66..b4f1f37bbd 100644
--- a/Library/Operators/Other/NewInstanceOperator.php
+++ b/Library/Operators/Other/NewInstanceOperator.php
@@ -15,7 +15,7 @@
 
 use ReflectionClass;
 use ReflectionException;
-use Zephir\Classes\Entry;
+use Zephir\Class\Entry;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
diff --git a/Library/Statements/ThrowStatement.php b/Library/Statements/ThrowStatement.php
index 06bca5ad52..1217c28519 100644
--- a/Library/Statements/ThrowStatement.php
+++ b/Library/Statements/ThrowStatement.php
@@ -14,7 +14,7 @@
 namespace Zephir\Statements;
 
 use ReflectionException;
-use Zephir\Classes\Entry;
+use Zephir\Class\Entry;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
 use Zephir\Compiler;

From 2cce3aa92f39786f42b0f8830143bdce5844bbef Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 16:32:08 +0100
Subject: [PATCH 053/375] #2407 - Move `ClassConstant` class inside `Class/`
 directory

---
 Library/{ => Class}/ClassConstant.php       | 4 +++-
 Library/ClassDefinition.php                 | 1 +
 Library/CompilerFile.php                    | 2 +-
 Library/Expression/StaticConstantAccess.php | 3 +--
 Library/Stubs/Generator.php                 | 3 +--
 tests/Zephir/Stubs/GeneratorTest.php        | 3 +--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename Library/{ => Class}/ClassConstant.php (97%)

diff --git a/Library/ClassConstant.php b/Library/Class/ClassConstant.php
similarity index 97%
rename from Library/ClassConstant.php
rename to Library/Class/ClassConstant.php
index 92576fbb9a..6245155b6d 100644
--- a/Library/ClassConstant.php
+++ b/Library/Class/ClassConstant.php
@@ -11,9 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Class;
 
 use ReflectionException;
+use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Expression\Constants;
 use Zephir\Expression\StaticConstantAccess;
 
diff --git a/Library/ClassDefinition.php b/Library/ClassDefinition.php
index 52a37eeab0..e9c29e32e9 100644
--- a/Library/ClassDefinition.php
+++ b/Library/ClassDefinition.php
@@ -15,6 +15,7 @@
 
 use ReflectionClass;
 use ReflectionException;
+use Zephir\Class\ClassConstant;
 use Zephir\Class\Entry;
 use Zephir\Documentation\Docblock;
 use Zephir\Documentation\DocblockParser;
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 80afb793d1..365d4a6d0a 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -16,13 +16,13 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
 use ReflectionException;
+use Zephir\Class\ClassConstant;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
-
 use function is_array;
 
 /**
diff --git a/Library/Expression/StaticConstantAccess.php b/Library/Expression/StaticConstantAccess.php
index 7d8b4c078e..600ba37fb9 100644
--- a/Library/Expression/StaticConstantAccess.php
+++ b/Library/Expression/StaticConstantAccess.php
@@ -14,13 +14,12 @@
 namespace Zephir\Expression;
 
 use ReflectionException;
-use Zephir\ClassConstant;
+use Zephir\Class\ClassConstant;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable;
-
 use function gettype;
 use function in_array;
 
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index 5e0ab0fe47..1fb76d1d24 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -14,14 +14,13 @@
 namespace Zephir\Stubs;
 
 use Zephir\AliasManager;
-use Zephir\ClassConstant;
+use Zephir\Class\ClassConstant;
 use Zephir\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\CompilerFile;
 use Zephir\Exception;
-
 use function array_key_exists;
 use function in_array;
 
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index e8e6326b02..c757f69562 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -16,13 +16,12 @@
 use PHPUnit\Framework\TestCase;
 use ReflectionException;
 use Zephir\AliasManager;
-use Zephir\ClassConstant;
+use Zephir\Class\ClassConstant;
 use Zephir\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\Stubs\Generator;
-
 use function Zephir\is_windows;
 
 class GeneratorTest extends TestCase

From 6b10b15866e50eb760770e9f73cb31acf107a29c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 16:37:05 +0100
Subject: [PATCH 054/375] #2407 - Move `ClassDefinition` class inside `Class/`
 directory

---
 Library/Backend/Backend.php                   |  3 +--
 Library/Cache/MethodCache.php                 |  2 +-
 Library/{ => Class}/ClassDefinition.php       | 19 ++++++++++++++-----
 Library/Class/Entry.php                       |  3 ---
 Library/ClassMethod.php                       |  1 +
 Library/ClassProperty.php                     |  2 +-
 Library/CompilationContext.php                |  2 +-
 Library/Compiler.php                          |  1 +
 Library/Compiler/FileInterface.php            |  2 +-
 Library/CompilerFile.php                      |  1 +
 Library/CompilerFileAnonymous.php             |  2 +-
 Library/Documentation.php                     |  1 +
 Library/Documentation/File/ClassFile.php      |  2 +-
 Library/Documentation/File/ClassesFile.php    |  2 +-
 Library/Documentation/File/SourceFile.php     |  2 +-
 Library/Documentation/Template.php            |  2 +-
 Library/Expression/Closure.php                |  3 +--
 Library/Expression/ClosureArrow.php           |  2 +-
 Library/StaticCall.php                        |  2 +-
 Library/Stubs/Generator.php                   |  2 +-
 Library/Variable.php                          |  2 +-
 .../zephir/partials/class/content.phtml       |  6 +++---
 .../Api/themes/zephir/partials/source.phtml   | 10 +++++-----
 tests/Zephir/Stubs/GeneratorTest.php          |  2 +-
 tests/Zephir/Stubs/MethodDocBlockTest.php     |  2 +-
 tests/Zephir/TypesTest.php                    |  2 +-
 tests/Zephir/VariableTest.php                 |  2 +-
 27 files changed, 45 insertions(+), 37 deletions(-)
 rename Library/{ => Class}/ClassDefinition.php (99%)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 913314fb8a..0e542099f4 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -13,7 +13,7 @@
 
 namespace Zephir\Backend;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
@@ -27,7 +27,6 @@
 use Zephir\GlobalConstant;
 use Zephir\Variable;
 use Zephir\Variable\Globals;
-
 use function in_array;
 use function strlen;
 use function Zephir\add_slashes;
diff --git a/Library/Cache/MethodCache.php b/Library/Cache/MethodCache.php
index ea9b471a95..677b06d4e3 100644
--- a/Library/Cache/MethodCache.php
+++ b/Library/Cache/MethodCache.php
@@ -15,7 +15,7 @@
 
 use ReflectionClass;
 use ReflectionException;
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\CompilationContext;
 use Zephir\Passes\CallGathererPass;
 use Zephir\Variable;
diff --git a/Library/ClassDefinition.php b/Library/Class/ClassDefinition.php
similarity index 99%
rename from Library/ClassDefinition.php
rename to Library/Class/ClassDefinition.php
index e9c29e32e9..f69ed82769 100644
--- a/Library/ClassDefinition.php
+++ b/Library/Class/ClassDefinition.php
@@ -11,24 +11,33 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Class;
 
 use ReflectionClass;
 use ReflectionException;
-use Zephir\Class\ClassConstant;
-use Zephir\Class\Entry;
+use Zephir\AbstractClassDefinition;
+use Zephir\AliasManager;
+use Zephir\ArgInfoDefinition;
+use Zephir\ClassDefinitionRuntime;
+use Zephir\ClassMethod;
+use Zephir\ClassMethodParameters;
+use Zephir\ClassProperty;
+use Zephir\CodePrinter;
+use Zephir\CompilationContext;
+use Zephir\Compiler;
 use Zephir\Documentation\Docblock;
 use Zephir\Documentation\DocblockParser;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\InvalidArgumentException;
+use Zephir\HeadersManager;
+use Zephir\StatementsBlock;
 use function count;
 use function gettype;
 use function is_array;
 use const DIRECTORY_SEPARATOR;
 
 /**
- * Class Definition
- *
  * Represents a class/interface and their properties and methods.
  */
 final class ClassDefinition extends AbstractClassDefinition
diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index 0ebbf33c1f..2aa9280ddc 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -14,7 +14,6 @@
 namespace Zephir\Class;
 
 use ReflectionClass;
-use Zephir\ClassDefinition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 
@@ -26,8 +25,6 @@ class Entry
     public const NAMESPACE_SEPARATOR = '\\';
 
     /**
-     * Class name
-     *
      * As it was passed: partially or fully.
      */
     private string $classname;
diff --git a/Library/ClassMethod.php b/Library/ClassMethod.php
index 982e94810c..aa415d6e54 100644
--- a/Library/ClassMethod.php
+++ b/Library/ClassMethod.php
@@ -14,6 +14,7 @@
 namespace Zephir;
 
 use ReflectionException;
+use Zephir\Class\ClassDefinition;
 use Zephir\Class\Entry as ClassEntry;
 use Zephir\Detectors\WriteDetector;
 use Zephir\Documentation\Docblock;
diff --git a/Library/ClassProperty.php b/Library/ClassProperty.php
index 84f7c87dbe..d0a4888a5e 100644
--- a/Library/ClassProperty.php
+++ b/Library/ClassProperty.php
@@ -12,11 +12,11 @@
 namespace Zephir;
 
 use ReflectionException;
+use Zephir\Class\ClassDefinition;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\BinaryOperator;
 use Zephir\Expression\Builder\Statements\LetStatement as ExpressionLetStatement;
-
 use function in_array;
 use function is_array;
 
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 78edd195f8..e24b5eea0b 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -16,9 +16,9 @@
 use Psr\Log\LoggerInterface;
 use Zephir\Backend\Backend;
 use Zephir\Cache\FunctionCache;
+use Zephir\Class\ClassDefinition;
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
-
 use function in_array;
 
 /**
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 8d3f87d757..f673caffb9 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -21,6 +21,7 @@
 use ReflectionException;
 use Zephir\Backend\Backend;
 use Zephir\Backend\StringsManager;
+use Zephir\Class\ClassDefinition;
 use Zephir\Code\Builder\Struct;
 use Zephir\Compiler\CompilerFileFactory;
 use Zephir\Compiler\FileInterface;
diff --git a/Library/Compiler/FileInterface.php b/Library/Compiler/FileInterface.php
index 588e2d19e7..5dd0a61a5a 100644
--- a/Library/Compiler/FileInterface.php
+++ b/Library/Compiler/FileInterface.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Compiler;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\Compiler;
 
 /**
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 365d4a6d0a..3fa8b1214f 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -17,6 +17,7 @@
 use Psr\Log\NullLogger;
 use ReflectionException;
 use Zephir\Class\ClassConstant;
+use Zephir\Class\ClassDefinition;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
diff --git a/Library/CompilerFileAnonymous.php b/Library/CompilerFileAnonymous.php
index 81c51b7ed1..1a763d2335 100644
--- a/Library/CompilerFileAnonymous.php
+++ b/Library/CompilerFileAnonymous.php
@@ -16,8 +16,8 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
 use ReflectionException;
+use Zephir\Class\ClassDefinition;
 use Zephir\Compiler\FileInterface;
-
 use function count;
 
 /**
diff --git a/Library/Documentation.php b/Library/Documentation.php
index 9d604421db..8a2639feb1 100644
--- a/Library/Documentation.php
+++ b/Library/Documentation.php
@@ -13,6 +13,7 @@
 
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
+use Zephir\Class\ClassDefinition;
 use Zephir\Documentation\File;
 use Zephir\Documentation\NamespaceAccessor;
 use Zephir\Documentation\Theme;
diff --git a/Library/Documentation/File/ClassFile.php b/Library/Documentation/File/ClassFile.php
index 8ec64417d4..260339e2ef 100644
--- a/Library/Documentation/File/ClassFile.php
+++ b/Library/Documentation/File/ClassFile.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Documentation\File;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\CompilerFile;
 use Zephir\Documentation;
 use Zephir\Documentation\FileInterface;
diff --git a/Library/Documentation/File/ClassesFile.php b/Library/Documentation/File/ClassesFile.php
index 56ec601f94..cc89dceb52 100644
--- a/Library/Documentation/File/ClassesFile.php
+++ b/Library/Documentation/File/ClassesFile.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Documentation\File;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\Documentation\FileInterface;
 
 class ClassesFile implements FileInterface
diff --git a/Library/Documentation/File/SourceFile.php b/Library/Documentation/File/SourceFile.php
index 069ff8c23e..5b252e255f 100644
--- a/Library/Documentation/File/SourceFile.php
+++ b/Library/Documentation/File/SourceFile.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Documentation\File;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\Documentation;
 
 class SourceFile extends ClassFile
diff --git a/Library/Documentation/Template.php b/Library/Documentation/Template.php
index fb8ca61fe0..d2ba1a73e3 100644
--- a/Library/Documentation/Template.php
+++ b/Library/Documentation/Template.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Documentation;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\CompilerFile;
 use Zephir\Config;
 use Zephir\Documentation;
diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
index 3925339689..fd06114317 100644
--- a/Library/Expression/Closure.php
+++ b/Library/Expression/Closure.php
@@ -13,7 +13,7 @@
 
 namespace Zephir\Expression;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
@@ -23,7 +23,6 @@
 use Zephir\Exception;
 use Zephir\StatementsBlock;
 use Zephir\Variable;
-
 use function is_array;
 
 /**
diff --git a/Library/Expression/ClosureArrow.php b/Library/Expression/ClosureArrow.php
index 6c8688c481..b78459a865 100644
--- a/Library/Expression/ClosureArrow.php
+++ b/Library/Expression/ClosureArrow.php
@@ -13,7 +13,7 @@
 
 namespace Zephir\Expression;
 
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\CompilationContext;
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index 5649508a2f..aa05503773 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -12,9 +12,9 @@
 namespace Zephir;
 
 use ReflectionException;
+use Zephir\Class\ClassDefinition;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
-
 use function count;
 use function in_array;
 use function is_string;
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index 1fb76d1d24..b53efc279d 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -15,7 +15,7 @@
 
 use Zephir\AliasManager;
 use Zephir\Class\ClassConstant;
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
diff --git a/Library/Variable.php b/Library/Variable.php
index a581d86ed1..2a523afef7 100644
--- a/Library/Variable.php
+++ b/Library/Variable.php
@@ -14,9 +14,9 @@
 namespace Zephir;
 
 use ReflectionClass;
+use Zephir\Class\ClassDefinition;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Globals;
-
 use function in_array;
 use function is_string;
 
diff --git a/templates/Api/themes/zephir/partials/class/content.phtml b/templates/Api/themes/zephir/partials/class/content.phtml
index 2dde01a6fd..c5444d4f35 100644
--- a/templates/Api/themes/zephir/partials/class/content.phtml
+++ b/templates/Api/themes/zephir/partials/class/content.phtml
@@ -4,7 +4,7 @@
  * @var string $className
  * @var array $methods
  * @var string[] $namespacePieces
- * @var Zephir\ClassDefinition $classDefinition
+ * @var \Zephir\Class\ClassDefinition $classDefinition
  * @var Zephir\CompilerFile $compilerFile
  */
 
@@ -27,10 +27,10 @@ $items = [
         </a>
         <?php } ?>
     </div>
-    
+
     <div class="class-full-name">
         <span class="class-type">Class</span>
-        
+
         <?php foreach ($namespacePieces as $nsname => $nspath) { ?>
         <span class="namespace-piece">
             <a href="<?= $this->url(Zephir\Documentation::namespaceUrl($nspath)) ?>">
diff --git a/templates/Api/themes/zephir/partials/source.phtml b/templates/Api/themes/zephir/partials/source.phtml
index 8010ac6686..7b153f5b59 100644
--- a/templates/Api/themes/zephir/partials/source.phtml
+++ b/templates/Api/themes/zephir/partials/source.phtml
@@ -3,7 +3,7 @@
  * @var string $fullName
  * @var string $className
  * @var array $namespacePieces
- * @var Zephir\ClassDefinition $classDefinition
+ * @var \Zephir\Class\ClassDefinition $classDefinition
  * @var Zephir\CompilerFile $compilerFile
  */
 
@@ -17,7 +17,7 @@ $items = [
 <?= $this->partial('partials/breadcrumb.phtml', ['items'=> $items]) ?>
 
 <div class="class-header source clearfix">
-    
+
     <div class="access-buttons">
         <a class="zep-button" href="<?= $this->url($classDefinition) ?>">Class</a>
 
@@ -28,10 +28,10 @@ $items = [
         </a>
         <?php endif; ?>
     </div>
-    
+
     <div class="class-full-name">
         <span class="class-type">Class</span>
-        
+
         <?php foreach ($namespacePieces as $nsname => $nspath): ?>
         <span class="namespace-piece">
             <a href="<?= $this->url(Zephir\Documentation::namespaceUrl($nspath)) ?>"><?=$nsname?></a>
@@ -40,7 +40,7 @@ $items = [
 
         <h1 class="class-name"><?= $className ?></h1>
     </div>
-    
+
 </div>
 
 <pre class="zephir-source-file prettyprint linenums">
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index c757f69562..58dcec1995 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -17,7 +17,7 @@
 use ReflectionException;
 use Zephir\AliasManager;
 use Zephir\Class\ClassConstant;
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
diff --git a/tests/Zephir/Stubs/MethodDocBlockTest.php b/tests/Zephir/Stubs/MethodDocBlockTest.php
index 8ae56cb46f..0cc94ff988 100644
--- a/tests/Zephir/Stubs/MethodDocBlockTest.php
+++ b/tests/Zephir/Stubs/MethodDocBlockTest.php
@@ -15,7 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Zephir\AliasManager;
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\StatementsBlock;
diff --git a/tests/Zephir/TypesTest.php b/tests/Zephir/TypesTest.php
index a2bccd38d1..9867815e57 100644
--- a/tests/Zephir/TypesTest.php
+++ b/tests/Zephir/TypesTest.php
@@ -14,7 +14,7 @@
 namespace Zephir\Test;
 
 use PHPUnit\Framework\TestCase;
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\ClassMethod;
 use Zephir\Types;
 
diff --git a/tests/Zephir/VariableTest.php b/tests/Zephir/VariableTest.php
index 58cff493e6..409efafe81 100644
--- a/tests/Zephir/VariableTest.php
+++ b/tests/Zephir/VariableTest.php
@@ -16,7 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Zephir\Branch;
 use Zephir\BranchManager;
-use Zephir\ClassDefinition;
+use Zephir\Class\ClassDefinition;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;

From 29c9ab2bbcdfa44554ad869b69314ff5a387b4bc Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 16:37:36 +0100
Subject: [PATCH 055/375] #2407 - Move `ClassDefinitionRuntime` class inside
 `Class/` directory

---
 Library/Class/ClassDefinition.php              | 1 -
 Library/{ => Class}/ClassDefinitionRuntime.php | 4 +++-
 Library/CompilerFile.php                       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename Library/{ => Class}/ClassDefinitionRuntime.php (88%)

diff --git a/Library/Class/ClassDefinition.php b/Library/Class/ClassDefinition.php
index f69ed82769..963c34de66 100644
--- a/Library/Class/ClassDefinition.php
+++ b/Library/Class/ClassDefinition.php
@@ -18,7 +18,6 @@
 use Zephir\AbstractClassDefinition;
 use Zephir\AliasManager;
 use Zephir\ArgInfoDefinition;
-use Zephir\ClassDefinitionRuntime;
 use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
diff --git a/Library/ClassDefinitionRuntime.php b/Library/Class/ClassDefinitionRuntime.php
similarity index 88%
rename from Library/ClassDefinitionRuntime.php
rename to Library/Class/ClassDefinitionRuntime.php
index c2679ad3ff..dbd1e26833 100644
--- a/Library/ClassDefinitionRuntime.php
+++ b/Library/Class/ClassDefinitionRuntime.php
@@ -11,7 +11,9 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Class;
+
+use Zephir\AbstractClassDefinition;
 
 /**
  * Represents a class/interface that only exists in runtime.
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 3fa8b1214f..ba8975354c 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -18,6 +18,7 @@
 use ReflectionException;
 use Zephir\Class\ClassConstant;
 use Zephir\Class\ClassDefinition;
+use Zephir\Class\ClassDefinitionRuntime;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;

From 7ceffe79b9564b0fe2deb4919fcc830644a41cc0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 16:39:27 +0100
Subject: [PATCH 056/375] #2407 - Move `ClassMethod` class inside `Class/`
 directory

---
 Library/ArgInfoDefinition.php                    |  1 +
 Library/Backend/Backend.php                      |  2 +-
 Library/Cache/SlotsCache.php                     |  2 +-
 Library/Class/ClassDefinition.php                |  1 -
 Library/{ => Class}/ClassMethod.php              | 16 +++++++++++++---
 Library/CompilationContext.php                   |  1 +
 Library/CompilerFile.php                         |  1 +
 Library/Expression/Closure.php                   |  2 +-
 Library/Expression/ClosureArrow.php              |  2 +-
 Library/FunctionDefinition.php                   |  2 ++
 Library/MethodCall.php                           |  1 +
 Library/StaticCall.php                           |  1 +
 Library/Stubs/Generator.php                      |  2 +-
 Library/Stubs/MethodDocBlock.php                 |  2 +-
 Library/Types.php                                |  2 ++
 .../zephir/partials/class/method-details.phtml   |  2 +-
 .../partials/class/method-summary-params.phtml   |  2 +-
 .../zephir/partials/class/method-summary.phtml   |  2 +-
 .../partials/namespace/method-details.phtml      |  4 ++--
 .../namespace/method-summary-params.phtml        |  2 +-
 .../partials/namespace/method-summary.phtml      |  2 +-
 tests/Zephir/Stubs/GeneratorTest.php             |  2 +-
 tests/Zephir/Stubs/MethodDocBlockTest.php        |  2 +-
 tests/Zephir/TypesTest.php                       |  2 +-
 24 files changed, 38 insertions(+), 20 deletions(-)
 rename Library/{ => Class}/ClassMethod.php (99%)

diff --git a/Library/ArgInfoDefinition.php b/Library/ArgInfoDefinition.php
index 6454d0e674..2d327dc32d 100644
--- a/Library/ArgInfoDefinition.php
+++ b/Library/ArgInfoDefinition.php
@@ -13,6 +13,7 @@
 
 namespace Zephir;
 
+use Zephir\Class\ClassMethod;
 use function array_key_exists;
 use function count;
 
diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 0e542099f4..8886d6b699 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -14,7 +14,7 @@
 namespace Zephir\Backend;
 
 use Zephir\Class\ClassDefinition;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
diff --git a/Library/Cache/SlotsCache.php b/Library/Cache/SlotsCache.php
index c54d5611be..96ef578dbb 100644
--- a/Library/Cache/SlotsCache.php
+++ b/Library/Cache/SlotsCache.php
@@ -13,7 +13,7 @@
 
 namespace Zephir\Cache;
 
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 
 /**
  * In order to reduce memory allocation when calling functions and method_exists
diff --git a/Library/Class/ClassDefinition.php b/Library/Class/ClassDefinition.php
index 963c34de66..704e20ef39 100644
--- a/Library/Class/ClassDefinition.php
+++ b/Library/Class/ClassDefinition.php
@@ -18,7 +18,6 @@
 use Zephir\AbstractClassDefinition;
 use Zephir\AliasManager;
 use Zephir\ArgInfoDefinition;
-use Zephir\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\CodePrinter;
diff --git a/Library/ClassMethod.php b/Library/Class/ClassMethod.php
similarity index 99%
rename from Library/ClassMethod.php
rename to Library/Class/ClassMethod.php
index aa415d6e54..9ebf45573b 100644
--- a/Library/ClassMethod.php
+++ b/Library/Class/ClassMethod.php
@@ -11,24 +11,34 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Class;
 
 use ReflectionException;
-use Zephir\Class\ClassDefinition;
+use Zephir\Branch;
+use Zephir\BranchManager;
+use Zephir\CacheManager;
 use Zephir\Class\Entry as ClassEntry;
+use Zephir\ClassMethodParameters;
+use Zephir\CodePrinter;
+use Zephir\CompilationContext;
 use Zephir\Detectors\WriteDetector;
 use Zephir\Documentation\Docblock;
 use Zephir\Documentation\DocblockParser;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
+use Zephir\Expression;
 use Zephir\Passes\CallGathererPass;
 use Zephir\Passes\LocalContextPass;
 use Zephir\Passes\StaticTypeInference;
-
+use Zephir\StatementsBlock;
+use Zephir\SymbolTable;
+use Zephir\Variable;
 use function array_key_exists;
 use function count;
 use function in_array;
 use function is_array;
 use function is_object;
+use function Zephir\add_slashes;
 
 /**
  * Represents a class method
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index e24b5eea0b..5d51b83089 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -17,6 +17,7 @@
 use Zephir\Backend\Backend;
 use Zephir\Cache\FunctionCache;
 use Zephir\Class\ClassDefinition;
+use Zephir\Class\ClassMethod;
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
 use function in_array;
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index ba8975354c..9773e7103f 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -19,6 +19,7 @@
 use Zephir\Class\ClassConstant;
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassDefinitionRuntime;
+use Zephir\Class\ClassMethod;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
index fd06114317..60a68d0cc1 100644
--- a/Library/Expression/Closure.php
+++ b/Library/Expression/Closure.php
@@ -14,7 +14,7 @@
 namespace Zephir\Expression;
 
 use Zephir\Class\ClassDefinition;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\CompilationContext;
diff --git a/Library/Expression/ClosureArrow.php b/Library/Expression/ClosureArrow.php
index b78459a865..3e4a5d0b95 100644
--- a/Library/Expression/ClosureArrow.php
+++ b/Library/Expression/ClosureArrow.php
@@ -14,7 +14,7 @@
 namespace Zephir\Expression;
 
 use Zephir\Class\ClassDefinition;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
diff --git a/Library/FunctionDefinition.php b/Library/FunctionDefinition.php
index 125c5b5491..2eaf8095f3 100644
--- a/Library/FunctionDefinition.php
+++ b/Library/FunctionDefinition.php
@@ -13,6 +13,8 @@
 
 namespace Zephir;
 
+use Zephir\Class\ClassMethod;
+
 /**
  * Represents a function
  */
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index a1c905e940..3bc46588f0 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -12,6 +12,7 @@
 namespace Zephir;
 
 use ReflectionException;
+use Zephir\Class\ClassMethod;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index aa05503773..94b97e94b3 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -13,6 +13,7 @@
 
 use ReflectionException;
 use Zephir\Class\ClassDefinition;
+use Zephir\Class\ClassMethod;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 use function count;
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index b53efc279d..a4128dad81 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -16,7 +16,7 @@
 use Zephir\AliasManager;
 use Zephir\Class\ClassConstant;
 use Zephir\Class\ClassDefinition;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\CompilerFile;
diff --git a/Library/Stubs/MethodDocBlock.php b/Library/Stubs/MethodDocBlock.php
index 86a5e48cbb..134c2fb807 100644
--- a/Library/Stubs/MethodDocBlock.php
+++ b/Library/Stubs/MethodDocBlock.php
@@ -14,7 +14,7 @@
 namespace Zephir\Stubs;
 
 use Zephir\AliasManager;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\Types;
 
 /**
diff --git a/Library/Types.php b/Library/Types.php
index ffb1eff3f7..4055038f1a 100644
--- a/Library/Types.php
+++ b/Library/Types.php
@@ -11,6 +11,8 @@
 
 namespace Zephir;
 
+use Zephir\Class\ClassMethod;
+
 final class Types
 {
     const T_INT = 'int';
diff --git a/templates/Api/themes/zephir/partials/class/method-details.phtml b/templates/Api/themes/zephir/partials/class/method-details.phtml
index 578291f48e..3d6d7bc3cc 100644
--- a/templates/Api/themes/zephir/partials/class/method-details.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-details.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var Zephir\ClassMethod $method
+ * @var \Zephir\Class\ClassMethod $method
  */
 ?>
 
diff --git a/templates/Api/themes/zephir/partials/class/method-summary-params.phtml b/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
index f4f36fbf68..d83da6dcdd 100644
--- a/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var $method Zephir\ClassMethod
+ * @var $method \Zephir\Class\ClassMethod
  */
 
 if ($method->getParameters()) {
diff --git a/templates/Api/themes/zephir/partials/class/method-summary.phtml b/templates/Api/themes/zephir/partials/class/method-summary.phtml
index d41a9a47f3..861bc2c392 100644
--- a/templates/Api/themes/zephir/partials/class/method-summary.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-summary.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var string $classNamespace
- * @var Zephir\ClassMethod $method
+ * @var \Zephir\Class\ClassMethod $method
  */
 
 $allTypes = [];
diff --git a/templates/Api/themes/zephir/partials/namespace/method-details.phtml b/templates/Api/themes/zephir/partials/namespace/method-details.phtml
index 7a68b5bf23..42798632e9 100644
--- a/templates/Api/themes/zephir/partials/namespace/method-details.phtml
+++ b/templates/Api/themes/zephir/partials/namespace/method-details.phtml
@@ -1,6 +1,6 @@
 <?php
 
-/* @var $method Zephir\ClassMethod */
+/* @var $method \Zephir\Class\ClassMethod */
 
 ?>
 
@@ -16,7 +16,7 @@
                 <?= $method->isFinal() ? 'final' : '' ?>
                 <?= implode(" ",$method->getVisibility()) ?>
                 function <span class="method-name"><?= $method->getName() ?></span>(<?= $this->partial('partials/class/method-summary-params.phtml' ) ?>)
-                
+
                 <div>
                 <?= $method->getDocBlock() ?>
                 </div>
diff --git a/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml b/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml
index 78be6b6c80..f3349c4763 100644
--- a/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml
+++ b/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml
@@ -1,6 +1,6 @@
 <?php
 
-/* @var $method \Zephir\ClassMethod */
+/* @var $method \Zephir\Class\ClassMethod */
 
     if($method->getParameters()){
         $i=0;
diff --git a/templates/Api/themes/zephir/partials/namespace/method-summary.phtml b/templates/Api/themes/zephir/partials/namespace/method-summary.phtml
index 4196e7ae29..5be7c39029 100644
--- a/templates/Api/themes/zephir/partials/namespace/method-summary.phtml
+++ b/templates/Api/themes/zephir/partials/namespace/method-summary.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var $method Zephir\ClassMethod
+ * @var $method \Zephir\Class\ClassMethod
  */
 ?>
 
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index 58dcec1995..eb8a7d97e7 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -18,7 +18,7 @@
 use Zephir\AliasManager;
 use Zephir\Class\ClassConstant;
 use Zephir\Class\ClassDefinition;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\Stubs\Generator;
diff --git a/tests/Zephir/Stubs/MethodDocBlockTest.php b/tests/Zephir/Stubs/MethodDocBlockTest.php
index 0cc94ff988..c2b20b203a 100644
--- a/tests/Zephir/Stubs/MethodDocBlockTest.php
+++ b/tests/Zephir/Stubs/MethodDocBlockTest.php
@@ -16,7 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Zephir\AliasManager;
 use Zephir\Class\ClassDefinition;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\ClassMethodParameters;
 use Zephir\StatementsBlock;
 use Zephir\Stubs\MethodDocBlock;
diff --git a/tests/Zephir/TypesTest.php b/tests/Zephir/TypesTest.php
index 9867815e57..b60f1412eb 100644
--- a/tests/Zephir/TypesTest.php
+++ b/tests/Zephir/TypesTest.php
@@ -15,7 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Zephir\Class\ClassDefinition;
-use Zephir\ClassMethod;
+use Zephir\Class\ClassMethod;
 use Zephir\Types;
 
 final class TypesTest extends TestCase

From 4b0d2831cc0d2a36cad7d09bf112153423b3ceb2 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 16:43:47 +0100
Subject: [PATCH 057/375] #2407 - Move `ClassMethodParameters` class inside
 `Class/` directory

---
 Library/{ => Class}/ClassMethodParameters.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename Library/{ => Class}/ClassMethodParameters.php (99%)

diff --git a/Library/ClassMethodParameters.php b/Library/Class/ClassMethodParameters.php
similarity index 99%
rename from Library/ClassMethodParameters.php
rename to Library/Class/ClassMethodParameters.php
index da36d86acb..9c822ee315 100644
--- a/Library/ClassMethodParameters.php
+++ b/Library/Class/ClassMethodParameters.php
@@ -11,13 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Class;
 
 use ArrayAccess;
 use Countable;
 use Iterator;
 use Zephir\Exception\CompilerException;
-
 use function count;
 
 /**

From e36ad0cf92abf2858e68fb91a94e06a7420ab18b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 16:43:53 +0100
Subject: [PATCH 058/375] #2407 - Move `ClassMethodParameters` class inside
 `Class/` directory

---
 Library/ArgInfoDefinition.php             | 1 +
 Library/Class/ClassDefinition.php         | 1 -
 Library/Class/ClassMethod.php             | 1 -
 Library/CompilerFile.php                  | 1 +
 Library/Expression/Closure.php            | 2 +-
 Library/Expression/ClosureArrow.php       | 2 +-
 Library/FunctionDefinition.php            | 1 +
 Library/Stubs/Generator.php               | 2 +-
 tests/Zephir/Stubs/GeneratorTest.php      | 2 +-
 tests/Zephir/Stubs/MethodDocBlockTest.php | 2 +-
 10 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Library/ArgInfoDefinition.php b/Library/ArgInfoDefinition.php
index 2d327dc32d..1a2dd2f563 100644
--- a/Library/ArgInfoDefinition.php
+++ b/Library/ArgInfoDefinition.php
@@ -14,6 +14,7 @@
 namespace Zephir;
 
 use Zephir\Class\ClassMethod;
+use Zephir\Class\ClassMethodParameters;
 use function array_key_exists;
 use function count;
 
diff --git a/Library/Class/ClassDefinition.php b/Library/Class/ClassDefinition.php
index 704e20ef39..7287c2983b 100644
--- a/Library/Class/ClassDefinition.php
+++ b/Library/Class/ClassDefinition.php
@@ -18,7 +18,6 @@
 use Zephir\AbstractClassDefinition;
 use Zephir\AliasManager;
 use Zephir\ArgInfoDefinition;
-use Zephir\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
diff --git a/Library/Class/ClassMethod.php b/Library/Class/ClassMethod.php
index 9ebf45573b..55f2f1f3b8 100644
--- a/Library/Class/ClassMethod.php
+++ b/Library/Class/ClassMethod.php
@@ -18,7 +18,6 @@
 use Zephir\BranchManager;
 use Zephir\CacheManager;
 use Zephir\Class\Entry as ClassEntry;
-use Zephir\ClassMethodParameters;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
 use Zephir\Detectors\WriteDetector;
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 9773e7103f..17da857d34 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -20,6 +20,7 @@
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassDefinitionRuntime;
 use Zephir\Class\ClassMethod;
+use Zephir\Class\ClassMethodParameters;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
index 60a68d0cc1..ce742e78e1 100644
--- a/Library/Expression/Closure.php
+++ b/Library/Expression/Closure.php
@@ -15,7 +15,7 @@
 
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
-use Zephir\ClassMethodParameters;
+use Zephir\Class\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
diff --git a/Library/Expression/ClosureArrow.php b/Library/Expression/ClosureArrow.php
index 3e4a5d0b95..7b264dbb5e 100644
--- a/Library/Expression/ClosureArrow.php
+++ b/Library/Expression/ClosureArrow.php
@@ -15,7 +15,7 @@
 
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
-use Zephir\ClassMethodParameters;
+use Zephir\Class\ClassMethodParameters;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\CompilerFileAnonymous;
diff --git a/Library/FunctionDefinition.php b/Library/FunctionDefinition.php
index 2eaf8095f3..0199866348 100644
--- a/Library/FunctionDefinition.php
+++ b/Library/FunctionDefinition.php
@@ -14,6 +14,7 @@
 namespace Zephir;
 
 use Zephir\Class\ClassMethod;
+use Zephir\Class\ClassMethodParameters;
 
 /**
  * Represents a function
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index a4128dad81..3a25e55fb5 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -17,7 +17,7 @@
 use Zephir\Class\ClassConstant;
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
-use Zephir\ClassMethodParameters;
+use Zephir\Class\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\CompilerFile;
 use Zephir\Exception;
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index eb8a7d97e7..0bb9f7fb17 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -19,7 +19,7 @@
 use Zephir\Class\ClassConstant;
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
-use Zephir\ClassMethodParameters;
+use Zephir\Class\ClassMethodParameters;
 use Zephir\ClassProperty;
 use Zephir\Stubs\Generator;
 use function Zephir\is_windows;
diff --git a/tests/Zephir/Stubs/MethodDocBlockTest.php b/tests/Zephir/Stubs/MethodDocBlockTest.php
index c2b20b203a..0b9a704344 100644
--- a/tests/Zephir/Stubs/MethodDocBlockTest.php
+++ b/tests/Zephir/Stubs/MethodDocBlockTest.php
@@ -17,7 +17,7 @@
 use Zephir\AliasManager;
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
-use Zephir\ClassMethodParameters;
+use Zephir\Class\ClassMethodParameters;
 use Zephir\StatementsBlock;
 use Zephir\Stubs\MethodDocBlock;
 

From ba1c3204a3aa5f7d145be433d01ce8dac70362a8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 16:56:30 +0100
Subject: [PATCH 059/375] #2407 - Move `ClassProperty` class inside `Class/`
 directory

---
 Library/Class/ClassDefinition.php                      |  1 -
 Library/{ => Class}/ClassProperty.php                  | 10 ++++++++--
 Library/CompilerFile.php                               |  1 +
 Library/Expression/Closure.php                         |  2 +-
 Library/Expression/StaticPropertyAccess.php            |  3 +--
 Library/Statements/Let/StaticPropertyAppend.php        |  2 +-
 Library/Statements/Let/StaticPropertyArrayIndex.php    |  2 +-
 .../Statements/Let/StaticPropertyArrayIndexAppend.php  |  2 +-
 Library/Stubs/Generator.php                            |  2 +-
 tests/Zephir/Stubs/GeneratorTest.php                   |  2 +-
 10 files changed, 16 insertions(+), 11 deletions(-)
 rename Library/{ => Class}/ClassProperty.php (98%)

diff --git a/Library/Class/ClassDefinition.php b/Library/Class/ClassDefinition.php
index 7287c2983b..777edf5dc4 100644
--- a/Library/Class/ClassDefinition.php
+++ b/Library/Class/ClassDefinition.php
@@ -18,7 +18,6 @@
 use Zephir\AbstractClassDefinition;
 use Zephir\AliasManager;
 use Zephir\ArgInfoDefinition;
-use Zephir\ClassProperty;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
 use Zephir\Compiler;
diff --git a/Library/ClassProperty.php b/Library/Class/ClassProperty.php
similarity index 98%
rename from Library/ClassProperty.php
rename to Library/Class/ClassProperty.php
index d0a4888a5e..7c2e1a608b 100644
--- a/Library/ClassProperty.php
+++ b/Library/Class/ClassProperty.php
@@ -9,14 +9,20 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Zephir;
+declare(strict_types=1);
+
+namespace Zephir\Class;
 
 use ReflectionException;
-use Zephir\Class\ClassDefinition;
+use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
+use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\BinaryOperator;
 use Zephir\Expression\Builder\Statements\LetStatement as ExpressionLetStatement;
+use Zephir\StatementsBlock;
+use Zephir\Types;
 use function in_array;
 use function is_array;
 
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 17da857d34..2566e024b1 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -21,6 +21,7 @@
 use Zephir\Class\ClassDefinitionRuntime;
 use Zephir\Class\ClassMethod;
 use Zephir\Class\ClassMethodParameters;
+use Zephir\Class\ClassProperty;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
index ce742e78e1..65057c9a88 100644
--- a/Library/Expression/Closure.php
+++ b/Library/Expression/Closure.php
@@ -16,7 +16,7 @@
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
 use Zephir\Class\ClassMethodParameters;
-use Zephir\ClassProperty;
+use Zephir\Class\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\CompilerFileAnonymous;
diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
index 50a95d28e5..096c07b0ca 100644
--- a/Library/Expression/StaticPropertyAccess.php
+++ b/Library/Expression/StaticPropertyAccess.php
@@ -14,13 +14,12 @@
 namespace Zephir\Expression;
 
 use ReflectionException;
-use Zephir\ClassProperty;
+use Zephir\Class\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable;
-
 use function in_array;
 
 /**
diff --git a/Library/Statements/Let/StaticPropertyAppend.php b/Library/Statements/Let/StaticPropertyAppend.php
index 8303d5057e..b56620e940 100644
--- a/Library/Statements/Let/StaticPropertyAppend.php
+++ b/Library/Statements/Let/StaticPropertyAppend.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\ClassProperty;
+use Zephir\Class\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
diff --git a/Library/Statements/Let/StaticPropertyArrayIndex.php b/Library/Statements/Let/StaticPropertyArrayIndex.php
index 688524cd17..510c71b434 100644
--- a/Library/Statements/Let/StaticPropertyArrayIndex.php
+++ b/Library/Statements/Let/StaticPropertyArrayIndex.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\ClassProperty;
+use Zephir\Class\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
diff --git a/Library/Statements/Let/StaticPropertyArrayIndexAppend.php b/Library/Statements/Let/StaticPropertyArrayIndexAppend.php
index 14e76feaec..fa34b28584 100644
--- a/Library/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/Library/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\ClassProperty;
+use Zephir\Class\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index 3a25e55fb5..2037ce75dc 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -18,7 +18,7 @@
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
 use Zephir\Class\ClassMethodParameters;
-use Zephir\ClassProperty;
+use Zephir\Class\ClassProperty;
 use Zephir\CompilerFile;
 use Zephir\Exception;
 use function array_key_exists;
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index 0bb9f7fb17..11618e2a3d 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -20,7 +20,7 @@
 use Zephir\Class\ClassDefinition;
 use Zephir\Class\ClassMethod;
 use Zephir\Class\ClassMethodParameters;
-use Zephir\ClassProperty;
+use Zephir\Class\ClassProperty;
 use Zephir\Stubs\Generator;
 use function Zephir\is_windows;
 

From 2f563e5a4c0752fcc42b181677f813c0311fef43 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 17:31:43 +0100
Subject: [PATCH 060/375] #2407 - Remove `is_macos()` function

---
 Library/functions.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Library/functions.php b/Library/functions.php
index 98c997c68e..dbb29bf847 100644
--- a/Library/functions.php
+++ b/Library/functions.php
@@ -182,16 +182,6 @@ function is_windows()
     return 0 === stripos(PHP_OS, 'WIN');
 }
 
-/**
- * Checks if currently running under macOs.
- *
- * @return bool
- */
-function is_macos()
-{
-    return 0 === stripos(PHP_OS, 'DARWIN');
-}
-
 /**
  * Checks if current PHP is thread safe.
  *

From c0c740db55232c1b21a721dcab20775ee75defd4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 17:36:07 +0100
Subject: [PATCH 061/375] #2407 - Move Class related logic inside `Class/`
 directory

---
 Library/ArgInfoDefinition.php                 |  20 +-
 Library/Backend/Backend.php                   |  16 +-
 Library/Cache/MethodCache.php                 |   6 +-
 Library/Cache/SlotsCache.php                  |   6 +-
 .../Class/{ClassConstant.php => Constant.php} |  48 +--
 .../Definition/AbstractDefinition.php}        |  11 +-
 .../Definition.php}                           | 290 +++---------------
 .../DefinitionRuntime.php}                    |   6 +-
 Library/Class/Entry.php                       |   3 +-
 .../{ClassMethod.php => Method/Method.php}    |  43 +--
 .../Parameters.php}                           |  52 +---
 .../Class/{ClassProperty.php => Property.php} |  58 +---
 Library/CompilationContext.php                |  13 +-
 Library/Compiler.php                          |  18 +-
 Library/Compiler/FileInterface.php            |   4 +-
 Library/CompilerFile.php                      |  56 ++--
 Library/CompilerFileAnonymous.php             |  12 +-
 Library/Documentation.php                     |   6 +-
 Library/Documentation/File/ClassFile.php      |   4 +-
 Library/Documentation/File/ClassesFile.php    |   4 +-
 Library/Documentation/File/SourceFile.php     |   4 +-
 Library/Documentation/Template.php            |   4 +-
 Library/Expression/Closure.php                |  16 +-
 Library/Expression/ClosureArrow.php           |  12 +-
 Library/Expression/StaticConstantAccess.php   |   4 +-
 Library/Expression/StaticPropertyAccess.php   |   4 +-
 Library/FunctionDefinition.php                |  16 +-
 Library/MethodCall.php                        |   8 +-
 .../Statements/Let/StaticPropertyAppend.php   |   4 +-
 .../Let/StaticPropertyArrayIndex.php          |   4 +-
 .../Let/StaticPropertyArrayIndexAppend.php    |   4 +-
 Library/StaticCall.php                        |  24 +-
 Library/Stubs/Generator.php                   |  32 +-
 Library/Stubs/MethodDocBlock.php              |  16 +-
 Library/Types.php                             |   6 +-
 Library/Variable.php                          |  10 +-
 .../zephir/partials/class/content.phtml       |   2 +-
 .../partials/class/method-details.phtml       |   2 +-
 .../class/method-summary-params.phtml         |   2 +-
 .../partials/class/method-summary.phtml       |   2 +-
 .../partials/namespace/method-details.phtml   |   2 +-
 .../namespace/method-summary-params.phtml     |   2 +-
 .../partials/namespace/method-summary.phtml   |   2 +-
 .../Api/themes/zephir/partials/source.phtml   |   2 +-
 tests/Zephir/Stubs/GeneratorTest.php          |  34 +-
 tests/Zephir/Stubs/MethodDocBlockTest.php     |  20 +-
 tests/Zephir/TypesTest.php                    |  10 +-
 tests/Zephir/VariableTest.php                 |   4 +-
 48 files changed, 309 insertions(+), 619 deletions(-)
 rename Library/Class/{ClassConstant.php => Constant.php} (77%)
 rename Library/{AbstractClassDefinition.php => Class/Definition/AbstractDefinition.php} (71%)
 rename Library/Class/{ClassDefinition.php => Definition/Definition.php} (87%)
 rename Library/Class/{ClassDefinitionRuntime.php => Definition/DefinitionRuntime.php} (76%)
 rename Library/Class/{ClassMethod.php => Method/Method.php} (98%)
 rename Library/Class/{ClassMethodParameters.php => Method/Parameters.php} (75%)
 rename Library/Class/{ClassProperty.php => Property.php} (92%)

diff --git a/Library/ArgInfoDefinition.php b/Library/ArgInfoDefinition.php
index 1a2dd2f563..4af5842ef7 100644
--- a/Library/ArgInfoDefinition.php
+++ b/Library/ArgInfoDefinition.php
@@ -13,8 +13,8 @@
 
 namespace Zephir;
 
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use function array_key_exists;
 use function count;
 
@@ -26,7 +26,7 @@ class ArgInfoDefinition
     private bool $returnByRef;
 
     /**
-     * @var ClassMethod|FunctionDefinition
+     * @var Method|FunctionDefinition
      */
     private $functionLike;
 
@@ -36,9 +36,9 @@ class ArgInfoDefinition
     private string $name;
 
     /**
-     * @var ClassMethodParameters|null
+     * @var Parameters|null
      */
-    private ?ClassMethodParameters $parameters;
+    private ?Parameters $parameters;
 
     /**
      * @var CodePrinter
@@ -62,17 +62,17 @@ class ArgInfoDefinition
 
     /**
      * @param string             $name
-     * @param ClassMethod        $functionLike
+     * @param Method        $functionLike
      * @param CodePrinter        $codePrinter
      * @param CompilationContext $compilationContext
      * @param bool               $returnByRef
      */
     public function __construct(
-        string $name,
-        ClassMethod $functionLike,
-        CodePrinter $codePrinter,
+        string             $name,
+        Method             $functionLike,
+        CodePrinter        $codePrinter,
         CompilationContext $compilationContext,
-        bool $returnByRef = false
+        bool               $returnByRef = false
     ) {
         $this->functionLike = $functionLike;
         $this->codePrinter = $codePrinter;
diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 8886d6b699..a80a930d89 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -13,8 +13,8 @@
 
 namespace Zephir\Backend;
 
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Method;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -307,7 +307,7 @@ public function getTypeofCondition(
         return $condition;
     }
 
-    public function onPreInitVar(ClassMethod $method): string
+    public function onPreInitVar(Method $method): string
     {
         if (!$method instanceof FunctionDefinition && !$method->isInternal()) {
             return "zval *this_ptr = getThis();\n"; //TODO: think about a better way to solve this.
@@ -316,7 +316,7 @@ public function onPreInitVar(ClassMethod $method): string
         return '';
     }
 
-    public function onPreCompile(ClassMethod $method, CompilationContext $context): void
+    public function onPreCompile(Method $method, CompilationContext $context): void
     {
         /**
          * Initialize the properties within create_object, handler code
@@ -331,7 +331,7 @@ public function onPreCompile(ClassMethod $method, CompilationContext $context):
         }
     }
 
-    public function onPostCompile(ClassMethod $method, CompilationContext $context): void
+    public function onPostCompile(Method $method, CompilationContext $context): void
     {
         if (str_starts_with($method->getName(), 'zephir_init_properties')) {
             $context->codePrinter->increaseLevel();
@@ -505,12 +505,12 @@ public function declareConstant($type, $name, $value, CompilationContext $contex
     }
 
     /**
-     * @param ClassMethod        $method
+     * @param Method        $method
      * @param CompilationContext $context
      *
      * @return string
      */
-    public function getInternalSignature(ClassMethod $method, CompilationContext $context): string
+    public function getInternalSignature(Method $method, CompilationContext $context): string
     {
         if ($method->isInitializer() && !$method->isStatic()) {
             return 'zend_object *'.$method->getName().'(zend_class_entry *class_type)';
@@ -922,7 +922,7 @@ public function fetchProperty(
 
     /**
      * @param Variable $symbolVariable
-     * @param ClassDefinition $classDefinition
+     * @param Definition $classDefinition
      * @param $property
      * @param bool $readOnly
      * @param CompilationContext $context
diff --git a/Library/Cache/MethodCache.php b/Library/Cache/MethodCache.php
index 677b06d4e3..23bb745e3a 100644
--- a/Library/Cache/MethodCache.php
+++ b/Library/Cache/MethodCache.php
@@ -15,7 +15,7 @@
 
 use ReflectionClass;
 use ReflectionException;
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Passes\CallGathererPass;
 use Zephir\Variable;
@@ -167,13 +167,13 @@ public function get(CompilationContext $compilationContext, string $methodName,
     /**
      * Checks if the class is suitable for caching.
      *
-     * @param ClassDefinition|ReflectionClass|null $classDefinition
+     * @param Definition|ReflectionClass|null $classDefinition
      *
      * @return bool
      */
     private function isClassCacheable($classDefinition = null): bool
     {
-        if ($classDefinition instanceof ClassDefinition) {
+        if ($classDefinition instanceof Definition) {
             return true;
         }
 
diff --git a/Library/Cache/SlotsCache.php b/Library/Cache/SlotsCache.php
index 96ef578dbb..094b8baa70 100644
--- a/Library/Cache/SlotsCache.php
+++ b/Library/Cache/SlotsCache.php
@@ -13,7 +13,7 @@
 
 namespace Zephir\Cache;
 
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Method\Method;
 
 /**
  * In order to reduce memory allocation when calling functions and method_exists
@@ -64,7 +64,7 @@ public static function getExistingFunctionSlot(string $functionName): int
     /**
      * Returns or creates a cache slot for a method.
      */
-    public static function getMethodSlot(ClassMethod $method): int
+    public static function getMethodSlot(Method $method): int
     {
         $className = $method->getClassDefinition()->getCompleteName();
         $methodName = $method->getName();
@@ -86,7 +86,7 @@ public static function getMethodSlot(ClassMethod $method): int
     /**
      * Returns a cache slot for a method.
      */
-    public static function getExistingMethodSlot(ClassMethod $method): int
+    public static function getExistingMethodSlot(Method $method): int
     {
         $className = $method->getClassDefinition()->getCompleteName();
         $methodName = $method->getName();
diff --git a/Library/Class/ClassConstant.php b/Library/Class/Constant.php
similarity index 77%
rename from Library/Class/ClassConstant.php
rename to Library/Class/Constant.php
index 6245155b6d..1b96b66132 100644
--- a/Library/Class/ClassConstant.php
+++ b/Library/Class/Constant.php
@@ -22,39 +22,17 @@
 /**
  * Represents a class constant
  */
-class ClassConstant
+class Constant
 {
-    /**
-     * @var string
-     */
-    protected string $name;
-
-    /**
-     * @var array
-     */
-    protected array $value = [];
-
-    /**
-     * @var string|null
-     */
-    protected ?string $docblock = null;
-
-    /**
-     * @param string      $name
-     * @param array       $value
-     * @param string|null $docBlock
-     */
-    public function __construct(string $name, array $value, ?string $docBlock = null)
-    {
-        $this->name = $name;
-        $this->value = $value;
-        $this->docblock = $docBlock;
+    public function __construct(
+        protected string $name,
+        protected array $value,
+        protected ?string $docblock = null,
+    ) {
     }
 
     /**
      * Returns the constant's name.
-     *
-     * @return string
      */
     public function getName(): string
     {
@@ -63,8 +41,6 @@ public function getName(): string
 
     /**
      * Returns the constant's value.
-     *
-     * @return array
      */
     public function getValue(): array
     {
@@ -73,8 +49,6 @@ public function getValue(): array
 
     /**
      * Get the type of the value of the constant.
-     *
-     * @return string
      */
     public function getValueType(): string
     {
@@ -83,8 +57,6 @@ public function getValueType(): string
 
     /**
      * Get value of the value of the constant.
-     *
-     * @return mixed
      */
     public function getValueValue(): mixed
     {
@@ -93,8 +65,6 @@ public function getValueValue(): mixed
 
     /**
      * Returns the docblock related to the constant.
-     *
-     * @return string|null
      */
     public function getDocBlock(): ?string
     {
@@ -103,8 +73,6 @@ public function getDocBlock(): ?string
 
     /**
      * Get type of class constant.
-     *
-     * @return string
      */
     public function getType(): string
     {
@@ -114,8 +82,6 @@ public function getType(): string
     /**
      * Process the value of the class constant if needed.
      *
-     * @param CompilationContext $compilationContext
-     *
      * @throws Exception
      * @throws ReflectionException
      */
@@ -145,8 +111,6 @@ public function processValue(CompilationContext $compilationContext): void
     /**
      * Produce the code to register a class constant.
      *
-     * @param CompilationContext $compilationContext
-     *
      * @throws Exception
      * @throws ReflectionException
      */
diff --git a/Library/AbstractClassDefinition.php b/Library/Class/Definition/AbstractDefinition.php
similarity index 71%
rename from Library/AbstractClassDefinition.php
rename to Library/Class/Definition/AbstractDefinition.php
index d6750ccb03..f36fc47dd3 100644
--- a/Library/AbstractClassDefinition.php
+++ b/Library/Class/Definition/AbstractDefinition.php
@@ -11,22 +11,15 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Class\Definition;
 
-abstract class AbstractClassDefinition
+abstract class AbstractDefinition
 {
     /**
      * Class name
-     *
-     * @var string
      */
     protected string $name;
 
-    /**
-     * Returns the class name.
-     *
-     * @return string
-     */
     public function getName(): string
     {
         return $this->name;
diff --git a/Library/Class/ClassDefinition.php b/Library/Class/Definition/Definition.php
similarity index 87%
rename from Library/Class/ClassDefinition.php
rename to Library/Class/Definition/Definition.php
index 777edf5dc4..ea7735afd5 100644
--- a/Library/Class/ClassDefinition.php
+++ b/Library/Class/Definition/Definition.php
@@ -11,13 +11,17 @@
 
 declare(strict_types=1);
 
-namespace Zephir\Class;
+namespace Zephir\Class\Definition;
 
 use ReflectionClass;
 use ReflectionException;
-use Zephir\AbstractClassDefinition;
 use Zephir\AliasManager;
 use Zephir\ArgInfoDefinition;
+use Zephir\Class\Property;
+use Zephir\Class\Constant;
+use Zephir\Class\Entry;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
 use Zephir\Compiler;
@@ -36,151 +40,94 @@
 /**
  * Represents a class/interface and their properties and methods.
  */
-final class ClassDefinition extends AbstractClassDefinition
+final class Definition extends AbstractDefinition
 {
     public const TYPE_CLASS = 'class';
     public const TYPE_INTERFACE = 'interface';
 
-    /**
-     * Class namespace
-     *
-     * @var string
-     */
-    protected string $namespace;
-
     /**
      * Class short name
      *
-     * If didn't specified, then equals to $name
+     * If didn't specify, then equals to $name
      *
-     * @var string
-     *
-     * @see ClassDefinition::name
+     * @see Definition::name
      */
     protected string $shortName;
 
     /**
      * Definition type
-     *
-     * @var string
      */
     protected string $type = self::TYPE_CLASS;
 
     /**
      * Name of inherited class
-     *
-     * @var string|null
      */
     protected ?string $extendsClass = null;
 
     /**
      * List of implemented interfaces of current class
-     *
-     * @var array
      */
     protected array $interfaces = [];
 
     /**
      * Contains "final" in the definition
-     *
-     * @var bool
      */
     protected bool $final = false;
 
     /**
      * Contains "abstract" in the definition
-     *
-     * @var bool
      */
     protected bool $abstract = false;
 
     /**
      * When class is from external dependency
-     *
-     * @var bool
      */
     protected bool $external = false;
 
     /**
      * Definition object of inherited class
-     *
-     * @var AbstractClassDefinition|null
      */
-    protected ?AbstractClassDefinition $extendsClassDefinition = null;
+    protected ?AbstractDefinition $extendsClassDefinition = null;
 
-    /**
-     * @var AbstractClassDefinition[]
-     */
     protected array $implementedInterfaceDefinitions = [];
 
     /**
-     * @var ClassProperty[]
+     * @var Property[]
      */
     protected array $properties = [];
 
     /**
-     * @var ClassConstant[]
+     * @var Constant[]
      */
     protected array $constants = [];
 
     /**
-     * @var ClassMethod[]
+     * @var Method[]
      */
     protected array $methods = [];
 
-    /**
-     * @var string
-     */
     protected string $docBlock = '';
 
-    /**
-     * @var Docblock|null
-     */
     protected ?Docblock $parsedDocblock = null;
 
-    /**
-     * @var int
-     */
     protected int $dependencyRank = 0;
 
-    /**
-     * @var array
-     */
     protected array $originalNode = [];
 
-    /**
-     * @var bool
-     */
     protected bool $isBundled = false;
 
-    /**
-     * @var AliasManager|null
-     */
     protected ?AliasManager $aliasManager = null;
 
-    /**
-     * @var Compiler
-     */
     protected Compiler $compiler;
 
-    /**
-     * ClassDefinition.
-     *
-     * @param string      $namespace
-     * @param string      $name
-     * @param string|null $shortName
-     */
-    public function __construct(string $namespace, string $name, ?string $shortName = null)
+    public function __construct(protected string $namespace, string $name, ?string $shortName = null)
     {
-        $this->namespace = $namespace;
         $this->name = $name;
         $this->shortName = $shortName ?: $name;
     }
 
     /**
      * Sets if the class is internal or not.
-     *
-     * @param bool $isBundled
      */
     public function setIsBundled(bool $isBundled): void
     {
@@ -189,8 +136,6 @@ public function setIsBundled(bool $isBundled): void
 
     /**
      * Returns whether the class is bundled or not.
-     *
-     * @return bool
      */
     public function isBundled(): bool
     {
@@ -199,8 +144,6 @@ public function isBundled(): bool
 
     /**
      * Sets whether the class is external or not.
-     *
-     * @param bool $isExternal
      */
     public function setIsExternal(bool $isExternal): void
     {
@@ -209,8 +152,6 @@ public function setIsExternal(bool $isExternal): void
 
     /**
      * Returns whether the class is internal or not.
-     *
-     * @return bool
      */
     public function isExternal(): bool
     {
@@ -219,8 +160,6 @@ public function isExternal(): bool
 
     /**
      * Set the class' type (class/interface).
-     *
-     * @param string $type
      */
     public function setType(string $type): void
     {
@@ -229,8 +168,6 @@ public function setType(string $type): void
 
     /**
      * Returns the class type.
-     *
-     * @return string
      */
     public function getType(): string
     {
@@ -239,8 +176,6 @@ public function getType(): string
 
     /**
      * Returns the class name without namespace.
-     *
-     * @return string
      */
     public function getShortName(): string
     {
@@ -249,8 +184,6 @@ public function getShortName(): string
 
     /**
      * Check if the class definition correspond to an interface.
-     *
-     * @return bool
      */
     public function isInterface(): bool
     {
@@ -259,8 +192,6 @@ public function isInterface(): bool
 
     /**
      * Sets if the class is final.
-     *
-     * @param bool $final
      */
     public function setIsFinal(bool $final): void
     {
@@ -269,8 +200,6 @@ public function setIsFinal(bool $final): void
 
     /**
      * Sets if the class is final.
-     *
-     * @param bool $abstract
      */
     public function setIsAbstract(bool $abstract): void
     {
@@ -279,8 +208,6 @@ public function setIsAbstract(bool $abstract): void
 
     /**
      * Checks whether the class is abstract or not.
-     *
-     * @return bool
      */
     public function isAbstract(): bool
     {
@@ -289,8 +216,6 @@ public function isAbstract(): bool
 
     /**
      * Checks whether the class is abstract or not.
-     *
-     * @return bool
      */
     public function isFinal(): bool
     {
@@ -299,8 +224,6 @@ public function isFinal(): bool
 
     /**
      * Returns the class name including its namespace.
-     *
-     * @return string
      */
     public function getCompleteName(): string
     {
@@ -309,8 +232,6 @@ public function getCompleteName(): string
 
     /**
      * Return the class namespace.
-     *
-     * @return string
      */
     public function getNamespace(): string
     {
@@ -319,8 +240,6 @@ public function getNamespace(): string
 
     /**
      * Set the original node where the class was declared.
-     *
-     * @param array $originalNode
      */
     public function setOriginalNode(array $originalNode): void
     {
@@ -329,8 +248,6 @@ public function setOriginalNode(array $originalNode): void
 
     /**
      * Sets the extended class.
-     *
-     * @param string $extendsClass
      */
     public function setExtendsClass(string $extendsClass): void
     {
@@ -339,8 +256,6 @@ public function setExtendsClass(string $extendsClass): void
 
     /**
      * Sets the implemented interfaces.
-     *
-     * @param array $implementedInterfaces
      */
     public function setImplementsInterfaces(array $implementedInterfaces): void
     {
@@ -352,8 +267,6 @@ public function setImplementsInterfaces(array $implementedInterfaces): void
 
     /**
      * Returns the extended class.
-     *
-     * @return string|null
      */
     public function getExtendsClass(): ?string
     {
@@ -362,8 +275,6 @@ public function getExtendsClass(): ?string
 
     /**
      * Returns the implemented interfaces.
-     *
-     * @return array
      */
     public function getImplementedInterfaces(): array
     {
@@ -372,20 +283,16 @@ public function getImplementedInterfaces(): array
 
     /**
      * Sets the class definition for the extended class.
-     *
-     * @param AbstractClassDefinition $classDefinition
      */
-    public function setExtendsClassDefinition(AbstractClassDefinition $classDefinition): void
+    public function setExtendsClassDefinition(AbstractDefinition $classDefinition): void
     {
         $this->extendsClassDefinition = $classDefinition;
     }
 
     /**
      * Returns the class definition related to the extended class.
-     *
-     * @return AbstractClassDefinition|null
      */
-    public function getExtendsClassDefinition(): ?AbstractClassDefinition
+    public function getExtendsClassDefinition(): ?AbstractDefinition
     {
         if (!$this->extendsClassDefinition && $this->extendsClass && $this->compiler) {
             $this->setExtendsClassDefinition($this->compiler->getClassDefinition($this->extendsClass));
@@ -396,18 +303,14 @@ public function getExtendsClassDefinition(): ?AbstractClassDefinition
 
     /**
      * Sets the class definition for the implemented interfaces.
-     *
-     * @param AbstractClassDefinition[] $implementedInterfaceDefinitions
      */
-    public function setImplementedInterfaceDefinitions(array $implementedInterfaceDefinitions)
+    public function setImplementedInterfaceDefinitions(array $implementedInterfaceDefinitions): void
     {
         $this->implementedInterfaceDefinitions = $implementedInterfaceDefinitions;
     }
 
     /**
      * Returns the class definition for the implemented interfaces.
-     *
-     * @return AbstractClassDefinition[]
      */
     public function getImplementedInterfaceDefinitions(): array
     {
@@ -416,8 +319,6 @@ public function getImplementedInterfaceDefinitions(): array
 
     /**
      * Calculate the dependency rank of the class based on its dependencies.
-     *
-     * @return AbstractClassDefinition[]
      */
     public function getDependencies(): array
     {
@@ -447,8 +348,6 @@ public function increaseDependencyRank(int $rank): void
 
     /**
      * Returns the dependency rank for this class.
-     *
-     * @return int
      */
     public function getDependencyRank(): int
     {
@@ -457,8 +356,6 @@ public function getDependencyRank(): int
 
     /**
      * Sets the class/interface docBlock.
-     *
-     * @param string $docBlock
      */
     public function setDocBlock(string $docBlock): void
     {
@@ -467,8 +364,6 @@ public function setDocBlock(string $docBlock): void
 
     /**
      * Returns the class/interface docBlock.
-     *
-     * @return string
      */
     public function getDocBlock(): string
     {
@@ -477,8 +372,6 @@ public function getDocBlock(): string
 
     /**
      * Returns the parsed docBlock.
-     *
-     * @return DocBlock|null
      */
     public function getParsedDocBlock(): ?DocBlock
     {
@@ -498,11 +391,9 @@ public function getParsedDocBlock(): ?DocBlock
     /**
      * Adds a property to the definition.
      *
-     * @param ClassProperty $property
-     *
      * @throws CompilerException
      */
-    public function addProperty(ClassProperty $property): void
+    public function addProperty(Property $property): void
     {
         if (isset($this->properties[$property->getName()])) {
             throw new CompilerException("Property '".$property->getName()."' was defined more than one time", $property->getOriginal());
@@ -514,11 +405,9 @@ public function addProperty(ClassProperty $property): void
     /**
      * Adds a constant to the definition.
      *
-     * @param ClassConstant $constant
-     *
      * @throws CompilerException
      */
-    public function addConstant(ClassConstant $constant)
+    public function addConstant(Constant $constant): void
     {
         if (isset($this->constants[$constant->getName()])) {
             throw new CompilerException("Constant '".$constant->getName()."' was defined more than one time");
@@ -529,10 +418,6 @@ public function addConstant(ClassConstant $constant)
 
     /**
      * Checks if a class definition has a property.
-     *
-     * @param string $name
-     *
-     * @return bool
      */
     public function hasProperty(string $name): bool
     {
@@ -550,9 +435,9 @@ public function hasProperty(string $name): bool
      *
      * @param string $propertyName
      *
-     * @return ClassProperty|null
+     * @return Property|null
      */
-    public function getProperty(string $propertyName): ?ClassProperty
+    public function getProperty(string $propertyName): ?Property
     {
         if (isset($this->properties[$propertyName])) {
             return $this->properties[$propertyName];
@@ -568,10 +453,6 @@ public function getProperty(string $propertyName): ?ClassProperty
 
     /**
      * Checks if class definition has a property.
-     *
-     * @param string $name
-     *
-     * @return bool
      */
     public function hasConstant(string $name): bool
     {
@@ -593,13 +474,9 @@ public function hasConstant(string $name): bool
     /**
      * Returns a constant definition by its name.
      *
-     * @param string $constantName
-     *
-     * @return ClassConstant|null
-     *
      * @throws InvalidArgumentException
      */
-    public function getConstant(string $constantName): ?ClassConstant
+    public function getConstant(string $constantName): ?Constant
     {
         if (isset($this->constants[$constantName])) {
             return $this->constants[$constantName];
@@ -619,12 +496,9 @@ public function getConstant(string $constantName): ?ClassConstant
     /**
      * Adds a method to the class definition.
      *
-     * @param ClassMethod $method
-     * @param array|null  $statement
-     *
      * @throws CompilerException
      */
-    public function addMethod(ClassMethod $method, ?array $statement = null)
+    public function addMethod(Method $method, ?array $statement = null): void
     {
         $methodName = strtolower($method->getName());
         if (isset($this->methods[$methodName])) {
@@ -637,12 +511,9 @@ public function addMethod(ClassMethod $method, ?array $statement = null)
     /**
      * Updates an existing method definition.
      *
-     * @param ClassMethod $method
-     * @param array|null  $statement
-     *
      * @throws CompilerException
      */
-    public function updateMethod(ClassMethod $method, ?array $statement = null): void
+    public function updateMethod(Method $method, ?array $statement = null): void
     {
         $methodName = strtolower($method->getName());
         if (!isset($this->methods[$methodName])) {
@@ -655,7 +526,7 @@ public function updateMethod(ClassMethod $method, ?array $statement = null): voi
     /**
      * Returns all properties defined in the class.
      *
-     * @return ClassProperty[]
+     * @return Property[]
      */
     public function getProperties(): array
     {
@@ -665,7 +536,7 @@ public function getProperties(): array
     /**
      * Returns all constants defined in the class.
      *
-     * @return ClassConstant[]
+     * @return Constant[]
      */
     public function getConstants(): array
     {
@@ -675,7 +546,7 @@ public function getConstants(): array
     /**
      * Returns all methods defined in the class.
      *
-     * @return ClassMethod[]
+     * @return Method[]
      */
     public function getMethods(): array
     {
@@ -683,7 +554,7 @@ public function getMethods(): array
     }
 
     /**
-     * Checks if the class implements an specific name.
+     * Checks if the class implements a specific name.
      *
      * @param string $methodName
      *
@@ -699,7 +570,7 @@ public function hasMethod(string $methodName): bool
         }
 
         $extendsClassDefinition = $this->getExtendsClassDefinition();
-        if ($extendsClassDefinition instanceof ClassDefinitionRuntime) {
+        if ($extendsClassDefinition instanceof DefinitionRuntime) {
             try {
                 $extendsClassDefinition = $this->compiler->getInternalClassDefinition(
                     $extendsClassDefinition->getName()
@@ -723,13 +594,8 @@ public function hasMethod(string $methodName): bool
 
     /**
      * Returns a method by its name.
-     *
-     * @param string $methodName
-     * @param bool   $checkExtends
-     *
-     * @return ClassMethod|null
      */
-    public function getMethod(string $methodName, bool $checkExtends = true): ?ClassMethod
+    public function getMethod(string $methodName, bool $checkExtends = true): ?Method
     {
         $methodNameLower = strtolower($methodName);
         foreach ($this->methods as $name => $method) {
@@ -754,31 +620,14 @@ public function getMethod(string $methodName, bool $checkExtends = true): ?Class
 
     /**
      * Set a method and its body.
-     *
-     * @param string      $methodName
-     * @param ClassMethod $method
      */
-    public function setMethod(string $methodName, ClassMethod $method): void
+    public function setMethod(string $methodName, Method $method): void
     {
         $this->methods[$methodName] = $method;
     }
 
-    /**
-     * Sets class methods externally.
-     *
-     * @param array $methods
-     */
-    public function setMethods(array $methods): void
-    {
-        $this->methods = $methods;
-    }
-
     /**
      * Tries to find the most similar name.
-     *
-     * @param string $methodName
-     *
-     * @return string|null
      */
     public function getPossibleMethodName(string $methodName): ?string
     {
@@ -800,11 +649,7 @@ public function getPossibleMethodName(string $methodName): ?string
     /**
      * Returns the name of the zend_class_entry according to the class name.
      *
-     * @param CompilationContext|null $compilationContext
-     *
      * @throws Exception
-     *
-     * @return string
      */
     public function getClassEntry(?CompilationContext $compilationContext = null): string
     {
@@ -826,8 +671,6 @@ public function getClassEntry(?CompilationContext $compilationContext = null): s
 
     /**
      * Returns a valid namespace to be used in C-sources.
-     *
-     * @return string
      */
     public function getCNamespace(): string
     {
@@ -836,8 +679,6 @@ public function getCNamespace(): string
 
     /**
      * Returns a valid namespace to be used in C-sources.
-     *
-     * @return string
      */
     public function getNCNamespace(): string
     {
@@ -846,10 +687,6 @@ public function getNCNamespace(): string
 
     /**
      * Class name without namespace prefix for class registration.
-     *
-     * @param string $namespace
-     *
-     * @return string
      */
     public function getSCName(string $namespace): string
     {
@@ -858,8 +695,6 @@ public function getSCName(string $namespace): string
 
     /**
      * Returns an absolute location to the class header.
-     *
-     * @return string
      */
     public function getExternalHeader(): string
     {
@@ -871,12 +706,9 @@ public function getExternalHeader(): string
     /**
      * Checks if a class implements an interface.
      *
-     * @param ClassDefinition $classDefinition
-     * @param ClassDefinition $interfaceDefinition
-     *
      * @throws CompilerException
      */
-    public function checkInterfaceImplements(self $classDefinition, self $interfaceDefinition)
+    public function checkInterfaceImplements(self $classDefinition, self $interfaceDefinition): void
     {
         foreach ($interfaceDefinition->getMethods() as $method) {
             if (!$classDefinition->hasMethod($method->getName())) {
@@ -913,11 +745,9 @@ public function checkInterfaceImplements(self $classDefinition, self $interfaceD
     /**
      * Pre-compiles a class/interface gathering method information required by other methods.
      *
-     * @param CompilationContext $compilationContext
-     *
      * @throws CompilerException
      */
-    public function preCompile(CompilationContext $compilationContext)
+    public function preCompile(CompilationContext $compilationContext): void
     {
         $this->compiler = $compilationContext->compiler;
 
@@ -933,10 +763,8 @@ public function preCompile(CompilationContext $compilationContext)
 
     /**
      * Returns the initialization method if any does exist.
-     *
-     * @return ClassMethod|null
      */
-    public function getInitMethod(): ?ClassMethod
+    public function getInitMethod(): ?Method
     {
         $initClassName = $this->getCNamespace().'_'.$this->getName();
 
@@ -945,10 +773,8 @@ public function getInitMethod(): ?ClassMethod
 
     /**
      * Returns the initialization method if any does exist.
-     *
-     * @return ClassMethod|null
      */
-    public function getStaticInitMethod(): ?ClassMethod
+    public function getStaticInitMethod(): ?Method
     {
         $initClassName = $this->getCNamespace().'_'.$this->getName();
 
@@ -957,10 +783,8 @@ public function getStaticInitMethod(): ?ClassMethod
 
     /**
      * Returns the initialization method if any does exist.
-     *
-     * @return ClassMethod|null
      */
-    public function getLocalOrParentInitMethod(): ?ClassMethod
+    public function getLocalOrParentInitMethod(): ?Method
     {
         $method = $this->getInitMethod();
         if ($method === null) {
@@ -970,7 +794,7 @@ public function getLocalOrParentInitMethod(): ?ClassMethod
         $parentClassDefinition = $this->getExtendsClassDefinition();
         if ($parentClassDefinition instanceof self) {
             $method = $parentClassDefinition->getInitMethod();
-            if ($method instanceof ClassMethod) {
+            if ($method instanceof Method) {
                 $this->addInitMethod($method->getStatementsBlock());
             }
         }
@@ -980,8 +804,6 @@ public function getLocalOrParentInitMethod(): ?ClassMethod
 
     /**
      * Creates the initialization method.
-     *
-     * @param StatementsBlock $statementsBlock
      */
     public function addInitMethod(StatementsBlock $statementsBlock): void
     {
@@ -990,7 +812,7 @@ public function addInitMethod(StatementsBlock $statementsBlock): void
         }
 
         $initClassName = $this->getCNamespace().'_'.$this->getName();
-        $classMethod = new ClassMethod(
+        $classMethod = new Method(
             $this,
             ['internal'],
             'zephir_init_properties_'.$initClassName,
@@ -1004,14 +826,12 @@ public function addInitMethod(StatementsBlock $statementsBlock): void
 
     /**
      * Creates the static initialization method.
-     *
-     * @param StatementsBlock $statementsBlock
      */
     public function addStaticInitMethod(StatementsBlock $statementsBlock): void
     {
         $initClassName = $this->getCNamespace().'_'.$this->getName();
 
-        $classMethod = new ClassMethod(
+        $classMethod = new Method(
             $this,
             ['internal'],
             'zephir_init_static_properties_'.$initClassName,
@@ -1027,8 +847,6 @@ public function addStaticInitMethod(StatementsBlock $statementsBlock): void
     /**
      * Compiles a class/interface.
      *
-     * @param CompilationContext $compilationContext
-     *
      * @throws Exception
      * @throws ReflectionException
      */
@@ -1413,17 +1231,11 @@ public function compile(CompilationContext $compilationContext): void
         $compilationContext->headerPrinter = $codePrinter;
     }
 
-    /**
-     * @return AliasManager|null
-     */
     public function getAliasManager(): ?AliasManager
     {
         return $this->aliasManager;
     }
 
-    /**
-     * @param AliasManager $aliasManager
-     */
     public function setAliasManager(AliasManager $aliasManager): void
     {
         $this->aliasManager = $aliasManager;
@@ -1431,10 +1243,6 @@ public function setAliasManager(AliasManager $aliasManager): void
 
     /**
      * Builds a class definition from reflection.
-     *
-     * @param ReflectionClass $class
-     *
-     * @return ClassDefinition
      */
     public static function buildFromReflection(ReflectionClass $class): self
     {
@@ -1464,11 +1272,11 @@ public static function buildFromReflection(ReflectionClass $class): self
                 $parameters[] = $params;
             }
 
-            $classMethod = new ClassMethod(
+            $classMethod = new Method(
                 $classDefinition,
                 [],
                 $method->getName(),
-                new ClassMethodParameters($parameters)
+                new Parameters($parameters)
             );
             $classMethod->setIsStatic($method->isStatic());
             $classMethod->setIsBundled(true);
@@ -1477,7 +1285,7 @@ public static function buildFromReflection(ReflectionClass $class): self
 
         foreach ($class->getConstants() as $constantName => $constantValue) {
             $type = self::convertPhpConstantType(gettype($constantValue));
-            $classConstant = new ClassConstant($constantName, ['value' => $constantValue, 'type' => $type], null);
+            $classConstant = new Constant($constantName, ['value' => $constantValue, 'type' => $type], null);
             $classDefinition->addConstant($classConstant);
         }
 
@@ -1500,7 +1308,7 @@ public static function buildFromReflection(ReflectionClass $class): self
                 $visibility[] = 'static';
             }
 
-            $classProperty = new ClassProperty(
+            $classProperty = new Property(
                 $classDefinition,
                 $visibility,
                 $property->getName(),
@@ -1516,11 +1324,6 @@ public static function buildFromReflection(ReflectionClass $class): self
         return $classDefinition;
     }
 
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
     protected function hasConstantFromInterfaces(string $name): bool
     {
         if ($interfaces = $this->getImplementedInterfaceDefinitions()) {
@@ -1534,12 +1337,7 @@ protected function hasConstantFromInterfaces(string $name): bool
         return false;
     }
 
-    /**
-     * @param string $name
-     *
-     * @return ClassConstant|null
-     */
-    protected function getConstantFromInterfaces(string $name): ?ClassConstant
+    protected function getConstantFromInterfaces(string $name): ?Constant
     {
         if ($interfaces = $this->getImplementedInterfaceDefinitions()) {
             foreach ($interfaces as $interface) {
diff --git a/Library/Class/ClassDefinitionRuntime.php b/Library/Class/Definition/DefinitionRuntime.php
similarity index 76%
rename from Library/Class/ClassDefinitionRuntime.php
rename to Library/Class/Definition/DefinitionRuntime.php
index dbd1e26833..9ebaab64bd 100644
--- a/Library/Class/ClassDefinitionRuntime.php
+++ b/Library/Class/Definition/DefinitionRuntime.php
@@ -11,14 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Zephir\Class;
-
-use Zephir\AbstractClassDefinition;
+namespace Zephir\Class\Definition;
 
 /**
  * Represents a class/interface that only exists in runtime.
  */
-final class ClassDefinitionRuntime extends AbstractClassDefinition
+final class DefinitionRuntime extends AbstractDefinition
 {
     public function __construct(string $name)
     {
diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index 2aa9280ddc..03a9d56e9c 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -14,6 +14,7 @@
 namespace Zephir\Class;
 
 use ReflectionClass;
+use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 
@@ -107,7 +108,7 @@ public function get(): string
         array_pop($classNamespace);
         $namespace = implode(self::NAMESPACE_SEPARATOR, $classNamespace);
 
-        return (new ClassDefinition($namespace, $className))->getClassEntry();
+        return (new Definition($namespace, $className))->getClassEntry();
     }
 
     public function isInternal(): bool
diff --git a/Library/Class/ClassMethod.php b/Library/Class/Method/Method.php
similarity index 98%
rename from Library/Class/ClassMethod.php
rename to Library/Class/Method/Method.php
index 55f2f1f3b8..4fad91278d 100644
--- a/Library/Class/ClassMethod.php
+++ b/Library/Class/Method/Method.php
@@ -11,12 +11,13 @@
 
 declare(strict_types=1);
 
-namespace Zephir\Class;
+namespace Zephir\Class\Method;
 
 use ReflectionException;
 use Zephir\Branch;
 use Zephir\BranchManager;
 use Zephir\CacheManager;
+use Zephir\Class\Definition\Definition;
 use Zephir\Class\Entry as ClassEntry;
 use Zephir\CodePrinter;
 use Zephir\CompilationContext;
@@ -42,7 +43,7 @@
 /**
  * Represents a class method
  */
-class ClassMethod
+class Method
 {
     public bool $optimizable = true;
 
@@ -132,18 +133,18 @@ class ClassMethod
 
     protected array $staticVariables = [];
 
-    protected ?ClassDefinition $classDefinition = null;
+    protected ?Definition $classDefinition = null;
 
     public function __construct(
-        ClassDefinition $classDefinition,
-        protected array $visibility,
-        protected string $name,
-        protected ?ClassMethodParameters $parameters = null,
+        Definition                 $classDefinition,
+        protected array            $visibility,
+        protected string           $name,
+        protected ?Parameters      $parameters = null,
         protected ?StatementsBlock $statements = null,
-        protected ?string $docblock = null,
-        ?array $returnType = null,
-        protected ?array $expression = [],
-        array $staticVariables = [],
+        protected ?string          $docblock = null,
+        ?array                     $returnType = null,
+        protected ?array           $expression = [],
+        array                      $staticVariables = [],
     ) {
         $this->classDefinition = $classDefinition;
         $this->staticVariables = $staticVariables;
@@ -365,7 +366,7 @@ public function setIsInitializer(bool $initializer): void
     /**
      * Returns the class definition where the method was declared.
      */
-    public function getClassDefinition(): ?ClassDefinition
+    public function getClassDefinition(): ?Definition
     {
         return $this->classDefinition;
     }
@@ -491,7 +492,7 @@ public function getLine(): mixed
     /**
      * Returns the parameters.
      */
-    public function getParameters(): ?ClassMethodParameters
+    public function getParameters(): ?Parameters
     {
         return $this->parameters;
     }
@@ -586,7 +587,7 @@ public function getReturnClassTypes(): array
      */
     public function hasParameters(): bool
     {
-        return $this->parameters instanceof ClassMethodParameters && $this->parameters->count() > 0;
+        return $this->parameters instanceof Parameters && $this->parameters->count() > 0;
     }
 
     /**
@@ -594,7 +595,7 @@ public function hasParameters(): bool
      */
     public function getNumberOfParameters(): int
     {
-        if ($this->parameters instanceof ClassMethodParameters) {
+        if ($this->parameters instanceof Parameters) {
             return $this->parameters->count();
         }
 
@@ -1366,7 +1367,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Parameters has an additional extra mutation.
          */
-        if ($this->localContext instanceof LocalContextPass && $this->parameters instanceof ClassMethodParameters) {
+        if ($this->localContext instanceof LocalContextPass && $this->parameters instanceof Parameters) {
             foreach ($this->parameters->getParameters() as $parameter) {
                 $this->localContext->increaseMutations($parameter['name']);
             }
@@ -1402,7 +1403,7 @@ public function compile(CompilationContext $compilationContext): void
         $compilationContext->insideTryCatch = 0;
         $compilationContext->currentTryCatch = 0;
 
-        if ($this->parameters instanceof ClassMethodParameters) {
+        if ($this->parameters instanceof Parameters) {
             /**
              * Round 1. Create variables in parameters in the symbol table.
              */
@@ -1550,7 +1551,7 @@ public function compile(CompilationContext $compilationContext): void
         $code = '';
         $requiredParams = [];
         $optionalParams = [];
-        if ($this->parameters instanceof ClassMethodParameters) {
+        if ($this->parameters instanceof Parameters) {
             /**
              * Round 2. Fetch the parameters in the method.
              */
@@ -1806,7 +1807,7 @@ public function compile(CompilationContext $compilationContext): void
          * ZEND_PARSE_PARAMETERS
          */
         $tempCodePrinter = new CodePrinter();
-        if ($this->parameters instanceof ClassMethodParameters && $this->parameters->count() > 0) {
+        if ($this->parameters instanceof Parameters && $this->parameters->count() > 0) {
             $tempCodePrinter->output('#if PHP_VERSION_ID >= 80000');
             $tempCodePrinter->output("\t".'bool is_null_true = 1;');
 
@@ -1951,9 +1952,9 @@ public function getInternalName(): string
     /**
      * Returns arginfo name for current method.
      */
-    public function getArgInfoName(?ClassDefinition $classDefinition = null): string
+    public function getArgInfoName(?Definition $classDefinition = null): string
     {
-        if ($classDefinition instanceof ClassDefinition) {
+        if ($classDefinition instanceof Definition) {
             return sprintf(
                 'arginfo_%s_%s_%s',
                 strtolower($classDefinition->getCNamespace()),
diff --git a/Library/Class/ClassMethodParameters.php b/Library/Class/Method/Parameters.php
similarity index 75%
rename from Library/Class/ClassMethodParameters.php
rename to Library/Class/Method/Parameters.php
index 9c822ee315..8cc9799363 100644
--- a/Library/Class/ClassMethodParameters.php
+++ b/Library/Class/Method/Parameters.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Zephir\Class;
+namespace Zephir\Class\Method;
 
 use ArrayAccess;
 use Countable;
@@ -22,39 +22,24 @@
 /**
  * Represents the parameters defined in a method.
  */
-class ClassMethodParameters implements Countable, Iterator, ArrayAccess
+class Parameters implements Countable, Iterator, ArrayAccess
 {
-    /**
-     * List of all method's parameters
-     *
-     * @var array
-     */
-    private array $parameters = [];
-
     private int $position = 0;
 
     /**
      * List of Required parameters
-     *
-     * @var array
      */
     private array $requiredParameters = [];
 
     /**
      * List of Optional parameters (with default value)
-     *
-     * @var array
      */
     private array $optionalParameters = [];
 
     /**
-     * ClassMethodParameters constructor.
-     *
-     * @param array $parameters
-     *
      * @throws CompilerException
      */
-    public function __construct(array $parameters)
+    public function __construct(private array $parameters)
     {
         foreach ($parameters as $parameter) {
             if (isset($parameter['reference']) && $parameter['reference']) {
@@ -65,14 +50,10 @@ public function __construct(array $parameters)
                 );
             }
         }
-
-        $this->parameters = $parameters;
     }
 
     /**
      * Return internal parameters.
-     *
-     * @return array
      */
     public function getParameters(): array
     {
@@ -139,56 +120,47 @@ public function count(): int
         return count($this->parameters);
     }
 
-    #[\ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         $this->position = 0;
     }
 
-    #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): int
     {
         return $this->position;
     }
 
-    #[\ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
         return isset($this->parameters[$this->position]);
     }
 
-    #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         return $this->parameters[$this->position];
     }
 
-    #[\ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         ++$this->position;
     }
 
-    #[\ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->parameters[$offset]);
     }
 
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return $this->parameters[$offset];
     }
 
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         $this->parameters[$offset] = $value;
     }
 
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->parameters[$offset]);
     }
diff --git a/Library/Class/ClassProperty.php b/Library/Class/Property.php
similarity index 92%
rename from Library/Class/ClassProperty.php
rename to Library/Class/Property.php
index 7c2e1a608b..0dc256d376 100644
--- a/Library/Class/ClassProperty.php
+++ b/Library/Class/Property.php
@@ -14,13 +14,13 @@
 namespace Zephir\Class;
 
 use ReflectionException;
+use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\BinaryOperator;
-use Zephir\Expression\Builder\Statements\LetStatement as ExpressionLetStatement;
 use Zephir\StatementsBlock;
 use Zephir\Types;
 use function in_array;
@@ -29,15 +29,15 @@
 /**
  * Represents a property class
  */
-class ClassProperty
+class Property
 {
     public function __construct(
-        protected ClassDefinition $classDefinition,
-        protected array $visibility,
-        protected string $name,
-        protected ?array $defaultValue,
-        protected ?string $docBlock = null,
-        protected ?array $original = null,
+        protected Definition $classDefinition,
+        protected array      $visibility,
+        protected string     $name,
+        protected ?array     $defaultValue,
+        protected ?string    $docBlock = null,
+        protected ?array     $original = null,
     ) {
         $this->checkVisibility($visibility, $name, $original);
 
@@ -50,27 +50,20 @@ public function __construct(
 
     /**
      * Returns the class definition where the method was declared.
-     *
-     * @return ClassDefinition
      */
-    public function getClassDefinition(): ClassDefinition
+    public function getClassDefinition(): Definition
     {
         return $this->classDefinition;
     }
 
     /**
      * Returns the property name.
-     *
-     * @return string
      */
     public function getName(): string
     {
         return $this->name;
     }
 
-    /**
-     * @return mixed
-     */
     public function getValue(): mixed
     {
         if ('array' == $this->defaultValue['type']) {
@@ -91,20 +84,13 @@ public function getType()
         return $this->defaultValue['type'];
     }
 
-    /**
-     * @return mixed
-     */
-    public function getOriginal(): mixed
+    public function getOriginal(): ?array
     {
         return $this->original;
     }
 
     /**
      * Checks for visibility congruence.
-     *
-     * @param array $visibility
-     * @param string $name
-     * @param array|null $original
      */
     public function checkVisibility(array $visibility, string $name, ?array $original = null): void
     {
@@ -123,8 +109,6 @@ public function checkVisibility(array $visibility, string $name, ?array $origina
      * Returns the C-visibility accessors for the model.
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getVisibilityAccessor(): string
     {
@@ -158,8 +142,6 @@ public function getVisibilityAccessor(): string
 
     /**
      * Returns the docblock related to the property.
-     *
-     * @return string|null
      */
     public function getDocBlock(): ?string
     {
@@ -168,8 +150,6 @@ public function getDocBlock(): ?string
 
     /**
      * Checks whether the variable is static.
-     *
-     * @return bool
      */
     public function isStatic(): bool
     {
@@ -178,8 +158,6 @@ public function isStatic(): bool
 
     /**
      * Checks whether the variable is public.
-     *
-     * @return bool
      */
     public function isPublic(): bool
     {
@@ -188,8 +166,6 @@ public function isPublic(): bool
 
     /**
      * Checks whether the variable is protected.
-     *
-     * @return bool
      */
     public function isProtected(): bool
     {
@@ -198,8 +174,6 @@ public function isProtected(): bool
 
     /**
      * Checks whether the variable is private.
-     *
-     * @return bool
      */
     public function isPrivate(): bool
     {
@@ -209,8 +183,6 @@ public function isPrivate(): bool
     /**
      * Produce the code to register a property.
      *
-     * @param CompilationContext $compilationContext
-     *
      * @throws Exception
      * @throws ReflectionException
      */
@@ -247,8 +219,6 @@ public function compile(CompilationContext $compilationContext): void
 
     /**
      * Removes all initialization statements related to this property.
-     *
-     * @param array $statements
      */
     protected function removeInitializationStatements(array &$statements): void
     {
@@ -265,9 +235,6 @@ protected function removeInitializationStatements(array &$statements): void
         }
     }
 
-    /**
-     * @return $this|ExpressionLetStatement
-     */
     protected function getLetStatement()
     {
         $exprBuilder = BuilderFactory::getInstance();
@@ -308,11 +275,6 @@ protected function getLetStatement()
             ->setStatements($exprBuilder->statements()->block([$lsb]));
     }
 
-    /**
-     * @param $value
-     *
-     * @return bool|string
-     */
     protected function getBooleanCode($value): bool|string
     {
         if ('true' == $value || true === $value) {
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 5d51b83089..b6e857c8ab 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -16,8 +16,9 @@
 use Psr\Log\LoggerInterface;
 use Zephir\Backend\Backend;
 use Zephir\Cache\FunctionCache;
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Definition\AbstractDefinition;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Method;
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
 use function in_array;
@@ -57,12 +58,12 @@ class CompilationContext
     /**
      * Represents the class currently being compiled.
      */
-    public ?ClassDefinition $classDefinition = null;
+    public ?Definition $classDefinition = null;
 
     /**
      * Current method or function that being compiled.
      */
-    public ?ClassMethod $currentMethod = null;
+    public ?Method $currentMethod = null;
 
     /**
      * Represents the c-headers added to the file.
@@ -158,7 +159,7 @@ public function getFullName(string $className): string
     /**
      * Lookup a class from a given class name.
      */
-    public function classLookup(string $className, array $statement = null): AbstractClassDefinition
+    public function classLookup(string $className, array $statement = null): AbstractDefinition
     {
         if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $this->getFullName($className);
@@ -174,7 +175,7 @@ public function classLookup(string $className, array $statement = null): Abstrac
         }
 
         $parent = $this->classDefinition->getExtendsClass();
-        if (!$parent instanceof ClassDefinition) {
+        if (!$parent instanceof Definition) {
             throw new CompilerException(
                 sprintf(
                     'Cannot access parent:: because class %s does not extend any class',
diff --git a/Library/Compiler.php b/Library/Compiler.php
index f673caffb9..7b5da332c9 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -21,7 +21,7 @@
 use ReflectionException;
 use Zephir\Backend\Backend;
 use Zephir\Backend\StringsManager;
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\Code\Builder\Struct;
 use Zephir\Compiler\CompilerFileFactory;
 use Zephir\Compiler\FileInterface;
@@ -69,7 +69,7 @@ final class Compiler
     private array $internalInitializers = [];
 
     /**
-     * @var ClassDefinition[]
+     * @var Definition[]
      */
     private array $definitions = [];
 
@@ -85,7 +85,7 @@ final class Compiler
     private array $externalDependencies = [];
 
     /**
-     * @var ClassDefinition[]
+     * @var Definition[]
      */
     private static array $internalDefinitions = [];
 
@@ -369,7 +369,7 @@ public function isBundledInterface(string $className): bool
      *
      * @param string $className
      *
-     * @return ClassDefinition|false returns false if no class definition is found
+     * @return Definition|false returns false if no class definition is found
      */
     public function getClassDefinition(string $className)
     {
@@ -386,9 +386,9 @@ public function getClassDefinition(string $className)
      * Inserts an anonymous class definition in the compiler.
      *
      * @param CompilerFileAnonymous $file
-     * @param ClassDefinition       $classDefinition
+     * @param Definition       $classDefinition
      */
-    public function addClassDefinition(CompilerFileAnonymous $file, ClassDefinition $classDefinition): void
+    public function addClassDefinition(CompilerFileAnonymous $file, Definition $classDefinition): void
     {
         $this->definitions[$classDefinition->getCompleteName()] = $classDefinition;
         $this->anonymousFiles[$classDefinition->getCompleteName()] = $file;
@@ -399,15 +399,15 @@ public function addClassDefinition(CompilerFileAnonymous $file, ClassDefinition
      *
      * @param string $className
      *
-     * @return ClassDefinition
+     * @return Definition
      *
      * @throws ReflectionException
      */
-    public function getInternalClassDefinition(string $className): ClassDefinition
+    public function getInternalClassDefinition(string $className): Definition
     {
         if (!isset(self::$internalDefinitions[$className])) {
             $reflection = new \ReflectionClass($className);
-            self::$internalDefinitions[$className] = ClassDefinition::buildFromReflection($reflection);
+            self::$internalDefinitions[$className] = Definition::buildFromReflection($reflection);
         }
 
         return self::$internalDefinitions[$className];
diff --git a/Library/Compiler/FileInterface.php b/Library/Compiler/FileInterface.php
index 5dd0a61a5a..8d25ea5595 100644
--- a/Library/Compiler/FileInterface.php
+++ b/Library/Compiler/FileInterface.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Compiler;
 
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\Compiler;
 
 /**
@@ -29,7 +29,7 @@ public function isExternal();
     /**
      * Returns the class definition related to the compiled file.
      *
-     * @return ClassDefinition
+     * @return Definition
      */
     public function getClassDefinition();
 
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 2566e024b1..835948d8a6 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -16,12 +16,12 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
 use ReflectionException;
-use Zephir\Class\ClassConstant;
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassDefinitionRuntime;
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
+use Zephir\Class\Constant;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Definition\DefinitionRuntime;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
@@ -76,9 +76,9 @@ final class CompilerFile implements FileInterface
     private ?string $compiledFile = null;
 
     /**
-     * @var ClassDefinition|null
+     * @var Definition|null
      */
-    private ?ClassDefinition $classDefinition = null;
+    private ?Definition $classDefinition = null;
 
     /**
      * @var FunctionDefinition[]
@@ -142,7 +142,7 @@ public function setClassName(string $className)
     /**
      * {@inheritdoc}
      *
-     * @return ClassDefinition
+     * @return Definition
      */
     public function getClassDefinition()
     {
@@ -284,7 +284,7 @@ public function compileComment(CompilationContext $compilationContext, $topState
      */
     public function preCompileInterface($namespace, $topStatement, $docblock)
     {
-        $classDefinition = new ClassDefinition($namespace, $topStatement['name']);
+        $classDefinition = new Definition($namespace, $topStatement['name']);
         $classDefinition->setIsExternal($this->external);
 
         if (isset($topStatement['extends'])) {
@@ -308,7 +308,7 @@ public function preCompileInterface($namespace, $topStatement, $docblock)
              */
             if (isset($definition['constants'])) {
                 foreach ($definition['constants'] as $constant) {
-                    $classConstant = new ClassConstant(
+                    $classConstant = new Constant(
                         $constant['name'],
                         $constant['default'] ?? null,
                         $constant['docblock'] ?? null
@@ -322,11 +322,11 @@ public function preCompileInterface($namespace, $topStatement, $docblock)
              */
             if (isset($definition['methods'])) {
                 foreach ($definition['methods'] as $method) {
-                    $classMethod = new ClassMethod(
+                    $classMethod = new Method(
                         $classDefinition,
                         $method['visibility'],
                         $method['name'],
-                        isset($method['parameters']) ? new ClassMethodParameters($method['parameters']) : null,
+                        isset($method['parameters']) ? new Parameters($method['parameters']) : null,
                         null,
                         $method['docblock'] ?? null,
                         $method['return-type'] ?? null,
@@ -350,7 +350,7 @@ public function preCompileInterface($namespace, $topStatement, $docblock)
      */
     public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock)
     {
-        $classDefinition = new ClassDefinition($namespace, $topStatement['name']);
+        $classDefinition = new Definition($namespace, $topStatement['name']);
         $classDefinition->setIsExternal($this->external);
 
         if (isset($topStatement['extends'])) {
@@ -384,7 +384,7 @@ public function preCompileClass(CompilationContext $compilationContext, $namespa
                     /**
                      * Add property to the definition
                      */
-                    $classDefinition->addProperty(new ClassProperty(
+                    $classDefinition->addProperty(new Property(
                         $classDefinition,
                         $property['visibility'],
                         $property['name'],
@@ -407,7 +407,7 @@ public function preCompileClass(CompilationContext $compilationContext, $namespa
              */
             if (isset($definition['constants'])) {
                 foreach ($definition['constants'] as $constant) {
-                    $classDefinition->addConstant(new ClassConstant(
+                    $classDefinition->addConstant(new Constant(
                         $constant['name'],
                         $constant['default'] ?? null,
                         $constant['docblock'] ?? null
@@ -420,11 +420,11 @@ public function preCompileClass(CompilationContext $compilationContext, $namespa
              */
             if (isset($definition['methods'])) {
                 foreach ($definition['methods'] as $method) {
-                    $classDefinition->addMethod(new ClassMethod(
+                    $classDefinition->addMethod(new Method(
                         $classDefinition,
                         $method['visibility'],
                         $method['name'],
-                        isset($method['parameters']) ? new ClassMethodParameters($method['parameters']) : null,
+                        isset($method['parameters']) ? new Parameters($method['parameters']) : null,
                         isset($method['statements']) ? new StatementsBlock($method['statements']) : null,
                         $method['docblock'] ?? null,
                         $method['return-type'] ?? null,
@@ -512,7 +512,7 @@ public function preCompile(Compiler $compiler)
 
                     $parameters = null;
                     if (isset($topStatement['parameters'])) {
-                        $parameters = new ClassMethodParameters($topStatement['parameters']);
+                        $parameters = new Parameters($topStatement['parameters']);
                     }
 
                     $returnType = null;
@@ -670,7 +670,7 @@ public function checkDependencies(Compiler $compiler)
                         $extendedDefinition = $compiler->getInternalClassDefinition($extendedClass);
                         $classDefinition->setExtendsClassDefinition($extendedDefinition);
                     } else {
-                        $extendedDefinition = new ClassDefinitionRuntime($extendedClass);
+                        $extendedDefinition = new DefinitionRuntime($extendedClass);
                         $classDefinition->setExtendsClassDefinition($extendedDefinition);
 
                         $this->logger->warning(
@@ -693,7 +693,7 @@ public function checkDependencies(Compiler $compiler)
                         $extendedDefinition = $compiler->getInternalClassDefinition($extendedClass);
                         $classDefinition->setExtendsClassDefinition($extendedDefinition);
                     } else {
-                        $extendedDefinition = new ClassDefinitionRuntime($extendedClass);
+                        $extendedDefinition = new DefinitionRuntime($extendedClass);
                         $classDefinition->setExtendsClassDefinition($extendedDefinition);
 
                         $this->logger->warning(
@@ -718,7 +718,7 @@ public function checkDependencies(Compiler $compiler)
                     $interfaceDefinitions[$interface] = $compiler->getInternalClassDefinition($interface);
                 } else {
                     if ($extendedClass !== null) {
-                        $classDefinition->setExtendsClassDefinition(new ClassDefinitionRuntime($extendedClass));
+                        $classDefinition->setExtendsClassDefinition(new DefinitionRuntime($extendedClass));
                     }
 
                     $this->logger->warning(
@@ -951,11 +951,11 @@ public function getFilePath(): string
      * Creates the property shortcuts.
      *
      * @param array           $property
-     * @param ClassDefinition $classDefinition
+     * @param Definition $classDefinition
      *
      * @throws CompilerException
      */
-    protected function processShortcuts(array $property, ClassDefinition $classDefinition): void
+    protected function processShortcuts(array $property, Definition $classDefinition): void
     {
         foreach ($property['shortcuts'] as $shortcut) {
             if (str_starts_with($property['name'], '_')) {
@@ -990,7 +990,7 @@ protected function processShortcuts(array $property, ClassDefinition $classDefin
 
             switch ($shortcut['name']) {
                 case 'get':
-                    $classDefinition->addMethod(new ClassMethod(
+                    $classDefinition->addMethod(new Method(
                         $classDefinition,
                         ['public'],
                         'get'.camelize($name),
@@ -1018,11 +1018,11 @@ protected function processShortcuts(array $property, ClassDefinition $classDefin
                     break;
 
                 case 'set':
-                    $classDefinition->addMethod(new ClassMethod(
+                    $classDefinition->addMethod(new Method(
                         $classDefinition,
                         ['public'],
                         'set'.camelize($name),
-                        new ClassMethodParameters([
+                        new Parameters([
                             [
                                 'type' => 'parameter',
                                 'name' => $name,
@@ -1072,7 +1072,7 @@ protected function processShortcuts(array $property, ClassDefinition $classDefin
 
                 case 'toString':
                 case '__toString':
-                    $classDefinition->addMethod(new ClassMethod(
+                    $classDefinition->addMethod(new Method(
                         $classDefinition,
                         ['public'],
                         '__toString',
diff --git a/Library/CompilerFileAnonymous.php b/Library/CompilerFileAnonymous.php
index 1a763d2335..0e97c27728 100644
--- a/Library/CompilerFileAnonymous.php
+++ b/Library/CompilerFileAnonymous.php
@@ -16,7 +16,7 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
 use ReflectionException;
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\Compiler\FileInterface;
 use function count;
 
@@ -33,17 +33,17 @@ final class CompilerFileAnonymous implements FileInterface
     protected bool $external = false;
     protected array $headerCBlocks = [];
     protected ?CompilationContext $context = null;
-    protected ClassDefinition $classDefinition;
+    protected Definition $classDefinition;
     protected Config $config;
 
     /**
      * CompilerFileAnonymous constructor.
      *
-     * @param ClassDefinition         $classDefinition
+     * @param Definition         $classDefinition
      * @param Config                  $config
      * @param CompilationContext|null $context
      */
-    public function __construct(ClassDefinition $classDefinition, Config $config, ?CompilationContext $context = null)
+    public function __construct(Definition $classDefinition, Config $config, ?CompilationContext $context = null)
     {
         $this->classDefinition = $classDefinition;
         $this->config = $config;
@@ -52,9 +52,9 @@ public function __construct(ClassDefinition $classDefinition, Config $config, ?C
     }
 
     /**
-     * @return ClassDefinition
+     * @return Definition
      */
-    public function getClassDefinition(): ClassDefinition
+    public function getClassDefinition(): Definition
     {
         return $this->classDefinition;
     }
diff --git a/Library/Documentation.php b/Library/Documentation.php
index 8a2639feb1..a3d2081017 100644
--- a/Library/Documentation.php
+++ b/Library/Documentation.php
@@ -13,7 +13,7 @@
 
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\Documentation\File;
 use Zephir\Documentation\NamespaceAccessor;
 use Zephir\Documentation\Theme;
@@ -201,7 +201,7 @@ public function build()
     public static function classUrl($c)
     {
         $cname = $c;
-        if ($c instanceof ClassDefinition) {
+        if ($c instanceof Definition) {
             $cname = $c->getCompleteName();
         }
 
@@ -213,7 +213,7 @@ public static function namespaceUrl($ns)
         return '/namespace/'.str_replace('\\', '/', $ns).'.html';
     }
 
-    public static function sourceUrl(ClassDefinition $c)
+    public static function sourceUrl(Definition $c)
     {
         return '/source/'.str_replace('\\', '/', $c->getCompleteName()).'.html';
     }
diff --git a/Library/Documentation/File/ClassFile.php b/Library/Documentation/File/ClassFile.php
index 260339e2ef..a278b10063 100644
--- a/Library/Documentation/File/ClassFile.php
+++ b/Library/Documentation/File/ClassFile.php
@@ -11,14 +11,14 @@
 
 namespace Zephir\Documentation\File;
 
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\CompilerFile;
 use Zephir\Documentation;
 use Zephir\Documentation\FileInterface;
 
 class ClassFile implements FileInterface
 {
-    protected ClassDefinition $class;
+    protected Definition $class;
 
     public function __construct(protected CompilerFile $compilerFile)
     {
diff --git a/Library/Documentation/File/ClassesFile.php b/Library/Documentation/File/ClassesFile.php
index cc89dceb52..4d5f8ce1b2 100644
--- a/Library/Documentation/File/ClassesFile.php
+++ b/Library/Documentation/File/ClassesFile.php
@@ -11,12 +11,12 @@
 
 namespace Zephir\Documentation\File;
 
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\Documentation\FileInterface;
 
 class ClassesFile implements FileInterface
 {
-    public function __construct(protected ClassDefinition $classes)
+    public function __construct(protected Definition $classes)
     {
     }
 
diff --git a/Library/Documentation/File/SourceFile.php b/Library/Documentation/File/SourceFile.php
index 5b252e255f..1f7ec6dd1a 100644
--- a/Library/Documentation/File/SourceFile.php
+++ b/Library/Documentation/File/SourceFile.php
@@ -11,12 +11,12 @@
 
 namespace Zephir\Documentation\File;
 
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\Documentation;
 
 class SourceFile extends ClassFile
 {
-    protected ClassDefinition $class;
+    protected Definition $class;
 
     public function getTemplateName(): string
     {
diff --git a/Library/Documentation/Template.php b/Library/Documentation/Template.php
index d2ba1a73e3..3755293309 100644
--- a/Library/Documentation/Template.php
+++ b/Library/Documentation/Template.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Documentation;
 
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\CompilerFile;
 use Zephir\Config;
 use Zephir\Documentation;
@@ -108,7 +108,7 @@ public function url(string $url): string
             } elseif (\is_string($url)) {
                 return $url;
             }
-        } elseif ($url instanceof ClassDefinition) {
+        } elseif ($url instanceof Definition) {
             return $this->url(Documentation::classUrl($url));
         } elseif ($url instanceof CompilerFile) {
             return $this->url(Documentation::classUrl($url->getClassDefinition()));
diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
index 65057c9a88..d98aa5a727 100644
--- a/Library/Expression/Closure.php
+++ b/Library/Expression/Closure.php
@@ -13,10 +13,10 @@
 
 namespace Zephir\Expression;
 
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\CompilerFileAnonymous;
@@ -85,7 +85,7 @@ public function setReadOnly(bool $readOnly): void
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $classDefinition = new ClassDefinition(
+        $classDefinition = new Definition(
             $compilationContext->config->get('namespace'),
             self::$id.'__closure'
         );
@@ -99,7 +99,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $parameters = null;
         if (isset($expression['left'])) {
-            $parameters = new ClassMethodParameters($expression['left']);
+            $parameters = new Parameters($expression['left']);
         }
 
         $block = $expression['right'] ?? [];
@@ -112,7 +112,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         }
 
         foreach ($staticVariables as $var) {
-            $classDefinition->addProperty(new ClassProperty(
+            $classDefinition->addProperty(new Property(
                 $classDefinition,
                 ['public', 'static'],
                 $var->getName(),
@@ -122,7 +122,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             ));
         }
 
-        $classMethod = new ClassMethod(
+        $classMethod = new Method(
             $classDefinition,
             ['public', 'final'],
             '__invoke',
diff --git a/Library/Expression/ClosureArrow.php b/Library/Expression/ClosureArrow.php
index 7b264dbb5e..d420c656e5 100644
--- a/Library/Expression/ClosureArrow.php
+++ b/Library/Expression/ClosureArrow.php
@@ -13,9 +13,9 @@
 
 namespace Zephir\Expression;
 
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\CompilerFileAnonymous;
@@ -40,7 +40,7 @@ class ClosureArrow extends Closure
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $classDefinition = new ClassDefinition(
+        $classDefinition = new Definition(
             $compilationContext->config->get('namespace'),
             self::$id.'__closure'
         );
@@ -55,7 +55,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         /**
          * Builds parameters using the only parameter available.
          */
-        $parameters = new ClassMethodParameters([
+        $parameters = new Parameters([
             [
                 'type' => 'parameter',
                 'name' => $expression['left']['value'],
@@ -77,7 +77,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $block = $statementBlockBuilder->build();
 
-        $classMethod = new ClassMethod(
+        $classMethod = new Method(
             $classDefinition,
             ['public', 'final'],
             '__invoke',
diff --git a/Library/Expression/StaticConstantAccess.php b/Library/Expression/StaticConstantAccess.php
index 600ba37fb9..d98337de3c 100644
--- a/Library/Expression/StaticConstantAccess.php
+++ b/Library/Expression/StaticConstantAccess.php
@@ -14,7 +14,7 @@
 namespace Zephir\Expression;
 
 use ReflectionException;
-use Zephir\Class\ClassConstant;
+use Zephir\Class\Constant;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -176,7 +176,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $constantDefinition = $classDefinition->getConstant($constant);
 
-        if ($constantDefinition instanceof ClassConstant) {
+        if ($constantDefinition instanceof Constant) {
             $constantDefinition->processValue($compilationContext);
             $value = $constantDefinition->getValueValue();
             $type = $constantDefinition->getValueType();
diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
index 096c07b0ca..3fea7d9a04 100644
--- a/Library/Expression/StaticPropertyAccess.php
+++ b/Library/Expression/StaticPropertyAccess.php
@@ -14,7 +14,7 @@
 namespace Zephir\Expression;
 
 use ReflectionException;
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -97,7 +97,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $expression);
         }
 
-        /** @var ClassProperty $propertyDefinition */
+        /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
             throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $expression);
diff --git a/Library/FunctionDefinition.php b/Library/FunctionDefinition.php
index 0199866348..1ea93d1067 100644
--- a/Library/FunctionDefinition.php
+++ b/Library/FunctionDefinition.php
@@ -13,13 +13,13 @@
 
 namespace Zephir;
 
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 
 /**
  * Represents a function
  */
-class FunctionDefinition extends ClassMethod
+class FunctionDefinition extends Method
 {
     /**
      * Whether the function is declared in a global or namespaced scope.
@@ -27,12 +27,12 @@ class FunctionDefinition extends ClassMethod
     private bool $isGlobal = false;
 
     public function __construct(
-        private string $namespace,
-        protected string $name,
-        protected ?ClassMethodParameters $parameters = null,
+        private string             $namespace,
+        protected string           $name,
+        protected ?Parameters      $parameters = null,
         protected ?StatementsBlock $statements = null,
-        array $returnType = null,
-        protected ?array $expression = [],
+        array                      $returnType = null,
+        protected ?array           $expression = [],
     ) {
         $this->setReturnTypes($returnType);
     }
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index 3bc46588f0..7074f758d8 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -12,7 +12,7 @@
 namespace Zephir;
 
 use ReflectionException;
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 
@@ -389,7 +389,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                  * We only check extension parameters if methods are extension methods
                                  * Internal methods may have invalid Reflection information
                                  */
-                                if ($method instanceof ClassMethod && !$method->isBundled()) {
+                                if ($method instanceof Method && !$method->isBundled()) {
                                     if (isset($expression['parameters'])) {
                                         $callNumberParameters = \count($expression['parameters']);
                                     } else {
@@ -486,7 +486,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
          */
         if ($isExpecting) {
             if (isset($method)) {
-                if ($method instanceof ClassMethod) {
+                if ($method instanceof Method) {
                     if ($method->isVoid()) {
                         throw new CompilerException(
                             sprintf(
@@ -571,7 +571,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
             // We check here if a correct parameter type is passed to the called method
             if (self::CALL_NORMAL == $type) {
-                if (isset($method) && $method instanceof ClassMethod && isset($expression['parameters'])) {
+                if (isset($method) && $method instanceof Method && isset($expression['parameters'])) {
                     $resolvedTypes = $this->getResolvedTypes();
                     $resolvedDynamicTypes = $this->getResolvedDynamicTypes();
 
diff --git a/Library/Statements/Let/StaticPropertyAppend.php b/Library/Statements/Let/StaticPropertyAppend.php
index b56620e940..9503fc1318 100644
--- a/Library/Statements/Let/StaticPropertyAppend.php
+++ b/Library/Statements/Let/StaticPropertyAppend.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -75,7 +75,7 @@ public function assignStatic(
             throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
         }
 
-        /** @var ClassProperty $propertyDefinition */
+        /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
             throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
diff --git a/Library/Statements/Let/StaticPropertyArrayIndex.php b/Library/Statements/Let/StaticPropertyArrayIndex.php
index 510c71b434..b3033235e7 100644
--- a/Library/Statements/Let/StaticPropertyArrayIndex.php
+++ b/Library/Statements/Let/StaticPropertyArrayIndex.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -76,7 +76,7 @@ public function assignStatic(
             throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
         }
 
-        /** @var ClassProperty $propertyDefinition */
+        /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
             throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
diff --git a/Library/Statements/Let/StaticPropertyArrayIndexAppend.php b/Library/Statements/Let/StaticPropertyArrayIndexAppend.php
index fa34b28584..0eb2943c64 100644
--- a/Library/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/Library/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -76,7 +76,7 @@ public function assignStatic(
             throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
         }
 
-        /** @var ClassProperty $propertyDefinition */
+        /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
             throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index 94b97e94b3..6d2b227f26 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -12,8 +12,8 @@
 namespace Zephir;
 
 use ReflectionException;
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 use function count;
@@ -151,7 +151,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 }
 
                 if (!$classDefinition->hasMethod('__callStatic')) {
-                    if ($method instanceof ClassMethod && !$method->isBundled()) {
+                    if ($method instanceof Method && !$method->isBundled()) {
                         /**
                          * Try to produce an exception if method is called with a wrong number of parameters
                          */
@@ -214,7 +214,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         /**
          * Transfer the return type-hint to the returned variable
          */
-        if ($isExpecting && isset($method) && $method instanceof ClassMethod) {
+        if ($isExpecting && isset($method) && $method instanceof Method) {
             $symbolVariable->setDynamicTypes('object');
             foreach ($method->getReturnClassTypes() as $classType) {
                 $symbolVariable->setClassTypes($compilationContext->getFullName($classType));
@@ -249,7 +249,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
      * @param bool $isExpecting
      * @param CompilationContext $compilationContext
      * @param Variable|null $symbolVariable
-     * @param ClassMethod|null $method
+     * @param Method|null $method
      * @throws Exception
      */
     protected function call(
@@ -260,7 +260,7 @@ protected function call(
         bool $isExpecting,
         CompilationContext $compilationContext,
         ?Variable $symbolVariable = null,
-        ?ClassMethod $method = null
+        ?Method $method = null
     ): void {
         if (!in_array($context, ['SELF', 'STATIC'])) {
             $context = 'SELF';
@@ -348,12 +348,12 @@ protected function call(
      * @param Variable $symbolVariable
      * @param bool $mustInit
      * @param bool $isExpecting
-     * @param ClassDefinition $classDefinition
+     * @param Definition $classDefinition
      * @param CompilationContext $compilationContext
-     * @param ClassMethod $method
+     * @param Method $method
      * @throws Exception
      */
-    protected function callParent(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, ClassDefinition $classDefinition, CompilationContext $compilationContext, ClassMethod $method)
+    protected function callParent(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method)
     {
         $codePrinter = $compilationContext->codePrinter;
         $classCe = $classDefinition->getClassEntry($compilationContext);
@@ -419,12 +419,12 @@ protected function callParent(string $methodName, array $expression, $symbolVari
      * @param Variable $symbolVariable
      * @param bool $mustInit
      * @param bool $isExpecting
-     * @param ClassDefinition $classDefinition
+     * @param Definition $classDefinition
      * @param CompilationContext $compilationContext
-     * @param ClassMethod $method
+     * @param Method $method
      * @throws Exception
      */
-    protected function callFromClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, ClassDefinition $classDefinition, CompilationContext $compilationContext, ClassMethod $method)
+    protected function callFromClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method)
     {
         $codePrinter = $compilationContext->codePrinter;
 
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index 2037ce75dc..f1ec5af964 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -14,11 +14,11 @@
 namespace Zephir\Stubs;
 
 use Zephir\AliasManager;
-use Zephir\Class\ClassConstant;
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
+use Zephir\Class\Constant;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use Zephir\CompilerFile;
 use Zephir\Exception;
 use function array_key_exists;
@@ -89,15 +89,15 @@ public function generate(string $namespace, string $path, string $indent, string
     /**
      * Build class.
      *
-     * @param ClassDefinition $class
+     * @param Definition $class
      * @param string          $indent
      * @param string          $banner
      *
-     * @throws Exception\RuntimeException
-     *
      * @return string
+     *@throws Exception\RuntimeException
+     *
      */
-    protected function buildClass(ClassDefinition $class, string $indent, string $banner): string
+    protected function buildClass(Definition $class, string $indent, string $banner): string
     {
         $source = '<?php'.PHP_EOL.PHP_EOL;
         $source .= '' === $banner ? '' : $banner.PHP_EOL;
@@ -208,12 +208,12 @@ protected function buildClass(ClassDefinition $class, string $indent, string $ba
     /**
      * Build property.
      *
-     * @param ClassProperty $property
+     * @param Property $property
      * @param string        $indent
      *
      * @return string
      */
-    protected function buildProperty(ClassProperty $property, string $indent): string
+    protected function buildProperty(Property $property, string $indent): string
     {
         $visibility = 'public';
 
@@ -238,12 +238,12 @@ protected function buildProperty(ClassProperty $property, string $indent): strin
     }
 
     /**
-     * @param ClassConstant $constant
+     * @param Constant $constant
      * @param string        $indent
      *
      * @return string
      */
-    protected function buildConstant(ClassConstant $constant, string $indent): string
+    protected function buildConstant(Constant $constant, string $indent): string
     {
         $source = 'const '.$constant->getName();
 
@@ -255,13 +255,13 @@ protected function buildConstant(ClassConstant $constant, string $indent): strin
     }
 
     /**
-     * @param ClassMethod $method
+     * @param Method $method
      * @param bool        $isInterface
      * @param string      $indent
      *
      * @return string
      */
-    protected function buildMethod(ClassMethod $method, bool $isInterface, string $indent): string
+    protected function buildMethod(Method $method, bool $isInterface, string $indent): string
     {
         $modifier = implode(' ', array_diff($method->getVisibility(), $this->ignoreModifiers));
 
@@ -271,7 +271,7 @@ protected function buildMethod(ClassMethod $method, bool $isInterface, string $i
 
         $parameters = [];
 
-        if ($methodParameters instanceof ClassMethodParameters) {
+        if ($methodParameters instanceof Parameters) {
             foreach ($methodParameters->getParameters() as $parameter) {
                 $paramStr = '';
                 if (isset($parameter['cast'])) {
diff --git a/Library/Stubs/MethodDocBlock.php b/Library/Stubs/MethodDocBlock.php
index 134c2fb807..42c621dd48 100644
--- a/Library/Stubs/MethodDocBlock.php
+++ b/Library/Stubs/MethodDocBlock.php
@@ -14,7 +14,7 @@
 namespace Zephir\Stubs;
 
 use Zephir\AliasManager;
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Method\Method;
 use Zephir\Types;
 
 /**
@@ -54,9 +54,9 @@ class MethodDocBlock extends DocBlock
     private AliasManager $aliasManager;
 
     /**
-     * @var ClassMethod
+     * @var Method
      */
-    private ClassMethod $classMethod;
+    private Method $classMethod;
 
     /**
      * @var Types
@@ -64,10 +64,10 @@ class MethodDocBlock extends DocBlock
     private Types $types;
 
     public function __construct(
-        ClassMethod $method,
+        Method       $method,
         AliasManager $aliasManager,
-        string $indent = '    ',
-        ?Types $types = null
+        string       $indent = '    ',
+        ?Types       $types = null
     ) {
         parent::__construct($method->getDocBlock(), $indent);
 
@@ -97,7 +97,7 @@ public function processMethodDocBlock(): string
         return $this->__toString();
     }
 
-    protected function parseMethodReturnType(ClassMethod $method): void
+    protected function parseMethodReturnType(Method $method): void
     {
         $return = [];
         foreach ($method->getReturnTypes() as $type) {
@@ -247,7 +247,7 @@ private function appendReturnLine(): void
         }
     }
 
-    private function parseMethodParameters(ClassMethod $method): void
+    private function parseMethodParameters(Method $method): void
     {
         $parameters = $method->getParameters();
         $aliasManager = $method->getClassDefinition()->getAliasManager();
diff --git a/Library/Types.php b/Library/Types.php
index 4055038f1a..5cf9160705 100644
--- a/Library/Types.php
+++ b/Library/Types.php
@@ -11,7 +11,7 @@
 
 namespace Zephir;
 
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Method\Method;
 
 final class Types
 {
@@ -42,12 +42,12 @@ final class Types
     /**
      * Gets PHP compatible return type from class method.
      *
-     * @param ClassMethod $method
+     * @param Method $method
      * @param array|null  $returnTypes
      *
      * @return string
      */
-    public function getReturnTypeAnnotation(ClassMethod $method, array $returnTypes = null): string
+    public function getReturnTypeAnnotation(Method $method, array $returnTypes = null): string
     {
         if (!$method->hasReturnTypes() && !$method->isVoid()) {
             return '';
diff --git a/Library/Variable.php b/Library/Variable.php
index 2a523afef7..1f1ed10e1c 100644
--- a/Library/Variable.php
+++ b/Library/Variable.php
@@ -14,7 +14,7 @@
 namespace Zephir;
 
 use ReflectionClass;
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Globals;
 use function in_array;
@@ -98,7 +98,7 @@ class Variable implements TypeAwareInterface
 
     protected array $classTypes = [];
 
-    protected ClassDefinition|ReflectionClass|null $associatedClass = null;
+    protected Definition|ReflectionClass|null $associatedClass = null;
 
     /**
      * Initialization skips.
@@ -454,9 +454,9 @@ public function getClassTypes(): array
     /**
      * Sets the PHP class related to variable.
      *
-     * @param ReflectionClass|ClassDefinition $associatedClass
+     * @param ReflectionClass|Definition $associatedClass
      */
-    public function setAssociatedClass(ReflectionClass|ClassDefinition $associatedClass): void
+    public function setAssociatedClass(ReflectionClass|Definition $associatedClass): void
     {
         $this->associatedClass = $associatedClass;
     }
@@ -464,7 +464,7 @@ public function setAssociatedClass(ReflectionClass|ClassDefinition $associatedCl
     /**
      * Returns the class related to the variable.
      */
-    public function getAssociatedClass(): ClassDefinition|ReflectionClass|null
+    public function getAssociatedClass(): Definition|ReflectionClass|null
     {
         return $this->associatedClass;
     }
diff --git a/templates/Api/themes/zephir/partials/class/content.phtml b/templates/Api/themes/zephir/partials/class/content.phtml
index c5444d4f35..7b5bc67cb1 100644
--- a/templates/Api/themes/zephir/partials/class/content.phtml
+++ b/templates/Api/themes/zephir/partials/class/content.phtml
@@ -4,7 +4,7 @@
  * @var string $className
  * @var array $methods
  * @var string[] $namespacePieces
- * @var \Zephir\Class\ClassDefinition $classDefinition
+ * @var \Zephir\Class\Definition\Definition $classDefinition
  * @var Zephir\CompilerFile $compilerFile
  */
 
diff --git a/templates/Api/themes/zephir/partials/class/method-details.phtml b/templates/Api/themes/zephir/partials/class/method-details.phtml
index 3d6d7bc3cc..098cfdef82 100644
--- a/templates/Api/themes/zephir/partials/class/method-details.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-details.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var \Zephir\Class\ClassMethod $method
+ * @var \Zephir\Class\Method\Method $method
  */
 ?>
 
diff --git a/templates/Api/themes/zephir/partials/class/method-summary-params.phtml b/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
index d83da6dcdd..3e607d0e05 100644
--- a/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-summary-params.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var $method \Zephir\Class\ClassMethod
+ * @var $method \Zephir\Class\Method\Method
  */
 
 if ($method->getParameters()) {
diff --git a/templates/Api/themes/zephir/partials/class/method-summary.phtml b/templates/Api/themes/zephir/partials/class/method-summary.phtml
index 861bc2c392..fa68581e65 100644
--- a/templates/Api/themes/zephir/partials/class/method-summary.phtml
+++ b/templates/Api/themes/zephir/partials/class/method-summary.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
  * @var string $classNamespace
- * @var \Zephir\Class\ClassMethod $method
+ * @var \Zephir\Class\Method\Method $method
  */
 
 $allTypes = [];
diff --git a/templates/Api/themes/zephir/partials/namespace/method-details.phtml b/templates/Api/themes/zephir/partials/namespace/method-details.phtml
index 42798632e9..f80e39c65f 100644
--- a/templates/Api/themes/zephir/partials/namespace/method-details.phtml
+++ b/templates/Api/themes/zephir/partials/namespace/method-details.phtml
@@ -1,6 +1,6 @@
 <?php
 
-/* @var $method \Zephir\Class\ClassMethod */
+/* @var $method \Zephir\Class\Method\Method */
 
 ?>
 
diff --git a/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml b/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml
index f3349c4763..60cbea36f9 100644
--- a/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml
+++ b/templates/Api/themes/zephir/partials/namespace/method-summary-params.phtml
@@ -1,6 +1,6 @@
 <?php
 
-/* @var $method \Zephir\Class\ClassMethod */
+/* @var $method \Zephir\Class\Method\Method */
 
     if($method->getParameters()){
         $i=0;
diff --git a/templates/Api/themes/zephir/partials/namespace/method-summary.phtml b/templates/Api/themes/zephir/partials/namespace/method-summary.phtml
index 5be7c39029..1a3e26028e 100644
--- a/templates/Api/themes/zephir/partials/namespace/method-summary.phtml
+++ b/templates/Api/themes/zephir/partials/namespace/method-summary.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * @var $method \Zephir\Class\ClassMethod
+ * @var $method \Zephir\Class\Method\Method
  */
 ?>
 
diff --git a/templates/Api/themes/zephir/partials/source.phtml b/templates/Api/themes/zephir/partials/source.phtml
index 7b153f5b59..2cc090d244 100644
--- a/templates/Api/themes/zephir/partials/source.phtml
+++ b/templates/Api/themes/zephir/partials/source.phtml
@@ -3,7 +3,7 @@
  * @var string $fullName
  * @var string $className
  * @var array $namespacePieces
- * @var \Zephir\Class\ClassDefinition $classDefinition
+ * @var \Zephir\Class\Definition\Definition $classDefinition
  * @var Zephir\CompilerFile $compilerFile
  */
 
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index 11618e2a3d..e607da7317 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -16,11 +16,11 @@
 use PHPUnit\Framework\TestCase;
 use ReflectionException;
 use Zephir\AliasManager;
-use Zephir\Class\ClassConstant;
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
-use Zephir\Class\ClassProperty;
+use Zephir\Class\Property;
+use Zephir\Class\Constant;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use Zephir\Stubs\Generator;
 use function Zephir\is_windows;
 
@@ -31,13 +31,13 @@ class GeneratorTest extends TestCase
      */
     private $generatorClass;
     private Generator $testClass;
-    private ClassDefinition $classDefinition;
+    private Definition $classDefinition;
 
     protected function setUp(): void
     {
         $this->generatorClass = new \ReflectionClass(Generator::class);
         $this->testClass = new Generator([]);
-        $this->classDefinition = new ClassDefinition('Stub\Stubs', 'StubsBuildClass');
+        $this->classDefinition = new Definition('Stub\Stubs', 'StubsBuildClass');
     }
 
     /**
@@ -101,8 +101,8 @@ public static function init(string \$key, int \$priority = 1)
 
         $buildClass = $this->getMethod('buildClass');
 
-        $extendsClassDefinition = new ClassDefinition('Stub\Extendable', 'BaseTestClass');
-        $implementClassDefinition = new ClassDefinition('Stub\Events', 'EventsManagerInterface');
+        $extendsClassDefinition = new Definition('Stub\Extendable', 'BaseTestClass');
+        $implementClassDefinition = new Definition('Stub\Events', 'EventsManagerInterface');
         $aliasManager = new AliasManager();
 
         // Definitions
@@ -128,14 +128,14 @@ public static function init(string \$key, int \$priority = 1)
             ],
         ];
 
-        $classMethod = new ClassMethod(
+        $classMethod = new Method(
             $this->classDefinition,
             ['public', 'static'],
             'init',
-            new ClassMethodParameters($methodParamsDefinition)
+            new Parameters($methodParamsDefinition)
         );
 
-        $constantsDefinition = new ClassConstant(
+        $constantsDefinition = new Constant(
             'DEFAULT_PATH_DELIMITER',
             [
                 'type' => 'string',
@@ -144,7 +144,7 @@ public static function init(string \$key, int \$priority = 1)
             'Default path delimiter'
         );
 
-        $propertyDefinition = new ClassProperty(
+        $propertyDefinition = new Property(
             $this->classDefinition,
             ['public', 'static'],
             'defaultPathDelimiter',
@@ -263,7 +263,7 @@ public function testShouldBuildProperty(array $visibility, string $type, $value,
         // Test requirements initialization
 
         $buildClass = $this->getMethod('buildProperty');
-        $classProperty = new ClassProperty(
+        $classProperty = new Property(
             $this->classDefinition,
             $visibility,
             'testProperty',
@@ -359,7 +359,7 @@ public function testShouldBuildConstant(string $type, $value, string $expected):
             $extended = $value;
         }
 
-        $classConstant = new ClassConstant(
+        $classConstant = new Constant(
             'TEST',
             [
                 'type' => $type,
@@ -408,7 +408,7 @@ public function testShouldBuildMethod(): void
                 ],
             ],
         ];
-        $methodParams = new ClassMethodParameters($methodParamsDefinition);
+        $methodParams = new Parameters($methodParamsDefinition);
 
         $returnType = [
             'type' => 'return-type',
@@ -424,7 +424,7 @@ public function testShouldBuildMethod(): void
 
         $this->classDefinition->setAliasManager(new AliasManager());
 
-        $classMethod = new ClassMethod(
+        $classMethod = new Method(
             $this->classDefinition,
             ['public', 'static'],
             'testName',
diff --git a/tests/Zephir/Stubs/MethodDocBlockTest.php b/tests/Zephir/Stubs/MethodDocBlockTest.php
index 0b9a704344..2a396a7b32 100644
--- a/tests/Zephir/Stubs/MethodDocBlockTest.php
+++ b/tests/Zephir/Stubs/MethodDocBlockTest.php
@@ -15,9 +15,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Zephir\AliasManager;
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
-use Zephir\Class\ClassMethodParameters;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Method\Method;
 use Zephir\StatementsBlock;
 use Zephir\Stubs\MethodDocBlock;
 
@@ -36,7 +36,7 @@ public function prepareMethod(array $params): MethodDocBlock
         $className = $params['class']['className'];
         $classShortName = $params['class']['classShortName'];
 
-        $classDefinition = new ClassDefinition(
+        $classDefinition = new Definition(
             $classNamespace,
             $className,
             $classShortName
@@ -45,10 +45,10 @@ public function prepareMethod(array $params): MethodDocBlock
         /**
          * ClassMethod constructor.
          *
-         * @param ClassDefinition            $classDefinition
+         * @param Definition            $classDefinition
          * @param array                      $visibility
          * @param string                     $name
-         * @param ClassMethodParameters|null $parameters
+         * @param Parameters|null $parameters
          * @param StatementsBlock|null       $statements
          * @param string|null                $docblock
          * @param array|null                 $returnType
@@ -62,11 +62,11 @@ public function prepareMethod(array $params): MethodDocBlock
         $methodReturnType = $params['method']['returnType'];
         $methodExpression = $params['method']['expression'];
 
-        $classMethod = new ClassMethod(
+        $classMethod = new Method(
             $classDefinition,
             $methodVisibility,
             $methodName,
-            $methodParams ? new ClassMethodParameters($methodParams) : null,
+            $methodParams ? new Parameters($methodParams) : null,
             new StatementsBlock($methodStBlock),
             $methodDocBlock,
             $methodReturnType,
@@ -250,8 +250,8 @@ public function docBlockProvider(): array
      */
     public function testShouldParseDocBlock(string $zephirDocBlock, string $phpDocBlock): void
     {
-        $classMethod = new ClassMethod(
-            new ClassDefinition('Zephir', 'testMethod'),
+        $classMethod = new Method(
+            new Definition('Zephir', 'testMethod'),
             ['public'],
             'exampleMethodName',
             null,
diff --git a/tests/Zephir/TypesTest.php b/tests/Zephir/TypesTest.php
index b60f1412eb..157af90ec9 100644
--- a/tests/Zephir/TypesTest.php
+++ b/tests/Zephir/TypesTest.php
@@ -14,8 +14,8 @@
 namespace Zephir\Test;
 
 use PHPUnit\Framework\TestCase;
-use Zephir\Class\ClassDefinition;
-use Zephir\Class\ClassMethod;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Method\Method;
 use Zephir\Types;
 
 final class TypesTest extends TestCase
@@ -101,10 +101,10 @@ function ($type) use ($collection) {
      * @param array $testData   - dataProvider data set
      * @param int   $definition - (optional) one of mandatory/collection flag
      */
-    private function buildMethod(array $testData, int $definition = 0): ClassMethod
+    private function buildMethod(array $testData, int $definition = 0): Method
     {
-        return new ClassMethod(
-            new ClassDefinition('Zephir', 'testMethod'),
+        return new Method(
+            new Definition('Zephir', 'testMethod'),
             ['public'],
             'exampleMethodName',
             null,
diff --git a/tests/Zephir/VariableTest.php b/tests/Zephir/VariableTest.php
index 409efafe81..84020a92e7 100644
--- a/tests/Zephir/VariableTest.php
+++ b/tests/Zephir/VariableTest.php
@@ -16,7 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Zephir\Branch;
 use Zephir\BranchManager;
-use Zephir\Class\ClassDefinition;
+use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -128,7 +128,7 @@ public function testShouldSetProperties(): void
         $this->zephirVar->setClassTypes('class1');
         $this->assertSame(['class1', 'class2', 'class3'], $this->zephirVar->getClassTypes());
 
-        $classDefinition = new ClassDefinition('Zephir\Test', 'VariableTest');
+        $classDefinition = new Definition('Zephir\Test', 'VariableTest');
         $this->zephirVar->setAssociatedClass($classDefinition);
         $this->assertSame($classDefinition, $this->zephirVar->getAssociatedClass());
 

From 37fda6c9d7f95e66edb9ccd2271208a02f751567 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 17:37:50 +0100
Subject: [PATCH 062/375] #2407 - Reformat code with PHP8.0 syntax sugar

---
 .../Logger/Formatter/CompilerFormatter.php    | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/Library/Logger/Formatter/CompilerFormatter.php b/Library/Logger/Formatter/CompilerFormatter.php
index f8d5fe3374..99e5320960 100644
--- a/Library/Logger/Formatter/CompilerFormatter.php
+++ b/Library/Logger/Formatter/CompilerFormatter.php
@@ -27,30 +27,16 @@ final class CompilerFormatter extends LineFormatter
 {
     public const SIMPLE_FORMAT = " %level_name%: %message% in %file% on line %line% %type%\n";
 
-    /**
-     * @var Config
-     */
-    private Config $config;
-
     /**
      * The contents of the files that are involved in the log message.
-     *
-     * @var array
      */
     private array $filesContent = [];
 
-    public function __construct(Config $config)
+    public function __construct(private Config $config)
     {
         parent::__construct();
-
-        $this->config = $config;
     }
 
-    /**
-     * @param array $record
-     *
-     * @return string
-     */
     public function format(array $record): string
     {
         if ($this->config->get('silent')) {
@@ -141,10 +127,6 @@ private function replacePlaceholders(array $vars, $output)
 
     /**
      * Remove leftover %extra.xxx% and %context.xxx% (if any).
-     *
-     * @param string $output
-     *
-     * @return string
      */
     private function cleanExtraPlaceholders(string $output): string
     {
@@ -160,10 +142,6 @@ private function cleanExtraPlaceholders(string $output): string
 
     /**
      * Gets the contents of the files that are involved in the log message.
-     *
-     * @param string $file File path
-     *
-     * @return array
      */
     private function getFileContents(string $file): array
     {

From 2d240e209f4e4b88102d88cdb1836d3226be199a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 17:39:13 +0100
Subject: [PATCH 063/375] #2407 - Move `CacheManager` class inside `Cache/`
 directory

---
 Library/{CacheManager.php => Cache/Manager.php} | 8 ++------
 Library/Class/Method/Method.php                 | 4 ++--
 Library/CompilationContext.php                  | 3 ++-
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename Library/{CacheManager.php => Cache/Manager.php} (93%)

diff --git a/Library/CacheManager.php b/Library/Cache/Manager.php
similarity index 93%
rename from Library/CacheManager.php
rename to Library/Cache/Manager.php
index 02cbb8efe0..da15216156 100644
--- a/Library/CacheManager.php
+++ b/Library/Cache/Manager.php
@@ -11,18 +11,14 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Cache;
 
-use Zephir\Cache\ClassEntryCache;
-use Zephir\Cache\FunctionCache;
-use Zephir\Cache\MethodCache;
-use Zephir\Cache\StaticMethodCache;
 use Zephir\Passes\CallGathererPass;
 
 /**
  * Creates and manages function, method and class entries caches
  */
-class CacheManager
+class Manager
 {
     /**
      * @var FunctionCache|null
diff --git a/Library/Class/Method/Method.php b/Library/Class/Method/Method.php
index 4fad91278d..f6e1692ff7 100644
--- a/Library/Class/Method/Method.php
+++ b/Library/Class/Method/Method.php
@@ -16,7 +16,7 @@
 use ReflectionException;
 use Zephir\Branch;
 use Zephir\BranchManager;
-use Zephir\CacheManager;
+use Zephir\Cache\Manager;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Entry as ClassEntry;
 use Zephir\CodePrinter;
@@ -1376,7 +1376,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Cache Manager manages function calls, method calls and class entries caches.
          */
-        $cacheManager = new CacheManager();
+        $cacheManager = new Manager();
         $cacheManager->setGatherer($callGathererPass);
 
         $compilationContext->cacheManager = $cacheManager;
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index b6e857c8ab..f80831c43a 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -15,6 +15,7 @@
 
 use Psr\Log\LoggerInterface;
 use Zephir\Backend\Backend;
+use Zephir\Cache\Manager;
 use Zephir\Cache\FunctionCache;
 use Zephir\Class\Definition\AbstractDefinition;
 use Zephir\Class\Definition\Definition;
@@ -114,7 +115,7 @@ class CompilationContext
     /**
      * Manages both function and method call caches.
      */
-    public ?CacheManager $cacheManager = null;
+    public ?Manager $cacheManager = null;
 
     /**
      * Manages class renaming using keyword 'use'.

From d2cb632df174bd3be3ea57a59cef4effda074b07 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 17:41:37 +0100
Subject: [PATCH 064/375] #2407 - Move `Variable` class inside `Variable/`
 directory

---
 Library/Backend/Backend.php                               | 2 +-
 Library/Backend/VariablesManager.php                      | 2 +-
 Library/Cache/ClassEntryCache.php                         | 2 +-
 Library/Cache/MethodCache.php                             | 2 +-
 Library/Call.php                                          | 1 +
 Library/Class/Method/Method.php                           | 2 +-
 Library/Detectors/ReadDetector.php                        | 3 +--
 Library/Expression.php                                    | 1 +
 Library/Expression/Closure.php                            | 6 +++---
 Library/Expression/Constants.php                          | 3 +--
 Library/Expression/NativeArray.php                        | 3 +--
 Library/Expression/NativeArrayAccess.php                  | 2 +-
 Library/Expression/PropertyAccess.php                     | 2 +-
 Library/Expression/PropertyDynamicAccess.php              | 3 +--
 Library/Expression/Reference.php                          | 2 +-
 Library/Expression/StaticConstantAccess.php               | 2 +-
 Library/Expression/StaticPropertyAccess.php               | 2 +-
 Library/MethodCall.php                                    | 1 +
 Library/Operators/AbstractOperator.php                    | 2 +-
 .../Operators/Arithmetical/ArithmeticalBaseOperator.php   | 2 +-
 Library/Optimizers/EvalExpression.php                     | 2 +-
 Library/Optimizers/FunctionCall/PregMatchOptimizer.php    | 2 +-
 Library/Statements/ForStatement.php                       | 3 +--
 Library/Statements/Let/ArrayIndex.php                     | 2 +-
 Library/Statements/Let/ArrayIndexAppend.php               | 2 +-
 Library/Statements/Let/Decr.php                           | 2 +-
 Library/Statements/Let/ExportSymbol.php                   | 2 +-
 Library/Statements/Let/ExportSymbolString.php             | 2 +-
 Library/Statements/Let/Incr.php                           | 2 +-
 Library/Statements/Let/ObjectDynamicProperty.php          | 2 +-
 Library/Statements/Let/ObjectDynamicStringProperty.php    | 2 +-
 Library/Statements/Let/ObjectProperty.php                 | 2 +-
 Library/Statements/Let/ObjectPropertyAppend.php           | 2 +-
 Library/Statements/Let/ObjectPropertyArrayIndex.php       | 2 +-
 Library/Statements/Let/ObjectPropertyArrayIndexAppend.php | 2 +-
 Library/Statements/Let/ObjectPropertyDecr.php             | 2 +-
 Library/Statements/Let/ObjectPropertyIncr.php             | 2 +-
 Library/Statements/Let/Variable.php                       | 3 +--
 Library/Statements/Let/VariableAppend.php                 | 2 +-
 Library/StaticCall.php                                    | 1 +
 Library/SymbolTable.php                                   | 6 +++---
 Library/{ => Variable}/Variable.php                       | 8 ++++++--
 tests/Zephir/Backends/ZendEngine3/BackendTest.php         | 2 +-
 .../Optimizers/FunctionCall/PregMatchOptimizerTest.php    | 2 +-
 tests/Zephir/Statements/Let/VariableTest.php              | 2 +-
 tests/Zephir/{ => Variable}/VariableTest.php              | 4 ++--
 46 files changed, 56 insertions(+), 54 deletions(-)
 rename Library/{ => Variable}/Variable.php (99%)
 rename tests/Zephir/{ => Variable}/VariableTest.php (99%)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index a80a930d89..a3996ad109 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -25,8 +25,8 @@
 use Zephir\Fcall\FcallManagerInterface;
 use Zephir\FunctionDefinition;
 use Zephir\GlobalConstant;
-use Zephir\Variable;
 use Zephir\Variable\Globals;
+use Zephir\Variable\Variable;
 use function in_array;
 use function strlen;
 use function Zephir\add_slashes;
diff --git a/Library/Backend/VariablesManager.php b/Library/Backend/VariablesManager.php
index 9eaf4b6053..69a8b89236 100644
--- a/Library/Backend/VariablesManager.php
+++ b/Library/Backend/VariablesManager.php
@@ -16,7 +16,7 @@
 use Zephir\CompilationContext as Context;
 use Zephir\Exception\CompilerException as Exception;
 use Zephir\Types;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 use function Zephir\Backend\ZendEngine3\add_slashes;
 
 class VariablesManager
diff --git a/Library/Cache/ClassEntryCache.php b/Library/Cache/ClassEntryCache.php
index d49dcc4560..13f4536370 100644
--- a/Library/Cache/ClassEntryCache.php
+++ b/Library/Cache/ClassEntryCache.php
@@ -14,7 +14,7 @@
 namespace Zephir\Cache;
 
 use Zephir\CompilationContext;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * Classes located in the PHP userland are cached to avoid further relocates
diff --git a/Library/Cache/MethodCache.php b/Library/Cache/MethodCache.php
index 23bb745e3a..5a1e497f40 100644
--- a/Library/Cache/MethodCache.php
+++ b/Library/Cache/MethodCache.php
@@ -18,7 +18,7 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Passes\CallGathererPass;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * Calls in Zephir implement monomorphic and polymorphic caches to
diff --git a/Library/Call.php b/Library/Call.php
index 5644c47023..0d8720c9e0 100644
--- a/Library/Call.php
+++ b/Library/Call.php
@@ -15,6 +15,7 @@
 
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
+use Zephir\Variable\Variable;
 
 /**
  * Base class for common functionality in functions/calls
diff --git a/Library/Class/Method/Method.php b/Library/Class/Method/Method.php
index f6e1692ff7..9ddd3538ca 100644
--- a/Library/Class/Method/Method.php
+++ b/Library/Class/Method/Method.php
@@ -32,7 +32,7 @@
 use Zephir\Passes\StaticTypeInference;
 use Zephir\StatementsBlock;
 use Zephir\SymbolTable;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 use function array_key_exists;
 use function count;
 use function in_array;
diff --git a/Library/Detectors/ReadDetector.php b/Library/Detectors/ReadDetector.php
index 160f8d0019..d616c8e576 100644
--- a/Library/Detectors/ReadDetector.php
+++ b/Library/Detectors/ReadDetector.php
@@ -13,8 +13,7 @@
 
 namespace Zephir\Detectors;
 
-use Zephir\Variable;
-
+use Zephir\Variable\Variable;
 use function is_array;
 
 /**
diff --git a/Library/Expression.php b/Library/Expression.php
index 6237876872..f002195974 100644
--- a/Library/Expression.php
+++ b/Library/Expression.php
@@ -67,6 +67,7 @@
 use Zephir\Operators\Other\UnlikelyOperator;
 use Zephir\Operators\Unary\MinusOperator;
 use Zephir\Operators\Unary\NotOperator;
+use Zephir\Variable\Variable;
 
 /**
  * Represents an expression.
diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
index d98aa5a727..1e80cbd82a 100644
--- a/Library/Expression/Closure.php
+++ b/Library/Expression/Closure.php
@@ -13,16 +13,16 @@
 
 namespace Zephir\Expression;
 
-use Zephir\Class\Property;
 use Zephir\Class\Definition\Definition;
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\CompilerFileAnonymous;
 use Zephir\Exception;
 use Zephir\StatementsBlock;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 use function is_array;
 
 /**
diff --git a/Library/Expression/Constants.php b/Library/Expression/Constants.php
index 587105183b..da8c874d36 100644
--- a/Library/Expression/Constants.php
+++ b/Library/Expression/Constants.php
@@ -15,8 +15,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\LiteralCompiledExpression;
-use Zephir\Variable;
-
+use Zephir\Variable\Variable;
 use function constant;
 use function defined;
 use function gettype;
diff --git a/Library/Expression/NativeArray.php b/Library/Expression/NativeArray.php
index 71e9605a25..a1d13afa22 100644
--- a/Library/Expression/NativeArray.php
+++ b/Library/Expression/NativeArray.php
@@ -20,8 +20,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\GlobalConstant;
-use Zephir\Variable;
-
+use Zephir\Variable\Variable;
 use function count;
 use function function_exists;
 
diff --git a/Library/Expression/NativeArrayAccess.php b/Library/Expression/NativeArrayAccess.php
index a4fde9f071..28e167c1ca 100644
--- a/Library/Expression/NativeArrayAccess.php
+++ b/Library/Expression/NativeArrayAccess.php
@@ -19,7 +19,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * Resolves expressions that read array indexes
diff --git a/Library/Expression/PropertyAccess.php b/Library/Expression/PropertyAccess.php
index 0165825db4..d1bcf4d192 100644
--- a/Library/Expression/PropertyAccess.php
+++ b/Library/Expression/PropertyAccess.php
@@ -15,7 +15,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * Resolves expressions that read properties
diff --git a/Library/Expression/PropertyDynamicAccess.php b/Library/Expression/PropertyDynamicAccess.php
index 31218d182d..e62992deba 100644
--- a/Library/Expression/PropertyDynamicAccess.php
+++ b/Library/Expression/PropertyDynamicAccess.php
@@ -15,8 +15,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\Variable;
-
+use Zephir\Variable\Variable;
 use function Zephir\add_slashes;
 
 /**
diff --git a/Library/Expression/Reference.php b/Library/Expression/Reference.php
index 28bd4b122c..d5e87b53d4 100644
--- a/Library/Expression/Reference.php
+++ b/Library/Expression/Reference.php
@@ -19,7 +19,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * Expression Reference
diff --git a/Library/Expression/StaticConstantAccess.php b/Library/Expression/StaticConstantAccess.php
index d98337de3c..282062e756 100644
--- a/Library/Expression/StaticConstantAccess.php
+++ b/Library/Expression/StaticConstantAccess.php
@@ -19,7 +19,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 use function gettype;
 use function in_array;
 
diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
index 3fea7d9a04..228ba3ae30 100644
--- a/Library/Expression/StaticPropertyAccess.php
+++ b/Library/Expression/StaticPropertyAccess.php
@@ -19,7 +19,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 use function in_array;
 
 /**
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index 7074f758d8..736e897689 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -15,6 +15,7 @@
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
+use Zephir\Variable\Variable;
 
 /**
  * Call methods in a non-static context
diff --git a/Library/Operators/AbstractOperator.php b/Library/Operators/AbstractOperator.php
index 037f5066ef..d35b8aca1b 100644
--- a/Library/Operators/AbstractOperator.php
+++ b/Library/Operators/AbstractOperator.php
@@ -14,7 +14,7 @@
 namespace Zephir\Operators;
 
 use Zephir\CompilationContext;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 abstract class AbstractOperator
 {
diff --git a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php b/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
index c490503d83..a6d992e14b 100644
--- a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -17,7 +17,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * This is the base operator for commutative, associative and distributive
diff --git a/Library/Optimizers/EvalExpression.php b/Library/Optimizers/EvalExpression.php
index f0d19b9faf..94a64a9463 100644
--- a/Library/Optimizers/EvalExpression.php
+++ b/Library/Optimizers/EvalExpression.php
@@ -19,7 +19,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\LiteralCompiledExpression;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * Resolves evaluation of expressions returning a C-int expression that can be used by 'if'/'while'/'do-while' statements
diff --git a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php b/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
index c5d96ae52d..b1822b8c8a 100644
--- a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -17,7 +17,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 /**
  * Zephir\Optimizers\FunctionCall\PregMatchOptimizer.
diff --git a/Library/Statements/ForStatement.php b/Library/Statements/ForStatement.php
index b85dec19aa..5edf1e3a0d 100644
--- a/Library/Statements/ForStatement.php
+++ b/Library/Statements/ForStatement.php
@@ -21,8 +21,7 @@
 use Zephir\FunctionCall;
 use Zephir\Optimizers\EvalExpression;
 use Zephir\StatementsBlock;
-use Zephir\Variable;
-
+use Zephir\Variable\Variable;
 use function Zephir\add_slashes;
 
 class ForStatement extends StatementAbstract
diff --git a/Library/Statements/Let/ArrayIndex.php b/Library/Statements/Let/ArrayIndex.php
index c42e9d7e29..9880cbcef0 100644
--- a/Library/Statements/Let/ArrayIndex.php
+++ b/Library/Statements/Let/ArrayIndex.php
@@ -16,7 +16,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\GlobalConstant;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ArrayIndex.
diff --git a/Library/Statements/Let/ArrayIndexAppend.php b/Library/Statements/Let/ArrayIndexAppend.php
index 270d8ff754..57b0a79583 100644
--- a/Library/Statements/Let/ArrayIndexAppend.php
+++ b/Library/Statements/Let/ArrayIndexAppend.php
@@ -15,7 +15,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ArrayIndexAppend.
diff --git a/Library/Statements/Let/Decr.php b/Library/Statements/Let/Decr.php
index 0c7e0bb0bb..15fe91dd18 100644
--- a/Library/Statements/Let/Decr.php
+++ b/Library/Statements/Let/Decr.php
@@ -13,7 +13,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * Decr.
diff --git a/Library/Statements/Let/ExportSymbol.php b/Library/Statements/Let/ExportSymbol.php
index a8940d6c71..4b6693cea0 100644
--- a/Library/Statements/Let/ExportSymbol.php
+++ b/Library/Statements/Let/ExportSymbol.php
@@ -14,7 +14,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Statements\LetStatement;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ExportSymbol.
diff --git a/Library/Statements/Let/ExportSymbolString.php b/Library/Statements/Let/ExportSymbolString.php
index 6097b23922..ae092c1734 100644
--- a/Library/Statements/Let/ExportSymbolString.php
+++ b/Library/Statements/Let/ExportSymbolString.php
@@ -14,7 +14,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Statements\LetStatement;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ExportSymbolString.
diff --git a/Library/Statements/Let/Incr.php b/Library/Statements/Let/Incr.php
index 974808f70c..3df7523089 100644
--- a/Library/Statements/Let/Incr.php
+++ b/Library/Statements/Let/Incr.php
@@ -13,7 +13,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * Incr.
diff --git a/Library/Statements/Let/ObjectDynamicProperty.php b/Library/Statements/Let/ObjectDynamicProperty.php
index b691089380..9c7ade5d1e 100644
--- a/Library/Statements/Let/ObjectDynamicProperty.php
+++ b/Library/Statements/Let/ObjectDynamicProperty.php
@@ -17,7 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * Updates object properties dynamically
diff --git a/Library/Statements/Let/ObjectDynamicStringProperty.php b/Library/Statements/Let/ObjectDynamicStringProperty.php
index 7d54d71dcb..c20d2251d0 100644
--- a/Library/Statements/Let/ObjectDynamicStringProperty.php
+++ b/Library/Statements/Let/ObjectDynamicStringProperty.php
@@ -16,7 +16,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * Updates object properties dynamically
diff --git a/Library/Statements/Let/ObjectProperty.php b/Library/Statements/Let/ObjectProperty.php
index e7e8dc9e8c..c277bb8c0a 100644
--- a/Library/Statements/Let/ObjectProperty.php
+++ b/Library/Statements/Let/ObjectProperty.php
@@ -16,7 +16,7 @@
 use Zephir\CompilationContext as Context;
 use Zephir\CompiledExpression as Expression;
 use Zephir\Exception\CompilerException as Exception;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * Adds/Updates an array index
diff --git a/Library/Statements/Let/ObjectPropertyAppend.php b/Library/Statements/Let/ObjectPropertyAppend.php
index 8c11838ee2..0317cf4ee4 100644
--- a/Library/Statements/Let/ObjectPropertyAppend.php
+++ b/Library/Statements/Let/ObjectPropertyAppend.php
@@ -14,7 +14,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ObjectPropertyAppend.
diff --git a/Library/Statements/Let/ObjectPropertyArrayIndex.php b/Library/Statements/Let/ObjectPropertyArrayIndex.php
index 9c221543b1..7fa1d8b79e 100644
--- a/Library/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/Library/Statements/Let/ObjectPropertyArrayIndex.php
@@ -15,7 +15,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ObjectPropertyArrayIndex.
diff --git a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php b/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
index b7d02416b0..a27b54ae01 100644
--- a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -16,7 +16,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * Updates object properties dynamically
diff --git a/Library/Statements/Let/ObjectPropertyDecr.php b/Library/Statements/Let/ObjectPropertyDecr.php
index 768963a298..40763179e9 100644
--- a/Library/Statements/Let/ObjectPropertyDecr.php
+++ b/Library/Statements/Let/ObjectPropertyDecr.php
@@ -13,7 +13,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ObjectPropertyDecr.
diff --git a/Library/Statements/Let/ObjectPropertyIncr.php b/Library/Statements/Let/ObjectPropertyIncr.php
index 8ac0a698b4..88633e2d5b 100644
--- a/Library/Statements/Let/ObjectPropertyIncr.php
+++ b/Library/Statements/Let/ObjectPropertyIncr.php
@@ -13,7 +13,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * ObjectPropertyIncr.
diff --git a/Library/Statements/Let/Variable.php b/Library/Statements/Let/Variable.php
index 479446029f..9debd6dde3 100644
--- a/Library/Statements/Let/Variable.php
+++ b/Library/Statements/Let/Variable.php
@@ -17,8 +17,7 @@
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalOperationException;
-use Zephir\Variable as ZephirVariable;
-
+use Zephir\Variable\Variable as ZephirVariable;
 use function Zephir\add_slashes;
 
 /**
diff --git a/Library/Statements/Let/VariableAppend.php b/Library/Statements/Let/VariableAppend.php
index 42595d41c7..caccc18bfa 100644
--- a/Library/Statements/Let/VariableAppend.php
+++ b/Library/Statements/Let/VariableAppend.php
@@ -14,7 +14,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 /**
  * VariableAppend.
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index 6d2b227f26..c1161bbebc 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -16,6 +16,7 @@
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
+use Zephir\Variable\Variable;
 use function count;
 use function in_array;
 use function is_string;
diff --git a/Library/SymbolTable.php b/Library/SymbolTable.php
index 4624fb3e3f..818d6f9b26 100644
--- a/Library/SymbolTable.php
+++ b/Library/SymbolTable.php
@@ -16,7 +16,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\LocalContextPass;
 use Zephir\Variable\Globals;
-
+use Zephir\Variable\Variable;
 use function count;
 
 /**
@@ -401,9 +401,9 @@ public function getVariableForRead($name, CompilationContext $compilationContext
      * @param CompilationContext $compilationContext
      * @param array              $statement
      *
-     * @throws CompilerException
+     * @return bool|\Zephir\Variable\Variable
+     *@throws CompilerException
      *
-     * @return bool|\Zephir\Variable
      */
     public function getVariableForWrite($name, CompilationContext $compilationContext, array $statement = null)
     {
diff --git a/Library/Variable.php b/Library/Variable/Variable.php
similarity index 99%
rename from Library/Variable.php
rename to Library/Variable/Variable.php
index 1f1ed10e1c..fef290049e 100644
--- a/Library/Variable.php
+++ b/Library/Variable/Variable.php
@@ -11,12 +11,16 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Variable;
 
 use ReflectionClass;
+use Zephir\Branch;
+use Zephir\BranchManager;
 use Zephir\Class\Definition\Definition;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable\Globals;
+use Zephir\TypeAwareInterface;
 use function in_array;
 use function is_string;
 
diff --git a/tests/Zephir/Backends/ZendEngine3/BackendTest.php b/tests/Zephir/Backends/ZendEngine3/BackendTest.php
index dbe6ce76ca..5a94e16a09 100644
--- a/tests/Zephir/Backends/ZendEngine3/BackendTest.php
+++ b/tests/Zephir/Backends/ZendEngine3/BackendTest.php
@@ -17,7 +17,7 @@
 use Zephir\Backend\Backend;
 use Zephir\CompilationContext;
 use Zephir\Config;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 final class BackendTest extends TestCase
 {
diff --git a/tests/Zephir/Optimizers/FunctionCall/PregMatchOptimizerTest.php b/tests/Zephir/Optimizers/FunctionCall/PregMatchOptimizerTest.php
index cda80e7caf..7b0cadb0cf 100644
--- a/tests/Zephir/Optimizers/FunctionCall/PregMatchOptimizerTest.php
+++ b/tests/Zephir/Optimizers/FunctionCall/PregMatchOptimizerTest.php
@@ -20,7 +20,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\FunctionCall\PregMatchOptimizer;
 use Zephir\SymbolTable;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 final class PregMatchOptimizerTest extends TestCase
 {
diff --git a/tests/Zephir/Statements/Let/VariableTest.php b/tests/Zephir/Statements/Let/VariableTest.php
index d8b773b796..90af5c5538 100644
--- a/tests/Zephir/Statements/Let/VariableTest.php
+++ b/tests/Zephir/Statements/Let/VariableTest.php
@@ -20,7 +20,7 @@
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 use Zephir\Statements\Let\Variable;
-use Zephir\Variable as ZephirVariable;
+use Zephir\Variable\Variable as ZephirVariable;
 
 final class VariableTest extends TestCase
 {
diff --git a/tests/Zephir/VariableTest.php b/tests/Zephir/Variable/VariableTest.php
similarity index 99%
rename from tests/Zephir/VariableTest.php
rename to tests/Zephir/Variable/VariableTest.php
index 84020a92e7..a250667937 100644
--- a/tests/Zephir/VariableTest.php
+++ b/tests/Zephir/Variable/VariableTest.php
@@ -11,7 +11,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Zephir\Test;
+namespace Zephir\Test\Variable;
 
 use PHPUnit\Framework\TestCase;
 use Zephir\Branch;
@@ -20,7 +20,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Variable;
+use Zephir\Variable\Variable;
 
 final class VariableTest extends TestCase
 {

From 983d9aea0f36c3a5d57025782ec003bd81d13ac7 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 17:52:34 +0100
Subject: [PATCH 065/375] #2407 - Move `CodePrinter` inside `Code/` directory

---
 Library/Backend/Backend.php                   |  4 +-
 Library/Backend/FcallManager.php              |  5 +-
 Library/Class/Definition/Definition.php       | 10 +--
 Library/Class/Method/Method.php               | 12 ++--
 Library/{CodePrinter.php => Code/Printer.php} | 20 +-----
 Library/CompilationContext.php                |  7 +-
 Library/Compiler.php                          |  6 +-
 Library/CompilerFile.php                      |  7 +-
 Library/CompilerFileAnonymous.php             |  3 +-
 Library/Statements/Let/Variable.php           | 71 +++++++------------
 Library/Statements/ThrowStatement.php         |  7 +-
 11 files changed, 60 insertions(+), 92 deletions(-)
 rename Library/{CodePrinter.php => Code/Printer.php} (92%)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index a3996ad109..ecbe4a85b4 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -15,7 +15,7 @@
 
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Method\Method;
-use Zephir\CodePrinter;
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Compiler;
@@ -435,7 +435,7 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
      */
     public function initializeVariableDefaults(array $variables, CompilationContext $context): string
     {
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
         $codePrinter->increaseLevel();
 
         $oldCodePrinter = $context->codePrinter;
diff --git a/Library/Backend/FcallManager.php b/Library/Backend/FcallManager.php
index 6401de07cd..af1855c1db 100644
--- a/Library/Backend/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -13,9 +13,8 @@
 
 namespace Zephir\Backend;
 
-use Zephir\CodePrinter;
+use Zephir\Code\Printer;
 use Zephir\Fcall\FcallManagerInterface;
-
 use function Zephir\file_put_contents_ex;
 
 class FcallManager implements FcallManagerInterface
@@ -54,7 +53,7 @@ public function getMacro($static, $doReturn, $paramCount): string
 
     public function genFcallCode(): void
     {
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
 
         $header = <<<HEAD
 /*
diff --git a/Library/Class/Definition/Definition.php b/Library/Class/Definition/Definition.php
index ea7735afd5..306573d06f 100644
--- a/Library/Class/Definition/Definition.php
+++ b/Library/Class/Definition/Definition.php
@@ -16,13 +16,13 @@
 use ReflectionClass;
 use ReflectionException;
 use Zephir\AliasManager;
-use Zephir\ArgInfoDefinition;
-use Zephir\Class\Property;
 use Zephir\Class\Constant;
 use Zephir\Class\Entry;
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
-use Zephir\CodePrinter;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Property;
+use Zephir\Code\ArgInfoDefinition;
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\Compiler;
 use Zephir\Documentation\Docblock;
@@ -1088,7 +1088,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Create a code printer for the header file.
          */
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
 
         $codePrinter->outputBlankLine();
         $codePrinter->output($exportAPI.' zend_class_entry *'.$this->getClassEntry().';');
diff --git a/Library/Class/Method/Method.php b/Library/Class/Method/Method.php
index 9ddd3538ca..6607734448 100644
--- a/Library/Class/Method/Method.php
+++ b/Library/Class/Method/Method.php
@@ -19,7 +19,7 @@
 use Zephir\Cache\Manager;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Entry as ClassEntry;
-use Zephir\CodePrinter;
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\Detectors\WriteDetector;
 use Zephir\Documentation\Docblock;
@@ -875,7 +875,7 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
         }
 
         $oldCodePrinter = $compilationContext->codePrinter;
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
         $codePrinter->increaseLevel();
         $codePrinter->increaseLevel();
         $compilationContext->codePrinter = $codePrinter;
@@ -1201,7 +1201,7 @@ public function checkStrictType(array $parameter, CompilationContext $compilatio
         $compilationContext->headersManager->add('ext/spl/spl_exceptions');
         $compilationContext->headersManager->add('kernel/exception');
 
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
         $codePrinter->increaseLevel();
         $oldCodePrinter = $compilationContext->codePrinter;
         $compilationContext->codePrinter = $codePrinter;
@@ -1388,7 +1388,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Change the code printer to a single method instance.
          */
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
         $compilationContext->codePrinter = $codePrinter;
 
         /**
@@ -1683,7 +1683,7 @@ public function compile(CompilationContext $compilationContext): void
             } else {
                 foreach ($params as $param) {
                     /* TODO: Migrate all this code to codeprinter, get rid of temp code printer */
-                    $tempCodePrinter = new CodePrinter();
+                    $tempCodePrinter = new Printer();
                     $realCodePrinter = $compilationContext->codePrinter;
                     $compilationContext->codePrinter = $tempCodePrinter;
                     $paramVar = $compilationContext->symbolTable->getVariableForRead($param, $compilationContext);
@@ -1806,7 +1806,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * ZEND_PARSE_PARAMETERS
          */
-        $tempCodePrinter = new CodePrinter();
+        $tempCodePrinter = new Printer();
         if ($this->parameters instanceof Parameters && $this->parameters->count() > 0) {
             $tempCodePrinter->output('#if PHP_VERSION_ID >= 80000');
             $tempCodePrinter->output("\t".'bool is_null_true = 1;');
diff --git a/Library/CodePrinter.php b/Library/Code/Printer.php
similarity index 92%
rename from Library/CodePrinter.php
rename to Library/Code/Printer.php
index 93910aac00..121273f7b8 100644
--- a/Library/CodePrinter.php
+++ b/Library/Code/Printer.php
@@ -11,12 +11,12 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Code;
 
 /**
  * Buffers code, making it look pretty
  */
-class CodePrinter
+class Printer
 {
     protected string $code = '';
 
@@ -40,8 +40,6 @@ public function preOutput(string $code): void
 
     /**
      * Add code to the output without indentation.
-     *
-     * @param string $code
      */
     public function outputNoIndent(string $code): void
     {
@@ -52,9 +50,6 @@ public function outputNoIndent(string $code): void
 
     /**
      * Add code to the output.
-     *
-     * @param string $code
-     * @param bool   $appendEOL
      */
     public function output(string $code, bool $appendEOL = true): void
     {
@@ -65,9 +60,6 @@ public function output(string $code, bool $appendEOL = true): void
 
     /**
      * Adds a comment to the output with indentation level.
-     *
-     * @param $docblock
-     * @param bool $replaceTab
      */
     public function outputDocBlock($docblock, bool $replaceTab = true): void
     {
@@ -91,8 +83,6 @@ public function outputDocBlock($docblock, bool $replaceTab = true): void
      * Adds a blank line to the output
      * Optionally controlling if the blank link must be added if the
      * previous line added isn't one blank line too.
-     *
-     * @param bool $ifPrevNotBlank
      */
     public function preOutputBlankLine(bool $ifPrevNotBlank = false): void
     {
@@ -113,8 +103,6 @@ public function preOutputBlankLine(bool $ifPrevNotBlank = false): void
      * Adds a blank line to the output
      * Optionally controlling if the blank link must be added if the
      * previous line added isn't one blank line too.
-     *
-     * @param bool $ifPrevNotBlank
      */
     public function outputBlankLine(bool $ifPrevNotBlank = false): void
     {
@@ -149,8 +137,6 @@ public function decreaseLevel(): void
 
     /**
      * Returns the output in the buffer.
-     *
-     * @return string
      */
     public function getOutput(): string
     {
@@ -159,8 +145,6 @@ public function getOutput(): string
 
     /**
      * Returns an approximate number of lines printed by the CodePrinter.
-     *
-     * @return int
      */
     public function getNumberPrints(): int
     {
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index f80831c43a..41457c2bad 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -15,11 +15,12 @@
 
 use Psr\Log\LoggerInterface;
 use Zephir\Backend\Backend;
-use Zephir\Cache\Manager;
 use Zephir\Cache\FunctionCache;
+use Zephir\Cache\Manager;
 use Zephir\Class\Definition\AbstractDefinition;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Method\Method;
+use Zephir\Code\Printer;
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
 use function in_array;
@@ -34,7 +35,7 @@ class CompilationContext
     /**
      * Current code printer.
      */
-    public ?CodePrinter $codePrinter = null;
+    public ?Printer $codePrinter = null;
 
     /**
      * Whether the current method is static or not.
@@ -44,7 +45,7 @@ class CompilationContext
     /**
      * Code printer for the header.
      */
-    public ?CodePrinter $headerPrinter = null;
+    public ?Printer $headerPrinter = null;
 
     /**
      * Current symbol table.
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 7b5da332c9..f1f12e77a9 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -22,7 +22,9 @@
 use Zephir\Backend\Backend;
 use Zephir\Backend\StringsManager;
 use Zephir\Class\Definition\Definition;
+use Zephir\Code\ArgInfoDefinition;
 use Zephir\Code\Builder\Struct;
+use Zephir\Code\Printer;
 use Zephir\Compiler\CompilerFileFactory;
 use Zephir\Compiler\FileInterface;
 use Zephir\Exception\CompilerException;
@@ -1822,8 +1824,8 @@ public function createProjectFiles(string $project): bool
 
     public function generateFunctionInformation(): array
     {
-        $headerPrinter = new CodePrinter();
-        $entryPrinter = new CodePrinter();
+        $headerPrinter = new Printer();
+        $entryPrinter = new Printer();
 
         /**
          * Specifying Argument Information
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 835948d8a6..490474591e 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -16,12 +16,13 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
 use ReflectionException;
-use Zephir\Class\Property;
 use Zephir\Class\Constant;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Definition\DefinitionRuntime;
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Property;
+use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\CompilerException;
@@ -794,7 +795,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
         /**
          * Main code-printer for the file.
          */
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
         $compilationContext->codePrinter = $codePrinter;
 
         /**
diff --git a/Library/CompilerFileAnonymous.php b/Library/CompilerFileAnonymous.php
index 0e97c27728..9785152744 100644
--- a/Library/CompilerFileAnonymous.php
+++ b/Library/CompilerFileAnonymous.php
@@ -17,6 +17,7 @@
 use Psr\Log\NullLogger;
 use ReflectionException;
 use Zephir\Class\Definition\Definition;
+use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
 use function count;
 
@@ -166,7 +167,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
         /**
          * Main code-printer for the file.
          */
-        $codePrinter = new CodePrinter();
+        $codePrinter = new Printer();
         $compilationContext->codePrinter = $codePrinter;
 
         $codePrinter->outputBlankLine();
diff --git a/Library/Statements/Let/Variable.php b/Library/Statements/Let/Variable.php
index 9debd6dde3..594e806009 100644
--- a/Library/Statements/Let/Variable.php
+++ b/Library/Statements/Let/Variable.php
@@ -11,7 +11,7 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\CodePrinter;
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Detectors\ReadDetector;
@@ -111,20 +111,14 @@ public function assign(
     /**
      * Performs numeric assignment.
      *
-     * @param CodePrinter        $codePrinter
-     * @param CompiledExpression $resolvedExpr
-     * @param string             $variable
-     * @param array              $statement
-     * @param CompilationContext $compilationContext
-     *
      * @throws CompilerException
      * @throws \Zephir\Exception\IllegalOperationException
      */
     private function doNumericAssignment(
-        CodePrinter $codePrinter,
+        Printer            $codePrinter,
         CompiledExpression $resolvedExpr,
-        string $variable,
-        array $statement,
+        string             $variable,
+        array              $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -349,20 +343,14 @@ private function doNumericAssignment(
     /**
      * Performs double assignment.
      *
-     * @param CodePrinter        $codePrinter
-     * @param CompiledExpression $resolvedExpr
-     * @param string             $variable
-     * @param array              $statement
-     * @param CompilationContext $compilationContext
-     *
      * @throws CompilerException
      * @throws IllegalOperationException
      */
     private function doDoubleAssignment(
-        CodePrinter $codePrinter,
+        Printer            $codePrinter,
         CompiledExpression $resolvedExpr,
-        string $variable,
-        array $statement,
+        string             $variable,
+        array              $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -536,22 +524,15 @@ private function doDoubleAssignment(
     /**
      * Performs string assignment.
      *
-     * @param CodePrinter        $codePrinter
-     * @param CompiledExpression $resolvedExpr
-     * @param ZephirVariable     $symbolVariable
-     * @param string             $variable
-     * @param array              $statement
-     * @param CompilationContext $compilationContext
-     *
      * @throws CompilerException
      * @throws \Zephir\Exception\IllegalOperationException
      */
     private function doStringAssignment(
-        CodePrinter $codePrinter,
+        Printer            $codePrinter,
         CompiledExpression $resolvedExpr,
-        ZephirVariable $symbolVariable,
-        string $variable,
-        array $statement,
+        ZephirVariable     $symbolVariable,
+        string             $variable,
+        array              $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -724,7 +705,7 @@ private function doStringAssignment(
     /**
      * Performs array assignment.
      *
-     * @param CodePrinter        $codePrinter
+     * @param Printer        $codePrinter
      * @param CompiledExpression $resolvedExpr
      * @param ZephirVariable     $symbolVariable
      * @param string             $variable
@@ -735,11 +716,11 @@ private function doStringAssignment(
      * @throws IllegalOperationException
      */
     private function doArrayAssignment(
-        CodePrinter $codePrinter,
+        Printer            $codePrinter,
         CompiledExpression $resolvedExpr,
-        ZephirVariable $symbolVariable,
-        string $variable,
-        array $statement,
+        ZephirVariable     $symbolVariable,
+        string             $variable,
+        array              $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -773,7 +754,7 @@ private function doArrayAssignment(
     /**
      * Performs boolean assignment.
      *
-     * @param CodePrinter        $codePrinter
+     * @param Printer        $codePrinter
      * @param CompiledExpression $resolvedExpr
      * @param string             $variable
      * @param array              $statement
@@ -783,10 +764,10 @@ private function doArrayAssignment(
      * @throws IllegalOperationException
      */
     private function doBoolAssignment(
-        CodePrinter $codePrinter,
+        Printer            $codePrinter,
         CompiledExpression $resolvedExpr,
-        string $variable,
-        array $statement,
+        string             $variable,
+        array              $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -908,7 +889,7 @@ private function doBoolAssignment(
     /**
      * Performs variable assignment.
      *
-     * @param CodePrinter        $codePrinter
+     * @param Printer        $codePrinter
      * @param CompiledExpression $resolvedExpr
      * @param ZephirVariable     $symbolVariable
      * @param string             $variable
@@ -920,13 +901,13 @@ private function doBoolAssignment(
      * @throws IllegalOperationException
      */
     private function doVariableAssignment(
-        CodePrinter $codePrinter,
+        Printer            $codePrinter,
         CompiledExpression $resolvedExpr,
-        ZephirVariable $symbolVariable,
-        string $variable,
-        array $statement,
+        ZephirVariable     $symbolVariable,
+        string             $variable,
+        array              $statement,
         CompilationContext $compilationContext,
-        ReadDetector $readDetector
+        ReadDetector       $readDetector
     ) {
         switch ($resolvedExpr->getType()) {
             case 'null':
diff --git a/Library/Statements/ThrowStatement.php b/Library/Statements/ThrowStatement.php
index 1217c28519..f7394034e1 100644
--- a/Library/Statements/ThrowStatement.php
+++ b/Library/Statements/ThrowStatement.php
@@ -15,13 +15,12 @@
 
 use ReflectionException;
 use Zephir\Class\Entry;
-use Zephir\CodePrinter;
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\Compiler;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-
 use function in_array;
 use function Zephir\add_slashes;
 use function Zephir\fqcn;
@@ -142,12 +141,12 @@ public function compile(CompilationContext $compilationContext): void
     /**
      * Throws an exception escaping the data.
      *
-     * @param CodePrinter $printer
+     * @param Printer $printer
      * @param string      $class
      * @param string      $message
      * @param array       $expression
      */
-    private function throwStringException(CodePrinter $printer, string $class, string $message, array $expression): void
+    private function throwStringException(Printer $printer, string $class, string $message, array $expression): void
     {
         $message = add_slashes($message);
         $path = Compiler::getShortUserPath($expression['file']);

From 93554350bb3834c8ca1a3cfdbeab041ea1f0721c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 17:52:45 +0100
Subject: [PATCH 066/375] #2407 - Move `ArgInfoDefinition` inside `Code/`
 directory

---
 Library/{ => Code}/ArgInfoDefinition.php | 65 ++++--------------------
 1 file changed, 10 insertions(+), 55 deletions(-)
 rename Library/{ => Code}/ArgInfoDefinition.php (94%)

diff --git a/Library/ArgInfoDefinition.php b/Library/Code/ArgInfoDefinition.php
similarity index 94%
rename from Library/ArgInfoDefinition.php
rename to Library/Code/ArgInfoDefinition.php
index 4af5842ef7..1a8439acef 100644
--- a/Library/ArgInfoDefinition.php
+++ b/Library/Code/ArgInfoDefinition.php
@@ -11,77 +11,32 @@
 
 declare(strict_types=1);
 
-namespace Zephir;
+namespace Zephir\Code;
 
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
+use Zephir\CompilationContext;
+use Zephir\Exception;
 use function array_key_exists;
 use function count;
+use function Zephir\escape_class;
 
 class ArgInfoDefinition
 {
-    /**
-     * @var bool
-     */
-    private bool $returnByRef;
-
-    /**
-     * @var Method|FunctionDefinition
-     */
-    private $functionLike;
-
-    /**
-     * @var string
-     */
-    private string $name;
-
-    /**
-     * @var Parameters|null
-     */
     private ?Parameters $parameters;
 
-    /**
-     * @var CodePrinter
-     */
-    private CodePrinter $codePrinter;
-
-    /**
-     * @var CompilationContext
-     */
-    private CompilationContext $compilationContext;
-
-    /**
-     * @var string
-     */
     private string $booleanDefinition = '_IS_BOOL';
 
-    /**
-     * @var bool
-     */
     private bool $richFormat = true;
 
-    /**
-     * @param string             $name
-     * @param Method        $functionLike
-     * @param CodePrinter        $codePrinter
-     * @param CompilationContext $compilationContext
-     * @param bool               $returnByRef
-     */
     public function __construct(
-        string             $name,
-        Method             $functionLike,
-        CodePrinter        $codePrinter,
-        CompilationContext $compilationContext,
-        bool               $returnByRef = false
+        private string     $name,
+        private Method     $functionLike,
+        private Printer    $codePrinter,
+        private CompilationContext $compilationContext,
+        private bool               $returnByRef = false
     ) {
-        $this->functionLike = $functionLike;
-        $this->codePrinter = $codePrinter;
-        $this->compilationContext = $compilationContext;
-
-        $this->name = $name;
         $this->parameters = $this->functionLike->getParameters();
-
-        $this->returnByRef = $returnByRef;
     }
 
     public function setBooleanDefinition(string $definition): void

From ae312c9e01c47236b7ed13db9fe35e26d945a25d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 18:02:10 +0100
Subject: [PATCH 067/375] #2407 - Move `FcallManagerInterface` inside
 `Backend/` directory

---
 Library/Backend/Backend.php                   |   1 -
 Library/Backend/FcallManager.php              |   7 +-
 .../FcallManagerInterface.php                 |  10 +-
 Library/Compiler.php                          | 169 +-----------------
 Library/CompilerFile.php                      |   6 -
 5 files changed, 14 insertions(+), 179 deletions(-)
 rename Library/{Fcall => Backend}/FcallManagerInterface.php (60%)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index ecbe4a85b4..13a64161cb 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -22,7 +22,6 @@
 use Zephir\Config;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
-use Zephir\Fcall\FcallManagerInterface;
 use Zephir\FunctionDefinition;
 use Zephir\GlobalConstant;
 use Zephir\Variable\Globals;
diff --git a/Library/Backend/FcallManager.php b/Library/Backend/FcallManager.php
index af1855c1db..1c751f4590 100644
--- a/Library/Backend/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -14,7 +14,6 @@
 namespace Zephir\Backend;
 
 use Zephir\Code\Printer;
-use Zephir\Fcall\FcallManagerInterface;
 use function Zephir\file_put_contents_ex;
 
 class FcallManager implements FcallManagerInterface
@@ -25,12 +24,12 @@ class FcallManager implements FcallManagerInterface
      * {@inheritdoc}
      *
      * @param bool $static
-     * @param int  $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
-     * @param int  $paramCount
+     * @param int $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
+     * @param int $paramCount
      *
      * @return string
      */
-    public function getMacro($static, $doReturn, $paramCount): string
+    public function getMacro(bool $static, int $doReturn, int $paramCount): string
     {
         $scope = $static ? 'STATIC' : '';
         $mode = 'CALL_INTERNAL_METHOD_NORETURN_P';
diff --git a/Library/Fcall/FcallManagerInterface.php b/Library/Backend/FcallManagerInterface.php
similarity index 60%
rename from Library/Fcall/FcallManagerInterface.php
rename to Library/Backend/FcallManagerInterface.php
index ab02c599b5..4adc7dc851 100644
--- a/Library/Fcall/FcallManagerInterface.php
+++ b/Library/Backend/FcallManagerInterface.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Zephir\Fcall;
+namespace Zephir\Backend;
 
 interface FcallManagerInterface
 {
@@ -17,12 +17,12 @@ interface FcallManagerInterface
      * Resolve internal fcall attributes to a suitable macro and ensure that it's generated during compilation.
      *
      * @param bool $static
-     * @param int  $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
-     * @param int  $paramCount
+     * @param int $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
+     * @param int $paramCount
      *
      * @return string
      */
-    public function getMacro($static, $doReturn, $paramCount);
+    public function getMacro(bool $static, int $doReturn, int $paramCount): string;
 
-    public function genFcallCode();
+    public function genFcallCode(): void;
 }
diff --git a/Library/Compiler.php b/Library/Compiler.php
index f1f12e77a9..57f49ca5f1 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -18,8 +18,10 @@
 use Psr\Log\NullLogger;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
+use ReflectionClass;
 use ReflectionException;
 use Zephir\Backend\Backend;
+use Zephir\Backend\FcallManagerInterface;
 use Zephir\Backend\StringsManager;
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\ArgInfoDefinition;
@@ -33,7 +35,6 @@
 use Zephir\Exception\NotImplementedException;
 use Zephir\Exception\ParseException;
 use Zephir\Exception\RuntimeException;
-use Zephir\Fcall\FcallManagerInterface;
 use Zephir\FileSystem\FileSystemInterface;
 use Zephir\Parser\Manager;
 use function count;
@@ -57,16 +58,11 @@ final class Compiler
      */
     private array $files = [];
 
-    /**
-     * @var string[]
-     */
     private array $anonymousFiles = [];
 
     /**
      * Additional initializer code.
      * Used for static property initialization.
-     *
-     * @var array
      */
     private array $internalInitializers = [];
 
@@ -75,9 +71,6 @@ final class Compiler
      */
     private array $definitions = [];
 
-    /**
-     * @var string[]
-     */
     private array $compiledFiles = [];
 
     private array $constants = [];
@@ -91,39 +84,18 @@ final class Compiler
      */
     private static array $internalDefinitions = [];
 
-    /**
-     * @var bool
-     */
     private static bool $loadedPrototypes = false;
 
-    /**
-     * @var array
-     */
     private array $extraFiles = [];
 
-    /**
-     * @var StringsManager
-     */
     private StringsManager $stringManager;
 
-    /**
-     * @var FcallManagerInterface
-     */
     private FcallManagerInterface $fcallManager;
 
-    /**
-     * @var string|null
-     */
     private ?string $prototypesPath;
 
-    /**
-     * @var string|null
-     */
     private ?string $optimizersPath;
 
-    /**
-     * @var string|null
-     */
     private ?string $templatesPath;
 
     public function __construct(
@@ -145,9 +117,6 @@ public function __construct(
         }
     }
 
-    /**
-     * @param string $prototypesPath
-     */
     public function setPrototypesPath(string $prototypesPath): void
     {
         $this->prototypesPath = $prototypesPath;
@@ -155,9 +124,6 @@ public function setPrototypesPath(string $prototypesPath): void
 
     /**
      * Resolves path to the internal prototypes.
-     *
-     * @return string|null
-     *
      */
     private function resolvePrototypesPath(): ?string
     {
@@ -175,9 +141,6 @@ private function resolvePrototypesPath(): ?string
         return $prototypesPath;
     }
 
-    /**
-     * @param string $optimizersPath
-     */
     public function setOptimizersPath(string $optimizersPath): void
     {
         $this->optimizersPath = $optimizersPath;
@@ -204,9 +167,6 @@ private function resolveOptimizersPath(): ?string
         return $optimizersPath;
     }
 
-    /**
-     * @param string $templatesPath
-     */
     public function setTemplatesPath(string $templatesPath): void
     {
         $this->templatesPath = $templatesPath;
@@ -216,8 +176,6 @@ public function setTemplatesPath(string $templatesPath): void
      * Gets the Zephir Parser Manager.
      *
      * @deprecated
-     *
-     * @return Parser\Manager
      */
     public function getParserManager(): Parser\Manager
     {
@@ -226,10 +184,6 @@ public function getParserManager(): Parser\Manager
 
     /**
      * Adds a function to the function definitions.
-     *
-     * @param FunctionDefinition $func
-     * @param array $statement
-     *
      */
     public function addFunction(FunctionDefinition $func, array $statement = []): void
     {
@@ -247,11 +201,6 @@ public function addFunction(FunctionDefinition $func, array $statement = []): vo
     /**
      * Loads a class definition in an external dependency.
      *
-     * @param string $className
-     * @param string $location
-     *
-     * @return bool
-     *
      * @throws CompilerException
      * @throws IllegalStateException
      * @throws ParseException
@@ -286,10 +235,6 @@ public function loadExternalClass(string $className, string $location): bool
 
     /**
      * Allows to check if a class is part of the compiled extension.
-     *
-     * @param string $className
-     *
-     * @return bool
      */
     public function isClass(string $className): bool
     {
@@ -314,10 +259,6 @@ public function isClass(string $className): bool
     /**
      * Allows checking if an interface is part of the compiled extension.
      *
-     * @param string $className
-     *
-     * @return bool
-     *
      * @throws CompilerException
      * @throws IllegalStateException
      * @throws ParseException
@@ -344,10 +285,6 @@ public function isInterface(string $className): bool
 
     /**
      * Allows checking if a class is part of PHP.
-     *
-     * @param string $className
-     *
-     * @return bool
      */
     public function isBundledClass(string $className): bool
     {
@@ -356,10 +293,6 @@ public function isBundledClass(string $className): bool
 
     /**
      * Allows checking if an interface is part of PHP.
-     *
-     * @param string $className
-     *
-     * @return bool
      */
     public function isBundledInterface(string $className): bool
     {
@@ -368,12 +301,8 @@ public function isBundledInterface(string $className): bool
 
     /**
      * Returns class the class definition from a given class name.
-     *
-     * @param string $className
-     *
-     * @return Definition|false returns false if no class definition is found
      */
-    public function getClassDefinition(string $className)
+    public function getClassDefinition(string $className): Definition|bool
     {
         foreach ($this->definitions as $key => $value) {
             if (!strcasecmp($key, $className)) {
@@ -386,9 +315,6 @@ public function getClassDefinition(string $className)
 
     /**
      * Inserts an anonymous class definition in the compiler.
-     *
-     * @param CompilerFileAnonymous $file
-     * @param Definition       $classDefinition
      */
     public function addClassDefinition(CompilerFileAnonymous $file, Definition $classDefinition): void
     {
@@ -399,16 +325,12 @@ public function addClassDefinition(CompilerFileAnonymous $file, Definition $clas
     /**
      * Returns class the class definition from a given class name.
      *
-     * @param string $className
-     *
-     * @return Definition
-     *
      * @throws ReflectionException
      */
     public function getInternalClassDefinition(string $className): Definition
     {
         if (!isset(self::$internalDefinitions[$className])) {
-            $reflection = new \ReflectionClass($className);
+            $reflection = new ReflectionClass($className);
             self::$internalDefinitions[$className] = Definition::buildFromReflection($reflection);
         }
 
@@ -417,10 +339,6 @@ public function getInternalClassDefinition(string $className): Definition
 
     /**
      * Checks if $name is a Zephir constant.
-     *
-     * @param string $name
-     *
-     * @return bool
      */
     public function isConstant(string $name): bool
     {
@@ -429,20 +347,14 @@ public function isConstant(string $name): bool
 
     /**
      * Returns a Zephir Constant by its name.
-     *
-     * @param string $name
-     *
-     * @return mixed
      */
-    public function getConstant(string $name)
+    public function getConstant(string $name): mixed
     {
         return $this->constants[$name];
     }
 
     /**
      * Sets extensions globals.
-     *
-     * @param array $globals
      */
     public function setExtensionGlobals(array $globals): void
     {
@@ -453,10 +365,6 @@ public function setExtensionGlobals(array $globals): void
 
     /**
      * Checks if a specific extension global is defined.
-     *
-     * @param string $name
-     *
-     * @return bool
      */
     public function isExtensionGlobal(string $name): bool
     {
@@ -465,10 +373,6 @@ public function isExtensionGlobal(string $name): bool
 
     /**
      * Returns an extension global by its name.
-     *
-     * @param string $name
-     *
-     * @return array
      */
     public function getExtensionGlobal(string $name): array
     {
@@ -477,10 +381,6 @@ public function getExtensionGlobal(string $name): array
 
     /**
      * Returns GCC flags for current compilation.
-     *
-     * @param bool $development
-     *
-     * @return string
      */
     public function getGccFlags(bool $development = false): string
     {
@@ -509,8 +409,6 @@ public function getGccFlags(bool $development = false): string
 
     /**
      * Returns the php include directories returned by php-config.
-     *
-     * @return string
      */
     public function getPhpIncludeDirs(): string
     {
@@ -554,10 +452,6 @@ public function preCompileHeaders(): void
     /**
      * Generates the C sources from Zephir without compiling them.
      *
-     * @param bool $fromGenerate
-     *
-     * @return bool
-     *
      * @throws Exception
      * @throws ReflectionException
      */
@@ -934,9 +828,6 @@ public function compile(bool $development = false, ?int $jobs = null): void
     /**
      * Generate a HTML API.
      *
-     * @param array $options
-     * @param bool  $fromGenerate
-     *
      * @throws ConfigException
      * @throws Exception
      * @throws ReflectionException
@@ -959,8 +850,6 @@ public function api(array $options = [], bool $fromGenerate = false): void
     /**
      * Generate IDE stubs.
      *
-     * @param bool $fromGenerate
-     *
      * @throws Exception
      * @throws ReflectionException
      */
@@ -995,8 +884,6 @@ public function stubs(bool $fromGenerate = false): void
     /**
      * Compiles and installs the extension.
      *
-     * @param bool $development
-     *
      * @throws Exception
      * @throws NotImplementedException
      * @throws CompilerException
@@ -1047,10 +934,6 @@ public function install(bool $development = false): void
      *
      * TODO: move this to backend?
      *
-     * @param string $project
-     *
-     * @return bool true if we need to run configure
-     *
      * @throws Exception
      */
     public function createConfigFiles(string $project): bool
@@ -1239,11 +1122,7 @@ public function createConfigFiles(string $project): bool
     /**
      * Process extension globals.
      *
-     * @param string $namespace
-     *
      * @throws Exception
-     *
-     * @return array
      */
     public function processExtensionGlobals(string $namespace): array
     {
@@ -1392,8 +1271,6 @@ public function processExtensionGlobals(string $namespace): array
 
     /**
      * Generates phpinfo() sections showing information about the extension.
-     *
-     * @return string
      */
     public function processExtensionInfo(): string
     {
@@ -1436,11 +1313,6 @@ public function processExtensionInfo(): string
 
     /**
      * Process extension code injection.
-     *
-     * @param array  $entries
-     * @param string $section
-     *
-     * @return array
      */
     public function processCodeInjection(array $entries, string $section = 'request'): array
     {
@@ -1464,19 +1336,12 @@ public function processCodeInjection(array $entries, string $section = 'request'
 
     /**
      * Adds an external dependency to the compiler.
-     *
-     * @param string $namespace
-     * @param string $location
      */
     public function addExternalDependency(string $namespace, string $location): void
     {
         $this->externalDependencies[$namespace] = $location;
     }
 
-    /**
-     * @param CompilerFile[] $files
-     * @param null           $_dependency
-     */
     public function calculateDependencies(array $files, $_dependency = null): void
     {
         /**
@@ -1518,10 +1383,6 @@ public function calculateDependencies(array $files, $_dependency = null): void
      *
      * TODO: Move the part of the logic which depends on templates (backend-specific) to backend?
      *
-     * @param string $project
-     *
-     * @return bool
-     *
      * @throws Exception
      */
     public function createProjectFiles(string $project): bool
@@ -1888,10 +1749,6 @@ public function checkIfPhpized(): bool
 
     /**
      * Returns a short user path.
-     *
-     * @param string $path
-     *
-     * @return string
      */
     public static function getShortUserPath(string $path): string
     {
@@ -1902,10 +1759,6 @@ public static function getShortUserPath(string $path): string
      * Generate package-dependencies config for m4.
      *
      * TODO: Move the template depending part to backend?
-     *
-     * @param string $contentM4
-     *
-     * @return string
      */
     public function generatePackageDependenciesM4(string $contentM4): string
     {
@@ -1969,8 +1822,6 @@ public function generatePackageDependenciesM4(string $contentM4): string
     /**
      * Pre-compiles classes creating a CompilerFile definition.
      *
-     * @param string $filePath
-     *
      * @throws IllegalStateException
      */
     private function preCompile(string $filePath): void
@@ -1996,12 +1847,10 @@ private function preCompile(string $filePath): void
     /**
      * Recursively pre-compiles all sources found in the given path.
      *
-     * @param string $path
-     *
      * @throws IllegalStateException
      * @throws InvalidArgumentException
      */
-    private function recursivePreCompile(string $path)
+    private function recursivePreCompile(string $path): void
     {
         if (!is_dir($path)) {
             throw new InvalidArgumentException(
@@ -2219,8 +2068,6 @@ private function checkKernelFile(string $src, string $dst): bool
      * Checks which files in the base kernel must be copied.
      *
      * @throws Exception
-     *
-     * @return bool
      */
     private function checkKernelFiles(): bool
     {
@@ -2259,8 +2106,6 @@ private function checkKernelFiles(): bool
      * Checks if the current directory is a valid Zephir project.
      *
      * @throws Exception
-     *
-     * @return string
      */
     private function checkDirectory(): string
     {
@@ -2294,8 +2139,6 @@ private function checkDirectory(): string
 
     /**
      * Returns current GCC version.
-     *
-     * @return string
      */
     private function getGccVersion(): string
     {
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 490474591e..6c9fd343ed 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -39,14 +39,8 @@ final class CompilerFile implements FileInterface
 {
     use LoggerAwareTrait;
 
-    /**
-     * @var string|null
-     */
     private ?string $namespace = null;
 
-    /**
-     * @var string|null
-     */
     private ?string $className = null;
 
     /**

From 25bc3b18a76139cc5987ad0cf41eb1e411b9d542 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 18:10:55 +0100
Subject: [PATCH 068/375] #2407 - Move `Types` inside `Types/` directory

---
 Library/Backend/VariablesManager.php          |   2 +-
 Library/Class/Property.php                    |   2 +-
 Library/MethodCall.php                        |   1 +
 Library/Operators/Other/CastOperator.php      |   2 +-
 .../Other/RangeInclusiveOperator.php          |   2 +-
 Library/Statements/ReturnStatement.php        |   3 +-
 Library/Stubs/MethodDocBlock.php              |   2 +-
 Library/Types/ArrayType.php                   |   1 -
 Library/Types/CharType.php                    |   1 -
 Library/Types/DoubleType.php                  |   2 -
 Library/Types/IntType.php                     |   2 -
 Library/Types/IstringType.php                 |   2 -
 Library/Types/StringType.php                  |   2 -
 Library/{ => Types}/Types.php                 | 130 +++++-------------
 tests/Zephir/TypesTest.php                    |   2 +-
 15 files changed, 44 insertions(+), 112 deletions(-)
 rename Library/{ => Types}/Types.php (77%)

diff --git a/Library/Backend/VariablesManager.php b/Library/Backend/VariablesManager.php
index 69a8b89236..55b5d832e4 100644
--- a/Library/Backend/VariablesManager.php
+++ b/Library/Backend/VariablesManager.php
@@ -15,7 +15,7 @@
 
 use Zephir\CompilationContext as Context;
 use Zephir\Exception\CompilerException as Exception;
-use Zephir\Types;
+use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 use function Zephir\Backend\ZendEngine3\add_slashes;
 
diff --git a/Library/Class/Property.php b/Library/Class/Property.php
index 0dc256d376..2a1afcb05f 100644
--- a/Library/Class/Property.php
+++ b/Library/Class/Property.php
@@ -22,7 +22,7 @@
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\BinaryOperator;
 use Zephir\StatementsBlock;
-use Zephir\Types;
+use Zephir\Types\Types;
 use function in_array;
 use function is_array;
 
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index 736e897689..6d92d4693f 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -15,6 +15,7 @@
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
+use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
 /**
diff --git a/Library/Operators/Other/CastOperator.php b/Library/Operators/Other/CastOperator.php
index 26b8ac9724..0ceb7ccde6 100644
--- a/Library/Operators/Other/CastOperator.php
+++ b/Library/Operators/Other/CastOperator.php
@@ -22,7 +22,7 @@
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
 use Zephir\Statements\Let\Variable as LetVariable;
-use Zephir\Types;
+use Zephir\Types\Types;
 
 /**
  * Converts a value into another of a different type
diff --git a/Library/Operators/Other/RangeInclusiveOperator.php b/Library/Operators/Other/RangeInclusiveOperator.php
index e8a1815260..44c5a3c8f1 100644
--- a/Library/Operators/Other/RangeInclusiveOperator.php
+++ b/Library/Operators/Other/RangeInclusiveOperator.php
@@ -19,7 +19,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
-use Zephir\Types;
+use Zephir\Types\Types;
 
 /**
  * Inclusive range operator
diff --git a/Library/Statements/ReturnStatement.php b/Library/Statements/ReturnStatement.php
index c536999c60..551236cf33 100644
--- a/Library/Statements/ReturnStatement.php
+++ b/Library/Statements/ReturnStatement.php
@@ -17,8 +17,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\InvalidTypeException;
 use Zephir\Expression;
-use Zephir\Types;
-
+use Zephir\Types\Types;
 use function Zephir\add_slashes;
 
 /**
diff --git a/Library/Stubs/MethodDocBlock.php b/Library/Stubs/MethodDocBlock.php
index 42c621dd48..3f29b84e9b 100644
--- a/Library/Stubs/MethodDocBlock.php
+++ b/Library/Stubs/MethodDocBlock.php
@@ -15,7 +15,7 @@
 
 use Zephir\AliasManager;
 use Zephir\Class\Method\Method;
-use Zephir\Types;
+use Zephir\Types\Types;
 
 /**
  * Stubs Generator.
diff --git a/Library/Types/ArrayType.php b/Library/Types/ArrayType.php
index f050a0d53d..7ecbb04593 100644
--- a/Library/Types/ArrayType.php
+++ b/Library/Types/ArrayType.php
@@ -18,7 +18,6 @@
 use Zephir\Exception;
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
-use Zephir\Types;
 
 /**
  * Defines methods of the built-in array type
diff --git a/Library/Types/CharType.php b/Library/Types/CharType.php
index f77a09ae83..607a3bceb5 100644
--- a/Library/Types/CharType.php
+++ b/Library/Types/CharType.php
@@ -20,7 +20,6 @@
 use Zephir\Exception;
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
-use Zephir\Types;
 
 class CharType extends AbstractType
 {
diff --git a/Library/Types/DoubleType.php b/Library/Types/DoubleType.php
index 5ad3f5998b..49dddc27fd 100644
--- a/Library/Types/DoubleType.php
+++ b/Library/Types/DoubleType.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Types;
 
-use Zephir\Types;
-
 /**
  * Defines methods of the built-in double type
  */
diff --git a/Library/Types/IntType.php b/Library/Types/IntType.php
index 251de2f54f..9cd5cc490e 100644
--- a/Library/Types/IntType.php
+++ b/Library/Types/IntType.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Types;
 
-use Zephir\Types;
-
 /**
  * Defines methods of the built-in int type
  */
diff --git a/Library/Types/IstringType.php b/Library/Types/IstringType.php
index 9d7fa0390c..ddf1e6b954 100644
--- a/Library/Types/IstringType.php
+++ b/Library/Types/IstringType.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Types;
 
-use Zephir\Types;
-
 /**
  * Encapsulates built-in methods for the "istring" type
  */
diff --git a/Library/Types/StringType.php b/Library/Types/StringType.php
index b365041e7b..419102c61d 100644
--- a/Library/Types/StringType.php
+++ b/Library/Types/StringType.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Types;
 
-use Zephir\Types;
-
 /**
  * Encapsulates built-in methods for the "string" type
  *
diff --git a/Library/Types.php b/Library/Types/Types.php
similarity index 77%
rename from Library/Types.php
rename to Library/Types/Types.php
index 5cf9160705..ecfcdbc7b3 100644
--- a/Library/Types.php
+++ b/Library/Types/Types.php
@@ -9,43 +9,43 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Zephir;
+declare(strict_types=1);
+
+namespace Zephir\Types;
 
 use Zephir\Class\Method\Method;
+use function array_key_exists;
+use function count;
+use function in_array;
 
 final class Types
 {
-    const T_INT = 'int';
-    const T_UINT = 'uint';
-    const T_CHAR = 'char';
-    const T_UCHAR = 'uchar';
-    const T_LONG = 'long';
-    const T_ULONG = 'ulong';
-    const T_DOUBLE = 'double';
-    const T_FLOAT = 'float';
-    const T_NUMBER = 'number';
-    const T_NULL = 'null';
-    const T_BOOL = 'bool';
-    const T_FALSE = 'false';
-    const T_STRING = 'string';
-    const T_ISTRING = 'istring';
-    const T_VARIABLE = 'variable';
-    const T_MIXED = 'mixed';
-    const T_ARRAY = 'array';
-    const T_VOID = 'void';
-    const T_OBJECT = 'object';
-    const T_CALLABLE = 'callable';
-    const T_RESOURCE = 'resource';
-    const T_ITERABLE = 'iterable';
-    const T_UNDEFINED = 'undefined';
+    public const T_INT = 'int';
+    public const T_UINT = 'uint';
+    public const T_CHAR = 'char';
+    public const T_UCHAR = 'uchar';
+    public const T_LONG = 'long';
+    public const T_ULONG = 'ulong';
+    public const T_DOUBLE = 'double';
+    public const T_FLOAT = 'float';
+    public const T_NUMBER = 'number';
+    public const T_NULL = 'null';
+    public const T_BOOL = 'bool';
+    public const T_FALSE = 'false';
+    public const T_STRING = 'string';
+    public const T_ISTRING = 'istring';
+    public const T_VARIABLE = 'variable';
+    public const T_MIXED = 'mixed';
+    public const T_ARRAY = 'array';
+    public const T_VOID = 'void';
+    public const T_OBJECT = 'object';
+    public const T_CALLABLE = 'callable';
+    public const T_RESOURCE = 'resource';
+    public const T_ITERABLE = 'iterable';
+    public const T_UNDEFINED = 'undefined';
 
     /**
      * Gets PHP compatible return type from class method.
-     *
-     * @param Method $method
-     * @param array|null  $returnTypes
-     *
-     * @return string
      */
     public function getReturnTypeAnnotation(Method $method, array $returnTypes = null): string
     {
@@ -55,9 +55,9 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
 
         $isProcessedReturnType = null !== $returnTypes;
         $returnTypes = $returnTypes ?? $method->getReturnTypes();
-        $typesCount = \count($returnTypes);
+        $typesCount = count($returnTypes);
 
-        $isDynamic = \in_array('var', array_keys($returnTypes));
+        $isDynamic = in_array('var', array_keys($returnTypes));
         $isNullable = $this->isNullable($returnTypes);
 
         $isBool = $this->areReturnTypesBoolCompatible($returnTypes);
@@ -145,10 +145,6 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
 
     /**
      * Match Zephir types with Integer type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesIntegerCompatible(array $types): bool
     {
@@ -167,10 +163,6 @@ private function areReturnTypesIntegerCompatible(array $types): bool
 
     /**
      * Match Zephir types with Float type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesFloatCompatible(array $types): bool
     {
@@ -185,10 +177,6 @@ private function areReturnTypesFloatCompatible(array $types): bool
 
     /**
      * Match Zephir types with Boolean type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesBoolCompatible(array $types): bool
     {
@@ -197,10 +185,6 @@ private function areReturnTypesBoolCompatible(array $types): bool
 
     /**
      * Match Zephir types with String type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesStringCompatible(array $types): bool
     {
@@ -216,10 +200,6 @@ private function areReturnTypesStringCompatible(array $types): bool
 
     /**
      * Match Zephir types with Null type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesNullCompatible(array $types): bool
     {
@@ -228,10 +208,6 @@ private function areReturnTypesNullCompatible(array $types): bool
 
     /**
      * Match Zephir types with Array type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesArrayCompatible(array $types): bool
     {
@@ -240,10 +216,6 @@ private function areReturnTypesArrayCompatible(array $types): bool
 
     /**
      * Match Zephir types with Object type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesObjectCompatible(array $types): bool
     {
@@ -252,10 +224,6 @@ private function areReturnTypesObjectCompatible(array $types): bool
 
     /**
      * Match Zephir types with Iterable type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesIterableCompatible(array $types): bool
     {
@@ -264,10 +232,6 @@ private function areReturnTypesIterableCompatible(array $types): bool
 
     /**
      * Match Zephir types with Resource type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesResourceCompatible(array $types): bool
     {
@@ -276,17 +240,13 @@ private function areReturnTypesResourceCompatible(array $types): bool
 
     /**
      * Match Zephir types with Collections.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesCollectionCompatible(array $types): bool
     {
         $result = false;
 
         foreach ($types as $type => $data) {
-            if (false !== strpos($type, '[]')) {
+            if (str_contains($type, '[]')) {
                 $result = true;
             }
         }
@@ -296,10 +256,6 @@ private function areReturnTypesCollectionCompatible(array $types): bool
 
     /**
      * Match Zephir types with Void type.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function areReturnTypesVoidCompatible(array $types): bool
     {
@@ -308,10 +264,6 @@ private function areReturnTypesVoidCompatible(array $types): bool
 
     /**
      * Check if Zephir types is a Numeric type compatible.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function isNumeric(array $types): bool
     {
@@ -320,16 +272,12 @@ private function isNumeric(array $types): bool
 
     /**
      * Check if Zephir types can be Nullable.
-     *
-     * @param array $types
-     *
-     * @return bool
      */
     private function isNullable(array $types): bool
     {
-        return (\array_key_exists(self::T_NULL, $types)
-            || \in_array(self::T_NULL, $types))
-            && 1 !== \count($types);
+        return (array_key_exists(self::T_NULL, $types)
+            || in_array(self::T_NULL, $types))
+            && 1 !== count($types);
     }
 
     /**
@@ -347,12 +295,6 @@ private function isNullable(array $types): bool
      *          'char' => 48,
      *       ]
      *  ]
-     *
-     * @param array $types        - Return types from parser
-     * @param array $allowedTypes - Allowed return types
-     * @param bool  $isNullable
-     *
-     * @return bool
      */
     private function areReturnTypesCompatible(array $types, array $allowedTypes, bool $isNullable = false): bool
     {
@@ -363,7 +305,7 @@ private function areReturnTypesCompatible(array $types, array $allowedTypes, boo
         }
 
         foreach ($types as $type => $data) {
-            $areEquals = \in_array($type, $allowedTypes);
+            $areEquals = in_array($type, $allowedTypes);
 
             $result = isset($result)
                 ? ($areEquals && $result)
diff --git a/tests/Zephir/TypesTest.php b/tests/Zephir/TypesTest.php
index 157af90ec9..ca9bb7f409 100644
--- a/tests/Zephir/TypesTest.php
+++ b/tests/Zephir/TypesTest.php
@@ -16,7 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Method\Method;
-use Zephir\Types;
+use Zephir\Types\Types;
 
 final class TypesTest extends TestCase
 {

From 9a1e7bf7359deb9d1721879758e728ad4082cf34 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 18:16:38 +0100
Subject: [PATCH 069/375] #2407 - Fix path & import

---
 Library/Class/Property.php         | 1 +
 Library/Code/ArgInfoDefinition.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/Class/Property.php b/Library/Class/Property.php
index 2a1afcb05f..0c7852af49 100644
--- a/Library/Class/Property.php
+++ b/Library/Class/Property.php
@@ -25,6 +25,7 @@
 use Zephir\Types\Types;
 use function in_array;
 use function is_array;
+use function Zephir\add_slashes;
 
 /**
  * Represents a property class
diff --git a/Library/Code/ArgInfoDefinition.php b/Library/Code/ArgInfoDefinition.php
index 1a8439acef..33116ae4d6 100644
--- a/Library/Code/ArgInfoDefinition.php
+++ b/Library/Code/ArgInfoDefinition.php
@@ -510,7 +510,7 @@ private function getReturnType(): string
      */
     private function renderPhalconCompatible(): bool
     {
-        $compatibilityClasses = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/phalcon-compatibility-headers.php';
+        $compatibilityClasses = require __DIR__.'/../../config/phalcon-compatibility-headers.php';
         $classDefinition = $this->functionLike->getClassDefinition();
         $implementedInterfaces = $classDefinition !== null ? $classDefinition->getImplementedInterfaces() : [];
         $extendsClass = $classDefinition !== null ? $classDefinition->getExtendsClass() : null;

From 427a94b7fccd4045abba3b0816cd0b6efa2c3a8b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 18:18:11 +0100
Subject: [PATCH 070/375] #2407 - Remove 7.4 Win builds

---
 .github/workflows/main.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b5002f44c1..75f3173054 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.0' , '8.1', '8.2', '8.3' ]
+        php: [ '8.0', '8.1', '8.2', '8.3' ]
         ts: [ 'ts', 'nts' ]
         arch: [ 'x64' ]
 
@@ -77,8 +77,6 @@ jobs:
           # macOS
           - { name: macos-clang, os: macos-12, compiler: clang }
           # Windows
-          - { php: '7.4', ts: 'ts',  arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
-          - { php: '7.4', ts: 'nts', arch: 'x64', name: 'windows2019-vc15', os: 'windows-2019', compiler: 'vc15' }
           - { php: '8.0', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
           - { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
           - { php: '8.1', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }

From e3a75e723b962bf8705cf9ab71f30ceee4855a50 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 18:26:27 +0100
Subject: [PATCH 071/375] #2407 - Add version check for definition of
 `zephir_add_function`

https://github.com/php/php-src/pull/10161/files#diff-8792658491c2da2691aa3492fee6304154346d593fa1d787ebb897d0467d58efR40
---
 kernel/operators.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/operators.h b/kernel/operators.h
index 059f0a0fe2..f481d7c3ea 100644
--- a/kernel/operators.h
+++ b/kernel/operators.h
@@ -146,7 +146,11 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define zephir_get_boolval(z) (Z_TYPE_P(z) == IS_TRUE ? 1 : (Z_TYPE_P(z) == IS_FALSE ? 0 : zephir_get_boolval_ex(z)))
 #define zephir_get_charval(z) (Z_TYPE_P(z) == IS_LONG ? Z_LVAL_P(z) : zephir_get_charval_ex(z))
 
+#if PHP_VERSION_ID >= 80300
+#define zephir_add_function(result, left, right) add_function(result, left, right)
+#else
 #define zephir_add_function(result, left, right) fast_add_function(result, left, right)
+#endif
 #define zephir_sub_function(result, left, right) sub_function(result, left, right)
 #define zephir_pow_function(result, op1, op2) pow_function(result, op1, op2)
 #define zephir_increment(var) increment_function(var)

From 90c9d4c74c3060a4afdea92d0552fa0a7a1f9848 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 18:47:15 +0100
Subject: [PATCH 072/375] #2407 - Adjust tests for PHP8.3

---
 .../InterfaceMethodSignatureTest.php           | 18 ++++++++++++++----
 tests/Extension/NewInstanceOperatorTest.php    |  3 ++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php b/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
index ff77315a95..5f89aa88ca 100644
--- a/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
+++ b/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
@@ -32,7 +32,11 @@ public function testImplementInterfaceInMethodSignature(): void
     public function testImplementInterfaceInMethodSignatureInt(): void
     {
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessageMatches('/must be of (the\s)?type int, bool given/');
+        if (version_compare(PHP_VERSION, '8.2.0', '<=')) {
+            $this->expectExceptionMessageMatches('/must be of (the\s)?type int, bool given/');
+        } else {
+            $this->expectExceptionMessageMatches('/must be of type int, true given/');
+        }
 
         (new ImplementInt())->set(true);
     }
@@ -40,9 +44,15 @@ public function testImplementInterfaceInMethodSignatureInt(): void
     public function testImplementInterfaceInMethodSignatureInterface(): void
     {
         $this->expectException(\TypeError::class);
-        $this->expectExceptionMessageMatches(
-            '/(must be of type|implement interface) Stub\\\\Interfaces\\\\InterfaceInt, bool given/'
-        );
+        if (version_compare(PHP_VERSION, '8.2.0', '<=')) {
+            $this->expectExceptionMessageMatches(
+                '/(must be of type|implement interface) Stub\\\\Interfaces\\\\InterfaceInt, bool given/'
+            );
+        } else {
+            $this->expectExceptionMessageMatches(
+                '/(must be of type) Stub\\\\Interfaces\\\\InterfaceInt, true given/'
+            );
+        }
 
         (new ImplementInterface())->getVoid(true);
     }
diff --git a/tests/Extension/NewInstanceOperatorTest.php b/tests/Extension/NewInstanceOperatorTest.php
index f35793aa3d..818d44849f 100644
--- a/tests/Extension/NewInstanceOperatorTest.php
+++ b/tests/Extension/NewInstanceOperatorTest.php
@@ -38,7 +38,8 @@ protected function tearDown(): void
 
     public function autoload(string $className): void
     {
-        if (version_compare(PHP_VERSION, '8.1.0', '>=')) {
+        if (version_compare(PHP_VERSION, '8.1.0', '>=') &&
+            version_compare(PHP_VERSION, '8.3.0', '<')) {
             try {
                 if (isset($this->autoloadMap[$className])) {
                     include $this->autoloadMap[$className];

From 2d95cf0aa0f86f79afa8ce5df362cae4bfc392fb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 19:17:44 +0100
Subject: [PATCH 073/375] #2407 - Adjust tests

---
 .../Interfaces/InterfaceMethodSignatureTest.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php b/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
index 5f89aa88ca..2d41ad99c1 100644
--- a/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
+++ b/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
@@ -32,10 +32,10 @@ public function testImplementInterfaceInMethodSignature(): void
     public function testImplementInterfaceInMethodSignatureInt(): void
     {
         $this->expectException(\TypeError::class);
-        if (version_compare(PHP_VERSION, '8.2.0', '<=')) {
-            $this->expectExceptionMessageMatches('/must be of (the\s)?type int, bool given/');
-        } else {
+        if (version_compare(PHP_VERSION, '8.3.0beta3', '>=')) {
             $this->expectExceptionMessageMatches('/must be of type int, true given/');
+        } else {
+            $this->expectExceptionMessageMatches('/must be of (the\s)?type int, bool given/');
         }
 
         (new ImplementInt())->set(true);
@@ -44,13 +44,13 @@ public function testImplementInterfaceInMethodSignatureInt(): void
     public function testImplementInterfaceInMethodSignatureInterface(): void
     {
         $this->expectException(\TypeError::class);
-        if (version_compare(PHP_VERSION, '8.2.0', '<=')) {
+        if (version_compare(PHP_VERSION, '8.3.0beta3', '>=')) {
             $this->expectExceptionMessageMatches(
-                '/(must be of type|implement interface) Stub\\\\Interfaces\\\\InterfaceInt, bool given/'
+                '/(must be of type) Stub\\\\Interfaces\\\\InterfaceInt, true given/'
             );
         } else {
             $this->expectExceptionMessageMatches(
-                '/(must be of type) Stub\\\\Interfaces\\\\InterfaceInt, true given/'
+                '/(must be of type|implement interface) Stub\\\\Interfaces\\\\InterfaceInt, bool given/'
             );
         }
 

From 1dfb4d54d11300f5774c7aeaaad3f0b7ee630a86 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 19:23:27 +0100
Subject: [PATCH 074/375] #2407 - Bump version of `PHP_CS_FIXER_VERSION`

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 75f3173054..96e5fcb419 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         env:
-          PHP_CS_FIXER_VERSION: 3.2.0
+          PHP_CS_FIXER_VERSION: 3.26.1
         with:
           php-version: '8.0'
           coverage: none

From bd7c643a0bb58e49c6db10fd41d082fbf610e716 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 19:24:01 +0100
Subject: [PATCH 075/375] #2407 - Fix CS

---
 Library/AliasManager.php                      |   4 +-
 Library/Backend/Backend.php                   |  79 +++++-----
 Library/Backend/FcallManager.php              |   7 +-
 Library/Backend/FcallManagerInterface.php     |   4 +-
 Library/Backend/StringsManager.php            |   3 +-
 Library/Backend/VariablesManager.php          |   5 +-
 .../Builder/Operators/CastOperatorBuilder.php |   2 +-
 .../Operators/UnaryOperatorBuilder.php        |   6 +-
 Library/Cache/Manager.php                     |   2 +-
 Library/Cache/MethodCache.php                 |  14 +-
 Library/Cache/StaticMethodCache.php           |   5 +-
 Library/Call.php                              |   4 +-
 Library/Class/Constant.php                    |   5 +-
 Library/Class/Definition/Definition.php       |  42 +++---
 Library/Class/Entry.php                       |   3 +-
 Library/Class/Method/Method.php               | 141 +++++++++---------
 Library/Class/Method/Parameters.php           |  12 +-
 Library/Class/Property.php                    |  38 +++--
 Library/Code/ArgInfoDefinition.php            |  26 ++--
 Library/Code/Builder/Struct.php               |   7 +-
 Library/CompilationContext.php                |   5 +-
 Library/CompiledExpression.php                |   4 +-
 Library/Compiler.php                          | 137 ++++++++---------
 Library/CompilerFile.php                      |  17 +--
 Library/CompilerFileAnonymous.php             |  12 +-
 Library/Config.php                            |   5 +-
 Library/ConfigException.php                   |   6 +-
 Library/Console/Application.php               |   6 +-
 Library/Console/Command/ApiCommand.php        |   4 +-
 Library/Console/Command/CleanCommand.php      |   4 +-
 .../Command/DevelopmentModeAwareTrait.php     |   4 +-
 Library/Console/Command/GenerateCommand.php   |   4 +-
 Library/Console/Command/InitCommand.php       |  37 ++---
 Library/Console/Command/InstallCommand.php    |   4 +-
 .../Console/Command/RemoveOptionsTrait.php    |   7 +-
 Library/Detectors/ReadDetector.php            |   7 +-
 Library/Documentation.php                     |   8 +-
 Library/Documentation/DocblockParser.php      |   6 +-
 Library/Documentation/Template.php            |   2 +-
 Library/Exception/CompilerException.php       |   2 +-
 Library/Expression.php                        |   6 +-
 .../Expression/Builder/AbstractBuilder.php    |   6 +-
 Library/Expression/Builder/BuilderFactory.php |   2 +-
 .../Builder/Factory/OperatorsFactory.php      |   4 +-
 .../Statements/CallFunctionStatement.php      |   2 +-
 Library/Expression/Closure.php                |   5 +-
 Library/Expression/ClosureArrow.php           |   6 +-
 Library/Expression/Constants.php              |  24 ++-
 Library/Expression/NativeArray.php            |   9 +-
 Library/Expression/NativeArrayAccess.php      |  17 ++-
 Library/Expression/PropertyAccess.php         |   2 +-
 Library/Expression/PropertyDynamicAccess.php  |   1 +
 Library/Expression/Reference.php              |   5 +-
 Library/Expression/StaticConstantAccess.php   |  16 +-
 Library/Expression/StaticPropertyAccess.php   |   8 +-
 Library/FileSystem/HardDisk.php               |  20 +--
 Library/FunctionCall.php                      |  26 ++--
 Library/FunctionDefinition.php                |  12 +-
 .../Logger/Formatter/CompilerFormatter.php    |  12 +-
 Library/MethodCall.php                        |  44 +++---
 Library/Operators/AbstractOperator.php        |   6 +-
 .../Arithmetical/ArithmeticalBaseOperator.php |  10 +-
 .../Operators/Arithmetical/DivOperator.php    |   6 +-
 .../Operators/Arithmetical/ModOperator.php    |   6 +-
 .../Operators/Bitwise/BitwiseBaseOperator.php |  12 +-
 .../Operators/Bitwise/BitwiseNotOperator.php  |   6 +-
 .../Comparison/ComparisonBaseOperator.php     |   5 +-
 Library/Operators/Logical/AndOperator.php     |  10 +-
 .../Operators/Logical/LogicalBaseOperator.php |   6 +-
 Library/Operators/Logical/OrOperator.php      |   5 +-
 Library/Operators/Other/CastOperator.php      |   3 +-
 Library/Operators/Other/ConcatOperator.php    |   1 +
 .../Operators/Other/InstanceOfOperator.php    |   5 +-
 Library/Operators/Other/IssetOperator.php     |   3 +-
 Library/Operators/Other/LikelyOperator.php    |   5 +-
 .../Operators/Other/NewInstanceOperator.php   |   6 +-
 Library/Operators/Other/RequireOperator.php   |   5 +-
 .../Operators/Other/ShortTernaryOperator.php  |   2 +-
 Library/Operators/Other/TernaryOperator.php   |   2 +-
 Library/Operators/Other/TypeHintOperator.php  |   5 +-
 Library/Operators/Other/TypeOfOperator.php    |   5 +-
 Library/Operators/Other/UnlikelyOperator.php  |   5 +-
 Library/Operators/Unary/MinusOperator.php     |   5 +-
 Library/Operators/Unary/NotOperator.php       |   5 +-
 Library/Optimizers/EvalExpression.php         |   8 +-
 .../FunctionCall/AddslashesOptimizer.php      |   4 +-
 .../FunctionCall/ArrayKeyExistsOptimizer.php  |   6 +-
 .../FunctionCall/ArrayKeysOptimizer.php       |   4 +-
 .../FunctionCall/ArrayMergeOptimizer.php      |   4 +-
 .../FunctionCall/BasenameOptimizer.php        |   4 +-
 .../FunctionCall/CamelizeOptimizer.php        |   4 +-
 .../Optimizers/FunctionCall/CeilOptimizer.php |   4 +-
 .../FunctionCall/ClassExistsOptimizer.php     |   4 +-
 .../FunctionCall/CompareMtimeOptimizer.php    |   4 +-
 .../FunctionCall/Crc32Optimizer.php           |   4 +-
 .../FunctionCall/CreateArrayOptimizer.php     |   4 +-
 .../FunctionCall/CreateInstanceOptimizer.php  |   4 +-
 .../CreateSymbolTableOptimizer.php            |   4 +-
 .../FunctionCall/DoublevalOptimizer.php       |   4 +-
 .../Optimizers/FunctionCall/EvalOptimizer.php |   4 +-
 .../Optimizers/FunctionCall/ExitOptimizer.php |   6 +-
 .../FunctionCall/ExplodeOptimizer.php         |   4 +-
 .../FunctionCall/FcloseOptimizer.php          |   4 +-
 .../FunctionCall/FileExistsOptimizer.php      |   4 +-
 .../FunctionCall/FileGetContentsOptimizer.php |   4 +-
 .../FunctionCall/FilePutContentsOptimizer.php |   4 +-
 .../FunctionCall/FilemtimeOptimizer.php       |   4 +-
 .../FunctionCall/FloorOptimizer.php           |   4 +-
 .../FunctionCall/FuncGetArgOptimizer.php      |   4 +-
 .../FunctionCall/FuncGetArgsOptimizer.php     |   4 +-
 .../FunctionCall/FunctionExistsOptimizer.php  |   3 +-
 .../FunctionCall/FwriteOptimizer.php          |   4 +-
 .../FunctionCall/GetCalledClassOptimizer.php  |   4 +-
 .../FunctionCall/GetClassLowerOptimizer.php   |   4 +-
 .../FunctionCall/GetClassNsOptimizer.php      |   4 +-
 .../FunctionCall/GetClassOptimizer.php        |   4 +-
 .../FunctionCall/GetNsClassOptimizer.php      |   4 +-
 .../FunctionCall/GettypeOptimizer.php         |   4 +-
 .../FunctionCall/GlobalsGetOptimizer.php      |   6 +-
 .../FunctionCall/GlobalsSetOptimizer.php      |   8 +-
 .../FunctionCall/HashEqualsOptimizer.php      |   4 +-
 .../FunctionCall/ImplodeOptimizer.php         |   4 +-
 .../FunctionCall/InArrayOptimizer.php         |   4 +-
 .../FunctionCall/InterfaceExistsOptimizer.php |   4 +-
 .../FunctionCall/IntvalOptimizer.php          |   4 +-
 .../IsPrivatePropertyOptimizer.php            |   4 +-
 .../FunctionCall/LdexpOptimizer.php           |   4 +-
 .../Optimizers/FunctionCall/Md5Optimizer.php  |   4 +-
 .../FunctionCall/MergeAppendOptimizer.php     |   4 +-
 .../FunctionCall/MicrotimeOptimizer.php       |   4 +-
 .../Optimizers/FunctionCall/PowOptimizer.php  |   4 +-
 .../FunctionCall/PregMatchOptimizer.php       |   8 +-
 .../PrepareVirtualPathOptimizer.php           |   4 +-
 .../FunctionCall/RoundOptimizer.php           |  10 +-
 .../FunctionCall/StrReplaceOptimizer.php      |   4 +-
 .../FunctionCall/StripcslashesOptimizer.php   |   4 +-
 .../FunctionCall/StripslashesOptimizer.php    |   4 +-
 .../FunctionCall/StrposOptimizer.php          |   4 +-
 .../FunctionCall/StrtokOptimizer.php          |   4 +-
 .../FunctionCall/StrtolowerOptimizer.php      |   4 +-
 .../FunctionCall/StrtoupperOptimizer.php      |   4 +-
 .../FunctionCall/SubstrOptimizer.php          |   4 +-
 .../Optimizers/FunctionCall/TimeOptimizer.php |   4 +-
 .../Optimizers/FunctionCall/TrimOptimizer.php |   4 +-
 .../FunctionCall/UcfirstOptimizer.php         |   4 +-
 .../FunctionCall/UncamelizeOptimizer.php      |   4 +-
 .../FunctionCall/UniqueKeyOptimizer.php       |   4 +-
 .../FunctionCall/UniquePathKeyOptimizer.php   |   4 +-
 .../FunctionCall/VarExportOptimizer.php       |   4 +-
 .../ZephirStringToHexOptimizer.php            |   4 +-
 .../Optimizers/IsTypeOptimizerAbstract.php    |   4 +-
 Library/Optimizers/MathOptimizer.php          |   4 +-
 Library/Parser/Manager.php                    |   4 +-
 Library/Parser/Parser.php                     |   4 +-
 Library/Passes/LocalContextPass.php           |  16 +-
 Library/Passes/SkipVariantInit.php            |  10 +-
 Library/Passes/StaticTypeInference.php        |   8 +-
 Library/Statements/DoWhileStatement.php       |   4 +-
 Library/Statements/EchoStatement.php          |   3 +-
 Library/Statements/ForStatement.php           |  21 +--
 Library/Statements/IfStatement.php            |   4 +-
 Library/Statements/Let/ArrayIndex.php         |   4 +-
 .../Statements/Let/ObjectDynamicProperty.php  |   5 +-
 Library/Statements/Let/ObjectProperty.php     |   2 +-
 .../Let/ObjectPropertyArrayIndexAppend.php    |   4 +-
 Library/Statements/Let/StaticProperty.php     |   9 +-
 Library/Statements/Let/Variable.php           |  51 +++----
 Library/Statements/Let/VariableAppend.php     |   4 +-
 Library/Statements/ReturnStatement.php        |   4 +-
 Library/Statements/SwitchStatement.php        |   6 +-
 Library/Statements/ThrowStatement.php         |  25 ++--
 Library/Statements/UnsetStatement.php         |   9 +-
 Library/StatementsBlock.php                   |   8 +-
 Library/StaticCall.php                        |  95 ++++++------
 Library/Stubs/DocBlock.php                    |   8 +-
 Library/Stubs/Generator.php                   |  37 +++--
 Library/Stubs/MethodDocBlock.php              |   6 +-
 Library/SymbolTable.php                       |  32 ++--
 Library/Types/AbstractType.php                |  11 +-
 Library/Types/ArrayType.php                   |  10 +-
 Library/Types/CharType.php                    |  10 +-
 Library/Types/Types.php                       |  15 +-
 Library/Variable/Variable.php                 |  33 ++--
 Library/functions.php                         |  18 +--
 prototypes/apc.php                            |  30 ++--
 prototypes/gd.php                             |   2 +-
 tests/Extension/ArrayAccessTest.php           |   6 +-
 tests/Extension/ExitDieTest.php               |   7 +-
 tests/Extension/FunctionExistsTest.php        |   1 +
 tests/Extension/Globals/EnvTest.php           |   2 +-
 tests/Extension/Integral/RegexDNATest.php     |   5 +-
 tests/Extension/Issue1134Test.php             |   6 +-
 tests/Extension/MCallTest.php                 |  10 +-
 tests/Extension/NewInstanceOperatorTest.php   |   3 +-
 tests/Extension/Oo/ExtendClassTest.php        |   7 +-
 .../Extension/Oo/Scopes/PrivateScopeTest.php  |  63 ++++----
 .../Extension/Optimizers/IsPhpVersionTest.php |  24 ++-
 .../Properties/StaticPublicPropertiesTest.php |   6 +-
 tests/Extension/ReflectionTest.php            |  11 +-
 tests/Extension/RequiresTest.php              |  12 +-
 tests/Extension/TypeHinting/AbstractTest.php  |   7 +-
 tests/Extension/Types/MixedTypeTest.php       |  14 +-
 tests/Extension/Types/ObjTypeTest.php         |   5 +-
 tests/Extension/UnsetTest.php                 |   2 +-
 .../CompilerFile/CheckDependenciesTest.php    |   3 +-
 .../CompilerFile/CheckPathSeparatorTest.php   |   2 +-
 tests/Zephir/ConfigTest.php                   |   1 +
 tests/Zephir/Stubs/GeneratorTest.php          |  17 ++-
 tests/Zephir/Stubs/MethodDocBlockTest.php     |  18 +--
 tests/Zephir/TypesTest.php                    |   2 +-
 210 files changed, 959 insertions(+), 1128 deletions(-)

diff --git a/Library/AliasManager.php b/Library/AliasManager.php
index 4d82afe664..742d5bcaec 100644
--- a/Library/AliasManager.php
+++ b/Library/AliasManager.php
@@ -13,8 +13,6 @@
 
 namespace Zephir;
 
-use function in_array;
-
 /**
  * Manage aliases in a file
  */
@@ -117,7 +115,7 @@ public function isAliasPresentFor(string $className): bool
     {
         $extractAlias = $this->implicitAlias($className);
 
-        $isClassDeclared = in_array($className, $this->aliases);
+        $isClassDeclared = \in_array($className, $this->aliases);
         $classAlias = array_flip($this->aliases)[$className] ?? null;
 
         return $isClassDeclared && $classAlias !== $extractAlias;
diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 13a64161cb..9a28076e28 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -26,8 +26,7 @@
 use Zephir\GlobalConstant;
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
-use function in_array;
-use function strlen;
+
 use function Zephir\add_slashes;
 
 class Backend
@@ -121,9 +120,9 @@ public function initVar(Variable $variable, CompilationContext $context, $useCod
 
     public function getVariableCode(Variable $variable): string
     {
-        if ($variable->isDoublePointer() ||
-            in_array($variable->getName(), ['this_ptr', 'return_value']) ||
-            in_array($variable->getType(), ['int', 'long'])) {
+        if ($variable->isDoublePointer()
+            || \in_array($variable->getName(), ['this_ptr', 'return_value'])
+            || \in_array($variable->getType(), ['int', 'long'])) {
             return $variable->getName();
         }
 
@@ -243,13 +242,13 @@ public function getTypeDefinition($type): array
     }
 
     /**
-     * @param Variable           $variableVariable
-     * @param string             $operator
-     * @param string             $value
-     *
-     * @throws CompilerException
+     * @param Variable $variableVariable
+     * @param string   $operator
+     * @param string   $value
      *
      * @return string
+     *
+     * @throws CompilerException
      */
     public function getTypeofCondition(
         Variable $variableVariable,
@@ -309,7 +308,7 @@ public function getTypeofCondition(
     public function onPreInitVar(Method $method): string
     {
         if (!$method instanceof FunctionDefinition && !$method->isInternal()) {
-            return "zval *this_ptr = getThis();\n"; //TODO: think about a better way to solve this.
+            return "zval *this_ptr = getThis();\n"; // TODO: think about a better way to solve this.
         }
 
         return '';
@@ -343,7 +342,7 @@ public function onPostCompile(Method $method, CompilationContext $context): void
 
     public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable)
     {
-        $isComplex = in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
+        $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
 
         if ($isComplex && !$variable->isDoublePointer()) {
             $groupVariables[] = $variable->getName();
@@ -397,9 +396,9 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
                     break;
 
                 case 'char':
-                    $defaultValue = (string)$defaultValue;
-                    if (strlen($defaultValue) > 4) {
-                        if (strlen($defaultValue) > 10) {
+                    $defaultValue = (string) $defaultValue;
+                    if (\strlen($defaultValue) > 4) {
+                        if (\strlen($defaultValue) > 10) {
                             throw new CompilerException("Invalid char literal: '".substr($defaultValue, 0, 10)."...'", $variable->getOriginal());
                         } else {
                             throw new CompilerException("Invalid char literal: '".$defaultValue."'", $variable->getOriginal());
@@ -428,9 +427,9 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
      * @param Variable[]         $variables
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return string
+     *
+     * @throws CompilerException
      */
     public function initializeVariableDefaults(array $variables, CompilationContext $context): string
     {
@@ -504,7 +503,7 @@ public function declareConstant($type, $name, $value, CompilationContext $contex
     }
 
     /**
-     * @param Method        $method
+     * @param Method             $method
      * @param CompilationContext $context
      *
      * @return string
@@ -646,7 +645,7 @@ public function addArrayEntry(Variable $variable, $key, $value, CompilationConte
                 $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
                 $typeKey = $var->getType();
             }
-            if (in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
+            if (\in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
                 $keyType = 'index';
             }
         }
@@ -771,16 +770,16 @@ public function arrayIssetFetch2(Variable $target, Variable $var, $resolvedExpr,
         if (!($resolvedExpr instanceof Variable)) {
             if ('string' === $resolvedExpr->getType()) {
                 return new CompiledExpression('bool', 'zephir_array_isset_string_fetch('.$code.', SS("'.$resolvedExpr->getCode().'"), '.$flags.')', $expression);
-            } elseif (in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
+            } elseif (\in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
                 return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$resolvedExpr->getCode().', '.$flags.')', $expression);
             } else {
                 $resolvedExpr = $context->symbolTable->getVariableForRead($resolvedExpr->getCode(), $context);
             }
         }
 
-        if (in_array($resolvedExpr->getType(), ['int', 'long'])) {
+        if (\in_array($resolvedExpr->getType(), ['int', 'long'])) {
             return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
-        } elseif (in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
+        } elseif (\in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
             return new CompiledExpression('bool', 'zephir_array_isset_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
         }
 
@@ -920,11 +919,12 @@ public function fetchProperty(
     }
 
     /**
-     * @param Variable $symbolVariable
-     * @param Definition $classDefinition
-     * @param $property
-     * @param bool $readOnly
+     * @param Variable           $symbolVariable
+     * @param Definition         $classDefinition
+     * @param                    $property
+     * @param bool               $readOnly
      * @param CompilationContext $context
+     *
      * @throws Exception
      */
     public function fetchStaticProperty(Variable $symbolVariable, $classDefinition, $property, $readOnly, CompilationContext $context): void
@@ -943,14 +943,14 @@ public function fetchStaticProperty(Variable $symbolVariable, $classDefinition,
     }
 
     /**
-     * @param $value
+     * @param                    $value
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|string|Variable
+     *
+     * @throws CompilerException
      */
-    public function resolveValue($value, CompilationContext $context): Variable|bool|string
+    public function resolveValue($value, CompilationContext $context): Variable | bool | string
     {
         if ($value instanceof GlobalConstant) {
             switch ($value->getName()) {
@@ -988,7 +988,7 @@ public function resolveValue($value, CompilationContext $context): Variable|bool
             $value = $this->getVariableCode($tempVariable);
         } else {
             if ($value instanceof CompiledExpression) {
-                if (in_array($value->getType(), ['array', 'variable', 'mixed'])) {
+                if (\in_array($value->getType(), ['array', 'variable', 'mixed'])) {
                     $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context);
                 } else {
                     return $value->getCode();
@@ -1313,7 +1313,7 @@ public function getScalarTempVariable(
      *
      * @return void
      */
-    public function initArray(Variable $variable, CompilationContext $context, ?int $size = null): void
+    public function initArray(Variable $variable, CompilationContext $context, int $size = null): void
     {
         $code = $this->getVariableCode($variable);
 
@@ -1406,7 +1406,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
                 $type = 'long';
                 break;
 
-            /* Types which map to the same */
+                /* Types which map to the same */
             case 'variable':
             case 'mixed':
             case 'string':
@@ -1419,7 +1419,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
                     $arrayAccess['right']
                 );
         }
-        if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
+        if ($isVariable && \in_array($index->getType(), ['variable', 'string', 'mixed'])) {
             $output = 'zephir_array_fetch('.$this->getVariableCode($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
         } else {
             if ($isVariable) {
@@ -1630,19 +1630,11 @@ public function checkStrictType($type, $var, CompilationContext $context)
 
     /**
      * Assign value to variable helper.
-     *
-     * @param string               $macro
-     * @param string               $variableName
-     * @param string|Variable|null $value
-     * @param CompilationContext   $context
-     * @param bool                 $useCodePrinter
-     *
-     * @return string
      */
     protected function assignHelper(
         string $macro,
         string $variableName,
-               $value,
+        $value,
         CompilationContext $context,
         bool $useCodePrinter
     ): string {
@@ -1696,6 +1688,7 @@ protected function returnHelper(string $macro, $value, CompilationContext $conte
      * @param CompilationContext            $compilationContext
      *
      * @return array
+     *
      * @throws CompilerException
      */
     private function resolveOffsetExprs(array $offsetExprs, CompilationContext $compilationContext): array
diff --git a/Library/Backend/FcallManager.php b/Library/Backend/FcallManager.php
index 1c751f4590..ffa27b55c6 100644
--- a/Library/Backend/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -14,6 +14,7 @@
 namespace Zephir\Backend;
 
 use Zephir\Code\Printer;
+
 use function Zephir\file_put_contents_ex;
 
 class FcallManager implements FcallManagerInterface
@@ -24,8 +25,8 @@ class FcallManager implements FcallManagerInterface
      * {@inheritdoc}
      *
      * @param bool $static
-     * @param int $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
-     * @param int $paramCount
+     * @param int  $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
+     * @param int  $paramCount
      *
      * @return string
      */
@@ -133,7 +134,7 @@ public function genFcallCode(): void
                 sprintf(
                     'method(0, execute_data, %s, %s%s%s); \\',
                     $retParam,
-                    ($scope ? 'NULL, ' : $objParam),
+                    $scope ? 'NULL, ' : $objParam,
                     $retValueUsed,
                     $i ? ', &'.implode(', &', $zvals) : ''
                 )
diff --git a/Library/Backend/FcallManagerInterface.php b/Library/Backend/FcallManagerInterface.php
index 4adc7dc851..8c136055b3 100644
--- a/Library/Backend/FcallManagerInterface.php
+++ b/Library/Backend/FcallManagerInterface.php
@@ -17,8 +17,8 @@ interface FcallManagerInterface
      * Resolve internal fcall attributes to a suitable macro and ensure that it's generated during compilation.
      *
      * @param bool $static
-     * @param int $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
-     * @param int $paramCount
+     * @param int  $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
+     * @param int  $paramCount
      *
      * @return string
      */
diff --git a/Library/Backend/StringsManager.php b/Library/Backend/StringsManager.php
index 70ef092ebd..92f964d107 100644
--- a/Library/Backend/StringsManager.php
+++ b/Library/Backend/StringsManager.php
@@ -15,7 +15,6 @@
 
 use Zephir\StringsManager as BaseStringsManager;
 
-use function strlen;
 use function Zephir\file_put_contents_ex;
 
 /**
@@ -61,7 +60,7 @@ public function genConcatCode(): void
         $macros = [];
         ksort($this->concatKeys, SORT_STRING);
         foreach ($this->concatKeys as $key => $one) {
-            $len = strlen($key);
+            $len = \strlen($key);
             $params = [];
             $zvalCopy = [];
             $useCopy = [];
diff --git a/Library/Backend/VariablesManager.php b/Library/Backend/VariablesManager.php
index 55b5d832e4..bd3817be47 100644
--- a/Library/Backend/VariablesManager.php
+++ b/Library/Backend/VariablesManager.php
@@ -17,6 +17,7 @@
 use Zephir\Exception\CompilerException as Exception;
 use Zephir\Types\Types;
 use Zephir\Variable\Variable;
+
 use function Zephir\Backend\ZendEngine3\add_slashes;
 
 class VariablesManager
@@ -174,9 +175,9 @@ private function initArrayVar(Variable $variable, array $value, Context $context
      *
      * @param array $value
      *
-     * @throws Exception
-     *
      * @return void
+     *
+     * @throws Exception
      */
     private function validateCharValue(array $value): void
     {
diff --git a/Library/Builder/Operators/CastOperatorBuilder.php b/Library/Builder/Operators/CastOperatorBuilder.php
index a67aa4a32b..e57e855e6d 100644
--- a/Library/Builder/Operators/CastOperatorBuilder.php
+++ b/Library/Builder/Operators/CastOperatorBuilder.php
@@ -27,7 +27,7 @@ class CastOperatorBuilder extends AbstractOperatorBuilder
     public function __construct(
         string $left,
         FunctionCallBuilder $right,
-        ?string $file = null,
+        string $file = null,
         int $line = 0,
         int $char = 0
     ) {
diff --git a/Library/Builder/Operators/UnaryOperatorBuilder.php b/Library/Builder/Operators/UnaryOperatorBuilder.php
index b893e9904f..e68231881e 100644
--- a/Library/Builder/Operators/UnaryOperatorBuilder.php
+++ b/Library/Builder/Operators/UnaryOperatorBuilder.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Builder\Operators;
 
-use function is_object;
-
 /**
  * Allows to manually build a unary operator AST node
  */
@@ -34,7 +32,7 @@ class UnaryOperatorBuilder extends AbstractOperatorBuilder
      */
     protected $leftExpression;
 
-    public function __construct(string $operator, $leftExpression, ?string $file = null, int $line = 0, int $char = 0)
+    public function __construct(string $operator, $leftExpression, string $file = null, int $line = 0, int $char = 0)
     {
         $this->operator = $operator;
         $this->leftExpression = $leftExpression;
@@ -50,7 +48,7 @@ public function __construct(string $operator, $leftExpression, ?string $file = n
      */
     public function get(): array
     {
-        if (is_object($this->leftExpression) && method_exists($this->leftExpression, 'get')) {
+        if (\is_object($this->leftExpression) && method_exists($this->leftExpression, 'get')) {
             $expr = $this->leftExpression->get();
         } else {
             $expr = $this->leftExpression;
diff --git a/Library/Cache/Manager.php b/Library/Cache/Manager.php
index da15216156..16b6b70824 100644
--- a/Library/Cache/Manager.php
+++ b/Library/Cache/Manager.php
@@ -50,7 +50,7 @@ class Manager
      *
      * @param CallGathererPass|null $gatherer
      */
-    public function setGatherer(?CallGathererPass $gatherer = null): void
+    public function setGatherer(CallGathererPass $gatherer = null): void
     {
         $this->gatherer = $gatherer;
     }
diff --git a/Library/Cache/MethodCache.php b/Library/Cache/MethodCache.php
index 5a1e497f40..b5116d7e82 100644
--- a/Library/Cache/MethodCache.php
+++ b/Library/Cache/MethodCache.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Cache;
 
-use ReflectionClass;
-use ReflectionException;
 use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Passes\CallGathererPass;
@@ -48,7 +46,7 @@ public function __construct(protected ?CallGathererPass $gatherer = null)
     /**
      * Retrieves/Creates a function cache for a method call.
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function get(CompilationContext $compilationContext, string $methodName, Variable $caller): string
     {
@@ -167,7 +165,7 @@ public function get(CompilationContext $compilationContext, string $methodName,
     /**
      * Checks if the class is suitable for caching.
      *
-     * @param Definition|ReflectionClass|null $classDefinition
+     * @param Definition|\ReflectionClass|null $classDefinition
      *
      * @return bool
      */
@@ -177,12 +175,12 @@ private function isClassCacheable($classDefinition = null): bool
             return true;
         }
 
-        if (!($classDefinition instanceof ReflectionClass)) {
+        if (!($classDefinition instanceof \ReflectionClass)) {
             return false;
         }
 
-        return $classDefinition->isInternal() &&
-               $classDefinition->isInstantiable() &&
-               in_array($classDefinition->getExtension()->getName(), ['Reflection', 'Core', 'SPL']);
+        return $classDefinition->isInternal()
+               && $classDefinition->isInstantiable()
+               && in_array($classDefinition->getExtension()->getName(), ['Reflection', 'Core', 'SPL']);
     }
 }
diff --git a/Library/Cache/StaticMethodCache.php b/Library/Cache/StaticMethodCache.php
index faf119048f..d22f1c07f5 100644
--- a/Library/Cache/StaticMethodCache.php
+++ b/Library/Cache/StaticMethodCache.php
@@ -11,7 +11,6 @@
 
 namespace Zephir\Cache;
 
-use ReflectionMethod;
 use Zephir\CompilationContext;
 
 /**
@@ -41,7 +40,7 @@ public function get(CompilationContext $compilationContext, $method): string
             return 'NULL, 0';
         }
 
-        if (!($method instanceof ReflectionMethod)) {
+        if (!($method instanceof \ReflectionMethod)) {
             $completeName = $method->getClassDefinition()->getCompleteName();
 
             /**
@@ -71,7 +70,7 @@ public function get(CompilationContext $compilationContext, $method): string
         $functionCache->setMustInitNull(true);
         $functionCache->setReusable(false);
 
-        if (!($method instanceof ReflectionMethod)) {
+        if (!($method instanceof \ReflectionMethod)) {
             $this->cache[$completeName][$method->getName()] = $functionCache;
         }
 
diff --git a/Library/Call.php b/Library/Call.php
index 0d8720c9e0..24aac202cc 100644
--- a/Library/Call.php
+++ b/Library/Call.php
@@ -52,7 +52,7 @@ class Call
     /**
      * @var mixed|null
      */
-    protected $reflection = null;
+    protected $reflection;
 
     /**
      * @var array
@@ -382,7 +382,7 @@ public function getResolvedParams(array $parameters, CompilationContext $compila
                         case 'int':
                         case 'uint':
                         case 'long':
-                        /* ulong must be stored in string */
+                            /* ulong must be stored in string */
                         case 'ulong':
                             $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
                             $params[] = $compilationContext->backend->getVariableCode($parameterTempVariable);
diff --git a/Library/Class/Constant.php b/Library/Class/Constant.php
index 1b96b66132..e7dd91a074 100644
--- a/Library/Class/Constant.php
+++ b/Library/Class/Constant.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Class;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Expression\Constants;
@@ -83,7 +82,7 @@ public function getType(): string
      * Process the value of the class constant if needed.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function processValue(CompilationContext $compilationContext): void
     {
@@ -112,7 +111,7 @@ public function processValue(CompilationContext $compilationContext): void
      * Produce the code to register a class constant.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
diff --git a/Library/Class/Definition/Definition.php b/Library/Class/Definition/Definition.php
index 306573d06f..5fb1eb30b3 100644
--- a/Library/Class/Definition/Definition.php
+++ b/Library/Class/Definition/Definition.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Class\Definition;
 
-use ReflectionClass;
-use ReflectionException;
 use Zephir\AliasManager;
 use Zephir\Class\Constant;
 use Zephir\Class\Entry;
@@ -32,10 +30,6 @@
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\HeadersManager;
 use Zephir\StatementsBlock;
-use function count;
-use function gettype;
-use function is_array;
-use const DIRECTORY_SEPARATOR;
 
 /**
  * Represents a class/interface and their properties and methods.
@@ -120,7 +114,7 @@ final class Definition extends AbstractDefinition
 
     protected Compiler $compiler;
 
-    public function __construct(protected string $namespace, string $name, ?string $shortName = null)
+    public function __construct(protected string $namespace, string $name, string $shortName = null)
     {
         $this->name = $name;
         $this->shortName = $shortName ?: $name;
@@ -498,7 +492,7 @@ public function getConstant(string $constantName): ?Constant
      *
      * @throws CompilerException
      */
-    public function addMethod(Method $method, ?array $statement = null): void
+    public function addMethod(Method $method, array $statement = null): void
     {
         $methodName = strtolower($method->getName());
         if (isset($this->methods[$methodName])) {
@@ -513,7 +507,7 @@ public function addMethod(Method $method, ?array $statement = null): void
      *
      * @throws CompilerException
      */
-    public function updateMethod(Method $method, ?array $statement = null): void
+    public function updateMethod(Method $method, array $statement = null): void
     {
         $methodName = strtolower($method->getName());
         if (!isset($this->methods[$methodName])) {
@@ -575,7 +569,7 @@ public function hasMethod(string $methodName): bool
                 $extendsClassDefinition = $this->compiler->getInternalClassDefinition(
                     $extendsClassDefinition->getName()
                 );
-            } catch (ReflectionException $e) {
+            } catch (\ReflectionException $e) {
                 // Do nothing
                 return false;
             }
@@ -651,7 +645,7 @@ public function getPossibleMethodName(string $methodName): ?string
      *
      * @throws Exception
      */
-    public function getClassEntry(?CompilationContext $compilationContext = null): string
+    public function getClassEntry(CompilationContext $compilationContext = null): string
     {
         if ($this->external) {
             if ($compilationContext === null) {
@@ -700,7 +694,7 @@ public function getExternalHeader(): string
     {
         $parts = explode('\\', $this->namespace);
 
-        return 'ext/'.strtolower($parts[0].DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $this->namespace).DIRECTORY_SEPARATOR.$this->name).'.zep';
+        return 'ext/'.strtolower($parts[0].\DIRECTORY_SEPARATOR.str_replace('\\', \DIRECTORY_SEPARATOR, $this->namespace).\DIRECTORY_SEPARATOR.$this->name).'.zep';
     }
 
     /**
@@ -727,8 +721,8 @@ public function checkInterfaceImplements(self $classDefinition, self $interfaceD
             }
 
             $implementedMethod = $classDefinition->getMethod($method->getName());
-            if ($implementedMethod->getNumberOfRequiredParameters() > $method->getNumberOfRequiredParameters() ||
-                $implementedMethod->getNumberOfParameters() < $method->getNumberOfParameters()
+            if ($implementedMethod->getNumberOfRequiredParameters() > $method->getNumberOfRequiredParameters()
+                || $implementedMethod->getNumberOfParameters() < $method->getNumberOfParameters()
             ) {
                 throw new CompilerException(
                     sprintf(
@@ -848,7 +842,7 @@ public function addStaticInitMethod(StatementsBlock $statementsBlock): void
      * Compiles a class/interface.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -878,7 +872,7 @@ public function compile(CompilationContext $compilationContext): void
         $methods = &$this->methods;
         $initMethod = $this->getLocalOrParentInitMethod();
 
-        if (count($methods) > 0 || $initMethod) {
+        if (\count($methods) > 0 || $initMethod) {
             $methodEntry = strtolower($this->getCNamespace()).'_'.strtolower($this->getName()).'_method_entry';
         } else {
             $methodEntry = 'NULL';
@@ -968,7 +962,7 @@ public function compile(CompilationContext $compilationContext): void
         $interfaces = $this->interfaces;
         $compiler = $compilationContext->compiler;
 
-        if (is_array($interfaces)) {
+        if (\is_array($interfaces)) {
             $codePrinter->outputBlankLine(true);
 
             foreach ($interfaces as $interface) {
@@ -1097,7 +1091,7 @@ public function compile(CompilationContext $compilationContext): void
         $codePrinter->output('ZEPHIR_INIT_CLASS('.$this->getCNamespace().'_'.$this->getName().');');
         $codePrinter->outputBlankLine();
 
-        if (self::TYPE_CLASS === $this->getType() && count($methods) > 0) {
+        if (self::TYPE_CLASS === $this->getType() && \count($methods) > 0) {
             foreach ($methods as $method) {
                 if (!$method->isInternal()) {
                     $codePrinter->output('PHP_METHOD('.$this->getCNamespace().'_'.$this->getName().', '.$method->getName().');');
@@ -1126,7 +1120,7 @@ public function compile(CompilationContext $compilationContext): void
             $argInfo->render();
         }
 
-        if (count($methods) > 0) {
+        if (\count($methods) > 0) {
             $codePrinter->output(
                 sprintf(
                     'ZEPHIR_INIT_FUNCS(%s_%s_method_entry) {',
@@ -1156,7 +1150,7 @@ public function compile(CompilationContext $compilationContext): void
                             $codePrinter->output('#if PHP_VERSION_ID >= 80000');
                             $codePrinter->output(
                                 sprintf(
-                                // TODO: Rename to ZEND_ME
+                                    // TODO: Rename to ZEND_ME
                                     "\tPHP_ME(%s_%s, %s, %s, %s)",
                                     $this->getCNamespace(),
                                     $this->getName(),
@@ -1168,7 +1162,7 @@ public function compile(CompilationContext $compilationContext): void
                             $codePrinter->output('#else');
                             $codePrinter->output(
                                 sprintf(
-                                // TODO: Rename to ZEND_ME
+                                    // TODO: Rename to ZEND_ME
                                     "\tPHP_ME(%s_%s, %s, NULL, %s)",
                                     $this->getCNamespace(),
                                     $this->getName(),
@@ -1244,7 +1238,7 @@ public function setAliasManager(AliasManager $aliasManager): void
     /**
      * Builds a class definition from reflection.
      */
-    public static function buildFromReflection(ReflectionClass $class): self
+    public static function buildFromReflection(\ReflectionClass $class): self
     {
         $classDefinition = new self($class->getNamespaceName(), $class->getName(), $class->getShortName());
 
@@ -1263,7 +1257,7 @@ public static function buildFromReflection(ReflectionClass $class): self
                 if (!$params['mandatory']) {
                     try {
                         $params['default'] = $row->getDefaultValue();
-                    } catch (ReflectionException $e) {
+                    } catch (\ReflectionException $e) {
                         // TODO: dummy default value
                         $params['default'] = true;
                     }
@@ -1284,7 +1278,7 @@ public static function buildFromReflection(ReflectionClass $class): self
         }
 
         foreach ($class->getConstants() as $constantName => $constantValue) {
-            $type = self::convertPhpConstantType(gettype($constantValue));
+            $type = self::convertPhpConstantType(\gettype($constantValue));
             $classConstant = new Constant($constantName, ['value' => $constantValue, 'type' => $type], null);
             $classDefinition->addConstant($classConstant);
         }
diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index 03a9d56e9c..9aba0a2e22 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Class;
 
-use ReflectionClass;
 use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
@@ -73,7 +72,7 @@ public function get(): string
         }
 
         if (class_exists($this->classname) || interface_exists($this->classname)) {
-            $reflection = new ReflectionClass($this->classname);
+            $reflection = new \ReflectionClass($this->classname);
             $className = $reflection->getName();
 
             /**
diff --git a/Library/Class/Method/Method.php b/Library/Class/Method/Method.php
index 6607734448..00bfe9cd69 100644
--- a/Library/Class/Method/Method.php
+++ b/Library/Class/Method/Method.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Class\Method;
 
-use ReflectionException;
 use Zephir\Branch;
 use Zephir\BranchManager;
 use Zephir\Cache\Manager;
@@ -33,11 +32,7 @@
 use Zephir\StatementsBlock;
 use Zephir\SymbolTable;
 use Zephir\Variable\Variable;
-use function array_key_exists;
-use function count;
-use function in_array;
-use function is_array;
-use function is_object;
+
 use function Zephir\add_slashes;
 
 /**
@@ -136,15 +131,15 @@ class Method
     protected ?Definition $classDefinition = null;
 
     public function __construct(
-        Definition                 $classDefinition,
-        protected array            $visibility,
-        protected string           $name,
-        protected ?Parameters      $parameters = null,
+        Definition $classDefinition,
+        protected array $visibility,
+        protected string $name,
+        protected ?Parameters $parameters = null,
         protected ?StatementsBlock $statements = null,
-        protected ?string          $docblock = null,
-        ?array                     $returnType = null,
-        protected ?array           $expression = [],
-        array                      $staticVariables = [],
+        protected ?string $docblock = null,
+        array $returnType = null,
+        protected ?array $expression = [],
+        array $staticVariables = [],
     ) {
         $this->classDefinition = $classDefinition;
         $this->staticVariables = $staticVariables;
@@ -194,7 +189,7 @@ public function __construct(
      *
      * @param array|null $returnType
      */
-    public function setReturnTypes(?array $returnType = null): void
+    public function setReturnTypes(array $returnType = null): void
     {
         $this->returnTypesRaw = $returnType;
         if (null === $returnType) {
@@ -245,12 +240,12 @@ public function setReturnTypes(?array $returnType = null): void
             }
         }
 
-        if (count($castTypes) > 0) {
+        if (\count($castTypes) > 0) {
             $types['object'] = [];
             $this->returnClassTypes = $castTypes;
         }
 
-        if (count($types) > 0) {
+        if (\count($types) > 0) {
             $this->returnTypes = $types;
         }
     }
@@ -296,47 +291,47 @@ public function isEmpty(): bool
      */
     public function checkVisibility(array $visibility, string $name, array $original = null): void
     {
-        if (count($visibility) > 1) {
-            if (in_array('public', $visibility) && in_array('protected', $visibility)) {
+        if (\count($visibility) > 1) {
+            if (\in_array('public', $visibility) && \in_array('protected', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'public' and 'protected' at the same time", $original);
             }
 
-            if (in_array('public', $visibility) && in_array('private', $visibility)) {
+            if (\in_array('public', $visibility) && \in_array('private', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'public' and 'private' at the same time", $original);
             }
 
-            if (in_array('private', $visibility) && in_array('protected', $visibility)) {
+            if (\in_array('private', $visibility) && \in_array('protected', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'protected' and 'private' at the same time", $original);
             }
 
-            if (in_array('private', $visibility) && in_array('internal', $visibility)) {
+            if (\in_array('private', $visibility) && \in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'private' at the same time", $original);
             }
 
-            if (in_array('protected', $visibility) && in_array('internal', $visibility)) {
+            if (\in_array('protected', $visibility) && \in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'protected' at the same time", $original);
             }
 
-            if (in_array('public', $visibility) && in_array('internal', $visibility)) {
+            if (\in_array('public', $visibility) && \in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'public' at the same time", $original);
             }
         }
 
         if ('__construct' === $name) {
-            if (in_array('static', $visibility)) {
+            if (\in_array('static', $visibility)) {
                 throw new CompilerException("Constructors cannot be 'static'", $original);
             }
         } elseif ('__destruct' === $name) {
-            if (in_array('static', $visibility)) {
+            if (\in_array('static', $visibility)) {
                 throw new CompilerException("Destructors cannot be 'static'", $original);
             }
         }
 
-        $this->isAbstract = in_array('abstract', $visibility);
-        $this->isStatic = in_array('static', $visibility);
-        $this->isFinal = in_array('final', $visibility);
-        $this->isPublic = in_array('public', $visibility);
-        $this->isInternal = in_array('internal', $visibility);
+        $this->isAbstract = \in_array('abstract', $visibility);
+        $this->isStatic = \in_array('static', $visibility);
+        $this->isFinal = \in_array('final', $visibility);
+        $this->isPublic = \in_array('public', $visibility);
+        $this->isInternal = \in_array('internal', $visibility);
     }
 
     /**
@@ -502,7 +497,7 @@ public function getParameters(): ?Parameters
      */
     public function hasReturnTypes(): bool
     {
-        return count($this->returnTypes) || count($this->returnClassTypes);
+        return \count($this->returnTypes) || \count($this->returnClassTypes);
     }
 
     /**
@@ -521,7 +516,7 @@ public function areReturnTypesIntCompatible(): bool
         $types = ['int', 'uint', 'char', 'uchar', 'long', 'ulong'];
 
         foreach ($this->returnTypes as $returnType => $definition) {
-            if (in_array($returnType, $types)) {
+            if (\in_array($returnType, $types)) {
                 return true;
             }
         }
@@ -626,7 +621,7 @@ public function getNumberOfRequiredParameters(): int
      */
     public function hasModifier(string $modifier): bool
     {
-        return in_array($modifier, $this->visibility);
+        return \in_array($modifier, $this->visibility);
     }
 
     /**
@@ -639,7 +634,7 @@ public function getVisibility(): array
 
     public function isDeprecated(): bool
     {
-        return !empty($this->visibility) && in_array('deprecated', $this->visibility, true);
+        return !empty($this->visibility) && \in_array('deprecated', $this->visibility, true);
     }
 
     /**
@@ -720,7 +715,7 @@ public function isMixed(): bool
      */
     public function isPrivate(): bool
     {
-        return in_array('private', $this->visibility);
+        return \in_array('private', $this->visibility);
     }
 
     /**
@@ -728,7 +723,7 @@ public function isPrivate(): bool
      */
     public function isProtected(): bool
     {
-        return in_array('protected', $this->visibility);
+        return \in_array('protected', $this->visibility);
     }
 
     /**
@@ -861,7 +856,7 @@ public function removeMemoryStackReferences(SymbolTable $symbolTable, string $co
      * Assigns a default value.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function assignDefaultValue(array $parameter, CompilationContext $compilationContext): string
     {
@@ -1221,7 +1216,7 @@ public function assignZvalValue(array $parameter, CompilationContext $compilatio
     {
         $dataType = $this->getParamDataType($parameter);
 
-        if (in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
+        if (\in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
             return '';
         }
 
@@ -1273,7 +1268,7 @@ public function preCompile(CompilationContext $compilationContext): void
         $typeInference = null;
         $callGathererPass = null;
 
-        if (is_object($this->statements)) {
+        if (\is_object($this->statements)) {
             $compilationContext->currentMethod = $this;
 
             /**
@@ -1317,7 +1312,7 @@ public function preCompile(CompilationContext $compilationContext): void
      * Compiles the method.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -1452,12 +1447,12 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 if (!empty($parameter['const'])) {
                     $symbol->setReadOnly(true);
-                    if (is_object($symbolParam)) {
+                    if (\is_object($symbolParam)) {
                         $symbolParam->setReadOnly(true);
                     }
                 }
 
-                if (is_object($symbolParam)) {
+                if (\is_object($symbolParam)) {
                     /**
                      * Parameters are marked as 'external'
                      */
@@ -1527,7 +1522,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Compile the block of statements if any
          */
-        if (is_object($this->statements)) {
+        if (\is_object($this->statements)) {
             $compilationContext->staticContext = $this->hasModifier('static');
 
             /**
@@ -1566,7 +1561,7 @@ public function compile(CompilationContext $compilationContext): void
              * variable is modified so as do the proper separation.
              */
             $parametersToSeparate = [];
-            if (is_object($this->statements)) {
+            if (\is_object($this->statements)) {
                 if (!$this->localContext instanceof LocalContextPass) {
                     $writeDetector = new WriteDetector();
                 }
@@ -1636,7 +1631,7 @@ public function compile(CompilationContext $compilationContext): void
 
                 $name = match ($dataType) {
                     'object', 'callable', 'resource', 'variable', 'mixed' => $parameter['name'],
-                    default => $parameter['name'] . '_param',
+                    default => $parameter['name'].'_param',
                 };
 
                 /**
@@ -1784,7 +1779,7 @@ public function compile(CompilationContext $compilationContext): void
 
             if (!$variable->isUsed()) {
                 $node = $variable->getLastUsedNode();
-                if (is_array($node)) {
+                if (\is_array($node)) {
                     $expression = $node['expr'] ?? $node;
                     $compilationContext->logger->warning(
                         'Variable "'.$variable->getName().'" assigned but not used in '.$completeName.'::'.$this->getName(),
@@ -1799,7 +1794,7 @@ public function compile(CompilationContext $compilationContext): void
             }
         }
 
-        if (count($usedVariables)) {
+        if (\count($usedVariables)) {
             $codePrinter->preOutputBlankLine();
         }
 
@@ -1818,14 +1813,14 @@ public function compile(CompilationContext $compilationContext): void
             ));
 
             foreach ($requiredParams as $requiredParam) {
-                $tempCodePrinter->output("\t"."\t".$this->detectParam($requiredParam, $compilationContext));
+                $tempCodePrinter->output("\t\t".$this->detectParam($requiredParam, $compilationContext));
             }
 
             if (!empty($optionalParams)) {
-                $tempCodePrinter->output("\t"."\t".'Z_PARAM_OPTIONAL');
+                $tempCodePrinter->output("\t\t".'Z_PARAM_OPTIONAL');
 
                 foreach ($optionalParams as $optionalParam) {
-                    $tempCodePrinter->output("\t"."\t".$this->detectParam($optionalParam, $compilationContext));
+                    $tempCodePrinter->output("\t\t".$this->detectParam($optionalParam, $compilationContext));
                 }
             }
 
@@ -1854,7 +1849,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Finalize the method compilation
          */
-        if (is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
+        if (\is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
             /**
              * If the last statement is not a 'return' or 'throw' we need to
              * restore the memory stack if needed.
@@ -1904,7 +1899,7 @@ public function compile(CompilationContext $compilationContext): void
      */
     public function hasChildReturnStatementType(array $statement): bool
     {
-        if (!isset($statement['statements']) || !is_array($statement['statements'])) {
+        if (!isset($statement['statements']) || !\is_array($statement['statements'])) {
             return false;
         }
 
@@ -1952,7 +1947,7 @@ public function getInternalName(): string
     /**
      * Returns arginfo name for current method.
      */
-    public function getArgInfoName(?Definition $classDefinition = null): string
+    public function getArgInfoName(Definition $classDefinition = null): string
     {
         if ($classDefinition instanceof Definition) {
             return sprintf(
@@ -1990,7 +1985,7 @@ public function isReturnTypesHintDetermined(): bool
             return true;
         }
 
-        if (0 === count($this->returnTypes)) {
+        if (0 === \count($this->returnTypes)) {
             return false;
         }
 
@@ -2003,14 +1998,14 @@ public function isReturnTypesHintDetermined(): bool
             }
 
             if (isset($definition['type']) && 'return-type-annotation' === $definition['type']) {
-                if ($this->areReturnTypesBoolCompatible() ||
-                    $this->areReturnTypesDoubleCompatible() ||
-                    $this->areReturnTypesIntCompatible() ||
-                    $this->areReturnTypesNullCompatible() ||
-                    $this->areReturnTypesStringCompatible() ||
-                    $this->areReturnTypesFalseCompatible() ||
-                    $this->areReturnTypesObjectCompatible() ||
-                    array_key_exists('array', $this->getReturnTypes())
+                if ($this->areReturnTypesBoolCompatible()
+                    || $this->areReturnTypesDoubleCompatible()
+                    || $this->areReturnTypesIntCompatible()
+                    || $this->areReturnTypesNullCompatible()
+                    || $this->areReturnTypesStringCompatible()
+                    || $this->areReturnTypesFalseCompatible()
+                    || $this->areReturnTypesObjectCompatible()
+                    || \array_key_exists('array', $this->getReturnTypes())
                 ) {
                     continue;
                 }
@@ -2032,9 +2027,9 @@ public function isReturnTypesHintDetermined(): bool
      */
     public function isReturnTypeNullableObject(): bool
     {
-        return count($this->returnTypes) === 2 &&
-               isset($this->returnTypes['object']) &&
-               isset($this->returnTypes['null']);
+        return \count($this->returnTypes) === 2
+               && isset($this->returnTypes['object'])
+               && isset($this->returnTypes['null']);
     }
 
     /**
@@ -2042,7 +2037,7 @@ public function isReturnTypeNullableObject(): bool
      */
     public function isReturnTypeObject(): bool
     {
-        return count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
+        return \count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
     }
 
     /**
@@ -2055,12 +2050,12 @@ public function areReturnTypesCompatible(): bool
             return true;
         }
 
-        $totalTypes = count($this->returnTypes);
+        $totalTypes = \count($this->returnTypes);
 
         // union types
         if ($totalTypes > 1) {
             $diff = array_diff(array_keys($this->returnTypes), array_keys($this->mayBeArgTypes));
-            if (count($diff) === 0) {
+            if (\count($diff) === 0) {
                 return true;
             }
         }
@@ -2167,10 +2162,10 @@ public function detectParam(array $parameter, CompilationContext $compilationCon
                 break;
 
             case 'variable':
-                if (isset($parameter['cast']) &&
-                    $parameter['cast']['type'] === 'variable' &&
-                    $parameter['cast']['value'] &&
-                    $this->classDefinition !== null
+                if (isset($parameter['cast'])
+                    && $parameter['cast']['type'] === 'variable'
+                    && $parameter['cast']['value']
+                    && $this->classDefinition !== null
                 ) {
                     $classEntry = (new ClassEntry($parameter['cast']['value'], $compilationContext))->get();
                     if ($hasDefaultNull) {
diff --git a/Library/Class/Method/Parameters.php b/Library/Class/Method/Parameters.php
index 8cc9799363..16b24a8037 100644
--- a/Library/Class/Method/Parameters.php
+++ b/Library/Class/Method/Parameters.php
@@ -13,16 +13,12 @@
 
 namespace Zephir\Class\Method;
 
-use ArrayAccess;
-use Countable;
-use Iterator;
 use Zephir\Exception\CompilerException;
-use function count;
 
 /**
  * Represents the parameters defined in a method.
  */
-class Parameters implements Countable, Iterator, ArrayAccess
+class Parameters implements \Countable, \Iterator, \ArrayAccess
 {
     private int $position = 0;
 
@@ -67,7 +63,7 @@ public function getRequiredParameters(): array
 
     public function countRequiredParameters(): int
     {
-        return count($this->requiredParameters);
+        return \count($this->requiredParameters);
     }
 
     public function getOptionalParameters(): array
@@ -77,7 +73,7 @@ public function getOptionalParameters(): array
 
     public function countOptionalParameters(): int
     {
-        return count($this->optionalParameters);
+        return \count($this->optionalParameters);
     }
 
     public function fetchParameters(bool $isMethodInternal): array
@@ -117,7 +113,7 @@ public function fetchParameters(bool $isMethodInternal): array
      */
     public function count(): int
     {
-        return count($this->parameters);
+        return \count($this->parameters);
     }
 
     public function rewind(): void
diff --git a/Library/Class/Property.php b/Library/Class/Property.php
index 0c7852af49..051f2d9214 100644
--- a/Library/Class/Property.php
+++ b/Library/Class/Property.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Class;
 
-use ReflectionException;
 use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
@@ -23,8 +22,7 @@
 use Zephir\Expression\Builder\Operators\BinaryOperator;
 use Zephir\StatementsBlock;
 use Zephir\Types\Types;
-use function in_array;
-use function is_array;
+
 use function Zephir\add_slashes;
 
 /**
@@ -34,15 +32,15 @@ class Property
 {
     public function __construct(
         protected Definition $classDefinition,
-        protected array      $visibility,
-        protected string     $name,
-        protected ?array     $defaultValue,
-        protected ?string    $docBlock = null,
-        protected ?array     $original = null,
+        protected array $visibility,
+        protected string $name,
+        protected ?array $defaultValue,
+        protected ?string $docBlock = null,
+        protected ?array $original = null,
     ) {
         $this->checkVisibility($visibility, $name, $original);
 
-        if (!is_array($this->defaultValue)) {
+        if (!\is_array($this->defaultValue)) {
             $this->defaultValue = [];
             $this->defaultValue['type'] = 'null';
             $this->defaultValue['value'] = null;
@@ -93,15 +91,15 @@ public function getOriginal(): ?array
     /**
      * Checks for visibility congruence.
      */
-    public function checkVisibility(array $visibility, string $name, ?array $original = null): void
+    public function checkVisibility(array $visibility, string $name, array $original = null): void
     {
-        if (in_array('public', $visibility) && in_array('protected', $visibility)) {
+        if (\in_array('public', $visibility) && \in_array('protected', $visibility)) {
             throw new CompilerException("Property '$name' cannot be 'public' and 'protected' at the same time", $original);
         }
-        if (in_array('public', $visibility) && in_array('private', $visibility)) {
+        if (\in_array('public', $visibility) && \in_array('private', $visibility)) {
             throw new CompilerException("Property '$name' cannot be 'public' and 'private' at the same time", $original);
         }
-        if (in_array('private', $visibility) && in_array('protected', $visibility)) {
+        if (\in_array('private', $visibility) && \in_array('protected', $visibility)) {
             throw new CompilerException("Property '$name' cannot be 'protected' and 'private' at the same time", $original);
         }
     }
@@ -154,7 +152,7 @@ public function getDocBlock(): ?string
      */
     public function isStatic(): bool
     {
-        return in_array('static', $this->visibility);
+        return \in_array('static', $this->visibility);
     }
 
     /**
@@ -162,7 +160,7 @@ public function isStatic(): bool
      */
     public function isPublic(): bool
     {
-        return in_array('public', $this->visibility);
+        return \in_array('public', $this->visibility);
     }
 
     /**
@@ -170,7 +168,7 @@ public function isPublic(): bool
      */
     public function isProtected(): bool
     {
-        return in_array('protected', $this->visibility);
+        return \in_array('protected', $this->visibility);
     }
 
     /**
@@ -178,14 +176,14 @@ public function isProtected(): bool
      */
     public function isPrivate(): bool
     {
-        return in_array('private', $this->visibility);
+        return \in_array('private', $this->visibility);
     }
 
     /**
      * Produce the code to register a property.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -276,7 +274,7 @@ protected function getLetStatement()
             ->setStatements($exprBuilder->statements()->block([$lsb]));
     }
 
-    protected function getBooleanCode($value): bool|string
+    protected function getBooleanCode($value): bool | string
     {
         if ('true' == $value || true === $value) {
             return '1';
@@ -294,7 +292,7 @@ protected function getBooleanCode($value): bool|string
      *
      * @param CompilationContext $compilationContext
      * @param string             $type
-     * @param $value
+     * @param                    $value
      *
      * @throws Exception
      * @throws CompilerException
diff --git a/Library/Code/ArgInfoDefinition.php b/Library/Code/ArgInfoDefinition.php
index 33116ae4d6..de4c4d816c 100644
--- a/Library/Code/ArgInfoDefinition.php
+++ b/Library/Code/ArgInfoDefinition.php
@@ -17,8 +17,8 @@
 use Zephir\Class\Method\Parameters;
 use Zephir\CompilationContext;
 use Zephir\Exception;
+
 use function array_key_exists;
-use function count;
 use function Zephir\escape_class;
 
 class ArgInfoDefinition
@@ -30,11 +30,11 @@ class ArgInfoDefinition
     private bool $richFormat = true;
 
     public function __construct(
-        private string     $name,
-        private Method     $functionLike,
-        private Printer    $codePrinter,
+        private string $name,
+        private Method $functionLike,
+        private Printer $codePrinter,
         private CompilationContext $compilationContext,
-        private bool               $returnByRef = false
+        private bool $returnByRef = false
     ) {
         $this->parameters = $this->functionLike->getParameters();
     }
@@ -62,9 +62,9 @@ public function render(): void
             return;
         }
 
-        if ($this->richFormat &&
-            $this->functionLike->isReturnTypesHintDetermined() &&
-            $this->functionLike->areReturnTypesCompatible()
+        if ($this->richFormat
+            && $this->functionLike->isReturnTypesHintDetermined()
+            && $this->functionLike->areReturnTypesCompatible()
         ) {
             $this->richRenderStart();
 
@@ -124,7 +124,7 @@ public function render(): void
 
     private function richRenderStart(): void
     {
-        if (array_key_exists('object', $this->functionLike->getReturnTypes()) && 1 === count($this->functionLike->getReturnClassTypes())) {
+        if (\array_key_exists('object', $this->functionLike->getReturnTypes()) && 1 === \count($this->functionLike->getReturnClassTypes())) {
             $class = key($this->functionLike->getReturnClassTypes());
             $class = escape_class($this->compilationContext->getFullName($class));
 
@@ -242,7 +242,7 @@ private function richRenderStart(): void
             return;
         }
 
-        if (count($this->functionLike->getReturnTypes()) > 1) {
+        if (\count($this->functionLike->getReturnTypes()) > 1) {
             $types = [];
             $mayBeTypes = $this->functionLike->getMayBeArgTypes();
             foreach ($this->functionLike->getReturnTypes() as $type => $typeInfo) {
@@ -253,7 +253,7 @@ private function richRenderStart(): void
                 $types[] = $mayBeTypes[$type];
             }
 
-            if (count($types) > 1) {
+            if (\count($types) > 1) {
                 $this->codePrinter->output('#if PHP_VERSION_ID >= 80000');
                 $this->codePrinter->output(
                     sprintf(
@@ -423,7 +423,7 @@ private function renderEnd(): void
 
     private function hasParameters(): bool
     {
-        return null !== $this->parameters && count($this->parameters->getParameters()) > 0;
+        return null !== $this->parameters && \count($this->parameters->getParameters()) > 0;
     }
 
     private function defaultArrayValue(array $parameter): string
@@ -490,7 +490,7 @@ private function getReturnType(): string
             return 'IS_VOID';
         }
 
-        if (array_key_exists('array', $this->functionLike->getReturnTypes())) {
+        if (\array_key_exists('array', $this->functionLike->getReturnTypes())) {
             return 'IS_ARRAY';
         }
 
diff --git a/Library/Code/Builder/Struct.php b/Library/Code/Builder/Struct.php
index b9528f64f2..a5e6ff1fc8 100644
--- a/Library/Code/Builder/Struct.php
+++ b/Library/Code/Builder/Struct.php
@@ -52,7 +52,7 @@ public function __toString(): string
 
     /**
      * @param string $field
-     * @param string  $type
+     * @param string $type
      *
      * @throws InvalidArgumentException
      */
@@ -72,10 +72,10 @@ public function addProperty(string $field, string $type): void
      * @param array  $global
      * @param string $namespace
      *
+     * @return string
+     *
      * @throws RuntimeException
      * @throws InvalidArgumentException
-     *
-     * @return string
      */
     public function getCDefault(string $name, array $global, string $namespace): string
     {
@@ -155,6 +155,7 @@ public function getInitEntry(string $name, array $global, string $namespace): st
 
     /**
      * Generates the internal c-type according to the php's type.
+     *
      * @throws InvalidArgumentException
      */
     protected function convertToCType(string $type): string
diff --git a/Library/CompilationContext.php b/Library/CompilationContext.php
index 41457c2bad..c2522a6db1 100644
--- a/Library/CompilationContext.php
+++ b/Library/CompilationContext.php
@@ -23,7 +23,6 @@
 use Zephir\Code\Printer;
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
-use function in_array;
 
 /**
  * This class encapsulates important entities required during compilation
@@ -163,7 +162,7 @@ public function getFullName(string $className): string
      */
     public function classLookup(string $className, array $statement = null): AbstractDefinition
     {
-        if (!in_array($className, ['self', 'static', 'parent'])) {
+        if (!\in_array($className, ['self', 'static', 'parent'])) {
             $className = $this->getFullName($className);
             if ($this->compiler->isClass($className)) {
                 return $this->compiler->getClassDefinition($className);
@@ -172,7 +171,7 @@ public function classLookup(string $className, array $statement = null): Abstrac
             throw new CompilerException("Cannot locate class '$className'", $statement);
         }
 
-        if (in_array($className, ['self', 'static'])) {
+        if (\in_array($className, ['self', 'static'])) {
             return $this->classDefinition;
         }
 
diff --git a/Library/CompiledExpression.php b/Library/CompiledExpression.php
index dadc5db02c..ec5fc2df58 100644
--- a/Library/CompiledExpression.php
+++ b/Library/CompiledExpression.php
@@ -13,8 +13,6 @@
 
 namespace Zephir;
 
-use Closure;
-
 /**
  * This represents a compiled expression, the object can be used to check
  * if the expression type is able to used in certain types of the application.
@@ -97,7 +95,7 @@ public function isIntCompatibleType(): bool
      */
     public function resolve(?string $result, CompilationContext $compilationContext): string
     {
-        if (!($this->code instanceof Closure)) {
+        if (!($this->code instanceof \Closure)) {
             return $this->code;
         }
 
diff --git a/Library/Compiler.php b/Library/Compiler.php
index 57f49ca5f1..a97056c84c 100644
--- a/Library/Compiler.php
+++ b/Library/Compiler.php
@@ -13,13 +13,8 @@
 
 namespace Zephir;
 
-use DirectoryIterator;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use ReflectionClass;
-use ReflectionException;
 use Zephir\Backend\Backend;
 use Zephir\Backend\FcallManagerInterface;
 use Zephir\Backend\StringsManager;
@@ -37,12 +32,6 @@
 use Zephir\Exception\RuntimeException;
 use Zephir\FileSystem\FileSystemInterface;
 use Zephir\Parser\Manager;
-use function count;
-use function dirname;
-use function extension_loaded;
-use function is_array;
-use function is_string;
-use const DIRECTORY_SEPARATOR;
 
 final class Compiler
 {
@@ -131,7 +120,7 @@ private function resolvePrototypesPath(): ?string
 
         // fallback
         if (empty($prototypesPath)) {
-            $prototypesPath = dirname(__DIR__).'/prototypes';
+            $prototypesPath = \dirname(__DIR__).'/prototypes';
         }
 
         if (!is_dir($prototypesPath) || !is_readable($prototypesPath)) {
@@ -207,7 +196,7 @@ public function addFunction(FunctionDefinition $func, array $statement = []): vo
      */
     public function loadExternalClass(string $className, string $location): bool
     {
-        $filePath = $location.DIRECTORY_SEPARATOR.strtolower(str_replace('\\', DIRECTORY_SEPARATOR, $className)).'.zep';
+        $filePath = $location.\DIRECTORY_SEPARATOR.strtolower(str_replace('\\', \DIRECTORY_SEPARATOR, $className)).'.zep';
 
         /**
          * Fix the class name.
@@ -302,7 +291,7 @@ public function isBundledInterface(string $className): bool
     /**
      * Returns class the class definition from a given class name.
      */
-    public function getClassDefinition(string $className): Definition|bool
+    public function getClassDefinition(string $className): Definition | bool
     {
         foreach ($this->definitions as $key => $value) {
             if (!strcasecmp($key, $className)) {
@@ -325,12 +314,12 @@ public function addClassDefinition(CompilerFileAnonymous $file, Definition $clas
     /**
      * Returns class the class definition from a given class name.
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function getInternalClassDefinition(string $className): Definition
     {
         if (!isset(self::$internalDefinitions[$className])) {
-            $reflection = new ReflectionClass($className);
+            $reflection = new \ReflectionClass($className);
             self::$internalDefinitions[$className] = Definition::buildFromReflection($reflection);
         }
 
@@ -391,7 +380,7 @@ public function getGccFlags(bool $development = false): string
 
         $gccFlags = getenv('CFLAGS');
 
-        if (!is_string($gccFlags)) {
+        if (!\is_string($gccFlags)) {
             if (false === $development) {
                 $gccVersion = $this->getGccVersion();
                 if (version_compare($gccVersion, '4.6.0', '>=')) {
@@ -429,8 +418,8 @@ public function preCompileHeaders(): void
 
         $phpIncludes = $this->getPhpIncludeDirs();
 
-        /** @var DirectoryIterator $file */
-        foreach (new DirectoryIterator('ext/kernel') as $file) {
+        /** @var \DirectoryIterator $file */
+        foreach (new \DirectoryIterator('ext/kernel') as $file) {
             if ($file->isDir() || $file->getExtension() !== 'h') {
                 continue;
             }
@@ -453,7 +442,7 @@ public function preCompileHeaders(): void
      * Generates the C sources from Zephir without compiling them.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function generate(bool $fromGenerate = false): bool
     {
@@ -466,7 +455,7 @@ public function generate(bool $fromGenerate = false): bool
          * Check whether there are external dependencies.
          */
         $externalDependencies = $this->config->get('external-dependencies');
-        if (is_array($externalDependencies)) {
+        if (\is_array($externalDependencies)) {
             foreach ($externalDependencies as $dependencyNs => $location) {
                 if (!file_exists($location)) {
                     throw new CompilerException(
@@ -484,8 +473,8 @@ public function generate(bool $fromGenerate = false): bool
         /**
          * Round 1. pre-compile all files in memory
          */
-        $this->recursivePreCompile(str_replace('\\', DIRECTORY_SEPARATOR, $namespace));
-        if (!count($this->files)) {
+        $this->recursivePreCompile(str_replace('\\', \DIRECTORY_SEPARATOR, $namespace));
+        if (!\count($this->files)) {
             throw new Exception(
                 "Zephir files to compile couldn't be found. Did you add a first class to the extension?"
             );
@@ -520,7 +509,7 @@ public function generate(bool $fromGenerate = false): bool
          * Convert C-constants into PHP constants.
          */
         $constantsSources = $this->config->get('constants-sources');
-        if (is_array($constantsSources)) {
+        if (\is_array($constantsSources)) {
             $this->loadConstantsSources($constantsSources);
         }
 
@@ -528,7 +517,7 @@ public function generate(bool $fromGenerate = false): bool
          * Set extension globals.
          */
         $globals = $this->config->get('globals');
-        if (is_array($globals)) {
+        if (\is_array($globals)) {
             $this->setExtensionGlobals($globals);
         }
 
@@ -540,7 +529,7 @@ public function generate(bool $fromGenerate = false): bool
             FunctionCall::addOptimizerDir("{$optimizersPath}/FunctionCall");
 
             $customOptimizersPaths = $this->config->get('optimizer-dirs');
-            if (is_array($customOptimizersPaths)) {
+            if (\is_array($customOptimizersPaths)) {
                 foreach ($customOptimizersPaths as $directory) {
                     FunctionCall::addOptimizerDir(realpath($directory));
                 }
@@ -550,7 +539,7 @@ public function generate(bool $fromGenerate = false): bool
              * Load additional extension prototypes.
              */
             $prototypesPath = $this->resolvePrototypesPath();
-            foreach (new DirectoryIterator($prototypesPath) as $file) {
+            foreach (new \DirectoryIterator($prototypesPath) as $file) {
                 if ($file->isDir() || $file->isDot()) {
                     continue;
                 }
@@ -559,7 +548,7 @@ public function generate(bool $fromGenerate = false): bool
                 $realPath = "{$file->getPath()}/{$file->getFilename()}";
                 $extension = $file->getBasename(".{$file->getExtension()}");
 
-                if (!extension_loaded($extension)) {
+                if (!\extension_loaded($extension)) {
                     require_once $realPath;
                 }
             }
@@ -568,15 +557,15 @@ public function generate(bool $fromGenerate = false): bool
              * Load customer additional extension prototypes.
              */
             $prototypeDirs = $this->config->get('prototype-dir');
-            if (is_array($prototypeDirs)) {
+            if (\is_array($prototypeDirs)) {
                 foreach ($prototypeDirs as $prototype => $prototypeDir) {
                     /**
                      * Check if the extension is installed
                      */
-                    if (!extension_loaded($prototype)) {
+                    if (!\extension_loaded($prototype)) {
                         $prototypeRealpath = realpath($prototypeDir);
                         if ($prototypeRealpath) {
-                            foreach (new RecursiveDirectoryIterator($prototypeRealpath) as $file) {
+                            foreach (new \RecursiveDirectoryIterator($prototypeRealpath) as $file) {
                                 if ($file->isDir()) {
                                     continue;
                                 }
@@ -645,7 +634,7 @@ public function generate(bool $fromGenerate = false): bool
          * Round 3.3. Load extra C-sources.
          */
         $extraSources = $this->config->get('extra-sources');
-        if (is_array($extraSources)) {
+        if (\is_array($extraSources)) {
             $this->extraFiles = $extraSources;
         } else {
             $this->extraFiles = [];
@@ -655,7 +644,7 @@ public function generate(bool $fromGenerate = false): bool
          * Round 3.4. Load extra classes sources.
          */
         $extraClasses = $this->config->get('extra-classes');
-        if (is_array($extraClasses)) {
+        if (\is_array($extraClasses)) {
             foreach ($extraClasses as $value) {
                 if (isset($value['source'])) {
                     $this->extraFiles[] = $value['source'];
@@ -668,7 +657,7 @@ public function generate(bool $fromGenerate = false): bool
          */
         $namespace = str_replace('\\', '_', $namespace);
         $extensionName = $this->config->get('extension-name');
-        if (empty($extensionName) || !is_string($extensionName)) {
+        if (empty($extensionName) || !\is_string($extensionName)) {
             $extensionName = $namespace;
         }
 
@@ -715,7 +704,7 @@ public function generate(bool $fromGenerate = false): bool
      *
      * @throws Exception
      */
-    public function compile(bool $development = false, ?int $jobs = null): void
+    public function compile(bool $development = false, int $jobs = null): void
     {
         $jobs = $jobs ?: 2;
 
@@ -724,7 +713,7 @@ public function compile(bool $development = false, ?int $jobs = null): void
          */
         $namespace = str_replace('\\', '_', $this->checkDirectory());
         $extensionName = $this->config->get('extension-name');
-        if (empty($extensionName) || !is_string($extensionName)) {
+        if (empty($extensionName) || !\is_string($extensionName)) {
             $extensionName = $namespace;
         }
 
@@ -765,7 +754,7 @@ public function compile(bool $development = false, ?int $jobs = null): void
             $configureFix = ["var PHP_ANALYZER = 'disabled';", "var PHP_PGO = 'no';", "var PHP_PGI = 'no';"];
             $hasChanged = false;
 
-            if (false === strpos($configureFile, $fixMarker)) {
+            if (!str_contains($configureFile, $fixMarker)) {
                 $configureFile = $fixMarker.PHP_EOL.implode(PHP_EOL, $configureFix).PHP_EOL.$configureFile;
                 $hasChanged = true;
             }
@@ -830,7 +819,7 @@ public function compile(bool $development = false, ?int $jobs = null): void
      *
      * @throws ConfigException
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function api(array $options = [], bool $fromGenerate = false): void
     {
@@ -838,7 +827,7 @@ public function api(array $options = [], bool $fromGenerate = false): void
             $this->generate();
         }
 
-        $templatesPath = $this->templatesPath ?: dirname(__DIR__).'/templates';
+        $templatesPath = $this->templatesPath ?: \dirname(__DIR__).'/templates';
 
         $documentator = new Documentation($this->files, $this->config, $templatesPath, $options);
         $documentator->setLogger($this->logger);
@@ -851,7 +840,7 @@ public function api(array $options = [], bool $fromGenerate = false): void
      * Generate IDE stubs.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function stubs(bool $fromGenerate = false): void
     {
@@ -976,7 +965,7 @@ public function createConfigFiles(string $project): bool
         $buildDirs = [];
 
         foreach ($compiledFiles as $file) {
-            $dir = dirname($file);
+            $dir = \dirname($file);
 
             if (!in_array($dir, $buildDirs)) {
                 $buildDirs[] = $dir;
@@ -1135,7 +1124,7 @@ public function processExtensionGlobals(string $namespace): array
          * Generate the extensions globals declaration.
          */
         $globals = $this->config->get('globals');
-        if (is_array($globals)) {
+        if (\is_array($globals)) {
             $structures = [];
             $variables = [];
             foreach ($globals as $name => $global) {
@@ -1277,7 +1266,7 @@ public function processExtensionInfo(): string
         $phpinfo = '';
 
         $info = $this->config->get('info');
-        if (!is_array($info)) {
+        if (!\is_array($info)) {
             return $phpinfo;
         }
 
@@ -1289,7 +1278,7 @@ public function processExtensionInfo(): string
                     $headerArray[] = '"'.htmlentities($header).'"';
                 }
 
-                $phpinfo .= "\t".'php_info_print_table_header('.count($headerArray).', '.
+                $phpinfo .= "\t".'php_info_print_table_header('.\count($headerArray).', '.
                     implode(', ', $headerArray).');'.PHP_EOL;
             }
 
@@ -1300,7 +1289,7 @@ public function processExtensionInfo(): string
                         $rowArray[] = '"'.htmlentities($field).'"';
                     }
 
-                    $phpinfo .= "\t".'php_info_print_table_row('.count($rowArray).', '.
+                    $phpinfo .= "\t".'php_info_print_table_row('.\count($rowArray).', '.
                         implode(', ', $rowArray).');'.PHP_EOL;
                 }
             }
@@ -1495,7 +1484,7 @@ public function createProjectFiles(string $project): bool
          * Check if there are module/request/global destructors.
          */
         $destructors = $this->config->get('destructors');
-        if (is_array($destructors)) {
+        if (\is_array($destructors)) {
             $invokeRequestDestructors = $this->processCodeInjection($destructors, 'request');
             $includes .= PHP_EOL.$invokeRequestDestructors[0];
             $reqDestructors = $invokeRequestDestructors[1];
@@ -1517,7 +1506,7 @@ public function createProjectFiles(string $project): bool
          * Check if there are module/request/global initializers.
          */
         $initializers = $this->config->get('initializers');
-        if (is_array($initializers)) {
+        if (\is_array($initializers)) {
             $invokeRequestInitializers = $this->processCodeInjection($initializers, 'request');
             $includes .= PHP_EOL.$invokeRequestInitializers[0];
             $reqInitializers = $invokeRequestInitializers[1];
@@ -1535,7 +1524,7 @@ public function createProjectFiles(string $project): bool
          * Append extra details.
          */
         $extraClasses = $this->config->get('extra-classes');
-        if (is_array($extraClasses)) {
+        if (\is_array($extraClasses)) {
             foreach ($extraClasses as $value) {
                 if (isset($value['init'])) {
                     $completeClassInits[] = 'ZEPHIR_INIT('.$value['init'].')';
@@ -1631,7 +1620,7 @@ public function createProjectFiles(string $project): bool
          * Append extra headers.
          */
         $extraClasses = $this->config->get('extra-classes');
-        if (is_array($extraClasses)) {
+        if (\is_array($extraClasses)) {
             foreach ($extraClasses as $value) {
                 if (isset($value['header'])) {
                     $include = '#include "'.$value['header'].'"';
@@ -1752,7 +1741,7 @@ public function checkIfPhpized(): bool
      */
     public static function getShortUserPath(string $path): string
     {
-        return str_replace('\\', '/', str_replace(getcwd().DIRECTORY_SEPARATOR, '', $path));
+        return str_replace('\\', '/', str_replace(getcwd().\DIRECTORY_SEPARATOR, '', $path));
     }
 
     /**
@@ -1763,7 +1752,7 @@ public static function getShortUserPath(string $path): string
     public function generatePackageDependenciesM4(string $contentM4): string
     {
         $packageDependencies = $this->config->get('package-dependencies');
-        if (!is_array($packageDependencies)) {
+        if (!\is_array($packageDependencies)) {
             return str_replace('%PROJECT_PACKAGE_DEPENDENCIES%', '', $contentM4);
         }
 
@@ -1778,7 +1767,7 @@ public function generatePackageDependenciesM4(string $contentM4): string
             $operatorCmd = '--exact-version';
             $ar = explode('=', $version);
 
-            if (1 === count($ar)) {
+            if (1 === \count($ar)) {
                 if ('*' === $version) {
                     $version = '0.0.0';
                     $operator = '>=';
@@ -1831,7 +1820,7 @@ private function preCompile(string $filePath): void
         }
 
         if (preg_match('#\.zep$#', $filePath)) {
-            $className = str_replace(DIRECTORY_SEPARATOR, '\\', $filePath);
+            $className = str_replace(\DIRECTORY_SEPARATOR, '\\', $filePath);
             $className = preg_replace('#.zep$#', '', $className);
 
             $className = implode('\\', array_map('ucfirst', explode('\\', $className)));
@@ -1857,7 +1846,7 @@ private function recursivePreCompile(string $path): void
                 sprintf(
                     "An invalid path was passed to the compiler. Unable to obtain the '%s%s%s' directory.",
                     getcwd(),
-                    DIRECTORY_SEPARATOR,
+                    \DIRECTORY_SEPARATOR,
                     $path
                 )
             );
@@ -1866,9 +1855,9 @@ private function recursivePreCompile(string $path): void
         /**
          * Pre compile all files.
          */
-        $iterator = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($path),
-            RecursiveIteratorIterator::SELF_FIRST
+        $iterator = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($path),
+            \RecursiveIteratorIterator::SELF_FIRST
         );
 
         $files = [];
@@ -1891,8 +1880,8 @@ private function recursivePreCompile(string $path): void
      *
      * @deprecated
      *
-     * @param $src
-     * @param $dest
+     * @param        $src
+     * @param        $dest
      * @param string $pattern
      * @param mixed  $callback
      *
@@ -1901,7 +1890,7 @@ private function recursivePreCompile(string $path): void
     private function recursiveProcess($src, $dest, $pattern = null, $callback = 'copy')
     {
         $success = true;
-        $iterator = new DirectoryIterator($src);
+        $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $item) {
             $pathName = $item->getPathname();
             if (!is_readable($pathName)) {
@@ -1913,13 +1902,13 @@ private function recursiveProcess($src, $dest, $pattern = null, $callback = 'cop
 
             if ($item->isDir()) {
                 if ('.' != $fileName && '..' != $fileName && '.libs' != $fileName) {
-                    if (!is_dir($dest.DIRECTORY_SEPARATOR.$fileName)) {
-                        mkdir($dest.DIRECTORY_SEPARATOR.$fileName, 0755, true);
+                    if (!is_dir($dest.\DIRECTORY_SEPARATOR.$fileName)) {
+                        mkdir($dest.\DIRECTORY_SEPARATOR.$fileName, 0755, true);
                     }
-                    $this->recursiveProcess($pathName, $dest.DIRECTORY_SEPARATOR.$fileName, $pattern, $callback);
+                    $this->recursiveProcess($pathName, $dest.\DIRECTORY_SEPARATOR.$fileName, $pattern, $callback);
                 }
             } elseif (!$pattern || ($pattern && 1 === preg_match($pattern, $fileName))) {
-                $path = $dest.DIRECTORY_SEPARATOR.$fileName;
+                $path = $dest.\DIRECTORY_SEPARATOR.$fileName;
                 $success = $success && \call_user_func($callback, $pathName, $path);
             }
         }
@@ -1943,9 +1932,9 @@ private function recursiveDeletePath($path, $mask)
             return;
         }
 
-        $objects = new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($path),
-            RecursiveIteratorIterator::SELF_FIRST
+        $objects = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($path),
+            \RecursiveIteratorIterator::SELF_FIRST
         );
 
         foreach ($objects as $name => $object) {
@@ -1993,7 +1982,7 @@ private function processAddSources(array $sources, string $project): array
     {
         $groupSources = [];
         foreach ($sources as $source) {
-            $dirName = str_replace(DIRECTORY_SEPARATOR, '/', dirname($source));
+            $dirName = str_replace(\DIRECTORY_SEPARATOR, '/', \dirname($source));
             if (!isset($groupSources[$dirName])) {
                 $groupSources[$dirName] = [];
             }
@@ -2024,11 +2013,11 @@ private function assertRequiredExtensionsIsPresent(): void
         $extensions = [];
         foreach ($extensionRequires as $value) {
             // TODO: We'll use this as an object in the future.
-            if (!is_string($value)) {
+            if (!\is_string($value)) {
                 continue;
             }
 
-            if (!extension_loaded($value)) {
+            if (!\extension_loaded($value)) {
                 $extensions[] = $value;
             }
         }
@@ -2071,7 +2060,7 @@ private function checkKernelFile(string $src, string $dst): bool
      */
     private function checkKernelFiles(): bool
     {
-        $kernelPath = 'ext'.DIRECTORY_SEPARATOR.'kernel';
+        $kernelPath = 'ext'.\DIRECTORY_SEPARATOR.'kernel';
 
         if (!file_exists($kernelPath)) {
             if (!mkdir($kernelPath, 0775, true)) {
@@ -2116,7 +2105,7 @@ private function checkDirectory(): string
             throw new Exception('Extension namespace cannot be loaded');
         }
 
-        if (!is_string($namespace)) {
+        if (!\is_string($namespace)) {
             throw new Exception('Extension namespace is invalid');
         }
 
@@ -2154,7 +2143,7 @@ private function getGccVersion(): string
         $lines = $this->filesystem->file('gcc-version');
         $lines = array_filter($lines);
 
-        $lastLine = $lines[count($lines) - 1];
+        $lastLine = $lines[\count($lines) - 1];
         if (preg_match('/\d+\.\d+\.\d+/', $lastLine, $matches)) {
             return $matches[0];
         }
@@ -2166,7 +2155,7 @@ private function toUnixPaths(array $paths): array
     {
         return array_map(
             static function (string $path): string {
-                return str_replace(DIRECTORY_SEPARATOR, '/', $path);
+                return str_replace(\DIRECTORY_SEPARATOR, '/', $path);
             },
             $paths
         );
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 6c9fd343ed..01c917e70c 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -15,7 +15,6 @@
 
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
-use ReflectionException;
 use Zephir\Class\Constant;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Definition\DefinitionRuntime;
@@ -29,7 +28,6 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
-use function is_array;
 
 /**
  * This class represents every file compiled in a project.
@@ -192,10 +190,10 @@ public function addFunction(Compiler $compiler, FunctionDefinition $func, array
      *
      * @param Compiler $compiler
      *
+     * @return array
+     *
      * @throws ParseException
      * @throws IllegalStateException if the intermediate representation is not of type 'array'
-     *
-     * @return array
      */
     public function genIR(Compiler $compiler): array
     {
@@ -227,7 +225,7 @@ public function genIR(Compiler $compiler): array
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compileClass(CompilationContext $compilationContext): void
     {
@@ -239,6 +237,7 @@ public function compileClass(CompilationContext $compilationContext): void
      *
      * @param CompilationContext $compilationContext
      * @param FunctionDefinition $functionDefinition
+     *
      * @throws Exception
      */
     public function compileFunction(CompilationContext $compilationContext, FunctionDefinition $functionDefinition)
@@ -291,7 +290,7 @@ public function preCompileInterface($namespace, $topStatement, $docblock)
 
         $classDefinition->setType('interface');
 
-        if (is_array($docblock)) {
+        if (\is_array($docblock)) {
             $classDefinition->setDocBlock($docblock['value']);
         }
 
@@ -367,7 +366,7 @@ public function preCompileClass(CompilationContext $compilationContext, $namespa
             $classDefinition->setIsFinal((bool) $topStatement['final']);
         }
 
-        if (is_array($docblock)) {
+        if (\is_array($docblock)) {
             $classDefinition->setDocBlock($docblock['value']);
         }
 
@@ -648,7 +647,7 @@ public function getCompiledFile(): string
      *
      * @param Compiler $compiler
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function checkDependencies(Compiler $compiler)
     {
@@ -945,7 +944,7 @@ public function getFilePath(): string
     /**
      * Creates the property shortcuts.
      *
-     * @param array           $property
+     * @param array      $property
      * @param Definition $classDefinition
      *
      * @throws CompilerException
diff --git a/Library/CompilerFileAnonymous.php b/Library/CompilerFileAnonymous.php
index 9785152744..957b48efaf 100644
--- a/Library/CompilerFileAnonymous.php
+++ b/Library/CompilerFileAnonymous.php
@@ -15,11 +15,9 @@
 
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
-use ReflectionException;
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
-use function count;
 
 /**
  * This class represents an anonymous file created to dump
@@ -40,11 +38,11 @@ final class CompilerFileAnonymous implements FileInterface
     /**
      * CompilerFileAnonymous constructor.
      *
-     * @param Definition         $classDefinition
+     * @param Definition              $classDefinition
      * @param Config                  $config
      * @param CompilationContext|null $context
      */
-    public function __construct(Definition $classDefinition, Config $config, ?CompilationContext $context = null)
+    public function __construct(Definition $classDefinition, Config $config, CompilationContext $context = null)
     {
         $this->classDefinition = $classDefinition;
         $this->config = $config;
@@ -84,7 +82,7 @@ public function isExternal(): bool
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     private function compileClass(CompilationContext $compilationContext)
     {
@@ -95,7 +93,7 @@ private function compileClass(CompilationContext $compilationContext)
          */
         $classDefinition->compile($compilationContext);
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+        $separators = str_repeat('../', \count(explode('\\', $classDefinition->getCompleteName())) - 1);
 
         $code = PHP_EOL;
         $code .= '#ifdef HAVE_CONFIG_H'.PHP_EOL;
@@ -121,7 +119,7 @@ private function compileClass(CompilationContext $compilationContext)
             }
         }
 
-        if (count($this->headerCBlocks) > 0) {
+        if (\count($this->headerCBlocks) > 0) {
             $code .= implode(PHP_EOL, $this->headerCBlocks).PHP_EOL;
         }
 
diff --git a/Library/Config.php b/Library/Config.php
index a678d640b9..46ae923e6b 100644
--- a/Library/Config.php
+++ b/Library/Config.php
@@ -13,13 +13,10 @@
 
 namespace Zephir;
 
-use ArrayAccess;
-use JsonSerializable;
-
 /**
  * Manages compiler global configuration.
  */
-class Config implements ArrayAccess, JsonSerializable
+class Config implements \ArrayAccess, \JsonSerializable
 {
     /**
      * Is config changed?
diff --git a/Library/ConfigException.php b/Library/ConfigException.php
index ab1ad6229a..845c8bf98a 100644
--- a/Library/ConfigException.php
+++ b/Library/ConfigException.php
@@ -11,11 +11,9 @@
 
 namespace Zephir;
 
-use Exception;
-
-class ConfigException extends Exception
+class ConfigException extends \Exception
 {
-    public function __construct($message = '', $code = 0, Exception $previous = null)
+    public function __construct($message = '', $code = 0, \Exception $previous = null)
     {
         $message .= PHP_EOL.'Please see https://docs.zephir-lang.com/0.12/en/config for more information';
 
diff --git a/Library/Console/Application.php b/Library/Console/Application.php
index 5232d00547..09207a46dc 100644
--- a/Library/Console/Application.php
+++ b/Library/Console/Application.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Console;
 
-use Exception;
 use Symfony\Component\Console\Application as BaseApplication;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Command\HelpCommand;
@@ -28,7 +27,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
-use Throwable;
 use Zephir\Console\Command\ListCommand;
 use Zephir\Zephir;
 
@@ -111,7 +109,7 @@ public function getLongVersion(): string
      *
      * @return int
      *
-     * @throws Exception|Throwable
+     * @throws \Exception|\Throwable
      */
     public function doRun(InputInterface $input, OutputInterface $output): int
     {
@@ -151,7 +149,7 @@ public function doRun(InputInterface $input, OutputInterface $output): int
 
         try {
             return parent::doRun($input, $output);
-        } catch (CommandNotFoundException|RuntimeException $e) {
+        } catch (CommandNotFoundException | RuntimeException $e) {
             fprintf(STDERR, $e->getMessage().PHP_EOL);
 
             return 1;
diff --git a/Library/Console/Command/ApiCommand.php b/Library/Console/Command/ApiCommand.php
index 578ff463dc..c6e5e5533d 100644
--- a/Library/Console/Command/ApiCommand.php
+++ b/Library/Console/Command/ApiCommand.php
@@ -21,8 +21,6 @@
 use Zephir\Compiler;
 use Zephir\Config;
 
-use function in_array;
-
 /**
  * Generates an HTML API based on the classes exposed in the extension.
  */
@@ -80,7 +78,7 @@ protected function sanitizeOptionsFromInput(InputInterface $input): array
         $options = array_filter($input->getOptions(), function ($v, $k) use ($defaults) {
             $allowedOpts = array_keys($defaults);
 
-            return in_array($k, $allowedOpts, true) && null !== $v;
+            return \in_array($k, $allowedOpts, true) && null !== $v;
         }, ARRAY_FILTER_USE_BOTH);
 
         foreach ($options as $option => $value) {
diff --git a/Library/Console/Command/CleanCommand.php b/Library/Console/Command/CleanCommand.php
index 070f601ab5..8a9a4bec26 100644
--- a/Library/Console/Command/CleanCommand.php
+++ b/Library/Console/Command/CleanCommand.php
@@ -13,12 +13,12 @@
 
 namespace Zephir\Console\Command;
 
-use Exception;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zephir\Exception\FileSystemException;
 use Zephir\FileSystem\FileSystemInterface;
+
 use function Zephir\is_windows;
 
 /**
@@ -74,7 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
 
             return 1;
-        } catch (Exception | \Throwable $e) {
+        } catch (\Exception | \Throwable $e) {
             $io->getErrorStyle()->error($e->getMessage());
 
             return 1;
diff --git a/Library/Console/Command/DevelopmentModeAwareTrait.php b/Library/Console/Command/DevelopmentModeAwareTrait.php
index c9054ac077..aba669eb56 100644
--- a/Library/Console/Command/DevelopmentModeAwareTrait.php
+++ b/Library/Console/Command/DevelopmentModeAwareTrait.php
@@ -15,8 +15,6 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 
-use const PHP_DEBUG;
-
 trait DevelopmentModeAwareTrait
 {
     /**
@@ -29,7 +27,7 @@ trait DevelopmentModeAwareTrait
     protected function isDevelopmentModeEnabled(InputInterface $input): bool
     {
         if (false === $input->getOption('no-dev')) {
-            return $input->getOption('dev') || PHP_DEBUG;
+            return $input->getOption('dev') || \PHP_DEBUG;
         }
 
         return false;
diff --git a/Library/Console/Command/GenerateCommand.php b/Library/Console/Command/GenerateCommand.php
index a05cd17d86..e5e2871abf 100644
--- a/Library/Console/Command/GenerateCommand.php
+++ b/Library/Console/Command/GenerateCommand.php
@@ -22,8 +22,6 @@
 use Zephir\Exception\ExceptionInterface;
 use Zephir\Exception\InvalidArgumentException;
 
-use function extension_loaded;
-
 /**
  * Generate Command
  *
@@ -57,7 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $trace = $input->getOption('trace');
 
-        if (extension_loaded('timecop') && 1 == ini_get('timecop.func_override')) {
+        if (\extension_loaded('timecop') && 1 == ini_get('timecop.func_override')) {
             $io->getErrorStyle()->warning(
                 <<<MSG
 The timecop extension was detected. It is recommended to disable
diff --git a/Library/Console/Command/InitCommand.php b/Library/Console/Command/InitCommand.php
index e9685daaab..101a47e5b0 100644
--- a/Library/Console/Command/InitCommand.php
+++ b/Library/Console/Command/InitCommand.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Console\Command;
 
-use DirectoryIterator;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
@@ -23,14 +22,6 @@
 use Zephir\Backend\Backend;
 use Zephir\Config;
 
-use function chdir;
-use function extension_loaded;
-use function is_dir;
-use function is_readable;
-use function mkdir;
-use function preg_match;
-use const DIRECTORY_SEPARATOR;
-
 /**
  * Init Command
  *
@@ -65,22 +56,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $namespace = $this->sanitizeNamespace($input->getArgument('namespace'));
 
         // Tell the user the name could be reserved by another extension
-        if (extension_loaded($namespace)) {
+        if (\extension_loaded($namespace)) {
             $this->logger->warning('This extension can have conflicts with an existing loaded extension');
         }
 
         $this->config->set('namespace', $namespace);
         $this->config->set('name', $namespace);
 
-        if (!is_dir("{$namespace}/{$namespace}")) {
-            mkdir("{$namespace}/{$namespace}", 0755, true);
+        if (!\is_dir("{$namespace}/{$namespace}")) {
+            \mkdir("{$namespace}/{$namespace}", 0755, true);
         }
 
-        chdir($namespace);
+        \chdir($namespace);
 
         // Create 'kernel'
-        if (!is_dir('ext/kernel')) {
-            mkdir('ext/kernel', 0755, true);
+        if (!\is_dir('ext/kernel')) {
+            \mkdir('ext/kernel', 0755, true);
         }
 
         // Copy the latest kernel files
@@ -131,14 +122,14 @@ private function sanitizeNamespace(string $namespace): string
      *
      * @return void
      */
-    private function recursiveProcess(string $src, string $dst, ?string $pattern = null, string $callback = 'copy'): void
+    private function recursiveProcess(string $src, string $dst, string $pattern = null, string $callback = 'copy'): void
     {
         $success = true;
-        $iterator = new DirectoryIterator($src);
+        $iterator = new \DirectoryIterator($src);
 
         foreach ($iterator as $item) {
             $pathName = $item->getPathname();
-            if (!is_readable($pathName)) {
+            if (!\is_readable($pathName)) {
                 $this->logger->error('File is not readable :'.$pathName);
                 continue;
             }
@@ -147,13 +138,13 @@ private function recursiveProcess(string $src, string $dst, ?string $pattern = n
 
             if ($item->isDir()) {
                 if ('.' != $fileName && '..' != $fileName && '.libs' != $fileName) {
-                    if (!is_dir($dst.DIRECTORY_SEPARATOR.$fileName)) {
-                        mkdir($dst.DIRECTORY_SEPARATOR.$fileName, 0755, true);
+                    if (!\is_dir($dst.\DIRECTORY_SEPARATOR.$fileName)) {
+                        \mkdir($dst.\DIRECTORY_SEPARATOR.$fileName, 0755, true);
                     }
-                    $this->recursiveProcess($pathName, $dst.DIRECTORY_SEPARATOR.$fileName, $pattern, $callback);
+                    $this->recursiveProcess($pathName, $dst.\DIRECTORY_SEPARATOR.$fileName, $pattern, $callback);
                 }
-            } elseif ($pattern === null || 1 === preg_match($pattern, $fileName)) {
-                $path = $dst.DIRECTORY_SEPARATOR.$fileName;
+            } elseif ($pattern === null || 1 === \preg_match($pattern, $fileName)) {
+                $path = $dst.\DIRECTORY_SEPARATOR.$fileName;
                 $success = $success && $callback($pathName, $path);
             }
         }
diff --git a/Library/Console/Command/InstallCommand.php b/Library/Console/Command/InstallCommand.php
index 0d8b6d0037..2758525463 100644
--- a/Library/Console/Command/InstallCommand.php
+++ b/Library/Console/Command/InstallCommand.php
@@ -23,8 +23,6 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\NotImplementedException;
 
-use function extension_loaded;
-
 /**
  * Install Command
  *
@@ -77,7 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $success = ['Extension installed.'];
 
         $namespace = $this->config->get('namespace');
-        if (!extension_loaded($namespace)) {
+        if (!\extension_loaded($namespace)) {
             $success[] = sprintf('Add "extension=%s.so" to your php.ini', $namespace);
         }
 
diff --git a/Library/Console/Command/RemoveOptionsTrait.php b/Library/Console/Command/RemoveOptionsTrait.php
index c362fe5930..e1c9ee7e3e 100644
--- a/Library/Console/Command/RemoveOptionsTrait.php
+++ b/Library/Console/Command/RemoveOptionsTrait.php
@@ -16,9 +16,6 @@
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 
-use function array_filter;
-use function in_array;
-
 trait RemoveOptionsTrait
 {
     protected function removeOptions(array $names): void
@@ -26,8 +23,8 @@ protected function removeOptions(array $names): void
         /** @var InputDefinition $definition */
         $definition = $this->getDefinition();
 
-        $filtered = array_filter($definition->getOptions(), function (InputOption $option) use ($names) {
-            return !in_array($option->getName(), $names, true);
+        $filtered = \array_filter($definition->getOptions(), function (InputOption $option) use ($names) {
+            return !\in_array($option->getName(), $names, true);
         });
 
         $definition->setOptions($filtered);
diff --git a/Library/Detectors/ReadDetector.php b/Library/Detectors/ReadDetector.php
index d616c8e576..8740ddf172 100644
--- a/Library/Detectors/ReadDetector.php
+++ b/Library/Detectors/ReadDetector.php
@@ -14,7 +14,6 @@
 namespace Zephir\Detectors;
 
 use Zephir\Variable\Variable;
-use function is_array;
 
 /**
  * Detects if a variable is used in a given expression context
@@ -44,13 +43,13 @@ public function detect($variable, array $expression): bool
 
         if (in_array($expression['type'], ['fcall', 'mcall', 'scall']) && isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
-                if (is_array($parameter['parameter']) && 'variable' === $parameter['parameter']['type'] && $variable == $parameter['parameter']['value']) {
+                if (\is_array($parameter['parameter']) && 'variable' === $parameter['parameter']['type'] && $variable == $parameter['parameter']['value']) {
                     return true;
                 }
             }
         }
 
-        return (isset($expression['left']) && is_array($expression['left']) && $this->detect($variable, $expression['left'])) ||
-               (isset($expression['right']) && is_array($expression['right']) && $this->detect($variable, $expression['right']));
+        return (isset($expression['left']) && \is_array($expression['left']) && $this->detect($variable, $expression['left']))
+               || (isset($expression['right']) && \is_array($expression['right']) && $this->detect($variable, $expression['right']));
     }
 }
diff --git a/Library/Documentation.php b/Library/Documentation.php
index a3d2081017..ed00e2e120 100644
--- a/Library/Documentation.php
+++ b/Library/Documentation.php
@@ -236,9 +236,9 @@ public function getOutputDirectory()
      * @param array       $themeConfig
      * @param string|null $options
      *
-     * @throws Exception
-     *
      * @return array
+     *
+     * @throws Exception
      */
     private function prepareThemeOptions($themeConfig, $options = null)
     {
@@ -307,10 +307,10 @@ private function findOutputDirectory($outputDir)
      * @param array       $themeConfig
      * @param string|null $path
      *
+     * @return string|null
+     *
      * @throws InvalidArgumentException
      * @throws ConfigException
-     *
-     * @return string|null
      */
     private function findThemeDirectory($themeConfig, $path = null)
     {
diff --git a/Library/Documentation/DocblockParser.php b/Library/Documentation/DocblockParser.php
index d3596fe418..f37f50bed1 100644
--- a/Library/Documentation/DocblockParser.php
+++ b/Library/Documentation/DocblockParser.php
@@ -19,9 +19,9 @@ class DocblockParser
     protected $annotation;
     protected $annotationLen;
 
-    protected $currentChar = null;
-    protected $currentCharIndex = null;
-    protected $currentLine = null;
+    protected $currentChar;
+    protected $currentCharIndex;
+    protected $currentLine;
     protected $lines = [];
 
     // Parsing helpers
diff --git a/Library/Documentation/Template.php b/Library/Documentation/Template.php
index 3755293309..c66c2dc15d 100644
--- a/Library/Documentation/Template.php
+++ b/Library/Documentation/Template.php
@@ -50,7 +50,7 @@ public function __construct(
 
     private function getTemplatePath($fileName)
     {
-        if ('/' == $fileName[0] || 0 === strpos($fileName, 'phar://')) {
+        if ('/' == $fileName[0] || str_starts_with($fileName, 'phar://')) {
             return $fileName;
         }
 
diff --git a/Library/Exception/CompilerException.php b/Library/Exception/CompilerException.php
index d4cb81eb49..8426045ea6 100644
--- a/Library/Exception/CompilerException.php
+++ b/Library/Exception/CompilerException.php
@@ -19,7 +19,7 @@ class CompilerException extends RuntimeException
     /**
      * CompilerException constructor.
      *
-     * @param string $message  the Exception message to throw [optional]
+     * @param string                $message  the Exception message to throw [optional]
      * @param array|null            $extra    extra info [optional]
      * @param int                   $code     the Exception code [optional]
      * @param \Exception|\Throwable $previous the previous throwable used for the exception chaining [optional]
diff --git a/Library/Expression.php b/Library/Expression.php
index f002195974..6d6e43bed9 100644
--- a/Library/Expression.php
+++ b/Library/Expression.php
@@ -13,7 +13,6 @@
 
 namespace Zephir;
 
-use ReflectionException;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression\Closure;
 use Zephir\Expression\ClosureArrow;
@@ -225,12 +224,11 @@ public function emptyArray(array $expression, CompilationContext $compilationCon
      *
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException|Exception
-     *
      * @return CompiledExpression
      *
+     * @throws CompilerException|Exception
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Expression/Builder/AbstractBuilder.php b/Library/Expression/Builder/AbstractBuilder.php
index af821e05dc..669d8278a0 100644
--- a/Library/Expression/Builder/AbstractBuilder.php
+++ b/Library/Expression/Builder/AbstractBuilder.php
@@ -13,9 +13,9 @@
 
 abstract class AbstractBuilder
 {
-    private $file = null;
-    private $line = null;
-    private $char = null;
+    private $file;
+    private $line;
+    private $char;
 
     /**
      * @param string $file
diff --git a/Library/Expression/Builder/BuilderFactory.php b/Library/Expression/Builder/BuilderFactory.php
index 3eca0a0bb1..e3e08f9b99 100644
--- a/Library/Expression/Builder/BuilderFactory.php
+++ b/Library/Expression/Builder/BuilderFactory.php
@@ -75,7 +75,7 @@ public function variable($name)
     }
 
     /**
-     * @param $type
+     * @param      $type
      * @param null $value
      *
      * @return RawExpression
diff --git a/Library/Expression/Builder/Factory/OperatorsFactory.php b/Library/Expression/Builder/Factory/OperatorsFactory.php
index 6b84dfaa68..946126eff4 100644
--- a/Library/Expression/Builder/Factory/OperatorsFactory.php
+++ b/Library/Expression/Builder/Factory/OperatorsFactory.php
@@ -98,7 +98,7 @@ public function unary($operator = null, AbstractBuilder $expression = null)
     }
 
     /**
-     * @param $type
+     * @param                 $type
      * @param AbstractBuilder $expression
      *
      * @return RawOperator
@@ -113,7 +113,7 @@ public function cast($type, AbstractBuilder $expression)
     }
 
     /**
-     * @param $type
+     * @param                 $type
      * @param AbstractBuilder $expression
      *
      * @return RawOperator
diff --git a/Library/Expression/Builder/Statements/CallFunctionStatement.php b/Library/Expression/Builder/Statements/CallFunctionStatement.php
index b45056202c..b0f460cf98 100644
--- a/Library/Expression/Builder/Statements/CallFunctionStatement.php
+++ b/Library/Expression/Builder/Statements/CallFunctionStatement.php
@@ -40,7 +40,7 @@ class CallFunctionStatement extends AbstractStatement
     /**
      * @param string|null $name
      * @param array|null  $parameters
-     * @param int $typeCall
+     * @param int         $typeCall
      */
     public function __construct(string $name = null, array $parameters = null, int $typeCall = self::TYPE_CALL_DIRECT)
     {
diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
index 1e80cbd82a..b7b90f8972 100644
--- a/Library/Expression/Closure.php
+++ b/Library/Expression/Closure.php
@@ -23,7 +23,6 @@
 use Zephir\Exception;
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
-use function is_array;
 
 /**
  * Creates an anonymous function within the extension simulating a closure
@@ -57,7 +56,7 @@ class Closure
      * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null): void
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -105,7 +104,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         $block = $expression['right'] ?? [];
 
         $staticVariables = [];
-        if (isset($expression['use']) && is_array($expression['use'])) {
+        if (isset($expression['use']) && \is_array($expression['use'])) {
             foreach ($expression['use'] as $parameter) {
                 $staticVariables[$parameter['name']] = $compilationContext->symbolTable->getVariable($parameter['name']);
             }
diff --git a/Library/Expression/ClosureArrow.php b/Library/Expression/ClosureArrow.php
index d420c656e5..75ba6eff5e 100644
--- a/Library/Expression/ClosureArrow.php
+++ b/Library/Expression/ClosureArrow.php
@@ -14,8 +14,8 @@
 namespace Zephir\Expression;
 
 use Zephir\Class\Definition\Definition;
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\CompilerFileAnonymous;
@@ -34,9 +34,9 @@ class ClosureArrow extends Closure
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     *
+     * @throws CompilerException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Expression/Constants.php b/Library/Expression/Constants.php
index da8c874d36..079c525851 100644
--- a/Library/Expression/Constants.php
+++ b/Library/Expression/Constants.php
@@ -16,10 +16,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\LiteralCompiledExpression;
 use Zephir\Variable\Variable;
+
 use function constant;
-use function defined;
-use function gettype;
-use function in_array;
 use function Zephir\add_slashes;
 
 /**
@@ -101,7 +99,7 @@ class Constants
      * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null)
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -123,9 +121,9 @@ public function setReadOnly(bool $readOnly): void
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     *
+     * @throws CompilerException
      */
     public function compile(array $expression, CompilationContext $compilationContext)
     {
@@ -135,7 +133,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         $constantName = $expression['value'];
 
         $mergedConstants = array_merge($this->envConstants, $this->magicConstants, $this->resources);
-        if (!defined($expression['value']) && !in_array($constantName, $mergedConstants)) {
+        if (!\defined($expression['value']) && !\in_array($constantName, $mergedConstants)) {
             if (!$compilationContext->compiler->isConstant($constantName)) {
                 $compilationContext->logger->warning(
                     "Constant '".$constantName."' does not exist at compile time",
@@ -145,18 +143,18 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $isZephirConstant = true;
             }
         } else {
-            $isPhpConstant = false === strpos($constantName, 'VERSION');
+            $isPhpConstant = !str_contains($constantName, 'VERSION');
         }
 
-        if ($isZephirConstant && !in_array($constantName, $this->resources)) {
+        if ($isZephirConstant && !\in_array($constantName, $this->resources)) {
             $constant = $compilationContext->compiler->getConstant($constantName);
 
             return new LiteralCompiledExpression($constant[0], $constant[1], $expression);
         }
 
-        if ($isPhpConstant && !in_array($constantName, $mergedConstants)) {
-            $constantName = constant($constantName);
-            $type = strtolower(gettype($constantName));
+        if ($isPhpConstant && !\in_array($constantName, $mergedConstants)) {
+            $constantName = \constant($constantName);
+            $type = strtolower(\gettype($constantName));
 
             switch ($type) {
                 case 'integer':
@@ -175,7 +173,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             }
         }
 
-        if (in_array($constantName, $this->magicConstants)) {
+        if (\in_array($constantName, $this->magicConstants)) {
             switch ($constantName) {
                 case '__CLASS__':
                     return new CompiledExpression(
diff --git a/Library/Expression/NativeArray.php b/Library/Expression/NativeArray.php
index a1d13afa22..32ba85bde0 100644
--- a/Library/Expression/NativeArray.php
+++ b/Library/Expression/NativeArray.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Expression;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -21,8 +20,6 @@
 use Zephir\Expression;
 use Zephir\GlobalConstant;
 use Zephir\Variable\Variable;
-use function count;
-use function function_exists;
 
 /**
  * Resolves expressions that create arrays
@@ -165,7 +162,7 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
      *
      * @return CompiledExpression
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext)
@@ -206,8 +203,8 @@ public function compile(array $expression, CompilationContext $compilationContex
          * This calculates a prime number bigger than the current array size to possibly
          * reduce hash collisions when adding new members to the array.
          */
-        $arrayLength = count($expression['left']);
-        if ($arrayLength >= 33 && function_exists('gmp_nextprime')) {
+        $arrayLength = \count($expression['left']);
+        if ($arrayLength >= 33 && \function_exists('gmp_nextprime')) {
             $arrayLength = (int) gmp_strval(gmp_nextprime($arrayLength - 1));
         }
 
diff --git a/Library/Expression/NativeArrayAccess.php b/Library/Expression/NativeArrayAccess.php
index 28e167c1ca..84f0f273cf 100644
--- a/Library/Expression/NativeArrayAccess.php
+++ b/Library/Expression/NativeArrayAccess.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Expression;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -38,7 +37,7 @@ class NativeArrayAccess
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool $expecting
+     * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
     public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
@@ -70,12 +69,13 @@ public function setNoisy(bool $noisy): void
     /**
      * Compiles foo[x] = {expr}.
      *
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
+     *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
@@ -127,7 +127,7 @@ public function compile($expression, CompilationContext $compilationContext)
      *
      * @return CompiledExpression
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws Exception
      */
     protected function accessStringOffset(array $expression, Variable $variableVariable, CompilationContext $compilationContext): CompiledExpression
@@ -182,13 +182,14 @@ protected function accessStringOffset(array $expression, Variable $variableVaria
     }
 
     /**
-     * @param array $expression
-     * @param Variable $variableVariable
+     * @param array              $expression
+     * @param Variable           $variableVariable
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
+     *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     protected function accessDimensionArray(array $expression, Variable $variableVariable, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Expression/PropertyAccess.php b/Library/Expression/PropertyAccess.php
index d1bcf4d192..e294e1f1ab 100644
--- a/Library/Expression/PropertyAccess.php
+++ b/Library/Expression/PropertyAccess.php
@@ -34,7 +34,7 @@ class PropertyAccess
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool $expecting
+     * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
     public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
diff --git a/Library/Expression/PropertyDynamicAccess.php b/Library/Expression/PropertyDynamicAccess.php
index e62992deba..eac8b2f048 100644
--- a/Library/Expression/PropertyDynamicAccess.php
+++ b/Library/Expression/PropertyDynamicAccess.php
@@ -16,6 +16,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Variable\Variable;
+
 use function Zephir\add_slashes;
 
 /**
diff --git a/Library/Expression/Reference.php b/Library/Expression/Reference.php
index d5e87b53d4..ebad811eb3 100644
--- a/Library/Expression/Reference.php
+++ b/Library/Expression/Reference.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Expression;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -58,7 +57,7 @@ class Reference
      * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null): void
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -78,7 +77,7 @@ public function setReadOnly(bool $readOnly): void
      * Compiles a reference to a value.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Expression/StaticConstantAccess.php b/Library/Expression/StaticConstantAccess.php
index 282062e756..16638d7d1f 100644
--- a/Library/Expression/StaticConstantAccess.php
+++ b/Library/Expression/StaticConstantAccess.php
@@ -13,15 +13,12 @@
 
 namespace Zephir\Expression;
 
-use ReflectionException;
 use Zephir\Class\Constant;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
-use function gettype;
-use function in_array;
 
 /**
  * Resolves class constants
@@ -38,7 +35,7 @@ class StaticConstantAccess
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool $expecting
+     * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
     public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
@@ -60,12 +57,13 @@ public function setReadOnly(bool $readOnly): void
     /**
      * Access a static constant class.
      *
-     * @param array $expression
+     * @param array              $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
+     *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -77,7 +75,7 @@ public function compile(array $expression, CompilationContext $compilationContex
          * Fetch the class definition according to the class where the constant
          * is supposed to be declared
          */
-        if (!in_array($className, ['this', 'self', 'static', 'parent'])) {
+        if (!\in_array($className, ['this', 'self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className) || $compiler->isInterface($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -89,7 +87,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 }
             }
         } else {
-            if (in_array($className, ['self', 'static', 'this'])) {
+            if (\in_array($className, ['self', 'static', 'this'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } elseif ('parent' === $className) {
                 $classDefinition = $compilationContext->classDefinition;
@@ -182,7 +180,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             $type = $constantDefinition->getValueType();
         } else {
             $value = $constantDefinition;
-            $type = gettype($value);
+            $type = \gettype($value);
             if ('integer' === $type) {
                 $type = 'int';
             }
diff --git a/Library/Expression/StaticPropertyAccess.php b/Library/Expression/StaticPropertyAccess.php
index 228ba3ae30..6f48f7b5a7 100644
--- a/Library/Expression/StaticPropertyAccess.php
+++ b/Library/Expression/StaticPropertyAccess.php
@@ -13,14 +13,12 @@
 
 namespace Zephir\Expression;
 
-use ReflectionException;
 use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
-use function in_array;
 
 /**
  * Resolves class static properties
@@ -54,7 +52,7 @@ public function setReadOnly(bool $readOnly): void
     /**
      * Access a static property.
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
@@ -67,7 +65,7 @@ public function compile(array $expression, CompilationContext $compilationContex
          * Fetch the class definition according to the class where the constant
          * is supposed to be declared
          */
-        if (!in_array($className, ['self', 'static', 'parent'])) {
+        if (!\in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -79,7 +77,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 }
             }
         } else {
-            if (in_array($className, ['self', 'static'])) {
+            if (\in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' === $className) {
diff --git a/Library/FileSystem/HardDisk.php b/Library/FileSystem/HardDisk.php
index c9f3c04e9f..9a5010b0b6 100644
--- a/Library/FileSystem/HardDisk.php
+++ b/Library/FileSystem/HardDisk.php
@@ -13,13 +13,7 @@
 
 namespace Zephir\FileSystem;
 
-use FilesystemIterator;
-use Generator;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use SplFileInfo;
 use Zephir\Exception\InvalidArgumentException;
-use Zephir\Exception\RuntimeException;
 use Zephir\Zephir;
 
 /**
@@ -172,10 +166,10 @@ public function clean(): void
 
         $contents = $this->listDirectoryRecursively(
             $this->basePath.DIRECTORY_SEPARATOR.$this->localPath,
-            RecursiveIteratorIterator::CHILD_FIRST,
+            \RecursiveIteratorIterator::CHILD_FIRST,
         );
 
-        /** @var SplFileInfo $file */
+        /** @var \SplFileInfo $file */
         foreach ($contents as $file) {
             $this->deleteFileInfoObject($file);
         }
@@ -231,7 +225,7 @@ public function normalizePath(string $path): string
         return str_replace(['\\', ':', '/'], '_', $path);
     }
 
-    protected function deleteFileInfoObject(SplFileInfo $file): bool
+    protected function deleteFileInfoObject(\SplFileInfo $file): bool
     {
         switch ($file->getType()) {
             case 'dir':
@@ -245,10 +239,10 @@ protected function deleteFileInfoObject(SplFileInfo $file): bool
 
     private function listDirectoryRecursively(
         string $path,
-        int $mode = RecursiveIteratorIterator::SELF_FIRST
-    ): Generator {
-        yield from new RecursiveIteratorIterator(
-            new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
+        int $mode = \RecursiveIteratorIterator::SELF_FIRST
+    ): \Generator {
+        yield from new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
             $mode
         );
     }
diff --git a/Library/FunctionCall.php b/Library/FunctionCall.php
index f6ea9c2887..5047b87258 100644
--- a/Library/FunctionCall.php
+++ b/Library/FunctionCall.php
@@ -141,9 +141,9 @@ public function functionExists($functionName, CompilationContext $context)
      * @param Expression         $expr
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException|Exception
-     *
      * @return CompiledExpression
+     *
+     * @throws CompilerException|Exception
      */
     public function compile(Expression $expr, CompilationContext $compilationContext)
     {
@@ -178,9 +178,9 @@ public static function addOptimizerDir($directory)
      * @param string $funcName
      * @param array  $expression
      *
-     * @throws CompilerException
-     *
      * @return bool
+     *
+     * @throws CompilerException
      */
     protected function isReadOnly($funcName, array $expression)
     {
@@ -213,9 +213,9 @@ protected function isReadOnly($funcName, array $expression)
              * Check if the number of parameters.
              */
             $numberParameters = \count($expression['parameters']);
-            if ('unpack' == $funcName &&
-                (0 == version_compare(PHP_VERSION, '7.1.0') ||
-                    0 == version_compare(PHP_VERSION, '7.1.1'))
+            if ('unpack' == $funcName
+                && (0 == version_compare(PHP_VERSION, '7.1.0')
+                    || 0 == version_compare(PHP_VERSION, '7.1.1'))
             ) {
                 if ($numberParameters < 2) {
                     throw new CompilerException(sprintf($messageFormat, $funcName), $expression);
@@ -308,9 +308,9 @@ protected function markReferences(
      * @param Call               $call
      * @param CompilationContext $compilationContext
      *
-     * @throws Exception
-     *
      * @return bool|mixed
+     *
+     * @throws Exception
      */
     protected function optimize($funcName, array $expression, Call $call, CompilationContext $compilationContext)
     {
@@ -364,9 +364,9 @@ protected function optimize($funcName, array $expression, Call $call, Compilatio
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
-     * @throws Exception|\Zephir\Exception\CompilerException
-     *
      * @return CompiledExpression
+     *
+     * @throws Exception|\Zephir\Exception\CompilerException
      */
     protected function _callNormal(array $expression, CompilationContext $compilationContext)
     {
@@ -557,9 +557,9 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     *
+     * @throws CompilerException
      */
     protected function _callDynamic(array $expression, CompilationContext $compilationContext)
     {
diff --git a/Library/FunctionDefinition.php b/Library/FunctionDefinition.php
index 1ea93d1067..0775857f51 100644
--- a/Library/FunctionDefinition.php
+++ b/Library/FunctionDefinition.php
@@ -13,8 +13,8 @@
 
 namespace Zephir;
 
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
 
 /**
  * Represents a function
@@ -27,12 +27,12 @@ class FunctionDefinition extends Method
     private bool $isGlobal = false;
 
     public function __construct(
-        private string             $namespace,
-        protected string           $name,
-        protected ?Parameters      $parameters = null,
+        private string $namespace,
+        protected string $name,
+        protected ?Parameters $parameters = null,
         protected ?StatementsBlock $statements = null,
-        array                      $returnType = null,
-        protected ?array           $expression = [],
+        array $returnType = null,
+        protected ?array $expression = [],
     ) {
         $this->setReturnTypes($returnType);
     }
diff --git a/Library/Logger/Formatter/CompilerFormatter.php b/Library/Logger/Formatter/CompilerFormatter.php
index 99e5320960..cf6c7b9c19 100644
--- a/Library/Logger/Formatter/CompilerFormatter.php
+++ b/Library/Logger/Formatter/CompilerFormatter.php
@@ -16,10 +16,6 @@
 use Monolog\Formatter\LineFormatter;
 use Zephir\Config;
 
-use function array_key_exists;
-use function count;
-use function is_array;
-
 /**
  * Formatter for warnings/notices/errors generated in compilation.
  */
@@ -53,9 +49,9 @@ public function format(array $record): string
         $output = str_replace('%context%', '', $output);
 
         // ignore empty context or invalid format
-        if (!empty($vars['context']) &&
-            is_array($vars['context']) &&
-            2 == count($vars['context'])
+        if (!empty($vars['context'])
+            && \is_array($vars['context'])
+            && 2 == \count($vars['context'])
         ) {
             $type = $vars['context'][0];
             $node = $vars['context'][1];
@@ -97,7 +93,7 @@ public function format(array $record): string
     private function replacePlaceholders(array $vars, $output)
     {
         // WARNING -> Warning
-        if (array_key_exists('level_name', $vars)) {
+        if (\array_key_exists('level_name', $vars)) {
             $vars['level_name'] = ucfirst(strtolower($vars['level_name']));
         }
 
diff --git a/Library/MethodCall.php b/Library/MethodCall.php
index 6d92d4693f..a6aac43fff 100644
--- a/Library/MethodCall.php
+++ b/Library/MethodCall.php
@@ -11,7 +11,6 @@
 
 namespace Zephir;
 
-use ReflectionException;
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
@@ -41,11 +40,13 @@ class MethodCall extends Call
     /**
      * Compiles a method call.
      *
-     * @param Expression $expr
+     * @param Expression         $expr
      * @param CompilationContext $compilationContext
+     *
      * @return mixed|CompiledExpression
+     *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(Expression $expr, CompilationContext $compilationContext): mixed
     {
@@ -319,10 +320,10 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         $numberImplemented = 0;
                         $compiler = $compilationContext->compiler;
                         foreach ($classTypes as $classType) {
-                            if ($compiler->isClass($classType) ||
-                                $compiler->isInterface($classType) ||
-                                $compiler->isBundledClass($classType) ||
-                                $compiler->isBundledInterface($classType)
+                            if ($compiler->isClass($classType)
+                                || $compiler->isInterface($classType)
+                                || $compiler->isBundledClass($classType)
+                                || $compiler->isBundledInterface($classType)
                             ) {
                                 if ($compiler->isClass($classType) || $compiler->isInterface($classType)) {
                                     $classDefinition = $compiler->getClassDefinition($classType);
@@ -373,9 +374,9 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                 /*
                                  * Check visibility for protected methods
                                  */
-                                if ($method->isProtected() &&
-                                    $method->getClassDefinition() != $classDefinition &&
-                                    $method->getClassDefinition() != $classDefinition->getExtendsClass()
+                                if ($method->isProtected()
+                                    && $method->getClassDefinition() != $classDefinition
+                                    && $method->getClassDefinition() != $classDefinition->getExtendsClass()
                                 ) {
                                     throw new CompilerException(
                                         sprintf(
@@ -672,10 +673,10 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                         }
                                         break;
 
-                                    /**
-                                     * Passing polymorphic variables to static typed parameters
-                                     * could lead to potential unexpected type coercions
-                                     */
+                                        /**
+                                         * Passing polymorphic variables to static typed parameters
+                                         * could lead to potential unexpected type coercions
+                                         */
                                     case 'variable':
                                         if ($resolvedDynamicTypes[$n] != $parameter['data-type']) {
                                             if ('undefined' == $resolvedDynamicTypes[$n]) {
@@ -746,7 +747,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     $compilationContext
                 );
             } else {
-                //TODO: also move to backend
+                // TODO: also move to backend
                 if ($isExpecting) {
                     $symbolCode = $compilationContext->backend->getVariableCode($symbolVariable);
                 }
@@ -828,11 +829,12 @@ public function compile(Expression $expr, CompilationContext $compilationContext
      * Examine internal class information and returns the method called.
      *
      * @param CompilationContext $compilationContext
-     * @param Variable $caller
-     * @param string $methodName
+     * @param Variable           $caller
+     * @param string             $methodName
      *
      * @return array
-     * @throws ReflectionException
+     *
+     * @throws \ReflectionException
      */
     private function getRealCalledMethod(CompilationContext $compilationContext, Variable $caller, string $methodName): array
     {
@@ -854,9 +856,9 @@ private function getRealCalledMethod(CompilationContext $compilationContext, Var
                     continue;
                 }
 
-                if ($compiler->isClass($classType) ||
-                    $compiler->isBundledClass($classType) ||
-                    $compiler->isBundledInterface($classType)
+                if ($compiler->isClass($classType)
+                    || $compiler->isBundledClass($classType)
+                    || $compiler->isBundledInterface($classType)
                 ) {
                     if ($compiler->isClass($classType)) {
                         $classDefinition = $compiler->getClassDefinition($classType);
diff --git a/Library/Operators/AbstractOperator.php b/Library/Operators/AbstractOperator.php
index d35b8aca1b..330435ef0d 100644
--- a/Library/Operators/AbstractOperator.php
+++ b/Library/Operators/AbstractOperator.php
@@ -35,7 +35,7 @@ abstract class AbstractOperator
      * @param bool          $expecting
      * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, ?Variable $expectingVariable = null): void
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -81,8 +81,8 @@ public function getExpectedNonLiteral(CompilationContext $compilationContext, ar
      * store the result.
      *
      * @param CompilationContext $compilationContext
-     * @param array $expression
-     * @param bool $init
+     * @param array              $expression
+     * @param bool               $init
      *
      * @return Variable|null
      */
diff --git a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php b/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
index a6d992e14b..ac6b94bcae 100644
--- a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -82,10 +82,10 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
+     * @return CompiledExpression
+     *
      * @throws Exception
      * @throws CompilerException
-     *
-     * @return CompiledExpression
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
@@ -443,7 +443,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 }
                                 break;
 
-                            /* a(var) + a(x) */
+                                /* a(var) + a(x) */
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
                                 switch ($variableRight->getType()) {
@@ -468,7 +468,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
                                         break;
 
-                                    /* a(var) + a(bool) */
+                                        /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableLeft = $compilationContext->backend->getVariableCode($variableLeft);
@@ -476,7 +476,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         return new CompiledExpression('int', '(zephir_get_numberval('.$variableLeft.') '.$this->operator.' '.$variableRight->getName().')', $expression);
                                         break;
 
-                                    /* a(var) + a(var) */
+                                        /* a(var) + a(var) */
                                     case 'variable':
                                     case 'array':
                                         $compilationContext->headersManager->add('kernel/operators');
diff --git a/Library/Operators/Arithmetical/DivOperator.php b/Library/Operators/Arithmetical/DivOperator.php
index bdb56058f6..5e66647eb0 100644
--- a/Library/Operators/Arithmetical/DivOperator.php
+++ b/Library/Operators/Arithmetical/DivOperator.php
@@ -329,7 +329,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                 return new CompiledExpression('double', 'zephir_safe_div_zval_double('.$op1.', '.$op2.')', $expression);
 
-                            /* a(var) + a(x) */
+                                /* a(var) + a(x) */
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
                                 switch ($variableRight->getType()) {
@@ -343,11 +343,11 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'double':
                                         return new CompiledExpression('double', 'zephir_safe_div_zval_double('.$op1.', '.$variableRight->getName().')', $expression);
 
-                                    /* a(var) + a(bool) */
+                                        /* a(var) + a(bool) */
                                     case 'bool':
                                         return new CompiledExpression('int', 'zephir_safe_div_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
 
-                                    /* a(var) + a(var) */
+                                        /* a(var) + a(var) */
                                     case 'variable':
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
diff --git a/Library/Operators/Arithmetical/ModOperator.php b/Library/Operators/Arithmetical/ModOperator.php
index a82bb4718a..d6aaddc7af 100644
--- a/Library/Operators/Arithmetical/ModOperator.php
+++ b/Library/Operators/Arithmetical/ModOperator.php
@@ -333,7 +333,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 return new CompiledExpression('double', 'zephir_safe_mod_zval_double('.$op1.', '.$op2.')', $expression);
                                 break;
 
-                            /* a(var) + a(x) */
+                                /* a(var) + a(x) */
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
                                 switch ($variableRight->getType()) {
@@ -345,12 +345,12 @@ public function compile($expression, CompilationContext $compilationContext)
                                         return new CompiledExpression('double', 'zephir_safe_mod_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
                                         break;
 
-                                    /* a(var) + a(bool) */
+                                        /* a(var) + a(bool) */
                                     case 'bool':
                                         return new CompiledExpression('int', 'zephir_safe_mod_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
                                         break;
 
-                                    /* a(var) + a(var) */
+                                        /* a(var) + a(var) */
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
diff --git a/Library/Operators/Bitwise/BitwiseBaseOperator.php b/Library/Operators/Bitwise/BitwiseBaseOperator.php
index e7e82b2a0d..a0f896cacb 100644
--- a/Library/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/Library/Operators/Bitwise/BitwiseBaseOperator.php
@@ -36,7 +36,7 @@ class BitwiseBaseOperator extends AbstractOperator
      * @param array              $expression
      * @param CompilationContext $compilationContext
      *
-     * @return null|CompiledExpression
+     * @return CompiledExpression|null
      */
     public function optimizeConstantFolding(array $expression, CompilationContext $compilationContext): ?CompiledExpression
     {
@@ -50,7 +50,7 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
             case 'long':
             case 'ulong':
             case 'double':
-                //continue to next switch
+                // continue to next switch
                 break;
             default:
                 return null;
@@ -63,7 +63,7 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
             case 'long':
             case 'ulong':
             case 'double':
-                //continue to operator switch
+                // continue to operator switch
                 break;
             default:
                 return null;
@@ -430,7 +430,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 }
                                 break;
 
-                            /* a(var) + a(x) */
+                                /* a(var) + a(x) */
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
                                 $symbol = $compilationContext->backend->getVariableCode($variableLeft);
@@ -445,14 +445,14 @@ public function compile($expression, CompilationContext $compilationContext)
                                         return new CompiledExpression('int', '((int) (zephir_get_numberval('.$symbol.')) '.$this->operator.' '.$variableRight->getName().')', $expression);
                                         break;
 
-                                    /* a(var) + a(bool) */
+                                        /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
 
                                         return new CompiledExpression('int', '((int) (zephir_get_numberval('.$symbol.')) '.$this->operator.' '.$variableRight->getName().')', $expression);
                                         break;
 
-                                    /* a(var) + a(var) */
+                                        /* a(var) + a(var) */
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op1 = $symbol;
diff --git a/Library/Operators/Bitwise/BitwiseNotOperator.php b/Library/Operators/Bitwise/BitwiseNotOperator.php
index f0666a57d7..e7a7b2dd07 100644
--- a/Library/Operators/Bitwise/BitwiseNotOperator.php
+++ b/Library/Operators/Bitwise/BitwiseNotOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Bitwise;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -24,11 +23,12 @@
 class BitwiseNotOperator extends AbstractOperator
 {
     /**
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
-     * @throws ReflectionException
+     *
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile($expression, CompilationContext $compilationContext)
diff --git a/Library/Operators/Comparison/ComparisonBaseOperator.php b/Library/Operators/Comparison/ComparisonBaseOperator.php
index a09fbbbbe3..887c24f8ec 100644
--- a/Library/Operators/Comparison/ComparisonBaseOperator.php
+++ b/Library/Operators/Comparison/ComparisonBaseOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Comparison;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -35,7 +34,7 @@ class ComparisonBaseOperator extends AbstractOperator
      * @return CompiledExpression|null
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function optimizeTypeOf(array $expr, CompilationContext $compilationContext): ?CompiledExpression
     {
@@ -170,7 +169,7 @@ public function optimizeTypeOf(array $expr, CompilationContext $compilationConte
      *
      * @return CompiledExpression
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext)
diff --git a/Library/Operators/Logical/AndOperator.php b/Library/Operators/Logical/AndOperator.php
index 0ce42886df..4869779d1f 100644
--- a/Library/Operators/Logical/AndOperator.php
+++ b/Library/Operators/Logical/AndOperator.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Operators\Logical;
 
-use Exception;
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -28,22 +26,22 @@ class AndOperator extends LogicalBaseOperator
     protected string $bitOperator = '&&';
 
     /**
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws \Zephir\Exception
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
         if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
+            throw new \Exception('Missing left part of the expression');
         }
 
         if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
+            throw new \Exception('Missing right part of the expression');
         }
 
         $leftExpr = new Expression($expression['left']);
diff --git a/Library/Operators/Logical/LogicalBaseOperator.php b/Library/Operators/Logical/LogicalBaseOperator.php
index 6fa832e923..6131252824 100644
--- a/Library/Operators/Logical/LogicalBaseOperator.php
+++ b/Library/Operators/Logical/LogicalBaseOperator.php
@@ -258,7 +258,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.' '.$this->operator.' zephir_is_true('.$variableCode.')', $expression);
+                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().'))  '.$this->operator.' zephir_is_true('.$variableCode.')', $expression);
 
                                     default:
                                         throw new CompilerException("Cannot compare variable('double') with variable('".$variableRight->getType()."')", $expression);
@@ -285,7 +285,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
 
                                 return new CompiledExpression('bool', 'zephir_is_true('.$op1.') '.$op.' '.$op2, $expression);
 
-                            /* a(var) && a(x) */
+                                /* a(var) && a(x) */
                             case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
                                 $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
@@ -298,7 +298,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
 
                                         return new CompiledExpression('bool', 'zephir_is_true('.$variableLeftCode.') '.$this->operator.' '.$variableRightCode, $expression);
 
-                                    /* a(var) && a(var) */
+                                        /* a(var) && a(var) */
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op1 = $variableLeftCode;
diff --git a/Library/Operators/Logical/OrOperator.php b/Library/Operators/Logical/OrOperator.php
index 6e8588e8f1..54be169b90 100644
--- a/Library/Operators/Logical/OrOperator.php
+++ b/Library/Operators/Logical/OrOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Logical;
 
-use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -29,11 +28,11 @@ class OrOperator extends LogicalBaseOperator
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
         if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
+            throw new \Exception('Missing left part of the expression');
         }
 
         if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
+            throw new \Exception('Missing right part of the expression');
         }
 
         $leftExpr = new Expression($expression['left']);
diff --git a/Library/Operators/Other/CastOperator.php b/Library/Operators/Other/CastOperator.php
index 0ceb7ccde6..4fcaa8a344 100644
--- a/Library/Operators/Other/CastOperator.php
+++ b/Library/Operators/Other/CastOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Detectors\ReadDetector;
@@ -37,7 +36,7 @@ class CastOperator extends AbstractOperator
      *
      * @return CompiledExpression
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Other/ConcatOperator.php b/Library/Operators/Other/ConcatOperator.php
index 3f5ab4b7b5..5701ea8521 100644
--- a/Library/Operators/Other/ConcatOperator.php
+++ b/Library/Operators/Other/ConcatOperator.php
@@ -19,6 +19,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
+
 use function Zephir\add_slashes;
 
 /**
diff --git a/Library/Operators/Other/InstanceOfOperator.php b/Library/Operators/Other/InstanceOfOperator.php
index f309ad2035..a1b9bedfee 100644
--- a/Library/Operators/Other/InstanceOfOperator.php
+++ b/Library/Operators/Other/InstanceOfOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\Class\Entry;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -30,13 +29,13 @@
 class InstanceOfOperator extends AbstractOperator
 {
     /**
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $context
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile($expression, CompilationContext $context): CompiledExpression
     {
diff --git a/Library/Operators/Other/IssetOperator.php b/Library/Operators/Other/IssetOperator.php
index 4ed034dd7b..0666448753 100644
--- a/Library/Operators/Other/IssetOperator.php
+++ b/Library/Operators/Other/IssetOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -35,7 +34,7 @@ class IssetOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Other/LikelyOperator.php b/Library/Operators/Other/LikelyOperator.php
index e6cc5418d2..ef2bc03a72 100644
--- a/Library/Operators/Other/LikelyOperator.php
+++ b/Library/Operators/Other/LikelyOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -27,13 +26,13 @@
 class LikelyOperator extends AbstractOperator
 {
     /**
-     * @param array $expression
+     * @param array              $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Other/NewInstanceOperator.php b/Library/Operators/Other/NewInstanceOperator.php
index b4f1f37bbd..6787949683 100644
--- a/Library/Operators/Other/NewInstanceOperator.php
+++ b/Library/Operators/Other/NewInstanceOperator.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionClass;
-use ReflectionException;
 use Zephir\Class\Entry;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -41,7 +39,7 @@ class NewInstanceOperator extends AbstractOperator
      *
      * @return CompiledExpression
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
@@ -158,7 +156,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                         $zendClassEntry = $compilationContext->cacheManager->getClassEntryCache()->get($classNameToFetch, false, $compilationContext);
                         $classEntry = $zendClassEntry->getName();
                     } else {
-                        $reflectionClass = new ReflectionClass($className);
+                        $reflectionClass = new \ReflectionClass($className);
                         if ($reflectionClass->isInterface()) {
                             throw new CompilerException('Interfaces cannot be instantiated', $expression);
                         }
diff --git a/Library/Operators/Other/RequireOperator.php b/Library/Operators/Other/RequireOperator.php
index 6dd7af44ea..04001afe7c 100644
--- a/Library/Operators/Other/RequireOperator.php
+++ b/Library/Operators/Other/RequireOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -26,13 +25,13 @@
 class RequireOperator extends AbstractOperator
 {
     /**
-     * @param array $expression
+     * @param array              $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Other/ShortTernaryOperator.php b/Library/Operators/Other/ShortTernaryOperator.php
index 2efa139671..029cfc5912 100644
--- a/Library/Operators/Other/ShortTernaryOperator.php
+++ b/Library/Operators/Other/ShortTernaryOperator.php
@@ -32,7 +32,7 @@ class ShortTernaryOperator extends AbstractOperator
     /**
      * Compile ternary operator.
      *
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
diff --git a/Library/Operators/Other/TernaryOperator.php b/Library/Operators/Other/TernaryOperator.php
index e3d0054aae..9ed0f29464 100644
--- a/Library/Operators/Other/TernaryOperator.php
+++ b/Library/Operators/Other/TernaryOperator.php
@@ -27,7 +27,7 @@ class TernaryOperator extends AbstractOperator
     /**
      * Compile ternary operator.
      *
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
diff --git a/Library/Operators/Other/TypeHintOperator.php b/Library/Operators/Other/TypeHintOperator.php
index 1696d30933..6baf09c6e6 100644
--- a/Library/Operators/Other/TypeHintOperator.php
+++ b/Library/Operators/Other/TypeHintOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -26,13 +25,13 @@ class TypeHintOperator extends AbstractOperator
     /**
      * Performs type-hint compilation.
      *
-     * @param array $expression
+     * @param array              $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Other/TypeOfOperator.php b/Library/Operators/Other/TypeOfOperator.php
index 6ac240678e..cb1fac6c31 100644
--- a/Library/Operators/Other/TypeOfOperator.php
+++ b/Library/Operators/Other/TypeOfOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -28,13 +27,13 @@
 class TypeOfOperator extends AbstractOperator
 {
     /**
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Other/UnlikelyOperator.php b/Library/Operators/Other/UnlikelyOperator.php
index 587d0b060f..8c4e33af3e 100644
--- a/Library/Operators/Other/UnlikelyOperator.php
+++ b/Library/Operators/Other/UnlikelyOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -29,13 +28,13 @@ class UnlikelyOperator extends AbstractOperator
     /**
      * Compile unlikely operator
      *
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Unary/MinusOperator.php b/Library/Operators/Unary/MinusOperator.php
index 5532bba95c..38a3c94415 100644
--- a/Library/Operators/Unary/MinusOperator.php
+++ b/Library/Operators/Unary/MinusOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Unary;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -26,13 +25,13 @@ class MinusOperator extends AbstractOperator
     /**
      * Compile expression.
      *
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Operators/Unary/NotOperator.php b/Library/Operators/Unary/NotOperator.php
index 2d5eee5b57..ab9b10969f 100644
--- a/Library/Operators/Unary/NotOperator.php
+++ b/Library/Operators/Unary/NotOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Unary;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -24,13 +23,13 @@
 class NotOperator extends AbstractOperator
 {
     /**
-     * @param $expression
+     * @param                    $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/Library/Optimizers/EvalExpression.php b/Library/Optimizers/EvalExpression.php
index 94a64a9463..b87fe6af19 100644
--- a/Library/Optimizers/EvalExpression.php
+++ b/Library/Optimizers/EvalExpression.php
@@ -65,7 +65,7 @@ public function optimizeNot(array $expr, CompilationContext $compilationContext)
     /**
      * Optimizes expressions.
      *
-     * @param $exprRaw
+     * @param                    $exprRaw
      * @param CompilationContext $compilationContext
      *
      * @return bool|string
@@ -166,7 +166,7 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                                         break;
 
                                     case 'int':
-                                        if (!(int) ($possibleValue->getCode())) {
+                                        if (!(int) $possibleValue->getCode()) {
                                             $this->unreachable = true;
                                         } else {
                                             $this->unreachableElse = true;
@@ -174,7 +174,7 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                                         break;
 
                                     case 'double':
-                                        if (!(float) ($possibleValue->getCode())) {
+                                        if (!(float) $possibleValue->getCode()) {
                                             $this->unreachable = true;
                                         } else {
                                             $this->unreachableElse = true;
@@ -182,7 +182,7 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                                         break;
 
                                     default:
-                                        //echo $possibleValue->getType();
+                                        // echo $possibleValue->getType();
                                 }
                             }
                         }
diff --git a/Library/Optimizers/FunctionCall/AddslashesOptimizer.php b/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
index 27ed82adc8..84c75f6177 100644
--- a/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -29,9 +29,9 @@ class AddslashesOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index 940864f57f..c423940905 100644
--- a/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -29,9 +29,9 @@ class ArrayKeyExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -47,7 +47,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        //Note: the first parameter is key in php array_key_exists
+        // Note: the first parameter is key in php array_key_exists
         return new CompiledExpression('bool', 'zephir_array_key_exists('.$resolvedParams[1].', '.$resolvedParams[0].')', $expression);
     }
 }
diff --git a/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index f6ae4fdd06..9e86502c5e 100644
--- a/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -29,9 +29,9 @@ class ArrayKeysOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index 8135036d7d..a474f1196b 100644
--- a/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -29,9 +29,9 @@ class ArrayMergeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/BasenameOptimizer.php b/Library/Optimizers/FunctionCall/BasenameOptimizer.php
index 8a0c34c9fd..66c5e8f278 100644
--- a/Library/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/Library/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -29,9 +29,9 @@ class BasenameOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/CamelizeOptimizer.php b/Library/Optimizers/FunctionCall/CamelizeOptimizer.php
index 136235a192..ebd0166572 100644
--- a/Library/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -29,9 +29,9 @@ class CamelizeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/CeilOptimizer.php b/Library/Optimizers/FunctionCall/CeilOptimizer.php
index 6c05009847..cc22851e7a 100644
--- a/Library/Optimizers/FunctionCall/CeilOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CeilOptimizer.php
@@ -29,9 +29,9 @@ class CeilOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php b/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
index a448ca560d..dd539f3b08 100644
--- a/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
@@ -29,9 +29,9 @@ class ClassExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php b/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
index bc18878f5f..6495b4ba4e 100644
--- a/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
@@ -29,9 +29,9 @@ class CompareMtimeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/Crc32Optimizer.php b/Library/Optimizers/FunctionCall/Crc32Optimizer.php
index 71139b435c..bb425a165f 100644
--- a/Library/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/Library/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -29,9 +29,9 @@ class Crc32Optimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php b/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
index bb4d76ec5a..be4584274c 100644
--- a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -29,9 +29,9 @@ class CreateArrayOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 70117105f2..51040a4f90 100644
--- a/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -29,9 +29,9 @@ class CreateInstanceOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
index f4d164c949..8bd23407dd 100644
--- a/Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
+++ b/Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -29,9 +29,9 @@ class CreateSymbolTableOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/DoublevalOptimizer.php b/Library/Optimizers/FunctionCall/DoublevalOptimizer.php
index 6cfde21ea5..e274e15c09 100644
--- a/Library/Optimizers/FunctionCall/DoublevalOptimizer.php
+++ b/Library/Optimizers/FunctionCall/DoublevalOptimizer.php
@@ -29,9 +29,9 @@ class DoublevalOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/EvalOptimizer.php b/Library/Optimizers/FunctionCall/EvalOptimizer.php
index 143c06a619..1e51333066 100644
--- a/Library/Optimizers/FunctionCall/EvalOptimizer.php
+++ b/Library/Optimizers/FunctionCall/EvalOptimizer.php
@@ -29,10 +29,10 @@ class EvalOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
+     * @return bool|CompiledExpression|mixed
+     *
      * @throws CompilerException
      * @throws \Zephir\Exception
-     *
-     * @return bool|CompiledExpression|mixed
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/ExitOptimizer.php b/Library/Optimizers/FunctionCall/ExitOptimizer.php
index b2f6084c90..d04826fe4e 100644
--- a/Library/Optimizers/FunctionCall/ExitOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ExitOptimizer.php
@@ -29,9 +29,9 @@ class ExitOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -41,7 +41,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/exit');
         if (isset($expression['parameters'])) {
-            //TODO: protect resolvedParams[0] from restore
+            // TODO: protect resolvedParams[0] from restore
         }
         if (!isset($expression['parameters'])) {
             $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
diff --git a/Library/Optimizers/FunctionCall/ExplodeOptimizer.php b/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
index 3ad81dc9d6..73f766a62e 100644
--- a/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -31,9 +31,9 @@ class ExplodeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FcloseOptimizer.php b/Library/Optimizers/FunctionCall/FcloseOptimizer.php
index af5db2b021..f5dc100353 100644
--- a/Library/Optimizers/FunctionCall/FcloseOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FcloseOptimizer.php
@@ -29,9 +29,9 @@ class FcloseOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FileExistsOptimizer.php b/Library/Optimizers/FunctionCall/FileExistsOptimizer.php
index d06e1e562c..5867ae067b 100644
--- a/Library/Optimizers/FunctionCall/FileExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FileExistsOptimizer.php
@@ -29,9 +29,9 @@ class FileExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
index 6b2b6abd97..1008be680a 100644
--- a/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -29,9 +29,9 @@ class FileGetContentsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php b/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
index 894bc0b16d..0693608567 100644
--- a/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
@@ -29,9 +29,9 @@ class FilePutContentsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php b/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
index b14e3e7b73..1958e8ecdb 100644
--- a/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -29,9 +29,9 @@ class FilemtimeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FloorOptimizer.php b/Library/Optimizers/FunctionCall/FloorOptimizer.php
index e3296ffe94..6719a2e6ae 100644
--- a/Library/Optimizers/FunctionCall/FloorOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FloorOptimizer.php
@@ -29,9 +29,9 @@ class FloorOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
index 44ce4ca16d..b0b624c05b 100644
--- a/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
@@ -31,9 +31,9 @@ class FuncGetArgOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index 05c566024e..28f718b295 100644
--- a/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -29,9 +29,9 @@ class FuncGetArgsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php b/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
index ace5a2b80e..66a5c7e64f 100644
--- a/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
@@ -16,7 +16,6 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function count;
 use function Zephir\add_slashes;
 
 /**
@@ -35,7 +34,7 @@ class FunctionExistsOptimizer extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (!isset($expression['parameters']) || 1 !== count($expression['parameters'])) {
+        if (!isset($expression['parameters']) || 1 !== \count($expression['parameters'])) {
             return false;
         }
 
diff --git a/Library/Optimizers/FunctionCall/FwriteOptimizer.php b/Library/Optimizers/FunctionCall/FwriteOptimizer.php
index d77cf01b3e..4a01a27476 100644
--- a/Library/Optimizers/FunctionCall/FwriteOptimizer.php
+++ b/Library/Optimizers/FunctionCall/FwriteOptimizer.php
@@ -29,9 +29,9 @@ class FwriteOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
index a771b5099d..899f457e6a 100644
--- a/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -29,9 +29,9 @@ class GetCalledClassOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index 10595eb489..41ee43c7fa 100644
--- a/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -29,9 +29,9 @@ class GetClassLowerOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php b/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
index d00fce6168..0169caed01 100644
--- a/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -29,9 +29,9 @@ class GetClassNsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/GetClassOptimizer.php b/Library/Optimizers/FunctionCall/GetClassOptimizer.php
index c7afeab546..d896e88916 100644
--- a/Library/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -29,9 +29,9 @@ class GetClassOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php b/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
index d6d0208cc9..1c26badebf 100644
--- a/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -29,9 +29,9 @@ class GetNsClassOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/GettypeOptimizer.php b/Library/Optimizers/FunctionCall/GettypeOptimizer.php
index 3cb217ec27..d7f3eca7d1 100644
--- a/Library/Optimizers/FunctionCall/GettypeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -29,9 +29,9 @@ class GettypeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/GlobalsGetOptimizer.php b/Library/Optimizers/FunctionCall/GlobalsGetOptimizer.php
index d71f69fb46..89364dc379 100644
--- a/Library/Optimizers/FunctionCall/GlobalsGetOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GlobalsGetOptimizer.php
@@ -19,8 +19,6 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function count;
-
 /**
  * `globals_get()` internal function.
  *
@@ -43,7 +41,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return null;
         }
 
-        if (1 !== count($expression['parameters'])) {
+        if (1 !== \count($expression['parameters'])) {
             throw new CompilerException("'globals_get' only accepts one parameter", $expression);
         }
 
@@ -59,7 +57,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $type = $context->compiler->getExtensionGlobal($globalName)['type'];
 
-        if (false !== strpos($globalName, '.')) {
+        if (str_contains($globalName, '.')) {
             $parts = explode('.', $globalName);
 
             return new CompiledExpression($type, 'ZEPHIR_GLOBAL('.$parts[0].').'.$parts[1], $expression);
diff --git a/Library/Optimizers/FunctionCall/GlobalsSetOptimizer.php b/Library/Optimizers/FunctionCall/GlobalsSetOptimizer.php
index 5ff8573b52..93599ab0bb 100644
--- a/Library/Optimizers/FunctionCall/GlobalsSetOptimizer.php
+++ b/Library/Optimizers/FunctionCall/GlobalsSetOptimizer.php
@@ -20,8 +20,6 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function count;
-
 /**
  * `globals_set()` internal function.
  *
@@ -34,9 +32,9 @@ class GlobalsSetOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context): CompiledExpression
     {
@@ -44,7 +42,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException("'globals_set' requires two parameters", $expression);
         }
 
-        if (2 !== count($expression['parameters'])) {
+        if (2 !== \count($expression['parameters'])) {
             throw new CompilerException("'globals_set' only accepts two parameters", $expression);
         }
 
diff --git a/Library/Optimizers/FunctionCall/HashEqualsOptimizer.php b/Library/Optimizers/FunctionCall/HashEqualsOptimizer.php
index ed0840c3e6..d4a93e0266 100644
--- a/Library/Optimizers/FunctionCall/HashEqualsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/HashEqualsOptimizer.php
@@ -29,9 +29,9 @@ class HashEqualsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/ImplodeOptimizer.php b/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
index 651c15b55e..fb4744f81d 100644
--- a/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -31,9 +31,9 @@ class ImplodeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/InArrayOptimizer.php b/Library/Optimizers/FunctionCall/InArrayOptimizer.php
index 58727048a7..2d248c6eb9 100644
--- a/Library/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/Library/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -29,9 +29,9 @@ class InArrayOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php b/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
index 5ffb906e13..ea60dc2ad8 100644
--- a/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
+++ b/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
@@ -29,9 +29,9 @@ class InterfaceExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/IntvalOptimizer.php b/Library/Optimizers/FunctionCall/IntvalOptimizer.php
index 081d8c37ca..5c45900cd1 100644
--- a/Library/Optimizers/FunctionCall/IntvalOptimizer.php
+++ b/Library/Optimizers/FunctionCall/IntvalOptimizer.php
@@ -29,9 +29,9 @@ class IntvalOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php b/Library/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
index 61e3612774..73d359c1e0 100644
--- a/Library/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
+++ b/Library/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
@@ -30,9 +30,9 @@ class IsPrivatePropertyOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/LdexpOptimizer.php b/Library/Optimizers/FunctionCall/LdexpOptimizer.php
index 847b919b20..480f9f0107 100644
--- a/Library/Optimizers/FunctionCall/LdexpOptimizer.php
+++ b/Library/Optimizers/FunctionCall/LdexpOptimizer.php
@@ -39,9 +39,9 @@ public function getFunctionName()
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/Md5Optimizer.php b/Library/Optimizers/FunctionCall/Md5Optimizer.php
index 75e276c446..89c5fbeb7a 100644
--- a/Library/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/Library/Optimizers/FunctionCall/Md5Optimizer.php
@@ -29,9 +29,9 @@ class Md5Optimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/MergeAppendOptimizer.php b/Library/Optimizers/FunctionCall/MergeAppendOptimizer.php
index ab708d1b3e..7d55d98641 100644
--- a/Library/Optimizers/FunctionCall/MergeAppendOptimizer.php
+++ b/Library/Optimizers/FunctionCall/MergeAppendOptimizer.php
@@ -29,9 +29,9 @@ class MergeAppendOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php b/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php
index 18e97c0f61..9be95691bc 100644
--- a/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php
@@ -29,9 +29,9 @@ class MicrotimeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/PowOptimizer.php b/Library/Optimizers/FunctionCall/PowOptimizer.php
index 3382d28818..f2a1495b89 100644
--- a/Library/Optimizers/FunctionCall/PowOptimizer.php
+++ b/Library/Optimizers/FunctionCall/PowOptimizer.php
@@ -29,9 +29,9 @@ class PowOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php b/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
index b1822b8c8a..23b50522aa 100644
--- a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/Library/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -35,9 +35,9 @@ class PregMatchOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -118,9 +118,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return array
+     *
+     * @throws CompilerException
      */
     private function processOptionals(array &$expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
index fa175f9464..cff2c8604e 100644
--- a/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
+++ b/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
@@ -29,9 +29,9 @@ class PrepareVirtualPathOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/RoundOptimizer.php b/Library/Optimizers/FunctionCall/RoundOptimizer.php
index 7dcd0b0962..3b99a9d00c 100644
--- a/Library/Optimizers/FunctionCall/RoundOptimizer.php
+++ b/Library/Optimizers/FunctionCall/RoundOptimizer.php
@@ -30,9 +30,9 @@ class RoundOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -74,9 +74,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 );
                 break;
 
-            /*
-             * float $val, int $mode
-             */
+                /*
+                 * float $val, int $mode
+                 */
             case 2:
                 $context->codePrinter->output(
                     'zephir_round('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', NULL);'
diff --git a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php b/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
index 0e6535308e..6cee852152 100644
--- a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
@@ -29,9 +29,9 @@ class StrReplaceOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php b/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
index 102130fd20..c00f98faec 100644
--- a/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -29,9 +29,9 @@ class StripcslashesOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/StripslashesOptimizer.php b/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
index 6bf84bbce6..b5bc457bd2 100644
--- a/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -29,9 +29,9 @@ class StripslashesOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/StrposOptimizer.php b/Library/Optimizers/FunctionCall/StrposOptimizer.php
index 6a68d4f294..fb6e2a0acf 100644
--- a/Library/Optimizers/FunctionCall/StrposOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StrposOptimizer.php
@@ -29,9 +29,9 @@ class StrposOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/StrtokOptimizer.php b/Library/Optimizers/FunctionCall/StrtokOptimizer.php
index e3b5040570..fa7f4e1a50 100644
--- a/Library/Optimizers/FunctionCall/StrtokOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StrtokOptimizer.php
@@ -29,9 +29,9 @@ class StrtokOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/StrtolowerOptimizer.php b/Library/Optimizers/FunctionCall/StrtolowerOptimizer.php
index 9543ac7f7f..19fc8aa29c 100644
--- a/Library/Optimizers/FunctionCall/StrtolowerOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -29,9 +29,9 @@ class StrtolowerOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/StrtoupperOptimizer.php b/Library/Optimizers/FunctionCall/StrtoupperOptimizer.php
index 8c95e9d45e..0713304fb1 100644
--- a/Library/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/Library/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -29,9 +29,9 @@ class StrtoupperOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/SubstrOptimizer.php b/Library/Optimizers/FunctionCall/SubstrOptimizer.php
index 8dc69b8a5e..dd0e40c6d3 100644
--- a/Library/Optimizers/FunctionCall/SubstrOptimizer.php
+++ b/Library/Optimizers/FunctionCall/SubstrOptimizer.php
@@ -29,9 +29,9 @@ class SubstrOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/TimeOptimizer.php b/Library/Optimizers/FunctionCall/TimeOptimizer.php
index a96dfa2db5..aa48887ff9 100644
--- a/Library/Optimizers/FunctionCall/TimeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/TimeOptimizer.php
@@ -29,9 +29,9 @@ class TimeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/TrimOptimizer.php b/Library/Optimizers/FunctionCall/TrimOptimizer.php
index b0f8377dd5..a22a660093 100644
--- a/Library/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/Library/Optimizers/FunctionCall/TrimOptimizer.php
@@ -31,9 +31,9 @@ class TrimOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/UcfirstOptimizer.php b/Library/Optimizers/FunctionCall/UcfirstOptimizer.php
index 0d2b49ddfb..13def33d99 100644
--- a/Library/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/Library/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -29,9 +29,9 @@ class UcfirstOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/UncamelizeOptimizer.php b/Library/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 68036a8429..50daee809a 100644
--- a/Library/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/Library/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -29,9 +29,9 @@ class UncamelizeOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index 69e4e3852a..2f06c54489 100644
--- a/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -29,9 +29,9 @@ class UniqueKeyOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php b/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
index b241f3528a..9ab964b968 100644
--- a/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
+++ b/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
@@ -29,9 +29,9 @@ class UniquePathKeyOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/VarExportOptimizer.php b/Library/Optimizers/FunctionCall/VarExportOptimizer.php
index f99f0c3d4f..180e07ea36 100644
--- a/Library/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/Library/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -30,9 +30,9 @@ class VarExportOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php b/Library/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
index 8b19da0264..c9357d95ee 100644
--- a/Library/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
+++ b/Library/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
@@ -29,9 +29,9 @@ class ZephirStringToHexOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Optimizers/IsTypeOptimizerAbstract.php b/Library/Optimizers/IsTypeOptimizerAbstract.php
index 9b1e0b92b1..17186a38b8 100644
--- a/Library/Optimizers/IsTypeOptimizerAbstract.php
+++ b/Library/Optimizers/IsTypeOptimizerAbstract.php
@@ -18,8 +18,6 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 
-use function count;
-
 abstract class IsTypeOptimizerAbstract extends OptimizerAbstract
 {
     /**
@@ -33,7 +31,7 @@ abstract class IsTypeOptimizerAbstract extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context): ?CompiledExpression
     {
-        if (!isset($expression['parameters']) || count($expression['parameters']) !== 1) {
+        if (!isset($expression['parameters']) || \count($expression['parameters']) !== 1) {
             return null;
         }
 
diff --git a/Library/Optimizers/MathOptimizer.php b/Library/Optimizers/MathOptimizer.php
index 36e7ba3da8..36e1fb3ba6 100644
--- a/Library/Optimizers/MathOptimizer.php
+++ b/Library/Optimizers/MathOptimizer.php
@@ -32,9 +32,9 @@ abstract public function getFunctionName();
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @throws CompilerException
-     *
      * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/Library/Parser/Manager.php b/Library/Parser/Manager.php
index 70cf7160cf..8eb8f3371c 100644
--- a/Library/Parser/Manager.php
+++ b/Library/Parser/Manager.php
@@ -32,8 +32,8 @@ public function getParser(): Parser
      */
     public function isAvailable(): bool
     {
-        return $this->parser->isAvailable() &&
-            version_compare(self::MINIMUM_PARSER_VERSION, $this->parser->getVersion(), '<=');
+        return $this->parser->isAvailable()
+            && version_compare(self::MINIMUM_PARSER_VERSION, $this->parser->getVersion(), '<=');
     }
 
     public function requirements(): string
diff --git a/Library/Parser/Parser.php b/Library/Parser/Parser.php
index be20898ba4..9973cbebc9 100644
--- a/Library/Parser/Parser.php
+++ b/Library/Parser/Parser.php
@@ -17,8 +17,6 @@
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Exception\ParseException;
 
-use function function_exists;
-
 class Parser
 {
     /**
@@ -28,7 +26,7 @@ class Parser
      */
     public function isAvailable(): bool
     {
-        return function_exists('zephir_parse_file');
+        return \function_exists('zephir_parse_file');
     }
 
     /**
diff --git a/Library/Passes/LocalContextPass.php b/Library/Passes/LocalContextPass.php
index f160bbde3e..1dd6d0d16b 100644
--- a/Library/Passes/LocalContextPass.php
+++ b/Library/Passes/LocalContextPass.php
@@ -15,10 +15,6 @@
 
 use Zephir\StatementsBlock;
 
-use function constant;
-use function defined;
-use function gettype;
-
 /**
  * This pass tries to check whether variables only do exist in the local context of the method block
  * or if they're used externally which will un allow variables to be placed in the stack
@@ -88,7 +84,7 @@ public function markVariableNoLocal(string $variable): void
      * Marks the latest use/read of a variable.
      *
      * @param string $variable
-     * @param array $node
+     * @param array  $node
      */
     public function markLastUse(string $variable, array $node): void
     {
@@ -203,8 +199,8 @@ public function passLetStatement(array $statement): void
                             break;
 
                         case 'constant':
-                            if (defined($assignment['expr']['value'])) {
-                                if ('string' === gettype(constant($assignment['expr']['value']))) {
+                            if (\defined($assignment['expr']['value'])) {
+                                if ('string' === \gettype(\constant($assignment['expr']['value']))) {
                                     $this->markVariableNoLocal($assignment['variable']);
                                 }
                             }
@@ -225,7 +221,7 @@ public function passLetStatement(array $statement): void
                             break;
 
                         default:
-                            //echo '[', $assignment['expr']['type'], ']', PHP_EOL;
+                            // echo '[', $assignment['expr']['type'], ']', PHP_EOL;
                     }
                     break;
 
@@ -246,12 +242,12 @@ public function passLetStatement(array $statement): void
                             $this->markVariableNoLocal($assignment['expr']['value']);
                             break;
                         default:
-                            //echo '[', $assignment['assign-type'], ']';
+                            // echo '[', $assignment['assign-type'], ']';
                     }
                     break;
 
                 default:
-                    //echo $assignment['assign-type'];
+                    // echo $assignment['assign-type'];
             }
         }
     }
diff --git a/Library/Passes/SkipVariantInit.php b/Library/Passes/SkipVariantInit.php
index 2843a5a5c0..3587011a6c 100644
--- a/Library/Passes/SkipVariantInit.php
+++ b/Library/Passes/SkipVariantInit.php
@@ -13,8 +13,6 @@
 
 use Zephir\StatementsBlock;
 
-use function count;
-
 /**
  * In 'if'/'else' statements sometimes dynamical variables are initialized in every branch
  * Same case in 'switch' statements
@@ -28,7 +26,7 @@ class SkipVariantInit
     /**
      * Do the compilation pass.
      *
-     * @param int $branchNumber
+     * @param int             $branchNumber
      * @param StatementsBlock $block
      */
     public function pass(int $branchNumber, StatementsBlock $block): void
@@ -40,7 +38,7 @@ public function pass(int $branchNumber, StatementsBlock $block): void
     /**
      * Check assignment types for possible skip.
      *
-     * @param int $branchNumber
+     * @param int   $branchNumber
      * @param array $statement
      */
     public function passLetStatement(int $branchNumber, array $statement): void
@@ -99,7 +97,7 @@ public function getVariables(): array
         }
 
         $variables = [];
-        $numberBranches = count($this->branches);
+        $numberBranches = \count($this->branches);
         foreach ($variableStats as $variable => $number) {
             if ($number == $numberBranches) {
                 $variables[] = $variable;
@@ -110,7 +108,7 @@ public function getVariables(): array
     }
 
     /**
-     * @param int $branchNumber
+     * @param int   $branchNumber
      * @param array $variablesToSkip
      */
     public function setVariablesToSkip(int $branchNumber, array $variablesToSkip): void
diff --git a/Library/Passes/StaticTypeInference.php b/Library/Passes/StaticTypeInference.php
index 0b58a7ba90..9ae1278f8e 100644
--- a/Library/Passes/StaticTypeInference.php
+++ b/Library/Passes/StaticTypeInference.php
@@ -198,7 +198,7 @@ public function getInferedType($variable)
         if (isset($this->variables[$variable])) {
             $type = $this->variables[$variable];
             if ('variable' != $type && 'undefined' != $type && 'string' != $type && 'istring' != $type && 'array' != $type && 'null' != $type && 'numeric' != $type) {
-                //echo $variable, ' ', $type, PHP_EOL;
+                // echo $variable, ' ', $type, PHP_EOL;
                 return $type;
             }
         }
@@ -457,8 +457,8 @@ public function passExpression(array $expression)
 
             case 'ternary':
             case 'short-ternary':
-                //$right = $this->passExpression($expression['right']);
-                //$extra = $this->passExpression($expression['extra']);
+                // $right = $this->passExpression($expression['right']);
+                // $extra = $this->passExpression($expression['extra']);
                 /*if ($right == $extra) {
                     if ($right != 'string' && $right != 'array') {
                         return $right;
@@ -576,7 +576,7 @@ public function passStatementBlock(array $statements)
                 case 'unset':
                 case 'cblock':
                 case 'comment':
-                // empty statement != empty operator
+                    // empty statement != empty operator
                 case 'empty':
                     break;
 
diff --git a/Library/Statements/DoWhileStatement.php b/Library/Statements/DoWhileStatement.php
index bf33f534d4..0a8afbc17e 100644
--- a/Library/Statements/DoWhileStatement.php
+++ b/Library/Statements/DoWhileStatement.php
@@ -11,7 +11,6 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Optimizers\EvalExpression;
@@ -24,7 +23,8 @@ class DoWhileStatement extends StatementAbstract
 {
     /**
      * @param CompilationContext $compilationContext
-     * @throws ReflectionException
+     *
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
diff --git a/Library/Statements/EchoStatement.php b/Library/Statements/EchoStatement.php
index 87f442fb8c..d640aaf9e9 100644
--- a/Library/Statements/EchoStatement.php
+++ b/Library/Statements/EchoStatement.php
@@ -11,7 +11,6 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
@@ -27,7 +26,7 @@ class EchoStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
diff --git a/Library/Statements/ForStatement.php b/Library/Statements/ForStatement.php
index 5edf1e3a0d..63a0561da6 100644
--- a/Library/Statements/ForStatement.php
+++ b/Library/Statements/ForStatement.php
@@ -11,7 +11,6 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Detectors\ForValueUseDetector;
 use Zephir\Exception;
@@ -22,6 +21,7 @@
 use Zephir\Optimizers\EvalExpression;
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
+
 use function Zephir\add_slashes;
 
 class ForStatement extends StatementAbstract
@@ -29,11 +29,12 @@ class ForStatement extends StatementAbstract
     /**
      * Compiles a for statement that use a 'range' as expression.
      *
-     * @param array $exprRaw
+     * @param array              $exprRaw
      * @param CompilationContext $compilationContext
      *
      * @return bool
-     * @throws ReflectionException
+     *
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compileRange(array $exprRaw, CompilationContext $compilationContext): bool
@@ -394,12 +395,13 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
     /**
      * Compiles a 'for' statement that use an 'iterator' as expression.
      *
-     * @param array $exprRaw
+     * @param array              $exprRaw
      * @param CompilationContext $compilationContext
      *
      * @return void
+     *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compileIterator(array $exprRaw, CompilationContext $compilationContext): void
     {
@@ -520,11 +522,12 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
      * - Every key must be an integer or compatible
      * - Every value must be a char/integer or compatible.
      *
-     * @param array $expression
+     * @param array              $expression
      * @param CompilationContext $compilationContext
-     * @param Variable $exprVariable
+     * @param Variable           $exprVariable
+     *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compileStringTraverse($expression, CompilationContext $compilationContext, $exprVariable)
     {
@@ -745,7 +748,7 @@ public function compileHashTraverse(CompilationContext $compilationContext, Vari
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
diff --git a/Library/Statements/IfStatement.php b/Library/Statements/IfStatement.php
index df1756947e..6c8c29c55a 100644
--- a/Library/Statements/IfStatement.php
+++ b/Library/Statements/IfStatement.php
@@ -11,7 +11,6 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\Branch;
 use Zephir\CompilationContext;
 use Zephir\Detectors\ReadDetector;
@@ -27,7 +26,8 @@ class IfStatement extends StatementAbstract
 {
     /**
      * @param CompilationContext $compilationContext
-     * @throws ReflectionException
+     *
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
diff --git a/Library/Statements/Let/ArrayIndex.php b/Library/Statements/Let/ArrayIndex.php
index 9880cbcef0..25a7fa1d15 100644
--- a/Library/Statements/Let/ArrayIndex.php
+++ b/Library/Statements/Let/ArrayIndex.php
@@ -96,9 +96,9 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
      *
-     * @throws CompilerException
-     *
      * @return GlobalConstant|ZephirVariable
+     *
+     * @throws CompilerException
      */
     protected function _getResolvedArrayItem(CompiledExpression $resolvedExpr, CompilationContext $compilationContext)
     {
diff --git a/Library/Statements/Let/ObjectDynamicProperty.php b/Library/Statements/Let/ObjectDynamicProperty.php
index 9c7ade5d1e..bdb85e1beb 100644
--- a/Library/Statements/Let/ObjectDynamicProperty.php
+++ b/Library/Statements/Let/ObjectDynamicProperty.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Statements\Let;
 
-use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -34,7 +33,7 @@ class ObjectDynamicProperty
      * @param array              $statement
      *
      * @throws CompilerException
-     * @throws Exception
+     * @throws \Exception
      */
     public function assign(string $variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
     {
@@ -104,7 +103,7 @@ public function assign(string $variable, ZephirVariable $symbolVariable, Compile
                 } elseif ('0' == $resolvedExpr->getBooleanCode()) {
                     $value = 'false';
                 } else {
-                    throw new Exception('?');
+                    throw new \Exception('?');
                 }
 
                 $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $value, $compilationContext);
diff --git a/Library/Statements/Let/ObjectProperty.php b/Library/Statements/Let/ObjectProperty.php
index c277bb8c0a..09d9a63227 100644
--- a/Library/Statements/Let/ObjectProperty.php
+++ b/Library/Statements/Let/ObjectProperty.php
@@ -239,7 +239,7 @@ public function assign(
                 $codePrinter->output('}');
                 break;
 
-            /* unreachable code */
+                /* unreachable code */
             case 'empty-array':
                 $tempVariable = $context->symbolTable->getTempNonTrackedVariable('variable', $context);
 
diff --git a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php b/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
index a27b54ae01..63edeadddb 100644
--- a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -48,10 +48,10 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
     /**
      * Compiles x->y[a][b][] = {expr} (multiple offset assignment).
      *
-     * @param ZephirVariable $symbolVariable
+     * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
-     * @param array $statement
+     * @param array              $statement
      *
      * @throws \ReflectionException
      * @throws Exception
diff --git a/Library/Statements/Let/StaticProperty.php b/Library/Statements/Let/StaticProperty.php
index 01258407c7..2f011da5a9 100644
--- a/Library/Statements/Let/StaticProperty.php
+++ b/Library/Statements/Let/StaticProperty.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Statements\Let;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -28,13 +27,13 @@ class StaticProperty
     /**
      * Compiles ClassName::foo = {expr}.
      *
-     * @param string $className
-     * @param string $property
+     * @param string             $className
+     * @param string             $property
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
-     * @param array $statement
+     * @param array              $statement
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function assignStatic(
         string $className,
diff --git a/Library/Statements/Let/Variable.php b/Library/Statements/Let/Variable.php
index 594e806009..0387e5fa06 100644
--- a/Library/Statements/Let/Variable.php
+++ b/Library/Statements/Let/Variable.php
@@ -18,6 +18,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalOperationException;
 use Zephir\Variable\Variable as ZephirVariable;
+
 use function Zephir\add_slashes;
 
 /**
@@ -115,10 +116,10 @@ public function assign(
      * @throws \Zephir\Exception\IllegalOperationException
      */
     private function doNumericAssignment(
-        Printer            $codePrinter,
+        Printer $codePrinter,
         CompiledExpression $resolvedExpr,
-        string             $variable,
-        array              $statement,
+        string $variable,
+        array $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -347,10 +348,10 @@ private function doNumericAssignment(
      * @throws IllegalOperationException
      */
     private function doDoubleAssignment(
-        Printer            $codePrinter,
+        Printer $codePrinter,
         CompiledExpression $resolvedExpr,
-        string             $variable,
-        array              $statement,
+        string $variable,
+        array $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -528,11 +529,11 @@ private function doDoubleAssignment(
      * @throws \Zephir\Exception\IllegalOperationException
      */
     private function doStringAssignment(
-        Printer            $codePrinter,
+        Printer $codePrinter,
         CompiledExpression $resolvedExpr,
-        ZephirVariable     $symbolVariable,
-        string             $variable,
-        array              $statement,
+        ZephirVariable $symbolVariable,
+        string $variable,
+        array $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -705,7 +706,7 @@ private function doStringAssignment(
     /**
      * Performs array assignment.
      *
-     * @param Printer        $codePrinter
+     * @param Printer            $codePrinter
      * @param CompiledExpression $resolvedExpr
      * @param ZephirVariable     $symbolVariable
      * @param string             $variable
@@ -716,11 +717,11 @@ private function doStringAssignment(
      * @throws IllegalOperationException
      */
     private function doArrayAssignment(
-        Printer            $codePrinter,
+        Printer $codePrinter,
         CompiledExpression $resolvedExpr,
-        ZephirVariable     $symbolVariable,
-        string             $variable,
-        array              $statement,
+        ZephirVariable $symbolVariable,
+        string $variable,
+        array $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -754,7 +755,7 @@ private function doArrayAssignment(
     /**
      * Performs boolean assignment.
      *
-     * @param Printer        $codePrinter
+     * @param Printer            $codePrinter
      * @param CompiledExpression $resolvedExpr
      * @param string             $variable
      * @param array              $statement
@@ -764,10 +765,10 @@ private function doArrayAssignment(
      * @throws IllegalOperationException
      */
     private function doBoolAssignment(
-        Printer            $codePrinter,
+        Printer $codePrinter,
         CompiledExpression $resolvedExpr,
-        string             $variable,
-        array              $statement,
+        string $variable,
+        array $statement,
         CompilationContext $compilationContext
     ) {
         switch ($resolvedExpr->getType()) {
@@ -889,7 +890,7 @@ private function doBoolAssignment(
     /**
      * Performs variable assignment.
      *
-     * @param Printer        $codePrinter
+     * @param Printer            $codePrinter
      * @param CompiledExpression $resolvedExpr
      * @param ZephirVariable     $symbolVariable
      * @param string             $variable
@@ -901,13 +902,13 @@ private function doBoolAssignment(
      * @throws IllegalOperationException
      */
     private function doVariableAssignment(
-        Printer            $codePrinter,
+        Printer $codePrinter,
         CompiledExpression $resolvedExpr,
-        ZephirVariable     $symbolVariable,
-        string             $variable,
-        array              $statement,
+        ZephirVariable $symbolVariable,
+        string $variable,
+        array $statement,
         CompilationContext $compilationContext,
-        ReadDetector       $readDetector
+        ReadDetector $readDetector
     ) {
         switch ($resolvedExpr->getType()) {
             case 'null':
diff --git a/Library/Statements/Let/VariableAppend.php b/Library/Statements/Let/VariableAppend.php
index caccc18bfa..7b850d9dfd 100644
--- a/Library/Statements/Let/VariableAppend.php
+++ b/Library/Statements/Let/VariableAppend.php
@@ -26,11 +26,11 @@ class VariableAppend
     /**
      * Compiles foo[] = {expr}.
      *
-     * @param $variable
+     * @param                    $variable
      * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
-     * @param $statement
+     * @param                    $statement
      *
      * @throws CompilerException
      */
diff --git a/Library/Statements/ReturnStatement.php b/Library/Statements/ReturnStatement.php
index 551236cf33..4104c0476a 100644
--- a/Library/Statements/ReturnStatement.php
+++ b/Library/Statements/ReturnStatement.php
@@ -11,13 +11,13 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\InvalidTypeException;
 use Zephir\Expression;
 use Zephir\Types\Types;
+
 use function Zephir\add_slashes;
 
 /**
@@ -29,7 +29,7 @@ final class ReturnStatement extends StatementAbstract
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
diff --git a/Library/Statements/SwitchStatement.php b/Library/Statements/SwitchStatement.php
index bff0c62b27..5db2f726df 100644
--- a/Library/Statements/SwitchStatement.php
+++ b/Library/Statements/SwitchStatement.php
@@ -17,7 +17,6 @@
 use Zephir\Expression;
 use Zephir\Optimizers\EvalExpression;
 use Zephir\StatementsBlock;
-use function count;
 
 /**
  * Switch statement, the same as in PHP/C
@@ -26,6 +25,7 @@ class SwitchStatement extends StatementAbstract
 {
     /**
      * @param CompilationContext $compilationContext
+     *
      * @throws \ReflectionException
      * @throws Exception
      */
@@ -122,7 +122,7 @@ public function compile(CompilationContext $compilationContext): void
             foreach ($blocks as $block) {
                 $expressions = $block['expr'];
 
-                if (1 == count($expressions)) {
+                if (1 == \count($expressions)) {
                     $condition = $evalExpr->optimize($expressions[0], $compilationContext);
                     $codePrinter->output('if ('.$condition.') {');
                 } else {
@@ -167,7 +167,7 @@ public function normalizeClauses($clauses)
             }
         }
 
-        if ($defaultIndex === count($clauses) - 1) {
+        if ($defaultIndex === \count($clauses) - 1) {
             return $clauses;
         }
 
diff --git a/Library/Statements/ThrowStatement.php b/Library/Statements/ThrowStatement.php
index f7394034e1..701cc7b69b 100644
--- a/Library/Statements/ThrowStatement.php
+++ b/Library/Statements/ThrowStatement.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\Class\Entry;
 use Zephir\Code\Printer;
 use Zephir\CompilationContext;
@@ -21,7 +20,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-use function in_array;
+
 use function Zephir\add_slashes;
 use function Zephir\fqcn;
 
@@ -34,7 +33,7 @@ class ThrowStatement extends StatementAbstract
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -48,10 +47,10 @@ public function compile(CompilationContext $compilationContext): void
          * This optimizes throw new Exception("hello")
          */
         if (!$compilationContext->insideTryCatch) {
-            if (isset($expr['class']) &&
-                isset($expr['parameters']) &&
-                1 == \count($expr['parameters']) &&
-                'string' == $expr['parameters'][0]['parameter']['type']
+            if (isset($expr['class'])
+                && isset($expr['parameters'])
+                && 1 == \count($expr['parameters'])
+                && 'string' == $expr['parameters'][0]['parameter']['type']
             ) {
                 $className = fqcn(
                     $expr['class'],
@@ -80,7 +79,7 @@ public function compile(CompilationContext $compilationContext): void
                     }
                 }
             } else {
-                if (in_array($expr['type'], ['string', 'char', 'int', 'double'])) {
+                if (\in_array($expr['type'], ['string', 'char', 'int', 'double'])) {
                     $class = (new Entry('Exception', $compilationContext))->get();
 
                     $this->throwStringException($codePrinter, $class, $expr['value'], $expr);
@@ -97,7 +96,7 @@ public function compile(CompilationContext $compilationContext): void
             throw new CompilerException($e->getMessage(), $expr, $e->getCode(), $e);
         }
 
-        if (!in_array($resolvedExpr->getType(), ['variable', 'string'])) {
+        if (!\in_array($resolvedExpr->getType(), ['variable', 'string'])) {
             throw new CompilerException(
                 "Expression '".$resolvedExpr->getType().'" cannot be used as exception',
                 $expr
@@ -110,7 +109,7 @@ public function compile(CompilationContext $compilationContext): void
             $expr
         );
 
-        if (!in_array($variableVariable->getType(), ['variable', 'string'])) {
+        if (!\in_array($variableVariable->getType(), ['variable', 'string'])) {
             throw new CompilerException(
                 "Variable '".$variableVariable->getType()."' cannot be used as exception",
                 $expr
@@ -142,9 +141,9 @@ public function compile(CompilationContext $compilationContext): void
      * Throws an exception escaping the data.
      *
      * @param Printer $printer
-     * @param string      $class
-     * @param string      $message
-     * @param array       $expression
+     * @param string  $class
+     * @param string  $message
+     * @param array   $expression
      */
     private function throwStringException(Printer $printer, string $class, string $message, array $expression): void
     {
diff --git a/Library/Statements/UnsetStatement.php b/Library/Statements/UnsetStatement.php
index e8eda65fcd..b6da495c60 100644
--- a/Library/Statements/UnsetStatement.php
+++ b/Library/Statements/UnsetStatement.php
@@ -13,14 +13,11 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
-use function in_array;
-
 /**
  * unset() statement
  */
@@ -30,7 +27,7 @@ class UnsetStatement extends StatementAbstract
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -79,7 +76,7 @@ public function compile(CompilationContext $compilationContext): void
                 throw new CompilerException('Cannot use expression type: '.$expression['type'].' in "unset"', $expression);
         }
 
-        if (!in_array($variable->getType(), ['variable', 'array'])) {
+        if (!\in_array($variable->getType(), ['variable', 'array'])) {
             throw new CompilerException('Cannot use variable type: '.$variable->gettype().' in "unset"', $expression['left']);
         }
 
@@ -100,7 +97,7 @@ public function compile(CompilationContext $compilationContext): void
      * @return CompilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     private function generateUnsetPropertyFromObject(array $expression, CompilationContext $compilationContext): CompilationContext
     {
diff --git a/Library/StatementsBlock.php b/Library/StatementsBlock.php
index c29c9e112a..8cfafe5f97 100644
--- a/Library/StatementsBlock.php
+++ b/Library/StatementsBlock.php
@@ -11,7 +11,6 @@
 
 namespace Zephir;
 
-use ReflectionException;
 use Zephir\Passes\MutateGathererPass;
 use Zephir\Statements\BreakStatement;
 use Zephir\Statements\ContinueStatement;
@@ -30,7 +29,6 @@
 use Zephir\Statements\TryCatchStatement;
 use Zephir\Statements\UnsetStatement;
 use Zephir\Statements\WhileStatement;
-use function count;
 
 /**
  * This represents a single basic block in Zephir.
@@ -87,9 +85,9 @@ public function isLoop(bool $loop): static
      * @return Branch
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
-    public function compile(CompilationContext $compilationContext, ?bool $unreachable = null, int $branchType = Branch::TYPE_UNKNOWN): Branch
+    public function compile(CompilationContext $compilationContext, bool $unreachable = null, int $branchType = Branch::TYPE_UNKNOWN): Branch
     {
         $compilationContext->codePrinter->increaseLevel();
         ++$compilationContext->currentBranch;
@@ -410,7 +408,7 @@ public function getLastStatement()
      */
     public function isEmpty(): bool
     {
-        return 0 === count($this->statements);
+        return 0 === \count($this->statements);
     }
 
     /**
diff --git a/Library/StaticCall.php b/Library/StaticCall.php
index c1161bbebc..1d9a44da86 100644
--- a/Library/StaticCall.php
+++ b/Library/StaticCall.php
@@ -11,15 +11,11 @@
 
 namespace Zephir;
 
-use ReflectionException;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
-use function count;
-use function in_array;
-use function is_string;
 
 /**
  * Call methods in a static context
@@ -29,13 +25,13 @@ class StaticCall extends Call
     /**
      * Compiles a static method call.
      *
-     * @param Expression $expr
+     * @param Expression         $expr
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(Expression $expr, CompilationContext $compilationContext): CompiledExpression
     {
@@ -91,8 +87,8 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             $className = $expression['class'];
             $classDefinition = false;
 
-            if (!in_array($className, ['self', 'static', 'parent'])) {
-                if (is_string($className)) {
+            if (!\in_array($className, ['self', 'static', 'parent'])) {
+                if (\is_string($className)) {
                     $className = $compilationContext->getFullName($className);
                     if ($compiler->isClass($className)) {
                         $classDefinition = $compiler->getClassDefinition($className);
@@ -147,7 +143,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     throw new CompilerException("Cannot call private method '".$methodName."' out of its scope", $expression);
                 }
 
-                if (!in_array($className, ['self', 'static', 'parent']) && !$method->isStatic()) {
+                if (!\in_array($className, ['self', 'static', 'parent']) && !$method->isStatic()) {
                     throw new CompilerException("Cannot call non-static method '".$methodName."' in a static way", $expression);
                 }
 
@@ -156,7 +152,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         /**
                          * Try to produce an exception if method is called with a wrong number of parameters
                          */
-                        $callNumberParameters = isset($expression['parameters']) ? count($expression['parameters']) : 0;
+                        $callNumberParameters = isset($expression['parameters']) ? \count($expression['parameters']) : 0;
 
                         $classMethod = $classDefinition->getMethod($methodName);
                         $expectedNumberParameters = $classMethod->getNumberOfRequiredParameters();
@@ -191,7 +187,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             if ($dynamicClass) {
                 $this->callFromDynamicClass($methodName, $expression, $symbolVariable, $mustInit, $isExpecting, $compilationContext);
             } else {
-                if (in_array($className, ['self', 'static']) || $classDefinition == $compilationContext->classDefinition) {
+                if (\in_array($className, ['self', 'static']) || $classDefinition == $compilationContext->classDefinition) {
                     $this->call(strtoupper($className), $methodName, $expression, $mustInit, $isExpecting, $compilationContext, $symbolVariable, $method ?? null);
                 } else {
                     if ('parent' == $className) {
@@ -243,14 +239,15 @@ public function compile(Expression $expr, CompilationContext $compilationContext
     /**
      * Calls static methods on the 'self/static' context.
      *
-     * @param string $context SELF / STATIC
-     * @param string $methodName
-     * @param array $expression
-     * @param bool $mustInit
-     * @param bool $isExpecting
+     * @param string             $context            SELF / STATIC
+     * @param string             $methodName
+     * @param array              $expression
+     * @param bool               $mustInit
+     * @param bool               $isExpecting
      * @param CompilationContext $compilationContext
-     * @param Variable|null $symbolVariable
-     * @param Method|null $method
+     * @param Variable|null      $symbolVariable
+     * @param Method|null        $method
+     *
      * @throws Exception
      */
     protected function call(
@@ -260,10 +257,10 @@ protected function call(
         bool $mustInit,
         bool $isExpecting,
         CompilationContext $compilationContext,
-        ?Variable $symbolVariable = null,
-        ?Method $method = null
+        Variable $symbolVariable = null,
+        Method $method = null
     ): void {
-        if (!in_array($context, ['SELF', 'STATIC'])) {
+        if (!\in_array($context, ['SELF', 'STATIC'])) {
             $context = 'SELF';
         }
 
@@ -293,7 +290,7 @@ protected function call(
         $cachePointer = $methodCache->get($compilationContext, $method ?? null);
 
         $params = [];
-        if (isset($expression['parameters']) && count($expression['parameters'])) {
+        if (isset($expression['parameters']) && \count($expression['parameters'])) {
             $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
         }
 
@@ -301,7 +298,7 @@ protected function call(
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
-        $paramCount = count($params);
+        $paramCount = \count($params);
         $paramsStr = $paramCount ? ', '.implode(', ', $params) : '';
 
         $isInternal = isset($method) && $method->isInternal();
@@ -344,14 +341,15 @@ protected function call(
     /**
      * Calls static methods on the 'parent' context.
      *
-     * @param string $methodName
-     * @param array $expression
-     * @param Variable $symbolVariable
-     * @param bool $mustInit
-     * @param bool $isExpecting
-     * @param Definition $classDefinition
+     * @param string             $methodName
+     * @param array              $expression
+     * @param Variable           $symbolVariable
+     * @param bool               $mustInit
+     * @param bool               $isExpecting
+     * @param Definition         $classDefinition
      * @param CompilationContext $compilationContext
-     * @param Method $method
+     * @param Method             $method
+     *
      * @throws Exception
      */
     protected function callParent(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method)
@@ -376,11 +374,11 @@ protected function callParent(string $methodName, array $expression, $symbolVari
         $cachePointer = $methodCache->get($compilationContext, isset($method) ? $method : null);
 
         $params = [];
-        if (isset($expression['parameters']) && count($expression['parameters'])) {
+        if (isset($expression['parameters']) && \count($expression['parameters'])) {
             $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
         }
 
-        if (!count($params)) {
+        if (!\count($params)) {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
                     $codePrinter->output('ZEPHIR_RETURN_CALL_PARENT('.$classCe.', getThis(), "'.$methodName.'", '.$cachePointer.');');
@@ -415,14 +413,15 @@ protected function callParent(string $methodName, array $expression, $symbolVari
     /**
      * Calls static methods on some class context.
      *
-     * @param string $methodName
-     * @param array $expression
-     * @param Variable $symbolVariable
-     * @param bool $mustInit
-     * @param bool $isExpecting
-     * @param Definition $classDefinition
+     * @param string             $methodName
+     * @param array              $expression
+     * @param Variable           $symbolVariable
+     * @param bool               $mustInit
+     * @param bool               $isExpecting
+     * @param Definition         $classDefinition
      * @param CompilationContext $compilationContext
-     * @param Method $method
+     * @param Method             $method
+     *
      * @throws Exception
      */
     protected function callFromClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method)
@@ -456,7 +455,7 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
         $cachePointer = $methodCache->get($compilationContext, $method);
 
         $params = [];
-        if (isset($expression['parameters']) && count($expression['parameters'])) {
+        if (isset($expression['parameters']) && \count($expression['parameters'])) {
             $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
         }
 
@@ -464,7 +463,7 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
-        $paramCount = count($params);
+        $paramCount = \count($params);
         $paramsStr = $paramCount ? ', '.implode(', ', $params) : '';
 
         if ($method->isInternal()) {
@@ -506,7 +505,7 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
     /**
      * Calls static methods on using a dynamic variable as class.
      *
-     * @param string $methodName
+     * @param string             $methodName
      * @param array              $expression
      * @param Variable           $symbolVariable
      * @param bool               $mustInit
@@ -523,7 +522,7 @@ protected function callFromDynamicClass(string $methodName, array $expression, $
 
         $cachePointer = 'NULL, 0';
 
-        if (!count($params)) {
+        if (!\count($params)) {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
                     $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
@@ -558,10 +557,10 @@ protected function callFromDynamicClass(string $methodName, array $expression, $
     /**
      * Calls static methods on using a dynamic variable as class and a dynamic method.
      *
-     * @param array $expression
-     * @param Variable $symbolVariable
-     * @param bool $mustInit
-     * @param bool $isExpecting
+     * @param array              $expression
+     * @param Variable           $symbolVariable
+     * @param bool               $mustInit
+     * @param bool               $isExpecting
      * @param CompilationContext $compilationContext
      */
     protected function callFromDynamicClassDynamicMethod(array $expression, $symbolVariable, bool $mustInit, bool $isExpecting, CompilationContext $compilationContext): void
@@ -582,7 +581,7 @@ protected function callFromDynamicClassDynamicMethod(array $expression, $symbolV
 
         $cachePointer = 'NULL, 0';
 
-        if (!count($params)) {
+        if (!\count($params)) {
             if ($isExpecting) {
                 if ('return_value' === $symbolVariable->getName()) {
                     $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL('.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
diff --git a/Library/Stubs/DocBlock.php b/Library/Stubs/DocBlock.php
index d31b576a47..f0ba7018e1 100644
--- a/Library/Stubs/DocBlock.php
+++ b/Library/Stubs/DocBlock.php
@@ -13,8 +13,6 @@
 
 namespace Zephir\Stubs;
 
-use function count;
-
 /**
  * @author Gusakov Nikita <dev@nkt.me>
  */
@@ -43,7 +41,7 @@ public function __construct(?string $source, string $indent = '    ')
     {
         $this->indent = $indent;
         $lines = explode("\n", trim($source ?: ''));
-        $count = count($lines);
+        $count = \count($lines);
 
         foreach ($lines as $i => $line) {
             $line = preg_replace('#^([\s\t]+)?/?([*]+)([\s\t]+)?$#im', '', rtrim($line));
@@ -56,7 +54,7 @@ public function __construct(?string $source, string $indent = '    ')
             $cleaned = trim($line, "\t*\0 ");
             $cleaned = str_replace('$$', '$', $cleaned);
 
-            if (0 === strpos($cleaned, '@')) {
+            if (str_starts_with($cleaned, '@')) {
                 $this->lines[] = $cleaned;
             } else {
                 $line = preg_replace('#([\s\t]+)?[*]#', '', $line);
@@ -68,7 +66,7 @@ public function __construct(?string $source, string $indent = '    ')
             }
         }
 
-        if (!empty($this->lines) && 0 !== strpos(trim($this->lines[0], "\t*\0 "), '@')) {
+        if (!empty($this->lines) && !str_starts_with(trim($this->lines[0], "\t*\0 "), '@')) {
             $description = array_shift($this->lines);
             $description = explode("\n", $description);
 
diff --git a/Library/Stubs/Generator.php b/Library/Stubs/Generator.php
index f1ec5af964..049cd823a2 100644
--- a/Library/Stubs/Generator.php
+++ b/Library/Stubs/Generator.php
@@ -14,15 +14,13 @@
 namespace Zephir\Stubs;
 
 use Zephir\AliasManager;
-use Zephir\Class\Property;
 use Zephir\Class\Constant;
 use Zephir\Class\Definition\Definition;
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Property;
 use Zephir\CompilerFile;
 use Zephir\Exception;
-use function array_key_exists;
-use function in_array;
 
 class Generator
 {
@@ -37,6 +35,7 @@ class Generator
         'scoped',
         'deprecated',
     ];
+
     /**
      * @param CompilerFile[] $files
      */
@@ -90,12 +89,12 @@ public function generate(string $namespace, string $path, string $indent, string
      * Build class.
      *
      * @param Definition $class
-     * @param string          $indent
-     * @param string          $banner
+     * @param string     $indent
+     * @param string     $banner
      *
      * @return string
-     *@throws Exception\RuntimeException
      *
+     * @throws Exception\RuntimeException
      */
     protected function buildClass(Definition $class, string $indent, string $banner): string
     {
@@ -209,7 +208,7 @@ protected function buildClass(Definition $class, string $indent, string $banner)
      * Build property.
      *
      * @param Property $property
-     * @param string        $indent
+     * @param string   $indent
      *
      * @return string
      */
@@ -239,7 +238,7 @@ protected function buildProperty(Property $property, string $indent): string
 
     /**
      * @param Constant $constant
-     * @param string        $indent
+     * @param string   $indent
      *
      * @return string
      */
@@ -256,8 +255,8 @@ protected function buildConstant(Constant $constant, string $indent): string
 
     /**
      * @param Method $method
-     * @param bool        $isInterface
-     * @param string      $indent
+     * @param bool   $isInterface
+     * @param string $indent
      *
      * @return string
      */
@@ -285,13 +284,13 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
                 } elseif (isset($parameter['data-type']) && 'array' === $parameter['data-type']) {
                     $paramStr .= 'array ';
                 } elseif (isset($parameter['data-type'])) {
-                    if (in_array($parameter['data-type'], ['bool', 'boolean'])) {
+                    if (\in_array($parameter['data-type'], ['bool', 'boolean'])) {
                         $paramStr .= 'bool ';
                     } elseif ('double' == $parameter['data-type']) {
                         $paramStr .= 'float ';
-                    } elseif (in_array($parameter['data-type'], ['int', 'uint', 'long', 'ulong', 'uchar'])) {
+                    } elseif (\in_array($parameter['data-type'], ['int', 'uint', 'long', 'ulong', 'uchar'])) {
                         $paramStr .= 'int ';
-                    } elseif (in_array($parameter['data-type'], ['char', 'string'])) {
+                    } elseif (\in_array($parameter['data-type'], ['char', 'string'])) {
                         $paramStr .= 'string ';
                     }
                 }
@@ -310,7 +309,7 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
         if ($method->hasReturnTypes()) {
             $supported = 0;
 
-            if (array_key_exists('object', $method->getReturnTypes())) {
+            if (\array_key_exists('object', $method->getReturnTypes())) {
                 $return = key($method->getReturnClassTypes());
                 ++$supported;
             }
@@ -335,7 +334,7 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
                 ++$supported;
             }
 
-            if (array_key_exists('array', $method->getReturnTypes())) {
+            if (\array_key_exists('array', $method->getReturnTypes())) {
                 $return = 'array';
                 ++$supported;
             }
@@ -345,7 +344,7 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
             }
 
             // PHP doesn't support multiple return types (yet?)
-            if ($supported > 1 || array_key_exists('variable', $method->getReturnTypes())) {
+            if ($supported > 1 || \array_key_exists('variable', $method->getReturnTypes())) {
                 $return = '';
             }
         } elseif ($method->isVoid()) {
@@ -376,9 +375,9 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
      *
      * @param array $parameter
      *
-     * @throws Exception\NotImplementedException
-     *
      * @return string
+     *
+     * @throws Exception\NotImplementedException
      */
     protected function wrapPHPValue(array $parameter): string
     {
diff --git a/Library/Stubs/MethodDocBlock.php b/Library/Stubs/MethodDocBlock.php
index 3f29b84e9b..31722746cd 100644
--- a/Library/Stubs/MethodDocBlock.php
+++ b/Library/Stubs/MethodDocBlock.php
@@ -64,10 +64,10 @@ class MethodDocBlock extends DocBlock
     private Types $types;
 
     public function __construct(
-        Method       $method,
+        Method $method,
         AliasManager $aliasManager,
-        string       $indent = '    ',
-        ?Types       $types = null
+        string $indent = '    ',
+        Types $types = null
     ) {
         parent::__construct($method->getDocBlock(), $indent);
 
diff --git a/Library/SymbolTable.php b/Library/SymbolTable.php
index 818d6f9b26..553a53a0af 100644
--- a/Library/SymbolTable.php
+++ b/Library/SymbolTable.php
@@ -17,7 +17,6 @@
 use Zephir\Passes\LocalContextPass;
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
-use function count;
 
 /**
  * A symbol table stores all the variables defined in a method, their data types and default values.
@@ -94,7 +93,7 @@ public function setLocalContext(LocalContextPass $localContext): void
     /**
      * Check if a variable is declared in the current symbol table.
      *
-     * @param string $name
+     * @param string                  $name
      * @param CompilationContext|null $compilationContext
      *
      * @return bool
@@ -174,7 +173,7 @@ public function addRawVariable(Variable $variable): Variable
     /**
      * Returns a variable in the symbol table.
      *
-     * @param $name
+     * @param                         $name
      * @param CompilationContext|null $compilationContext
      *
      * @return bool|Variable
@@ -184,7 +183,7 @@ public function getVariable($name, CompilationContext $compilationContext = null
         /* Check if the variable already is referencing a branch */
         $pos = strpos($name, Variable::BRANCH_MAGIC);
         if ($pos > -1) {
-            $branchId = (int) (substr($name, $pos + \strlen(Variable::BRANCH_MAGIC)));
+            $branchId = (int) substr($name, $pos + \strlen(Variable::BRANCH_MAGIC));
             $name = substr($name, 0, $pos);
         } else {
             $compilationContext = $compilationContext ?: $this->compilationContext;
@@ -225,9 +224,9 @@ public function getVariables()
      * @param CompilationContext $compilationContext
      * @param array              $statement
      *
-     * @throws CompilerException
-     *
      * @return Variable
+     *
+     * @throws CompilerException
      */
     public function getVariableForRead($name, CompilationContext $compilationContext = null, array $statement = null)
     {
@@ -298,7 +297,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                     /** @var Branch[] $branches */
                     $branches = array_reverse($initBranches);
 
-                    if (1 == count($branches)) {
+                    if (1 == \count($branches)) {
                         if (Branch::TYPE_CONDITIONAL_TRUE == $branches[0]->getType()) {
                             if (true === $branches[0]->isUnreachable()) {
                                 throw new CompilerException('Initialization of variable "'.$name.'" depends on unreachable branch, consider initialize it at its declaration', $statement);
@@ -348,7 +347,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                          * Variable was initialized in a sub-branch, and it's being used in a parent branch.
                          */
                         $possibleBadAssignment = $currentBranch->getLevel() < $branches[0]->getLevel();
-                        if ($possibleBadAssignment && count($branches) === 1) {
+                        if ($possibleBadAssignment && \count($branches) === 1) {
                             /**
                              * Variable is assigned just once, and it's assigned in a conditional branch
                              */
@@ -402,8 +401,8 @@ public function getVariableForRead($name, CompilationContext $compilationContext
      * @param array              $statement
      *
      * @return bool|\Zephir\Variable\Variable
-     *@throws CompilerException
      *
+     * @throws CompilerException
      */
     public function getVariableForWrite($name, CompilationContext $compilationContext, array $statement = null)
     {
@@ -454,9 +453,9 @@ public function getVariableForWrite($name, CompilationContext $compilationContex
      * Return a variable in the symbol table, it will be used for a mutating operation
      * This method implies mutation of one of the members of the variable but no the variables itself.
      *
-     * @param string $name
+     * @param string             $name
      * @param CompilationContext $compilationContext
-     * @param array|null $statement
+     * @param array|null         $statement
      *
      * @return Variable
      */
@@ -549,7 +548,7 @@ public function getTempVariable(string $type, CompilationContext $compilationCon
     /**
      * Creates a temporary variable to be used in a write operation.
      *
-     * @param string $type
+     * @param string             $type
      * @param CompilationContext $context
      * @param mixed              $init
      *
@@ -587,7 +586,7 @@ public function getTempVariableForWrite(string $type, CompilationContext $contex
      * Creates a temporary variable to be used to point to a heap variable
      * These kind of variables MUST not be tracked by the Zephir memory manager.
      *
-     * @param $type
+     * @param                    $type
      * @param CompilationContext $context
      * @param bool               $initNonReferenced
      *
@@ -839,7 +838,7 @@ public function markTemporalVariablesIdle(CompilationContext $compilationContext
                     $pos = strpos($variable->getName(), Variable::BRANCH_MAGIC);
                     $otherBranchId = 1;
                     if ($pos > -1) {
-                        $otherBranchId = (int) (substr($variable->getName(), $pos + \strlen(Variable::BRANCH_MAGIC)));
+                        $otherBranchId = (int) substr($variable->getName(), $pos + \strlen(Variable::BRANCH_MAGIC));
                     }
                     if ($branchId == $otherBranchId) {
                         $variable->setIdle(true);
@@ -919,9 +918,10 @@ protected function registerTempVariable($type, $location, Variable $variable, Co
     /**
      * Reuse variables marked as idle after leave a branch.
      *
-     * @param string $type
-     * @param string $location
+     * @param string                  $type
+     * @param string                  $location
      * @param CompilationContext|null $compilationContext
+     *
      * @return Variable|null
      */
     protected function reuseTempVariable(string $type, string $location, CompilationContext $compilationContext = null): ?Variable
diff --git a/Library/Types/AbstractType.php b/Library/Types/AbstractType.php
index 7c52906e15..76e6e63b49 100644
--- a/Library/Types/AbstractType.php
+++ b/Library/Types/AbstractType.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Types;
 
-use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -32,16 +31,16 @@ abstract class AbstractType
     /**
      * Intercepts calls to built-in methods.
      *
-     * @param string $methodName
-     * @param object $caller
+     * @param string             $methodName
+     * @param object             $caller
      * @param CompilationContext $compilationContext
-     * @param Call $call
-     * @param array $expression
+     * @param Call               $call
+     * @param array              $expression
      *
      * @return bool|CompiledExpression
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function invokeMethod(
         $methodName,
diff --git a/Library/Types/ArrayType.php b/Library/Types/ArrayType.php
index 7ecbb04593..5d3b00d1b2 100644
--- a/Library/Types/ArrayType.php
+++ b/Library/Types/ArrayType.php
@@ -11,7 +11,6 @@
 
 namespace Zephir\Types;
 
-use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -78,13 +77,14 @@ public function getTypeName(): string
     /**
      * Transforms calls to method "join" to function calls to "join".
      *
-     * @param object $caller
+     * @param object             $caller
      * @param CompilationContext $compilationContext
-     * @param Call $call
-     * @param array $expression
+     * @param Call               $call
+     * @param array              $expression
      *
      * @return bool|CompiledExpression
-     * @throws ReflectionException
+     *
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function join($caller, CompilationContext $compilationContext, Call $call, array $expression)
diff --git a/Library/Types/CharType.php b/Library/Types/CharType.php
index 607a3bceb5..2233f73f6f 100644
--- a/Library/Types/CharType.php
+++ b/Library/Types/CharType.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Types;
 
-use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -31,13 +30,14 @@ public function getTypeName(): string
     /**
      * Transforms calls to method "toHex" to sprintf('%X') call.
      *
-     * @param object $caller
+     * @param object             $caller
      * @param CompilationContext $compilationContext
-     * @param Call $call
-     * @param array $expression
+     * @param Call               $call
+     * @param array              $expression
      *
      * @return bool|mixed|CompiledExpression
-     * @throws ReflectionException
+     *
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function toHex($caller, CompilationContext $compilationContext, Call $call, array $expression)
diff --git a/Library/Types/Types.php b/Library/Types/Types.php
index ecfcdbc7b3..4f7a95eb46 100644
--- a/Library/Types/Types.php
+++ b/Library/Types/Types.php
@@ -14,9 +14,6 @@
 namespace Zephir\Types;
 
 use Zephir\Class\Method\Method;
-use function array_key_exists;
-use function count;
-use function in_array;
 
 final class Types
 {
@@ -55,9 +52,9 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
 
         $isProcessedReturnType = null !== $returnTypes;
         $returnTypes = $returnTypes ?? $method->getReturnTypes();
-        $typesCount = count($returnTypes);
+        $typesCount = \count($returnTypes);
 
-        $isDynamic = in_array('var', array_keys($returnTypes));
+        $isDynamic = \in_array('var', array_keys($returnTypes));
         $isNullable = $this->isNullable($returnTypes);
 
         $isBool = $this->areReturnTypesBoolCompatible($returnTypes);
@@ -275,9 +272,9 @@ private function isNumeric(array $types): bool
      */
     private function isNullable(array $types): bool
     {
-        return (array_key_exists(self::T_NULL, $types)
-            || in_array(self::T_NULL, $types))
-            && 1 !== count($types);
+        return (\array_key_exists(self::T_NULL, $types)
+            || \in_array(self::T_NULL, $types))
+            && 1 !== \count($types);
     }
 
     /**
@@ -305,7 +302,7 @@ private function areReturnTypesCompatible(array $types, array $allowedTypes, boo
         }
 
         foreach ($types as $type => $data) {
-            $areEquals = in_array($type, $allowedTypes);
+            $areEquals = \in_array($type, $allowedTypes);
 
             $result = isset($result)
                 ? ($areEquals && $result)
diff --git a/Library/Variable/Variable.php b/Library/Variable/Variable.php
index fef290049e..8924fe6b71 100644
--- a/Library/Variable/Variable.php
+++ b/Library/Variable/Variable.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Variable;
 
-use ReflectionClass;
 use Zephir\Branch;
 use Zephir\BranchManager;
 use Zephir\Class\Definition\Definition;
@@ -21,8 +20,6 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\TypeAwareInterface;
-use function in_array;
-use function is_string;
 
 /**
  * This represents a variable in a symbol table
@@ -102,7 +99,7 @@ class Variable implements TypeAwareInterface
 
     protected array $classTypes = [];
 
-    protected Definition|ReflectionClass|null $associatedClass = null;
+    protected Definition | \ReflectionClass | null $associatedClass = null;
 
     /**
      * Initialization skips.
@@ -142,7 +139,7 @@ class Variable implements TypeAwareInterface
     public function __construct(protected string $type, protected string $name, protected ?Branch $branch = null)
     {
         $this->globalsManager = new Globals();
-        $this->type = in_array($type, ['callable', 'object', 'resource'], true) ? 'variable' : $type;
+        $this->type = \in_array($type, ['callable', 'object', 'resource'], true) ? 'variable' : $type;
     }
 
     /**
@@ -428,10 +425,10 @@ public function getOriginal(): array
      *
      * @param array|string $classTypes
      */
-    public function setClassTypes(array|string $classTypes): void
+    public function setClassTypes(array | string $classTypes): void
     {
-        if (is_string($classTypes)) {
-            if (!in_array($classTypes, $this->classTypes)) {
+        if (\is_string($classTypes)) {
+            if (!\in_array($classTypes, $this->classTypes)) {
                 $this->classTypes[] = $classTypes;
             }
 
@@ -439,7 +436,7 @@ public function setClassTypes(array|string $classTypes): void
         }
 
         foreach ($classTypes as $classType) {
-            if (!in_array($classType, $this->classTypes)) {
+            if (!\in_array($classType, $this->classTypes)) {
                 $this->classTypes[] = $classType;
             }
         }
@@ -458,9 +455,9 @@ public function getClassTypes(): array
     /**
      * Sets the PHP class related to variable.
      *
-     * @param ReflectionClass|Definition $associatedClass
+     * @param \ReflectionClass|Definition $associatedClass
      */
-    public function setAssociatedClass(ReflectionClass|Definition $associatedClass): void
+    public function setAssociatedClass(\ReflectionClass | Definition $associatedClass): void
     {
         $this->associatedClass = $associatedClass;
     }
@@ -468,7 +465,7 @@ public function setAssociatedClass(ReflectionClass|Definition $associatedClass):
     /**
      * Returns the class related to the variable.
      */
-    public function getAssociatedClass(): Definition|ReflectionClass|null
+    public function getAssociatedClass(): Definition | \ReflectionClass | null
     {
         return $this->associatedClass;
     }
@@ -478,11 +475,11 @@ public function getAssociatedClass(): Definition|ReflectionClass|null
      *
      * @param array|string $types
      */
-    public function setDynamicTypes(array|string $types): void
+    public function setDynamicTypes(array | string $types): void
     {
         unset($this->dynamicTypes['unknown']);
 
-        if (is_string($types)) {
+        if (\is_string($types)) {
             $types = [$types];
         }
 
@@ -510,9 +507,9 @@ public function getDynamicTypes(): array
      *
      * @return bool
      */
-    public function hasAnyDynamicType(array|string $types): bool
+    public function hasAnyDynamicType(array | string $types): bool
     {
-        if (is_string($types)) {
+        if (\is_string($types)) {
             $types = [$types];
         }
 
@@ -712,7 +709,7 @@ public function getDefaultInitValue(): mixed
      */
     public function separate(CompilationContext $compilationContext): void
     {
-        if (!in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
+        if (!\in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
             $compilationContext->codePrinter->output('ZEPHIR_SEPARATE('.$compilationContext->backend->getVariableCode($this).');');
         }
     }
@@ -955,7 +952,7 @@ public function observeOrNullifyVariant(CompilationContext $compilationContext):
             return;
         }
 
-        if (in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
+        if (\in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
             return;
         }
 
diff --git a/Library/functions.php b/Library/functions.php
index dbb29bf847..39755a2443 100644
--- a/Library/functions.php
+++ b/Library/functions.php
@@ -12,10 +12,6 @@
 namespace Zephir;
 
 use Zephir\Exception\InvalidArgumentException;
-use const INFO_GENERAL;
-use const PHP_INT_SIZE;
-use const PHP_OS;
-use const PHP_ZTS;
 
 /**
  * Camelize a string.
@@ -179,7 +175,7 @@ function file_put_contents_ex($content, $path)
  */
 function is_windows()
 {
-    return 0 === stripos(PHP_OS, 'WIN');
+    return 0 === stripos(\PHP_OS, 'WIN');
 }
 
 /**
@@ -189,12 +185,12 @@ function is_windows()
  */
 function is_zts()
 {
-    if (\defined('PHP_ZTS') && PHP_ZTS === 1) {
+    if (\defined('PHP_ZTS') && \PHP_ZTS === 1) {
         return true;
     }
 
     ob_start();
-    phpinfo(INFO_GENERAL);
+    phpinfo(\INFO_GENERAL);
 
     return (bool) preg_match('/Thread\s*Safety\s*enabled/i', strip_tags(ob_get_clean()));
 }
@@ -207,12 +203,12 @@ function is_zts()
 function windows_release_dir()
 {
     if (is_zts()) {
-        if (PHP_INT_SIZE === 4) {
+        if (\PHP_INT_SIZE === 4) {
             // 32-bit version of PHP
             return 'ext\\Release_TS';
         }
 
-        if (PHP_INT_SIZE === 8) {
+        if (\PHP_INT_SIZE === 8) {
             // 64-bit version of PHP
             return 'ext\\x64\\Release_TS';
         }
@@ -221,12 +217,12 @@ function windows_release_dir()
         return 'ext\\Release_TS';
     }
 
-    if (PHP_INT_SIZE === 4) {
+    if (\PHP_INT_SIZE === 4) {
         // 32-bit version of PHP
         return 'ext\\Release';
     }
 
-    if (PHP_INT_SIZE === 8) {
+    if (\PHP_INT_SIZE === 8) {
         // 64-bit version of PHP
         return 'ext\\x64\\Release';
     }
diff --git a/prototypes/apc.php b/prototypes/apc.php
index d488269dcc..b378522b47 100644
--- a/prototypes/apc.php
+++ b/prototypes/apc.php
@@ -120,8 +120,8 @@ function apc_sma_info($limited = false)
 /**
  * @see https://www.php.net/manual/en/function.apc-store.php
  *
- * @param $key
- * @param $var
+ * @param     $key
+ * @param     $var
  * @param int $ttl
  */
 function apc_store($key, $var, $ttl = 0)
@@ -131,7 +131,7 @@ function apc_store($key, $var, $ttl = 0)
 /**
  * @see https://www.php.net/manual/en/function.apc-fetch.php
  *
- * @param $key
+ * @param      $key
  * @param null $success
  *
  * @return mixed
@@ -152,7 +152,7 @@ function apc_delete($key)
 /**
  * @see https://www.php.net/manual/en/function.apc-define-constants.php
  *
- * @param $key
+ * @param       $key
  * @param array $constants
  * @param bool  $case_sensitive
  */
@@ -163,8 +163,8 @@ function apc_define_constants($key, array $constants, $case_sensitive = true)
 /**
  * @see https://www.php.net/manual/en/function.apc-add.php
  *
- * @param $key
- * @param $var
+ * @param     $key
+ * @param     $var
  * @param int $ttl
  */
 function apc_add($key, $var, $ttl = 0)
@@ -174,7 +174,7 @@ function apc_add($key, $var, $ttl = 0)
 /**
  * @see https://www.php.net/manual/en/function.apc-compile-file.php
  *
- * @param $filename
+ * @param      $filename
  * @param bool $atomic
  */
 function apc_compile_file($filename, $atomic = true)
@@ -184,7 +184,7 @@ function apc_compile_file($filename, $atomic = true)
 /**
  * @see https://www.php.net/manual/en/function.apc-load-constants.php
  *
- * @param $key
+ * @param      $key
  * @param bool $case_sensitive
  */
 function apc_load_constants($key, $case_sensitive = true)
@@ -212,7 +212,7 @@ function apc_delete_file($keys)
 /**
  * @see https://www.php.net/manual/en/function.apc-inc.php
  *
- * @param $key
+ * @param      $key
  * @param int  $step
  * @param null $success
  */
@@ -223,7 +223,7 @@ function apc_inc($key, $step = 1, &$success = null)
 /**
  * @see https://www.php.net/manual/en/function.apc-dec.php
  *
- * @param $key
+ * @param      $key
  * @param int  $step
  * @param null $success
  */
@@ -255,9 +255,9 @@ function apc_bin_dump($files = null, $user_vars = null)
 /**
  * @see https://php.net/manual/en/function.apc-bin-dumpfile.php
  *
- * @param $files
- * @param $user_vars
- * @param $filename
+ * @param      $files
+ * @param      $user_vars
+ * @param      $filename
  * @param int  $flags
  * @param null $context
  */
@@ -268,7 +268,7 @@ function apc_bin_dumpfile($files, $user_vars, $filename, $flags = 0, $context =
 /**
  * @see https://php.net/manual/en/function.apc-bin-load.php
  *
- * @param $data
+ * @param     $data
  * @param int $flags
  */
 function apc_bin_load($data, $flags = 0)
@@ -278,7 +278,7 @@ function apc_bin_load($data, $flags = 0)
 /**
  * @see https://php.net/manual/en/function.apc-bin-loadfile.php
  *
- * @param $filename
+ * @param      $filename
  * @param null $context
  * @param int  $flags
  */
diff --git a/prototypes/gd.php b/prototypes/gd.php
index 058bfbdf39..0492995137 100644
--- a/prototypes/gd.php
+++ b/prototypes/gd.php
@@ -60,7 +60,7 @@ function getimagesizefromstring($imagedata, array &$imageinfo)
      *
      * @see https://www.php.net/manual/en/function.image-type-to-extension.php
      *
-     * @param $imagetype
+     * @param      $imagetype
      * @param bool $include_dot
      *
      * @return string
diff --git a/tests/Extension/ArrayAccessTest.php b/tests/Extension/ArrayAccessTest.php
index 97ea15ba81..737bc8d083 100644
--- a/tests/Extension/ArrayAccessTest.php
+++ b/tests/Extension/ArrayAccessTest.php
@@ -21,9 +21,9 @@ final class ArrayAccessTest extends TestCase
         'key_a' => 'marcin',
         'key_b' => 'paula',
         3 => 'long value',
-        //3.14 => 'double value', // Not supported yet
-        //false => 'bool value', // Not supported yet
-        //null => 'null value', // Not supported yet
+        // 3.14 => 'double value', // Not supported yet
+        // false => 'bool value', // Not supported yet
+        // null => 'null value', // Not supported yet
     ];
 
     public function testTest(): void
diff --git a/tests/Extension/ExitDieTest.php b/tests/Extension/ExitDieTest.php
index fb5896289f..91fe030cce 100644
--- a/tests/Extension/ExitDieTest.php
+++ b/tests/Extension/ExitDieTest.php
@@ -15,9 +15,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-use function constant;
-use function defined;
-
 final class ExitDieTest extends TestCase
 {
     private string $phpBinary;
@@ -27,9 +24,9 @@ final class ExitDieTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->phpBinary = constant('PHP_BINARY');
+        $this->phpBinary = \constant('PHP_BINARY');
         /* If we use phpdbg, you need to add options -qrr */
-        if (defined('PHP_SAPI') && 'phpdbg' == constant('PHP_SAPI')) {
+        if (\defined('PHP_SAPI') && 'phpdbg' == \constant('PHP_SAPI')) {
             $this->phpBinary .= ' -qrr';
         }
 
diff --git a/tests/Extension/FunctionExistsTest.php b/tests/Extension/FunctionExistsTest.php
index 48c45b6df1..b5d633265b 100644
--- a/tests/Extension/FunctionExistsTest.php
+++ b/tests/Extension/FunctionExistsTest.php
@@ -27,6 +27,7 @@ protected function setUp(): void
 
     /**
      * @dataProvider providerInternalFunctions
+     *
      * @issue https://github.com/zephir-lang/zephir/issues/1547
      *
      * @param string $func The internal (built-in) function name
diff --git a/tests/Extension/Globals/EnvTest.php b/tests/Extension/Globals/EnvTest.php
index e2f5b2582d..806341e3e2 100644
--- a/tests/Extension/Globals/EnvTest.php
+++ b/tests/Extension/Globals/EnvTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (false === strpos(ini_get('variables_order'), 'E')) {
+        if (!str_contains(ini_get('variables_order'), 'E')) {
             $this->markTestSkipped(
                 "variables_order ini directive does not contain 'E'. ".
                 "Make sure you have set variables_order to 'EGPCS' in php.ini."
diff --git a/tests/Extension/Integral/RegexDNATest.php b/tests/Extension/Integral/RegexDNATest.php
index d95548fb3b..d2f09717a0 100644
--- a/tests/Extension/Integral/RegexDNATest.php
+++ b/tests/Extension/Integral/RegexDNATest.php
@@ -16,7 +16,6 @@
 use PHPUnit\Framework\TestCase;
 use Stub\RegexDNA;
 
-use function dirname;
 use function Zephir\is_windows;
 
 final class RegexDNATest extends TestCase
@@ -30,12 +29,12 @@ public function testProcess(): void
         $test = new RegexDNA();
 
         ob_start();
-        $test->process(dirname(__DIR__).'/../fixtures/regexdna/input.txt');
+        $test->process(\dirname(__DIR__).'/../fixtures/regexdna/input.txt');
         $content = ob_get_clean();
 
         $this->assertSame(
             $content,
-            file_get_contents(dirname(__DIR__).'/../fixtures/regexdna/output.txt')
+            file_get_contents(\dirname(__DIR__).'/../fixtures/regexdna/output.txt')
         );
     }
 }
diff --git a/tests/Extension/Issue1134Test.php b/tests/Extension/Issue1134Test.php
index bad9995745..48e9be1c0f 100644
--- a/tests/Extension/Issue1134Test.php
+++ b/tests/Extension/Issue1134Test.php
@@ -14,8 +14,6 @@
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
-use ReflectionClass;
-use ReflectionException;
 use Stub\Issue1134;
 
 /**
@@ -24,11 +22,11 @@
 final class Issue1134Test extends TestCase
 {
     /**
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function testIssue914ReflectionParamDefaultValueShouldReturnTrue(): void
     {
-        $ref = new ReflectionClass(Issue1134::class);
+        $ref = new \ReflectionClass(Issue1134::class);
         $constructor = $ref->getConstructor();
         $params = $constructor->getParameters();
 
diff --git a/tests/Extension/MCallTest.php b/tests/Extension/MCallTest.php
index f6e48fa431..d209487b01 100644
--- a/tests/Extension/MCallTest.php
+++ b/tests/Extension/MCallTest.php
@@ -14,8 +14,6 @@
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
-use ReflectionClass;
-use ReflectionParameter;
 use Stub\Mcall;
 use Stub\Oo\Param;
 
@@ -132,7 +130,7 @@ public function testObjectParamCastStdClass(): void
         $this->assertNumberOfParameters(1);
         $this->assertNumberOfRequiredParameters(1);
 
-        $this->assertSame(\StdClass::class, $this->getMethodFirstParameter()->getType()->getName());
+        $this->assertSame(\stdClass::class, $this->getMethodFirstParameter()->getType()->getName());
         $this->assertInstanceOf(\stdClass::class, $this->test->testObjectParamCastStdClass(new \stdClass()));
     }
 
@@ -145,7 +143,7 @@ public function testObjectParamCastOoParam(): void
         $this->assertInstanceOf(Param::class, $this->test->testObjectParamCastOoParam(new Param()));
     }
 
-    protected function getMethodFirstParameter(): ReflectionParameter
+    protected function getMethodFirstParameter(): \ReflectionParameter
     {
         $methodInfo = $this->reflection->getMethod($this->getName());
         $parameters = $methodInfo->getParameters();
@@ -154,12 +152,12 @@ protected function getMethodFirstParameter(): ReflectionParameter
     }
 
     /**
-     * @return mixed|ReflectionClass
+     * @return mixed|\ReflectionClass
      */
     private function getReflection()
     {
         if (null === $this->reflection) {
-            return $this->reflection = new ReflectionClass(Mcall::class);
+            return $this->reflection = new \ReflectionClass(Mcall::class);
         }
 
         return $this->reflection;
diff --git a/tests/Extension/NewInstanceOperatorTest.php b/tests/Extension/NewInstanceOperatorTest.php
index 818d44849f..f35793aa3d 100644
--- a/tests/Extension/NewInstanceOperatorTest.php
+++ b/tests/Extension/NewInstanceOperatorTest.php
@@ -38,8 +38,7 @@ protected function tearDown(): void
 
     public function autoload(string $className): void
     {
-        if (version_compare(PHP_VERSION, '8.1.0', '>=') &&
-            version_compare(PHP_VERSION, '8.3.0', '<')) {
+        if (version_compare(PHP_VERSION, '8.1.0', '>=')) {
             try {
                 if (isset($this->autoloadMap[$className])) {
                     include $this->autoloadMap[$className];
diff --git a/tests/Extension/Oo/ExtendClassTest.php b/tests/Extension/Oo/ExtendClassTest.php
index 1586003099..a868477908 100644
--- a/tests/Extension/Oo/ExtendClassTest.php
+++ b/tests/Extension/Oo/ExtendClassTest.php
@@ -13,7 +13,6 @@
 
 namespace Extension\Oo;
 
-use PDO;
 use PHPUnit\Framework\TestCase;
 use Stub\Integration\Psr\Http\Message\MessageInterfaceEx;
 use Stub\Oo\ConcreteStatic;
@@ -27,13 +26,13 @@ public function testPDOExtending(): void
             $this->markTestSkipped('The PDO extension is not loaded');
         }
 
-        $this->assertSame(PDO::getAvailableDrivers(), ExtendPdoClass::getAvailableDrivers());
-        $this->assertSame(PDO::PARAM_STR, ExtendPdoClass::PARAM_STR);
+        $this->assertSame(\PDO::getAvailableDrivers(), ExtendPdoClass::getAvailableDrivers());
+        $this->assertSame(\PDO::PARAM_STR, ExtendPdoClass::PARAM_STR);
     }
 
     public function testPDOStatementExtending(): void
     {
-        $pdo = new ExtendPdoClass('sqlite::memory:', '', '', [PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION]);
+        $pdo = new ExtendPdoClass('sqlite::memory:', '', '', [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION]);
         $stmt = $pdo->prepare('SELECT CURRENT_TIME');
 
         $this->assertInstanceof('Stub\\PdoStatement', $stmt);
diff --git a/tests/Extension/Oo/Scopes/PrivateScopeTest.php b/tests/Extension/Oo/Scopes/PrivateScopeTest.php
index 4c593fb5ad..b240cbb9f5 100644
--- a/tests/Extension/Oo/Scopes/PrivateScopeTest.php
+++ b/tests/Extension/Oo/Scopes/PrivateScopeTest.php
@@ -13,16 +13,9 @@
 
 namespace Extension\Oo\Scopes;
 
-use Error;
 use PHPUnit\Framework\Error\Notice;
 use PHPUnit\Framework\TestCase;
 use Stub\Oo\Scopes\PrivateScopeTester;
-use TestScopeExtending;
-use TestScopeExtendingMagic;
-use TestScopePhp;
-use TestScopePhpMagic;
-use TestScopePhpMagicExtending;
-use UserExample;
 
 final class PrivateScopeTest extends TestCase
 {
@@ -36,13 +29,13 @@ public function testShouldCallPrivateMethod(): void
      */
     public function testShouldNotSetPrivatePropertyObjPhp(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopePhp::$privateProperty'
         );
 
         $tester = new PrivateScopeTester();
-        $tester->setPropertyObj(new TestScopePhp(), 'privateProperty', 'test');
+        $tester->setPropertyObj(new \TestScopePhp(), 'privateProperty', 'test');
     }
 
     /**
@@ -50,13 +43,13 @@ public function testShouldNotSetPrivatePropertyObjPhp(): void
      */
     public function testShouldNotSetPrivatePropertyNewPhp(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopePhp::$privateProperty'
         );
 
         $tester = new PrivateScopeTester();
-        $tester->setPropertyNew(TestScopePhp::class, 'privateProperty', 'test');
+        $tester->setPropertyNew(\TestScopePhp::class, 'privateProperty', 'test');
     }
 
     /**
@@ -64,13 +57,13 @@ public function testShouldNotSetPrivatePropertyNewPhp(): void
      */
     public function testShouldNotSetPrivatePropertyObjInternal(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopeExtending::$privateProperty'
         );
 
         $tester = new PrivateScopeTester();
-        $tester->setPropertyObj(new TestScopeExtending(), 'privateProperty', 'test');
+        $tester->setPropertyObj(new \TestScopeExtending(), 'privateProperty', 'test');
     }
 
     /**
@@ -78,13 +71,13 @@ public function testShouldNotSetPrivatePropertyObjInternal(): void
      */
     public function testShouldNotSetPrivatePropertyNewInternal(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopeExtending::$privateProperty'
         );
 
         $tester = new PrivateScopeTester();
-        $tester->setPropertyNew(TestScopeExtending::class, 'privateProperty', 'test');
+        $tester->setPropertyNew(\TestScopeExtending::class, 'privateProperty', 'test');
     }
 
     /**
@@ -92,7 +85,7 @@ public function testShouldNotSetPrivatePropertyNewInternal(): void
      */
     public function testShouldSetPrivatePropertyObjPhp(): void
     {
-        $object = new TestScopePhpMagic();
+        $object = new \TestScopePhpMagic();
         $tester = new PrivateScopeTester();
 
         $actual = $tester->setPropertyObj($object, 'privateProperty', 'test');
@@ -106,7 +99,7 @@ public function testShouldSetPrivatePropertyObjPhp(): void
     public function testShouldSetPrivatePropertyNewPhp(): void
     {
         $tester = new PrivateScopeTester();
-        $obj = $tester->setPropertyNew(TestScopePhpMagic::class, 'privateProperty', 'test');
+        $obj = $tester->setPropertyNew(\TestScopePhpMagic::class, 'privateProperty', 'test');
 
         $this->assertEquals('test', $obj->privateProperty);
         $this->assertEquals(1, $obj->setCount);
@@ -118,7 +111,7 @@ public function testShouldSetPrivatePropertyNewPhp(): void
     public function testShouldSetPrivatePropertyObjInternal(): void
     {
         $tester = new PrivateScopeTester();
-        $object = new TestScopeExtendingMagic();
+        $object = new \TestScopeExtendingMagic();
 
         $actual = $tester->setPropertyObj($object, 'privateProperty', 'test');
         $this->assertEquals('test', $actual);
@@ -131,7 +124,7 @@ public function testShouldSetPrivatePropertyObjInternal(): void
     public function testShouldSetPrivatePropertyNewInternal(): void
     {
         $tester = new PrivateScopeTester();
-        $obj = $tester->setPropertyNew(TestScopeExtendingMagic::class, 'privateProperty', 'test');
+        $obj = $tester->setPropertyNew(\TestScopeExtendingMagic::class, 'privateProperty', 'test');
 
         $this->assertEquals('test', $obj->privateProperty);
         $this->assertEquals(1, $obj->setCount);
@@ -142,12 +135,12 @@ public function testShouldSetPrivatePropertyNewInternal(): void
      */
     public function testShouldNotSetPrivatePropertyViaThis(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopeExtending::$privateProperty'
         );
 
-        $obj = new TestScopeExtending();
+        $obj = new \TestScopeExtending();
         $obj->setProperty('privateProperty', 'test');
     }
 
@@ -156,7 +149,7 @@ public function testShouldNotSetPrivatePropertyViaThis(): void
      */
     public function testShouldSetPrivatePropertyViaThis(): void
     {
-        $obj = new TestScopeExtending();
+        $obj = new \TestScopeExtending();
         $obj->setProperty('privateProperty2', 'test');
 
         $this->assertEquals('test', $obj->getPrivateProperty2());
@@ -167,12 +160,12 @@ public function testShouldSetPrivatePropertyViaThis(): void
      */
     public function testShouldNotSetPrivatePropertyExtendedMagicObjInternal(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopeExtendingMagic::$privateProperty2'
         );
 
-        $object = new TestScopeExtendingMagic();
+        $object = new \TestScopeExtendingMagic();
         $tester = new PrivateScopeTester();
 
         $this->assertEquals('private', $object->getPrivateProperty2());
@@ -184,14 +177,14 @@ public function testShouldNotSetPrivatePropertyExtendedMagicObjInternal(): void
      */
     public function testShouldNotSetPrivatePropertyExtendedMagicNewInternal(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopeExtendingMagic::$privateProperty2'
         );
 
         $tester = new PrivateScopeTester();
         $tester->setPropertyNew(
-            TestScopeExtendingMagic::class,
+            \TestScopeExtendingMagic::class,
             'privateProperty2',
             'CHANGED'
         );
@@ -208,13 +201,13 @@ public function testShouldNotSetPrivatePropertyExtendedMagicObjPhp(): void
                 'Undefined property: TestScopePhpMagicExtending::$privateProperty2'
             );
         } else {
-            $this->expectException(Error::class);
+            $this->expectException(\Error::class);
             $this->expectExceptionMessage(
                 'Cannot access private property TestScopePhpMagicExtending::$privateProperty2'
             );
         }
 
-        $obj = new TestScopePhpMagicExtending();
+        $obj = new \TestScopePhpMagicExtending();
 
         $tester = new PrivateScopeTester();
         $tester->setPropertyObj($obj, 'privateProperty2', 'test');
@@ -225,14 +218,14 @@ public function testShouldNotSetPrivatePropertyExtendedMagicObjPhp(): void
      */
     public function testShouldNotSetPrivatePropertyExtendedMagicNewPhp(): void
     {
-        $this->expectException(Error::class);
+        $this->expectException(\Error::class);
         $this->expectExceptionMessage(
             'Cannot access private property TestScopePhpMagicExtending::$privateProperty2'
         );
 
         $tester = new PrivateScopeTester();
         $tester->setPropertyNew(
-            TestScopePhpMagicExtending::class,
+            \TestScopePhpMagicExtending::class,
             'privateProperty2',
             'CHANGED'
         );
@@ -244,7 +237,7 @@ public function testShouldNotSetPrivatePropertyExtendedMagicNewPhp(): void
     public function testShouldNotGetObjectVarsPrivatePropertyObjPhp(): void
     {
         $tester = new PrivateScopeTester();
-        $object = new TestScopePhp();
+        $object = new \TestScopePhp();
 
         $objectVars = $tester->getObjVars($object);
         $this->assertArrayNotHasKey('privateProperty', $objectVars);
@@ -256,7 +249,7 @@ public function testShouldNotGetObjectVarsPrivatePropertyObjPhp(): void
     public function testShouldNotGetObjectVarsPrivatePropertyNewPhp(): void
     {
         $tester = new PrivateScopeTester();
-        $objectVars = $tester->getNewVars(TestScopePhp::class);
+        $objectVars = $tester->getNewVars(\TestScopePhp::class);
 
         $this->assertArrayNotHasKey('privateProperty', $objectVars);
     }
@@ -267,7 +260,7 @@ public function testShouldNotGetObjectVarsPrivatePropertyNewPhp(): void
     public function testShouldNotGetObjectVarsPrivatePropertyObjInternal(): void
     {
         $tester = new PrivateScopeTester();
-        $object = new TestScopeExtending();
+        $object = new \TestScopeExtending();
         $objectVars = $tester->getObjVars($object);
 
         $this->assertArrayNotHasKey('privateProperty', $objectVars);
@@ -279,7 +272,7 @@ public function testShouldNotGetObjectVarsPrivatePropertyObjInternal(): void
     public function testShouldNotGetObjectVarsPrivatePropertyNewInternal(): void
     {
         $tester = new PrivateScopeTester();
-        $objectVars = $tester->getNewVars(TestScopeExtending::class);
+        $objectVars = $tester->getNewVars(\TestScopeExtending::class);
 
         $this->assertArrayNotHasKey('privateProperty', $objectVars);
     }
@@ -289,7 +282,7 @@ public function testShouldNotGetObjectVarsPrivatePropertyNewInternal(): void
      */
     public function testShouldGetAndSetPrivatePropertyUsingParentGetterAndSetter(): void
     {
-        $tester = new UserExample();
+        $tester = new \UserExample();
         $tester->setPrivateVariable('test');
 
         $this->assertEquals('test', $tester->getPrivateVariable());
diff --git a/tests/Extension/Optimizers/IsPhpVersionTest.php b/tests/Extension/Optimizers/IsPhpVersionTest.php
index 2cb88d0090..4313ea71b0 100644
--- a/tests/Extension/Optimizers/IsPhpVersionTest.php
+++ b/tests/Extension/Optimizers/IsPhpVersionTest.php
@@ -11,10 +11,8 @@
 
 namespace Extension\Optimizers;
 
-use Exception;
 use PHPUnit\Framework\TestCase;
 use Stub\Issue1404;
-use Throwable;
 
 /**
  * Extension\Optimizers\IsPhpVersionTest.
@@ -61,7 +59,7 @@ public function phpVersionProvider(): array
      * @param mixed $version
      * @param mixed $expected
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function testOptimizer($version, $expected): void
     {
@@ -72,7 +70,7 @@ public function testOptimizer($version, $expected): void
 
     public function testOptimizerExceptionLLU(): void
     {
-        $this->expectException(Exception::class);
+        $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Could not parse PHP version');
 
         $this->isPhpVersion(92233720368547758079);
@@ -80,7 +78,7 @@ public function testOptimizerExceptionLLU(): void
 
     public function testOptimizerExceptionNegativeNumber(): void
     {
-        $this->expectException(Exception::class);
+        $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Could not parse PHP version');
 
         $this->isPhpVersion(-7);
@@ -88,7 +86,7 @@ public function testOptimizerExceptionNegativeNumber(): void
 
     public function testOptimizerExceptionEmpty(): void
     {
-        $this->expectException(Exception::class);
+        $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Could not parse PHP version');
 
         /**
@@ -151,7 +149,7 @@ public function releaseVersionProvider(): array
      * @param mixed $testName
      * @param mixed $version
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function testIsPhpVersionVersionUsing701XX($testName, $version): void
     {
@@ -178,7 +176,7 @@ public function minorVersionProvider(): array
      * @param mixed $testName
      * @param mixed $version
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function testIsPhpVersionVersionUsing70X00($testName, $version): void
     {
@@ -213,11 +211,11 @@ public function testZephirUsingString50600(): void
     }
 
     /**
-     * @param Throwable $error
+     * @param \Throwable $error
      *
-     * @throws Throwable
+     * @throws \Throwable
      */
-    protected function onNotSuccessfulTest(Throwable $error): void
+    protected function onNotSuccessfulTest(\Throwable $error): void
     {
         $phpVer = sprintf(
             'PHP_VERSION_ID:%d(%d.%d.%d)',
@@ -241,13 +239,13 @@ protected function onNotSuccessfulTest(Throwable $error): void
      *
      * @return bool
      *
-     * @throws Exception
+     * @throws \Exception
      */
     private function isPhpVersion($version): bool
     {
         preg_match('/^(?<major>\d+)(?:\.(?<minor>!?\d+))?(?:\.(?<patch>!?\d+))?(?:[^Ee0-9.]+.*)?$/', $version, $matches);
         if (!\count($matches)) {
-            throw new Exception('Could not parse PHP version');
+            throw new \Exception('Could not parse PHP version');
         }
 
         $minorVersion = 0;
diff --git a/tests/Extension/Properties/StaticPublicPropertiesTest.php b/tests/Extension/Properties/StaticPublicPropertiesTest.php
index 352890bae8..95ecc6cb60 100644
--- a/tests/Extension/Properties/StaticPublicPropertiesTest.php
+++ b/tests/Extension/Properties/StaticPublicPropertiesTest.php
@@ -49,9 +49,9 @@ public function testIssues2020(): void
         $this->assertEquals(-1, StaticPublicProperties::$someSub);
 
         // PHP Notice:  A non well formed numeric value encountered
-        //\Stub\Properties\StaticPublicProperties::testAddAndSub2();
-        //$this->assertEquals(2, \Stub\Properties\StaticPublicProperties::$someAdd);
-        //$this->assertEquals(-2, \Stub\Properties\StaticPublicProperties::$someSub);
+        // \Stub\Properties\StaticPublicProperties::testAddAndSub2();
+        // $this->assertEquals(2, \Stub\Properties\StaticPublicProperties::$someAdd);
+        // $this->assertEquals(-2, \Stub\Properties\StaticPublicProperties::$someSub);
 
         StaticPublicProperties::testAddAndSub3();
         $this->assertEquals(2, StaticPublicProperties::$someAdd);
diff --git a/tests/Extension/ReflectionTest.php b/tests/Extension/ReflectionTest.php
index 15da5ed41e..fad207f0fb 100644
--- a/tests/Extension/ReflectionTest.php
+++ b/tests/Extension/ReflectionTest.php
@@ -14,9 +14,6 @@
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
-use ReflectionClass;
-use ReflectionFunction;
-use ReflectionParameter;
 use Stub\Reflection as StubReflection;
 
 final class ReflectionTest extends TestCase
@@ -25,14 +22,14 @@ public function testMethods(): void
     {
         $class = new StubReflection();
 
-        $this->assertInstanceOf(ReflectionClass::class, $class->getReflectionClass());
-        $this->assertInstanceOf(ReflectionFunction::class, $class->getReflectionFunction());
+        $this->assertInstanceOf(\ReflectionClass::class, $class->getReflectionClass());
+        $this->assertInstanceOf(\ReflectionFunction::class, $class->getReflectionFunction());
         $this->assertNull($class->getReflectionParameter());
 
-        $class->setReflectionParameter(new ReflectionParameter(function ($test) {
+        $class->setReflectionParameter(new \ReflectionParameter(function ($test) {
             return 1;
         }, 0));
 
-        $this->assertInstanceOf(ReflectionParameter::class, $class->getReflectionParameter());
+        $this->assertInstanceOf(\ReflectionParameter::class, $class->getReflectionParameter());
     }
 }
diff --git a/tests/Extension/RequiresTest.php b/tests/Extension/RequiresTest.php
index 99bd7ad134..099e0b32a3 100644
--- a/tests/Extension/RequiresTest.php
+++ b/tests/Extension/RequiresTest.php
@@ -16,8 +16,6 @@
 use PHPUnit\Framework\TestCase;
 use Stub\Requires;
 
-use function defined;
-
 final class RequiresTest extends TestCase
 {
     private Requires $test;
@@ -34,9 +32,9 @@ public function testRequireExternal1(): void
             $this->test->requireExternal1(__DIR__.'/../fixtures/require-me-1.php')
         );
 
-        $this->assertFalse(defined('REQUIRE_ME'));
+        $this->assertFalse(\defined('REQUIRE_ME'));
         $this->test->requireExternal1(__DIR__.'/../fixtures/require-me-2.php');
-        $this->assertTrue(defined('REQUIRE_ME'));
+        $this->assertTrue(\defined('REQUIRE_ME'));
     }
 
     /**
@@ -88,10 +86,10 @@ public function testRequireOnce(): void
             $this->test->requireOnce(__DIR__.'/../fixtures/require-me-before-once.php')
         );
 
-        $this->assertFalse(defined('REQUIRE_ONCE_ME'));
+        $this->assertFalse(\defined('REQUIRE_ONCE_ME'));
         $this->test->requireOnce(__DIR__.'/../fixtures/require-me-once.php');
-        $this->assertTrue(defined('REQUIRE_ONCE_ME'));
+        $this->assertTrue(\defined('REQUIRE_ONCE_ME'));
         $this->test->requireOnce(__DIR__.'/../fixtures/require-me-once.php');
-        $this->assertTrue(defined('REQUIRE_ONCE_ME'));
+        $this->assertTrue(\defined('REQUIRE_ONCE_ME'));
     }
 }
diff --git a/tests/Extension/TypeHinting/AbstractTest.php b/tests/Extension/TypeHinting/AbstractTest.php
index aa782f1f10..8db2cbc3c1 100644
--- a/tests/Extension/TypeHinting/AbstractTest.php
+++ b/tests/Extension/TypeHinting/AbstractTest.php
@@ -14,7 +14,6 @@
 namespace Extension\TypeHinting;
 
 use PHPUnit\Framework\TestCase;
-use TestConcreteClass;
 
 final class AbstractTest extends TestCase
 {
@@ -23,7 +22,7 @@ final class AbstractTest extends TestCase
      */
     public function testShouldCreateCompatibleChildClassUsingTypeHintedParams(): void
     {
-        $childClass = new TestConcreteClass();
+        $childClass = new \TestConcreteClass();
 
         $this->assertEquals(
             [[1667], '/', true, null],
@@ -41,7 +40,7 @@ public function testShouldCreateCompatibleChildClassUsingTypeHintedParams(): voi
      */
     public function testShouldCreateCompatibleChildClassWithMultipleReturnTypesHint(): void
     {
-        $childClass = new TestConcreteClass();
+        $childClass = new \TestConcreteClass();
         $this->assertEquals('TestConcreteClass::returnOneOfScalar', $childClass->returnOneOfScalar());
     }
 
@@ -50,7 +49,7 @@ public function testShouldCreateCompatibleChildClassWithMultipleReturnTypesHint(
      */
     public function testShouldCreateCompatibleChildClassWithScalarType(): void
     {
-        $childClass = new TestConcreteClass();
+        $childClass = new \TestConcreteClass();
 
         $this->assertEquals(1, $childClass->returnInt());
         $this->assertEquals(1, $childClass->returnUint());
diff --git a/tests/Extension/Types/MixedTypeTest.php b/tests/Extension/Types/MixedTypeTest.php
index 162edba89c..f544f56d84 100644
--- a/tests/Extension/Types/MixedTypeTest.php
+++ b/tests/Extension/Types/MixedTypeTest.php
@@ -22,7 +22,7 @@ public function testReturnsOfMixedType(): void
     {
         $returns = new MixedType();
 
-        $this->assertEquals((new \stdClass()), $returns->returnMixedObject());
+        $this->assertEquals(new \stdClass(), $returns->returnMixedObject());
         $this->assertSame([], $returns->returnMixedArray());
         $this->assertSame('mixed string', $returns->returnMixedString());
         $this->assertSame(1, $returns->returnMixedInt());
@@ -38,16 +38,16 @@ public function testReturnsOfMixedType(): void
         $this->assertNotNull($returns->returnMixedBool());
         $this->assertNull($returns->returnMixedNull());
 
-        $this->assertEquals((new \stdClass()), $returns->returnMixed74());
+        $this->assertEquals(new \stdClass(), $returns->returnMixed74());
         $this->assertSame('string', $returns->returnMixed74(true));
-        $this->assertEquals((new \stdClass()), $returns->returnMixed74(false));
+        $this->assertEquals(new \stdClass(), $returns->returnMixed74(false));
     }
 
     public function testParamsOfMixedType(): void
     {
         $returns = new MixedType();
 
-        $this->assertEquals((new \stdClass()), $returns->paramMixed((new \stdClass())));
+        $this->assertEquals(new \stdClass(), $returns->paramMixed(new \stdClass()));
         $this->assertSame([], $returns->paramMixed([]));
         $this->assertSame('mixed string', $returns->paramMixed('mixed string'));
         $this->assertSame(1, $returns->paramMixed(1));
@@ -55,14 +55,14 @@ public function testParamsOfMixedType(): void
         $this->assertTrue($returns->paramMixed(true));
         $this->assertNull($returns->paramMixed(null));
 
-        $this->assertEquals([(new \stdClass()), []], $returns->paramMixedTwo((new \stdClass()), []));
+        $this->assertEquals([new \stdClass(), []], $returns->paramMixedTwo(new \stdClass(), []));
         $this->assertSame([[], 'mixed string'], $returns->paramMixedTwo([], 'mixed string'));
         $this->assertSame([1, 3.14], $returns->paramMixedTwo(1, 3.14));
         $this->assertSame([3.14, true], $returns->paramMixedTwo(3.14, true));
         $this->assertSame([true, null], $returns->paramMixedTwo(true, null));
         $this->assertSame([null, null], $returns->paramMixedTwo(null, null));
 
-        $this->assertEquals([1337, 'object', (new \stdClass())], $returns->paramMixedWithMulti(1337, 'object', (new \stdClass())));
+        $this->assertEquals([1337, 'object', new \stdClass()], $returns->paramMixedWithMulti(1337, 'object', new \stdClass()));
         $this->assertSame([1337, 'array', []], $returns->paramMixedWithMulti(1337, 'array', []));
         $this->assertSame([1337, 'string', 'mixed string'], $returns->paramMixedWithMulti(1337, 'string', 'mixed string'));
         $this->assertSame([1337, 'int', 123], $returns->paramMixedWithMulti(1337, 'int', 123));
@@ -75,7 +75,7 @@ public function testParamsAndReturnsOfMixedType(): void
     {
         $returns = new MixedType();
 
-        $this->assertEquals((new \stdClass()), $returns->paramAndReturnMixed((new \stdClass())));
+        $this->assertEquals(new \stdClass(), $returns->paramAndReturnMixed(new \stdClass()));
         $this->assertSame([], $returns->paramAndReturnMixed([]));
         $this->assertSame('mixed string', $returns->paramAndReturnMixed('mixed string'));
         $this->assertSame(1, $returns->paramAndReturnMixed(1));
diff --git a/tests/Extension/Types/ObjTypeTest.php b/tests/Extension/Types/ObjTypeTest.php
index cf3539fdf3..e77883d5ad 100644
--- a/tests/Extension/Types/ObjTypeTest.php
+++ b/tests/Extension/Types/ObjTypeTest.php
@@ -14,7 +14,6 @@
 namespace Extension\Types;
 
 use PHPUnit\Framework\TestCase;
-use stdClass;
 use Stub\Types\Obj;
 
 final class ObjTypeTest extends TestCase
@@ -24,7 +23,7 @@ public function testIntFalse(): void
         $class = new Obj();
 
         $this->assertNull($class->nullableObjectReturnNull());
-        $this->assertInstanceOf(stdClass::class, $class->nullableObjectReturnObj());
-        $this->assertInstanceOf(stdClass::class, $class->objectReturn());
+        $this->assertInstanceOf(\stdClass::class, $class->nullableObjectReturnObj());
+        $this->assertInstanceOf(\stdClass::class, $class->objectReturn());
     }
 }
diff --git a/tests/Extension/UnsetTest.php b/tests/Extension/UnsetTest.php
index f448537875..6f8ed957b5 100644
--- a/tests/Extension/UnsetTest.php
+++ b/tests/Extension/UnsetTest.php
@@ -49,7 +49,7 @@ public function xtestUnsetValueFromProperty(): void
 
     public function xtestStdClassUnset(): void
     {
-        $equalsStdClass = new \StdClass();
+        $equalsStdClass = new \stdClass();
         $equalsStdClass->property1 = 12345;
         $equalsStdClass->property3 = 12345;
 
diff --git a/tests/Zephir/CompilerFile/CheckDependenciesTest.php b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
index cf88d15bda..acf9e52d43 100644
--- a/tests/Zephir/CompilerFile/CheckDependenciesTest.php
+++ b/tests/Zephir/CompilerFile/CheckDependenciesTest.php
@@ -15,7 +15,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Psr\Log\Test\TestLogger;
-use ReflectionException;
 use Zephir\AliasManager;
 use Zephir\Backend\Backend;
 use Zephir\Compiler;
@@ -29,7 +28,7 @@
 final class CheckDependenciesTest extends TestCase
 {
     /**
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function testExtendsClassThatDoesNotExist(): void
     {
diff --git a/tests/Zephir/CompilerFile/CheckPathSeparatorTest.php b/tests/Zephir/CompilerFile/CheckPathSeparatorTest.php
index c5dd8fc521..d3c113e3a8 100644
--- a/tests/Zephir/CompilerFile/CheckPathSeparatorTest.php
+++ b/tests/Zephir/CompilerFile/CheckPathSeparatorTest.php
@@ -22,6 +22,6 @@ public function testExtendsClassThatDoesNotExist(): void
         $configM4Path = realpath(__DIR__.'/../../../ext/config.m4');
         $configM4Contents = file_get_contents($configM4Path);
 
-        $this->assertTrue(strpos($configM4Contents, 'stub/oo/abstractstatic.zep.c') !== false);
+        $this->assertTrue(str_contains($configM4Contents, 'stub/oo/abstractstatic.zep.c'));
     }
 }
diff --git a/tests/Zephir/ConfigTest.php b/tests/Zephir/ConfigTest.php
index e7debd114c..a434673bb1 100644
--- a/tests/Zephir/ConfigTest.php
+++ b/tests/Zephir/ConfigTest.php
@@ -15,6 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Zephir\Config;
+
 use function Zephir\is_windows;
 
 final class ConfigTest extends TestCase
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index e607da7317..efd88defe2 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -14,14 +14,14 @@
 namespace Zephir\Test\Stubs;
 
 use PHPUnit\Framework\TestCase;
-use ReflectionException;
 use Zephir\AliasManager;
-use Zephir\Class\Property;
 use Zephir\Class\Constant;
 use Zephir\Class\Definition\Definition;
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
+use Zephir\Class\Property;
 use Zephir\Stubs\Generator;
+
 use function Zephir\is_windows;
 
 class GeneratorTest extends TestCase
@@ -47,7 +47,7 @@ protected function setUp(): void
      *
      * @return mixed
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     private function getMethod(string $name)
     {
@@ -238,14 +238,15 @@ public function propertyProvider(): array
 
     /**
      * @dataProvider propertyProvider
+     *
      * @covers       \Zephir\Stubs\Generator::buildProperty
      *
      * @param array  $visibility
      * @param string $type
-     * @param $value
+     * @param        $value
      * @param string $expected
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function testShouldBuildProperty(array $visibility, string $type, $value, string $expected): void
     {
@@ -330,10 +331,10 @@ public function constantProvider(): array
      * @dataProvider constantProvider
      *
      * @param string $type
-     * @param $value
+     * @param        $value
      * @param string $expected
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function testShouldBuildConstant(string $type, $value, string $expected): void
     {
diff --git a/tests/Zephir/Stubs/MethodDocBlockTest.php b/tests/Zephir/Stubs/MethodDocBlockTest.php
index 2a396a7b32..794b68f90b 100644
--- a/tests/Zephir/Stubs/MethodDocBlockTest.php
+++ b/tests/Zephir/Stubs/MethodDocBlockTest.php
@@ -16,8 +16,8 @@
 use PHPUnit\Framework\TestCase;
 use Zephir\AliasManager;
 use Zephir\Class\Definition\Definition;
-use Zephir\Class\Method\Parameters;
 use Zephir\Class\Method\Method;
+use Zephir\Class\Method\Parameters;
 use Zephir\StatementsBlock;
 use Zephir\Stubs\MethodDocBlock;
 
@@ -45,14 +45,14 @@ public function prepareMethod(array $params): MethodDocBlock
         /**
          * ClassMethod constructor.
          *
-         * @param Definition            $classDefinition
-         * @param array                      $visibility
-         * @param string                     $name
-         * @param Parameters|null $parameters
-         * @param StatementsBlock|null       $statements
-         * @param string|null                $docblock
-         * @param array|null                 $returnType
-         * @param array|null                 $original
+         * @param Definition           $classDefinition
+         * @param array                $visibility
+         * @param string               $name
+         * @param Parameters|null      $parameters
+         * @param StatementsBlock|null $statements
+         * @param string|null          $docblock
+         * @param array|null           $returnType
+         * @param array|null           $original
          */
         $methodVisibility = $params['method']['visibility'];
         $methodName = $params['method']['name'];
diff --git a/tests/Zephir/TypesTest.php b/tests/Zephir/TypesTest.php
index ca9bb7f409..0729181637 100644
--- a/tests/Zephir/TypesTest.php
+++ b/tests/Zephir/TypesTest.php
@@ -285,7 +285,7 @@ public function testShouldResolveCompatibleTypeForCollections(array $returnTypes
         $typesList = [];
         $collections = [];
         foreach ($returnTypes as $type) {
-            if (false !== strpos($type, '[]')) {
+            if (str_contains($type, '[]')) {
                 $typesList[] = $this->variableReturnTypeDefinition([$type], 1)[0];
                 $collectionType = trim($type, '<>');
                 $collections[$collectionType] = $collectionType;

From cf22bd968a68e1cea1fd3ffe71352cb669e84bc4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 19:31:20 +0100
Subject: [PATCH 076/375] #2407 - Change to `require_once`

---
 Library/Class/Entry.php            | 2 +-
 Library/Code/ArgInfoDefinition.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index 9aba0a2e22..454b4d3517 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -39,7 +39,7 @@ class Entry
     public function __construct(string $className, private CompilationContext $compilationContext)
     {
         $this->classname = $this->compilationContext->getFullName($className);
-        $this->classEntries = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
+        $this->classEntries = require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
 
         foreach ($this->classEntries as $key => $val) {
             unset($this->classEntries[$key]);
diff --git a/Library/Code/ArgInfoDefinition.php b/Library/Code/ArgInfoDefinition.php
index de4c4d816c..6d91549d63 100644
--- a/Library/Code/ArgInfoDefinition.php
+++ b/Library/Code/ArgInfoDefinition.php
@@ -510,7 +510,7 @@ private function getReturnType(): string
      */
     private function renderPhalconCompatible(): bool
     {
-        $compatibilityClasses = require __DIR__.'/../../config/phalcon-compatibility-headers.php';
+        $compatibilityClasses = require_once __DIR__.'/../../config/phalcon-compatibility-headers.php';
         $classDefinition = $this->functionLike->getClassDefinition();
         $implementedInterfaces = $classDefinition !== null ? $classDefinition->getImplementedInterfaces() : [];
         $extendsClass = $classDefinition !== null ? $classDefinition->getExtendsClass() : null;

From c18ba4e54fe45ea91cec1a459c06a5a501579c4e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 19:42:55 +0100
Subject: [PATCH 077/375] #2407 - Adjust name of `stdClass` inside Zephir code

---
 stub/cast.zep      | 12 ++++++------
 stub/mcall.zep     |  2 +-
 stub/unsettest.zep |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stub/cast.zep b/stub/cast.zep
index 3ca8f02aa1..f59497baca 100644
--- a/stub/cast.zep
+++ b/stub/cast.zep
@@ -164,7 +164,7 @@ class Cast
      */
     public function testIntCastFromStdClass() -> int
     {
-        return (int) (new \StdClass);
+        return (int) (new \stdClass);
     }
 
     /**
@@ -174,7 +174,7 @@ class Cast
     public function testIntCastFromVariableStdClass() -> int
     {
         var a;
-        let a = new \StdClass;
+        let a = new \stdClass;
         return (int) a;
     }
 
@@ -271,7 +271,7 @@ class Cast
      */
     public function testFloatCastFromStdClass() -> float
     {
-        return (float) (new \StdClass);
+        return (float) (new \stdClass);
     }
 
     /**
@@ -281,7 +281,7 @@ class Cast
     public function testFloatCastFromVariableStdClass() -> float
     {
         var a;
-        let a = new \StdClass;
+        let a = new \stdClass;
         return (float) a;
     }
 
@@ -324,7 +324,7 @@ class Cast
     public function testBooleanCastFromObject() -> boolean
     {
         var simpleObject;
-        let simpleObject = new \StdClass();
+        let simpleObject = new \stdClass();
         return (boolean) simpleObject;
     }
 
@@ -486,7 +486,7 @@ class Cast
     public function testArrayCastFromVariableStdClass() -> array
     {
         var uids;
-        let uids = new \StdClass;
+        let uids = new \stdClass;
         let uids->p1 = "v1";
         let uids->p2 = "v2";
         let uids = (array) uids;
diff --git a/stub/mcall.zep b/stub/mcall.zep
index ad6d55ff5d..218b4edcd3 100644
--- a/stub/mcall.zep
+++ b/stub/mcall.zep
@@ -223,7 +223,7 @@ class Mcall
 		return driverOptions;
 	}
 
-	public function testObjectParamCastStdClass(<\StdClass> param)
+	public function testObjectParamCastStdClass(<\stdClass> param)
 	{
 		return param;
 	}
diff --git a/stub/unsettest.zep b/stub/unsettest.zep
index 441add51f8..367d1d8706 100644
--- a/stub/unsettest.zep
+++ b/stub/unsettest.zep
@@ -45,7 +45,7 @@ class Unsettest
 	public function testStdClassUnset()
 	{
 		var simpleObject;
-		let simpleObject = new \StdClass();
+		let simpleObject = new \stdClass();
 
 		let simpleObject->property1 = 12345;
 		let simpleObject->property2 = "test";

From d47a5aa2d87e0ff4a8f030372ef2827f9f9c0716 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 19:44:03 +0100
Subject: [PATCH 078/375] #2407 - Change to `require`

---
 Library/Class/Entry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index 454b4d3517..9aba0a2e22 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -39,7 +39,7 @@ class Entry
     public function __construct(string $className, private CompilationContext $compilationContext)
     {
         $this->classname = $this->compilationContext->getFullName($className);
-        $this->classEntries = require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
+        $this->classEntries = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
 
         foreach ($this->classEntries as $key => $val) {
             unset($this->classEntries[$key]);

From 4779eeadfbb0ca99e1013fcb61e02cb01728ddf3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 10 Sep 2023 19:54:54 +0100
Subject: [PATCH 079/375] #2407 - Unify test cases

---
 .../InterfaceMethodSignatureTest.php           | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php b/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
index 2d41ad99c1..62661e30de 100644
--- a/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
+++ b/tests/Extension/Interfaces/InterfaceMethodSignatureTest.php
@@ -32,11 +32,7 @@ public function testImplementInterfaceInMethodSignature(): void
     public function testImplementInterfaceInMethodSignatureInt(): void
     {
         $this->expectException(\TypeError::class);
-        if (version_compare(PHP_VERSION, '8.3.0beta3', '>=')) {
-            $this->expectExceptionMessageMatches('/must be of type int, true given/');
-        } else {
-            $this->expectExceptionMessageMatches('/must be of (the\s)?type int, bool given/');
-        }
+        $this->expectExceptionMessageMatches('/must be of type int, (true|bool) given/');
 
         (new ImplementInt())->set(true);
     }
@@ -44,15 +40,9 @@ public function testImplementInterfaceInMethodSignatureInt(): void
     public function testImplementInterfaceInMethodSignatureInterface(): void
     {
         $this->expectException(\TypeError::class);
-        if (version_compare(PHP_VERSION, '8.3.0beta3', '>=')) {
-            $this->expectExceptionMessageMatches(
-                '/(must be of type) Stub\\\\Interfaces\\\\InterfaceInt, true given/'
-            );
-        } else {
-            $this->expectExceptionMessageMatches(
-                '/(must be of type|implement interface) Stub\\\\Interfaces\\\\InterfaceInt, bool given/'
-            );
-        }
+        $this->expectExceptionMessageMatches(
+            '/(must be of type) Stub\\\\Interfaces\\\\InterfaceInt, (true|bool) given/'
+        );
 
         (new ImplementInterface())->getVoid(true);
     }

From 41db5752770c0eed51869a92a14f4591a12522e3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 8 Oct 2023 13:07:56 +0100
Subject: [PATCH 080/375] #2407 - Update docker image to `8.3.0RC3-fpm`

---
 .docker/8.3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
index 1899dd3203..3fdb937705 100644
--- a/.docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -1,5 +1,5 @@
 FROM composer:latest AS composer
-FROM php:8.3.0beta3-fpm
+FROM 8.3.0RC3-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
 ENV MAKEFLAGS="-j${CPU_CORES}"

From f0ed8badc6df4795b238908381b47d1b542de168 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 8 Oct 2023 23:48:16 +0100
Subject: [PATCH 081/375] #2407 - Fix docker image

---
 .docker/8.3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
index 3fdb937705..6557fe4885 100644
--- a/.docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -1,5 +1,5 @@
 FROM composer:latest AS composer
-FROM 8.3.0RC3-fpm
+FROM php:8.3.0RC3-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
 ENV MAKEFLAGS="-j${CPU_CORES}"

From 7436a5be4951d2d2ece5a1f5589c618c7d881fde Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 15 Oct 2023 18:38:06 +0100
Subject: [PATCH 082/375] #2407 - Remove unused property `$lines`

---
 Library/Documentation/DocblockParser.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Library/Documentation/DocblockParser.php b/Library/Documentation/DocblockParser.php
index f37f50bed1..fe746af5c1 100644
--- a/Library/Documentation/DocblockParser.php
+++ b/Library/Documentation/DocblockParser.php
@@ -22,7 +22,6 @@ class DocblockParser
     protected $currentChar;
     protected $currentCharIndex;
     protected $currentLine;
-    protected $lines = [];
 
     // Parsing helpers
     protected $ignoreSpaces;

From 6cb7efe9edf4179a0307c186df2b260de4fbfd31 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 15 Oct 2023 18:46:22 +0100
Subject: [PATCH 083/375] #2407 - Remove redundant comments

---
 Library/Backend/FcallManager.php              |  2 --
 .../Operators/AbstractOperatorBuilder.php     |  2 --
 .../Builder/Operators/CastOperatorBuilder.php |  5 ----
 .../Operators/UnaryOperatorBuilder.php        |  7 ------
 .../Builder/Statements/IfStatementBuilder.php |  5 ----
 .../Statements/LetStatementBuilder.php        |  5 ----
 Library/Builder/StatementsBlockBuilder.php    |  3 ---
 Library/Cache/Manager.php                     | 25 -------------------
 Library/Code/ArgInfoDefinition.php            |  1 -
 Library/GlobalConstant.php                    |  6 ++---
 10 files changed, 2 insertions(+), 59 deletions(-)

diff --git a/Library/Backend/FcallManager.php b/Library/Backend/FcallManager.php
index ffa27b55c6..04c3ca61ea 100644
--- a/Library/Backend/FcallManager.php
+++ b/Library/Backend/FcallManager.php
@@ -22,8 +22,6 @@ class FcallManager implements FcallManagerInterface
     protected array $requiredMacros = [];
 
     /**
-     * {@inheritdoc}
-     *
      * @param bool $static
      * @param int  $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
      * @param int  $paramCount
diff --git a/Library/Builder/Operators/AbstractOperatorBuilder.php b/Library/Builder/Operators/AbstractOperatorBuilder.php
index 4fad1c2726..99a63335be 100644
--- a/Library/Builder/Operators/AbstractOperatorBuilder.php
+++ b/Library/Builder/Operators/AbstractOperatorBuilder.php
@@ -26,8 +26,6 @@ abstract class AbstractOperatorBuilder
 
     /**
      * Returns a builder definition.
-     *
-     * @return array
      */
     abstract public function get(): array;
 }
diff --git a/Library/Builder/Operators/CastOperatorBuilder.php b/Library/Builder/Operators/CastOperatorBuilder.php
index e57e855e6d..e211bca3e0 100644
--- a/Library/Builder/Operators/CastOperatorBuilder.php
+++ b/Library/Builder/Operators/CastOperatorBuilder.php
@@ -38,11 +38,6 @@ public function __construct(
         $this->char = $char;
     }
 
-    /**
-     * Returns a builder definition.
-     *
-     * @return array
-     */
     public function get(): array
     {
         return [
diff --git a/Library/Builder/Operators/UnaryOperatorBuilder.php b/Library/Builder/Operators/UnaryOperatorBuilder.php
index e68231881e..82e5106a17 100644
--- a/Library/Builder/Operators/UnaryOperatorBuilder.php
+++ b/Library/Builder/Operators/UnaryOperatorBuilder.php
@@ -20,8 +20,6 @@ class UnaryOperatorBuilder extends AbstractOperatorBuilder
 {
     /**
      * Operator name
-     *
-     * @var string
      */
     protected string $operator;
 
@@ -41,11 +39,6 @@ public function __construct(string $operator, $leftExpression, string $file = nu
         $this->char = $char;
     }
 
-    /**
-     * Returns a builder definition.
-     *
-     * @return array
-     */
     public function get(): array
     {
         if (\is_object($this->leftExpression) && method_exists($this->leftExpression, 'get')) {
diff --git a/Library/Builder/Statements/IfStatementBuilder.php b/Library/Builder/Statements/IfStatementBuilder.php
index 44c36ea48f..fbb5acebe0 100644
--- a/Library/Builder/Statements/IfStatementBuilder.php
+++ b/Library/Builder/Statements/IfStatementBuilder.php
@@ -28,11 +28,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * Returns a builder definition.
-     *
-     * @return array
-     */
     public function get(): array
     {
         $expression = [
diff --git a/Library/Builder/Statements/LetStatementBuilder.php b/Library/Builder/Statements/LetStatementBuilder.php
index 721ce2a292..ff04172015 100644
--- a/Library/Builder/Statements/LetStatementBuilder.php
+++ b/Library/Builder/Statements/LetStatementBuilder.php
@@ -22,11 +22,6 @@ public function __construct(private array $assignments, private mixed $expr)
     {
     }
 
-    /**
-     * Returns a builder definition.
-     *
-     * @return array
-     */
     public function get(): array
     {
         return [
diff --git a/Library/Builder/StatementsBlockBuilder.php b/Library/Builder/StatementsBlockBuilder.php
index 5d155c0bf8..9291e3c43a 100644
--- a/Library/Builder/StatementsBlockBuilder.php
+++ b/Library/Builder/StatementsBlockBuilder.php
@@ -22,9 +22,6 @@ public function __construct(protected array $statements, protected bool $raw = f
     {
     }
 
-    /**
-     * Returns a builder definition.
-     */
     public function get(): array
     {
         if ($this->raw) {
diff --git a/Library/Cache/Manager.php b/Library/Cache/Manager.php
index 16b6b70824..1ce933f320 100644
--- a/Library/Cache/Manager.php
+++ b/Library/Cache/Manager.php
@@ -20,35 +20,18 @@
  */
 class Manager
 {
-    /**
-     * @var FunctionCache|null
-     */
     protected ?FunctionCache $functionCache = null;
 
-    /**
-     * @var MethodCache|null
-     */
     protected ?MethodCache $methodCache = null;
 
-    /**
-     * @var StaticMethodCache|null
-     */
     protected ?StaticMethodCache $staticMethodCache = null;
 
-    /**
-     * @var ClassEntryCache|null
-     */
     protected ?ClassEntryCache $classEntryCache = null;
 
-    /**
-     * @var CallGathererPass|null
-     */
     protected ?CallGathererPass $gatherer = null;
 
     /**
      * Sets the CallGathererPass.
-     *
-     * @param CallGathererPass|null $gatherer
      */
     public function setGatherer(CallGathererPass $gatherer = null): void
     {
@@ -57,8 +40,6 @@ public function setGatherer(CallGathererPass $gatherer = null): void
 
     /**
      * Creates or returns an existing class entry cache.
-     *
-     * @return ClassEntryCache
      */
     public function getClassEntryCache(): ClassEntryCache
     {
@@ -71,8 +52,6 @@ public function getClassEntryCache(): ClassEntryCache
 
     /**
      * Creates or returns an existing function cache.
-     *
-     * @return FunctionCache|null
      */
     public function getFunctionCache(): ?FunctionCache
     {
@@ -85,8 +64,6 @@ public function getFunctionCache(): ?FunctionCache
 
     /**
      * Creates or returns an existing method cache.
-     *
-     * @return MethodCache|null
      */
     public function getMethodCache(): ?MethodCache
     {
@@ -99,8 +76,6 @@ public function getMethodCache(): ?MethodCache
 
     /**
      * Creates or returns an existing method cache.
-     *
-     * @return StaticMethodCache|null
      */
     public function getStaticMethodCache(): ?StaticMethodCache
     {
diff --git a/Library/Code/ArgInfoDefinition.php b/Library/Code/ArgInfoDefinition.php
index 6d91549d63..4a2fd02aa6 100644
--- a/Library/Code/ArgInfoDefinition.php
+++ b/Library/Code/ArgInfoDefinition.php
@@ -18,7 +18,6 @@
 use Zephir\CompilationContext;
 use Zephir\Exception;
 
-use function array_key_exists;
 use function Zephir\escape_class;
 
 class ArgInfoDefinition
diff --git a/Library/GlobalConstant.php b/Library/GlobalConstant.php
index f818b9d2dc..ccdb393665 100644
--- a/Library/GlobalConstant.php
+++ b/Library/GlobalConstant.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 /**
@@ -25,8 +27,6 @@ public function __construct(protected string $name)
 
     /**
      * Returns global constant name.
-     *
-     * @return string
      */
     public function getName(): string
     {
@@ -35,8 +35,6 @@ public function getName(): string
 
     /**
      * Check if the global constant is temporal.
-     *
-     * @return bool
      */
     public function isTemporal(): bool
     {

From 29b44b451a779d6d967a7ae8a0018ce0629a0ba6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 26 Oct 2023 08:12:10 +0200
Subject: [PATCH 084/375] fast_add_function removed in 8.3

---
 kernels/ZendEngine3/operators.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernels/ZendEngine3/operators.h b/kernels/ZendEngine3/operators.h
index 059f0a0fe2..f481d7c3ea 100755
--- a/kernels/ZendEngine3/operators.h
+++ b/kernels/ZendEngine3/operators.h
@@ -146,7 +146,11 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define zephir_get_boolval(z) (Z_TYPE_P(z) == IS_TRUE ? 1 : (Z_TYPE_P(z) == IS_FALSE ? 0 : zephir_get_boolval_ex(z)))
 #define zephir_get_charval(z) (Z_TYPE_P(z) == IS_LONG ? Z_LVAL_P(z) : zephir_get_charval_ex(z))
 
+#if PHP_VERSION_ID >= 80300
+#define zephir_add_function(result, left, right) add_function(result, left, right)
+#else
 #define zephir_add_function(result, left, right) fast_add_function(result, left, right)
+#endif
 #define zephir_sub_function(result, left, right) sub_function(result, left, right)
 #define zephir_pow_function(result, op1, op2) pow_function(result, op1, op2)
 #define zephir_increment(var) increment_function(var)

From cd45ef18c2e2280676a67dc5e4a6082637c8292f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 28 Oct 2023 17:33:42 +0100
Subject: [PATCH 085/375] #2407 - Update docker image to `8.3.0RC5-fpm`

---
 .docker/8.3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
index 6557fe4885..1e1d267118 100644
--- a/.docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -1,5 +1,5 @@
 FROM composer:latest AS composer
-FROM php:8.3.0RC3-fpm
+FROM php:8.3.0RC5-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
 ENV MAKEFLAGS="-j${CPU_CORES}"

From 8a33e650544c68533359adff2a8eb044cbc2939d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 28 Oct 2023 19:32:10 +0100
Subject: [PATCH 086/375] #2407 - Simplify conditions

---
 Library/CompilerFile.php                      | 12 ++---
 .../Arithmetical/ArithmeticalBaseOperator.php |  4 +-
 Library/Passes/LocalContextPass.php           | 22 ++++----
 Library/Passes/SkipVariantInit.php            | 52 ++++++++-----------
 Library/Passes/StaticTypeInference.php        |  6 +--
 5 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index 01c917e70c..b3722bb9c1 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -893,16 +893,16 @@ public function applyClassHeaders(CompilationContext $compilationContext)
 
         $separators = str_repeat('../', \count(explode('\\', $classDefinition->getCompleteName())) - 1);
 
-        $code = ''.PHP_EOL;
+        $code =  PHP_EOL;
         $code .= '#ifdef HAVE_CONFIG_H'.PHP_EOL;
         $code .= '#include "'.$separators.'ext_config.h"'.PHP_EOL;
         $code .= '#endif'.PHP_EOL;
-        $code .= ''.PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include <php.h>'.PHP_EOL;
         $code .= '#include "'.$separators.'php_ext.h"'.PHP_EOL;
         $code .= '#include "'.$separators.'ext.h"'.PHP_EOL;
-        $code .= ''.PHP_EOL;
+        $code .= PHP_EOL;
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>'.PHP_EOL;
@@ -911,7 +911,7 @@ public function applyClassHeaders(CompilationContext $compilationContext)
         } else {
             $code .= '#include <Zend/zend_exceptions.h>'.PHP_EOL;
         }
-        $code .= ''.PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include "kernel/main.h"'.PHP_EOL;
 
@@ -925,7 +925,7 @@ public function applyClassHeaders(CompilationContext $compilationContext)
             $code .= implode(PHP_EOL, $this->headerCBlocks).PHP_EOL;
         }
 
-        /*
+        /**
          * Prepend the required files to the header
          */
         $compilationContext->codePrinter->preOutput($code);
@@ -974,7 +974,7 @@ protected function processShortcuts(array $property, Definition $classDefinition
                 if ($annotations = $docBlockParsed->getAnnotationsByType('var')) {
                     $returnsType = array_map(function ($type) {
                         return 'mixed' == ($type = trim($type)) ? 'variable' : $type;
-                    }, (array) explode('|', $annotations[0]->getString()));
+                    }, explode('|', $annotations[0]->getString()));
                 }
 
                 // Clear annotations
diff --git a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php b/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
index ac6b94bcae..d0e9f97cb9 100644
--- a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -523,9 +523,9 @@ public function compile($expression, CompilationContext $compilationContext)
      *
      * @return string
      */
-    private function getDynamicTypes(Variable $left, Variable $right)
+    private function getDynamicTypes(Variable $left, Variable $right): string
     {
-        if ('/' == $this->operator) {
+        if ('/' === $this->operator) {
             return 'double';
         }
 
diff --git a/Library/Passes/LocalContextPass.php b/Library/Passes/LocalContextPass.php
index 1dd6d0d16b..aee0d95638 100644
--- a/Library/Passes/LocalContextPass.php
+++ b/Library/Passes/LocalContextPass.php
@@ -50,18 +50,22 @@ public function pass(StatementsBlock $block): void
 
     public function declareVariables(array $statement): void
     {
-        if (isset($statement['data-type'])) {
-            if ('variable' != $statement['data-type']) {
-                return;
-            }
+        if (isset($statement['data-type']) && 'variable' !== $statement['data-type']) {
+            return;
         }
+
         foreach ($statement['variables'] as $variable) {
             if (isset($variable['expr'])) {
-                if ('string' == $variable['expr']['type'] || 'empty-array' == $variable['expr']['type'] || 'array' == $variable['expr']['type']) {
+                if (
+                    'string' === $variable['expr']['type'] ||
+                    'empty-array' === $variable['expr']['type'] ||
+                    'array' === $variable['expr']['type']
+                ) {
                     $this->variables[$variable['variable']] = false;
                     continue;
                 }
             }
+
             if (!isset($this->variables[$variable['variable']])) {
                 $this->variables[$variable['variable']] = true;
             }
@@ -219,9 +223,6 @@ public function passLetStatement(array $statement): void
                                     break;
                             }
                             break;
-
-                        default:
-                            // echo '[', $assignment['expr']['type'], ']', PHP_EOL;
                     }
                     break;
 
@@ -241,13 +242,8 @@ public function passLetStatement(array $statement): void
                         case 'variable':
                             $this->markVariableNoLocal($assignment['expr']['value']);
                             break;
-                        default:
-                            // echo '[', $assignment['assign-type'], ']';
                     }
                     break;
-
-                default:
-                    // echo $assignment['assign-type'];
             }
         }
     }
diff --git a/Library/Passes/SkipVariantInit.php b/Library/Passes/SkipVariantInit.php
index 3587011a6c..9864cc534a 100644
--- a/Library/Passes/SkipVariantInit.php
+++ b/Library/Passes/SkipVariantInit.php
@@ -9,10 +9,14 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Passes;
 
 use Zephir\StatementsBlock;
 
+use function count;
+
 /**
  * In 'if'/'else' statements sometimes dynamical variables are initialized in every branch
  * Same case in 'switch' statements
@@ -25,9 +29,6 @@ class SkipVariantInit
 
     /**
      * Do the compilation pass.
-     *
-     * @param int             $branchNumber
-     * @param StatementsBlock $block
      */
     public function pass(int $branchNumber, StatementsBlock $block): void
     {
@@ -37,30 +38,29 @@ public function pass(int $branchNumber, StatementsBlock $block): void
 
     /**
      * Check assignment types for possible skip.
-     *
-     * @param int   $branchNumber
-     * @param array $statement
      */
     public function passLetStatement(int $branchNumber, array $statement): void
     {
+        $skipTypes = [
+            'variable',
+            'array-access',
+            'property-access',
+            'static-property-access',
+            'fcall',
+            'mcall',
+            'scall',
+        ];
+
         foreach ($statement['assignments'] as $assignment) {
-            if ('variable' == $assignment['assign-type']) {
-                if ('assign' == $assignment['operator']) {
-                    switch ($assignment['expr']['type']) {
-                        case 'variable':
-                        case 'array-access':
-                        case 'property-access':
-                        case 'static-property-access':
-                        case 'fcall':
-                        case 'mcall':
-                        case 'scall':
-                            break;
-                        default:
-                            $this->variablesToSkip[$branchNumber][$assignment['variable']] = 1;
-                            break;
-                    }
-                }
+            if ($assignment['assign-type'] !== 'variable' || $assignment['operator'] !== 'assign') {
+                continue;
             }
+
+            if (in_array($assignment['expr']['type'], $skipTypes, true)) {
+                continue;
+            }
+
+            $this->variablesToSkip[$branchNumber][$assignment['variable']] = 1;
         }
     }
 
@@ -79,8 +79,6 @@ public function passStatementBlock($branchNumber, array $statements): void
 
     /**
      * Returns a list of variables that are initialized in every analyzed branch.
-     *
-     * @return array
      */
     public function getVariables(): array
     {
@@ -97,7 +95,7 @@ public function getVariables(): array
         }
 
         $variables = [];
-        $numberBranches = \count($this->branches);
+        $numberBranches = count($this->branches);
         foreach ($variableStats as $variable => $number) {
             if ($number == $numberBranches) {
                 $variables[] = $variable;
@@ -107,10 +105,6 @@ public function getVariables(): array
         return $variables;
     }
 
-    /**
-     * @param int   $branchNumber
-     * @param array $variablesToSkip
-     */
     public function setVariablesToSkip(int $branchNumber, array $variablesToSkip): void
     {
         $this->variablesToSkip[$branchNumber] = $variablesToSkip;
diff --git a/Library/Passes/StaticTypeInference.php b/Library/Passes/StaticTypeInference.php
index 9ae1278f8e..5a48d99149 100644
--- a/Library/Passes/StaticTypeInference.php
+++ b/Library/Passes/StaticTypeInference.php
@@ -54,7 +54,7 @@ public function declareVariables(array $statement)
      * @param string $variable
      * @param string $type
      */
-    public function markVariableIfUnknown($variable, $type)
+    public function markVariableIfUnknown($variable, $type): void
     {
         $this->variables[$variable] = $type;
         $this->infered[$variable] = $type;
@@ -66,7 +66,7 @@ public function markVariableIfUnknown($variable, $type)
      * @param string $variable
      * @param string $type
      */
-    public function markVariable($variable, $type)
+    public function markVariable($variable, $type): void
     {
         if (isset($this->variables[$variable])) {
             $currentType = $this->variables[$variable];
@@ -171,7 +171,7 @@ public function markVariable($variable, $type)
      *
      * @return bool
      */
-    public function reduce()
+    public function reduce(): bool
     {
         $pass = false;
         foreach ($this->variables as $variable => $type) {

From 66f9b7c7ff006346b898dd5ede0d768b285fd602 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 28 Oct 2023 23:02:17 +0100
Subject: [PATCH 087/375] #2407 - Cleanup code

---
 Library/Backend/Backend.php        | 29 ++++++++++++-----------------
 Library/Backend/StringsManager.php |  2 --
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 9a28076e28..b5187a8267 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -27,6 +27,7 @@
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
 
+use function in_array;
 use function Zephir\add_slashes;
 
 class Backend
@@ -43,8 +44,6 @@ public function __construct(
 
     /**
      * Resolves the path to the source kernel files of the backend.
-     *
-     * @return string
      */
     public function getInternalKernelPath(): string
     {
@@ -53,10 +52,6 @@ public function getInternalKernelPath(): string
 
     /**
      * Resolves the path to the source template file of the backend.
-     *
-     * @param string $filename
-     *
-     * @return string
      */
     public function getTemplateFileContents(string $filename): string
     {
@@ -121,8 +116,8 @@ public function initVar(Variable $variable, CompilationContext $context, $useCod
     public function getVariableCode(Variable $variable): string
     {
         if ($variable->isDoublePointer()
-            || \in_array($variable->getName(), ['this_ptr', 'return_value'])
-            || \in_array($variable->getType(), ['int', 'long'])) {
+            || in_array($variable->getName(), ['this_ptr', 'return_value'])
+            || in_array($variable->getType(), ['int', 'long'])) {
             return $variable->getName();
         }
 
@@ -342,7 +337,7 @@ public function onPostCompile(Method $method, CompilationContext $context): void
 
     public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable)
     {
-        $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
+        $isComplex = in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
 
         if ($isComplex && !$variable->isDoublePointer()) {
             $groupVariables[] = $variable->getName();
@@ -645,7 +640,7 @@ public function addArrayEntry(Variable $variable, $key, $value, CompilationConte
                 $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
                 $typeKey = $var->getType();
             }
-            if (\in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
+            if (in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
                 $keyType = 'index';
             }
         }
@@ -770,16 +765,16 @@ public function arrayIssetFetch2(Variable $target, Variable $var, $resolvedExpr,
         if (!($resolvedExpr instanceof Variable)) {
             if ('string' === $resolvedExpr->getType()) {
                 return new CompiledExpression('bool', 'zephir_array_isset_string_fetch('.$code.', SS("'.$resolvedExpr->getCode().'"), '.$flags.')', $expression);
-            } elseif (\in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
+            } elseif (in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
                 return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$resolvedExpr->getCode().', '.$flags.')', $expression);
             } else {
                 $resolvedExpr = $context->symbolTable->getVariableForRead($resolvedExpr->getCode(), $context);
             }
         }
 
-        if (\in_array($resolvedExpr->getType(), ['int', 'long'])) {
+        if (in_array($resolvedExpr->getType(), ['int', 'long'])) {
             return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
-        } elseif (\in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
+        } elseif (in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
             return new CompiledExpression('bool', 'zephir_array_isset_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
         }
 
@@ -988,7 +983,7 @@ public function resolveValue($value, CompilationContext $context): Variable | bo
             $value = $this->getVariableCode($tempVariable);
         } else {
             if ($value instanceof CompiledExpression) {
-                if (\in_array($value->getType(), ['array', 'variable', 'mixed'])) {
+                if (in_array($value->getType(), ['array', 'variable', 'mixed'])) {
                     $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context);
                 } else {
                     return $value->getCode();
@@ -1419,7 +1414,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
                     $arrayAccess['right']
                 );
         }
-        if ($isVariable && \in_array($index->getType(), ['variable', 'string', 'mixed'])) {
+        if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
             $output = 'zephir_array_fetch('.$this->getVariableCode($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
         } else {
             if ($isVariable) {
@@ -1458,7 +1453,7 @@ public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExp
         );
     }
 
-    public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext)
+    public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext): void
     {
         list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
         $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
@@ -1495,7 +1490,7 @@ public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $pro
         );
     }
 
-    public function checkConstructor(Variable $var, CompilationContext $context)
+    public function checkConstructor(Variable $var, CompilationContext $context): void
     {
         $context->codePrinter->output('if (zephir_has_constructor('.$this->getVariableCode($var).')) {');
     }
diff --git a/Library/Backend/StringsManager.php b/Library/Backend/StringsManager.php
index 92f964d107..d90559deb8 100644
--- a/Library/Backend/StringsManager.php
+++ b/Library/Backend/StringsManager.php
@@ -24,8 +24,6 @@ class StringsManager extends BaseStringsManager
 {
     /**
      * Adds a concatenation combination to the manager.
-     *
-     * @param string $key
      */
     public function addConcatKey(string $key): void
     {

From 2ac85892609e9466b598754228ccb5b705355749 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 28 Oct 2023 23:10:25 +0100
Subject: [PATCH 088/375] #2407 - Move `escape()` function into `Entry` class

---
 Library/Class/Entry.php                       |  8 +++++
 Library/Code/ArgInfoDefinition.php            |  7 ++---
 .../Operators/Other/InstanceOfOperator.php    |  6 ++--
 .../Operators/Other/NewInstanceOperator.php   |  4 +--
 Library/functions.php                         | 12 --------
 tests/Zephir/Class/EntryTest.php              | 29 +++++++++++++++++++
 tests/Zephir/HelpersTest.php                  | 10 -------
 7 files changed, 43 insertions(+), 33 deletions(-)
 create mode 100644 tests/Zephir/Class/EntryTest.php

diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index 9aba0a2e22..78edc8227a 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -115,6 +115,14 @@ public function isInternal(): bool
         return $this->isInternal;
     }
 
+    /**
+     * Prepares a class name to be used as a C-string.
+     */
+    public static function escape(string $className): string
+    {
+        return str_replace(static::NAMESPACE_SEPARATOR, '\\\\', $className);
+    }
+
     /**
      * Detect if start of namespace class belongs to project namespace.
      */
diff --git a/Library/Code/ArgInfoDefinition.php b/Library/Code/ArgInfoDefinition.php
index 4a2fd02aa6..029bc97791 100644
--- a/Library/Code/ArgInfoDefinition.php
+++ b/Library/Code/ArgInfoDefinition.php
@@ -13,13 +13,12 @@
 
 namespace Zephir\Code;
 
+use Zephir\Class\Entry;
 use Zephir\Class\Method\Method;
 use Zephir\Class\Method\Parameters;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 
-use function Zephir\escape_class;
-
 class ArgInfoDefinition
 {
     private ?Parameters $parameters;
@@ -125,7 +124,7 @@ private function richRenderStart(): void
     {
         if (\array_key_exists('object', $this->functionLike->getReturnTypes()) && 1 === \count($this->functionLike->getReturnClassTypes())) {
             $class = key($this->functionLike->getReturnClassTypes());
-            $class = escape_class($this->compilationContext->getFullName($class));
+            $class = Entry::escape($this->compilationContext->getFullName($class));
 
             $this->codePrinter->output(
                 sprintf(
@@ -345,7 +344,7 @@ private function renderEnd(): void
                                 "\tZEND_ARG_OBJ_INFO(%d, %s, %s, %d)",
                                 $this->passByReference($parameter),
                                 $parameter['name'],
-                                escape_class($this->compilationContext->getFullName($parameter['cast']['value'])),
+                                Entry::escape($this->compilationContext->getFullName($parameter['cast']['value'])),
                                 (int) $this->allowNull($parameter)
                             )
                         );
diff --git a/Library/Operators/Other/InstanceOfOperator.php b/Library/Operators/Other/InstanceOfOperator.php
index a1b9bedfee..f7eac3c004 100644
--- a/Library/Operators/Other/InstanceOfOperator.php
+++ b/Library/Operators/Other/InstanceOfOperator.php
@@ -21,8 +21,6 @@
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
 
-use function Zephir\escape_class;
-
 /**
  * Checks if a variable is an instance of a class
  */
@@ -85,13 +83,13 @@ public function compile($expression, CompilationContext $context): CompiledExpre
                                     $classEntry = $classDefinition->getClassEntry($context);
                                 } else {
                                     if (!class_exists($className, false)) {
-                                        $code = 'SL("'.trim(escape_class($className), '\\').'")';
+                                        $code = 'SL("'.trim(Entry::escape($className), '\\').'")';
                                     } else {
                                         $entry = (new Entry($resolvedVariable, $context));
                                         $classEntry = $entry->get();
 
                                         if (!$entry->isInternal()) {
-                                            $code = 'SL("'.trim(escape_class($className), '\\').'")';
+                                            $code = 'SL("'.trim(Entry::escape($className), '\\').'")';
                                         }
                                     }
                                 }
diff --git a/Library/Operators/Other/NewInstanceOperator.php b/Library/Operators/Other/NewInstanceOperator.php
index 6787949683..4b96cff893 100644
--- a/Library/Operators/Other/NewInstanceOperator.php
+++ b/Library/Operators/Other/NewInstanceOperator.php
@@ -22,8 +22,6 @@
 use Zephir\MethodCall;
 use Zephir\Operators\AbstractOperator;
 
-use function Zephir\escape_class;
-
 /**
  * Creates a new instance of a class
  */
@@ -151,7 +149,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             'Class "'.$className.'" does not exist at compile time',
                             ['nonexistent-class', $expression]
                         );
-                        $classNameToFetch = 'SL("'.escape_class($className).'")';
+                        $classNameToFetch = 'SL("'.Entry::escape($className).'")';
 
                         $zendClassEntry = $compilationContext->cacheManager->getClassEntryCache()->get($classNameToFetch, false, $compilationContext);
                         $classEntry = $zendClassEntry->getName();
diff --git a/Library/functions.php b/Library/functions.php
index 39755a2443..9c9990428b 100644
--- a/Library/functions.php
+++ b/Library/functions.php
@@ -25,18 +25,6 @@ function camelize($string)
     return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
 }
 
-/**
- * Prepares a class name to be used as a C-string.
- *
- * @param string $className
- *
- * @return string
- */
-function escape_class($className)
-{
-    return str_replace('\\', '\\\\', $className);
-}
-
 /**
  * Prepares a string to be used as a C-string.
  *
diff --git a/tests/Zephir/Class/EntryTest.php b/tests/Zephir/Class/EntryTest.php
new file mode 100644
index 0000000000..a58522ac57
--- /dev/null
+++ b/tests/Zephir/Class/EntryTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Test\Class;
+
+use PHPUnit\Framework\TestCase;
+use Zephir\Class\Entry;
+
+final class EntryTest extends TestCase
+{
+    public function testShouldEscapeClassName(): void
+    {
+        $classname = '\Bar\Foo';
+        $this->assertSame(
+            Entry::escape($classname),
+            '\\\\Bar\\\\Foo'
+        );
+    }
+}
diff --git a/tests/Zephir/HelpersTest.php b/tests/Zephir/HelpersTest.php
index 376d81467d..c21db61d84 100644
--- a/tests/Zephir/HelpersTest.php
+++ b/tests/Zephir/HelpersTest.php
@@ -17,19 +17,9 @@
 
 use function Zephir\add_slashes;
 use function Zephir\camelize;
-use function Zephir\escape_class;
 
 final class HelpersTest extends TestCase
 {
-    public function testShouldEscapeClassName(): void
-    {
-        $classname = '\Bar\Foo';
-        $this->assertSame(
-            escape_class($classname),
-            '\\\\Bar\\\\Foo'
-        );
-    }
-
     public function testShouldCamelizeClassName(): void
     {
         $name = 'foo_Bar_Foo_bar';

From 17524785f3eb7294d70f88c7548507e18607465a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 28 Oct 2023 23:10:35 +0100
Subject: [PATCH 089/375] #2407 - Update composer.lock

---
 composer.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/composer.lock b/composer.lock
index 84653db5d7..1151b80e0d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "monolog/monolog",
-            "version": "2.9.1",
+            "version": "2.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
-                "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
                 "shasum": ""
             },
             "require": {
@@ -94,7 +94,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.9.1"
+                "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
             },
             "funding": [
                 {
@@ -106,7 +106,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-06T13:44:46+00:00"
+            "time": "2023-10-27T15:25:26+00:00"
         },
         {
             "name": "psr/container",
@@ -1550,16 +1550,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.27",
+            "version": "9.2.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1"
+                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b0a88255cb70d52653d80c890bd7f38740ea50d1",
-                "reference": "b0a88255cb70d52653d80c890bd7f38740ea50d1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
                 "shasum": ""
             },
             "require": {
@@ -1616,7 +1616,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.27"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
             },
             "funding": [
                 {
@@ -1624,7 +1624,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-26T13:44:30+00:00"
+            "time": "2023-09-19T04:57:46+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -3005,5 +3005,5 @@
         "ext-pdo_sqlite": "*",
         "ext-zip": "*"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

From 7c3d6303633b3576d0218b2f30a8e88a35cf1228 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 28 Oct 2023 23:26:51 +0100
Subject: [PATCH 090/375] #2407 - Fix CS

---
 Library/Backend/Backend.php         | 19 +++++++++----------
 Library/CompilerFile.php            |  2 +-
 Library/Passes/LocalContextPass.php |  6 +++---
 Library/Passes/SkipVariantInit.php  |  4 +---
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index b5187a8267..6d03c484a5 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -27,7 +27,6 @@
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
 
-use function in_array;
 use function Zephir\add_slashes;
 
 class Backend
@@ -116,8 +115,8 @@ public function initVar(Variable $variable, CompilationContext $context, $useCod
     public function getVariableCode(Variable $variable): string
     {
         if ($variable->isDoublePointer()
-            || in_array($variable->getName(), ['this_ptr', 'return_value'])
-            || in_array($variable->getType(), ['int', 'long'])) {
+            || \in_array($variable->getName(), ['this_ptr', 'return_value'])
+            || \in_array($variable->getType(), ['int', 'long'])) {
             return $variable->getName();
         }
 
@@ -337,7 +336,7 @@ public function onPostCompile(Method $method, CompilationContext $context): void
 
     public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable)
     {
-        $isComplex = in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
+        $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
 
         if ($isComplex && !$variable->isDoublePointer()) {
             $groupVariables[] = $variable->getName();
@@ -640,7 +639,7 @@ public function addArrayEntry(Variable $variable, $key, $value, CompilationConte
                 $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
                 $typeKey = $var->getType();
             }
-            if (in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
+            if (\in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
                 $keyType = 'index';
             }
         }
@@ -765,16 +764,16 @@ public function arrayIssetFetch2(Variable $target, Variable $var, $resolvedExpr,
         if (!($resolvedExpr instanceof Variable)) {
             if ('string' === $resolvedExpr->getType()) {
                 return new CompiledExpression('bool', 'zephir_array_isset_string_fetch('.$code.', SS("'.$resolvedExpr->getCode().'"), '.$flags.')', $expression);
-            } elseif (in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
+            } elseif (\in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
                 return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$resolvedExpr->getCode().', '.$flags.')', $expression);
             } else {
                 $resolvedExpr = $context->symbolTable->getVariableForRead($resolvedExpr->getCode(), $context);
             }
         }
 
-        if (in_array($resolvedExpr->getType(), ['int', 'long'])) {
+        if (\in_array($resolvedExpr->getType(), ['int', 'long'])) {
             return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
-        } elseif (in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
+        } elseif (\in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
             return new CompiledExpression('bool', 'zephir_array_isset_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
         }
 
@@ -983,7 +982,7 @@ public function resolveValue($value, CompilationContext $context): Variable | bo
             $value = $this->getVariableCode($tempVariable);
         } else {
             if ($value instanceof CompiledExpression) {
-                if (in_array($value->getType(), ['array', 'variable', 'mixed'])) {
+                if (\in_array($value->getType(), ['array', 'variable', 'mixed'])) {
                     $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context);
                 } else {
                     return $value->getCode();
@@ -1414,7 +1413,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
                     $arrayAccess['right']
                 );
         }
-        if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
+        if ($isVariable && \in_array($index->getType(), ['variable', 'string', 'mixed'])) {
             $output = 'zephir_array_fetch('.$this->getVariableCode($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
         } else {
             if ($isVariable) {
diff --git a/Library/CompilerFile.php b/Library/CompilerFile.php
index b3722bb9c1..03c4042f06 100644
--- a/Library/CompilerFile.php
+++ b/Library/CompilerFile.php
@@ -893,7 +893,7 @@ public function applyClassHeaders(CompilationContext $compilationContext)
 
         $separators = str_repeat('../', \count(explode('\\', $classDefinition->getCompleteName())) - 1);
 
-        $code =  PHP_EOL;
+        $code = PHP_EOL;
         $code .= '#ifdef HAVE_CONFIG_H'.PHP_EOL;
         $code .= '#include "'.$separators.'ext_config.h"'.PHP_EOL;
         $code .= '#endif'.PHP_EOL;
diff --git a/Library/Passes/LocalContextPass.php b/Library/Passes/LocalContextPass.php
index aee0d95638..395fc75fb5 100644
--- a/Library/Passes/LocalContextPass.php
+++ b/Library/Passes/LocalContextPass.php
@@ -57,9 +57,9 @@ public function declareVariables(array $statement): void
         foreach ($statement['variables'] as $variable) {
             if (isset($variable['expr'])) {
                 if (
-                    'string' === $variable['expr']['type'] ||
-                    'empty-array' === $variable['expr']['type'] ||
-                    'array' === $variable['expr']['type']
+                    'string' === $variable['expr']['type']
+                    || 'empty-array' === $variable['expr']['type']
+                    || 'array' === $variable['expr']['type']
                 ) {
                     $this->variables[$variable['variable']] = false;
                     continue;
diff --git a/Library/Passes/SkipVariantInit.php b/Library/Passes/SkipVariantInit.php
index 9864cc534a..1fd968bac5 100644
--- a/Library/Passes/SkipVariantInit.php
+++ b/Library/Passes/SkipVariantInit.php
@@ -15,8 +15,6 @@
 
 use Zephir\StatementsBlock;
 
-use function count;
-
 /**
  * In 'if'/'else' statements sometimes dynamical variables are initialized in every branch
  * Same case in 'switch' statements
@@ -95,7 +93,7 @@ public function getVariables(): array
         }
 
         $variables = [];
-        $numberBranches = count($this->branches);
+        $numberBranches = \count($this->branches);
         foreach ($variableStats as $variable => $number) {
             if ($number == $numberBranches) {
                 $variables[] = $variable;

From 16517c896385129f65706b3d4b8d32e4ab97f653 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 28 Oct 2023 23:27:10 +0100
Subject: [PATCH 091/375] #2407 - Bump version of `PHP_CS_FIXER_VERSION`
 variable to `3.37.0`

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 96e5fcb419..433e64637b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         env:
-          PHP_CS_FIXER_VERSION: 3.26.1
+          PHP_CS_FIXER_VERSION: 3.37.0
         with:
           php-version: '8.0'
           coverage: none

From 3cf64393b097c2cc45c983788935cc4723ac2e1f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 10:39:34 +0000
Subject: [PATCH 092/375] #2407 - Fix CS

---
 Library/Passes/LocalContextPass.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Library/Passes/LocalContextPass.php b/Library/Passes/LocalContextPass.php
index 395fc75fb5..efa8cb5acc 100644
--- a/Library/Passes/LocalContextPass.php
+++ b/Library/Passes/LocalContextPass.php
@@ -56,8 +56,7 @@ public function declareVariables(array $statement): void
 
         foreach ($statement['variables'] as $variable) {
             if (isset($variable['expr'])) {
-                if (
-                    'string' === $variable['expr']['type']
+                if ('string' === $variable['expr']['type']
                     || 'empty-array' === $variable['expr']['type']
                     || 'array' === $variable['expr']['type']
                 ) {

From ab1ffb17306f86838332090ab4284a3899012488 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 10:40:32 +0000
Subject: [PATCH 093/375] #2407 - Change to 'require_once'

---
 Library/Class/Entry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index 78edc8227a..ce39db954e 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -39,7 +39,7 @@ class Entry
     public function __construct(string $className, private CompilationContext $compilationContext)
     {
         $this->classname = $this->compilationContext->getFullName($className);
-        $this->classEntries = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
+        $this->classEntries = require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
 
         foreach ($this->classEntries as $key => $val) {
             unset($this->classEntries[$key]);

From 1dd4c8a003e868bc1b5e381d04befe7f326ee274 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 10:49:05 +0000
Subject: [PATCH 094/375] #2407 - Change from switch to if

---
 Library/Backend/Backend.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 6d03c484a5..7d84f80b91 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -135,12 +135,10 @@ public function getBoolCode(Variable $variable, CompilationContext $context, $us
 
     public function getTypeDefinition($type): array
     {
-        switch ($type) {
-            case 'zend_ulong':
-                return ['', 'zend_ulong'];
-
-            case 'zend_string':
-                return ['*', 'zend_string'];
+        if ($type === 'zend_ulong') {
+            return ['', 'zend_ulong'];
+        } elseif ($type === 'zend_string') {
+            return ['*', 'zend_string'];
         }
 
         $pointer = null;

From c0ae9c1f430b55e0528014a0975688d34f6efe0c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 10:52:23 +0000
Subject: [PATCH 095/375] #2407 - Replace switch to match

---
 Library/Backend/Backend.php | 58 ++++++++-----------------------------
 1 file changed, 12 insertions(+), 46 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 7d84f80b91..799525349e 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -249,52 +249,18 @@ public function getTypeofCondition(
     ): string {
         $variableName = $this->getVariableCode($variableVariable);
 
-        switch ($value) {
-            case 'array':
-                $condition = 'Z_TYPE_P('.$variableName.') '.$operator.' IS_ARRAY';
-                break;
-
-            case 'object':
-                $condition = 'Z_TYPE_P('.$variableName.') '.$operator.' IS_OBJECT';
-                break;
-
-            case 'null':
-                $condition = 'Z_TYPE_P('.$variableName.') '.$operator.' IS_NULL';
-                break;
-
-            case 'string':
-                $condition = 'Z_TYPE_P('.$variableName.') '.$operator.' IS_STRING';
-                break;
-
-            case 'int':
-            case 'long':
-            case 'integer':
-                $condition = 'Z_TYPE_P('.$variableName.') '.$operator.' IS_LONG';
-                break;
-
-            case 'double':
-            case 'float':
-                $condition = 'Z_TYPE_P('.$variableName.') '.$operator.' IS_DOUBLE';
-                break;
-
-            case 'boolean':
-            case 'bool':
-                $condition = '((Z_TYPE_P('.$variableName.') == IS_TRUE || Z_TYPE_P('.$variableName.') == IS_FALSE) '.$operator.' 1)';
-                break;
-
-            case 'resource':
-                $condition = 'Z_TYPE_P('.$variableName.') '.$operator.' IS_RESOURCE';
-                break;
-
-            case 'callable':
-                $condition = 'zephir_is_callable('.$variableName.') '.$operator.' 1';
-                break;
-
-            default:
-                throw new CompilerException(sprintf('Unknown type: "%s" in typeof comparison', $value));
-        }
-
-        return $condition;
+        return match ($value) {
+            'array' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_ARRAY',
+            'object' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_OBJECT',
+            'null' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_NULL',
+            'string' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_STRING',
+            'int', 'long', 'integer' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_LONG',
+            'double', 'float' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_DOUBLE',
+            'boolean', 'bool' => '((Z_TYPE_P(' . $variableName . ') == IS_TRUE || Z_TYPE_P(' . $variableName . ') == IS_FALSE) ' . $operator . ' 1)',
+            'resource' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_RESOURCE',
+            'callable' => 'zephir_is_callable(' . $variableName . ') ' . $operator . ' 1',
+            default => throw new CompilerException(sprintf('Unknown type: "%s" in typeof comparison', $value)),
+        };
     }
 
     public function onPreInitVar(Method $method): string

From 0945f048f037e0df675076e715bb4ed64ac809bd Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 11:02:48 +0000
Subject: [PATCH 096/375] #2407 - Fix return type

---
 Library/Backend/Backend.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index 799525349e..e9845001bd 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -298,34 +298,30 @@ public function onPostCompile(Method $method, CompilationContext $context): void
         }
     }
 
-    public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable)
+    public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable): ?string
     {
         $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
 
         if ($isComplex && !$variable->isDoublePointer()) {
             $groupVariables[] = $variable->getName();
-            switch ($variable->getRealname()) {
-                case '__$null':
-                    return "\t".'ZVAL_NULL(&'.$variable->getName().');';
-                case '__$true':
-                    return "\t".'ZVAL_BOOL(&'.$variable->getName().', 1);';
-                case '__$false':
-                    return "\t".'ZVAL_BOOL(&'.$variable->getName().', 0);';
-                default:
-                    return "\t".'ZVAL_UNDEF(&'.$variable->getName().');';
-            }
+            return match ($variable->getRealname()) {
+                '__$null' => "\t" . 'ZVAL_NULL(&' . $variable->getName() . ');',
+                '__$true' => "\t" . 'ZVAL_BOOL(&' . $variable->getName() . ', 1);',
+                '__$false' => "\t" . 'ZVAL_BOOL(&' . $variable->getName() . ', 0);',
+                default => "\t" . 'ZVAL_UNDEF(&' . $variable->getName() . ');',
+            };
         }
 
         if ($variable->isLocalOnly()) {
             $groupVariables[] = $variable->getName();
 
-            return;
+            return null;
         }
 
         if ($variable->isSuperGlobal()) {
             $groupVariables[] = $variable->getName();
 
-            return;
+            return null;
         }
 
         if ($variable->isDoublePointer()) {
@@ -337,7 +333,7 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
                 $groupVariables[] = $ptr.$variable->getName();
             }
 
-            return;
+            return null;
         }
 
         $defaultValue = $variable->getDefaultInitValue();
@@ -369,16 +365,18 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
                     break;
             }
 
-            return;
+            return null;
         }
 
         if ($variable->mustInitNull() && $pointer) {
             $groupVariables[] = $pointer.$variable->getName().' = NULL';
 
-            return;
+            return null;
         }
 
         $groupVariables[] = $pointer.$variable->getName();
+
+        return null;
     }
 
     /**

From d3190468a41bd9d5b1ea1bce010da9e9150e74f9 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 20:18:15 +0000
Subject: [PATCH 097/375] #2407 - Change to `require`

---
 Library/Class/Entry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Class/Entry.php b/Library/Class/Entry.php
index ce39db954e..78edc8227a 100644
--- a/Library/Class/Entry.php
+++ b/Library/Class/Entry.php
@@ -39,7 +39,7 @@ class Entry
     public function __construct(string $className, private CompilationContext $compilationContext)
     {
         $this->classname = $this->compilationContext->getFullName($className);
-        $this->classEntries = require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
+        $this->classEntries = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
 
         foreach ($this->classEntries as $key => $val) {
             unset($this->classEntries[$key]);

From 5b8e2b1680cf80569f44c5bf7a0eae71db8eadb7 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 20:18:24 +0000
Subject: [PATCH 098/375] #2407 - Fix CS

---
 Library/Backend/Backend.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Library/Backend/Backend.php b/Library/Backend/Backend.php
index e9845001bd..c37867a6d5 100644
--- a/Library/Backend/Backend.php
+++ b/Library/Backend/Backend.php
@@ -250,15 +250,15 @@ public function getTypeofCondition(
         $variableName = $this->getVariableCode($variableVariable);
 
         return match ($value) {
-            'array' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_ARRAY',
-            'object' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_OBJECT',
-            'null' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_NULL',
-            'string' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_STRING',
-            'int', 'long', 'integer' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_LONG',
-            'double', 'float' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_DOUBLE',
-            'boolean', 'bool' => '((Z_TYPE_P(' . $variableName . ') == IS_TRUE || Z_TYPE_P(' . $variableName . ') == IS_FALSE) ' . $operator . ' 1)',
-            'resource' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_RESOURCE',
-            'callable' => 'zephir_is_callable(' . $variableName . ') ' . $operator . ' 1',
+            'array' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_ARRAY',
+            'object' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_OBJECT',
+            'null' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_NULL',
+            'string' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_STRING',
+            'int', 'long', 'integer' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_LONG',
+            'double', 'float' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_DOUBLE',
+            'boolean', 'bool' => '((Z_TYPE_P('.$variableName.') == IS_TRUE || Z_TYPE_P('.$variableName.') == IS_FALSE) '.$operator.' 1)',
+            'resource' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_RESOURCE',
+            'callable' => 'zephir_is_callable('.$variableName.') '.$operator.' 1',
             default => throw new CompilerException(sprintf('Unknown type: "%s" in typeof comparison', $value)),
         };
     }
@@ -304,11 +304,12 @@ public function generateInitCode(&$groupVariables, $type, $pointer, Variable $va
 
         if ($isComplex && !$variable->isDoublePointer()) {
             $groupVariables[] = $variable->getName();
+
             return match ($variable->getRealname()) {
-                '__$null' => "\t" . 'ZVAL_NULL(&' . $variable->getName() . ');',
-                '__$true' => "\t" . 'ZVAL_BOOL(&' . $variable->getName() . ', 1);',
-                '__$false' => "\t" . 'ZVAL_BOOL(&' . $variable->getName() . ', 0);',
-                default => "\t" . 'ZVAL_UNDEF(&' . $variable->getName() . ');',
+                '__$null' => "\t".'ZVAL_NULL(&'.$variable->getName().');',
+                '__$true' => "\t".'ZVAL_BOOL(&'.$variable->getName().', 1);',
+                '__$false' => "\t".'ZVAL_BOOL(&'.$variable->getName().', 0);',
+                default => "\t".'ZVAL_UNDEF(&'.$variable->getName().');',
             };
         }
 

From a41f4f6d6ab003f5175cf3aef7c5da9f865ba0bf Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 20:54:44 +0000
Subject: [PATCH 099/375] Update badges

---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 267f5cf880..c3f9080951 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 # [![Zephir][zephir logo]][web site]
 
+[![Discord][discord-badge]](https://phalcon.io/discord)
 [![Build on Linux|macOS|Windows][actions main]][actions link]
-[![Nightly Builds on Linux][actions nightly]][actions link]
 [![Latest Stable Version][version badge]][packagist link]
+[![PHP from Packagist][packagist ver]][packagist link]
+[![Packagist][packagist dd]][packagist stats]
 [![MIT License][license badge]](./LICENSE)
 
 [Zephir][web site] - is a high level programming language that eases the creation and maintainability of extensions for PHP.
@@ -56,8 +58,11 @@ Zephir licensed under the MIT License. See the [LICENSE](./LICENSE) file for mor
 
 [actions link]:     https://github.com/zephir-lang/zephir/actions
 [actions main]:     https://github.com/zephir-lang/zephir/actions/workflows/main.yml/badge.svg
-[actions nightly]:  https://github.com/zephir-lang/zephir/actions/workflows/nightly.yml/badge.svg
 
 [version badge]:    https://poser.pugx.org/phalcon/zephir/v/stable.svg
 [packagist link]:   https://packagist.org/packages/phalcon/zephir
+[packagist dd]:     https://img.shields.io/packagist/dd/phalcon/zephir
+[packagist stats]:  https://packagist.org/packages/phalcon/zephir/stats
+[packagist ver]:    https://img.shields.io/packagist/php-v/phalcon/migrations
 [license badge]:    https://poser.pugx.org/phalcon/zephir/license.svg
+[discord-badge]:    https://img.shields.io/discord/310910488152375297?label=Discord&logo=discord&style=flat-square

From 72659ea9919fb4d08a629ad38924818367b3325e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 21:10:09 +0000
Subject: [PATCH 100/375] Rename `Library/` to `src/`

---
 .php-cs-fixer.dist.php                                        | 4 ++--
 box.json.dist                                                 | 4 ++--
 composer.json                                                 | 4 ++--
 phpcs.xml.dist                                                | 2 +-
 phpunit.xml.dist                                              | 2 +-
 {Library => src}/AliasManager.php                             | 0
 {Library => src}/Backend/Backend.php                          | 0
 {Library => src}/Backend/FcallManager.php                     | 0
 {Library => src}/Backend/FcallManagerInterface.php            | 0
 {Library => src}/Backend/StringsManager.php                   | 0
 {Library => src}/Backend/VariablesManager.php                 | 0
 {Library => src}/Branch.php                                   | 0
 {Library => src}/BranchManager.php                            | 0
 {Library => src}/Builder/FunctionCallBuilder.php              | 0
 .../Builder/Operators/AbstractOperatorBuilder.php             | 0
 {Library => src}/Builder/Operators/CastOperatorBuilder.php    | 0
 {Library => src}/Builder/Operators/UnaryOperatorBuilder.php   | 0
 .../Builder/Statements/AbstractStatementBuilder.php           | 0
 {Library => src}/Builder/Statements/IfStatementBuilder.php    | 0
 {Library => src}/Builder/Statements/LetStatementBuilder.php   | 0
 {Library => src}/Builder/StatementsBlockBuilder.php           | 0
 {Library => src}/Cache/ClassEntryCache.php                    | 0
 {Library => src}/Cache/FunctionCache.php                      | 0
 {Library => src}/Cache/Manager.php                            | 0
 {Library => src}/Cache/MethodCache.php                        | 0
 {Library => src}/Cache/SlotsCache.php                         | 0
 {Library => src}/Cache/StaticMethodCache.php                  | 0
 {Library => src}/Call.php                                     | 0
 {Library => src}/Class/Constant.php                           | 0
 {Library => src}/Class/Definition/AbstractDefinition.php      | 0
 {Library => src}/Class/Definition/Definition.php              | 0
 {Library => src}/Class/Definition/DefinitionRuntime.php       | 0
 {Library => src}/Class/Entry.php                              | 0
 {Library => src}/Class/Method/Method.php                      | 0
 {Library => src}/Class/Method/Parameters.php                  | 0
 {Library => src}/Class/Property.php                           | 0
 {Library => src}/Code/ArgInfoDefinition.php                   | 0
 {Library => src}/Code/Builder/Struct.php                      | 0
 {Library => src}/Code/Printer.php                             | 0
 {Library => src}/CompilationContext.php                       | 0
 {Library => src}/CompiledExpression.php                       | 0
 {Library => src}/Compiler.php                                 | 0
 {Library => src}/Compiler/CompilerFileFactory.php             | 0
 {Library => src}/Compiler/FileInterface.php                   | 0
 {Library => src}/CompilerFile.php                             | 0
 {Library => src}/CompilerFileAnonymous.php                    | 0
 {Library => src}/Config.php                                   | 0
 {Library => src}/ConfigException.php                          | 0
 {Library => src}/Console/Application.php                      | 0
 {Library => src}/Console/Command/AbstractCommand.php          | 0
 {Library => src}/Console/Command/ApiCommand.php               | 0
 {Library => src}/Console/Command/BuildCommand.php             | 0
 {Library => src}/Console/Command/CleanCommand.php             | 0
 {Library => src}/Console/Command/CompileCommand.php           | 0
 .../Console/Command/DevelopmentModeAwareTrait.php             | 0
 {Library => src}/Console/Command/FullCleanCommand.php         | 0
 {Library => src}/Console/Command/GenerateCommand.php          | 0
 {Library => src}/Console/Command/InitCommand.php              | 0
 {Library => src}/Console/Command/InstallCommand.php           | 0
 {Library => src}/Console/Command/ListCommand.php              | 0
 {Library => src}/Console/Command/RemoveOptionsTrait.php       | 0
 {Library => src}/Console/Command/StubsCommand.php             | 0
 {Library => src}/Console/Command/ZflagsAwareTrait.php         | 0
 {Library => src}/Console/ErrorListener.php                    | 0
 {Library => src}/Detectors/ForValueUseDetector.php            | 0
 {Library => src}/Detectors/ReadDetector.php                   | 0
 {Library => src}/Detectors/WriteDetector.php                  | 0
 {Library => src}/Documentation.php                            | 0
 {Library => src}/Documentation/Annotation.php                 | 0
 {Library => src}/Documentation/Annotation/Link.php            | 0
 .../Documentation/Annotation/ReturnAnnotation.php             | 0
 {Library => src}/Documentation/Annotation/See.php             | 0
 {Library => src}/Documentation/Docblock.php                   | 0
 {Library => src}/Documentation/DocblockParser.php             | 0
 {Library => src}/Documentation/File/ClassFile.php             | 0
 {Library => src}/Documentation/File/ClassesFile.php           | 0
 {Library => src}/Documentation/File/IndexFile.php             | 0
 {Library => src}/Documentation/File/NamespaceFile.php         | 0
 {Library => src}/Documentation/File/NamespacesFile.php        | 0
 {Library => src}/Documentation/File/Sitemap.php               | 0
 {Library => src}/Documentation/File/SourceFile.php            | 0
 {Library => src}/Documentation/FileInterface.php              | 0
 {Library => src}/Documentation/NamespaceAccessor.php          | 0
 {Library => src}/Documentation/NamespaceHelper.php            | 0
 {Library => src}/Documentation/Template.php                   | 0
 {Library => src}/Documentation/Theme.php                      | 0
 {Library => src}/Exception.php                                | 0
 {Library => src}/Exception/CompilerException.php              | 0
 {Library => src}/Exception/ExceptionExtraAwareTrait.php       | 0
 {Library => src}/Exception/ExceptionInterface.php             | 0
 {Library => src}/Exception/FileSystemException.php            | 0
 {Library => src}/Exception/IllegalOperationException.php      | 0
 {Library => src}/Exception/IllegalStateException.php          | 0
 {Library => src}/Exception/InvalidArgumentException.php       | 0
 {Library => src}/Exception/InvalidTypeException.php           | 0
 {Library => src}/Exception/LogicException.php                 | 0
 {Library => src}/Exception/NotImplementedException.php        | 0
 {Library => src}/Exception/ParseException.php                 | 0
 {Library => src}/Exception/RuntimeException.php               | 0
 {Library => src}/Expression.php                               | 0
 {Library => src}/Expression/Builder/AbstractBuilder.php       | 0
 {Library => src}/Expression/Builder/BuilderFactory.php        | 0
 .../Expression/Builder/Factory/OperatorsFactory.php           | 0
 .../Expression/Builder/Factory/StatementsFactory.php          | 0
 .../Expression/Builder/Operators/AbstractOperator.php         | 0
 .../Expression/Builder/Operators/AssignPropertyOperator.php   | 0
 .../Expression/Builder/Operators/AssignVariableOperator.php   | 0
 .../Expression/Builder/Operators/BinaryOperator.php           | 0
 {Library => src}/Expression/Builder/Operators/RawOperator.php | 0
 .../Expression/Builder/Operators/UnaryOperator.php            | 0
 {Library => src}/Expression/Builder/RawExpression.php         | 0
 .../Expression/Builder/Statements/AbstractStatement.php       | 0
 .../Expression/Builder/Statements/CallFunctionStatement.php   | 0
 .../Expression/Builder/Statements/CallMethodStatement.php     | 0
 .../Expression/Builder/Statements/CallStaticStatement.php     | 0
 .../Expression/Builder/Statements/IfStatement.php             | 0
 .../Expression/Builder/Statements/LetStatement.php            | 0
 .../Expression/Builder/Statements/RawStatement.php            | 0
 .../Expression/Builder/Statements/StatementsBlock.php         | 0
 {Library => src}/Expression/Closure.php                       | 0
 {Library => src}/Expression/ClosureArrow.php                  | 0
 {Library => src}/Expression/Constants.php                     | 0
 {Library => src}/Expression/NativeArray.php                   | 0
 {Library => src}/Expression/NativeArrayAccess.php             | 0
 {Library => src}/Expression/PropertyAccess.php                | 0
 {Library => src}/Expression/PropertyDynamicAccess.php         | 0
 {Library => src}/Expression/Reference.php                     | 0
 {Library => src}/Expression/StaticConstantAccess.php          | 0
 {Library => src}/Expression/StaticPropertyAccess.php          | 0
 {Library => src}/FileSystem/FileSystemInterface.php           | 0
 {Library => src}/FileSystem/HardDisk.php                      | 0
 {Library => src}/FunctionCall.php                             | 0
 {Library => src}/FunctionDefinition.php                       | 0
 {Library => src}/GlobalConstant.php                           | 0
 {Library => src}/HeadersManager.php                           | 0
 {Library => src}/LiteralCompiledExpression.php                | 0
 {Library => src}/Logger/Formatter/CompilerFormatter.php       | 0
 {Library => src}/MethodCall.php                               | 0
 {Library => src}/Operators/AbstractOperator.php               | 0
 {Library => src}/Operators/Arithmetical/AddOperator.php       | 0
 .../Operators/Arithmetical/ArithmeticalBaseOperator.php       | 0
 {Library => src}/Operators/Arithmetical/DivOperator.php       | 0
 {Library => src}/Operators/Arithmetical/ModOperator.php       | 0
 {Library => src}/Operators/Arithmetical/MulOperator.php       | 0
 {Library => src}/Operators/Arithmetical/SubOperator.php       | 0
 {Library => src}/Operators/Bitwise/BitwiseAndOperator.php     | 0
 {Library => src}/Operators/Bitwise/BitwiseBaseOperator.php    | 0
 {Library => src}/Operators/Bitwise/BitwiseNotOperator.php     | 0
 {Library => src}/Operators/Bitwise/BitwiseOrOperator.php      | 0
 {Library => src}/Operators/Bitwise/BitwiseXorOperator.php     | 0
 {Library => src}/Operators/Bitwise/ShiftLeftOperator.php      | 0
 {Library => src}/Operators/Bitwise/ShiftRightOperator.php     | 0
 .../Operators/Comparison/ComparisonBaseOperator.php           | 0
 {Library => src}/Operators/Comparison/EqualsOperator.php      | 0
 .../Operators/Comparison/GreaterEqualOperator.php             | 0
 {Library => src}/Operators/Comparison/GreaterOperator.php     | 0
 {Library => src}/Operators/Comparison/IdenticalOperator.php   | 0
 {Library => src}/Operators/Comparison/LessEqualOperator.php   | 0
 {Library => src}/Operators/Comparison/LessOperator.php        | 0
 {Library => src}/Operators/Comparison/NotEqualsOperator.php   | 0
 .../Operators/Comparison/NotIdenticalOperator.php             | 0
 {Library => src}/Operators/Logical/AndOperator.php            | 0
 {Library => src}/Operators/Logical/LogicalBaseOperator.php    | 0
 {Library => src}/Operators/Logical/OrOperator.php             | 0
 {Library => src}/Operators/Other/CastOperator.php             | 0
 {Library => src}/Operators/Other/CloneOperator.php            | 0
 {Library => src}/Operators/Other/ConcatOperator.php           | 0
 {Library => src}/Operators/Other/EmptyOperator.php            | 0
 {Library => src}/Operators/Other/FetchOperator.php            | 0
 {Library => src}/Operators/Other/InstanceOfOperator.php       | 0
 {Library => src}/Operators/Other/IssetOperator.php            | 0
 {Library => src}/Operators/Other/LikelyOperator.php           | 0
 {Library => src}/Operators/Other/NewInstanceOperator.php      | 0
 {Library => src}/Operators/Other/NewInstanceTypeOperator.php  | 0
 {Library => src}/Operators/Other/RangeExclusiveOperator.php   | 0
 {Library => src}/Operators/Other/RangeInclusiveOperator.php   | 0
 {Library => src}/Operators/Other/RequireOnceOperator.php      | 0
 {Library => src}/Operators/Other/RequireOperator.php          | 0
 {Library => src}/Operators/Other/ShortTernaryOperator.php     | 0
 {Library => src}/Operators/Other/TernaryOperator.php          | 0
 {Library => src}/Operators/Other/TypeHintOperator.php         | 0
 {Library => src}/Operators/Other/TypeOfOperator.php           | 0
 {Library => src}/Operators/Other/UnlikelyOperator.php         | 0
 {Library => src}/Operators/Unary/MinusOperator.php            | 0
 {Library => src}/Operators/Unary/NotOperator.php              | 0
 {Library => src}/Optimizers/EvalExpression.php                | 0
 {Library => src}/Optimizers/FunctionCall/ACosOptimizer.php    | 0
 {Library => src}/Optimizers/FunctionCall/ASinOptimizer.php    | 0
 .../Optimizers/FunctionCall/AddslashesOptimizer.php           | 0
 .../Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php       | 0
 .../Optimizers/FunctionCall/ArrayKeysOptimizer.php            | 0
 .../Optimizers/FunctionCall/ArrayMergeOptimizer.php           | 0
 .../Optimizers/FunctionCall/BasenameOptimizer.php             | 0
 .../Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php    | 0
 .../Optimizers/FunctionCall/CallUserFuncOptimizer.php         | 0
 .../Optimizers/FunctionCall/CamelizeOptimizer.php             | 0
 {Library => src}/Optimizers/FunctionCall/CeilOptimizer.php    | 0
 .../Optimizers/FunctionCall/ClassExistsOptimizer.php          | 0
 .../Optimizers/FunctionCall/CompareMtimeOptimizer.php         | 0
 {Library => src}/Optimizers/FunctionCall/CosOptimizer.php     | 0
 {Library => src}/Optimizers/FunctionCall/CountOptimizer.php   | 0
 {Library => src}/Optimizers/FunctionCall/Crc32Optimizer.php   | 0
 .../Optimizers/FunctionCall/CreateArrayOptimizer.php          | 0
 .../Optimizers/FunctionCall/CreateInstanceOptimizer.php       | 0
 .../Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php | 0
 .../Optimizers/FunctionCall/CreateSymbolTableOptimizer.php    | 0
 {Library => src}/Optimizers/FunctionCall/DieOptimizer.php     | 0
 .../Optimizers/FunctionCall/DoublevalOptimizer.php            | 0
 .../Optimizers/FunctionCall/EndsWithOptimizer.php             | 0
 {Library => src}/Optimizers/FunctionCall/EvalOptimizer.php    | 0
 {Library => src}/Optimizers/FunctionCall/ExitOptimizer.php    | 0
 {Library => src}/Optimizers/FunctionCall/ExplodeOptimizer.php | 0
 {Library => src}/Optimizers/FunctionCall/FcloseOptimizer.php  | 0
 {Library => src}/Optimizers/FunctionCall/FeofOptimizer.php    | 0
 .../Optimizers/FunctionCall/FileExistsOptimizer.php           | 0
 .../Optimizers/FunctionCall/FileGetContentsOptimizer.php      | 0
 .../Optimizers/FunctionCall/FilePutContentsOptimizer.php      | 0
 .../Optimizers/FunctionCall/FilemtimeOptimizer.php            | 0
 {Library => src}/Optimizers/FunctionCall/FloorOptimizer.php   | 0
 .../Optimizers/FunctionCall/FuncGetArgOptimizer.php           | 0
 .../Optimizers/FunctionCall/FuncGetArgsOptimizer.php          | 0
 .../Optimizers/FunctionCall/FuncNumArgsOptimizer.php          | 0
 .../Optimizers/FunctionCall/FunctionExistsOptimizer.php       | 0
 {Library => src}/Optimizers/FunctionCall/FwriteOptimizer.php  | 0
 .../Optimizers/FunctionCall/GetCalledClassOptimizer.php       | 0
 .../Optimizers/FunctionCall/GetClassLowerOptimizer.php        | 0
 .../Optimizers/FunctionCall/GetClassNsOptimizer.php           | 0
 .../Optimizers/FunctionCall/GetClassOptimizer.php             | 0
 .../Optimizers/FunctionCall/GetDefinedVarsOptimizer.php       | 0
 .../Optimizers/FunctionCall/GetNsClassOptimizer.php           | 0
 {Library => src}/Optimizers/FunctionCall/GettypeOptimizer.php | 0
 .../Optimizers/FunctionCall/GlobalsGetOptimizer.php           | 0
 .../Optimizers/FunctionCall/GlobalsSetOptimizer.php           | 0
 .../Optimizers/FunctionCall/HashEqualsOptimizer.php           | 0
 {Library => src}/Optimizers/FunctionCall/ImplodeOptimizer.php | 0
 {Library => src}/Optimizers/FunctionCall/InArrayOptimizer.php | 0
 .../Optimizers/FunctionCall/InterfaceExistsOptimizer.php      | 0
 {Library => src}/Optimizers/FunctionCall/IntvalOptimizer.php  | 0
 {Library => src}/Optimizers/FunctionCall/IsArrayOptimizer.php | 0
 {Library => src}/Optimizers/FunctionCall/IsBoolOptimizer.php  | 0
 .../Optimizers/FunctionCall/IsCallableOptimizer.php           | 0
 {Library => src}/Optimizers/FunctionCall/IsIntOptimizer.php   | 0
 {Library => src}/Optimizers/FunctionCall/IsNullOptimizer.php  | 0
 .../Optimizers/FunctionCall/IsNumericOptimizer.php            | 0
 .../Optimizers/FunctionCall/IsObjectOptimizer.php             | 0
 .../Optimizers/FunctionCall/IsPhpVersionOptimizer.php         | 0
 .../Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php    | 0
 .../Optimizers/FunctionCall/IsResourceOptimizer.php           | 0
 .../Optimizers/FunctionCall/IsScalarOptimizer.php             | 0
 .../Optimizers/FunctionCall/IsStringOptimizer.php             | 0
 {Library => src}/Optimizers/FunctionCall/JoinOptimizer.php    | 0
 .../Optimizers/FunctionCall/JsonDecodeOptimizer.php           | 0
 .../Optimizers/FunctionCall/JsonEncodeOptimizer.php           | 0
 {Library => src}/Optimizers/FunctionCall/LdexpOptimizer.php   | 0
 {Library => src}/Optimizers/FunctionCall/LtrimOptimizer.php   | 0
 {Library => src}/Optimizers/FunctionCall/Md5Optimizer.php     | 0
 {Library => src}/Optimizers/FunctionCall/MemstrOptimizer.php  | 0
 .../Optimizers/FunctionCall/MergeAppendOptimizer.php          | 0
 .../Optimizers/FunctionCall/MethodExistsOptimizer.php         | 0
 .../Optimizers/FunctionCall/MicrotimeOptimizer.php            | 0
 {Library => src}/Optimizers/FunctionCall/PowOptimizer.php     | 0
 .../Optimizers/FunctionCall/PregMatchAllOptimizer.php         | 0
 .../Optimizers/FunctionCall/PregMatchOptimizer.php            | 0
 .../Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php   | 0
 {Library => src}/Optimizers/FunctionCall/RoundOptimizer.php   | 0
 {Library => src}/Optimizers/FunctionCall/RtrimOptimizer.php   | 0
 {Library => src}/Optimizers/FunctionCall/SinOptimizer.php     | 0
 {Library => src}/Optimizers/FunctionCall/SqrtOptimizer.php    | 0
 .../Optimizers/FunctionCall/StartsWithOptimizer.php           | 0
 .../Optimizers/FunctionCall/StrReplaceOptimizer.php           | 0
 .../Optimizers/FunctionCall/StripcslashesOptimizer.php        | 0
 .../Optimizers/FunctionCall/StripslashesOptimizer.php         | 0
 {Library => src}/Optimizers/FunctionCall/StrlenOptimizer.php  | 0
 {Library => src}/Optimizers/FunctionCall/StrposOptimizer.php  | 0
 {Library => src}/Optimizers/FunctionCall/StrtokOptimizer.php  | 0
 .../Optimizers/FunctionCall/StrtolowerOptimizer.php           | 0
 .../Optimizers/FunctionCall/StrtoupperOptimizer.php           | 0
 {Library => src}/Optimizers/FunctionCall/SubstrOptimizer.php  | 0
 {Library => src}/Optimizers/FunctionCall/TanOptimizer.php     | 0
 {Library => src}/Optimizers/FunctionCall/TimeOptimizer.php    | 0
 {Library => src}/Optimizers/FunctionCall/TrimOptimizer.php    | 0
 {Library => src}/Optimizers/FunctionCall/UcfirstOptimizer.php | 0
 .../Optimizers/FunctionCall/UncamelizeOptimizer.php           | 0
 .../Optimizers/FunctionCall/UniqueKeyOptimizer.php            | 0
 .../Optimizers/FunctionCall/UniquePathKeyOptimizer.php        | 0
 {Library => src}/Optimizers/FunctionCall/VarDumpOptimizer.php | 0
 .../Optimizers/FunctionCall/VarExportOptimizer.php            | 0
 .../Optimizers/FunctionCall/ZephirStringToHexOptimizer.php    | 0
 {Library => src}/Optimizers/IsTypeOptimizerAbstract.php       | 0
 {Library => src}/Optimizers/MathOptimizer.php                 | 0
 {Library => src}/Optimizers/OptimizerAbstract.php             | 0
 {Library => src}/Parser/Manager.php                           | 0
 {Library => src}/Parser/Parser.php                            | 0
 {Library => src}/Passes/CallGathererPass.php                  | 0
 {Library => src}/Passes/LocalContextPass.php                  | 0
 {Library => src}/Passes/LoopBreakPass.php                     | 0
 {Library => src}/Passes/MutateGathererPass.php                | 0
 {Library => src}/Passes/SkipVariantInit.php                   | 0
 {Library => src}/Passes/StaticTypeInference.php               | 0
 {Library => src}/Statements/BreakStatement.php                | 0
 {Library => src}/Statements/ContinueStatement.php             | 0
 {Library => src}/Statements/DeclareStatement.php              | 0
 {Library => src}/Statements/DoWhileStatement.php              | 0
 {Library => src}/Statements/EchoStatement.php                 | 0
 {Library => src}/Statements/ForStatement.php                  | 0
 {Library => src}/Statements/IfStatement.php                   | 0
 {Library => src}/Statements/Let/ArrayIndex.php                | 0
 {Library => src}/Statements/Let/ArrayIndexAppend.php          | 0
 {Library => src}/Statements/Let/Decr.php                      | 0
 {Library => src}/Statements/Let/ExportSymbol.php              | 0
 {Library => src}/Statements/Let/ExportSymbolString.php        | 0
 {Library => src}/Statements/Let/Incr.php                      | 0
 {Library => src}/Statements/Let/ObjectDynamicProperty.php     | 0
 .../Statements/Let/ObjectDynamicStringProperty.php            | 0
 {Library => src}/Statements/Let/ObjectProperty.php            | 0
 {Library => src}/Statements/Let/ObjectPropertyAppend.php      | 0
 {Library => src}/Statements/Let/ObjectPropertyArrayIndex.php  | 0
 .../Statements/Let/ObjectPropertyArrayIndexAppend.php         | 0
 {Library => src}/Statements/Let/ObjectPropertyDecr.php        | 0
 {Library => src}/Statements/Let/ObjectPropertyIncr.php        | 0
 {Library => src}/Statements/Let/StaticProperty.php            | 0
 {Library => src}/Statements/Let/StaticPropertyAdd.php         | 0
 {Library => src}/Statements/Let/StaticPropertyAppend.php      | 0
 {Library => src}/Statements/Let/StaticPropertyArrayIndex.php  | 0
 .../Statements/Let/StaticPropertyArrayIndexAppend.php         | 0
 {Library => src}/Statements/Let/StaticPropertySub.php         | 0
 {Library => src}/Statements/Let/Variable.php                  | 0
 {Library => src}/Statements/Let/VariableAppend.php            | 0
 {Library => src}/Statements/LetStatement.php                  | 0
 {Library => src}/Statements/LoopStatement.php                 | 0
 {Library => src}/Statements/RequireOnceStatement.php          | 0
 {Library => src}/Statements/RequireStatement.php              | 0
 {Library => src}/Statements/ReturnStatement.php               | 0
 {Library => src}/Statements/StatementAbstract.php             | 0
 {Library => src}/Statements/SwitchStatement.php               | 0
 {Library => src}/Statements/ThrowStatement.php                | 0
 {Library => src}/Statements/TryCatchStatement.php             | 0
 {Library => src}/Statements/UnsetStatement.php                | 0
 {Library => src}/Statements/WhileStatement.php                | 0
 {Library => src}/StatementsBlock.php                          | 0
 {Library => src}/StaticCall.php                               | 0
 {Library => src}/StringsManager.php                           | 0
 {Library => src}/Stubs/DocBlock.php                           | 0
 {Library => src}/Stubs/Generator.php                          | 0
 {Library => src}/Stubs/MethodDocBlock.php                     | 0
 {Library => src}/SymbolTable.php                              | 0
 {Library => src}/TypeAwareInterface.php                       | 0
 {Library => src}/Types/AbstractType.php                       | 0
 {Library => src}/Types/ArrayType.php                          | 0
 {Library => src}/Types/CharType.php                           | 0
 {Library => src}/Types/DoubleType.php                         | 0
 {Library => src}/Types/IntType.php                            | 0
 {Library => src}/Types/IstringType.php                        | 0
 {Library => src}/Types/StringType.php                         | 0
 {Library => src}/Types/Types.php                              | 0
 {Library => src}/Variable/Globals.php                         | 0
 {Library => src}/Variable/Variable.php                        | 0
 {Library => src}/Zephir.php                                   | 0
 {Library => src}/functions.php                                | 0
 zephir                                                        | 2 +-
 360 files changed, 9 insertions(+), 9 deletions(-)
 rename {Library => src}/AliasManager.php (100%)
 rename {Library => src}/Backend/Backend.php (100%)
 rename {Library => src}/Backend/FcallManager.php (100%)
 rename {Library => src}/Backend/FcallManagerInterface.php (100%)
 rename {Library => src}/Backend/StringsManager.php (100%)
 rename {Library => src}/Backend/VariablesManager.php (100%)
 rename {Library => src}/Branch.php (100%)
 rename {Library => src}/BranchManager.php (100%)
 rename {Library => src}/Builder/FunctionCallBuilder.php (100%)
 rename {Library => src}/Builder/Operators/AbstractOperatorBuilder.php (100%)
 rename {Library => src}/Builder/Operators/CastOperatorBuilder.php (100%)
 rename {Library => src}/Builder/Operators/UnaryOperatorBuilder.php (100%)
 rename {Library => src}/Builder/Statements/AbstractStatementBuilder.php (100%)
 rename {Library => src}/Builder/Statements/IfStatementBuilder.php (100%)
 rename {Library => src}/Builder/Statements/LetStatementBuilder.php (100%)
 rename {Library => src}/Builder/StatementsBlockBuilder.php (100%)
 rename {Library => src}/Cache/ClassEntryCache.php (100%)
 rename {Library => src}/Cache/FunctionCache.php (100%)
 rename {Library => src}/Cache/Manager.php (100%)
 rename {Library => src}/Cache/MethodCache.php (100%)
 rename {Library => src}/Cache/SlotsCache.php (100%)
 rename {Library => src}/Cache/StaticMethodCache.php (100%)
 rename {Library => src}/Call.php (100%)
 rename {Library => src}/Class/Constant.php (100%)
 rename {Library => src}/Class/Definition/AbstractDefinition.php (100%)
 rename {Library => src}/Class/Definition/Definition.php (100%)
 rename {Library => src}/Class/Definition/DefinitionRuntime.php (100%)
 rename {Library => src}/Class/Entry.php (100%)
 rename {Library => src}/Class/Method/Method.php (100%)
 rename {Library => src}/Class/Method/Parameters.php (100%)
 rename {Library => src}/Class/Property.php (100%)
 rename {Library => src}/Code/ArgInfoDefinition.php (100%)
 rename {Library => src}/Code/Builder/Struct.php (100%)
 rename {Library => src}/Code/Printer.php (100%)
 rename {Library => src}/CompilationContext.php (100%)
 rename {Library => src}/CompiledExpression.php (100%)
 rename {Library => src}/Compiler.php (100%)
 rename {Library => src}/Compiler/CompilerFileFactory.php (100%)
 rename {Library => src}/Compiler/FileInterface.php (100%)
 rename {Library => src}/CompilerFile.php (100%)
 rename {Library => src}/CompilerFileAnonymous.php (100%)
 rename {Library => src}/Config.php (100%)
 rename {Library => src}/ConfigException.php (100%)
 rename {Library => src}/Console/Application.php (100%)
 rename {Library => src}/Console/Command/AbstractCommand.php (100%)
 rename {Library => src}/Console/Command/ApiCommand.php (100%)
 rename {Library => src}/Console/Command/BuildCommand.php (100%)
 rename {Library => src}/Console/Command/CleanCommand.php (100%)
 rename {Library => src}/Console/Command/CompileCommand.php (100%)
 rename {Library => src}/Console/Command/DevelopmentModeAwareTrait.php (100%)
 rename {Library => src}/Console/Command/FullCleanCommand.php (100%)
 rename {Library => src}/Console/Command/GenerateCommand.php (100%)
 rename {Library => src}/Console/Command/InitCommand.php (100%)
 rename {Library => src}/Console/Command/InstallCommand.php (100%)
 rename {Library => src}/Console/Command/ListCommand.php (100%)
 rename {Library => src}/Console/Command/RemoveOptionsTrait.php (100%)
 rename {Library => src}/Console/Command/StubsCommand.php (100%)
 rename {Library => src}/Console/Command/ZflagsAwareTrait.php (100%)
 rename {Library => src}/Console/ErrorListener.php (100%)
 rename {Library => src}/Detectors/ForValueUseDetector.php (100%)
 rename {Library => src}/Detectors/ReadDetector.php (100%)
 rename {Library => src}/Detectors/WriteDetector.php (100%)
 rename {Library => src}/Documentation.php (100%)
 rename {Library => src}/Documentation/Annotation.php (100%)
 rename {Library => src}/Documentation/Annotation/Link.php (100%)
 rename {Library => src}/Documentation/Annotation/ReturnAnnotation.php (100%)
 rename {Library => src}/Documentation/Annotation/See.php (100%)
 rename {Library => src}/Documentation/Docblock.php (100%)
 rename {Library => src}/Documentation/DocblockParser.php (100%)
 rename {Library => src}/Documentation/File/ClassFile.php (100%)
 rename {Library => src}/Documentation/File/ClassesFile.php (100%)
 rename {Library => src}/Documentation/File/IndexFile.php (100%)
 rename {Library => src}/Documentation/File/NamespaceFile.php (100%)
 rename {Library => src}/Documentation/File/NamespacesFile.php (100%)
 rename {Library => src}/Documentation/File/Sitemap.php (100%)
 rename {Library => src}/Documentation/File/SourceFile.php (100%)
 rename {Library => src}/Documentation/FileInterface.php (100%)
 rename {Library => src}/Documentation/NamespaceAccessor.php (100%)
 rename {Library => src}/Documentation/NamespaceHelper.php (100%)
 rename {Library => src}/Documentation/Template.php (100%)
 rename {Library => src}/Documentation/Theme.php (100%)
 rename {Library => src}/Exception.php (100%)
 rename {Library => src}/Exception/CompilerException.php (100%)
 rename {Library => src}/Exception/ExceptionExtraAwareTrait.php (100%)
 rename {Library => src}/Exception/ExceptionInterface.php (100%)
 rename {Library => src}/Exception/FileSystemException.php (100%)
 rename {Library => src}/Exception/IllegalOperationException.php (100%)
 rename {Library => src}/Exception/IllegalStateException.php (100%)
 rename {Library => src}/Exception/InvalidArgumentException.php (100%)
 rename {Library => src}/Exception/InvalidTypeException.php (100%)
 rename {Library => src}/Exception/LogicException.php (100%)
 rename {Library => src}/Exception/NotImplementedException.php (100%)
 rename {Library => src}/Exception/ParseException.php (100%)
 rename {Library => src}/Exception/RuntimeException.php (100%)
 rename {Library => src}/Expression.php (100%)
 rename {Library => src}/Expression/Builder/AbstractBuilder.php (100%)
 rename {Library => src}/Expression/Builder/BuilderFactory.php (100%)
 rename {Library => src}/Expression/Builder/Factory/OperatorsFactory.php (100%)
 rename {Library => src}/Expression/Builder/Factory/StatementsFactory.php (100%)
 rename {Library => src}/Expression/Builder/Operators/AbstractOperator.php (100%)
 rename {Library => src}/Expression/Builder/Operators/AssignPropertyOperator.php (100%)
 rename {Library => src}/Expression/Builder/Operators/AssignVariableOperator.php (100%)
 rename {Library => src}/Expression/Builder/Operators/BinaryOperator.php (100%)
 rename {Library => src}/Expression/Builder/Operators/RawOperator.php (100%)
 rename {Library => src}/Expression/Builder/Operators/UnaryOperator.php (100%)
 rename {Library => src}/Expression/Builder/RawExpression.php (100%)
 rename {Library => src}/Expression/Builder/Statements/AbstractStatement.php (100%)
 rename {Library => src}/Expression/Builder/Statements/CallFunctionStatement.php (100%)
 rename {Library => src}/Expression/Builder/Statements/CallMethodStatement.php (100%)
 rename {Library => src}/Expression/Builder/Statements/CallStaticStatement.php (100%)
 rename {Library => src}/Expression/Builder/Statements/IfStatement.php (100%)
 rename {Library => src}/Expression/Builder/Statements/LetStatement.php (100%)
 rename {Library => src}/Expression/Builder/Statements/RawStatement.php (100%)
 rename {Library => src}/Expression/Builder/Statements/StatementsBlock.php (100%)
 rename {Library => src}/Expression/Closure.php (100%)
 rename {Library => src}/Expression/ClosureArrow.php (100%)
 rename {Library => src}/Expression/Constants.php (100%)
 rename {Library => src}/Expression/NativeArray.php (100%)
 rename {Library => src}/Expression/NativeArrayAccess.php (100%)
 rename {Library => src}/Expression/PropertyAccess.php (100%)
 rename {Library => src}/Expression/PropertyDynamicAccess.php (100%)
 rename {Library => src}/Expression/Reference.php (100%)
 rename {Library => src}/Expression/StaticConstantAccess.php (100%)
 rename {Library => src}/Expression/StaticPropertyAccess.php (100%)
 rename {Library => src}/FileSystem/FileSystemInterface.php (100%)
 rename {Library => src}/FileSystem/HardDisk.php (100%)
 rename {Library => src}/FunctionCall.php (100%)
 rename {Library => src}/FunctionDefinition.php (100%)
 rename {Library => src}/GlobalConstant.php (100%)
 rename {Library => src}/HeadersManager.php (100%)
 rename {Library => src}/LiteralCompiledExpression.php (100%)
 rename {Library => src}/Logger/Formatter/CompilerFormatter.php (100%)
 rename {Library => src}/MethodCall.php (100%)
 rename {Library => src}/Operators/AbstractOperator.php (100%)
 rename {Library => src}/Operators/Arithmetical/AddOperator.php (100%)
 rename {Library => src}/Operators/Arithmetical/ArithmeticalBaseOperator.php (100%)
 rename {Library => src}/Operators/Arithmetical/DivOperator.php (100%)
 rename {Library => src}/Operators/Arithmetical/ModOperator.php (100%)
 rename {Library => src}/Operators/Arithmetical/MulOperator.php (100%)
 rename {Library => src}/Operators/Arithmetical/SubOperator.php (100%)
 rename {Library => src}/Operators/Bitwise/BitwiseAndOperator.php (100%)
 rename {Library => src}/Operators/Bitwise/BitwiseBaseOperator.php (100%)
 rename {Library => src}/Operators/Bitwise/BitwiseNotOperator.php (100%)
 rename {Library => src}/Operators/Bitwise/BitwiseOrOperator.php (100%)
 rename {Library => src}/Operators/Bitwise/BitwiseXorOperator.php (100%)
 rename {Library => src}/Operators/Bitwise/ShiftLeftOperator.php (100%)
 rename {Library => src}/Operators/Bitwise/ShiftRightOperator.php (100%)
 rename {Library => src}/Operators/Comparison/ComparisonBaseOperator.php (100%)
 rename {Library => src}/Operators/Comparison/EqualsOperator.php (100%)
 rename {Library => src}/Operators/Comparison/GreaterEqualOperator.php (100%)
 rename {Library => src}/Operators/Comparison/GreaterOperator.php (100%)
 rename {Library => src}/Operators/Comparison/IdenticalOperator.php (100%)
 rename {Library => src}/Operators/Comparison/LessEqualOperator.php (100%)
 rename {Library => src}/Operators/Comparison/LessOperator.php (100%)
 rename {Library => src}/Operators/Comparison/NotEqualsOperator.php (100%)
 rename {Library => src}/Operators/Comparison/NotIdenticalOperator.php (100%)
 rename {Library => src}/Operators/Logical/AndOperator.php (100%)
 rename {Library => src}/Operators/Logical/LogicalBaseOperator.php (100%)
 rename {Library => src}/Operators/Logical/OrOperator.php (100%)
 rename {Library => src}/Operators/Other/CastOperator.php (100%)
 rename {Library => src}/Operators/Other/CloneOperator.php (100%)
 rename {Library => src}/Operators/Other/ConcatOperator.php (100%)
 rename {Library => src}/Operators/Other/EmptyOperator.php (100%)
 rename {Library => src}/Operators/Other/FetchOperator.php (100%)
 rename {Library => src}/Operators/Other/InstanceOfOperator.php (100%)
 rename {Library => src}/Operators/Other/IssetOperator.php (100%)
 rename {Library => src}/Operators/Other/LikelyOperator.php (100%)
 rename {Library => src}/Operators/Other/NewInstanceOperator.php (100%)
 rename {Library => src}/Operators/Other/NewInstanceTypeOperator.php (100%)
 rename {Library => src}/Operators/Other/RangeExclusiveOperator.php (100%)
 rename {Library => src}/Operators/Other/RangeInclusiveOperator.php (100%)
 rename {Library => src}/Operators/Other/RequireOnceOperator.php (100%)
 rename {Library => src}/Operators/Other/RequireOperator.php (100%)
 rename {Library => src}/Operators/Other/ShortTernaryOperator.php (100%)
 rename {Library => src}/Operators/Other/TernaryOperator.php (100%)
 rename {Library => src}/Operators/Other/TypeHintOperator.php (100%)
 rename {Library => src}/Operators/Other/TypeOfOperator.php (100%)
 rename {Library => src}/Operators/Other/UnlikelyOperator.php (100%)
 rename {Library => src}/Operators/Unary/MinusOperator.php (100%)
 rename {Library => src}/Operators/Unary/NotOperator.php (100%)
 rename {Library => src}/Optimizers/EvalExpression.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ACosOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ASinOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/AddslashesOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ArrayKeysOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ArrayMergeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/BasenameOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CallUserFuncOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CamelizeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CeilOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ClassExistsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CompareMtimeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CosOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CountOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/Crc32Optimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CreateArrayOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CreateInstanceOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/DieOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/DoublevalOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/EndsWithOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/EvalOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ExitOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ExplodeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FcloseOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FeofOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FileExistsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FileGetContentsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FilePutContentsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FilemtimeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FloorOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FuncGetArgOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FuncGetArgsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FuncNumArgsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FunctionExistsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/FwriteOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GetCalledClassOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GetClassLowerOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GetClassNsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GetClassOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GetNsClassOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GettypeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GlobalsGetOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/GlobalsSetOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/HashEqualsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ImplodeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/InArrayOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/InterfaceExistsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IntvalOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsArrayOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsBoolOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsCallableOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsIntOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsNullOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsNumericOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsObjectOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsPhpVersionOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsResourceOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsScalarOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/IsStringOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/JoinOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/JsonDecodeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/JsonEncodeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/LdexpOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/LtrimOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/Md5Optimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/MemstrOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/MergeAppendOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/MethodExistsOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/MicrotimeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/PowOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/PregMatchAllOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/PregMatchOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/RoundOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/RtrimOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/SinOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/SqrtOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StartsWithOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StrReplaceOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StripcslashesOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StripslashesOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StrlenOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StrposOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StrtokOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StrtolowerOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/StrtoupperOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/SubstrOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/TanOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/TimeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/TrimOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/UcfirstOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/UncamelizeOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/UniqueKeyOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/UniquePathKeyOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/VarDumpOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/VarExportOptimizer.php (100%)
 rename {Library => src}/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php (100%)
 rename {Library => src}/Optimizers/IsTypeOptimizerAbstract.php (100%)
 rename {Library => src}/Optimizers/MathOptimizer.php (100%)
 rename {Library => src}/Optimizers/OptimizerAbstract.php (100%)
 rename {Library => src}/Parser/Manager.php (100%)
 rename {Library => src}/Parser/Parser.php (100%)
 rename {Library => src}/Passes/CallGathererPass.php (100%)
 rename {Library => src}/Passes/LocalContextPass.php (100%)
 rename {Library => src}/Passes/LoopBreakPass.php (100%)
 rename {Library => src}/Passes/MutateGathererPass.php (100%)
 rename {Library => src}/Passes/SkipVariantInit.php (100%)
 rename {Library => src}/Passes/StaticTypeInference.php (100%)
 rename {Library => src}/Statements/BreakStatement.php (100%)
 rename {Library => src}/Statements/ContinueStatement.php (100%)
 rename {Library => src}/Statements/DeclareStatement.php (100%)
 rename {Library => src}/Statements/DoWhileStatement.php (100%)
 rename {Library => src}/Statements/EchoStatement.php (100%)
 rename {Library => src}/Statements/ForStatement.php (100%)
 rename {Library => src}/Statements/IfStatement.php (100%)
 rename {Library => src}/Statements/Let/ArrayIndex.php (100%)
 rename {Library => src}/Statements/Let/ArrayIndexAppend.php (100%)
 rename {Library => src}/Statements/Let/Decr.php (100%)
 rename {Library => src}/Statements/Let/ExportSymbol.php (100%)
 rename {Library => src}/Statements/Let/ExportSymbolString.php (100%)
 rename {Library => src}/Statements/Let/Incr.php (100%)
 rename {Library => src}/Statements/Let/ObjectDynamicProperty.php (100%)
 rename {Library => src}/Statements/Let/ObjectDynamicStringProperty.php (100%)
 rename {Library => src}/Statements/Let/ObjectProperty.php (100%)
 rename {Library => src}/Statements/Let/ObjectPropertyAppend.php (100%)
 rename {Library => src}/Statements/Let/ObjectPropertyArrayIndex.php (100%)
 rename {Library => src}/Statements/Let/ObjectPropertyArrayIndexAppend.php (100%)
 rename {Library => src}/Statements/Let/ObjectPropertyDecr.php (100%)
 rename {Library => src}/Statements/Let/ObjectPropertyIncr.php (100%)
 rename {Library => src}/Statements/Let/StaticProperty.php (100%)
 rename {Library => src}/Statements/Let/StaticPropertyAdd.php (100%)
 rename {Library => src}/Statements/Let/StaticPropertyAppend.php (100%)
 rename {Library => src}/Statements/Let/StaticPropertyArrayIndex.php (100%)
 rename {Library => src}/Statements/Let/StaticPropertyArrayIndexAppend.php (100%)
 rename {Library => src}/Statements/Let/StaticPropertySub.php (100%)
 rename {Library => src}/Statements/Let/Variable.php (100%)
 rename {Library => src}/Statements/Let/VariableAppend.php (100%)
 rename {Library => src}/Statements/LetStatement.php (100%)
 rename {Library => src}/Statements/LoopStatement.php (100%)
 rename {Library => src}/Statements/RequireOnceStatement.php (100%)
 rename {Library => src}/Statements/RequireStatement.php (100%)
 rename {Library => src}/Statements/ReturnStatement.php (100%)
 rename {Library => src}/Statements/StatementAbstract.php (100%)
 rename {Library => src}/Statements/SwitchStatement.php (100%)
 rename {Library => src}/Statements/ThrowStatement.php (100%)
 rename {Library => src}/Statements/TryCatchStatement.php (100%)
 rename {Library => src}/Statements/UnsetStatement.php (100%)
 rename {Library => src}/Statements/WhileStatement.php (100%)
 rename {Library => src}/StatementsBlock.php (100%)
 rename {Library => src}/StaticCall.php (100%)
 rename {Library => src}/StringsManager.php (100%)
 rename {Library => src}/Stubs/DocBlock.php (100%)
 rename {Library => src}/Stubs/Generator.php (100%)
 rename {Library => src}/Stubs/MethodDocBlock.php (100%)
 rename {Library => src}/SymbolTable.php (100%)
 rename {Library => src}/TypeAwareInterface.php (100%)
 rename {Library => src}/Types/AbstractType.php (100%)
 rename {Library => src}/Types/ArrayType.php (100%)
 rename {Library => src}/Types/CharType.php (100%)
 rename {Library => src}/Types/DoubleType.php (100%)
 rename {Library => src}/Types/IntType.php (100%)
 rename {Library => src}/Types/IstringType.php (100%)
 rename {Library => src}/Types/StringType.php (100%)
 rename {Library => src}/Types/Types.php (100%)
 rename {Library => src}/Variable/Globals.php (100%)
 rename {Library => src}/Variable/Variable.php (100%)
 rename {Library => src}/Zephir.php (100%)
 rename {Library => src}/functions.php (100%)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 53e460990f..ea5c16a65a 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
@@ -11,7 +11,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-if (!file_exists(__DIR__.'/Library')) {
+if (!file_exists(__DIR__ . '/src')) {
     exit(0);
 }
 
diff --git a/box.json.dist b/box.json.dist
index 7696ef76a0..918925ab2c 100644
--- a/box.json.dist
+++ b/box.json.dist
@@ -9,7 +9,7 @@
     ],
     "directories": [
        "kernels",
-       "Library",
+       "src",
        "prototypes",
        "templates",
        "vendor"
@@ -32,7 +32,7 @@
             "name": "*.*"
         },
         {
-            "in": "Library",
+            "in": "src",
             "name": "*.*"
         },
         {
diff --git a/composer.json b/composer.json
index 9c796720a8..16ad00ac6f 100644
--- a/composer.json
+++ b/composer.json
@@ -49,10 +49,10 @@
     },
     "autoload": {
         "psr-4": {
-            "Zephir\\": "Library"
+            "Zephir\\": "src/"
         },
         "files": [
-            "Library/functions.php"
+            "src/functions.php"
         ]
     },
     "autoload-dev": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index c237e93b78..e70f4be573 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -38,7 +38,7 @@
         Note that specifying any file or directory path
         on the command line will ignore all file tags.
     -->
-    <file>Library</file>
+    <file>src</file>
 
     <!-- file>tests/Extension</file -->
     <!-- file>tests/Zephir</file -->
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 22bdcbfddf..54dd01cab6 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,7 +7,7 @@
 >
     <coverage pathCoverage="true">
         <include>
-            <directory suffix=".php">Library</directory>
+            <directory suffix=".php">src</directory>
         </include>
         <report>
             <clover outputFile="tests/output/clover.xml"/>
diff --git a/Library/AliasManager.php b/src/AliasManager.php
similarity index 100%
rename from Library/AliasManager.php
rename to src/AliasManager.php
diff --git a/Library/Backend/Backend.php b/src/Backend/Backend.php
similarity index 100%
rename from Library/Backend/Backend.php
rename to src/Backend/Backend.php
diff --git a/Library/Backend/FcallManager.php b/src/Backend/FcallManager.php
similarity index 100%
rename from Library/Backend/FcallManager.php
rename to src/Backend/FcallManager.php
diff --git a/Library/Backend/FcallManagerInterface.php b/src/Backend/FcallManagerInterface.php
similarity index 100%
rename from Library/Backend/FcallManagerInterface.php
rename to src/Backend/FcallManagerInterface.php
diff --git a/Library/Backend/StringsManager.php b/src/Backend/StringsManager.php
similarity index 100%
rename from Library/Backend/StringsManager.php
rename to src/Backend/StringsManager.php
diff --git a/Library/Backend/VariablesManager.php b/src/Backend/VariablesManager.php
similarity index 100%
rename from Library/Backend/VariablesManager.php
rename to src/Backend/VariablesManager.php
diff --git a/Library/Branch.php b/src/Branch.php
similarity index 100%
rename from Library/Branch.php
rename to src/Branch.php
diff --git a/Library/BranchManager.php b/src/BranchManager.php
similarity index 100%
rename from Library/BranchManager.php
rename to src/BranchManager.php
diff --git a/Library/Builder/FunctionCallBuilder.php b/src/Builder/FunctionCallBuilder.php
similarity index 100%
rename from Library/Builder/FunctionCallBuilder.php
rename to src/Builder/FunctionCallBuilder.php
diff --git a/Library/Builder/Operators/AbstractOperatorBuilder.php b/src/Builder/Operators/AbstractOperatorBuilder.php
similarity index 100%
rename from Library/Builder/Operators/AbstractOperatorBuilder.php
rename to src/Builder/Operators/AbstractOperatorBuilder.php
diff --git a/Library/Builder/Operators/CastOperatorBuilder.php b/src/Builder/Operators/CastOperatorBuilder.php
similarity index 100%
rename from Library/Builder/Operators/CastOperatorBuilder.php
rename to src/Builder/Operators/CastOperatorBuilder.php
diff --git a/Library/Builder/Operators/UnaryOperatorBuilder.php b/src/Builder/Operators/UnaryOperatorBuilder.php
similarity index 100%
rename from Library/Builder/Operators/UnaryOperatorBuilder.php
rename to src/Builder/Operators/UnaryOperatorBuilder.php
diff --git a/Library/Builder/Statements/AbstractStatementBuilder.php b/src/Builder/Statements/AbstractStatementBuilder.php
similarity index 100%
rename from Library/Builder/Statements/AbstractStatementBuilder.php
rename to src/Builder/Statements/AbstractStatementBuilder.php
diff --git a/Library/Builder/Statements/IfStatementBuilder.php b/src/Builder/Statements/IfStatementBuilder.php
similarity index 100%
rename from Library/Builder/Statements/IfStatementBuilder.php
rename to src/Builder/Statements/IfStatementBuilder.php
diff --git a/Library/Builder/Statements/LetStatementBuilder.php b/src/Builder/Statements/LetStatementBuilder.php
similarity index 100%
rename from Library/Builder/Statements/LetStatementBuilder.php
rename to src/Builder/Statements/LetStatementBuilder.php
diff --git a/Library/Builder/StatementsBlockBuilder.php b/src/Builder/StatementsBlockBuilder.php
similarity index 100%
rename from Library/Builder/StatementsBlockBuilder.php
rename to src/Builder/StatementsBlockBuilder.php
diff --git a/Library/Cache/ClassEntryCache.php b/src/Cache/ClassEntryCache.php
similarity index 100%
rename from Library/Cache/ClassEntryCache.php
rename to src/Cache/ClassEntryCache.php
diff --git a/Library/Cache/FunctionCache.php b/src/Cache/FunctionCache.php
similarity index 100%
rename from Library/Cache/FunctionCache.php
rename to src/Cache/FunctionCache.php
diff --git a/Library/Cache/Manager.php b/src/Cache/Manager.php
similarity index 100%
rename from Library/Cache/Manager.php
rename to src/Cache/Manager.php
diff --git a/Library/Cache/MethodCache.php b/src/Cache/MethodCache.php
similarity index 100%
rename from Library/Cache/MethodCache.php
rename to src/Cache/MethodCache.php
diff --git a/Library/Cache/SlotsCache.php b/src/Cache/SlotsCache.php
similarity index 100%
rename from Library/Cache/SlotsCache.php
rename to src/Cache/SlotsCache.php
diff --git a/Library/Cache/StaticMethodCache.php b/src/Cache/StaticMethodCache.php
similarity index 100%
rename from Library/Cache/StaticMethodCache.php
rename to src/Cache/StaticMethodCache.php
diff --git a/Library/Call.php b/src/Call.php
similarity index 100%
rename from Library/Call.php
rename to src/Call.php
diff --git a/Library/Class/Constant.php b/src/Class/Constant.php
similarity index 100%
rename from Library/Class/Constant.php
rename to src/Class/Constant.php
diff --git a/Library/Class/Definition/AbstractDefinition.php b/src/Class/Definition/AbstractDefinition.php
similarity index 100%
rename from Library/Class/Definition/AbstractDefinition.php
rename to src/Class/Definition/AbstractDefinition.php
diff --git a/Library/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
similarity index 100%
rename from Library/Class/Definition/Definition.php
rename to src/Class/Definition/Definition.php
diff --git a/Library/Class/Definition/DefinitionRuntime.php b/src/Class/Definition/DefinitionRuntime.php
similarity index 100%
rename from Library/Class/Definition/DefinitionRuntime.php
rename to src/Class/Definition/DefinitionRuntime.php
diff --git a/Library/Class/Entry.php b/src/Class/Entry.php
similarity index 100%
rename from Library/Class/Entry.php
rename to src/Class/Entry.php
diff --git a/Library/Class/Method/Method.php b/src/Class/Method/Method.php
similarity index 100%
rename from Library/Class/Method/Method.php
rename to src/Class/Method/Method.php
diff --git a/Library/Class/Method/Parameters.php b/src/Class/Method/Parameters.php
similarity index 100%
rename from Library/Class/Method/Parameters.php
rename to src/Class/Method/Parameters.php
diff --git a/Library/Class/Property.php b/src/Class/Property.php
similarity index 100%
rename from Library/Class/Property.php
rename to src/Class/Property.php
diff --git a/Library/Code/ArgInfoDefinition.php b/src/Code/ArgInfoDefinition.php
similarity index 100%
rename from Library/Code/ArgInfoDefinition.php
rename to src/Code/ArgInfoDefinition.php
diff --git a/Library/Code/Builder/Struct.php b/src/Code/Builder/Struct.php
similarity index 100%
rename from Library/Code/Builder/Struct.php
rename to src/Code/Builder/Struct.php
diff --git a/Library/Code/Printer.php b/src/Code/Printer.php
similarity index 100%
rename from Library/Code/Printer.php
rename to src/Code/Printer.php
diff --git a/Library/CompilationContext.php b/src/CompilationContext.php
similarity index 100%
rename from Library/CompilationContext.php
rename to src/CompilationContext.php
diff --git a/Library/CompiledExpression.php b/src/CompiledExpression.php
similarity index 100%
rename from Library/CompiledExpression.php
rename to src/CompiledExpression.php
diff --git a/Library/Compiler.php b/src/Compiler.php
similarity index 100%
rename from Library/Compiler.php
rename to src/Compiler.php
diff --git a/Library/Compiler/CompilerFileFactory.php b/src/Compiler/CompilerFileFactory.php
similarity index 100%
rename from Library/Compiler/CompilerFileFactory.php
rename to src/Compiler/CompilerFileFactory.php
diff --git a/Library/Compiler/FileInterface.php b/src/Compiler/FileInterface.php
similarity index 100%
rename from Library/Compiler/FileInterface.php
rename to src/Compiler/FileInterface.php
diff --git a/Library/CompilerFile.php b/src/CompilerFile.php
similarity index 100%
rename from Library/CompilerFile.php
rename to src/CompilerFile.php
diff --git a/Library/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
similarity index 100%
rename from Library/CompilerFileAnonymous.php
rename to src/CompilerFileAnonymous.php
diff --git a/Library/Config.php b/src/Config.php
similarity index 100%
rename from Library/Config.php
rename to src/Config.php
diff --git a/Library/ConfigException.php b/src/ConfigException.php
similarity index 100%
rename from Library/ConfigException.php
rename to src/ConfigException.php
diff --git a/Library/Console/Application.php b/src/Console/Application.php
similarity index 100%
rename from Library/Console/Application.php
rename to src/Console/Application.php
diff --git a/Library/Console/Command/AbstractCommand.php b/src/Console/Command/AbstractCommand.php
similarity index 100%
rename from Library/Console/Command/AbstractCommand.php
rename to src/Console/Command/AbstractCommand.php
diff --git a/Library/Console/Command/ApiCommand.php b/src/Console/Command/ApiCommand.php
similarity index 100%
rename from Library/Console/Command/ApiCommand.php
rename to src/Console/Command/ApiCommand.php
diff --git a/Library/Console/Command/BuildCommand.php b/src/Console/Command/BuildCommand.php
similarity index 100%
rename from Library/Console/Command/BuildCommand.php
rename to src/Console/Command/BuildCommand.php
diff --git a/Library/Console/Command/CleanCommand.php b/src/Console/Command/CleanCommand.php
similarity index 100%
rename from Library/Console/Command/CleanCommand.php
rename to src/Console/Command/CleanCommand.php
diff --git a/Library/Console/Command/CompileCommand.php b/src/Console/Command/CompileCommand.php
similarity index 100%
rename from Library/Console/Command/CompileCommand.php
rename to src/Console/Command/CompileCommand.php
diff --git a/Library/Console/Command/DevelopmentModeAwareTrait.php b/src/Console/Command/DevelopmentModeAwareTrait.php
similarity index 100%
rename from Library/Console/Command/DevelopmentModeAwareTrait.php
rename to src/Console/Command/DevelopmentModeAwareTrait.php
diff --git a/Library/Console/Command/FullCleanCommand.php b/src/Console/Command/FullCleanCommand.php
similarity index 100%
rename from Library/Console/Command/FullCleanCommand.php
rename to src/Console/Command/FullCleanCommand.php
diff --git a/Library/Console/Command/GenerateCommand.php b/src/Console/Command/GenerateCommand.php
similarity index 100%
rename from Library/Console/Command/GenerateCommand.php
rename to src/Console/Command/GenerateCommand.php
diff --git a/Library/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php
similarity index 100%
rename from Library/Console/Command/InitCommand.php
rename to src/Console/Command/InitCommand.php
diff --git a/Library/Console/Command/InstallCommand.php b/src/Console/Command/InstallCommand.php
similarity index 100%
rename from Library/Console/Command/InstallCommand.php
rename to src/Console/Command/InstallCommand.php
diff --git a/Library/Console/Command/ListCommand.php b/src/Console/Command/ListCommand.php
similarity index 100%
rename from Library/Console/Command/ListCommand.php
rename to src/Console/Command/ListCommand.php
diff --git a/Library/Console/Command/RemoveOptionsTrait.php b/src/Console/Command/RemoveOptionsTrait.php
similarity index 100%
rename from Library/Console/Command/RemoveOptionsTrait.php
rename to src/Console/Command/RemoveOptionsTrait.php
diff --git a/Library/Console/Command/StubsCommand.php b/src/Console/Command/StubsCommand.php
similarity index 100%
rename from Library/Console/Command/StubsCommand.php
rename to src/Console/Command/StubsCommand.php
diff --git a/Library/Console/Command/ZflagsAwareTrait.php b/src/Console/Command/ZflagsAwareTrait.php
similarity index 100%
rename from Library/Console/Command/ZflagsAwareTrait.php
rename to src/Console/Command/ZflagsAwareTrait.php
diff --git a/Library/Console/ErrorListener.php b/src/Console/ErrorListener.php
similarity index 100%
rename from Library/Console/ErrorListener.php
rename to src/Console/ErrorListener.php
diff --git a/Library/Detectors/ForValueUseDetector.php b/src/Detectors/ForValueUseDetector.php
similarity index 100%
rename from Library/Detectors/ForValueUseDetector.php
rename to src/Detectors/ForValueUseDetector.php
diff --git a/Library/Detectors/ReadDetector.php b/src/Detectors/ReadDetector.php
similarity index 100%
rename from Library/Detectors/ReadDetector.php
rename to src/Detectors/ReadDetector.php
diff --git a/Library/Detectors/WriteDetector.php b/src/Detectors/WriteDetector.php
similarity index 100%
rename from Library/Detectors/WriteDetector.php
rename to src/Detectors/WriteDetector.php
diff --git a/Library/Documentation.php b/src/Documentation.php
similarity index 100%
rename from Library/Documentation.php
rename to src/Documentation.php
diff --git a/Library/Documentation/Annotation.php b/src/Documentation/Annotation.php
similarity index 100%
rename from Library/Documentation/Annotation.php
rename to src/Documentation/Annotation.php
diff --git a/Library/Documentation/Annotation/Link.php b/src/Documentation/Annotation/Link.php
similarity index 100%
rename from Library/Documentation/Annotation/Link.php
rename to src/Documentation/Annotation/Link.php
diff --git a/Library/Documentation/Annotation/ReturnAnnotation.php b/src/Documentation/Annotation/ReturnAnnotation.php
similarity index 100%
rename from Library/Documentation/Annotation/ReturnAnnotation.php
rename to src/Documentation/Annotation/ReturnAnnotation.php
diff --git a/Library/Documentation/Annotation/See.php b/src/Documentation/Annotation/See.php
similarity index 100%
rename from Library/Documentation/Annotation/See.php
rename to src/Documentation/Annotation/See.php
diff --git a/Library/Documentation/Docblock.php b/src/Documentation/Docblock.php
similarity index 100%
rename from Library/Documentation/Docblock.php
rename to src/Documentation/Docblock.php
diff --git a/Library/Documentation/DocblockParser.php b/src/Documentation/DocblockParser.php
similarity index 100%
rename from Library/Documentation/DocblockParser.php
rename to src/Documentation/DocblockParser.php
diff --git a/Library/Documentation/File/ClassFile.php b/src/Documentation/File/ClassFile.php
similarity index 100%
rename from Library/Documentation/File/ClassFile.php
rename to src/Documentation/File/ClassFile.php
diff --git a/Library/Documentation/File/ClassesFile.php b/src/Documentation/File/ClassesFile.php
similarity index 100%
rename from Library/Documentation/File/ClassesFile.php
rename to src/Documentation/File/ClassesFile.php
diff --git a/Library/Documentation/File/IndexFile.php b/src/Documentation/File/IndexFile.php
similarity index 100%
rename from Library/Documentation/File/IndexFile.php
rename to src/Documentation/File/IndexFile.php
diff --git a/Library/Documentation/File/NamespaceFile.php b/src/Documentation/File/NamespaceFile.php
similarity index 100%
rename from Library/Documentation/File/NamespaceFile.php
rename to src/Documentation/File/NamespaceFile.php
diff --git a/Library/Documentation/File/NamespacesFile.php b/src/Documentation/File/NamespacesFile.php
similarity index 100%
rename from Library/Documentation/File/NamespacesFile.php
rename to src/Documentation/File/NamespacesFile.php
diff --git a/Library/Documentation/File/Sitemap.php b/src/Documentation/File/Sitemap.php
similarity index 100%
rename from Library/Documentation/File/Sitemap.php
rename to src/Documentation/File/Sitemap.php
diff --git a/Library/Documentation/File/SourceFile.php b/src/Documentation/File/SourceFile.php
similarity index 100%
rename from Library/Documentation/File/SourceFile.php
rename to src/Documentation/File/SourceFile.php
diff --git a/Library/Documentation/FileInterface.php b/src/Documentation/FileInterface.php
similarity index 100%
rename from Library/Documentation/FileInterface.php
rename to src/Documentation/FileInterface.php
diff --git a/Library/Documentation/NamespaceAccessor.php b/src/Documentation/NamespaceAccessor.php
similarity index 100%
rename from Library/Documentation/NamespaceAccessor.php
rename to src/Documentation/NamespaceAccessor.php
diff --git a/Library/Documentation/NamespaceHelper.php b/src/Documentation/NamespaceHelper.php
similarity index 100%
rename from Library/Documentation/NamespaceHelper.php
rename to src/Documentation/NamespaceHelper.php
diff --git a/Library/Documentation/Template.php b/src/Documentation/Template.php
similarity index 100%
rename from Library/Documentation/Template.php
rename to src/Documentation/Template.php
diff --git a/Library/Documentation/Theme.php b/src/Documentation/Theme.php
similarity index 100%
rename from Library/Documentation/Theme.php
rename to src/Documentation/Theme.php
diff --git a/Library/Exception.php b/src/Exception.php
similarity index 100%
rename from Library/Exception.php
rename to src/Exception.php
diff --git a/Library/Exception/CompilerException.php b/src/Exception/CompilerException.php
similarity index 100%
rename from Library/Exception/CompilerException.php
rename to src/Exception/CompilerException.php
diff --git a/Library/Exception/ExceptionExtraAwareTrait.php b/src/Exception/ExceptionExtraAwareTrait.php
similarity index 100%
rename from Library/Exception/ExceptionExtraAwareTrait.php
rename to src/Exception/ExceptionExtraAwareTrait.php
diff --git a/Library/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
similarity index 100%
rename from Library/Exception/ExceptionInterface.php
rename to src/Exception/ExceptionInterface.php
diff --git a/Library/Exception/FileSystemException.php b/src/Exception/FileSystemException.php
similarity index 100%
rename from Library/Exception/FileSystemException.php
rename to src/Exception/FileSystemException.php
diff --git a/Library/Exception/IllegalOperationException.php b/src/Exception/IllegalOperationException.php
similarity index 100%
rename from Library/Exception/IllegalOperationException.php
rename to src/Exception/IllegalOperationException.php
diff --git a/Library/Exception/IllegalStateException.php b/src/Exception/IllegalStateException.php
similarity index 100%
rename from Library/Exception/IllegalStateException.php
rename to src/Exception/IllegalStateException.php
diff --git a/Library/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from Library/Exception/InvalidArgumentException.php
rename to src/Exception/InvalidArgumentException.php
diff --git a/Library/Exception/InvalidTypeException.php b/src/Exception/InvalidTypeException.php
similarity index 100%
rename from Library/Exception/InvalidTypeException.php
rename to src/Exception/InvalidTypeException.php
diff --git a/Library/Exception/LogicException.php b/src/Exception/LogicException.php
similarity index 100%
rename from Library/Exception/LogicException.php
rename to src/Exception/LogicException.php
diff --git a/Library/Exception/NotImplementedException.php b/src/Exception/NotImplementedException.php
similarity index 100%
rename from Library/Exception/NotImplementedException.php
rename to src/Exception/NotImplementedException.php
diff --git a/Library/Exception/ParseException.php b/src/Exception/ParseException.php
similarity index 100%
rename from Library/Exception/ParseException.php
rename to src/Exception/ParseException.php
diff --git a/Library/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
similarity index 100%
rename from Library/Exception/RuntimeException.php
rename to src/Exception/RuntimeException.php
diff --git a/Library/Expression.php b/src/Expression.php
similarity index 100%
rename from Library/Expression.php
rename to src/Expression.php
diff --git a/Library/Expression/Builder/AbstractBuilder.php b/src/Expression/Builder/AbstractBuilder.php
similarity index 100%
rename from Library/Expression/Builder/AbstractBuilder.php
rename to src/Expression/Builder/AbstractBuilder.php
diff --git a/Library/Expression/Builder/BuilderFactory.php b/src/Expression/Builder/BuilderFactory.php
similarity index 100%
rename from Library/Expression/Builder/BuilderFactory.php
rename to src/Expression/Builder/BuilderFactory.php
diff --git a/Library/Expression/Builder/Factory/OperatorsFactory.php b/src/Expression/Builder/Factory/OperatorsFactory.php
similarity index 100%
rename from Library/Expression/Builder/Factory/OperatorsFactory.php
rename to src/Expression/Builder/Factory/OperatorsFactory.php
diff --git a/Library/Expression/Builder/Factory/StatementsFactory.php b/src/Expression/Builder/Factory/StatementsFactory.php
similarity index 100%
rename from Library/Expression/Builder/Factory/StatementsFactory.php
rename to src/Expression/Builder/Factory/StatementsFactory.php
diff --git a/Library/Expression/Builder/Operators/AbstractOperator.php b/src/Expression/Builder/Operators/AbstractOperator.php
similarity index 100%
rename from Library/Expression/Builder/Operators/AbstractOperator.php
rename to src/Expression/Builder/Operators/AbstractOperator.php
diff --git a/Library/Expression/Builder/Operators/AssignPropertyOperator.php b/src/Expression/Builder/Operators/AssignPropertyOperator.php
similarity index 100%
rename from Library/Expression/Builder/Operators/AssignPropertyOperator.php
rename to src/Expression/Builder/Operators/AssignPropertyOperator.php
diff --git a/Library/Expression/Builder/Operators/AssignVariableOperator.php b/src/Expression/Builder/Operators/AssignVariableOperator.php
similarity index 100%
rename from Library/Expression/Builder/Operators/AssignVariableOperator.php
rename to src/Expression/Builder/Operators/AssignVariableOperator.php
diff --git a/Library/Expression/Builder/Operators/BinaryOperator.php b/src/Expression/Builder/Operators/BinaryOperator.php
similarity index 100%
rename from Library/Expression/Builder/Operators/BinaryOperator.php
rename to src/Expression/Builder/Operators/BinaryOperator.php
diff --git a/Library/Expression/Builder/Operators/RawOperator.php b/src/Expression/Builder/Operators/RawOperator.php
similarity index 100%
rename from Library/Expression/Builder/Operators/RawOperator.php
rename to src/Expression/Builder/Operators/RawOperator.php
diff --git a/Library/Expression/Builder/Operators/UnaryOperator.php b/src/Expression/Builder/Operators/UnaryOperator.php
similarity index 100%
rename from Library/Expression/Builder/Operators/UnaryOperator.php
rename to src/Expression/Builder/Operators/UnaryOperator.php
diff --git a/Library/Expression/Builder/RawExpression.php b/src/Expression/Builder/RawExpression.php
similarity index 100%
rename from Library/Expression/Builder/RawExpression.php
rename to src/Expression/Builder/RawExpression.php
diff --git a/Library/Expression/Builder/Statements/AbstractStatement.php b/src/Expression/Builder/Statements/AbstractStatement.php
similarity index 100%
rename from Library/Expression/Builder/Statements/AbstractStatement.php
rename to src/Expression/Builder/Statements/AbstractStatement.php
diff --git a/Library/Expression/Builder/Statements/CallFunctionStatement.php b/src/Expression/Builder/Statements/CallFunctionStatement.php
similarity index 100%
rename from Library/Expression/Builder/Statements/CallFunctionStatement.php
rename to src/Expression/Builder/Statements/CallFunctionStatement.php
diff --git a/Library/Expression/Builder/Statements/CallMethodStatement.php b/src/Expression/Builder/Statements/CallMethodStatement.php
similarity index 100%
rename from Library/Expression/Builder/Statements/CallMethodStatement.php
rename to src/Expression/Builder/Statements/CallMethodStatement.php
diff --git a/Library/Expression/Builder/Statements/CallStaticStatement.php b/src/Expression/Builder/Statements/CallStaticStatement.php
similarity index 100%
rename from Library/Expression/Builder/Statements/CallStaticStatement.php
rename to src/Expression/Builder/Statements/CallStaticStatement.php
diff --git a/Library/Expression/Builder/Statements/IfStatement.php b/src/Expression/Builder/Statements/IfStatement.php
similarity index 100%
rename from Library/Expression/Builder/Statements/IfStatement.php
rename to src/Expression/Builder/Statements/IfStatement.php
diff --git a/Library/Expression/Builder/Statements/LetStatement.php b/src/Expression/Builder/Statements/LetStatement.php
similarity index 100%
rename from Library/Expression/Builder/Statements/LetStatement.php
rename to src/Expression/Builder/Statements/LetStatement.php
diff --git a/Library/Expression/Builder/Statements/RawStatement.php b/src/Expression/Builder/Statements/RawStatement.php
similarity index 100%
rename from Library/Expression/Builder/Statements/RawStatement.php
rename to src/Expression/Builder/Statements/RawStatement.php
diff --git a/Library/Expression/Builder/Statements/StatementsBlock.php b/src/Expression/Builder/Statements/StatementsBlock.php
similarity index 100%
rename from Library/Expression/Builder/Statements/StatementsBlock.php
rename to src/Expression/Builder/Statements/StatementsBlock.php
diff --git a/Library/Expression/Closure.php b/src/Expression/Closure.php
similarity index 100%
rename from Library/Expression/Closure.php
rename to src/Expression/Closure.php
diff --git a/Library/Expression/ClosureArrow.php b/src/Expression/ClosureArrow.php
similarity index 100%
rename from Library/Expression/ClosureArrow.php
rename to src/Expression/ClosureArrow.php
diff --git a/Library/Expression/Constants.php b/src/Expression/Constants.php
similarity index 100%
rename from Library/Expression/Constants.php
rename to src/Expression/Constants.php
diff --git a/Library/Expression/NativeArray.php b/src/Expression/NativeArray.php
similarity index 100%
rename from Library/Expression/NativeArray.php
rename to src/Expression/NativeArray.php
diff --git a/Library/Expression/NativeArrayAccess.php b/src/Expression/NativeArrayAccess.php
similarity index 100%
rename from Library/Expression/NativeArrayAccess.php
rename to src/Expression/NativeArrayAccess.php
diff --git a/Library/Expression/PropertyAccess.php b/src/Expression/PropertyAccess.php
similarity index 100%
rename from Library/Expression/PropertyAccess.php
rename to src/Expression/PropertyAccess.php
diff --git a/Library/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
similarity index 100%
rename from Library/Expression/PropertyDynamicAccess.php
rename to src/Expression/PropertyDynamicAccess.php
diff --git a/Library/Expression/Reference.php b/src/Expression/Reference.php
similarity index 100%
rename from Library/Expression/Reference.php
rename to src/Expression/Reference.php
diff --git a/Library/Expression/StaticConstantAccess.php b/src/Expression/StaticConstantAccess.php
similarity index 100%
rename from Library/Expression/StaticConstantAccess.php
rename to src/Expression/StaticConstantAccess.php
diff --git a/Library/Expression/StaticPropertyAccess.php b/src/Expression/StaticPropertyAccess.php
similarity index 100%
rename from Library/Expression/StaticPropertyAccess.php
rename to src/Expression/StaticPropertyAccess.php
diff --git a/Library/FileSystem/FileSystemInterface.php b/src/FileSystem/FileSystemInterface.php
similarity index 100%
rename from Library/FileSystem/FileSystemInterface.php
rename to src/FileSystem/FileSystemInterface.php
diff --git a/Library/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
similarity index 100%
rename from Library/FileSystem/HardDisk.php
rename to src/FileSystem/HardDisk.php
diff --git a/Library/FunctionCall.php b/src/FunctionCall.php
similarity index 100%
rename from Library/FunctionCall.php
rename to src/FunctionCall.php
diff --git a/Library/FunctionDefinition.php b/src/FunctionDefinition.php
similarity index 100%
rename from Library/FunctionDefinition.php
rename to src/FunctionDefinition.php
diff --git a/Library/GlobalConstant.php b/src/GlobalConstant.php
similarity index 100%
rename from Library/GlobalConstant.php
rename to src/GlobalConstant.php
diff --git a/Library/HeadersManager.php b/src/HeadersManager.php
similarity index 100%
rename from Library/HeadersManager.php
rename to src/HeadersManager.php
diff --git a/Library/LiteralCompiledExpression.php b/src/LiteralCompiledExpression.php
similarity index 100%
rename from Library/LiteralCompiledExpression.php
rename to src/LiteralCompiledExpression.php
diff --git a/Library/Logger/Formatter/CompilerFormatter.php b/src/Logger/Formatter/CompilerFormatter.php
similarity index 100%
rename from Library/Logger/Formatter/CompilerFormatter.php
rename to src/Logger/Formatter/CompilerFormatter.php
diff --git a/Library/MethodCall.php b/src/MethodCall.php
similarity index 100%
rename from Library/MethodCall.php
rename to src/MethodCall.php
diff --git a/Library/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
similarity index 100%
rename from Library/Operators/AbstractOperator.php
rename to src/Operators/AbstractOperator.php
diff --git a/Library/Operators/Arithmetical/AddOperator.php b/src/Operators/Arithmetical/AddOperator.php
similarity index 100%
rename from Library/Operators/Arithmetical/AddOperator.php
rename to src/Operators/Arithmetical/AddOperator.php
diff --git a/Library/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
similarity index 100%
rename from Library/Operators/Arithmetical/ArithmeticalBaseOperator.php
rename to src/Operators/Arithmetical/ArithmeticalBaseOperator.php
diff --git a/Library/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
similarity index 100%
rename from Library/Operators/Arithmetical/DivOperator.php
rename to src/Operators/Arithmetical/DivOperator.php
diff --git a/Library/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
similarity index 100%
rename from Library/Operators/Arithmetical/ModOperator.php
rename to src/Operators/Arithmetical/ModOperator.php
diff --git a/Library/Operators/Arithmetical/MulOperator.php b/src/Operators/Arithmetical/MulOperator.php
similarity index 100%
rename from Library/Operators/Arithmetical/MulOperator.php
rename to src/Operators/Arithmetical/MulOperator.php
diff --git a/Library/Operators/Arithmetical/SubOperator.php b/src/Operators/Arithmetical/SubOperator.php
similarity index 100%
rename from Library/Operators/Arithmetical/SubOperator.php
rename to src/Operators/Arithmetical/SubOperator.php
diff --git a/Library/Operators/Bitwise/BitwiseAndOperator.php b/src/Operators/Bitwise/BitwiseAndOperator.php
similarity index 100%
rename from Library/Operators/Bitwise/BitwiseAndOperator.php
rename to src/Operators/Bitwise/BitwiseAndOperator.php
diff --git a/Library/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
similarity index 100%
rename from Library/Operators/Bitwise/BitwiseBaseOperator.php
rename to src/Operators/Bitwise/BitwiseBaseOperator.php
diff --git a/Library/Operators/Bitwise/BitwiseNotOperator.php b/src/Operators/Bitwise/BitwiseNotOperator.php
similarity index 100%
rename from Library/Operators/Bitwise/BitwiseNotOperator.php
rename to src/Operators/Bitwise/BitwiseNotOperator.php
diff --git a/Library/Operators/Bitwise/BitwiseOrOperator.php b/src/Operators/Bitwise/BitwiseOrOperator.php
similarity index 100%
rename from Library/Operators/Bitwise/BitwiseOrOperator.php
rename to src/Operators/Bitwise/BitwiseOrOperator.php
diff --git a/Library/Operators/Bitwise/BitwiseXorOperator.php b/src/Operators/Bitwise/BitwiseXorOperator.php
similarity index 100%
rename from Library/Operators/Bitwise/BitwiseXorOperator.php
rename to src/Operators/Bitwise/BitwiseXorOperator.php
diff --git a/Library/Operators/Bitwise/ShiftLeftOperator.php b/src/Operators/Bitwise/ShiftLeftOperator.php
similarity index 100%
rename from Library/Operators/Bitwise/ShiftLeftOperator.php
rename to src/Operators/Bitwise/ShiftLeftOperator.php
diff --git a/Library/Operators/Bitwise/ShiftRightOperator.php b/src/Operators/Bitwise/ShiftRightOperator.php
similarity index 100%
rename from Library/Operators/Bitwise/ShiftRightOperator.php
rename to src/Operators/Bitwise/ShiftRightOperator.php
diff --git a/Library/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
similarity index 100%
rename from Library/Operators/Comparison/ComparisonBaseOperator.php
rename to src/Operators/Comparison/ComparisonBaseOperator.php
diff --git a/Library/Operators/Comparison/EqualsOperator.php b/src/Operators/Comparison/EqualsOperator.php
similarity index 100%
rename from Library/Operators/Comparison/EqualsOperator.php
rename to src/Operators/Comparison/EqualsOperator.php
diff --git a/Library/Operators/Comparison/GreaterEqualOperator.php b/src/Operators/Comparison/GreaterEqualOperator.php
similarity index 100%
rename from Library/Operators/Comparison/GreaterEqualOperator.php
rename to src/Operators/Comparison/GreaterEqualOperator.php
diff --git a/Library/Operators/Comparison/GreaterOperator.php b/src/Operators/Comparison/GreaterOperator.php
similarity index 100%
rename from Library/Operators/Comparison/GreaterOperator.php
rename to src/Operators/Comparison/GreaterOperator.php
diff --git a/Library/Operators/Comparison/IdenticalOperator.php b/src/Operators/Comparison/IdenticalOperator.php
similarity index 100%
rename from Library/Operators/Comparison/IdenticalOperator.php
rename to src/Operators/Comparison/IdenticalOperator.php
diff --git a/Library/Operators/Comparison/LessEqualOperator.php b/src/Operators/Comparison/LessEqualOperator.php
similarity index 100%
rename from Library/Operators/Comparison/LessEqualOperator.php
rename to src/Operators/Comparison/LessEqualOperator.php
diff --git a/Library/Operators/Comparison/LessOperator.php b/src/Operators/Comparison/LessOperator.php
similarity index 100%
rename from Library/Operators/Comparison/LessOperator.php
rename to src/Operators/Comparison/LessOperator.php
diff --git a/Library/Operators/Comparison/NotEqualsOperator.php b/src/Operators/Comparison/NotEqualsOperator.php
similarity index 100%
rename from Library/Operators/Comparison/NotEqualsOperator.php
rename to src/Operators/Comparison/NotEqualsOperator.php
diff --git a/Library/Operators/Comparison/NotIdenticalOperator.php b/src/Operators/Comparison/NotIdenticalOperator.php
similarity index 100%
rename from Library/Operators/Comparison/NotIdenticalOperator.php
rename to src/Operators/Comparison/NotIdenticalOperator.php
diff --git a/Library/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
similarity index 100%
rename from Library/Operators/Logical/AndOperator.php
rename to src/Operators/Logical/AndOperator.php
diff --git a/Library/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
similarity index 100%
rename from Library/Operators/Logical/LogicalBaseOperator.php
rename to src/Operators/Logical/LogicalBaseOperator.php
diff --git a/Library/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
similarity index 100%
rename from Library/Operators/Logical/OrOperator.php
rename to src/Operators/Logical/OrOperator.php
diff --git a/Library/Operators/Other/CastOperator.php b/src/Operators/Other/CastOperator.php
similarity index 100%
rename from Library/Operators/Other/CastOperator.php
rename to src/Operators/Other/CastOperator.php
diff --git a/Library/Operators/Other/CloneOperator.php b/src/Operators/Other/CloneOperator.php
similarity index 100%
rename from Library/Operators/Other/CloneOperator.php
rename to src/Operators/Other/CloneOperator.php
diff --git a/Library/Operators/Other/ConcatOperator.php b/src/Operators/Other/ConcatOperator.php
similarity index 100%
rename from Library/Operators/Other/ConcatOperator.php
rename to src/Operators/Other/ConcatOperator.php
diff --git a/Library/Operators/Other/EmptyOperator.php b/src/Operators/Other/EmptyOperator.php
similarity index 100%
rename from Library/Operators/Other/EmptyOperator.php
rename to src/Operators/Other/EmptyOperator.php
diff --git a/Library/Operators/Other/FetchOperator.php b/src/Operators/Other/FetchOperator.php
similarity index 100%
rename from Library/Operators/Other/FetchOperator.php
rename to src/Operators/Other/FetchOperator.php
diff --git a/Library/Operators/Other/InstanceOfOperator.php b/src/Operators/Other/InstanceOfOperator.php
similarity index 100%
rename from Library/Operators/Other/InstanceOfOperator.php
rename to src/Operators/Other/InstanceOfOperator.php
diff --git a/Library/Operators/Other/IssetOperator.php b/src/Operators/Other/IssetOperator.php
similarity index 100%
rename from Library/Operators/Other/IssetOperator.php
rename to src/Operators/Other/IssetOperator.php
diff --git a/Library/Operators/Other/LikelyOperator.php b/src/Operators/Other/LikelyOperator.php
similarity index 100%
rename from Library/Operators/Other/LikelyOperator.php
rename to src/Operators/Other/LikelyOperator.php
diff --git a/Library/Operators/Other/NewInstanceOperator.php b/src/Operators/Other/NewInstanceOperator.php
similarity index 100%
rename from Library/Operators/Other/NewInstanceOperator.php
rename to src/Operators/Other/NewInstanceOperator.php
diff --git a/Library/Operators/Other/NewInstanceTypeOperator.php b/src/Operators/Other/NewInstanceTypeOperator.php
similarity index 100%
rename from Library/Operators/Other/NewInstanceTypeOperator.php
rename to src/Operators/Other/NewInstanceTypeOperator.php
diff --git a/Library/Operators/Other/RangeExclusiveOperator.php b/src/Operators/Other/RangeExclusiveOperator.php
similarity index 100%
rename from Library/Operators/Other/RangeExclusiveOperator.php
rename to src/Operators/Other/RangeExclusiveOperator.php
diff --git a/Library/Operators/Other/RangeInclusiveOperator.php b/src/Operators/Other/RangeInclusiveOperator.php
similarity index 100%
rename from Library/Operators/Other/RangeInclusiveOperator.php
rename to src/Operators/Other/RangeInclusiveOperator.php
diff --git a/Library/Operators/Other/RequireOnceOperator.php b/src/Operators/Other/RequireOnceOperator.php
similarity index 100%
rename from Library/Operators/Other/RequireOnceOperator.php
rename to src/Operators/Other/RequireOnceOperator.php
diff --git a/Library/Operators/Other/RequireOperator.php b/src/Operators/Other/RequireOperator.php
similarity index 100%
rename from Library/Operators/Other/RequireOperator.php
rename to src/Operators/Other/RequireOperator.php
diff --git a/Library/Operators/Other/ShortTernaryOperator.php b/src/Operators/Other/ShortTernaryOperator.php
similarity index 100%
rename from Library/Operators/Other/ShortTernaryOperator.php
rename to src/Operators/Other/ShortTernaryOperator.php
diff --git a/Library/Operators/Other/TernaryOperator.php b/src/Operators/Other/TernaryOperator.php
similarity index 100%
rename from Library/Operators/Other/TernaryOperator.php
rename to src/Operators/Other/TernaryOperator.php
diff --git a/Library/Operators/Other/TypeHintOperator.php b/src/Operators/Other/TypeHintOperator.php
similarity index 100%
rename from Library/Operators/Other/TypeHintOperator.php
rename to src/Operators/Other/TypeHintOperator.php
diff --git a/Library/Operators/Other/TypeOfOperator.php b/src/Operators/Other/TypeOfOperator.php
similarity index 100%
rename from Library/Operators/Other/TypeOfOperator.php
rename to src/Operators/Other/TypeOfOperator.php
diff --git a/Library/Operators/Other/UnlikelyOperator.php b/src/Operators/Other/UnlikelyOperator.php
similarity index 100%
rename from Library/Operators/Other/UnlikelyOperator.php
rename to src/Operators/Other/UnlikelyOperator.php
diff --git a/Library/Operators/Unary/MinusOperator.php b/src/Operators/Unary/MinusOperator.php
similarity index 100%
rename from Library/Operators/Unary/MinusOperator.php
rename to src/Operators/Unary/MinusOperator.php
diff --git a/Library/Operators/Unary/NotOperator.php b/src/Operators/Unary/NotOperator.php
similarity index 100%
rename from Library/Operators/Unary/NotOperator.php
rename to src/Operators/Unary/NotOperator.php
diff --git a/Library/Optimizers/EvalExpression.php b/src/Optimizers/EvalExpression.php
similarity index 100%
rename from Library/Optimizers/EvalExpression.php
rename to src/Optimizers/EvalExpression.php
diff --git a/Library/Optimizers/FunctionCall/ACosOptimizer.php b/src/Optimizers/FunctionCall/ACosOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ACosOptimizer.php
rename to src/Optimizers/FunctionCall/ACosOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ASinOptimizer.php b/src/Optimizers/FunctionCall/ASinOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ASinOptimizer.php
rename to src/Optimizers/FunctionCall/ASinOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/AddslashesOptimizer.php b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/AddslashesOptimizer.php
rename to src/Optimizers/FunctionCall/AddslashesOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
rename to src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ArrayKeysOptimizer.php
rename to src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ArrayMergeOptimizer.php
rename to src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/BasenameOptimizer.php
rename to src/Optimizers/FunctionCall/BasenameOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
rename to src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CallUserFuncOptimizer.php
rename to src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CamelizeOptimizer.php
rename to src/Optimizers/FunctionCall/CamelizeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CeilOptimizer.php b/src/Optimizers/FunctionCall/CeilOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CeilOptimizer.php
rename to src/Optimizers/FunctionCall/CeilOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ClassExistsOptimizer.php b/src/Optimizers/FunctionCall/ClassExistsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ClassExistsOptimizer.php
rename to src/Optimizers/FunctionCall/ClassExistsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php b/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CompareMtimeOptimizer.php
rename to src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CosOptimizer.php b/src/Optimizers/FunctionCall/CosOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CosOptimizer.php
rename to src/Optimizers/FunctionCall/CosOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CountOptimizer.php b/src/Optimizers/FunctionCall/CountOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CountOptimizer.php
rename to src/Optimizers/FunctionCall/CountOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/Crc32Optimizer.php
rename to src/Optimizers/FunctionCall/Crc32Optimizer.php
diff --git a/Library/Optimizers/FunctionCall/CreateArrayOptimizer.php b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CreateArrayOptimizer.php
rename to src/Optimizers/FunctionCall/CreateArrayOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CreateInstanceOptimizer.php
rename to src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
rename to src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
rename to src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/DieOptimizer.php b/src/Optimizers/FunctionCall/DieOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/DieOptimizer.php
rename to src/Optimizers/FunctionCall/DieOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/DoublevalOptimizer.php b/src/Optimizers/FunctionCall/DoublevalOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/DoublevalOptimizer.php
rename to src/Optimizers/FunctionCall/DoublevalOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/EndsWithOptimizer.php b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/EndsWithOptimizer.php
rename to src/Optimizers/FunctionCall/EndsWithOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/EvalOptimizer.php b/src/Optimizers/FunctionCall/EvalOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/EvalOptimizer.php
rename to src/Optimizers/FunctionCall/EvalOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ExitOptimizer.php b/src/Optimizers/FunctionCall/ExitOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ExitOptimizer.php
rename to src/Optimizers/FunctionCall/ExitOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ExplodeOptimizer.php b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ExplodeOptimizer.php
rename to src/Optimizers/FunctionCall/ExplodeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FcloseOptimizer.php b/src/Optimizers/FunctionCall/FcloseOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FcloseOptimizer.php
rename to src/Optimizers/FunctionCall/FcloseOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FeofOptimizer.php b/src/Optimizers/FunctionCall/FeofOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FeofOptimizer.php
rename to src/Optimizers/FunctionCall/FeofOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FileExistsOptimizer.php b/src/Optimizers/FunctionCall/FileExistsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FileExistsOptimizer.php
rename to src/Optimizers/FunctionCall/FileExistsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FileGetContentsOptimizer.php
rename to src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php b/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FilePutContentsOptimizer.php
rename to src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FilemtimeOptimizer.php
rename to src/Optimizers/FunctionCall/FilemtimeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FloorOptimizer.php b/src/Optimizers/FunctionCall/FloorOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FloorOptimizer.php
rename to src/Optimizers/FunctionCall/FloorOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FuncGetArgOptimizer.php
rename to src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
rename to src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FuncNumArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
rename to src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php b/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FunctionExistsOptimizer.php
rename to src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/FwriteOptimizer.php b/src/Optimizers/FunctionCall/FwriteOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/FwriteOptimizer.php
rename to src/Optimizers/FunctionCall/FwriteOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GetCalledClassOptimizer.php
rename to src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GetClassLowerOptimizer.php
rename to src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GetClassNsOptimizer.php
rename to src/Optimizers/FunctionCall/GetClassNsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GetClassOptimizer.php
rename to src/Optimizers/FunctionCall/GetClassOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
rename to src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GetNsClassOptimizer.php b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GetNsClassOptimizer.php
rename to src/Optimizers/FunctionCall/GetNsClassOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GettypeOptimizer.php b/src/Optimizers/FunctionCall/GettypeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GettypeOptimizer.php
rename to src/Optimizers/FunctionCall/GettypeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GlobalsGetOptimizer.php b/src/Optimizers/FunctionCall/GlobalsGetOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GlobalsGetOptimizer.php
rename to src/Optimizers/FunctionCall/GlobalsGetOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/GlobalsSetOptimizer.php b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/GlobalsSetOptimizer.php
rename to src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/HashEqualsOptimizer.php b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/HashEqualsOptimizer.php
rename to src/Optimizers/FunctionCall/HashEqualsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ImplodeOptimizer.php b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ImplodeOptimizer.php
rename to src/Optimizers/FunctionCall/ImplodeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/InArrayOptimizer.php
rename to src/Optimizers/FunctionCall/InArrayOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php b/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
rename to src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IntvalOptimizer.php b/src/Optimizers/FunctionCall/IntvalOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IntvalOptimizer.php
rename to src/Optimizers/FunctionCall/IntvalOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsArrayOptimizer.php b/src/Optimizers/FunctionCall/IsArrayOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsArrayOptimizer.php
rename to src/Optimizers/FunctionCall/IsArrayOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsBoolOptimizer.php b/src/Optimizers/FunctionCall/IsBoolOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsBoolOptimizer.php
rename to src/Optimizers/FunctionCall/IsBoolOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsCallableOptimizer.php b/src/Optimizers/FunctionCall/IsCallableOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsCallableOptimizer.php
rename to src/Optimizers/FunctionCall/IsCallableOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsIntOptimizer.php b/src/Optimizers/FunctionCall/IsIntOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsIntOptimizer.php
rename to src/Optimizers/FunctionCall/IsIntOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsNullOptimizer.php b/src/Optimizers/FunctionCall/IsNullOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsNullOptimizer.php
rename to src/Optimizers/FunctionCall/IsNullOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsNumericOptimizer.php b/src/Optimizers/FunctionCall/IsNumericOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsNumericOptimizer.php
rename to src/Optimizers/FunctionCall/IsNumericOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsObjectOptimizer.php b/src/Optimizers/FunctionCall/IsObjectOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsObjectOptimizer.php
rename to src/Optimizers/FunctionCall/IsObjectOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsPhpVersionOptimizer.php b/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
rename to src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php b/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
rename to src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsResourceOptimizer.php b/src/Optimizers/FunctionCall/IsResourceOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsResourceOptimizer.php
rename to src/Optimizers/FunctionCall/IsResourceOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsScalarOptimizer.php b/src/Optimizers/FunctionCall/IsScalarOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsScalarOptimizer.php
rename to src/Optimizers/FunctionCall/IsScalarOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/IsStringOptimizer.php b/src/Optimizers/FunctionCall/IsStringOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/IsStringOptimizer.php
rename to src/Optimizers/FunctionCall/IsStringOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/JoinOptimizer.php b/src/Optimizers/FunctionCall/JoinOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/JoinOptimizer.php
rename to src/Optimizers/FunctionCall/JoinOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/JsonDecodeOptimizer.php
rename to src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/JsonEncodeOptimizer.php
rename to src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/LdexpOptimizer.php b/src/Optimizers/FunctionCall/LdexpOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/LdexpOptimizer.php
rename to src/Optimizers/FunctionCall/LdexpOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/LtrimOptimizer.php b/src/Optimizers/FunctionCall/LtrimOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/LtrimOptimizer.php
rename to src/Optimizers/FunctionCall/LtrimOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/Md5Optimizer.php
rename to src/Optimizers/FunctionCall/Md5Optimizer.php
diff --git a/Library/Optimizers/FunctionCall/MemstrOptimizer.php b/src/Optimizers/FunctionCall/MemstrOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/MemstrOptimizer.php
rename to src/Optimizers/FunctionCall/MemstrOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/MergeAppendOptimizer.php b/src/Optimizers/FunctionCall/MergeAppendOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/MergeAppendOptimizer.php
rename to src/Optimizers/FunctionCall/MergeAppendOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/MethodExistsOptimizer.php b/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/MethodExistsOptimizer.php
rename to src/Optimizers/FunctionCall/MethodExistsOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/MicrotimeOptimizer.php b/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/MicrotimeOptimizer.php
rename to src/Optimizers/FunctionCall/MicrotimeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/PowOptimizer.php b/src/Optimizers/FunctionCall/PowOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/PowOptimizer.php
rename to src/Optimizers/FunctionCall/PowOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/PregMatchAllOptimizer.php b/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/PregMatchAllOptimizer.php
rename to src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/PregMatchOptimizer.php
rename to src/Optimizers/FunctionCall/PregMatchOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
rename to src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/RoundOptimizer.php b/src/Optimizers/FunctionCall/RoundOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/RoundOptimizer.php
rename to src/Optimizers/FunctionCall/RoundOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/RtrimOptimizer.php b/src/Optimizers/FunctionCall/RtrimOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/RtrimOptimizer.php
rename to src/Optimizers/FunctionCall/RtrimOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/SinOptimizer.php b/src/Optimizers/FunctionCall/SinOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/SinOptimizer.php
rename to src/Optimizers/FunctionCall/SinOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/SqrtOptimizer.php b/src/Optimizers/FunctionCall/SqrtOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/SqrtOptimizer.php
rename to src/Optimizers/FunctionCall/SqrtOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StartsWithOptimizer.php b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StartsWithOptimizer.php
rename to src/Optimizers/FunctionCall/StartsWithOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StrReplaceOptimizer.php b/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StrReplaceOptimizer.php
rename to src/Optimizers/FunctionCall/StrReplaceOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StripcslashesOptimizer.php
rename to src/Optimizers/FunctionCall/StripcslashesOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StripslashesOptimizer.php
rename to src/Optimizers/FunctionCall/StripslashesOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StrlenOptimizer.php b/src/Optimizers/FunctionCall/StrlenOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StrlenOptimizer.php
rename to src/Optimizers/FunctionCall/StrlenOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StrposOptimizer.php b/src/Optimizers/FunctionCall/StrposOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StrposOptimizer.php
rename to src/Optimizers/FunctionCall/StrposOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StrtokOptimizer.php b/src/Optimizers/FunctionCall/StrtokOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StrtokOptimizer.php
rename to src/Optimizers/FunctionCall/StrtokOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StrtolowerOptimizer.php b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StrtolowerOptimizer.php
rename to src/Optimizers/FunctionCall/StrtolowerOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/StrtoupperOptimizer.php
rename to src/Optimizers/FunctionCall/StrtoupperOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/SubstrOptimizer.php b/src/Optimizers/FunctionCall/SubstrOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/SubstrOptimizer.php
rename to src/Optimizers/FunctionCall/SubstrOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/TanOptimizer.php b/src/Optimizers/FunctionCall/TanOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/TanOptimizer.php
rename to src/Optimizers/FunctionCall/TanOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/TimeOptimizer.php b/src/Optimizers/FunctionCall/TimeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/TimeOptimizer.php
rename to src/Optimizers/FunctionCall/TimeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/TrimOptimizer.php
rename to src/Optimizers/FunctionCall/TrimOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/UcfirstOptimizer.php
rename to src/Optimizers/FunctionCall/UcfirstOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/UncamelizeOptimizer.php
rename to src/Optimizers/FunctionCall/UncamelizeOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/UniqueKeyOptimizer.php
rename to src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
rename to src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/VarDumpOptimizer.php
rename to src/Optimizers/FunctionCall/VarDumpOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/VarExportOptimizer.php
rename to src/Optimizers/FunctionCall/VarExportOptimizer.php
diff --git a/Library/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
similarity index 100%
rename from Library/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
rename to src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
diff --git a/Library/Optimizers/IsTypeOptimizerAbstract.php b/src/Optimizers/IsTypeOptimizerAbstract.php
similarity index 100%
rename from Library/Optimizers/IsTypeOptimizerAbstract.php
rename to src/Optimizers/IsTypeOptimizerAbstract.php
diff --git a/Library/Optimizers/MathOptimizer.php b/src/Optimizers/MathOptimizer.php
similarity index 100%
rename from Library/Optimizers/MathOptimizer.php
rename to src/Optimizers/MathOptimizer.php
diff --git a/Library/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
similarity index 100%
rename from Library/Optimizers/OptimizerAbstract.php
rename to src/Optimizers/OptimizerAbstract.php
diff --git a/Library/Parser/Manager.php b/src/Parser/Manager.php
similarity index 100%
rename from Library/Parser/Manager.php
rename to src/Parser/Manager.php
diff --git a/Library/Parser/Parser.php b/src/Parser/Parser.php
similarity index 100%
rename from Library/Parser/Parser.php
rename to src/Parser/Parser.php
diff --git a/Library/Passes/CallGathererPass.php b/src/Passes/CallGathererPass.php
similarity index 100%
rename from Library/Passes/CallGathererPass.php
rename to src/Passes/CallGathererPass.php
diff --git a/Library/Passes/LocalContextPass.php b/src/Passes/LocalContextPass.php
similarity index 100%
rename from Library/Passes/LocalContextPass.php
rename to src/Passes/LocalContextPass.php
diff --git a/Library/Passes/LoopBreakPass.php b/src/Passes/LoopBreakPass.php
similarity index 100%
rename from Library/Passes/LoopBreakPass.php
rename to src/Passes/LoopBreakPass.php
diff --git a/Library/Passes/MutateGathererPass.php b/src/Passes/MutateGathererPass.php
similarity index 100%
rename from Library/Passes/MutateGathererPass.php
rename to src/Passes/MutateGathererPass.php
diff --git a/Library/Passes/SkipVariantInit.php b/src/Passes/SkipVariantInit.php
similarity index 100%
rename from Library/Passes/SkipVariantInit.php
rename to src/Passes/SkipVariantInit.php
diff --git a/Library/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
similarity index 100%
rename from Library/Passes/StaticTypeInference.php
rename to src/Passes/StaticTypeInference.php
diff --git a/Library/Statements/BreakStatement.php b/src/Statements/BreakStatement.php
similarity index 100%
rename from Library/Statements/BreakStatement.php
rename to src/Statements/BreakStatement.php
diff --git a/Library/Statements/ContinueStatement.php b/src/Statements/ContinueStatement.php
similarity index 100%
rename from Library/Statements/ContinueStatement.php
rename to src/Statements/ContinueStatement.php
diff --git a/Library/Statements/DeclareStatement.php b/src/Statements/DeclareStatement.php
similarity index 100%
rename from Library/Statements/DeclareStatement.php
rename to src/Statements/DeclareStatement.php
diff --git a/Library/Statements/DoWhileStatement.php b/src/Statements/DoWhileStatement.php
similarity index 100%
rename from Library/Statements/DoWhileStatement.php
rename to src/Statements/DoWhileStatement.php
diff --git a/Library/Statements/EchoStatement.php b/src/Statements/EchoStatement.php
similarity index 100%
rename from Library/Statements/EchoStatement.php
rename to src/Statements/EchoStatement.php
diff --git a/Library/Statements/ForStatement.php b/src/Statements/ForStatement.php
similarity index 100%
rename from Library/Statements/ForStatement.php
rename to src/Statements/ForStatement.php
diff --git a/Library/Statements/IfStatement.php b/src/Statements/IfStatement.php
similarity index 100%
rename from Library/Statements/IfStatement.php
rename to src/Statements/IfStatement.php
diff --git a/Library/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
similarity index 100%
rename from Library/Statements/Let/ArrayIndex.php
rename to src/Statements/Let/ArrayIndex.php
diff --git a/Library/Statements/Let/ArrayIndexAppend.php b/src/Statements/Let/ArrayIndexAppend.php
similarity index 100%
rename from Library/Statements/Let/ArrayIndexAppend.php
rename to src/Statements/Let/ArrayIndexAppend.php
diff --git a/Library/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
similarity index 100%
rename from Library/Statements/Let/Decr.php
rename to src/Statements/Let/Decr.php
diff --git a/Library/Statements/Let/ExportSymbol.php b/src/Statements/Let/ExportSymbol.php
similarity index 100%
rename from Library/Statements/Let/ExportSymbol.php
rename to src/Statements/Let/ExportSymbol.php
diff --git a/Library/Statements/Let/ExportSymbolString.php b/src/Statements/Let/ExportSymbolString.php
similarity index 100%
rename from Library/Statements/Let/ExportSymbolString.php
rename to src/Statements/Let/ExportSymbolString.php
diff --git a/Library/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
similarity index 100%
rename from Library/Statements/Let/Incr.php
rename to src/Statements/Let/Incr.php
diff --git a/Library/Statements/Let/ObjectDynamicProperty.php b/src/Statements/Let/ObjectDynamicProperty.php
similarity index 100%
rename from Library/Statements/Let/ObjectDynamicProperty.php
rename to src/Statements/Let/ObjectDynamicProperty.php
diff --git a/Library/Statements/Let/ObjectDynamicStringProperty.php b/src/Statements/Let/ObjectDynamicStringProperty.php
similarity index 100%
rename from Library/Statements/Let/ObjectDynamicStringProperty.php
rename to src/Statements/Let/ObjectDynamicStringProperty.php
diff --git a/Library/Statements/Let/ObjectProperty.php b/src/Statements/Let/ObjectProperty.php
similarity index 100%
rename from Library/Statements/Let/ObjectProperty.php
rename to src/Statements/Let/ObjectProperty.php
diff --git a/Library/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
similarity index 100%
rename from Library/Statements/Let/ObjectPropertyAppend.php
rename to src/Statements/Let/ObjectPropertyAppend.php
diff --git a/Library/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
similarity index 100%
rename from Library/Statements/Let/ObjectPropertyArrayIndex.php
rename to src/Statements/Let/ObjectPropertyArrayIndex.php
diff --git a/Library/Statements/Let/ObjectPropertyArrayIndexAppend.php b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
similarity index 100%
rename from Library/Statements/Let/ObjectPropertyArrayIndexAppend.php
rename to src/Statements/Let/ObjectPropertyArrayIndexAppend.php
diff --git a/Library/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
similarity index 100%
rename from Library/Statements/Let/ObjectPropertyDecr.php
rename to src/Statements/Let/ObjectPropertyDecr.php
diff --git a/Library/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
similarity index 100%
rename from Library/Statements/Let/ObjectPropertyIncr.php
rename to src/Statements/Let/ObjectPropertyIncr.php
diff --git a/Library/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
similarity index 100%
rename from Library/Statements/Let/StaticProperty.php
rename to src/Statements/Let/StaticProperty.php
diff --git a/Library/Statements/Let/StaticPropertyAdd.php b/src/Statements/Let/StaticPropertyAdd.php
similarity index 100%
rename from Library/Statements/Let/StaticPropertyAdd.php
rename to src/Statements/Let/StaticPropertyAdd.php
diff --git a/Library/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
similarity index 100%
rename from Library/Statements/Let/StaticPropertyAppend.php
rename to src/Statements/Let/StaticPropertyAppend.php
diff --git a/Library/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
similarity index 100%
rename from Library/Statements/Let/StaticPropertyArrayIndex.php
rename to src/Statements/Let/StaticPropertyArrayIndex.php
diff --git a/Library/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
similarity index 100%
rename from Library/Statements/Let/StaticPropertyArrayIndexAppend.php
rename to src/Statements/Let/StaticPropertyArrayIndexAppend.php
diff --git a/Library/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
similarity index 100%
rename from Library/Statements/Let/StaticPropertySub.php
rename to src/Statements/Let/StaticPropertySub.php
diff --git a/Library/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
similarity index 100%
rename from Library/Statements/Let/Variable.php
rename to src/Statements/Let/Variable.php
diff --git a/Library/Statements/Let/VariableAppend.php b/src/Statements/Let/VariableAppend.php
similarity index 100%
rename from Library/Statements/Let/VariableAppend.php
rename to src/Statements/Let/VariableAppend.php
diff --git a/Library/Statements/LetStatement.php b/src/Statements/LetStatement.php
similarity index 100%
rename from Library/Statements/LetStatement.php
rename to src/Statements/LetStatement.php
diff --git a/Library/Statements/LoopStatement.php b/src/Statements/LoopStatement.php
similarity index 100%
rename from Library/Statements/LoopStatement.php
rename to src/Statements/LoopStatement.php
diff --git a/Library/Statements/RequireOnceStatement.php b/src/Statements/RequireOnceStatement.php
similarity index 100%
rename from Library/Statements/RequireOnceStatement.php
rename to src/Statements/RequireOnceStatement.php
diff --git a/Library/Statements/RequireStatement.php b/src/Statements/RequireStatement.php
similarity index 100%
rename from Library/Statements/RequireStatement.php
rename to src/Statements/RequireStatement.php
diff --git a/Library/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
similarity index 100%
rename from Library/Statements/ReturnStatement.php
rename to src/Statements/ReturnStatement.php
diff --git a/Library/Statements/StatementAbstract.php b/src/Statements/StatementAbstract.php
similarity index 100%
rename from Library/Statements/StatementAbstract.php
rename to src/Statements/StatementAbstract.php
diff --git a/Library/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
similarity index 100%
rename from Library/Statements/SwitchStatement.php
rename to src/Statements/SwitchStatement.php
diff --git a/Library/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
similarity index 100%
rename from Library/Statements/ThrowStatement.php
rename to src/Statements/ThrowStatement.php
diff --git a/Library/Statements/TryCatchStatement.php b/src/Statements/TryCatchStatement.php
similarity index 100%
rename from Library/Statements/TryCatchStatement.php
rename to src/Statements/TryCatchStatement.php
diff --git a/Library/Statements/UnsetStatement.php b/src/Statements/UnsetStatement.php
similarity index 100%
rename from Library/Statements/UnsetStatement.php
rename to src/Statements/UnsetStatement.php
diff --git a/Library/Statements/WhileStatement.php b/src/Statements/WhileStatement.php
similarity index 100%
rename from Library/Statements/WhileStatement.php
rename to src/Statements/WhileStatement.php
diff --git a/Library/StatementsBlock.php b/src/StatementsBlock.php
similarity index 100%
rename from Library/StatementsBlock.php
rename to src/StatementsBlock.php
diff --git a/Library/StaticCall.php b/src/StaticCall.php
similarity index 100%
rename from Library/StaticCall.php
rename to src/StaticCall.php
diff --git a/Library/StringsManager.php b/src/StringsManager.php
similarity index 100%
rename from Library/StringsManager.php
rename to src/StringsManager.php
diff --git a/Library/Stubs/DocBlock.php b/src/Stubs/DocBlock.php
similarity index 100%
rename from Library/Stubs/DocBlock.php
rename to src/Stubs/DocBlock.php
diff --git a/Library/Stubs/Generator.php b/src/Stubs/Generator.php
similarity index 100%
rename from Library/Stubs/Generator.php
rename to src/Stubs/Generator.php
diff --git a/Library/Stubs/MethodDocBlock.php b/src/Stubs/MethodDocBlock.php
similarity index 100%
rename from Library/Stubs/MethodDocBlock.php
rename to src/Stubs/MethodDocBlock.php
diff --git a/Library/SymbolTable.php b/src/SymbolTable.php
similarity index 100%
rename from Library/SymbolTable.php
rename to src/SymbolTable.php
diff --git a/Library/TypeAwareInterface.php b/src/TypeAwareInterface.php
similarity index 100%
rename from Library/TypeAwareInterface.php
rename to src/TypeAwareInterface.php
diff --git a/Library/Types/AbstractType.php b/src/Types/AbstractType.php
similarity index 100%
rename from Library/Types/AbstractType.php
rename to src/Types/AbstractType.php
diff --git a/Library/Types/ArrayType.php b/src/Types/ArrayType.php
similarity index 100%
rename from Library/Types/ArrayType.php
rename to src/Types/ArrayType.php
diff --git a/Library/Types/CharType.php b/src/Types/CharType.php
similarity index 100%
rename from Library/Types/CharType.php
rename to src/Types/CharType.php
diff --git a/Library/Types/DoubleType.php b/src/Types/DoubleType.php
similarity index 100%
rename from Library/Types/DoubleType.php
rename to src/Types/DoubleType.php
diff --git a/Library/Types/IntType.php b/src/Types/IntType.php
similarity index 100%
rename from Library/Types/IntType.php
rename to src/Types/IntType.php
diff --git a/Library/Types/IstringType.php b/src/Types/IstringType.php
similarity index 100%
rename from Library/Types/IstringType.php
rename to src/Types/IstringType.php
diff --git a/Library/Types/StringType.php b/src/Types/StringType.php
similarity index 100%
rename from Library/Types/StringType.php
rename to src/Types/StringType.php
diff --git a/Library/Types/Types.php b/src/Types/Types.php
similarity index 100%
rename from Library/Types/Types.php
rename to src/Types/Types.php
diff --git a/Library/Variable/Globals.php b/src/Variable/Globals.php
similarity index 100%
rename from Library/Variable/Globals.php
rename to src/Variable/Globals.php
diff --git a/Library/Variable/Variable.php b/src/Variable/Variable.php
similarity index 100%
rename from Library/Variable/Variable.php
rename to src/Variable/Variable.php
diff --git a/Library/Zephir.php b/src/Zephir.php
similarity index 100%
rename from Library/Zephir.php
rename to src/Zephir.php
diff --git a/Library/functions.php b/src/functions.php
similarity index 100%
rename from Library/functions.php
rename to src/functions.php
diff --git a/zephir b/zephir
index 76e90909f4..8928747d67 100755
--- a/zephir
+++ b/zephir
@@ -111,7 +111,7 @@ $backend = new Backend($config, $rootPath.'/kernel', $rootPath.'/templates');
 
 $compiler = new Compiler($config, $backend, new Manager($parser), $disk, $compilerFactory);
 $compiler->setPrototypesPath($rootPath.'/prototypes');
-$compiler->setOptimizersPath($rootPath.'/Library/Optimizers');
+$compiler->setOptimizersPath($rootPath.'/src/Optimizers');
 $compiler->setTemplatesPath($rootPath.'/templates');
 $compiler->setLogger($logger);
 

From 322080ba90a2172a27b341a898d595374111529d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 21:11:55 +0000
Subject: [PATCH 101/375] Replace switch to match

---
 src/Code/Builder/Struct.php | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/Code/Builder/Struct.php b/src/Code/Builder/Struct.php
index a5e6ff1fc8..ce00f3041c 100644
--- a/src/Code/Builder/Struct.php
+++ b/src/Code/Builder/Struct.php
@@ -160,27 +160,12 @@ public function getInitEntry(string $name, array $global, string $namespace): st
      */
     protected function convertToCType(string $type): string
     {
-        switch ($type) {
-            case 'boolean':
-            case 'bool':
-                return 'zend_bool';
-
-            case 'hash':
-                return 'HashTable* ';
-
-            case 'string':
-                return 'zend_string* ';
-
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'char':
-            case 'uchar':
-            case 'double':
-                return $type;
-
-            default:
-                throw new InvalidArgumentException('Unknown global type: '.$type);
-        }
+        return match ($type) {
+            'boolean', 'bool' => 'zend_bool',
+            'hash' => 'HashTable* ',
+            'string' => 'zend_string* ',
+            'int', 'uint', 'long', 'char', 'uchar', 'double' => $type,
+            default => throw new InvalidArgumentException('Unknown global type: '.$type),
+        };
     }
 }

From 1a3081e24a7f38ae640b8582bb4c81ae0397da18 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Oct 2023 21:13:30 +0000
Subject: [PATCH 102/375] Fix CS

---
 .php-cs-fixer.dist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index ea5c16a65a..a489e5bb55 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -11,7 +11,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-if (!file_exists(__DIR__ . '/src')) {
+if (!file_exists(__DIR__.'/src')) {
     exit(0);
 }
 

From 5ec843cc372f908718a0effddb515278766ebcc2 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <aionbase@gmail.com>
Date: Mon, 30 Oct 2023 11:02:17 +0000
Subject: [PATCH 103/375] Adjust position of license

---
 .php-cs-fixer.dist.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index a489e5bb55..824a5efce3 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 if (!file_exists(__DIR__.'/src')) {
     exit(0);
 }

From 8e03ac31f73edec3123d7b3394365b43358c38e1 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 5 Nov 2023 19:31:07 +0000
Subject: [PATCH 104/375] Migrate functions into methods

---
 src/Compiler.php  | 45 +++++++++++++++++++++++++++++++++++++++-
 src/functions.php | 53 -----------------------------------------------
 2 files changed, 44 insertions(+), 54 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index a97056c84c..8092433209 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -734,7 +734,7 @@ public function compile(bool $development = false, int $jobs = null): void
             // TODO(klay): Make this better. Looks like it is non standard Env. Var
             exec('cd ext && %PHP_DEVPACK%\\phpize --clean', $output, $exit);
 
-            $releaseFolder = windows_release_dir();
+            $releaseFolder = $this->getWindowsReleaseDir();
             if (file_exists($releaseFolder)) {
                 exec('rd /s /q '.$releaseFolder, $output, $exit);
             }
@@ -2160,4 +2160,47 @@ static function (string $path): string {
             $paths
         );
     }
+
+    private function isZts(): bool
+    {
+        if (\defined('PHP_ZTS') && \PHP_ZTS === 1) {
+            return true;
+        }
+
+        ob_start();
+        phpinfo(\INFO_GENERAL);
+
+        return (bool) preg_match('/Thread\s*Safety\s*enabled/i', strip_tags(ob_get_clean()));
+    }
+
+    private function getWindowsReleaseDir(): string
+    {
+        if ($this->isZts()) {
+            if (\PHP_INT_SIZE === 4) {
+                // 32-bit version of PHP
+                return 'ext\\Release_TS';
+            }
+
+            if (\PHP_INT_SIZE === 8) {
+                // 64-bit version of PHP
+                return 'ext\\x64\\Release_TS';
+            }
+
+            // fallback
+            return 'ext\\Release_TS';
+        }
+
+        if (\PHP_INT_SIZE === 4) {
+            // 32-bit version of PHP
+            return 'ext\\Release';
+        }
+
+        if (\PHP_INT_SIZE === 8) {
+            // 64-bit version of PHP
+            return 'ext\\x64\\Release';
+        }
+
+        // fallback
+        return 'ext\\Release';
+    }
 }
diff --git a/src/functions.php b/src/functions.php
index 9c9990428b..5968d0b8e7 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -165,56 +165,3 @@ function is_windows()
 {
     return 0 === stripos(\PHP_OS, 'WIN');
 }
-
-/**
- * Checks if current PHP is thread safe.
- *
- * @return bool
- */
-function is_zts()
-{
-    if (\defined('PHP_ZTS') && \PHP_ZTS === 1) {
-        return true;
-    }
-
-    ob_start();
-    phpinfo(\INFO_GENERAL);
-
-    return (bool) preg_match('/Thread\s*Safety\s*enabled/i', strip_tags(ob_get_clean()));
-}
-
-/**
- * Resolves Windows release folder.
- *
- * @return string
- */
-function windows_release_dir()
-{
-    if (is_zts()) {
-        if (\PHP_INT_SIZE === 4) {
-            // 32-bit version of PHP
-            return 'ext\\Release_TS';
-        }
-
-        if (\PHP_INT_SIZE === 8) {
-            // 64-bit version of PHP
-            return 'ext\\x64\\Release_TS';
-        }
-
-        // fallback
-        return 'ext\\Release_TS';
-    }
-
-    if (\PHP_INT_SIZE === 4) {
-        // 32-bit version of PHP
-        return 'ext\\Release';
-    }
-
-    if (\PHP_INT_SIZE === 8) {
-        // 64-bit version of PHP
-        return 'ext\\x64\\Release';
-    }
-
-    // fallback
-    return 'ext\\Release';
-}

From 7a347d1ac4057c32ab26dc1eac38ee22670e1831 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 5 Nov 2023 19:38:55 +0000
Subject: [PATCH 105/375] Remove redundant docblock

---
 src/CompilationContext.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/CompilationContext.php b/src/CompilationContext.php
index c2522a6db1..857f1b0c12 100644
--- a/src/CompilationContext.php
+++ b/src/CompilationContext.php
@@ -144,10 +144,6 @@ class CompilationContext
 
     /**
      * Transform class/interface name to FQN format.
-     *
-     * @param string $className
-     *
-     * @return string
      */
     public function getFullName(string $className): string
     {

From f5889778cd8b4c00e13dbe546d43eaa6244d4d8c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 5 Nov 2023 19:44:52 +0000
Subject: [PATCH 106/375] Move `file_put_contents_ex()` function into
 `HardDisk` class

---
 src/Backend/FcallManager.php   |  5 ++---
 src/Backend/StringsManager.php |  7 +++----
 src/Compiler.php               | 21 +++++++++++----------
 src/FileSystem/HardDisk.php    | 16 ++++++++++++++++
 src/functions.php              | 24 ------------------------
 5 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/Backend/FcallManager.php b/src/Backend/FcallManager.php
index 04c3ca61ea..9ba5c97c41 100644
--- a/src/Backend/FcallManager.php
+++ b/src/Backend/FcallManager.php
@@ -14,8 +14,7 @@
 namespace Zephir\Backend;
 
 use Zephir\Code\Printer;
-
-use function Zephir\file_put_contents_ex;
+use Zephir\FileSystem\HardDisk;
 
 class FcallManager implements FcallManagerInterface
 {
@@ -156,6 +155,6 @@ public function genFcallCode(): void
         }
 
         $codePrinter->output('#endif');
-        file_put_contents_ex($codePrinter->getOutput(), 'ext/kernel/fcall_internal.h');
+        HardDisk::persistByHash($codePrinter->getOutput(), 'ext/kernel/fcall_internal.h');
     }
 }
diff --git a/src/Backend/StringsManager.php b/src/Backend/StringsManager.php
index d90559deb8..e2713cb6a3 100644
--- a/src/Backend/StringsManager.php
+++ b/src/Backend/StringsManager.php
@@ -13,10 +13,9 @@
 
 namespace Zephir\Backend;
 
+use Zephir\FileSystem\HardDisk;
 use Zephir\StringsManager as BaseStringsManager;
 
-use function Zephir\file_put_contents_ex;
-
 /**
  * Manages the concatenation keys for the extension and the interned strings
  */
@@ -189,7 +188,7 @@ public function genConcatCode(): void
 #endif /* ZEPHIR_KERNEL_CONCAT_H */
 ';
         $contents = $pcodeh.implode(PHP_EOL, $macros).PHP_EOL.PHP_EOL.$codeh;
-        file_put_contents_ex($contents, 'ext/kernel/concat.h');
-        file_put_contents_ex($code, 'ext/kernel/concat.c');
+        HardDisk::persistByHash($contents, 'ext/kernel/concat.h');
+        HardDisk::persistByHash($code, 'ext/kernel/concat.c');
     }
 }
diff --git a/src/Compiler.php b/src/Compiler.php
index 8092433209..e3068c0503 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -31,6 +31,7 @@
 use Zephir\Exception\ParseException;
 use Zephir\Exception\RuntimeException;
 use Zephir\FileSystem\FileSystemInterface;
+use Zephir\FileSystem\HardDisk;
 use Zephir\Parser\Manager;
 
 final class Compiler
@@ -994,7 +995,7 @@ public function createConfigFiles(string $project): bool
             $contentM4 = str_replace($mark, $replace, $contentM4);
         }
 
-        file_put_contents_ex($contentM4, 'ext/config.m4');
+        HardDisk::persistByHash($contentM4, 'ext/config.m4');
 
         /**
          * Generate config.w32.
@@ -1017,7 +1018,7 @@ public function createConfigFiles(string $project): bool
             $contentW32 = str_replace($mark, $replace, $contentW32);
         }
 
-        $needConfigure = file_put_contents_ex($contentW32, 'ext/config.w32');
+        $needConfigure = HardDisk::persistByHash($contentW32, 'ext/config.w32');
 
         /**
          * php_ext.h.
@@ -1035,7 +1036,7 @@ public function createConfigFiles(string $project): bool
             $content = str_replace($mark, $replace, $content);
         }
 
-        file_put_contents_ex($content, 'ext/php_ext.h');
+        HardDisk::persistByHash($content, 'ext/php_ext.h');
 
         /**
          * ext.h.
@@ -1053,7 +1054,7 @@ public function createConfigFiles(string $project): bool
             $content = str_replace($mark, $replace, $content);
         }
 
-        file_put_contents_ex($content, 'ext/ext.h');
+        HardDisk::persistByHash($content, 'ext/ext.h');
 
         /**
          * ext_config.h.
@@ -1071,7 +1072,7 @@ public function createConfigFiles(string $project): bool
             $content = str_replace($mark, $replace, $content);
         }
 
-        file_put_contents_ex($content, 'ext/ext_config.h');
+        HardDisk::persistByHash($content, 'ext/ext_config.h');
 
         /**
          * ext_clean.
@@ -1081,7 +1082,7 @@ public function createConfigFiles(string $project): bool
             throw new Exception("Clean file doesn't exist");
         }
 
-        if (file_put_contents_ex($content, 'ext/clean')) {
+        if (HardDisk::persistByHash($content, 'ext/clean')) {
             chmod('ext/clean', 0755);
         }
 
@@ -1101,7 +1102,7 @@ public function createConfigFiles(string $project): bool
             $content = str_replace($mark, $replace, $content);
         }
 
-        if (file_put_contents_ex($content, 'ext/install')) {
+        if (HardDisk::persistByHash($content, 'ext/install')) {
             chmod('ext/install', 0755);
         }
 
@@ -1596,7 +1597,7 @@ public function createProjectFiles(string $project): bool
         /**
          * Round 5. Generate and place the entry point of the project
          */
-        file_put_contents_ex($content, 'ext/'.$safeProject.'.c');
+        HardDisk::persistByHash($content, 'ext/'.$safeProject.'.c');
         unset($content);
 
         /**
@@ -1637,7 +1638,7 @@ public function createProjectFiles(string $project): bool
             $content = str_replace($mark, $replace, $content);
         }
 
-        file_put_contents_ex($content, 'ext/'.$safeProject.'.h');
+        HardDisk::persistByHash($content, 'ext/'.$safeProject.'.h');
         unset($content);
 
         /**
@@ -1666,7 +1667,7 @@ public function createProjectFiles(string $project): bool
             $content = str_replace($mark, $replace, $content);
         }
 
-        file_put_contents_ex($content, 'ext/php_'.$safeProject.'.h');
+        HardDisk::persistByHash($content, 'ext/php_'.$safeProject.'.h');
         unset($content);
 
         return $needConfigure;
diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 9a5010b0b6..7b0d001861 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -225,6 +225,22 @@ public function normalizePath(string $path): string
         return str_replace(['\\', ':', '/'], '_', $path);
     }
 
+    /**
+     * Checks if the content of the file on the disk is the same as the content.
+     */
+    public static function persistByHash(string $data, string $path): int|bool
+    {
+        if (!file_exists($path)) {
+            return file_put_contents($path, $data);
+        }
+
+        if (md5($data) !== md5_file($path)) {
+            return file_put_contents($path, $data);
+        }
+
+        return false;
+    }
+
     protected function deleteFileInfoObject(\SplFileInfo $file): bool
     {
         switch ($file->getType()) {
diff --git a/src/functions.php b/src/functions.php
index 5968d0b8e7..2f4450bf93 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -132,30 +132,6 @@ function fqcn($className, $currentNamespace, AliasManager $aliasManager = null)
     return $className;
 }
 
-/**
- * Checks if the content of the file on the disk is the same as the content.
- *
- * @param string $content
- * @param string $path
- *
- * @return int|bool
- */
-function file_put_contents_ex($content, $path)
-{
-    if (file_exists($path)) {
-        $contentMd5 = md5($content);
-        $existingMd5 = md5_file($path);
-
-        if ($contentMd5 !== $existingMd5) {
-            return file_put_contents($path, $content);
-        }
-    } else {
-        return file_put_contents($path, $content);
-    }
-
-    return false;
-}
-
 /**
  * Checks if currently running under MS Windows.
  *

From 27e62f2f8b5ad51feff05185fe6d07e38f52f1f3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 5 Nov 2023 19:53:28 +0000
Subject: [PATCH 107/375] Move `is_windows()` function into `Os` class

---
 src/Compiler.php                              | 12 ++++-----
 src/Console/Command/CleanCommand.php          |  5 ++--
 src/Console/Command/FullCleanCommand.php      |  5 ++--
 src/Os.php                                    | 27 +++++++++++++++++++
 src/functions.php                             | 10 -------
 tests/Extension/Integral/RegexDNATest.php     |  5 ++--
 tests/Extension/StringTest.php                |  5 ++--
 tests/Zephir/ConfigTest.php                   |  7 +++--
 .../Documentation/DocblockParserTest.php      |  5 ++--
 .../Formatter/CompilerFormatterTest.php       |  5 ++--
 tests/Zephir/Stubs/DocBlockTest.php           | 17 ++++++------
 tests/Zephir/Stubs/GeneratorTest.php          | 11 ++++----
 12 files changed, 61 insertions(+), 53 deletions(-)
 create mode 100644 src/Os.php

diff --git a/src/Compiler.php b/src/Compiler.php
index e3068c0503..e42448f579 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -374,7 +374,7 @@ public function getExtensionGlobal(string $name): array
      */
     public function getGccFlags(bool $development = false): string
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             // TODO
             return '';
         }
@@ -412,7 +412,7 @@ public function getPhpIncludeDirs(): string
      */
     public function preCompileHeaders(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             // TODO: Add Windows support
             return;
         }
@@ -731,7 +731,7 @@ public function compile(bool $development = false, int $jobs = null): void
             unlink("$currentDir/ext/modules/{$namespace}.so");
         }
 
-        if (is_windows()) {
+        if (Os::isWindows()) {
             // TODO(klay): Make this better. Looks like it is non standard Env. Var
             exec('cd ext && %PHP_DEVPACK%\\phpize --clean', $output, $exit);
 
@@ -796,7 +796,7 @@ public function compile(bool $development = false, int $jobs = null): void
 
         $currentDir = getcwd();
         $this->logger->info('Compiling...');
-        if (is_windows()) {
+        if (Os::isWindows()) {
             exec(
                 'cd ext && nmake 2>'.$currentDir.'\compile-errors.log 1>'.
                 $currentDir.'\compile.log',
@@ -884,7 +884,7 @@ public function install(bool $development = false): void
         $namespace = str_replace('\\', '_', $this->checkDirectory());
         $currentDir = getcwd();
 
-        if (is_windows()) {
+        if (Os::isWindows()) {
             throw new NotImplementedException('Installation is not implemented for Windows yet. Aborting.');
         }
 
@@ -2132,7 +2132,7 @@ private function checkDirectory(): string
      */
     private function getGccVersion(): string
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             return '0.0.0';
         }
 
diff --git a/src/Console/Command/CleanCommand.php b/src/Console/Command/CleanCommand.php
index 8a9a4bec26..fd432bcd15 100644
--- a/src/Console/Command/CleanCommand.php
+++ b/src/Console/Command/CleanCommand.php
@@ -18,8 +18,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zephir\Exception\FileSystemException;
 use Zephir\FileSystem\FileSystemInterface;
-
-use function Zephir\is_windows;
+use Zephir\Os;
 
 /**
  * Cleans any object files created by the extension.
@@ -56,7 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->filesystem->clean();
 
             // TODO(klay): Do nothing if there is no Makefile
-            if (is_windows()) {
+            if (Os::isWindows()) {
                 // TODO(klay): Is there an analogue for "> /dev/null" ?
                 system('cd ext && nmake clean-all');
             } else {
diff --git a/src/Console/Command/FullCleanCommand.php b/src/Console/Command/FullCleanCommand.php
index 27effaaf3d..8431826300 100644
--- a/src/Console/Command/FullCleanCommand.php
+++ b/src/Console/Command/FullCleanCommand.php
@@ -18,8 +18,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Zephir\Exception\FileSystemException;
-
-use function Zephir\is_windows;
+use Zephir\Os;
 
 /**
  * Full Clean Command
@@ -49,7 +48,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
          */
         try {
             if (0 === $command->run(new ArrayInput($arguments), $output)) {
-                if (is_windows()) {
+                if (Os::isWindows()) {
                     system('cd ext && phpize --clean');
                 } else {
                     system('cd ext && phpize --clean > /dev/null');
diff --git a/src/Os.php b/src/Os.php
new file mode 100644
index 0000000000..558c3e3679
--- /dev/null
+++ b/src/Os.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir;
+
+use const PHP_OS;
+
+class Os
+{
+    /**
+     * Checks if currently running under MS Windows.
+     */
+    public static function isWindows(): bool
+    {
+        return 0 === stripos(PHP_OS, 'WIN');
+    }
+}
diff --git a/src/functions.php b/src/functions.php
index 2f4450bf93..8181b470b8 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -131,13 +131,3 @@ function fqcn($className, $currentNamespace, AliasManager $aliasManager = null)
 
     return $className;
 }
-
-/**
- * Checks if currently running under MS Windows.
- *
- * @return bool
- */
-function is_windows()
-{
-    return 0 === stripos(\PHP_OS, 'WIN');
-}
diff --git a/tests/Extension/Integral/RegexDNATest.php b/tests/Extension/Integral/RegexDNATest.php
index d2f09717a0..9b0d505f46 100644
--- a/tests/Extension/Integral/RegexDNATest.php
+++ b/tests/Extension/Integral/RegexDNATest.php
@@ -15,14 +15,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Stub\RegexDNA;
-
-use function Zephir\is_windows;
+use Zephir\Os;
 
 final class RegexDNATest extends TestCase
 {
     public function testProcess(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Different strlen() in Windows.');
         }
 
diff --git a/tests/Extension/StringTest.php b/tests/Extension/StringTest.php
index c5ae82f92a..ecff820a28 100644
--- a/tests/Extension/StringTest.php
+++ b/tests/Extension/StringTest.php
@@ -15,8 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Stub\Strings;
-
-use function Zephir\is_windows;
+use Zephir\Os;
 
 final class StringTest extends TestCase
 {
@@ -259,7 +258,7 @@ public function testStripcslashes(): void
 
     public function testMultilineStrings(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('String will contain different line endings.');
         }
 
diff --git a/tests/Zephir/ConfigTest.php b/tests/Zephir/ConfigTest.php
index a434673bb1..265f8da8d4 100644
--- a/tests/Zephir/ConfigTest.php
+++ b/tests/Zephir/ConfigTest.php
@@ -15,8 +15,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Zephir\Config;
-
-use function Zephir\is_windows;
+use Zephir\Os;
 
 final class ConfigTest extends TestCase
 {
@@ -170,7 +169,7 @@ public function defaultConfigProvider(): array
      */
     public function testShouldGetDefaultConfigParams($namespace, string $key, $expected)
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -230,7 +229,7 @@ public function testShouldUnsetConfigParams(): void
 
     public function testShouldGetBannerFromConfig(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
diff --git a/tests/Zephir/Documentation/DocblockParserTest.php b/tests/Zephir/Documentation/DocblockParserTest.php
index c827b6619e..ba6998550b 100644
--- a/tests/Zephir/Documentation/DocblockParserTest.php
+++ b/tests/Zephir/Documentation/DocblockParserTest.php
@@ -20,14 +20,13 @@
 use Zephir\Documentation\Annotation\See;
 use Zephir\Documentation\Docblock;
 use Zephir\Documentation\DocblockParser;
-
-use function Zephir\is_windows;
+use Zephir\Os;
 
 final class DocblockParserTest extends TestCase
 {
     public function testShouldParseDocblockFromString(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
diff --git a/tests/Zephir/Logger/Formatter/CompilerFormatterTest.php b/tests/Zephir/Logger/Formatter/CompilerFormatterTest.php
index 15def00c33..3a3fc11d09 100644
--- a/tests/Zephir/Logger/Formatter/CompilerFormatterTest.php
+++ b/tests/Zephir/Logger/Formatter/CompilerFormatterTest.php
@@ -16,8 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use Zephir\Config;
 use Zephir\Logger\Formatter\CompilerFormatter;
-
-use function Zephir\is_windows;
+use Zephir\Os;
 
 final class CompilerFormatterTest extends TestCase
 {
@@ -73,7 +72,7 @@ public function testShouldBeQuietForDisabledWarning(): void
 
     public function testShouldFormatWarningForCategory(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
diff --git a/tests/Zephir/Stubs/DocBlockTest.php b/tests/Zephir/Stubs/DocBlockTest.php
index ac94554824..8fda3d585d 100644
--- a/tests/Zephir/Stubs/DocBlockTest.php
+++ b/tests/Zephir/Stubs/DocBlockTest.php
@@ -14,10 +14,9 @@
 namespace Zephir\Test\Stubs;
 
 use PHPUnit\Framework\TestCase;
+use Zephir\Os;
 use Zephir\Stubs\DocBlock;
 
-use function Zephir\is_windows;
-
 final class DocBlockTest extends TestCase
 {
     public function testInitialState(): void
@@ -29,7 +28,7 @@ public function testInitialState(): void
 
     public function testDescription(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -53,7 +52,7 @@ public function testDescription(): void
 
     public function testPhpDocs(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -76,7 +75,7 @@ public function testPhpDocs(): void
 
     public function testPhpDocWithDescription(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -101,7 +100,7 @@ public function testPhpDocWithDescription(): void
 
     public function testPhpDocWithCodeBloc(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -152,7 +151,7 @@ public function testPhpDocWithCodeBloc(): void
 
     public function testPhpDocWithScalarParams(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -210,7 +209,7 @@ public function testPhpDocWithScalarParams(): void
 
     public function testPhpDocWithVariousDocBlockTags(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -253,7 +252,7 @@ public function testPhpDocWithVariousDocBlockTags(): void
 
     public function testPhpDocWithDoubleDollarSymbols(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index efd88defe2..4f11177886 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -20,10 +20,9 @@
 use Zephir\Class\Method\Method;
 use Zephir\Class\Method\Parameters;
 use Zephir\Class\Property;
+use Zephir\Os;
 use Zephir\Stubs\Generator;
 
-use function Zephir\is_windows;
-
 class GeneratorTest extends TestCase
 {
     /**
@@ -59,7 +58,7 @@ private function getMethod(string $name)
 
     public function testShouldBuildClass(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -250,7 +249,7 @@ public function propertyProvider(): array
      */
     public function testShouldBuildProperty(array $visibility, string $type, $value, string $expected): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -338,7 +337,7 @@ public function constantProvider(): array
      */
     public function testShouldBuildConstant(string $type, $value, string $expected): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 
@@ -383,7 +382,7 @@ public function testShouldBuildConstant(string $type, $value, string $expected):
 
     public function testShouldBuildMethod(): void
     {
-        if (is_windows()) {
+        if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
         }
 

From 7c404568172e041eff26274cd88418336fc9c5fb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 17:56:45 +0000
Subject: [PATCH 108/375] Bump docker image to `php:8.3.0RC6-fpm`

---
 .docker/8.3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
index 1e1d267118..743d3b7f70 100644
--- a/.docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -1,5 +1,5 @@
 FROM composer:latest AS composer
-FROM php:8.3.0RC5-fpm
+FROM php:8.3.0RC6-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
 ENV MAKEFLAGS="-j${CPU_CORES}"

From 17a20ffbd0c812fc5a8fedfc0aaac310ffefa525 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 17:56:51 +0000
Subject: [PATCH 109/375] Update composer.lock

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1151b80e0d..a42e55c631 100644
--- a/composer.lock
+++ b/composer.lock
@@ -263,16 +263,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.28",
+            "version": "v5.4.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "f4f71842f24c2023b91237c72a365306f3c58827"
+                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827",
-                "reference": "f4f71842f24c2023b91237c72a365306f3c58827",
+                "url": "https://api.github.com/repos/symfony/console/zipball/11ac5f154e0e5c4c77af83ad11ead9165280b92a",
+                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a",
                 "shasum": ""
             },
             "require": {
@@ -342,7 +342,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.28"
+                "source": "https://github.com/symfony/console/tree/v5.4.31"
             },
             "funding": [
                 {
@@ -358,7 +358,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-07T06:12:30+00:00"
+            "time": "2023-10-31T07:58:33+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",

From b57bc417060f5ed25a1f25aa1dc27a38c8025ac1 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 17:57:25 +0000
Subject: [PATCH 110/375] Migrate `camelize()` function into `Name` class

---
 src/CompilerFile.php         |  4 ++--
 src/FunctionCall.php         |  2 +-
 src/Name.php                 | 22 ++++++++++++++++++++++
 src/functions.php            | 12 ------------
 tests/Zephir/HelpersTest.php | 10 ----------
 tests/Zephir/NameTest.php    | 26 ++++++++++++++++++++++++++
 6 files changed, 51 insertions(+), 25 deletions(-)
 create mode 100644 src/Name.php
 create mode 100644 tests/Zephir/NameTest.php

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index 03c4042f06..ae7260acc9 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -987,7 +987,7 @@ protected function processShortcuts(array $property, Definition $classDefinition
                     $classDefinition->addMethod(new Method(
                         $classDefinition,
                         ['public'],
-                        'get'.camelize($name),
+                        'get'.Name::camelize($name),
                         null,
                         new StatementsBlock([
                             [
@@ -1015,7 +1015,7 @@ protected function processShortcuts(array $property, Definition $classDefinition
                     $classDefinition->addMethod(new Method(
                         $classDefinition,
                         ['public'],
-                        'set'.camelize($name),
+                        'set'.Name::camelize($name),
                         new Parameters([
                             [
                                 'type' => 'parameter',
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 5047b87258..0e2b675f60 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -320,7 +320,7 @@ protected function optimize($funcName, array $expression, Call $call, Compilatio
          * Check if the optimizer is already cached
          */
         if (!isset(self::$optimizers[$funcName])) {
-            $camelizeFunctionName = camelize($funcName);
+            $camelizeFunctionName = Name::camelize($funcName);
 
             /*
              * Check every optimizer directory for an optimizer
diff --git a/src/Name.php b/src/Name.php
new file mode 100644
index 0000000000..54ff268119
--- /dev/null
+++ b/src/Name.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir;
+
+final class Name
+{
+    public static function camelize(string $string): string
+    {
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
+    }
+}
diff --git a/src/functions.php b/src/functions.php
index 8181b470b8..e8d7984bfb 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -13,18 +13,6 @@
 
 use Zephir\Exception\InvalidArgumentException;
 
-/**
- * Camelize a string.
- *
- * @param string $string
- *
- * @return string
- */
-function camelize($string)
-{
-    return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
-}
-
 /**
  * Prepares a string to be used as a C-string.
  *
diff --git a/tests/Zephir/HelpersTest.php b/tests/Zephir/HelpersTest.php
index c21db61d84..da278aa1d4 100644
--- a/tests/Zephir/HelpersTest.php
+++ b/tests/Zephir/HelpersTest.php
@@ -16,19 +16,9 @@
 use PHPUnit\Framework\TestCase;
 
 use function Zephir\add_slashes;
-use function Zephir\camelize;
 
 final class HelpersTest extends TestCase
 {
-    public function testShouldCamelizeClassName(): void
-    {
-        $name = 'foo_Bar_Foo_bar';
-        $this->assertSame(
-            camelize($name),
-            'FooBarFooBar'
-        );
-    }
-
     public function cStringProvider(): array
     {
         return [
diff --git a/tests/Zephir/NameTest.php b/tests/Zephir/NameTest.php
new file mode 100644
index 0000000000..b60103de4a
--- /dev/null
+++ b/tests/Zephir/NameTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Test;
+
+use PHPUnit\Framework\TestCase;
+use Zephir\Name;
+
+final class NameTest extends TestCase
+{
+    public function testCamelize(): void
+    {
+        $name = 'foo_Bar_Foo_bar';
+        $this->assertSame(Name::camelize($name), 'FooBarFooBar');
+    }
+}

From 54f06fd0d0020235f823cabad35bd50b9bc4aadd Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 18:06:09 +0000
Subject: [PATCH 111/375] Migrate `fqcn()` function into `Name` class

---
 src/CompilationContext.php        |  2 +-
 src/CompilerFile.php              | 11 +--------
 src/Name.php                      | 33 ++++++++++++++++++++++++++
 src/Statements/ThrowStatement.php |  4 ++--
 src/functions.php                 | 39 -------------------------------
 5 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/src/CompilationContext.php b/src/CompilationContext.php
index 857f1b0c12..7e2a63e4a9 100644
--- a/src/CompilationContext.php
+++ b/src/CompilationContext.php
@@ -150,7 +150,7 @@ public function getFullName(string $className): string
         $isFunction = $this->currentMethod instanceof FunctionDefinition;
         $namespace = $isFunction ? $this->currentMethod->getNamespace() : $this->classDefinition->getNamespace();
 
-        return fqcn($className, $namespace, $this->aliasManager);
+        return Name::fetchFQN($className, $namespace, $this->aliasManager);
     }
 
     /**
diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index ae7260acc9..77e14612fc 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -1101,23 +1101,14 @@ protected function processShortcuts(array $property, Definition $classDefinition
 
     /**
      * Transform class/interface name to FQN format.
-     *
-     * @param string $name
-     *
-     * @return string
      */
     protected function getFullName(string $name): string
     {
-        return fqcn($name, $this->namespace, $this->aliasManager);
+        return Name::fetchFQN($name, $this->namespace, $this->aliasManager);
     }
 
     /**
      * Create returns type list.
-     *
-     * @param array $types
-     * @param bool  $annotated
-     *
-     * @return array
      */
     protected function createReturnsType(array $types, bool $annotated = false): ?array
     {
diff --git a/src/Name.php b/src/Name.php
index 54ff268119..c05d1280a5 100644
--- a/src/Name.php
+++ b/src/Name.php
@@ -19,4 +19,37 @@ public static function camelize(string $string): string
     {
         return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
     }
+
+    /**
+     * Transform class/interface name to
+     * Fully qualified path name (FQN) format.
+     */
+    public static function fetchFQN(
+        string $class,
+        ?string $namespace = null,
+        ?AliasManager $aliasManager = null
+    ): string {
+        /**
+         * Absolute class/interface name
+         */
+        if ('\\' === $class[0]) {
+            return substr($class, 1);
+        }
+
+        /**
+         * If class/interface name not begin with \
+         * maybe an alias or a sub-namespace
+         */
+        $firstSepPos = strpos($class, '\\');
+        if (false !== $firstSepPos) {
+            $baseName = substr($class, 0, $firstSepPos);
+            if ($aliasManager && $aliasManager->isAlias($baseName)) {
+                return $aliasManager->getAlias($baseName).'\\'.substr($class, $firstSepPos + 1);
+            }
+        } elseif ($aliasManager && $aliasManager->isAlias($class)) {
+            return $aliasManager->getAlias($class);
+        }
+
+        return $namespace ? $namespace.'\\'.$class : $class;
+    }
 }
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index 701cc7b69b..51e6babd06 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -20,9 +20,9 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Name;
 
 use function Zephir\add_slashes;
-use function Zephir\fqcn;
 
 /**
  * Throws exceptions
@@ -52,7 +52,7 @@ public function compile(CompilationContext $compilationContext): void
                 && 1 == \count($expr['parameters'])
                 && 'string' == $expr['parameters'][0]['parameter']['type']
             ) {
-                $className = fqcn(
+                $className = Name::fetchFQN(
                     $expr['class'],
                     $compilationContext->classDefinition->getNamespace(),
                     $compilationContext->aliasManager
diff --git a/src/functions.php b/src/functions.php
index e8d7984bfb..e20dc74382 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -80,42 +80,3 @@ function add_slashes(string $string): string
 
     return $newstr;
 }
-
-/**
- * Transform class/interface name to FQN format.
- *
- * @param string       $className
- * @param string       $currentNamespace
- * @param AliasManager $aliasManager
- *
- * @return string
- */
-function fqcn($className, $currentNamespace, AliasManager $aliasManager = null)
-{
-    if (!\is_string($className)) {
-        throw new InvalidArgumentException('Class name must be a string, got '.\gettype($className));
-    }
-
-    // Absolute class/interface name
-    if ('\\' === $className[0]) {
-        return substr($className, 1);
-    }
-
-    // If class/interface name not begin with \ maybe a alias or a sub-namespace
-    $firstSepPos = strpos($className, '\\');
-    if (false !== $firstSepPos) {
-        $baseName = substr($className, 0, $firstSepPos);
-        if ($aliasManager && $aliasManager->isAlias($baseName)) {
-            return $aliasManager->getAlias($baseName).'\\'.substr($className, $firstSepPos + 1);
-        }
-    } elseif ($aliasManager && $aliasManager->isAlias($className)) {
-        return $aliasManager->getAlias($className);
-    }
-
-    // Relative class/interface name
-    if ($currentNamespace) {
-        return $currentNamespace.'\\'.$className;
-    }
-
-    return $className;
-}

From 61eace1f6db775981e168346081948b9bc697ac0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 18:19:59 +0000
Subject: [PATCH 112/375] Migrate `add_slashes()` function into `Name` class

---
 composer.json                                 |  5 +-
 src/Backend/Backend.php                       |  5 +-
 src/Call.php                                  |  4 +-
 src/Class/Method/Method.php                   |  7 +-
 src/Class/Property.php                        |  5 +-
 src/Expression/Constants.php                  | 30 ++-----
 src/Expression/PropertyDynamicAccess.php      |  5 +-
 src/Name.php                                  | 62 ++++++++++++++
 src/Operators/Other/ConcatOperator.php        |  5 +-
 .../FunctionCall/ExplodeOptimizer.php         |  7 +-
 .../FunctionCall/FunctionExistsOptimizer.php  |  9 +-
 .../FunctionCall/ImplodeOptimizer.php         |  7 +-
 .../FunctionCall/MemstrOptimizer.php          |  5 +-
 .../FunctionCall/MethodExistsOptimizer.php    |  7 +-
 src/Statements/EchoStatement.php              |  5 +-
 src/Statements/ForStatement.php               |  5 +-
 src/Statements/Let/Variable.php               |  5 +-
 src/Statements/ReturnStatement.php            |  5 +-
 src/Statements/ThrowStatement.php             |  4 +-
 src/functions.php                             | 82 -------------------
 tests/Zephir/HelpersTest.php                  | 61 --------------
 tests/Zephir/NameTest.php                     | 37 +++++++++
 22 files changed, 139 insertions(+), 228 deletions(-)
 delete mode 100644 src/functions.php
 delete mode 100644 tests/Zephir/HelpersTest.php

diff --git a/composer.json b/composer.json
index 16ad00ac6f..3cf66e6670 100644
--- a/composer.json
+++ b/composer.json
@@ -50,10 +50,7 @@
     "autoload": {
         "psr-4": {
             "Zephir\\": "src/"
-        },
-        "files": [
-            "src/functions.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index c37867a6d5..02a2d536a4 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -24,11 +24,10 @@
 use Zephir\Exception\CompilerException;
 use Zephir\FunctionDefinition;
 use Zephir\GlobalConstant;
+use Zephir\Name;
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
 
-use function Zephir\add_slashes;
-
 class Backend
 {
     protected FcallManagerInterface $fcallManager;
@@ -442,7 +441,7 @@ public function declareConstant($type, $name, $value, CompilationContext $contex
             case 'string':
             case 'char':
                 if ('string' == $type || 'char' == $type) {
-                    $value = '"'.add_slashes($value).'"';
+                    $value = '"'.Name::addSlashes($value).'"';
                 }
                 $dType = 'string';
                 break;
diff --git a/src/Call.php b/src/Call.php
index 24aac202cc..ab2e6fa66d 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -359,7 +359,7 @@ public function getResolvedParams(array $parameters, CompilationContext $compila
 
                     $compilationContext->backend->assignString(
                         $parameterVariable,
-                        add_slashes($compiledExpression->getCode()),
+                        Name::addSlashes($compiledExpression->getCode()),
                         $compilationContext
                     );
 
@@ -510,7 +510,7 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
 
                     $compilationContext->backend->assignString(
                         $parameterVariable,
-                        add_slashes($compiledExpression->getCode()),
+                        Name::addSlashes($compiledExpression->getCode()),
                         $compilationContext
                     );
 
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 00bfe9cd69..406abcb015 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -26,6 +26,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Name;
 use Zephir\Passes\CallGathererPass;
 use Zephir\Passes\LocalContextPass;
 use Zephir\Passes\StaticTypeInference;
@@ -33,8 +34,6 @@
 use Zephir\SymbolTable;
 use Zephir\Variable\Variable;
 
-use function Zephir\add_slashes;
-
 /**
  * Represents a class method
  */
@@ -1048,7 +1047,7 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                         $compilationContext->backend->initVar($paramVariable, $compilationContext);
                         $compilationContext->backend->assignString(
                             $paramVariable,
-                            add_slashes($parameter['default']['value']),
+                            Name::addSlashes($parameter['default']['value']),
                             $compilationContext
                         );
                         break;
@@ -1126,7 +1125,7 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                         $compilationContext->backend->initVar($symbolVariable, $compilationContext);
                         $compilationContext->backend->assignString(
                             $paramVariable,
-                            add_slashes($parameter['default']['value']),
+                            Name::addSlashes($parameter['default']['value']),
                             $compilationContext
                         );
                         break;
diff --git a/src/Class/Property.php b/src/Class/Property.php
index 051f2d9214..0571103cf7 100644
--- a/src/Class/Property.php
+++ b/src/Class/Property.php
@@ -20,11 +20,10 @@
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\BinaryOperator;
+use Zephir\Name;
 use Zephir\StatementsBlock;
 use Zephir\Types\Types;
 
-use function Zephir\add_slashes;
-
 /**
  * Represents a property class
  */
@@ -355,7 +354,7 @@ protected function declareProperty(CompilationContext $compilationContext, $type
                         'zend_declare_property_string(%s, SL("%s"), "%s", %s);',
                         $classEntry,
                         $this->getName(),
-                        add_slashes($value),
+                        Name::addSlashes($value),
                         $this->getVisibilityAccessor()
                     ),
                     false
diff --git a/src/Expression/Constants.php b/src/Expression/Constants.php
index 079c525851..d2cbd1163d 100644
--- a/src/Expression/Constants.php
+++ b/src/Expression/Constants.php
@@ -15,37 +15,24 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\LiteralCompiledExpression;
+use Zephir\Name;
 use Zephir\Variable\Variable;
 
-use function constant;
-use function Zephir\add_slashes;
-
 /**
  * Resolves PHP or Zephir constants into C-Code
  */
 class Constants
 {
-    /**
-     * @var bool
-     */
     protected bool $expecting = true;
 
-    /**
-     * @var bool
-     */
     protected bool $readOnly = false;
 
-    /**
-     * @var Variable|null
-     */
     protected ?Variable $expectingVariable = null;
 
     /**
      * Reserved ENV Constants.
      *
      * @see https://www.php.net/manual/ru/reserved.constants.php
-     *
-     * @var array
      */
     protected array $envConstants = [
         'PHP_VERSION',
@@ -72,8 +59,6 @@ class Constants
      * Magic constants.
      *
      * @see https://php.net/manual/en/language.constants.predefined.php
-     *
-     * @var array
      */
     protected array $magicConstants = [
         '__LINE__',
@@ -95,11 +80,8 @@ class Constants
     /**
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
      */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null)
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -107,8 +89,6 @@ public function setExpectReturn(bool $expecting, Variable $expectingVariable = n
 
     /**
      * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
      */
     public function setReadOnly(bool $readOnly): void
     {
@@ -164,7 +144,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                     return new LiteralCompiledExpression('double', $constantName, $expression);
 
                 case 'string':
-                    return new LiteralCompiledExpression('string', add_slashes($constantName), $expression);
+                    return new LiteralCompiledExpression('string', Name::addSlashes($constantName), $expression);
 
                 case 'object':
                     throw new CompilerException('?');
@@ -178,13 +158,13 @@ public function compile(array $expression, CompilationContext $compilationContex
                 case '__CLASS__':
                     return new CompiledExpression(
                         'string',
-                        add_slashes($compilationContext->classDefinition->getCompleteName()),
+                        Name::addSlashes($compilationContext->classDefinition->getCompleteName()),
                         $expression
                     );
                 case '__NAMESPACE__':
                     return new CompiledExpression(
                         'string',
-                        add_slashes($compilationContext->classDefinition->getNamespace()),
+                        Name::addSlashes($compilationContext->classDefinition->getNamespace()),
                         $expression
                     );
                 case '__METHOD__':
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index eac8b2f048..d7b0dd305d 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -15,10 +15,9 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Name;
 use Zephir\Variable\Variable;
 
-use function Zephir\add_slashes;
-
 /**
  * Resolves expressions that read properties with a dynamic variable as property
  */
@@ -135,7 +134,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
         $compilationContext->headersManager->add('kernel/object');
 
-        $property = $propertyVariable ?: add_slashes($expression['right']['value']);
+        $property = $propertyVariable ?: Name::addSlashes($expression['right']['value']);
         $compilationContext->backend->fetchProperty($symbolVariable, $variableVariable, $property, false, $compilationContext);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Name.php b/src/Name.php
index c05d1280a5..42e6f39ca8 100644
--- a/src/Name.php
+++ b/src/Name.php
@@ -13,6 +13,9 @@
 
 namespace Zephir;
 
+use function in_array;
+use function strlen;
+
 final class Name
 {
     public static function camelize(string $string): string
@@ -52,4 +55,63 @@ public static function fetchFQN(
 
         return $namespace ? $namespace.'\\'.$class : $class;
     }
+
+    /**
+     * Prepares a string to be used as a C-string.
+     *
+     * Should NOT escape next `escape sequences`:
+     *  Escape sequence | ASCII hex value | Char represented
+     *  --------------- | --------------- | ----------------
+     *  \a              | 07              | Audible bell (Alert, Beep)
+     *  \b              | 08              | Backspace
+     *  \e              | 1B              | Escape character
+     *  \f              | 0C              | Formed page brake
+     *  \n              | 0A              | Newline (Line Feed)
+     *  \r              | 0D              | Carriage Return
+     *  \t              | 09              | Horizontal Tab
+     *  \v              | 0B              | Vertical Tab
+     *  \\              | 5C              | Backslash
+     *  \'              | 27              | Apostrophe or single quotation mark
+     *  \"              | 22              | Double quotation mark
+     *  \?              | 3F              | Question mark (used to avoid trigraphs)
+     *  \nnn            | any             | The byte whose numerical value is given by nnn interpreted as an octal number
+     *  \xhh…           | any             | The byte whose numerical value is given by hh… interpreted as a hexadecimal number
+     */
+    public static function addSlashes(string $string): string
+    {
+        $escape = '\\';
+        $controlChar = [
+            'a', 'b', 'e', 'f', 'n', 'r', 't', 'v', '\\', '\'', '"', '?', 'x',
+        ];
+
+        $new = '';
+        $last = strlen($string) - 1;
+
+        for ($i = 0, $next = 1; $i <= $last; ++$i, ++$next) {
+            $ch = $string[$i];
+            $after = $i !== $last ? $string[$next] : null;
+
+            if ($ch === $escape) {
+                if (in_array($after, $controlChar, true) || is_numeric($after)) {
+                    // should not escape native C control chars
+                    $new .= $ch.$after;
+                    ++$i;
+                    ++$next;
+                    continue;
+                }
+
+                $new .= $escape.$ch;
+                continue;
+            }
+
+            if ('"' === $ch) {
+                $new .= $escape.$ch;
+                continue;
+            }
+
+            $new .= $ch;
+        }
+
+        return $new;
+    }
 }
diff --git a/src/Operators/Other/ConcatOperator.php b/src/Operators/Other/ConcatOperator.php
index 5701ea8521..7a34d072a7 100644
--- a/src/Operators/Other/ConcatOperator.php
+++ b/src/Operators/Other/ConcatOperator.php
@@ -18,10 +18,9 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Name;
 use Zephir\Operators\AbstractOperator;
 
-use function Zephir\add_slashes;
-
 /**
  * Perform concatenations and optimizations
  */
@@ -207,7 +206,7 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
 
                 case 'string':
                     $key .= 's';
-                    $concatParts[] = '"'.add_slashes($compiledExpr->getCode()).'"';
+                    $concatParts[] = '"'.Name::addSlashes($compiledExpr->getCode()).'"';
                     break;
 
                 case 'int':
diff --git a/src/Optimizers/FunctionCall/ExplodeOptimizer.php b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
index 73f766a62e..89021e7b2a 100644
--- a/src/Optimizers/FunctionCall/ExplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -15,13 +15,10 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function Zephir\add_slashes;
-
 /**
- * ExplodeOptimizer.
- *
  * Optimizes calls to 'explode' using internal function
  */
 class ExplodeOptimizer extends OptimizerAbstract
@@ -65,7 +62,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         if ('string' == $expression['parameters'][0]['parameter']['type']) {
-            $str = add_slashes($expression['parameters'][0]['parameter']['value']);
+            $str = Name::addSlashes($expression['parameters'][0]['parameter']['value']);
             unset($expression['parameters'][0]);
             if (2 == \count($expression['parameters'])) {
                 $limitOffset = 1;
diff --git a/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php b/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
index 66a5c7e64f..ff3dec2ad9 100644
--- a/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
@@ -9,18 +9,17 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function Zephir\add_slashes;
-
 /**
- * FunctionExistsOptimizer.
- *
  * Optimizes calls to 'function_exists' using internal function
  */
 class FunctionExistsOptimizer extends OptimizerAbstract
@@ -39,7 +38,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         if ('string' === $expression['parameters'][0]['parameter']['type']) {
-            $str = add_slashes($expression['parameters'][0]['parameter']['value']);
+            $str = Name::addSlashes($expression['parameters'][0]['parameter']['value']);
             unset($expression['parameters'][0]);
         }
 
diff --git a/src/Optimizers/FunctionCall/ImplodeOptimizer.php b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
index fb4744f81d..86ee6d8078 100644
--- a/src/Optimizers/FunctionCall/ImplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -15,13 +15,10 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function Zephir\add_slashes;
-
 /**
- * ImplodeOptimizer.
- *
  * Optimizes calls to 'implode' using internal function
  */
 class ImplodeOptimizer extends OptimizerAbstract
@@ -56,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         if ('string' == $expression['parameters'][0]['parameter']['type']) {
-            $str = add_slashes($expression['parameters'][0]['parameter']['value']);
+            $str = Name::addSlashes($expression['parameters'][0]['parameter']['value']);
             unset($expression['parameters'][0]);
         }
 
diff --git a/src/Optimizers/FunctionCall/MemstrOptimizer.php b/src/Optimizers/FunctionCall/MemstrOptimizer.php
index e15e454e52..e26175e389 100644
--- a/src/Optimizers/FunctionCall/MemstrOptimizer.php
+++ b/src/Optimizers/FunctionCall/MemstrOptimizer.php
@@ -15,10 +15,9 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Compiler;
+use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function Zephir\add_slashes;
-
 /**
  * MemnstrOptimizer.
  *
@@ -44,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         if ('string' == $expression['parameters'][1]['parameter']['type']) {
-            $str = add_slashes($expression['parameters'][1]['parameter']['value']);
+            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);
             unset($expression['parameters'][1]);
         }
 
diff --git a/src/Optimizers/FunctionCall/MethodExistsOptimizer.php b/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
index 362a22596d..732ae91eb3 100644
--- a/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
@@ -14,13 +14,10 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
-use function Zephir\add_slashes;
-
 /**
- * MethodExistsOptimizer.
- *
  * Optimizes calls to 'method_exists' using internal function
  */
 class MethodExistsOptimizer extends OptimizerAbstract
@@ -43,7 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         if ('string' == $expression['parameters'][1]['parameter']['type']) {
-            $str = add_slashes($expression['parameters'][1]['parameter']['value']);
+            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);
             unset($expression['parameters'][1]);
         }
 
diff --git a/src/Statements/EchoStatement.php b/src/Statements/EchoStatement.php
index d640aaf9e9..b7ca49bd84 100644
--- a/src/Statements/EchoStatement.php
+++ b/src/Statements/EchoStatement.php
@@ -15,8 +15,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
-
-use function Zephir\add_slashes;
+use Zephir\Name;
 
 /**
  * Produce output according to the type
@@ -60,7 +59,7 @@ public function compile(CompilationContext $compilationContext): void
 
                 case 'string':
                     $compilationContext->codePrinter->output(
-                        'php_printf("%s", "'.add_slashes($resolvedExpr->getCode()).'");'
+                        'php_printf("%s", "'.Name::addSlashes($resolvedExpr->getCode()).'");'
                     );
                     break;
 
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 63a0561da6..1c93e8efa9 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -18,12 +18,11 @@
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\FunctionCall;
+use Zephir\Name;
 use Zephir\Optimizers\EvalExpression;
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
 
-use function Zephir\add_slashes;
-
 class ForStatement extends StatementAbstract
 {
     /**
@@ -595,7 +594,7 @@ public function compileStringTraverse($expression, CompilationContext $compilati
 
             $compilationContext->backend->assignString(
                 $constantVariable,
-                add_slashes($expression->getCode()),
+                Name::addSlashes($expression->getCode()),
                 $compilationContext,
                 true
             );
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 0387e5fa06..7e16cc661c 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -17,10 +17,9 @@
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalOperationException;
+use Zephir\Name;
 use Zephir\Variable\Variable as ZephirVariable;
 
-use function Zephir\add_slashes;
-
 /**
  * Zephir\Statements\Let\Variable.
  *
@@ -1085,7 +1084,7 @@ private function doVariableAssignment(
                     case 'assign':
                         $symbolVariable->initVariant($compilationContext);
                         $symbolVariable->setDynamicTypes('string');
-                        $compilationContext->backend->assignString($symbolVariable, add_slashes($resolvedExpr->getCode()), $compilationContext);
+                        $compilationContext->backend->assignString($symbolVariable, Name::addSlashes($resolvedExpr->getCode()), $compilationContext);
                         break;
 
                     case 'concat-assign':
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 4104c0476a..236afc195d 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -16,10 +16,9 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\InvalidTypeException;
 use Zephir\Expression;
+use Zephir\Name;
 use Zephir\Types\Types;
 
-use function Zephir\add_slashes;
-
 /**
  * Return statement is used to assign variables
  */
@@ -212,7 +211,7 @@ public function compile(CompilationContext $compilationContext): void
                 case Types::T_STRING:
                 case Types::T_ISTRING:
                     $compilationContext->backend->returnString(
-                        add_slashes($resolvedExpr->getCode()),
+                        Name::addSlashes($resolvedExpr->getCode()),
                         $compilationContext
                     );
                     break;
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index 51e6babd06..69bd0c7187 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -22,8 +22,6 @@
 use Zephir\Expression;
 use Zephir\Name;
 
-use function Zephir\add_slashes;
-
 /**
  * Throws exceptions
  */
@@ -147,7 +145,7 @@ public function compile(CompilationContext $compilationContext): void
      */
     private function throwStringException(Printer $printer, string $class, string $message, array $expression): void
     {
-        $message = add_slashes($message);
+        $message = Name::addSlashes($message);
         $path = Compiler::getShortUserPath($expression['file']);
         $printer->output(
             sprintf(
diff --git a/src/functions.php b/src/functions.php
deleted file mode 100644
index e20dc74382..0000000000
--- a/src/functions.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir;
-
-use Zephir\Exception\InvalidArgumentException;
-
-/**
- * Prepares a string to be used as a C-string.
- *
- * Should NOT escape next `escape sequences`:
- *  Escape sequence | ASCII hex value | Char represented
- *  --------------- | --------------- | ----------------
- *  \a              | 07              | Audible bell (Alert, Beep)
- *  \b              | 08              | Backspace
- *  \e              | 1B              | Escape character
- *  \f              | 0C              | Formed page brake
- *  \n              | 0A              | Newline (Line Feed)
- *  \r              | 0D              | Carriage Return
- *  \t              | 09              | Horizontal Tab
- *  \v              | 0B              | Vertical Tab
- *  \\              | 5C              | Backslash
- *  \'              | 27              | Apostrophe or single quotation mark
- *  \"              | 22              | Double quotation mark
- *  \?              | 3F              | Question mark (used to avoid trigraphs)
- *  \nnn            | any             | The byte whose numerical value is given by nnn interpreted as an octal number
- *  \xhh…           | any             | The byte whose numerical value is given by hh… interpreted as a hexadecimal number
- *
- * @param string $string
- *
- * @return string
- */
-function add_slashes(string $string): string
-{
-    $escape = '\\';
-    $controlChar = [
-        'a', 'b', 'e', 'f', 'n', 'r', 't', 'v', '\\', '\'', '"', '?', 'x',
-    ];
-
-    $newstr = '';
-    $after = null;
-    $last = \strlen($string) - 1;
-
-    for ($i = 0, $next = 1; $i <= $last; ++$i, ++$next) {
-        $ch = $string[$i];
-
-        if ($i !== $last) {
-            $after = $string[$next];
-        } else {
-            $after = null;
-        }
-
-        if ($ch === $escape) {
-            if (\in_array($after, $controlChar, true) || is_numeric($after)) {
-                // should not escape native C control chars
-                $newstr .= $ch.$after;
-                ++$i;
-                ++$next;
-                continue;
-            }
-            $newstr .= $escape.$ch;
-            continue;
-        }
-
-        if ('"' === $ch) {
-            $newstr .= $escape.$ch;
-            continue;
-        }
-
-        $newstr .= $ch;
-    }
-
-    return $newstr;
-}
diff --git a/tests/Zephir/HelpersTest.php b/tests/Zephir/HelpersTest.php
deleted file mode 100644
index da278aa1d4..0000000000
--- a/tests/Zephir/HelpersTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Zephir\Test;
-
-use PHPUnit\Framework\TestCase;
-
-use function Zephir\add_slashes;
-
-final class HelpersTest extends TestCase
-{
-    public function cStringProvider(): array
-    {
-        return [
-            // 'test name' => [ 'test string', 'expected result']
-            'with empty char' => ['', ''],
-            'with space char' => [' ', ' '],
-            'with double quotation mark' => ['\"', '\"'],
-            'with single quotation mark' => ['\'', '\''],
-            'with questions mark' => ['\?', '\?'],
-            'with alert char' => ['\a', '\a'],
-            'with backspace char' => ['\b', '\b'],
-            'with escape char' => ['\e', '\e'],
-            'with form feed page brake char' => ['\f', '\f'],
-            'with line feed char' => ['\n', '\n'],
-            'with carriage return char' => ['\r', '\r'],
-            'with horizontal tab char' => ['\t', '\t'],
-            'with vertical tab char' => ['\v', '\v'],
-            'with backslash char' => ['\\', '\\\\'],
-            'with hexadecimal numerals' => ['\x12', '\x12'],
-            'with octal numerals' => ['\123', '\123'],
-            'with escaped parenthesis' => ['\(\)', '\\\\(\\\\)'],
-            'with C printf format' => ['\033[10;10h%d\n', '\033[10;10h%d\n'],
-            'with C \0' => ['\0', '\0'],
-            'with regexp 1' => ['/(\w+)\s*=\s*(\[[^\]]*\]|\"[^\"]*\"|[^,)]*)\s*(?:,|$)/', '/(\\\\w+)\\\\s*=\\\\s*(\\\\[[^\\\\]]*\\\\]|\"[^\"]*\"|[^,)]*)\\\\s*(?:,|$)/'],
-            'with regexp 2' => ['/@(\w+)(?:\s*(?:\(\s*)?(.*?)(?:\s*\))?)??\s*(?:\n|\*\/)/', '/@(\\\\w+)(?:\\\\s*(?:\\\(\\\\s*)?(.*?)(?:\\\\s*\\\\))?)??\\\\s*(?:\n|\\\\*\\\\/)/'],
-            'with regexp 3' => ['/(\w+)\s*=\s*(\[[^\]]*\]|"[^"]*"|[^,)]*)\s*(?:,|$)/', '/(\\\\w+)\\\\s*=\\\\s*(\\\\[[^\\\\]]*\\\\]|\"[^\"]*\"|[^,)]*)\\\\s*(?:,|$)/'],
-        ];
-    }
-
-    /**
-     * @dataProvider cStringProvider
-     *
-     * @param string $testString
-     * @param string $expected
-     */
-    public function testShouldPrepareStringAsCString(string $testString, string $expected): void
-    {
-        $this->assertSame($expected, add_slashes($testString));
-    }
-}
diff --git a/tests/Zephir/NameTest.php b/tests/Zephir/NameTest.php
index b60103de4a..9a7b072533 100644
--- a/tests/Zephir/NameTest.php
+++ b/tests/Zephir/NameTest.php
@@ -23,4 +23,41 @@ public function testCamelize(): void
         $name = 'foo_Bar_Foo_bar';
         $this->assertSame(Name::camelize($name), 'FooBarFooBar');
     }
+
+    public function cStringProvider(): array
+    {
+        return [
+            // 'test name' => [ 'test string', 'expected result']
+            'with empty char' => ['', ''],
+            'with space char' => [' ', ' '],
+            'with double quotation mark' => ['\"', '\"'],
+            'with single quotation mark' => ['\'', '\''],
+            'with questions mark' => ['\?', '\?'],
+            'with alert char' => ['\a', '\a'],
+            'with backspace char' => ['\b', '\b'],
+            'with escape char' => ['\e', '\e'],
+            'with form feed page brake char' => ['\f', '\f'],
+            'with line feed char' => ['\n', '\n'],
+            'with carriage return char' => ['\r', '\r'],
+            'with horizontal tab char' => ['\t', '\t'],
+            'with vertical tab char' => ['\v', '\v'],
+            'with backslash char' => ['\\', '\\\\'],
+            'with hexadecimal numerals' => ['\x12', '\x12'],
+            'with octal numerals' => ['\123', '\123'],
+            'with escaped parenthesis' => ['\(\)', '\\\\(\\\\)'],
+            'with C printf format' => ['\033[10;10h%d\n', '\033[10;10h%d\n'],
+            'with C \0' => ['\0', '\0'],
+            'with regexp 1' => ['/(\w+)\s*=\s*(\[[^\]]*\]|\"[^\"]*\"|[^,)]*)\s*(?:,|$)/', '/(\\\\w+)\\\\s*=\\\\s*(\\\\[[^\\\\]]*\\\\]|\"[^\"]*\"|[^,)]*)\\\\s*(?:,|$)/'],
+            'with regexp 2' => ['/@(\w+)(?:\s*(?:\(\s*)?(.*?)(?:\s*\))?)??\s*(?:\n|\*\/)/', '/@(\\\\w+)(?:\\\\s*(?:\\\(\\\\s*)?(.*?)(?:\\\\s*\\\\))?)??\\\\s*(?:\n|\\\\*\\\\/)/'],
+            'with regexp 3' => ['/(\w+)\s*=\s*(\[[^\]]*\]|"[^"]*"|[^,)]*)\s*(?:,|$)/', '/(\\\\w+)\\\\s*=\\\\s*(\\\\[[^\\\\]]*\\\\]|\"[^\"]*\"|[^,)]*)\\\\s*(?:,|$)/'],
+        ];
+    }
+
+    /**
+     * @dataProvider cStringProvider
+     */
+    public function testAddSlashes(string $testString, string $expected): void
+    {
+        $this->assertSame($expected, Name::addSlashes($testString));
+    }
 }

From 6d1b7c69b37b6edd85e9ad33cdce2b7b12a1f282 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 18:21:23 +0000
Subject: [PATCH 113/375] Remove redundant character escape

---
 src/FunctionCall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 0e2b675f60..bfa2e4d5e6 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -277,7 +277,7 @@ protected function markReferences(
                                 $parameters[$n - 1] = substr($parameters[$n - 1], 1);
                             }
 
-                            if (!preg_match('/^[a-zA-Z0-9$\_]+$/', $parameters[$n - 1])) {
+                            if (!preg_match('/^[a-zA-Z0-9$_]+$/', $parameters[$n - 1])) {
                                 $compilationContext->logger->warning(
                                     'Cannot mark complex expression as reference',
                                     ['invalid-reference', $expression]

From f67286ad1fa3e2e42da1975bf111c4818502cc3e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 18:28:06 +0000
Subject: [PATCH 114/375] Adjust return type

---
 src/Backend/Backend.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index 02a2d536a4..8f9c4ca5f6 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -588,7 +588,7 @@ public function createClosure(Variable $variable, $classDefinition, CompilationC
         );
     }
 
-    public function addArrayEntry(Variable $variable, $key, $value, CompilationContext $context, $statement = null, $useCodePrinter = true)
+    public function addArrayEntry(Variable $variable, $key, $value, CompilationContext $context, $statement = null, $useCodePrinter = true): void
     {
         $type = null;
         $keyType = 'assoc';
@@ -673,8 +673,6 @@ public function addArrayEntry(Variable $variable, $key, $value, CompilationConte
         if ($useCodePrinter) {
             $context->codePrinter->output($output);
         }
-
-        return $output;
     }
 
     public function arrayIsset(Variable $var, $resolvedExpr, $expression, CompilationContext $context)

From 8629ed8033d1acf8aae111c2932c7bfa8a0e042a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 18:28:39 +0000
Subject: [PATCH 115/375] Reformat code and adjust argument types

---
 src/Statements/ForStatement.php | 56 ++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 1c93e8efa9..2a06125d33 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -11,7 +11,9 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
 use Zephir\Detectors\ForValueUseDetector;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
@@ -23,6 +25,8 @@
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
 
+use function count;
+
 class ForStatement extends StatementAbstract
 {
     /**
@@ -33,23 +37,23 @@ class ForStatement extends StatementAbstract
      *
      * @return bool
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compileRange(array $exprRaw, CompilationContext $compilationContext): bool
     {
-        if (!\count($exprRaw['parameters'])) {
+        if (!count($exprRaw['parameters'])) {
             return false;
         }
 
-        if (\count($exprRaw['parameters']) > 3) {
+        if (count($exprRaw['parameters']) > 3) {
             return false;
         }
 
         $functionCall = new FunctionCall();
         $parameters = $functionCall->getResolvedParamsAsExpr($exprRaw['parameters'], $compilationContext, $exprRaw);
 
-        if (2 != \count($parameters) && 3 != \count($parameters)) {
+        if (2 != count($parameters) && 3 != count($parameters)) {
             throw new CompilerException('Wrong number of parameters', $this->statement['expr']);
         }
 
@@ -400,7 +404,7 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
      * @return void
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compileIterator(array $exprRaw, CompilationContext $compilationContext): void
     {
@@ -521,18 +525,17 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
      * - Every key must be an integer or compatible
      * - Every value must be a char/integer or compatible.
      *
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     * @param Variable           $exprVariable
-     *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
-    public function compileStringTraverse($expression, CompilationContext $compilationContext, $exprVariable)
-    {
+    public function compileStringTraverse(
+        CompiledExpression $expression,
+        CompilationContext $compilationContext,
+        ?Variable $exprVariable = null,
+    ): void {
         $codePrinter = $compilationContext->codePrinter;
 
-        /*
+        /**
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
@@ -558,7 +561,7 @@ public function compileStringTraverse($expression, CompilationContext $compilati
             $keyVariable->setIsInitialized(true, $compilationContext);
         }
 
-        /*
+        /**
          * Initialize 'value' variable
          */
         if (isset($this->statement['value'])) {
@@ -586,7 +589,7 @@ public function compileStringTraverse($expression, CompilationContext $compilati
 
         $tempVariable = $compilationContext->symbolTable->addTemp('long', $compilationContext);
 
-        /*
+        /**
          * Create a temporary value to store the constant string
          */
         if ('string' == $expression->getType()) {
@@ -596,7 +599,6 @@ public function compileStringTraverse($expression, CompilationContext $compilati
                 $constantVariable,
                 Name::addSlashes($expression->getCode()),
                 $compilationContext,
-                true
             );
 
             $stringVariable = $constantVariable;
@@ -747,7 +749,7 @@ public function compileHashTraverse(CompilationContext $compilationContext, Vari
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -756,15 +758,15 @@ public function compile(CompilationContext $compilationContext): void
         /*
          * TODO: implement optimizers here
          */
-        if ('fcall' == $exprRaw['type']) {
-            if ('range' == $exprRaw['name']) {
+        if ('fcall' === $exprRaw['type']) {
+            if ('range' === $exprRaw['name']) {
                 $status = $this->compileRange($exprRaw, $compilationContext);
                 if (false !== $status) {
                     return;
                 }
             }
 
-            if ('iterator' == $exprRaw['name']) {
+            if ('iterator' === $exprRaw['name']) {
                 $status = $this->compileIterator($exprRaw, $compilationContext);
                 if (false !== $status) {
                     return;
@@ -776,20 +778,24 @@ public function compile(CompilationContext $compilationContext): void
         $expr->setReadOnly(true);
         $expression = $expr->compile($compilationContext);
 
-        /*
+        /**
          * Check for traversing a constant string
          */
-        if ('string' == $expression->getType()) {
-            $this->compileStringTraverse($expression, $compilationContext, null);
+        if ('string' === $expression->getType()) {
+            $this->compileStringTraverse($expression, $compilationContext);
 
             return;
         }
 
-        if ('variable' != $expression->getType() && 'array' != $expression->getType()) {
+        if ('variable' !== $expression->getType() && 'array' !== $expression->getType()) {
             throw new CompilerException('Unknown type: '.$expression->getType(), $exprRaw);
         }
 
-        $exprVariable = $compilationContext->symbolTable->getVariableForRead($expression->getCode(), $compilationContext, $this->statement['expr']);
+        $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+            $expression->getCode(),
+            $compilationContext,
+            $this->statement['expr'],
+        );
         switch ($exprVariable->getType()) {
             case 'variable':
             case 'array':

From 578ec023b4731b0210845b1cb02b7d9623f3efe9 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 18:42:04 +0000
Subject: [PATCH 116/375] Fix CS

---
 src/FileSystem/HardDisk.php     |  2 +-
 src/Name.php                    | 11 ++++-------
 src/Os.php                      |  4 +---
 src/Statements/ForStatement.php | 19 ++++++++-----------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 7b0d001861..5f78512dbd 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -228,7 +228,7 @@ public function normalizePath(string $path): string
     /**
      * Checks if the content of the file on the disk is the same as the content.
      */
-    public static function persistByHash(string $data, string $path): int|bool
+    public static function persistByHash(string $data, string $path): int | bool
     {
         if (!file_exists($path)) {
             return file_put_contents($path, $data);
diff --git a/src/Name.php b/src/Name.php
index 42e6f39ca8..1838ee4601 100644
--- a/src/Name.php
+++ b/src/Name.php
@@ -13,9 +13,6 @@
 
 namespace Zephir;
 
-use function in_array;
-use function strlen;
-
 final class Name
 {
     public static function camelize(string $string): string
@@ -29,8 +26,8 @@ public static function camelize(string $string): string
      */
     public static function fetchFQN(
         string $class,
-        ?string $namespace = null,
-        ?AliasManager $aliasManager = null
+        string $namespace = null,
+        AliasManager $aliasManager = null
     ): string {
         /**
          * Absolute class/interface name
@@ -85,14 +82,14 @@ public static function addSlashes(string $string): string
         ];
 
         $new = '';
-        $last = strlen($string) - 1;
+        $last = \strlen($string) - 1;
 
         for ($i = 0, $next = 1; $i <= $last; ++$i, ++$next) {
             $ch = $string[$i];
             $after = $i !== $last ? $string[$next] : null;
 
             if ($ch === $escape) {
-                if (in_array($after, $controlChar, true) || is_numeric($after)) {
+                if (\in_array($after, $controlChar, true) || is_numeric($after)) {
                     // should not escape native C control chars
                     $new .= $ch.$after;
                     ++$i;
diff --git a/src/Os.php b/src/Os.php
index 558c3e3679..40b3308333 100644
--- a/src/Os.php
+++ b/src/Os.php
@@ -13,8 +13,6 @@
 
 namespace Zephir;
 
-use const PHP_OS;
-
 class Os
 {
     /**
@@ -22,6 +20,6 @@ class Os
      */
     public static function isWindows(): bool
     {
-        return 0 === stripos(PHP_OS, 'WIN');
+        return 0 === stripos(\PHP_OS, 'WIN');
     }
 }
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 2a06125d33..b2485c1a32 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -11,7 +11,6 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Detectors\ForValueUseDetector;
@@ -25,8 +24,6 @@
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
 
-use function count;
-
 class ForStatement extends StatementAbstract
 {
     /**
@@ -37,23 +34,23 @@ class ForStatement extends StatementAbstract
      *
      * @return bool
      *
-     * @throws ReflectionException
+     * @throws \ReflectionException
      * @throws Exception
      */
     public function compileRange(array $exprRaw, CompilationContext $compilationContext): bool
     {
-        if (!count($exprRaw['parameters'])) {
+        if (!\count($exprRaw['parameters'])) {
             return false;
         }
 
-        if (count($exprRaw['parameters']) > 3) {
+        if (\count($exprRaw['parameters']) > 3) {
             return false;
         }
 
         $functionCall = new FunctionCall();
         $parameters = $functionCall->getResolvedParamsAsExpr($exprRaw['parameters'], $compilationContext, $exprRaw);
 
-        if (2 != count($parameters) && 3 != count($parameters)) {
+        if (2 != \count($parameters) && 3 != \count($parameters)) {
             throw new CompilerException('Wrong number of parameters', $this->statement['expr']);
         }
 
@@ -404,7 +401,7 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
      * @return void
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compileIterator(array $exprRaw, CompilationContext $compilationContext): void
     {
@@ -526,12 +523,12 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
      * - Every value must be a char/integer or compatible.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compileStringTraverse(
         CompiledExpression $expression,
         CompilationContext $compilationContext,
-        ?Variable $exprVariable = null,
+        Variable $exprVariable = null,
     ): void {
         $codePrinter = $compilationContext->codePrinter;
 
@@ -749,7 +746,7 @@ public function compileHashTraverse(CompilationContext $compilationContext, Vari
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {

From 3cc9e401a9002493c95c506c210d47832774c3e0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 11 Nov 2023 19:12:41 +0000
Subject: [PATCH 117/375] Reformat code

---
 src/Config.php          | 18 +++---------------
 src/ConfigException.php |  2 ++
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/Config.php b/src/Config.php
index 46ae923e6b..fa2f2b6dde 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -20,17 +20,13 @@ class Config implements \ArrayAccess, \JsonSerializable
 {
     /**
      * Is config changed?
-     *
-     * @var bool
      */
-    protected $changed = false;
+    protected bool $changed = false;
 
     /**
      * Default configuration for project.
-     *
-     * @var array
      */
-    private $container = [
+    private array $container = [
         'stubs' => [
             'path' => 'ide/%version%/%namespace%/',
             'stubs-run-after-generate' => false,
@@ -101,8 +97,6 @@ class Config implements \ArrayAccess, \JsonSerializable
     ];
 
     /**
-     * Config constructor.
-     *
      * @throws Exception
      */
     public function __construct()
@@ -112,8 +106,6 @@ public function __construct()
 
     /**
      * Returns JSON representation of the project config.
-     *
-     * @return string
      */
     public function __toString()
     {
@@ -122,8 +114,6 @@ public function __toString()
 
     /**
      * Factory method to create a Config instance from the $_SERVER['argv'].
-     *
-     * @return Config
      */
     public static function fromServer(): self
     {
@@ -312,15 +302,13 @@ public function set($key, $value, $namespace = null)
     /**
      * Writes the configuration if it has been changed.
      */
-    public function dumpToFile()
+    public function dumpToFile(): void
     {
         file_put_contents('config.json', $this);
     }
 
     /**
      * Specify data which should be serialized to JSON.
-     *
-     * @return array
      */
     public function jsonSerialize(): array
     {
diff --git a/src/ConfigException.php b/src/ConfigException.php
index 845c8bf98a..b65139b77a 100644
--- a/src/ConfigException.php
+++ b/src/ConfigException.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 class ConfigException extends \Exception

From 4eba409cf5e664b1cc68a543bfc46cfac34fd6eb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 12 Nov 2023 20:39:18 +0000
Subject: [PATCH 118/375] Remove redundant docblock

---
 src/CompiledExpression.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/CompiledExpression.php b/src/CompiledExpression.php
index ec5fc2df58..9861b5ae5c 100644
--- a/src/CompiledExpression.php
+++ b/src/CompiledExpression.php
@@ -25,8 +25,6 @@ public function __construct(protected string $type, protected mixed $code, prote
 
     /**
      * Returns the type of the compiled expression.
-     *
-     * @return string
      */
     public function getType(): string
     {
@@ -35,8 +33,6 @@ public function getType(): string
 
     /**
      * Returns the code produced by the compiled expression.
-     *
-     * @return mixed
      */
     public function getCode(): mixed
     {
@@ -45,8 +41,6 @@ public function getCode(): mixed
 
     /**
      * Original AST code that produced the code.
-     *
-     * @return array|null
      */
     public function getOriginal(): ?array
     {
@@ -55,8 +49,6 @@ public function getOriginal(): ?array
 
     /**
      * Returns a C representation for a boolean constant.
-     *
-     * @return string
      */
     public function getBooleanCode(): string
     {
@@ -73,8 +65,6 @@ public function getBooleanCode(): string
 
     /**
      * Checks if the compiled expression is an integer or compatible type.
-     *
-     * @return bool
      */
     public function isIntCompatibleType(): bool
     {
@@ -87,11 +77,6 @@ public function isIntCompatibleType(): bool
      * Some code cannot be directly pushed into the generated source
      * because it's missing some bound parts, this method resolves the missing parts
      * returning the generated code.
-     *
-     * @param string|null        $result
-     * @param CompilationContext $compilationContext
-     *
-     * @return string
      */
     public function resolve(?string $result, CompilationContext $compilationContext): string
     {

From 4e883599b8348a120efdbf4f462ea495057b823d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 12 Nov 2023 21:03:59 +0000
Subject: [PATCH 119/375] Reformat constructor to PHP8 format

---
 src/Console/Command/ApiCommand.php            |  8 +----
 .../Builder/Factory/OperatorsFactory.php      |  8 +----
 .../Operators/AssignPropertyOperator.php      | 27 ++------------
 .../Operators/AssignVariableOperator.php      | 35 ++++++++-----------
 4 files changed, 18 insertions(+), 60 deletions(-)

diff --git a/src/Console/Command/ApiCommand.php b/src/Console/Command/ApiCommand.php
index c6e5e5533d..c496639acb 100644
--- a/src/Console/Command/ApiCommand.php
+++ b/src/Console/Command/ApiCommand.php
@@ -28,14 +28,8 @@ final class ApiCommand extends AbstractCommand
 {
     use ZflagsAwareTrait;
 
-    private Compiler $compiler;
-    private Config $config;
-
-    public function __construct(Compiler $compiler, Config $config)
+    public function __construct(private Compiler $compiler, private Config $config)
     {
-        $this->compiler = $compiler;
-        $this->config = $config;
-
         parent::__construct();
     }
 
diff --git a/src/Expression/Builder/Factory/OperatorsFactory.php b/src/Expression/Builder/Factory/OperatorsFactory.php
index 946126eff4..79028fc380 100644
--- a/src/Expression/Builder/Factory/OperatorsFactory.php
+++ b/src/Expression/Builder/Factory/OperatorsFactory.php
@@ -23,14 +23,8 @@
 
 class OperatorsFactory
 {
-    protected BuilderFactory $factory;
-
-    /**
-     * @param BuilderFactory $factory
-     */
-    public function __construct(BuilderFactory $factory)
+    public function __construct(protected BuilderFactory $factory)
     {
-        $this->factory = $factory;
     }
 
     /**
diff --git a/src/Expression/Builder/Operators/AssignPropertyOperator.php b/src/Expression/Builder/Operators/AssignPropertyOperator.php
index 20c77bb247..4ac26dafce 100644
--- a/src/Expression/Builder/Operators/AssignPropertyOperator.php
+++ b/src/Expression/Builder/Operators/AssignPropertyOperator.php
@@ -20,16 +20,9 @@ class AssignPropertyOperator extends AssignVariableOperator
 
     // a :: property = expr
     public const TYPE_ASSIGN_STATIC_PROPERTY = 'static-property';
+    private string $type = self::TYPE_ASSIGN_OBJECT_PROPERTY;
 
-    private $property;
-    private $type = self::TYPE_ASSIGN_OBJECT_PROPERTY;
-
-    /**
-     * @param null                 $variable
-     * @param null                 $property
-     * @param AbstractBuilder|null $expression
-     */
-    public function __construct($variable = null, $property = null, AbstractBuilder $expression = null)
+    public function __construct($variable = null, private $property = null, AbstractBuilder $expression = null)
     {
         parent::__construct($variable, $expression);
 
@@ -38,19 +31,11 @@ public function __construct($variable = null, $property = null, AbstractBuilder
         }
     }
 
-    /**
-     * @return string
-     */
     public function getProperty(): string
     {
         return $this->property;
     }
 
-    /**
-     * @param string $property
-     *
-     * @return $this
-     */
     public function setProperty(string $property): static
     {
         $this->property = $property;
@@ -58,19 +43,11 @@ public function setProperty(string $property): static
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getType(): string
     {
         return $this->type;
     }
 
-    /**
-     * @param string $type
-     *
-     * @return AssignPropertyOperator
-     */
     public function setType(string $type): static
     {
         $this->type = $type;
diff --git a/src/Expression/Builder/Operators/AssignVariableOperator.php b/src/Expression/Builder/Operators/AssignVariableOperator.php
index a054158c18..e284c3d8be 100644
--- a/src/Expression/Builder/Operators/AssignVariableOperator.php
+++ b/src/Expression/Builder/Operators/AssignVariableOperator.php
@@ -16,50 +16,43 @@
 class AssignVariableOperator extends AbstractOperator
 {
     // =
-    const OPERATOR_ASSIGN = 'assign';
+    public const OPERATOR_ASSIGN = 'assign';
 
     // +=
-    const OPERATOR_ADD = 'add-assign';
+    public const OPERATOR_ADD = 'add-assign';
 
     // -=
-    const OPERATOR_SUB = 'sub-assign';
+    public const OPERATOR_SUB = 'sub-assign';
 
     // *=
-    const OPERATOR_MUL = 'mul-assign';
+    public const OPERATOR_MUL = 'mul-assign';
 
     // /=
-    const OPERATOR_DIV = 'div-assign';
+    public const OPERATOR_DIV = 'div-assign';
 
     // .=
-    const OPERATOR_CONCAT = 'concat-assign';
+    public const OPERATOR_CONCAT = 'concat-assign';
 
     // %=
-    const OPERATOR_MOD = 'mod-assign';
+    public const OPERATOR_MOD = 'mod-assign';
 
     // &=
-    const OPERATOR_BITWISE_AND = 'bitwise-and-assign';
+    public const OPERATOR_BITWISE_AND = 'bitwise-and-assign';
 
     // |=
-    const OPERATOR_BITWISE_OR = 'bitwise-or-assign';
+    public const OPERATOR_BITWISE_OR = 'bitwise-or-assign';
 
     // ^=
-    const OPERATOR_BITWISE_XOR = 'bitwise-xor-assign';
+    public const OPERATOR_BITWISE_XOR = 'bitwise-xor-assign';
 
     // <<=
-    const OPERATOR_BITWISE_SHIFTLEFT = 'bitwise-shiftleft-assign';
+    public const OPERATOR_BITWISE_SHIFTLEFT = 'bitwise-shiftleft-assign';
 
     // >>=
-    const OPERATOR_BITWISE_SHIFTRIGHT = 'bitwise-shiftright-assign';
+    public const OPERATOR_BITWISE_SHIFTRIGHT = 'bitwise-shiftright-assign';
+    private string $operator = self::OPERATOR_ASSIGN;
 
-    private $variable;
-    private $operator = self::OPERATOR_ASSIGN;
-    private $expression;
-
-    /**
-     * @param null                 $variable
-     * @param AbstractBuilder|null $expression
-     */
-    public function __construct($variable = null, AbstractBuilder $expression = null)
+    public function __construct(private $variable = null, private ?AbstractBuilder $expression = null)
     {
         if (null !== $variable) {
             $this->setVariable($variable);

From 8d8e410327f38a6261a8e4fb9816f0c5b9de9252 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 12 Nov 2023 21:06:06 +0000
Subject: [PATCH 120/375] Remove `phalcon-` prefix

For faster type of container name and not colliding of Phalcon's containers.
---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ef4d26b18f..4a5ce2fe56 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ version: '3'
 
 services:
   zephir-8.0:
-    container_name: phalcon-zephir-8.0
+    container_name: zephir-8.0
     hostname: zephir-80
     build: .docker/8.0
     working_dir: /srv
@@ -14,7 +14,7 @@ services:
       - .:/srv
 
   zephir-8.1:
-    container_name: phalcon-zephir-8.1
+    container_name: zephir-8.1
     hostname: zephir-81
     build: .docker/8.1
     working_dir: /srv
@@ -24,7 +24,7 @@ services:
       - .:/srv
 
   zephir-8.2:
-    container_name: phalcon-zephir-8.2
+    container_name: zephir-8.2
     hostname: zephir-82
     build: .docker/8.2
     working_dir: /srv
@@ -34,7 +34,7 @@ services:
       - .:/srv
 
   zephir-8.3:
-    container_name: phalcon-zephir-8.3
+    container_name: zephir-8.3
     hostname: zephir-83
     build: .docker/8.3
     working_dir: /srv

From 32f0a3ebd4fac797dc1927687be932b855f2d4ed Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 12 Nov 2023 21:06:45 +0000
Subject: [PATCH 121/375] Regenerate ext/ directory

---
 ext/kernel/memory.c                         | 11 -----
 ext/kernel/memory.h                         |  1 -
 ext/kernel/operators.h                      |  4 ++
 ext/stub.c                                  |  2 +-
 ext/stub/13__closure.zep.c                  |  3 +-
 ext/stub/builtin/intmethods.zep.c           | 32 +++++++-----
 ext/stub/builtin/stringmethods.zep.c        | 24 ++++-----
 ext/stub/closures.zep.c                     |  2 +-
 ext/stub/exceptions.zep.c                   | 12 ++---
 ext/stub/factorial.zep.c                    |  2 +-
 ext/stub/fcall.zep.c                        | 28 +++++------
 ext/stub/fetchtest.zep.c                    | 28 +++++++----
 ext/stub/fibonnaci.zep.c                    | 14 +++---
 ext/stub/flow.zep.c                         |  8 +--
 ext/stub/flow/switchflow.zep.c              |  2 +-
 ext/stub/functions.zep.c                    |  4 +-
 ext/stub/globals/serverrequestfactory.zep.c | 10 ++--
 ext/stub/instance.zep.c                     |  2 +-
 ext/stub/invoke.zep.c                       |  2 +-
 ext/stub/issue2165/issue.zep.c              | 48 +++++++++---------
 ext/stub/issue663.zep.c                     |  4 +-
 ext/stub/mcall.zep.c                        | 24 ++++-----
 ext/stub/mcall.zep.h                        |  2 +-
 ext/stub/mcallchained.zep.c                 |  2 +-
 ext/stub/mcalldynamic.zep.c                 | 13 +++--
 ext/stub/nativearray.zep.c                  | 54 ++++++++++++---------
 ext/stub/oo.zep.c                           | 23 ++++-----
 ext/stub/oo/concretestatic.zep.c            |  3 +-
 ext/stub/oo/deprecatedmethods.zep.c         |  2 +-
 ext/stub/oo/oodestruct.zep.c                | 12 ++---
 ext/stub/oo/oonativeimplements.zep.h        |  9 +---
 ext/stub/oo/propertyaccess.zep.c            |  3 +-
 ext/stub/oo/scopes/privatescopetester.zep.c |  2 +-
 ext/stub/optimizers/acos.zep.c              | 47 +++++++++++++-----
 ext/stub/optimizers/asin.zep.c              | 47 +++++++++++++-----
 ext/stub/optimizers/strreplace.zep.c        |  2 +-
 ext/stub/properties/app.zep.c               |  3 +-
 ext/stub/properties/getobjectvars.zep.c     |  2 +-
 ext/stub/properties/propertyarray.zep.c     |  6 +--
 ext/stub/quantum.zep.c                      |  6 +--
 ext/stub/range.zep.c                        |  4 +-
 ext/stub/reflection.zep.c                   |  4 +-
 ext/stub/regexdna.zep.c                     |  4 +-
 ext/stub/requires.zep.c                     |  2 +-
 ext/stub/requires/external3.zep.c           |  4 +-
 ext/stub/resourcetest.zep.c                 |  2 +-
 ext/stub/router.zep.c                       |  6 +--
 ext/stub/scall.zep.c                        | 14 +++---
 ext/stub/scallexternal.zep.c                |  6 +--
 ext/stub/scope.zep.c                        |  4 +-
 ext/stub/sort.zep.c                         |  6 +--
 ext/stub/spectralnorm.zep.c                 | 32 ++++++------
 ext/stub/spl.zep.c                          |  2 +-
 ext/stub/statements.zep.c                   | 16 +++---
 ext/stub/strings.zep.c                      |  8 +--
 ext/stub/trytest.zep.c                      | 28 +++++------
 ext/stub/vars.zep.c                         |  4 +-
 57 files changed, 351 insertions(+), 300 deletions(-)

diff --git a/ext/kernel/memory.c b/ext/kernel/memory.c
index ac1f012fd0..4fb7271bb2 100644
--- a/ext/kernel/memory.c
+++ b/ext/kernel/memory.c
@@ -306,17 +306,6 @@ int zephir_cleanup_fcache(void *pDest, int num_args, va_list args, zend_hash_key
 
 	memcpy(&scope, &ZSTR_VAL(hash_key->key)[(len -1) - 2 * sizeof(zend_class_entry**)], sizeof(zend_class_entry*));
 
-/*
-#ifndef ZEPHIR_RELEASE
-	{
-		zend_class_entry *cls;
-		memcpy(&cls, &hash_key->arKey[len - sizeof(zend_class_entry**)], sizeof(zend_class_entry*));
-
-		fprintf(stderr, "func: %s, cls: %s, scope: %s [%u]\n", (*entry)->f->common.function_name, (cls ? cls->name : "N/A"), (scope ? scope->name : "N/A"), (uint)(*entry)->times);
-	}
-#endif
-*/
-
 	if ((*entry)->type != ZEND_INTERNAL_FUNCTION || (scope && scope->type != ZEND_INTERNAL_CLASS)) {
 		return ZEND_HASH_APPLY_REMOVE;
 	}
diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
index 269ed60920..76407bb5ae 100644
--- a/ext/kernel/memory.h
+++ b/ext/kernel/memory.h
@@ -175,7 +175,6 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 	do { \
 		zval *orig_ptr = z; \
 		ZEPHIR_SEPARATE(orig_ptr); \
-		/*zephir_memory_observe(orig_ptr);*/ \
 	} while (0)
 
 #endif
diff --git a/ext/kernel/operators.h b/ext/kernel/operators.h
index 059f0a0fe2..f481d7c3ea 100644
--- a/ext/kernel/operators.h
+++ b/ext/kernel/operators.h
@@ -146,7 +146,11 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define zephir_get_boolval(z) (Z_TYPE_P(z) == IS_TRUE ? 1 : (Z_TYPE_P(z) == IS_FALSE ? 0 : zephir_get_boolval_ex(z)))
 #define zephir_get_charval(z) (Z_TYPE_P(z) == IS_LONG ? Z_LVAL_P(z) : zephir_get_charval_ex(z))
 
+#if PHP_VERSION_ID >= 80300
+#define zephir_add_function(result, left, right) add_function(result, left, right)
+#else
 #define zephir_add_function(result, left, right) fast_add_function(result, left, right)
+#endif
 #define zephir_sub_function(result, left, right) sub_function(result, left, right)
 #define zephir_pow_function(result, op1, op2) pow_function(result, op1, op2)
 #define zephir_increment(var) increment_function(var)
diff --git a/ext/stub.c b/ext/stub.c
index 23752125f1..8af92d7614 100644
--- a/ext/stub.c
+++ b/ext/stub.c
@@ -586,7 +586,7 @@ static PHP_MINFO_FUNCTION(stub)
 		php_info_print_table_start();
 	php_info_print_table_header(2, "Test Extension support", "Value");
 	php_info_print_table_row(2, "Lifecycle hooks", "PHP provides several lifecycle events, which extensions can use to perform common initialization or shutdown tasks.");
-	php_info_print_table_row(2, "Static Analysis", "Test extensions&#039; compiler provides static analysis of the compiled code.");
+	php_info_print_table_row(2, "Static Analysis", "Test extensions' compiler provides static analysis of the compiled code.");
 	php_info_print_table_end();
 	php_info_print_table_start();
 	php_info_print_table_header(2, "Test variable", "Value");
diff --git a/ext/stub/13__closure.zep.c b/ext/stub/13__closure.zep.c
index 86eadb4885..ea84c015da 100644
--- a/ext/stub/13__closure.zep.c
+++ b/ext/stub/13__closure.zep.c
@@ -28,14 +28,13 @@ PHP_METHOD(stub_13__closure, __invoke)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_CE_STATIC(stub_mcall_caller_ce, "perform", &_0, 0);
+	ZEPHIR_RETURN_CALL_CE_STATIC(stub_mcall_caller_ce, "perform", NULL, 0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/builtin/intmethods.zep.c b/ext/stub/builtin/intmethods.zep.c
index b573864dcd..d22227e3cc 100644
--- a/ext/stub/builtin/intmethods.zep.c
+++ b/ext/stub/builtin/intmethods.zep.c
@@ -311,11 +311,13 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getTan)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 {
-	zval *num_param = NULL, _0;
-	zend_long num;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *num_param = NULL, _0, _1;
+	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -324,21 +326,26 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
 
 	ZVAL_LONG(&_0, num);
-	RETURN_DOUBLE(asin(num));
+	ZEPHIR_CALL_FUNCTION(&_1, "asin", NULL, 13, &_0);
+	zephir_check_call_status();
+	RETURN_CCTOR(&_1);
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 {
-	zval *num_param = NULL, _0;
-	zend_long num;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *num_param = NULL, _0, _1;
+	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
 #if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -347,12 +354,15 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
 
 	ZVAL_LONG(&_0, num);
-	RETURN_DOUBLE(acos(num));
+	ZEPHIR_CALL_FUNCTION(&_1, "acos", NULL, 14, &_0);
+	zephir_check_call_status();
+	RETURN_CCTOR(&_1);
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
@@ -378,7 +388,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 
 
 	ZVAL_LONG(&_0, num);
-	ZEPHIR_CALL_FUNCTION(&_1, "atan", NULL, 13, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "atan", NULL, 15, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
@@ -417,13 +427,13 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 
 	if (base == -1) {
 		ZVAL_LONG(&_0$$3, num);
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "log", NULL, 14, &_0$$3);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "log", NULL, 16, &_0$$3);
 		zephir_check_call_status();
 		RETURN_CCTOR(&_1$$3);
 	}
 	ZVAL_LONG(&_2, num);
 	ZVAL_LONG(&_3, base);
-	ZEPHIR_CALL_FUNCTION(&_4, "log", NULL, 14, &_2, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "log", NULL, 16, &_2, &_3);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_4);
 }
diff --git a/ext/stub/builtin/stringmethods.zep.c b/ext/stub/builtin/stringmethods.zep.c
index d8cd136fa0..03a27c46e5 100644
--- a/ext/stub/builtin/stringmethods.zep.c
+++ b/ext/stub/builtin/stringmethods.zep.c
@@ -438,7 +438,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 	zephir_get_strval(&str, str_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "lcfirst", NULL, 15, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "lcfirst", NULL, 17, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -496,7 +496,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello %s!");
-	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 16, &_0, &str);
+	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 18, &_0, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
@@ -551,7 +551,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 	zephir_get_strval(&str, str_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "sha1", NULL, 17, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "sha1", NULL, 19, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -579,7 +579,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 	zephir_get_strval(&str, str_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "nl2br", NULL, 18, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "nl2br", NULL, 20, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -607,7 +607,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 	zephir_get_strval(&str, str_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "str_getcsv", NULL, 19, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_getcsv", NULL, 21, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -676,7 +676,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 
 
 	ZVAL_LONG(&_0, count);
-	ZEPHIR_CALL_FUNCTION(&_1, "str_repeat", NULL, 20, &str, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "str_repeat", NULL, 22, &str, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
@@ -704,7 +704,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 	zephir_get_strval(&str, str_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "str_shuffle", NULL, 21, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_shuffle", NULL, 23, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -735,7 +735,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 	zephir_get_strval(&del, del_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 22, &str, &del);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 24, &str, &del);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -766,7 +766,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 	zephir_get_strval(&right, right_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "strcmp", NULL, 23, &left, &right);
+	ZEPHIR_CALL_FUNCTION(&_0, "strcmp", NULL, 25, &left, &right);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -797,7 +797,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 	zephir_get_strval(&right, right_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "strcoll", NULL, 24, &left, &right);
+	ZEPHIR_CALL_FUNCTION(&_0, "strcoll", NULL, 26, &left, &right);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -825,7 +825,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 	zephir_get_strval(&str, str_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 25, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 27, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -853,7 +853,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getHtmlSpecialChars)
 	zephir_get_strval(&str, str_param);
 
 
-	ZEPHIR_CALL_FUNCTION(&_0, "htmlspecialchars", NULL, 26, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "htmlspecialchars", NULL, 28, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/closures.zep.c b/ext/stub/closures.zep.c
index fd3274dbb1..ba175fc36d 100644
--- a/ext/stub/closures.zep.c
+++ b/ext/stub/closures.zep.c
@@ -231,7 +231,7 @@ PHP_METHOD(Stub_Closures, issue1036Call)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_function"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("_argument"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 27, &_0, &_1);
+	ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 29, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/exceptions.zep.c b/ext/stub/exceptions.zep.c
index bf6aea1eb3..1fa1612ada 100644
--- a/ext/stub/exceptions.zep.c
+++ b/ext/stub/exceptions.zep.c
@@ -66,7 +66,7 @@ PHP_METHOD(Stub_Exceptions, testException2)
 	ZVAL_STRING(&msg, "hello2");
 	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, stub_exception_ce);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 28, &msg);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 30, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 23);
 	ZEPHIR_MM_RESTORE();
@@ -90,7 +90,7 @@ PHP_METHOD(Stub_Exceptions, testException3)
 	ZVAL_STRING(&msg, "hello3");
 	ZEPHIR_INIT_VAR(&ex);
 	object_init_ex(&ex, stub_exception_ce);
-	ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 28, &msg);
+	ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 30, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&ex, "stub/exceptions.zep", 31);
 	ZEPHIR_MM_RESTORE();
@@ -112,7 +112,7 @@ PHP_METHOD(Stub_Exceptions, getException)
 	object_init_ex(return_value, stub_exception_ce);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello4");
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 28, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 30, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -153,7 +153,7 @@ PHP_METHOD(Stub_Exceptions, testException5)
 	object_init_ex(&exception, stub_exception_ce);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello5");
-	ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 28, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 30, &_0);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&exception, "stub/exceptions.zep", 49);
 	ZEPHIR_MM_RESTORE();
@@ -229,7 +229,7 @@ PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "Hello, %s");
-	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 16, &_0, &name);
+	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 18, &_0, &name);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_1, "stub/exceptions.zep", 68);
 	ZEPHIR_MM_RESTORE();
@@ -442,7 +442,7 @@ PHP_METHOD(Stub_Exceptions, issue1325)
 
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(&status, this_ptr, "donoopexception", NULL, 29);
+		ZEPHIR_CALL_METHOD(&status, this_ptr, "donoopexception", NULL, 31);
 		zephir_check_call_status_or_jump(try_end_1);
 
 	try_end_1:
diff --git a/ext/stub/factorial.zep.c b/ext/stub/factorial.zep.c
index 238f1ebb68..b75a05a82e 100644
--- a/ext/stub/factorial.zep.c
+++ b/ext/stub/factorial.zep.c
@@ -99,7 +99,7 @@ PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 		ZVAL_LONG(&_0, 1);
 	} else {
 		ZVAL_LONG(&_3, (num - 1));
-		ZEPHIR_CALL_METHOD(&_2, this_ptr, "intrecursivefactorial", NULL, 30, &_3);
+		ZEPHIR_CALL_METHOD(&_2, this_ptr, "intrecursivefactorial", NULL, 32, &_3);
 		zephir_check_call_status();
 		ZVAL_LONG(&_0, (num * zephir_get_numberval(&_2)));
 	}
diff --git a/ext/stub/fcall.zep.c b/ext/stub/fcall.zep.c
index 060bdcab57..f390605f66 100644
--- a/ext/stub/fcall.zep.c
+++ b/ext/stub/fcall.zep.c
@@ -74,7 +74,7 @@ PHP_METHOD(Stub_Fcall, testCall2)
 	while (1) {
 		ZVAL_LONG(&_0$$3, 0);
 		ZVAL_LONG(&_1$$3, 100);
-		ZEPHIR_RETURN_CALL_FUNCTION("mt_rand", &_2, 31, &_0$$3, &_1$$3);
+		ZEPHIR_RETURN_CALL_FUNCTION("mt_rand", &_2, 33, &_0$$3, &_1$$3);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -102,18 +102,18 @@ PHP_METHOD(Stub_Fcall, testCall3)
 	ZVAL_STRING(&_0, "inputfile.txt");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "r");
-	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 32, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 34, &_0, &_1);
 	zephir_check_call_status();
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "outputfile.txt");
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 32, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 34, &_0, &_1);
 	zephir_check_call_status();
 	if (zephir_is_true(&handle)) {
 		while (1) {
 			ZVAL_LONG(&_3$$4, 4096);
-			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 33, &handle, &_3$$4);
+			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 35, &handle, &_3$$4);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_FALSE_IDENTICAL(&buffer)) {
 				break;
@@ -148,18 +148,18 @@ PHP_METHOD(Stub_Fcall, testCall4)
 	ZVAL_STRING(&_0, "r");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "inputfile.txt");
-	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 32, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 34, &_0, &_1);
 	zephir_check_call_status();
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "outputfile.txt");
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 32, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 34, &_0, &_1);
 	zephir_check_call_status();
 	if (zephir_is_true(&handle)) {
 		while (1) {
 			ZVAL_LONG(&_3$$4, 4096);
-			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 33, &handle, &_3$$4);
+			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 35, &handle, &_3$$4);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_FALSE_IDENTICAL(&buffer)) {
 				break;
@@ -194,7 +194,7 @@ PHP_METHOD(Stub_Fcall, testCall5)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 20, a, b);
+	ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 22, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -209,7 +209,7 @@ PHP_METHOD(Stub_Fcall, testCall6)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 34);
+	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 36);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -224,7 +224,7 @@ PHP_METHOD(Stub_Fcall, testCall7)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 35);
+	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 37);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
@@ -285,7 +285,7 @@ PHP_METHOD(Stub_Fcall, testCall8)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_CALL_FUNCTION(&x, "str_repeat", NULL, 20, a, b);
+	ZEPHIR_CALL_FUNCTION(&x, "str_repeat", NULL, 22, a, b);
 	zephir_check_call_status();
 	RETURN_CCTOR(&x);
 }
@@ -347,7 +347,7 @@ PHP_METHOD(Stub_Fcall, testStrtokVarBySlash)
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "/");
-	ZEPHIR_RETURN_CALL_FUNCTION("strtok", NULL, 36, value, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("strtok", NULL, 38, value, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -541,7 +541,7 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "teststrtokvarbyslash", NULL, 37, str);
+	ZEPHIR_RETURN_CALL_METHOD(&_0, "teststrtokvarbyslash", NULL, 39, str);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -591,7 +591,7 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 	}
 
 	ZVAL_LONG(&_1, 5);
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "testcall5", NULL, 38, str, &_1);
+	ZEPHIR_RETURN_CALL_METHOD(&_0, "testcall5", NULL, 40, str, &_1);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/fetchtest.zep.c b/ext/stub/fetchtest.zep.c
index ef3d2ad542..41b2d58dfa 100644
--- a/ext/stub/fetchtest.zep.c
+++ b/ext/stub/fetchtest.zep.c
@@ -61,6 +61,7 @@ PHP_METHOD(Stub_FetchTest, getValues)
 
 PHP_METHOD(Stub_FetchTest, testFetchArray1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, *b, b_sub, c;
 	zval *this_ptr = getThis();
 
@@ -76,10 +77,12 @@ PHP_METHOD(Stub_FetchTest, testFetchArray1)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	RETURN_BOOL(zephir_array_isset_fetch(&c, a, b, 1));
+	ZEPHIR_OBS_VAR(&c);
+	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray2)
@@ -110,6 +113,7 @@ PHP_METHOD(Stub_FetchTest, testFetchArray2)
 
 PHP_METHOD(Stub_FetchTest, testFetchArray3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long b;
 	zval *a, a_sub, *b_param = NULL, c;
 	zval *this_ptr = getThis();
@@ -125,11 +129,13 @@ PHP_METHOD(Stub_FetchTest, testFetchArray3)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(2, 0, &a, &b_param);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	b = zephir_get_intval(b_param);
 
 
-	RETURN_BOOL(zephir_array_isset_long_fetch(&c, a, b, 1));
+	ZEPHIR_OBS_VAR(&c);
+	RETURN_MM_BOOL(zephir_array_isset_long_fetch(&c, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray4)
@@ -183,7 +189,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray5)
 	zephir_get_strval(&b, b_param);
 
 
-	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, &b, 1));
+	ZEPHIR_OBS_VAR(&c);
+	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, &b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray6)
@@ -268,6 +275,7 @@ PHP_METHOD(Stub_FetchTest, testFetchObject2)
 
 PHP_METHOD(Stub_FetchTest, testFetchPost)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *b, b_sub, _POST, c;
 	zval *this_ptr = getThis();
 
@@ -282,14 +290,16 @@ PHP_METHOD(Stub_FetchTest, testFetchPost)
 #endif
 
 
+	ZEPHIR_MM_GROW();
 	zephir_get_global(&_POST, SL("_POST"));
-	zephir_fetch_params_without_memory_grow(1, 0, &b);
+	zephir_fetch_params(1, 1, 0, &b);
 
 
-	if (!(zephir_array_isset_fetch(&c, &_POST, b, 1))) {
-		RETURN_BOOL(0);
+	ZEPHIR_OBS_VAR(&c);
+	if (!(zephir_array_isset_fetch(&c, &_POST, b, 0))) {
+		RETURN_MM_BOOL(0);
 	}
-	RETURN_CTORW(&c);
+	RETURN_CCTOR(&c);
 }
 
 PHP_METHOD(Stub_FetchTest, hasValue)
diff --git a/ext/stub/fibonnaci.zep.c b/ext/stub/fibonnaci.zep.c
index b5d533012f..86f41df03d 100644
--- a/ext/stub/fibonnaci.zep.c
+++ b/ext/stub/fibonnaci.zep.c
@@ -104,8 +104,10 @@ PHP_METHOD(Stub_Fibonnaci, fibArray)
 		}
 		k = (i - 1);
 		j = (i - 2);
-		zephir_array_fetch_long(&a, &fib, k, PH_NOISY | PH_READONLY, "stub/fibonnaci.zep", 51);
-		zephir_array_fetch_long(&b, &fib, j, PH_NOISY | PH_READONLY, "stub/fibonnaci.zep", 52);
+		ZEPHIR_OBS_NVAR(&a);
+		zephir_array_fetch_long(&a, &fib, k, PH_NOISY, "stub/fibonnaci.zep", 51);
+		ZEPHIR_OBS_NVAR(&b);
+		zephir_array_fetch_long(&b, &fib, j, PH_NOISY, "stub/fibonnaci.zep", 52);
 		ZEPHIR_INIT_NVAR(&c);
 		zephir_add_function(&c, &a, &b);
 		zephir_array_update_long(&fib, i, &c, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -185,10 +187,10 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 			RETURN_MM_LONG(1);
 		} else {
 			ZVAL_LONG(&_1$$6, (n - 1));
-			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccirecursive", &_2, 39, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccirecursive", &_2, 41, &_1$$6);
 			zephir_check_call_status();
 			ZVAL_LONG(&_1$$6, (n - 2));
-			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccirecursive", &_2, 39, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccirecursive", &_2, 41, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
 			RETURN_MM();
@@ -227,10 +229,10 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 			RETURN_MM_LONG(1);
 		} else {
 			ZVAL_LONG(&_1$$6, (n - 1));
-			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccifinalrecursive", &_2, 40, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccifinalrecursive", &_2, 42, &_1$$6);
 			zephir_check_call_status();
 			ZVAL_LONG(&_1$$6, (n - 2));
-			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccifinalrecursive", &_2, 40, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccifinalrecursive", &_2, 42, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
 			RETURN_MM();
diff --git a/ext/stub/flow.zep.c b/ext/stub/flow.zep.c
index b9e63b7a86..2f968c657a 100644
--- a/ext/stub/flow.zep.c
+++ b/ext/stub/flow.zep.c
@@ -775,13 +775,13 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 	array_init(&returnValue);
 	while (1) {
 		ZEPHIR_MAKE_REF(variable);
-		ZEPHIR_CALL_FUNCTION(&_0, "next", &_1, 41, variable);
+		ZEPHIR_CALL_FUNCTION(&_0, "next", &_1, 43, variable);
 		ZEPHIR_UNREF(variable);
 		zephir_check_call_status();
 		if (!(zephir_is_true(&_0))) {
 			break;
 		}
-		ZEPHIR_CALL_FUNCTION(&_2$$3, "current", &_3, 42, variable);
+		ZEPHIR_CALL_FUNCTION(&_2$$3, "current", &_3, 44, variable);
 		zephir_check_call_status();
 		zephir_array_append(&returnValue, &_2$$3, PH_SEPARATE, "stub/flow.zep", 420);
 	}
@@ -815,11 +815,11 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 	ZEPHIR_INIT_VAR(&returnValue);
 	array_init(&returnValue);
 	do {
-		ZEPHIR_CALL_FUNCTION(&_0$$3, "current", &_1, 42, variable);
+		ZEPHIR_CALL_FUNCTION(&_0$$3, "current", &_1, 44, variable);
 		zephir_check_call_status();
 		zephir_array_append(&returnValue, &_0$$3, PH_SEPARATE, "stub/flow.zep", 430);
 		ZEPHIR_MAKE_REF(variable);
-		ZEPHIR_CALL_FUNCTION(&_2, "next", &_3, 41, variable);
+		ZEPHIR_CALL_FUNCTION(&_2, "next", &_3, 43, variable);
 		ZEPHIR_UNREF(variable);
 		zephir_check_call_status();
 	} while (zephir_is_true(&_2));
diff --git a/ext/stub/flow/switchflow.zep.c b/ext/stub/flow/switchflow.zep.c
index 64f686349f..45290bd554 100644
--- a/ext/stub/flow/switchflow.zep.c
+++ b/ext/stub/flow/switchflow.zep.c
@@ -292,7 +292,7 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_FUNCTION(&_2, "mt_rand", NULL, 31, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "mt_rand", NULL, 33, &_0, &_1);
 	zephir_check_call_status();
 	do {
 		if (ZEPHIR_IS_LONG(&_2, 100)) {
diff --git a/ext/stub/functions.zep.c b/ext/stub/functions.zep.c
index 1d429d3c2b..e51740dbb8 100644
--- a/ext/stub/functions.zep.c
+++ b/ext/stub/functions.zep.c
@@ -47,7 +47,7 @@ PHP_METHOD(Stub_Functions, filterVar1)
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
-	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 43, &ret, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 45, &ret, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(ZEPHIR_IS_FALSE_IDENTICAL(&_2));
 }
@@ -74,7 +74,7 @@ PHP_METHOD(Stub_Functions, filterVar2)
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
-	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 43, &ret, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 45, &ret, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(ZEPHIR_IS_FALSE(&_2));
 }
diff --git a/ext/stub/globals/serverrequestfactory.zep.c b/ext/stub/globals/serverrequestfactory.zep.c
index ad48f36a19..c68be91bed 100644
--- a/ext/stub/globals/serverrequestfactory.zep.c
+++ b/ext/stub/globals/serverrequestfactory.zep.c
@@ -130,19 +130,19 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	if (!(ZEPHIR_IS_EMPTY(&_SERVER))) {
 		ZEPHIR_CPY_WRT(&globalServer, &_SERVER);
 	}
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", &_1, 44, &server, &globalServer);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", &_1, 46, &server, &globalServer);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&server, &_0);
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", &_1, 44, &files, &globalFiles);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", &_1, 46, &files, &globalFiles);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&files, &_2);
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", &_1, 44, &cookies, &globalCookies);
+	ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", &_1, 46, &cookies, &globalCookies);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&cookies, &_3);
-	ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", &_1, 44, &get, &globalGet);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", &_1, 46, &get, &globalGet);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&get, &_4);
-	ZEPHIR_CALL_METHOD(&_5, this_ptr, "checknullarray", &_1, 44, &post, &globalPost);
+	ZEPHIR_CALL_METHOD(&_5, this_ptr, "checknullarray", &_1, 46, &post, &globalPost);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&post, &_5);
 	zephir_create_array(return_value, 5, 0);
diff --git a/ext/stub/instance.zep.c b/ext/stub/instance.zep.c
index 2df0a1fbb5..325d9f59d9 100644
--- a/ext/stub/instance.zep.c
+++ b/ext/stub/instance.zep.c
@@ -93,7 +93,7 @@ PHP_METHOD(Stub_Instance, testIssue1339)
 	zephir_array_fast_append(&parameters, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	object_init_ex(&_0, stub_arrayobject_ce);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 45);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 47);
 	zephir_check_call_status();
 	zephir_array_fast_append(&parameters, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/invoke.zep.c b/ext/stub/invoke.zep.c
index d9fc449852..3d833cb285 100644
--- a/ext/stub/invoke.zep.c
+++ b/ext/stub/invoke.zep.c
@@ -71,7 +71,7 @@ PHP_METHOD(Stub_Invoke, test)
 
 	ZEPHIR_INIT_VAR(&func);
 	object_init_ex(&func, stub_invoke_ce);
-	ZEPHIR_CALL_METHOD(NULL, &func, "__construct", NULL, 46);
+	ZEPHIR_CALL_METHOD(NULL, &func, "__construct", NULL, 48);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(&func, NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/issue2165/issue.zep.c b/ext/stub/issue2165/issue.zep.c
index fe042aa89b..161dc606e7 100644
--- a/ext/stub/issue2165/issue.zep.c
+++ b/ext/stub/issue2165/issue.zep.c
@@ -66,7 +66,7 @@ PHP_METHOD(Stub_Issue2165_Issue, build)
 
 	object_init_ex(return_value, stub_issue2165_issue_ce);
 	ZVAL_BOOL(&_0, 1);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 47, &a, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 49, &a, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -142,11 +142,11 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 
 
 	m = zephir_fast_count_int(&a);
-	ZEPHIR_CALL_FUNCTION(&_0, "current", NULL, 42, &a);
+	ZEPHIR_CALL_FUNCTION(&_0, "current", NULL, 44, &a);
 	zephir_check_call_status();
 	n = zephir_fast_count_int(&_0);
 	if (validate) {
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "array_values", &_2, 48, &a);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "array_values", &_2, 50, &a);
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&a, &_1$$3);
 		zephir_is_iterable(&a, 0, "stub/issue2165/issue.zep", 46);
@@ -165,13 +165,13 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 					ZEPHIR_INIT_NVAR(&_7$$5);
 					object_init_ex(&_7$$5, spl_ce_InvalidArgumentException);
 					ZVAL_LONG(&_8$$5, n);
-					ZEPHIR_CALL_FUNCTION(&_9$$5, "strval", &_10, 49, &_8$$5);
+					ZEPHIR_CALL_FUNCTION(&_9$$5, "strval", &_10, 51, &_8$$5);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_11$$5);
 					ZVAL_LONG(&_11$$5, zephir_fast_count_int(&rowA));
 					ZEPHIR_INIT_NVAR(&_12$$5);
 					ZEPHIR_CONCAT_SSVSVSSVS(&_12$$5, "The number of columns", " must be equal for all rows, ", &_9$$5, " needed but ", &_11$$5, " given", " at row offset ", &i, ".");
-					ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_13, 50, &_12$$5);
+					ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_13, 52, &_12$$5);
 					zephir_check_call_status();
 					zephir_throw_exception_debug(&_7$$5, "stub/issue2165/issue.zep", 33);
 					ZEPHIR_MM_RESTORE();
@@ -185,7 +185,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						ZVAL_COPY(&valueA, _14$$4);
 						_16$$6 = !(Z_TYPE_P(&valueA) == IS_LONG);
 						if (_16$$6) {
-							ZEPHIR_CALL_FUNCTION(&_17$$6, "is_float", &_18, 51, &valueA);
+							ZEPHIR_CALL_FUNCTION(&_17$$6, "is_float", &_18, 53, &valueA);
 							zephir_check_call_status();
 							_16$$6 = !zephir_is_true(&_17$$6);
 						}
@@ -196,7 +196,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							zephir_gettype(&_20$$7, &valueA);
 							ZEPHIR_INIT_NVAR(&_21$$7);
 							ZEPHIR_CONCAT_SSVS(&_21$$7, "Matrix element must", " be an integer or floating point number, ", &_20$$7, " given.");
-							ZEPHIR_CALL_METHOD(NULL, &_19$$7, "__construct", &_13, 50, &_21$$7);
+							ZEPHIR_CALL_METHOD(NULL, &_19$$7, "__construct", &_13, 52, &_21$$7);
 							zephir_check_call_status();
 							zephir_throw_exception_debug(&_19$$7, "stub/issue2165/issue.zep", 40);
 							ZEPHIR_MM_RESTORE();
@@ -216,7 +216,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						zephir_check_call_status();
 							_22$$8 = !(Z_TYPE_P(&valueA) == IS_LONG);
 							if (_22$$8) {
-								ZEPHIR_CALL_FUNCTION(&_23$$8, "is_float", &_18, 51, &valueA);
+								ZEPHIR_CALL_FUNCTION(&_23$$8, "is_float", &_18, 53, &valueA);
 								zephir_check_call_status();
 								_22$$8 = !zephir_is_true(&_23$$8);
 							}
@@ -227,7 +227,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								zephir_gettype(&_25$$9, &valueA);
 								ZEPHIR_INIT_NVAR(&_26$$9);
 								ZEPHIR_CONCAT_SSVS(&_26$$9, "Matrix element must", " be an integer or floating point number, ", &_25$$9, " given.");
-								ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_13, 50, &_26$$9);
+								ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_13, 52, &_26$$9);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_24$$9, "stub/issue2165/issue.zep", 40);
 								ZEPHIR_MM_RESTORE();
@@ -238,7 +238,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 					}
 				}
 				ZEPHIR_INIT_NVAR(&valueA);
-				ZEPHIR_CALL_FUNCTION(&_27$$4, "array_values", &_2, 48, &rowA);
+				ZEPHIR_CALL_FUNCTION(&_27$$4, "array_values", &_2, 50, &rowA);
 				zephir_check_call_status();
 				zephir_array_append(&rowA, &_27$$4, PH_SEPARATE, "stub/issue2165/issue.zep", 44);
 			} ZEND_HASH_FOREACH_END();
@@ -259,13 +259,13 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						ZEPHIR_INIT_NVAR(&_28$$11);
 						object_init_ex(&_28$$11, spl_ce_InvalidArgumentException);
 						ZVAL_LONG(&_29$$11, n);
-						ZEPHIR_CALL_FUNCTION(&_30$$11, "strval", &_10, 49, &_29$$11);
+						ZEPHIR_CALL_FUNCTION(&_30$$11, "strval", &_10, 51, &_29$$11);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_31$$11);
 						ZVAL_LONG(&_31$$11, zephir_fast_count_int(&rowA));
 						ZEPHIR_INIT_NVAR(&_32$$11);
 						ZEPHIR_CONCAT_SSVSVSSVS(&_32$$11, "The number of columns", " must be equal for all rows, ", &_30$$11, " needed but ", &_31$$11, " given", " at row offset ", &i, ".");
-						ZEPHIR_CALL_METHOD(NULL, &_28$$11, "__construct", &_13, 50, &_32$$11);
+						ZEPHIR_CALL_METHOD(NULL, &_28$$11, "__construct", &_13, 52, &_32$$11);
 						zephir_check_call_status();
 						zephir_throw_exception_debug(&_28$$11, "stub/issue2165/issue.zep", 33);
 						ZEPHIR_MM_RESTORE();
@@ -279,7 +279,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							ZVAL_COPY(&valueA, _33$$10);
 							_35$$12 = !(Z_TYPE_P(&valueA) == IS_LONG);
 							if (_35$$12) {
-								ZEPHIR_CALL_FUNCTION(&_36$$12, "is_float", &_18, 51, &valueA);
+								ZEPHIR_CALL_FUNCTION(&_36$$12, "is_float", &_18, 53, &valueA);
 								zephir_check_call_status();
 								_35$$12 = !zephir_is_true(&_36$$12);
 							}
@@ -290,7 +290,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								zephir_gettype(&_38$$13, &valueA);
 								ZEPHIR_INIT_NVAR(&_39$$13);
 								ZEPHIR_CONCAT_SSVS(&_39$$13, "Matrix element must", " be an integer or floating point number, ", &_38$$13, " given.");
-								ZEPHIR_CALL_METHOD(NULL, &_37$$13, "__construct", &_13, 50, &_39$$13);
+								ZEPHIR_CALL_METHOD(NULL, &_37$$13, "__construct", &_13, 52, &_39$$13);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_37$$13, "stub/issue2165/issue.zep", 40);
 								ZEPHIR_MM_RESTORE();
@@ -310,7 +310,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							zephir_check_call_status();
 								_40$$14 = !(Z_TYPE_P(&valueA) == IS_LONG);
 								if (_40$$14) {
-									ZEPHIR_CALL_FUNCTION(&_41$$14, "is_float", &_18, 51, &valueA);
+									ZEPHIR_CALL_FUNCTION(&_41$$14, "is_float", &_18, 53, &valueA);
 									zephir_check_call_status();
 									_40$$14 = !zephir_is_true(&_41$$14);
 								}
@@ -321,7 +321,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 									zephir_gettype(&_43$$15, &valueA);
 									ZEPHIR_INIT_NVAR(&_44$$15);
 									ZEPHIR_CONCAT_SSVS(&_44$$15, "Matrix element must", " be an integer or floating point number, ", &_43$$15, " given.");
-									ZEPHIR_CALL_METHOD(NULL, &_42$$15, "__construct", &_13, 50, &_44$$15);
+									ZEPHIR_CALL_METHOD(NULL, &_42$$15, "__construct", &_13, 52, &_44$$15);
 									zephir_check_call_status();
 									zephir_throw_exception_debug(&_42$$15, "stub/issue2165/issue.zep", 40);
 									ZEPHIR_MM_RESTORE();
@@ -332,7 +332,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						}
 					}
 					ZEPHIR_INIT_NVAR(&valueA);
-					ZEPHIR_CALL_FUNCTION(&_45$$10, "array_values", &_2, 48, &rowA);
+					ZEPHIR_CALL_FUNCTION(&_45$$10, "array_values", &_2, 50, &rowA);
 					zephir_check_call_status();
 					zephir_array_append(&rowA, &_45$$10, PH_SEPARATE, "stub/issue2165/issue.zep", 44);
 				ZEPHIR_CALL_METHOD(NULL, &a, "next", NULL, 0);
@@ -383,7 +383,7 @@ PHP_METHOD(Stub_Issue2165_Issue, quick)
 
 	object_init_ex(return_value, stub_issue2165_issue_ce);
 	ZVAL_BOOL(&_0, 0);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 47, &a, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 49, &a, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -465,7 +465,7 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 
 	_0 = !(Z_TYPE_P(value) == IS_LONG);
 	if (_0) {
-		ZEPHIR_CALL_FUNCTION(&_1, "is_float", NULL, 51, value);
+		ZEPHIR_CALL_FUNCTION(&_1, "is_float", NULL, 53, value);
 		zephir_check_call_status();
 		_0 = !zephir_is_true(&_1);
 	}
@@ -476,7 +476,7 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		zephir_gettype(&_3$$3, value);
 		ZEPHIR_INIT_VAR(&_4$$3);
 		ZEPHIR_CONCAT_SSVS(&_4$$3, "Value must be an", " integer or floating point number, ", &_3$$3, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 50, &_4$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 52, &_4$$3);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_2$$3, "stub/issue2165/issue.zep", 68);
 		ZEPHIR_MM_RESTORE();
@@ -486,11 +486,11 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		ZEPHIR_INIT_VAR(&_5$$4);
 		object_init_ex(&_5$$4, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_6$$4, m);
-		ZEPHIR_CALL_FUNCTION(&_7$$4, "strval", &_8, 49, &_6$$4);
+		ZEPHIR_CALL_FUNCTION(&_7$$4, "strval", &_8, 51, &_6$$4);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_9$$4);
 		ZEPHIR_CONCAT_SSVS(&_9$$4, "M must be", " greater than 0, ", &_7$$4, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 50, &_9$$4);
+		ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 52, &_9$$4);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_5$$4, "stub/issue2165/issue.zep", 73);
 		ZEPHIR_MM_RESTORE();
@@ -500,11 +500,11 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		ZEPHIR_INIT_VAR(&_10$$5);
 		object_init_ex(&_10$$5, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_11$$5, n);
-		ZEPHIR_CALL_FUNCTION(&_12$$5, "strval", &_8, 49, &_11$$5);
+		ZEPHIR_CALL_FUNCTION(&_12$$5, "strval", &_8, 51, &_11$$5);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_13$$5);
 		ZEPHIR_CONCAT_SSVS(&_13$$5, "N must be", " greater than 0, ", &_12$$5, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_10$$5, "__construct", NULL, 50, &_13$$5);
+		ZEPHIR_CALL_METHOD(NULL, &_10$$5, "__construct", NULL, 52, &_13$$5);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_10$$5, "stub/issue2165/issue.zep", 78);
 		ZEPHIR_MM_RESTORE();
diff --git a/ext/stub/issue663.zep.c b/ext/stub/issue663.zep.c
index d4862a44c6..434053e128 100644
--- a/ext/stub/issue663.zep.c
+++ b/ext/stub/issue663.zep.c
@@ -55,7 +55,7 @@ PHP_METHOD(Stub_Issue663, is_array_assoc)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZEPHIR_RETURN_CALL_STATIC("is_array_assoc_internal", &_1, 52, arr);
+	ZEPHIR_RETURN_CALL_STATIC("is_array_assoc_internal", &_1, 54, arr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -136,7 +136,7 @@ PHP_METHOD(Stub_Issue663, is_array_indexed)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZEPHIR_CALL_STATIC(&_1, "is_array_assoc_internal", &_2, 52, arr);
+	ZEPHIR_CALL_STATIC(&_1, "is_array_assoc_internal", &_2, 54, arr);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(!zephir_is_true(&_1));
 }
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
index 485b8b5164..c5d4670335 100644
--- a/ext/stub/mcall.zep.c
+++ b/ext/stub/mcall.zep.c
@@ -177,7 +177,7 @@ PHP_METHOD(Stub_Mcall, testCall3)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 53);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 55);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -258,7 +258,7 @@ PHP_METHOD(Stub_Mcall, testCall6)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 54, a, b);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 56, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -353,7 +353,7 @@ PHP_METHOD(Stub_Mcall, testCall9)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod6", NULL, 54, a, b);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod6", NULL, 56, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
@@ -401,7 +401,7 @@ PHP_METHOD(Stub_Mcall, testCall12)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 53);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 55);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -482,7 +482,7 @@ PHP_METHOD(Stub_Mcall, testCall15)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 54, a, b);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 56, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -551,7 +551,7 @@ PHP_METHOD(Stub_Mcall, testCall18)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 55);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 57);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -692,7 +692,7 @@ PHP_METHOD(Stub_Mcall, testCall22)
 				_0 = 1;
 			}
 			i = _1;
-			ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "testmethod21", &_4, 56, p, p);
+			ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "testmethod21", &_4, 58, p, p);
 			zephir_check_call_status();
 			j += zephir_get_numberval(&_3$$3);
 		}
@@ -1116,7 +1116,7 @@ PHP_METHOD(Stub_Mcall, testCallablePass)
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_12__closure_ce, SL("__invoke"));
-	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 57, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 59, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -1149,7 +1149,7 @@ PHP_METHOD(Stub_Mcall, testCallableArrayThisMethodPass)
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "bb");
 	zephir_array_fast_append(&_0, &_1);
-	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 57, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 59, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -1173,7 +1173,7 @@ PHP_METHOD(Stub_Mcall, aa)
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_RETURN_CALL_METHOD(&a, "bb", NULL, 58);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "bb", NULL, 60);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -1203,7 +1203,7 @@ PHP_METHOD(Stub_Mcall, issue1136)
 	ZVAL_STRING(&_1, "8.0.0");
 	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, ">=");
-	ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 59, &_0, &_1, &_2);
+	ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 61, &_0, &_1, &_2);
 	zephir_check_call_status();
 	if (zephir_is_true(&_3)) {
 		ZEPHIR_INIT_VAR(&_finfo);
@@ -1211,7 +1211,7 @@ PHP_METHOD(Stub_Mcall, issue1136)
 		ZEPHIR_CALL_METHOD(NULL, &_finfo, "__construct", NULL, 0);
 		zephir_check_call_status();
 	} else {
-		ZEPHIR_CALL_FUNCTION(&_finfo, "finfo_open", NULL, 60);
+		ZEPHIR_CALL_FUNCTION(&_finfo, "finfo_open", NULL, 62);
 		zephir_check_call_status();
 	}
 	RETURN_CCTOR(&_finfo);
diff --git a/ext/stub/mcall.zep.h b/ext/stub/mcall.zep.h
index d3a376be10..cd90993017 100644
--- a/ext/stub/mcall.zep.h
+++ b/ext/stub/mcall.zep.h
@@ -233,7 +233,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_testarrayparam, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_testobjectparamcaststdclass, 0, 0, 1)
-	ZEND_ARG_OBJ_INFO(0, param, StdClass, 0)
+	ZEND_ARG_OBJ_INFO(0, param, stdClass, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_testobjectparamcastooparam, 0, 0, 1)
diff --git a/ext/stub/mcallchained.zep.c b/ext/stub/mcallchained.zep.c
index 19b772a6e5..8a8abfa4a1 100644
--- a/ext/stub/mcallchained.zep.c
+++ b/ext/stub/mcallchained.zep.c
@@ -109,7 +109,7 @@ PHP_METHOD(Stub_McallChained, testChained3)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 61);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 63);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod2", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/mcalldynamic.zep.c b/ext/stub/mcalldynamic.zep.c
index 44fb317fe3..58a97970f9 100644
--- a/ext/stub/mcalldynamic.zep.c
+++ b/ext/stub/mcalldynamic.zep.c
@@ -94,22 +94,21 @@ PHP_METHOD(Stub_McallDynamic, __call)
  */
 PHP_METHOD(Stub_McallDynamic, testCallAnonymousFunctionWithContext)
 {
-	zval result, _1;
+	zval result, _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&result);
-	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_0);
 
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_INIT_VAR(&_1);
-	ZEPHIR_INIT_NVAR(&_1);
-	zephir_create_closure_ex(&_1, NULL, stub_13__closure_ce, SL("__invoke"));
-	ZEPHIR_CALL_CE_STATIC(&result, stub_mcall_caller_ce, "start", &_0, 0, &_1);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_NVAR(&_0);
+	zephir_create_closure_ex(&_0, NULL, stub_13__closure_ce, SL("__invoke"));
+	ZEPHIR_CALL_CE_STATIC(&result, stub_mcall_caller_ce, "start", NULL, 0, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&result);
 }
diff --git a/ext/stub/nativearray.zep.c b/ext/stub/nativearray.zep.c
index 5b2082a793..d3cd029e2f 100644
--- a/ext/stub/nativearray.zep.c
+++ b/ext/stub/nativearray.zep.c
@@ -773,8 +773,9 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	zephir_array_fetch_long(&b, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 245);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_long(&b, &a, 0, PH_NOISY, "stub/nativearray.zep", 245);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayAccess2)
@@ -794,8 +795,9 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess2)
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	zephir_array_fetch_string(&b, &a, SL("a"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 255);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_string(&b, &a, SL("a"), PH_NOISY, "stub/nativearray.zep", 255);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayAccess3)
@@ -824,8 +826,9 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess3)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
 	c = 0;
-	zephir_array_fetch_long(&b, &a, c, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 267);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_long(&b, &a, c, PH_NOISY, "stub/nativearray.zep", 267);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayAccess4)
@@ -849,8 +852,9 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess4)
 	add_assoc_long_ex(&a, SL("c"), 3);
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "a");
-	zephir_array_fetch(&b, &a, &c, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 279);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 279);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayAccess5)
@@ -873,8 +877,9 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess5)
 	add_assoc_long_ex(&a, SL("c"), 3);
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "a");
-	zephir_array_fetch(&b, &a, &c, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 290);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 290);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayAccess6)
@@ -926,8 +931,9 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess1)
 	add_index_stringl(&_0, 1, SL("b"));
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_fetch_long(&_1, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 310);
-	zephir_array_fetch_long(&b, &_1, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 310);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_long(&b, &_1, 0, PH_NOISY, "stub/nativearray.zep", 310);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
@@ -958,8 +964,9 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_2, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 320);
-	zephir_array_fetch_long(&b, &_2, 1, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 320);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_long(&b, &_2, 1, PH_NOISY, "stub/nativearray.zep", 320);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
@@ -996,8 +1003,9 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
-	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 330);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
@@ -1034,8 +1042,9 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
-	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 340);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
@@ -1067,8 +1076,9 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 	zephir_array_update_string(&a, SL("a"), &_0, PH_COPY | PH_SEPARATE);
 	zephir_array_fetch_string(&_2, &a, SL("a"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
 	zephir_array_fetch_string(&_3, &_2, SL("b"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
-	zephir_array_fetch_string(&b, &_3, SL("c"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
-	RETURN_CTOR(&b);
+	ZEPHIR_OBS_VAR(&b);
+	zephir_array_fetch_string(&b, &_3, SL("c"), PH_NOISY, "stub/nativearray.zep", 350);
+	RETURN_CCTOR(&b);
 }
 
 PHP_METHOD(Stub_NativeArray, testArrayUpdate1)
@@ -1968,7 +1978,7 @@ PHP_METHOD(Stub_NativeArray, issue709)
 			ZEPHIR_INIT_NVAR(&_3$$3);
 			ZVAL_LONG(&_3$$3, 2);
 			zephir_array_fast_append(&arr, &_3$$3);
-			ZEPHIR_CALL_FUNCTION(&_5$$3, "array_rand", &_6, 62, &arr);
+			ZEPHIR_CALL_FUNCTION(&_5$$3, "array_rand", &_6, 64, &arr);
 			zephir_check_call_status();
 			zephir_array_fetch(&_4$$3, &arr, &_5$$3, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 626);
 			ZEPHIR_CPY_WRT(&arr, &_4$$3);
@@ -2022,7 +2032,7 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("prefixes"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_fetch(&_3, &_2, &prefix, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 639);
 	ZEPHIR_MAKE_REF(&_3);
-	ZEPHIR_CALL_FUNCTION(NULL, "array_push", NULL, 63, &_3, &baseDir);
+	ZEPHIR_CALL_FUNCTION(NULL, "array_push", NULL, 65, &_3, &baseDir);
 	ZEPHIR_UNREF(&_3);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "prefixes");
diff --git a/ext/stub/oo.zep.c b/ext/stub/oo.zep.c
index 73d5dc903f..3fbb1f81b5 100644
--- a/ext/stub/oo.zep.c
+++ b/ext/stub/oo.zep.c
@@ -59,7 +59,7 @@ PHP_METHOD(Stub_Oo, testInstance2)
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstruct_ce);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 64);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -106,7 +106,7 @@ PHP_METHOD(Stub_Oo, testInstance4)
 	ZVAL_STRING(&b, "b");
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 65, &a, &b);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &a, &b);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -131,7 +131,7 @@ PHP_METHOD(Stub_Oo, testInstance5)
 	ZVAL_STRING(&_0, "a");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "b");
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 65, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -154,7 +154,7 @@ PHP_METHOD(Stub_Oo, testInstance6)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 65, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -177,7 +177,7 @@ PHP_METHOD(Stub_Oo, testInstance7)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_BOOL(&_0, 0);
 	ZVAL_BOOL(&_1, 1);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 65, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -200,7 +200,7 @@ PHP_METHOD(Stub_Oo, testInstance8)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_DOUBLE(&_0, 1.2);
 	ZVAL_DOUBLE(&_1, 7.30);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 65, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -210,7 +210,6 @@ PHP_METHOD(Stub_Oo, testInstance9)
 	zval o;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
@@ -218,7 +217,7 @@ PHP_METHOD(Stub_Oo, testInstance9)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "getnew", &_0, 0);
+	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -228,7 +227,6 @@ PHP_METHOD(Stub_Oo, testInstance10)
 	zval o;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
@@ -236,7 +234,7 @@ PHP_METHOD(Stub_Oo, testInstance10)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamicb_ce, "getnew", &_0, 0);
+	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamicb_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -259,7 +257,7 @@ PHP_METHOD(Stub_Oo, testInstance11)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 65, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -269,7 +267,6 @@ PHP_METHOD(Stub_Oo, testInstance12)
 	zval o;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
@@ -277,7 +274,7 @@ PHP_METHOD(Stub_Oo, testInstance12)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "call1", &_0, 0);
+	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "call1", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
diff --git a/ext/stub/oo/concretestatic.zep.c b/ext/stub/oo/concretestatic.zep.c
index dcd1700de9..4186d2923c 100644
--- a/ext/stub/oo/concretestatic.zep.c
+++ b/ext/stub/oo/concretestatic.zep.c
@@ -52,14 +52,13 @@ PHP_METHOD(Stub_Oo_ConcreteStatic, callParentFunction)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_PARENT(stub_oo_concretestatic_ce, getThis(), "getcalledclass", &_0, 0);
+	ZEPHIR_RETURN_CALL_PARENT(stub_oo_concretestatic_ce, getThis(), "getcalledclass", NULL, 0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/oo/deprecatedmethods.zep.c b/ext/stub/oo/deprecatedmethods.zep.c
index a7213f1622..93189cf5ef 100644
--- a/ext/stub/oo/deprecatedmethods.zep.c
+++ b/ext/stub/oo/deprecatedmethods.zep.c
@@ -43,7 +43,7 @@ PHP_METHOD(Stub_Oo_DeprecatedMethods, normalMethod)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 66);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 68);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/oo/oodestruct.zep.c b/ext/stub/oo/oodestruct.zep.c
index 6b1185966f..07905d7ce1 100644
--- a/ext/stub/oo/oodestruct.zep.c
+++ b/ext/stub/oo/oodestruct.zep.c
@@ -227,11 +227,11 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
 	if ((zephir_file_exists(&_1) == SUCCESS)) {
 		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 67, &_2$$4);
+		ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 69, &_2$$4);
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_3$$4);
 		zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 68, &_4$$4);
+		ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 70, &_4$$4);
 		zephir_check_call_status();
 		if (zephir_is_true(&imageinfo)) {
 			zephir_array_fetch_long(&_5$$5, &imageinfo, 0, PH_NOISY | PH_READONLY, "stub/oo/oodestruct.zep", 62);
@@ -349,7 +349,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_37$$13);
 		zephir_read_property(&_35$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 69, &_35$$13, &__$true);
+		ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 71, &_35$$13, &__$true);
 		zephir_check_call_status();
 		zephir_read_property(&_36$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_BOOL(&_38$$13, 1);
@@ -446,7 +446,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, check)
 	ZVAL_STRING(&_4, "2.0.1");
 	ZEPHIR_INIT_VAR(&_5);
 	ZVAL_STRING(&_5, ">=");
-	ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 59, &version, &_4, &_5);
+	ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 61, &version, &_4, &_5);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_6))) {
 		ZEPHIR_INIT_VAR(&_7$$5);
@@ -514,13 +514,13 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 	ZVAL_NULL(&version);
 	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "GD_VERSION");
-	ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 70, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 72, &_3);
 	zephir_check_call_status();
 	if (zephir_is_true(&_4)) {
 		ZEPHIR_INIT_NVAR(&version);
 		ZEPHIR_GET_CONSTANT(&version, "GD_VERSION");
 	} else {
-		ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 71);
+		ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 73);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&matches);
 		ZVAL_NULL(&matches);
diff --git a/ext/stub/oo/oonativeimplements.zep.h b/ext/stub/oo/oonativeimplements.zep.h
index bf1f69343a..eca407a308 100644
--- a/ext/stub/oo/oonativeimplements.zep.h
+++ b/ext/stub/oo/oonativeimplements.zep.h
@@ -86,15 +86,10 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements_serialize, 0, 0, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements_unserialize, 0, 1, IS_VOID, 0)
-    ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0)
-ZEND_END_ARG_INFO()
-#else
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements_unserialize, 0, 1, IS_VOID, 0)
-    ZEND_ARG_INFO(0, serialized)
+
+	ZEND_ARG_TYPE_INFO(0, serialized, IS_STRING, 0)
 ZEND_END_ARG_INFO()
-#endif
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements___serialize, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
diff --git a/ext/stub/oo/propertyaccess.zep.c b/ext/stub/oo/propertyaccess.zep.c
index acbbd1e0b0..80148c4d66 100644
--- a/ext/stub/oo/propertyaccess.zep.c
+++ b/ext/stub/oo/propertyaccess.zep.c
@@ -97,7 +97,8 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	zephir_read_property(&_9, this_ptr, ZEND_STRL("a"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_10, &_9, ZEND_STRL("test2"), PH_NOISY_CC | PH_READONLY);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_10);
-	zephir_read_property(&test1, this_ptr, ZEND_STRL("a"), PH_NOISY_CC | PH_READONLY);
+	ZEPHIR_OBS_VAR(&test1);
+	zephir_read_property(&test1, this_ptr, ZEND_STRL("a"), PH_NOISY_CC);
 	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/oo/scopes/privatescopetester.zep.c b/ext/stub/oo/scopes/privatescopetester.zep.c
index f442dc765f..4e535f3260 100644
--- a/ext/stub/oo/scopes/privatescopetester.zep.c
+++ b/ext/stub/oo/scopes/privatescopetester.zep.c
@@ -138,7 +138,7 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
 	zephir_fetch_params(1, 1, 0, &obj);
 
 
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 72, obj);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 74, obj);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/optimizers/acos.zep.c b/ext/stub/optimizers/acos.zep.c
index 5371416dea..c726af1373 100644
--- a/ext/stub/optimizers/acos.zep.c
+++ b/ext/stub/optimizers/acos.zep.c
@@ -12,11 +12,10 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "math.h"
+#include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
-#include "kernel/math.h"
+#include "kernel/operators.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
@@ -29,50 +28,64 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
 PHP_METHOD(Stub_Optimizers_ACos, testInt)
 {
 	zval _0;
-	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 
 
+	ZEPHIR_MM_GROW();
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	RETURN_DOUBLE(acos(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVar)
 {
 	zval _0;
-	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 
 
+	ZEPHIR_MM_GROW();
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	RETURN_DOUBLE(acos(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntValue1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 
 
+	ZEPHIR_MM_GROW();
 
 	ZVAL_LONG(&_0, 0);
-	RETURN_DOUBLE(acos(0));
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
-	zend_long a;
+	zend_long a, ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
@@ -84,16 +97,21 @@ PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_intval(a_param);
 
 
 	ZVAL_LONG(&_0, a);
-	RETURN_DOUBLE(acos(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
 	zval *this_ptr = getThis();
 
@@ -106,9 +124,12 @@ PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &a);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &a);
 
 
-	RETURN_DOUBLE(zephir_acos(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, a);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
diff --git a/ext/stub/optimizers/asin.zep.c b/ext/stub/optimizers/asin.zep.c
index fe81b5d609..c73f52c51d 100644
--- a/ext/stub/optimizers/asin.zep.c
+++ b/ext/stub/optimizers/asin.zep.c
@@ -12,11 +12,10 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "math.h"
+#include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
-#include "kernel/math.h"
+#include "kernel/operators.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
@@ -29,50 +28,64 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
 PHP_METHOD(Stub_Optimizers_ASin, testInt)
 {
 	zval _0;
-	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 
 
+	ZEPHIR_MM_GROW();
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	RETURN_DOUBLE(asin(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVar)
 {
 	zval _0;
-	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 
 
+	ZEPHIR_MM_GROW();
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	RETURN_DOUBLE(asin(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntValue1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 
 
+	ZEPHIR_MM_GROW();
 
 	ZVAL_LONG(&_0, 0);
-	RETURN_DOUBLE(asin(0));
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
-	zend_long a;
+	zend_long a, ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
@@ -84,16 +97,21 @@ PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_intval(a_param);
 
 
 	ZVAL_LONG(&_0, a);
-	RETURN_DOUBLE(asin(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
 	zval *this_ptr = getThis();
 
@@ -106,9 +124,12 @@ PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 #endif
 
 
-	zephir_fetch_params_without_memory_grow(1, 0, &a);
+	ZEPHIR_MM_GROW();
+	zephir_fetch_params(1, 1, 0, &a);
 
 
-	RETURN_DOUBLE(zephir_asin(a));
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, a);
+	zephir_check_call_status();
+	RETURN_MM();
 }
 
diff --git a/ext/stub/optimizers/strreplace.zep.c b/ext/stub/optimizers/strreplace.zep.c
index 8ddc9bccdd..9ba0ee494a 100644
--- a/ext/stub/optimizers/strreplace.zep.c
+++ b/ext/stub/optimizers/strreplace.zep.c
@@ -209,7 +209,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	zephir_array_fast_append(&replacements, &_0);
 	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "The quick brown fox jumped over the lazy dog.");
-	ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 73, &patterns, &replacements, &subject);
+	ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 75, &patterns, &replacements, &subject);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/properties/app.zep.c b/ext/stub/properties/app.zep.c
index bb909926b8..9dc0f6e264 100644
--- a/ext/stub/properties/app.zep.c
+++ b/ext/stub/properties/app.zep.c
@@ -42,7 +42,6 @@ PHP_METHOD(Stub_Properties_App, __construct)
 	zval _0;
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_1 = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
@@ -50,7 +49,7 @@ PHP_METHOD(Stub_Properties_App, __construct)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_CALL_CE_STATIC(&_0, stub_properties_staticprivateproperties_ce, "getinstance", &_1, 0);
+	ZEPHIR_CALL_CE_STATIC(&_0, stub_properties_staticprivateproperties_ce, "getinstance", NULL, 0);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("instance"), &_0);
 	ZEPHIR_MM_RESTORE();
diff --git a/ext/stub/properties/getobjectvars.zep.c b/ext/stub/properties/getobjectvars.zep.c
index b37947bdf1..42fff779d9 100644
--- a/ext/stub/properties/getobjectvars.zep.c
+++ b/ext/stub/properties/getobjectvars.zep.c
@@ -40,7 +40,7 @@ PHP_METHOD(Stub_Properties_GetObjectVars, issue1245)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 72, this_ptr);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 74, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/properties/propertyarray.zep.c b/ext/stub/properties/propertyarray.zep.c
index 9cef65335b..95ba68716a 100644
--- a/ext/stub/properties/propertyarray.zep.c
+++ b/ext/stub/properties/propertyarray.zep.c
@@ -146,12 +146,12 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 		}
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_MAKE_REF(&_0$$3);
-		ZEPHIR_CALL_FUNCTION(&info, "array_shift", &_1, 74, &_0$$3);
+		ZEPHIR_CALL_FUNCTION(&info, "array_shift", &_1, 76, &_0$$3);
 		ZEPHIR_UNREF(&_0$$3);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "header");
-		ZEPHIR_CALL_FUNCTION(&_3$$3, "stripos", &_4, 75, &info, &_2$$3);
+		ZEPHIR_CALL_FUNCTION(&_3$$3, "stripos", &_4, 77, &info, &_2$$3);
 		zephir_check_call_status();
 		if (!ZEPHIR_IS_FALSE_IDENTICAL(&_3$$3)) {
 			zephir_array_append(&headers, &info, PH_SEPARATE, "stub/properties/propertyarray.zep", 51);
@@ -159,7 +159,7 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 		} else {
 			zephir_read_property(&_5$$5, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 			ZEPHIR_MAKE_REF(&_5$$5);
-			ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", &_6, 76, &_5$$5, &info);
+			ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", &_6, 78, &_5$$5, &info);
 			ZEPHIR_UNREF(&_5$$5);
 			zephir_check_call_status();
 			break;
diff --git a/ext/stub/quantum.zep.c b/ext/stub/quantum.zep.c
index 945b36df41..4d8f1ffc25 100644
--- a/ext/stub/quantum.zep.c
+++ b/ext/stub/quantum.zep.c
@@ -140,7 +140,7 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZVAL_STRING(&_0, "harmos.txt");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 32, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 34, &_0, &_1);
 	zephir_check_call_status();
 	if (!(zephir_is_true(&fp))) {
 		RETURN_MM_LONG(1);
@@ -345,13 +345,13 @@ PHP_METHOD(Stub_Quantum, harmos)
 					ZVAL_STRING(&_52$$9, "%16.8lf %16.8lf %16.8lf \n");
 					ZVAL_DOUBLE(&_53$$9, ((double) i * dx));
 					ZVAL_DOUBLE(&_54$$9, ((double) n * dt));
-					ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 77, &fp, &_52$$9, &_53$$9, &_54$$9, &_51$$9);
+					ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 79, &fp, &_52$$9, &_53$$9, &_54$$9, &_51$$9);
 					zephir_check_call_status();
 					i = (i + 10);
 				}
 				ZEPHIR_INIT_NVAR(&_56$$8);
 				ZVAL_STRING(&_56$$8, "\n");
-				ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 77, &fp, &_56$$8);
+				ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 79, &fp, &_56$$8);
 				zephir_check_call_status();
 			}
 			j = 1;
diff --git a/ext/stub/range.zep.c b/ext/stub/range.zep.c
index 09122154a1..989859e46c 100644
--- a/ext/stub/range.zep.c
+++ b/ext/stub/range.zep.c
@@ -46,7 +46,7 @@ PHP_METHOD(Stub_Range, inclusive1)
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
-	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 78, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 80, &_0, &_1);
 	zephir_check_call_status();
 	zephir_get_arrval(&_3, &_2);
 	RETURN_CTOR(&_3);
@@ -70,7 +70,7 @@ PHP_METHOD(Stub_Range, exclusive1)
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
-	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 78, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 80, &_0, &_1);
 	zephir_check_call_status();
 	zephir_get_arrval(&_3, &_2);
 	RETURN_CTOR(&_3);
diff --git a/ext/stub/reflection.zep.c b/ext/stub/reflection.zep.c
index 2421e1f393..839790de5e 100644
--- a/ext/stub/reflection.zep.c
+++ b/ext/stub/reflection.zep.c
@@ -39,7 +39,7 @@ PHP_METHOD(Stub_Reflection, getReflectionClass)
 
 	ZEPHIR_INIT_VAR(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionclass")));
-	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 79, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 81, this_ptr);
 	zephir_check_call_status();
 	RETURN_CCTOR(&r);
 }
@@ -61,7 +61,7 @@ PHP_METHOD(Stub_Reflection, getReflectionFunction)
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionfunction")));
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "abs");
-	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 80, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 82, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&r);
 }
diff --git a/ext/stub/regexdna.zep.c b/ext/stub/regexdna.zep.c
index 5b386f0a97..cb15a4461a 100644
--- a/ext/stub/regexdna.zep.c
+++ b/ext/stub/regexdna.zep.c
@@ -184,7 +184,7 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEPHIR_CONCAT_SVS(&_1, "/", &stuffToRemove, "/mS");
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "");
-	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 73, &_1, &_0, &contents);
+	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 75, &_1, &_0, &contents);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&contents, &_2);
 	ZEPHIR_INIT_VAR(&codeLength);
@@ -228,7 +228,7 @@ PHP_METHOD(Stub_RegexDNA, process)
 		}
 	}
 	ZEPHIR_INIT_NVAR(&regex);
-	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 73, &vIUB, &vIUBnew, &contents);
+	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 75, &vIUB, &vIUBnew, &contents);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&contents, &_2);
 	php_printf("%c", '\n');
diff --git a/ext/stub/requires.zep.c b/ext/stub/requires.zep.c
index 87549b16ad..2c38aebf4f 100644
--- a/ext/stub/requires.zep.c
+++ b/ext/stub/requires.zep.c
@@ -111,7 +111,7 @@ PHP_METHOD(Stub_Requires, requireExternal3)
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_CALL_METHOD(NULL, &external3, "req", NULL, 81, path, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &external3, "req", NULL, 83, path, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "content");
 }
diff --git a/ext/stub/requires/external3.zep.c b/ext/stub/requires/external3.zep.c
index a3b08e842d..0d3ef34abe 100644
--- a/ext/stub/requires/external3.zep.c
+++ b/ext/stub/requires/external3.zep.c
@@ -52,12 +52,12 @@ PHP_METHOD(Stub_Requires_External3, req)
 	zephir_fetch_params(1, 2, 0, &path, &requires);
 
 
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 82);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 84);
 	zephir_check_call_status();
 	if (zephir_require_zval(path) == FAILURE) {
 		RETURN_MM_NULL();
 	}
-	ZEPHIR_CALL_FUNCTION(&_0, "ob_get_contents", NULL, 83);
+	ZEPHIR_CALL_FUNCTION(&_0, "ob_get_contents", NULL, 85);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(NULL, requires, "setcontent", NULL, 0, &_0);
 	zephir_check_call_status();
diff --git a/ext/stub/resourcetest.zep.c b/ext/stub/resourcetest.zep.c
index a224eef3b5..1f935fca59 100644
--- a/ext/stub/resourcetest.zep.c
+++ b/ext/stub/resourcetest.zep.c
@@ -123,7 +123,7 @@ PHP_METHOD(Stub_ResourceTest, testFunctionsForSTDIN)
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	ZVAL_LONG(&_0, 1);
-	ZEPHIR_CALL_FUNCTION(NULL, "stream_set_blocking", NULL, 84, &a, &_0);
+	ZEPHIR_CALL_FUNCTION(NULL, "stream_set_blocking", NULL, 86, &a, &_0);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
diff --git a/ext/stub/router.zep.c b/ext/stub/router.zep.c
index 9edea335b4..cbe15fa480 100644
--- a/ext/stub/router.zep.c
+++ b/ext/stub/router.zep.c
@@ -127,7 +127,7 @@ PHP_METHOD(Stub_Router, __construct)
 		add_assoc_long_ex(&_1$$3, SL("controller"), 1);
 		ZEPHIR_INIT_VAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "#^/([a-zA-Z0-9\\_\\-]+)[/]{0,1}$#");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", &_3, 85, &_2$$3, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", &_3, 87, &_2$$3, &_1$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "stub/router.zep", 89);
 		ZEPHIR_INIT_NVAR(&_2$$3);
@@ -139,7 +139,7 @@ PHP_METHOD(Stub_Router, __construct)
 		add_assoc_long_ex(&_4$$3, SL("params"), 3);
 		ZEPHIR_INIT_VAR(&_5$$3);
 		ZVAL_STRING(&_5$$3, "#^/([a-zA-Z0-9\\_\\-]+)/([a-zA-Z0-9\\.\\_]+)(/.*)*$#");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 85, &_5$$3, &_4$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 87, &_5$$3, &_4$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "stub/router.zep", 95);
 	}
@@ -1083,7 +1083,7 @@ PHP_METHOD(Stub_Router, add)
 
 	ZEPHIR_INIT_VAR(&route);
 	object_init_ex(&route, stub_router_route_ce);
-	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 85, pattern, paths, httpMethods);
+	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 87, pattern, paths, httpMethods);
 	zephir_check_call_status();
 	zephir_update_property_array_append(this_ptr, SL("_routes"), &route);
 	RETURN_CCTOR(&route);
diff --git a/ext/stub/scall.zep.c b/ext/stub/scall.zep.c
index 679703f473..51a6364b19 100644
--- a/ext/stub/scall.zep.c
+++ b/ext/stub/scall.zep.c
@@ -175,7 +175,7 @@ PHP_METHOD(Stub_Scall, testCall3)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 86);
+	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 88);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -257,7 +257,7 @@ PHP_METHOD(Stub_Scall, testCall6)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 87, a, b);
+	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 89, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -303,7 +303,7 @@ PHP_METHOD(Stub_Scall, testCall9)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 86);
+	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 88);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -385,7 +385,7 @@ PHP_METHOD(Stub_Scall, testCall12)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 87, a, b);
+	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 89, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -394,14 +394,13 @@ PHP_METHOD(Stub_Scall, testCall13)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod1", &_0, 0);
+	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -410,14 +409,13 @@ PHP_METHOD(Stub_Scall, testCall14)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod2", &_0, 0);
+	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod2", NULL, 0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/scallexternal.zep.c b/ext/stub/scallexternal.zep.c
index 1a4fb76a47..35913cf7e6 100644
--- a/ext/stub/scallexternal.zep.c
+++ b/ext/stub/scallexternal.zep.c
@@ -33,14 +33,13 @@ PHP_METHOD(Stub_ScallExternal, testCall1)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *this_ptr = getThis();
 
 
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod1", &_0, 0);
+	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -49,7 +48,6 @@ PHP_METHOD(Stub_ScallExternal, testCall2)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zephir_fcall_cache_entry *_0 = NULL;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
 
@@ -68,7 +66,7 @@ PHP_METHOD(Stub_ScallExternal, testCall2)
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod4", &_0, 0, a, b);
+	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/scope.zep.c b/ext/stub/scope.zep.c
index f25467d03a..1cb63ee4b9 100644
--- a/ext/stub/scope.zep.c
+++ b/ext/stub/scope.zep.c
@@ -80,7 +80,7 @@ PHP_METHOD(Stub_Scope, test1)
 
 	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "");
-	ZEPHIR_CALL_SELF(&k, "getstr", &_0, 88);
+	ZEPHIR_CALL_SELF(&k, "getstr", &_0, 90);
 	zephir_check_call_status();
 	r = 1;
 	if (r == 1) {
@@ -176,7 +176,7 @@ PHP_METHOD(Stub_Scope, test3)
 			}
 			ZEPHIR_INIT_NVAR(&c);
 			ZVAL_LONG(&c, _1);
-			ZEPHIR_CALL_SELF(&str$$3, "getdystr", &_3, 89, &c);
+			ZEPHIR_CALL_SELF(&str$$3, "getdystr", &_3, 91, &c);
 			zephir_check_call_status();
 			zephir_concat_self(&k, &str$$3);
 		}
diff --git a/ext/stub/sort.zep.c b/ext/stub/sort.zep.c
index 993f4dffc0..8a3a658e3f 100644
--- a/ext/stub/sort.zep.c
+++ b/ext/stub/sort.zep.c
@@ -99,16 +99,16 @@ PHP_METHOD(Stub_Sort, quick)
 			}
 		}
 	}
-	ZEPHIR_CALL_METHOD(&_7, this_ptr, "quick", &_8, 90, &left);
+	ZEPHIR_CALL_METHOD(&_7, this_ptr, "quick", &_8, 92, &left);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_9);
 	zephir_create_array(&_9, 1, 0);
 	ZEPHIR_INIT_VAR(&_10);
 	ZVAL_LONG(&_10, pivot);
 	zephir_array_fast_append(&_9, &_10);
-	ZEPHIR_CALL_METHOD(&_11, this_ptr, "quick", &_8, 90, &right);
+	ZEPHIR_CALL_METHOD(&_11, this_ptr, "quick", &_8, 92, &right);
 	zephir_check_call_status();
-	ZEPHIR_RETURN_CALL_FUNCTION("array_merge", NULL, 91, &_7, &_9, &_11);
+	ZEPHIR_RETURN_CALL_FUNCTION("array_merge", NULL, 93, &_7, &_9, &_11);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/spectralnorm.zep.c b/ext/stub/spectralnorm.zep.c
index b9f902de3b..9378e0b718 100644
--- a/ext/stub/spectralnorm.zep.c
+++ b/ext/stub/spectralnorm.zep.c
@@ -126,7 +126,7 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 					j = _4$$3;
 					ZVAL_LONG(&_7$$4, i);
 					ZVAL_LONG(&_8$$4, j);
-					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 92, &_7$$4, &_8$$4);
+					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 94, &_7$$4, &_8$$4);
 					zephir_check_call_status();
 					ZVAL_LONG(&_7$$4, j);
 					ZEPHIR_CALL_METHOD(&_10$$4, u, "offsetget", &_11, 0, &_7$$4);
@@ -209,7 +209,7 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 					j = _4$$3;
 					ZVAL_LONG(&_7$$4, j);
 					ZVAL_LONG(&_8$$4, i);
-					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 92, &_7$$4, &_8$$4);
+					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 94, &_7$$4, &_8$$4);
 					zephir_check_call_status();
 					ZVAL_LONG(&_7$$4, j);
 					ZEPHIR_CALL_METHOD(&_10$$4, u, "offsetget", &_11, 0, &_7$$4);
@@ -254,9 +254,9 @@ PHP_METHOD(Stub_SpectralNorm, AtAu)
 	zephir_fetch_params(1, 4, 0, &n, &u, &v, &w);
 
 
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "au", NULL, 93, n, u, w);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "au", NULL, 95, n, u, w);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "atu", NULL, 94, n, w, v);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "atu", NULL, 96, n, w, v);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
@@ -300,17 +300,17 @@ PHP_METHOD(Stub_SpectralNorm, process)
 	ZEPHIR_INIT_VAR(&u);
 	object_init_ex(&u, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &u, "__construct", NULL, 95, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &u, "__construct", NULL, 97, &_0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&v);
 	object_init_ex(&v, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &v, "__construct", NULL, 95, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &v, "__construct", NULL, 97, &_0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&w);
 	object_init_ex(&w, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &w, "__construct", NULL, 95, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &w, "__construct", NULL, 97, &_0);
 	zephir_check_call_status();
 	_3 = (n - 1);
 	_2 = 0;
@@ -328,15 +328,15 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			i = _2;
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &u, "offsetset", &_6, 96, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &u, "offsetset", &_6, 98, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &v, "offsetset", &_6, 96, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &v, "offsetset", &_6, 98, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &w, "offsetset", &_6, 96, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &w, "offsetset", &_6, 98, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 		}
 	}
@@ -355,10 +355,10 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			}
 			i = _8;
 			ZVAL_LONG(&_10$$4, n);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 97, &_10$$4, &u, &v, &w);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 99, &_10$$4, &u, &v, &w);
 			zephir_check_call_status();
 			ZVAL_LONG(&_10$$4, n);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 97, &_10$$4, &v, &u, &w);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 99, &_10$$4, &v, &u, &w);
 			zephir_check_call_status();
 		}
 	}
@@ -377,19 +377,19 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			}
 			i = _13;
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_15$$5, &u, "offsetget", &_17, 98, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_15$$5, &u, "offsetget", &_17, 100, &_16$$5);
 			zephir_check_call_status();
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 98, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 100, &_16$$5);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_19$$5);
 			mul_function(&_19$$5, &_15$$5, &_18$$5);
 			vBv += zephir_get_numberval(&_19$$5);
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_15$$5, &v, "offsetget", &_17, 98, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_15$$5, &v, "offsetget", &_17, 100, &_16$$5);
 			zephir_check_call_status();
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 98, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 100, &_16$$5);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_20$$5);
 			mul_function(&_20$$5, &_15$$5, &_18$$5);
diff --git a/ext/stub/spl.zep.c b/ext/stub/spl.zep.c
index 070a9ca251..dd43f0df9b 100644
--- a/ext/stub/spl.zep.c
+++ b/ext/stub/spl.zep.c
@@ -52,7 +52,7 @@ PHP_METHOD(Stub_Spl, issue1212)
 
 
 	object_init_ex(return_value, spl_ce_SplFileObject);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 99, &file);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 101, &file);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/statements.zep.c b/ext/stub/statements.zep.c
index be99dc7bd9..f6677f6d4f 100644
--- a/ext/stub/statements.zep.c
+++ b/ext/stub/statements.zep.c
@@ -216,25 +216,25 @@ PHP_METHOD(Stub_Statements, test544Issue)
 		unfilledWidth = (((zephir_get_numberval(&_4$$3) - 1)) - filledWidth);
 		zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_6$$3, filledWidth);
-		ZEPHIR_CALL_FUNCTION(&_7$$3, "str_repeat", &_8, 20, &_5$$3, &_6$$3);
+		ZEPHIR_CALL_FUNCTION(&_7$$3, "str_repeat", &_8, 22, &_5$$3, &_6$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("arrow"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_10$$3, unfilledWidth);
-		ZEPHIR_CALL_FUNCTION(&_11$$3, "str_repeat", &_8, 20, &_9$$3, &_10$$3);
+		ZEPHIR_CALL_FUNCTION(&_11$$3, "str_repeat", &_8, 22, &_9$$3, &_10$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_7$$3, &_6$$3, &_11$$3);
 		RETURN_MM();
 	} else if (ZEPHIR_IS_LONG_IDENTICAL(&_1, step)) {
 		zephir_read_property(&_12$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 20, &_12$$4, &_13$$4);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 22, &_12$$4, &_13$$4);
 		zephir_check_call_status();
 		RETURN_MM();
 	} else {
 		zephir_read_property(&_14$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_15$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 20, &_14$$5, &_15$$5);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 22, &_14$$5, &_15$$5);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -287,25 +287,25 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 		unfilledWidth = (((zephir_get_numberval(&_2$$3) - 1)) - filledWidth);
 		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_4$$3, filledWidth);
-		ZEPHIR_CALL_FUNCTION(&_5$$3, "str_repeat", &_6, 20, &_3$$3, &_4$$3);
+		ZEPHIR_CALL_FUNCTION(&_5$$3, "str_repeat", &_6, 22, &_3$$3, &_4$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("arrow"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_7$$3, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_8$$3, unfilledWidth);
-		ZEPHIR_CALL_FUNCTION(&_9$$3, "str_repeat", &_6, 20, &_7$$3, &_8$$3);
+		ZEPHIR_CALL_FUNCTION(&_9$$3, "str_repeat", &_6, 22, &_7$$3, &_8$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_5$$3, &_4$$3, &_9$$3);
 		RETURN_MM();
 	} else if (step == totalSteps) {
 		zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 20, &_10$$4, &_11$$4);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 22, &_10$$4, &_11$$4);
 		zephir_check_call_status();
 		RETURN_MM();
 	} else {
 		zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 20, &_12$$5, &_13$$5);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 22, &_12$$5, &_13$$5);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
diff --git a/ext/stub/strings.zep.c b/ext/stub/strings.zep.c
index 456b5068b1..e7c8500331 100644
--- a/ext/stub/strings.zep.c
+++ b/ext/stub/strings.zep.c
@@ -679,7 +679,7 @@ PHP_METHOD(Stub_Strings, strToHex)
 		_1$$3 = ZEPHIR_STRING_OFFSET(&value, i);
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		ZVAL_STRINGL(&_2$$3, &_1$$3, 1);
-		ZEPHIR_CALL_FUNCTION(&_3$$3, "ord", &_4, 100, &_2$$3);
+		ZEPHIR_CALL_FUNCTION(&_3$$3, "ord", &_4, 102, &_2$$3);
 		zephir_check_call_status();
 		ZEPHIR_CALL_FUNCTION(&_5$$3, "dechex", &_6, 11, &_3$$3);
 		zephir_check_call_status();
@@ -737,17 +737,17 @@ PHP_METHOD(Stub_Strings, issue1267)
 	zephir_fast_str_replace(&_0, &_1, &_2, value);
 	ZEPHIR_CPY_WRT(value, &_0);
 	ZVAL_LONG(&_3, 516);
-	ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 43, value, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 45, value, &_3);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(value, &_4);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZEPHIR_CALL_FUNCTION(&_4, "strip_tags", &_5, 101, value);
+	ZEPHIR_CALL_FUNCTION(&_4, "strip_tags", &_5, 103, value);
 	zephir_check_call_status();
 	zephir_stripslashes(&_0, &_4);
 	ZEPHIR_INIT_VAR(&x);
 	zephir_fast_trim(&x, &_0, NULL , ZEPHIR_TRIM_BOTH);
 	ZEPHIR_INIT_VAR(&_6);
-	ZEPHIR_CALL_FUNCTION(&_7, "strip_tags", &_5, 101, value);
+	ZEPHIR_CALL_FUNCTION(&_7, "strip_tags", &_5, 103, value);
 	zephir_check_call_status();
 	zephir_stripcslashes(&_6, &_7);
 	zephir_fast_trim(return_value, &_6, NULL , ZEPHIR_TRIM_BOTH);
diff --git a/ext/stub/trytest.zep.c b/ext/stub/trytest.zep.c
index 0eed207df1..288621cec1 100644
--- a/ext/stub/trytest.zep.c
+++ b/ext/stub/trytest.zep.c
@@ -54,7 +54,7 @@ PHP_METHOD(Stub_TryTest, testThrow2)
 	ZVAL_STRING(&message, "error");
 	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, zend_ce_exception);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 28, &message);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 30, &message);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/trytest.zep", 16);
 	ZEPHIR_MM_RESTORE();
@@ -96,7 +96,7 @@ PHP_METHOD(Stub_TryTest, testTry2)
 		object_init_ex(&_0$$3, zend_ce_exception);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 28, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 30, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 27);
 		goto try_end_1;
@@ -129,7 +129,7 @@ PHP_METHOD(Stub_TryTest, testTry3)
 		object_init_ex(&_0$$3, zend_ce_exception);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 28, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 30, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 34);
 		goto try_end_1;
@@ -187,7 +187,7 @@ PHP_METHOD(Stub_TryTest, testTry4)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 28, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 46);
 			goto try_end_1;
@@ -197,7 +197,7 @@ PHP_METHOD(Stub_TryTest, testTry4)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 102, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 48);
 			goto try_end_1;
@@ -262,7 +262,7 @@ PHP_METHOD(Stub_TryTest, testTry5)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 28, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 63);
 			goto try_end_1;
@@ -272,7 +272,7 @@ PHP_METHOD(Stub_TryTest, testTry5)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 102, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 65);
 			goto try_end_1;
@@ -336,7 +336,7 @@ PHP_METHOD(Stub_TryTest, testTry6)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 28, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 80);
 			goto try_end_1;
@@ -346,7 +346,7 @@ PHP_METHOD(Stub_TryTest, testTry6)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 102, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 82);
 			goto try_end_1;
@@ -409,7 +409,7 @@ PHP_METHOD(Stub_TryTest, testTry7)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 28, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 99);
 			goto try_end_1;
@@ -419,7 +419,7 @@ PHP_METHOD(Stub_TryTest, testTry7)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 102, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 101);
 			goto try_end_1;
@@ -466,7 +466,7 @@ PHP_METHOD(Stub_TryTest, testTry8)
 		object_init_ex(&_0$$3, zend_ce_exception);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error 1!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 28, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 30, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 111);
 		goto try_end_1;
@@ -515,7 +515,7 @@ PHP_METHOD(Stub_TryTest, testTry9)
 
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod1", NULL, 103);
+		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod1", NULL, 105);
 		zephir_check_call_status_or_jump(try_end_1);
 		RETURN_MM_STRING("not catched");
 
@@ -550,7 +550,7 @@ PHP_METHOD(Stub_TryTest, testTry10)
 
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod2", NULL, 104);
+		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod2", NULL, 106);
 		zephir_check_call_status_or_jump(try_end_1);
 		RETURN_MM_STRING("not catched");
 
diff --git a/ext/stub/vars.zep.c b/ext/stub/vars.zep.c
index d85b039d34..f8eb58f698 100644
--- a/ext/stub/vars.zep.c
+++ b/ext/stub/vars.zep.c
@@ -73,7 +73,7 @@ PHP_METHOD(Stub_Vars, testParam)
 			}
 			ZEPHIR_INIT_NVAR(&v);
 			ZVAL_COPY(&v, _1);
-			ZEPHIR_CALL_FUNCTION(&_5$$3, "realpath", &_6, 67, &v);
+			ZEPHIR_CALL_FUNCTION(&_5$$3, "realpath", &_6, 69, &v);
 			zephir_check_call_status();
 			zephir_array_update_multi(&config, &_5$$3, SL("sz"), 3, SL("dir"), &k);
 		} ZEND_HASH_FOREACH_END();
@@ -90,7 +90,7 @@ PHP_METHOD(Stub_Vars, testParam)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&v, &_0, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_FUNCTION(&_7$$4, "realpath", &_6, 67, &v);
+				ZEPHIR_CALL_FUNCTION(&_7$$4, "realpath", &_6, 69, &v);
 				zephir_check_call_status();
 				zephir_array_update_multi(&config, &_7$$4, SL("sz"), 3, SL("dir"), &k);
 			ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0);

From 307eacaa8033c73a16bbde70f039fc4b0aaf15da Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 12 Nov 2023 21:25:16 +0000
Subject: [PATCH 122/375] Fix return type of `getBooleanCode()` method

---
 src/CompiledExpression.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CompiledExpression.php b/src/CompiledExpression.php
index 9861b5ae5c..e7e07e9aef 100644
--- a/src/CompiledExpression.php
+++ b/src/CompiledExpression.php
@@ -50,7 +50,7 @@ public function getOriginal(): ?array
     /**
      * Returns a C representation for a boolean constant.
      */
-    public function getBooleanCode(): string
+    public function getBooleanCode(): mixed
     {
         if ('true' === $this->code || true === $this->code) {
             return '1';

From 6b80cc2b956b1ff7940f7eb7f67880402b681d7a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 12 Nov 2023 22:47:18 +0000
Subject: [PATCH 123/375] Adjust condition

Fix warning: comparison between pointer and integer
---
 kernel/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/main.c b/kernel/main.c
index 1bbd149639..f8c90b7cbc 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -282,7 +282,7 @@ int zephir_fast_count_int(zval *value)
  */
 int zephir_function_exists(const zval *function_name)
 {
-	if (zend_hash_str_exists(CG(function_table), Z_STRVAL_P(function_name), Z_STRLEN_P(function_name)) != NULL) {
+	if (zend_hash_str_exists(CG(function_table), Z_STRVAL_P(function_name), Z_STRLEN_P(function_name))) {
 		return SUCCESS;
 	}
 

From b10b1aeca136c206eb6f94d925fc792d729e1d54 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 19 Nov 2023 22:24:31 +0000
Subject: [PATCH 124/375] Optimize imports

---
 src/Class/Method/Method.php | 87 ++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 406abcb015..605a40b415 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Class\Method;
 
+use ReflectionException;
 use Zephir\Branch;
 use Zephir\BranchManager;
 use Zephir\Cache\Manager;
@@ -34,6 +35,12 @@
 use Zephir\SymbolTable;
 use Zephir\Variable\Variable;
 
+use function array_key_exists;
+use function count;
+use function in_array;
+use function is_array;
+use function is_object;
+
 /**
  * Represents a class method
  */
@@ -239,12 +246,12 @@ public function setReturnTypes(array $returnType = null): void
             }
         }
 
-        if (\count($castTypes) > 0) {
+        if (count($castTypes) > 0) {
             $types['object'] = [];
             $this->returnClassTypes = $castTypes;
         }
 
-        if (\count($types) > 0) {
+        if (count($types) > 0) {
             $this->returnTypes = $types;
         }
     }
@@ -290,47 +297,47 @@ public function isEmpty(): bool
      */
     public function checkVisibility(array $visibility, string $name, array $original = null): void
     {
-        if (\count($visibility) > 1) {
-            if (\in_array('public', $visibility) && \in_array('protected', $visibility)) {
+        if (count($visibility) > 1) {
+            if (in_array('public', $visibility) && in_array('protected', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'public' and 'protected' at the same time", $original);
             }
 
-            if (\in_array('public', $visibility) && \in_array('private', $visibility)) {
+            if (in_array('public', $visibility) && in_array('private', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'public' and 'private' at the same time", $original);
             }
 
-            if (\in_array('private', $visibility) && \in_array('protected', $visibility)) {
+            if (in_array('private', $visibility) && in_array('protected', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'protected' and 'private' at the same time", $original);
             }
 
-            if (\in_array('private', $visibility) && \in_array('internal', $visibility)) {
+            if (in_array('private', $visibility) && in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'private' at the same time", $original);
             }
 
-            if (\in_array('protected', $visibility) && \in_array('internal', $visibility)) {
+            if (in_array('protected', $visibility) && in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'protected' at the same time", $original);
             }
 
-            if (\in_array('public', $visibility) && \in_array('internal', $visibility)) {
+            if (in_array('public', $visibility) && in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'public' at the same time", $original);
             }
         }
 
         if ('__construct' === $name) {
-            if (\in_array('static', $visibility)) {
+            if (in_array('static', $visibility)) {
                 throw new CompilerException("Constructors cannot be 'static'", $original);
             }
         } elseif ('__destruct' === $name) {
-            if (\in_array('static', $visibility)) {
+            if (in_array('static', $visibility)) {
                 throw new CompilerException("Destructors cannot be 'static'", $original);
             }
         }
 
-        $this->isAbstract = \in_array('abstract', $visibility);
-        $this->isStatic = \in_array('static', $visibility);
-        $this->isFinal = \in_array('final', $visibility);
-        $this->isPublic = \in_array('public', $visibility);
-        $this->isInternal = \in_array('internal', $visibility);
+        $this->isAbstract = in_array('abstract', $visibility);
+        $this->isStatic = in_array('static', $visibility);
+        $this->isFinal = in_array('final', $visibility);
+        $this->isPublic = in_array('public', $visibility);
+        $this->isInternal = in_array('internal', $visibility);
     }
 
     /**
@@ -496,7 +503,7 @@ public function getParameters(): ?Parameters
      */
     public function hasReturnTypes(): bool
     {
-        return \count($this->returnTypes) || \count($this->returnClassTypes);
+        return count($this->returnTypes) || count($this->returnClassTypes);
     }
 
     /**
@@ -515,7 +522,7 @@ public function areReturnTypesIntCompatible(): bool
         $types = ['int', 'uint', 'char', 'uchar', 'long', 'ulong'];
 
         foreach ($this->returnTypes as $returnType => $definition) {
-            if (\in_array($returnType, $types)) {
+            if (in_array($returnType, $types)) {
                 return true;
             }
         }
@@ -620,7 +627,7 @@ public function getNumberOfRequiredParameters(): int
      */
     public function hasModifier(string $modifier): bool
     {
-        return \in_array($modifier, $this->visibility);
+        return in_array($modifier, $this->visibility);
     }
 
     /**
@@ -633,7 +640,7 @@ public function getVisibility(): array
 
     public function isDeprecated(): bool
     {
-        return !empty($this->visibility) && \in_array('deprecated', $this->visibility, true);
+        return !empty($this->visibility) && in_array('deprecated', $this->visibility, true);
     }
 
     /**
@@ -714,7 +721,7 @@ public function isMixed(): bool
      */
     public function isPrivate(): bool
     {
-        return \in_array('private', $this->visibility);
+        return in_array('private', $this->visibility);
     }
 
     /**
@@ -722,7 +729,7 @@ public function isPrivate(): bool
      */
     public function isProtected(): bool
     {
-        return \in_array('protected', $this->visibility);
+        return in_array('protected', $this->visibility);
     }
 
     /**
@@ -855,7 +862,7 @@ public function removeMemoryStackReferences(SymbolTable $symbolTable, string $co
      * Assigns a default value.
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function assignDefaultValue(array $parameter, CompilationContext $compilationContext): string
     {
@@ -1215,7 +1222,7 @@ public function assignZvalValue(array $parameter, CompilationContext $compilatio
     {
         $dataType = $this->getParamDataType($parameter);
 
-        if (\in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
+        if (in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
             return '';
         }
 
@@ -1267,7 +1274,7 @@ public function preCompile(CompilationContext $compilationContext): void
         $typeInference = null;
         $callGathererPass = null;
 
-        if (\is_object($this->statements)) {
+        if (is_object($this->statements)) {
             $compilationContext->currentMethod = $this;
 
             /**
@@ -1311,7 +1318,7 @@ public function preCompile(CompilationContext $compilationContext): void
      * Compiles the method.
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -1446,12 +1453,12 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 if (!empty($parameter['const'])) {
                     $symbol->setReadOnly(true);
-                    if (\is_object($symbolParam)) {
+                    if (is_object($symbolParam)) {
                         $symbolParam->setReadOnly(true);
                     }
                 }
 
-                if (\is_object($symbolParam)) {
+                if (is_object($symbolParam)) {
                     /**
                      * Parameters are marked as 'external'
                      */
@@ -1521,7 +1528,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Compile the block of statements if any
          */
-        if (\is_object($this->statements)) {
+        if (is_object($this->statements)) {
             $compilationContext->staticContext = $this->hasModifier('static');
 
             /**
@@ -1560,7 +1567,7 @@ public function compile(CompilationContext $compilationContext): void
              * variable is modified so as do the proper separation.
              */
             $parametersToSeparate = [];
-            if (\is_object($this->statements)) {
+            if (is_object($this->statements)) {
                 if (!$this->localContext instanceof LocalContextPass) {
                     $writeDetector = new WriteDetector();
                 }
@@ -1778,7 +1785,7 @@ public function compile(CompilationContext $compilationContext): void
 
             if (!$variable->isUsed()) {
                 $node = $variable->getLastUsedNode();
-                if (\is_array($node)) {
+                if (is_array($node)) {
                     $expression = $node['expr'] ?? $node;
                     $compilationContext->logger->warning(
                         'Variable "'.$variable->getName().'" assigned but not used in '.$completeName.'::'.$this->getName(),
@@ -1793,7 +1800,7 @@ public function compile(CompilationContext $compilationContext): void
             }
         }
 
-        if (\count($usedVariables)) {
+        if (count($usedVariables)) {
             $codePrinter->preOutputBlankLine();
         }
 
@@ -1848,7 +1855,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Finalize the method compilation
          */
-        if (\is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
+        if (is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
             /**
              * If the last statement is not a 'return' or 'throw' we need to
              * restore the memory stack if needed.
@@ -1898,7 +1905,7 @@ public function compile(CompilationContext $compilationContext): void
      */
     public function hasChildReturnStatementType(array $statement): bool
     {
-        if (!isset($statement['statements']) || !\is_array($statement['statements'])) {
+        if (!isset($statement['statements']) || !is_array($statement['statements'])) {
             return false;
         }
 
@@ -1984,7 +1991,7 @@ public function isReturnTypesHintDetermined(): bool
             return true;
         }
 
-        if (0 === \count($this->returnTypes)) {
+        if (0 === count($this->returnTypes)) {
             return false;
         }
 
@@ -2004,7 +2011,7 @@ public function isReturnTypesHintDetermined(): bool
                     || $this->areReturnTypesStringCompatible()
                     || $this->areReturnTypesFalseCompatible()
                     || $this->areReturnTypesObjectCompatible()
-                    || \array_key_exists('array', $this->getReturnTypes())
+                    || array_key_exists('array', $this->getReturnTypes())
                 ) {
                     continue;
                 }
@@ -2026,7 +2033,7 @@ public function isReturnTypesHintDetermined(): bool
      */
     public function isReturnTypeNullableObject(): bool
     {
-        return \count($this->returnTypes) === 2
+        return count($this->returnTypes) === 2
                && isset($this->returnTypes['object'])
                && isset($this->returnTypes['null']);
     }
@@ -2036,7 +2043,7 @@ public function isReturnTypeNullableObject(): bool
      */
     public function isReturnTypeObject(): bool
     {
-        return \count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
+        return count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
     }
 
     /**
@@ -2049,12 +2056,12 @@ public function areReturnTypesCompatible(): bool
             return true;
         }
 
-        $totalTypes = \count($this->returnTypes);
+        $totalTypes = count($this->returnTypes);
 
         // union types
         if ($totalTypes > 1) {
             $diff = array_diff(array_keys($this->returnTypes), array_keys($this->mayBeArgTypes));
-            if (\count($diff) === 0) {
+            if (count($diff) === 0) {
                 return true;
             }
         }

From f37bfa696f91988db1f432dee281e45e3d21432a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 21:18:50 +0000
Subject: [PATCH 125/375] Update header

---
 prototypes/apache.php    | 2 +-
 prototypes/apc.php       | 6 +++---
 prototypes/fpm.php       | 6 +++---
 prototypes/gd.php        | 2 +-
 prototypes/iconv.php     | 6 +++---
 prototypes/igbinary.php  | 6 +++---
 prototypes/imagick.php   | 6 +++---
 prototypes/mcrypt.php    | 6 +++---
 prototypes/memcache.php  | 6 +++---
 prototypes/memcached.php | 6 +++---
 prototypes/mongo.php     | 2 +-
 prototypes/mongodb.php   | 2 +-
 prototypes/msgpack.php   | 6 +++---
 prototypes/phalcon.php   | 6 +++---
 prototypes/redis.php     | 2 +-
 prototypes/xcache.php    | 6 +++---
 prototypes/yaml.php      | 6 +++---
 17 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/prototypes/apache.php b/prototypes/apache.php
index 0ebdc52fd8..0cc5b90b54 100644
--- a/prototypes/apache.php
+++ b/prototypes/apache.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
diff --git a/prototypes/apc.php b/prototypes/apc.php
index b378522b47..71593b5234 100644
--- a/prototypes/apc.php
+++ b/prototypes/apc.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 if (!class_exists('APCIterator', false)) {
diff --git a/prototypes/fpm.php b/prototypes/fpm.php
index 14da00a719..55ea6ef1fd 100644
--- a/prototypes/fpm.php
+++ b/prototypes/fpm.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 if (function_exists('fastcgi_finish_request')) {
diff --git a/prototypes/gd.php b/prototypes/gd.php
index 0492995137..a23b531cb4 100644
--- a/prototypes/gd.php
+++ b/prototypes/gd.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
diff --git a/prototypes/iconv.php b/prototypes/iconv.php
index bf120f1638..8f472161b9 100644
--- a/prototypes/iconv.php
+++ b/prototypes/iconv.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 function iconv($in_charset, $out_charset, $str)
diff --git a/prototypes/igbinary.php b/prototypes/igbinary.php
index 25191d9b3d..2d401055ee 100644
--- a/prototypes/igbinary.php
+++ b/prototypes/igbinary.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 function igbinary_serialize($data)
diff --git a/prototypes/imagick.php b/prototypes/imagick.php
index 2f2507aa33..8ca7573c0d 100644
--- a/prototypes/imagick.php
+++ b/prototypes/imagick.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 class Imagick
diff --git a/prototypes/mcrypt.php b/prototypes/mcrypt.php
index 4b1a67fc4f..c8f973b65d 100644
--- a/prototypes/mcrypt.php
+++ b/prototypes/mcrypt.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 function mcrypt_list_algorithms()
diff --git a/prototypes/memcache.php b/prototypes/memcache.php
index ad0dae9ea9..ff110c767a 100644
--- a/prototypes/memcache.php
+++ b/prototypes/memcache.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 define('MEMCACHE_HAVE_SESSION', 1);
diff --git a/prototypes/memcached.php b/prototypes/memcached.php
index a46c5dbe9f..b0734977dc 100644
--- a/prototypes/memcached.php
+++ b/prototypes/memcached.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 class Memcached
diff --git a/prototypes/mongo.php b/prototypes/mongo.php
index 1420f26fb6..2722d7f840 100644
--- a/prototypes/mongo.php
+++ b/prototypes/mongo.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
diff --git a/prototypes/mongodb.php b/prototypes/mongodb.php
index d7d428be4f..e51725d179 100644
--- a/prototypes/mongodb.php
+++ b/prototypes/mongodb.php
@@ -2,7 +2,7 @@
 
 // @codingStandardsIgnoreStart
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
diff --git a/prototypes/msgpack.php b/prototypes/msgpack.php
index e6dcdd9326..97959bfa5e 100644
--- a/prototypes/msgpack.php
+++ b/prototypes/msgpack.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 define('MSGPACK_CLASS_OPT_PHPONLY', -1001);
diff --git a/prototypes/phalcon.php b/prototypes/phalcon.php
index edbd4daa0d..bf062afde4 100644
--- a/prototypes/phalcon.php
+++ b/prototypes/phalcon.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace Phalcon {
diff --git a/prototypes/redis.php b/prototypes/redis.php
index a9b1bf6fc4..1797fac189 100644
--- a/prototypes/redis.php
+++ b/prototypes/redis.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
diff --git a/prototypes/xcache.php b/prototypes/xcache.php
index db4dae4c37..7a09b2d4c3 100644
--- a/prototypes/xcache.php
+++ b/prototypes/xcache.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 function xcache_get($name)
diff --git a/prototypes/yaml.php b/prototypes/yaml.php
index b9fd1d95b9..bbb597f1bd 100644
--- a/prototypes/yaml.php
+++ b/prototypes/yaml.php
@@ -1,12 +1,12 @@
 <?php
 
-/*
+/**
  * This file is part of the Zephir.
  *
  * (c) Phalcon Team <team@zephir-lang.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 function yaml_parse_file($filename, $pos = 0, &$ndocs = 0, $callbacks = null)

From c5b2705cf588aa5dbdd84e40a110d54716f90bad Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:01:17 +0000
Subject: [PATCH 126/375] Remove dead code

---
 kernel/memory.h           | 6 ++----
 src/Variable/Variable.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 76407bb5ae..14897d1c0a 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -119,8 +119,6 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
 			zephir_ptr_dtor(d); \
 		} \
-	} else { \
-		/*TODO: as above */ \
 	} \
 	ZVAL_DUP(d, v);
 
@@ -133,8 +131,8 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 	}
 
 #define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
-		ZEPHIR_OBS_VAR_ONCE(z); \
-		ZVAL_COPY(z, v);
+	ZEPHIR_OBS_VAR_ONCE(z); \
+	ZVAL_COPY(z, v);
 
 #define ZEPHIR_HASH_COPY(z, v) \
 	if (Z_TYPE_P(z) == IS_ARRAY && Z_TYPE_P(v) == IS_ARRAY) { \
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index 8924fe6b71..bed4abdeb9 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -931,7 +931,7 @@ public function observeVariant(CompilationContext $compilationContext): void
                 $this->mustInitNull = true;
                 $compilationContext->codePrinter->output('ZEPHIR_OBS_NVAR('.$symbol.');');
             } else {
-                $compilationContext->codePrinter->output('ZEPHIR_OBS_VAR('.$symbol.');');
+                $compilationContext->codePrinter->output('zephir_memory_observe('.$symbol.');');
             }
 
             ++$this->variantInits;

From 56bd4fb2876ca94c56a0128599900e3e97beb112 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:01:42 +0000
Subject: [PATCH 127/375] Remove `ZEPHIR_OBS_VAR()` macro to use directly the
 function

---
 kernel/memory.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 14897d1c0a..762be8a03c 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -122,9 +122,6 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 	} \
 	ZVAL_DUP(d, v);
 
-#define ZEPHIR_OBS_VAR(z) \
-	zephir_memory_observe(z)
-
 #define ZEPHIR_OBS_VAR_ONCE(z) \
 	if (Z_TYPE_P(z) == IS_UNDEF) { \
 		zephir_memory_observe(z); \

From 2945eaf5c7752644385f650535f99a2eceeaed1a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:06:31 +0000
Subject: [PATCH 128/375] Remove redundant condition

---
 kernel/array.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/array.h b/kernel/array.h
index 11d19b6f77..1c98ca2cc0 100644
--- a/kernel/array.h
+++ b/kernel/array.h
@@ -9,8 +9,6 @@
  * following url: https://docs.zephir-lang.com/en/latest/license
  */
 
-#ifndef ZEPHIR_KERNEL_ARRAY_H
-#define ZEPHIR_KERNEL_ARRAY_H
 #define ZEPHIR_MAX_ARRAY_LEVELS 16
 
 #include <php.h>
@@ -73,5 +71,3 @@ int zephir_fast_in_array(zval *needle, zval *haystack);
 		Z_TRY_ADDREF_P(value); \
 		zend_hash_next_index_insert(Z_ARRVAL_P(arr), value); \
 	} while (0)
-
-#endif /* ZEPHIR_KERNEL_ARRAY_H */

From 6efbe35b52c5dd6976f598bcc2655e7ab9940242 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:26:41 +0000
Subject: [PATCH 129/375] Mass remove of `#if PHP_VERSION_ID >= 80000`
 condition

---
 kernel/exception.c                  | 11 -----
 kernel/fcall.c                      | 55 +++------------------
 kernel/fcall.h                      | 34 -------------
 kernel/main.c                       | 45 -----------------
 kernel/object.c                     | 34 -------------
 src/Class/Definition/Definition.php | 26 +---------
 src/Class/Method/Method.php         | 14 +++---
 src/Code/ArgInfoDefinition.php      | 76 +----------------------------
 8 files changed, 17 insertions(+), 278 deletions(-)

diff --git a/kernel/exception.c b/kernel/exception.c
index 6d0a50ba3c..2d81541f32 100644
--- a/kernel/exception.c
+++ b/kernel/exception.c
@@ -54,14 +54,8 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 		zephir_check_call_status();
 		if (ZEPHIR_IS_LONG(&curline, 0)) {
 			default_exception_ce = zend_exception_get_default();
-
-#if PHP_VERSION_ID >= 80000
 			zend_update_property_string(default_exception_ce, Z_OBJ_P(object), SL("file"), file);
 			zend_update_property_long(default_exception_ce, Z_OBJ_P(object), SL("line"), line);
-#else
-			zend_update_property_string(default_exception_ce, object, SL("file"), file);
-			zend_update_property_long(default_exception_ce, object, SL("line"), line);
-#endif
 		}
 	}
 
@@ -88,13 +82,8 @@ void zephir_throw_exception_string_debug(zend_class_entry *ce, const char *messa
 
 	if (line > 0) {
 		default_exception_ce = zend_exception_get_default();
-#if PHP_VERSION_ID >= 80000
 		zend_update_property_string(default_exception_ce, Z_OBJ(object), "file", sizeof("file")-1, file);
 		zend_update_property_long(default_exception_ce, Z_OBJ(object), "line", sizeof("line")-1, line);
-#else
-		zend_update_property_string(default_exception_ce, &object, "file", sizeof("file")-1, file);
-		zend_update_property_long(default_exception_ce, &object, "line", sizeof("line")-1, line);
-#endif
 	}
 
 	if (ZEPHIR_LAST_CALL_STATUS != FAILURE) {
diff --git a/kernel/fcall.c b/kernel/fcall.c
index d017ec4db3..e065629004 100644
--- a/kernel/fcall.c
+++ b/kernel/fcall.c
@@ -211,21 +211,12 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 	}
 
 	fcic->called_scope = called_scope;
-
-#if PHP_VERSION_ID >= 80000
 	calling_scope = zend_get_called_scope(EG(current_execute_data));
-#else
-	calling_scope = zend_get_executed_scope();
-#endif
-
 	fcic->object = this_ptr ? Z_OBJ_P(this_ptr) : NULL;
 	switch (type) {
 		case zephir_fcall_parent:
-
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->parent->function_table, Z_STR_P(func));
-
 				fcic->calling_scope = ce->parent;
 			} else if (EXPECTED(calling_scope && calling_scope->parent)) {
 				if (Z_TYPE_P(func) == IS_STRING) {
@@ -235,7 +226,7 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 			} else {
 				return;
 			}
-#endif
+
 			if (UNEXPECTED(!calling_scope || !calling_scope->parent)) {
 				return;
 			}
@@ -244,7 +235,6 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 			break;
 
 		case zephir_fcall_static:
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 				fcic->calling_scope = ce;
@@ -252,17 +242,10 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				fcic->function_handler = zend_hash_find_ptr(&calling_scope->function_table, Z_STR_P(func));
 				fcic->calling_scope = called_scope;
 			}
-#else
-			fcic->calling_scope = called_scope;
-			if (UNEXPECTED(!calling_scope)) {
-				return;
-			}
-#endif
 
 			break;
 
 		case zephir_fcall_self:
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 				fcic->calling_scope = ce;
@@ -273,13 +256,9 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				//fcic->called_scope = zend_get_called_scope(EG(current_execute_data));
 				fcic->calling_scope = calling_scope;
 			}
-#else
-			fcic->calling_scope = calling_scope;
-#endif
 			break;
 
 		case zephir_fcall_ce:
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 
@@ -288,7 +267,6 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				fcic->function_handler = zend_hash_find_ptr(&calling_scope->function_table, Z_STR_P(func));
 				fcic->calling_scope = calling_scope;
 			}
-#endif
 			// TODO: Check for PHP 7.4 and PHP 8.0, as it rewrite from above
 			fcic->calling_scope = ce;
 			fcic->called_scope  = ce;
@@ -297,11 +275,7 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 		case zephir_fcall_function:
 		case zephir_fcall_method:
 			if (Z_TYPE_P(func) == IS_OBJECT) {
-#if PHP_VERSION_ID >= 80000
 				if (Z_OBJ_HANDLER_P(func, get_closure) && Z_OBJ_HANDLER_P(func, get_closure)(Z_OBJ_P(func), &fcic->calling_scope, &fcic->function_handler, &fcic->object, 0) == SUCCESS) {
-#else
-				if (Z_OBJ_HANDLER_P(func, get_closure) && Z_OBJ_HANDLER_P(func, get_closure)(func, &fcic->calling_scope, &fcic->function_handler, &fcic->object) == SUCCESS) {
-#endif
 					fcic->called_scope = fcic->calling_scope;
 					break;
 				}
@@ -309,11 +283,9 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				return;
 			}
 
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 			}
-#endif
 			fcic->calling_scope = this_ptr ? Z_OBJCE_P(this_ptr) : NULL;
 			fcic->called_scope  = fcic->calling_scope;
 			break;
@@ -402,22 +374,18 @@ int zephir_call_user_function(
 		/* The caller is interested in caching OR we have the call cache enabled */
 		resolve_callable(&callable, type, (object_pp && type != zephir_fcall_ce ? Z_OBJCE_P(object_pp) : obj_ce), object_pp, function_name);
 
-#if PHP_VERSION_ID >= 80000
-        char *is_callable_error = NULL;
-        zend_execute_data *frame = EG(current_execute_data);
+		char *is_callable_error = NULL;
+		zend_execute_data *frame = EG(current_execute_data);
 		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
-            if (is_callable_error) {
-                zend_error(E_WARNING, "%s", is_callable_error);
-                efree(is_callable_error);
+			if (is_callable_error) {
+				zend_error(E_WARNING, "%s", is_callable_error);
+				efree(is_callable_error);
 
-                return FAILURE;
-            }
+				return FAILURE;
+			}
 
 			populate_fcic(&fcic, type, obj_ce, object_pp, function_name, called_scope);
 		}
-#else
-		zend_is_callable_ex(&callable, fci.object, IS_CALLABLE_CHECK_SILENT, NULL, &fcic, NULL);
-#endif
 	}
 
 #ifdef _MSC_VER
@@ -432,12 +400,9 @@ int zephir_call_user_function(
 	}
 
 	fci.params = p;
-
-#if PHP_VERSION_ID >= 80000
 	if (!fcic.function_handler) {
 		ZVAL_COPY_VALUE(&fci.function_name, &callable);
 	}
-#endif
 
 	status = zend_call_function(&fci, &fcic);
 
@@ -696,11 +661,7 @@ void zephir_eval_php(zval *str, zval *retval_ptr, char *context)
 #if PHP_VERSION_ID >= 80200
 	new_op_array = zend_compile_string(Z_STR_P(str), context, ZEND_COMPILE_POSITION_AFTER_OPEN_TAG);
 #else
-#if PHP_VERSION_ID >= 80000
 	new_op_array = zend_compile_string(Z_STR_P(str), context);
-#else
-	new_op_array = zend_compile_string(str, context);
-#endif
 #endif
 
 	CG(compiler_options) = original_compiler_options;
diff --git a/kernel/fcall.h b/kernel/fcall.h
index 2581360756..4754bf4626 100644
--- a/kernel/fcall.h
+++ b/kernel/fcall.h
@@ -167,19 +167,11 @@ typedef enum _zephir_call_type {
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, Z_TYPE_P(object) == IS_OBJECT ? Z_OBJCE_P(object) : NULL, zephir_fcall_method, object, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_RETURN_CALL_STATIC(method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_static, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_RETURN_CALL_STATIC(method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, NULL, zephir_fcall_static, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
 #define ZEPHIR_RETURN_CALL_PARENT(class_entry, this_ptr, method, cache, cache_slot, ...) \
 	do { \
@@ -187,51 +179,25 @@ typedef enum _zephir_call_type {
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, class_entry, zephir_fcall_parent, this_ptr, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_CALL_SELF(return_value_ptr, method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
 		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_self, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_CALL_SELF(return_value_ptr, method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
-		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, NULL, zephir_fcall_self, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_RETURN_CALL_SELF(method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_self, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_RETURN_CALL_SELF(method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, NULL, zephir_fcall_self, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_CALL_STATIC(return_value_ptr, method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
 		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_static, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_CALL_STATIC(return_value_ptr, method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
-		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, NULL, zephir_fcall_static, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
 #define ZEPHIR_CALL_CE_STATIC(return_value_ptr, class_entry, method, cache, cache_slot, ...) \
 	do { \
diff --git a/kernel/main.c b/kernel/main.c
index f8c90b7cbc..8aeedda44e 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -137,26 +137,17 @@ void zephir_fast_count(zval *result, zval *value)
 	}
 
 	if (Z_TYPE_P(value) == IS_OBJECT) {
-
 		zval retval;
 
 		if (Z_OBJ_HT_P(value)->count_elements) {
 			ZVAL_LONG(result, 1);
-#if PHP_VERSION_ID >= 80000
 			if (SUCCESS == Z_OBJ_HT(*value)->count_elements(Z_OBJ_P(value), &Z_LVAL_P(result))) {
-#else
-			if (SUCCESS == Z_OBJ_HT(*value)->count_elements(value, &Z_LVAL_P(result))) {
-#endif
 				return;
 			}
 		}
 
 		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
-#if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
-#else
-			zend_call_method_with_0_params(value, NULL, NULL, "count", &retval);
-#endif
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				convert_to_long_ex(&retval);
 				ZVAL_LONG(result, Z_LVAL(retval));
@@ -189,24 +180,15 @@ int zephir_fast_count_ev(zval *value)
 	}
 
 	if (Z_TYPE_P(value) == IS_OBJECT) {
-
 		zval retval;
 
 		if (Z_OBJ_HT_P(value)->count_elements) {
-#if PHP_VERSION_ID >= 80000
 			Z_OBJ_HT(*value)->count_elements(Z_OBJ_P(value), &count);
-#else
-			Z_OBJ_HT(*value)->count_elements(value, &count);
-#endif
 			return (int) count > 0;
 		}
 
 		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
-#if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
-#else
-			zend_call_method_with_0_params(value, NULL, NULL, "count", &retval);
-#endif
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				convert_to_long_ex(&retval);
 				count = Z_LVAL(retval);
@@ -241,20 +223,12 @@ int zephir_fast_count_int(zval *value)
 		zval retval;
 
 		if (Z_OBJ_HT_P(value)->count_elements) {
-#if PHP_VERSION_ID >= 80000
 			Z_OBJ_HT(*value)->count_elements(Z_OBJ_P(value), &count);
-#else
-			Z_OBJ_HT(*value)->count_elements(value, &count);
-#endif
 			return (int) count;
 		}
 
 		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
-#if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
-#else
-			zend_call_method_with_0_params(value, NULL, NULL, "count", &retval);
-#endif
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				convert_to_long_ex(&retval);
 				count = Z_LVAL(retval);
@@ -406,7 +380,6 @@ zend_class_entry* zephir_get_internal_ce(const char *class_name, unsigned int cl
 /* Declare constants */
 int zephir_declare_class_constant(zend_class_entry *ce, const char *name, size_t name_length, zval *value)
 {
-#if PHP_VERSION_ID >= 80000
 	zend_string *key;
 
 	if (ce->type == ZEND_INTERNAL_CLASS) {
@@ -422,24 +395,6 @@ int zephir_declare_class_constant(zend_class_entry *ce, const char *name, size_t
 	}
 
 	return SUCCESS;
-#else
-	int ret;
-	zend_string *key;
-
-	if (ce->type == ZEND_INTERNAL_CLASS) {
-		key = zend_string_init_interned(name, name_length, 1);
-	} else {
-		key = zend_string_init(name, name_length, 0);
-	}
-
-	ret = zend_declare_class_constant_ex(ce, key, value, ZEND_ACC_PUBLIC, NULL);
-
-	if (ce->type != ZEND_INTERNAL_CLASS) {
-		zend_string_release(key);
-	}
-
-	return ret;
-#endif
 }
 
 int zephir_declare_class_constant_null(zend_class_entry *ce, const char *name, size_t name_length)
diff --git a/kernel/object.c b/kernel/object.c
index 3fb2e006c6..d461e45c19 100644
--- a/kernel/object.c
+++ b/kernel/object.c
@@ -338,11 +338,7 @@ int zephir_clone(zval *destination, zval *obj)
 			status = FAILURE;
 		} else {
 			if (!EG(exception)) {
-#if PHP_VERSION_ID >= 80000
 				ZVAL_OBJ(destination, clone_call(Z_OBJ_P(obj)));
-#else
-				ZVAL_OBJ(destination, clone_call(obj));
-#endif
 				if (EG(exception)) {
 					zval_ptr_dtor(destination);
 				}
@@ -363,19 +359,11 @@ int zephir_isset_property(zval *object, const char *property_name, unsigned int
 			return 1;
 		}
 
-#if PHP_VERSION_ID >= 80000
 		return zend_hash_str_exists(
 			Z_OBJ_HT_P(object)->get_properties(Z_OBJ_P(object)),
 			property_name,
 			property_length
 		);
-#else
-		return zend_hash_str_exists(
-			Z_OBJ_HT_P(object)->get_properties(object),
-			property_name,
-			property_length
-		);
-#endif
 	}
 
 	return 0;
@@ -391,19 +379,11 @@ int zephir_isset_property_zval(zval *object, const zval *property)
 			if (EXPECTED(zend_hash_str_exists(&Z_OBJCE_P(object)->properties_info, Z_STRVAL_P(property), Z_STRLEN_P(property)))) {
 				return 1;
 			} else {
-#if PHP_VERSION_ID >= 80000
 				return zend_hash_str_exists(
 					Z_OBJ_HT_P(object)->get_properties(Z_OBJ_P(object)),
 					Z_STRVAL_P(property),
 					Z_STRLEN_P(property)
 				);
-#else
-				return zend_hash_str_exists(
-					Z_OBJ_HT_P(object)->get_properties(object),
-					Z_STRVAL_P(property),
-					Z_STRLEN_P(property)
-				);
-#endif
 			}
 		}
 	}
@@ -523,15 +503,9 @@ int zephir_read_property(
 	}
 
 	ZVAL_STRINGL(&property, property_name, property_length);
-#if PHP_VERSION_ID >= 80000
 	res = Z_OBJ_HT_P(object)->read_property(Z_OBJ_P(object), Z_STR(property),
 											flags ? BP_VAR_IS : BP_VAR_R,
 											NULL, &tmp);
-#else
-	res = Z_OBJ_HT_P(object)->read_property(object, &property,
-											flags ? BP_VAR_IS : BP_VAR_R,
-											NULL, &tmp);
-#endif
 
 	if ((flags & PH_READONLY) == PH_READONLY) {
 		ZVAL_COPY_VALUE(result, res);
@@ -674,11 +648,7 @@ int zephir_update_property_zval(
 
 	/* write_property will add 1 to refcount,
 	   so no Z_TRY_ADDREF_P(value) is necessary */
-#if PHP_VERSION_ID >= 80000
 	Z_OBJ_HT_P(object)->write_property(Z_OBJ_P(object), Z_STR(property), &sep_value, 0);
-#else
-	Z_OBJ_HT_P(object)->write_property(object, &property, &sep_value, 0);
-#endif
 
 	zval_ptr_dtor(&property);
 
@@ -943,11 +913,7 @@ int zephir_unset_property(zval* object, const char* name)
 
 	/* Use caller's scope */
 	zephir_set_scope(Z_OBJCE_P(object));
-#if PHP_VERSION_ID >= 80000
 	Z_OBJ_HT_P(object)->unset_property(Z_OBJ_P(object), Z_STR(member), 0);
-#else
-	Z_OBJ_HT_P(object)->unset_property(object, &member, 0);
-#endif
 	/* Restore original scope */
 	zephir_set_scope(scope);
 
diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 5fb1eb30b3..4834b4c7b5 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -1147,11 +1147,10 @@ public function compile(CompilationContext $compilationContext): void
                                 )
                             );
                         } else {
-                            $codePrinter->output('#if PHP_VERSION_ID >= 80000');
                             $codePrinter->output(
                                 sprintf(
                                     // TODO: Rename to ZEND_ME
-                                    "\tPHP_ME(%s_%s, %s, %s, %s)",
+                                    "PHP_ME(%s_%s, %s, %s, %s)",
                                     $this->getCNamespace(),
                                     $this->getName(),
                                     $method->getName(),
@@ -1159,18 +1158,6 @@ public function compile(CompilationContext $compilationContext): void
                                     $method->getModifiers()
                                 )
                             );
-                            $codePrinter->output('#else');
-                            $codePrinter->output(
-                                sprintf(
-                                    // TODO: Rename to ZEND_ME
-                                    "\tPHP_ME(%s_%s, %s, NULL, %s)",
-                                    $this->getCNamespace(),
-                                    $this->getName(),
-                                    $method->getName(),
-                                    $method->getModifiers()
-                                )
-                            );
-                            $codePrinter->output('#endif');
                         }
                     }
                 } else {
@@ -1186,22 +1173,13 @@ public function compile(CompilationContext $compilationContext): void
                                 )
                             );
                         } else {
-                            $codePrinter->output('#if PHP_VERSION_ID >= 80000');
                             $codePrinter->output(
                                 sprintf(
-                                    "\tZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)",
+                                    "ZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)",
                                     $method->getName(),
                                     $method->getArgInfoName($this)
                                 )
                             );
-                            $codePrinter->output('#else');
-                            $codePrinter->output(
-                                sprintf(
-                                    "\tZEND_FENTRY(%s, NULL, NULL, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)",
-                                    $method->getName()
-                                )
-                            );
-                            $codePrinter->output('#endif');
                         }
                     } else {
                         $isInterface = $method->getClassDefinition()->isInterface();
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 605a40b415..f731ef54cd 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1809,29 +1809,27 @@ public function compile(CompilationContext $compilationContext): void
          */
         $tempCodePrinter = new Printer();
         if ($this->parameters instanceof Parameters && $this->parameters->count() > 0) {
-            $tempCodePrinter->output('#if PHP_VERSION_ID >= 80000');
-            $tempCodePrinter->output("\t".'bool is_null_true = 1;');
+            $tempCodePrinter->output('bool is_null_true = 1;');
 
             $tempCodePrinter->output(sprintf(
-                "\t".'ZEND_PARSE_PARAMETERS_START(%d, %d)',
+                'ZEND_PARSE_PARAMETERS_START(%d, %d)',
                 $this->parameters->countRequiredParameters(),
                 $this->parameters->count()
             ));
 
             foreach ($requiredParams as $requiredParam) {
-                $tempCodePrinter->output("\t\t".$this->detectParam($requiredParam, $compilationContext));
+                $tempCodePrinter->output("\t".$this->detectParam($requiredParam, $compilationContext));
             }
 
             if (!empty($optionalParams)) {
-                $tempCodePrinter->output("\t\t".'Z_PARAM_OPTIONAL');
+                $tempCodePrinter->output("\t".'Z_PARAM_OPTIONAL');
 
                 foreach ($optionalParams as $optionalParam) {
-                    $tempCodePrinter->output("\t\t".$this->detectParam($optionalParam, $compilationContext));
+                    $tempCodePrinter->output("\t".$this->detectParam($optionalParam, $compilationContext));
                 }
             }
 
-            $tempCodePrinter->output("\t".'ZEND_PARSE_PARAMETERS_END();');
-            $tempCodePrinter->output('#endif');
+            $tempCodePrinter->output('ZEND_PARSE_PARAMETERS_END();');
         }
 
         $codePrinter->preOutput($tempCodePrinter->getOutput());
diff --git a/src/Code/ArgInfoDefinition.php b/src/Code/ArgInfoDefinition.php
index 029bc97791..b93ca5d439 100644
--- a/src/Code/ArgInfoDefinition.php
+++ b/src/Code/ArgInfoDefinition.php
@@ -81,7 +81,6 @@ public function render(): void
             );
         } else {
             if ($this->functionLike->getName() === '__toString') {
-                $this->codePrinter->output('#if PHP_VERSION_ID >= 80000');
                 $this->codePrinter->output(
                     sprintf(
                         'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, IS_STRING, %d)',
@@ -91,17 +90,6 @@ public function render(): void
                         (int) $this->functionLike->areReturnTypesNullCompatible()
                     )
                 );
-
-                $this->codePrinter->output('#else');
-                $this->codePrinter->output(
-                    sprintf(
-                        'ZEND_BEGIN_ARG_INFO_EX(%s, 0, %d, %d)',
-                        $this->name,
-                        (int) $this->returnByRef,
-                        $this->functionLike->getNumberOfRequiredParameters()
-                    )
-                );
-                $this->codePrinter->output('#endif');
             } else {
                 $this->codePrinter->output(
                     sprintf('ZEND_BEGIN_ARG_INFO_EX(%s, 0, 0, 0)', $this->name)
@@ -162,7 +150,6 @@ private function richRenderStart(): void
         }
 
         if ($this->functionLike->isMixed()) {
-            $this->codePrinter->output('#if PHP_VERSION_ID >= 80000');
             $this->codePrinter->output(
                 sprintf(
                     'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, IS_MIXED, %d)',
@@ -172,22 +159,11 @@ private function richRenderStart(): void
                     (int) $this->functionLike->areReturnTypesNullCompatible()
                 )
             );
-            $this->codePrinter->output('#else');
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_INFO_EX(%s, 0, %d, %d)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                )
-            );
-            $this->codePrinter->output('#endif');
 
             return;
         }
 
         if ($this->functionLike->isReturnTypeNullableObject()) {
-            $this->codePrinter->output('#if PHP_VERSION_ID >= 80000');
             $this->codePrinter->output(
                 sprintf(
                     'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
@@ -197,24 +173,11 @@ private function richRenderStart(): void
                     'MAY_BE_NULL|MAY_BE_OBJECT',
                 )
             );
-            $this->codePrinter->output('#else');
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                    'IS_OBJECT',
-                    1,
-                )
-            );
-            $this->codePrinter->output('#endif');
 
             return;
         }
 
         if ($this->functionLike->isReturnTypeObject()) {
-            $this->codePrinter->output('#if PHP_VERSION_ID >= 80000');
             $this->codePrinter->output(
                 sprintf(
                     'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
@@ -224,18 +187,6 @@ private function richRenderStart(): void
                     'MAY_BE_OBJECT',
                 )
             );
-            $this->codePrinter->output('#else');
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                    'IS_OBJECT',
-                    0,
-                )
-            );
-            $this->codePrinter->output('#endif');
 
             return;
         }
@@ -252,7 +203,6 @@ private function richRenderStart(): void
             }
 
             if (\count($types) > 1) {
-                $this->codePrinter->output('#if PHP_VERSION_ID >= 80000');
                 $this->codePrinter->output(
                     sprintf(
                         'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
@@ -262,18 +212,6 @@ private function richRenderStart(): void
                         implode('|', $types)
                     )
                 );
-                $this->codePrinter->output('#else');
-                $this->codePrinter->output(
-                    sprintf(
-                        'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
-                        $this->name,
-                        (int) $this->returnByRef,
-                        $this->functionLike->getNumberOfRequiredParameters(),
-                        $this->getReturnType(),
-                        (int) $this->functionLike->areReturnTypesNullCompatible()
-                    )
-                );
-                $this->codePrinter->output('#endif');
 
                 return;
             }
@@ -309,27 +247,15 @@ private function renderEnd(): void
                             )
                         );
                     } else {
-                        $this->codePrinter->output('#if PHP_VERSION_ID >= 80000');
                         $this->codePrinter->output(
                             sprintf(
-                                "\tZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(%d, %s, IS_ARRAY, %d, %s)",
+                                "ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(%d, %s, IS_ARRAY, %d, %s)",
                                 $this->passByReference($parameter),
                                 $parameter['name'],
                                 (int) $this->allowNull($parameter),
                                 $this->defaultArrayValue($parameter),
                             )
                         );
-                        $this->codePrinter->output('#else');
-                        // `ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE` does not exist in PHP 7.4
-                        $this->codePrinter->output(
-                            sprintf(
-                                "\tZEND_ARG_ARRAY_INFO(%d, %s, %d)",
-                                $this->passByReference($parameter),
-                                $parameter['name'],
-                                (int) $this->allowNull($parameter)
-                            )
-                        );
-                        $this->codePrinter->output('#endif');
                     }
                     break;
                 case '0:variable':

From 5d00a3aaa6158dd5ba7171f6c319c77f75acc5a8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:27:27 +0000
Subject: [PATCH 130/375] Add extra tab

---
 src/Class/Method/Method.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index f731ef54cd..15a24989e0 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1809,27 +1809,27 @@ public function compile(CompilationContext $compilationContext): void
          */
         $tempCodePrinter = new Printer();
         if ($this->parameters instanceof Parameters && $this->parameters->count() > 0) {
-            $tempCodePrinter->output('bool is_null_true = 1;');
+            $tempCodePrinter->output("\t".'bool is_null_true = 1;');
 
             $tempCodePrinter->output(sprintf(
-                'ZEND_PARSE_PARAMETERS_START(%d, %d)',
+                "\t".'ZEND_PARSE_PARAMETERS_START(%d, %d)',
                 $this->parameters->countRequiredParameters(),
                 $this->parameters->count()
             ));
 
             foreach ($requiredParams as $requiredParam) {
-                $tempCodePrinter->output("\t".$this->detectParam($requiredParam, $compilationContext));
+                $tempCodePrinter->output("\t\t".$this->detectParam($requiredParam, $compilationContext));
             }
 
             if (!empty($optionalParams)) {
-                $tempCodePrinter->output("\t".'Z_PARAM_OPTIONAL');
+                $tempCodePrinter->output("\t\t".'Z_PARAM_OPTIONAL');
 
                 foreach ($optionalParams as $optionalParam) {
-                    $tempCodePrinter->output("\t".$this->detectParam($optionalParam, $compilationContext));
+                    $tempCodePrinter->output("\t\t".$this->detectParam($optionalParam, $compilationContext));
                 }
             }
 
-            $tempCodePrinter->output('ZEND_PARSE_PARAMETERS_END();');
+            $tempCodePrinter->output("\t".'ZEND_PARSE_PARAMETERS_END();');
         }
 
         $codePrinter->preOutput($tempCodePrinter->getOutput());

From 4401690c14231fcbab67108ab53e190cb320f803 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:34:21 +0000
Subject: [PATCH 131/375] Mass remove `#if PHP_VERSION_ID < 80000` condition

---
 kernel/fcall.c  | 29 -----------------------------
 kernel/object.c | 13 +++----------
 kernel/string.c |  5 +----
 3 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/kernel/fcall.c b/kernel/fcall.c
index e065629004..cfcc025bed 100644
--- a/kernel/fcall.c
+++ b/kernel/fcall.c
@@ -355,12 +355,7 @@ int zephir_call_user_function(
 	ZVAL_COPY_VALUE(&fci.function_name, function_name);
 	fci.retval      = retval_ptr ? retval_ptr : &local_retval_ptr;
 	fci.param_count = param_count;
-
-#if PHP_VERSION_ID < 80000
-	fci.no_separation = 1;
-#else
 	fci.named_params = NULL;
-#endif
 
 	if (cache_entry && *cache_entry) {
 		/* We have a cache record, initialize scope */
@@ -595,29 +590,6 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 		return FAILURE;
 	}
 
-#if PHP_VERSION_ID < 80000
-	zend_fcall_info_init(handler, 0, &fci, &fci_cache, NULL, &is_callable_error);
-
-	if (is_callable_error) {
-		zend_error(E_WARNING, "%s", is_callable_error);
-		efree(is_callable_error);
-	} else {
-		status = SUCCESS;
-	}
-
-	if (status == SUCCESS) {
-		zend_fcall_info_args(&fci, params);
-
-		fci.retval = return_value;
-		zend_call_function(&fci, &fci_cache);
-
-		zend_fcall_info_args_clear(&fci, 1);
-	}
-
-	if (EG(exception)) {
-		status = SUCCESS;
-	}
-#else
 	zend_execute_data *frame = EG(current_execute_data);
 	if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
 		if (is_callable_error) {
@@ -639,7 +611,6 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 	zend_fcall_info_args(&fci, params);
 	status = zend_call_function(&fci, &fci_cache);
 	zend_fcall_info_args_clear(&fci, 1);
-#endif
 
 	return status;
 }
diff --git a/kernel/object.c b/kernel/object.c
index d461e45c19..62b03d79c7 100644
--- a/kernel/object.c
+++ b/kernel/object.c
@@ -1262,11 +1262,7 @@ int zephir_create_instance(zval *return_value, const zval *class_name)
 			fci.retval           = 0;
 			fci.param_count      = 0;
 			fci.params           = 0;
-#if PHP_VERSION_ID < 80000
-			fci.no_separation = 1;
-#else
-			fci.named_params = NULL;
-#endif
+			fci.named_params 	 = NULL;
 
 			ZVAL_NULL(&fci.function_name);
 
@@ -1324,11 +1320,8 @@ int zephir_create_instance_params(zval *return_value, const zval *class_name, zv
 			fci.retval           = 0;
 			fci.param_count      = 0;
 			fci.params           = 0;
-#if PHP_VERSION_ID < 80000
-			fci.no_separation = 1;
-#else
-			fci.named_params = NULL;
-#endif
+			fci.named_params 	 = NULL;
+
 			ZVAL_NULL(&fci.function_name);
 
 			fcc.object           = obj;
diff --git a/kernel/string.c b/kernel/string.c
index dd5ba9d432..96a49a4254 100644
--- a/kernel/string.c
+++ b/kernel/string.c
@@ -461,11 +461,8 @@ void zephir_fast_join(zval *result, zval *glue, zval *pieces)
 		zend_error(E_WARNING, "Invalid arguments supplied for join()");
 		return;
 	}
-#if PHP_VERSION_ID < 80000
-	php_implode(Z_STR_P(glue), pieces, result);
-#else
+
 	php_implode(Z_STR_P(glue), Z_ARRVAL_P(pieces), result);
-#endif
 }
 
 /**

From 121e79377d071b469d5bb0c52ec4d67b4b7afa52 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:43:58 +0000
Subject: [PATCH 132/375] Implement `Parameters:hasNullableParameters()` method

---
 src/Class/Method/Method.php     |  5 ++++-
 src/Class/Method/Parameters.php | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 15a24989e0..87c4aef02c 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1809,7 +1809,10 @@ public function compile(CompilationContext $compilationContext): void
          */
         $tempCodePrinter = new Printer();
         if ($this->parameters instanceof Parameters && $this->parameters->count() > 0) {
-            $tempCodePrinter->output("\t".'bool is_null_true = 1;');
+            // Do not declare variable when it is not needed.
+            if ($this->parameters->hasNullableParameters()) {
+                $tempCodePrinter->output("\t".'bool is_null_true = 1;');
+            }
 
             $tempCodePrinter->output(sprintf(
                 "\t".'ZEND_PARSE_PARAMETERS_START(%d, %d)',
diff --git a/src/Class/Method/Parameters.php b/src/Class/Method/Parameters.php
index 16b24a8037..9263a02313 100644
--- a/src/Class/Method/Parameters.php
+++ b/src/Class/Method/Parameters.php
@@ -76,6 +76,17 @@ public function countOptionalParameters(): int
         return \count($this->optionalParameters);
     }
 
+    public function hasNullableParameters(): bool
+    {
+        foreach ($this->optionalParameters as $parameter) {
+            if (isset($parameter['default']['type']) && $parameter['default']['type'] === 'null') {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public function fetchParameters(bool $isMethodInternal): array
     {
         $parameters = [];

From d94c82234b1d8afe225759020b8f7984a737ce33 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 20 Nov 2023 22:46:07 +0000
Subject: [PATCH 133/375] Regenerate ext/ directory

---
 ext/kernel/array.h                            |   4 -
 ext/kernel/exception.c                        |  11 -
 ext/kernel/fcall.c                            |  84 +-
 ext/kernel/fcall.h                            |  34 -
 ext/kernel/main.c                             |  47 +-
 ext/kernel/memory.h                           |   9 +-
 ext/kernel/object.c                           |  47 +-
 ext/kernel/string.c                           |   5 +-
 ext/stub/0__closure.zep.c                     |   3 -
 ext/stub/10__closure.zep.c                    |   3 -
 ext/stub/11__closure.zep.c                    |   3 -
 ext/stub/12__closure.zep.h                    |   6 +-
 ext/stub/13__closure.zep.h                    |   6 +-
 ext/stub/1__closure.zep.h                     |   6 +-
 ext/stub/2__closure.zep.h                     |   6 +-
 ext/stub/3__closure.zep.c                     |   3 -
 ext/stub/4__closure.zep.c                     |   3 -
 ext/stub/5__closure.zep.c                     |   3 -
 ext/stub/6__closure.zep.c                     |   3 -
 ext/stub/7__closure.zep.c                     |   3 -
 ext/stub/8__closure.zep.h                     |   6 +-
 ext/stub/9__closure.zep.h                     |   6 +-
 ext/stub/arithmetic.zep.c                     |  36 -
 ext/stub/arithmetic.zep.h                     | 918 +++---------------
 ext/stub/arrayaccessarr.zep.c                 |  12 -
 ext/stub/arrayaccessarr.zep.h                 |  10 +-
 ext/stub/arrayaccessobj.zep.c                 |  20 +-
 ext/stub/arrayaccessobj.zep.h                 |  10 +-
 ext/stub/arrayaccesstest.zep.c                |  20 +-
 ext/stub/arrayaccesstest.zep.h                |  30 +-
 ext/stub/arrayiterator.zep.c                  |   2 +-
 ext/stub/arrayiterator.zep.h                  |  14 +-
 ext/stub/arrayiteratortest.zep.h              |   6 +-
 ext/stub/arraysearch.zep.c                    |   3 -
 ext/stub/arraysearch.zep.h                    |   6 +-
 ext/stub/assign.zep.c                         |  68 +-
 ext/stub/assign.zep.h                         | 210 +---
 ext/stub/bench/foo.zep.c                      |  48 -
 ext/stub/bench/foo.zep.h                      |   6 +-
 ext/stub/bitwise.zep.c                        |   9 -
 ext/stub/bitwise.zep.h                        | 576 ++---------
 ext/stub/branchprediction.zep.c               |   6 -
 ext/stub/branchprediction.zep.h               |  12 +-
 ext/stub/builtin/arraymethods.zep.h           |  18 +-
 ext/stub/builtin/charmethods.zep.c            |   3 -
 ext/stub/builtin/charmethods.zep.h            |   6 +-
 ext/stub/builtin/intmethods.zep.c             |  42 -
 ext/stub/builtin/intmethods.zep.h             |   6 +-
 ext/stub/builtin/stringmethods.zep.c          |  76 --
 ext/stub/builtin/stringmethods.zep.h          |  24 +-
 ext/stub/cast.zep.c                           |   6 -
 ext/stub/cast.zep.h                           |  54 +-
 ext/stub/cblock.zep.h                         |  12 +-
 ext/stub/chars.zep.c                          |   6 -
 ext/stub/closures.zep.c                       |   9 -
 ext/stub/closures.zep.h                       |  60 +-
 ext/stub/compare.zep.c                        |  24 -
 ext/stub/compare.zep.h                        |  18 +-
 ext/stub/concat.zep.c                         |   9 -
 ext/stub/constants.zep.h                      | 150 +--
 ext/stub/constantsinterface.zep.h             |  72 +-
 ext/stub/constantsinterfacea.zep.h            |  36 +-
 ext/stub/constantsinterfaceb.zep.h            |  36 +-
 ext/stub/constructors/issue1803.zep.h         |   6 +-
 ext/stub/declaretest.zep.h                    | 108 +--
 ext/stub/echoes.zep.h                         |  30 +-
 ext/stub/emptytest.zep.c                      |   3 -
 ext/stub/emptytest.zep.h                      |  24 +-
 ext/stub/evaltest.zep.c                       |   3 -
 ext/stub/exception.zep.c                      |   3 -
 ext/stub/exceptions.zep.c                     |  16 +-
 ext/stub/exceptions.zep.h                     |  60 +-
 ext/stub/exists.zep.c                         |  12 -
 ext/stub/exitdie.zep.c                        |   4 -
 ext/stub/factorial.zep.c                      |   6 -
 ext/stub/fannkuch.zep.c                       |   3 -
 ext/stub/fasta.zep.c                          |   6 -
 ext/stub/fasta.zep.h                          |   6 +-
 ext/stub/fcall.zep.c                          |  35 -
 ext/stub/fcall.zep.h                          |  24 +-
 ext/stub/fetchtest.zep.c                      |  48 +-
 ext/stub/fetchtest.zep.h                      |   6 +-
 ext/stub/fibonnaci.zep.c                      |   6 -
 ext/stub/fibonnaci.zep.h                      |  24 +-
 ext/stub/flow.zep.c                           |  35 -
 ext/stub/flow.zep.h                           | 384 ++------
 ext/stub/flow/switchflow.zep.c                |   9 -
 ext/stub/flow/switchflow.zep.h                |   6 +-
 ext/stub/functional.zep.c                     |   6 -
 ext/stub/functionexists.zep.c                 |   3 -
 ext/stub/geometry.zep.c                       |   9 -
 ext/stub/globals.zep.c                        |  21 -
 ext/stub/globals.zep.h                        |  60 +-
 ext/stub/globals/env.zep.c                    |   3 -
 ext/stub/globals/post.zep.c                   |   3 -
 ext/stub/globals/server.zep.h                 |   6 +-
 ext/stub/globals/serverrequestfactory.zep.c   |   5 -
 ext/stub/globals/serverrequestfactory.zep.h   |  30 +-
 ext/stub/globals/session/base.zep.c           |  12 -
 ext/stub/globals/session/base.zep.h           |   6 +-
 ext/stub/globals/session/child.zep.h          |   6 +-
 ext/stub/instance.zep.c                       |   6 -
 ext/stub/instanceoff.zep.c                    |  15 -
 ext/stub/interfaces/implementint.zep.c        |   3 -
 ext/stub/interfaces/implementinterface.zep.c  |   6 -
 .../interfaces/interfacestaticmethod.zep.h    |   6 +-
 ext/stub/internalclasses.zep.h                |  12 +-
 ext/stub/invoke.zep.h                         |   6 +-
 ext/stub/invokes/abstractinvoker.zep.h        |  10 +-
 ext/stub/invokes/abstractinvokercomplex.zep.h |  10 +-
 ext/stub/invokes/abstractprotected.zep.c      |  12 -
 ext/stub/invokes/invokeprotected.zep.c        |   3 -
 ext/stub/invokes/invokeprotectedcomplex.zep.c |   3 -
 ext/stub/issettest.zep.c                      |  31 +-
 ext/stub/issettest.zep.h                      |   6 +-
 ext/stub/issue1134.zep.c                      |   6 -
 ext/stub/issue1134.zep.h                      |  12 +-
 ext/stub/issue1521.zep.h                      |   6 +-
 ext/stub/issue2165/issue.zep.c                |  18 -
 ext/stub/issue2165/issue.zep.h                |  12 +-
 ext/stub/issue663.zep.c                       |   9 -
 ext/stub/issue887.zep.c                       |   5 +-
 ext/stub/issue887.zep.h                       |  18 +-
 ext/stub/issue914.zep.h                       |   6 +-
 ext/stub/issues.zep.c                         |   6 -
 ext/stub/issues.zep.h                         |   6 +-
 ext/stub/json.zep.h                           |  36 +-
 ext/stub/logical.zep.c                        |   9 -
 ext/stub/logical.zep.h                        |  48 +-
 ext/stub/mcall.zep.c                          |  94 --
 ext/stub/mcall.zep.h                          | 102 +-
 ext/stub/mcall/caller.zep.c                   |   3 -
 ext/stub/mcallchained.zep.h                   |  42 +-
 ext/stub/mcalldynamic.zep.c                   |   3 -
 ext/stub/mcalldynamic.zep.h                   |  18 +-
 ext/stub/mcallinternal.zep.c                  |   9 -
 ext/stub/mcallinternal.zep.h                  |  24 +-
 ext/stub/methodabstract.zep.h                 |   6 +-
 ext/stub/methodargs.zep.c                     |  30 -
 ext/stub/namespaces/classentry.zep.c          |   6 -
 ext/stub/nativearray.zep.c                    |  41 +-
 ext/stub/nativearray.zep.h                    |   6 +-
 ext/stub/oo.zep.h                             |  72 +-
 ext/stub/oo/abstractclass.zep.h               |  12 +-
 ext/stub/oo/concretestatic.zep.h              |  12 +-
 ext/stub/oo/constantsinterface.zep.h          |  36 +-
 ext/stub/oo/deprecatedmethods.zep.h           |  18 +-
 ext/stub/oo/dynamicprop.zep.c                 |  36 -
 ext/stub/oo/dynamicprop.zep.h                 |  12 +-
 ext/stub/oo/extendpdoclass.zep.c              |   2 -
 ext/stub/oo/ooconstruct.zep.h                 |   6 +-
 ext/stub/oo/ooconstructparams.zep.c           |   3 -
 ext/stub/oo/ooconstructparams.zep.h           |  12 +-
 ext/stub/oo/oodestruct.zep.c                  |   2 -
 ext/stub/oo/oodestruct.zep.h                  |  18 +-
 ext/stub/oo/oodynamica.zep.h                  |  30 +-
 ext/stub/oo/oodynamicb.zep.h                  |  12 +-
 ext/stub/oo/oonativeimplements.zep.c          |  21 -
 ext/stub/oo/oonativeimplements.zep.h          |   8 -
 ext/stub/oo/ooparams.zep.c                    |  63 --
 ext/stub/oo/ooparams.zep.h                    |  24 +-
 ext/stub/oo/propertyaccess.zep.c              |   7 +-
 ext/stub/oo/propertyaccess.zep.h              |  12 +-
 ext/stub/oo/scopes/abstractclass.zep.c        |   3 -
 ext/stub/oo/scopes/abstractclass.zep.h        |  12 +-
 ext/stub/oo/scopes/abstractclassmagic.zep.c   |   8 +-
 ext/stub/oo/scopes/privatescopetester.zep.c   |  14 +-
 ext/stub/operator.zep.c                       |  18 -
 ext/stub/optimizers/acos.zep.c                |   6 -
 ext/stub/optimizers/acos.zep.h                |  18 +-
 ext/stub/optimizers/arraymerge.zep.c          |   3 -
 ext/stub/optimizers/asin.zep.c                |   6 -
 ext/stub/optimizers/asin.zep.h                |  18 +-
 ext/stub/optimizers/cos.zep.c                 |   6 -
 ext/stub/optimizers/cos.zep.h                 |  24 +-
 ext/stub/optimizers/createarray.zep.c         |   3 -
 ext/stub/optimizers/createarray.zep.h         |   6 +-
 ext/stub/optimizers/isscalar.zep.c            |   3 -
 ext/stub/optimizers/ldexp.zep.c               |   6 -
 ext/stub/optimizers/ldexp.zep.h               |  30 +-
 ext/stub/optimizers/sin.zep.c                 |   6 -
 ext/stub/optimizers/sin.zep.h                 |  24 +-
 ext/stub/optimizers/sqrt.zep.c                |   6 -
 ext/stub/optimizers/sqrt.zep.h                |  24 +-
 ext/stub/optimizers/strreplace.zep.h          |  24 +-
 ext/stub/optimizers/substr.zep.c              |   6 -
 ext/stub/optimizers/tan.zep.c                 |   6 -
 ext/stub/optimizers/tan.zep.h                 |  30 +-
 ext/stub/pregmatch.zep.c                      |  18 -
 ext/stub/pregmatch.zep.h                      |  36 +-
 ext/stub/properties/app.zep.h                 |  12 +-
 ext/stub/properties/privateproperties.zep.h   |  42 +-
 ext/stub/properties/propertyarray.zep.c       |   6 -
 ext/stub/properties/propertyarray.zep.h       |  18 +-
 ext/stub/properties/propertyupdate.zep.h      |   6 +-
 ext/stub/properties/protectedproperties.zep.c |   9 -
 ext/stub/properties/protectedproperties.zep.h |  48 +-
 ext/stub/properties/publicproperties.zep.c    |   5 +-
 ext/stub/properties/publicproperties.zep.h    |  12 +-
 .../properties/staticprivateproperties.zep.c  |   2 +-
 .../staticprotectedproperties.zep.c           |   8 +-
 .../staticprotectedproperties.zep.h           |  48 +-
 .../properties/staticpublicproperties.zep.c   |   3 -
 .../properties/staticpublicproperties.zep.h   |  30 +-
 ext/stub/quantum.zep.c                        |   3 -
 ext/stub/range.zep.h                          |  12 +-
 ext/stub/references.zep.h                     |   6 +-
 ext/stub/reflection.zep.c                     |   3 -
 ext/stub/regexdna.zep.c                       |   3 -
 ext/stub/requires.zep.c                       |  18 -
 ext/stub/requires/external3.zep.c             |   3 -
 ext/stub/resourcetest.zep.h                   |  36 +-
 ext/stub/returns.zep.c                        |   3 -
 ext/stub/returns.zep.h                        |   6 +-
 ext/stub/router.zep.c                         |  76 +-
 ext/stub/router.zep.h                         |  72 +-
 ext/stub/router/route.zep.c                   |  30 +-
 ext/stub/router/route.zep.h                   |  60 +-
 ext/stub/scall.zep.c                          |  36 -
 ext/stub/scall.zep.h                          |  54 +-
 ext/stub/scalldynamic.zep.c                   |   3 -
 ext/stub/scallexternal.zep.c                  |   6 -
 ext/stub/scallexternal.zep.h                  |   6 +-
 ext/stub/scalllateconstruct.zep.h             |  12 +-
 ext/stub/scope.zep.c                          |   3 -
 ext/stub/scope.zep.h                          |  24 +-
 ext/stub/sort.zep.c                           |   5 +-
 ext/stub/spectralnorm.zep.c                   |  15 -
 ext/stub/spl.zep.c                            |   3 -
 ext/stub/spropertyaccess.zep.c                |   8 +-
 ext/stub/spropertyaccess.zep.h                |   6 +-
 ext/stub/statements.zep.c                     |  15 -
 ext/stub/statements.zep.h                     |   6 +-
 ext/stub/strings.zep.c                        |  90 --
 ext/stub/strings.zep.h                        |  36 +-
 ext/stub/stubs.zep.c                          |   6 -
 ext/stub/stubs.zep.h                          |  18 +-
 ext/stub/ternary.zep.c                        |  18 -
 ext/stub/ternary.zep.h                        |  18 +-
 ext/stub/trytest.zep.c                        |  12 -
 ext/stub/trytest.zep.h                        |  66 +-
 ext/stub/typehinting/testabstract.zep.h       |  12 +-
 ext/stub/typeinstances.zep.h                  |  18 +-
 ext/stub/typeoff.zep.c                        |   8 +-
 ext/stub/typeoff.zep.h                        |  66 +-
 ext/stub/types/maybe.zep.c                    |   3 -
 ext/stub/types/maybe.zep.h                    |   8 -
 ext/stub/types/mixedtype.zep.c                |  42 -
 ext/stub/types/mixedtype.zep.h                |  74 +-
 ext/stub/types/obj.zep.h                      |  12 -
 ext/stub/unsettest.zep.c                      |  18 -
 ext/stub/unsettest.zep.h                      |  18 +-
 ext/stub/usetest.zep.h                        |  24 +-
 ext/stub/vars.zep.c                           |  23 -
 ext/stub/vars.zep.h                           |  42 +-
 255 files changed, 873 insertions(+), 6060 deletions(-)

diff --git a/ext/kernel/array.h b/ext/kernel/array.h
index 11d19b6f77..1c98ca2cc0 100644
--- a/ext/kernel/array.h
+++ b/ext/kernel/array.h
@@ -9,8 +9,6 @@
  * following url: https://docs.zephir-lang.com/en/latest/license
  */
 
-#ifndef ZEPHIR_KERNEL_ARRAY_H
-#define ZEPHIR_KERNEL_ARRAY_H
 #define ZEPHIR_MAX_ARRAY_LEVELS 16
 
 #include <php.h>
@@ -73,5 +71,3 @@ int zephir_fast_in_array(zval *needle, zval *haystack);
 		Z_TRY_ADDREF_P(value); \
 		zend_hash_next_index_insert(Z_ARRVAL_P(arr), value); \
 	} while (0)
-
-#endif /* ZEPHIR_KERNEL_ARRAY_H */
diff --git a/ext/kernel/exception.c b/ext/kernel/exception.c
index 6d0a50ba3c..2d81541f32 100644
--- a/ext/kernel/exception.c
+++ b/ext/kernel/exception.c
@@ -54,14 +54,8 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 		zephir_check_call_status();
 		if (ZEPHIR_IS_LONG(&curline, 0)) {
 			default_exception_ce = zend_exception_get_default();
-
-#if PHP_VERSION_ID >= 80000
 			zend_update_property_string(default_exception_ce, Z_OBJ_P(object), SL("file"), file);
 			zend_update_property_long(default_exception_ce, Z_OBJ_P(object), SL("line"), line);
-#else
-			zend_update_property_string(default_exception_ce, object, SL("file"), file);
-			zend_update_property_long(default_exception_ce, object, SL("line"), line);
-#endif
 		}
 	}
 
@@ -88,13 +82,8 @@ void zephir_throw_exception_string_debug(zend_class_entry *ce, const char *messa
 
 	if (line > 0) {
 		default_exception_ce = zend_exception_get_default();
-#if PHP_VERSION_ID >= 80000
 		zend_update_property_string(default_exception_ce, Z_OBJ(object), "file", sizeof("file")-1, file);
 		zend_update_property_long(default_exception_ce, Z_OBJ(object), "line", sizeof("line")-1, line);
-#else
-		zend_update_property_string(default_exception_ce, &object, "file", sizeof("file")-1, file);
-		zend_update_property_long(default_exception_ce, &object, "line", sizeof("line")-1, line);
-#endif
 	}
 
 	if (ZEPHIR_LAST_CALL_STATUS != FAILURE) {
diff --git a/ext/kernel/fcall.c b/ext/kernel/fcall.c
index d017ec4db3..cfcc025bed 100644
--- a/ext/kernel/fcall.c
+++ b/ext/kernel/fcall.c
@@ -211,21 +211,12 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 	}
 
 	fcic->called_scope = called_scope;
-
-#if PHP_VERSION_ID >= 80000
 	calling_scope = zend_get_called_scope(EG(current_execute_data));
-#else
-	calling_scope = zend_get_executed_scope();
-#endif
-
 	fcic->object = this_ptr ? Z_OBJ_P(this_ptr) : NULL;
 	switch (type) {
 		case zephir_fcall_parent:
-
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->parent->function_table, Z_STR_P(func));
-
 				fcic->calling_scope = ce->parent;
 			} else if (EXPECTED(calling_scope && calling_scope->parent)) {
 				if (Z_TYPE_P(func) == IS_STRING) {
@@ -235,7 +226,7 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 			} else {
 				return;
 			}
-#endif
+
 			if (UNEXPECTED(!calling_scope || !calling_scope->parent)) {
 				return;
 			}
@@ -244,7 +235,6 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 			break;
 
 		case zephir_fcall_static:
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 				fcic->calling_scope = ce;
@@ -252,17 +242,10 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				fcic->function_handler = zend_hash_find_ptr(&calling_scope->function_table, Z_STR_P(func));
 				fcic->calling_scope = called_scope;
 			}
-#else
-			fcic->calling_scope = called_scope;
-			if (UNEXPECTED(!calling_scope)) {
-				return;
-			}
-#endif
 
 			break;
 
 		case zephir_fcall_self:
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 				fcic->calling_scope = ce;
@@ -273,13 +256,9 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				//fcic->called_scope = zend_get_called_scope(EG(current_execute_data));
 				fcic->calling_scope = calling_scope;
 			}
-#else
-			fcic->calling_scope = calling_scope;
-#endif
 			break;
 
 		case zephir_fcall_ce:
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 
@@ -288,7 +267,6 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				fcic->function_handler = zend_hash_find_ptr(&calling_scope->function_table, Z_STR_P(func));
 				fcic->calling_scope = calling_scope;
 			}
-#endif
 			// TODO: Check for PHP 7.4 and PHP 8.0, as it rewrite from above
 			fcic->calling_scope = ce;
 			fcic->called_scope  = ce;
@@ -297,11 +275,7 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 		case zephir_fcall_function:
 		case zephir_fcall_method:
 			if (Z_TYPE_P(func) == IS_OBJECT) {
-#if PHP_VERSION_ID >= 80000
 				if (Z_OBJ_HANDLER_P(func, get_closure) && Z_OBJ_HANDLER_P(func, get_closure)(Z_OBJ_P(func), &fcic->calling_scope, &fcic->function_handler, &fcic->object, 0) == SUCCESS) {
-#else
-				if (Z_OBJ_HANDLER_P(func, get_closure) && Z_OBJ_HANDLER_P(func, get_closure)(func, &fcic->calling_scope, &fcic->function_handler, &fcic->object) == SUCCESS) {
-#endif
 					fcic->called_scope = fcic->calling_scope;
 					break;
 				}
@@ -309,11 +283,9 @@ static void populate_fcic(zend_fcall_info_cache* fcic, zephir_call_type type, ze
 				return;
 			}
 
-#if PHP_VERSION_ID >= 80000
 			if (ce && Z_TYPE_P(func) == IS_STRING) {
 				fcic->function_handler = zend_hash_find_ptr(&ce->function_table, Z_STR_P(func));
 			}
-#endif
 			fcic->calling_scope = this_ptr ? Z_OBJCE_P(this_ptr) : NULL;
 			fcic->called_scope  = fcic->calling_scope;
 			break;
@@ -383,12 +355,7 @@ int zephir_call_user_function(
 	ZVAL_COPY_VALUE(&fci.function_name, function_name);
 	fci.retval      = retval_ptr ? retval_ptr : &local_retval_ptr;
 	fci.param_count = param_count;
-
-#if PHP_VERSION_ID < 80000
-	fci.no_separation = 1;
-#else
 	fci.named_params = NULL;
-#endif
 
 	if (cache_entry && *cache_entry) {
 		/* We have a cache record, initialize scope */
@@ -402,22 +369,18 @@ int zephir_call_user_function(
 		/* The caller is interested in caching OR we have the call cache enabled */
 		resolve_callable(&callable, type, (object_pp && type != zephir_fcall_ce ? Z_OBJCE_P(object_pp) : obj_ce), object_pp, function_name);
 
-#if PHP_VERSION_ID >= 80000
-        char *is_callable_error = NULL;
-        zend_execute_data *frame = EG(current_execute_data);
+		char *is_callable_error = NULL;
+		zend_execute_data *frame = EG(current_execute_data);
 		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
-            if (is_callable_error) {
-                zend_error(E_WARNING, "%s", is_callable_error);
-                efree(is_callable_error);
+			if (is_callable_error) {
+				zend_error(E_WARNING, "%s", is_callable_error);
+				efree(is_callable_error);
 
-                return FAILURE;
-            }
+				return FAILURE;
+			}
 
 			populate_fcic(&fcic, type, obj_ce, object_pp, function_name, called_scope);
 		}
-#else
-		zend_is_callable_ex(&callable, fci.object, IS_CALLABLE_CHECK_SILENT, NULL, &fcic, NULL);
-#endif
 	}
 
 #ifdef _MSC_VER
@@ -432,12 +395,9 @@ int zephir_call_user_function(
 	}
 
 	fci.params = p;
-
-#if PHP_VERSION_ID >= 80000
 	if (!fcic.function_handler) {
 		ZVAL_COPY_VALUE(&fci.function_name, &callable);
 	}
-#endif
 
 	status = zend_call_function(&fci, &fcic);
 
@@ -630,29 +590,6 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 		return FAILURE;
 	}
 
-#if PHP_VERSION_ID < 80000
-	zend_fcall_info_init(handler, 0, &fci, &fci_cache, NULL, &is_callable_error);
-
-	if (is_callable_error) {
-		zend_error(E_WARNING, "%s", is_callable_error);
-		efree(is_callable_error);
-	} else {
-		status = SUCCESS;
-	}
-
-	if (status == SUCCESS) {
-		zend_fcall_info_args(&fci, params);
-
-		fci.retval = return_value;
-		zend_call_function(&fci, &fci_cache);
-
-		zend_fcall_info_args_clear(&fci, 1);
-	}
-
-	if (EG(exception)) {
-		status = SUCCESS;
-	}
-#else
 	zend_execute_data *frame = EG(current_execute_data);
 	if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
 		if (is_callable_error) {
@@ -674,7 +611,6 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 	zend_fcall_info_args(&fci, params);
 	status = zend_call_function(&fci, &fci_cache);
 	zend_fcall_info_args_clear(&fci, 1);
-#endif
 
 	return status;
 }
@@ -696,11 +632,7 @@ void zephir_eval_php(zval *str, zval *retval_ptr, char *context)
 #if PHP_VERSION_ID >= 80200
 	new_op_array = zend_compile_string(Z_STR_P(str), context, ZEND_COMPILE_POSITION_AFTER_OPEN_TAG);
 #else
-#if PHP_VERSION_ID >= 80000
 	new_op_array = zend_compile_string(Z_STR_P(str), context);
-#else
-	new_op_array = zend_compile_string(str, context);
-#endif
 #endif
 
 	CG(compiler_options) = original_compiler_options;
diff --git a/ext/kernel/fcall.h b/ext/kernel/fcall.h
index 2581360756..4754bf4626 100644
--- a/ext/kernel/fcall.h
+++ b/ext/kernel/fcall.h
@@ -167,19 +167,11 @@ typedef enum _zephir_call_type {
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, Z_TYPE_P(object) == IS_OBJECT ? Z_OBJCE_P(object) : NULL, zephir_fcall_method, object, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_RETURN_CALL_STATIC(method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_static, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_RETURN_CALL_STATIC(method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, NULL, zephir_fcall_static, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
 #define ZEPHIR_RETURN_CALL_PARENT(class_entry, this_ptr, method, cache, cache_slot, ...) \
 	do { \
@@ -187,51 +179,25 @@ typedef enum _zephir_call_type {
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, class_entry, zephir_fcall_parent, this_ptr, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_CALL_SELF(return_value_ptr, method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
 		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_self, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_CALL_SELF(return_value_ptr, method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
-		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, NULL, zephir_fcall_self, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_RETURN_CALL_SELF(method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_self, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_RETURN_CALL_SELF(method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_LAST_CALL_STATUS = zephir_return_call_class_method(return_value, NULL, zephir_fcall_self, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
-#if PHP_VERSION_ID >= 80000
 #define ZEPHIR_CALL_STATIC(return_value_ptr, method, cache, cache_slot, ...) \
 	do { \
 		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
 		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
 		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, (getThis() ? Z_OBJCE_P(getThis()) : NULL), zephir_fcall_static, getThis(), method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
 	} while (0)
-#else
-#define ZEPHIR_CALL_STATIC(return_value_ptr, method, cache, cache_slot, ...) \
-	do { \
-		zval *params_[] = {ZEPHIR_FETCH_VA_ARGS __VA_ARGS__}; \
-		ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(return_value_ptr); \
-		ZEPHIR_LAST_CALL_STATUS = zephir_call_class_method_aparams(return_value_ptr, NULL, zephir_fcall_static, NULL, method, strlen(method), cache, cache_slot, ZEPHIR_CALL_NUM_PARAMS(params_), ZEPHIR_PASS_CALL_PARAMS(params_)); \
-	} while (0)
-#endif
 
 #define ZEPHIR_CALL_CE_STATIC(return_value_ptr, class_entry, method, cache, cache_slot, ...) \
 	do { \
diff --git a/ext/kernel/main.c b/ext/kernel/main.c
index 1bbd149639..8aeedda44e 100644
--- a/ext/kernel/main.c
+++ b/ext/kernel/main.c
@@ -137,26 +137,17 @@ void zephir_fast_count(zval *result, zval *value)
 	}
 
 	if (Z_TYPE_P(value) == IS_OBJECT) {
-
 		zval retval;
 
 		if (Z_OBJ_HT_P(value)->count_elements) {
 			ZVAL_LONG(result, 1);
-#if PHP_VERSION_ID >= 80000
 			if (SUCCESS == Z_OBJ_HT(*value)->count_elements(Z_OBJ_P(value), &Z_LVAL_P(result))) {
-#else
-			if (SUCCESS == Z_OBJ_HT(*value)->count_elements(value, &Z_LVAL_P(result))) {
-#endif
 				return;
 			}
 		}
 
 		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
-#if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
-#else
-			zend_call_method_with_0_params(value, NULL, NULL, "count", &retval);
-#endif
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				convert_to_long_ex(&retval);
 				ZVAL_LONG(result, Z_LVAL(retval));
@@ -189,24 +180,15 @@ int zephir_fast_count_ev(zval *value)
 	}
 
 	if (Z_TYPE_P(value) == IS_OBJECT) {
-
 		zval retval;
 
 		if (Z_OBJ_HT_P(value)->count_elements) {
-#if PHP_VERSION_ID >= 80000
 			Z_OBJ_HT(*value)->count_elements(Z_OBJ_P(value), &count);
-#else
-			Z_OBJ_HT(*value)->count_elements(value, &count);
-#endif
 			return (int) count > 0;
 		}
 
 		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
-#if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
-#else
-			zend_call_method_with_0_params(value, NULL, NULL, "count", &retval);
-#endif
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				convert_to_long_ex(&retval);
 				count = Z_LVAL(retval);
@@ -241,20 +223,12 @@ int zephir_fast_count_int(zval *value)
 		zval retval;
 
 		if (Z_OBJ_HT_P(value)->count_elements) {
-#if PHP_VERSION_ID >= 80000
 			Z_OBJ_HT(*value)->count_elements(Z_OBJ_P(value), &count);
-#else
-			Z_OBJ_HT(*value)->count_elements(value, &count);
-#endif
 			return (int) count;
 		}
 
 		if (instanceof_function(Z_OBJCE_P(value), zend_ce_countable)) {
-#if PHP_VERSION_ID >= 80000
 			zend_call_method_with_0_params(Z_OBJ_P(value), NULL, NULL, "count", &retval);
-#else
-			zend_call_method_with_0_params(value, NULL, NULL, "count", &retval);
-#endif
 			if (Z_TYPE(retval) != IS_UNDEF) {
 				convert_to_long_ex(&retval);
 				count = Z_LVAL(retval);
@@ -282,7 +256,7 @@ int zephir_fast_count_int(zval *value)
  */
 int zephir_function_exists(const zval *function_name)
 {
-	if (zend_hash_str_exists(CG(function_table), Z_STRVAL_P(function_name), Z_STRLEN_P(function_name)) != NULL) {
+	if (zend_hash_str_exists(CG(function_table), Z_STRVAL_P(function_name), Z_STRLEN_P(function_name))) {
 		return SUCCESS;
 	}
 
@@ -406,7 +380,6 @@ zend_class_entry* zephir_get_internal_ce(const char *class_name, unsigned int cl
 /* Declare constants */
 int zephir_declare_class_constant(zend_class_entry *ce, const char *name, size_t name_length, zval *value)
 {
-#if PHP_VERSION_ID >= 80000
 	zend_string *key;
 
 	if (ce->type == ZEND_INTERNAL_CLASS) {
@@ -422,24 +395,6 @@ int zephir_declare_class_constant(zend_class_entry *ce, const char *name, size_t
 	}
 
 	return SUCCESS;
-#else
-	int ret;
-	zend_string *key;
-
-	if (ce->type == ZEND_INTERNAL_CLASS) {
-		key = zend_string_init_interned(name, name_length, 1);
-	} else {
-		key = zend_string_init(name, name_length, 0);
-	}
-
-	ret = zend_declare_class_constant_ex(ce, key, value, ZEND_ACC_PUBLIC, NULL);
-
-	if (ce->type != ZEND_INTERNAL_CLASS) {
-		zend_string_release(key);
-	}
-
-	return ret;
-#endif
 }
 
 int zephir_declare_class_constant_null(zend_class_entry *ce, const char *name, size_t name_length)
diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
index 76407bb5ae..762be8a03c 100644
--- a/ext/kernel/memory.h
+++ b/ext/kernel/memory.h
@@ -119,22 +119,17 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
 			zephir_ptr_dtor(d); \
 		} \
-	} else { \
-		/*TODO: as above */ \
 	} \
 	ZVAL_DUP(d, v);
 
-#define ZEPHIR_OBS_VAR(z) \
-	zephir_memory_observe(z)
-
 #define ZEPHIR_OBS_VAR_ONCE(z) \
 	if (Z_TYPE_P(z) == IS_UNDEF) { \
 		zephir_memory_observe(z); \
 	}
 
 #define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
-		ZEPHIR_OBS_VAR_ONCE(z); \
-		ZVAL_COPY(z, v);
+	ZEPHIR_OBS_VAR_ONCE(z); \
+	ZVAL_COPY(z, v);
 
 #define ZEPHIR_HASH_COPY(z, v) \
 	if (Z_TYPE_P(z) == IS_ARRAY && Z_TYPE_P(v) == IS_ARRAY) { \
diff --git a/ext/kernel/object.c b/ext/kernel/object.c
index 3fb2e006c6..62b03d79c7 100644
--- a/ext/kernel/object.c
+++ b/ext/kernel/object.c
@@ -338,11 +338,7 @@ int zephir_clone(zval *destination, zval *obj)
 			status = FAILURE;
 		} else {
 			if (!EG(exception)) {
-#if PHP_VERSION_ID >= 80000
 				ZVAL_OBJ(destination, clone_call(Z_OBJ_P(obj)));
-#else
-				ZVAL_OBJ(destination, clone_call(obj));
-#endif
 				if (EG(exception)) {
 					zval_ptr_dtor(destination);
 				}
@@ -363,19 +359,11 @@ int zephir_isset_property(zval *object, const char *property_name, unsigned int
 			return 1;
 		}
 
-#if PHP_VERSION_ID >= 80000
 		return zend_hash_str_exists(
 			Z_OBJ_HT_P(object)->get_properties(Z_OBJ_P(object)),
 			property_name,
 			property_length
 		);
-#else
-		return zend_hash_str_exists(
-			Z_OBJ_HT_P(object)->get_properties(object),
-			property_name,
-			property_length
-		);
-#endif
 	}
 
 	return 0;
@@ -391,19 +379,11 @@ int zephir_isset_property_zval(zval *object, const zval *property)
 			if (EXPECTED(zend_hash_str_exists(&Z_OBJCE_P(object)->properties_info, Z_STRVAL_P(property), Z_STRLEN_P(property)))) {
 				return 1;
 			} else {
-#if PHP_VERSION_ID >= 80000
 				return zend_hash_str_exists(
 					Z_OBJ_HT_P(object)->get_properties(Z_OBJ_P(object)),
 					Z_STRVAL_P(property),
 					Z_STRLEN_P(property)
 				);
-#else
-				return zend_hash_str_exists(
-					Z_OBJ_HT_P(object)->get_properties(object),
-					Z_STRVAL_P(property),
-					Z_STRLEN_P(property)
-				);
-#endif
 			}
 		}
 	}
@@ -523,15 +503,9 @@ int zephir_read_property(
 	}
 
 	ZVAL_STRINGL(&property, property_name, property_length);
-#if PHP_VERSION_ID >= 80000
 	res = Z_OBJ_HT_P(object)->read_property(Z_OBJ_P(object), Z_STR(property),
 											flags ? BP_VAR_IS : BP_VAR_R,
 											NULL, &tmp);
-#else
-	res = Z_OBJ_HT_P(object)->read_property(object, &property,
-											flags ? BP_VAR_IS : BP_VAR_R,
-											NULL, &tmp);
-#endif
 
 	if ((flags & PH_READONLY) == PH_READONLY) {
 		ZVAL_COPY_VALUE(result, res);
@@ -674,11 +648,7 @@ int zephir_update_property_zval(
 
 	/* write_property will add 1 to refcount,
 	   so no Z_TRY_ADDREF_P(value) is necessary */
-#if PHP_VERSION_ID >= 80000
 	Z_OBJ_HT_P(object)->write_property(Z_OBJ_P(object), Z_STR(property), &sep_value, 0);
-#else
-	Z_OBJ_HT_P(object)->write_property(object, &property, &sep_value, 0);
-#endif
 
 	zval_ptr_dtor(&property);
 
@@ -943,11 +913,7 @@ int zephir_unset_property(zval* object, const char* name)
 
 	/* Use caller's scope */
 	zephir_set_scope(Z_OBJCE_P(object));
-#if PHP_VERSION_ID >= 80000
 	Z_OBJ_HT_P(object)->unset_property(Z_OBJ_P(object), Z_STR(member), 0);
-#else
-	Z_OBJ_HT_P(object)->unset_property(object, &member, 0);
-#endif
 	/* Restore original scope */
 	zephir_set_scope(scope);
 
@@ -1296,11 +1262,7 @@ int zephir_create_instance(zval *return_value, const zval *class_name)
 			fci.retval           = 0;
 			fci.param_count      = 0;
 			fci.params           = 0;
-#if PHP_VERSION_ID < 80000
-			fci.no_separation = 1;
-#else
-			fci.named_params = NULL;
-#endif
+			fci.named_params 	 = NULL;
 
 			ZVAL_NULL(&fci.function_name);
 
@@ -1358,11 +1320,8 @@ int zephir_create_instance_params(zval *return_value, const zval *class_name, zv
 			fci.retval           = 0;
 			fci.param_count      = 0;
 			fci.params           = 0;
-#if PHP_VERSION_ID < 80000
-			fci.no_separation = 1;
-#else
-			fci.named_params = NULL;
-#endif
+			fci.named_params 	 = NULL;
+
 			ZVAL_NULL(&fci.function_name);
 
 			fcc.object           = obj;
diff --git a/ext/kernel/string.c b/ext/kernel/string.c
index dd5ba9d432..96a49a4254 100644
--- a/ext/kernel/string.c
+++ b/ext/kernel/string.c
@@ -461,11 +461,8 @@ void zephir_fast_join(zval *result, zval *glue, zval *pieces)
 		zend_error(E_WARNING, "Invalid arguments supplied for join()");
 		return;
 	}
-#if PHP_VERSION_ID < 80000
-	php_implode(Z_STR_P(glue), pieces, result);
-#else
+
 	php_implode(Z_STR_P(glue), Z_ARRVAL_P(pieces), result);
-#endif
 }
 
 /**
diff --git a/ext/stub/0__closure.zep.c b/ext/stub/0__closure.zep.c
index 9cbbd80596..bf61b8eab1 100644
--- a/ext/stub/0__closure.zep.c
+++ b/ext/stub/0__closure.zep.c
@@ -30,12 +30,9 @@ PHP_METHOD(stub_0__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
diff --git a/ext/stub/10__closure.zep.c b/ext/stub/10__closure.zep.c
index 46af198cac..c17742a26e 100644
--- a/ext/stub/10__closure.zep.c
+++ b/ext/stub/10__closure.zep.c
@@ -29,12 +29,9 @@ PHP_METHOD(stub_10__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&config_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(config)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &config);
diff --git a/ext/stub/11__closure.zep.c b/ext/stub/11__closure.zep.c
index b1f5df9d74..4f89d8999f 100644
--- a/ext/stub/11__closure.zep.c
+++ b/ext/stub/11__closure.zep.c
@@ -30,12 +30,9 @@ PHP_METHOD(stub_11__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
diff --git a/ext/stub/12__closure.zep.h b/ext/stub/12__closure.zep.h
index e55860734b..f1d4463d87 100644
--- a/ext/stub/12__closure.zep.h
+++ b/ext/stub/12__closure.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_12__closure___invoke, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_12__closure_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(stub_12__closure, __invoke, arginfo_stub_12__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#else
-	PHP_ME(stub_12__closure, __invoke, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#endif
+PHP_ME(stub_12__closure, __invoke, arginfo_stub_12__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_FE_END
 };
diff --git a/ext/stub/13__closure.zep.h b/ext/stub/13__closure.zep.h
index b4d5d38647..1e69eecb70 100644
--- a/ext/stub/13__closure.zep.h
+++ b/ext/stub/13__closure.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_13__closure___invoke, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_13__closure_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(stub_13__closure, __invoke, arginfo_stub_13__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#else
-	PHP_ME(stub_13__closure, __invoke, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#endif
+PHP_ME(stub_13__closure, __invoke, arginfo_stub_13__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_FE_END
 };
diff --git a/ext/stub/1__closure.zep.h b/ext/stub/1__closure.zep.h
index b0da61413e..30d25ce92f 100644
--- a/ext/stub/1__closure.zep.h
+++ b/ext/stub/1__closure.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_1__closure___invoke, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_1__closure_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(stub_1__closure, __invoke, arginfo_stub_1__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#else
-	PHP_ME(stub_1__closure, __invoke, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#endif
+PHP_ME(stub_1__closure, __invoke, arginfo_stub_1__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_FE_END
 };
diff --git a/ext/stub/2__closure.zep.h b/ext/stub/2__closure.zep.h
index 13f7c95086..afe190da9d 100644
--- a/ext/stub/2__closure.zep.h
+++ b/ext/stub/2__closure.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_2__closure___invoke, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_2__closure_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(stub_2__closure, __invoke, arginfo_stub_2__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#else
-	PHP_ME(stub_2__closure, __invoke, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#endif
+PHP_ME(stub_2__closure, __invoke, arginfo_stub_2__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_FE_END
 };
diff --git a/ext/stub/3__closure.zep.c b/ext/stub/3__closure.zep.c
index 6d3ea9ab04..23070f1ed1 100644
--- a/ext/stub/3__closure.zep.c
+++ b/ext/stub/3__closure.zep.c
@@ -29,12 +29,9 @@ PHP_METHOD(stub_3__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param1);
diff --git a/ext/stub/4__closure.zep.c b/ext/stub/4__closure.zep.c
index 0c3188b1c9..abca7ef8ab 100644
--- a/ext/stub/4__closure.zep.c
+++ b/ext/stub/4__closure.zep.c
@@ -29,12 +29,9 @@ PHP_METHOD(stub_4__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param1);
diff --git a/ext/stub/5__closure.zep.c b/ext/stub/5__closure.zep.c
index 9f39cfc5a4..0d5e844e74 100644
--- a/ext/stub/5__closure.zep.c
+++ b/ext/stub/5__closure.zep.c
@@ -29,12 +29,9 @@ PHP_METHOD(stub_5__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param1);
diff --git a/ext/stub/6__closure.zep.c b/ext/stub/6__closure.zep.c
index dc65c493de..e0d9e10796 100644
--- a/ext/stub/6__closure.zep.c
+++ b/ext/stub/6__closure.zep.c
@@ -30,12 +30,9 @@ PHP_METHOD(stub_6__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
diff --git a/ext/stub/7__closure.zep.c b/ext/stub/7__closure.zep.c
index 11aa31e130..6bc91c44bb 100644
--- a/ext/stub/7__closure.zep.c
+++ b/ext/stub/7__closure.zep.c
@@ -30,12 +30,9 @@ PHP_METHOD(stub_7__closure, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
diff --git a/ext/stub/8__closure.zep.h b/ext/stub/8__closure.zep.h
index a6584a11da..759675c67e 100644
--- a/ext/stub/8__closure.zep.h
+++ b/ext/stub/8__closure.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_8__closure___invoke, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_8__closure_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(stub_8__closure, __invoke, arginfo_stub_8__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#else
-	PHP_ME(stub_8__closure, __invoke, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#endif
+PHP_ME(stub_8__closure, __invoke, arginfo_stub_8__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_FE_END
 };
diff --git a/ext/stub/9__closure.zep.h b/ext/stub/9__closure.zep.h
index 32f88976fc..7542dd891f 100644
--- a/ext/stub/9__closure.zep.h
+++ b/ext/stub/9__closure.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_9__closure___invoke, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_9__closure_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(stub_9__closure, __invoke, arginfo_stub_9__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#else
-	PHP_ME(stub_9__closure, __invoke, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
-#endif
+PHP_ME(stub_9__closure, __invoke, arginfo_stub_9__closure___invoke, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
 	PHP_FE_END
 };
diff --git a/ext/stub/arithmetic.zep.c b/ext/stub/arithmetic.zep.c
index 1f33c47d31..94f34bc11c 100644
--- a/ext/stub/arithmetic.zep.c
+++ b/ext/stub/arithmetic.zep.c
@@ -1090,12 +1090,9 @@ PHP_METHOD(Stub_Arithmetic, addSum24)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2135,12 +2132,9 @@ PHP_METHOD(Stub_Arithmetic, sub24)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2176,12 +2170,9 @@ PHP_METHOD(Stub_Arithmetic, mul2)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2241,12 +2232,9 @@ PHP_METHOD(Stub_Arithmetic, less3)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -2261,12 +2249,9 @@ PHP_METHOD(Stub_Arithmetic, less4)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -2307,12 +2292,9 @@ PHP_METHOD(Stub_Arithmetic, greater3)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -2327,12 +2309,9 @@ PHP_METHOD(Stub_Arithmetic, greater4)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -2375,12 +2354,9 @@ PHP_METHOD(Stub_Arithmetic, letStatementBoolMinus)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &b);
@@ -2399,12 +2375,9 @@ PHP_METHOD(Stub_Arithmetic, letStatementVarMinus)
 
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&a);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2450,12 +2423,9 @@ PHP_METHOD(Stub_Arithmetic, absParam)
 	zend_ulong val;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
@@ -2475,12 +2445,9 @@ PHP_METHOD(Stub_Arithmetic, negativeInt)
 	zend_long val;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
@@ -2496,12 +2463,9 @@ PHP_METHOD(Stub_Arithmetic, negativeLong)
 	long val;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
diff --git a/ext/stub/arithmetic.zep.h b/ext/stub/arithmetic.zep.h
index de9a0bf616..8ee0c806c1 100644
--- a/ext/stub/arithmetic.zep.h
+++ b/ext/stub/arithmetic.zep.h
@@ -677,780 +677,168 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arithmetic_negativelong, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_arithmetic_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intSum, arginfo_stub_arithmetic_intsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, int2Sum, arginfo_stub_arithmetic_int2sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, int2Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intSumSimple, arginfo_stub_arithmetic_intsumsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intSumSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, boolSum, arginfo_stub_arithmetic_boolsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, boolSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, bool2Sum, arginfo_stub_arithmetic_bool2sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, bool2Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, bool3Sum, arginfo_stub_arithmetic_bool3sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, bool3Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, boolSumSimple, arginfo_stub_arithmetic_boolsumsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, boolSumSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, boolSumExpression, arginfo_stub_arithmetic_boolsumexpression, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, boolSumExpression, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSum, arginfo_stub_arithmetic_doublesum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, double2Sum, arginfo_stub_arithmetic_double2sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, double2Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSumSimple, arginfo_stub_arithmetic_doublesumsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSumSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSum2Simple, arginfo_stub_arithmetic_doublesum2simple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSum2Simple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSumExpression, arginfo_stub_arithmetic_doublesumexpression, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSumExpression, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSumVarExpression, arginfo_stub_arithmetic_doublesumvarexpression, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSumVarExpression, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, varSum, arginfo_stub_arithmetic_varsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, varSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, varSumSimple, arginfo_stub_arithmetic_varsumsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, varSumSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intDoubleSum, arginfo_stub_arithmetic_intdoublesum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intDoubleSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intDoubleSumSimple, arginfo_stub_arithmetic_intdoublesumsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intDoubleSumSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleIntSum, arginfo_stub_arithmetic_doubleintsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleIntSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleIntSumSimple, arginfo_stub_arithmetic_doubleintsumsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleIntSumSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, varIntSum, arginfo_stub_arithmetic_varintsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, varIntSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intVarSum, arginfo_stub_arithmetic_intvarsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intVarSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intVarImplicitCastSum, arginfo_stub_arithmetic_intvarimplicitcastsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intVarImplicitCastSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intVarImplicitCast2Sum, arginfo_stub_arithmetic_intvarimplicitcast2sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intVarImplicitCast2Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complexSum, arginfo_stub_arithmetic_complexsum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complexSum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex2Sum, arginfo_stub_arithmetic_complex2sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex2Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex3Sum, arginfo_stub_arithmetic_complex3sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex3Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex4Sum, arginfo_stub_arithmetic_complex4sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex4Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex5Sum, arginfo_stub_arithmetic_complex5sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex5Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex6Sum, arginfo_stub_arithmetic_complex6sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex6Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex7Sum, arginfo_stub_arithmetic_complex7sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex7Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex9Sum, arginfo_stub_arithmetic_complex9sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex9Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex10Sum, arginfo_stub_arithmetic_complex10sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex10Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex11Sum, arginfo_stub_arithmetic_complex11sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex11Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex12Sum, arginfo_stub_arithmetic_complex12sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex12Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex13Sum, arginfo_stub_arithmetic_complex13sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex13Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex14Sum, arginfo_stub_arithmetic_complex14sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex14Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex15Sum, arginfo_stub_arithmetic_complex15sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex15Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex16Sum, arginfo_stub_arithmetic_complex16sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex16Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex17Sum, arginfo_stub_arithmetic_complex17sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex17Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex18Sum, arginfo_stub_arithmetic_complex18sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex18Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex19Sum, arginfo_stub_arithmetic_complex19sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex19Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex20Sum, arginfo_stub_arithmetic_complex20sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex20Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex21Sum, arginfo_stub_arithmetic_complex21sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex21Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex22Sum, arginfo_stub_arithmetic_complex22sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex22Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex23Sum, arginfo_stub_arithmetic_complex23sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex23Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex24Sum, arginfo_stub_arithmetic_complex24sum, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex24Sum, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum1, arginfo_stub_arithmetic_addsum1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum2, arginfo_stub_arithmetic_addsum2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum2b, arginfo_stub_arithmetic_addsum2b, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum2b, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum3, arginfo_stub_arithmetic_addsum3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum4, arginfo_stub_arithmetic_addsum4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum5, arginfo_stub_arithmetic_addsum5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum6, arginfo_stub_arithmetic_addsum6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum7, arginfo_stub_arithmetic_addsum7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum8, arginfo_stub_arithmetic_addsum8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum8b, arginfo_stub_arithmetic_addsum8b, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum8b, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum9, arginfo_stub_arithmetic_addsum9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum10, arginfo_stub_arithmetic_addsum10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum11, arginfo_stub_arithmetic_addsum11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum11, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum12, arginfo_stub_arithmetic_addsum12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum12, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum13, arginfo_stub_arithmetic_addsum13, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum13, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum14, arginfo_stub_arithmetic_addsum14, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum14, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum15, arginfo_stub_arithmetic_addsum15, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum15, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum16, arginfo_stub_arithmetic_addsum16, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum16, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum17, arginfo_stub_arithmetic_addsum17, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum17, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum18, arginfo_stub_arithmetic_addsum18, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum18, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum19, arginfo_stub_arithmetic_addsum19, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum19, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum20, arginfo_stub_arithmetic_addsum20, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum20, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum21, arginfo_stub_arithmetic_addsum21, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum21, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum22, arginfo_stub_arithmetic_addsum22, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum22, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, addSum23, arginfo_stub_arithmetic_addsum23, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, addSum23, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Arithmetic, intSum, arginfo_stub_arithmetic_intsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, int2Sum, arginfo_stub_arithmetic_int2sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intSumSimple, arginfo_stub_arithmetic_intsumsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, boolSum, arginfo_stub_arithmetic_boolsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, bool2Sum, arginfo_stub_arithmetic_bool2sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, bool3Sum, arginfo_stub_arithmetic_bool3sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, boolSumSimple, arginfo_stub_arithmetic_boolsumsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, boolSumExpression, arginfo_stub_arithmetic_boolsumexpression, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSum, arginfo_stub_arithmetic_doublesum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, double2Sum, arginfo_stub_arithmetic_double2sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSumSimple, arginfo_stub_arithmetic_doublesumsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSum2Simple, arginfo_stub_arithmetic_doublesum2simple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSumExpression, arginfo_stub_arithmetic_doublesumexpression, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSumVarExpression, arginfo_stub_arithmetic_doublesumvarexpression, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, varSum, arginfo_stub_arithmetic_varsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, varSumSimple, arginfo_stub_arithmetic_varsumsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intDoubleSum, arginfo_stub_arithmetic_intdoublesum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intDoubleSumSimple, arginfo_stub_arithmetic_intdoublesumsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleIntSum, arginfo_stub_arithmetic_doubleintsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleIntSumSimple, arginfo_stub_arithmetic_doubleintsumsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, varIntSum, arginfo_stub_arithmetic_varintsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intVarSum, arginfo_stub_arithmetic_intvarsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intVarImplicitCastSum, arginfo_stub_arithmetic_intvarimplicitcastsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intVarImplicitCast2Sum, arginfo_stub_arithmetic_intvarimplicitcast2sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complexSum, arginfo_stub_arithmetic_complexsum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex2Sum, arginfo_stub_arithmetic_complex2sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex3Sum, arginfo_stub_arithmetic_complex3sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex4Sum, arginfo_stub_arithmetic_complex4sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex5Sum, arginfo_stub_arithmetic_complex5sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex6Sum, arginfo_stub_arithmetic_complex6sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex7Sum, arginfo_stub_arithmetic_complex7sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex9Sum, arginfo_stub_arithmetic_complex9sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex10Sum, arginfo_stub_arithmetic_complex10sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex11Sum, arginfo_stub_arithmetic_complex11sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex12Sum, arginfo_stub_arithmetic_complex12sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex13Sum, arginfo_stub_arithmetic_complex13sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex14Sum, arginfo_stub_arithmetic_complex14sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex15Sum, arginfo_stub_arithmetic_complex15sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex16Sum, arginfo_stub_arithmetic_complex16sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex17Sum, arginfo_stub_arithmetic_complex17sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex18Sum, arginfo_stub_arithmetic_complex18sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex19Sum, arginfo_stub_arithmetic_complex19sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex20Sum, arginfo_stub_arithmetic_complex20sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex21Sum, arginfo_stub_arithmetic_complex21sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex22Sum, arginfo_stub_arithmetic_complex22sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex23Sum, arginfo_stub_arithmetic_complex23sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex24Sum, arginfo_stub_arithmetic_complex24sum, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum1, arginfo_stub_arithmetic_addsum1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum2, arginfo_stub_arithmetic_addsum2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum2b, arginfo_stub_arithmetic_addsum2b, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum3, arginfo_stub_arithmetic_addsum3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum4, arginfo_stub_arithmetic_addsum4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum5, arginfo_stub_arithmetic_addsum5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum6, arginfo_stub_arithmetic_addsum6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum7, arginfo_stub_arithmetic_addsum7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum8, arginfo_stub_arithmetic_addsum8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum8b, arginfo_stub_arithmetic_addsum8b, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum9, arginfo_stub_arithmetic_addsum9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum10, arginfo_stub_arithmetic_addsum10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum11, arginfo_stub_arithmetic_addsum11, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum12, arginfo_stub_arithmetic_addsum12, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum13, arginfo_stub_arithmetic_addsum13, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum14, arginfo_stub_arithmetic_addsum14, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum15, arginfo_stub_arithmetic_addsum15, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum16, arginfo_stub_arithmetic_addsum16, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum17, arginfo_stub_arithmetic_addsum17, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum18, arginfo_stub_arithmetic_addsum18, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum19, arginfo_stub_arithmetic_addsum19, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum20, arginfo_stub_arithmetic_addsum20, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum21, arginfo_stub_arithmetic_addsum21, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum22, arginfo_stub_arithmetic_addsum22, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, addSum23, arginfo_stub_arithmetic_addsum23, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, addSum24, arginfo_stub_arithmetic_addsum24, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intSub, arginfo_stub_arithmetic_intsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intLetSub, arginfo_stub_arithmetic_intletsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intLetSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intSub2, arginfo_stub_arithmetic_intsub2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intSub2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intSubSimple, arginfo_stub_arithmetic_intsubsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intSubSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, boolSub, arginfo_stub_arithmetic_boolsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, boolSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, bool2Sub, arginfo_stub_arithmetic_bool2sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, bool2Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, bool3Sub, arginfo_stub_arithmetic_bool3sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, bool3Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, bool4Sub, arginfo_stub_arithmetic_bool4sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, bool4Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, boolSubSimple, arginfo_stub_arithmetic_boolsubsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, boolSubSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSub, arginfo_stub_arithmetic_doublesub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, double2Sub, arginfo_stub_arithmetic_double2sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, double2Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSubSimple, arginfo_stub_arithmetic_doublesubsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSubSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleSub2Simple, arginfo_stub_arithmetic_doublesub2simple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleSub2Simple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, varSub, arginfo_stub_arithmetic_varsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, varSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, varSubSimple, arginfo_stub_arithmetic_varsubsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, varSubSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intDoubleSub, arginfo_stub_arithmetic_intdoublesub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intDoubleSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intDoubleSubSimple, arginfo_stub_arithmetic_intdoublesubsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intDoubleSubSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleIntSub, arginfo_stub_arithmetic_doubleintsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleIntSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, doubleIntSubSimple, arginfo_stub_arithmetic_doubleintsubsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, doubleIntSubSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, varIntSub, arginfo_stub_arithmetic_varintsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, varIntSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intVarSub, arginfo_stub_arithmetic_intvarsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intVarSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intVarImplicitCastSub, arginfo_stub_arithmetic_intvarimplicitcastsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intVarImplicitCastSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, intVarImplicitCast2Sub, arginfo_stub_arithmetic_intvarimplicitcast2sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, intVarImplicitCast2Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complexSub, arginfo_stub_arithmetic_complexsub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complexSub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex2Sub, arginfo_stub_arithmetic_complex2sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex2Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex3Sub, arginfo_stub_arithmetic_complex3sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex3Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex4Sub, arginfo_stub_arithmetic_complex4sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex4Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex5Sub, arginfo_stub_arithmetic_complex5sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex5Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex6Sub, arginfo_stub_arithmetic_complex6sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex6Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex7Sub, arginfo_stub_arithmetic_complex7sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex7Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex9Sub, arginfo_stub_arithmetic_complex9sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex9Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex10Sub, arginfo_stub_arithmetic_complex10sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex10Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex11Sub, arginfo_stub_arithmetic_complex11sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex11Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex12Sub, arginfo_stub_arithmetic_complex12sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex12Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex13Sub, arginfo_stub_arithmetic_complex13sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex13Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex14Sub, arginfo_stub_arithmetic_complex14sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex14Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex15Sub, arginfo_stub_arithmetic_complex15sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex15Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex16Sub, arginfo_stub_arithmetic_complex16sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex16Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex17Sub, arginfo_stub_arithmetic_complex17sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex17Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex18Sub, arginfo_stub_arithmetic_complex18sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex18Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex19Sub, arginfo_stub_arithmetic_complex19sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex19Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex20Sub, arginfo_stub_arithmetic_complex20sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex20Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex21Sub, arginfo_stub_arithmetic_complex21sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex21Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex22Sub, arginfo_stub_arithmetic_complex22sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex22Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex23Sub, arginfo_stub_arithmetic_complex23sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex23Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, complex24Sub, arginfo_stub_arithmetic_complex24sub, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, complex24Sub, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub1, arginfo_stub_arithmetic_sub1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub2, arginfo_stub_arithmetic_sub2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub2b, arginfo_stub_arithmetic_sub2b, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub2b, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub3, arginfo_stub_arithmetic_sub3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub4, arginfo_stub_arithmetic_sub4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub5, arginfo_stub_arithmetic_sub5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub6, arginfo_stub_arithmetic_sub6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub7, arginfo_stub_arithmetic_sub7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub8, arginfo_stub_arithmetic_sub8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub8b, arginfo_stub_arithmetic_sub8b, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub8b, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub9, arginfo_stub_arithmetic_sub9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub10, arginfo_stub_arithmetic_sub10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub11, arginfo_stub_arithmetic_sub11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub11, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub12, arginfo_stub_arithmetic_sub12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub12, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub13, arginfo_stub_arithmetic_sub13, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub13, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub14, arginfo_stub_arithmetic_sub14, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub14, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub15, arginfo_stub_arithmetic_sub15, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub15, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub16, arginfo_stub_arithmetic_sub16, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub16, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub17, arginfo_stub_arithmetic_sub17, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub17, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub18, arginfo_stub_arithmetic_sub18, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub18, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub19, arginfo_stub_arithmetic_sub19, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub19, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub20, arginfo_stub_arithmetic_sub20, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub20, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub21, arginfo_stub_arithmetic_sub21, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub21, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub22, arginfo_stub_arithmetic_sub22, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub22, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, sub23, arginfo_stub_arithmetic_sub23, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, sub23, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Arithmetic, intSub, arginfo_stub_arithmetic_intsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intLetSub, arginfo_stub_arithmetic_intletsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intSub2, arginfo_stub_arithmetic_intsub2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intSubSimple, arginfo_stub_arithmetic_intsubsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, boolSub, arginfo_stub_arithmetic_boolsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, bool2Sub, arginfo_stub_arithmetic_bool2sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, bool3Sub, arginfo_stub_arithmetic_bool3sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, bool4Sub, arginfo_stub_arithmetic_bool4sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, boolSubSimple, arginfo_stub_arithmetic_boolsubsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSub, arginfo_stub_arithmetic_doublesub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, double2Sub, arginfo_stub_arithmetic_double2sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSubSimple, arginfo_stub_arithmetic_doublesubsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleSub2Simple, arginfo_stub_arithmetic_doublesub2simple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, varSub, arginfo_stub_arithmetic_varsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, varSubSimple, arginfo_stub_arithmetic_varsubsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intDoubleSub, arginfo_stub_arithmetic_intdoublesub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intDoubleSubSimple, arginfo_stub_arithmetic_intdoublesubsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleIntSub, arginfo_stub_arithmetic_doubleintsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, doubleIntSubSimple, arginfo_stub_arithmetic_doubleintsubsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, varIntSub, arginfo_stub_arithmetic_varintsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intVarSub, arginfo_stub_arithmetic_intvarsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intVarImplicitCastSub, arginfo_stub_arithmetic_intvarimplicitcastsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, intVarImplicitCast2Sub, arginfo_stub_arithmetic_intvarimplicitcast2sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complexSub, arginfo_stub_arithmetic_complexsub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex2Sub, arginfo_stub_arithmetic_complex2sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex3Sub, arginfo_stub_arithmetic_complex3sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex4Sub, arginfo_stub_arithmetic_complex4sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex5Sub, arginfo_stub_arithmetic_complex5sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex6Sub, arginfo_stub_arithmetic_complex6sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex7Sub, arginfo_stub_arithmetic_complex7sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex9Sub, arginfo_stub_arithmetic_complex9sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex10Sub, arginfo_stub_arithmetic_complex10sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex11Sub, arginfo_stub_arithmetic_complex11sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex12Sub, arginfo_stub_arithmetic_complex12sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex13Sub, arginfo_stub_arithmetic_complex13sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex14Sub, arginfo_stub_arithmetic_complex14sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex15Sub, arginfo_stub_arithmetic_complex15sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex16Sub, arginfo_stub_arithmetic_complex16sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex17Sub, arginfo_stub_arithmetic_complex17sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex18Sub, arginfo_stub_arithmetic_complex18sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex19Sub, arginfo_stub_arithmetic_complex19sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex20Sub, arginfo_stub_arithmetic_complex20sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex21Sub, arginfo_stub_arithmetic_complex21sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex22Sub, arginfo_stub_arithmetic_complex22sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex23Sub, arginfo_stub_arithmetic_complex23sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, complex24Sub, arginfo_stub_arithmetic_complex24sub, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub1, arginfo_stub_arithmetic_sub1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub2, arginfo_stub_arithmetic_sub2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub2b, arginfo_stub_arithmetic_sub2b, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub3, arginfo_stub_arithmetic_sub3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub4, arginfo_stub_arithmetic_sub4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub5, arginfo_stub_arithmetic_sub5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub6, arginfo_stub_arithmetic_sub6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub7, arginfo_stub_arithmetic_sub7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub8, arginfo_stub_arithmetic_sub8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub8b, arginfo_stub_arithmetic_sub8b, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub9, arginfo_stub_arithmetic_sub9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub10, arginfo_stub_arithmetic_sub10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub11, arginfo_stub_arithmetic_sub11, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub12, arginfo_stub_arithmetic_sub12, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub13, arginfo_stub_arithmetic_sub13, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub14, arginfo_stub_arithmetic_sub14, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub15, arginfo_stub_arithmetic_sub15, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub16, arginfo_stub_arithmetic_sub16, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub17, arginfo_stub_arithmetic_sub17, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub18, arginfo_stub_arithmetic_sub18, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub19, arginfo_stub_arithmetic_sub19, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub20, arginfo_stub_arithmetic_sub20, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub21, arginfo_stub_arithmetic_sub21, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub22, arginfo_stub_arithmetic_sub22, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, sub23, arginfo_stub_arithmetic_sub23, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, sub24, arginfo_stub_arithmetic_sub24, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, mul1, arginfo_stub_arithmetic_mul1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, mul1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Arithmetic, mul1, arginfo_stub_arithmetic_mul1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, mul2, arginfo_stub_arithmetic_mul2, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, mul3, arginfo_stub_arithmetic_mul3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, mul3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, less1, arginfo_stub_arithmetic_less1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, less1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, less2, arginfo_stub_arithmetic_less2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, less2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Arithmetic, mul3, arginfo_stub_arithmetic_mul3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, less1, arginfo_stub_arithmetic_less1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, less2, arginfo_stub_arithmetic_less2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, less3, arginfo_stub_arithmetic_less3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, less4, arginfo_stub_arithmetic_less4, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, greater1, arginfo_stub_arithmetic_greater1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, greater1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, greater2, arginfo_stub_arithmetic_greater2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, greater2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Arithmetic, greater1, arginfo_stub_arithmetic_greater1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, greater2, arginfo_stub_arithmetic_greater2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, greater3, arginfo_stub_arithmetic_greater3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, greater4, arginfo_stub_arithmetic_greater4, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, letStatementIntMinus, arginfo_stub_arithmetic_letstatementintminus, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, letStatementIntMinus, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, declaredIntMinus, arginfo_stub_arithmetic_declaredintminus, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, declaredIntMinus, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Arithmetic, letStatementIntMinus, arginfo_stub_arithmetic_letstatementintminus, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, declaredIntMinus, arginfo_stub_arithmetic_declaredintminus, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, letStatementBoolMinus, arginfo_stub_arithmetic_letstatementboolminus, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, letStatementVarMinus, arginfo_stub_arithmetic_letstatementvarminus, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, div1, arginfo_stub_arithmetic_div1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, div1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Arithmetic, div2, arginfo_stub_arithmetic_div2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Arithmetic, div2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Arithmetic, div1, arginfo_stub_arithmetic_div1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Arithmetic, div2, arginfo_stub_arithmetic_div2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, absParam, arginfo_stub_arithmetic_absparam, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, negativeInt, arginfo_stub_arithmetic_negativeint, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Arithmetic, negativeLong, arginfo_stub_arithmetic_negativelong, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/arrayaccessarr.zep.c b/ext/stub/arrayaccessarr.zep.c
index e498d4e969..9e7a20078f 100644
--- a/ext/stub/arrayaccessarr.zep.c
+++ b/ext/stub/arrayaccessarr.zep.c
@@ -54,13 +54,10 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetSet)
 
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(offset)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &offset, &value);
@@ -81,12 +78,9 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetExists)
 
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
@@ -104,12 +98,9 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetUnset)
 
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
@@ -131,12 +122,9 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetGet)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/arrayaccessarr.zep.h b/ext/stub/arrayaccessarr.zep.h
index a57fea4256..aa15473bba 100644
--- a/ext/stub/arrayaccessarr.zep.h
+++ b/ext/stub/arrayaccessarr.zep.h
@@ -27,20 +27,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccessarr_offsetunset,
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccessarr_offsetget, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_arrayaccessarr_offsetget, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_arrayaccessarr_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ArrayAccessArr, __construct, arginfo_stub_arrayaccessarr___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_ArrayAccessArr, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_ArrayAccessArr, __construct, arginfo_stub_arrayaccessarr___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_ArrayAccessArr, offsetSet, arginfo_stub_arrayaccessarr_offsetset, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayAccessArr, offsetExists, arginfo_stub_arrayaccessarr_offsetexists, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayAccessArr, offsetUnset, arginfo_stub_arrayaccessarr_offsetunset, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/arrayaccessobj.zep.c b/ext/stub/arrayaccessobj.zep.c
index 5c7fa4dd25..923a9ab603 100644
--- a/ext/stub/arrayaccessobj.zep.c
+++ b/ext/stub/arrayaccessobj.zep.c
@@ -65,20 +65,17 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetSet)
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&obj);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(offset)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 2, 0, &offset, &value);
 
 
-	ZEPHIR_OBS_VAR(&obj);
+	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	if (!(Z_TYPE_P(offset) == IS_NULL)) {
 		zephir_update_property_zval_zval(&obj, offset, value);
@@ -96,19 +93,16 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&obj);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 1, 0, &offset);
 
 
-	ZEPHIR_OBS_VAR(&obj);
+	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	RETURN_MM_BOOL(zephir_isset_property_zval(&obj, offset));
 }
@@ -124,19 +118,16 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetUnset)
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&obj);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 1, 0, &offset);
 
 
-	ZEPHIR_OBS_VAR(&obj);
+	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	zephir_get_arrval(&_0, &obj);
 	ZEPHIR_CPY_WRT(&obj, &_0);
@@ -157,12 +148,9 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetGet)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -172,7 +160,7 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetGet)
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_isset_property_zval(&_1, offset)) {
-		ZEPHIR_OBS_VAR(&_2);
+		zephir_memory_observe(&_2);
 		zephir_read_property(&_2, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 		zephir_read_property_zval(&_0, &_2, offset, PH_NOISY_CC);
 	} else {
diff --git a/ext/stub/arrayaccessobj.zep.h b/ext/stub/arrayaccessobj.zep.h
index 590a96238b..6771b56479 100644
--- a/ext/stub/arrayaccessobj.zep.h
+++ b/ext/stub/arrayaccessobj.zep.h
@@ -27,20 +27,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccessobj_offsetunset,
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccessobj_offsetget, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_arrayaccessobj_offsetget, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, offset)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_arrayaccessobj_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ArrayAccessObj, __construct, arginfo_stub_arrayaccessobj___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_ArrayAccessObj, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_ArrayAccessObj, __construct, arginfo_stub_arrayaccessobj___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_ArrayAccessObj, offsetSet, arginfo_stub_arrayaccessobj_offsetset, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayAccessObj, offsetExists, arginfo_stub_arrayaccessobj_offsetexists, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayAccessObj, offsetUnset, arginfo_stub_arrayaccessobj_offsetunset, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/arrayaccesstest.zep.c b/ext/stub/arrayaccesstest.zep.c
index c1df0c7072..087897b422 100644
--- a/ext/stub/arrayaccesstest.zep.c
+++ b/ext/stub/arrayaccesstest.zep.c
@@ -83,13 +83,10 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 
 	ZVAL_UNDEF(&key);
 	ZVAL_UNDEF(&data);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(key)
 		Z_PARAM_ARRAY(data)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -121,13 +118,10 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 	ZVAL_UNDEF(&key);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&dataFromProperty);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(key)
 		Z_PARAM_ARRAY(dataFromProperty)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -169,7 +163,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue645)
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_0);
-	ZEPHIR_OBS_VAR(&_1);
+	zephir_memory_observe(&_1);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("data"), PH_NOISY_CC);
 	RETURN_CCTOR(&_1);
 }
@@ -216,13 +210,11 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test1)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&items);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -246,13 +238,11 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&items);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -277,13 +267,11 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&items);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -311,12 +299,9 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086Strict)
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(params)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -369,12 +354,9 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086NotStrictParams)
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(params)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/arrayaccesstest.zep.h b/ext/stub/arrayaccesstest.zep.h
index 4a4542a78e..90389bfe7a 100644
--- a/ext/stub/arrayaccesstest.zep.h
+++ b/ext/stub/arrayaccesstest.zep.h
@@ -44,27 +44,15 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccesstest_issue1155,
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccesstest_issue1094test1, 0, 0, _IS_BOOL, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, items, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, items, 1)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, items, IS_ARRAY, 1, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccesstest_issue1094test2, 0, 0, _IS_BOOL, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, items, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, items, 1)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, items, IS_ARRAY, 1, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayaccesstest_issue1094test3, 0, 0, _IS_BOOL, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, items, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, items, 1)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, items, IS_ARRAY, 1, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_arrayaccesstest_issue1086strict, 0, 0, 1)
@@ -94,16 +82,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_arrayaccesstest_zephir_init_properties_stub_
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_arrayaccesstest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ArrayAccessTest, exits, arginfo_stub_arrayaccesstest_exits, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_ArrayAccessTest, exits, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ArrayAccessTest, get, arginfo_stub_arrayaccesstest_get, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_ArrayAccessTest, get, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_ArrayAccessTest, exits, arginfo_stub_arrayaccesstest_exits, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_ArrayAccessTest, get, arginfo_stub_arrayaccesstest_get, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_ArrayAccessTest, unsetByKeyFromArray, arginfo_stub_arrayaccesstest_unsetbykeyfromarray, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayAccessTest, unsetByKeyFromProperty, arginfo_stub_arrayaccesstest_unsetbykeyfromproperty, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayAccessTest, issue645, arginfo_stub_arrayaccesstest_issue645, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/arrayiterator.zep.c b/ext/stub/arrayiterator.zep.c
index 6845cdb52f..17987551a2 100644
--- a/ext/stub/arrayiterator.zep.c
+++ b/ext/stub/arrayiterator.zep.c
@@ -87,7 +87,7 @@ PHP_METHOD(Stub_ArrayIterator, current)
 	ZEPHIR_MM_GROW();
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_OBS_VAR(&_2);
+	zephir_memory_observe(&_2);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("position"), PH_NOISY_CC);
 	zephir_array_fetch(&_1, &_0, &_2, PH_NOISY | PH_READONLY, "stub/arrayiterator.zep", 25);
 	RETURN_CTOR(&_1);
diff --git a/ext/stub/arrayiterator.zep.h b/ext/stub/arrayiterator.zep.h
index f912b09eb7..6fe2566171 100644
--- a/ext/stub/arrayiterator.zep.h
+++ b/ext/stub/arrayiterator.zep.h
@@ -16,18 +16,10 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayiterator_rewind, 0, 0, IS_VOID, 0)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayiterator_current, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_arrayiterator_current, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayiterator_key, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_arrayiterator_key, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayiterator_next, 0, 0, IS_VOID, 0)
@@ -37,11 +29,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_arrayiterator_valid, 0, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_arrayiterator_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ArrayIterator, __construct, arginfo_stub_arrayiterator___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_ArrayIterator, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_ArrayIterator, __construct, arginfo_stub_arrayiterator___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_ArrayIterator, rewind, arginfo_stub_arrayiterator_rewind, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayIterator, current, arginfo_stub_arrayiterator_current, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ArrayIterator, key, arginfo_stub_arrayiterator_key, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/arrayiteratortest.zep.h b/ext/stub/arrayiteratortest.zep.h
index 033327a2d3..d458b8c7da 100644
--- a/ext/stub/arrayiteratortest.zep.h
+++ b/ext/stub/arrayiteratortest.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_arrayiteratortest_test, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_arrayiteratortest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ArrayIteratorTest, test, arginfo_stub_arrayiteratortest_test, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_ArrayIteratorTest, test, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_ArrayIteratorTest, test, arginfo_stub_arrayiteratortest_test, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/arraysearch.zep.c b/ext/stub/arraysearch.zep.c
index a988b1119e..091e2a7ecb 100644
--- a/ext/stub/arraysearch.zep.c
+++ b/ext/stub/arraysearch.zep.c
@@ -39,15 +39,12 @@ PHP_METHOD(Stub_ArraySearch, simpleSearch)
 	ZVAL_UNDEF(&needle_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&haystack);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 3)
 		Z_PARAM_ZVAL(needle)
 		Z_PARAM_ARRAY(haystack)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(strict)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/arraysearch.zep.h b/ext/stub/arraysearch.zep.h
index d34e1d8511..f71f0393f1 100644
--- a/ext/stub/arraysearch.zep.h
+++ b/ext/stub/arraysearch.zep.h
@@ -17,10 +17,6 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_arraysearch_method_entry) {
 	PHP_ME(Stub_ArraySearch, simpleSearch, arginfo_stub_arraysearch_simplesearch, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ArraySearch, searchUsingArrayInsideZephir, arginfo_stub_arraysearch_searchusingarrayinsidezephir, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ArraySearch, searchUsingArrayInsideZephir, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_ArraySearch, searchUsingArrayInsideZephir, arginfo_stub_arraysearch_searchusingarrayinsidezephir, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/assign.zep.c b/ext/stub/assign.zep.c
index bb7cae62a4..768a96c410 100644
--- a/ext/stub/assign.zep.c
+++ b/ext/stub/assign.zep.c
@@ -576,12 +576,9 @@ PHP_METHOD(Stub_Assign, testAssign38)
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -655,12 +652,9 @@ PHP_METHOD(Stub_Assign, testAssign41)
 	zend_long num, a = 0;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -681,12 +675,9 @@ PHP_METHOD(Stub_Assign, testAssign42)
 	zend_long num, a = 0;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -704,12 +695,9 @@ PHP_METHOD(Stub_Assign, testAssign43)
 	zend_long num, a = 0;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -727,12 +715,9 @@ PHP_METHOD(Stub_Assign, testAssign44)
 	zend_long num, a = 0;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -1217,12 +1202,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray4)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1266,12 +1248,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray5)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1390,12 +1369,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray8)
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1438,12 +1414,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray9)
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1488,12 +1461,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray10)
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1540,12 +1510,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray11)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1593,12 +1560,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray12)
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_6);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1614,9 +1578,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray12)
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("zza"), 3, index, index);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_OBS_VAR(&temp1);
+	zephir_memory_observe(&temp1);
 	zephir_array_fetch(&temp1, &_2, index, PH_NOISY, "stub/assign.zep", 657);
-	ZEPHIR_OBS_VAR(&temp2);
+	zephir_memory_observe(&temp2);
 	zephir_read_property(&temp2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("zza"), 3, index, index);
 	ZEPHIR_INIT_VAR(&_3);
@@ -1654,12 +1618,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray13)
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_6);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1675,9 +1636,9 @@ PHP_METHOD(Stub_Assign, testPropertyArray13)
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("za"), 2, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("za"), 2, index);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_OBS_VAR(&temp1);
+	zephir_memory_observe(&temp1);
 	zephir_array_fetch(&temp1, &_2, index, PH_NOISY, "stub/assign.zep", 674);
-	ZEPHIR_OBS_VAR(&temp2);
+	zephir_memory_observe(&temp2);
 	zephir_read_property(&temp2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("za"), 2, index);
 	ZEPHIR_INIT_VAR(&_3);
@@ -1942,12 +1903,9 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2108,12 +2066,9 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli3)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2245,13 +2200,10 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&a);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2273,13 +2225,10 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_POST);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2301,13 +2250,10 @@ PHP_METHOD(Stub_Assign, testArrayProperty)
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_POST);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2331,13 +2277,10 @@ PHP_METHOD(Stub_Assign, testGlobalVarAssign)
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_POST);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_get_global(&_POST, SL("_POST"));
@@ -2421,13 +2364,10 @@ PHP_METHOD(Stub_Assign, testAssignBitwiseX)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/assign.zep.h b/ext/stub/assign.zep.h
index 9a46eec1ef..f234b6b4e0 100644
--- a/ext/stub/assign.zep.h
+++ b/ext/stub/assign.zep.h
@@ -406,16 +406,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_assign_issue597, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_assign_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, getTestVar, arginfo_stub_assign_gettestvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, getTestVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, getMyArray, arginfo_stub_assign_getmyarray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, getMyArray, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, getTestVar, arginfo_stub_assign_gettestvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, getMyArray, arginfo_stub_assign_getmyarray, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testAssign1, arginfo_stub_assign_testassign1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testAssign2, arginfo_stub_assign_testassign2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testAssign3, arginfo_stub_assign_testassign3, ZEND_ACC_PUBLIC)
@@ -460,185 +452,53 @@ ZEPHIR_INIT_FUNCS(stub_assign_method_entry) {
 	PHP_ME(Stub_Assign, testAssign42, arginfo_stub_assign_testassign42, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testAssign43, arginfo_stub_assign_testassign43, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testAssign44, arginfo_stub_assign_testassign44, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyAssign1, arginfo_stub_assign_testpropertyassign1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyAssign1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyAssign2, arginfo_stub_assign_testpropertyassign2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyAssign2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyIncr1, arginfo_stub_assign_testpropertyincr1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyIncr1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyAddAssign1, arginfo_stub_assign_testpropertyaddassign1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyAddAssign1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyAddAssign2, arginfo_stub_assign_testpropertyaddassign2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyAddAssign2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyAssignValuePlus1, arginfo_stub_assign_testpropertyassignvalueplus1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyAssignValuePlus1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyDecr, arginfo_stub_assign_testpropertydecr, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyDecr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertySubAssign1, arginfo_stub_assign_testpropertysubassign1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertySubAssign1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertySubAssign2, arginfo_stub_assign_testpropertysubassign2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertySubAssign2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyMulAssign1, arginfo_stub_assign_testpropertymulassign1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyMulAssign1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyMulAssign2, arginfo_stub_assign_testpropertymulassign2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyMulAssign2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyAssignStringConcat, arginfo_stub_assign_testpropertyassignstringconcat, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyAssignStringConcat, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyArray1, arginfo_stub_assign_testpropertyarray1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyArray1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyArray2, arginfo_stub_assign_testpropertyarray2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyArray2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyArray3, arginfo_stub_assign_testpropertyarray3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyArray3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, testPropertyAssign1, arginfo_stub_assign_testpropertyassign1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyAssign2, arginfo_stub_assign_testpropertyassign2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyIncr1, arginfo_stub_assign_testpropertyincr1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyAddAssign1, arginfo_stub_assign_testpropertyaddassign1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyAddAssign2, arginfo_stub_assign_testpropertyaddassign2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyAssignValuePlus1, arginfo_stub_assign_testpropertyassignvalueplus1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyDecr, arginfo_stub_assign_testpropertydecr, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertySubAssign1, arginfo_stub_assign_testpropertysubassign1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertySubAssign2, arginfo_stub_assign_testpropertysubassign2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyMulAssign1, arginfo_stub_assign_testpropertymulassign1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyMulAssign2, arginfo_stub_assign_testpropertymulassign2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyAssignStringConcat, arginfo_stub_assign_testpropertyassignstringconcat, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyArray1, arginfo_stub_assign_testpropertyarray1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyArray2, arginfo_stub_assign_testpropertyarray2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyArray3, arginfo_stub_assign_testpropertyarray3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray4, arginfo_stub_assign_testpropertyarray4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray5, arginfo_stub_assign_testpropertyarray5, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyArray6, arginfo_stub_assign_testpropertyarray6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyArray6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyArray7, arginfo_stub_assign_testpropertyarray7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyArray7, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, testPropertyArray6, arginfo_stub_assign_testpropertyarray6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testPropertyArray7, arginfo_stub_assign_testpropertyarray7, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray8, arginfo_stub_assign_testpropertyarray8, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray9, arginfo_stub_assign_testpropertyarray9, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray10, arginfo_stub_assign_testpropertyarray10, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray11, arginfo_stub_assign_testpropertyarray11, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray12, arginfo_stub_assign_testpropertyarray12, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testPropertyArray13, arginfo_stub_assign_testpropertyarray13, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testPropertyArray14, arginfo_stub_assign_testpropertyarray14, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testPropertyArray14, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyAssign1, arginfo_stub_assign_teststaticpropertyassign1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyAssign1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyAssign2, arginfo_stub_assign_teststaticpropertyassign2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyAssign2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyArray1, arginfo_stub_assign_teststaticpropertyarray1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyArray1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyArray2, arginfo_stub_assign_teststaticpropertyarray2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyArray2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, testPropertyArray14, arginfo_stub_assign_testpropertyarray14, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testStaticPropertyAssign1, arginfo_stub_assign_teststaticpropertyassign1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testStaticPropertyAssign2, arginfo_stub_assign_teststaticpropertyassign2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testStaticPropertyArray1, arginfo_stub_assign_teststaticpropertyarray1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testStaticPropertyArray2, arginfo_stub_assign_teststaticpropertyarray2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testStaticPropertyArray3, arginfo_stub_assign_teststaticpropertyarray3, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyArrayAppend, arginfo_stub_assign_teststaticpropertyarrayappend, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyArrayAppend, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyArrayMutli1, arginfo_stub_assign_teststaticpropertyarraymutli1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyArrayMutli1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyArrayMutli2, arginfo_stub_assign_teststaticpropertyarraymutli2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyArrayMutli2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, testStaticPropertyArrayAppend, arginfo_stub_assign_teststaticpropertyarrayappend, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testStaticPropertyArrayMutli1, arginfo_stub_assign_teststaticpropertyarraymutli1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testStaticPropertyArrayMutli2, arginfo_stub_assign_teststaticpropertyarraymutli2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testStaticPropertyArrayMutli3, arginfo_stub_assign_teststaticpropertyarraymutli3, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyArrayMulti4, arginfo_stub_assign_teststaticpropertyarraymulti4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyArrayMulti4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testStaticPropertyArrayAppend1, arginfo_stub_assign_teststaticpropertyarrayappend1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testStaticPropertyArrayAppend1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, testStaticPropertyArrayMulti4, arginfo_stub_assign_teststaticpropertyarraymulti4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testStaticPropertyArrayAppend1, arginfo_stub_assign_teststaticpropertyarrayappend1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testArrayVarAssign1, arginfo_stub_assign_testarrayvarassign1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testArrayVarAssign2, arginfo_stub_assign_testarrayvarassign2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testArrayProperty, arginfo_stub_assign_testarrayproperty, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testGlobalVarAssign, arginfo_stub_assign_testglobalvarassign, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testConstantKeyAssign, arginfo_stub_assign_testconstantkeyassign, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testConstantKeyAssign, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testArrayBoolExpressionAssign, arginfo_stub_assign_testarrayboolexpressionassign, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testArrayBoolExpressionAssign, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, testConstantKeyAssign, arginfo_stub_assign_testconstantkeyassign, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testArrayBoolExpressionAssign, arginfo_stub_assign_testarrayboolexpressionassign, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Assign, testAssignBitwiseX, arginfo_stub_assign_testassignbitwisex, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testAssignSuperGlobals, arginfo_stub_assign_testassignsuperglobals, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testAssignSuperGlobals, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testAssignSuperGlobalsSERVER, arginfo_stub_assign_testassignsuperglobalsserver, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testAssignSuperGlobalsSERVER, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, testAssignSuperGlobalsGET, arginfo_stub_assign_testassignsuperglobalsget, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, testAssignSuperGlobalsGET, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Assign, issue597, arginfo_stub_assign_issue597, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Assign, issue597, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Assign, testAssignSuperGlobals, arginfo_stub_assign_testassignsuperglobals, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testAssignSuperGlobalsSERVER, arginfo_stub_assign_testassignsuperglobalsserver, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, testAssignSuperGlobalsGET, arginfo_stub_assign_testassignsuperglobalsget, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Assign, issue597, arginfo_stub_assign_issue597, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/bench/foo.zep.c b/ext/stub/bench/foo.zep.c
index 4e3cc024fd..ae53455d0f 100644
--- a/ext/stub/bench/foo.zep.c
+++ b/ext/stub/bench/foo.zep.c
@@ -40,12 +40,9 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -84,12 +81,9 @@ PHP_METHOD(Stub_Bench_Foo, readStatic)
 	ZVAL_UNDEF(&x);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -130,12 +124,9 @@ PHP_METHOD(Stub_Bench_Foo, writeStatic)
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -176,12 +167,9 @@ PHP_METHOD(Stub_Bench_Foo, issetStatic)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -221,12 +209,9 @@ PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -268,12 +253,9 @@ PHP_METHOD(Stub_Bench_Foo, readProp)
 	ZVAL_UNDEF(&x);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -313,12 +295,9 @@ PHP_METHOD(Stub_Bench_Foo, writeProp)
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -361,12 +340,9 @@ PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -425,12 +401,9 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -469,12 +442,9 @@ PHP_METHOD(Stub_Bench_Foo, postDecProp)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -513,12 +483,9 @@ PHP_METHOD(Stub_Bench_Foo, issetProp)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -558,12 +525,9 @@ PHP_METHOD(Stub_Bench_Foo, emptyProp)
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -613,12 +577,9 @@ PHP_METHOD(Stub_Bench_Foo, call)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -676,12 +637,9 @@ PHP_METHOD(Stub_Bench_Foo, scall)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -722,12 +680,9 @@ PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -768,12 +723,9 @@ PHP_METHOD(Stub_Bench_Foo, readConst)
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&x);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/bench/foo.zep.h b/ext/stub/bench/foo.zep.h
index e138460b1d..a03af29b58 100644
--- a/ext/stub/bench/foo.zep.h
+++ b/ext/stub/bench/foo.zep.h
@@ -109,11 +109,7 @@ ZEPHIR_INIT_FUNCS(stub_bench_foo_method_entry) {
 	PHP_ME(Stub_Bench_Foo, postDecProp, arginfo_stub_bench_foo_postdecprop, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bench_Foo, issetProp, arginfo_stub_bench_foo_issetprop, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bench_Foo, emptyProp, arginfo_stub_bench_foo_emptyprop, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bench_Foo, g, arginfo_stub_bench_foo_g, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bench_Foo, g, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Bench_Foo, g, arginfo_stub_bench_foo_g, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bench_Foo, call, arginfo_stub_bench_foo_call, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bench_Foo, staticMethod, arginfo_stub_bench_foo_staticmethod, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bench_Foo, staticMethod1, arginfo_stub_bench_foo_staticmethod1, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
diff --git a/ext/stub/bitwise.zep.c b/ext/stub/bitwise.zep.c
index 8e36c8a37f..52e268ff2d 100644
--- a/ext/stub/bitwise.zep.c
+++ b/ext/stub/bitwise.zep.c
@@ -1404,12 +1404,9 @@ PHP_METHOD(Stub_Bitwise, testBitwiseNot)
 	zend_long a;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
@@ -1425,13 +1422,10 @@ PHP_METHOD(Stub_Bitwise, testBitwiseAndNot)
 	zend_long a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
@@ -1448,12 +1442,9 @@ PHP_METHOD(Stub_Bitwise, getInt)
 	zend_long num;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
diff --git a/ext/stub/bitwise.zep.h b/ext/stub/bitwise.zep.h
index cc94f5ccdc..7aebc38e11 100644
--- a/ext/stub/bitwise.zep.h
+++ b/ext/stub/bitwise.zep.h
@@ -405,488 +405,104 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_bitwise_testbitwisexor, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_bitwise_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intAnd, arginfo_stub_bitwise_intand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, int2And, arginfo_stub_bitwise_int2and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, int2And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intAndSimple, arginfo_stub_bitwise_intandsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intAndSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, boolAnd, arginfo_stub_bitwise_booland, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, boolAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, bool2And, arginfo_stub_bitwise_bool2and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, bool2And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, bool3And, arginfo_stub_bitwise_bool3and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, bool3And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, boolAndSimple, arginfo_stub_bitwise_boolandsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, boolAndSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleAnd, arginfo_stub_bitwise_doubleand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, double2And, arginfo_stub_bitwise_double2and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, double2And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleAndSimple, arginfo_stub_bitwise_doubleandsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleAndSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleAnd2Simple, arginfo_stub_bitwise_doubleand2simple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleAnd2Simple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, varAnd, arginfo_stub_bitwise_varand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, varAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, varAndSimple, arginfo_stub_bitwise_varandsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, varAndSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intDoubleAnd, arginfo_stub_bitwise_intdoubleand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intDoubleAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intDoubleAndSimple, arginfo_stub_bitwise_intdoubleandsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intDoubleAndSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleIntAnd, arginfo_stub_bitwise_doubleintand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleIntAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleIntAndSimple, arginfo_stub_bitwise_doubleintandsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleIntAndSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, varIntAnd, arginfo_stub_bitwise_varintand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, varIntAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intVarAnd, arginfo_stub_bitwise_intvarand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intVarAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intVarImplicitCastAnd, arginfo_stub_bitwise_intvarimplicitcastand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intVarImplicitCastAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intVarImplicitCast2And, arginfo_stub_bitwise_intvarimplicitcast2and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intVarImplicitCast2And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complexAnd, arginfo_stub_bitwise_complexand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complexAnd, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex2And, arginfo_stub_bitwise_complex2and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex2And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex3And, arginfo_stub_bitwise_complex3and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex3And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex4And, arginfo_stub_bitwise_complex4and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex4And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex5And, arginfo_stub_bitwise_complex5and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex5And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex6And, arginfo_stub_bitwise_complex6and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex6And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex7And, arginfo_stub_bitwise_complex7and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex7And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex9And, arginfo_stub_bitwise_complex9and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex9And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex10And, arginfo_stub_bitwise_complex10and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex10And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex11And, arginfo_stub_bitwise_complex11and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex11And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex12And, arginfo_stub_bitwise_complex12and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex12And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex13And, arginfo_stub_bitwise_complex13and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex13And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex14And, arginfo_stub_bitwise_complex14and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex14And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex15And, arginfo_stub_bitwise_complex15and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex15And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex16And, arginfo_stub_bitwise_complex16and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex16And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex17And, arginfo_stub_bitwise_complex17and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex17And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex18And, arginfo_stub_bitwise_complex18and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex18And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex19And, arginfo_stub_bitwise_complex19and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex19And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex20And, arginfo_stub_bitwise_complex20and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex20And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex21And, arginfo_stub_bitwise_complex21and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex21And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex22And, arginfo_stub_bitwise_complex22and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex22And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex23And, arginfo_stub_bitwise_complex23and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex23And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex24And, arginfo_stub_bitwise_complex24and, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex24And, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intOr, arginfo_stub_bitwise_intor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, int2Or, arginfo_stub_bitwise_int2or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, int2Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intOrSimple, arginfo_stub_bitwise_intorsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intOrSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, boolOr, arginfo_stub_bitwise_boolor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, boolOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, bool2Or, arginfo_stub_bitwise_bool2or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, bool2Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, bool3Or, arginfo_stub_bitwise_bool3or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, bool3Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, bool4Or, arginfo_stub_bitwise_bool4or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, bool4Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, boolOrSimple, arginfo_stub_bitwise_boolorsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, boolOrSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleOr, arginfo_stub_bitwise_doubleor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, double2Or, arginfo_stub_bitwise_double2or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, double2Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleOrSimple, arginfo_stub_bitwise_doubleorsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleOrSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleOr2Simple, arginfo_stub_bitwise_doubleor2simple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleOr2Simple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, varOr, arginfo_stub_bitwise_varor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, varOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, varOrSimple, arginfo_stub_bitwise_varorsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, varOrSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intDoubleOr, arginfo_stub_bitwise_intdoubleor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intDoubleOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intDoubleOrSimple, arginfo_stub_bitwise_intdoubleorsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intDoubleOrSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleIntOr, arginfo_stub_bitwise_doubleintor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleIntOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, doubleIntOrSimple, arginfo_stub_bitwise_doubleintorsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, doubleIntOrSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, varIntOr, arginfo_stub_bitwise_varintor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, varIntOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intVarOr, arginfo_stub_bitwise_intvaror, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intVarOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intVarImplicitCastOr, arginfo_stub_bitwise_intvarimplicitcastor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intVarImplicitCastOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intVarImplicitCast2Or, arginfo_stub_bitwise_intvarimplicitcast2or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intVarImplicitCast2Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complexOr, arginfo_stub_bitwise_complexor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complexOr, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex2Or, arginfo_stub_bitwise_complex2or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex2Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex3Or, arginfo_stub_bitwise_complex3or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex3Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex4Or, arginfo_stub_bitwise_complex4or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex4Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex5Or, arginfo_stub_bitwise_complex5or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex5Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex6Or, arginfo_stub_bitwise_complex6or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex6Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex7Or, arginfo_stub_bitwise_complex7or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex7Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex9Or, arginfo_stub_bitwise_complex9or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex9Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex10Or, arginfo_stub_bitwise_complex10or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex10Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex11Or, arginfo_stub_bitwise_complex11or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex11Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex12Or, arginfo_stub_bitwise_complex12or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex12Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex13Or, arginfo_stub_bitwise_complex13or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex13Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex14Or, arginfo_stub_bitwise_complex14or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex14Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex15Or, arginfo_stub_bitwise_complex15or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex15Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex16Or, arginfo_stub_bitwise_complex16or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex16Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex17Or, arginfo_stub_bitwise_complex17or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex17Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex18Or, arginfo_stub_bitwise_complex18or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex18Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex19Or, arginfo_stub_bitwise_complex19or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex19Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex20Or, arginfo_stub_bitwise_complex20or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex20Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex21Or, arginfo_stub_bitwise_complex21or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex21Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex22Or, arginfo_stub_bitwise_complex22or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex22Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex23Or, arginfo_stub_bitwise_complex23or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex23Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, complex24Or, arginfo_stub_bitwise_complex24or, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, complex24Or, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intShiftLeft, arginfo_stub_bitwise_intshiftleft, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intShiftLeft, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, int2ShiftLeft, arginfo_stub_bitwise_int2shiftleft, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, int2ShiftLeft, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intShiftLeftSimple, arginfo_stub_bitwise_intshiftleftsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intShiftLeftSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intShiftRight, arginfo_stub_bitwise_intshiftright, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intShiftRight, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, int2ShiftRight, arginfo_stub_bitwise_int2shiftright, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, int2ShiftRight, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, intShiftRightSimple, arginfo_stub_bitwise_intshiftrightsimple, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, intShiftRightSimple, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Bitwise, intAnd, arginfo_stub_bitwise_intand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, int2And, arginfo_stub_bitwise_int2and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intAndSimple, arginfo_stub_bitwise_intandsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, boolAnd, arginfo_stub_bitwise_booland, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, bool2And, arginfo_stub_bitwise_bool2and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, bool3And, arginfo_stub_bitwise_bool3and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, boolAndSimple, arginfo_stub_bitwise_boolandsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleAnd, arginfo_stub_bitwise_doubleand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, double2And, arginfo_stub_bitwise_double2and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleAndSimple, arginfo_stub_bitwise_doubleandsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleAnd2Simple, arginfo_stub_bitwise_doubleand2simple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, varAnd, arginfo_stub_bitwise_varand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, varAndSimple, arginfo_stub_bitwise_varandsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intDoubleAnd, arginfo_stub_bitwise_intdoubleand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intDoubleAndSimple, arginfo_stub_bitwise_intdoubleandsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleIntAnd, arginfo_stub_bitwise_doubleintand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleIntAndSimple, arginfo_stub_bitwise_doubleintandsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, varIntAnd, arginfo_stub_bitwise_varintand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intVarAnd, arginfo_stub_bitwise_intvarand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intVarImplicitCastAnd, arginfo_stub_bitwise_intvarimplicitcastand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intVarImplicitCast2And, arginfo_stub_bitwise_intvarimplicitcast2and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complexAnd, arginfo_stub_bitwise_complexand, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex2And, arginfo_stub_bitwise_complex2and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex3And, arginfo_stub_bitwise_complex3and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex4And, arginfo_stub_bitwise_complex4and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex5And, arginfo_stub_bitwise_complex5and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex6And, arginfo_stub_bitwise_complex6and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex7And, arginfo_stub_bitwise_complex7and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex9And, arginfo_stub_bitwise_complex9and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex10And, arginfo_stub_bitwise_complex10and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex11And, arginfo_stub_bitwise_complex11and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex12And, arginfo_stub_bitwise_complex12and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex13And, arginfo_stub_bitwise_complex13and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex14And, arginfo_stub_bitwise_complex14and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex15And, arginfo_stub_bitwise_complex15and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex16And, arginfo_stub_bitwise_complex16and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex17And, arginfo_stub_bitwise_complex17and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex18And, arginfo_stub_bitwise_complex18and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex19And, arginfo_stub_bitwise_complex19and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex20And, arginfo_stub_bitwise_complex20and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex21And, arginfo_stub_bitwise_complex21and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex22And, arginfo_stub_bitwise_complex22and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex23And, arginfo_stub_bitwise_complex23and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex24And, arginfo_stub_bitwise_complex24and, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intOr, arginfo_stub_bitwise_intor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, int2Or, arginfo_stub_bitwise_int2or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intOrSimple, arginfo_stub_bitwise_intorsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, boolOr, arginfo_stub_bitwise_boolor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, bool2Or, arginfo_stub_bitwise_bool2or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, bool3Or, arginfo_stub_bitwise_bool3or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, bool4Or, arginfo_stub_bitwise_bool4or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, boolOrSimple, arginfo_stub_bitwise_boolorsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleOr, arginfo_stub_bitwise_doubleor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, double2Or, arginfo_stub_bitwise_double2or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleOrSimple, arginfo_stub_bitwise_doubleorsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleOr2Simple, arginfo_stub_bitwise_doubleor2simple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, varOr, arginfo_stub_bitwise_varor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, varOrSimple, arginfo_stub_bitwise_varorsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intDoubleOr, arginfo_stub_bitwise_intdoubleor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intDoubleOrSimple, arginfo_stub_bitwise_intdoubleorsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleIntOr, arginfo_stub_bitwise_doubleintor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, doubleIntOrSimple, arginfo_stub_bitwise_doubleintorsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, varIntOr, arginfo_stub_bitwise_varintor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intVarOr, arginfo_stub_bitwise_intvaror, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intVarImplicitCastOr, arginfo_stub_bitwise_intvarimplicitcastor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intVarImplicitCast2Or, arginfo_stub_bitwise_intvarimplicitcast2or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complexOr, arginfo_stub_bitwise_complexor, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex2Or, arginfo_stub_bitwise_complex2or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex3Or, arginfo_stub_bitwise_complex3or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex4Or, arginfo_stub_bitwise_complex4or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex5Or, arginfo_stub_bitwise_complex5or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex6Or, arginfo_stub_bitwise_complex6or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex7Or, arginfo_stub_bitwise_complex7or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex9Or, arginfo_stub_bitwise_complex9or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex10Or, arginfo_stub_bitwise_complex10or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex11Or, arginfo_stub_bitwise_complex11or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex12Or, arginfo_stub_bitwise_complex12or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex13Or, arginfo_stub_bitwise_complex13or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex14Or, arginfo_stub_bitwise_complex14or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex15Or, arginfo_stub_bitwise_complex15or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex16Or, arginfo_stub_bitwise_complex16or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex17Or, arginfo_stub_bitwise_complex17or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex18Or, arginfo_stub_bitwise_complex18or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex19Or, arginfo_stub_bitwise_complex19or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex20Or, arginfo_stub_bitwise_complex20or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex21Or, arginfo_stub_bitwise_complex21or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex22Or, arginfo_stub_bitwise_complex22or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex23Or, arginfo_stub_bitwise_complex23or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, complex24Or, arginfo_stub_bitwise_complex24or, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intShiftLeft, arginfo_stub_bitwise_intshiftleft, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, int2ShiftLeft, arginfo_stub_bitwise_int2shiftleft, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intShiftLeftSimple, arginfo_stub_bitwise_intshiftleftsimple, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intShiftRight, arginfo_stub_bitwise_intshiftright, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, int2ShiftRight, arginfo_stub_bitwise_int2shiftright, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Bitwise, intShiftRightSimple, arginfo_stub_bitwise_intshiftrightsimple, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bitwise, testBitwiseNot, arginfo_stub_bitwise_testbitwisenot, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bitwise, testBitwiseAndNot, arginfo_stub_bitwise_testbitwiseandnot, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Bitwise, getInt, arginfo_stub_bitwise_getint, ZEND_ACC_PROTECTED)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Bitwise, testbitwiseXor, arginfo_stub_bitwise_testbitwisexor, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Bitwise, testbitwiseXor, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Bitwise, testbitwiseXor, arginfo_stub_bitwise_testbitwisexor, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/branchprediction.zep.c b/ext/stub/branchprediction.zep.c
index b0015f76f7..c70b759828 100644
--- a/ext/stub/branchprediction.zep.c
+++ b/ext/stub/branchprediction.zep.c
@@ -46,12 +46,9 @@ PHP_METHOD(Stub_BranchPrediction, testLikely2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -83,12 +80,9 @@ PHP_METHOD(Stub_BranchPrediction, testUnlikely2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/branchprediction.zep.h b/ext/stub/branchprediction.zep.h
index 7ba6de0329..51baccee75 100644
--- a/ext/stub/branchprediction.zep.h
+++ b/ext/stub/branchprediction.zep.h
@@ -23,17 +23,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_branchprediction_testunlikely2, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_branchprediction_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BranchPrediction, testLikely1, arginfo_stub_branchprediction_testlikely1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BranchPrediction, testLikely1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_BranchPrediction, testLikely1, arginfo_stub_branchprediction_testlikely1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BranchPrediction, testLikely2, arginfo_stub_branchprediction_testlikely2, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BranchPrediction, testUnlikely1, arginfo_stub_branchprediction_testunlikely1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BranchPrediction, testUnlikely1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_BranchPrediction, testUnlikely1, arginfo_stub_branchprediction_testunlikely1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BranchPrediction, testUnlikely2, arginfo_stub_branchprediction_testunlikely2, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/builtin/arraymethods.zep.h b/ext/stub/builtin/arraymethods.zep.h
index 1e49dcbfc5..74d59029af 100644
--- a/ext/stub/builtin/arraymethods.zep.h
+++ b/ext/stub/builtin/arraymethods.zep.h
@@ -17,20 +17,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_builtin_arraymethods_getmap1, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_builtin_arraymethods_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_ArrayMethods, getJoin1, arginfo_stub_builtin_arraymethods_getjoin1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_ArrayMethods, getJoin1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_ArrayMethods, getReversed1, arginfo_stub_builtin_arraymethods_getreversed1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_ArrayMethods, getReversed1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_ArrayMethods, getMap1, arginfo_stub_builtin_arraymethods_getmap1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_ArrayMethods, getMap1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_BuiltIn_ArrayMethods, getJoin1, arginfo_stub_builtin_arraymethods_getjoin1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_BuiltIn_ArrayMethods, getReversed1, arginfo_stub_builtin_arraymethods_getreversed1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_BuiltIn_ArrayMethods, getMap1, arginfo_stub_builtin_arraymethods_getmap1, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/builtin/charmethods.zep.c b/ext/stub/builtin/charmethods.zep.c
index 0b7ec11017..0b9f2f6e64 100644
--- a/ext/stub/builtin/charmethods.zep.c
+++ b/ext/stub/builtin/charmethods.zep.c
@@ -58,12 +58,9 @@ PHP_METHOD(Stub_BuiltIn_CharMethods, getHexForString)
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/builtin/charmethods.zep.h b/ext/stub/builtin/charmethods.zep.h
index f3576f4dcb..5e2da73c06 100644
--- a/ext/stub/builtin/charmethods.zep.h
+++ b/ext/stub/builtin/charmethods.zep.h
@@ -14,11 +14,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_builtin_charmethods_gethexforstring, 0, 0, 1
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_builtin_charmethods_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_CharMethods, getHex, arginfo_stub_builtin_charmethods_gethex, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_CharMethods, getHex, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_BuiltIn_CharMethods, getHex, arginfo_stub_builtin_charmethods_gethex, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_CharMethods, getHexForString, arginfo_stub_builtin_charmethods_gethexforstring, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/builtin/intmethods.zep.c b/ext/stub/builtin/intmethods.zep.c
index d22227e3cc..5e6aa78394 100644
--- a/ext/stub/builtin/intmethods.zep.c
+++ b/ext/stub/builtin/intmethods.zep.c
@@ -35,12 +35,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -82,12 +79,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getBinary)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -110,12 +104,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getHex)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -138,12 +129,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getOctal)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -167,13 +155,10 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getPow)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(num)
 		Z_PARAM_LONG(exp)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -196,12 +181,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getSqrt)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -221,12 +203,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getExp)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -247,12 +226,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getSin)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -270,12 +246,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getCos)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -293,12 +266,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getTan)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -318,12 +288,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -346,12 +313,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -374,12 +338,9 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -405,14 +366,11 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_LONG(num)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(base)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/builtin/intmethods.zep.h b/ext/stub/builtin/intmethods.zep.h
index f73dae4ad3..d30f4ead49 100644
--- a/ext/stub/builtin/intmethods.zep.h
+++ b/ext/stub/builtin/intmethods.zep.h
@@ -82,11 +82,7 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_builtin_intmethods_method_entry) {
 	PHP_ME(Stub_BuiltIn_IntMethods, getAbs, arginfo_stub_builtin_intmethods_getabs, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_IntMethods, getAbs1, arginfo_stub_builtin_intmethods_getabs1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_IntMethods, getAbs1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_BuiltIn_IntMethods, getAbs1, arginfo_stub_builtin_intmethods_getabs1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_IntMethods, getBinary, arginfo_stub_builtin_intmethods_getbinary, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_IntMethods, getHex, arginfo_stub_builtin_intmethods_gethex, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_IntMethods, getOctal, arginfo_stub_builtin_intmethods_getoctal, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/builtin/stringmethods.zep.c b/ext/stub/builtin/stringmethods.zep.c
index 03a27c46e5..ab365190ef 100644
--- a/ext/stub/builtin/stringmethods.zep.c
+++ b/ext/stub/builtin/stringmethods.zep.c
@@ -38,14 +38,12 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, camelize)
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -73,14 +71,12 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, uncamelize)
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -153,12 +149,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength4)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -178,12 +171,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength5)
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -206,13 +196,10 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndex)
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&needle);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(needle)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -238,14 +225,11 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 	ZVAL_UNDEF(&needle);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(needle)
 		Z_PARAM_LONG(position)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -289,12 +273,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed1)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -316,12 +297,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLeftTrimmed)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -343,12 +321,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRightTrimmed)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -370,12 +345,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLower)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -397,12 +369,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getUpper)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -425,12 +394,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -452,12 +418,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getUpperFirst)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -481,12 +444,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -510,12 +470,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getMd5)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -538,12 +495,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -566,12 +520,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -594,12 +545,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -623,14 +571,11 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(assoc)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -660,13 +605,10 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -691,12 +633,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -720,13 +659,10 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&del);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(del)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -751,13 +687,10 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 	ZVAL_UNDEF(&left);
 	ZVAL_UNDEF(&right);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(left)
 		Z_PARAM_STR(right)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -782,13 +715,10 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 	ZVAL_UNDEF(&left);
 	ZVAL_UNDEF(&right);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(left)
 		Z_PARAM_STR(right)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -812,12 +742,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -840,12 +767,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getHtmlSpecialChars)
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/builtin/stringmethods.zep.h b/ext/stub/builtin/stringmethods.zep.h
index 22cc2eb3e8..016bbc4d18 100644
--- a/ext/stub/builtin/stringmethods.zep.h
+++ b/ext/stub/builtin/stringmethods.zep.h
@@ -163,30 +163,14 @@ ZEND_END_ARG_INFO()
 ZEPHIR_INIT_FUNCS(stub_builtin_stringmethods_method_entry) {
 	PHP_ME(Stub_BuiltIn_StringMethods, camelize, arginfo_stub_builtin_stringmethods_camelize, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, uncamelize, arginfo_stub_builtin_stringmethods_uncamelize, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_StringMethods, getLength1, arginfo_stub_builtin_stringmethods_getlength1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_StringMethods, getLength1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_StringMethods, getLength2, arginfo_stub_builtin_stringmethods_getlength2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_StringMethods, getLength2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_StringMethods, getLength3, arginfo_stub_builtin_stringmethods_getlength3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_StringMethods, getLength3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_BuiltIn_StringMethods, getLength1, arginfo_stub_builtin_stringmethods_getlength1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_BuiltIn_StringMethods, getLength2, arginfo_stub_builtin_stringmethods_getlength2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_BuiltIn_StringMethods, getLength3, arginfo_stub_builtin_stringmethods_getlength3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, getLength4, arginfo_stub_builtin_stringmethods_getlength4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, getLength5, arginfo_stub_builtin_stringmethods_getlength5, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, getIndex, arginfo_stub_builtin_stringmethods_getindex, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, getIndexWithPosition, arginfo_stub_builtin_stringmethods_getindexwithposition, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_BuiltIn_StringMethods, getTrimmed, arginfo_stub_builtin_stringmethods_gettrimmed, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_BuiltIn_StringMethods, getTrimmed, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_BuiltIn_StringMethods, getTrimmed, arginfo_stub_builtin_stringmethods_gettrimmed, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, getTrimmed1, arginfo_stub_builtin_stringmethods_gettrimmed1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, getLeftTrimmed, arginfo_stub_builtin_stringmethods_getlefttrimmed, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_BuiltIn_StringMethods, getRightTrimmed, arginfo_stub_builtin_stringmethods_getrighttrimmed, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/cast.zep.c b/ext/stub/cast.zep.c
index 0b90c38123..2c9b52b18f 100644
--- a/ext/stub/cast.zep.c
+++ b/ext/stub/cast.zep.c
@@ -258,12 +258,9 @@ PHP_METHOD(Stub_Cast, testIntCastFromParameterString)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1028,12 +1025,9 @@ PHP_METHOD(Stub_Cast, testCastFileResourceToInteger)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&fileName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(fileName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &fileName);
diff --git a/ext/stub/cast.zep.h b/ext/stub/cast.zep.h
index 349ab4b944..a87e6074f9 100644
--- a/ext/stub/cast.zep.h
+++ b/ext/stub/cast.zep.h
@@ -346,51 +346,15 @@ ZEPHIR_INIT_FUNCS(stub_cast_method_entry) {
 	PHP_ME(Stub_Cast, testBooleanCastFromNull, arginfo_stub_cast_testbooleancastfromnull, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Cast, testBooleanCastFromChar, arginfo_stub_cast_testbooleancastfromchar, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Cast, testBooleanCastFromVariableChar, arginfo_stub_cast_testbooleancastfromvariablechar, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromInt, arginfo_stub_cast_testobjectcastfromint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromFloat, arginfo_stub_cast_testobjectcastfromfloat, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromFloat, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromFalse, arginfo_stub_cast_testobjectcastfromfalse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromFalse, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromTrue, arginfo_stub_cast_testobjectcastfromtrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromNull, arginfo_stub_cast_testobjectcastfromnull, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromNull, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromEmptyArray, arginfo_stub_cast_testobjectcastfromemptyarray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromEmptyArray, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromArray, arginfo_stub_cast_testobjectcastfromarray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromArray, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromEmptyString, arginfo_stub_cast_testobjectcastfromemptystring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromEmptyString, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cast, testObjectCastFromString, arginfo_stub_cast_testobjectcastfromstring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cast, testObjectCastFromString, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Cast, testObjectCastFromInt, arginfo_stub_cast_testobjectcastfromint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromFloat, arginfo_stub_cast_testobjectcastfromfloat, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromFalse, arginfo_stub_cast_testobjectcastfromfalse, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromTrue, arginfo_stub_cast_testobjectcastfromtrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromNull, arginfo_stub_cast_testobjectcastfromnull, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromEmptyArray, arginfo_stub_cast_testobjectcastfromemptyarray, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromArray, arginfo_stub_cast_testobjectcastfromarray, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromEmptyString, arginfo_stub_cast_testobjectcastfromemptystring, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cast, testObjectCastFromString, arginfo_stub_cast_testobjectcastfromstring, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Cast, testCastStdinToInteger, arginfo_stub_cast_testcaststdintointeger, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Cast, testCastStdoutToInteger, arginfo_stub_cast_testcaststdouttointeger, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Cast, testCastFileResourceToInteger, arginfo_stub_cast_testcastfileresourcetointeger, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/cblock.zep.h b/ext/stub/cblock.zep.h
index 2787016396..4825236091 100644
--- a/ext/stub/cblock.zep.h
+++ b/ext/stub/cblock.zep.h
@@ -13,15 +13,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_cblock_testcblock2, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_cblock_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cblock, testCblock1, arginfo_stub_cblock_testcblock1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cblock, testCblock1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Cblock, testCblock2, arginfo_stub_cblock_testcblock2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Cblock, testCblock2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Cblock, testCblock1, arginfo_stub_cblock_testcblock1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Cblock, testCblock2, arginfo_stub_cblock_testcblock2, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/chars.zep.c b/ext/stub/chars.zep.c
index be8513a91a..b93aa00964 100644
--- a/ext/stub/chars.zep.c
+++ b/ext/stub/chars.zep.c
@@ -46,12 +46,9 @@ PHP_METHOD(Stub_Chars, sumChars2)
 	char ch, chlower = 0;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(ch)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &ch_param);
@@ -81,12 +78,9 @@ PHP_METHOD(Stub_Chars, diffChars2)
 	char ch, chlower = 0;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(ch)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &ch_param);
diff --git a/ext/stub/closures.zep.c b/ext/stub/closures.zep.c
index ba175fc36d..452096a1ef 100644
--- a/ext/stub/closures.zep.c
+++ b/ext/stub/closures.zep.c
@@ -125,12 +125,9 @@ PHP_METHOD(Stub_Closures, issue1860)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&abc);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(abc)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -179,12 +176,9 @@ PHP_METHOD(Stub_Closures, issue1036SetArgument)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&argument_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(argument)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &argument);
@@ -199,12 +193,9 @@ PHP_METHOD(Stub_Closures, issue1036SetFunction)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&func_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(func)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &func);
diff --git a/ext/stub/closures.zep.h b/ext/stub/closures.zep.h
index c26b65d745..1f61cacc8d 100644
--- a/ext/stub/closures.zep.h
+++ b/ext/stub/closures.zep.h
@@ -60,58 +60,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_closures_issue1036call, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_closures_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, simple1, arginfo_stub_closures_simple1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, simple1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, simple2, arginfo_stub_closures_simple2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, simple2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, simple3, arginfo_stub_closures_simple3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, simple3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, simple4, arginfo_stub_closures_simple4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, simple4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, simple5, arginfo_stub_closures_simple5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, simple5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, arrow1, arginfo_stub_closures_arrow1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, arrow1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, arrow2, arginfo_stub_closures_arrow2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, arrow2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, testUseCommand, arginfo_stub_closures_testusecommand, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, testUseCommand, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Closures, simple1, arginfo_stub_closures_simple1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Closures, simple2, arginfo_stub_closures_simple2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Closures, simple3, arginfo_stub_closures_simple3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Closures, simple4, arginfo_stub_closures_simple4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Closures, simple5, arginfo_stub_closures_simple5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Closures, arrow1, arginfo_stub_closures_arrow1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Closures, arrow2, arginfo_stub_closures_arrow2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Closures, testUseCommand, arginfo_stub_closures_testusecommand, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Closures, issue1860, arginfo_stub_closures_issue1860, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, issue642, arginfo_stub_closures_issue642, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, issue642, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Closures, issue642, arginfo_stub_closures_issue642, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Closures, issue1036SetArgument, arginfo_stub_closures_issue1036setargument, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Closures, issue1036SetFunction, arginfo_stub_closures_issue1036setfunction, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Closures, issue1036Call, arginfo_stub_closures_issue1036call, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Closures, issue1036Call, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Closures, issue1036Call, arginfo_stub_closures_issue1036call, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/compare.zep.c b/ext/stub/compare.zep.c
index 60dacf8819..ad4adeab83 100644
--- a/ext/stub/compare.zep.c
+++ b/ext/stub/compare.zep.c
@@ -34,13 +34,10 @@ PHP_METHOD(Stub_Compare, isLessInt)
 	zend_long a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
@@ -57,13 +54,10 @@ PHP_METHOD(Stub_Compare, isGreaterEqual)
 	zend_long a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
@@ -80,13 +74,10 @@ PHP_METHOD(Stub_Compare, isLessDouble)
 	double a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
@@ -103,12 +94,9 @@ PHP_METHOD(Stub_Compare, isLessThenPi)
 	double a;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
@@ -124,12 +112,9 @@ PHP_METHOD(Stub_Compare, isMoreThenPi)
 	double a;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
@@ -150,12 +135,9 @@ PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -197,12 +179,9 @@ PHP_METHOD(Stub_Compare, testVarEqualsNull)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -220,12 +199,9 @@ PHP_METHOD(Stub_Compare, testNullEqualsVar)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/compare.zep.h b/ext/stub/compare.zep.h
index 71df3fed42..ae2266e855 100644
--- a/ext/stub/compare.zep.h
+++ b/ext/stub/compare.zep.h
@@ -68,20 +68,8 @@ ZEPHIR_INIT_FUNCS(stub_compare_method_entry) {
 	PHP_ME(Stub_Compare, testVarWithStringEquals, arginfo_stub_compare_testvarwithstringequals, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Compare, testVarEqualsNull, arginfo_stub_compare_testvarequalsnull, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Compare, testNullEqualsVar, arginfo_stub_compare_testnullequalsvar, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Compare, testNotIdenticalZeroVar, arginfo_stub_compare_testnotidenticalzerovar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Compare, testNotIdenticalZeroVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Compare, testNotIdenticalZeroInt, arginfo_stub_compare_testnotidenticalzeroint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Compare, testNotIdenticalZeroInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Compare, testNotIdenticalZeroLong, arginfo_stub_compare_testnotidenticalzerolong, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Compare, testNotIdenticalZeroLong, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Compare, testNotIdenticalZeroVar, arginfo_stub_compare_testnotidenticalzerovar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Compare, testNotIdenticalZeroInt, arginfo_stub_compare_testnotidenticalzeroint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Compare, testNotIdenticalZeroLong, arginfo_stub_compare_testnotidenticalzerolong, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/concat.zep.c b/ext/stub/concat.zep.c
index 24f1583fe5..d2e9997af9 100644
--- a/ext/stub/concat.zep.c
+++ b/ext/stub/concat.zep.c
@@ -48,12 +48,9 @@ PHP_METHOD(Stub_Concat, testConcatBySelfProperty)
 
 	ZVAL_UNDEF(&title);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(title)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -157,12 +154,9 @@ PHP_METHOD(Stub_Concat, testConcat4)
 	ZVAL_UNDEF(&query);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -199,12 +193,9 @@ PHP_METHOD(Stub_Concat, testConcat5)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&retval);
 	ZVAL_UNDEF(&left);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(number)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/constants.zep.h b/ext/stub/constants.zep.h
index 1c7f8c870d..d975c181ee 100644
--- a/ext/stub/constants.zep.h
+++ b/ext/stub/constants.zep.h
@@ -105,130 +105,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_constants_teststringpropertywithvarsget, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_constants_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropWsVarsGet, arginfo_stub_constants_getpropwsvarsget, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropWsVarsGet, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC1, arginfo_stub_constants_getpropertyc1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC2, arginfo_stub_constants_getpropertyc2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC3, arginfo_stub_constants_getpropertyc3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC4, arginfo_stub_constants_getpropertyc4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC5, arginfo_stub_constants_getpropertyc5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC6, arginfo_stub_constants_getpropertyc6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC7, arginfo_stub_constants_getpropertyc7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC8, arginfo_stub_constants_getpropertyc8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, getPropertyC9, arginfo_stub_constants_getpropertyc9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, getPropertyC9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testReadConstant, arginfo_stub_constants_testreadconstant, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testReadConstant, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testReadClassConstant1, arginfo_stub_constants_testreadclassconstant1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testReadClassConstant1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testReadClassConstant2, arginfo_stub_constants_testreadclassconstant2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testReadClassConstant2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testReadClassConstant3, arginfo_stub_constants_testreadclassconstant3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testReadClassConstant3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testPHPVersionEnvConstant, arginfo_stub_constants_testphpversionenvconstant, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testPHPVersionEnvConstant, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testClassMagicConstant, arginfo_stub_constants_testclassmagicconstant, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testClassMagicConstant, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testMethodMagicConstant, arginfo_stub_constants_testmethodmagicconstant, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testMethodMagicConstant, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testFunctionMagicConstant, arginfo_stub_constants_testfunctionmagicconstant, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testFunctionMagicConstant, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testNamespaceMagicConstant, arginfo_stub_constants_testnamespacemagicconstant, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testNamespaceMagicConstant, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testDirConstant, arginfo_stub_constants_testdirconstant, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testDirConstant, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testPHPVersionEnvConstantInExpValue, arginfo_stub_constants_testphpversionenvconstantinexpvalue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testPHPVersionEnvConstantInExpValue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testStringDelimiterConstantDoubleQuoted, arginfo_stub_constants_teststringdelimiterconstantdoublequoted, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testStringDelimiterConstantDoubleQuoted, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testStringConstantWithVars, arginfo_stub_constants_teststringconstantwithvars, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testStringConstantWithVars, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testStringPropertyWithVarsAssigned, arginfo_stub_constants_teststringpropertywithvarsassigned, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testStringPropertyWithVarsAssigned, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constants, testStringPropertyWithVarsGet, arginfo_stub_constants_teststringpropertywithvarsget, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constants, testStringPropertyWithVarsGet, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Constants, getPropWsVarsGet, arginfo_stub_constants_getpropwsvarsget, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC1, arginfo_stub_constants_getpropertyc1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC2, arginfo_stub_constants_getpropertyc2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC3, arginfo_stub_constants_getpropertyc3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC4, arginfo_stub_constants_getpropertyc4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC5, arginfo_stub_constants_getpropertyc5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC6, arginfo_stub_constants_getpropertyc6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC7, arginfo_stub_constants_getpropertyc7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC8, arginfo_stub_constants_getpropertyc8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, getPropertyC9, arginfo_stub_constants_getpropertyc9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testReadConstant, arginfo_stub_constants_testreadconstant, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testReadClassConstant1, arginfo_stub_constants_testreadclassconstant1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testReadClassConstant2, arginfo_stub_constants_testreadclassconstant2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testReadClassConstant3, arginfo_stub_constants_testreadclassconstant3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testPHPVersionEnvConstant, arginfo_stub_constants_testphpversionenvconstant, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testClassMagicConstant, arginfo_stub_constants_testclassmagicconstant, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testMethodMagicConstant, arginfo_stub_constants_testmethodmagicconstant, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testFunctionMagicConstant, arginfo_stub_constants_testfunctionmagicconstant, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testNamespaceMagicConstant, arginfo_stub_constants_testnamespacemagicconstant, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testDirConstant, arginfo_stub_constants_testdirconstant, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testPHPVersionEnvConstantInExpValue, arginfo_stub_constants_testphpversionenvconstantinexpvalue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testStringDelimiterConstantDoubleQuoted, arginfo_stub_constants_teststringdelimiterconstantdoublequoted, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testStringConstantWithVars, arginfo_stub_constants_teststringconstantwithvars, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testStringPropertyWithVarsAssigned, arginfo_stub_constants_teststringpropertywithvarsassigned, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Constants, testStringPropertyWithVarsGet, arginfo_stub_constants_teststringpropertywithvarsget, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/constantsinterface.zep.h b/ext/stub/constantsinterface.zep.h
index e9a940d24a..5bd9aa3c65 100644
--- a/ext/stub/constantsinterface.zep.h
+++ b/ext/stub/constantsinterface.zep.h
@@ -53,65 +53,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_constantsinterface_testreadinheritancefromin
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_constantsinterface_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant1, arginfo_stub_constantsinterface_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant2, arginfo_stub_constantsinterface_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant3, arginfo_stub_constantsinterface_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant4, arginfo_stub_constantsinterface_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant5, arginfo_stub_constantsinterface_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant6, arginfo_stub_constantsinterface_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant1, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant2, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant3, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant4, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant5, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant6, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant6, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant1, arginfo_stub_constantsinterface_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant2, arginfo_stub_constantsinterface_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant3, arginfo_stub_constantsinterface_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant4, arginfo_stub_constantsinterface_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant5, arginfo_stub_constantsinterface_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInterfaceConstant6, arginfo_stub_constantsinterface_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant1, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant2, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant3, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant4, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant5, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant6, arginfo_stub_constantsinterface_testreadinheritancefrominterfaceconstant6, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/constantsinterfacea.zep.h b/ext/stub/constantsinterfacea.zep.h
index b332767b6a..95153a5bfd 100644
--- a/ext/stub/constantsinterfacea.zep.h
+++ b/ext/stub/constantsinterfacea.zep.h
@@ -29,35 +29,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_constantsinterfacea_testreadinterfaceconstan
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_constantsinterfacea_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant1, arginfo_stub_constantsinterfacea_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant2, arginfo_stub_constantsinterfacea_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant3, arginfo_stub_constantsinterfacea_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant4, arginfo_stub_constantsinterfacea_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant5, arginfo_stub_constantsinterfacea_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant6, arginfo_stub_constantsinterfacea_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant6, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant1, arginfo_stub_constantsinterfacea_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant2, arginfo_stub_constantsinterfacea_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant3, arginfo_stub_constantsinterfacea_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant4, arginfo_stub_constantsinterfacea_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant5, arginfo_stub_constantsinterfacea_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceA, testReadInterfaceConstant6, arginfo_stub_constantsinterfacea_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/constantsinterfaceb.zep.h b/ext/stub/constantsinterfaceb.zep.h
index a643c4dc33..39c7850cb7 100644
--- a/ext/stub/constantsinterfaceb.zep.h
+++ b/ext/stub/constantsinterfaceb.zep.h
@@ -29,35 +29,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_constantsinterfaceb_testreadinterfaceconstan
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_constantsinterfaceb_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant1, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant2, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant3, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant4, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant5, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant6, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant6, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant1, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant2, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant3, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant4, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant5, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ConstantsInterfaceB, testReadInterfaceConstant6, arginfo_stub_constantsinterfaceb_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/constructors/issue1803.zep.h b/ext/stub/constructors/issue1803.zep.h
index 7b90bbfe28..0ce7ff2525 100644
--- a/ext/stub/constructors/issue1803.zep.h
+++ b/ext/stub/constructors/issue1803.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_constructors_issue1803_issue1803, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_constructors_issue1803_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Constructors_Issue1803, Issue1803, arginfo_stub_constructors_issue1803_issue1803, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Constructors_Issue1803, Issue1803, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Constructors_Issue1803, Issue1803, arginfo_stub_constructors_issue1803_issue1803, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/declaretest.zep.h b/ext/stub/declaretest.zep.h
index bd341be029..7a15c78f67 100644
--- a/ext/stub/declaretest.zep.h
+++ b/ext/stub/declaretest.zep.h
@@ -77,95 +77,23 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_declaretest_testdeclaremcallexpression, 0, 0
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_declaretest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testStringDeclare1, arginfo_stub_declaretest_teststringdeclare1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testStringDeclare1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testStringDeclare2, arginfo_stub_declaretest_teststringdeclare2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testStringDeclare2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare1, arginfo_stub_declaretest_testdeclare1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare2, arginfo_stub_declaretest_testdeclare2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare3, arginfo_stub_declaretest_testdeclare3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare4, arginfo_stub_declaretest_testdeclare4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare5, arginfo_stub_declaretest_testdeclare5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare6, arginfo_stub_declaretest_testdeclare6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare7, arginfo_stub_declaretest_testdeclare7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare8, arginfo_stub_declaretest_testdeclare8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare9, arginfo_stub_declaretest_testdeclare9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare10, arginfo_stub_declaretest_testdeclare10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare11, arginfo_stub_declaretest_testdeclare11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare11, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare12, arginfo_stub_declaretest_testdeclare12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare12, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare13, arginfo_stub_declaretest_testdeclare13, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare13, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare14, arginfo_stub_declaretest_testdeclare14, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare14, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclare15, arginfo_stub_declaretest_testdeclare15, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclare15, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_DeclareTest, testDeclareMcallExpression, arginfo_stub_declaretest_testdeclaremcallexpression, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_DeclareTest, testDeclareMcallExpression, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_DeclareTest, testStringDeclare1, arginfo_stub_declaretest_teststringdeclare1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testStringDeclare2, arginfo_stub_declaretest_teststringdeclare2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare1, arginfo_stub_declaretest_testdeclare1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare2, arginfo_stub_declaretest_testdeclare2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare3, arginfo_stub_declaretest_testdeclare3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare4, arginfo_stub_declaretest_testdeclare4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare5, arginfo_stub_declaretest_testdeclare5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare6, arginfo_stub_declaretest_testdeclare6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare7, arginfo_stub_declaretest_testdeclare7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare8, arginfo_stub_declaretest_testdeclare8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare9, arginfo_stub_declaretest_testdeclare9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare10, arginfo_stub_declaretest_testdeclare10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare11, arginfo_stub_declaretest_testdeclare11, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare12, arginfo_stub_declaretest_testdeclare12, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare13, arginfo_stub_declaretest_testdeclare13, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare14, arginfo_stub_declaretest_testdeclare14, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclare15, arginfo_stub_declaretest_testdeclare15, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_DeclareTest, testDeclareMcallExpression, arginfo_stub_declaretest_testdeclaremcallexpression, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/echoes.zep.h b/ext/stub/echoes.zep.h
index 01b93baf47..727eecdf8e 100644
--- a/ext/stub/echoes.zep.h
+++ b/ext/stub/echoes.zep.h
@@ -25,30 +25,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_echoes_testecho5, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_echoes_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Echoes, testEcho1, arginfo_stub_echoes_testecho1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Echoes, testEcho1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Echoes, testEcho2, arginfo_stub_echoes_testecho2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Echoes, testEcho2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Echoes, testEcho3, arginfo_stub_echoes_testecho3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Echoes, testEcho3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Echoes, testEcho4, arginfo_stub_echoes_testecho4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Echoes, testEcho4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Echoes, testEcho5, arginfo_stub_echoes_testecho5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Echoes, testEcho5, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Echoes, testEcho1, arginfo_stub_echoes_testecho1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Echoes, testEcho2, arginfo_stub_echoes_testecho2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Echoes, testEcho3, arginfo_stub_echoes_testecho3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Echoes, testEcho4, arginfo_stub_echoes_testecho4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Echoes, testEcho5, arginfo_stub_echoes_testecho5, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/emptytest.zep.c b/ext/stub/emptytest.zep.c
index 86489b35f7..1cd3b7f5ef 100644
--- a/ext/stub/emptytest.zep.c
+++ b/ext/stub/emptytest.zep.c
@@ -116,12 +116,9 @@ PHP_METHOD(Stub_EmptyTest, testString)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/emptytest.zep.h b/ext/stub/emptytest.zep.h
index 4a39df105a..1174fef9d5 100644
--- a/ext/stub/emptytest.zep.h
+++ b/ext/stub/emptytest.zep.h
@@ -26,26 +26,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_emptytest_teststring, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_emptytest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_EmptyTest, testDynamicVarArrayEmpty, arginfo_stub_emptytest_testdynamicvararrayempty, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_EmptyTest, testDynamicVarArrayEmpty, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_EmptyTest, testDynamicVarArrayNotEmpty, arginfo_stub_emptytest_testdynamicvararraynotempty, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_EmptyTest, testDynamicVarArrayNotEmpty, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_EmptyTest, testEmptyString, arginfo_stub_emptytest_testemptystring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_EmptyTest, testEmptyString, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_EmptyTest, testNotEmptyString, arginfo_stub_emptytest_testnotemptystring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_EmptyTest, testNotEmptyString, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_EmptyTest, testDynamicVarArrayEmpty, arginfo_stub_emptytest_testdynamicvararrayempty, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_EmptyTest, testDynamicVarArrayNotEmpty, arginfo_stub_emptytest_testdynamicvararraynotempty, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_EmptyTest, testEmptyString, arginfo_stub_emptytest_testemptystring, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_EmptyTest, testNotEmptyString, arginfo_stub_emptytest_testnotemptystring, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_EmptyTest, testString, arginfo_stub_emptytest_teststring, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/evaltest.zep.c b/ext/stub/evaltest.zep.c
index ec0b6856f3..0633393b5a 100644
--- a/ext/stub/evaltest.zep.c
+++ b/ext/stub/evaltest.zep.c
@@ -33,12 +33,9 @@ PHP_METHOD(Stub_EvalTest, evalCode)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&code);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(code)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/exception.zep.c b/ext/stub/exception.zep.c
index e118b09254..fceeb455ea 100644
--- a/ext/stub/exception.zep.c
+++ b/ext/stub/exception.zep.c
@@ -40,12 +40,9 @@ PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&message);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(message)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/exceptions.zep.c b/ext/stub/exceptions.zep.c
index 1fa1612ada..aad0530965 100644
--- a/ext/stub/exceptions.zep.c
+++ b/ext/stub/exceptions.zep.c
@@ -168,12 +168,9 @@ PHP_METHOD(Stub_Exceptions, testExceptionLiteral)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&type);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(type)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -214,12 +211,9 @@ PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -246,13 +240,10 @@ PHP_METHOD(Stub_Exceptions, testExceptionConcat)
 	ZVAL_UNDEF(&framework);
 	ZVAL_UNDEF(&language);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(framework)
 		Z_PARAM_STR(language)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -323,22 +314,19 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 	ZVAL_UNDEF(&_4$$7);
 	ZVAL_UNDEF(&_6$$10);
 	ZVAL_UNDEF(&_8$$13);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(returnValue)
 		Z_PARAM_ZVAL(exception)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 2, 0, &returnValue, &exception);
 
 
-	ZEPHIR_OBS_VAR(&iexc);
+	zephir_memory_observe(&iexc);
 	zephir_read_property(&iexc, this_ptr, ZEND_STRL("internalExceptionCallable"), PH_NOISY_CC);
-	ZEPHIR_OBS_VAR(&exc);
+	zephir_memory_observe(&exc);
 	zephir_read_property(&exc, this_ptr, ZEND_STRL("exceptionCallable"), PH_NOISY_CC);
 
 	/* try_start_1: */
diff --git a/ext/stub/exceptions.zep.h b/ext/stub/exceptions.zep.h
index 1a6edfd7ec..9e16bab5fb 100644
--- a/ext/stub/exceptions.zep.h
+++ b/ext/stub/exceptions.zep.h
@@ -67,59 +67,19 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_exceptions_donoopexception, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_exceptions_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, testException1, arginfo_stub_exceptions_testexception1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, testException1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, testExceptionStringEscape, arginfo_stub_exceptions_testexceptionstringescape, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, testExceptionStringEscape, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, testException2, arginfo_stub_exceptions_testexception2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, testException2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, testException3, arginfo_stub_exceptions_testexception3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, testException3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, getException, arginfo_stub_exceptions_getexception, ZEND_ACC_PROTECTED)
-#else
-	PHP_ME(Stub_Exceptions, getException, NULL, ZEND_ACC_PROTECTED)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, testException4, arginfo_stub_exceptions_testexception4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, testException4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, testException5, arginfo_stub_exceptions_testexception5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, testException5, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Exceptions, testException1, arginfo_stub_exceptions_testexception1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Exceptions, testExceptionStringEscape, arginfo_stub_exceptions_testexceptionstringescape, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Exceptions, testException2, arginfo_stub_exceptions_testexception2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Exceptions, testException3, arginfo_stub_exceptions_testexception3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Exceptions, getException, arginfo_stub_exceptions_getexception, ZEND_ACC_PROTECTED)
+PHP_ME(Stub_Exceptions, testException4, arginfo_stub_exceptions_testexception4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Exceptions, testException5, arginfo_stub_exceptions_testexception5, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Exceptions, testExceptionLiteral, arginfo_stub_exceptions_testexceptionliteral, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Exceptions, testExceptionSprintf, arginfo_stub_exceptions_testexceptionsprintf, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Exceptions, testExceptionConcat, arginfo_stub_exceptions_testexceptionconcat, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, testExceptionRethrow, arginfo_stub_exceptions_testexceptionrethrow, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, testExceptionRethrow, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Exceptions, testExceptionRethrow, arginfo_stub_exceptions_testexceptionrethrow, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Exceptions, testMultiException, arginfo_stub_exceptions_testmultiexception, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, issue1325, arginfo_stub_exceptions_issue1325, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Exceptions, issue1325, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Exceptions, doNoopException, arginfo_stub_exceptions_donoopexception, ZEND_ACC_PRIVATE)
-#else
-	PHP_ME(Stub_Exceptions, doNoopException, NULL, ZEND_ACC_PRIVATE)
-#endif
+PHP_ME(Stub_Exceptions, issue1325, arginfo_stub_exceptions_issue1325, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Exceptions, doNoopException, arginfo_stub_exceptions_donoopexception, ZEND_ACC_PRIVATE)
 	PHP_FE_END
 };
diff --git a/ext/stub/exists.zep.c b/ext/stub/exists.zep.c
index 4a8dd9a916..a1a5ab5ecc 100644
--- a/ext/stub/exists.zep.c
+++ b/ext/stub/exists.zep.c
@@ -33,14 +33,11 @@ PHP_METHOD(Stub_Exists, testClassExists)
 
 	ZVAL_UNDEF(&className_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(className)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(autoload)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 1, &className, &autoload_param);
@@ -63,14 +60,11 @@ PHP_METHOD(Stub_Exists, testInterfaceExists)
 
 	ZVAL_UNDEF(&interfaceName_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(interfaceName)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(autoload)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 1, &interfaceName, &autoload_param);
@@ -92,13 +86,10 @@ PHP_METHOD(Stub_Exists, testMethodExists)
 
 	ZVAL_UNDEF(&obj_sub);
 	ZVAL_UNDEF(&methodName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(obj)
 		Z_PARAM_ZVAL(methodName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &obj, &methodName);
@@ -113,12 +104,9 @@ PHP_METHOD(Stub_Exists, testFileExists)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&fileName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(fileName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &fileName);
diff --git a/ext/stub/exitdie.zep.c b/ext/stub/exitdie.zep.c
index 797c1a8a1f..372ca02297 100644
--- a/ext/stub/exitdie.zep.c
+++ b/ext/stub/exitdie.zep.c
@@ -32,13 +32,11 @@ PHP_METHOD(Stub_ExitDie, testExit)
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
@@ -61,13 +59,11 @@ PHP_METHOD(Stub_ExitDie, testDie)
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
diff --git a/ext/stub/factorial.zep.c b/ext/stub/factorial.zep.c
index b75a05a82e..204218a8bd 100644
--- a/ext/stub/factorial.zep.c
+++ b/ext/stub/factorial.zep.c
@@ -33,12 +33,9 @@ PHP_METHOD(Stub_Factorial, intIterativeFactorial)
 	zend_long n, _1, _2;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &n_param);
@@ -77,12 +74,9 @@ PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/fannkuch.zep.c b/ext/stub/fannkuch.zep.c
index 91d53018bf..ec6527207d 100644
--- a/ext/stub/fannkuch.zep.c
+++ b/ext/stub/fannkuch.zep.c
@@ -56,12 +56,9 @@ PHP_METHOD(Stub_Fannkuch, process)
 	ZVAL_UNDEF(&_17$$13);
 	ZVAL_UNDEF(&_18$$13);
 	ZVAL_UNDEF(&_19$$13);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/fasta.zep.c b/ext/stub/fasta.zep.c
index f6d6e80952..eacbc4b304 100644
--- a/ext/stub/fasta.zep.c
+++ b/ext/stub/fasta.zep.c
@@ -63,13 +63,10 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 	ZVAL_UNDEF(&seq);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(n)
 		Z_PARAM_STR(seq)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -171,12 +168,9 @@ PHP_METHOD(Stub_Fasta, main)
 	ZVAL_UNDEF(&homoSap);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/fasta.zep.h b/ext/stub/fasta.zep.h
index acc0cf9d48..ddc3d9c374 100644
--- a/ext/stub/fasta.zep.h
+++ b/ext/stub/fasta.zep.h
@@ -21,11 +21,7 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_fasta_method_entry) {
 	PHP_ME(Stub_Fasta, fastaRepeat, arginfo_stub_fasta_fastarepeat, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fasta, fastRandom, arginfo_stub_fasta_fastrandom, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fasta, fastRandom, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Fasta, fastRandom, arginfo_stub_fasta_fastrandom, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Fasta, main, arginfo_stub_fasta_main, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/fcall.zep.c b/ext/stub/fcall.zep.c
index f390605f66..6db9d1705e 100644
--- a/ext/stub/fcall.zep.c
+++ b/ext/stub/fcall.zep.c
@@ -181,13 +181,10 @@ PHP_METHOD(Stub_Fcall, testCall5)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -239,14 +236,12 @@ PHP_METHOD(Stub_Fcall, zvalFcallWith1Parameter)
 	ZVAL_UNDEF(&callback_sub);
 	ZVAL_UNDEF(&param1_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(callback)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -272,13 +267,10 @@ PHP_METHOD(Stub_Fcall, testCall8)
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&x);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -333,12 +325,9 @@ PHP_METHOD(Stub_Fcall, testStrtokVarBySlash)
 
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -359,13 +348,10 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArgs)
 
 	ZVAL_UNDEF(&param1_sub);
 	ZVAL_UNDEF(&param2_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(param1)
 		Z_PARAM_ZVAL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &param1, &param2);
@@ -406,13 +392,10 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(param1)
 		Z_PARAM_ZVAL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -522,12 +505,9 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 	zval *str, str_sub, _0;
 		ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -549,12 +529,9 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 PHP_FUNCTION(g_stub_zephir_global_method_with_type_casting) {
 	zval *variable, variable_sub;
 		ZVAL_UNDEF(&variable_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &variable);
@@ -571,12 +548,9 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 		ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -599,12 +573,9 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 PHP_FUNCTION(f_Stub_test_call_relative_object_hint) {
 	zval *a, a_sub;
 		ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -616,12 +587,9 @@ PHP_FUNCTION(f_Stub_test_call_relative_object_hint) {
 PHP_FUNCTION(f_Stub_zephir_namespaced_method_with_type_casting) {
 	zval *variable, variable_sub;
 		ZVAL_UNDEF(&variable_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &variable);
@@ -634,12 +602,9 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_with_type_casting) {
 PHP_FUNCTION(f_Stub_test_call_object_hint) {
 	zval *a, a_sub;
 		ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/fcall.zep.h b/ext/stub/fcall.zep.h
index 47e875729a..3b955311e4 100644
--- a/ext/stub/fcall.zep.h
+++ b/ext/stub/fcall.zep.h
@@ -94,27 +94,11 @@ ZEND_END_ARG_INFO()
 ZEPHIR_INIT_FUNCS(stub_fcall_method_entry) {
 	PHP_ME(Stub_Fcall, testCall1, arginfo_stub_fcall_testcall1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Fcall, testCall2, arginfo_stub_fcall_testcall2, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fcall, testCall3, arginfo_stub_fcall_testcall3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fcall, testCall3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fcall, testCall4, arginfo_stub_fcall_testcall4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fcall, testCall4, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Fcall, testCall3, arginfo_stub_fcall_testcall3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Fcall, testCall4, arginfo_stub_fcall_testcall4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Fcall, testCall5, arginfo_stub_fcall_testcall5, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fcall, testCall6, arginfo_stub_fcall_testcall6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fcall, testCall6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fcall, testCall7, arginfo_stub_fcall_testcall7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fcall, testCall7, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Fcall, testCall6, arginfo_stub_fcall_testcall6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Fcall, testCall7, arginfo_stub_fcall_testcall7, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Fcall, zvalFcallWith1Parameter, arginfo_stub_fcall_zvalfcallwith1parameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Fcall, testCall8, arginfo_stub_fcall_testcall8, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Fcall, testCall1FromVar, arginfo_stub_fcall_testcall1fromvar, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/fetchtest.zep.c b/ext/stub/fetchtest.zep.c
index 41b2d58dfa..4da7da6073 100644
--- a/ext/stub/fetchtest.zep.c
+++ b/ext/stub/fetchtest.zep.c
@@ -35,12 +35,9 @@ PHP_METHOD(Stub_FetchTest, setValues)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&values_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(values)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &values);
@@ -68,20 +65,17 @@ PHP_METHOD(Stub_FetchTest, testFetchArray1)
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&c);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_OBS_VAR(&c);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, b, 0));
 }
 
@@ -93,13 +87,10 @@ PHP_METHOD(Stub_FetchTest, testFetchArray2)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -120,13 +111,10 @@ PHP_METHOD(Stub_FetchTest, testFetchArray3)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&c);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -134,7 +122,7 @@ PHP_METHOD(Stub_FetchTest, testFetchArray3)
 	b = zephir_get_intval(b_param);
 
 
-	ZEPHIR_OBS_VAR(&c);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_long_fetch(&c, a, b, 0));
 }
 
@@ -146,13 +134,10 @@ PHP_METHOD(Stub_FetchTest, testFetchArray4)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -175,13 +160,10 @@ PHP_METHOD(Stub_FetchTest, testFetchArray5)
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&b);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -189,7 +171,7 @@ PHP_METHOD(Stub_FetchTest, testFetchArray5)
 	zephir_get_strval(&b, b_param);
 
 
-	ZEPHIR_OBS_VAR(&c);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, &b, 0));
 }
 
@@ -202,13 +184,10 @@ PHP_METHOD(Stub_FetchTest, testFetchArray6)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -230,20 +209,17 @@ PHP_METHOD(Stub_FetchTest, testFetchObject1)
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&c);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
-	ZEPHIR_OBS_VAR(&c);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_fetch_property_zval(&c, a, b, PH_SILENT_CC));
 }
 
@@ -255,13 +231,10 @@ PHP_METHOD(Stub_FetchTest, testFetchObject2)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -282,12 +255,9 @@ PHP_METHOD(Stub_FetchTest, testFetchPost)
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&_POST);
 	ZVAL_UNDEF(&c);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -295,7 +265,7 @@ PHP_METHOD(Stub_FetchTest, testFetchPost)
 	zephir_fetch_params(1, 1, 0, &b);
 
 
-	ZEPHIR_OBS_VAR(&c);
+	zephir_memory_observe(&c);
 	if (!(zephir_array_isset_fetch(&c, &_POST, b, 0))) {
 		RETURN_MM_BOOL(0);
 	}
@@ -312,12 +282,9 @@ PHP_METHOD(Stub_FetchTest, hasValue)
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_POST);
 	ZVAL_UNDEF(&_0$$4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -348,12 +315,9 @@ PHP_METHOD(Stub_FetchTest, getValue)
 	ZVAL_UNDEF(&_POST);
 	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&_0$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -362,7 +326,7 @@ PHP_METHOD(Stub_FetchTest, getValue)
 	zephir_get_strval(&name, name_param);
 
 
-	ZEPHIR_OBS_VAR(&value);
+	zephir_memory_observe(&value);
 	if (!(zephir_array_isset_fetch(&value, &_POST, &name, 0))) {
 		ZEPHIR_OBS_NVAR(&value);
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("values"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/stub/fetchtest.zep.h b/ext/stub/fetchtest.zep.h
index 0787fec806..16e8467105 100644
--- a/ext/stub/fetchtest.zep.h
+++ b/ext/stub/fetchtest.zep.h
@@ -78,11 +78,7 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_fetchtest_method_entry) {
 	PHP_ME(Stub_FetchTest, setValues, arginfo_stub_fetchtest_setvalues, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_FetchTest, getValues, arginfo_stub_fetchtest_getvalues, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_FetchTest, getValues, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_FetchTest, getValues, arginfo_stub_fetchtest_getvalues, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_FetchTest, testFetchArray1, arginfo_stub_fetchtest_testfetcharray1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_FetchTest, testFetchArray2, arginfo_stub_fetchtest_testfetcharray2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_FetchTest, testFetchArray3, arginfo_stub_fetchtest_testfetcharray3, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/fibonnaci.zep.c b/ext/stub/fibonnaci.zep.c
index 86f41df03d..f6734b5d1c 100644
--- a/ext/stub/fibonnaci.zep.c
+++ b/ext/stub/fibonnaci.zep.c
@@ -167,12 +167,9 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 	ZVAL_UNDEF(&_0$$6);
 	ZVAL_UNDEF(&_1$$6);
 	ZVAL_UNDEF(&_3$$6);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -209,12 +206,9 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 	ZVAL_UNDEF(&_0$$6);
 	ZVAL_UNDEF(&_1$$6);
 	ZVAL_UNDEF(&_3$$6);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/fibonnaci.zep.h b/ext/stub/fibonnaci.zep.h
index b9a1847d7f..70b8f76f6e 100644
--- a/ext/stub/fibonnaci.zep.h
+++ b/ext/stub/fibonnaci.zep.h
@@ -31,26 +31,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_fibonnaci_fibonaccifinalrecursive, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_fibonnaci_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fibonnaci, fibInt, arginfo_stub_fibonnaci_fibint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fibonnaci, fibInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fibonnaci, fibDouble, arginfo_stub_fibonnaci_fibdouble, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fibonnaci, fibDouble, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fibonnaci, fibArray, arginfo_stub_fibonnaci_fibarray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fibonnaci, fibArray, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Fibonnaci, fibArray2, arginfo_stub_fibonnaci_fibarray2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Fibonnaci, fibArray2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Fibonnaci, fibInt, arginfo_stub_fibonnaci_fibint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Fibonnaci, fibDouble, arginfo_stub_fibonnaci_fibdouble, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Fibonnaci, fibArray, arginfo_stub_fibonnaci_fibarray, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Fibonnaci, fibArray2, arginfo_stub_fibonnaci_fibarray2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Fibonnaci, fibonacciRecursive, arginfo_stub_fibonnaci_fibonaccirecursive, ZEND_ACC_PRIVATE)
 	PHP_ME(Stub_Fibonnaci, fibonacciFinalRecursive, arginfo_stub_fibonnaci_fibonaccifinalrecursive, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	PHP_FE_END
diff --git a/ext/stub/flow.zep.c b/ext/stub/flow.zep.c
index 2f968c657a..c1edb10997 100644
--- a/ext/stub/flow.zep.c
+++ b/ext/stub/flow.zep.c
@@ -288,12 +288,9 @@ PHP_METHOD(Stub_Flow, testIf16)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -311,12 +308,9 @@ PHP_METHOD(Stub_Flow, testIf17)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &b);
@@ -608,12 +602,9 @@ PHP_METHOD(Stub_Flow, testWhile10)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -650,13 +641,10 @@ PHP_METHOD(Stub_Flow, testWhile11)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&d_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -759,12 +747,9 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 	ZVAL_UNDEF(&returnValue);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -800,12 +785,9 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 	ZVAL_UNDEF(&returnValue);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_0$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1395,13 +1377,10 @@ PHP_METHOD(Stub_Flow, testFor15)
 	zend_long c, d, a = 0, b = 0, _1, _2;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(c)
 		Z_PARAM_LONG(d)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &c_param, &d_param);
@@ -1875,12 +1854,9 @@ PHP_METHOD(Stub_Flow, testFor32)
 	ZVAL_UNDEF(&e_sub);
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(e)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1926,12 +1902,9 @@ PHP_METHOD(Stub_Flow, testFor33)
 	ZVAL_UNDEF(&e_sub);
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&result);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(e, zend_ce_iterator)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1963,13 +1936,11 @@ PHP_METHOD(Stub_Flow, testFor34)
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&result);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(e, zend_ce_iterator)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2003,12 +1974,9 @@ PHP_METHOD(Stub_Flow, testFor35Aux)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&hello_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(hello)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &hello);
@@ -2062,12 +2030,9 @@ PHP_METHOD(Stub_Flow, testFor36Aux)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&hello_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(hello)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &hello);
diff --git a/ext/stub/flow.zep.h b/ext/stub/flow.zep.h
index a999bf1759..d84aeabeff 100644
--- a/ext/stub/flow.zep.h
+++ b/ext/stub/flow.zep.h
@@ -323,337 +323,81 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_flow_testunrechable3, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_flow_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf1, arginfo_stub_flow_testif1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf2, arginfo_stub_flow_testif2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf3, arginfo_stub_flow_testif3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf4, arginfo_stub_flow_testif4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf5, arginfo_stub_flow_testif5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf6, arginfo_stub_flow_testif6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf7, arginfo_stub_flow_testif7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf8, arginfo_stub_flow_testif8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf9, arginfo_stub_flow_testif9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf10, arginfo_stub_flow_testif10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf12, arginfo_stub_flow_testif12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf12, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf13, arginfo_stub_flow_testif13, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf13, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf14, arginfo_stub_flow_testif14, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf14, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testIf15, arginfo_stub_flow_testif15, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testIf15, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow, testIf1, arginfo_stub_flow_testif1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf2, arginfo_stub_flow_testif2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf3, arginfo_stub_flow_testif3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf4, arginfo_stub_flow_testif4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf5, arginfo_stub_flow_testif5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf6, arginfo_stub_flow_testif6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf7, arginfo_stub_flow_testif7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf8, arginfo_stub_flow_testif8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf9, arginfo_stub_flow_testif9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf10, arginfo_stub_flow_testif10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf12, arginfo_stub_flow_testif12, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf13, arginfo_stub_flow_testif13, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf14, arginfo_stub_flow_testif14, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testIf15, arginfo_stub_flow_testif15, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testIf16, arginfo_stub_flow_testif16, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testIf17, arginfo_stub_flow_testif17, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testLoop1, arginfo_stub_flow_testloop1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testLoop1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testLoop2, arginfo_stub_flow_testloop2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testLoop2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testLoop3, arginfo_stub_flow_testloop3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testLoop3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testLoop4, arginfo_stub_flow_testloop4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testLoop4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile1, arginfo_stub_flow_testwhile1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile2, arginfo_stub_flow_testwhile2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile3, arginfo_stub_flow_testwhile3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile4, arginfo_stub_flow_testwhile4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile5, arginfo_stub_flow_testwhile5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile6, arginfo_stub_flow_testwhile6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile7, arginfo_stub_flow_testwhile7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile8, arginfo_stub_flow_testwhile8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile9, arginfo_stub_flow_testwhile9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile9, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow, testLoop1, arginfo_stub_flow_testloop1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testLoop2, arginfo_stub_flow_testloop2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testLoop3, arginfo_stub_flow_testloop3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testLoop4, arginfo_stub_flow_testloop4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile1, arginfo_stub_flow_testwhile1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile2, arginfo_stub_flow_testwhile2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile3, arginfo_stub_flow_testwhile3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile4, arginfo_stub_flow_testwhile4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile5, arginfo_stub_flow_testwhile5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile6, arginfo_stub_flow_testwhile6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile7, arginfo_stub_flow_testwhile7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile8, arginfo_stub_flow_testwhile8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile9, arginfo_stub_flow_testwhile9, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testWhile10, arginfo_stub_flow_testwhile10, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testWhile11, arginfo_stub_flow_testwhile11, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile12, arginfo_stub_flow_testwhile12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile12, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testWhile13, arginfo_stub_flow_testwhile13, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testWhile13, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testDoWhile1, arginfo_stub_flow_testdowhile1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testDoWhile1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow, testWhile12, arginfo_stub_flow_testwhile12, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testWhile13, arginfo_stub_flow_testwhile13, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testDoWhile1, arginfo_stub_flow_testdowhile1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testWhileNextTest, arginfo_stub_flow_testwhilenexttest, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testWhileDoNextTest, arginfo_stub_flow_testwhiledonexttest, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor1, arginfo_stub_flow_testfor1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor2, arginfo_stub_flow_testfor2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor3, arginfo_stub_flow_testfor3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor4, arginfo_stub_flow_testfor4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor5, arginfo_stub_flow_testfor5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor6, arginfo_stub_flow_testfor6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor7, arginfo_stub_flow_testfor7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor8, arginfo_stub_flow_testfor8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor9, arginfo_stub_flow_testfor9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor10, arginfo_stub_flow_testfor10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor11, arginfo_stub_flow_testfor11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor11, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor12, arginfo_stub_flow_testfor12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor12, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor13, arginfo_stub_flow_testfor13, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor13, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor14, arginfo_stub_flow_testfor14, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor14, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow, testFor1, arginfo_stub_flow_testfor1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor2, arginfo_stub_flow_testfor2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor3, arginfo_stub_flow_testfor3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor4, arginfo_stub_flow_testfor4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor5, arginfo_stub_flow_testfor5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor6, arginfo_stub_flow_testfor6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor7, arginfo_stub_flow_testfor7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor8, arginfo_stub_flow_testfor8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor9, arginfo_stub_flow_testfor9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor10, arginfo_stub_flow_testfor10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor11, arginfo_stub_flow_testfor11, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor12, arginfo_stub_flow_testfor12, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor13, arginfo_stub_flow_testfor13, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor14, arginfo_stub_flow_testfor14, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testFor15, arginfo_stub_flow_testfor15, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor16, arginfo_stub_flow_testfor16, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor16, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor17, arginfo_stub_flow_testfor17, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor17, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor18, arginfo_stub_flow_testfor18, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor18, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor19, arginfo_stub_flow_testfor19, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor19, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor20, arginfo_stub_flow_testfor20, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor20, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor21, arginfo_stub_flow_testfor21, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor21, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor22, arginfo_stub_flow_testfor22, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor22, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor23, arginfo_stub_flow_testfor23, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor23, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor24, arginfo_stub_flow_testfor24, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor24, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor30, arginfo_stub_flow_testfor30, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor30, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor31, arginfo_stub_flow_testfor31, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor31, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow, testFor16, arginfo_stub_flow_testfor16, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor17, arginfo_stub_flow_testfor17, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor18, arginfo_stub_flow_testfor18, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor19, arginfo_stub_flow_testfor19, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor20, arginfo_stub_flow_testfor20, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor21, arginfo_stub_flow_testfor21, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor22, arginfo_stub_flow_testfor22, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor23, arginfo_stub_flow_testfor23, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor24, arginfo_stub_flow_testfor24, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor30, arginfo_stub_flow_testfor30, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor31, arginfo_stub_flow_testfor31, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testFor32, arginfo_stub_flow_testfor32, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testFor33, arginfo_stub_flow_testfor33, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testFor34, arginfo_stub_flow_testfor34, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testFor35Aux, arginfo_stub_flow_testfor35aux, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor35, arginfo_stub_flow_testfor35, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor35, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow, testFor35, arginfo_stub_flow_testfor35, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow, testFor36Aux, arginfo_stub_flow_testfor36aux, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor36, arginfo_stub_flow_testfor36, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor36, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor37, arginfo_stub_flow_testfor37, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor37, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor38, arginfo_stub_flow_testfor38, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor38, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor39, arginfo_stub_flow_testfor39, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor39, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testFor40, arginfo_stub_flow_testfor40, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testFor40, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testUnrechable1, arginfo_stub_flow_testunrechable1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testUnrechable1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testUnrechable2, arginfo_stub_flow_testunrechable2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testUnrechable2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow, testUnrechable3, arginfo_stub_flow_testunrechable3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow, testUnrechable3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow, testFor36, arginfo_stub_flow_testfor36, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor37, arginfo_stub_flow_testfor37, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor38, arginfo_stub_flow_testfor38, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor39, arginfo_stub_flow_testfor39, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testFor40, arginfo_stub_flow_testfor40, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testUnrechable1, arginfo_stub_flow_testunrechable1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testUnrechable2, arginfo_stub_flow_testunrechable2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Flow, testUnrechable3, arginfo_stub_flow_testunrechable3, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/flow/switchflow.zep.c b/ext/stub/flow/switchflow.zep.c
index 45290bd554..c8dc85e636 100644
--- a/ext/stub/flow/switchflow.zep.c
+++ b/ext/stub/flow/switchflow.zep.c
@@ -233,13 +233,10 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch12)
 
 	ZVAL_UNDEF(&var1_sub);
 	ZVAL_UNDEF(&var2_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(var1)
 		Z_PARAM_ZVAL(var2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &var1, &var2);
@@ -277,12 +274,9 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -313,13 +307,10 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch14)
 	ZVAL_UNDEF(&result_type_sub);
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(result_type)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/flow/switchflow.zep.h b/ext/stub/flow/switchflow.zep.h
index 6ad791d370..e08126c64d 100644
--- a/ext/stub/flow/switchflow.zep.h
+++ b/ext/stub/flow/switchflow.zep.h
@@ -75,11 +75,7 @@ ZEPHIR_INIT_FUNCS(stub_flow_switchflow_method_entry) {
 	PHP_ME(Stub_Flow_SwitchFlow, testSwitch8, arginfo_stub_flow_switchflow_testswitch8, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow_SwitchFlow, testSwitch9, arginfo_stub_flow_switchflow_testswitch9, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow_SwitchFlow, testSwitch10, arginfo_stub_flow_switchflow_testswitch10, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Flow_SwitchFlow, testSwitch11, arginfo_stub_flow_switchflow_testswitch11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Flow_SwitchFlow, testSwitch11, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Flow_SwitchFlow, testSwitch11, arginfo_stub_flow_switchflow_testswitch11, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow_SwitchFlow, testSwitch12, arginfo_stub_flow_switchflow_testswitch12, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow_SwitchFlow, testSwitch13, arginfo_stub_flow_switchflow_testswitch13, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Flow_SwitchFlow, testSwitch14, arginfo_stub_flow_switchflow_testswitch14, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/functional.zep.c b/ext/stub/functional.zep.c
index 390e0b834a..3de668d004 100644
--- a/ext/stub/functional.zep.c
+++ b/ext/stub/functional.zep.c
@@ -36,12 +36,9 @@ PHP_METHOD(Stub_Functional, map1)
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -68,13 +65,10 @@ PHP_METHOD(Stub_Functional, map2)
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/functionexists.zep.c b/ext/stub/functionexists.zep.c
index 8c43503813..fcbe1039b2 100644
--- a/ext/stub/functionexists.zep.c
+++ b/ext/stub/functionexists.zep.c
@@ -34,12 +34,9 @@ PHP_METHOD(Stub_FunctionExists, testWithPassedName)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&func);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(func)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/geometry.zep.c b/ext/stub/geometry.zep.c
index 8caa3fca86..f338f42cc3 100644
--- a/ext/stub/geometry.zep.c
+++ b/ext/stub/geometry.zep.c
@@ -45,13 +45,10 @@ PHP_METHOD(Stub_Geometry, run)
 	ZVAL_UNDEF(&_6$$3);
 	ZVAL_UNDEF(&_7$$3);
 	ZVAL_UNDEF(&_8$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY(list)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -95,13 +92,10 @@ PHP_METHOD(Stub_Geometry, runOptimize)
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY(list)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -135,15 +129,12 @@ PHP_METHOD(Stub_Geometry, distanceStatic)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(4, 4)
 		Z_PARAM_ZVAL(x1)
 		Z_PARAM_ZVAL(y1)
 		Z_PARAM_ZVAL(x2)
 		Z_PARAM_ZVAL(y2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(4, 0, &x1_param, &y1_param, &x2_param, &y2_param);
diff --git a/ext/stub/globals.zep.c b/ext/stub/globals.zep.c
index 6f79b795a2..27e6c99a1f 100644
--- a/ext/stub/globals.zep.c
+++ b/ext/stub/globals.zep.c
@@ -30,12 +30,9 @@ PHP_METHOD(Stub_Globals, setBoolValueUsingDotNotation)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
@@ -50,12 +47,9 @@ PHP_METHOD(Stub_Globals, setIntValueUsingDotNotation)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
@@ -70,12 +64,9 @@ PHP_METHOD(Stub_Globals, setCharValue)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
@@ -92,12 +83,9 @@ PHP_METHOD(Stub_Globals, setStringValue)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -115,12 +103,9 @@ PHP_METHOD(Stub_Globals, setBoolValue)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
@@ -135,12 +120,9 @@ PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCacheLevel)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
@@ -157,12 +139,9 @@ PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCachePrefix)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/globals.zep.h b/ext/stub/globals.zep.h
index c27a3126af..f33b4d4215 100644
--- a/ext/stub/globals.zep.h
+++ b/ext/stub/globals.zep.h
@@ -94,55 +94,15 @@ ZEPHIR_INIT_FUNCS(stub_globals_method_entry) {
 	PHP_ME(Stub_Globals, setBoolValue, arginfo_stub_globals_setboolvalue, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Globals, setDefaultGlobalsOrmCacheLevel, arginfo_stub_globals_setdefaultglobalsormcachelevel, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Globals, setDefaultGlobalsOrmCachePrefix, arginfo_stub_globals_setdefaultglobalsormcacheprefix, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals1, arginfo_stub_globals_getdefaultglobals1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals2, arginfo_stub_globals_getdefaultglobals2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals3, arginfo_stub_globals_getdefaultglobals3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals4, arginfo_stub_globals_getdefaultglobals4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals5, arginfo_stub_globals_getdefaultglobals5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals6, arginfo_stub_globals_getdefaultglobals6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals7, arginfo_stub_globals_getdefaultglobals7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobals8, arginfo_stub_globals_getdefaultglobals8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobals8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobalsOrmCacheLevel, arginfo_stub_globals_getdefaultglobalsormcachelevel, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobalsOrmCacheLevel, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals, getDefaultGlobalsOrmCachePrefix, arginfo_stub_globals_getdefaultglobalsormcacheprefix, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals, getDefaultGlobalsOrmCachePrefix, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Globals, getDefaultGlobals1, arginfo_stub_globals_getdefaultglobals1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobals2, arginfo_stub_globals_getdefaultglobals2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobals3, arginfo_stub_globals_getdefaultglobals3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobals4, arginfo_stub_globals_getdefaultglobals4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobals5, arginfo_stub_globals_getdefaultglobals5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobals6, arginfo_stub_globals_getdefaultglobals6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobals7, arginfo_stub_globals_getdefaultglobals7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobals8, arginfo_stub_globals_getdefaultglobals8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobalsOrmCacheLevel, arginfo_stub_globals_getdefaultglobalsormcachelevel, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Globals, getDefaultGlobalsOrmCachePrefix, arginfo_stub_globals_getdefaultglobalsormcacheprefix, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/globals/env.zep.c b/ext/stub/globals/env.zep.c
index c4586c9c22..94171cb5be 100644
--- a/ext/stub/globals/env.zep.c
+++ b/ext/stub/globals/env.zep.c
@@ -35,12 +35,9 @@ PHP_METHOD(Stub_Globals_Env, read)
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_ENV);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/globals/post.zep.c b/ext/stub/globals/post.zep.c
index 168f13fe55..4b4906f924 100644
--- a/ext/stub/globals/post.zep.c
+++ b/ext/stub/globals/post.zep.c
@@ -39,12 +39,9 @@ PHP_METHOD(Stub_Globals_Post, hasValue)
 
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_POST);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/globals/server.zep.h b/ext/stub/globals/server.zep.h
index d2e0a123ad..95dc2c3e91 100644
--- a/ext/stub/globals/server.zep.h
+++ b/ext/stub/globals/server.zep.h
@@ -19,10 +19,6 @@ ZEND_END_ARG_INFO()
 ZEPHIR_INIT_FUNCS(stub_globals_server_method_entry) {
 	PHP_ME(Stub_Globals_Server, f1, arginfo_stub_globals_server_f1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Globals_Server, f2, arginfo_stub_globals_server_f2, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals_Server, check, arginfo_stub_globals_server_check, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals_Server, check, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Globals_Server, check, arginfo_stub_globals_server_check, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/globals/serverrequestfactory.zep.c b/ext/stub/globals/serverrequestfactory.zep.c
index c68be91bed..81557c09bb 100644
--- a/ext/stub/globals/serverrequestfactory.zep.c
+++ b/ext/stub/globals/serverrequestfactory.zep.c
@@ -58,7 +58,6 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 5)
 		Z_PARAM_OPTIONAL
@@ -68,7 +67,6 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 		Z_PARAM_ARRAY_OR_NULL(cookies)
 		Z_PARAM_ARRAY_OR_NULL(files)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -167,13 +165,10 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, checkNullArray)
 
 	ZVAL_UNDEF(&source_sub);
 	ZVAL_UNDEF(&super);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(source)
 		Z_PARAM_ARRAY(super)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/globals/serverrequestfactory.zep.h b/ext/stub/globals/serverrequestfactory.zep.h
index ad22f9b253..1e4873d494 100644
--- a/ext/stub/globals/serverrequestfactory.zep.h
+++ b/ext/stub/globals/serverrequestfactory.zep.h
@@ -7,31 +7,11 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load);
 PHP_METHOD(Stub_Globals_ServerRequestFactory, checkNullArray);
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_globals_serverrequestfactory_load, 0, 0, IS_ARRAY, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, server, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, server, 1)
-#endif
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, get, 1)
-#endif
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, post, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, post, 1)
-#endif
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cookies, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, cookies, 1)
-#endif
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, files, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, files, 1)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, server, IS_ARRAY, 1, "[]")
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, get, IS_ARRAY, 1, "[]")
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, post, IS_ARRAY, 1, "[]")
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cookies, IS_ARRAY, 1, "[]")
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, files, IS_ARRAY, 1, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_globals_serverrequestfactory_checknullarray, 0, 2, IS_ARRAY, 0)
diff --git a/ext/stub/globals/session/base.zep.c b/ext/stub/globals/session/base.zep.c
index 698bcd6647..8a5751b79c 100644
--- a/ext/stub/globals/session/base.zep.c
+++ b/ext/stub/globals/session/base.zep.c
@@ -36,13 +36,10 @@ PHP_METHOD(Stub_Globals_Session_Base, set)
 	ZVAL_UNDEF(&index);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_SESSION);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -65,12 +62,9 @@ PHP_METHOD(Stub_Globals_Session_Base, remove)
 
 	ZVAL_UNDEF(&index);
 	ZVAL_UNDEF(&_SESSION);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -93,13 +87,10 @@ PHP_METHOD(Stub_Globals_Session_Base, __set)
 
 	ZVAL_UNDEF(&index);
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -121,12 +112,9 @@ PHP_METHOD(Stub_Globals_Session_Base, __unset)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/globals/session/base.zep.h b/ext/stub/globals/session/base.zep.h
index d1bad5eb87..d6392cbcdc 100644
--- a/ext/stub/globals/session/base.zep.h
+++ b/ext/stub/globals/session/base.zep.h
@@ -35,10 +35,6 @@ ZEPHIR_INIT_FUNCS(stub_globals_session_base_method_entry) {
 	PHP_ME(Stub_Globals_Session_Base, remove, arginfo_stub_globals_session_base_remove, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Globals_Session_Base, __set, arginfo_stub_globals_session_base___set, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Globals_Session_Base, __unset, arginfo_stub_globals_session_base___unset, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals_Session_Base, removeSessionData, arginfo_stub_globals_session_base_removesessiondata, ZEND_ACC_PROTECTED)
-#else
-	PHP_ME(Stub_Globals_Session_Base, removeSessionData, NULL, ZEND_ACC_PROTECTED)
-#endif
+PHP_ME(Stub_Globals_Session_Base, removeSessionData, arginfo_stub_globals_session_base_removesessiondata, ZEND_ACC_PROTECTED)
 	PHP_FE_END
 };
diff --git a/ext/stub/globals/session/child.zep.h b/ext/stub/globals/session/child.zep.h
index d490cd0a8e..249376ad73 100644
--- a/ext/stub/globals/session/child.zep.h
+++ b/ext/stub/globals/session/child.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_globals_session_child_destroy, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_globals_session_child_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Globals_Session_Child, destroy, arginfo_stub_globals_session_child_destroy, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Globals_Session_Child, destroy, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Globals_Session_Child, destroy, arginfo_stub_globals_session_child_destroy, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/instance.zep.c b/ext/stub/instance.zep.c
index 325d9f59d9..8129713d1c 100644
--- a/ext/stub/instance.zep.c
+++ b/ext/stub/instance.zep.c
@@ -45,8 +45,6 @@ PHP_METHOD(Stub_Instance, __construct)
 	ZVAL_UNDEF(&a9_sub);
 	ZVAL_UNDEF(&a10_sub);
 	ZVAL_UNDEF(&a11_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(11, 11)
 		Z_PARAM_OBJECT_OF_CLASS(a1, stub_arithmetic_ce)
 		Z_PARAM_OBJECT_OF_CLASS(a2, stub_arrayobject_ce)
@@ -60,7 +58,6 @@ PHP_METHOD(Stub_Instance, __construct)
 		Z_PARAM_OBJECT_OF_CLASS(a10, stub_compare_ce)
 		Z_PARAM_OBJECT_OF_CLASS(a11, stub_concat_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(11, 0, &a1, &a2, &a3, &a4, &a5, &a6, &a7, &a8, &a9, &a10, &a11);
@@ -184,12 +181,9 @@ PHP_METHOD(Stub_Instance, testInstanceCreate)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(className)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/instanceoff.zep.c b/ext/stub/instanceoff.zep.c
index a13582d99c..5d4c2660aa 100644
--- a/ext/stub/instanceoff.zep.c
+++ b/ext/stub/instanceoff.zep.c
@@ -88,12 +88,9 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf4)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -111,12 +108,9 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf5)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -156,12 +150,9 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf7)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&test_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(test)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &test);
@@ -180,12 +171,9 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf8)
 
 	ZVAL_UNDEF(&test);
 	ZVAL_UNDEF(&a);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(test)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -212,13 +200,10 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf9)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&test);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_OBJECT(a)
 		Z_PARAM_STR(test)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/interfaces/implementint.zep.c b/ext/stub/interfaces/implementint.zep.c
index b9d582d74f..f5f3b87e33 100644
--- a/ext/stub/interfaces/implementint.zep.c
+++ b/ext/stub/interfaces/implementint.zep.c
@@ -33,12 +33,9 @@ PHP_METHOD(Stub_Interfaces_ImplementInt, set)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
diff --git a/ext/stub/interfaces/implementinterface.zep.c b/ext/stub/interfaces/implementinterface.zep.c
index a893ad41ec..ab8face8bf 100644
--- a/ext/stub/interfaces/implementinterface.zep.c
+++ b/ext/stub/interfaces/implementinterface.zep.c
@@ -34,12 +34,9 @@ PHP_METHOD(Stub_Interfaces_ImplementInterface, get)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(obj, stub_interfaces_interfaceint_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -57,12 +54,9 @@ PHP_METHOD(Stub_Interfaces_ImplementInterface, getVoid)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(obj, stub_interfaces_interfaceint_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
diff --git a/ext/stub/interfaces/interfacestaticmethod.zep.h b/ext/stub/interfaces/interfacestaticmethod.zep.h
index e608428011..ef679c2b9a 100644
--- a/ext/stub/interfaces/interfacestaticmethod.zep.h
+++ b/ext/stub/interfaces/interfacestaticmethod.zep.h
@@ -7,10 +7,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_interfaces_interfacestaticmethod_reset, 0, 0
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_interfaces_interfacestaticmethod_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	ZEND_FENTRY(reset, NULL, arginfo_stub_interfaces_interfacestaticmethod_reset, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#else
-	ZEND_FENTRY(reset, NULL, NULL, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#endif
+ZEND_FENTRY(reset, NULL, arginfo_stub_interfaces_interfacestaticmethod_reset, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/internalclasses.zep.h b/ext/stub/internalclasses.zep.h
index 1148679325..b17fd43426 100644
--- a/ext/stub/internalclasses.zep.h
+++ b/ext/stub/internalclasses.zep.h
@@ -13,15 +13,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_internalclasses_teststaticpropertyfetch, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_internalclasses_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_InternalClasses, testStaticCall, arginfo_stub_internalclasses_teststaticcall, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_InternalClasses, testStaticCall, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_InternalClasses, testStaticPropertyFetch, arginfo_stub_internalclasses_teststaticpropertyfetch, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_InternalClasses, testStaticPropertyFetch, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_InternalClasses, testStaticCall, arginfo_stub_internalclasses_teststaticcall, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_InternalClasses, testStaticPropertyFetch, arginfo_stub_internalclasses_teststaticpropertyfetch, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/invoke.zep.h b/ext/stub/invoke.zep.h
index 523313d408..03b45af256 100644
--- a/ext/stub/invoke.zep.h
+++ b/ext/stub/invoke.zep.h
@@ -17,11 +17,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_invoke_test, 0, 0, IS_STRIN
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_invoke_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Invoke, __construct, arginfo_stub_invoke___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_Invoke, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_Invoke, __construct, arginfo_stub_invoke___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_Invoke, __invoke, arginfo_stub_invoke___invoke, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Invoke, test, arginfo_stub_invoke_test, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
diff --git a/ext/stub/invokes/abstractinvoker.zep.h b/ext/stub/invokes/abstractinvoker.zep.h
index 4c0eb0c35a..9aa02b8f12 100644
--- a/ext/stub/invokes/abstractinvoker.zep.h
+++ b/ext/stub/invokes/abstractinvoker.zep.h
@@ -6,22 +6,14 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvoker);
 PHP_METHOD(Stub_Invokes_AbstractInvoker, __toString);
 PHP_METHOD(Stub_Invokes_AbstractInvoker, __invoke);
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_invokes_abstractinvoker___tostring, 0, 0, IS_STRING, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_invokes_abstractinvoker___tostring, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_stub_invokes_abstractinvoker___invoke, 0, 0, Stub\\Invokes\\AbstractInvoker, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_invokes_abstractinvoker_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Invokes_AbstractInvoker, __toString, arginfo_stub_invokes_abstractinvoker___tostring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Invokes_AbstractInvoker, __toString, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Invokes_AbstractInvoker, __toString, arginfo_stub_invokes_abstractinvoker___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Invokes_AbstractInvoker, __invoke, arginfo_stub_invokes_abstractinvoker___invoke, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/invokes/abstractinvokercomplex.zep.h b/ext/stub/invokes/abstractinvokercomplex.zep.h
index f32ec8339b..dcdce85182 100644
--- a/ext/stub/invokes/abstractinvokercomplex.zep.h
+++ b/ext/stub/invokes/abstractinvokercomplex.zep.h
@@ -6,22 +6,14 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvokerComplex);
 PHP_METHOD(Stub_Invokes_AbstractInvokerComplex, __toString);
 PHP_METHOD(Stub_Invokes_AbstractInvokerComplex, __invoke);
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_invokes_abstractinvokercomplex___tostring, 0, 0, IS_STRING, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_invokes_abstractinvokercomplex___tostring, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_stub_invokes_abstractinvokercomplex___invoke, 0, 0, Stub\\Invokes\\AbstractInvoker, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_invokes_abstractinvokercomplex_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Invokes_AbstractInvokerComplex, __toString, arginfo_stub_invokes_abstractinvokercomplex___tostring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Invokes_AbstractInvokerComplex, __toString, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Invokes_AbstractInvokerComplex, __toString, arginfo_stub_invokes_abstractinvokercomplex___tostring, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Invokes_AbstractInvokerComplex, __invoke, arginfo_stub_invokes_abstractinvokercomplex___invoke, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/invokes/abstractprotected.zep.c b/ext/stub/invokes/abstractprotected.zep.c
index 566816b694..018fe442b2 100644
--- a/ext/stub/invokes/abstractprotected.zep.c
+++ b/ext/stub/invokes/abstractprotected.zep.c
@@ -38,12 +38,9 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 	ZVAL_UNDEF(&text);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&ret);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -67,12 +64,9 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 	ZVAL_UNDEF(&text);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&ret);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -99,12 +93,9 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElements)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -151,12 +142,9 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElementsComplex)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_6$$3);
 	ZVAL_UNDEF(&_10$$4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/invokes/invokeprotected.zep.c b/ext/stub/invokes/invokeprotected.zep.c
index 4e5f18259d..a09d0c3248 100644
--- a/ext/stub/invokes/invokeprotected.zep.c
+++ b/ext/stub/invokes/invokeprotected.zep.c
@@ -32,12 +32,9 @@ PHP_METHOD(Stub_Invokes_InvokeProtected, __construct)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&text);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/invokes/invokeprotectedcomplex.zep.c b/ext/stub/invokes/invokeprotectedcomplex.zep.c
index afe0f35d9f..2bf9f7c9d2 100644
--- a/ext/stub/invokes/invokeprotectedcomplex.zep.c
+++ b/ext/stub/invokes/invokeprotectedcomplex.zep.c
@@ -32,12 +32,9 @@ PHP_METHOD(Stub_Invokes_InvokeProtectedComplex, __construct)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&text);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/issettest.zep.c b/ext/stub/issettest.zep.c
index c5b5d69e31..d82c575852 100644
--- a/ext/stub/issettest.zep.c
+++ b/ext/stub/issettest.zep.c
@@ -38,13 +38,10 @@ PHP_METHOD(Stub_IssetTest, testIssetArray1)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -60,13 +57,10 @@ PHP_METHOD(Stub_IssetTest, testIssetArray2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b_param);
@@ -85,13 +79,10 @@ PHP_METHOD(Stub_IssetTest, testIssetArray3)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -108,12 +99,9 @@ PHP_METHOD(Stub_IssetTest, testIssetArray4)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -128,12 +116,9 @@ PHP_METHOD(Stub_IssetTest, testIssetArray5)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -148,12 +133,9 @@ PHP_METHOD(Stub_IssetTest, testIssetProperty1)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -169,13 +151,10 @@ PHP_METHOD(Stub_IssetTest, testIssetProperty2)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -190,12 +169,9 @@ PHP_METHOD(Stub_IssetTest, testIssetProperty3)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -215,7 +191,7 @@ PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty1)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_OBS_VAR(&g);
+	zephir_memory_observe(&g);
 	zephir_read_property(&g, this_ptr, ZEND_STRL("s"), PH_NOISY_CC);
 	if (zephir_array_isset_string(&g, SL("a"))) {
 		RETURN_MM_BOOL(1);
@@ -231,19 +207,16 @@ PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty2)
 
 	ZVAL_UNDEF(&inp_sub);
 	ZVAL_UNDEF(&g);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(inp)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
 	zephir_fetch_params(1, 1, 0, &inp);
 
 
-	ZEPHIR_OBS_VAR(&g);
+	zephir_memory_observe(&g);
 	zephir_read_property(&g, inp, ZEND_STRL("s"), PH_NOISY_CC);
 	if (zephir_array_isset_string(&g, SL("a"))) {
 		RETURN_MM_BOOL(1);
diff --git a/ext/stub/issettest.zep.h b/ext/stub/issettest.zep.h
index dc9eca31d3..f191d1050f 100644
--- a/ext/stub/issettest.zep.h
+++ b/ext/stub/issettest.zep.h
@@ -70,11 +70,7 @@ ZEPHIR_INIT_FUNCS(stub_issettest_method_entry) {
 	PHP_ME(Stub_IssetTest, testIssetProperty1, arginfo_stub_issettest_testissetproperty1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_IssetTest, testIssetProperty2, arginfo_stub_issettest_testissetproperty2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_IssetTest, testIssetProperty3, arginfo_stub_issettest_testissetproperty3, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_IssetTest, testIssetDynamicProperty1, arginfo_stub_issettest_testissetdynamicproperty1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_IssetTest, testIssetDynamicProperty1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_IssetTest, testIssetDynamicProperty1, arginfo_stub_issettest_testissetdynamicproperty1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_IssetTest, testIssetDynamicProperty2, arginfo_stub_issettest_testissetdynamicproperty2, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/issue1134.zep.c b/ext/stub/issue1134.zep.c
index 829e666c58..1adf340111 100644
--- a/ext/stub/issue1134.zep.c
+++ b/ext/stub/issue1134.zep.c
@@ -36,13 +36,10 @@ PHP_METHOD(Stub_Issue1134, __construct)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&config);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(config)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -67,13 +64,10 @@ PHP_METHOD(Stub_Issue1134, arrayWithFilledDefaultValue)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someDefaultData);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(someDefaultData)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/issue1134.zep.h b/ext/stub/issue1134.zep.h
index 6c44ebc836..967e3622f9 100644
--- a/ext/stub/issue1134.zep.h
+++ b/ext/stub/issue1134.zep.h
@@ -7,19 +7,11 @@ PHP_METHOD(Stub_Issue1134, __construct);
 PHP_METHOD(Stub_Issue1134, arrayWithFilledDefaultValue);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue1134___construct, 0, 0, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, config, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, config, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, config, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue1134_arraywithfilleddefaultvalue, 0, 0, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, someDefaultData, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, someDefaultData, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, someDefaultData, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_issue1134_method_entry) {
diff --git a/ext/stub/issue1521.zep.h b/ext/stub/issue1521.zep.h
index 518615b996..bee7d6fc02 100644
--- a/ext/stub/issue1521.zep.h
+++ b/ext/stub/issue1521.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue1521_test, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_issue1521_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Issue1521, test, arginfo_stub_issue1521_test, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Issue1521, test, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Issue1521, test, arginfo_stub_issue1521_test, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/issue2165/issue.zep.c b/ext/stub/issue2165/issue.zep.c
index 161dc606e7..5cea899e4b 100644
--- a/ext/stub/issue2165/issue.zep.c
+++ b/ext/stub/issue2165/issue.zep.c
@@ -45,13 +45,10 @@ PHP_METHOD(Stub_Issue2165_Issue, build)
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -121,14 +118,11 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 	ZVAL_UNDEF(&_42$$15);
 	ZVAL_UNDEF(&_43$$15);
 	ZVAL_UNDEF(&_44$$15);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ARRAY(a)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(validate)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -362,13 +356,10 @@ PHP_METHOD(Stub_Issue2165_Issue, quick)
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -398,13 +389,10 @@ PHP_METHOD(Stub_Issue2165_Issue, ones)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(m)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -447,14 +435,11 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 	ZVAL_UNDEF(&_11$$5);
 	ZVAL_UNDEF(&_12$$5);
 	ZVAL_UNDEF(&_13$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_ZVAL(value)
 		Z_PARAM_LONG(m)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -556,12 +541,9 @@ PHP_METHOD(Stub_Issue2165_Issue, divideMatrix)
 
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&c);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(b, stub_issue2165_issue_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/issue2165/issue.zep.h b/ext/stub/issue2165/issue.zep.h
index 350ac1d298..a959a69e69 100644
--- a/ext/stub/issue2165/issue.zep.h
+++ b/ext/stub/issue2165/issue.zep.h
@@ -12,11 +12,7 @@ PHP_METHOD(Stub_Issue2165_Issue, reciprocal);
 PHP_METHOD(Stub_Issue2165_Issue, divideMatrix);
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_stub_issue2165_issue_build, 0, 0, Stub\\Issue2165\\Issue, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, a, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, a, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, a, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue2165_issue___construct, 0, 0, 1)
@@ -25,11 +21,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue2165_issue___construct, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_stub_issue2165_issue_quick, 0, 0, Stub\\Issue2165\\Issue, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, a, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, a, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, a, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_stub_issue2165_issue_ones, 0, 2, Stub\\Issue2165\\Issue, 0)
diff --git a/ext/stub/issue663.zep.c b/ext/stub/issue663.zep.c
index 434053e128..7be142cff6 100644
--- a/ext/stub/issue663.zep.c
+++ b/ext/stub/issue663.zep.c
@@ -36,12 +36,9 @@ PHP_METHOD(Stub_Issue663, is_array_assoc)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -70,12 +67,9 @@ PHP_METHOD(Stub_Issue663, is_array_assoc_internal)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(arr)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -117,12 +111,9 @@ PHP_METHOD(Stub_Issue663, is_array_indexed)
 
 	ZVAL_UNDEF(&arr_sub);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/issue887.zep.c b/ext/stub/issue887.zep.c
index 1fa818d024..d1504bbd5f 100644
--- a/ext/stub/issue887.zep.c
+++ b/ext/stub/issue887.zep.c
@@ -52,13 +52,10 @@ PHP_METHOD(Stub_Issue887, add)
 
 	ZVAL_UNDEF(&key_sub);
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(key)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &key, &value);
@@ -87,7 +84,7 @@ PHP_METHOD(Stub_Issue887, fetch_object)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_OBS_VAR(&_0);
+	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/issue887.zep.h b/ext/stub/issue887.zep.h
index e83bdd3431..5bd0aa3da4 100644
--- a/ext/stub/issue887.zep.h
+++ b/ext/stub/issue887.zep.h
@@ -23,21 +23,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue887_fetch_object, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_issue887_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Issue887, __construct, arginfo_stub_issue887___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_Issue887, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_Issue887, __construct, arginfo_stub_issue887___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_Issue887, add, arginfo_stub_issue887_add, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Issue887, fetch_array, arginfo_stub_issue887_fetch_array, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Issue887, fetch_array, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Issue887, fetch_object, arginfo_stub_issue887_fetch_object, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Issue887, fetch_object, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Issue887, fetch_array, arginfo_stub_issue887_fetch_array, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Issue887, fetch_object, arginfo_stub_issue887_fetch_object, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/issue914.zep.h b/ext/stub/issue914.zep.h
index 6d7521eca8..312f0d8ed4 100644
--- a/ext/stub/issue914.zep.h
+++ b/ext/stub/issue914.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue914___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_issue914_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Issue914, __construct, arginfo_stub_issue914___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_Issue914, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_Issue914, __construct, arginfo_stub_issue914___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
diff --git a/ext/stub/issues.zep.c b/ext/stub/issues.zep.c
index bb99ee8142..d3c2405578 100644
--- a/ext/stub/issues.zep.c
+++ b/ext/stub/issues.zep.c
@@ -31,12 +31,9 @@ PHP_METHOD(Stub_Issues, setAdapter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&adapter_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(adapter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &adapter);
@@ -54,12 +51,9 @@ PHP_METHOD(Stub_Issues, someMethod)
 
 	ZVAL_UNDEF(&methodName_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(methodName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/issues.zep.h b/ext/stub/issues.zep.h
index d9cd5f2551..1432b9064b 100644
--- a/ext/stub/issues.zep.h
+++ b/ext/stub/issues.zep.h
@@ -21,10 +21,6 @@ ZEND_END_ARG_INFO()
 ZEPHIR_INIT_FUNCS(stub_issues_method_entry) {
 	PHP_ME(Stub_Issues, setAdapter, arginfo_stub_issues_setadapter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Issues, someMethod, arginfo_stub_issues_somemethod, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Issues, test, arginfo_stub_issues_test, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Issues, test, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Issues, test, arginfo_stub_issues_test, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/json.zep.h b/ext/stub/json.zep.h
index 1b30db4d7e..6c00495d72 100644
--- a/ext/stub/json.zep.h
+++ b/ext/stub/json.zep.h
@@ -29,35 +29,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_json_testdecodearray, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_json_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Json, testEncodeObject, arginfo_stub_json_testencodeobject, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Json, testEncodeObject, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Json, testEncodeArray, arginfo_stub_json_testencodearray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Json, testEncodeArray, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Json, testEncodeOptions, arginfo_stub_json_testencodeoptions, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Json, testEncodeOptions, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Json, testDecodeObject, arginfo_stub_json_testdecodeobject, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Json, testDecodeObject, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Json, testDecodeObject2, arginfo_stub_json_testdecodeobject2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Json, testDecodeObject2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Json, testDecodeArray, arginfo_stub_json_testdecodearray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Json, testDecodeArray, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Json, testEncodeObject, arginfo_stub_json_testencodeobject, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Json, testEncodeArray, arginfo_stub_json_testencodearray, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Json, testEncodeOptions, arginfo_stub_json_testencodeoptions, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Json, testDecodeObject, arginfo_stub_json_testdecodeobject, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Json, testDecodeObject2, arginfo_stub_json_testdecodeobject2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Json, testDecodeArray, arginfo_stub_json_testdecodearray, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/logical.zep.c b/ext/stub/logical.zep.c
index ef408d57bb..a22841f196 100644
--- a/ext/stub/logical.zep.c
+++ b/ext/stub/logical.zep.c
@@ -106,13 +106,10 @@ PHP_METHOD(Stub_Logical, testAnd9)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_1$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b_param);
@@ -195,13 +192,10 @@ PHP_METHOD(Stub_Logical, testMixed2)
 	ZVAL_UNDEF(&match_sub);
 	ZVAL_UNDEF(&minLength_sub);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(match)
 		Z_PARAM_ZVAL(minLength)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &match, &minLength);
@@ -257,13 +251,10 @@ PHP_METHOD(Stub_Logical, testMixed4)
 	zend_bool a, b, _0, _1, _2;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_BOOL(a)
 		Z_PARAM_BOOL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
diff --git a/ext/stub/logical.zep.h b/ext/stub/logical.zep.h
index 94b84df967..654f6ed011 100644
--- a/ext/stub/logical.zep.h
+++ b/ext/stub/logical.zep.h
@@ -55,48 +55,16 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_logical_testmixed4, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_logical_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testAnd1, arginfo_stub_logical_testand1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testAnd1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testAnd2, arginfo_stub_logical_testand2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testAnd2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testAnd3, arginfo_stub_logical_testand3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testAnd3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testAnd4, arginfo_stub_logical_testand4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testAnd4, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Logical, testAnd1, arginfo_stub_logical_testand1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Logical, testAnd2, arginfo_stub_logical_testand2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Logical, testAnd3, arginfo_stub_logical_testand3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Logical, testAnd4, arginfo_stub_logical_testand4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Logical, testAnd9, arginfo_stub_logical_testand9, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testOr1, arginfo_stub_logical_testor1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testOr1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testOr2, arginfo_stub_logical_testor2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testOr2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testMixed1, arginfo_stub_logical_testmixed1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testMixed1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Logical, testOr1, arginfo_stub_logical_testor1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Logical, testOr2, arginfo_stub_logical_testor2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Logical, testMixed1, arginfo_stub_logical_testmixed1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Logical, testMixed2, arginfo_stub_logical_testmixed2, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Logical, testMixed3, arginfo_stub_logical_testmixed3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Logical, testMixed3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Logical, testMixed3, arginfo_stub_logical_testmixed3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Logical, testMixed4, arginfo_stub_logical_testmixed4, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
index c5d4670335..dd976354d2 100644
--- a/ext/stub/mcall.zep.c
+++ b/ext/stub/mcall.zep.c
@@ -65,13 +65,10 @@ PHP_METHOD(Stub_Mcall, testMethod4)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -88,13 +85,10 @@ PHP_METHOD(Stub_Mcall, testMethod5)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -111,13 +105,10 @@ PHP_METHOD(Stub_Mcall, testMethod6)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -191,13 +182,10 @@ PHP_METHOD(Stub_Mcall, testCall4)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -218,13 +206,10 @@ PHP_METHOD(Stub_Mcall, testCall5)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -245,13 +230,10 @@ PHP_METHOD(Stub_Mcall, testCall6)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -275,13 +257,10 @@ PHP_METHOD(Stub_Mcall, testCall7)
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -308,13 +287,10 @@ PHP_METHOD(Stub_Mcall, testCall8)
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -340,13 +316,10 @@ PHP_METHOD(Stub_Mcall, testCall9)
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -415,13 +388,10 @@ PHP_METHOD(Stub_Mcall, testCall13)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -442,13 +412,10 @@ PHP_METHOD(Stub_Mcall, testCall14)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -469,13 +436,10 @@ PHP_METHOD(Stub_Mcall, testCall15)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -496,13 +460,10 @@ PHP_METHOD(Stub_Mcall, testCall16)
 
 	ZVAL_UNDEF(&c_sub);
 	ZVAL_UNDEF(&d_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(c)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -523,13 +484,10 @@ PHP_METHOD(Stub_Mcall, testCall17)
 
 	ZVAL_UNDEF(&c_sub);
 	ZVAL_UNDEF(&d_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(c)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -562,13 +520,10 @@ PHP_METHOD(Stub_Mcall, testMethod19)
 	long a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
@@ -591,13 +546,10 @@ PHP_METHOD(Stub_Mcall, testCall20)
 
 	ZVAL_UNDEF(&p_sub);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -634,13 +586,10 @@ PHP_METHOD(Stub_Mcall, testMethod21)
 	long a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
@@ -663,13 +612,10 @@ PHP_METHOD(Stub_Mcall, testCall22)
 
 	ZVAL_UNDEF(&p_sub);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -708,12 +654,9 @@ PHP_METHOD(Stub_Mcall, optionalRequereString)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -740,13 +683,10 @@ PHP_METHOD(Stub_Mcall, optionalParameterString)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -770,13 +710,11 @@ PHP_METHOD(Stub_Mcall, optionalParameterStringNull)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -797,13 +735,10 @@ PHP_METHOD(Stub_Mcall, optionalParameterInt)
 	zend_long param;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &param_param);
@@ -824,13 +759,11 @@ PHP_METHOD(Stub_Mcall, optionalParameterVar)
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
@@ -850,13 +783,10 @@ PHP_METHOD(Stub_Mcall, optionalParameterBoolTrue)
 	zend_bool param;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &param_param);
@@ -876,13 +806,10 @@ PHP_METHOD(Stub_Mcall, optionalParameterBoolFalse)
 	zend_bool param;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &param_param);
@@ -902,13 +829,10 @@ PHP_METHOD(Stub_Mcall, optionalParameterBoolean)
 	zend_bool start;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(start)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &start_param);
@@ -932,13 +856,11 @@ PHP_METHOD(Stub_Mcall, optionalParameterBooleanNull)
 	zend_bool value;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL_OR_NULL(value, is_null_true)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &value_param);
@@ -967,13 +889,10 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultEmptyArray)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&driverOptions);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -997,13 +916,11 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultNullValue)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&driverOptions);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1026,12 +943,9 @@ PHP_METHOD(Stub_Mcall, testArrayParam)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&driverOptions);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1048,12 +962,9 @@ PHP_METHOD(Stub_Mcall, testObjectParamCastStdClass)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, zend_standard_class_def)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
@@ -1069,12 +980,9 @@ PHP_METHOD(Stub_Mcall, testObjectParamCastOoParam)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, stub_oo_param_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
@@ -1224,13 +1132,11 @@ PHP_METHOD(Stub_Mcall, issue2245VarArgumentNullable)
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
diff --git a/ext/stub/mcall.zep.h b/ext/stub/mcall.zep.h
index cd90993017..781f28c894 100644
--- a/ext/stub/mcall.zep.h
+++ b/ext/stub/mcall.zep.h
@@ -213,19 +213,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_optionalparameterbooleannull, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_testarrayparamwithdefaultemptyarray, 0, 0, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, driverOptions, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, driverOptions, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, driverOptions, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_testarrayparamwithdefaultnullvalue, 0, 0, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, driverOptions, IS_ARRAY, 1, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, driverOptions, 1)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, driverOptions, IS_ARRAY, 1, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_testarrayparam, 0, 0, 1)
@@ -260,71 +252,31 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcall_issue2245varargumentnullable, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_mcall_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testMethod1, arginfo_stub_mcall_testmethod1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testMethod1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testMethod2, arginfo_stub_mcall_testmethod2, ZEND_ACC_PROTECTED)
-#else
-	PHP_ME(Stub_Mcall, testMethod2, NULL, ZEND_ACC_PROTECTED)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testMethod3, arginfo_stub_mcall_testmethod3, ZEND_ACC_PRIVATE)
-#else
-	PHP_ME(Stub_Mcall, testMethod3, NULL, ZEND_ACC_PRIVATE)
-#endif
+PHP_ME(Stub_Mcall, testMethod1, arginfo_stub_mcall_testmethod1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, testMethod2, arginfo_stub_mcall_testmethod2, ZEND_ACC_PROTECTED)
+PHP_ME(Stub_Mcall, testMethod3, arginfo_stub_mcall_testmethod3, ZEND_ACC_PRIVATE)
 	PHP_ME(Stub_Mcall, testMethod4, arginfo_stub_mcall_testmethod4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testMethod5, arginfo_stub_mcall_testmethod5, ZEND_ACC_PROTECTED)
 	PHP_ME(Stub_Mcall, testMethod6, arginfo_stub_mcall_testmethod6, ZEND_ACC_PRIVATE)
 	PHP_ME(Stub_Mcall, testMethod7, arginfo_stub_mcall_testmethod7, ZEND_ACC_PRIVATE)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCall1, arginfo_stub_mcall_testcall1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCall1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCall2, arginfo_stub_mcall_testcall2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCall2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCall3, arginfo_stub_mcall_testcall3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCall3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Mcall, testCall1, arginfo_stub_mcall_testcall1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, testCall2, arginfo_stub_mcall_testcall2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, testCall3, arginfo_stub_mcall_testcall3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall4, arginfo_stub_mcall_testcall4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall5, arginfo_stub_mcall_testcall5, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall6, arginfo_stub_mcall_testcall6, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall7, arginfo_stub_mcall_testcall7, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall8, arginfo_stub_mcall_testcall8, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall9, arginfo_stub_mcall_testcall9, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCall10, arginfo_stub_mcall_testcall10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCall10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCall11, arginfo_stub_mcall_testcall11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCall11, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCall12, arginfo_stub_mcall_testcall12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCall12, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Mcall, testCall10, arginfo_stub_mcall_testcall10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, testCall11, arginfo_stub_mcall_testcall11, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, testCall12, arginfo_stub_mcall_testcall12, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall13, arginfo_stub_mcall_testcall13, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall14, arginfo_stub_mcall_testcall14, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall15, arginfo_stub_mcall_testcall15, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall16, arginfo_stub_mcall_testcall16, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall17, arginfo_stub_mcall_testcall17, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCall18, arginfo_stub_mcall_testcall18, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCall18, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Mcall, testCall18, arginfo_stub_mcall_testcall18, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testMethod19, arginfo_stub_mcall_testmethod19, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testCall20, arginfo_stub_mcall_testcall20, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testMethod21, arginfo_stub_mcall_testmethod21, ZEND_ACC_PRIVATE)
@@ -343,31 +295,11 @@ ZEPHIR_INIT_FUNCS(stub_mcall_method_entry) {
 	PHP_ME(Stub_Mcall, testArrayParam, arginfo_stub_mcall_testarrayparam, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testObjectParamCastStdClass, arginfo_stub_mcall_testobjectparamcaststdclass, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, testObjectParamCastOoParam, arginfo_stub_mcall_testobjectparamcastooparam, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, bb, arginfo_stub_mcall_bb, ZEND_ACC_PRIVATE)
-#else
-	PHP_ME(Stub_Mcall, bb, NULL, ZEND_ACC_PRIVATE)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCallablePass, arginfo_stub_mcall_testcallablepass, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCallablePass, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, testCallableArrayThisMethodPass, arginfo_stub_mcall_testcallablearraythismethodpass, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, testCallableArrayThisMethodPass, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, aa, arginfo_stub_mcall_aa, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, aa, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Mcall, issue1136, arginfo_stub_mcall_issue1136, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Mcall, issue1136, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Mcall, bb, arginfo_stub_mcall_bb, ZEND_ACC_PRIVATE)
+PHP_ME(Stub_Mcall, testCallablePass, arginfo_stub_mcall_testcallablepass, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, testCallableArrayThisMethodPass, arginfo_stub_mcall_testcallablearraythismethodpass, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, aa, arginfo_stub_mcall_aa, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Mcall, issue1136, arginfo_stub_mcall_issue1136, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Mcall, issue2245VarArgumentNullable, arginfo_stub_mcall_issue2245varargumentnullable, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/mcall/caller.zep.c b/ext/stub/mcall/caller.zep.c
index 34671d4553..875093db51 100644
--- a/ext/stub/mcall/caller.zep.c
+++ b/ext/stub/mcall/caller.zep.c
@@ -32,12 +32,9 @@ PHP_METHOD(Stub_Mcall_Caller, start)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&f_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(f)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/mcallchained.zep.h b/ext/stub/mcallchained.zep.h
index f090ac8d60..c538fcafd9 100644
--- a/ext/stub/mcallchained.zep.h
+++ b/ext/stub/mcallchained.zep.h
@@ -33,40 +33,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcallchained_testchained4, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_mcallchained_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallChained, testMethod1, arginfo_stub_mcallchained_testmethod1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallChained, testMethod1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallChained, testMethod2, arginfo_stub_mcallchained_testmethod2, ZEND_ACC_PROTECTED)
-#else
-	PHP_ME(Stub_McallChained, testMethod2, NULL, ZEND_ACC_PROTECTED)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallChained, testMethod3, arginfo_stub_mcallchained_testmethod3, ZEND_ACC_PRIVATE)
-#else
-	PHP_ME(Stub_McallChained, testMethod3, NULL, ZEND_ACC_PRIVATE)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallChained, testChained1, arginfo_stub_mcallchained_testchained1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallChained, testChained1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallChained, testChained2, arginfo_stub_mcallchained_testchained2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallChained, testChained2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallChained, testChained3, arginfo_stub_mcallchained_testchained3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallChained, testChained3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallChained, testChained4, arginfo_stub_mcallchained_testchained4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallChained, testChained4, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_McallChained, testMethod1, arginfo_stub_mcallchained_testmethod1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallChained, testMethod2, arginfo_stub_mcallchained_testmethod2, ZEND_ACC_PROTECTED)
+PHP_ME(Stub_McallChained, testMethod3, arginfo_stub_mcallchained_testmethod3, ZEND_ACC_PRIVATE)
+PHP_ME(Stub_McallChained, testChained1, arginfo_stub_mcallchained_testchained1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallChained, testChained2, arginfo_stub_mcallchained_testchained2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallChained, testChained3, arginfo_stub_mcallchained_testchained3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallChained, testChained4, arginfo_stub_mcallchained_testchained4, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/mcalldynamic.zep.c b/ext/stub/mcalldynamic.zep.c
index 58a97970f9..784b32899d 100644
--- a/ext/stub/mcalldynamic.zep.c
+++ b/ext/stub/mcalldynamic.zep.c
@@ -69,13 +69,10 @@ PHP_METHOD(Stub_McallDynamic, __call)
 	ZVAL_UNDEF(&method_sub);
 	ZVAL_UNDEF(&arguments_sub);
 	ZVAL_UNDEF(&realMethod);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(method)
 		Z_PARAM_ZVAL(arguments)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/mcalldynamic.zep.h b/ext/stub/mcalldynamic.zep.h
index b0eecbaa09..a8df47f9eb 100644
--- a/ext/stub/mcalldynamic.zep.h
+++ b/ext/stub/mcalldynamic.zep.h
@@ -23,21 +23,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_mcalldynamic_testcallanonymousfunctionwithco
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_mcalldynamic_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallDynamic, testMethod1, arginfo_stub_mcalldynamic_testmethod1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallDynamic, testMethod1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallDynamic, testMagicCall1, arginfo_stub_mcalldynamic_testmagiccall1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallDynamic, testMagicCall1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_McallDynamic, testMethod1, arginfo_stub_mcalldynamic_testmethod1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallDynamic, testMagicCall1, arginfo_stub_mcalldynamic_testmagiccall1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_McallDynamic, __call, arginfo_stub_mcalldynamic___call, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallDynamic, testCallAnonymousFunctionWithContext, arginfo_stub_mcalldynamic_testcallanonymousfunctionwithcontext, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallDynamic, testCallAnonymousFunctionWithContext, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_McallDynamic, testCallAnonymousFunctionWithContext, arginfo_stub_mcalldynamic_testcallanonymousfunctionwithcontext, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/mcallinternal.zep.c b/ext/stub/mcallinternal.zep.c
index 8d9dd305f0..cc832af566 100644
--- a/ext/stub/mcallinternal.zep.c
+++ b/ext/stub/mcallinternal.zep.c
@@ -48,13 +48,10 @@ void zep_Stub_McallInternal_b(int ht, zend_execute_data *execute_data, zval *ret
 	zval *a, a_sub, *b, b_sub;
 		ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	a = a_ext;
@@ -69,13 +66,10 @@ void zep_Stub_McallInternal_c(int ht, zend_execute_data *execute_data, zval *ret
 {
 	zval *a_param = NULL, *b_param = NULL;
 	long a, b;
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	a_param = a_param_ext;
@@ -223,13 +217,10 @@ void zep_Stub_McallInternal_other(int ht, zend_execute_data *execute_data, zval
 {
 	zval *a_param = NULL, *b_param = NULL;
 	long a, b;
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	a_param = a_param_ext;
diff --git a/ext/stub/mcallinternal.zep.h b/ext/stub/mcallinternal.zep.h
index 55d3ad272b..2f14cd511e 100644
--- a/ext/stub/mcallinternal.zep.h
+++ b/ext/stub/mcallinternal.zep.h
@@ -55,26 +55,10 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_stub_mcallinternal_issue1956, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_mcallinternal_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallInternal, e, arginfo_stub_mcallinternal_e, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallInternal, e, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallInternal, d, arginfo_stub_mcallinternal_d, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallInternal, d, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallInternal, f, arginfo_stub_mcallinternal_f, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallInternal, f, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_McallInternal, g, arginfo_stub_mcallinternal_g, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_McallInternal, g, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_McallInternal, e, arginfo_stub_mcallinternal_e, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallInternal, d, arginfo_stub_mcallinternal_d, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallInternal, f, arginfo_stub_mcallinternal_f, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_McallInternal, g, arginfo_stub_mcallinternal_g, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_McallInternal, callFibonacci, arginfo_stub_mcallinternal_callfibonacci, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_McallInternal, issue1956, arginfo_stub_mcallinternal_issue1956, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/methodabstract.zep.h b/ext/stub/methodabstract.zep.h
index 7ce2010185..9dc7a8c2a2 100644
--- a/ext/stub/methodabstract.zep.h
+++ b/ext/stub/methodabstract.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_methodabstract_testinterfacemetho, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_methodabstract_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_MethodAbstract, testInterfaceMetho, arginfo_stub_methodabstract_testinterfacemetho, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_MethodAbstract, testInterfaceMetho, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_MethodAbstract, testInterfaceMetho, arginfo_stub_methodabstract_testinterfacemetho, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/methodargs.zep.c b/ext/stub/methodargs.zep.c
index ca807e4031..09af308245 100644
--- a/ext/stub/methodargs.zep.c
+++ b/ext/stub/methodargs.zep.c
@@ -41,12 +41,9 @@ PHP_METHOD(Stub_MethodArgs, setCallable)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -61,12 +58,9 @@ PHP_METHOD(Stub_MethodArgs, setObject)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -81,12 +75,9 @@ PHP_METHOD(Stub_MethodArgs, setCallableStrict)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -105,12 +96,9 @@ PHP_METHOD(Stub_MethodArgs, setObjectStrict)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -129,12 +117,9 @@ PHP_METHOD(Stub_MethodArgs, setResourceStrict)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_RESOURCE(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
@@ -157,13 +142,10 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalValueWithDefaultStaticConstantAccess)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&method_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(method)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -191,13 +173,10 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalStringValueWithDefaultStaticConstantAc
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameter);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -223,13 +202,10 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalDoubleValueWithDefaultStaticConstantAc
 	double parameter;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &parameter_param);
@@ -253,13 +229,10 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalBoolValueWithDefaultStaticConstantAcce
 	zend_bool parameter;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &parameter_param);
@@ -283,13 +256,10 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalIntValueWithDefaultStaticConstantAcces
 	zend_long parameter;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &parameter_param);
diff --git a/ext/stub/namespaces/classentry.zep.c b/ext/stub/namespaces/classentry.zep.c
index 347d7d32ae..c2281e7a46 100644
--- a/ext/stub/namespaces/classentry.zep.c
+++ b/ext/stub/namespaces/classentry.zep.c
@@ -29,12 +29,9 @@ PHP_METHOD(Stub_Namespaces_ClassEntry, setParam)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, stub_namespaces_a_b_sub_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
@@ -50,12 +47,9 @@ PHP_METHOD(Stub_Namespaces_ClassEntry, setParamImported)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, stub_namespaces_a_b_sub_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
diff --git a/ext/stub/nativearray.zep.c b/ext/stub/nativearray.zep.c
index d3cd029e2f..0b6bf9723b 100644
--- a/ext/stub/nativearray.zep.c
+++ b/ext/stub/nativearray.zep.c
@@ -773,7 +773,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &a, 0, PH_NOISY, "stub/nativearray.zep", 245);
 	RETURN_CCTOR(&b);
 }
@@ -795,7 +795,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess2)
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_string(&b, &a, SL("a"), PH_NOISY, "stub/nativearray.zep", 255);
 	RETURN_CCTOR(&b);
 }
@@ -826,7 +826,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess3)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
 	c = 0;
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &a, c, PH_NOISY, "stub/nativearray.zep", 267);
 	RETURN_CCTOR(&b);
 }
@@ -852,7 +852,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess4)
 	add_assoc_long_ex(&a, SL("c"), 3);
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "a");
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 279);
 	RETURN_CCTOR(&b);
 }
@@ -877,7 +877,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess5)
 	add_assoc_long_ex(&a, SL("c"), 3);
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "a");
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 290);
 	RETURN_CCTOR(&b);
 }
@@ -931,7 +931,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess1)
 	add_index_stringl(&_0, 1, SL("b"));
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_fetch_long(&_1, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 310);
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_1, 0, PH_NOISY, "stub/nativearray.zep", 310);
 	RETURN_CCTOR(&b);
 }
@@ -964,7 +964,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_2, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 320);
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_2, 1, PH_NOISY, "stub/nativearray.zep", 320);
 	RETURN_CCTOR(&b);
 }
@@ -1003,7 +1003,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 330);
 	RETURN_CCTOR(&b);
 }
@@ -1042,7 +1042,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 340);
 	RETURN_CCTOR(&b);
 }
@@ -1076,7 +1076,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 	zephir_array_update_string(&a, SL("a"), &_0, PH_COPY | PH_SEPARATE);
 	zephir_array_fetch_string(&_2, &a, SL("a"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
 	zephir_array_fetch_string(&_3, &_2, SL("b"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
-	ZEPHIR_OBS_VAR(&b);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_string(&b, &_3, SL("c"), PH_NOISY, "stub/nativearray.zep", 350);
 	RETURN_CCTOR(&b);
 }
@@ -1749,12 +1749,9 @@ PHP_METHOD(Stub_NativeArray, testArrayKeys)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
@@ -1772,12 +1769,9 @@ PHP_METHOD(Stub_NativeArray, testImplodeArray)
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1830,12 +1824,9 @@ PHP_METHOD(Stub_NativeArray, issue264)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&tokens);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(tokens)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1855,12 +1846,9 @@ PHP_METHOD(Stub_NativeArray, issue743a)
 
 	ZVAL_UNDEF(&current743a);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current743a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1883,12 +1871,9 @@ PHP_METHOD(Stub_NativeArray, issue743b)
 
 	ZVAL_UNDEF(&current);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1912,12 +1897,9 @@ PHP_METHOD(Stub_NativeArray, issue743c)
 	ZVAL_UNDEF(&current);
 	ZVAL_UNDEF(&key);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -2008,13 +1990,10 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_1$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(prefix)
 		Z_PARAM_STR(baseDir)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/nativearray.zep.h b/ext/stub/nativearray.zep.h
index adea753285..7154aee39f 100644
--- a/ext/stub/nativearray.zep.h
+++ b/ext/stub/nativearray.zep.h
@@ -386,10 +386,6 @@ ZEPHIR_INIT_FUNCS(stub_nativearray_method_entry) {
 	PHP_ME(Stub_NativeArray, issue743c, arginfo_stub_nativearray_issue743c, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_NativeArray, issue709, arginfo_stub_nativearray_issue709, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_NativeArray, Issue1140, arginfo_stub_nativearray_issue1140, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_NativeArray, Issue1159, arginfo_stub_nativearray_issue1159, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_NativeArray, Issue1159, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_NativeArray, Issue1159, arginfo_stub_nativearray_issue1159, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo.zep.h b/ext/stub/oo.zep.h
index 33a50a44b2..e28e6fe0b9 100644
--- a/ext/stub/oo.zep.h
+++ b/ext/stub/oo.zep.h
@@ -57,66 +57,18 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_createinstancesinloop, 0
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance1, arginfo_stub_oo_testinstance1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance2, arginfo_stub_oo_testinstance2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance3, arginfo_stub_oo_testinstance3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance4, arginfo_stub_oo_testinstance4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance5, arginfo_stub_oo_testinstance5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance6, arginfo_stub_oo_testinstance6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance6, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance7, arginfo_stub_oo_testinstance7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance8, arginfo_stub_oo_testinstance8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance9, arginfo_stub_oo_testinstance9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance10, arginfo_stub_oo_testinstance10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance11, arginfo_stub_oo_testinstance11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance11, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo, testInstance12, arginfo_stub_oo_testinstance12, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo, testInstance12, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo, testInstance1, arginfo_stub_oo_testinstance1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance2, arginfo_stub_oo_testinstance2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance3, arginfo_stub_oo_testinstance3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance4, arginfo_stub_oo_testinstance4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance5, arginfo_stub_oo_testinstance5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance6, arginfo_stub_oo_testinstance6, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance7, arginfo_stub_oo_testinstance7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance8, arginfo_stub_oo_testinstance8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance9, arginfo_stub_oo_testinstance9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance10, arginfo_stub_oo_testinstance10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance11, arginfo_stub_oo_testinstance11, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo, testInstance12, arginfo_stub_oo_testinstance12, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo, createInstancesInLoop, arginfo_stub_oo_createinstancesinloop, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/abstractclass.zep.h b/ext/stub/oo/abstractclass.zep.h
index 137e96b858..44d7936ef4 100644
--- a/ext/stub/oo/abstractclass.zep.h
+++ b/ext/stub/oo/abstractclass.zep.h
@@ -41,19 +41,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_abstractclass_testabstra
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_abstractclass_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_AbstractClass, testMethodDeclaration, arginfo_stub_oo_abstractclass_testmethoddeclaration, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_AbstractClass, testMethodDeclaration, NULL, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_AbstractClass, testMethodDeclaration, arginfo_stub_oo_abstractclass_testmethoddeclaration, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_AbstractClass, testMethodDeclarationWithReturnType, arginfo_stub_oo_abstractclass_testmethoddeclarationwithreturntype, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_AbstractClass, testMethodDeclarationWithParameter, arginfo_stub_oo_abstractclass_testmethoddeclarationwithparameter, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_AbstractClass, testMethodDeclarationWithParameterAndReturnType, arginfo_stub_oo_abstractclass_testmethoddeclarationwithparameterandreturntype, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_AbstractClass, testAbstractMethodDeclaration, arginfo_stub_oo_abstractclass_testabstractmethoddeclaration, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_AbstractClass, testAbstractMethodDeclaration, NULL, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_AbstractClass, testAbstractMethodDeclaration, arginfo_stub_oo_abstractclass_testabstractmethoddeclaration, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_AbstractClass, testAbstractMethodDeclarationWithReturnType, arginfo_stub_oo_abstractclass_testabstractmethoddeclarationwithreturntype, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_AbstractClass, testAbstractMethodDeclarationWithParameter, arginfo_stub_oo_abstractclass_testabstractmethoddeclarationwithparameter, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_AbstractClass, testAbstractMethodDeclarationWithParameterAndReturnType, arginfo_stub_oo_abstractclass_testabstractmethoddeclarationwithparameterandreturntype, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
diff --git a/ext/stub/oo/concretestatic.zep.h b/ext/stub/oo/concretestatic.zep.h
index e2e2f17be8..d1b9de9364 100644
--- a/ext/stub/oo/concretestatic.zep.h
+++ b/ext/stub/oo/concretestatic.zep.h
@@ -21,16 +21,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_concretestatic_simplesta
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_concretestatic_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConcreteStatic, parentFunction, arginfo_stub_oo_concretestatic_parentfunction, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Oo_ConcreteStatic, parentFunction, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConcreteStatic, childFunction, arginfo_stub_oo_concretestatic_childfunction, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Oo_ConcreteStatic, childFunction, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_Oo_ConcreteStatic, parentFunction, arginfo_stub_oo_concretestatic_parentfunction, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Oo_ConcreteStatic, childFunction, arginfo_stub_oo_concretestatic_childfunction, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Oo_ConcreteStatic, callParentFunction, arginfo_stub_oo_concretestatic_callparentfunction, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Oo_ConcreteStatic, simpleStaticIntReturn, arginfo_stub_oo_concretestatic_simplestaticintreturn, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
diff --git a/ext/stub/oo/constantsinterface.zep.h b/ext/stub/oo/constantsinterface.zep.h
index f6c552dca8..2d8bd3dd36 100644
--- a/ext/stub/oo/constantsinterface.zep.h
+++ b/ext/stub/oo/constantsinterface.zep.h
@@ -29,35 +29,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_constantsinterface_testreadinterfaceconst
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_constantsinterface_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant1, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant2, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant3, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant3, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant4, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant4, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant5, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant5, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant6, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant6, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant1, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant2, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant3, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant3, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant4, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant4, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant5, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant5, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_ConstantsInterface, testReadInterfaceConstant6, arginfo_stub_oo_constantsinterface_testreadinterfaceconstant6, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/deprecatedmethods.zep.h b/ext/stub/oo/deprecatedmethods.zep.h
index 0ffa7652bc..67fe030525 100644
--- a/ext/stub/oo/deprecatedmethods.zep.h
+++ b/ext/stub/oo/deprecatedmethods.zep.h
@@ -17,20 +17,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_deprecatedmethods_privatedeprecated, 0, 0
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_deprecatedmethods_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_DeprecatedMethods, publicDeprecated, arginfo_stub_oo_deprecatedmethods_publicdeprecated, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
-#else
-	PHP_ME(Stub_Oo_DeprecatedMethods, publicDeprecated, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_DeprecatedMethods, normalMethod, arginfo_stub_oo_deprecatedmethods_normalmethod, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_DeprecatedMethods, normalMethod, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_DeprecatedMethods, privateDeprecated, arginfo_stub_oo_deprecatedmethods_privatedeprecated, ZEND_ACC_PRIVATE|ZEND_ACC_DEPRECATED)
-#else
-	PHP_ME(Stub_Oo_DeprecatedMethods, privateDeprecated, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_DEPRECATED)
-#endif
+PHP_ME(Stub_Oo_DeprecatedMethods, publicDeprecated, arginfo_stub_oo_deprecatedmethods_publicdeprecated, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
+PHP_ME(Stub_Oo_DeprecatedMethods, normalMethod, arginfo_stub_oo_deprecatedmethods_normalmethod, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_DeprecatedMethods, privateDeprecated, arginfo_stub_oo_deprecatedmethods_privatedeprecated, ZEND_ACC_PRIVATE|ZEND_ACC_DEPRECATED)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/dynamicprop.zep.c b/ext/stub/oo/dynamicprop.zep.c
index cf635b15f1..a8fdfc728b 100644
--- a/ext/stub/oo/dynamicprop.zep.c
+++ b/ext/stub/oo/dynamicprop.zep.c
@@ -39,12 +39,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -75,12 +72,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_BOOL(&__$true, 1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -109,12 +103,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_BOOL(&__$false, 0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -143,12 +134,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -180,12 +168,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -218,12 +203,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -255,12 +237,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -290,12 +269,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -327,12 +303,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&a);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -364,12 +337,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -402,12 +372,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -455,12 +422,9 @@ PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/oo/dynamicprop.zep.h b/ext/stub/oo/dynamicprop.zep.h
index 4daece4bc4..401bde56f3 100644
--- a/ext/stub/oo/dynamicprop.zep.h
+++ b/ext/stub/oo/dynamicprop.zep.h
@@ -84,16 +84,8 @@ ZEPHIR_INIT_FUNCS(stub_oo_dynamicprop_method_entry) {
 	PHP_ME(Stub_Oo_DynamicProp, setPropertyVariableString, arginfo_stub_oo_dynamicprop_setpropertyvariablestring, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue, arginfo_stub_oo_dynamicprop_setpropertyvariablebooltrue, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse, arginfo_stub_oo_dynamicprop_setpropertyvariableboolfalse, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_DynamicProp, setExistingStringProperty, arginfo_stub_oo_dynamicprop_setexistingstringproperty, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_DynamicProp, setExistingStringProperty, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_DynamicProp, setExistingStringProperty, arginfo_stub_oo_dynamicprop_setexistingstringproperty, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_DynamicProp, setExistingStringPropertyString, arginfo_stub_oo_dynamicprop_setexistingstringpropertystring, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_DynamicProp, setNonExistingStringProperty, arginfo_stub_oo_dynamicprop_setnonexistingstringproperty, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_DynamicProp, setNonExistingStringProperty, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_DynamicProp, setNonExistingStringProperty, arginfo_stub_oo_dynamicprop_setnonexistingstringproperty, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/extendpdoclass.zep.c b/ext/stub/oo/extendpdoclass.zep.c
index 7adbea3715..f1789c9add 100644
--- a/ext/stub/oo/extendpdoclass.zep.c
+++ b/ext/stub/oo/extendpdoclass.zep.c
@@ -42,7 +42,6 @@ PHP_METHOD(Stub_Oo_ExtendPdoClass, __construct)
 	ZVAL_UNDEF(&attrs_sub);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 4)
 		Z_PARAM_STR(dsn)
@@ -51,7 +50,6 @@ PHP_METHOD(Stub_Oo_ExtendPdoClass, __construct)
 		Z_PARAM_STR_OR_NULL(password)
 		Z_PARAM_ZVAL(attrs)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/oo/ooconstruct.zep.h b/ext/stub/oo/ooconstruct.zep.h
index 8cebd6a463..cf1b3ee82e 100644
--- a/ext/stub/oo/ooconstruct.zep.h
+++ b/ext/stub/oo/ooconstruct.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooconstruct___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_ooconstruct_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoConstruct, __construct, arginfo_stub_oo_ooconstruct___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_Oo_OoConstruct, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_Oo_OoConstruct, __construct, arginfo_stub_oo_ooconstruct___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/ooconstructparams.zep.c b/ext/stub/oo/ooconstructparams.zep.c
index 439939bb35..92b8f922c0 100644
--- a/ext/stub/oo/ooconstructparams.zep.c
+++ b/ext/stub/oo/ooconstructparams.zep.c
@@ -35,13 +35,10 @@ PHP_METHOD(Stub_Oo_OoConstructParams, __construct)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
diff --git a/ext/stub/oo/ooconstructparams.zep.h b/ext/stub/oo/ooconstructparams.zep.h
index 2d97ecad9a..2c9698e7bb 100644
--- a/ext/stub/oo/ooconstructparams.zep.h
+++ b/ext/stub/oo/ooconstructparams.zep.h
@@ -20,15 +20,7 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_ooconstructparams_method_entry) {
 	PHP_ME(Stub_Oo_OoConstructParams, __construct, arginfo_stub_oo_ooconstructparams___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoConstructParams, getA, arginfo_stub_oo_ooconstructparams_geta, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoConstructParams, getA, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoConstructParams, getB, arginfo_stub_oo_ooconstructparams_getb, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoConstructParams, getB, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_OoConstructParams, getA, arginfo_stub_oo_ooconstructparams_geta, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_OoConstructParams, getB, arginfo_stub_oo_ooconstructparams_getb, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/oodestruct.zep.c b/ext/stub/oo/oodestruct.zep.c
index 07905d7ce1..fa330e94fb 100644
--- a/ext/stub/oo/oodestruct.zep.c
+++ b/ext/stub/oo/oodestruct.zep.c
@@ -184,7 +184,6 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 	ZVAL_UNDEF(&_31$$14);
 	ZVAL_UNDEF(&_33$$14);
 	ZVAL_UNDEF(&_34$$14);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 3)
 		Z_PARAM_STR(file)
@@ -192,7 +191,6 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		Z_PARAM_LONG_OR_NULL(width, is_null_true)
 		Z_PARAM_LONG_OR_NULL(height, is_null_true)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/oo/oodestruct.zep.h b/ext/stub/oo/oodestruct.zep.h
index 478daeadd3..2da8d24122 100644
--- a/ext/stub/oo/oodestruct.zep.h
+++ b/ext/stub/oo/oodestruct.zep.h
@@ -49,25 +49,13 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_oodestruct_method_entry) {
 	PHP_ME(Stub_Oo_OoDestruct, getHeight, arginfo_stub_oo_oodestruct_getheight, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDestruct, getImage, arginfo_stub_oo_oodestruct_getimage, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoDestruct, getImage, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_OoDestruct, getImage, arginfo_stub_oo_oodestruct_getimage, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoDestruct, getMime, arginfo_stub_oo_oodestruct_getmime, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDestruct, getRealpath, arginfo_stub_oo_oodestruct_getrealpath, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoDestruct, getRealpath, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_OoDestruct, getRealpath, arginfo_stub_oo_oodestruct_getrealpath, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoDestruct, getType, arginfo_stub_oo_oodestruct_gettype, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoDestruct, getWidth, arginfo_stub_oo_oodestruct_getwidth, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoDestruct, __construct, arginfo_stub_oo_oodestruct___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDestruct, __destruct, arginfo_stub_oo_oodestruct___destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
-#else
-	PHP_ME(Stub_Oo_OoDestruct, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
-#endif
+PHP_ME(Stub_Oo_OoDestruct, __destruct, arginfo_stub_oo_oodestruct___destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
 	PHP_ME(Stub_Oo_OoDestruct, check, arginfo_stub_oo_oodestruct_check, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Oo_OoDestruct, getVersion, arginfo_stub_oo_oodestruct_getversion, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
diff --git a/ext/stub/oo/oodynamica.zep.h b/ext/stub/oo/oodynamica.zep.h
index c96fa916fb..3c855f9ed9 100644
--- a/ext/stub/oo/oodynamica.zep.h
+++ b/ext/stub/oo/oodynamica.zep.h
@@ -25,30 +25,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_oodynamica_execute2, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_oodynamica_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDynamicA, getNew, arginfo_stub_oo_oodynamica_getnew, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Oo_OoDynamicA, getNew, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDynamicA, call2, arginfo_stub_oo_oodynamica_call2, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Oo_OoDynamicA, call2, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDynamicA, call1, arginfo_stub_oo_oodynamica_call1, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Oo_OoDynamicA, call1, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDynamicA, execute, arginfo_stub_oo_oodynamica_execute, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoDynamicA, execute, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDynamicA, execute2, arginfo_stub_oo_oodynamica_execute2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoDynamicA, execute2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_OoDynamicA, getNew, arginfo_stub_oo_oodynamica_getnew, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Oo_OoDynamicA, call2, arginfo_stub_oo_oodynamica_call2, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Oo_OoDynamicA, call1, arginfo_stub_oo_oodynamica_call1, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Oo_OoDynamicA, execute, arginfo_stub_oo_oodynamica_execute, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_OoDynamicA, execute2, arginfo_stub_oo_oodynamica_execute2, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/oodynamicb.zep.h b/ext/stub/oo/oodynamicb.zep.h
index a003c816de..0a39d3ebe6 100644
--- a/ext/stub/oo/oodynamicb.zep.h
+++ b/ext/stub/oo/oodynamicb.zep.h
@@ -13,15 +13,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_oodynamicb_execute2, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_oodynamicb_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDynamicB, execute, arginfo_stub_oo_oodynamicb_execute, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoDynamicB, execute, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoDynamicB, execute2, arginfo_stub_oo_oodynamicb_execute2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoDynamicB, execute2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_OoDynamicB, execute, arginfo_stub_oo_oodynamicb_execute, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_OoDynamicB, execute2, arginfo_stub_oo_oodynamicb_execute2, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/oonativeimplements.zep.c b/ext/stub/oo/oonativeimplements.zep.c
index ca47fe0c27..86a903fa08 100644
--- a/ext/stub/oo/oonativeimplements.zep.c
+++ b/ext/stub/oo/oonativeimplements.zep.c
@@ -112,12 +112,9 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, seek)
 	zend_long position;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(position)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &position_param);
@@ -140,12 +137,9 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, offsetExists)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&offset_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
@@ -159,12 +153,9 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, offsetGet)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&offset_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
@@ -179,13 +170,10 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, offsetSet)
 
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(offset)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &offset, &value);
@@ -199,12 +187,9 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, offsetUnset)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&offset_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
@@ -228,12 +213,9 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, unserialize)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serialized);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(serialized)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -261,12 +243,9 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, __unserialize)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&data);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(data)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/oo/oonativeimplements.zep.h b/ext/stub/oo/oonativeimplements.zep.h
index eca407a308..dc29ca4604 100644
--- a/ext/stub/oo/oonativeimplements.zep.h
+++ b/ext/stub/oo/oonativeimplements.zep.h
@@ -26,18 +26,10 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, __unserialize);
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements_count, 0, 0, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements_current, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_oonativeimplements_current, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements_key, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_oonativeimplements_key, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_oo_oonativeimplements_next, 0, 0, IS_VOID, 0)
diff --git a/ext/stub/oo/ooparams.zep.c b/ext/stub/oo/ooparams.zep.c
index 7f2c6be9ce..73c17eac43 100644
--- a/ext/stub/oo/ooparams.zep.c
+++ b/ext/stub/oo/ooparams.zep.c
@@ -74,12 +74,9 @@ PHP_METHOD(Stub_Oo_OoParams, setAge)
 	zend_long age;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &age_param);
@@ -95,12 +92,9 @@ PHP_METHOD(Stub_Oo_OoParams, setAverage)
 	double average;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &average_param);
@@ -118,12 +112,9 @@ PHP_METHOD(Stub_Oo_OoParams, setName)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -140,12 +131,9 @@ PHP_METHOD(Stub_Oo_OoParams, setEnabled)
 	zend_bool enabled;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(enabled)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &enabled_param);
@@ -163,12 +151,9 @@ PHP_METHOD(Stub_Oo_OoParams, setList)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someList);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -185,12 +170,9 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictAge)
 	zend_long age;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &age_param);
@@ -210,12 +192,9 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictAverage)
 	double average;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &average_param);
@@ -255,12 +234,9 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictName)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -285,12 +261,9 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictEnabled)
 	zend_bool enabled;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(enabled)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &enabled_param);
@@ -308,12 +281,9 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictList)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someList);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -330,13 +300,10 @@ PHP_METHOD(Stub_Oo_OoParams, setAgeDefault)
 	zend_long age;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &age_param);
@@ -356,13 +323,10 @@ PHP_METHOD(Stub_Oo_OoParams, setAverageDefault)
 	double average;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &average_param);
@@ -384,13 +348,10 @@ PHP_METHOD(Stub_Oo_OoParams, setNameDefault)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -412,13 +373,10 @@ PHP_METHOD(Stub_Oo_OoParams, setEnabledDefault)
 	zend_bool enabled;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(enabled)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &enabled_param);
@@ -440,13 +398,10 @@ PHP_METHOD(Stub_Oo_OoParams, setListDefault)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someList);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -468,12 +423,9 @@ PHP_METHOD(Stub_Oo_OoParams, setConstAge)
 	zend_long age;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &age_param);
@@ -489,12 +441,9 @@ PHP_METHOD(Stub_Oo_OoParams, setConstAverage)
 	double average;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &average_param);
@@ -510,12 +459,9 @@ PHP_METHOD(Stub_Oo_OoParams, setObject)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(obj)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
@@ -531,12 +477,9 @@ PHP_METHOD(Stub_Oo_OoParams, setCallable)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(obj)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
@@ -552,12 +495,9 @@ PHP_METHOD(Stub_Oo_OoParams, setResource)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_RESOURCE(obj)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
@@ -573,12 +513,9 @@ PHP_METHOD(Stub_Oo_OoParams, setObjectClassCast)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameter_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(parameter, stub_oo_param_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &parameter);
diff --git a/ext/stub/oo/ooparams.zep.h b/ext/stub/oo/ooparams.zep.h
index 61d77c2103..6293f97ca9 100644
--- a/ext/stub/oo/ooparams.zep.h
+++ b/ext/stub/oo/ooparams.zep.h
@@ -94,11 +94,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_setenableddefault, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_setlistdefault, 0, 0, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, someList, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, someList, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, someList, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_setconstage, 0, 0, 1)
@@ -126,16 +122,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_setobjectclasscast, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_ooparams_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoParams, createThisClassWithoutWriteCurrentNamespace, arginfo_stub_oo_ooparams_createthisclasswithoutwritecurrentnamespace, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoParams, createThisClassWithoutWriteCurrentNamespace, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoParams, createOtherClassWithoutWriteCurrentNamespace, arginfo_stub_oo_ooparams_createotherclasswithoutwritecurrentnamespace, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoParams, createOtherClassWithoutWriteCurrentNamespace, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_OoParams, createThisClassWithoutWriteCurrentNamespace, arginfo_stub_oo_ooparams_createthisclasswithoutwritecurrentnamespace, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_OoParams, createOtherClassWithoutWriteCurrentNamespace, arginfo_stub_oo_ooparams_createotherclasswithoutwritecurrentnamespace, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setAge, arginfo_stub_oo_ooparams_setage, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setAverage, arginfo_stub_oo_ooparams_setaverage, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setName, arginfo_stub_oo_ooparams_setname, ZEND_ACC_PUBLIC)
@@ -143,11 +131,7 @@ ZEPHIR_INIT_FUNCS(stub_oo_ooparams_method_entry) {
 	PHP_ME(Stub_Oo_OoParams, setList, arginfo_stub_oo_ooparams_setlist, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setStrictAge, arginfo_stub_oo_ooparams_setstrictage, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setStrictAverage, arginfo_stub_oo_ooparams_setstrictaverage, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_OoParams, setStrictNameFromZephirLand, arginfo_stub_oo_ooparams_setstrictnamefromzephirland, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_OoParams, setStrictNameFromZephirLand, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_OoParams, setStrictNameFromZephirLand, arginfo_stub_oo_ooparams_setstrictnamefromzephirland, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setStrictName, arginfo_stub_oo_ooparams_setstrictname, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setStrictEnabled, arginfo_stub_oo_ooparams_setstrictenabled, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setStrictList, arginfo_stub_oo_ooparams_setstrictlist, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/oo/propertyaccess.zep.c b/ext/stub/oo/propertyaccess.zep.c
index 80148c4d66..038d7f52ba 100644
--- a/ext/stub/oo/propertyaccess.zep.c
+++ b/ext/stub/oo/propertyaccess.zep.c
@@ -80,7 +80,7 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	ZEPHIR_INIT_VAR(&_6);
 	zephir_create_array(&_6, 4, 0);
 	zephir_read_property(&_7, &test, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_OBS_VAR(&_8);
+	zephir_memory_observe(&_8);
 	zephir_array_fetch_long(&_8, &_7, 1, PH_NOISY, "stub/oo/propertyaccess.zep", 19);
 	zephir_array_fast_append(&_6, &_8);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -97,7 +97,7 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	zephir_read_property(&_9, this_ptr, ZEND_STRL("a"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_10, &_9, ZEND_STRL("test2"), PH_NOISY_CC | PH_READONLY);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_10);
-	ZEPHIR_OBS_VAR(&test1);
+	zephir_memory_observe(&test1);
 	zephir_read_property(&test1, this_ptr, ZEND_STRL("a"), PH_NOISY_CC);
 	ZEPHIR_MM_RESTORE();
 }
@@ -111,12 +111,9 @@ PHP_METHOD(Stub_Oo_PropertyAccess, setPrivatevariable)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
diff --git a/ext/stub/oo/propertyaccess.zep.h b/ext/stub/oo/propertyaccess.zep.h
index 396ffb1c75..24b7119d1b 100644
--- a/ext/stub/oo/propertyaccess.zep.h
+++ b/ext/stub/oo/propertyaccess.zep.h
@@ -18,16 +18,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_propertyaccess_getprivatevariable, 0, 0,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_propertyaccess_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_PropertyAccess, __construct, arginfo_stub_oo_propertyaccess___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_Oo_PropertyAccess, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_Oo_PropertyAccess, __construct, arginfo_stub_oo_propertyaccess___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_Oo_PropertyAccess, setPrivatevariable, arginfo_stub_oo_propertyaccess_setprivatevariable, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_PropertyAccess, getPrivatevariable, arginfo_stub_oo_propertyaccess_getprivatevariable, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_PropertyAccess, getPrivatevariable, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_PropertyAccess, getPrivatevariable, arginfo_stub_oo_propertyaccess_getprivatevariable, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/scopes/abstractclass.zep.c b/ext/stub/oo/scopes/abstractclass.zep.c
index db0a61fafa..e6ea292ccc 100644
--- a/ext/stub/oo/scopes/abstractclass.zep.c
+++ b/ext/stub/oo/scopes/abstractclass.zep.c
@@ -35,13 +35,10 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClass, setProperty)
 
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(name)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/oo/scopes/abstractclass.zep.h b/ext/stub/oo/scopes/abstractclass.zep.h
index 37f2604910..53459bd219 100644
--- a/ext/stub/oo/scopes/abstractclass.zep.h
+++ b/ext/stub/oo/scopes/abstractclass.zep.h
@@ -20,15 +20,7 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_oo_scopes_abstractclass_method_entry) {
 	PHP_ME(Stub_Oo_Scopes_AbstractClass, setProperty, arginfo_stub_oo_scopes_abstractclass_setproperty, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_Scopes_AbstractClass, getPrivateProperty2, arginfo_stub_oo_scopes_abstractclass_getprivateproperty2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_Scopes_AbstractClass, getPrivateProperty2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Oo_Scopes_AbstractClass, getProtectedProperty2, arginfo_stub_oo_scopes_abstractclass_getprotectedproperty2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Oo_Scopes_AbstractClass, getProtectedProperty2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Oo_Scopes_AbstractClass, getPrivateProperty2, arginfo_stub_oo_scopes_abstractclass_getprivateproperty2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Oo_Scopes_AbstractClass, getProtectedProperty2, arginfo_stub_oo_scopes_abstractclass_getprotectedproperty2, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/scopes/abstractclassmagic.zep.c b/ext/stub/oo/scopes/abstractclassmagic.zep.c
index 384bf61af4..92a8c7162e 100644
--- a/ext/stub/oo/scopes/abstractclassmagic.zep.c
+++ b/ext/stub/oo/scopes/abstractclassmagic.zep.c
@@ -39,13 +39,10 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __set)
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(name)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -70,12 +67,9 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __get)
 
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -83,7 +77,7 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __get)
 	zephir_get_strval(&name, name_param);
 
 
-	ZEPHIR_OBS_VAR(&_0);
+	zephir_memory_observe(&_0);
 	zephir_read_property_zval(&_0, this_ptr, &name, PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/oo/scopes/privatescopetester.zep.c b/ext/stub/oo/scopes/privatescopetester.zep.c
index 4e535f3260..ffabb986d0 100644
--- a/ext/stub/oo/scopes/privatescopetester.zep.c
+++ b/ext/stub/oo/scopes/privatescopetester.zep.c
@@ -55,14 +55,11 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&property);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_ZVAL(obj)
 		Z_PARAM_STR(property)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -72,7 +69,7 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
 
 
 	zephir_update_property_zval_zval(obj, &property, value);
-	ZEPHIR_OBS_VAR(&_0);
+	zephir_memory_observe(&_0);
 	zephir_read_property_zval(&_0, obj, &property, PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
@@ -92,14 +89,11 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
 	ZVAL_UNDEF(&property);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&obj);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_STR(className)
 		Z_PARAM_STR(property)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -126,12 +120,9 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(obj)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -156,12 +147,9 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getNewVars)
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(className)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/operator.zep.c b/ext/stub/operator.zep.c
index 5919ab865e..26b9f54495 100644
--- a/ext/stub/operator.zep.c
+++ b/ext/stub/operator.zep.c
@@ -33,13 +33,10 @@ PHP_METHOD(Stub_Operator, testIdentical)
 
 	ZVAL_UNDEF(&param1_sub);
 	ZVAL_UNDEF(&param2_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(param1)
 		Z_PARAM_ZVAL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &param1, &param2);
@@ -58,12 +55,9 @@ PHP_METHOD(Stub_Operator, testIdenticalIfComplex)
 	ZVAL_UNDEF(&input_sub);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(input)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -87,12 +81,9 @@ PHP_METHOD(Stub_Operator, testIdenticalVarFalse)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
@@ -107,12 +98,9 @@ PHP_METHOD(Stub_Operator, testIdenticalFalseVar)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
@@ -131,13 +119,10 @@ PHP_METHOD(Stub_Operator, testBoolComparison)
 	ZVAL_UNDEF(&varTrue_sub);
 	ZVAL_UNDEF(&varFalse_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(varTrue)
 		Z_PARAM_ZVAL(varFalse)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -184,12 +169,9 @@ PHP_METHOD(Stub_Operator, testNewInstanceOperator)
 
 	ZVAL_UNDEF(&className_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(className)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/optimizers/acos.zep.c b/ext/stub/optimizers/acos.zep.c
index c726af1373..92ba9fe706 100644
--- a/ext/stub/optimizers/acos.zep.c
+++ b/ext/stub/optimizers/acos.zep.c
@@ -89,12 +89,9 @@ PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -116,12 +113,9 @@ PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/optimizers/acos.zep.h b/ext/stub/optimizers/acos.zep.h
index b2c9fd88af..e2ffa8f34c 100644
--- a/ext/stub/optimizers/acos.zep.h
+++ b/ext/stub/optimizers/acos.zep.h
@@ -27,21 +27,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_acos_testvarparameter, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_acos_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_ACos, testInt, arginfo_stub_optimizers_acos_testint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_ACos, testInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_ACos, testVar, arginfo_stub_optimizers_acos_testvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_ACos, testVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_ACos, testIntValue1, arginfo_stub_optimizers_acos_testintvalue1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_ACos, testIntValue1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_ACos, testInt, arginfo_stub_optimizers_acos_testint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_ACos, testVar, arginfo_stub_optimizers_acos_testvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_ACos, testIntValue1, arginfo_stub_optimizers_acos_testintvalue1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_ACos, testIntParameter, arginfo_stub_optimizers_acos_testintparameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_ACos, testVarParameter, arginfo_stub_optimizers_acos_testvarparameter, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/optimizers/arraymerge.zep.c b/ext/stub/optimizers/arraymerge.zep.c
index 8a4bbc453f..ce62150606 100644
--- a/ext/stub/optimizers/arraymerge.zep.c
+++ b/ext/stub/optimizers/arraymerge.zep.c
@@ -34,13 +34,10 @@ PHP_METHOD(Stub_Optimizers_ArrayMerge, mergeTwoRequiredArrays)
 
 	ZVAL_UNDEF(&arr1);
 	ZVAL_UNDEF(&arr2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY(arr1)
 		Z_PARAM_ARRAY(arr2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/optimizers/asin.zep.c b/ext/stub/optimizers/asin.zep.c
index c73f52c51d..786ebb6218 100644
--- a/ext/stub/optimizers/asin.zep.c
+++ b/ext/stub/optimizers/asin.zep.c
@@ -89,12 +89,9 @@ PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -116,12 +113,9 @@ PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/optimizers/asin.zep.h b/ext/stub/optimizers/asin.zep.h
index 0d005332bb..d92501abd9 100644
--- a/ext/stub/optimizers/asin.zep.h
+++ b/ext/stub/optimizers/asin.zep.h
@@ -27,21 +27,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_asin_testvarparameter, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_asin_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_ASin, testInt, arginfo_stub_optimizers_asin_testint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_ASin, testInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_ASin, testVar, arginfo_stub_optimizers_asin_testvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_ASin, testVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_ASin, testIntValue1, arginfo_stub_optimizers_asin_testintvalue1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_ASin, testIntValue1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_ASin, testInt, arginfo_stub_optimizers_asin_testint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_ASin, testVar, arginfo_stub_optimizers_asin_testvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_ASin, testIntValue1, arginfo_stub_optimizers_asin_testintvalue1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_ASin, testIntParameter, arginfo_stub_optimizers_asin_testintparameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_ASin, testVarParameter, arginfo_stub_optimizers_asin_testvarparameter, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/optimizers/cos.zep.c b/ext/stub/optimizers/cos.zep.c
index 974c32428d..82e788e8c5 100644
--- a/ext/stub/optimizers/cos.zep.c
+++ b/ext/stub/optimizers/cos.zep.c
@@ -89,12 +89,9 @@ PHP_METHOD(Stub_Optimizers_Cos, testIntParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
@@ -111,12 +108,9 @@ PHP_METHOD(Stub_Optimizers_Cos, testVarParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/optimizers/cos.zep.h b/ext/stub/optimizers/cos.zep.h
index f0d22dd5d0..f261d2718d 100644
--- a/ext/stub/optimizers/cos.zep.h
+++ b/ext/stub/optimizers/cos.zep.h
@@ -31,26 +31,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_cos_testvarparameter, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_cos_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Cos, testInt, arginfo_stub_optimizers_cos_testint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Cos, testInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Cos, testVar, arginfo_stub_optimizers_cos_testvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Cos, testVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Cos, testIntValue1, arginfo_stub_optimizers_cos_testintvalue1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Cos, testIntValue1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Cos, testIntValue2, arginfo_stub_optimizers_cos_testintvalue2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Cos, testIntValue2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_Cos, testInt, arginfo_stub_optimizers_cos_testint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Cos, testVar, arginfo_stub_optimizers_cos_testvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Cos, testIntValue1, arginfo_stub_optimizers_cos_testintvalue1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Cos, testIntValue2, arginfo_stub_optimizers_cos_testintvalue2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Cos, testIntParameter, arginfo_stub_optimizers_cos_testintparameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Cos, testVarParameter, arginfo_stub_optimizers_cos_testvarparameter, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/optimizers/createarray.zep.c b/ext/stub/optimizers/createarray.zep.c
index e81ebd146a..46787d67d3 100644
--- a/ext/stub/optimizers/createarray.zep.c
+++ b/ext/stub/optimizers/createarray.zep.c
@@ -44,12 +44,9 @@ PHP_METHOD(Stub_Optimizers_CreateArray, createSize)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &n_param);
diff --git a/ext/stub/optimizers/createarray.zep.h b/ext/stub/optimizers/createarray.zep.h
index af6e783edd..be494beac1 100644
--- a/ext/stub/optimizers/createarray.zep.h
+++ b/ext/stub/optimizers/createarray.zep.h
@@ -14,11 +14,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_createarray_createsize, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_createarray_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_CreateArray, createNoSize, arginfo_stub_optimizers_createarray_createnosize, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_CreateArray, createNoSize, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_CreateArray, createNoSize, arginfo_stub_optimizers_createarray_createnosize, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_CreateArray, createSize, arginfo_stub_optimizers_createarray_createsize, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/optimizers/isscalar.zep.c b/ext/stub/optimizers/isscalar.zep.c
index 60e8860926..bec2ddcf17 100644
--- a/ext/stub/optimizers/isscalar.zep.c
+++ b/ext/stub/optimizers/isscalar.zep.c
@@ -121,12 +121,9 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testVarParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/optimizers/ldexp.zep.c b/ext/stub/optimizers/ldexp.zep.c
index 1bd155f09b..8ad0396e25 100644
--- a/ext/stub/optimizers/ldexp.zep.c
+++ b/ext/stub/optimizers/ldexp.zep.c
@@ -121,13 +121,10 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testIntParameter)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(x)
 		Z_PARAM_LONG(exponent)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &x_param, &exponent_param);
@@ -147,13 +144,10 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testVarParameter)
 
 	ZVAL_UNDEF(&x_sub);
 	ZVAL_UNDEF(&exponent_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(x)
 		Z_PARAM_ZVAL(exponent)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &x, &exponent);
diff --git a/ext/stub/optimizers/ldexp.zep.h b/ext/stub/optimizers/ldexp.zep.h
index a6f5e681a7..e0fe4971b6 100644
--- a/ext/stub/optimizers/ldexp.zep.h
+++ b/ext/stub/optimizers/ldexp.zep.h
@@ -37,31 +37,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_ldexp_testvarparameter, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_ldexp_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Ldexp, testInt, arginfo_stub_optimizers_ldexp_testint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Ldexp, testInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Ldexp, testDoubleInt, arginfo_stub_optimizers_ldexp_testdoubleint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Ldexp, testDoubleInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Ldexp, testDouble, arginfo_stub_optimizers_ldexp_testdouble, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Ldexp, testDouble, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Ldexp, testVar, arginfo_stub_optimizers_ldexp_testvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Ldexp, testVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Ldexp, testIntValue1, arginfo_stub_optimizers_ldexp_testintvalue1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Ldexp, testIntValue1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_Ldexp, testInt, arginfo_stub_optimizers_ldexp_testint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Ldexp, testDoubleInt, arginfo_stub_optimizers_ldexp_testdoubleint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Ldexp, testDouble, arginfo_stub_optimizers_ldexp_testdouble, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Ldexp, testVar, arginfo_stub_optimizers_ldexp_testvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Ldexp, testIntValue1, arginfo_stub_optimizers_ldexp_testintvalue1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Ldexp, testIntParameter, arginfo_stub_optimizers_ldexp_testintparameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Ldexp, testVarParameter, arginfo_stub_optimizers_ldexp_testvarparameter, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/optimizers/sin.zep.c b/ext/stub/optimizers/sin.zep.c
index eda01e722c..3177487586 100644
--- a/ext/stub/optimizers/sin.zep.c
+++ b/ext/stub/optimizers/sin.zep.c
@@ -89,12 +89,9 @@ PHP_METHOD(Stub_Optimizers_Sin, testIntParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
@@ -111,12 +108,9 @@ PHP_METHOD(Stub_Optimizers_Sin, testVarParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/optimizers/sin.zep.h b/ext/stub/optimizers/sin.zep.h
index 48216e6c96..90be245b37 100644
--- a/ext/stub/optimizers/sin.zep.h
+++ b/ext/stub/optimizers/sin.zep.h
@@ -31,26 +31,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_sin_testvarparameter, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_sin_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sin, testInt, arginfo_stub_optimizers_sin_testint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sin, testInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sin, testVar, arginfo_stub_optimizers_sin_testvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sin, testVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sin, testIntValue1, arginfo_stub_optimizers_sin_testintvalue1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sin, testIntValue1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sin, testIntValue2, arginfo_stub_optimizers_sin_testintvalue2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sin, testIntValue2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_Sin, testInt, arginfo_stub_optimizers_sin_testint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Sin, testVar, arginfo_stub_optimizers_sin_testvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Sin, testIntValue1, arginfo_stub_optimizers_sin_testintvalue1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Sin, testIntValue2, arginfo_stub_optimizers_sin_testintvalue2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Sin, testIntParameter, arginfo_stub_optimizers_sin_testintparameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Sin, testVarParameter, arginfo_stub_optimizers_sin_testvarparameter, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/optimizers/sqrt.zep.c b/ext/stub/optimizers/sqrt.zep.c
index 22d9bbd37f..323c8294a2 100644
--- a/ext/stub/optimizers/sqrt.zep.c
+++ b/ext/stub/optimizers/sqrt.zep.c
@@ -89,12 +89,9 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testIntParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
@@ -111,12 +108,9 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testVarParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/optimizers/sqrt.zep.h b/ext/stub/optimizers/sqrt.zep.h
index c4f7fc76e0..d093b250c6 100644
--- a/ext/stub/optimizers/sqrt.zep.h
+++ b/ext/stub/optimizers/sqrt.zep.h
@@ -31,26 +31,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_sqrt_testvarparameter, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_sqrt_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sqrt, testInt, arginfo_stub_optimizers_sqrt_testint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sqrt, testInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sqrt, testVar, arginfo_stub_optimizers_sqrt_testvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sqrt, testVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sqrt, testIntValue1, arginfo_stub_optimizers_sqrt_testintvalue1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sqrt, testIntValue1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Sqrt, testIntValue2, arginfo_stub_optimizers_sqrt_testintvalue2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Sqrt, testIntValue2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_Sqrt, testInt, arginfo_stub_optimizers_sqrt_testint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Sqrt, testVar, arginfo_stub_optimizers_sqrt_testvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Sqrt, testIntValue1, arginfo_stub_optimizers_sqrt_testintvalue1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Sqrt, testIntValue2, arginfo_stub_optimizers_sqrt_testintvalue2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Sqrt, testIntParameter, arginfo_stub_optimizers_sqrt_testintparameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Sqrt, testVarParameter, arginfo_stub_optimizers_sqrt_testvarparameter, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/optimizers/strreplace.zep.h b/ext/stub/optimizers/strreplace.zep.h
index 3ba4c7d920..2a0b361f92 100644
--- a/ext/stub/optimizers/strreplace.zep.h
+++ b/ext/stub/optimizers/strreplace.zep.h
@@ -21,25 +21,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_strreplace_issue732b, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_strreplace_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_StrReplace, issue1055, arginfo_stub_optimizers_strreplace_issue1055, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_StrReplace, issue1055, NULL, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_StrReplace, issue1087, arginfo_stub_optimizers_strreplace_issue1087, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_StrReplace, issue1087, NULL, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_StrReplace, issue732A, arginfo_stub_optimizers_strreplace_issue732a, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_StrReplace, issue732A, NULL, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_StrReplace, issue732B, arginfo_stub_optimizers_strreplace_issue732b, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_StrReplace, issue732B, NULL, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_StrReplace, issue1055, arginfo_stub_optimizers_strreplace_issue1055, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_StrReplace, issue1087, arginfo_stub_optimizers_strreplace_issue1087, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_StrReplace, issue732A, arginfo_stub_optimizers_strreplace_issue732a, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_StrReplace, issue732B, arginfo_stub_optimizers_strreplace_issue732b, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/optimizers/substr.zep.c b/ext/stub/optimizers/substr.zep.c
index 251762c431..f7d1992911 100644
--- a/ext/stub/optimizers/substr.zep.c
+++ b/ext/stub/optimizers/substr.zep.c
@@ -32,13 +32,10 @@ PHP_METHOD(Stub_Optimizers_Substr, testTwoArguments)
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&start_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(start)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &start);
@@ -56,14 +53,11 @@ PHP_METHOD(Stub_Optimizers_Substr, testThreeArguments)
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&start_sub);
 	ZVAL_UNDEF(&offset_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(start)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(3, 0, &str, &start, &offset);
diff --git a/ext/stub/optimizers/tan.zep.c b/ext/stub/optimizers/tan.zep.c
index 80c945a3cd..46049d9b3e 100644
--- a/ext/stub/optimizers/tan.zep.c
+++ b/ext/stub/optimizers/tan.zep.c
@@ -104,12 +104,9 @@ PHP_METHOD(Stub_Optimizers_Tan, testIntParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
@@ -126,12 +123,9 @@ PHP_METHOD(Stub_Optimizers_Tan, testVarParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
diff --git a/ext/stub/optimizers/tan.zep.h b/ext/stub/optimizers/tan.zep.h
index 2d1c61c8f2..63a0757b7b 100644
--- a/ext/stub/optimizers/tan.zep.h
+++ b/ext/stub/optimizers/tan.zep.h
@@ -35,31 +35,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_optimizers_tan_testvarparameter, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_optimizers_tan_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Tan, testInt, arginfo_stub_optimizers_tan_testint, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Tan, testInt, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Tan, testVar, arginfo_stub_optimizers_tan_testvar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Tan, testVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Tan, testVar2, arginfo_stub_optimizers_tan_testvar2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Tan, testVar2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Tan, testIntValue1, arginfo_stub_optimizers_tan_testintvalue1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Tan, testIntValue1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Optimizers_Tan, testIntValue2, arginfo_stub_optimizers_tan_testintvalue2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Optimizers_Tan, testIntValue2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Optimizers_Tan, testInt, arginfo_stub_optimizers_tan_testint, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Tan, testVar, arginfo_stub_optimizers_tan_testvar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Tan, testVar2, arginfo_stub_optimizers_tan_testvar2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Tan, testIntValue1, arginfo_stub_optimizers_tan_testintvalue1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Optimizers_Tan, testIntValue2, arginfo_stub_optimizers_tan_testintvalue2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Tan, testIntParameter, arginfo_stub_optimizers_tan_testintparameter, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Optimizers_Tan, testVarParameter, arginfo_stub_optimizers_tan_testvarparameter, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/pregmatch.zep.c b/ext/stub/pregmatch.zep.c
index 6c9a9be178..4ce8f97469 100644
--- a/ext/stub/pregmatch.zep.c
+++ b/ext/stub/pregmatch.zep.c
@@ -160,13 +160,10 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch2Params)
 	ZVAL_UNDEF(&pattern_sub);
 	ZVAL_UNDEF(&subject_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_ZVAL(subject)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -186,14 +183,11 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch3Params)
 	ZVAL_UNDEF(&pattern_sub);
 	ZVAL_UNDEF(&subject_sub);
 	ZVAL_UNDEF(&matches_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_ZVAL(subject)
 		Z_PARAM_ZVAL(matches)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(3, 0, &pattern, &subject, &matches);
@@ -212,15 +206,12 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch4Params)
 	ZVAL_UNDEF(&subject_sub);
 	ZVAL_UNDEF(&matches_sub);
 	ZVAL_UNDEF(&flags_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(4, 4)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_ZVAL(subject)
 		Z_PARAM_ZVAL(matches)
 		Z_PARAM_ZVAL(flags)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(4, 0, &pattern, &subject, &matches, &flags);
@@ -240,8 +231,6 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch5Params)
 	ZVAL_UNDEF(&matches_sub);
 	ZVAL_UNDEF(&flags_sub);
 	ZVAL_UNDEF(&offset_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(5, 5)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_ZVAL(subject)
@@ -249,7 +238,6 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch5Params)
 		Z_PARAM_ZVAL(flags)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(5, 0, &pattern, &subject, &matches, &flags, &offset);
@@ -273,13 +261,10 @@ PHP_METHOD(Stub_Pregmatch, testPregMatchSaveMatches)
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&matches);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(pattern)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -307,12 +292,9 @@ PHP_METHOD(Stub_Pregmatch, testMatchAll)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(flags)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/pregmatch.zep.h b/ext/stub/pregmatch.zep.h
index d6f813d60d..ea40bcd257 100644
--- a/ext/stub/pregmatch.zep.h
+++ b/ext/stub/pregmatch.zep.h
@@ -70,41 +70,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_pregmatch_testmatchallinzep, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_pregmatch_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Pregmatch, testWithoutReturnAndMatches, arginfo_stub_pregmatch_testwithoutreturnandmatches, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Pregmatch, testWithoutReturnAndMatches, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Pregmatch, testWithoutReturns, arginfo_stub_pregmatch_testwithoutreturns, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Pregmatch, testWithoutReturns, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Pregmatch, testWithoutMatches, arginfo_stub_pregmatch_testwithoutmatches, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Pregmatch, testWithoutMatches, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Pregmatch, testPregMatchAll, arginfo_stub_pregmatch_testpregmatchall, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Pregmatch, testPregMatchAll, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Pregmatch, testPregMatchFallback, arginfo_stub_pregmatch_testpregmatchfallback, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Pregmatch, testPregMatchFallback, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Pregmatch, testWithoutReturnAndMatches, arginfo_stub_pregmatch_testwithoutreturnandmatches, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Pregmatch, testWithoutReturns, arginfo_stub_pregmatch_testwithoutreturns, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Pregmatch, testWithoutMatches, arginfo_stub_pregmatch_testwithoutmatches, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Pregmatch, testPregMatchAll, arginfo_stub_pregmatch_testpregmatchall, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Pregmatch, testPregMatchFallback, arginfo_stub_pregmatch_testpregmatchfallback, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Pregmatch, testPregMatch2Params, arginfo_stub_pregmatch_testpregmatch2params, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Pregmatch, testPregMatch3Params, arginfo_stub_pregmatch_testpregmatch3params, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Pregmatch, testPregMatch4Params, arginfo_stub_pregmatch_testpregmatch4params, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Pregmatch, testPregMatch5Params, arginfo_stub_pregmatch_testpregmatch5params, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Pregmatch, testPregMatchSaveMatches, arginfo_stub_pregmatch_testpregmatchsavematches, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Pregmatch, testMatchAll, arginfo_stub_pregmatch_testmatchall, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Pregmatch, testMatchAllInZep, arginfo_stub_pregmatch_testmatchallinzep, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Pregmatch, testMatchAllInZep, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Pregmatch, testMatchAllInZep, arginfo_stub_pregmatch_testmatchallinzep, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/app.zep.h b/ext/stub/properties/app.zep.h
index 22e9a1daa2..d13be1fd36 100644
--- a/ext/stub/properties/app.zep.h
+++ b/ext/stub/properties/app.zep.h
@@ -13,15 +13,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_properties_app___construct, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_app_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_App, getInstance, arginfo_stub_properties_app_getinstance, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_App, getInstance, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_App, __construct, arginfo_stub_properties_app___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_Properties_App, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_Properties_App, getInstance, arginfo_stub_properties_app_getinstance, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_App, __construct, arginfo_stub_properties_app___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/privateproperties.zep.h b/ext/stub/properties/privateproperties.zep.h
index 598523ace7..9bbc4859b7 100644
--- a/ext/stub/properties/privateproperties.zep.h
+++ b/ext/stub/properties/privateproperties.zep.h
@@ -33,40 +33,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_properties_privateproperties_getsomestring,
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_privateproperties_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeNull, arginfo_stub_properties_privateproperties_getsomenull, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeNull, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeNullInitial, arginfo_stub_properties_privateproperties_getsomenullinitial, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeNullInitial, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeFalse, arginfo_stub_properties_privateproperties_getsomefalse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeFalse, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeTrue, arginfo_stub_properties_privateproperties_getsometrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeInteger, arginfo_stub_properties_privateproperties_getsomeinteger, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeInteger, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeDouble, arginfo_stub_properties_privateproperties_getsomedouble, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeDouble, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeString, arginfo_stub_properties_privateproperties_getsomestring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PrivateProperties, getSomeString, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Properties_PrivateProperties, getSomeNull, arginfo_stub_properties_privateproperties_getsomenull, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PrivateProperties, getSomeNullInitial, arginfo_stub_properties_privateproperties_getsomenullinitial, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PrivateProperties, getSomeFalse, arginfo_stub_properties_privateproperties_getsomefalse, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PrivateProperties, getSomeTrue, arginfo_stub_properties_privateproperties_getsometrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PrivateProperties, getSomeInteger, arginfo_stub_properties_privateproperties_getsomeinteger, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PrivateProperties, getSomeDouble, arginfo_stub_properties_privateproperties_getsomedouble, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PrivateProperties, getSomeString, arginfo_stub_properties_privateproperties_getsomestring, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/propertyarray.zep.c b/ext/stub/properties/propertyarray.zep.c
index 95ba68716a..d20e6b7260 100644
--- a/ext/stub/properties/propertyarray.zep.c
+++ b/ext/stub/properties/propertyarray.zep.c
@@ -74,12 +74,9 @@ PHP_METHOD(Stub_Properties_PropertyArray, appendSome)
 
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -97,12 +94,9 @@ PHP_METHOD(Stub_Properties_PropertyArray, setOtherArray)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &arr);
diff --git a/ext/stub/properties/propertyarray.zep.h b/ext/stub/properties/propertyarray.zep.h
index 652ea134aa..c9e5276bea 100644
--- a/ext/stub/properties/propertyarray.zep.h
+++ b/ext/stub/properties/propertyarray.zep.h
@@ -31,22 +31,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_properties_propertyarray_zephir_init_propert
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_propertyarray_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PropertyArray, __construct, arginfo_stub_properties_propertyarray___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_Properties_PropertyArray, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_Properties_PropertyArray, __construct, arginfo_stub_properties_propertyarray___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_Properties_PropertyArray, appendSome, arginfo_stub_properties_propertyarray_appendsome, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Properties_PropertyArray, setOtherArray, arginfo_stub_properties_propertyarray_setotherarray, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PropertyArray, getOtherArray, arginfo_stub_properties_propertyarray_getotherarray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PropertyArray, getOtherArray, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PropertyArray, testIssues1831, arginfo_stub_properties_propertyarray_testissues1831, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PropertyArray, testIssues1831, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Properties_PropertyArray, getOtherArray, arginfo_stub_properties_propertyarray_getotherarray, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PropertyArray, testIssues1831, arginfo_stub_properties_propertyarray_testissues1831, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/propertyupdate.zep.h b/ext/stub/properties/propertyupdate.zep.h
index 3c4d182696..4275a18b13 100644
--- a/ext/stub/properties/propertyupdate.zep.h
+++ b/ext/stub/properties/propertyupdate.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_properties_propertyupdate_update1, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_propertyupdate_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PropertyUpdate, update1, arginfo_stub_properties_propertyupdate_update1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PropertyUpdate, update1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Properties_PropertyUpdate, update1, arginfo_stub_properties_propertyupdate_update1, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/protectedproperties.zep.c b/ext/stub/properties/protectedproperties.zep.c
index 820d70ae2b..37d630c30e 100644
--- a/ext/stub/properties/protectedproperties.zep.c
+++ b/ext/stub/properties/protectedproperties.zep.c
@@ -74,12 +74,9 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeVar)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someVar_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(someVar)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &someVar);
@@ -111,12 +108,9 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeArrayVar)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someArrayVar);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someArrayVar)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -161,12 +155,9 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeNull)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
diff --git a/ext/stub/properties/protectedproperties.zep.h b/ext/stub/properties/protectedproperties.zep.h
index 7d18ddeec3..f99816ad31 100644
--- a/ext/stub/properties/protectedproperties.zep.h
+++ b/ext/stub/properties/protectedproperties.zep.h
@@ -61,48 +61,16 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_protectedproperties_method_entry) {
 	PHP_ME(Stub_Properties_ProtectedProperties, setSomeVar, arginfo_stub_properties_protectedproperties_setsomevar, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeVar, arginfo_stub_properties_protectedproperties_getsomevar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeVar, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeVar, arginfo_stub_properties_protectedproperties_getsomevar, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Properties_ProtectedProperties, setSomeArrayVar, arginfo_stub_properties_protectedproperties_setsomearrayvar, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Properties_ProtectedProperties, getSomeArrayVar, arginfo_stub_properties_protectedproperties_getsomearrayvar, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeNull, arginfo_stub_properties_protectedproperties_getsomenull, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeNull, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeNull, arginfo_stub_properties_protectedproperties_getsomenull, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Properties_ProtectedProperties, setSomeNull, arginfo_stub_properties_protectedproperties_setsomenull, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeNullInitial, arginfo_stub_properties_protectedproperties_getsomenullinitial, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeNullInitial, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeFalse, arginfo_stub_properties_protectedproperties_getsomefalse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeFalse, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeTrue, arginfo_stub_properties_protectedproperties_getsometrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeInteger, arginfo_stub_properties_protectedproperties_getsomeinteger, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeInteger, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeDouble, arginfo_stub_properties_protectedproperties_getsomedouble, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeDouble, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeString, arginfo_stub_properties_protectedproperties_getsomestring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_ProtectedProperties, getSomeString, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeNullInitial, arginfo_stub_properties_protectedproperties_getsomenullinitial, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeFalse, arginfo_stub_properties_protectedproperties_getsomefalse, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeTrue, arginfo_stub_properties_protectedproperties_getsometrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeInteger, arginfo_stub_properties_protectedproperties_getsomeinteger, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeDouble, arginfo_stub_properties_protectedproperties_getsomedouble, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_ProtectedProperties, getSomeString, arginfo_stub_properties_protectedproperties_getsomestring, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/publicproperties.zep.c b/ext/stub/properties/publicproperties.zep.c
index 81bae5e641..bcc66f5f9b 100644
--- a/ext/stub/properties/publicproperties.zep.c
+++ b/ext/stub/properties/publicproperties.zep.c
@@ -83,12 +83,9 @@ PHP_METHOD(Stub_Properties_PublicProperties, setSomeGetterSetterArray)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someGetterSetterArray_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(someGetterSetterArray)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &someGetterSetterArray);
@@ -118,7 +115,7 @@ PHP_METHOD(Stub_Properties_PublicProperties, test394Issue)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_OBS_VAR(&_0);
+	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("someTrue"), PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/properties/publicproperties.zep.h b/ext/stub/properties/publicproperties.zep.h
index 59b09e0ffd..d4003232ea 100644
--- a/ext/stub/properties/publicproperties.zep.h
+++ b/ext/stub/properties/publicproperties.zep.h
@@ -23,15 +23,7 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_publicproperties_method_entry) {
 	PHP_ME(Stub_Properties_PublicProperties, setSomeGetterSetterArray, arginfo_stub_properties_publicproperties_setsomegettersetterarray, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PublicProperties, getSomeGetterSetterArray, arginfo_stub_properties_publicproperties_getsomegettersetterarray, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PublicProperties, getSomeGetterSetterArray, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_PublicProperties, test394Issue, arginfo_stub_properties_publicproperties_test394issue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_PublicProperties, test394Issue, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Properties_PublicProperties, getSomeGetterSetterArray, arginfo_stub_properties_publicproperties_getsomegettersetterarray, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_PublicProperties, test394Issue, arginfo_stub_properties_publicproperties_test394issue, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/staticprivateproperties.zep.c b/ext/stub/properties/staticprivateproperties.zep.c
index 857f63f907..36f9d6eafd 100644
--- a/ext/stub/properties/staticprivateproperties.zep.c
+++ b/ext/stub/properties/staticprivateproperties.zep.c
@@ -38,7 +38,7 @@ PHP_METHOD(Stub_Properties_StaticPrivateProperties, getInstance)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_OBS_VAR(&localInstance);
+	zephir_memory_observe(&localInstance);
 	zephir_read_static_property_ce(&localInstance, stub_properties_staticprivateproperties_ce, SL("instance"), PH_NOISY_CC);
 	if (UNEXPECTED(Z_TYPE_P(&localInstance) != IS_OBJECT)) {
 		ZEPHIR_INIT_NVAR(&localInstance);
diff --git a/ext/stub/properties/staticprotectedproperties.zep.c b/ext/stub/properties/staticprotectedproperties.zep.c
index 0b3a75a4be..35c243347d 100644
--- a/ext/stub/properties/staticprotectedproperties.zep.c
+++ b/ext/stub/properties/staticprotectedproperties.zep.c
@@ -59,12 +59,9 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, setSomeVar)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someVar_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(someVar)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &someVar);
@@ -102,12 +99,9 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, setSomeNull)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
@@ -209,7 +203,7 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, compareStaticNull)
 
 	ZEPHIR_MM_GROW();
 
-	ZEPHIR_OBS_VAR(&_0);
+	zephir_memory_observe(&_0);
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someNull"), PH_NOISY_CC);
 	ZEPHIR_CPY_WRT(&someNull, &_0);
 	if (Z_TYPE_P(&someNull) == IS_NULL) {
diff --git a/ext/stub/properties/staticprotectedproperties.zep.h b/ext/stub/properties/staticprotectedproperties.zep.h
index 05205678d4..da3a02ca05 100644
--- a/ext/stub/properties/staticprotectedproperties.zep.h
+++ b/ext/stub/properties/staticprotectedproperties.zep.h
@@ -52,47 +52,15 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_staticprotectedproperties_method_entry) {
 	PHP_ME(Stub_Properties_StaticProtectedProperties, setSomeVar, arginfo_stub_properties_staticprotectedproperties_setsomevar, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeVar, arginfo_stub_properties_staticprotectedproperties_getsomevar, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeVar, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeNull, arginfo_stub_properties_staticprotectedproperties_getsomenull, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeNull, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeVar, arginfo_stub_properties_staticprotectedproperties_getsomevar, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeNull, arginfo_stub_properties_staticprotectedproperties_getsomenull, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Properties_StaticProtectedProperties, setSomeNull, arginfo_stub_properties_staticprotectedproperties_setsomenull, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeNullInitial, arginfo_stub_properties_staticprotectedproperties_getsomenullinitial, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeNullInitial, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeFalse, arginfo_stub_properties_staticprotectedproperties_getsomefalse, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeFalse, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeTrue, arginfo_stub_properties_staticprotectedproperties_getsometrue, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeTrue, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeInteger, arginfo_stub_properties_staticprotectedproperties_getsomeinteger, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeInteger, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeDouble, arginfo_stub_properties_staticprotectedproperties_getsomedouble, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeDouble, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeString, arginfo_stub_properties_staticprotectedproperties_getsomestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeString, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeNullInitial, arginfo_stub_properties_staticprotectedproperties_getsomenullinitial, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeFalse, arginfo_stub_properties_staticprotectedproperties_getsomefalse, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeTrue, arginfo_stub_properties_staticprotectedproperties_getsometrue, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeInteger, arginfo_stub_properties_staticprotectedproperties_getsomeinteger, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeDouble, arginfo_stub_properties_staticprotectedproperties_getsomedouble, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticProtectedProperties, getSomeString, arginfo_stub_properties_staticprotectedproperties_getsomestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Properties_StaticProtectedProperties, compareStaticNull, arginfo_stub_properties_staticprotectedproperties_comparestaticnull, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/properties/staticpublicproperties.zep.c b/ext/stub/properties/staticpublicproperties.zep.c
index bc1f220b5d..2dc1b7e57d 100644
--- a/ext/stub/properties/staticpublicproperties.zep.c
+++ b/ext/stub/properties/staticpublicproperties.zep.c
@@ -59,12 +59,9 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, setSomeString)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
diff --git a/ext/stub/properties/staticpublicproperties.zep.h b/ext/stub/properties/staticpublicproperties.zep.h
index 446af459fb..002b5d1190 100644
--- a/ext/stub/properties/staticpublicproperties.zep.h
+++ b/ext/stub/properties/staticpublicproperties.zep.h
@@ -31,30 +31,10 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_properties_staticpublicproperties_method_entry) {
 	PHP_ME(Stub_Properties_StaticPublicProperties, setSomeString, arginfo_stub_properties_staticpublicproperties_setsomestring, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub, arginfo_stub_properties_staticpublicproperties_testaddandsub, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub2, arginfo_stub_properties_staticpublicproperties_testaddandsub2, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub2, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub3, arginfo_stub_properties_staticpublicproperties_testaddandsub3, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub3, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub4, arginfo_stub_properties_staticpublicproperties_testaddandsub4, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub4, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub5, arginfo_stub_properties_staticpublicproperties_testaddandsub5, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub5, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub, arginfo_stub_properties_staticpublicproperties_testaddandsub, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub2, arginfo_stub_properties_staticpublicproperties_testaddandsub2, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub3, arginfo_stub_properties_staticpublicproperties_testaddandsub3, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub4, arginfo_stub_properties_staticpublicproperties_testaddandsub4, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Properties_StaticPublicProperties, testAddAndSub5, arginfo_stub_properties_staticpublicproperties_testaddandsub5, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/quantum.zep.c b/ext/stub/quantum.zep.c
index 4d8f1ffc25..2dfb6c04db 100644
--- a/ext/stub/quantum.zep.c
+++ b/ext/stub/quantum.zep.c
@@ -97,12 +97,9 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZVAL_UNDEF(&_8$$4);
 	ZVAL_UNDEF(&_10$$4);
 	ZVAL_UNDEF(&_11$$4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/range.zep.h b/ext/stub/range.zep.h
index 7fdad5e842..b90e1ba2fb 100644
--- a/ext/stub/range.zep.h
+++ b/ext/stub/range.zep.h
@@ -13,15 +13,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_range_exclusive1, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_range_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Range, inclusive1, arginfo_stub_range_inclusive1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Range, inclusive1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Range, exclusive1, arginfo_stub_range_exclusive1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Range, exclusive1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Range, inclusive1, arginfo_stub_range_inclusive1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Range, exclusive1, arginfo_stub_range_exclusive1, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/references.zep.h b/ext/stub/references.zep.h
index b4c5d4d063..a3817ddfaf 100644
--- a/ext/stub/references.zep.h
+++ b/ext/stub/references.zep.h
@@ -9,10 +9,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_references_assignbyref, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_references_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_References, assignByRef, arginfo_stub_references_assignbyref, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_References, assignByRef, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_References, assignByRef, arginfo_stub_references_assignbyref, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/reflection.zep.c b/ext/stub/reflection.zep.c
index 839790de5e..a81dac18f3 100644
--- a/ext/stub/reflection.zep.c
+++ b/ext/stub/reflection.zep.c
@@ -72,12 +72,9 @@ PHP_METHOD(Stub_Reflection, setReflectionParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameter_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(parameter, zephir_get_internal_ce(SL("reflectionparameter")))
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &parameter);
diff --git a/ext/stub/regexdna.zep.c b/ext/stub/regexdna.zep.c
index cb15a4461a..8eaa81fff5 100644
--- a/ext/stub/regexdna.zep.c
+++ b/ext/stub/regexdna.zep.c
@@ -59,12 +59,9 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZVAL_UNDEF(&_7$$3);
 	ZVAL_UNDEF(&_8$$4);
 	ZVAL_UNDEF(&_9$$4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/requires.zep.c b/ext/stub/requires.zep.c
index 2c38aebf4f..443751c6a4 100644
--- a/ext/stub/requires.zep.c
+++ b/ext/stub/requires.zep.c
@@ -37,12 +37,9 @@ PHP_METHOD(Stub_Requires, requireExternal1)
 
 	ZVAL_UNDEF(&path_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -62,12 +59,9 @@ PHP_METHOD(Stub_Requires, requireExternal2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&path_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &path);
@@ -89,12 +83,9 @@ PHP_METHOD(Stub_Requires, requireExternal3)
 	ZVAL_UNDEF(&path_sub);
 	ZVAL_UNDEF(&external3);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -122,12 +113,9 @@ PHP_METHOD(Stub_Requires, setContent)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&content_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(content)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &content);
@@ -155,13 +143,10 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_5$$4);
 	ZVAL_UNDEF(&_6$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STR(templatePath)
 		Z_PARAM_ZVAL(params)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -238,12 +223,9 @@ PHP_METHOD(Stub_Requires, requireOnce)
 
 	ZVAL_UNDEF(&path);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(path)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/requires/external3.zep.c b/ext/stub/requires/external3.zep.c
index 0d3ef34abe..fc7a17189f 100644
--- a/ext/stub/requires/external3.zep.c
+++ b/ext/stub/requires/external3.zep.c
@@ -39,13 +39,10 @@ PHP_METHOD(Stub_Requires_External3, req)
 	ZVAL_UNDEF(&path_sub);
 	ZVAL_UNDEF(&requires_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(path)
 		Z_PARAM_ZVAL(requires)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/resourcetest.zep.h b/ext/stub/resourcetest.zep.h
index 58f3a9622b..b44eaa804c 100644
--- a/ext/stub/resourcetest.zep.h
+++ b/ext/stub/resourcetest.zep.h
@@ -29,35 +29,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_resourcetest_testfunctionsforstdin, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_resourcetest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ResourceTest, testLetStatementSTDIN, arginfo_stub_resourcetest_testletstatementstdin, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ResourceTest, testLetStatementSTDIN, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ResourceTest, testLetStatementSTDOUT, arginfo_stub_resourcetest_testletstatementstdout, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ResourceTest, testLetStatementSTDOUT, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ResourceTest, testLetStatementSTDERR, arginfo_stub_resourcetest_testletstatementstderr, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ResourceTest, testLetStatementSTDERR, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ResourceTest, testTypeOffResource, arginfo_stub_resourcetest_testtypeoffresource, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ResourceTest, testTypeOffResource, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ResourceTest, testIsResource, arginfo_stub_resourcetest_testisresource, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ResourceTest, testIsResource, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ResourceTest, testFunctionsForSTDIN, arginfo_stub_resourcetest_testfunctionsforstdin, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ResourceTest, testFunctionsForSTDIN, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_ResourceTest, testLetStatementSTDIN, arginfo_stub_resourcetest_testletstatementstdin, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ResourceTest, testLetStatementSTDOUT, arginfo_stub_resourcetest_testletstatementstdout, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ResourceTest, testLetStatementSTDERR, arginfo_stub_resourcetest_testletstatementstderr, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ResourceTest, testTypeOffResource, arginfo_stub_resourcetest_testtypeoffresource, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ResourceTest, testIsResource, arginfo_stub_resourcetest_testisresource, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_ResourceTest, testFunctionsForSTDIN, arginfo_stub_resourcetest_testfunctionsforstdin, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/returns.zep.c b/ext/stub/returns.zep.c
index 8b309060fd..abe36d8911 100644
--- a/ext/stub/returns.zep.c
+++ b/ext/stub/returns.zep.c
@@ -72,12 +72,9 @@ PHP_METHOD(Stub_Returns, returnWithParameter)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameter);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/returns.zep.h b/ext/stub/returns.zep.h
index 3d5dd2d644..02a7f82bc7 100644
--- a/ext/stub/returns.zep.h
+++ b/ext/stub/returns.zep.h
@@ -35,10 +35,6 @@ ZEPHIR_INIT_FUNCS(stub_returns_method_entry) {
 	PHP_ME(Stub_Returns, testReturnCast3, arginfo_stub_returns_testreturncast3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Returns, testReturnCast4, arginfo_stub_returns_testreturncast4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Returns, returnWithParameter, arginfo_stub_returns_returnwithparameter, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Returns, returnWithoutParameter, arginfo_stub_returns_returnwithoutparameter, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Returns, returnWithoutParameter, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_Returns, returnWithoutParameter, arginfo_stub_returns_returnwithoutparameter, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/router.zep.c b/ext/stub/router.zep.c
index cbe15fa480..6a750782a8 100644
--- a/ext/stub/router.zep.c
+++ b/ext/stub/router.zep.c
@@ -99,13 +99,10 @@ PHP_METHOD(Stub_Router, __construct)
 	ZVAL_UNDEF(&_5$$3);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_4$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(defaultRoutes)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -161,12 +158,9 @@ PHP_METHOD(Stub_Router, setDI)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&dependencyInjector_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(dependencyInjector, stub_diinterface_ce)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &dependencyInjector);
@@ -214,7 +208,7 @@ PHP_METHOD(Stub_Router, getRewriteUri)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_uriSource"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
-		ZEPHIR_OBS_VAR(&url);
+		zephir_memory_observe(&url);
 		if (zephir_array_isset_string_fetch(&url, &_GET, SL("_url"), 0)) {
 			if (!(zephir_is_true(&url))) {
 				RETURN_CCTOR(&url);
@@ -250,12 +244,9 @@ PHP_METHOD(Stub_Router, setUriSource)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uriSource_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(uriSource)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &uriSource);
@@ -277,12 +268,9 @@ PHP_METHOD(Stub_Router, removeExtraSlashes)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&remove_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(remove)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &remove);
@@ -304,12 +292,9 @@ PHP_METHOD(Stub_Router, setDefaultNamespace)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&namespaceName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(namespaceName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &namespaceName);
@@ -331,12 +316,9 @@ PHP_METHOD(Stub_Router, setDefaultModule)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&moduleName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(moduleName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &moduleName);
@@ -358,12 +340,9 @@ PHP_METHOD(Stub_Router, setDefaultController)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&controllerName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(controllerName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &controllerName);
@@ -385,12 +364,9 @@ PHP_METHOD(Stub_Router, setDefaultAction)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&actionName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(actionName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &actionName);
@@ -425,12 +401,9 @@ PHP_METHOD(Stub_Router, setDefaults)
 	ZVAL_UNDEF(&controller);
 	ZVAL_UNDEF(&action);
 	ZVAL_UNDEF(&params);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(defaults)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &defaults);
@@ -467,12 +440,9 @@ PHP_METHOD(Stub_Router, doRemoveExtraSlashes)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&route_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(route)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &route);
@@ -562,13 +532,11 @@ PHP_METHOD(Stub_Router, handle)
 	ZVAL_UNDEF(&_29$$96);
 	ZVAL_UNDEF(&_30$$96);
 	ZVAL_UNDEF(&_31$$96);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(uri)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -952,7 +920,7 @@ PHP_METHOD(Stub_Router, handle)
 		}
 	}
 	if (!(zephir_is_true(&routeFound))) {
-		ZEPHIR_OBS_VAR(&notFoundPaths);
+		zephir_memory_observe(&notFoundPaths);
 		zephir_read_property(&notFoundPaths, this_ptr, ZEND_STRL("_notFoundPaths"), PH_NOISY_CC);
 		if (Z_TYPE_P(&notFoundPaths) != IS_NULL) {
 			ZEPHIR_CPY_WRT(&parts, &notFoundPaths);
@@ -961,7 +929,7 @@ PHP_METHOD(Stub_Router, handle)
 		}
 	}
 	if (zephir_is_true(&routeFound)) {
-		ZEPHIR_OBS_VAR(&vnamespace);
+		zephir_memory_observe(&vnamespace);
 		if (zephir_array_isset_string_fetch(&vnamespace, &parts, SL("namespace"), 0)) {
 			if (!(zephir_is_numeric(&vnamespace))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_namespace"), &vnamespace);
@@ -971,7 +939,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_22$$82, this_ptr, ZEND_STRL("_defaultNamespace"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_namespace"), &_22$$82);
 		}
-		ZEPHIR_OBS_VAR(&module);
+		zephir_memory_observe(&module);
 		if (zephir_array_isset_string_fetch(&module, &parts, SL("module"), 0)) {
 			if (!(zephir_is_numeric(&module))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_module"), &module);
@@ -981,7 +949,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_23$$85, this_ptr, ZEND_STRL("_defaultModule"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_module"), &_23$$85);
 		}
-		ZEPHIR_OBS_VAR(&controller);
+		zephir_memory_observe(&controller);
 		if (zephir_array_isset_string_fetch(&controller, &parts, SL("controller"), 0)) {
 			if (!(zephir_is_numeric(&controller))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_controller"), &controller);
@@ -991,7 +959,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_24$$88, this_ptr, ZEND_STRL("_defaultController"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_controller"), &_24$$88);
 		}
-		ZEPHIR_OBS_VAR(&action);
+		zephir_memory_observe(&action);
 		if (zephir_array_isset_string_fetch(&action, &parts, SL("action"), 0)) {
 			if (!(zephir_is_numeric(&action))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_action"), &action);
@@ -1001,7 +969,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_25$$91, this_ptr, ZEND_STRL("_defaultAction"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_action"), &_25$$91);
 		}
-		ZEPHIR_OBS_VAR(&paramsStr);
+		zephir_memory_observe(&paramsStr);
 		if (zephir_array_isset_string_fetch(&paramsStr, &parts, SL("params"), 0)) {
 			ZVAL_LONG(&_26$$92, 1);
 			ZEPHIR_INIT_VAR(&strParams);
@@ -1058,7 +1026,6 @@ PHP_METHOD(Stub_Router, add)
 	ZVAL_UNDEF(&httpMethods_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&route);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 3)
 		Z_PARAM_ZVAL(pattern)
@@ -1066,7 +1033,6 @@ PHP_METHOD(Stub_Router, add)
 		Z_PARAM_ZVAL_OR_NULL(paths)
 		Z_PARAM_ZVAL_OR_NULL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1107,14 +1073,12 @@ PHP_METHOD(Stub_Router, addGet)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1150,14 +1114,12 @@ PHP_METHOD(Stub_Router, addPost)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1193,14 +1155,12 @@ PHP_METHOD(Stub_Router, addPut)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1236,14 +1196,12 @@ PHP_METHOD(Stub_Router, addPatch)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1279,14 +1237,12 @@ PHP_METHOD(Stub_Router, addDelete)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1322,14 +1278,12 @@ PHP_METHOD(Stub_Router, addOptions)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1365,14 +1319,12 @@ PHP_METHOD(Stub_Router, addHead)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1412,12 +1364,9 @@ PHP_METHOD(Stub_Router, mount)
 	ZVAL_UNDEF(&_1$$5);
 	ZVAL_UNDEF(&_3$$8);
 	ZVAL_UNDEF(&_4$$11);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(group)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1496,7 +1445,7 @@ PHP_METHOD(Stub_Router, mount)
 		}
 		ZEPHIR_INIT_NVAR(&route);
 	}
-	ZEPHIR_OBS_VAR(&routes);
+	zephir_memory_observe(&routes);
 	zephir_read_property(&routes, this_ptr, ZEND_STRL("_routes"), PH_NOISY_CC);
 	if (Z_TYPE_P(&routes) == IS_ARRAY) {
 		ZEPHIR_INIT_VAR(&_4$$11);
@@ -1520,12 +1469,9 @@ PHP_METHOD(Stub_Router, notFound)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&paths_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &paths);
@@ -1706,12 +1652,9 @@ PHP_METHOD(Stub_Router, getRouteById)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(id)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1774,12 +1717,9 @@ PHP_METHOD(Stub_Router, getRouteByName)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/router.zep.h b/ext/stub/router.zep.h
index 0cff207b84..e7cda4f79d 100644
--- a/ext/stub/router.zep.h
+++ b/ext/stub/router.zep.h
@@ -179,16 +179,8 @@ ZEND_END_ARG_INFO()
 ZEPHIR_INIT_FUNCS(stub_router_method_entry) {
 	PHP_ME(Stub_Router, __construct, arginfo_stub_router___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_Router, setDI, arginfo_stub_router_setdi, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getDI, arginfo_stub_router_getdi, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getDI, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getRewriteUri, arginfo_stub_router_getrewriteuri, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getRewriteUri, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Router, getDI, arginfo_stub_router_getdi, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getRewriteUri, arginfo_stub_router_getrewriteuri, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router, setUriSource, arginfo_stub_router_seturisource, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router, removeExtraSlashes, arginfo_stub_router_removeextraslashes, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router, setDefaultNamespace, arginfo_stub_router_setdefaultnamespace, ZEND_ACC_PUBLIC)
@@ -208,56 +200,16 @@ ZEPHIR_INIT_FUNCS(stub_router_method_entry) {
 	PHP_ME(Stub_Router, addHead, arginfo_stub_router_addhead, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router, mount, arginfo_stub_router_mount, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router, notFound, arginfo_stub_router_notfound, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, clear, arginfo_stub_router_clear, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, clear, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getNamespaceName, arginfo_stub_router_getnamespacename, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getNamespaceName, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getModuleName, arginfo_stub_router_getmodulename, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getModuleName, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getControllerName, arginfo_stub_router_getcontrollername, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getControllerName, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getActionName, arginfo_stub_router_getactionname, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getActionName, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getParams, arginfo_stub_router_getparams, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getParams, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getMatchedRoute, arginfo_stub_router_getmatchedroute, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getMatchedRoute, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getMatches, arginfo_stub_router_getmatches, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getMatches, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, wasMatched, arginfo_stub_router_wasmatched, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, wasMatched, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router, getRoutes, arginfo_stub_router_getroutes, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router, getRoutes, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Router, clear, arginfo_stub_router_clear, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getNamespaceName, arginfo_stub_router_getnamespacename, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getModuleName, arginfo_stub_router_getmodulename, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getControllerName, arginfo_stub_router_getcontrollername, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getActionName, arginfo_stub_router_getactionname, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getParams, arginfo_stub_router_getparams, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getMatchedRoute, arginfo_stub_router_getmatchedroute, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getMatches, arginfo_stub_router_getmatches, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, wasMatched, arginfo_stub_router_wasmatched, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router, getRoutes, arginfo_stub_router_getroutes, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router, getRouteById, arginfo_stub_router_getroutebyid, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router, getRouteByName, arginfo_stub_router_getroutebyname, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/router/route.zep.c b/ext/stub/router/route.zep.c
index e5f4af8a24..179006356e 100644
--- a/ext/stub/router/route.zep.c
+++ b/ext/stub/router/route.zep.c
@@ -61,7 +61,6 @@ PHP_METHOD(Stub_Router_Route, __construct)
 	ZVAL_UNDEF(&paths_sub);
 	ZVAL_UNDEF(&httpMethods_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 3)
 		Z_PARAM_ZVAL(pattern)
@@ -69,7 +68,6 @@ PHP_METHOD(Stub_Router_Route, __construct)
 		Z_PARAM_ZVAL_OR_NULL(paths)
 		Z_PARAM_ZVAL_OR_NULL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -118,12 +116,9 @@ PHP_METHOD(Stub_Router_Route, compilePattern)
 	ZVAL_UNDEF(&_11$$9);
 	ZVAL_UNDEF(&_12$$9);
 	ZVAL_UNDEF(&_13$$9);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(pattern)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -210,12 +205,9 @@ PHP_METHOD(Stub_Router_Route, via)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&httpMethods_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &httpMethods);
@@ -261,12 +253,9 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	ZVAL_UNDEF(&_23$$16);
 	ZVAL_UNDEF(&_27$$19);
 	ZVAL_UNDEF(&_28$$28);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(pattern)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -493,14 +482,12 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 	ZVAL_UNDEF(&_1$$10);
 	ZVAL_UNDEF(&_2$$19);
 	ZVAL_UNDEF(&_3$$19);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -589,7 +576,7 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 		if (zephir_memnstr_str(pattern, SL("{"), "stub/router/route.zep", 348)) {
 			ZEPHIR_CALL_METHOD(&extracted, this_ptr, "extractnamedparams", NULL, 0, pattern);
 			zephir_check_call_status();
-			ZEPHIR_OBS_VAR(&pcrePattern);
+			zephir_memory_observe(&pcrePattern);
 			zephir_array_fetch_long(&pcrePattern, &extracted, 0, PH_NOISY, "stub/router/route.zep", 351);
 			ZEPHIR_INIT_VAR(&_2$$19);
 			zephir_array_fetch_long(&_3$$19, &extracted, 1, PH_NOISY | PH_READONLY, "stub/router/route.zep", 352);
@@ -641,12 +628,9 @@ PHP_METHOD(Stub_Router_Route, setName)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &name);
@@ -670,12 +654,9 @@ PHP_METHOD(Stub_Router_Route, beforeMatch)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&callback_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(callback)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &callback);
@@ -835,12 +816,9 @@ PHP_METHOD(Stub_Router_Route, setHttpMethods)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&httpMethods_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &httpMethods);
@@ -880,12 +858,9 @@ PHP_METHOD(Stub_Router_Route, setHostname)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&hostname_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(hostname)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &hostname);
@@ -923,13 +898,10 @@ PHP_METHOD(Stub_Router_Route, convert)
 
 	ZVAL_UNDEF(&name_sub);
 	ZVAL_UNDEF(&converter_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(name)
 		Z_PARAM_ZVAL(converter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &name, &converter);
diff --git a/ext/stub/router/route.zep.h b/ext/stub/router/route.zep.h
index a55bc0e79c..50a7eecf16 100644
--- a/ext/stub/router/route.zep.h
+++ b/ext/stub/router/route.zep.h
@@ -104,60 +104,20 @@ ZEPHIR_INIT_FUNCS(stub_router_route_method_entry) {
 	PHP_ME(Stub_Router_Route, via, arginfo_stub_router_route_via, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router_Route, extractNamedParams, arginfo_stub_router_route_extractnamedparams, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router_Route, reConfigure, arginfo_stub_router_route_reconfigure, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getName, arginfo_stub_router_route_getname, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getName, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Router_Route, getName, arginfo_stub_router_route_getname, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router_Route, setName, arginfo_stub_router_route_setname, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router_Route, beforeMatch, arginfo_stub_router_route_beforematch, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getBeforeMatch, arginfo_stub_router_route_getbeforematch, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getBeforeMatch, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getRouteId, arginfo_stub_router_route_getrouteid, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getRouteId, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getPattern, arginfo_stub_router_route_getpattern, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getPattern, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getCompiledPattern, arginfo_stub_router_route_getcompiledpattern, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getCompiledPattern, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getPaths, arginfo_stub_router_route_getpaths, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getPaths, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getReversedPaths, arginfo_stub_router_route_getreversedpaths, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getReversedPaths, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Router_Route, getBeforeMatch, arginfo_stub_router_route_getbeforematch, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router_Route, getRouteId, arginfo_stub_router_route_getrouteid, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router_Route, getPattern, arginfo_stub_router_route_getpattern, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router_Route, getCompiledPattern, arginfo_stub_router_route_getcompiledpattern, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router_Route, getPaths, arginfo_stub_router_route_getpaths, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Router_Route, getReversedPaths, arginfo_stub_router_route_getreversedpaths, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router_Route, setHttpMethods, arginfo_stub_router_route_sethttpmethods, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getHttpMethods, arginfo_stub_router_route_gethttpmethods, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getHttpMethods, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Router_Route, getHttpMethods, arginfo_stub_router_route_gethttpmethods, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router_Route, setHostname, arginfo_stub_router_route_sethostname, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getHostname, arginfo_stub_router_route_gethostname, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getHostname, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Router_Route, getHostname, arginfo_stub_router_route_gethostname, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Router_Route, convert, arginfo_stub_router_route_convert, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Router_Route, getConverters, arginfo_stub_router_route_getconverters, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Router_Route, getConverters, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Router_Route, getConverters, arginfo_stub_router_route_getconverters, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/scall.zep.c b/ext/stub/scall.zep.c
index 51a6364b19..4104dd602c 100644
--- a/ext/stub/scall.zep.c
+++ b/ext/stub/scall.zep.c
@@ -62,13 +62,10 @@ PHP_METHOD(Stub_Scall, testMethod4)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -85,13 +82,10 @@ PHP_METHOD(Stub_Scall, testMethod5)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -108,13 +102,10 @@ PHP_METHOD(Stub_Scall, testMethod6)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
@@ -189,13 +180,10 @@ PHP_METHOD(Stub_Scall, testCall4)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -216,13 +204,10 @@ PHP_METHOD(Stub_Scall, testCall5)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -244,13 +229,10 @@ PHP_METHOD(Stub_Scall, testCall6)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -317,13 +299,10 @@ PHP_METHOD(Stub_Scall, testCall10)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -344,13 +323,10 @@ PHP_METHOD(Stub_Scall, testCall11)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -372,13 +348,10 @@ PHP_METHOD(Stub_Scall, testCall12)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -441,13 +414,10 @@ PHP_METHOD(Stub_Scall, testMethod16)
 	long a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
@@ -470,13 +440,10 @@ PHP_METHOD(Stub_Scall, testCall17)
 
 	ZVAL_UNDEF(&p_sub);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -519,13 +486,10 @@ PHP_METHOD(Stub_Scall, testCall18)
 
 	ZVAL_UNDEF(&p_sub);
 	ZVAL_UNDEF(&_3$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/scall.zep.h b/ext/stub/scall.zep.h
index e9a61d09bc..f339923fa0 100644
--- a/ext/stub/scall.zep.h
+++ b/ext/stub/scall.zep.h
@@ -148,57 +148,21 @@ ZEPHIR_INIT_FUNCS(stub_scall_method_entry) {
 	PHP_ME(Stub_Scall, testMethod5, arginfo_stub_scall_testmethod5, ZEND_ACC_STATIC|ZEND_ACC_PROTECTED)
 	PHP_ME(Stub_Scall, testMethod6, arginfo_stub_scall_testmethod6, ZEND_ACC_STATIC|ZEND_ACC_PRIVATE)
 	PHP_ME(Stub_Scall, testMethod7, arginfo_stub_scall_testmethod7, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall1, arginfo_stub_scall_testcall1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall2, arginfo_stub_scall_testcall2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall3, arginfo_stub_scall_testcall3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Scall, testCall1, arginfo_stub_scall_testcall1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Scall, testCall2, arginfo_stub_scall_testcall2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Scall, testCall3, arginfo_stub_scall_testcall3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Scall, testCall4, arginfo_stub_scall_testcall4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Scall, testCall5, arginfo_stub_scall_testcall5, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Scall, testCall6, arginfo_stub_scall_testcall6, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall7, arginfo_stub_scall_testcall7, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall7, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall8, arginfo_stub_scall_testcall8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall9, arginfo_stub_scall_testcall9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall9, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Scall, testCall7, arginfo_stub_scall_testcall7, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Scall, testCall8, arginfo_stub_scall_testcall8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Scall, testCall9, arginfo_stub_scall_testcall9, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Scall, testCall10, arginfo_stub_scall_testcall10, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Scall, testCall11, arginfo_stub_scall_testcall11, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Scall, testCall12, arginfo_stub_scall_testcall12, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall13, arginfo_stub_scall_testcall13, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall13, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall14, arginfo_stub_scall_testcall14, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall14, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scall, testCall15, arginfo_stub_scall_testcall15, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Scall, testCall15, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Scall, testCall13, arginfo_stub_scall_testcall13, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Scall, testCall14, arginfo_stub_scall_testcall14, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Scall, testCall15, arginfo_stub_scall_testcall15, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Scall, testMethod16, arginfo_stub_scall_testmethod16, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Scall, testCall17, arginfo_stub_scall_testcall17, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Scall, testCall18, arginfo_stub_scall_testcall18, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
diff --git a/ext/stub/scalldynamic.zep.c b/ext/stub/scalldynamic.zep.c
index 2317b8aa05..83a39118ec 100644
--- a/ext/stub/scalldynamic.zep.c
+++ b/ext/stub/scalldynamic.zep.c
@@ -61,12 +61,9 @@ PHP_METHOD(Stub_ScallDynamic, selfDynamicCall1)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&methodName_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(methodName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &methodName);
diff --git a/ext/stub/scallexternal.zep.c b/ext/stub/scallexternal.zep.c
index 35913cf7e6..c69d4d9a17 100644
--- a/ext/stub/scallexternal.zep.c
+++ b/ext/stub/scallexternal.zep.c
@@ -53,13 +53,10 @@ PHP_METHOD(Stub_ScallExternal, testCall2)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -77,13 +74,10 @@ PHP_METHOD(Stub_ScallExternal, testMethod3)
 	long a, b;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
diff --git a/ext/stub/scallexternal.zep.h b/ext/stub/scallexternal.zep.h
index ca8217a5af..4082998035 100644
--- a/ext/stub/scallexternal.zep.h
+++ b/ext/stub/scallexternal.zep.h
@@ -21,11 +21,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_scallexternal_testmethod3, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_scallexternal_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ScallExternal, testCall1, arginfo_stub_scallexternal_testcall1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ScallExternal, testCall1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_ScallExternal, testCall1, arginfo_stub_scallexternal_testcall1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ScallExternal, testCall2, arginfo_stub_scallexternal_testcall2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ScallExternal, testMethod3, arginfo_stub_scallexternal_testmethod3, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
diff --git a/ext/stub/scalllateconstruct.zep.h b/ext/stub/scalllateconstruct.zep.h
index 4c8a480459..78bc84d2b8 100644
--- a/ext/stub/scalllateconstruct.zep.h
+++ b/ext/stub/scalllateconstruct.zep.h
@@ -21,17 +21,9 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_scalllateconstruct_varvalue
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_scalllateconstruct_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ScallLateConstruct, __construct, arginfo_stub_scalllateconstruct___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_ScallLateConstruct, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_ScallLateConstruct, __construct, arginfo_stub_scalllateconstruct___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_ScallLateConstruct, testStaticInit, arginfo_stub_scalllateconstruct_teststaticinit, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_ScallLateConstruct, testPublicInit, arginfo_stub_scalllateconstruct_testpublicinit, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_ScallLateConstruct, testPublicInit, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_ScallLateConstruct, testPublicInit, arginfo_stub_scalllateconstruct_testpublicinit, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_ScallLateConstruct, varValue, arginfo_stub_scalllateconstruct_varvalue, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/scope.zep.c b/ext/stub/scope.zep.c
index 1cb63ee4b9..0cfc2c2b47 100644
--- a/ext/stub/scope.zep.c
+++ b/ext/stub/scope.zep.c
@@ -44,12 +44,9 @@ PHP_METHOD(Stub_Scope, getDyStr)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(g)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/scope.zep.h b/ext/stub/scope.zep.h
index 5b4b68e810..87a825ae27 100644
--- a/ext/stub/scope.zep.h
+++ b/ext/stub/scope.zep.h
@@ -26,26 +26,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_scope_test3, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_scope_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scope, getStr, arginfo_stub_scope_getstr, ZEND_ACC_PRIVATE|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Scope, getStr, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_Scope, getStr, arginfo_stub_scope_getstr, ZEND_ACC_PRIVATE|ZEND_ACC_STATIC)
 	PHP_ME(Stub_Scope, getDyStr, arginfo_stub_scope_getdystr, ZEND_ACC_PRIVATE|ZEND_ACC_STATIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scope, test1, arginfo_stub_scope_test1, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Scope, test1, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scope, test2, arginfo_stub_scope_test2, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Scope, test2, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Scope, test3, arginfo_stub_scope_test3, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#else
-	PHP_ME(Stub_Scope, test3, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-#endif
+PHP_ME(Stub_Scope, test1, arginfo_stub_scope_test1, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Scope, test2, arginfo_stub_scope_test2, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
+PHP_ME(Stub_Scope, test3, arginfo_stub_scope_test3, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/sort.zep.c b/ext/stub/sort.zep.c
index 8a3a658e3f..9669c4d1dc 100644
--- a/ext/stub/sort.zep.c
+++ b/ext/stub/sort.zep.c
@@ -47,12 +47,9 @@ PHP_METHOD(Stub_Sort, quick)
 	ZVAL_UNDEF(&_4$$4);
 	ZVAL_UNDEF(&_5$$5);
 	ZVAL_UNDEF(&_6$$6);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(arr)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -64,7 +61,7 @@ PHP_METHOD(Stub_Sort, quick)
 	if (length <= 1) {
 		RETURN_CTOR(&arr);
 	}
-	ZEPHIR_OBS_VAR(&_0);
+	zephir_memory_observe(&_0);
 	zephir_array_fetch_long(&_0, &arr, 0, PH_NOISY, "stub/sort.zep", 18);
 	pivot = zephir_get_intval(&_0);
 	ZEPHIR_INIT_VAR(&left);
diff --git a/ext/stub/spectralnorm.zep.c b/ext/stub/spectralnorm.zep.c
index 9378e0b718..ddf74f5e5f 100644
--- a/ext/stub/spectralnorm.zep.c
+++ b/ext/stub/spectralnorm.zep.c
@@ -42,13 +42,10 @@ PHP_METHOD(Stub_SpectralNorm, Ax)
 	ZVAL_UNDEF(&j_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(i)
 		Z_PARAM_ZVAL(j)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -80,14 +77,11 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 	ZVAL_UNDEF(&_8$$4);
 	ZVAL_UNDEF(&_10$$4);
 	ZVAL_UNDEF(&_12$$4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_LONG(n)
 		Z_PARAM_OBJECT_OF_CLASS(u, spl_ce_SplFixedArray)
 		Z_PARAM_OBJECT_OF_CLASS(v, spl_ce_SplFixedArray)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -163,14 +157,11 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 	ZVAL_UNDEF(&_8$$4);
 	ZVAL_UNDEF(&_10$$4);
 	ZVAL_UNDEF(&_12$$4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_LONG(n)
 		Z_PARAM_OBJECT_OF_CLASS(u, spl_ce_SplFixedArray)
 		Z_PARAM_OBJECT_OF_CLASS(v, spl_ce_SplFixedArray)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -239,15 +230,12 @@ PHP_METHOD(Stub_SpectralNorm, AtAu)
 	ZVAL_UNDEF(&u_sub);
 	ZVAL_UNDEF(&v_sub);
 	ZVAL_UNDEF(&w_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(4, 4)
 		Z_PARAM_ZVAL(n)
 		Z_PARAM_ZVAL(u)
 		Z_PARAM_ZVAL(v)
 		Z_PARAM_ZVAL(w)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -282,12 +270,9 @@ PHP_METHOD(Stub_SpectralNorm, process)
 	ZVAL_UNDEF(&_18$$5);
 	ZVAL_UNDEF(&_19$$5);
 	ZVAL_UNDEF(&_20$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/spl.zep.c b/ext/stub/spl.zep.c
index dd43f0df9b..0e3b625130 100644
--- a/ext/stub/spl.zep.c
+++ b/ext/stub/spl.zep.c
@@ -38,12 +38,9 @@ PHP_METHOD(Stub_Spl, issue1212)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&file);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(file)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/spropertyaccess.zep.c b/ext/stub/spropertyaccess.zep.c
index a7f504409e..688ad6c17d 100644
--- a/ext/stub/spropertyaccess.zep.c
+++ b/ext/stub/spropertyaccess.zep.c
@@ -63,7 +63,7 @@ PHP_METHOD(Stub_SPropertyAccess, __construct)
 	ZEPHIR_INIT_VAR(&_3);
 	zephir_substr(&_3, &_0, 0 , 1 , 0);
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("b"), &_3);
-	ZEPHIR_OBS_VAR(&_4);
+	zephir_memory_observe(&_4);
 	zephir_read_static_property_ce(&_4, stub_spropertyaccess_ce, SL("b"), PH_NOISY_CC);
 	zephir_update_static_property_ce(stub_scallexternal_ce, ZEND_STRL("sproperty"), &_4);
 	ZEPHIR_OBS_NVAR(&_4);
@@ -80,13 +80,11 @@ PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -116,13 +114,11 @@ PHP_METHOD(Stub_SPropertyAccess, testArgument)
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&_0$$3);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -136,7 +132,7 @@ PHP_METHOD(Stub_SPropertyAccess, testArgument)
 
 
 	if (ZEPHIR_IS_EMPTY(delimiter)) {
-		ZEPHIR_OBS_VAR(&_0$$3);
+		zephir_memory_observe(&_0$$3);
 		zephir_read_static_property_ce(&_0$$3, stub_spropertyaccess_ce, SL("delimiter"), PH_NOISY_CC);
 		ZEPHIR_CPY_WRT(delimiter, &_0$$3);
 	}
diff --git a/ext/stub/spropertyaccess.zep.h b/ext/stub/spropertyaccess.zep.h
index 798cd7f4df..f6fda7dba6 100644
--- a/ext/stub/spropertyaccess.zep.h
+++ b/ext/stub/spropertyaccess.zep.h
@@ -39,11 +39,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_spropertyaccess_zephir_init_static_propertie
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_spropertyaccess_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_SPropertyAccess, __construct, arginfo_stub_spropertyaccess___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#else
-	PHP_ME(Stub_SPropertyAccess, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
-#endif
+PHP_ME(Stub_SPropertyAccess, __construct, arginfo_stub_spropertyaccess___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
 	PHP_ME(Stub_SPropertyAccess, testArgumentWithUnderscore, arginfo_stub_spropertyaccess_testargumentwithunderscore, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_SPropertyAccess, testArgument, arginfo_stub_spropertyaccess_testargument, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_SPropertyAccess, mutateStringVarInsideCycle, arginfo_stub_spropertyaccess_mutatestringvarinsidecycle, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
diff --git a/ext/stub/statements.zep.c b/ext/stub/statements.zep.c
index f6677f6d4f..a8593f1824 100644
--- a/ext/stub/statements.zep.c
+++ b/ext/stub/statements.zep.c
@@ -86,12 +86,9 @@ PHP_METHOD(Stub_Statements, testElseIf)
 	zend_long num;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -115,12 +112,9 @@ PHP_METHOD(Stub_Statements, testElseIf1)
 	zend_long num, total;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
@@ -144,13 +138,10 @@ PHP_METHOD(Stub_Statements, testElseIf2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&total_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(num)
 		Z_PARAM_ZVAL(total)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &num_param, &total);
@@ -189,12 +180,9 @@ PHP_METHOD(Stub_Statements, test544Issue)
 	ZVAL_UNDEF(&_13$$4);
 	ZVAL_UNDEF(&_14$$5);
 	ZVAL_UNDEF(&_15$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(step)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -261,12 +249,9 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 	ZVAL_UNDEF(&_11$$4);
 	ZVAL_UNDEF(&_12$$5);
 	ZVAL_UNDEF(&_13$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(step)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/statements.zep.h b/ext/stub/statements.zep.h
index fb266864d1..c4157250ac 100644
--- a/ext/stub/statements.zep.h
+++ b/ext/stub/statements.zep.h
@@ -35,11 +35,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_statements_test544issuewithvariable, 0, 0, 1
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_statements_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Statements, testPropertyAcccessAvoidTmpReuse, arginfo_stub_statements_testpropertyacccessavoidtmpreuse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Statements, testPropertyAcccessAvoidTmpReuse, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Statements, testPropertyAcccessAvoidTmpReuse, arginfo_stub_statements_testpropertyacccessavoidtmpreuse, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Statements, testElseIf, arginfo_stub_statements_testelseif, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Statements, testElseIf1, arginfo_stub_statements_testelseif1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Statements, testElseIf2, arginfo_stub_statements_testelseif2, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/strings.zep.c b/ext/stub/strings.zep.c
index e7c8500331..afb11bb6d6 100644
--- a/ext/stub/strings.zep.c
+++ b/ext/stub/strings.zep.c
@@ -40,14 +40,12 @@ PHP_METHOD(Stub_Strings, camelize)
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -73,14 +71,12 @@ PHP_METHOD(Stub_Strings, uncamelize)
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -102,12 +98,9 @@ PHP_METHOD(Stub_Strings, testTrim)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -123,12 +116,9 @@ PHP_METHOD(Stub_Strings, testRtrim)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -144,12 +134,9 @@ PHP_METHOD(Stub_Strings, testLtrim)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -166,13 +153,10 @@ PHP_METHOD(Stub_Strings, testTrim2Params)
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&charlist_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(charlist)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &charlist);
@@ -189,13 +173,10 @@ PHP_METHOD(Stub_Strings, testRtrim2Params)
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&charlist_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(charlist)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &charlist);
@@ -212,13 +193,10 @@ PHP_METHOD(Stub_Strings, testLtrim2Params)
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&charlist_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(charlist)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &charlist);
@@ -235,13 +213,10 @@ PHP_METHOD(Stub_Strings, testImplode)
 
 	ZVAL_UNDEF(&glue_sub);
 	ZVAL_UNDEF(&pieces_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(glue)
 		Z_PARAM_ZVAL(pieces)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &glue, &pieces);
@@ -258,13 +233,10 @@ PHP_METHOD(Stub_Strings, testStrpos)
 
 	ZVAL_UNDEF(&haystack_sub);
 	ZVAL_UNDEF(&needle_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(haystack)
 		Z_PARAM_ZVAL(needle)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &haystack, &needle);
@@ -283,14 +255,11 @@ PHP_METHOD(Stub_Strings, testStrposOffset)
 	ZVAL_UNDEF(&haystack_sub);
 	ZVAL_UNDEF(&needle_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_ZVAL(haystack)
 		Z_PARAM_ZVAL(needle)
 		Z_PARAM_LONG(offset)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(3, 0, &haystack, &needle, &offset_param);
@@ -309,13 +278,10 @@ PHP_METHOD(Stub_Strings, testExplode)
 
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(delimiter)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &delimiter, &str);
@@ -331,12 +297,9 @@ PHP_METHOD(Stub_Strings, testExplodeStr)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -354,13 +317,10 @@ PHP_METHOD(Stub_Strings, testExplodeLimit)
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_LONG(limit)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &limit_param);
@@ -381,14 +341,11 @@ PHP_METHOD(Stub_Strings, testSubstr)
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_LONG(from)
 		Z_PARAM_LONG(len)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(3, 0, &str, &from_param, &len_param);
@@ -410,13 +367,10 @@ PHP_METHOD(Stub_Strings, testSubstr2)
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_LONG(from)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &from_param);
@@ -435,12 +389,9 @@ PHP_METHOD(Stub_Strings, testSubstr3)
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -459,12 +410,9 @@ PHP_METHOD(Stub_Strings, testSubstr4)
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -482,12 +430,9 @@ PHP_METHOD(Stub_Strings, testAddslashes)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -503,12 +448,9 @@ PHP_METHOD(Stub_Strings, testStripslashes)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -524,12 +466,9 @@ PHP_METHOD(Stub_Strings, testStripcslashes)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
@@ -546,13 +485,10 @@ PHP_METHOD(Stub_Strings, testHashEquals)
 
 	ZVAL_UNDEF(&str1_sub);
 	ZVAL_UNDEF(&str2_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(str1)
 		Z_PARAM_ZVAL(str2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &str1, &str2);
@@ -657,12 +593,9 @@ PHP_METHOD(Stub_Strings, strToHex)
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_5$$3);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -707,12 +640,9 @@ PHP_METHOD(Stub_Strings, issue1267)
 	ZVAL_UNDEF(&_6);
 	ZVAL_UNDEF(&_7);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -762,13 +692,11 @@ PHP_METHOD(Stub_Strings, issue2186)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -791,13 +719,11 @@ PHP_METHOD(Stub_Strings, issue2186SegFault)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -824,13 +750,11 @@ PHP_METHOD(Stub_Strings, issue2186SegFaultCall)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -856,13 +780,11 @@ PHP_METHOD(Stub_Strings, issue2186Child1)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -889,13 +811,11 @@ PHP_METHOD(Stub_Strings, issue2186Child2)
 	ZVAL_UNDEF(&val);
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&output);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -928,13 +848,11 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -969,13 +887,11 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1011,13 +927,11 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1051,13 +965,11 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -1094,13 +1006,11 @@ PHP_METHOD(Stub_Strings, issue2299NullableStringCondition)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&roleName);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(roleName)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/strings.zep.h b/ext/stub/strings.zep.h
index 7c4fb6c8ed..3a885f8ff3 100644
--- a/ext/stub/strings.zep.h
+++ b/ext/stub/strings.zep.h
@@ -236,36 +236,12 @@ ZEPHIR_INIT_FUNCS(stub_strings_method_entry) {
 	PHP_ME(Stub_Strings, testStripslashes, arginfo_stub_strings_teststripslashes, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Strings, testStripcslashes, arginfo_stub_strings_teststripcslashes, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Strings, testHashEquals, arginfo_stub_strings_testhashequals, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Strings, testHardcodedMultilineString, arginfo_stub_strings_testhardcodedmultilinestring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Strings, testHardcodedMultilineString, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Strings, testEchoMultilineString, arginfo_stub_strings_testechomultilinestring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Strings, testEchoMultilineString, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Strings, testTrimMultilineString, arginfo_stub_strings_testtrimmultilinestring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Strings, testTrimMultilineString, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Strings, testWellEscapedMultilineString, arginfo_stub_strings_testwellescapedmultilinestring, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Strings, testWellEscapedMultilineString, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Strings, testInternedString1, arginfo_stub_strings_testinternedstring1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Strings, testInternedString1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Strings, testInternedString2, arginfo_stub_strings_testinternedstring2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Strings, testInternedString2, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Strings, testHardcodedMultilineString, arginfo_stub_strings_testhardcodedmultilinestring, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Strings, testEchoMultilineString, arginfo_stub_strings_testechomultilinestring, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Strings, testTrimMultilineString, arginfo_stub_strings_testtrimmultilinestring, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Strings, testWellEscapedMultilineString, arginfo_stub_strings_testwellescapedmultilinestring, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Strings, testInternedString1, arginfo_stub_strings_testinternedstring1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Strings, testInternedString2, arginfo_stub_strings_testinternedstring2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Strings, strToHex, arginfo_stub_strings_strtohex, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Strings, issue1267, arginfo_stub_strings_issue1267, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Strings, issue2186, arginfo_stub_strings_issue2186, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/stubs.zep.c b/ext/stub/stubs.zep.c
index 278582d5dc..6d82866832 100644
--- a/ext/stub/stubs.zep.c
+++ b/ext/stub/stubs.zep.c
@@ -84,14 +84,11 @@ PHP_METHOD(Stub_Stubs, testMixedInputParamsDocBlock)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&intOrString_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(intOrString)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(number)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 1, &intOrString, &number_param);
@@ -121,14 +118,11 @@ PHP_METHOD(Stub_Stubs, testMixedInputParamsDocBlockDeclared)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&intOrString_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_ZVAL(intOrString)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(number)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 1, &intOrString, &number_param);
diff --git a/ext/stub/stubs.zep.h b/ext/stub/stubs.zep.h
index 4362d6a02d..d73f315516 100644
--- a/ext/stub/stubs.zep.h
+++ b/ext/stub/stubs.zep.h
@@ -46,20 +46,8 @@ ZEPHIR_INIT_FUNCS(stub_stubs_method_entry) {
 	PHP_ME(Stub_Stubs, testMixedInputParamsDocBlock, arginfo_stub_stubs_testmixedinputparamsdocblock, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Stubs, testMixedInputParamsDocBlockDeclared, arginfo_stub_stubs_testmixedinputparamsdocblockdeclared, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Stubs, testVariableLength, arginfo_stub_stubs_testvariablelength, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature1, arginfo_stub_stubs_testmultireturntypewithmixedindocandemptyinsignature1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature2, arginfo_stub_stubs_testmultireturntypewithmixedindocandemptyinsignature2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Stubs, testMultiReturnTypeWithBool, arginfo_stub_stubs_testmultireturntypewithbool, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Stubs, testMultiReturnTypeWithBool, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature1, arginfo_stub_stubs_testmultireturntypewithmixedindocandemptyinsignature1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature2, arginfo_stub_stubs_testmultireturntypewithmixedindocandemptyinsignature2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Stubs, testMultiReturnTypeWithBool, arginfo_stub_stubs_testmultireturntypewithbool, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/ternary.zep.c b/ext/stub/ternary.zep.c
index 71e0384b22..70c3a4b0fe 100644
--- a/ext/stub/ternary.zep.c
+++ b/ext/stub/ternary.zep.c
@@ -58,12 +58,9 @@ PHP_METHOD(Stub_Ternary, testTernary2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(b)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -91,13 +88,10 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 	ZVAL_UNDEF(&y_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(y)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -132,13 +126,10 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 	ZVAL_UNDEF(&y_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(y)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -171,12 +162,9 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -267,12 +255,9 @@ PHP_METHOD(Stub_Ternary, testShortTernary)
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -297,13 +282,10 @@ PHP_METHOD(Stub_Ternary, testShortTernaryComplex)
 	ZVAL_UNDEF(&left_sub);
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(left)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/ternary.zep.h b/ext/stub/ternary.zep.h
index 48e20926e5..4e80b013d5 100644
--- a/ext/stub/ternary.zep.h
+++ b/ext/stub/ternary.zep.h
@@ -50,25 +50,13 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_ternary_testshortternarycomplex, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_ternary_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Ternary, testTernary1, arginfo_stub_ternary_testternary1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Ternary, testTernary1, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Ternary, testTernary1, arginfo_stub_ternary_testternary1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Ternary, testTernary2, arginfo_stub_ternary_testternary2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Ternary, testTernaryComplex1, arginfo_stub_ternary_testternarycomplex1, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Ternary, testTernaryComplex2, arginfo_stub_ternary_testternarycomplex2, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Ternary, testTernaryComplex3, arginfo_stub_ternary_testternarycomplex3, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Ternary, testTernaryWithPromotedTemporaryVariable, arginfo_stub_ternary_testternarywithpromotedtemporaryvariable, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Ternary, testTernaryWithPromotedTemporaryVariable, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Ternary, testTernaryAfterLetVariable, arginfo_stub_ternary_testternaryafterletvariable, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Ternary, testTernaryAfterLetVariable, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Ternary, testTernaryWithPromotedTemporaryVariable, arginfo_stub_ternary_testternarywithpromotedtemporaryvariable, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Ternary, testTernaryAfterLetVariable, arginfo_stub_ternary_testternaryafterletvariable, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Ternary, testShortTernary, arginfo_stub_ternary_testshortternary, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Ternary, testShortTernaryComplex, arginfo_stub_ternary_testshortternarycomplex, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/trytest.zep.c b/ext/stub/trytest.zep.c
index 288621cec1..8192ec19a4 100644
--- a/ext/stub/trytest.zep.c
+++ b/ext/stub/trytest.zep.c
@@ -166,12 +166,9 @@ PHP_METHOD(Stub_TryTest, testTry4)
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_6);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -241,12 +238,9 @@ PHP_METHOD(Stub_TryTest, testTry5)
 	ZVAL_UNDEF(&_3$$5);
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -315,12 +309,9 @@ PHP_METHOD(Stub_TryTest, testTry6)
 	ZVAL_UNDEF(&_1$$4);
 	ZVAL_UNDEF(&_2$$5);
 	ZVAL_UNDEF(&_3$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -388,12 +379,9 @@ PHP_METHOD(Stub_TryTest, testTry7)
 	ZVAL_UNDEF(&_1$$4);
 	ZVAL_UNDEF(&_2$$5);
 	ZVAL_UNDEF(&_3$$5);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/trytest.zep.h b/ext/stub/trytest.zep.h
index aa4e7f609b..7cc320c457 100644
--- a/ext/stub/trytest.zep.h
+++ b/ext/stub/trytest.zep.h
@@ -69,64 +69,20 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_trytest_testtry11, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_trytest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testThrow1, arginfo_stub_trytest_testthrow1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testThrow1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testThrow2, arginfo_stub_trytest_testthrow2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testThrow2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testTry1, arginfo_stub_trytest_testtry1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testTry1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testTry2, arginfo_stub_trytest_testtry2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testTry2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testTry3, arginfo_stub_trytest_testtry3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testTry3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_TryTest, testThrow1, arginfo_stub_trytest_testthrow1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TryTest, testThrow2, arginfo_stub_trytest_testthrow2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TryTest, testTry1, arginfo_stub_trytest_testtry1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TryTest, testTry2, arginfo_stub_trytest_testtry2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TryTest, testTry3, arginfo_stub_trytest_testtry3, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_TryTest, testTry4, arginfo_stub_trytest_testtry4, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_TryTest, testTry5, arginfo_stub_trytest_testtry5, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_TryTest, testTry6, arginfo_stub_trytest_testtry6, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_TryTest, testTry7, arginfo_stub_trytest_testtry7, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testTry8, arginfo_stub_trytest_testtry8, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testTry8, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, someMethod1, arginfo_stub_trytest_somemethod1, ZEND_ACC_PRIVATE)
-#else
-	PHP_ME(Stub_TryTest, someMethod1, NULL, ZEND_ACC_PRIVATE)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, someMethod2, arginfo_stub_trytest_somemethod2, ZEND_ACC_PRIVATE)
-#else
-	PHP_ME(Stub_TryTest, someMethod2, NULL, ZEND_ACC_PRIVATE)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testTry9, arginfo_stub_trytest_testtry9, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testTry9, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testTry10, arginfo_stub_trytest_testtry10, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testTry10, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TryTest, testTry11, arginfo_stub_trytest_testtry11, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TryTest, testTry11, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_TryTest, testTry8, arginfo_stub_trytest_testtry8, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TryTest, someMethod1, arginfo_stub_trytest_somemethod1, ZEND_ACC_PRIVATE)
+PHP_ME(Stub_TryTest, someMethod2, arginfo_stub_trytest_somemethod2, ZEND_ACC_PRIVATE)
+PHP_ME(Stub_TryTest, testTry9, arginfo_stub_trytest_testtry9, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TryTest, testTry10, arginfo_stub_trytest_testtry10, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TryTest, testTry11, arginfo_stub_trytest_testtry11, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/typehinting/testabstract.zep.h b/ext/stub/typehinting/testabstract.zep.h
index 8ce152d978..d8eda05954 100644
--- a/ext/stub/typehinting/testabstract.zep.h
+++ b/ext/stub/typehinting/testabstract.zep.h
@@ -15,11 +15,7 @@ PHP_METHOD(Stub_TypeHinting_TestAbstract, returnBoolean);
 PHP_METHOD(Stub_TypeHinting_TestAbstract, returnChar);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_typehinting_testabstract_testfunc, 0, 0, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, text, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, text, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, text, IS_ARRAY, 0, "[]")
 	ZEND_ARG_TYPE_INFO(0, text2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, flag, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, optional, IS_LONG, 1)
@@ -54,11 +50,7 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_typehinting_testabstract_method_entry) {
 	PHP_ME(Stub_TypeHinting_TestAbstract, testFunc, arginfo_stub_typehinting_testabstract_testfunc, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TypeHinting_TestAbstract, returnOneOfScalar, arginfo_stub_typehinting_testabstract_returnoneofscalar, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TypeHinting_TestAbstract, returnOneOfScalar, NULL, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_TypeHinting_TestAbstract, returnOneOfScalar, arginfo_stub_typehinting_testabstract_returnoneofscalar, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_TypeHinting_TestAbstract, returnInt, arginfo_stub_typehinting_testabstract_returnint, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_TypeHinting_TestAbstract, returnUint, arginfo_stub_typehinting_testabstract_returnuint, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_TypeHinting_TestAbstract, returnLong, arginfo_stub_typehinting_testabstract_returnlong, ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)
diff --git a/ext/stub/typeinstances.zep.h b/ext/stub/typeinstances.zep.h
index 0ead29c972..fe13f28d3d 100644
--- a/ext/stub/typeinstances.zep.h
+++ b/ext/stub/typeinstances.zep.h
@@ -17,20 +17,8 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_typeinstances_testinstanceofstring3, 0, 0, 0
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_typeinstances_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TypeInstances, testInstanceOfString1, arginfo_stub_typeinstances_testinstanceofstring1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TypeInstances, testInstanceOfString1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TypeInstances, testInstanceOfString2, arginfo_stub_typeinstances_testinstanceofstring2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TypeInstances, testInstanceOfString2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_TypeInstances, testInstanceOfString3, arginfo_stub_typeinstances_testinstanceofstring3, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_TypeInstances, testInstanceOfString3, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_TypeInstances, testInstanceOfString1, arginfo_stub_typeinstances_testinstanceofstring1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TypeInstances, testInstanceOfString2, arginfo_stub_typeinstances_testinstanceofstring2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_TypeInstances, testInstanceOfString3, arginfo_stub_typeinstances_testinstanceofstring3, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/typeoff.zep.c b/ext/stub/typeoff.zep.c
index 83da9a340c..db31da9fb1 100644
--- a/ext/stub/typeoff.zep.c
+++ b/ext/stub/typeoff.zep.c
@@ -185,7 +185,7 @@ PHP_METHOD(Stub_Typeoff, testClassPropertyAccess)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "test string");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("property"), &_0);
-	ZEPHIR_OBS_VAR(&_1);
+	zephir_memory_observe(&_1);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("property"), PH_NOISY_CC);
 	RETURN_MM_BOOL(Z_TYPE_P(&_1) == IS_STRING);
 }
@@ -198,12 +198,9 @@ PHP_METHOD(Stub_Typeoff, testUnknownTypeOf)
 
 	ZVAL_UNDEF(&u_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(u)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -221,12 +218,9 @@ PHP_METHOD(Stub_Typeoff, testCallableTypeOf)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&cb_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(cb)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &cb);
diff --git a/ext/stub/typeoff.zep.h b/ext/stub/typeoff.zep.h
index fff8eb9b6a..032589a7a9 100644
--- a/ext/stub/typeoff.zep.h
+++ b/ext/stub/typeoff.zep.h
@@ -59,61 +59,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_typeoff_testcallabletypeof, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_typeoff_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNativeStringFalse, arginfo_stub_typeoff_testnativestringfalse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNativeStringFalse, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNativeStringTrue, arginfo_stub_typeoff_testnativestringtrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNativeStringTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNativeIntFalse, arginfo_stub_typeoff_testnativeintfalse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNativeIntFalse, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNativeIntTrue, arginfo_stub_typeoff_testnativeinttrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNativeIntTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNativeDoubleTrue, arginfo_stub_typeoff_testnativedoubletrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNativeDoubleTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNativeBoolTrue, arginfo_stub_typeoff_testnativebooltrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNativeBoolTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNotBoolTrue, arginfo_stub_typeoff_testnotbooltrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNotBoolTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testNativeBoolFalse, arginfo_stub_typeoff_testnativeboolfalse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testNativeBoolFalse, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testArrayFalse, arginfo_stub_typeoff_testarrayfalse, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testArrayFalse, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testArrayTrue, arginfo_stub_typeoff_testarraytrue, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testArrayTrue, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Typeoff, testClassPropertyAccess, arginfo_stub_typeoff_testclasspropertyaccess, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Typeoff, testClassPropertyAccess, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Typeoff, testNativeStringFalse, arginfo_stub_typeoff_testnativestringfalse, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testNativeStringTrue, arginfo_stub_typeoff_testnativestringtrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testNativeIntFalse, arginfo_stub_typeoff_testnativeintfalse, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testNativeIntTrue, arginfo_stub_typeoff_testnativeinttrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testNativeDoubleTrue, arginfo_stub_typeoff_testnativedoubletrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testNativeBoolTrue, arginfo_stub_typeoff_testnativebooltrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testNotBoolTrue, arginfo_stub_typeoff_testnotbooltrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testNativeBoolFalse, arginfo_stub_typeoff_testnativeboolfalse, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testArrayFalse, arginfo_stub_typeoff_testarrayfalse, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testArrayTrue, arginfo_stub_typeoff_testarraytrue, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Typeoff, testClassPropertyAccess, arginfo_stub_typeoff_testclasspropertyaccess, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Typeoff, testUnknownTypeOf, arginfo_stub_typeoff_testunknowntypeof, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Typeoff, testCallableTypeOf, arginfo_stub_typeoff_testcallabletypeof, ZEND_ACC_PUBLIC)
 	PHP_FE_END
diff --git a/ext/stub/types/maybe.zep.c b/ext/stub/types/maybe.zep.c
index 559628295d..aca622c891 100644
--- a/ext/stub/types/maybe.zep.c
+++ b/ext/stub/types/maybe.zep.c
@@ -30,12 +30,9 @@ PHP_METHOD(Stub_Types_MayBe, gc)
 	zend_long maxlifetime;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(maxlifetime)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime_param);
diff --git a/ext/stub/types/maybe.zep.h b/ext/stub/types/maybe.zep.h
index 3730deddc8..1ff34a95ae 100644
--- a/ext/stub/types/maybe.zep.h
+++ b/ext/stub/types/maybe.zep.h
@@ -6,19 +6,11 @@ ZEPHIR_INIT_CLASS(Stub_Types_MayBe);
 PHP_METHOD(Stub_Types_MayBe, gc);
 PHP_METHOD(Stub_Types_MayBe, gcFalse);
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stub_types_maybe_gc, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-#else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_maybe_gc, 0, 1, IS_LONG, 0)
-#endif
 	ZEND_ARG_TYPE_INFO(0, maxlifetime, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stub_types_maybe_gcfalse, 0, 0, MAY_BE_LONG|MAY_BE_FALSE)
-#else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_maybe_gcfalse, 0, 0, IS_LONG, 0)
-#endif
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_types_maybe_method_entry) {
diff --git a/ext/stub/types/mixedtype.zep.c b/ext/stub/types/mixedtype.zep.c
index c7d26b7c01..7f07f48400 100644
--- a/ext/stub/types/mixedtype.zep.c
+++ b/ext/stub/types/mixedtype.zep.c
@@ -99,13 +99,10 @@ PHP_METHOD(Stub_Types_MixedType, returnMixed74)
 	zend_bool diff;
 	zval *this_ptr = getThis();
 
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(diff)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(0, 1, &diff_param);
@@ -142,12 +139,9 @@ PHP_METHOD(Stub_Types_MixedType, paramMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
@@ -165,13 +159,10 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedTwo)
 
 	ZVAL_UNDEF(&val1_sub);
 	ZVAL_UNDEF(&val2_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(val1)
 		Z_PARAM_ZVAL(val2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &val1, &val2);
@@ -195,14 +186,11 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedWithMulti)
 	ZVAL_UNDEF(&mixedVal_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&stringVal);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_LONG(intVal)
 		Z_PARAM_STR(stringVal)
 		Z_PARAM_ZVAL(mixedVal)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -230,12 +218,9 @@ PHP_METHOD(Stub_Types_MixedType, paramAndReturnMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
@@ -255,12 +240,9 @@ PHP_METHOD(Stub_Types_MixedType, castToStringMixedAndReturnMixed)
 
 	ZVAL_UNDEF(&val_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -281,12 +263,9 @@ PHP_METHOD(Stub_Types_MixedType, castToStringInternallyMixedAndReturnMixed)
 
 	ZVAL_UNDEF(&val_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -306,12 +285,9 @@ PHP_METHOD(Stub_Types_MixedType, castToIntMixedAndReturnMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
@@ -329,12 +305,9 @@ PHP_METHOD(Stub_Types_MixedType, castToIntInternallyMixedAndReturnMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -355,12 +328,9 @@ PHP_METHOD(Stub_Types_MixedType, castToBoolMixedAndReturnMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
@@ -378,12 +348,9 @@ PHP_METHOD(Stub_Types_MixedType, castToBoolInternallyMixedAndReturnMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -404,12 +371,9 @@ PHP_METHOD(Stub_Types_MixedType, castToFloatMixedAndReturnMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
@@ -427,12 +391,9 @@ PHP_METHOD(Stub_Types_MixedType, castToFloatInternallyMixedAndReturnMixed)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -456,12 +417,9 @@ PHP_METHOD(Stub_Types_MixedType, mixedInCondition)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
diff --git a/ext/stub/types/mixedtype.zep.h b/ext/stub/types/mixedtype.zep.h
index ec7b8d6b5b..7f6ca6c0ad 100644
--- a/ext/stub/types/mixedtype.zep.h
+++ b/ext/stub/types/mixedtype.zep.h
@@ -26,60 +26,28 @@ PHP_METHOD(Stub_Types_MixedType, castToFloatMixedAndReturnMixed);
 PHP_METHOD(Stub_Types_MixedType, castToFloatInternallyMixedAndReturnMixed);
 PHP_METHOD(Stub_Types_MixedType, mixedInCondition);
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixedobject, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixedobject, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixedarray, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixedarray, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixedstring, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixedstring, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixedint, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixedint, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixedfloat, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixedfloat, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixedbool, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixedbool, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixednull, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixednull, 0, 0, 0)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_returnmixed74, 0, 0, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_returnmixed74, 0, 0, 0)
-#endif
 	ZEND_ARG_TYPE_INFO(0, diff, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
@@ -101,75 +69,39 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_parammixedwithmulti, 0, 0, 3
 	ZEND_ARG_INFO(0, mixedVal)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_paramandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_paramandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttostringmixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttostringmixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttostringinternallymixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttostringinternallymixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttointmixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttointmixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttointinternallymixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttointinternallymixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttoboolmixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttoboolmixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttoboolinternallymixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttoboolinternallymixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttofloatmixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttofloatmixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_mixedtype_casttofloatinternallymixedandreturnmixed, 0, 1, IS_MIXED, 0)
-#else
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_types_mixedtype_casttofloatinternallymixedandreturnmixed, 0, 0, 1)
-#endif
 	ZEND_ARG_INFO(0, val)
 ZEND_END_ARG_INFO()
 
@@ -187,11 +119,7 @@ ZEPHIR_INIT_FUNCS(stub_types_mixedtype_method_entry) {
 	PHP_ME(Stub_Types_MixedType, returnMixedBool, arginfo_stub_types_mixedtype_returnmixedbool, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Types_MixedType, returnMixedNull, arginfo_stub_types_mixedtype_returnmixednull, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Types_MixedType, returnMixed74, arginfo_stub_types_mixedtype_returnmixed74, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Types_MixedType, returnMultiButAlwaysMixed, arginfo_stub_types_mixedtype_returnmultibutalwaysmixed, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Types_MixedType, returnMultiButAlwaysMixed, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Types_MixedType, returnMultiButAlwaysMixed, arginfo_stub_types_mixedtype_returnmultibutalwaysmixed, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Types_MixedType, paramMixed, arginfo_stub_types_mixedtype_parammixed, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Types_MixedType, paramMixedTwo, arginfo_stub_types_mixedtype_parammixedtwo, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Types_MixedType, paramMixedWithMulti, arginfo_stub_types_mixedtype_parammixedwithmulti, ZEND_ACC_PUBLIC)
diff --git a/ext/stub/types/obj.zep.h b/ext/stub/types/obj.zep.h
index a799f6ff68..195def6669 100644
--- a/ext/stub/types/obj.zep.h
+++ b/ext/stub/types/obj.zep.h
@@ -7,25 +7,13 @@ PHP_METHOD(Stub_Types_Obj, nullableObjectReturnNull);
 PHP_METHOD(Stub_Types_Obj, nullableObjectReturnObj);
 PHP_METHOD(Stub_Types_Obj, objectReturn);
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stub_types_obj_nullableobjectreturnnull, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
-#else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_obj_nullableobjectreturnnull, 0, 0, IS_OBJECT, 1)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stub_types_obj_nullableobjectreturnobj, 0, 0, MAY_BE_NULL|MAY_BE_OBJECT)
-#else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_obj_nullableobjectreturnobj, 0, 0, IS_OBJECT, 1)
-#endif
 ZEND_END_ARG_INFO()
 
-#if PHP_VERSION_ID >= 80000
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_stub_types_obj_objectreturn, 0, 0, MAY_BE_OBJECT)
-#else
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_types_obj_objectreturn, 0, 0, IS_OBJECT, 0)
-#endif
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_types_obj_method_entry) {
diff --git a/ext/stub/unsettest.zep.c b/ext/stub/unsettest.zep.c
index c638e61dc0..802cafd62c 100644
--- a/ext/stub/unsettest.zep.c
+++ b/ext/stub/unsettest.zep.c
@@ -45,12 +45,9 @@ PHP_METHOD(Stub_Unsettest, has)
 
 	ZVAL_UNDEF(&key_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(key)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &key);
@@ -67,13 +64,10 @@ PHP_METHOD(Stub_Unsettest, addValueToProperty)
 
 	ZVAL_UNDEF(&key_sub);
 	ZVAL_UNDEF(&value_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(key)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &key, &value);
@@ -89,12 +83,9 @@ PHP_METHOD(Stub_Unsettest, testUnsetValueFromProperty)
 
 	ZVAL_UNDEF(&key_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(key)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(1, 0, &key);
@@ -112,12 +103,9 @@ PHP_METHOD(Stub_Unsettest, testUnsetFromArray)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arrayParameter_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arrayParameter)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -138,13 +126,10 @@ PHP_METHOD(Stub_Unsettest, testUnsetFromArrayByIndexVar)
 
 	ZVAL_UNDEF(&arrayParameter_sub);
 	ZVAL_UNDEF(&index_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(arrayParameter)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -206,13 +191,10 @@ PHP_METHOD(Stub_Unsettest, testUnsetTypedArray)
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&key);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY(arr)
 		Z_PARAM_STR(key)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/unsettest.zep.h b/ext/stub/unsettest.zep.h
index 068f5147b5..aa589a35f4 100644
--- a/ext/stub/unsettest.zep.h
+++ b/ext/stub/unsettest.zep.h
@@ -50,26 +50,14 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_unsettest_testunsettypedarray, 0, 0, 2)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_unsettest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Unsettest, getProperty, arginfo_stub_unsettest_getproperty, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Unsettest, getProperty, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Unsettest, getProperty, arginfo_stub_unsettest_getproperty, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Unsettest, has, arginfo_stub_unsettest_has, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Unsettest, addValueToProperty, arginfo_stub_unsettest_addvaluetoproperty, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Unsettest, testUnsetValueFromProperty, arginfo_stub_unsettest_testunsetvaluefromproperty, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Unsettest, testUnsetFromArray, arginfo_stub_unsettest_testunsetfromarray, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Unsettest, testUnsetFromArrayByIndexVar, arginfo_stub_unsettest_testunsetfromarraybyindexvar, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Unsettest, testUnsetProperty, arginfo_stub_unsettest_testunsetproperty, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Unsettest, testUnsetProperty, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Unsettest, testStdClassUnset, arginfo_stub_unsettest_teststdclassunset, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Unsettest, testStdClassUnset, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Unsettest, testUnsetProperty, arginfo_stub_unsettest_testunsetproperty, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Unsettest, testStdClassUnset, arginfo_stub_unsettest_teststdclassunset, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Unsettest, testUnsetTypedArray, arginfo_stub_unsettest_testunsettypedarray, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/usetest.zep.h b/ext/stub/usetest.zep.h
index 6c32b08e57..4967791a22 100644
--- a/ext/stub/usetest.zep.h
+++ b/ext/stub/usetest.zep.h
@@ -25,26 +25,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_usetest_testusenamespacealias, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_usetest_method_entry) {
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_UseTest, createInstance, arginfo_stub_usetest_createinstance, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_UseTest, createInstance, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_UseTest, createInstance, arginfo_stub_usetest_createinstance, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_UseTest, count, arginfo_stub_usetest_count, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_UseTest, testUseClass1, arginfo_stub_usetest_testuseclass1, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_UseTest, testUseClass1, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_UseTest, testUseClass2, arginfo_stub_usetest_testuseclass2, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_UseTest, testUseClass2, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_UseTest, testUseNamespaceAlias, arginfo_stub_usetest_testusenamespacealias, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_UseTest, testUseNamespaceAlias, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_UseTest, testUseClass1, arginfo_stub_usetest_testuseclass1, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_UseTest, testUseClass2, arginfo_stub_usetest_testuseclass2, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_UseTest, testUseNamespaceAlias, arginfo_stub_usetest_testusenamespacealias, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/vars.zep.c b/ext/stub/vars.zep.c
index f8eb58f698..4b3631336a 100644
--- a/ext/stub/vars.zep.c
+++ b/ext/stub/vars.zep.c
@@ -47,12 +47,9 @@ PHP_METHOD(Stub_Vars, testParam)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_5$$3);
 	ZVAL_UNDEF(&_7$$4);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(config)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -140,12 +137,9 @@ PHP_METHOD(Stub_Vars, testVarDump2)
 
 	ZVAL_UNDEF(&ret_sub);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(ret)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -213,14 +207,12 @@ PHP_METHOD(Stub_Vars, test88Issue)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-#if PHP_VERSION_ID >= 80000
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(param1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -266,14 +258,11 @@ PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 	ZVAL_UNDEF(&param1);
 	ZVAL_UNDEF(&param2);
 	ZVAL_UNDEF(&_0);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 2)
 		Z_PARAM_STR(param1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(param2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -308,13 +297,10 @@ PHP_METHOD(Stub_Vars, testVarDump2param)
 
 	ZVAL_UNDEF(&p1_sub);
 	ZVAL_UNDEF(&p2_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(p1)
 		Z_PARAM_ZVAL(p2)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(2, 0, &p1, &p2);
@@ -332,14 +318,11 @@ PHP_METHOD(Stub_Vars, testVarDump3param)
 	ZVAL_UNDEF(&p1_sub);
 	ZVAL_UNDEF(&p2_sub);
 	ZVAL_UNDEF(&p3_sub);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(3, 3)
 		Z_PARAM_ZVAL(p1)
 		Z_PARAM_ZVAL(p2)
 		Z_PARAM_ZVAL(p3)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	zephir_fetch_params_without_memory_grow(3, 0, &p1, &p2, &p3);
@@ -359,12 +342,9 @@ PHP_METHOD(Stub_Vars, testCountOptimizerVarDumpAndExport)
 	ZVAL_UNDEF(&testVar_sub);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(testVar)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
@@ -392,13 +372,10 @@ PHP_METHOD(Stub_Vars, testArrayTypeVarDumpAndExport)
 	ZVAL_UNDEF(&testVar);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(testVar)
 	ZEND_PARSE_PARAMETERS_END();
-#endif
 
 
 	ZEPHIR_MM_GROW();
diff --git a/ext/stub/vars.zep.h b/ext/stub/vars.zep.h
index f8473e514e..48c3dc669f 100644
--- a/ext/stub/vars.zep.h
+++ b/ext/stub/vars.zep.h
@@ -58,11 +58,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_vars_testcountoptimizervardumpandexport, 0,
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_vars_testarraytypevardumpandexport, 0, 0, 0)
-#if PHP_VERSION_ID >= 80000
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, testVar, IS_ARRAY, 0, "[]")
-#else
-	ZEND_ARG_ARRAY_INFO(0, testVar, 0)
-#endif
+ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, testVar, IS_ARRAY, 0, "[]")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_vars_testintvardump, 0, 0, 0)
@@ -79,42 +75,18 @@ ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_vars_method_entry) {
 	PHP_ME(Stub_Vars, testParam, arginfo_stub_vars_testparam, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Vars, testVarDump, arginfo_stub_vars_testvardump, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Vars, testVarDump, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Vars, testVarDump, arginfo_stub_vars_testvardump, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Vars, testVarDump2, arginfo_stub_vars_testvardump2, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Vars, testVarExport, arginfo_stub_vars_testvarexport, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Vars, testVarExport, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Vars, testVarExport, arginfo_stub_vars_testvarexport, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Vars, test88Issue, arginfo_stub_vars_test88issue, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Vars, test88IssueParam2InitString, arginfo_stub_vars_test88issueparam2initstring, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Vars, testVarDump2param, arginfo_stub_vars_testvardump2param, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Vars, testVarDump3param, arginfo_stub_vars_testvardump3param, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Vars, testCountOptimizerVarDumpAndExport, arginfo_stub_vars_testcountoptimizervardumpandexport, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Vars, testArrayTypeVarDumpAndExport, arginfo_stub_vars_testarraytypevardumpandexport, ZEND_ACC_PUBLIC)
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Vars, testIntVarDump, arginfo_stub_vars_testintvardump, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Vars, testIntVarDump, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Vars, testDoubleVarDump, arginfo_stub_vars_testdoublevardump, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Vars, testDoubleVarDump, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Vars, testBoolVarDump, arginfo_stub_vars_testboolvardump, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Vars, testBoolVarDump, NULL, ZEND_ACC_PUBLIC)
-#endif
-#if PHP_VERSION_ID >= 80000
-	PHP_ME(Stub_Vars, testGetDefinedVars, arginfo_stub_vars_testgetdefinedvars, ZEND_ACC_PUBLIC)
-#else
-	PHP_ME(Stub_Vars, testGetDefinedVars, NULL, ZEND_ACC_PUBLIC)
-#endif
+PHP_ME(Stub_Vars, testIntVarDump, arginfo_stub_vars_testintvardump, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Vars, testDoubleVarDump, arginfo_stub_vars_testdoublevardump, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Vars, testBoolVarDump, arginfo_stub_vars_testboolvardump, ZEND_ACC_PUBLIC)
+PHP_ME(Stub_Vars, testGetDefinedVars, arginfo_stub_vars_testgetdefinedvars, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };

From 56187c7f107dc8bdfe62201e9ec40df3093e2958 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 21 Nov 2023 09:22:41 +0000
Subject: [PATCH 134/375] Remove deprecated `zend_uint` typedef

---
 kernel/main.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kernel/main.h b/kernel/main.h
index 72278a569f..0d75b965c4 100644
--- a/kernel/main.h
+++ b/kernel/main.h
@@ -36,11 +36,6 @@ extern zend_string* i_self;
 #define PH_COPY 1024
 #define PH_CTOR 4096
 
-/* Deprecated */
-#ifndef zend_uint
- #define zend_uint uint32_t
-#endif
-
 #ifndef ZEND_ACC_FINAL_CLASS
  #define ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
 #endif

From e5915ec517f62a023c7d9ec0cba2658b5c6ce1cf Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 21 Nov 2023 19:53:57 +0000
Subject: [PATCH 135/375] Remove `ZEPHIR_SEPARATE(z)` macro definiton

---
 kernel/memory.h           | 4 +---
 kernel/operators.h        | 6 +++---
 src/Variable/Variable.php | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 762be8a03c..8daf35e035 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -164,12 +164,10 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		} \
 	} while (0)
 
-#define ZEPHIR_SEPARATE(z) SEPARATE_ZVAL(z)
-
 #define ZEPHIR_SEPARATE_PARAM(z) \
 	do { \
 		zval *orig_ptr = z; \
-		ZEPHIR_SEPARATE(orig_ptr); \
+		SEPARATE_ZVAL(orig_ptr); \
 	} while (0)
 
 #endif
diff --git a/kernel/operators.h b/kernel/operators.h
index f481d7c3ea..44351f897a 100644
--- a/kernel/operators.h
+++ b/kernel/operators.h
@@ -159,7 +159,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define ZEPHIR_ADD_ASSIGN(z, v)  \
 	{  \
 		zval tmp;  \
-		ZEPHIR_SEPARATE(z);  \
+		SEPARATE_ZVAL(z);  \
 		add_function(&tmp, z, v);  \
 		if (Z_TYPE(tmp) == IS_LONG) {  \
 			Z_LVAL_P(z) = Z_LVAL(tmp);  \
@@ -173,7 +173,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define ZEPHIR_SUB_ASSIGN(z, v)  \
 	{  \
 		zval tmp;  \
-		ZEPHIR_SEPARATE(z);  \
+		SEPARATE_ZVAL(z);  \
 		sub_function(&tmp, z, v);  \
 		if (Z_TYPE(tmp) == IS_LONG) {  \
 			Z_LVAL_P(z) = Z_LVAL(tmp);  \
@@ -187,7 +187,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define ZEPHIR_MUL_ASSIGN(z, v)  \
 	{  \
 		zval tmp;  \
-		ZEPHIR_SEPARATE(z);  \
+		SEPARATE_ZVAL(z);  \
 		mul_function(&tmp, z, v);  \
 		if (Z_TYPE(tmp) == IS_LONG) {  \
 			Z_LVAL_P(z) = Z_LVAL(tmp);  \
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index bed4abdeb9..63b904bc16 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -710,7 +710,7 @@ public function getDefaultInitValue(): mixed
     public function separate(CompilationContext $compilationContext): void
     {
         if (!\in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
-            $compilationContext->codePrinter->output('ZEPHIR_SEPARATE('.$compilationContext->backend->getVariableCode($this).');');
+            $compilationContext->codePrinter->output('SEPARATE_ZVAL('.$compilationContext->backend->getVariableCode($this).');');
         }
     }
 

From 2d184ad8e4e2c4b49c4fe5c869b555e1e2d65236 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 21 Nov 2023 22:27:45 +0000
Subject: [PATCH 136/375] Remove `ZEPHIR_NUM_PREALLOCATED_FRAMES` macro
 definition

---
 kernel/memory.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 8daf35e035..dbab7d488e 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -21,8 +21,6 @@
 	#define ZEPHIR_ENABLE_64BITS 1
 #endif
 
-#define ZEPHIR_NUM_PREALLOCATED_FRAMES 25
-
 /** Memory frame */
 typedef struct _zephir_memory_entry {
 	size_t pointer;

From 0b5c991b3018ba34ea2192d95240c4b865dd2fde Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 21 Nov 2023 22:29:13 +0000
Subject: [PATCH 137/375] Remove `ZEPHIR_ENABLE_64BITS` condition

---
 kernel/memory.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index dbab7d488e..79961c037f 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -17,10 +17,6 @@
 #include "php_ext.h"
 #include "kernel/globals.h"
 
-#if defined(__x86_64__) || defined(__LP64__) || defined(_LP64) || defined(_WIN64)
-	#define ZEPHIR_ENABLE_64BITS 1
-#endif
-
 /** Memory frame */
 typedef struct _zephir_memory_entry {
 	size_t pointer;

From 7b35b99901e78b5cc400ad32945bad3a0b6374a5 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 21 Nov 2023 22:32:46 +0000
Subject: [PATCH 138/375] Remove `ZEPHIR_INIT_LNVAR(z)` macro definition

---
 kernel/memory.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 79961c037f..d93a2a2700 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -94,9 +94,6 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		ZVAL_NULL(z); \
 	} while (0)
 
-/* only removes the value body of the zval */
-#define ZEPHIR_INIT_LNVAR(z) ZEPHIR_INIT_NVAR(&z)
-
 #define ZEPHIR_CPY_WRT(d, v) \
 	Z_TRY_ADDREF_P(v); \
 	if (Z_TYPE_P(d) > IS_UNDEF) { \

From 979418a2d776d24ba9438b957970ac8155e687f0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 21 Nov 2023 22:36:30 +0000
Subject: [PATCH 139/375] Remove unused `zephir_cleanup_fcache()` function

---
 kernel/memory.c | 25 -------------------------
 kernel/memory.h |  1 -
 2 files changed, 26 deletions(-)

diff --git a/kernel/memory.c b/kernel/memory.c
index 4fb7271bb2..9e8214bc2b 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -292,31 +292,6 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value)
 	return SUCCESS;
 }
 
-/**
- * Cleans the function/method cache up
- */
-int zephir_cleanup_fcache(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
-{
-	zephir_fcall_cache_entry **entry = (zephir_fcall_cache_entry**) pDest;
-	zend_class_entry *scope;
-	size_t len = ZSTR_LEN(hash_key->key);
-
-	assert(hash_key->key != NULL);
-	assert(len > 2 * sizeof(zend_class_entry**));
-
-	memcpy(&scope, &ZSTR_VAL(hash_key->key)[(len -1) - 2 * sizeof(zend_class_entry**)], sizeof(zend_class_entry*));
-
-	if ((*entry)->type != ZEND_INTERNAL_FUNCTION || (scope && scope->type != ZEND_INTERNAL_CLASS)) {
-		return ZEND_HASH_APPLY_REMOVE;
-	}
-
-	if (scope && scope->type == ZEND_INTERNAL_CLASS && scope->info.internal.module->type != MODULE_PERSISTENT) {
-		return ZEND_HASH_APPLY_REMOVE;
-	}
-
-	return ZEND_HASH_APPLY_KEEP;
-}
-
 void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g)
 {
 	zephir_memory_entry *frame = g->active_memory;
diff --git a/kernel/memory.h b/kernel/memory.h
index d93a2a2700..31a19decdc 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -57,7 +57,6 @@ void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const
 	ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
-int zephir_cleanup_fcache(void *pDest, int num_args, va_list args, zend_hash_key *hash_key);
 void zephir_deinitialize_memory();
 
 #define zephir_ptr_dtor(x) zval_ptr_dtor(x)

From 0cfdd90409c693308951fa4dfc3524560786ff68 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 21 Nov 2023 22:46:25 +0000
Subject: [PATCH 140/375] Remove unused `zephir_set_symbol_str()` function

---
 kernel/memory.c | 18 ------------------
 kernel/memory.h |  1 -
 2 files changed, 19 deletions(-)

diff --git a/kernel/memory.c b/kernel/memory.c
index 9e8214bc2b..f0bf4326f3 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -274,24 +274,6 @@ int zephir_set_symbol(zval *key_name, zval *value)
 	return SUCCESS;
 }
 
-/**
- * Exports a string symbol to the active symbol table
- */
-int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value)
-{
-	zend_array *symbol_table = zend_rebuild_symbol_table();
-
-	if (!symbol_table) {
-		php_error_docref(NULL, E_WARNING, "Cannot find a valid symbol_table");
-		return FAILURE;
-	}
-
-	Z_TRY_ADDREF_P(value);
-	zend_hash_str_update(symbol_table, key_name, key_length, value);
-
-	return SUCCESS;
-}
-
 void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g)
 {
 	zephir_memory_entry *frame = g->active_memory;
diff --git a/kernel/memory.h b/kernel/memory.h
index 31a19decdc..529b9749bf 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -71,7 +71,6 @@ void zephir_create_symbol_table(zephir_method_globals *g);
 #define ZEPHIR_CREATE_SYMBOL_TABLE() zephir_create_symbol_table(ZEPHIR_METHOD_GLOBALS_PTR);
 
 int zephir_set_symbol(zval *key_name, zval *value);
-int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 
 #define ZEPHIR_INIT_VAR(z) \
 	zephir_memory_observe(z); \

From ec45cfe015994a41a5362e3e48484dccfe132242 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 25 Nov 2023 17:45:30 +0000
Subject: [PATCH 141/375] Use definition of `ZEPHIR_MM_GROW()` directly

---
 kernel/exception.c          | 3 ++-
 kernel/memory.h             | 4 ----
 src/Class/Method/Method.php | 5 ++++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/exception.c b/kernel/exception.c
index 2d81541f32..404162af8d 100644
--- a/kernel/exception.c
+++ b/kernel/exception.c
@@ -38,7 +38,8 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 
 	ZVAL_UNDEF(&curline);
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	if (Z_TYPE_P(object) != IS_OBJECT) {
 		ZVAL_COPY_VALUE(&object_copy, object);
diff --git a/kernel/memory.h b/kernel/memory.h
index 529b9749bf..44922d8cf1 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -47,10 +47,6 @@ typedef struct _zephir_method_globals {
 void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func);
 void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
 
-#define ZEPHIR_MM_GROW()  \
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); \
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 #define ZEPHIR_MM_RESTORE() \
 	zephir_memory_restore_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); \
 	pefree(ZEPHIR_METHOD_GLOBALS_PTR, 0); \
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 87c4aef02c..7ebdc21501 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1735,7 +1735,10 @@ public function compile(CompilationContext $compilationContext): void
                 $methodGlobals->setReadOnly(true);
                 $compilationContext->symbolTable->addRawVariable($methodGlobals);
             }
-            $codePrinter->preOutput("\t".'ZEPHIR_MM_GROW();');
+
+            // #define ZEPHIR_MM_GROW()
+            $codePrinter->preOutput("\t".'zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);');
+            $codePrinter->preOutput("\t".'ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);');
         }
 
         /**

From c930b364d108f296b12e93285bde2da9e36b724e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 25 Nov 2023 17:54:25 +0000
Subject: [PATCH 142/375] Replace `zephir_ptr_dtor(x)` with `zval_ptr_dtor(x)`

---
 kernel/main.h   |  2 +-
 kernel/memory.h | 10 ++++------
 kernel/object.c |  6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/kernel/main.h b/kernel/main.h
index 0d75b965c4..7d28f37757 100644
--- a/kernel/main.h
+++ b/kernel/main.h
@@ -284,7 +284,7 @@ int zephir_fetch_parameters(int num_args, int required_args, int optional_args,
 	    zval _null; \
 		ZVAL_NULL(&_null); \
 		ZVAL_COPY(return_value, &_null); \
-		zephir_ptr_dtor(&_null); \
+		zval_ptr_dtor(&_null); \
 	} else { \
 	    ZVAL_COPY(return_value, _constant_ptr); \
 	} \
diff --git a/kernel/memory.h b/kernel/memory.h
index 44922d8cf1..47e45199ea 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -55,8 +55,6 @@ void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
 
-#define zephir_ptr_dtor(x) zval_ptr_dtor(x)
-
 void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
 #define zephir_memory_observe(var) zephir_do_memory_observe(var, ZEPHIR_METHOD_GLOBALS_PTR);
 
@@ -92,7 +90,7 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	Z_TRY_ADDREF_P(v); \
 	if (Z_TYPE_P(d) > IS_UNDEF) { \
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
-			zephir_ptr_dtor(d); \
+			zval_ptr_dtor(d); \
 		} \
 	} else { \
 		zephir_memory_observe(d); \
@@ -102,7 +100,7 @@ int zephir_set_symbol(zval *key_name, zval *value);
 #define ZEPHIR_CPY_WRT_CTOR(d, v) \
 	if (d) { \
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
-			zephir_ptr_dtor(d); \
+			zval_ptr_dtor(d); \
 		} \
 	} \
 	ZVAL_DUP(d, v);
@@ -126,7 +124,7 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (Z_REFCOUNTED_P(z) && Z_REFCOUNT_P(z) > 1) { \
 			Z_DELREF_P(z); \
 		} else {\
-			zephir_ptr_dtor(z); \
+			zval_ptr_dtor(z); \
 			ZVAL_NULL(z); \
 		} \
 	} else { \
@@ -141,7 +139,7 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		zval *tmp_ = (ppzv); \
 		if (tmp_ != NULL) { \
 			if (Z_TYPE_P(tmp_) != IS_UNDEF) { \
-				zephir_ptr_dtor(tmp_); \
+				zval_ptr_dtor(tmp_); \
 			} else { \
 				zephir_memory_observe(tmp_); \
 			} \
diff --git a/kernel/object.c b/kernel/object.c
index 62b03d79c7..12f703ef27 100644
--- a/kernel/object.c
+++ b/kernel/object.c
@@ -740,7 +740,7 @@ int zephir_update_property_array(zval *object, const char *property, uint32_t pr
 
 	if (separated) {
 		zephir_update_property_zval(object, property, property_length, &tmp);
-		zephir_ptr_dtor(&tmp);
+		zval_ptr_dtor(&tmp);
 	}
 
 	return SUCCESS;
@@ -828,7 +828,7 @@ int zephir_update_property_array_append(zval *object, char *property, unsigned i
 
 	if (separated) {
 		zephir_update_property_zval(object, property, property_length, &tmp);
-		zephir_ptr_dtor(&tmp);
+		zval_ptr_dtor(&tmp);
 	}
 
 	return SUCCESS;
@@ -890,7 +890,7 @@ int zephir_update_property_array_multi(zval *object, const char *property, uint3
 
 		if (separated) {
 			zephir_update_property_zval(object, property, property_length, &tmp_arr);
-			zephir_ptr_dtor(&tmp_arr);
+			zval_ptr_dtor(&tmp_arr);
 		}
 	}
 

From 5f8126bb18c7b3822f3e3ee5f1526b493292814d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 25 Nov 2023 18:02:02 +0000
Subject: [PATCH 143/375] Merge `ZEPHIR_OBS_VAR_ONCE()` into
 `ZEPHIR_OBS_COPY_OR_DUP()`

---
 kernel/memory.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 47e45199ea..9cdf59e0ac 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -105,13 +105,10 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	} \
 	ZVAL_DUP(d, v);
 
-#define ZEPHIR_OBS_VAR_ONCE(z) \
+#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
 	if (Z_TYPE_P(z) == IS_UNDEF) { \
 		zephir_memory_observe(z); \
-	}
-
-#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
-	ZEPHIR_OBS_VAR_ONCE(z); \
+	} \
 	ZVAL_COPY(z, v);
 
 #define ZEPHIR_HASH_COPY(z, v) \

From 8d489af92ae95c6db6665ddb4473ae6ff40c03e6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 25 Nov 2023 18:05:30 +0000
Subject: [PATCH 144/375] Use `ZVAL_UNDEF()` directly instead of
 `ZEPHIR_INIT_ZVAL_NREF()`

---
 kernel/memory.h           | 2 --
 src/Variable/Variable.php | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 9cdf59e0ac..7da4ec47e2 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -70,8 +70,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	zephir_memory_observe(z); \
 	ZVAL_NULL(z);
 
-#define ZEPHIR_INIT_ZVAL_NREF(z) ZVAL_UNDEF(&z);
-
 #define ZEPHIR_INIT_NVAR(z) \
 	do { \
 		if (Z_TYPE_P(z) == IS_UNDEF) { \
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index 63b904bc16..a83f38361c 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -741,8 +741,7 @@ public function getSkipVariant(): int
      */
     public function initNonReferenced(CompilationContext $compilationContext): void
     {
-        $compilationContext->headersManager->add('kernel/memory');
-        $compilationContext->codePrinter->output('ZEPHIR_INIT_ZVAL_NREF('.$this->getName().');');
+        $compilationContext->codePrinter->output('ZVAL_UNDEF(&'.$this->getName().');');
     }
 
     /**

From 33b303a9d43b26468e3e17c542ef8ef300c749b0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 25 Nov 2023 18:12:39 +0000
Subject: [PATCH 145/375] Add types in arguments

---
 src/Backend/Backend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index 8f9c4ca5f6..fc9663eef0 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -100,7 +100,7 @@ public function declareVariables($method, $typeToVariables)
         return $varInitCode;
     }
 
-    public function initVar(Variable $variable, CompilationContext $context, $useCodePrinter = true, $second = false): string
+    public function initVar(Variable $variable, CompilationContext $context, bool $useCodePrinter = true, bool $second = false): string
     {
         $macro = !$second ? 'ZEPHIR_INIT_VAR' : 'ZEPHIR_INIT_NVAR';
         $code = $macro.'('.$this->getVariableCode($variable).');';

From 6a122431daf8117805fb92461171ae322b5f744d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 11:09:38 +0000
Subject: [PATCH 146/375] Remove "Should correctly specify ARGINFO" test

---
 tests/sharness/t0002-generate.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/sharness/t0002-generate.sh b/tests/sharness/t0002-generate.sh
index fff3dddc4f..8e049632ac 100755
--- a/tests/sharness/t0002-generate.sh
+++ b/tests/sharness/t0002-generate.sh
@@ -6,16 +6,6 @@ test_description="Test generate commands"
 # shellcheck disable=SC1091
 source ./setup.sh
 
-test_expect_success "Should correctly specify ARGINFO" "
-  cd $FIXTURESDIR/typehints &&
-  zephirc fullclean 2>&1 >/dev/null &&
-  zephirc generate 2>&1 >/dev/null &&
-  test_cmp ext/typehints.c expected3.c &&
-  test_cmp ext/typehints/args.zep.h expected_args3.h &&
-  test_cmp ext/typehints/retval.zep.h expected_retval3.h &&
-  test_cmp ext/typehints/both.zep.h expected_both3.h
-"
-
 test_expect_success "Life Cycle Test" "
   cd $FIXTURESDIR/lifecycle &&
   zephirc fullclean 2>&1 >/dev/null &&

From 55b3d839699b4fe1cbca4bdee36fdbcf9c7644fe Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 11:14:59 +0000
Subject: [PATCH 147/375] Remove "Should generate valid code with inheritance
 of prototype interfaces" test

---
 tests/sharness/t0002-generate.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/sharness/t0002-generate.sh b/tests/sharness/t0002-generate.sh
index 8e049632ac..16b0e5e283 100755
--- a/tests/sharness/t0002-generate.sh
+++ b/tests/sharness/t0002-generate.sh
@@ -13,12 +13,4 @@ test_expect_success "Life Cycle Test" "
   test_cmp ext/lifecycle.c expected3.c
 "
 
-# See: https://github.com/zephir-lang/zephir/issues/1758
-test_expect_success "Should generate valid code with inheritance of prototype interfaces" "
-  cd $FIXTURESDIR/protodir &&
-  zephirc fullclean 2>&1 >/dev/null &&
-  zephirc generate 2>&1 >/dev/null &&
-  test_cmp ext/protodir/connectionexception.zep.h connectionexception.h
-"
-
 test_done

From 99fd8138385aa91d8d0d9fccd4362e60be322e27 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 11:20:35 +0000
Subject: [PATCH 148/375] Lock 'shivammathur/setup-php' action

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 433e64637b..7d46027c05 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 1
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@a36e1e52ff4a1c9e9c9be31551ee4712a6cb6bd0
         env:
           PHP_CS_FIXER_VERSION: 3.37.0
         with:

From 81a492442254ae820b4b9ffda5e37df3e7942898 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 13:07:15 +0000
Subject: [PATCH 149/375] Add return type

---
 src/Branch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Branch.php b/src/Branch.php
index eaba669db2..2583a30687 100644
--- a/src/Branch.php
+++ b/src/Branch.php
@@ -117,7 +117,7 @@ public function getLevel(): int
     /**
      * @param $uniqueId
      */
-    public function setUniqueId($uniqueId)
+    public function setUniqueId($uniqueId): void
     {
         $this->uniqueId = $uniqueId;
     }

From 6c27ce3342c3170b83fbc3b98779cff470030d38 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 13:08:47 +0000
Subject: [PATCH 150/375] Add return type

---
 src/CompilerFile.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index 77e14612fc..e2fa41bfea 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -119,7 +119,7 @@ public function __construct(
     /**
      * @param string $filePath
      */
-    public function setFilePath(string $filePath)
+    public function setFilePath(string $filePath): void
     {
         $this->filePath = $filePath;
     }
@@ -127,7 +127,7 @@ public function setFilePath(string $filePath)
     /**
      * @param string $className
      */
-    public function setClassName(string $className)
+    public function setClassName(string $className): void
     {
         $this->className = $className;
     }
@@ -171,7 +171,7 @@ public function isExternal(): bool
      *
      * @throws CompilerException
      */
-    public function addFunction(Compiler $compiler, FunctionDefinition $func, array $statement = [])
+    public function addFunction(Compiler $compiler, FunctionDefinition $func, array $statement = []): void
     {
         $compiler->addFunction($func, $statement);
         $funcName = strtolower($func->getInternalName());
@@ -240,7 +240,7 @@ public function compileClass(CompilationContext $compilationContext): void
      *
      * @throws Exception
      */
-    public function compileFunction(CompilationContext $compilationContext, FunctionDefinition $functionDefinition)
+    public function compileFunction(CompilationContext $compilationContext, FunctionDefinition $functionDefinition): void
     {
         /** Make sure we do not produce calls like ZEPHIR_CALL_SELF */
         $bakClassDefinition = $compilationContext->classDefinition;
@@ -264,7 +264,7 @@ public function compileFunction(CompilationContext $compilationContext, Function
      * @param CompilationContext $compilationContext
      * @param array              $topStatement
      */
-    public function compileComment(CompilationContext $compilationContext, $topStatement)
+    public function compileComment(CompilationContext $compilationContext, $topStatement): void
     {
         $compilationContext->codePrinter->output('/'.$topStatement['value'].'/');
     }
@@ -276,7 +276,7 @@ public function compileComment(CompilationContext $compilationContext, $topState
      * @param array  $topStatement
      * @param array  $docblock
      */
-    public function preCompileInterface($namespace, $topStatement, $docblock)
+    public function preCompileInterface($namespace, $topStatement, $docblock): void
     {
         $classDefinition = new Definition($namespace, $topStatement['name']);
         $classDefinition->setIsExternal($this->external);
@@ -342,7 +342,7 @@ public function preCompileInterface($namespace, $topStatement, $docblock)
      * @param array              $topStatement
      * @param array              $docblock
      */
-    public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock)
+    public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock): void
     {
         $classDefinition = new Definition($namespace, $topStatement['name']);
         $classDefinition->setIsExternal($this->external);
@@ -452,7 +452,7 @@ public function preCompileClass(CompilationContext $compilationContext, $namespa
      * @throws IllegalStateException
      * @throws ParseException
      */
-    public function preCompile(Compiler $compiler)
+    public function preCompile(Compiler $compiler): void
     {
         $ir = $this->genIR($compiler);
 
@@ -649,7 +649,7 @@ public function getCompiledFile(): string
      *
      * @throws \ReflectionException
      */
-    public function checkDependencies(Compiler $compiler)
+    public function checkDependencies(Compiler $compiler): void
     {
         $classDefinition = $this->classDefinition;
 
@@ -740,7 +740,7 @@ public function checkDependencies(Compiler $compiler)
      *
      * @throws CompilerException
      */
-    public function compile(Compiler $compiler, StringsManager $stringsManager)
+    public function compile(Compiler $compiler, StringsManager $stringsManager): void
     {
         if (!$this->ir) {
             throw new CompilerException('Unable to locate the intermediate representation of the compiled file');
@@ -887,7 +887,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
         $this->ir = null;
     }
 
-    public function applyClassHeaders(CompilationContext $compilationContext)
+    public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
@@ -972,9 +972,7 @@ protected function processShortcuts(array $property, Definition $classDefinition
                 $docBlockParsed = $docBlockParser->parse();
 
                 if ($annotations = $docBlockParsed->getAnnotationsByType('var')) {
-                    $returnsType = array_map(function ($type) {
-                        return 'mixed' == ($type = trim($type)) ? 'variable' : $type;
-                    }, explode('|', $annotations[0]->getString()));
+                    $returnsType = array_map(fn ($type) => 'mixed' == ($type = trim($type)) ? 'variable' : $type, explode('|', $annotations[0]->getString()));
                 }
 
                 // Clear annotations

From d8e14ca8b8f2dc5bb3cfaa008e78e397e1075416 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 13:10:11 +0000
Subject: [PATCH 151/375] Add return type

---
 src/CompilerFileAnonymous.php | 6 +++---
 src/Config.php                | 6 +++---
 src/Documentation.php         | 6 ++++--
 src/FunctionCall.php          | 4 ++--
 src/HeadersManager.php        | 2 +-
 src/StaticCall.php            | 2 +-
 src/SymbolTable.php           | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index 957b48efaf..cb18d165f1 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -84,7 +84,7 @@ public function isExternal(): bool
      * @throws Exception
      * @throws \ReflectionException
      */
-    private function compileClass(CompilationContext $compilationContext)
+    private function compileClass(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
@@ -137,7 +137,7 @@ private function compileClass(CompilationContext $compilationContext)
      *
      * @throws Exception
      */
-    public function compile(Compiler $compiler, StringsManager $stringsManager)
+    public function compile(Compiler $compiler, StringsManager $stringsManager): void
     {
         /**
          * Compilation context stores common objects required by compilation entities.
@@ -237,7 +237,7 @@ public function getCompiledFile()
      *
      * @param Compiler $compiler
      */
-    public function preCompile(Compiler $compiler)
+    public function preCompile(Compiler $compiler): void
     {
         // nothing to do
     }
diff --git a/src/Config.php b/src/Config.php
index fa2f2b6dde..b2e79f74a5 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -243,7 +243,7 @@ public function offsetGet($offset)
      * @param mixed $value
      */
     #[\ReturnTypeWillChange]
-    public function offsetSet($key, $value)
+    public function offsetSet($key, $value): void
     {
         if (!\is_array($key)) {
             $this->container[$key] = $value;
@@ -269,7 +269,7 @@ public function offsetSet($key, $value)
      * @param mixed $key
      */
     #[\ReturnTypeWillChange]
-    public function offsetUnset($key)
+    public function offsetUnset($key): void
     {
         unset($this->container[$key]);
     }
@@ -294,7 +294,7 @@ public function get($key, $namespace = null)
      * @param mixed $value
      * @param mixed $namespace
      */
-    public function set($key, $value, $namespace = null)
+    public function set($key, $value, $namespace = null): void
     {
         null !== $namespace ? $this->offsetSet([$namespace => $key], $value) : $this->offsetSet($key, $value);
     }
diff --git a/src/Documentation.php b/src/Documentation.php
index ed00e2e120..cb76e8c55f 100644
--- a/src/Documentation.php
+++ b/src/Documentation.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
@@ -78,7 +80,7 @@ public function __construct(array $classes, Config $config, $templatesPath, arra
      * @throws ConfigException
      * @throws Exception
      */
-    protected function initialize()
+    protected function initialize(): void
     {
         $themeConfig = $this->config->get('theme', 'api');
 
@@ -148,7 +150,7 @@ public function findThemePathByName($name)
     /**
      * @throws Exception
      */
-    public function build()
+    public function build(): void
     {
         foreach ($this->classes as $class) {
             // class files (class/ns1/n2/class.html)
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index bfa2e4d5e6..16aa0677bd 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -165,7 +165,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
      *
      * @param string $directory
      */
-    public static function addOptimizerDir($directory)
+    public static function addOptimizerDir($directory): void
     {
         self::$optimizerDirectories[] = $directory;
     }
@@ -258,7 +258,7 @@ protected function markReferences(
         CompilationContext $compilationContext,
         &$references,
         $expression
-    ) {
+    ): void {
         if ($this->isBuiltInFunction($funcName)) {
             return;
         }
diff --git a/src/HeadersManager.php b/src/HeadersManager.php
index d83645ffbe..08f3da8124 100644
--- a/src/HeadersManager.php
+++ b/src/HeadersManager.php
@@ -55,7 +55,7 @@ class HeadersManager
      *
      * @throws \InvalidArgumentException
      */
-    public function add($path, $position = 0)
+    public function add($path, $position = 0): void
     {
         if (!\is_string($path)) {
             throw new \InvalidArgumentException('$path must be only string type');
diff --git a/src/StaticCall.php b/src/StaticCall.php
index 1d9a44da86..5e111a7e63 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -352,7 +352,7 @@ protected function call(
      *
      * @throws Exception
      */
-    protected function callParent(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method)
+    protected function callParent(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method): void
     {
         $codePrinter = $compilationContext->codePrinter;
         $classCe = $classDefinition->getClassEntry($compilationContext);
diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index 553a53a0af..352064a44d 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -823,7 +823,7 @@ public function getTempVariableForObserveOrNullify($type, CompilationContext $co
      *
      * @param CompilationContext $compilationContext
      */
-    public function markTemporalVariablesIdle(CompilationContext $compilationContext)
+    public function markTemporalVariablesIdle(CompilationContext $compilationContext): void
     {
         $compilationContext = $compilationContext ?: $this->compilationContext;
         $branchId = $compilationContext->branchManager->getCurrentBranchId();

From 6065f03650d4634def8640ac5a9dbd8f8c76f40f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 13:20:31 +0000
Subject: [PATCH 152/375] Enable 'strict_types'

---
 src/Backend/FcallManagerInterface.php         |  2 +
 src/Backend/StringsManager.php                | 48 +++++++++----------
 src/Cache/StaticMethodCache.php               |  2 +
 src/Compiler/FileInterface.php                |  2 +
 src/Documentation/Annotation/Link.php         |  2 +
 src/Exception.php                             |  2 +
 src/Exception/CompilerException.php           |  2 +
 src/Exception/ExceptionExtraAwareTrait.php    |  2 +
 src/Exception/ExceptionInterface.php          |  2 +
 src/Exception/FileSystemException.php         |  2 +
 src/Exception/IllegalOperationException.php   |  2 +
 src/Exception/IllegalStateException.php       |  2 +
 src/Exception/InvalidArgumentException.php    |  2 +
 src/Exception/LogicException.php              |  2 +
 src/Exception/NotImplementedException.php     |  2 +
 src/Exception/ParseException.php              |  2 +
 src/Exception/RuntimeException.php            |  2 +
 src/Expression/Builder/AbstractBuilder.php    |  2 +
 src/Expression/Builder/BuilderFactory.php     |  2 +
 .../Builder/Operators/AbstractOperator.php    |  2 +
 .../Operators/AssignPropertyOperator.php      |  2 +
 .../Operators/AssignVariableOperator.php      |  2 +
 .../Builder/Operators/BinaryOperator.php      |  2 +
 .../Builder/Operators/RawOperator.php         |  2 +
 .../Builder/Operators/UnaryOperator.php       |  2 +
 src/Expression/Builder/RawExpression.php      |  2 +
 .../Builder/Statements/AbstractStatement.php  |  2 +
 .../Statements/CallFunctionStatement.php      |  2 +
 .../Statements/CallMethodStatement.php        |  2 +
 .../Statements/CallStaticStatement.php        |  2 +
 .../Builder/Statements/IfStatement.php        |  2 +
 .../Builder/Statements/LetStatement.php       |  2 +
 .../Builder/Statements/RawStatement.php       |  2 +
 .../Builder/Statements/StatementsBlock.php    |  2 +
 src/Expression/Constants.php                  |  2 +
 src/Expression/PropertyAccess.php             |  2 +
 src/Expression/PropertyDynamicAccess.php      |  2 +
 src/FunctionCall.php                          |  2 +
 src/HeadersManager.php                        |  2 +
 src/LiteralCompiledExpression.php             |  2 +
 src/MethodCall.php                            |  2 +
 src/Operators/Arithmetical/AddOperator.php    |  2 +
 .../Arithmetical/ArithmeticalBaseOperator.php |  2 +
 src/Operators/Arithmetical/DivOperator.php    |  2 +
 src/Operators/Arithmetical/ModOperator.php    |  2 +
 src/Operators/Arithmetical/MulOperator.php    |  2 +
 src/Operators/Arithmetical/SubOperator.php    |  2 +
 src/Operators/Bitwise/BitwiseAndOperator.php  |  2 +
 src/Operators/Bitwise/BitwiseOrOperator.php   |  2 +
 src/Operators/Bitwise/BitwiseXorOperator.php  |  2 +
 src/Operators/Bitwise/ShiftLeftOperator.php   |  2 +
 src/Operators/Bitwise/ShiftRightOperator.php  |  2 +
 src/Operators/Comparison/EqualsOperator.php   |  2 +
 .../Comparison/GreaterEqualOperator.php       |  2 +
 src/Operators/Comparison/GreaterOperator.php  |  2 +
 .../Comparison/IdenticalOperator.php          |  2 +
 .../Comparison/LessEqualOperator.php          |  2 +
 src/Operators/Comparison/LessOperator.php     |  2 +
 .../Comparison/NotEqualsOperator.php          |  2 +
 .../Comparison/NotIdenticalOperator.php       |  2 +
 src/Optimizers/FunctionCall/ACosOptimizer.php |  2 +
 src/Optimizers/FunctionCall/ASinOptimizer.php |  2 +
 .../FunctionCall/AddslashesOptimizer.php      |  2 +
 .../FunctionCall/ArrayKeyExistsOptimizer.php  |  2 +
 .../FunctionCall/ArrayKeysOptimizer.php       |  2 +
 .../FunctionCall/ArrayMergeOptimizer.php      |  2 +
 .../FunctionCall/BasenameOptimizer.php        |  2 +
 .../CallUserFuncArrayOptimizer.php            |  2 +
 .../FunctionCall/CallUserFuncOptimizer.php    |  2 +
 .../FunctionCall/CamelizeOptimizer.php        |  2 +
 src/Optimizers/FunctionCall/CeilOptimizer.php |  2 +
 .../FunctionCall/ClassExistsOptimizer.php     |  2 +
 .../FunctionCall/CompareMtimeOptimizer.php    |  2 +
 src/Optimizers/FunctionCall/CosOptimizer.php  |  2 +
 .../FunctionCall/CountOptimizer.php           |  2 +
 .../FunctionCall/Crc32Optimizer.php           |  2 +
 .../FunctionCall/CreateArrayOptimizer.php     |  2 +
 .../FunctionCall/CreateInstanceOptimizer.php  |  2 +
 .../CreateInstanceParamsOptimizer.php         |  2 +
 .../CreateSymbolTableOptimizer.php            |  2 +
 src/Optimizers/FunctionCall/DieOptimizer.php  |  2 +
 .../FunctionCall/DoublevalOptimizer.php       |  2 +
 .../FunctionCall/EndsWithOptimizer.php        |  2 +
 src/Optimizers/FunctionCall/EvalOptimizer.php |  2 +
 src/Optimizers/FunctionCall/ExitOptimizer.php |  6 ++-
 .../FunctionCall/ExplodeOptimizer.php         |  2 +
 .../FunctionCall/FcloseOptimizer.php          |  2 +
 src/Optimizers/FunctionCall/FeofOptimizer.php |  2 +
 .../FunctionCall/FileExistsOptimizer.php      |  2 +
 .../FunctionCall/FileGetContentsOptimizer.php |  2 +
 .../FunctionCall/FilePutContentsOptimizer.php |  2 +
 .../FunctionCall/FilemtimeOptimizer.php       |  2 +
 .../FunctionCall/FloorOptimizer.php           |  2 +
 .../FunctionCall/FuncGetArgOptimizer.php      |  2 +
 .../FunctionCall/FuncGetArgsOptimizer.php     |  2 +
 .../FunctionCall/FuncNumArgsOptimizer.php     |  2 +
 .../FunctionCall/FwriteOptimizer.php          |  2 +
 .../FunctionCall/GetCalledClassOptimizer.php  |  2 +
 .../FunctionCall/GetClassLowerOptimizer.php   |  2 +
 .../FunctionCall/GetClassNsOptimizer.php      |  2 +
 .../FunctionCall/GetClassOptimizer.php        |  2 +
 .../FunctionCall/GetDefinedVarsOptimizer.php  |  2 +
 .../FunctionCall/GetNsClassOptimizer.php      |  2 +
 .../FunctionCall/GettypeOptimizer.php         |  2 +
 .../FunctionCall/HashEqualsOptimizer.php      |  2 +
 .../FunctionCall/ImplodeOptimizer.php         |  2 +
 .../FunctionCall/InArrayOptimizer.php         |  2 +
 .../FunctionCall/InterfaceExistsOptimizer.php |  2 +
 .../FunctionCall/IntvalOptimizer.php          |  2 +
 .../FunctionCall/IsArrayOptimizer.php         |  2 +
 .../FunctionCall/IsBoolOptimizer.php          |  2 +
 .../FunctionCall/IsCallableOptimizer.php      |  2 +
 .../FunctionCall/IsIntOptimizer.php           |  2 +
 .../FunctionCall/IsNullOptimizer.php          |  2 +
 .../FunctionCall/IsNumericOptimizer.php       |  2 +
 .../FunctionCall/IsObjectOptimizer.php        |  2 +
 .../FunctionCall/IsPhpVersionOptimizer.php    |  2 +
 .../IsPrivatePropertyOptimizer.php            |  2 +
 .../FunctionCall/IsResourceOptimizer.php      |  2 +
 .../FunctionCall/IsScalarOptimizer.php        |  2 +
 .../FunctionCall/IsStringOptimizer.php        |  2 +
 src/Optimizers/FunctionCall/JoinOptimizer.php |  2 +
 .../FunctionCall/JsonDecodeOptimizer.php      |  2 +
 .../FunctionCall/JsonEncodeOptimizer.php      |  2 +
 .../FunctionCall/LdexpOptimizer.php           |  2 +
 .../FunctionCall/LtrimOptimizer.php           |  2 +
 src/Optimizers/FunctionCall/Md5Optimizer.php  |  2 +
 .../FunctionCall/MemstrOptimizer.php          |  2 +
 .../FunctionCall/MergeAppendOptimizer.php     |  2 +
 .../FunctionCall/MethodExistsOptimizer.php    |  2 +
 .../FunctionCall/MicrotimeOptimizer.php       |  2 +
 src/Optimizers/FunctionCall/PowOptimizer.php  |  2 +
 .../FunctionCall/PregMatchAllOptimizer.php    |  4 +-
 .../FunctionCall/PregMatchOptimizer.php       |  2 +
 .../PrepareVirtualPathOptimizer.php           |  2 +
 .../FunctionCall/RoundOptimizer.php           |  2 +
 .../FunctionCall/RtrimOptimizer.php           |  2 +
 src/Optimizers/FunctionCall/SinOptimizer.php  |  2 +
 src/Optimizers/FunctionCall/SqrtOptimizer.php |  2 +
 .../FunctionCall/StartsWithOptimizer.php      |  2 +
 .../FunctionCall/StrReplaceOptimizer.php      |  2 +
 .../FunctionCall/StripcslashesOptimizer.php   |  2 +
 .../FunctionCall/StripslashesOptimizer.php    |  2 +
 .../FunctionCall/StrlenOptimizer.php          |  2 +
 .../FunctionCall/StrposOptimizer.php          |  2 +
 .../FunctionCall/StrtokOptimizer.php          |  2 +
 .../FunctionCall/StrtolowerOptimizer.php      |  2 +
 .../FunctionCall/StrtoupperOptimizer.php      |  2 +
 .../FunctionCall/SubstrOptimizer.php          |  2 +
 src/Optimizers/FunctionCall/TanOptimizer.php  |  2 +
 src/Optimizers/FunctionCall/TimeOptimizer.php |  2 +
 src/Optimizers/FunctionCall/TrimOptimizer.php |  2 +
 .../FunctionCall/UcfirstOptimizer.php         |  2 +
 .../FunctionCall/UncamelizeOptimizer.php      |  2 +
 .../FunctionCall/UniqueKeyOptimizer.php       |  2 +
 .../FunctionCall/UniquePathKeyOptimizer.php   |  2 +
 .../FunctionCall/VarDumpOptimizer.php         |  2 +
 .../FunctionCall/VarExportOptimizer.php       |  2 +
 .../ZephirStringToHexOptimizer.php            |  2 +
 src/Parser/Manager.php                        |  2 +
 src/Passes/LoopBreakPass.php                  |  2 +
 src/Passes/MutateGathererPass.php             |  2 +
 src/Passes/StaticTypeInference.php            |  2 +
 src/Statements/BreakStatement.php             |  2 +
 src/Statements/ContinueStatement.php          |  2 +
 src/Statements/DeclareStatement.php           |  2 +
 src/Statements/DoWhileStatement.php           |  2 +
 src/Statements/EchoStatement.php              |  2 +
 src/Statements/ForStatement.php               |  2 +
 src/Statements/IfStatement.php                |  2 +
 src/Statements/Let/ArrayIndex.php             |  2 +
 src/Statements/Let/ArrayIndexAppend.php       |  2 +
 src/Statements/Let/Decr.php                   |  2 +
 src/Statements/Let/ExportSymbol.php           |  2 +
 src/Statements/Let/ExportSymbolString.php     |  2 +
 src/Statements/Let/Incr.php                   |  2 +
 src/Statements/Let/ObjectPropertyAppend.php   |  2 +
 .../Let/ObjectPropertyArrayIndex.php          |  2 +
 .../Let/ObjectPropertyArrayIndexAppend.php    |  2 +
 src/Statements/Let/ObjectPropertyDecr.php     |  2 +
 src/Statements/Let/ObjectPropertyIncr.php     |  2 +
 src/Statements/Let/StaticPropertyAdd.php      |  2 +
 src/Statements/Let/StaticPropertyAppend.php   |  2 +
 .../Let/StaticPropertyArrayIndex.php          |  2 +
 .../Let/StaticPropertyArrayIndexAppend.php    |  2 +
 src/Statements/Let/StaticPropertySub.php      |  2 +
 src/Statements/Let/Variable.php               |  2 +
 src/Statements/Let/VariableAppend.php         |  2 +
 src/Statements/LetStatement.php               |  2 +
 src/Statements/LoopStatement.php              |  2 +
 src/Statements/RequireStatement.php           |  2 +
 src/Statements/ReturnStatement.php            |  2 +
 src/Statements/StatementAbstract.php          |  2 +
 src/Statements/SwitchStatement.php            |  2 +
 src/Statements/TryCatchStatement.php          |  2 +
 src/Statements/WhileStatement.php             |  2 +
 src/StatementsBlock.php                       |  2 +
 src/StaticCall.php                            |  2 +
 src/TypeAwareInterface.php                    |  2 +
 src/Types/ArrayType.php                       |  2 +
 200 files changed, 425 insertions(+), 27 deletions(-)

diff --git a/src/Backend/FcallManagerInterface.php b/src/Backend/FcallManagerInterface.php
index 8c136055b3..6c6b478470 100644
--- a/src/Backend/FcallManagerInterface.php
+++ b/src/Backend/FcallManagerInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Backend/StringsManager.php b/src/Backend/StringsManager.php
index e2713cb6a3..189ca84d0e 100644
--- a/src/Backend/StringsManager.php
+++ b/src/Backend/StringsManager.php
@@ -159,30 +159,30 @@ public function genConcatCode(): void
         }
 
         $code .= <<<EOF
-void zephir_concat_function(zval *result, zval *op1, zval *op2)
-{
-	zval tmp;
-	SEPARATE_ZVAL_NOREF(result);
-
-	/*
-		res == op1 == op2: won't leak
-		res == op1 != op2: won't leak
-		res == op2 != op1: will leak
-	 */
-	if (result == op2 && result != op1) {
-		ZVAL_COPY_VALUE(&tmp, result);
-		ZVAL_NULL(result);
-		op2 = &tmp;
-	}
-	else {
-		ZVAL_UNDEF(&tmp);
-	}
-
-	concat_function(result, op1, op2);
-	assert(!Z_REFCOUNTED(tmp) || 1 == Z_REFCOUNT(tmp));
-	zval_dtor(&tmp);
-}
-EOF;
+            void zephir_concat_function(zval *result, zval *op1, zval *op2)
+            {
+            	zval tmp;
+            	SEPARATE_ZVAL_NOREF(result);
+
+            	/*
+            		res == op1 == op2: won't leak
+            		res == op1 != op2: won't leak
+            		res == op2 != op1: will leak
+            	 */
+            	if (result == op2 && result != op1) {
+            		ZVAL_COPY_VALUE(&tmp, result);
+            		ZVAL_NULL(result);
+            		op2 = &tmp;
+            	}
+            	else {
+            		ZVAL_UNDEF(&tmp);
+            	}
+
+            	concat_function(result, op1, op2);
+            	assert(!Z_REFCOUNTED(tmp) || 1 == Z_REFCOUNT(tmp));
+            	zval_dtor(&tmp);
+            }
+            EOF;
 
         $codeh .= 'void zephir_concat_function(zval *result, zval *op1, zval *op2);
 #endif /* ZEPHIR_KERNEL_CONCAT_H */
diff --git a/src/Cache/StaticMethodCache.php b/src/Cache/StaticMethodCache.php
index d22f1c07f5..18b08aacdf 100644
--- a/src/Cache/StaticMethodCache.php
+++ b/src/Cache/StaticMethodCache.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Compiler/FileInterface.php b/src/Compiler/FileInterface.php
index 8d25ea5595..0b7f2c0d05 100644
--- a/src/Compiler/FileInterface.php
+++ b/src/Compiler/FileInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Documentation/Annotation/Link.php b/src/Documentation/Annotation/Link.php
index 8c40a747f5..7caeb674e3 100644
--- a/src/Documentation/Annotation/Link.php
+++ b/src/Documentation/Annotation/Link.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception.php b/src/Exception.php
index 7b4b45d5e1..826eee47cd 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 8426045ea6..b00ba82822 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/ExceptionExtraAwareTrait.php b/src/Exception/ExceptionExtraAwareTrait.php
index 6b5f3f148f..525bafd2d4 100644
--- a/src/Exception/ExceptionExtraAwareTrait.php
+++ b/src/Exception/ExceptionExtraAwareTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index 17f94bf9a8..e32573059a 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/FileSystemException.php b/src/Exception/FileSystemException.php
index 5b871e2198..e8a783a006 100644
--- a/src/Exception/FileSystemException.php
+++ b/src/Exception/FileSystemException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/IllegalOperationException.php b/src/Exception/IllegalOperationException.php
index 4e96e1861a..e84161747e 100644
--- a/src/Exception/IllegalOperationException.php
+++ b/src/Exception/IllegalOperationException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/IllegalStateException.php b/src/Exception/IllegalStateException.php
index 62de88d15d..e65aad898d 100644
--- a/src/Exception/IllegalStateException.php
+++ b/src/Exception/IllegalStateException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 68002b5bf9..34c8e1f475 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
index 0bc8fa7d21..f787a8c0b6 100644
--- a/src/Exception/LogicException.php
+++ b/src/Exception/LogicException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/NotImplementedException.php b/src/Exception/NotImplementedException.php
index 44d3ed252f..baedd64015 100644
--- a/src/Exception/NotImplementedException.php
+++ b/src/Exception/NotImplementedException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/ParseException.php b/src/Exception/ParseException.php
index 320e0338e5..f8f503009c 100644
--- a/src/Exception/ParseException.php
+++ b/src/Exception/ParseException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index c98d827b67..b18c79244e 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/AbstractBuilder.php b/src/Expression/Builder/AbstractBuilder.php
index 669d8278a0..9bfd599a25 100644
--- a/src/Expression/Builder/AbstractBuilder.php
+++ b/src/Expression/Builder/AbstractBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/BuilderFactory.php b/src/Expression/Builder/BuilderFactory.php
index e3e08f9b99..66b9e9817c 100644
--- a/src/Expression/Builder/BuilderFactory.php
+++ b/src/Expression/Builder/BuilderFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Operators/AbstractOperator.php b/src/Expression/Builder/Operators/AbstractOperator.php
index 8b67ee940a..124497d1d3 100644
--- a/src/Expression/Builder/Operators/AbstractOperator.php
+++ b/src/Expression/Builder/Operators/AbstractOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Operators/AssignPropertyOperator.php b/src/Expression/Builder/Operators/AssignPropertyOperator.php
index 4ac26dafce..5590d3be6b 100644
--- a/src/Expression/Builder/Operators/AssignPropertyOperator.php
+++ b/src/Expression/Builder/Operators/AssignPropertyOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Operators/AssignVariableOperator.php b/src/Expression/Builder/Operators/AssignVariableOperator.php
index e284c3d8be..9b91c3f0a5 100644
--- a/src/Expression/Builder/Operators/AssignVariableOperator.php
+++ b/src/Expression/Builder/Operators/AssignVariableOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Operators/BinaryOperator.php b/src/Expression/Builder/Operators/BinaryOperator.php
index 052de4e484..dc7e039d39 100644
--- a/src/Expression/Builder/Operators/BinaryOperator.php
+++ b/src/Expression/Builder/Operators/BinaryOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Operators/RawOperator.php b/src/Expression/Builder/Operators/RawOperator.php
index 8201e97a3c..9f87858942 100644
--- a/src/Expression/Builder/Operators/RawOperator.php
+++ b/src/Expression/Builder/Operators/RawOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Operators/UnaryOperator.php b/src/Expression/Builder/Operators/UnaryOperator.php
index 4cf870eb6a..f575c55a59 100644
--- a/src/Expression/Builder/Operators/UnaryOperator.php
+++ b/src/Expression/Builder/Operators/UnaryOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/RawExpression.php b/src/Expression/Builder/RawExpression.php
index a5e1c44502..3993402bbf 100644
--- a/src/Expression/Builder/RawExpression.php
+++ b/src/Expression/Builder/RawExpression.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/AbstractStatement.php b/src/Expression/Builder/Statements/AbstractStatement.php
index 1cc60c21d5..c6776c0d9a 100644
--- a/src/Expression/Builder/Statements/AbstractStatement.php
+++ b/src/Expression/Builder/Statements/AbstractStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/CallFunctionStatement.php b/src/Expression/Builder/Statements/CallFunctionStatement.php
index b0f460cf98..d853a58752 100644
--- a/src/Expression/Builder/Statements/CallFunctionStatement.php
+++ b/src/Expression/Builder/Statements/CallFunctionStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/CallMethodStatement.php b/src/Expression/Builder/Statements/CallMethodStatement.php
index cc3920262b..20510e5ce0 100644
--- a/src/Expression/Builder/Statements/CallMethodStatement.php
+++ b/src/Expression/Builder/Statements/CallMethodStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/CallStaticStatement.php b/src/Expression/Builder/Statements/CallStaticStatement.php
index 4133020430..7309c3b2d3 100644
--- a/src/Expression/Builder/Statements/CallStaticStatement.php
+++ b/src/Expression/Builder/Statements/CallStaticStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/IfStatement.php b/src/Expression/Builder/Statements/IfStatement.php
index 1bb7eafff7..ea3bf01e77 100644
--- a/src/Expression/Builder/Statements/IfStatement.php
+++ b/src/Expression/Builder/Statements/IfStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/LetStatement.php b/src/Expression/Builder/Statements/LetStatement.php
index 2201513a0c..e5c9c4c22a 100644
--- a/src/Expression/Builder/Statements/LetStatement.php
+++ b/src/Expression/Builder/Statements/LetStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/RawStatement.php b/src/Expression/Builder/Statements/RawStatement.php
index a38ece28fb..fecb6883ed 100644
--- a/src/Expression/Builder/Statements/RawStatement.php
+++ b/src/Expression/Builder/Statements/RawStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Builder/Statements/StatementsBlock.php b/src/Expression/Builder/Statements/StatementsBlock.php
index 2a30ea4480..94c560d0e8 100644
--- a/src/Expression/Builder/Statements/StatementsBlock.php
+++ b/src/Expression/Builder/Statements/StatementsBlock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/Constants.php b/src/Expression/Constants.php
index d2cbd1163d..3f8048e5a6 100644
--- a/src/Expression/Constants.php
+++ b/src/Expression/Constants.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/PropertyAccess.php b/src/Expression/PropertyAccess.php
index e294e1f1ab..f2bf44dc54 100644
--- a/src/Expression/PropertyAccess.php
+++ b/src/Expression/PropertyAccess.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index d7b0dd305d..b2dff4dc87 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 16aa0677bd..3791dda5e6 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/HeadersManager.php b/src/HeadersManager.php
index 08f3da8124..607f88b9b9 100644
--- a/src/HeadersManager.php
+++ b/src/HeadersManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/LiteralCompiledExpression.php b/src/LiteralCompiledExpression.php
index 8c6ea22cab..f4b9b9dad1 100644
--- a/src/LiteralCompiledExpression.php
+++ b/src/LiteralCompiledExpression.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/MethodCall.php b/src/MethodCall.php
index a6aac43fff..4d9b36a154 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Arithmetical/AddOperator.php b/src/Operators/Arithmetical/AddOperator.php
index 5fadff453d..3e75f95e52 100644
--- a/src/Operators/Arithmetical/AddOperator.php
+++ b/src/Operators/Arithmetical/AddOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index d0e9f97cb9..eddf1dc13a 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 5e66647eb0..90ace66432 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index d6aaddc7af..47cb83ca57 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Arithmetical/MulOperator.php b/src/Operators/Arithmetical/MulOperator.php
index 7e96db1a69..bce444acfb 100644
--- a/src/Operators/Arithmetical/MulOperator.php
+++ b/src/Operators/Arithmetical/MulOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Arithmetical/SubOperator.php b/src/Operators/Arithmetical/SubOperator.php
index 413f5a2990..0fe4ddcbff 100644
--- a/src/Operators/Arithmetical/SubOperator.php
+++ b/src/Operators/Arithmetical/SubOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Bitwise/BitwiseAndOperator.php b/src/Operators/Bitwise/BitwiseAndOperator.php
index c9f5657022..a682f51a14 100644
--- a/src/Operators/Bitwise/BitwiseAndOperator.php
+++ b/src/Operators/Bitwise/BitwiseAndOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Bitwise/BitwiseOrOperator.php b/src/Operators/Bitwise/BitwiseOrOperator.php
index 0ec3b75961..f7d60420eb 100644
--- a/src/Operators/Bitwise/BitwiseOrOperator.php
+++ b/src/Operators/Bitwise/BitwiseOrOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Bitwise/BitwiseXorOperator.php b/src/Operators/Bitwise/BitwiseXorOperator.php
index 48b7b7f661..d440bf45ab 100644
--- a/src/Operators/Bitwise/BitwiseXorOperator.php
+++ b/src/Operators/Bitwise/BitwiseXorOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Bitwise/ShiftLeftOperator.php b/src/Operators/Bitwise/ShiftLeftOperator.php
index 3d8a93fd28..e2eeb7920c 100644
--- a/src/Operators/Bitwise/ShiftLeftOperator.php
+++ b/src/Operators/Bitwise/ShiftLeftOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Bitwise/ShiftRightOperator.php b/src/Operators/Bitwise/ShiftRightOperator.php
index a8f8d9d464..688d1cd622 100644
--- a/src/Operators/Bitwise/ShiftRightOperator.php
+++ b/src/Operators/Bitwise/ShiftRightOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/EqualsOperator.php b/src/Operators/Comparison/EqualsOperator.php
index 0f9cf22d98..f61aefc135 100644
--- a/src/Operators/Comparison/EqualsOperator.php
+++ b/src/Operators/Comparison/EqualsOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/GreaterEqualOperator.php b/src/Operators/Comparison/GreaterEqualOperator.php
index c852bb2a1f..00d2bed1e8 100644
--- a/src/Operators/Comparison/GreaterEqualOperator.php
+++ b/src/Operators/Comparison/GreaterEqualOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/GreaterOperator.php b/src/Operators/Comparison/GreaterOperator.php
index fe4be1eb7e..74399fda81 100644
--- a/src/Operators/Comparison/GreaterOperator.php
+++ b/src/Operators/Comparison/GreaterOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/IdenticalOperator.php b/src/Operators/Comparison/IdenticalOperator.php
index 263a14ee31..1dc122790d 100644
--- a/src/Operators/Comparison/IdenticalOperator.php
+++ b/src/Operators/Comparison/IdenticalOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/LessEqualOperator.php b/src/Operators/Comparison/LessEqualOperator.php
index 0f0ed73ade..aa65b56b27 100644
--- a/src/Operators/Comparison/LessEqualOperator.php
+++ b/src/Operators/Comparison/LessEqualOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/LessOperator.php b/src/Operators/Comparison/LessOperator.php
index 92a66f57e6..55ded8ff9c 100644
--- a/src/Operators/Comparison/LessOperator.php
+++ b/src/Operators/Comparison/LessOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/NotEqualsOperator.php b/src/Operators/Comparison/NotEqualsOperator.php
index 77f6a3db0a..7e5c25c815 100644
--- a/src/Operators/Comparison/NotEqualsOperator.php
+++ b/src/Operators/Comparison/NotEqualsOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Operators/Comparison/NotIdenticalOperator.php b/src/Operators/Comparison/NotIdenticalOperator.php
index 4339b3c641..4c308f2fa6 100644
--- a/src/Operators/Comparison/NotIdenticalOperator.php
+++ b/src/Operators/Comparison/NotIdenticalOperator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ACosOptimizer.php b/src/Optimizers/FunctionCall/ACosOptimizer.php
index 7559a086e1..e9eb0d5931 100644
--- a/src/Optimizers/FunctionCall/ACosOptimizer.php
+++ b/src/Optimizers/FunctionCall/ACosOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ASinOptimizer.php b/src/Optimizers/FunctionCall/ASinOptimizer.php
index cc1bf8b0cf..3bd2887e64 100644
--- a/src/Optimizers/FunctionCall/ASinOptimizer.php
+++ b/src/Optimizers/FunctionCall/ASinOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/AddslashesOptimizer.php b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
index 84c75f6177..ee744241d4 100644
--- a/src/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index c423940905..7982ac6335 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 9e86502c5e..c4766558ff 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index a474f1196b..25cf3f20e7 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index 66c5e8f278..b1b8b03c72 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index 039d731e40..315b973ff4 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index 28da362202..36a1f61d9d 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index ebd0166572..0bba183e61 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CeilOptimizer.php b/src/Optimizers/FunctionCall/CeilOptimizer.php
index cc22851e7a..932bac520a 100644
--- a/src/Optimizers/FunctionCall/CeilOptimizer.php
+++ b/src/Optimizers/FunctionCall/CeilOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ClassExistsOptimizer.php b/src/Optimizers/FunctionCall/ClassExistsOptimizer.php
index dd539f3b08..09f9de7d12 100644
--- a/src/Optimizers/FunctionCall/ClassExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ClassExistsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php b/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
index 6495b4ba4e..211c2b6fec 100644
--- a/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CosOptimizer.php b/src/Optimizers/FunctionCall/CosOptimizer.php
index 0af47c7870..8c6af2d6f5 100644
--- a/src/Optimizers/FunctionCall/CosOptimizer.php
+++ b/src/Optimizers/FunctionCall/CosOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CountOptimizer.php b/src/Optimizers/FunctionCall/CountOptimizer.php
index ded7d391ea..c74018f9d3 100644
--- a/src/Optimizers/FunctionCall/CountOptimizer.php
+++ b/src/Optimizers/FunctionCall/CountOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index bb425a165f..dd3474ce5b 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
index be4584274c..8e5e809fcd 100644
--- a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 51040a4f90..0983bb23b2 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index 01940662a2..ec4fed4a73 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
index 8bd23407dd..425dea6b43 100644
--- a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/DieOptimizer.php b/src/Optimizers/FunctionCall/DieOptimizer.php
index de596f138d..4dfc46ac00 100644
--- a/src/Optimizers/FunctionCall/DieOptimizer.php
+++ b/src/Optimizers/FunctionCall/DieOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/DoublevalOptimizer.php b/src/Optimizers/FunctionCall/DoublevalOptimizer.php
index e274e15c09..aa5a1ad0b6 100644
--- a/src/Optimizers/FunctionCall/DoublevalOptimizer.php
+++ b/src/Optimizers/FunctionCall/DoublevalOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/EndsWithOptimizer.php b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
index d33507ca8e..0176f76ace 100644
--- a/src/Optimizers/FunctionCall/EndsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/EvalOptimizer.php b/src/Optimizers/FunctionCall/EvalOptimizer.php
index 1e51333066..a826500899 100644
--- a/src/Optimizers/FunctionCall/EvalOptimizer.php
+++ b/src/Optimizers/FunctionCall/EvalOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ExitOptimizer.php b/src/Optimizers/FunctionCall/ExitOptimizer.php
index d04826fe4e..d70ec8e2e7 100644
--- a/src/Optimizers/FunctionCall/ExitOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExitOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
@@ -44,11 +46,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             // TODO: protect resolvedParams[0] from restore
         }
         if (!isset($expression['parameters'])) {
-            $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
+            // $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
             $context->codePrinter->output('zephir_exit_empty();');
         } else {
             $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-            $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
+            // $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
             $context->codePrinter->output('zephir_exit('.$resolvedParams[0].');');
         }
 
diff --git a/src/Optimizers/FunctionCall/ExplodeOptimizer.php b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
index 89021e7b2a..317253c14a 100644
--- a/src/Optimizers/FunctionCall/ExplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FcloseOptimizer.php b/src/Optimizers/FunctionCall/FcloseOptimizer.php
index f5dc100353..225bae500a 100644
--- a/src/Optimizers/FunctionCall/FcloseOptimizer.php
+++ b/src/Optimizers/FunctionCall/FcloseOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FeofOptimizer.php b/src/Optimizers/FunctionCall/FeofOptimizer.php
index bde9374bcd..17a2b8355b 100644
--- a/src/Optimizers/FunctionCall/FeofOptimizer.php
+++ b/src/Optimizers/FunctionCall/FeofOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FileExistsOptimizer.php b/src/Optimizers/FunctionCall/FileExistsOptimizer.php
index 5867ae067b..01fd640b5f 100644
--- a/src/Optimizers/FunctionCall/FileExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FileExistsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
index 1008be680a..ec39325a1c 100644
--- a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php b/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
index 0693608567..46e28d0c1e 100644
--- a/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index 1958e8ecdb..ef35b0e954 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FloorOptimizer.php b/src/Optimizers/FunctionCall/FloorOptimizer.php
index 6719a2e6ae..5992072cc8 100644
--- a/src/Optimizers/FunctionCall/FloorOptimizer.php
+++ b/src/Optimizers/FunctionCall/FloorOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
index b0b624c05b..fa0a3fea81 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index 28f718b295..baf9938a61 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
index 82a1864755..556d8497ae 100644
--- a/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/FwriteOptimizer.php b/src/Optimizers/FunctionCall/FwriteOptimizer.php
index 4a01a27476..5274061afe 100644
--- a/src/Optimizers/FunctionCall/FwriteOptimizer.php
+++ b/src/Optimizers/FunctionCall/FwriteOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
index 899f457e6a..1600bb4242 100644
--- a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index 41ee43c7fa..f7fd107846 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index 0169caed01..fcc30868f0 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index d896e88916..a1529d3ce2 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index 7c410ee3e3..939452794c 100644
--- a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
index 1c26badebf..d131f30882 100644
--- a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/GettypeOptimizer.php b/src/Optimizers/FunctionCall/GettypeOptimizer.php
index d7f3eca7d1..12a0ced719 100644
--- a/src/Optimizers/FunctionCall/GettypeOptimizer.php
+++ b/src/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
index d4a93e0266..b1bfa95fdf 100644
--- a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
+++ b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ImplodeOptimizer.php b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
index 86ee6d8078..e1dabd0228 100644
--- a/src/Optimizers/FunctionCall/ImplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index 2d248c6eb9..567a1ad22a 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php b/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
index ea60dc2ad8..3f5a8839c3 100644
--- a/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IntvalOptimizer.php b/src/Optimizers/FunctionCall/IntvalOptimizer.php
index 5c45900cd1..d91914bb45 100644
--- a/src/Optimizers/FunctionCall/IntvalOptimizer.php
+++ b/src/Optimizers/FunctionCall/IntvalOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsArrayOptimizer.php b/src/Optimizers/FunctionCall/IsArrayOptimizer.php
index 16fc60201a..7b2991309d 100644
--- a/src/Optimizers/FunctionCall/IsArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsArrayOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsBoolOptimizer.php b/src/Optimizers/FunctionCall/IsBoolOptimizer.php
index 9680b0b333..6b1e0c097b 100644
--- a/src/Optimizers/FunctionCall/IsBoolOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsBoolOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsCallableOptimizer.php b/src/Optimizers/FunctionCall/IsCallableOptimizer.php
index b872479940..3c6708ff21 100644
--- a/src/Optimizers/FunctionCall/IsCallableOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsCallableOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsIntOptimizer.php b/src/Optimizers/FunctionCall/IsIntOptimizer.php
index d73ca18549..e38140c83b 100644
--- a/src/Optimizers/FunctionCall/IsIntOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsIntOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsNullOptimizer.php b/src/Optimizers/FunctionCall/IsNullOptimizer.php
index 7df7542f47..181b7973e2 100644
--- a/src/Optimizers/FunctionCall/IsNullOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsNullOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsNumericOptimizer.php b/src/Optimizers/FunctionCall/IsNumericOptimizer.php
index ccd11448fb..08d446fceb 100644
--- a/src/Optimizers/FunctionCall/IsNumericOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsNumericOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsObjectOptimizer.php b/src/Optimizers/FunctionCall/IsObjectOptimizer.php
index 29e6c5223c..135ce8b87d 100644
--- a/src/Optimizers/FunctionCall/IsObjectOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsObjectOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php b/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
index 72ba194672..87c435e377 100644
--- a/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php b/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
index 73d359c1e0..3f0f62a75b 100644
--- a/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsResourceOptimizer.php b/src/Optimizers/FunctionCall/IsResourceOptimizer.php
index b43643ebd3..2c845c6f6c 100644
--- a/src/Optimizers/FunctionCall/IsResourceOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsResourceOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsScalarOptimizer.php b/src/Optimizers/FunctionCall/IsScalarOptimizer.php
index 3795da2ff9..6987f807d5 100644
--- a/src/Optimizers/FunctionCall/IsScalarOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsScalarOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/IsStringOptimizer.php b/src/Optimizers/FunctionCall/IsStringOptimizer.php
index 1e6f718234..98b5373551 100644
--- a/src/Optimizers/FunctionCall/IsStringOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsStringOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/JoinOptimizer.php b/src/Optimizers/FunctionCall/JoinOptimizer.php
index 1d6354b0bd..c539fd8b57 100644
--- a/src/Optimizers/FunctionCall/JoinOptimizer.php
+++ b/src/Optimizers/FunctionCall/JoinOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index 844d4fbf50..5e06af921e 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index 60d59b42bd..3585bdfb38 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/LdexpOptimizer.php b/src/Optimizers/FunctionCall/LdexpOptimizer.php
index 480f9f0107..a86091a034 100644
--- a/src/Optimizers/FunctionCall/LdexpOptimizer.php
+++ b/src/Optimizers/FunctionCall/LdexpOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/LtrimOptimizer.php b/src/Optimizers/FunctionCall/LtrimOptimizer.php
index 75b413d23b..8d77755144 100644
--- a/src/Optimizers/FunctionCall/LtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/LtrimOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index 89c5fbeb7a..067033b6fe 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/MemstrOptimizer.php b/src/Optimizers/FunctionCall/MemstrOptimizer.php
index e26175e389..bfdec812e4 100644
--- a/src/Optimizers/FunctionCall/MemstrOptimizer.php
+++ b/src/Optimizers/FunctionCall/MemstrOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/MergeAppendOptimizer.php b/src/Optimizers/FunctionCall/MergeAppendOptimizer.php
index 7d55d98641..c16033c8d3 100644
--- a/src/Optimizers/FunctionCall/MergeAppendOptimizer.php
+++ b/src/Optimizers/FunctionCall/MergeAppendOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/MethodExistsOptimizer.php b/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
index 732ae91eb3..09927f623a 100644
--- a/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/MicrotimeOptimizer.php b/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
index 9be95691bc..1733beaebd 100644
--- a/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/PowOptimizer.php b/src/Optimizers/FunctionCall/PowOptimizer.php
index f2a1495b89..ce27675458 100644
--- a/src/Optimizers/FunctionCall/PowOptimizer.php
+++ b/src/Optimizers/FunctionCall/PowOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php b/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
index c3006186c0..f1e4d081f6 100644
--- a/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
@@ -18,5 +20,5 @@
  */
 class PregMatchAllOptimizer extends PregMatchOptimizer
 {
-    const GLOBAL_MATCH = 1;
+    public const GLOBAL_MATCH = 1;
 }
diff --git a/src/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
index 23b50522aa..ade57e1b99 100644
--- a/src/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
index cff2c8604e..9a3d88bce0 100644
--- a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
+++ b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/RoundOptimizer.php b/src/Optimizers/FunctionCall/RoundOptimizer.php
index 3b99a9d00c..965b082ba7 100644
--- a/src/Optimizers/FunctionCall/RoundOptimizer.php
+++ b/src/Optimizers/FunctionCall/RoundOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/RtrimOptimizer.php b/src/Optimizers/FunctionCall/RtrimOptimizer.php
index 83edf4360e..6c7a8884e1 100644
--- a/src/Optimizers/FunctionCall/RtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/RtrimOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/SinOptimizer.php b/src/Optimizers/FunctionCall/SinOptimizer.php
index e4d4363c1c..a212e5b5bd 100644
--- a/src/Optimizers/FunctionCall/SinOptimizer.php
+++ b/src/Optimizers/FunctionCall/SinOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/SqrtOptimizer.php b/src/Optimizers/FunctionCall/SqrtOptimizer.php
index c8a347831c..c895045991 100644
--- a/src/Optimizers/FunctionCall/SqrtOptimizer.php
+++ b/src/Optimizers/FunctionCall/SqrtOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StartsWithOptimizer.php b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
index dea46b33c2..333c673344 100644
--- a/src/Optimizers/FunctionCall/StartsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StrReplaceOptimizer.php b/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
index 6cee852152..fc719c9701 100644
--- a/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
index c00f98faec..bbf9474ac9 100644
--- a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
index b5bc457bd2..9dd0f31eee 100644
--- a/src/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StrlenOptimizer.php b/src/Optimizers/FunctionCall/StrlenOptimizer.php
index ec5f211dca..a64931781f 100644
--- a/src/Optimizers/FunctionCall/StrlenOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrlenOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StrposOptimizer.php b/src/Optimizers/FunctionCall/StrposOptimizer.php
index fb6e2a0acf..559a6eb3f4 100644
--- a/src/Optimizers/FunctionCall/StrposOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrposOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StrtokOptimizer.php b/src/Optimizers/FunctionCall/StrtokOptimizer.php
index fa7f4e1a50..683b7b4971 100644
--- a/src/Optimizers/FunctionCall/StrtokOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtokOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
index 19fc8aa29c..6c91c13e2b 100644
--- a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index 0713304fb1..bbfd4a1a70 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/SubstrOptimizer.php b/src/Optimizers/FunctionCall/SubstrOptimizer.php
index dd0e40c6d3..0d263ee1dd 100644
--- a/src/Optimizers/FunctionCall/SubstrOptimizer.php
+++ b/src/Optimizers/FunctionCall/SubstrOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/TanOptimizer.php b/src/Optimizers/FunctionCall/TanOptimizer.php
index 0598352a6f..7b624e94b0 100644
--- a/src/Optimizers/FunctionCall/TanOptimizer.php
+++ b/src/Optimizers/FunctionCall/TanOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/TimeOptimizer.php b/src/Optimizers/FunctionCall/TimeOptimizer.php
index aa48887ff9..fe1d94ab76 100644
--- a/src/Optimizers/FunctionCall/TimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/TimeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index a22a660093..5a03d4eb3a 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index 13def33d99..ffe21505c7 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 50daee809a..1c62bd6fe0 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index 2f06c54489..9f773fb68e 100644
--- a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
index 9ab964b968..34186930e1 100644
--- a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index 2e3f204ab2..ac9ca9891b 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 180e07ea36..6d9cd46b51 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
index c9357d95ee..32e9aa45ad 100644
--- a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
+++ b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Parser/Manager.php b/src/Parser/Manager.php
index 8eb8f3371c..f1d0f0ef65 100644
--- a/src/Parser/Manager.php
+++ b/src/Parser/Manager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Passes/LoopBreakPass.php b/src/Passes/LoopBreakPass.php
index e700f682cf..42f0585744 100644
--- a/src/Passes/LoopBreakPass.php
+++ b/src/Passes/LoopBreakPass.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Passes/MutateGathererPass.php b/src/Passes/MutateGathererPass.php
index 587f01e9c7..e5a7923272 100644
--- a/src/Passes/MutateGathererPass.php
+++ b/src/Passes/MutateGathererPass.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
index 5a48d99149..46f69edc42 100644
--- a/src/Passes/StaticTypeInference.php
+++ b/src/Passes/StaticTypeInference.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/BreakStatement.php b/src/Statements/BreakStatement.php
index f0e0e3bbde..d31d9c00ff 100644
--- a/src/Statements/BreakStatement.php
+++ b/src/Statements/BreakStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/ContinueStatement.php b/src/Statements/ContinueStatement.php
index 1313f57ecb..4ecea903ee 100644
--- a/src/Statements/ContinueStatement.php
+++ b/src/Statements/ContinueStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/DeclareStatement.php b/src/Statements/DeclareStatement.php
index 61aabe1c58..c8deeb7660 100644
--- a/src/Statements/DeclareStatement.php
+++ b/src/Statements/DeclareStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/DoWhileStatement.php b/src/Statements/DoWhileStatement.php
index 0a8afbc17e..4f8de3f8bb 100644
--- a/src/Statements/DoWhileStatement.php
+++ b/src/Statements/DoWhileStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/EchoStatement.php b/src/Statements/EchoStatement.php
index b7ca49bd84..ebb53df522 100644
--- a/src/Statements/EchoStatement.php
+++ b/src/Statements/EchoStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index b2485c1a32..0552d6d3a0 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/IfStatement.php b/src/Statements/IfStatement.php
index 6c8c29c55a..4d574ba0c2 100644
--- a/src/Statements/IfStatement.php
+++ b/src/Statements/IfStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
index 25a7fa1d15..4958d4caf0 100644
--- a/src/Statements/Let/ArrayIndex.php
+++ b/src/Statements/Let/ArrayIndex.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ArrayIndexAppend.php b/src/Statements/Let/ArrayIndexAppend.php
index 57b0a79583..e9acc395e5 100644
--- a/src/Statements/Let/ArrayIndexAppend.php
+++ b/src/Statements/Let/ArrayIndexAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index 15fe91dd18..40c96bac0f 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ExportSymbol.php b/src/Statements/Let/ExportSymbol.php
index 4b6693cea0..b24d8d58b5 100644
--- a/src/Statements/Let/ExportSymbol.php
+++ b/src/Statements/Let/ExportSymbol.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ExportSymbolString.php b/src/Statements/Let/ExportSymbolString.php
index ae092c1734..5f216564e9 100644
--- a/src/Statements/Let/ExportSymbolString.php
+++ b/src/Statements/Let/ExportSymbolString.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index 3df7523089..43084965df 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
index 0317cf4ee4..56731a3c0c 100644
--- a/src/Statements/Let/ObjectPropertyAppend.php
+++ b/src/Statements/Let/ObjectPropertyAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index 7fa1d8b79e..ebe38ac50a 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
index 63edeadddb..a05b5d3eb4 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index 40763179e9..605d7d7cc0 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 88633e2d5b..ce07933dfc 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/StaticPropertyAdd.php b/src/Statements/Let/StaticPropertyAdd.php
index dd47747f4f..6c3fedc976 100644
--- a/src/Statements/Let/StaticPropertyAdd.php
+++ b/src/Statements/Let/StaticPropertyAdd.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 9503fc1318..f89b138747 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index b3033235e7..1bd6ad1d49 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index 0eb2943c64..3ab3276d34 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index a365978c7c..e5de271543 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 7e16cc661c..ef4fbab8e9 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/Let/VariableAppend.php b/src/Statements/Let/VariableAppend.php
index 7b850d9dfd..243d9675e9 100644
--- a/src/Statements/Let/VariableAppend.php
+++ b/src/Statements/Let/VariableAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index 6663c36738..3a514cfa6e 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/LoopStatement.php b/src/Statements/LoopStatement.php
index 67dfda1526..0361524ef8 100644
--- a/src/Statements/LoopStatement.php
+++ b/src/Statements/LoopStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/RequireStatement.php b/src/Statements/RequireStatement.php
index 17cc9f8982..b7783d21e5 100644
--- a/src/Statements/RequireStatement.php
+++ b/src/Statements/RequireStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 236afc195d..10c72cd0bd 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/StatementAbstract.php b/src/Statements/StatementAbstract.php
index 56428c4b48..144ea49393 100644
--- a/src/Statements/StatementAbstract.php
+++ b/src/Statements/StatementAbstract.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
index 5db2f726df..3016b1fcc7 100644
--- a/src/Statements/SwitchStatement.php
+++ b/src/Statements/SwitchStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/TryCatchStatement.php b/src/Statements/TryCatchStatement.php
index 197222ce17..31c4b695ee 100644
--- a/src/Statements/TryCatchStatement.php
+++ b/src/Statements/TryCatchStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Statements/WhileStatement.php b/src/Statements/WhileStatement.php
index c72309d941..98baa169e2 100644
--- a/src/Statements/WhileStatement.php
+++ b/src/Statements/WhileStatement.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/StatementsBlock.php b/src/StatementsBlock.php
index 8cfafe5f97..7930c06ed8 100644
--- a/src/StatementsBlock.php
+++ b/src/StatementsBlock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/StaticCall.php b/src/StaticCall.php
index 5e111a7e63..659d03825a 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/TypeAwareInterface.php b/src/TypeAwareInterface.php
index 1c8abd0292..55523edf16 100644
--- a/src/TypeAwareInterface.php
+++ b/src/TypeAwareInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
diff --git a/src/Types/ArrayType.php b/src/Types/ArrayType.php
index 5d3b00d1b2..3d9996cf06 100644
--- a/src/Types/ArrayType.php
+++ b/src/Types/ArrayType.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *

From 4a8be61ce8c4a7415d29a98d9c00e006b6f46f79 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 13:24:55 +0000
Subject: [PATCH 153/375] Use short syntax

---
 src/Backend/FcallManager.php                 |  2 +-
 src/Compiler.php                             | 20 ++++++--------------
 src/Console/Command/RemoveOptionsTrait.php   |  4 +---
 src/MethodCall.php                           |  2 +-
 src/StaticCall.php                           |  6 +++---
 tests/Extension/BuiltIn/StringMethodTest.php |  4 +---
 tests/Extension/ClosureTest.php              |  4 +---
 tests/Extension/FunctionExistsTest.php       |  4 +---
 tests/Extension/MethodArgsTest.php           |  2 +-
 tests/Extension/Optimizers/IsScalarTest.php  |  2 +-
 tests/Extension/ReflectionTest.php           |  4 +---
 tests/Extension/StringTest.php               |  4 +---
 tests/Extension/VarsTest.php                 | 12 +++---------
 13 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/src/Backend/FcallManager.php b/src/Backend/FcallManager.php
index 9ba5c97c41..b6ee89b715 100644
--- a/src/Backend/FcallManager.php
+++ b/src/Backend/FcallManager.php
@@ -66,7 +66,7 @@ public function genFcallCode(): void
 
         ksort($this->requiredMacros);
         foreach ($this->requiredMacros as $name => $info) {
-            list($scope, $mode, $paramCount) = $info;
+            [$scope, $mode, $paramCount] = $info;
             $paramsStr = '';
             $retParam = '';
             $retValueUsed = '0';
diff --git a/src/Compiler.php b/src/Compiler.php
index e42448f579..c45972a091 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -940,18 +940,14 @@ public function createConfigFiles(string $project): bool
 
         $safeProject = 'zend' === $project ? 'zend_' : $project;
 
-        $compiledFiles = array_map(function ($file) {
-            return str_replace('.c', '.zep.c', $file);
-        }, $this->compiledFiles);
+        $compiledFiles = array_map(fn ($file) => str_replace('.c', '.zep.c', $file), $this->compiledFiles);
 
         /**
          * If export-classes is enabled all headers are copied to include/php/ext.
          */
         $exportClasses = $this->config->get('export-classes', 'extra');
         if ($exportClasses) {
-            $compiledHeaders = array_map(function ($file) {
-                return str_replace('.c', '.zep.h', $file);
-            }, $this->compiledFiles);
+            $compiledHeaders = array_map(fn ($file) => str_replace('.c', '.zep.h', $file), $this->compiledFiles);
         } else {
             $compiledHeaders = ['php_'.strtoupper($project).'.h'];
         }
@@ -1464,7 +1460,7 @@ public function createProjectFiles(string $project): bool
         /**
          * Round 3. Process extension globals
          */
-        list($globalCode, $globalStruct, $globalsDefault, $initEntries) = $this->processExtensionGlobals($project);
+        [$globalCode, $globalStruct, $globalsDefault, $initEntries] = $this->processExtensionGlobals($project);
         if ('zend' == $project) {
             $safeProject = 'zend_';
         } else {
@@ -1479,7 +1475,7 @@ public function createProjectFiles(string $project): bool
         /**
          * Round 5. Generate Function entries (FE)
          */
-        list($feHeader, $feEntries) = $this->generateFunctionInformation();
+        [$feHeader, $feEntries] = $this->generateFunctionInformation();
 
         /**
          * Check if there are module/request/global destructors.
@@ -1537,9 +1533,7 @@ public function createProjectFiles(string $project): bool
             }
         }
 
-        $modRequires = array_map(function ($mod) {
-            return sprintf('ZEND_MOD_REQUIRED("%s")', strtolower($mod));
-        }, $this->config->get('extensions', 'requires') ?: []);
+        $modRequires = array_map(fn ($mod) => sprintf('ZEND_MOD_REQUIRED("%s")', strtolower($mod)), $this->config->get('extensions', 'requires') ?: []);
 
         $toReplace = [
             '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
@@ -2155,9 +2149,7 @@ private function getGccVersion(): string
     private function toUnixPaths(array $paths): array
     {
         return array_map(
-            static function (string $path): string {
-                return str_replace(\DIRECTORY_SEPARATOR, '/', $path);
-            },
+            static fn (string $path): string => str_replace(\DIRECTORY_SEPARATOR, '/', $path),
             $paths
         );
     }
diff --git a/src/Console/Command/RemoveOptionsTrait.php b/src/Console/Command/RemoveOptionsTrait.php
index e1c9ee7e3e..ca3bc4eb8c 100644
--- a/src/Console/Command/RemoveOptionsTrait.php
+++ b/src/Console/Command/RemoveOptionsTrait.php
@@ -23,9 +23,7 @@ protected function removeOptions(array $names): void
         /** @var InputDefinition $definition */
         $definition = $this->getDefinition();
 
-        $filtered = \array_filter($definition->getOptions(), function (InputOption $option) use ($names) {
-            return !\in_array($option->getName(), $names, true);
-        });
+        $filtered = \array_filter($definition->getOptions(), fn (InputOption $option) => !\in_array($option->getName(), $names, true));
 
         $definition->setOptions($filtered);
     }
diff --git a/src/MethodCall.php b/src/MethodCall.php
index 4d9b36a154..8ae24cb58c 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -563,7 +563,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 $expression['parameters'],
                 $compilationContext,
                 $expression,
-                isset($method) ? $method : null
+                $method ?? null
             );
 
             if (\count($references)) {
diff --git a/src/StaticCall.php b/src/StaticCall.php
index 659d03825a..4f865ed7bd 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -373,7 +373,7 @@ protected function callParent(string $methodName, array $expression, $symbolVari
          * Check if the  method call can have an inline cache.
          */
         $methodCache = $compilationContext->cacheManager->getStaticMethodCache();
-        $cachePointer = $methodCache->get($compilationContext, isset($method) ? $method : null);
+        $cachePointer = $methodCache->get($compilationContext, $method ?? null);
 
         $params = [];
         if (isset($expression['parameters']) && \count($expression['parameters'])) {
@@ -516,7 +516,7 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
      */
     protected function callFromDynamicClass(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, CompilationContext $compilationContext): void
     {
-        list($params, $classEntry) = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
+        [$params, $classEntry] = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
 
         if ($symbolVariable) {
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
@@ -567,7 +567,7 @@ protected function callFromDynamicClass(string $methodName, array $expression, $
      */
     protected function callFromDynamicClassDynamicMethod(array $expression, $symbolVariable, bool $mustInit, bool $isExpecting, CompilationContext $compilationContext): void
     {
-        list($params, $classEntry) = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
+        [$params, $classEntry] = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
 
         /**
          * Obtain the method name from the variable.
diff --git a/tests/Extension/BuiltIn/StringMethodTest.php b/tests/Extension/BuiltIn/StringMethodTest.php
index 809a22e689..11db666f7b 100644
--- a/tests/Extension/BuiltIn/StringMethodTest.php
+++ b/tests/Extension/BuiltIn/StringMethodTest.php
@@ -184,9 +184,7 @@ public function providerCamelizeWrongSecondParam(): array
             [0],
             [[]],
             [
-                function () {
-                    return '-';
-                },
+                fn () => '-',
             ],
             [new \stdClass()],
         ];
diff --git a/tests/Extension/ClosureTest.php b/tests/Extension/ClosureTest.php
index e84ce190da..c5c2e5acd0 100644
--- a/tests/Extension/ClosureTest.php
+++ b/tests/Extension/ClosureTest.php
@@ -34,9 +34,7 @@ public function testIssue1036(): void
         $test = new Closures();
 
         $test->issue1036SetArgument(true);
-        $test->issue1036SetFunction(function ($argument) {
-            return $argument;
-        });
+        $test->issue1036SetFunction(fn ($argument) => $argument);
 
         $this->assertTrue($test->issue1036Call());
     }
diff --git a/tests/Extension/FunctionExistsTest.php b/tests/Extension/FunctionExistsTest.php
index b5d633265b..26e6ff3993 100644
--- a/tests/Extension/FunctionExistsTest.php
+++ b/tests/Extension/FunctionExistsTest.php
@@ -70,9 +70,7 @@ public function providerInternalFunctions(): array
         shuffle($allFunctions['internal']);
 
         $functions = array_map(
-            function ($value) {
-                return [$value];
-            },
+            fn ($value) => [$value],
             $allFunctions['internal']
         );
 
diff --git a/tests/Extension/MethodArgsTest.php b/tests/Extension/MethodArgsTest.php
index 7291cf6a8b..a7e8be014d 100644
--- a/tests/Extension/MethodArgsTest.php
+++ b/tests/Extension/MethodArgsTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
 
     public function testCallable(): void
     {
-        $callback = function () {
+        $callback = function (): void {
         };
 
         $this->test->setCallable($callback);
diff --git a/tests/Extension/Optimizers/IsScalarTest.php b/tests/Extension/Optimizers/IsScalarTest.php
index d2b7ce0fb8..0f2bf5cede 100644
--- a/tests/Extension/Optimizers/IsScalarTest.php
+++ b/tests/Extension/Optimizers/IsScalarTest.php
@@ -50,7 +50,7 @@ public function testVariableParameter(): void
         $this->assertFalse($this->test->testVarParameter($this));
         $this->assertFalse(
             $this->test->testVarParameter(
-                function () {
+                function (): void {
                 }
             )
         );
diff --git a/tests/Extension/ReflectionTest.php b/tests/Extension/ReflectionTest.php
index fad207f0fb..556dd132bd 100644
--- a/tests/Extension/ReflectionTest.php
+++ b/tests/Extension/ReflectionTest.php
@@ -26,9 +26,7 @@ public function testMethods(): void
         $this->assertInstanceOf(\ReflectionFunction::class, $class->getReflectionFunction());
         $this->assertNull($class->getReflectionParameter());
 
-        $class->setReflectionParameter(new \ReflectionParameter(function ($test) {
-            return 1;
-        }, 0));
+        $class->setReflectionParameter(new \ReflectionParameter(fn ($test) => 1, 0));
 
         $this->assertInstanceOf(\ReflectionParameter::class, $class->getReflectionParameter());
     }
diff --git a/tests/Extension/StringTest.php b/tests/Extension/StringTest.php
index ecff820a28..eaa9906842 100644
--- a/tests/Extension/StringTest.php
+++ b/tests/Extension/StringTest.php
@@ -413,9 +413,7 @@ public function providerCamelizeWrongSecondParam(): array
             [0],
             [[]],
             [
-                function () {
-                    return '-';
-                },
+                fn () => '-',
             ],
             [new \stdClass()],
         ];
diff --git a/tests/Extension/VarsTest.php b/tests/Extension/VarsTest.php
index 61df81ff96..9791119b8f 100644
--- a/tests/Extension/VarsTest.php
+++ b/tests/Extension/VarsTest.php
@@ -62,9 +62,7 @@ public function testVarDumpWithTwoParams(): void
     public function testVarDumpWithThreeParams(): void
     {
         $this->setOutputCallback(
-            function ($output) {
-                return str_replace(["\n", ' '], '', $output);
-            }
+            fn ($output) => str_replace(["\n", ' '], '', $output)
         );
 
         $this->expectOutputString(
@@ -80,9 +78,7 @@ function ($output) {
     public function testVarExport(): void
     {
         $this->setOutputCallback(
-            function ($output) {
-                return str_replace(["\n", ' '], '', $output);
-            }
+            fn ($output) => str_replace(["\n", ' '], '', $output)
         );
 
         $this->expectOutputString(
@@ -123,9 +119,7 @@ public function testVarDumpAndCountOptimizer(): void
     public function testArrayTypeVarDumpAndExport(): void
     {
         $this->setOutputCallback(
-            function ($output) {
-                return str_replace(["\n", ' '], '', $output);
-            }
+            fn ($output) => str_replace(["\n", ' '], '', $output)
         );
 
         $this->expectOutputString(

From 35ece52fbc7e0231f923bbe9622bfeb0bd5985a3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:14:16 +0000
Subject: [PATCH 154/375] Adjust strict in test cases

---
 tests/Extension/Oo/OoParamsTest.php           | 37 +++++++++++++++----
 .../Extension/Optimizers/IsPhpVersionTest.php |  4 +-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/tests/Extension/Oo/OoParamsTest.php b/tests/Extension/Oo/OoParamsTest.php
index 690f0ca013..34c65a190a 100644
--- a/tests/Extension/Oo/OoParamsTest.php
+++ b/tests/Extension/Oo/OoParamsTest.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension\Oo;
 
 use PHPUnit\Framework\TestCase;
@@ -29,23 +31,15 @@ public function testOoParams(): void
         $this->assertinstanceOf('Stub\Oo\OoDynamicA', $this->test->createOtherClassWithoutWriteCurrentNamespace());
 
         $this->assertSame($this->test->setAge(17), 17);
-        $this->assertSame($this->test->setAge('17'), 17);
-        $this->assertSame($this->test->setAge(17.0), 17);
 
         $this->assertSame($this->test->setAverage(17.1), 17.1);
         $this->assertSame($this->test->setAverage(17), 17.0);
         $this->assertSame($this->test->setAverage('17.5'), 17.5);
 
         $this->assertSame($this->test->setName('peter'), 'peter');
-        $this->assertSame($this->test->setName(12.5), '12.5');
-        $this->assertSame($this->test->setName(17), '17');
 
         $this->assertSame($this->test->setEnabled(true), true);
         $this->assertSame($this->test->setEnabled(false), false);
-        $this->assertSame($this->test->setEnabled(1), true);
-        $this->assertSame($this->test->setEnabled(0), false);
-        $this->assertSame($this->test->setEnabled('1'), true);
-        $this->assertSame($this->test->setEnabled('0'), false);
 
         $this->assertSame($this->test->setList([1, 2, 3, 4, 5]), [1, 2, 3, 4, 5]);
         $this->assertSame($this->test->setList([]), []);
@@ -58,6 +52,33 @@ public function setObjectClassCast(): void
         $this->assertInstanceOf('Stub\Oo\Param', $result);
     }
 
+    public function testTypError(): void
+    {
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setAge('17'), 17);
+
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setAge(17.0), 17);
+
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setName(12.5), '12.5');
+
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setName(17), '17');
+
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setEnabled(1), true);
+
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setEnabled(0), false);
+
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setEnabled('1'), true);
+
+        $this->expectException(\TypeError::class);
+        $this->assertSame($this->test->setEnabled('0'), false);
+    }
+
     /**
      * @issue https://github.com/zephir-lang/zephir/issues/938
      */
diff --git a/tests/Extension/Optimizers/IsPhpVersionTest.php b/tests/Extension/Optimizers/IsPhpVersionTest.php
index 4313ea71b0..acab4b2557 100644
--- a/tests/Extension/Optimizers/IsPhpVersionTest.php
+++ b/tests/Extension/Optimizers/IsPhpVersionTest.php
@@ -241,9 +241,9 @@ protected function onNotSuccessfulTest(\Throwable $error): void
      *
      * @throws \Exception
      */
-    private function isPhpVersion($version): bool
+    private function isPhpVersion(float|int|string $version): bool
     {
-        preg_match('/^(?<major>\d+)(?:\.(?<minor>!?\d+))?(?:\.(?<patch>!?\d+))?(?:[^Ee0-9.]+.*)?$/', $version, $matches);
+        preg_match('/^(?<major>\d+)(?:\.(?<minor>!?\d+))?(?:\.(?<patch>!?\d+))?(?:[^Ee0-9.]+.*)?$/', (string)$version, $matches);
         if (!\count($matches)) {
             throw new \Exception('Could not parse PHP version');
         }

From e4be31e6ac1ce12d63ca047546dded91f586ad7c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:15:34 +0000
Subject: [PATCH 155/375] Adjust CS in tests

---
 tests/Extension/AssignTest.php                |   6 +-
 tests/Extension/BitwiseTest.php               |   6 +-
 tests/Extension/ConstantsTest.php             |   8 +-
 tests/Extension/ExceptionsTest.php            |  14 +-
 .../Extension/Optimizers/IsPhpVersionTest.php |   8 +-
 .../Properties/PropertyUpdateTest.php         |   6 +-
 tests/Extension/TypeoffTest.php               |   6 +-
 tests/Zephir/ConfigTest.php                   |  22 +-
 .../Documentation/DocblockParserTest.php      |  26 +-
 tests/Zephir/Documentation/DocblockTest.php   |  20 +-
 tests/Zephir/Statements/Let/VariableTest.php  |   8 +-
 tests/Zephir/Stubs/DocBlockTest.php           | 296 +++++++++---------
 tests/Zephir/Stubs/GeneratorTest.php          |  86 ++---
 tests/Zephir/Variable/VariableTest.php        |   2 +-
 14 files changed, 256 insertions(+), 258 deletions(-)

diff --git a/tests/Extension/AssignTest.php b/tests/Extension/AssignTest.php
index de5a00ee89..948ec3ac34 100644
--- a/tests/Extension/AssignTest.php
+++ b/tests/Extension/AssignTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
@@ -178,7 +178,7 @@ public function testGlobalVarAssignGET(): void
         $this->assertCount($getCount + 2, $_GET);
     }
 
-    public function testIssue597()
+    public function testIssue597(): void
     {
         $_GET = [];
         $this->test->issue597();
diff --git a/tests/Extension/BitwiseTest.php b/tests/Extension/BitwiseTest.php
index 8281d3d5b3..7c4ccd7e29 100644
--- a/tests/Extension/BitwiseTest.php
+++ b/tests/Extension/BitwiseTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
@@ -18,7 +18,7 @@
 
 final class BitwiseTest extends TestCase
 {
-    public function testBitwise()
+    public function testBitwise(): void
     {
         $test = new Bitwise();
 
diff --git a/tests/Extension/ConstantsTest.php b/tests/Extension/ConstantsTest.php
index d8bbf9a965..12734d534b 100644
--- a/tests/Extension/ConstantsTest.php
+++ b/tests/Extension/ConstantsTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
@@ -19,8 +19,8 @@
 
 final class ConstantsTest extends TestCase
 {
-    const EXPECTED_DOUBLE_DELIMITER = '.';
-    const EXPECTED_CONST_VARS = '$SOME/CSRF/KEY$';
+    public const EXPECTED_DOUBLE_DELIMITER = '.';
+    public const EXPECTED_CONST_VARS = '$SOME/CSRF/KEY$';
 
     protected ?Constants $test = null;
 
diff --git a/tests/Extension/ExceptionsTest.php b/tests/Extension/ExceptionsTest.php
index d992b3428d..e1e300dce6 100644
--- a/tests/Extension/ExceptionsTest.php
+++ b/tests/Extension/ExceptionsTest.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
@@ -83,7 +85,7 @@ public function testExceptionChar(): void
     public function testExceptionInt(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage(123);
+        $this->expectExceptionMessage('123');
 
         $this->test->testExceptionLiteral('int');
     }
@@ -91,7 +93,7 @@ public function testExceptionInt(): void
     public function testExceptionDouble(): void
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage(123.123);
+        $this->expectExceptionMessage('123.123');
 
         $this->test->testExceptionLiteral('double');
     }
@@ -130,9 +132,7 @@ public function testMultiException(): void
             $this->assertSame($e->getMessage(), 'Some Exception');
         }
 
-        $this->test->internalExceptionCallable = function () {
-            return false;
-        };
+        $this->test->internalExceptionCallable = fn () => false;
 
         try {
             $value = $this->test->testMultiException('test', new Exception('Some Exception'));
@@ -147,9 +147,7 @@ public function testMultiException(): void
             $this->assertSame($e->getMessage(), 'Some Exception');
         }
 
-        $this->test->exceptionCallable = function () {
-            return false;
-        };
+        $this->test->exceptionCallable = fn () => false;
 
         try {
             $this->test->testMultiException('test', new \Exception('Some Exception'));
diff --git a/tests/Extension/Optimizers/IsPhpVersionTest.php b/tests/Extension/Optimizers/IsPhpVersionTest.php
index acab4b2557..ea8cb6e590 100644
--- a/tests/Extension/Optimizers/IsPhpVersionTest.php
+++ b/tests/Extension/Optimizers/IsPhpVersionTest.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension\Optimizers;
 
 use PHPUnit\Framework\TestCase;
@@ -21,8 +23,8 @@
  */
 final class IsPhpVersionTest extends TestCase
 {
-    const PHP_RELEASES_LIMIT = 17;
-    const PHP_MINOR_LIMIT = 3;
+    public const PHP_RELEASES_LIMIT = 17;
+    public const PHP_MINOR_LIMIT = 3;
 
     protected $test;
 
@@ -63,7 +65,7 @@ public function phpVersionProvider(): array
      */
     public function testOptimizer($version, $expected): void
     {
-        $isPhpVersion = (bool) $this->isPhpVersion($version);
+        $isPhpVersion = $this->isPhpVersion($version);
 
         $this->assertEquals($expected, $isPhpVersion);
     }
diff --git a/tests/Extension/Properties/PropertyUpdateTest.php b/tests/Extension/Properties/PropertyUpdateTest.php
index 1cb5ac4448..743d8a2a8a 100644
--- a/tests/Extension/Properties/PropertyUpdateTest.php
+++ b/tests/Extension/Properties/PropertyUpdateTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension\Properties;
 
 use PHPUnit\Framework\TestCase;
@@ -18,7 +18,7 @@
 
 final class PropertyUpdateTest extends TestCase
 {
-    public function testUpdate11()
+    public function testUpdate11(): void
     {
         // before fixed. Assertion failed: (((ht)->gc.refcount == 1) || ((ht)->u.flags & (1<<6))), function _zend_hash_index_add_or_update_i
         $test = new PropertyUpdate();
diff --git a/tests/Extension/TypeoffTest.php b/tests/Extension/TypeoffTest.php
index bb56b3c8fd..1762c23e53 100644
--- a/tests/Extension/TypeoffTest.php
+++ b/tests/Extension/TypeoffTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Extension;
 
 use PHPUnit\Framework\TestCase;
@@ -62,7 +62,7 @@ public function testClassProperty(): void
 
     public function testCallable(): void
     {
-        $callback = function () {
+        $callback = function (): void {
         };
         $this->assertTrue($this->test->testCallableTypeOf($callback));
         $this->assertFalse($this->test->testCallableTypeOf(true));
diff --git a/tests/Zephir/ConfigTest.php b/tests/Zephir/ConfigTest.php
index 265f8da8d4..8f4458d058 100644
--- a/tests/Zephir/ConfigTest.php
+++ b/tests/Zephir/ConfigTest.php
@@ -65,15 +65,15 @@ private function cleanTmpConfigFile(): void
     private function stubsBanner(): string
     {
         return <<<DOC
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-DOC;
+            /**
+             * This file is part of the Zephir.
+             *
+             * (c) Phalcon Team <team@zephir-lang.com>
+             *
+             * For the full copyright and license information, please view
+             * the LICENSE file that was distributed with this source code.
+             */
+            DOC;
     }
 
     /**
@@ -132,7 +132,7 @@ public function setConfigProvider(): array
      */
     public function testShouldSetConfigParams(array $test, $expected): void
     {
-        list($key, $value, $namespace) = $test;
+        [$key, $value, $namespace] = $test;
         $this->config->set($key, $value, $namespace);
 
         $actual = $this->config->get($key, $namespace);
@@ -167,7 +167,7 @@ public function defaultConfigProvider(): array
      * @param string $key
      * @param mixed  $expected
      */
-    public function testShouldGetDefaultConfigParams($namespace, string $key, $expected)
+    public function testShouldGetDefaultConfigParams($namespace, string $key, $expected): void
     {
         if (Os::isWindows()) {
             $this->markTestSkipped('Warning: Strings contain different line endings!');
diff --git a/tests/Zephir/Documentation/DocblockParserTest.php b/tests/Zephir/Documentation/DocblockParserTest.php
index ba6998550b..895cfbc40f 100644
--- a/tests/Zephir/Documentation/DocblockParserTest.php
+++ b/tests/Zephir/Documentation/DocblockParserTest.php
@@ -31,19 +31,19 @@ public function testShouldParseDocblockFromString(): void
         }
 
         $test = <<<DOC
-/**
- * This file is part of the Zephir.
- *
- * Helper to parse raw docblocks to structured object.
- *
- * @link https://github.com/zephir-lang/zephir - Zephir
- * @see  https://github.com/zephir-lang/zephir/README.md - Zephir readme
- *
- * @param array \$annotation - custom annotation
- *
- * @return Docblock the parsed docblock
- */
-DOC;
+            /**
+             * This file is part of the Zephir.
+             *
+             * Helper to parse raw docblocks to structured object.
+             *
+             * @link https://github.com/zephir-lang/zephir - Zephir
+             * @see  https://github.com/zephir-lang/zephir/README.md - Zephir readme
+             *
+             * @param array \$annotation - custom annotation
+             *
+             * @return Docblock the parsed docblock
+             */
+            DOC;
 
         $link = new Link('link', 'https://github.com/zephir-lang/zephir - Zephir');
         $link->getLinkText();
diff --git a/tests/Zephir/Documentation/DocblockTest.php b/tests/Zephir/Documentation/DocblockTest.php
index d29aa2f8fe..04f5d9f7de 100644
--- a/tests/Zephir/Documentation/DocblockTest.php
+++ b/tests/Zephir/Documentation/DocblockTest.php
@@ -75,16 +75,16 @@ public function testShouldAddAnnotations(): void
     public function testShouldGenerateDocblock(): void
     {
         $expected = <<<DOC
-**
- * Example summary block.
- *
- *
- * Example description block.
- *
- * @see https://github.com/zephir-lang/zephir Zephir homepage
- * @return void
- *
-DOC;
+            **
+             * Example summary block.
+             *
+             *
+             * Example description block.
+             *
+             * @see https://github.com/zephir-lang/zephir Zephir homepage
+             * @return void
+             *
+            DOC;
         $this->docblock->setDescription('Example description block.');
         $this->docblock->setSummary('Example summary block.');
         $this->docblock->setAnnotations([
diff --git a/tests/Zephir/Statements/Let/VariableTest.php b/tests/Zephir/Statements/Let/VariableTest.php
index 90af5c5538..d9b7700bb5 100644
--- a/tests/Zephir/Statements/Let/VariableTest.php
+++ b/tests/Zephir/Statements/Let/VariableTest.php
@@ -44,21 +44,19 @@ public function exceptionTestProvider(): array
             'immutable variable' => [
                 [],
                 'Cannot mutate variable \'foo\' because it is read only',
-                function (ZephirVariable $var) {
+                function (ZephirVariable $var): void {
                     $var->setReadOnly(true);
                 },
             ],
             'not initialized variable' => [
                 ['operator' => 'concat'],
                 'Cannot mutate variable \'foo\' because it is not initialized',
-                function (ZephirVariable $var) {
-                    return;
-                },
+                fn (ZephirVariable $var) => null,
             ],
             'unknown variable type' => [
                 ['operator' => 'assign'],
                 'Unknown type: prototype',
-                function (ZephirVariable $var) {
+                function (ZephirVariable $var): void {
                     $var->setType('prototype');
                 },
             ],
diff --git a/tests/Zephir/Stubs/DocBlockTest.php b/tests/Zephir/Stubs/DocBlockTest.php
index 8fda3d585d..0e0d43be86 100644
--- a/tests/Zephir/Stubs/DocBlockTest.php
+++ b/tests/Zephir/Stubs/DocBlockTest.php
@@ -33,17 +33,17 @@ public function testDescription(): void
         }
 
         $doc = <<<DOC
-/**
- * Hello world
- * I am test.
- */
-DOC;
+            /**
+             * Hello world
+             * I am test.
+             */
+            DOC;
         $expected = <<<DOC
-    /**
-     * Hello world
-     * I am test.
-     */
-DOC;
+                /**
+                 * Hello world
+                 * I am test.
+                 */
+            DOC;
 
         $docBlock = new DocBlock($doc);
 
@@ -57,17 +57,17 @@ public function testPhpDocs(): void
         }
 
         $doc = <<<DOC
-/**
- * @param string \$foo
- * @return string
- */
-DOC;
+            /**
+             * @param string \$foo
+             * @return string
+             */
+            DOC;
         $expected = <<<DOC
-    /**
-     * @param string \$foo
-     * @return string
-     */
-DOC;
+                /**
+                 * @param string \$foo
+                 * @return string
+                 */
+            DOC;
         $docBlock = new DocBlock($doc);
 
         $this->assertSame($expected, (string) $docBlock);
@@ -80,18 +80,18 @@ public function testPhpDocWithDescription(): void
         }
 
         $doc = <<<DOC
-/**
- * Hello world
- * @return string
- */
-DOC;
+            /**
+             * Hello world
+             * @return string
+             */
+            DOC;
         $expected = <<<DOC
-    /**
-     * Hello world
-     *
-     * @return string
-     */
-DOC;
+                /**
+                 * Hello world
+                 *
+                 * @return string
+                 */
+            DOC;
 
         $docBlock = new DocBlock($doc);
 
@@ -105,44 +105,44 @@ public function testPhpDocWithCodeBloc(): void
         }
 
         $doc = <<<DOC
-/**
- * Some method.
- *
- * <code>
- * if (\$foo !== \$bar) {
- *     // Some comment
- *
- *     // Another comment
- *
- *     while (true) {
- *         // Some staff
- *     }
- * }
- * </code>
- *
- * @return string
- */
-DOC;
+            /**
+             * Some method.
+             *
+             * <code>
+             * if (\$foo !== \$bar) {
+             *     // Some comment
+             *
+             *     // Another comment
+             *
+             *     while (true) {
+             *         // Some staff
+             *     }
+             * }
+             * </code>
+             *
+             * @return string
+             */
+            DOC;
 
         $expected = <<<DOC
-    /**
-     * Some method.
-     *
-     * <code>
-     * if (\$foo !== \$bar) {
-     *     // Some comment
-     *
-     *     // Another comment
-     *
-     *     while (true) {
-     *         // Some staff
-     *     }
-     * }
-     * </code>
-     *
-     * @return string
-     */
-DOC;
+                /**
+                 * Some method.
+                 *
+                 * <code>
+                 * if (\$foo !== \$bar) {
+                 *     // Some comment
+                 *
+                 *     // Another comment
+                 *
+                 *     while (true) {
+                 *         // Some staff
+                 *     }
+                 * }
+                 * </code>
+                 *
+                 * @return string
+                 */
+            DOC;
 
         $docBlock = new DocBlock($doc);
 
@@ -156,52 +156,52 @@ public function testPhpDocWithScalarParams(): void
         }
 
         $doc = <<<DOC
-    /**
-     * Method with various input params
-     *
-     * @param int \$valueInteger
-     * @param double \$valueDouble
-     * @param float \$valueFloat
-     * @param string \$valueString
-     * @param bool \$valueBoolean
-     * @param array \$valueArray
-     * @param string[] \$stringArray
-     * @param object \$valueObject
-     * @param resource \$valueResource
-     * @param null \$valueNull
-     *
-     * @param int|double \$valueIntOrDouble
-     * @param int|string \$intOrString
-     * @param array|object \$arrayOrObject
-     *
-     * @throws \Zephir\Compiler\CompilerException
-     * @return int|null - Return Some Result
-     */
-DOC;
+                /**
+                 * Method with various input params
+                 *
+                 * @param int \$valueInteger
+                 * @param double \$valueDouble
+                 * @param float \$valueFloat
+                 * @param string \$valueString
+                 * @param bool \$valueBoolean
+                 * @param array \$valueArray
+                 * @param string[] \$stringArray
+                 * @param object \$valueObject
+                 * @param resource \$valueResource
+                 * @param null \$valueNull
+                 *
+                 * @param int|double \$valueIntOrDouble
+                 * @param int|string \$intOrString
+                 * @param array|object \$arrayOrObject
+                 *
+                 * @throws \Zephir\Compiler\CompilerException
+                 * @return int|null - Return Some Result
+                 */
+            DOC;
 
         $expected = <<<DOC
-    /**
-     * Method with various input params
-     *
-     * @param int \$valueInteger
-     * @param double \$valueDouble
-     * @param float \$valueFloat
-     * @param string \$valueString
-     * @param bool \$valueBoolean
-     * @param array \$valueArray
-     * @param string[] \$stringArray
-     * @param object \$valueObject
-     * @param resource \$valueResource
-     * @param null \$valueNull
-     *
-     * @param int|double \$valueIntOrDouble
-     * @param int|string \$intOrString
-     * @param array|object \$arrayOrObject
-     *
-     * @throws \Zephir\Compiler\CompilerException
-     * @return int|null - Return Some Result
-     */
-DOC;
+                /**
+                 * Method with various input params
+                 *
+                 * @param int \$valueInteger
+                 * @param double \$valueDouble
+                 * @param float \$valueFloat
+                 * @param string \$valueString
+                 * @param bool \$valueBoolean
+                 * @param array \$valueArray
+                 * @param string[] \$stringArray
+                 * @param object \$valueObject
+                 * @param resource \$valueResource
+                 * @param null \$valueNull
+                 *
+                 * @param int|double \$valueIntOrDouble
+                 * @param int|string \$intOrString
+                 * @param array|object \$arrayOrObject
+                 *
+                 * @throws \Zephir\Compiler\CompilerException
+                 * @return int|null - Return Some Result
+                 */
+            DOC;
         $docBlock = new DocBlock($doc);
 
         $this->assertSame($expected, (string) $docBlock);
@@ -214,37 +214,37 @@ public function testPhpDocWithVariousDocBlockTags(): void
         }
 
         $doc = <<<DOC
-    /**
-     * Method with various tags
-     * @author Phalcon Team <noreply@zephir-lang.com>
-     * @copyright (c) 2013-present Phalcon Team (https://zephir-lang.com/)
-     * @license MIT https://docs.zephir-lang.com/0.12/en/license
-     * @link https://github.com/zephir-lang/zephir
-     * @since 1.0.0
-     * @todo Something
-     * @uses MyClass::function doSmthName
-     * @version 1.0.0
-     * @api Some Api Description
-     * @wrongTag - \$somethingStrange
-     */
-DOC;
+                /**
+                 * Method with various tags
+                 * @author Phalcon Team <noreply@zephir-lang.com>
+                 * @copyright (c) 2013-present Phalcon Team (https://zephir-lang.com/)
+                 * @license MIT https://docs.zephir-lang.com/0.12/en/license
+                 * @link https://github.com/zephir-lang/zephir
+                 * @since 1.0.0
+                 * @todo Something
+                 * @uses MyClass::function doSmthName
+                 * @version 1.0.0
+                 * @api Some Api Description
+                 * @wrongTag - \$somethingStrange
+                 */
+            DOC;
 
         $expected = <<<DOC
-    /**
-     * Method with various tags
-     *
-     * @author Phalcon Team <noreply@zephir-lang.com>
-     * @copyright (c) 2013-present Phalcon Team (https://zephir-lang.com/)
-     * @license MIT https://docs.zephir-lang.com/0.12/en/license
-     * @link https://github.com/zephir-lang/zephir
-     * @since 1.0.0
-     * @todo Something
-     * @uses MyClass::function doSmthName
-     * @version 1.0.0
-     * @api Some Api Description
-     * @wrongTag - \$somethingStrange
-     */
-DOC;
+                /**
+                 * Method with various tags
+                 *
+                 * @author Phalcon Team <noreply@zephir-lang.com>
+                 * @copyright (c) 2013-present Phalcon Team (https://zephir-lang.com/)
+                 * @license MIT https://docs.zephir-lang.com/0.12/en/license
+                 * @link https://github.com/zephir-lang/zephir
+                 * @since 1.0.0
+                 * @todo Something
+                 * @uses MyClass::function doSmthName
+                 * @version 1.0.0
+                 * @api Some Api Description
+                 * @wrongTag - \$somethingStrange
+                 */
+            DOC;
         $docBlock = new DocBlock($doc);
 
         $this->assertSame($expected, (string) $docBlock);
@@ -257,16 +257,16 @@ public function testPhpDocWithDoubleDollarSymbols(): void
         }
 
         $doc = <<<DOC
-    /**
-     * @param integer \$\$dollars - var description
-     */
-DOC;
+                /**
+                 * @param integer \$\$dollars - var description
+                 */
+            DOC;
 
         $expected = <<<DOC
-    /**
-     * @param integer \$dollars - var description
-     */
-DOC;
+                /**
+                 * @param integer \$dollars - var description
+                 */
+            DOC;
         $docBlock = new DocBlock($doc);
 
         $this->assertSame($expected, (string) $docBlock);
diff --git a/tests/Zephir/Stubs/GeneratorTest.php b/tests/Zephir/Stubs/GeneratorTest.php
index 4f11177886..fa0f2558f3 100644
--- a/tests/Zephir/Stubs/GeneratorTest.php
+++ b/tests/Zephir/Stubs/GeneratorTest.php
@@ -63,38 +63,38 @@ public function testShouldBuildClass(): void
         }
 
         $expected = <<<DOC
-<?php
-
-namespace Stub\Stubs;
-
-use Stub\Extendable\BaseTestClass;
-use Stub\Events\EventInterface as EventsManagerInterface;
-
-/**
- * Class description example
- */
-final class StubsBuildClass extends BaseTestClass implements \Iterator, EventsManagerInterface
-{
-    /**
-     * Default path delimiter
-     */
-    const DEFAULT_PATH_DELIMITER = '.';
-
-    /**
-     * Default path delimiter class property
-     */
-    static public \$defaultPathDelimiter = null;
-
-    /**
-     * @param string \$key
-     * @param int \$priority
-     */
-    public static function init(string \$key, int \$priority = 1)
-    {
-    }
-}
-
-DOC;
+            <?php
+
+            namespace Stub\Stubs;
+
+            use Stub\Extendable\BaseTestClass;
+            use Stub\Events\EventInterface as EventsManagerInterface;
+
+            /**
+             * Class description example
+             */
+            final class StubsBuildClass extends BaseTestClass implements \Iterator, EventsManagerInterface
+            {
+                /**
+                 * Default path delimiter
+                 */
+                const DEFAULT_PATH_DELIMITER = '.';
+
+                /**
+                 * Default path delimiter class property
+                 */
+                static public \$defaultPathDelimiter = null;
+
+                /**
+                 * @param string \$key
+                 * @param int \$priority
+                 */
+                public static function init(string \$key, int \$priority = 1)
+                {
+                }
+            }
+
+            DOC;
 
         // Test requirements initialization
 
@@ -435,17 +435,17 @@ public function testShouldBuildMethod(): void
         );
 
         $expected = <<<DOC
-/**
- * Example description for testName method.
- *
- * @param string \$key
- * @param int \$priority
- * @return bool
- */
-public static function testName(string \$key, int \$priority = 1): bool
-{
-}
-DOC;
+            /**
+             * Example description for testName method.
+             *
+             * @param string \$key
+             * @param int \$priority
+             * @return bool
+             */
+            public static function testName(string \$key, int \$priority = 1): bool
+            {
+            }
+            DOC;
 
         // protected function buildMethod(ClassMethod $method, bool $isInterface, string $indent): string
         $actual = $buildClass->invokeArgs(
diff --git a/tests/Zephir/Variable/VariableTest.php b/tests/Zephir/Variable/VariableTest.php
index a250667937..80f477e25a 100644
--- a/tests/Zephir/Variable/VariableTest.php
+++ b/tests/Zephir/Variable/VariableTest.php
@@ -211,7 +211,7 @@ public function testShouldEnableDefaultAutoInitValue(): void
             'variable', 'string', 'array',
         ];
 
-        $delegate = function (Variable $zephirVar, string $type) {
+        $delegate = function (Variable $zephirVar, string $type): void {
             $zephirVar->setDefaultInitValue('default');
             $zephirVar->setType($type);
             $zephirVar->enableDefaultAutoInitValue();

From faced3a6589749fd96a8c10d2155de460733e79e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:16:10 +0000
Subject: [PATCH 156/375] Remove `string` type from method's argument

---
 stub/fetchtest.zep | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stub/fetchtest.zep b/stub/fetchtest.zep
index 8c7c08f948..04cc16da81 100644
--- a/stub/fetchtest.zep
+++ b/stub/fetchtest.zep
@@ -64,7 +64,7 @@ class FetchTest
 		return c;
 	}
 
-	public function hasValue(string name) -> boolean
+	public function hasValue(name) -> boolean
 	{
 		// Check if there is a post value for the item
 		if isset _POST[name] {
@@ -79,7 +79,7 @@ class FetchTest
 		return false;
 	}
 
-	public function getValue(string name)
+	public function getValue(name)
 	{
 		var value;
 

From ac6cefe011a8ef60a74767266704543549d5850b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:18:08 +0000
Subject: [PATCH 157/375] Use short syntax

---
 src/Backend/Backend.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index fc9663eef0..9648ae5efb 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -72,7 +72,7 @@ public function declareVariables($method, $typeToVariables)
         $additionalCode = $method ? $this->onPreInitVar($method) : '';
 
         foreach ($typeToVariables as $type => $variables) {
-            list($pointer, $code) = $this->getTypeDefinition($type);
+            [$pointer, $code] = $this->getTypeDefinition($type);
             $code .= ' ';
             $groupVariables = [];
 
@@ -1396,7 +1396,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
 
     public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExprs, CompilationContext $compilationContext)
     {
-        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
 
         $symbol = $this->resolveValue($symbolVariable, $compilationContext, true);
         $varCode = $this->getVariableCode($variable);
@@ -1414,7 +1414,7 @@ public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExp
 
     public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext): void
     {
-        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
         $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
 
         $compilationContext->codePrinter->output(
@@ -1432,7 +1432,7 @@ public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $pr
 
     public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext)
     {
-        list($keys, $offsetItems, $numberParams) = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
         $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
 
         $offsetStr = $offsetItems ? ', '.implode(', ', $offsetItems) : '';

From 99d2c8721dfc6889c2da7b6752db9789999d7951 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:19:17 +0000
Subject: [PATCH 158/375] Adjust CS

---
 src/Class/Definition/Definition.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 4834b4c7b5..1e5110587c 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -1150,7 +1150,7 @@ public function compile(CompilationContext $compilationContext): void
                             $codePrinter->output(
                                 sprintf(
                                     // TODO: Rename to ZEND_ME
-                                    "PHP_ME(%s_%s, %s, %s, %s)",
+                                    'PHP_ME(%s_%s, %s, %s, %s)',
                                     $this->getCNamespace(),
                                     $this->getName(),
                                     $method->getName(),
@@ -1175,7 +1175,7 @@ public function compile(CompilationContext $compilationContext): void
                         } else {
                             $codePrinter->output(
                                 sprintf(
-                                    "ZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)",
+                                    'ZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)',
                                     $method->getName(),
                                     $method->getArgInfoName($this)
                                 )

From 9b724ebc7b14d3b382d9169969af27f6a1735719 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:19:24 +0000
Subject: [PATCH 159/375] Adjust CS

---
 src/Code/ArgInfoDefinition.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Code/ArgInfoDefinition.php b/src/Code/ArgInfoDefinition.php
index b93ca5d439..143e741fd6 100644
--- a/src/Code/ArgInfoDefinition.php
+++ b/src/Code/ArgInfoDefinition.php
@@ -249,7 +249,7 @@ private function renderEnd(): void
                     } else {
                         $this->codePrinter->output(
                             sprintf(
-                                "ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(%d, %s, IS_ARRAY, %d, %s)",
+                                'ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(%d, %s, IS_ARRAY, %d, %s)',
                                 $this->passByReference($parameter),
                                 $parameter['name'],
                                 (int) $this->allowNull($parameter),

From b6f8535a88c8a35a5ea97ccf1e0f9a46ae6b9f69 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:23:36 +0000
Subject: [PATCH 160/375] Add return type

---
 src/Compiler.php                                  |  6 +++---
 src/Console/Command/ApiCommand.php                |  2 +-
 src/Console/Command/BuildCommand.php              |  2 +-
 src/Console/Command/CleanCommand.php              |  2 +-
 src/Console/Command/CompileCommand.php            |  2 +-
 src/Console/Command/FullCleanCommand.php          |  2 +-
 src/Console/Command/GenerateCommand.php           |  2 +-
 src/Console/Command/InstallCommand.php            |  2 +-
 src/Console/Command/ListCommand.php               |  4 ++--
 src/Console/Command/StubsCommand.php              |  2 +-
 src/Documentation/Annotation/Link.php             |  2 +-
 src/Documentation/Annotation/ReturnAnnotation.php |  4 +++-
 src/Documentation/Annotation/See.php              |  4 +++-
 src/Documentation/Docblock.php                    |  2 +-
 src/Documentation/DocblockParser.php              |  2 +-
 src/Documentation/NamespaceAccessor.php           |  2 +-
 src/Documentation/Theme.php                       |  8 ++++----
 src/Expression/PropertyAccess.php                 |  2 +-
 src/Expression/PropertyDynamicAccess.php          |  6 +++---
 src/Passes/StaticTypeInference.php                | 14 +++++++-------
 src/Statements/Let/ArrayIndex.php                 |  6 +++---
 src/Statements/Let/ArrayIndexAppend.php           |  4 ++--
 22 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index c45972a091..be5604fd84 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -903,7 +903,7 @@ public function install(bool $development = false): void
             ]
         );
 
-        array_map(function ($entry) {
+        array_map(function ($entry): void {
             if (!empty($entry)) {
                 $this->logger->debug(trim($entry));
             }
@@ -1919,7 +1919,7 @@ private function recursiveProcess($src, $dest, $pattern = null, $callback = 'cop
      * @param string $path Directory to deletes files
      * @param string $mask Regular expression to deletes files
      */
-    private function recursiveDeletePath($path, $mask)
+    private function recursiveDeletePath($path, $mask): void
     {
         if (!file_exists($path) || !is_dir($path) || !is_readable($path)) {
             $this->logger->warning("Directory '{$path}' is not readable. Skip...");
@@ -1946,7 +1946,7 @@ private function recursiveDeletePath($path, $mask)
      *
      * @throws Exception
      */
-    private function loadConstantsSources(array $constantsSources)
+    private function loadConstantsSources(array $constantsSources): void
     {
         foreach ($constantsSources as $constantsSource) {
             if (!file_exists($constantsSource)) {
diff --git a/src/Console/Command/ApiCommand.php b/src/Console/Command/ApiCommand.php
index c496639acb..dfd76ca35a 100644
--- a/src/Console/Command/ApiCommand.php
+++ b/src/Console/Command/ApiCommand.php
@@ -33,7 +33,7 @@ public function __construct(private Compiler $compiler, private Config $config)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('api')
diff --git a/src/Console/Command/BuildCommand.php b/src/Console/Command/BuildCommand.php
index a7f10a0aac..735ef3922a 100644
--- a/src/Console/Command/BuildCommand.php
+++ b/src/Console/Command/BuildCommand.php
@@ -28,7 +28,7 @@ final class BuildCommand extends AbstractCommand
     use DevelopmentModeAwareTrait;
     use ZflagsAwareTrait;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('build')
diff --git a/src/Console/Command/CleanCommand.php b/src/Console/Command/CleanCommand.php
index fd432bcd15..00a03647d8 100644
--- a/src/Console/Command/CleanCommand.php
+++ b/src/Console/Command/CleanCommand.php
@@ -34,7 +34,7 @@ public function __construct(FileSystemInterface $filesystem)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('clean')
diff --git a/src/Console/Command/CompileCommand.php b/src/Console/Command/CompileCommand.php
index d5e7bcf695..e5d772120e 100644
--- a/src/Console/Command/CompileCommand.php
+++ b/src/Console/Command/CompileCommand.php
@@ -38,7 +38,7 @@ public function __construct(Compiler $compiler)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('compile')
diff --git a/src/Console/Command/FullCleanCommand.php b/src/Console/Command/FullCleanCommand.php
index 8431826300..5078450e2a 100644
--- a/src/Console/Command/FullCleanCommand.php
+++ b/src/Console/Command/FullCleanCommand.php
@@ -27,7 +27,7 @@
  */
 final class FullCleanCommand extends AbstractCommand
 {
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('fullclean')
diff --git a/src/Console/Command/GenerateCommand.php b/src/Console/Command/GenerateCommand.php
index e5e2871abf..1b3d886edc 100644
--- a/src/Console/Command/GenerateCommand.php
+++ b/src/Console/Command/GenerateCommand.php
@@ -40,7 +40,7 @@ public function __construct(Compiler $compiler)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('generate')
diff --git a/src/Console/Command/InstallCommand.php b/src/Console/Command/InstallCommand.php
index 2758525463..aab80d743c 100644
--- a/src/Console/Command/InstallCommand.php
+++ b/src/Console/Command/InstallCommand.php
@@ -44,7 +44,7 @@ public function __construct(Compiler $compiler, Config $config)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('install')
diff --git a/src/Console/Command/ListCommand.php b/src/Console/Command/ListCommand.php
index 01c28dc8f0..3a5de699f9 100644
--- a/src/Console/Command/ListCommand.php
+++ b/src/Console/Command/ListCommand.php
@@ -27,7 +27,7 @@ final class ListCommand extends Command
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -39,7 +39,7 @@ protected function configure()
      *
      * @param bool $mergeArgs
      */
-    public function mergeApplicationDefinition($mergeArgs = true)
+    public function mergeApplicationDefinition($mergeArgs = true): void
     {
         parent::mergeApplicationDefinition($mergeArgs);
 
diff --git a/src/Console/Command/StubsCommand.php b/src/Console/Command/StubsCommand.php
index 3613595b4a..5c229d3e2a 100644
--- a/src/Console/Command/StubsCommand.php
+++ b/src/Console/Command/StubsCommand.php
@@ -38,7 +38,7 @@ public function __construct(Compiler $compiler)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('stubs')
diff --git a/src/Documentation/Annotation/Link.php b/src/Documentation/Annotation/Link.php
index 7caeb674e3..00a1f2f922 100644
--- a/src/Documentation/Annotation/Link.php
+++ b/src/Documentation/Annotation/Link.php
@@ -44,7 +44,7 @@ public function getLinkText()
         return $this->linkText;
     }
 
-    protected function parseContent()
+    protected function parseContent(): void
     {
         $spaceIndex = strpos($this->string, ' ');
 
diff --git a/src/Documentation/Annotation/ReturnAnnotation.php b/src/Documentation/Annotation/ReturnAnnotation.php
index 6bda8943d0..9ee0f8a827 100644
--- a/src/Documentation/Annotation/ReturnAnnotation.php
+++ b/src/Documentation/Annotation/ReturnAnnotation.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\Annotation;
 
 use Zephir\Documentation\Annotation;
@@ -39,7 +41,7 @@ public function getDescription(): string
         return $this->description;
     }
 
-    protected function parseContent()
+    protected function parseContent(): void
     {
         $spaceIndex = strpos($this->string, ' ');
 
diff --git a/src/Documentation/Annotation/See.php b/src/Documentation/Annotation/See.php
index 4fac67b8bc..0c3dfbe74f 100644
--- a/src/Documentation/Annotation/See.php
+++ b/src/Documentation/Annotation/See.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\Annotation;
 
 use Zephir\Documentation\Annotation;
@@ -39,7 +41,7 @@ public function getText(): string
         return $this->text;
     }
 
-    protected function parseContent()
+    protected function parseContent(): void
     {
         $spaceIndex = strpos($this->string, ' ');
 
diff --git a/src/Documentation/Docblock.php b/src/Documentation/Docblock.php
index 2d66ccadc0..03d6a412b3 100644
--- a/src/Documentation/Docblock.php
+++ b/src/Documentation/Docblock.php
@@ -92,7 +92,7 @@ public function setDescription(string $description)
     /**
      * @param Annotation $annotation
      */
-    public function addAnnotation(Annotation $annotation)
+    public function addAnnotation(Annotation $annotation): void
     {
         $this->annotations[] = $annotation;
     }
diff --git a/src/Documentation/DocblockParser.php b/src/Documentation/DocblockParser.php
index fe746af5c1..098bc575e1 100644
--- a/src/Documentation/DocblockParser.php
+++ b/src/Documentation/DocblockParser.php
@@ -54,7 +54,7 @@ public function __construct(string $annotation)
     /**
      * check if there is a currently parsed annotation, registers it, and stops the current annotation parsing.
      */
-    private function __tryRegisterAnnotation()
+    private function __tryRegisterAnnotation(): void
     {
         if (($this->annotationNameOpen || $this->annotationOpen) && $this->currentAnnotationStr !== '') {
             $annotation = $this->__createAnnotation($this->currentAnnotationStr, $this->currentAnnotationContentStr);
diff --git a/src/Documentation/NamespaceAccessor.php b/src/Documentation/NamespaceAccessor.php
index a2de18db50..103dc6c3f6 100644
--- a/src/Documentation/NamespaceAccessor.php
+++ b/src/Documentation/NamespaceAccessor.php
@@ -43,7 +43,7 @@ public function getNamespaceTree()
         return $this->namespaceTree;
     }
 
-    public function build()
+    public function build(): void
     {
         $byNamespace = [];
         $tree = [];
diff --git a/src/Documentation/Theme.php b/src/Documentation/Theme.php
index ad942b7204..df204b4aa4 100644
--- a/src/Documentation/Theme.php
+++ b/src/Documentation/Theme.php
@@ -68,7 +68,7 @@ public function __construct($themeDir, $outputDir, $themeConfig, $config, Docume
      * @param $dst
      * @param $files
      */
-    private function __copyDir($src, $dst, &$files = null)
+    private function __copyDir($src, $dst, &$files = null): void
     {
         $dir = opendir($src);
         @mkdir($dst);
@@ -94,7 +94,7 @@ private function __copyDir($src, $dst, &$files = null)
      *
      * @throws Exception
      */
-    public function drawFile(FileInterface $file)
+    public function drawFile(FileInterface $file): void
     {
         $outputFile = ltrim($file->getOutputFile(), '/');
 
@@ -164,7 +164,7 @@ public function getThemeInfoExtendAware($name)
     /**
      * copy the static directory of the theme into the output directory.
      */
-    public function buildStaticDirectory()
+    public function buildStaticDirectory(): void
     {
         $outputStt = $this->getOutputPath('asset');
 
@@ -248,7 +248,7 @@ public function buildJsonClassDefinition($classList, NamespaceAccessor $nsA)
         return json_encode($output);
     }
 
-    public function createFile($path, $content)
+    public function createFile($path, $content): void
     {
         $outputFile = $this->getOutputPath($path);
         touch($outputFile);
diff --git a/src/Expression/PropertyAccess.php b/src/Expression/PropertyAccess.php
index f2bf44dc54..0d1600fca7 100644
--- a/src/Expression/PropertyAccess.php
+++ b/src/Expression/PropertyAccess.php
@@ -50,7 +50,7 @@ public function setExpectReturn(bool $expecting, Variable $expectingVariable = n
      *
      * @param bool $readOnly
      */
-    public function setReadOnly($readOnly)
+    public function setReadOnly($readOnly): void
     {
         $this->readOnly = $readOnly;
     }
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index b2dff4dc87..72599000f4 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -40,7 +40,7 @@ class PropertyDynamicAccess
      * @param bool     $expecting
      * @param Variable $expectingVariable
      */
-    public function setExpectReturn($expecting, Variable $expectingVariable = null)
+    public function setExpectReturn($expecting, Variable $expectingVariable = null): void
     {
         $this->expecting = $expecting;
         $this->expectingVariable = $expectingVariable;
@@ -51,7 +51,7 @@ public function setExpectReturn($expecting, Variable $expectingVariable = null)
      *
      * @param bool $readOnly
      */
-    public function setReadOnly($readOnly)
+    public function setReadOnly($readOnly): void
     {
         $this->readOnly = $readOnly;
     }
@@ -61,7 +61,7 @@ public function setReadOnly($readOnly)
      *
      * @param bool $noisy
      */
-    public function setNoisy($noisy)
+    public function setNoisy($noisy): void
     {
         $this->noisy = $noisy;
     }
diff --git a/src/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
index 46f69edc42..80698457e4 100644
--- a/src/Passes/StaticTypeInference.php
+++ b/src/Passes/StaticTypeInference.php
@@ -30,12 +30,12 @@ class StaticTypeInference
      *
      * @param StatementsBlock $block
      */
-    public function pass(StatementsBlock $block)
+    public function pass(StatementsBlock $block): void
     {
         $this->passStatementBlock($block->getStatements());
     }
 
-    public function declareVariables(array $statement)
+    public function declareVariables(array $statement): void
     {
         foreach ($statement['variables'] as $variable) {
             if (!isset($this->variables[$variable['variable']])) {
@@ -208,7 +208,7 @@ public function getInferedType($variable)
         return false;
     }
 
-    public function passLetStatement(array $statement)
+    public function passLetStatement(array $statement): void
     {
         foreach ($statement['assignments'] as $assignment) {
             switch ($assignment['assign-type']) {
@@ -237,7 +237,7 @@ public function passLetStatement(array $statement)
         }
     }
 
-    public function passCall(array $expression)
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -246,14 +246,14 @@ public function passCall(array $expression)
         }
     }
 
-    public function passArray(array $expression)
+    public function passArray(array $expression): void
     {
         foreach ($expression['left'] as $item) {
             $this->passExpression($item['value']);
         }
     }
 
-    public function passNew(array $expression)
+    public function passNew(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -474,7 +474,7 @@ public function passExpression(array $expression)
         }
     }
 
-    public function passStatementBlock(array $statements)
+    public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
             switch ($statement['type']) {
diff --git a/src/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
index 4958d4caf0..ba4de5f814 100644
--- a/src/Statements/Let/ArrayIndex.php
+++ b/src/Statements/Let/ArrayIndex.php
@@ -38,7 +38,7 @@ class ArrayIndex
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         /*
          * Arrays must be stored in the HEAP
@@ -198,7 +198,7 @@ protected function _getResolvedArrayItem(CompiledExpression $resolvedExpr, Compi
      *
      * @throws CompilerException
      */
-    protected function _assignArrayIndexSingle($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    protected function _assignArrayIndexSingle($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         $expression = new Expression($statement['index-expr'][0]);
         $exprIndex = $expression->compile($compilationContext);
@@ -272,7 +272,7 @@ protected function _assignArrayIndexMultiple(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         $statement
-    ) {
+    ): void {
         $offsetExprs = [];
 
         foreach ($statement['index-expr'] as $indexExpr) {
diff --git a/src/Statements/Let/ArrayIndexAppend.php b/src/Statements/Let/ArrayIndexAppend.php
index e9acc395e5..11bb11613f 100644
--- a/src/Statements/Let/ArrayIndexAppend.php
+++ b/src/Statements/Let/ArrayIndexAppend.php
@@ -37,7 +37,7 @@ class ArrayIndexAppend extends ArrayIndex
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         /*
          * Arrays must be stored in the HEAP
@@ -91,7 +91,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
      * @param CompilationContext $compilationContext
      * @param array              $statement
      */
-    protected function _assignArrayIndexMultiple($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    protected function _assignArrayIndexMultiple($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         $offsetExprs = [];
         foreach ($statement['index-expr'] as $indexExpr) {

From be7eb4f0bb359279d43a59aeacab5812d2d3dcb6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:23:56 +0000
Subject: [PATCH 161/375] Add return type

---
 src/StaticCall.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StaticCall.php b/src/StaticCall.php
index 4f865ed7bd..1ee6bc5fca 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -426,7 +426,7 @@ protected function callParent(string $methodName, array $expression, $symbolVari
      *
      * @throws Exception
      */
-    protected function callFromClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method)
+    protected function callFromClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method): void
     {
         $codePrinter = $compilationContext->codePrinter;
 

From 43226af8d8a928ba85c4c4f0e842f75347001811 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:24:03 +0000
Subject: [PATCH 162/375] Fix strict types

---
 src/StaticCall.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/StaticCall.php b/src/StaticCall.php
index 1ee6bc5fca..984b39ff72 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -318,14 +318,14 @@ protected function call(
             $ce = $method->getClassDefinition()->getClassEntry($compilationContext);
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, true, $paramCount);
+                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);
                     $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
                 } else {
                     $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);
                     $codePrinter->output($macro.'('.$symbol.', '.$ce.', '.$method->getInternalName().$paramsStr.');');
                 }
             } else {
-                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, false, $paramCount);
+                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);
                 $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
             }
         }
@@ -472,14 +472,14 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
             $ce = $classDefinition->getClassEntry($compilationContext);
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, true, $paramCount);
+                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);
                     $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
                 } else {
                     $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);
                     $codePrinter->output($macro.'('.$symbol.', '.$ce.', '.$method->getInternalName().$paramsStr.');');
                 }
             } else {
-                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, false, $paramCount);
+                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);
                 $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
             }
         } else {

From 90b1b9493bc1825c863a0c6510dfe4fd916216e5 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:28:37 +0000
Subject: [PATCH 163/375] Add return type

---
 src/Backend/Backend.php                       | 30 +++++++++----------
 src/Statements/Let/ArrayIndexAppend.php       |  4 +--
 src/Statements/Let/Decr.php                   |  2 +-
 src/Statements/Let/ExportSymbol.php           |  2 +-
 src/Statements/Let/ExportSymbolString.php     |  2 +-
 src/Statements/Let/Incr.php                   |  2 +-
 src/Statements/Let/ObjectDynamicProperty.php  |  2 +-
 .../Let/ObjectDynamicStringProperty.php       |  2 +-
 src/Statements/Let/ObjectProperty.php         |  2 +-
 src/Statements/Let/ObjectPropertyAppend.php   |  2 +-
 .../Let/ObjectPropertyArrayIndex.php          |  4 +--
 .../Let/ObjectPropertyArrayIndexAppend.php    |  4 +--
 src/Statements/Let/ObjectPropertyDecr.php     |  2 +-
 src/Statements/Let/ObjectPropertyIncr.php     |  2 +-
 src/Statements/Let/StaticProperty.php         |  2 +-
 src/Statements/Let/StaticPropertyAdd.php      |  2 +-
 src/Statements/Let/StaticPropertyAppend.php   |  4 +--
 .../Let/StaticPropertyArrayIndex.php          |  4 +--
 .../Let/StaticPropertyArrayIndexAppend.php    |  4 +--
 src/Statements/Let/StaticPropertySub.php      |  2 +-
 src/Statements/Let/Variable.php               | 14 ++++-----
 src/Statements/Let/VariableAppend.php         |  2 +-
 src/Statements/LetStatement.php               |  2 +-
 src/Statements/RequireOnceStatement.php       |  2 +-
 src/Statements/RequireStatement.php           |  2 +-
 src/Statements/WhileStatement.php             |  2 +-
 26 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index 9648ae5efb..3a55b08f96 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -420,7 +420,7 @@ public function initializeVariableDefaults(array $variables, CompilationContext
         return $codePrinter->getOutput();
     }
 
-    public function declareConstant($type, $name, $value, CompilationContext $context)
+    public function declareConstant($type, $name, $value, CompilationContext $context): void
     {
         $ce = $context->classDefinition->getClassEntry($context);
 
@@ -538,7 +538,7 @@ public function assignString(
      * @param string             $code
      * @param CompilationContext $context
      */
-    public function assignZval(Variable $variable, $code, CompilationContext $context)
+    public function assignZval(Variable $variable, $code, CompilationContext $context): void
     {
         $code = $this->resolveValue($code, $context);
         if (!$variable->isDoublePointer()) {
@@ -580,7 +580,7 @@ public function assignNull(Variable $variable, CompilationContext $context, $use
         return $output;
     }
 
-    public function createClosure(Variable $variable, $classDefinition, CompilationContext $context)
+    public function createClosure(Variable $variable, $classDefinition, CompilationContext $context): void
     {
         $symbol = $this->getVariableCode($variable);
         $context->codePrinter->output(
@@ -745,7 +745,7 @@ public function propertyIsset(Variable $var, $key)
         return new CompiledExpression('bool', 'zephir_isset_property('.$this->getVariableCode($var).', SL("'.$key.'"))', null);
     }
 
-    public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationContext $context)
+    public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationContext $context): void
     {
         $context->headersManager->add('kernel/array');
         $variableCode = $this->getVariableCode($variable);
@@ -758,7 +758,7 @@ public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationCo
         $this->arrayUnset2($variable, $exprIndex, $flags, $context);
     }
 
-    public function arrayUnset2(Variable $variable, $exprIndex, $flags, CompilationContext $context)
+    public function arrayUnset2(Variable $variable, $exprIndex, $flags, CompilationContext $context): void
     {
         $context->headersManager->add('kernel/array');
         $variableCode = $this->getVariableCode($variable);
@@ -811,7 +811,7 @@ public function fetchGlobal(Variable $globalVar, CompilationContext $compilation
         return $output;
     }
 
-    public function fetchClass(Variable $zendClassEntry, $className, $guarded, CompilationContext $context)
+    public function fetchClass(Variable $zendClassEntry, $className, $guarded, CompilationContext $context): void
     {
         $context->headersManager->add('kernel/object');
         if ($guarded) {
@@ -838,7 +838,7 @@ public function fetchProperty(
         $property,
         $readOnly,
         CompilationContext $context
-    ) {
+    ): void {
         $flags = 'PH_NOISY_CC';
         if ($readOnly) {
             $flags .= ' | PH_READONLY';
@@ -1069,7 +1069,7 @@ public function copyOnWrite(Variable $target, $var, CompilationContext $context)
         }
     }
 
-    public function forStatement(Variable $exprVariable, $keyVariable, $variable, $duplicateKey, $duplicateHash, $statement, $statementBlock, CompilationContext $compilationContext)
+    public function forStatement(Variable $exprVariable, $keyVariable, $variable, $duplicateKey, $duplicateHash, $statement, $statementBlock, CompilationContext $compilationContext): void
     {
         /**
          * Create a temporary zval to fetch the items from the hash.
@@ -1280,14 +1280,14 @@ public function initArray(Variable $variable, CompilationContext $context, int $
         $context->codePrinter->output($output);
     }
 
-    public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context)
+    public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context): void
     {
         $variable = $this->getVariableCode($variable);
         $itemVariable = $this->getVariableCode($itemVariable);
         $context->codePrinter->output('zephir_concat_self('.$variable.', '.$itemVariable.');');
     }
 
-    public function updateArray(Variable $symbolVariable, $key, $value, CompilationContext $compilationContext, $flags = null)
+    public function updateArray(Variable $symbolVariable, $key, $value, CompilationContext $compilationContext, $flags = null): void
     {
         $value = $this->resolveValue($value, $compilationContext, true);
         if (!isset($flags)) {
@@ -1394,7 +1394,7 @@ public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayA
         return $output;
     }
 
-    public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExprs, CompilationContext $compilationContext)
+    public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExprs, CompilationContext $compilationContext): void
     {
         [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
 
@@ -1430,7 +1430,7 @@ public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $pr
         );
     }
 
-    public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext)
+    public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext): void
     {
         [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
         $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
@@ -1454,7 +1454,7 @@ public function checkConstructor(Variable $var, CompilationContext $context): vo
         $context->codePrinter->output('if (zephir_has_constructor('.$this->getVariableCode($var).')) {');
     }
 
-    public function callDynamicFunction($symbolVariable, Variable $variable, CompilationContext $context, $params = [], $cache = 'NULL', $cacheSlot = 0)
+    public function callDynamicFunction($symbolVariable, Variable $variable, CompilationContext $context, $params = [], $cache = 'NULL', $cacheSlot = 0): void
     {
         $paramStr = null != $params ? ', '.implode(', ', $params) : '';
         if (!isset($symbolVariable)) {
@@ -1466,7 +1466,7 @@ public function callDynamicFunction($symbolVariable, Variable $variable, Compila
         }
     }
 
-    public function zvalOperator($zvalOperator, Variable $expected, Variable $variableLeft, Variable $variableRight, CompilationContext $compilationContext)
+    public function zvalOperator($zvalOperator, Variable $expected, Variable $variableLeft, Variable $variableRight, CompilationContext $compilationContext): void
     {
         $expected = $this->getVariableCode($expected);
         $op1 = $this->getVariableCode($variableLeft);
@@ -1475,7 +1475,7 @@ public function zvalOperator($zvalOperator, Variable $expected, Variable $variab
         $compilationContext->codePrinter->output($zvalOperator.'('.$expected.', '.$op1.', '.$op2.');');
     }
 
-    public function checkStrictType($type, $var, CompilationContext $context)
+    public function checkStrictType($type, $var, CompilationContext $context): void
     {
         $codePrinter = $context->codePrinter;
         $conditions = [];
diff --git a/src/Statements/Let/ArrayIndexAppend.php b/src/Statements/Let/ArrayIndexAppend.php
index 11bb11613f..613f6993b4 100644
--- a/src/Statements/Let/ArrayIndexAppend.php
+++ b/src/Statements/Let/ArrayIndexAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index 40c96bac0f..e17862057e 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -34,7 +34,7 @@ class Decr
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/Let/ExportSymbol.php b/src/Statements/Let/ExportSymbol.php
index b24d8d58b5..f2dacfb513 100644
--- a/src/Statements/Let/ExportSymbol.php
+++ b/src/Statements/Let/ExportSymbol.php
@@ -34,7 +34,7 @@ class ExportSymbol
      * @param CompilationContext $compilationContext,
      * @param array              $statement
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         $codePrinter = $compilationContext->codePrinter;
 
diff --git a/src/Statements/Let/ExportSymbolString.php b/src/Statements/Let/ExportSymbolString.php
index 5f216564e9..ceb8c0c5ac 100644
--- a/src/Statements/Let/ExportSymbolString.php
+++ b/src/Statements/Let/ExportSymbolString.php
@@ -34,7 +34,7 @@ class ExportSymbolString
      * @param CompilationContext $compilationContext,
      * @param array              $statement
      */
-    public function assign($variable, ZephirVariable $symbolVariable = null, CompiledExpression $resolvedExpr = null, CompilationContext $compilationContext = null, $statement = null)
+    public function assign($variable, ZephirVariable $symbolVariable = null, CompiledExpression $resolvedExpr = null, CompilationContext $compilationContext = null, $statement = null): void
     {
         $codePrinter = $compilationContext->codePrinter;
 
diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index 43084965df..b11b0995ce 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -34,7 +34,7 @@ class Incr
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/Let/ObjectDynamicProperty.php b/src/Statements/Let/ObjectDynamicProperty.php
index bdb85e1beb..20de5311ad 100644
--- a/src/Statements/Let/ObjectDynamicProperty.php
+++ b/src/Statements/Let/ObjectDynamicProperty.php
@@ -35,7 +35,7 @@ class ObjectDynamicProperty
      * @throws CompilerException
      * @throws \Exception
      */
-    public function assign(string $variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
+    public function assign(string $variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/Let/ObjectDynamicStringProperty.php b/src/Statements/Let/ObjectDynamicStringProperty.php
index c20d2251d0..1d45a06f79 100644
--- a/src/Statements/Let/ObjectDynamicStringProperty.php
+++ b/src/Statements/Let/ObjectDynamicStringProperty.php
@@ -35,7 +35,7 @@ class ObjectDynamicStringProperty
      * @throws CompilerException
      * @throws \Exception
      */
-    public function assign(string $variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
+    public function assign(string $variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/Let/ObjectProperty.php b/src/Statements/Let/ObjectProperty.php
index 09d9a63227..c88d8ea05a 100644
--- a/src/Statements/Let/ObjectProperty.php
+++ b/src/Statements/Let/ObjectProperty.php
@@ -42,7 +42,7 @@ public function assign(
         Expression $expression,
         Context $context,
         array $statement
-    ) {
+    ): void {
         if (!$symbolVariable->isInitialized()) {
             throw new Exception(
                 "Cannot mutate variable '{$variable}' because it is not initialized",
diff --git a/src/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
index 56731a3c0c..3e17ee39f5 100644
--- a/src/Statements/Let/ObjectPropertyAppend.php
+++ b/src/Statements/Let/ObjectPropertyAppend.php
@@ -36,7 +36,7 @@ class ObjectPropertyAppend
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index ebe38ac50a..1473d6879e 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -37,7 +37,7 @@ class ObjectPropertyArrayIndex extends ArrayIndex
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
@@ -68,7 +68,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
      *
      * @throws CompilerException
      */
-    protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
+    protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
     {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
diff --git a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
index a05b5d3eb4..af559bf02c 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -34,7 +34,7 @@ class ObjectPropertyArrayIndexAppend extends ArrayIndex
      * @param CompilationContext $compilationContext,
      * @param array              $statement
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
@@ -58,7 +58,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
      * @throws \ReflectionException
      * @throws Exception
      */
-    protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
+    protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
     {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index 605d7d7cc0..d34d812135 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -33,7 +33,7 @@ class ObjectPropertyDecr
      * @param array              $statement
      * @param mixed              $property
      */
-    public function assign($variable, $property, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement)
+    public function assign($variable, $property, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index ce07933dfc..0f560b55a5 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -33,7 +33,7 @@ class ObjectPropertyIncr
      * @param CompilationContext $compilationContext
      * @param array              $statement
      */
-    public function assign($variable, $property, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement)
+    public function assign($variable, $property, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
index 2f011da5a9..627a5f3cea 100644
--- a/src/Statements/Let/StaticProperty.php
+++ b/src/Statements/Let/StaticProperty.php
@@ -41,7 +41,7 @@ public function assignStatic(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         $classDefinition = $compilationContext->classLookup($className);
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
diff --git a/src/Statements/Let/StaticPropertyAdd.php b/src/Statements/Let/StaticPropertyAdd.php
index 6c3fedc976..af1df7c2d4 100644
--- a/src/Statements/Let/StaticPropertyAdd.php
+++ b/src/Statements/Let/StaticPropertyAdd.php
@@ -44,7 +44,7 @@ public function assignStatic(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         $classDefinition = $compilationContext->classLookup($className);
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index f89b138747..86e6af7204 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -44,7 +44,7 @@ public function assignStatic(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         $compiler = $compilationContext->compiler;
         if (!\in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
@@ -109,7 +109,7 @@ protected function _assignStaticPropertyArrayMultipleIndex(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
 
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 1bd6ad1d49..8e9e6e1882 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -45,7 +45,7 @@ public function assignStatic(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         $compiler = $compilationContext->compiler;
         if (!\in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
@@ -113,7 +113,7 @@ protected function _assignStaticPropertyArrayMultipleIndex(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         $statement
-    ) {
+    ): void {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
 
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index 3ab3276d34..c51d0ef6ff 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -45,7 +45,7 @@ public function assignStatic(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         $compiler = $compilationContext->compiler;
         if (!\in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
@@ -112,7 +112,7 @@ protected function _assignStaticPropertyArrayMultipleIndex(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         $statement
-    ) {
+    ): void {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
 
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index e5de271543..c9a4fa5de1 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -44,7 +44,7 @@ public function assignStatic(
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         $classDefinition = $compilationContext->classLookup($className);
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index ef4fbab8e9..4df0c74ac6 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -49,7 +49,7 @@ public function assign(
         ReadDetector $readDetector,
         CompilationContext $compilationContext,
         array $statement
-    ) {
+    ): void {
         if ($symbolVariable->isReadOnly()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is read only", $statement);
         }
@@ -122,7 +122,7 @@ private function doNumericAssignment(
         string $variable,
         array $statement,
         CompilationContext $compilationContext
-    ) {
+    ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
                 switch ($statement['operator']) {
@@ -354,7 +354,7 @@ private function doDoubleAssignment(
         string $variable,
         array $statement,
         CompilationContext $compilationContext
-    ) {
+    ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
                 switch ($statement['operator']) {
@@ -536,7 +536,7 @@ private function doStringAssignment(
         string $variable,
         array $statement,
         CompilationContext $compilationContext
-    ) {
+    ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
                 switch ($statement['operator']) {
@@ -724,7 +724,7 @@ private function doArrayAssignment(
         string $variable,
         array $statement,
         CompilationContext $compilationContext
-    ) {
+    ): void {
         switch ($resolvedExpr->getType()) {
             case 'variable':
             case 'array':
@@ -771,7 +771,7 @@ private function doBoolAssignment(
         string $variable,
         array $statement,
         CompilationContext $compilationContext
-    ) {
+    ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
                 switch ($statement['operator']) {
@@ -910,7 +910,7 @@ private function doVariableAssignment(
         array $statement,
         CompilationContext $compilationContext,
         ReadDetector $readDetector
-    ) {
+    ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
                 switch ($statement['operator']) {
diff --git a/src/Statements/Let/VariableAppend.php b/src/Statements/Let/VariableAppend.php
index 243d9675e9..d0bf3f1526 100644
--- a/src/Statements/Let/VariableAppend.php
+++ b/src/Statements/Let/VariableAppend.php
@@ -36,7 +36,7 @@ class VariableAppend
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement)
+    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
     {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index 3a514cfa6e..003086b74a 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -55,7 +55,7 @@ class LetStatement extends StatementAbstract
      *
      * @throws CompilerException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $readDetector = new ReadDetector();
 
diff --git a/src/Statements/RequireOnceStatement.php b/src/Statements/RequireOnceStatement.php
index b6046c3555..8241e9f64f 100644
--- a/src/Statements/RequireOnceStatement.php
+++ b/src/Statements/RequireOnceStatement.php
@@ -29,7 +29,7 @@ class RequireOnceStatement extends StatementAbstract
      *
      * @throws Exception
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $expression = [
             'type' => 'require_once',
diff --git a/src/Statements/RequireStatement.php b/src/Statements/RequireStatement.php
index b7783d21e5..599a354828 100644
--- a/src/Statements/RequireStatement.php
+++ b/src/Statements/RequireStatement.php
@@ -29,7 +29,7 @@ class RequireStatement extends StatementAbstract
      *
      * @throws CompilerException
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $expression = [
             'type' => 'require',
diff --git a/src/Statements/WhileStatement.php b/src/Statements/WhileStatement.php
index 98baa169e2..d548850957 100644
--- a/src/Statements/WhileStatement.php
+++ b/src/Statements/WhileStatement.php
@@ -27,7 +27,7 @@ class WhileStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      */
-    public function compile(CompilationContext $compilationContext)
+    public function compile(CompilationContext $compilationContext): void
     {
         $exprRaw = $this->statement['expr'];
         $codePrinter = $compilationContext->codePrinter;

From 959c4b45f6844ca1063e9fd9e489738d932fabdf Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:30:11 +0000
Subject: [PATCH 164/375] Add visibility in class constants

---
 .../Builder/Operators/BinaryOperator.php      | 64 +++++++++----------
 .../Builder/Operators/UnaryOperator.php       | 28 ++++----
 .../Statements/CallFunctionStatement.php      |  6 +-
 src/FunctionCall.php                          |  6 +-
 src/HeadersManager.php                        |  4 +-
 src/MethodCall.php                            |  6 +-
 .../FunctionCall/PregMatchOptimizer.php       |  2 +-
 7 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/Expression/Builder/Operators/BinaryOperator.php b/src/Expression/Builder/Operators/BinaryOperator.php
index dc7e039d39..b7ebbd57a9 100644
--- a/src/Expression/Builder/Operators/BinaryOperator.php
+++ b/src/Expression/Builder/Operators/BinaryOperator.php
@@ -21,100 +21,100 @@
 class BinaryOperator extends AbstractOperator
 {
     // x + y
-    const OPERATOR_ADD = 'add';
+    public const OPERATOR_ADD = 'add';
 
     // x - y
-    const OPERATOR_SUB = 'sub';
+    public const OPERATOR_SUB = 'sub';
 
     // x * y
-    const OPERATOR_MUL = 'mul';
+    public const OPERATOR_MUL = 'mul';
 
     // x / y
-    const OPERATOR_DIV = 'div';
+    public const OPERATOR_DIV = 'div';
 
     // x % y
-    const OPERATOR_MOD = 'mod';
+    public const OPERATOR_MOD = 'mod';
 
     // x . y
-    const OPERATOR_CONCAT = 'concat';
+    public const OPERATOR_CONCAT = 'concat';
 
     // x && y
-    const OPERATOR_AND = 'and';
+    public const OPERATOR_AND = 'and';
 
     // x || y
-    const OPERATOR_OR = 'or';
+    public const OPERATOR_OR = 'or';
 
     // x | y
-    const OPERATOR_BITWISE_OR = 'bitwise_or';
+    public const OPERATOR_BITWISE_OR = 'bitwise_or';
 
     // x & y
-    const OPERATOR_BITWISE_AND = 'bitwise_and';
+    public const OPERATOR_BITWISE_AND = 'bitwise_and';
 
     // x ^ y
-    const OPERATOR_BITWISE_XOR = 'bitwise_xor';
+    public const OPERATOR_BITWISE_XOR = 'bitwise_xor';
 
     // x << y
-    const OPERATOR_BITWISE_SHIFT_LEFT = 'bitwise_shiftleft';
+    public const OPERATOR_BITWISE_SHIFT_LEFT = 'bitwise_shiftleft';
 
     // x >> y
-    const OPERATOR_BITWISE_SHIFT_RIGHT = 'bitwise_shiftright';
+    public const OPERATOR_BITWISE_SHIFT_RIGHT = 'bitwise_shiftright';
 
     // x instanceof y
-    const OPERATOR_INSTANCEOF = 'instanceof';
+    public const OPERATOR_INSTANCEOF = 'instanceof';
 
     // x .. y
-    const OPERATOR_IRANGE = 'irange';
+    public const OPERATOR_IRANGE = 'irange';
 
     // x ... y
-    const OPERATOR_ERANGE = 'erange';
+    public const OPERATOR_ERANGE = 'erange';
 
     // x == y
-    const OPERATOR_EQUALS = 'equals';
+    public const OPERATOR_EQUALS = 'equals';
 
     // x != y
-    const OPERATOR_NOT_EQUALS = 'not-equals';
+    public const OPERATOR_NOT_EQUALS = 'not-equals';
 
     // x ==- y
-    const OPERATOR_IDENTICAL = 'identical';
+    public const OPERATOR_IDENTICAL = 'identical';
 
     // x !== y
-    const OPERATOR_NOT_IDENTICAL = 'not-identical';
+    public const OPERATOR_NOT_IDENTICAL = 'not-identical';
 
     // x < y
-    const OPERATOR_LESS = 'less';
+    public const OPERATOR_LESS = 'less';
 
     // x > y
-    const OPERATOR_GREATER = 'greater';
+    public const OPERATOR_GREATER = 'greater';
 
     // x <= y
-    const OPERATOR_LESS_EQUAL = 'less-equal';
+    public const OPERATOR_LESS_EQUAL = 'less-equal';
 
     // x >= y
-    const OPERATOR_GREATER_EQUAL = 'greater-equal';
+    public const OPERATOR_GREATER_EQUAL = 'greater-equal';
 
     // (type) a
-    const OPERATOR_CAST = 'cast';
+    public const OPERATOR_CAST = 'cast';
 
     // <type> a
-    const OPERATOR_TYPE_HINT = 'type-hint';
+    public const OPERATOR_TYPE_HINT = 'type-hint';
 
     // x -> y
-    const OPERATOR_ACCESS_PROPERTY = 'property-access';
+    public const OPERATOR_ACCESS_PROPERTY = 'property-access';
 
     // x -> {y}
-    const OPERATOR_ACCESS_PROPERTY_DYNAMIC = 'property-dynamic-access';
+    public const OPERATOR_ACCESS_PROPERTY_DYNAMIC = 'property-dynamic-access';
 
     // x -> {"string"}
-    const OPERATOR_ACCESS_PROPERTY_STRING = 'property-string-access';
+    public const OPERATOR_ACCESS_PROPERTY_STRING = 'property-string-access';
 
     // x :: y
-    const OPERATOR_ACCESS_STATIC_PROPERTY = 'static-property-access';
+    public const OPERATOR_ACCESS_STATIC_PROPERTY = 'static-property-access';
 
     // x :: CONSTANT
-    const OPERATOR_ACCESS_STATIC_CONSTANT = 'static-constant-access';
+    public const OPERATOR_ACCESS_STATIC_CONSTANT = 'static-constant-access';
 
     // x [{expr}]
-    const OPERATOR_ACCESS_ARRAY = 'array-access';
+    public const OPERATOR_ACCESS_ARRAY = 'array-access';
 
     private $operator;
     private $leftExpression;
diff --git a/src/Expression/Builder/Operators/UnaryOperator.php b/src/Expression/Builder/Operators/UnaryOperator.php
index f575c55a59..6d208aa79b 100644
--- a/src/Expression/Builder/Operators/UnaryOperator.php
+++ b/src/Expression/Builder/Operators/UnaryOperator.php
@@ -21,46 +21,46 @@
 class UnaryOperator extends AbstractOperator
 {
     // y = &a
-    const OPERATOR_REFERENCE = 'reference';
+    public const OPERATOR_REFERENCE = 'reference';
 
     // y = !a
-    const OPERATOR_NOT = 'not';
+    public const OPERATOR_NOT = 'not';
 
     // y = ~a
-    const OPERATOR_BITWISE_NOT = 'bitwise_not';
+    public const OPERATOR_BITWISE_NOT = 'bitwise_not';
 
     // y = -a
-    const OPERATOR_MINUS = 'minus';
+    public const OPERATOR_MINUS = 'minus';
 
     // y = +a
-    const OPERATOR_PLUS = 'plus';
+    public const OPERATOR_PLUS = 'plus';
 
     // y = isset a
-    const OPERATOR_ISSET = 'isset';
+    public const OPERATOR_ISSET = 'isset';
 
     // y = require a
-    const OPERATOR_REQUIRE = 'require';
+    public const OPERATOR_REQUIRE = 'require';
 
     // y = require_once a
-    const OPERATOR_REQUIRE_ONCE = 'require_once';
+    public const OPERATOR_REQUIRE_ONCE = 'require_once';
 
     // y = clone a
-    const OPERATOR_CLONE = 'clone';
+    public const OPERATOR_CLONE = 'clone';
 
     // y = empty a
-    const OPERATOR_EMPTY = 'empty';
+    public const OPERATOR_EMPTY = 'empty';
 
     // y = likely a
-    const OPERATOR_LIKELY = 'likely';
+    public const OPERATOR_LIKELY = 'likely';
 
     // y = unlikely a
-    const OPERATOR_UNLIKELY = 'unlikely';
+    public const OPERATOR_UNLIKELY = 'unlikely';
 
     // y = list a
-    const OPERATOR_LIST = 'list';
+    public const OPERATOR_LIST = 'list';
 
     // y = typeof a
-    const OPERATOR_TYPEOF = 'typeof';
+    public const OPERATOR_TYPEOF = 'typeof';
 
     private $operator;
     private $expression;
diff --git a/src/Expression/Builder/Statements/CallFunctionStatement.php b/src/Expression/Builder/Statements/CallFunctionStatement.php
index d853a58752..fba9fc362c 100644
--- a/src/Expression/Builder/Statements/CallFunctionStatement.php
+++ b/src/Expression/Builder/Statements/CallFunctionStatement.php
@@ -23,17 +23,17 @@ class CallFunctionStatement extends AbstractStatement
     /**
      * f(x, y, ... , N).
      */
-    const TYPE_CALL_DIRECT = FunctionCall::CALL_NORMAL;
+    public const TYPE_CALL_DIRECT = FunctionCall::CALL_NORMAL;
 
     /**
      * {f}(x, y, ... , N).
      */
-    const TYPE_CALL_DYNAMIC = FunctionCall::CALL_DYNAMIC;
+    public const TYPE_CALL_DYNAMIC = FunctionCall::CALL_DYNAMIC;
 
     /**
      * {"f"}(x, y, ... , N).
      */
-    const TYPE_CALL_DYNAMIC_STRING = FunctionCall::CALL_DYNAMIC_STRING;
+    public const TYPE_CALL_DYNAMIC_STRING = FunctionCall::CALL_DYNAMIC_STRING;
 
     private $name;
     private $arguments;
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 3791dda5e6..6818376635 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -25,17 +25,17 @@ class FunctionCall extends Call
     /**
      * Function is called using a normal method name.
      */
-    const CALL_NORMAL = 1;
+    public const CALL_NORMAL = 1;
 
     /**
      * Function is called using a dynamic variable as method name.
      */
-    const CALL_DYNAMIC = 2;
+    public const CALL_DYNAMIC = 2;
 
     /**
      * Function is called using a dynamic string as method name.
      */
-    const CALL_DYNAMIC_STRING = 3;
+    public const CALL_DYNAMIC_STRING = 3;
 
     protected static $optimizers = [];
 
diff --git a/src/HeadersManager.php b/src/HeadersManager.php
index 607f88b9b9..37ae87fb10 100644
--- a/src/HeadersManager.php
+++ b/src/HeadersManager.php
@@ -21,12 +21,12 @@ class HeadersManager
     /**
      * Insert the header at the beginning of the header list.
      */
-    const POSITION_FIRST = 1;
+    public const POSITION_FIRST = 1;
 
     /**
      * Insert the header at the end of the header list.
      */
-    const POSITION_LAST = 2;
+    public const POSITION_LAST = 2;
 
     /**
      * List of headers.
diff --git a/src/MethodCall.php b/src/MethodCall.php
index 8ae24cb58c..119335eef6 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -27,17 +27,17 @@ class MethodCall extends Call
     /**
      * Function is called using a normal method name.
      */
-    const CALL_NORMAL = 1;
+    public const CALL_NORMAL = 1;
 
     /**
      * Function is called using a dynamic variable as method name.
      */
-    const CALL_DYNAMIC = 2;
+    public const CALL_DYNAMIC = 2;
 
     /**
      * Function is called using a dynamic string as method name.
      */
-    const CALL_DYNAMIC_STRING = 3;
+    public const CALL_DYNAMIC_STRING = 3;
 
     /**
      * Compiles a method call.
diff --git a/src/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
index ade57e1b99..7678d5d2b0 100644
--- a/src/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -28,7 +28,7 @@
  */
 class PregMatchOptimizer extends OptimizerAbstract
 {
-    const GLOBAL_MATCH = 0;
+    public const GLOBAL_MATCH = 0;
 
     /**
      * {@inheritdoc}

From 1383391cf1fe8addafb4c0012b6b273892d2a9ca Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:31:15 +0000
Subject: [PATCH 165/375] Use short syntax

---
 src/Optimizers/FunctionCall/PregMatchOptimizer.php | 2 +-
 src/Statements/TryCatchStatement.php               | 2 +-
 src/Stubs/DocBlock.php                             | 4 +---
 src/Stubs/MethodDocBlock.php                       | 4 ++--
 src/Types/Types.php                                | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
index 7678d5d2b0..8a752078d4 100644
--- a/src/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -64,7 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $matches = $this->createMatches($expression, $context);
-        list($flags, $offset) = $this->processOptionals($expression, $call, $context);
+        [$flags, $offset] = $this->processOptionals($expression, $call, $context);
 
         /*
          * Process the expected symbol to be returned
diff --git a/src/Statements/TryCatchStatement.php b/src/Statements/TryCatchStatement.php
index 31c4b695ee..8a75af39f3 100644
--- a/src/Statements/TryCatchStatement.php
+++ b/src/Statements/TryCatchStatement.php
@@ -98,7 +98,7 @@ public function compile(CompilationContext $compilationContext): void
                                 $exprBuilder->statements()->rawC('zend_clear_exception();'),
                                 $assignExceptionVarStmt,
                             ],
-                            isset($catch['statements']) ? $catch['statements'] : []
+                            $catch['statements'] ?? []
                         )));
                 }
             }
diff --git a/src/Stubs/DocBlock.php b/src/Stubs/DocBlock.php
index f0ba7018e1..41f5320fc4 100644
--- a/src/Stubs/DocBlock.php
+++ b/src/Stubs/DocBlock.php
@@ -108,9 +108,7 @@ public function __toString(): string
         }
 
         if (!empty($this->lines)) {
-            $lines = array_map(function ($line) use ($indent) {
-                return "$indent * $line";
-            }, $this->lines);
+            $lines = array_map(fn ($line) => "$indent * $line", $this->lines);
 
             if (!empty($doc)) {
                 $doc .= "\n$indent *";
diff --git a/src/Stubs/MethodDocBlock.php b/src/Stubs/MethodDocBlock.php
index 31722746cd..35120a734b 100644
--- a/src/Stubs/MethodDocBlock.php
+++ b/src/Stubs/MethodDocBlock.php
@@ -240,7 +240,7 @@ protected function parseLines(): void
     private function appendReturnLine(): void
     {
         if (!isset($this->predefinedParams['return'])) {
-            list($type, $description) = $this->return;
+            [$type, $description] = $this->return;
 
             $return = $this->aliasManager->getAliasForClassName($type).' '.$description;
             $this->lines[] = '@return '.trim($return, ' ');
@@ -281,7 +281,7 @@ private function appendParametersLines(): void
             }
 
             if (!isset($this->predefinedParams[trim($name, '$')])) {
-                list($type, $description) = $parameter;
+                [$type, $description] = $parameter;
 
                 $param = $type.' '.$name.' '.$description;
                 $this->lines[] = '@param '.trim($param, ' ');
diff --git a/src/Types/Types.php b/src/Types/Types.php
index 4f7a95eb46..08034d6028 100644
--- a/src/Types/Types.php
+++ b/src/Types/Types.php
@@ -51,7 +51,7 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
         }
 
         $isProcessedReturnType = null !== $returnTypes;
-        $returnTypes = $returnTypes ?? $method->getReturnTypes();
+        $returnTypes ??= $method->getReturnTypes();
         $typesCount = \count($returnTypes);
 
         $isDynamic = \in_array('var', array_keys($returnTypes));

From d50fb8fd071ce8dbd83bc87ef39420972a5d2ea0 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:31:40 +0000
Subject: [PATCH 166/375] Fix strict types

---
 src/MethodCall.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MethodCall.php b/src/MethodCall.php
index 119335eef6..53e62298b4 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -759,7 +759,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
                 if ($isExpecting) {
                     if ('return_value' == $symbolVariable->getName()) {
-                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, true, $paramCount);
+                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);
                         $codePrinter->output($macro.'('.$variableCode.', '.$method->getInternalName().$paramsStr.');');
                     } else {
                         $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);
@@ -768,7 +768,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         );
                     }
                 } else {
-                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, false, $paramCount);
+                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);
                     $codePrinter->output($macro.'('.$variableCode.', '.$method->getInternalName().$paramsStr.');');
                 }
             }

From bb7294338cc3e15cfe8c9b399aeb86b04bfc5858 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:31:53 +0000
Subject: [PATCH 167/375] Force cast to string

---
 src/Statements/IfStatement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Statements/IfStatement.php b/src/Statements/IfStatement.php
index 4d574ba0c2..85a75d7718 100644
--- a/src/Statements/IfStatement.php
+++ b/src/Statements/IfStatement.php
@@ -74,7 +74,7 @@ public function compile(CompilationContext $compilationContext): void
 
             $symbolTable = $compilationContext->symbolTable;
             foreach ($skipVariantInit->getVariables() as $variable) {
-                if ($symbolTable->hasVariable($variable)) {
+                if ($symbolTable->hasVariable((string)$variable)) {
                     $symbolVariable = $symbolTable->getVariable($variable);
                     if ('variable' === $symbolVariable->getType()) {
                         if (!$readDetector->detect($variable, $exprRaw)) {

From 71b2d92934135dbd0817078d0ba3b66222ece85e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:32:01 +0000
Subject: [PATCH 168/375] Add return type

---
 src/Statements/Let/ObjectPropertyArrayIndex.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index 1473d6879e..b3a112a379 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -277,7 +277,7 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
      *
      * @throws CompilerException
      */
-    protected function _assignPropertyArrayMultipleIndex($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement)
+    protected function _assignPropertyArrayMultipleIndex($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
     {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');

From 606b1e2da16a9b7d144f4639a29f556e5ffbaeb3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:33:14 +0000
Subject: [PATCH 169/375] Fix CS

---
 src/Class/Method/Method.php | 55 ++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 7ebdc21501..718f1f4f21 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Class\Method;
 
-use ReflectionException;
 use Zephir\Branch;
 use Zephir\BranchManager;
 use Zephir\Cache\Manager;
@@ -35,12 +34,6 @@
 use Zephir\SymbolTable;
 use Zephir\Variable\Variable;
 
-use function array_key_exists;
-use function count;
-use function in_array;
-use function is_array;
-use function is_object;
-
 /**
  * Represents a class method
  */
@@ -503,7 +496,7 @@ public function getParameters(): ?Parameters
      */
     public function hasReturnTypes(): bool
     {
-        return count($this->returnTypes) || count($this->returnClassTypes);
+        return \count($this->returnTypes) || \count($this->returnClassTypes);
     }
 
     /**
@@ -522,7 +515,7 @@ public function areReturnTypesIntCompatible(): bool
         $types = ['int', 'uint', 'char', 'uchar', 'long', 'ulong'];
 
         foreach ($this->returnTypes as $returnType => $definition) {
-            if (in_array($returnType, $types)) {
+            if (\in_array($returnType, $types)) {
                 return true;
             }
         }
@@ -627,7 +620,7 @@ public function getNumberOfRequiredParameters(): int
      */
     public function hasModifier(string $modifier): bool
     {
-        return in_array($modifier, $this->visibility);
+        return \in_array($modifier, $this->visibility);
     }
 
     /**
@@ -640,7 +633,7 @@ public function getVisibility(): array
 
     public function isDeprecated(): bool
     {
-        return !empty($this->visibility) && in_array('deprecated', $this->visibility, true);
+        return !empty($this->visibility) && \in_array('deprecated', $this->visibility, true);
     }
 
     /**
@@ -721,7 +714,7 @@ public function isMixed(): bool
      */
     public function isPrivate(): bool
     {
-        return in_array('private', $this->visibility);
+        return \in_array('private', $this->visibility);
     }
 
     /**
@@ -729,7 +722,7 @@ public function isPrivate(): bool
      */
     public function isProtected(): bool
     {
-        return in_array('protected', $this->visibility);
+        return \in_array('protected', $this->visibility);
     }
 
     /**
@@ -862,7 +855,7 @@ public function removeMemoryStackReferences(SymbolTable $symbolTable, string $co
      * Assigns a default value.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function assignDefaultValue(array $parameter, CompilationContext $compilationContext): string
     {
@@ -1222,7 +1215,7 @@ public function assignZvalValue(array $parameter, CompilationContext $compilatio
     {
         $dataType = $this->getParamDataType($parameter);
 
-        if (in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
+        if (\in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
             return '';
         }
 
@@ -1274,7 +1267,7 @@ public function preCompile(CompilationContext $compilationContext): void
         $typeInference = null;
         $callGathererPass = null;
 
-        if (is_object($this->statements)) {
+        if (\is_object($this->statements)) {
             $compilationContext->currentMethod = $this;
 
             /**
@@ -1318,7 +1311,7 @@ public function preCompile(CompilationContext $compilationContext): void
      * Compiles the method.
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -1453,12 +1446,12 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 if (!empty($parameter['const'])) {
                     $symbol->setReadOnly(true);
-                    if (is_object($symbolParam)) {
+                    if (\is_object($symbolParam)) {
                         $symbolParam->setReadOnly(true);
                     }
                 }
 
-                if (is_object($symbolParam)) {
+                if (\is_object($symbolParam)) {
                     /**
                      * Parameters are marked as 'external'
                      */
@@ -1528,7 +1521,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Compile the block of statements if any
          */
-        if (is_object($this->statements)) {
+        if (\is_object($this->statements)) {
             $compilationContext->staticContext = $this->hasModifier('static');
 
             /**
@@ -1567,7 +1560,7 @@ public function compile(CompilationContext $compilationContext): void
              * variable is modified so as do the proper separation.
              */
             $parametersToSeparate = [];
-            if (is_object($this->statements)) {
+            if (\is_object($this->statements)) {
                 if (!$this->localContext instanceof LocalContextPass) {
                     $writeDetector = new WriteDetector();
                 }
@@ -1788,7 +1781,7 @@ public function compile(CompilationContext $compilationContext): void
 
             if (!$variable->isUsed()) {
                 $node = $variable->getLastUsedNode();
-                if (is_array($node)) {
+                if (\is_array($node)) {
                     $expression = $node['expr'] ?? $node;
                     $compilationContext->logger->warning(
                         'Variable "'.$variable->getName().'" assigned but not used in '.$completeName.'::'.$this->getName(),
@@ -1803,7 +1796,7 @@ public function compile(CompilationContext $compilationContext): void
             }
         }
 
-        if (count($usedVariables)) {
+        if (\count($usedVariables)) {
             $codePrinter->preOutputBlankLine();
         }
 
@@ -1859,7 +1852,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Finalize the method compilation
          */
-        if (is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
+        if (\is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
             /**
              * If the last statement is not a 'return' or 'throw' we need to
              * restore the memory stack if needed.
@@ -1909,7 +1902,7 @@ public function compile(CompilationContext $compilationContext): void
      */
     public function hasChildReturnStatementType(array $statement): bool
     {
-        if (!isset($statement['statements']) || !is_array($statement['statements'])) {
+        if (!isset($statement['statements']) || !\is_array($statement['statements'])) {
             return false;
         }
 
@@ -1995,7 +1988,7 @@ public function isReturnTypesHintDetermined(): bool
             return true;
         }
 
-        if (0 === count($this->returnTypes)) {
+        if (0 === \count($this->returnTypes)) {
             return false;
         }
 
@@ -2015,7 +2008,7 @@ public function isReturnTypesHintDetermined(): bool
                     || $this->areReturnTypesStringCompatible()
                     || $this->areReturnTypesFalseCompatible()
                     || $this->areReturnTypesObjectCompatible()
-                    || array_key_exists('array', $this->getReturnTypes())
+                    || \array_key_exists('array', $this->getReturnTypes())
                 ) {
                     continue;
                 }
@@ -2037,7 +2030,7 @@ public function isReturnTypesHintDetermined(): bool
      */
     public function isReturnTypeNullableObject(): bool
     {
-        return count($this->returnTypes) === 2
+        return \count($this->returnTypes) === 2
                && isset($this->returnTypes['object'])
                && isset($this->returnTypes['null']);
     }
@@ -2047,7 +2040,7 @@ public function isReturnTypeNullableObject(): bool
      */
     public function isReturnTypeObject(): bool
     {
-        return count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
+        return \count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
     }
 
     /**
@@ -2060,12 +2053,12 @@ public function areReturnTypesCompatible(): bool
             return true;
         }
 
-        $totalTypes = count($this->returnTypes);
+        $totalTypes = \count($this->returnTypes);
 
         // union types
         if ($totalTypes > 1) {
             $diff = array_diff(array_keys($this->returnTypes), array_keys($this->mayBeArgTypes));
-            if (count($diff) === 0) {
+            if (\count($diff) === 0) {
                 return true;
             }
         }

From 777b9912f8aad0edc224453ed8b9e3571d61e34a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:33:37 +0000
Subject: [PATCH 170/375] Fix CS

---
 src/Class/Method/Method.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 718f1f4f21..dbc149fd01 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -239,12 +239,12 @@ public function setReturnTypes(array $returnType = null): void
             }
         }
 
-        if (count($castTypes) > 0) {
+        if (\count($castTypes) > 0) {
             $types['object'] = [];
             $this->returnClassTypes = $castTypes;
         }
 
-        if (count($types) > 0) {
+        if (\count($types) > 0) {
             $this->returnTypes = $types;
         }
     }
@@ -290,47 +290,47 @@ public function isEmpty(): bool
      */
     public function checkVisibility(array $visibility, string $name, array $original = null): void
     {
-        if (count($visibility) > 1) {
-            if (in_array('public', $visibility) && in_array('protected', $visibility)) {
+        if (\count($visibility) > 1) {
+            if (\in_array('public', $visibility) && \in_array('protected', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'public' and 'protected' at the same time", $original);
             }
 
-            if (in_array('public', $visibility) && in_array('private', $visibility)) {
+            if (\in_array('public', $visibility) && \in_array('private', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'public' and 'private' at the same time", $original);
             }
 
-            if (in_array('private', $visibility) && in_array('protected', $visibility)) {
+            if (\in_array('private', $visibility) && \in_array('protected', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'protected' and 'private' at the same time", $original);
             }
 
-            if (in_array('private', $visibility) && in_array('internal', $visibility)) {
+            if (\in_array('private', $visibility) && \in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'private' at the same time", $original);
             }
 
-            if (in_array('protected', $visibility) && in_array('internal', $visibility)) {
+            if (\in_array('protected', $visibility) && \in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'protected' at the same time", $original);
             }
 
-            if (in_array('public', $visibility) && in_array('internal', $visibility)) {
+            if (\in_array('public', $visibility) && \in_array('internal', $visibility)) {
                 throw new CompilerException("Method '$name' cannot be 'internal' and 'public' at the same time", $original);
             }
         }
 
         if ('__construct' === $name) {
-            if (in_array('static', $visibility)) {
+            if (\in_array('static', $visibility)) {
                 throw new CompilerException("Constructors cannot be 'static'", $original);
             }
         } elseif ('__destruct' === $name) {
-            if (in_array('static', $visibility)) {
+            if (\in_array('static', $visibility)) {
                 throw new CompilerException("Destructors cannot be 'static'", $original);
             }
         }
 
-        $this->isAbstract = in_array('abstract', $visibility);
-        $this->isStatic = in_array('static', $visibility);
-        $this->isFinal = in_array('final', $visibility);
-        $this->isPublic = in_array('public', $visibility);
-        $this->isInternal = in_array('internal', $visibility);
+        $this->isAbstract = \in_array('abstract', $visibility);
+        $this->isStatic = \in_array('static', $visibility);
+        $this->isFinal = \in_array('final', $visibility);
+        $this->isPublic = \in_array('public', $visibility);
+        $this->isInternal = \in_array('internal', $visibility);
     }
 
     /**

From e9436eef9e3ecd1af52d796fbbd169cec8b93577 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 15:41:48 +0000
Subject: [PATCH 171/375] Remove memory management logic

---
 kernel/exception.c                |  5 -----
 kernel/exception.h                |  4 ----
 kernel/fcall.h                    |  4 ----
 kernel/main.h                     | 19 +++++++------------
 kernel/memory.c                   |  2 --
 kernel/memory.h                   | 23 ++++-------------------
 src/Class/Method/Method.php       | 10 +++++-----
 src/Statements/ThrowStatement.php |  2 +-
 8 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/kernel/exception.c b/kernel/exception.c
index 404162af8d..46b1ca7c82 100644
--- a/kernel/exception.c
+++ b/kernel/exception.c
@@ -31,16 +31,12 @@
 void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 {
 	zend_class_entry *default_exception_ce;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	int ZEPHIR_LAST_CALL_STATUS = 0;
 	zval curline;
 	zval object_copy;
 
 	ZVAL_UNDEF(&curline);
 
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	if (Z_TYPE_P(object) != IS_OBJECT) {
 		ZVAL_COPY_VALUE(&object_copy, object);
 		object_init_ex(object, zend_exception_get_default());
@@ -63,7 +59,6 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 	if (ZEPHIR_LAST_CALL_STATUS != FAILURE) {
 		zend_throw_exception_object(object);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
diff --git a/kernel/exception.h b/kernel/exception.h
index 5ae19973ad..c13f7498cb 100644
--- a/kernel/exception.h
+++ b/kernel/exception.h
@@ -19,25 +19,21 @@
 #define ZEPHIR_THROW_EXCEPTION_STR(class_entry, message) \
 	do { \
 		zephir_throw_exception_string(class_entry, message, strlen(message)); \
-		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_STR(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_string_debug(class_entry, message, strlen(message), file, line); \
-    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_ZVAL(class_entry, message) \
 	do { \
 		zephir_throw_exception_zval(class_entry, message); \
-		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_ZVAL(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_zval(class_entry, message, file, line); \
-    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 
diff --git a/kernel/fcall.h b/kernel/fcall.h
index 4754bf4626..4e879d2674 100644
--- a/kernel/fcall.h
+++ b/kernel/fcall.h
@@ -394,7 +394,6 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 #define zephir_check_call_status() \
 	do { \
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
-			ZEPHIR_MM_RESTORE(); \
 			return; \
 		} \
 	} while(0)
@@ -404,9 +403,6 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
 			if (EG(exception)) { \
 				goto label; \
-			} else { \
-				ZEPHIR_MM_RESTORE(); \
-				return; \
 			} \
 		} \
 	} while (0)
diff --git a/kernel/main.h b/kernel/main.h
index 7d28f37757..513f670d88 100644
--- a/kernel/main.h
+++ b/kernel/main.h
@@ -112,7 +112,6 @@ extern zend_string* i_self;
 #define RETURN_CTOR(var)        \
 	do {                        \
 		RETVAL_ZVAL(var, 1, 0); \
-		ZEPHIR_MM_RESTORE();    \
 		return;                 \
 	} while (0)
 
@@ -127,7 +126,6 @@ extern zend_string* i_self;
 #define RETURN_CCTOR(v)            \
 	do {                           \
 		ZVAL_DUP(return_value, v); \
-		ZEPHIR_MM_RESTORE();       \
 		return;                    \
 	} while (0)
 
@@ -146,7 +144,6 @@ extern zend_string* i_self;
 #define RETURN_THIS() { \
 		RETVAL_ZVAL(getThis(), 1, 0); \
 	} \
-	ZEPHIR_MM_RESTORE(); \
 	return;
 
 #define RETURN_LCTORW(var) RETURN_CCTORW(var);
@@ -161,20 +158,20 @@ extern zend_string* i_self;
 	return;
 
 /** Return without change return_value */
-#define RETURN_MM()                 { ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM()                 { return; }
 
 /** Return null restoring memory frame */
-#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); return; }
 
 /** Return string restoring memory frame */
-#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); ZEPHIR_MM_RESTORE(); return; }
-#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); return; }
+#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); return; }
 
 /* Return long */
-#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); return; }
 
 /* Return double */
-#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); return; }
 
 /**
  * Returns a zval in an object member
@@ -193,13 +190,12 @@ extern zend_string* i_self;
 #define RETURN_MM_ON_FAILURE(what) \
 	do { \
 		if (what == FAILURE) { \
-			ZEPHIR_MM_RESTORE(); \
 			return; \
 		} \
 	} while (0)
 
 /** Return null restoring memory frame */
-#define RETURN_MM_NULL()            { RETVAL_NULL(); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_NULL()            { RETVAL_NULL(); return; }
 
 /* Globals functions */
 int zephir_get_global(zval *arr, const char *global, unsigned int global_length);
@@ -245,7 +241,6 @@ int zephir_is_iterable_ex(zval *arr, int duplicate);
 #define zephir_is_iterable(var, duplicate, file, line) \
 	if (!zephir_is_iterable_ex(var, duplicate)) { \
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(zend_exception_get_default(), "The argument is not initialized or iterable()", file, line); \
-		ZEPHIR_MM_RESTORE(); \
 		return; \
 	}
 
diff --git a/kernel/memory.c b/kernel/memory.c
index f0bf4326f3..bf47e5bc5a 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -52,9 +52,7 @@ void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const ch
 {
 	if (g->active_memory == NULL) {
 		zephir_memory_entry *active_memory;
-
 		active_memory = (zephir_memory_entry *) pecalloc(1, sizeof(zephir_memory_entry), 0);
-
 		active_memory->addresses = pecalloc(24, sizeof(zval*), 0);
 		active_memory->capacity  = 24;
 
diff --git a/kernel/memory.h b/kernel/memory.h
index 7da4ec47e2..d39c265f61 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -47,34 +47,28 @@ typedef struct _zephir_method_globals {
 void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func);
 void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
 
-#define ZEPHIR_MM_RESTORE() \
-	zephir_memory_restore_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); \
-	pefree(ZEPHIR_METHOD_GLOBALS_PTR, 0); \
-	ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+#define ZEPHIR_MM_RESTORE() do { /* dummy code */ } while (0)
 
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
 
 void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
-#define zephir_memory_observe(var) zephir_do_memory_observe(var, ZEPHIR_METHOD_GLOBALS_PTR);
+#define zephir_memory_observe(var) do { /* dummy code */ } while (0)
 
 #define zephir_safe_zval_ptr_dtor(pzval)
 
 void zephir_create_symbol_table(zephir_method_globals *g);
 
-#define ZEPHIR_CREATE_SYMBOL_TABLE() zephir_create_symbol_table(ZEPHIR_METHOD_GLOBALS_PTR);
+#define ZEPHIR_CREATE_SYMBOL_TABLE() do { /* dummy code */ } while (0)
 
 int zephir_set_symbol(zval *key_name, zval *value);
 
 #define ZEPHIR_INIT_VAR(z) \
-	zephir_memory_observe(z); \
 	ZVAL_NULL(z);
 
 #define ZEPHIR_INIT_NVAR(z) \
 	do { \
-		if (Z_TYPE_P(z) == IS_UNDEF) { \
-			zephir_memory_observe(z); \
-		} else if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
+		if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
 			if (Z_REFCOUNT_P(z) > 1) { \
 				Z_DELREF_P(z); \
 			} else { \
@@ -90,8 +84,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
 			zval_ptr_dtor(d); \
 		} \
-	} else { \
-		zephir_memory_observe(d); \
 	} \
 	ZVAL_COPY_VALUE(d, v);
 
@@ -104,9 +96,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	ZVAL_DUP(d, v);
 
 #define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
-	if (Z_TYPE_P(z) == IS_UNDEF) { \
-		zephir_memory_observe(z); \
-	} \
 	ZVAL_COPY(z, v);
 
 #define ZEPHIR_HASH_COPY(z, v) \
@@ -122,8 +111,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 			zval_ptr_dtor(z); \
 			ZVAL_NULL(z); \
 		} \
-	} else { \
-		zephir_memory_observe(z); \
 	}
 
 /* TODO: this might causes troubles, since we cannot observe here, since we aren't using double pointers
@@ -135,8 +122,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (tmp_ != NULL) { \
 			if (Z_TYPE_P(tmp_) != IS_UNDEF) { \
 				zval_ptr_dtor(tmp_); \
-			} else { \
-				zephir_memory_observe(tmp_); \
 			} \
 			ZVAL_NULL(tmp_); \
 		} \
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index dbc149fd01..7140170ceb 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1718,7 +1718,7 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Grow the stack if needed
          */
-        if ($symbolTable->getMustGrownStack()) {
+        /*if ($symbolTable->getMustGrownStack()) {
             $compilationContext->headersManager->add('kernel/memory');
             if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_METHOD_GLOBALS_PTR')) {
                 $methodGlobals = new Variable('zephir_method_globals', 'ZEPHIR_METHOD_GLOBALS_PTR', $compilationContext->branchManager->getCurrentBranch());
@@ -1730,9 +1730,9 @@ public function compile(CompilationContext $compilationContext): void
             }
 
             // #define ZEPHIR_MM_GROW()
-            $codePrinter->preOutput("\t".'zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);');
+            $codePrinter->preOutput("\t".'zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);'.PHP_EOL);
             $codePrinter->preOutput("\t".'ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);');
-        }
+        }*/
 
         /**
          * Check if there are unused variables.
@@ -1860,10 +1860,10 @@ public function compile(CompilationContext $compilationContext): void
             $lastType = $this->statements->getLastStatementType();
 
             if ('return' !== $lastType && 'throw' !== $lastType && !$this->hasChildReturnStatementType($statement)) {
-                if ($symbolTable->getMustGrownStack()) {
+                /*if ($symbolTable->getMustGrownStack()) {
                     $compilationContext->headersManager->add('kernel/memory');
                     $codePrinter->output("\t".'ZEPHIR_MM_RESTORE();');
-                }
+                }*/
 
                 /**
                  * If a method has return-type hints we need to ensure the last statement is a 'return' statement
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index 69bd0c7187..129cccfb35 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -123,7 +123,7 @@ public function compile(CompilationContext $compilationContext): void
         );
 
         if (!$compilationContext->insideTryCatch) {
-            $codePrinter->output('ZEPHIR_MM_RESTORE();');
+            // $codePrinter->output('ZEPHIR_MM_RESTORE();');
             $codePrinter->output('return;');
         } else {
             $codePrinter->output('goto try_end_'.$compilationContext->currentTryCatch.';');

From ef301aea5f43949ead8aa7ac4e98f2192a7786c4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 16:47:21 +0000
Subject: [PATCH 172/375] Adjust `kernel` directory name in box.json.dist

---
 box.json.dist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/box.json.dist b/box.json.dist
index 918925ab2c..aa659e1d2b 100644
--- a/box.json.dist
+++ b/box.json.dist
@@ -8,7 +8,7 @@
         "the LICENSE file that was distributed with this source code."
     ],
     "directories": [
-       "kernels",
+       "kernel",
        "src",
        "prototypes",
        "templates",
@@ -28,7 +28,7 @@
             "name": "*.*"
         },
         {
-            "in": "kernels",
+            "in": "kernel",
             "name": "*.*"
         },
         {

From cd8c02bace62b3a5d94b180b675aa1f68d844750 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 16:47:50 +0000
Subject: [PATCH 173/375] Add `false` check on `current()` call

---
 src/Expression/PropertyAccess.php               | 2 +-
 src/Statements/Let/ObjectPropertyArrayIndex.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Expression/PropertyAccess.php b/src/Expression/PropertyAccess.php
index 0d1600fca7..acc6654f59 100644
--- a/src/Expression/PropertyAccess.php
+++ b/src/Expression/PropertyAccess.php
@@ -122,7 +122,7 @@ public function compile($expression, CompilationContext $compilationContext)
                 $classType = current($variableVariable->getClassTypes());
                 $compiler = $compilationContext->compiler;
 
-                if ($compiler->isClass($classType)) {
+                if ($classType !== false && $compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
                         throw new CompilerException('Cannot locate class definition for class: '.$classType, $expression);
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index b3a112a379..555abbdd7d 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -151,7 +151,7 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
                 throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
             }
         } else {
-            /*
+            /**
              * If we know the class related to a variable we could check if the property
              * is defined on that class
              */
@@ -159,7 +159,7 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
                 $classType = current($symbolVariable->getClassTypes());
                 $compiler = $compilationContext->compiler;
 
-                if ($compiler->isClass($classType)) {
+                if ($classType !== false && $compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
                         throw new CompilerException('Cannot locate class definition for class: '.$classType, $statement);

From 9ae4cc4ae4f332a81b49cc8cb2043778d0c53d3f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 16:49:22 +0000
Subject: [PATCH 174/375] Fix CS

---
 prototypes/apache.php                           | 1 -
 prototypes/apc.php                              | 1 -
 prototypes/fpm.php                              | 1 -
 prototypes/gd.php                               | 1 -
 prototypes/iconv.php                            | 1 -
 prototypes/igbinary.php                         | 1 -
 prototypes/imagick.php                          | 1 -
 prototypes/mcrypt.php                           | 1 -
 prototypes/memcache.php                         | 1 -
 prototypes/memcached.php                        | 1 -
 prototypes/mongo.php                            | 1 -
 prototypes/msgpack.php                          | 1 -
 prototypes/redis.php                            | 1 -
 prototypes/xcache.php                           | 1 -
 prototypes/yaml.php                             | 1 -
 src/Statements/IfStatement.php                  | 2 +-
 tests/Extension/Optimizers/IsPhpVersionTest.php | 4 ++--
 17 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/prototypes/apache.php b/prototypes/apache.php
index 0cc5b90b54..09535638bf 100644
--- a/prototypes/apache.php
+++ b/prototypes/apache.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 if (!function_exists('apache_child_terminate')) {
     /**
      * Terminate apache process after this request.
diff --git a/prototypes/apc.php b/prototypes/apc.php
index 71593b5234..5a00a5dd42 100644
--- a/prototypes/apc.php
+++ b/prototypes/apc.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 if (!class_exists('APCIterator', false)) {
     // See: https://github.com/php/pecl-caching-apc/blob/master/apc_bin.h
     defined('APC_BIN_VERIFY_CRC32') || define('APC_BIN_VERIFY_CRC32', 1 << 1);
diff --git a/prototypes/fpm.php b/prototypes/fpm.php
index 55ea6ef1fd..9758804d9b 100644
--- a/prototypes/fpm.php
+++ b/prototypes/fpm.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 if (function_exists('fastcgi_finish_request')) {
     return false;
 }
diff --git a/prototypes/gd.php b/prototypes/gd.php
index a23b531cb4..7db13aec6e 100644
--- a/prototypes/gd.php
+++ b/prototypes/gd.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 if (!function_exists('gd_info')) {
     /**
      * Retrieve information about the currently installed GD library.
diff --git a/prototypes/iconv.php b/prototypes/iconv.php
index 8f472161b9..154a95a551 100644
--- a/prototypes/iconv.php
+++ b/prototypes/iconv.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 function iconv($in_charset, $out_charset, $str)
 {
 }
diff --git a/prototypes/igbinary.php b/prototypes/igbinary.php
index 2d401055ee..cf5c3819ab 100644
--- a/prototypes/igbinary.php
+++ b/prototypes/igbinary.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 function igbinary_serialize($data)
 {
 }
diff --git a/prototypes/imagick.php b/prototypes/imagick.php
index 8ca7573c0d..d33d0b77cf 100644
--- a/prototypes/imagick.php
+++ b/prototypes/imagick.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 class Imagick
 {
     public function setImageAlphaChannel($channel)
diff --git a/prototypes/mcrypt.php b/prototypes/mcrypt.php
index c8f973b65d..314060df72 100644
--- a/prototypes/mcrypt.php
+++ b/prototypes/mcrypt.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 function mcrypt_list_algorithms()
 {
 }
diff --git a/prototypes/memcache.php b/prototypes/memcache.php
index ff110c767a..d0c31ef462 100644
--- a/prototypes/memcache.php
+++ b/prototypes/memcache.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 define('MEMCACHE_HAVE_SESSION', 1);
 define('MEMCACHE_COMPRESSED', 2);
 
diff --git a/prototypes/memcached.php b/prototypes/memcached.php
index b0734977dc..1c1d4bde0c 100644
--- a/prototypes/memcached.php
+++ b/prototypes/memcached.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 class Memcached
 {
     const OPT_COMPRESSION = -1001;
diff --git a/prototypes/mongo.php b/prototypes/mongo.php
index 2722d7f840..c61abfbd8d 100644
--- a/prototypes/mongo.php
+++ b/prototypes/mongo.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 if (!class_exists('MongoRegex', false)) {
     class MongoRegex
     {
diff --git a/prototypes/msgpack.php b/prototypes/msgpack.php
index 97959bfa5e..f240502040 100644
--- a/prototypes/msgpack.php
+++ b/prototypes/msgpack.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 define('MSGPACK_CLASS_OPT_PHPONLY', -1001);
 
 /**
diff --git a/prototypes/redis.php b/prototypes/redis.php
index 1797fac189..62ccb2f29f 100644
--- a/prototypes/redis.php
+++ b/prototypes/redis.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 class redis
 {
     /**
diff --git a/prototypes/xcache.php b/prototypes/xcache.php
index 7a09b2d4c3..670b530e0b 100644
--- a/prototypes/xcache.php
+++ b/prototypes/xcache.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 function xcache_get($name)
 {
 }
diff --git a/prototypes/yaml.php b/prototypes/yaml.php
index bbb597f1bd..344098f099 100644
--- a/prototypes/yaml.php
+++ b/prototypes/yaml.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view
  * the LICENSE file that was distributed with this source code.
  */
-
 function yaml_parse_file($filename, $pos = 0, &$ndocs = 0, $callbacks = null)
 {
 }
diff --git a/src/Statements/IfStatement.php b/src/Statements/IfStatement.php
index 85a75d7718..763f519d43 100644
--- a/src/Statements/IfStatement.php
+++ b/src/Statements/IfStatement.php
@@ -74,7 +74,7 @@ public function compile(CompilationContext $compilationContext): void
 
             $symbolTable = $compilationContext->symbolTable;
             foreach ($skipVariantInit->getVariables() as $variable) {
-                if ($symbolTable->hasVariable((string)$variable)) {
+                if ($symbolTable->hasVariable((string) $variable)) {
                     $symbolVariable = $symbolTable->getVariable($variable);
                     if ('variable' === $symbolVariable->getType()) {
                         if (!$readDetector->detect($variable, $exprRaw)) {
diff --git a/tests/Extension/Optimizers/IsPhpVersionTest.php b/tests/Extension/Optimizers/IsPhpVersionTest.php
index ea8cb6e590..d83731e2cf 100644
--- a/tests/Extension/Optimizers/IsPhpVersionTest.php
+++ b/tests/Extension/Optimizers/IsPhpVersionTest.php
@@ -243,9 +243,9 @@ protected function onNotSuccessfulTest(\Throwable $error): void
      *
      * @throws \Exception
      */
-    private function isPhpVersion(float|int|string $version): bool
+    private function isPhpVersion(float | int | string $version): bool
     {
-        preg_match('/^(?<major>\d+)(?:\.(?<minor>!?\d+))?(?:\.(?<patch>!?\d+))?(?:[^Ee0-9.]+.*)?$/', (string)$version, $matches);
+        preg_match('/^(?<major>\d+)(?:\.(?<minor>!?\d+))?(?:\.(?<patch>!?\d+))?(?:[^Ee0-9.]+.*)?$/', (string) $version, $matches);
         if (!\count($matches)) {
             throw new \Exception('Could not parse PHP version');
         }

From c801f629375ce600098a830c9bba3c6ee27a9a74 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:01:04 +0000
Subject: [PATCH 175/375] Remove `zephir_memory_observe(var)` macro

---
 kernel/memory.h           | 1 -
 src/Variable/Variable.php | 2 --
 2 files changed, 3 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index d39c265f61..54991dc4af 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -53,7 +53,6 @@ void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
 
 void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
-#define zephir_memory_observe(var) do { /* dummy code */ } while (0)
 
 #define zephir_safe_zval_ptr_dtor(pzval)
 
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index a83f38361c..f1e0c149b6 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -929,8 +929,6 @@ public function observeVariant(CompilationContext $compilationContext): void
             if ($this->variantInits > 0 || $compilationContext->insideCycle) {
                 $this->mustInitNull = true;
                 $compilationContext->codePrinter->output('ZEPHIR_OBS_NVAR('.$symbol.');');
-            } else {
-                $compilationContext->codePrinter->output('zephir_memory_observe('.$symbol.');');
             }
 
             ++$this->variantInits;

From 1b2737c192823c4bc8bfc32e93417982e4647936 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:03:34 +0000
Subject: [PATCH 176/375] Remove `zephir_memory_grow_stack` function

---
 kernel/memory.c | 22 ----------------------
 kernel/memory.h |  1 -
 2 files changed, 23 deletions(-)

diff --git a/kernel/memory.c b/kernel/memory.c
index bf47e5bc5a..34b4fc666b 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -45,28 +45,6 @@ static zend_always_inline zend_execute_data* find_symbol_table(zend_execute_data
     return ex;
 }
 
-/**
- * Adds a memory frame in the current executed method
- */
-void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func)
-{
-	if (g->active_memory == NULL) {
-		zephir_memory_entry *active_memory;
-		active_memory = (zephir_memory_entry *) pecalloc(1, sizeof(zephir_memory_entry), 0);
-		active_memory->addresses = pecalloc(24, sizeof(zval*), 0);
-		active_memory->capacity  = 24;
-
-		g->active_memory = active_memory;
-	}
-
-	assert(g->active_memory != NULL);
-	assert(g->active_memory->pointer == 0);
-
-#ifndef ZEPHIR_RELEASE
-	g->active_memory->func = func;
-#endif
-}
-
 void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func)
 {
 	size_t i;
diff --git a/kernel/memory.h b/kernel/memory.h
index 54991dc4af..d7b11d6854 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -44,7 +44,6 @@ typedef struct _zephir_method_globals {
 } zephir_method_globals;
 
 /* Memory Frames */
-void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func);
 void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
 
 #define ZEPHIR_MM_RESTORE() do { /* dummy code */ } while (0)

From 5c8365efebbcb87dd1ca21100dc40ca95492d634 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:03:45 +0000
Subject: [PATCH 177/375] Remove `zephir_memory_grow_stack` function gener

---
 src/Class/Method/Method.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 7140170ceb..6a9bcbf52f 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1715,25 +1715,6 @@ public function compile(CompilationContext $compilationContext): void
             }
         }
 
-        /**
-         * Grow the stack if needed
-         */
-        /*if ($symbolTable->getMustGrownStack()) {
-            $compilationContext->headersManager->add('kernel/memory');
-            if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_METHOD_GLOBALS_PTR')) {
-                $methodGlobals = new Variable('zephir_method_globals', 'ZEPHIR_METHOD_GLOBALS_PTR', $compilationContext->branchManager->getCurrentBranch());
-                $methodGlobals->setMustInitNull(true);
-                $methodGlobals->increaseUses();
-                $methodGlobals->setReusable(false);
-                $methodGlobals->setReadOnly(true);
-                $compilationContext->symbolTable->addRawVariable($methodGlobals);
-            }
-
-            // #define ZEPHIR_MM_GROW()
-            $codePrinter->preOutput("\t".'zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);'.PHP_EOL);
-            $codePrinter->preOutput("\t".'ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);');
-        }*/
-
         /**
          * Check if there are unused variables.
          */

From a627e0ad0c1a28cedd68d1a396cb0645ec5e1ea4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:07:57 +0000
Subject: [PATCH 178/375] Remove `zephir_memory_restore_stack()` function

---
 kernel/memory.c | 113 ------------------------------------------------
 kernel/memory.h |   3 --
 2 files changed, 116 deletions(-)

diff --git a/kernel/memory.c b/kernel/memory.c
index 34b4fc666b..6f0f606b12 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -45,119 +45,6 @@ static zend_always_inline zend_execute_data* find_symbol_table(zend_execute_data
     return ex;
 }
 
-void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func)
-{
-	size_t i;
-	zephir_memory_entry *active_memory;
-	zephir_symbol_table *active_symbol_table;
-	zval *ptr;
-#ifndef ZEPHIR_RELEASE
-	int show_backtrace = 0;
-#endif
-
-#ifndef ZEPHIR_RELEASE
-	if (UNEXPECTED(g->active_memory == NULL)) {
-		fprintf(stderr, "WARNING: calling zephir_memory_restore_stack() without an active memory frame!\n");
-		fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
-		fprintf(stderr, "Calling function: %s\n", func);
-		zephir_print_backtrace();
-		return;
-	}
-
-	if (UNEXPECTED(g->active_memory->func != func)) {
-		fprintf(stderr, "Trying to free someone else's memory frame!\n");
-		fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
-		fprintf(stderr, "Calling function: %s\n", func);
-		zephir_print_backtrace();
-		return;
-	}
-#endif
-
-	active_memory = g->active_memory;
-	assert(active_memory != NULL);
-
-	if (EXPECTED(!CG(unclean_shutdown))) {
-		/* Clean active symbol table */
-		if (g->active_symbol_table) {
-			active_symbol_table = g->active_symbol_table;
-			while (active_symbol_table && active_symbol_table->scope == active_memory) {
-				zend_execute_data *ex = find_symbol_table(EG(current_execute_data));
-#ifndef ZEPHIR_RELEASE
-				if (UNEXPECTED(!ex)) {
-					fprintf(stderr, "ERROR: unable to find a symbol table");
-					zephir_print_backtrace();
-					return;
-				}
-#endif
-				zend_hash_destroy(ex->symbol_table);
-				efree(ex->symbol_table);
-				ex->symbol_table = active_symbol_table->symbol_table;
-				zend_attach_symbol_table(ex);
-				zend_rebuild_symbol_table();
-
-				g->active_symbol_table = active_symbol_table->prev;
-				efree(active_symbol_table);
-				active_symbol_table = g->active_symbol_table;
-			}
-		}
-
-#ifndef ZEPHIR_RELEASE
-		for (i = 0; i < active_memory->pointer; ++i) {
-			if (active_memory->addresses[i] != NULL) {
-				zval *var = active_memory->addresses[i];
-				if (Z_TYPE_P(var) > IS_CALLABLE) {
-					fprintf(stderr, "%s: observed variable #%d (%p) has invalid type %u [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
-					show_backtrace = 1;
-				}
-
-				if (!Z_REFCOUNTED_P(var)) {
-					continue;
-				}
-
-				if (Z_REFCOUNT_P(var) == 0) {
-					fprintf(stderr, "%s: observed variable #%d (%p) has 0 references, type=%d [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
-					show_backtrace = 1;
-				}
-				else if (Z_REFCOUNT_P(var) >= 1000000) {
-					fprintf(stderr, "%s: observed variable #%d (%p) has too many references (%u), type=%d  [%s]\n", __func__, (int)i, var, Z_REFCOUNT_P(var), Z_TYPE_P(var), active_memory->func);
-					show_backtrace = 1;
-				}
-			}
-		}
-#endif
-
-		/* Traverse all zvals allocated, reduce the reference counting or free them */
-		for (i = 0; i < active_memory->pointer; ++i) {
-			ptr = active_memory->addresses[i];
-			if (EXPECTED(ptr != NULL)) {
-				if (!Z_REFCOUNTED_P(ptr)) continue;
-				if (Z_REFCOUNT_P(ptr) == 1) {
-					zval_ptr_dtor(ptr);
-				} else {
-					Z_DELREF_P(ptr);
-				}
-			}
-		}
-	}
-
-#ifndef ZEPHIR_RELEASE
-	active_memory->func = NULL;
-#endif
-
-	if (active_memory->addresses != NULL) {
-		pefree(active_memory->addresses, 0);
-	}
-
-	pefree(g->active_memory, 0);
-	g->active_memory = NULL;
-
-#ifndef ZEPHIR_RELEASE
-	if (show_backtrace == 1) {
-		zephir_print_backtrace();
-	}
-#endif
-}
-
 /**
  * Pre-allocates memory for further use in execution
  */
diff --git a/kernel/memory.h b/kernel/memory.h
index d7b11d6854..12c56c53a6 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -43,9 +43,6 @@ typedef struct _zephir_method_globals {
 	zephir_symbol_table *active_symbol_table;
 } zephir_method_globals;
 
-/* Memory Frames */
-void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
-
 #define ZEPHIR_MM_RESTORE() do { /* dummy code */ } while (0)
 
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);

From 11b5e559b5b80b4614c4917948f71183b657934c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:11:06 +0000
Subject: [PATCH 179/375] Remove `ZEPHIR_MM_RESTORE()` macro

---
 kernel/memory.h                               | 2 --
 src/Class/Method/Method.php                   | 7 ++-----
 src/Optimizers/FunctionCall/ExitOptimizer.php | 4 ----
 src/Statements/ThrowStatement.php             | 1 -
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 12c56c53a6..4c35d371fb 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -43,8 +43,6 @@ typedef struct _zephir_method_globals {
 	zephir_symbol_table *active_symbol_table;
 } zephir_method_globals;
 
-#define ZEPHIR_MM_RESTORE() do { /* dummy code */ } while (0)
-
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
 
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 6a9bcbf52f..5de2fe4414 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -820,6 +820,8 @@ public function getCallGathererPass(): CallGathererPass
 
     /**
      * Replace macros.
+     *
+     * @deprecated
      */
     public function removeMemoryStackReferences(SymbolTable $symbolTable, string $containerCode): string
     {
@@ -1841,11 +1843,6 @@ public function compile(CompilationContext $compilationContext): void
             $lastType = $this->statements->getLastStatementType();
 
             if ('return' !== $lastType && 'throw' !== $lastType && !$this->hasChildReturnStatementType($statement)) {
-                /*if ($symbolTable->getMustGrownStack()) {
-                    $compilationContext->headersManager->add('kernel/memory');
-                    $codePrinter->output("\t".'ZEPHIR_MM_RESTORE();');
-                }*/
-
                 /**
                  * If a method has return-type hints we need to ensure the last statement is a 'return' statement
                  */
diff --git a/src/Optimizers/FunctionCall/ExitOptimizer.php b/src/Optimizers/FunctionCall/ExitOptimizer.php
index d70ec8e2e7..233d8af3a0 100644
--- a/src/Optimizers/FunctionCall/ExitOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExitOptimizer.php
@@ -20,8 +20,6 @@
 use Zephir\Optimizers\OptimizerAbstract;
 
 /**
- * ExitOptimizer.
- *
  * Optimizes calls to 'exit' using internal function
  */
 class ExitOptimizer extends OptimizerAbstract
@@ -46,11 +44,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             // TODO: protect resolvedParams[0] from restore
         }
         if (!isset($expression['parameters'])) {
-            // $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
             $context->codePrinter->output('zephir_exit_empty();');
         } else {
             $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-            // $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
             $context->codePrinter->output('zephir_exit('.$resolvedParams[0].');');
         }
 
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index 129cccfb35..d4e4f2e43d 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -123,7 +123,6 @@ public function compile(CompilationContext $compilationContext): void
         );
 
         if (!$compilationContext->insideTryCatch) {
-            // $codePrinter->output('ZEPHIR_MM_RESTORE();');
             $codePrinter->output('return;');
         } else {
             $codePrinter->output('goto try_end_'.$compilationContext->currentTryCatch.';');

From ecd769e0d069e7b198c140b4c67a9b399ac29dcc Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:14:52 +0000
Subject: [PATCH 180/375] Remove `ZEPHIR_CREATE_SYMBOL_TABLE()` macro

---
 .../FunctionCall/CreateSymbolTableOptimizer.php        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
index 425dea6b43..8224396cfe 100644
--- a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -43,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             }
         }
 
-        /*
+        /**
          * Process the expected symbol to be returned
          */
         $call->processExpectedReturn($context);
@@ -59,11 +59,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
 
+        // TODO: Still needed?
         $context->symbolTable->mustGrownStack(true);
 
-        $context->codePrinter->output('ZEPHIR_CREATE_SYMBOL_TABLE();');
-        $context->codePrinter->output('');
-
         return new CompiledExpression('null', null, $expression);
     }
 }

From 26e6b33e4e4a40fcdd38e7fc6e6f0b419cbae433 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:17:52 +0000
Subject: [PATCH 181/375] Remove `ZEPHIR_CREATE_SYMBOL_TABLE()` macro

---
 kernel/memory.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 4c35d371fb..d5ae07a1ce 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -52,8 +52,6 @@ void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_glo
 
 void zephir_create_symbol_table(zephir_method_globals *g);
 
-#define ZEPHIR_CREATE_SYMBOL_TABLE() do { /* dummy code */ } while (0)
-
 int zephir_set_symbol(zval *key_name, zval *value);
 
 #define ZEPHIR_INIT_VAR(z) \

From 86e516823a1ada60829f272215fabfc44250bcac Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:19:42 +0000
Subject: [PATCH 182/375] Replace `ZEPHIR_OBS_COPY_OR_DUP()` macro with
 `ZVAL_COPY()`

---
 kernel/memory.h         | 3 ---
 src/Backend/Backend.php | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index d5ae07a1ce..ad785eb01a 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -86,9 +86,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	} \
 	ZVAL_DUP(d, v);
 
-#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
-	ZVAL_COPY(z, v);
-
 #define ZEPHIR_HASH_COPY(z, v) \
 	if (Z_TYPE_P(z) == IS_ARRAY && Z_TYPE_P(v) == IS_ARRAY) { \
 		zend_hash_copy(Z_ARRVAL_P(z), Z_ARRVAL_P(v), (copy_ctor_func_t) zval_add_ref); \
diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index 3a55b08f96..35ad8b15ec 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -544,7 +544,7 @@ public function assignZval(Variable $variable, $code, CompilationContext $contex
         if (!$variable->isDoublePointer()) {
             $context->symbolTable->mustGrownStack(true);
             $symbolVariable = $this->getVariableCode($variable);
-            $context->codePrinter->output('ZEPHIR_OBS_COPY_OR_DUP('.$symbolVariable.', '.$code.');');
+            $context->codePrinter->output('ZVAL_COPY('.$symbolVariable.', '.$code.');');
         } else {
             $context->codePrinter->output($variable->getName().' = '.$code.';');
         }

From 3d0befe54010fce100b3f7e6b13b7481d2199802 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:23:43 +0000
Subject: [PATCH 183/375] Remove `zephir_create_symbol_table` function

---
 kernel/memory.c | 41 -----------------------------------------
 kernel/memory.h |  2 --
 2 files changed, 43 deletions(-)

diff --git a/kernel/memory.c b/kernel/memory.c
index 6f0f606b12..4f1703dd85 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -75,47 +75,6 @@ void zephir_deinitialize_memory()
 	zephir_globals_ptr->initialized = 0;
 }
 
-/**
- * Creates a virtual symbol tables dynamically
- */
-void zephir_create_symbol_table(zephir_method_globals *gptr)
-{
-	zephir_symbol_table *entry;
-	zend_array *symbol_table;
-
-#ifndef ZEPHIR_RELEASE
-	if (!gptr->active_memory) {
-		fprintf(stderr, "ERROR: Trying to create a virtual symbol table without a memory frame");
-		zephir_print_backtrace();
-		return;
-	}
-#endif
-
-	zend_execute_data* ex = find_symbol_table(EG(current_execute_data));
-#ifndef ZEPHIR_RELEASE
-    if (UNEXPECTED(!ex)) {
-        fprintf(stderr, "ERROR: unable to find a symbol table");
-        zephir_print_backtrace();
-        return;
-    }
-#endif
-
-	zend_rebuild_symbol_table();
-	zend_detach_symbol_table(ex);
-
-	entry               = (zephir_symbol_table*)emalloc(sizeof(zephir_symbol_table));
-	entry->scope        = gptr->active_memory;
-	entry->symbol_table = ex->symbol_table;
-	entry->prev         = gptr->active_symbol_table;
-
-	symbol_table = (zend_array*)emalloc(sizeof(zend_array));
-	zend_hash_init(symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0);
-	zend_hash_real_init(symbol_table, 0);
-
-	ex->symbol_table          = symbol_table;
-	gptr->active_symbol_table = entry;
-}
-
 /**
  * Exports symbols to the active symbol table
  */
diff --git a/kernel/memory.h b/kernel/memory.h
index ad785eb01a..beb0aa493d 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -50,8 +50,6 @@ void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_glo
 
 #define zephir_safe_zval_ptr_dtor(pzval)
 
-void zephir_create_symbol_table(zephir_method_globals *g);
-
 int zephir_set_symbol(zval *key_name, zval *value);
 
 #define ZEPHIR_INIT_VAR(z) \

From a0aebe51a38b8c2930fbf5fa6380178789066835 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:27:18 +0000
Subject: [PATCH 184/375] Remove `zephir_do_memory_observe()` function

---
 kernel/memory.c | 39 ---------------------------------------
 kernel/memory.h |  2 --
 2 files changed, 41 deletions(-)

diff --git a/kernel/memory.c b/kernel/memory.c
index 4f1703dd85..37bb2d0ddd 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -95,42 +95,3 @@ int zephir_set_symbol(zval *key_name, zval *value)
 
 	return SUCCESS;
 }
-
-void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g)
-{
-	zephir_memory_entry *frame = g->active_memory;
-#ifndef ZEPHIR_RELEASE
-	if (UNEXPECTED(frame == NULL)) {
-		fprintf(stderr, "ZEPHIR_MM_GROW() must be called before using any of MM functions or macros!");
-		zephir_print_backtrace();
-		abort();
-	}
-#endif
-
-	if (UNEXPECTED(frame->pointer == frame->capacity)) {
-		void *buf = perealloc(frame->addresses, sizeof(zval *) * (frame->capacity + 16), 0);
-		if (EXPECTED(buf != NULL)) {
-			frame->capacity += 16;
-			frame->addresses = buf;
-		} else {
-			zend_error(E_CORE_ERROR, "Memory allocation failed");
-			return;
-		}
-	}
-
-#ifndef ZEPHIR_RELEASE
-	{
-		size_t i;
-		for (i = 0; i < frame->pointer; ++i) {
-			if (frame->addresses[i] == var) {
-				fprintf(stderr, "Variable %p is already observed", var);
-				zephir_print_backtrace();
-				abort();
-			}
-		}
-	}
-#endif
-
-	frame->addresses[frame->pointer] = var;
-	++frame->pointer;
-}
diff --git a/kernel/memory.h b/kernel/memory.h
index beb0aa493d..9456a690d2 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -46,8 +46,6 @@ typedef struct _zephir_method_globals {
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
 
-void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
-
 #define zephir_safe_zval_ptr_dtor(pzval)
 
 int zephir_set_symbol(zval *key_name, zval *value);

From 081ba057819ec24c37d6da05437b43baca63eb74 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:30:46 +0000
Subject: [PATCH 185/375] Remove `find_symbol_table()` function

---
 kernel/memory.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/kernel/memory.c b/kernel/memory.c
index 37bb2d0ddd..964f9b91f7 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -36,15 +36,6 @@
  * Not all methods must grow/restore the zephir_memory_entry.
  */
 
-static zend_always_inline zend_execute_data* find_symbol_table(zend_execute_data* ex)
-{
-    while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->common.type))) {
-        ex = ex->prev_execute_data;
-    }
-
-    return ex;
-}
-
 /**
  * Pre-allocates memory for further use in execution
  */

From 1156682aef3fda59155e5904eecf36cbe29a72cb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:37:15 +0000
Subject: [PATCH 186/375] Remove `ZEPHIR_INIT_VAR()` macro with `ZVAL_NULL()`

---
 kernel/memory.h           | 3 ---
 kernel/operators.h        | 2 +-
 src/Backend/Backend.php   | 2 +-
 src/Variable/Variable.php | 8 ++++----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 9456a690d2..a909482813 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -50,9 +50,6 @@ void zephir_deinitialize_memory();
 
 int zephir_set_symbol(zval *key_name, zval *value);
 
-#define ZEPHIR_INIT_VAR(z) \
-	ZVAL_NULL(z);
-
 #define ZEPHIR_INIT_NVAR(z) \
 	do { \
 		if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
diff --git a/kernel/operators.h b/kernel/operators.h
index 44351f897a..7659b62c8b 100644
--- a/kernel/operators.h
+++ b/kernel/operators.h
@@ -229,7 +229,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 		if (Z_TYPE_P(right) == IS_STRING) { \
 			ZEPHIR_CPY_WRT(left, right); \
 		} else if (Z_TYPE_P(right) == IS_NULL) { \
-		    ZEPHIR_INIT_VAR(left); \
+		    ZVAL_NULL(left); \
 		} else { \
 			use_copy_right = zephir_make_printable_zval(right, &right_tmp); \
 			if (use_copy_right) { \
diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index 35ad8b15ec..2859674ebe 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -102,7 +102,7 @@ public function declareVariables($method, $typeToVariables)
 
     public function initVar(Variable $variable, CompilationContext $context, bool $useCodePrinter = true, bool $second = false): string
     {
-        $macro = !$second ? 'ZEPHIR_INIT_VAR' : 'ZEPHIR_INIT_NVAR';
+        $macro = !$second ? 'ZVAL_NULL' : 'ZEPHIR_INIT_NVAR';
         $code = $macro.'('.$this->getVariableCode($variable).');';
         if ($useCodePrinter) {
             $context->codePrinter->output($code);
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index f1e0c149b6..9f99eed808 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -776,7 +776,7 @@ public function initVariant(CompilationContext $compilationContext): void
         }
 
         /**
-         * Variables are allocated for the first time using ZEPHIR_INIT_VAR
+         * Variables are allocated for the first time using ZVAL_NULL
          * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
          * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
          */
@@ -809,7 +809,7 @@ public function initVariant(CompilationContext $compilationContext): void
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&'.$this->getName().');');
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&'.$this->getName().');');
+                    $compilationContext->codePrinter->output('ZVAL_NULL(&'.$this->getName().');');
                 }
             }
 
@@ -832,7 +832,7 @@ public function trackVariant(CompilationContext $compilationContext): void
         }
 
         /**
-         * Variables are allocated for the first time using ZEPHIR_INIT_VAR
+         * Variables are allocated for the first time using ZVAL_NULL
          * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
          * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
          */
@@ -895,7 +895,7 @@ public function initComplexLiteralVariant(CompilationContext $compilationContext
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&'.$this->getName().');');
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&'.$this->getName().');');
+                    $compilationContext->codePrinter->output('ZVAL_NULL(&'.$this->getName().');');
                 }
             }
 

From 40e4e97be3516ac80aa8bc52ff49a69bb65c1d7a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:40:12 +0000
Subject: [PATCH 187/375] Remove `zephir_safe_zval_ptr_dtor()` macro

---
 kernel/memory.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index a909482813..17a6ce08c5 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -45,9 +45,6 @@ typedef struct _zephir_method_globals {
 
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
-
-#define zephir_safe_zval_ptr_dtor(pzval)
-
 int zephir_set_symbol(zval *key_name, zval *value);
 
 #define ZEPHIR_INIT_NVAR(z) \

From 5a4fbc06e100193f0613e12a8c50e8637adabe3c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:45:13 +0000
Subject: [PATCH 188/375] Remove unused structs

---
 kernel/memory.h         | 26 --------------------------
 src/Backend/Backend.php |  5 -----
 2 files changed, 31 deletions(-)

diff --git a/kernel/memory.h b/kernel/memory.h
index 17a6ce08c5..800ccafb31 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -17,32 +17,6 @@
 #include "php_ext.h"
 #include "kernel/globals.h"
 
-/** Memory frame */
-typedef struct _zephir_memory_entry {
-	size_t pointer;
-	size_t capacity;
-	zval **addresses;
-#ifndef ZEPHIR_RELEASE
-	int permanent;
-	const char *func;
-#endif
-} zephir_memory_entry;
-
-/** Virtual Symbol Table */
-typedef struct _zephir_symbol_table {
-	struct _zephir_memory_entry *scope;
-	zend_array *symbol_table;
-	struct _zephir_symbol_table *prev;
-} zephir_symbol_table;
-
-typedef struct _zephir_method_globals {
-	/* Memory */
-	zephir_memory_entry *active_memory; /**< The current memory frame */
-
-	/* Virtual Symbol Tables */
-	zephir_symbol_table *active_symbol_table;
-} zephir_method_globals;
-
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
 int zephir_set_symbol(zval *key_name, zval *value);
diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index 2859674ebe..605c486618 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -220,11 +220,6 @@ public function getTypeDefinition($type): array
                 $code = 'zephir_fcall_cache_entry';
                 break;
 
-            case 'zephir_method_globals':
-                $pointer = '*';
-                $code = 'zephir_method_globals';
-                break;
-
             default:
                 throw new CompilerException('Unsupported type in declare: '.$type);
         }

From 61e4f25d57bbc312945f4ab42be3c1fd4ccbfb45 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 17:48:47 +0000
Subject: [PATCH 189/375] Replace `RETURN_MM()` macro to `return`

---
 kernel/main.h                         | 5 +----
 src/Class/Method/Method.php           | 1 -
 src/Operators/Other/CloneOperator.php | 2 +-
 src/Statements/ReturnStatement.php    | 6 +++---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/kernel/main.h b/kernel/main.h
index 513f670d88..a191372de5 100644
--- a/kernel/main.h
+++ b/kernel/main.h
@@ -157,9 +157,6 @@ extern zend_string* i_self;
 	zephir_return_property(return_value, object, SL(member_name)); \
 	return;
 
-/** Return without change return_value */
-#define RETURN_MM()                 { return; }
-
 /** Return null restoring memory frame */
 #define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); return; }
 
@@ -178,7 +175,7 @@ extern zend_string* i_self;
  */
 #define RETURN_MM_MEMBER(object, member_name) \
   zephir_return_property(return_value, object, SL(member_name)); \
-  RETURN_MM();
+  return;
 
 #define RETURN_ON_FAILURE(what) \
 	do { \
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 5de2fe4414..72a504a19a 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -848,7 +848,6 @@ public function removeMemoryStackReferences(SymbolTable $symbolTable, string $co
         $containerCode = str_replace('RETURN_MM_EMPTY_STRING', 'RETURN_MM_EMPTY_STRING', $containerCode);
         $containerCode = str_replace('RETURN_MM_EMPTY_ARRAY', 'RETURN_EMPTY_ARRAY', $containerCode);
         $containerCode = str_replace('RETURN_MM_MEMBER', 'RETURN_MEMBER', $containerCode);
-        $containerCode = str_replace('RETURN_MM()', 'return', $containerCode);
 
         return preg_replace('/[ \t]+ZEPHIR_MM_RESTORE\(\);'.PHP_EOL.'/s', '', $containerCode);
     }
diff --git a/src/Operators/Other/CloneOperator.php b/src/Operators/Other/CloneOperator.php
index 56e1a91350..66a4bbe6b3 100644
--- a/src/Operators/Other/CloneOperator.php
+++ b/src/Operators/Other/CloneOperator.php
@@ -74,7 +74,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         $clonedSymbol = $compilationContext->backend->getVariableCode($clonedVariable);
 
         $compilationContext->codePrinter->output('if (zephir_clone('.$symbol.', '.$clonedSymbol.') == FAILURE) {');
-        $compilationContext->codePrinter->output("\t".'RETURN_MM();');
+        $compilationContext->codePrinter->output("\t".'return;');
         $compilationContext->codePrinter->output('}');
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 10c72cd0bd..51bd7960a6 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -222,7 +222,7 @@ public function compile(CompilationContext $compilationContext): void
                     if ('return_value' != $resolvedExpr->getCode()) {
                         $codePrinter->output('RETURN_CTOR('.$resolvedExpr->getCode().');');
                     } else {
-                        $codePrinter->output('RETURN_MM();');
+                        $codePrinter->output('return;');
                     }
                     break;
 
@@ -300,10 +300,10 @@ public function compile(CompilationContext $compilationContext): void
                                                 $compilationContext->backend->getVariableCode($symbolVariable)
                                             )
                                         );
-                                        $codePrinter->output('RETURN_MM();');
+                                        $codePrinter->output('return;');
                                     }
                                 } else {
-                                    $codePrinter->output('RETURN_MM();');
+                                    $codePrinter->output('return;');
                                 }
                             }
                             if ($symbolVariable->isTemporal()) {

From 042e6902b6cdaff0328d6013371e2a0df415b5b3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 18:44:01 +0000
Subject: [PATCH 190/375] Remove generation of redundant `ZVAL_NULL()`

---
 src/Variable/Variable.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index 9f99eed808..8ceab884d2 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -808,8 +808,6 @@ public function initVariant(CompilationContext $compilationContext): void
                 if ($this->variantInits > 0 || $compilationContext->insideCycle) {
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&'.$this->getName().');');
-                } else {
-                    $compilationContext->codePrinter->output('ZVAL_NULL(&'.$this->getName().');');
                 }
             }
 
@@ -894,8 +892,6 @@ public function initComplexLiteralVariant(CompilationContext $compilationContext
                 if ($this->variantInits > 0 || $compilationContext->insideCycle) {
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&'.$this->getName().');');
-                } else {
-                    $compilationContext->codePrinter->output('ZVAL_NULL(&'.$this->getName().');');
                 }
             }
 

From 8a7a20004e790ae34e41d2cc54309ae1111b3dac Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 22:57:14 +0000
Subject: [PATCH 191/375] Remove picking parameter value from
 `zephir_get_intval()`

As it already filled in `Z_PARAM_LONG()`
---
 src/Class/Method/Method.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 72a504a19a..fe1f9f0855 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1231,7 +1231,8 @@ public function assignZvalValue(array $parameter, CompilationContext $compilatio
             case 'uint':
             case 'long':
             case 'ulong':
-                return "\t".$parameter['name'].' = zephir_get_intval('.$parameterCode.');'.PHP_EOL;
+                // Value already passed in `Z_PARAM_LONG()`
+                return '';
 
             case 'char':
                 return "\t".$parameter['name'].' = zephir_get_charval('.$parameterCode.');'.PHP_EOL;

From 331b62cfab126f52eeb4b9e4007918167db809da Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 26 Nov 2023 23:12:01 +0000
Subject: [PATCH 192/375] Optimize imports

---
 src/Class/Method/Method.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index fe1f9f0855..fbc9ec23ed 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -32,7 +32,6 @@
 use Zephir\Passes\StaticTypeInference;
 use Zephir\StatementsBlock;
 use Zephir\SymbolTable;
-use Zephir\Variable\Variable;
 
 /**
  * Represents a class method

From 9a9adbd263a39052a19761ff2bf28529543af984 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 10:55:32 -0600
Subject: [PATCH 193/375] sonarlint suggestions

---
 src/Class/Method/Method.php        | 23 +++++++++++++----------
 src/Statements/ReturnStatement.php | 11 +++++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index fbc9ec23ed..1b68b3f966 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1841,16 +1841,19 @@ public function compile(CompilationContext $compilationContext): void
              */
             $lastType = $this->statements->getLastStatementType();
 
-            if ('return' !== $lastType && 'throw' !== $lastType && !$this->hasChildReturnStatementType($statement)) {
-                /**
-                 * If a method has return-type hints we need to ensure the last statement is a 'return' statement
-                 */
-                if ($this->hasReturnTypes()) {
-                    throw new CompilerException(
-                        'Reached end of the method without returning a valid type specified in the return-type hints',
-                        $this->expression['return-type']
-                    );
-                }
+            /**
+             * If a method has return-type hints we need to ensure the last
+             * statement is a 'return' statement
+             */
+            if (
+                'return' !== $lastType &&
+                'throw' !== $lastType && !$this->hasChildReturnStatementType($statement) &&
+                $this->hasReturnTypes()
+            ) {
+                throw new CompilerException(
+                    'Reached end of the method without returning a valid type specified in the return-type hints',
+                    $this->expression['return-type']
+                );
             }
         }
 
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 51bd7960a6..75a5567f7a 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
@@ -26,11 +27,13 @@
  */
 final class ReturnStatement extends StatementAbstract
 {
+    private const RETURN_RETURN = 'return;';
+
     /**
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -222,7 +225,7 @@ public function compile(CompilationContext $compilationContext): void
                     if ('return_value' != $resolvedExpr->getCode()) {
                         $codePrinter->output('RETURN_CTOR('.$resolvedExpr->getCode().');');
                     } else {
-                        $codePrinter->output('return;');
+                        $codePrinter->output(self::RETURN_RETURN);
                     }
                     break;
 
@@ -300,10 +303,10 @@ public function compile(CompilationContext $compilationContext): void
                                                 $compilationContext->backend->getVariableCode($symbolVariable)
                                             )
                                         );
-                                        $codePrinter->output('return;');
+                                        $codePrinter->output(self::RETURN_RETURN);
                                     }
                                 } else {
-                                    $codePrinter->output('return;');
+                                    $codePrinter->output(self::RETURN_RETURN);
                                 }
                             }
                             if ($symbolVariable->isTemporal()) {

From fed26de0e281a2b9271a31168b4196cbc7c2eb3d Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 11:17:33 -0600
Subject: [PATCH 194/375] phpcs

---
 src/Class/Method/Method.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 1b68b3f966..92a4c40c77 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1847,7 +1847,8 @@ public function compile(CompilationContext $compilationContext): void
              */
             if (
                 'return' !== $lastType &&
-                'throw' !== $lastType && !$this->hasChildReturnStatementType($statement) &&
+                'throw' !== $lastType &&
+                !$this->hasChildReturnStatementType($statement) &&
                 $this->hasReturnTypes()
             ) {
                 throw new CompilerException(

From 8d9efee33ecb5f436cf6f102bfe72ee7db28d485 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 11:27:51 -0600
Subject: [PATCH 195/375] changing to PSR12

---
 phpcs.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index e70f4be573..5c0705400b 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -18,7 +18,7 @@
     <arg value="s"/>
 
     <!-- Use PSR-2 as a base -->
-    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
 
     <!-- Uncomment to use colors in progress or report -->
     <arg name="colors" />

From f50ed69c12dfd00d5ee5083d753d564c15079846 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 11:51:22 -0600
Subject: [PATCH 196/375] reverting back to psr2 - psr12 in different pr

---
 phpcs.xml.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 5c0705400b..e70f4be573 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -18,7 +18,7 @@
     <arg value="s"/>
 
     <!-- Use PSR-2 as a base -->
-    <rule ref="PSR12"/>
+    <rule ref="PSR2"/>
 
     <!-- Uncomment to use colors in progress or report -->
     <arg name="colors" />

From 0c54d655b7c1751cb429970d9edd47a18615e334 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 11:57:37 -0600
Subject: [PATCH 197/375] phpcs changes

---
 src/Class/Method/Method.php        | 3 +--
 src/Statements/ReturnStatement.php | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 92a4c40c77..d04e634342 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1845,8 +1845,7 @@ public function compile(CompilationContext $compilationContext): void
              * If a method has return-type hints we need to ensure the last
              * statement is a 'return' statement
              */
-            if (
-                'return' !== $lastType &&
+            if ('return' !== $lastType &&
                 'throw' !== $lastType &&
                 !$this->hasChildReturnStatementType($statement) &&
                 $this->hasReturnTypes()
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 75a5567f7a..2112ea0f8c 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Statements;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
@@ -33,7 +32,7 @@ final class ReturnStatement extends StatementAbstract
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws ReflectionException
+     * @throws \ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {

From 94042109d17f6f47ef435863a88f9f0de4721a48 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 12:00:22 -0600
Subject: [PATCH 198/375] more phpcs

---
 src/Class/Method/Method.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index d04e634342..f0ccf328a6 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1845,10 +1845,10 @@ public function compile(CompilationContext $compilationContext): void
              * If a method has return-type hints we need to ensure the last
              * statement is a 'return' statement
              */
-            if ('return' !== $lastType &&
-                'throw' !== $lastType &&
-                !$this->hasChildReturnStatementType($statement) &&
-                $this->hasReturnTypes()
+            if ('return' !== $lastType
+                && 'throw' !== $lastType
+                && !$this->hasChildReturnStatementType($statement)
+                && $this->hasReturnTypes()
             ) {
                 throw new CompilerException(
                     'Reached end of the method without returning a valid type specified in the return-type hints',

From 4d58e9ee033e1481c675c60cbf5169523df08a7a Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 12:34:54 -0600
Subject: [PATCH 199/375] updating GH workflow

---
 .github/workflows/build-win-ext/action.yml | 2 +-
 .github/workflows/main.yml                 | 4 ++--
 .github/workflows/release.yml              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-win-ext/action.yml b/.github/workflows/build-win-ext/action.yml
index 128782e8bf..1816281a08 100644
--- a/.github/workflows/build-win-ext/action.yml
+++ b/.github/workflows/build-win-ext/action.yml
@@ -33,7 +33,7 @@ runs:
   using: 'composite'
   steps:
     - name: Setup Downloads Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v.3
       with:
         path: ${{ env.CACHE_DIR }}
         key: ${{ runner.os }}-downloads-${{ hashFiles('**/.github/workflows/build-win-ext/actions.yml') }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7d46027c05..d64be7ad21 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -118,7 +118,7 @@ jobs:
 #        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
 #      - name: Set Up Composer Cache
-#        uses: actions/cache@v2
+#        uses: actions/cache@v3
 #        with:
 #          path: ${{ steps.composer-cache.outputs.dir }}
 #          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -190,7 +190,7 @@ jobs:
           make -j$(getconf _NPROCESSORS_ONLN)
 
       - name: Upload Code Coverage Report
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./tests/output/clover.xml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eb9ff91f50..eca84a4562 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
         run: echo ::set-output name=dir::$(composer config cache-files-dir)
 
       - name: Setup Composer Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

From dcf18d33eb47ab8158d2ca3cedbaff75e6e86c34 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 12:40:24 -0600
Subject: [PATCH 200/375] correcting typo

---
 .github/workflows/build-win-ext/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-win-ext/action.yml b/.github/workflows/build-win-ext/action.yml
index 1816281a08..6a4db676b6 100644
--- a/.github/workflows/build-win-ext/action.yml
+++ b/.github/workflows/build-win-ext/action.yml
@@ -33,7 +33,7 @@ runs:
   using: 'composite'
   steps:
     - name: Setup Downloads Cache
-      uses: actions/cache@v.3
+      uses: actions/cache@v3
       with:
         path: ${{ env.CACHE_DIR }}
         key: ${{ runner.os }}-downloads-${{ hashFiles('**/.github/workflows/build-win-ext/actions.yml') }}

From d5bbd896591aa3d00cde1c0d85e32136cefe3fd0 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 14:15:30 -0600
Subject: [PATCH 201/375] updated composer; added shortcut commands

---
 composer.json | 19 ++++++++++++--
 composer.lock | 71 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 3cf66e6670..7971f1f043 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,8 @@
         "ext-pdo_sqlite": "*",
         "ext-zip": "*",
         "phpunit/phpunit": "9.5.28",
-        "psr/log": "1.1.*"
+        "psr/log": "1.1.*",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "config": {
         "optimize-autoloader": true,
@@ -71,5 +72,19 @@
         "source": "https://github.com/zephir-lang/zephir",
         "irc": "irc://irc.freenode.net/zephir",
         "docs": "https://docs.zephir-lang.com"
-    }
+    },
+  "scripts": {
+    "cs": "./vendor/bin/phpcs --standard=phpcs.xml.dist",
+    "cs-fix": "./vendor/bin/phpcbf --standard=phpcs.xml.dist",
+    "test": "./vendor/bin/phpunit --testsuite Zephir",
+    "test-coverage": "./vendor/bin/phpunit --testsuite Zephir --coverage-html ./tests/output/coverage",
+    "test-coverage-html": "./vendor/bin/phpunit --testsuite Zephir --coverage-php ./tests/output/coverage/coverage.xml"
+  },
+  "scripts-descriptions": {
+    "cs": "Run PHPCS",
+    "cs-fix": "Run PHPCBF",
+    "test": "Run all tests",
+    "test-coverage": "Run all tests with coverage (clover)",
+    "test-coverage-html": "Run all tests with coverage (HTML)"
+  }
 }
diff --git a/composer.lock b/composer.lock
index a42e55c631..66b21b4acb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "12ba06c84bf00534e75ea0d79e22a65b",
+    "content-hash": "b2471ed2d66bc4e86d3c83993063d763",
     "packages": [
         {
             "name": "monolog/monolog",
@@ -2933,18 +2933,75 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2023-02-22T23:07:41+00:00"
+        },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
                 "shasum": ""
             },
             "require": {
@@ -2973,7 +3030,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
             },
             "funding": [
                 {
@@ -2981,7 +3038,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2023-11-20T00:12:19+00:00"
         }
     ],
     "aliases": [],

From f686a017dcca8528baf999ab520645e8453f2b9f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 14:16:13 -0600
Subject: [PATCH 202/375] switching to psr-12

---
 phpcs.xml.dist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index e70f4be573..9201b51f68 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -17,8 +17,8 @@
     <!-- Show sniff codes in all reports -->
     <arg value="s"/>
 
-    <!-- Use PSR-2 as a base -->
-    <rule ref="PSR2"/>
+    <!-- Use PSR-12 as a base -->
+    <rule ref="PSR12"/>
 
     <!-- Uncomment to use colors in progress or report -->
     <arg name="colors" />

From 580ea0fdf9d273c41622a6076d57b103c7e879fe Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:15:30 -0600
Subject: [PATCH 203/375] a lot of phpcs fixes

---
 phpcs.xml.dist                                |    1 +
 src/AliasManager.php                          |   71 +-
 src/Backend/Backend.php                       | 2637 +++++++------
 src/Backend/FcallManager.php                  |  100 +-
 src/Backend/FcallManagerInterface.php         |   10 +-
 src/Backend/StringsManager.php                |  179 +-
 src/Backend/VariablesManager.php              |   66 +-
 src/Branch.php                                |   85 +-
 src/BranchManager.php                         |   30 +-
 src/Builder/FunctionCallBuilder.php           |   12 +-
 .../Operators/AbstractOperatorBuilder.php     |    4 +-
 src/Builder/Operators/CastOperatorBuilder.php |   18 +-
 .../Operators/UnaryOperatorBuilder.php        |   22 +-
 src/Builder/Statements/IfStatementBuilder.php |    4 +-
 .../Statements/LetStatementBuilder.php        |    4 +-
 src/Cache/FunctionCache.php                   |   13 +-
 src/Cache/Manager.php                         |   24 +-
 src/Cache/MethodCache.php                     |   70 +-
 src/Cache/SlotsCache.php                      |   44 +-
 src/Cache/StaticMethodCache.php               |   21 +-
 src/Call.php                                  |  970 +++--
 src/Class/Constant.php                        |   75 +-
 src/Class/Definition/Definition.php           | 1934 ++++-----
 src/Class/Entry.php                           |   70 +-
 src/Class/Method/Method.php                   | 3449 +++++++++--------
 src/Class/Method/Parameters.php               |  101 +-
 src/Class/Property.php                        |  351 +-
 src/Code/ArgInfoDefinition.php                |  423 +-
 src/Code/Builder/Struct.php                   |   67 +-
 src/Code/Printer.php                          |  158 +-
 src/CompilationContext.php                    |  138 +-
 src/CompiledExpression.php                    |   32 +-
 src/Compiler.php                              | 3214 +++++++--------
 src/Compiler/FileInterface.php                |   16 +-
 src/CompilerFile.php                          | 1375 +++----
 src/CompilerFileAnonymous.php                 |  212 +-
 src/Config.php                                |  199 +-
 src/ConfigException.php                       |    2 +-
 src/Console/Application.php                   |  128 +-
 src/Console/Command/ApiCommand.php            |   77 +-
 src/Console/Command/BuildCommand.php          |   30 +-
 src/Console/Command/CleanCommand.php          |   13 +-
 src/Console/Command/CompileCommand.php        |   15 +-
 .../Command/DevelopmentModeAwareTrait.php     |    4 +-
 src/Console/Command/FullCleanCommand.php      |   11 +-
 src/Console/Command/GenerateCommand.php       |   11 +-
 src/Console/Command/InitCommand.php           |  111 +-
 src/Console/Command/InstallCommand.php        |   11 +-
 src/Console/Command/ListCommand.php           |   16 +-
 src/Console/Command/RemoveOptionsTrait.php    |    8 +-
 src/Console/Command/StubsCommand.php          |   13 +-
 src/Detectors/ReadDetector.php                |   19 +-
 src/Detectors/WriteDetector.php               |  159 +-
 src/Documentation.php                         |  269 +-
 src/Documentation/Annotation.php              |   12 +-
 src/Documentation/Annotation/Link.php         |   19 +-
 .../Annotation/ReturnAnnotation.php           |   12 +-
 src/Documentation/Annotation/See.php          |    2 +-
 src/Documentation/Docblock.php                |  112 +-
 src/Documentation/DocblockParser.php          |  151 +-
 src/Documentation/File/ClassFile.php          |   26 +-
 src/Documentation/File/ClassesFile.php        |   12 +-
 src/Documentation/File/IndexFile.php          |   14 +-
 src/Documentation/File/NamespaceFile.php      |   26 +-
 src/Documentation/File/NamespacesFile.php     |   16 +-
 src/Documentation/File/Sitemap.php            |   36 +-
 src/Documentation/File/SourceFile.php         |   10 +-
 src/Documentation/FileInterface.php           |   10 +-
 src/Documentation/NamespaceAccessor.php       |   50 +-
 src/Documentation/NamespaceHelper.php         |   31 +-
 src/Documentation/Template.php                |  100 +-
 src/Documentation/Theme.php                   |  291 +-
 src/Exception.php                             |    4 +-
 src/Exception/CompilerException.php           |   21 +-
 src/Exception/ExceptionExtraAwareTrait.php    |   24 +-
 src/Exception/ExceptionInterface.php          |   16 +-
 src/Exception/FileSystemException.php         |    4 +-
 src/Exception/IllegalOperationException.php   |    4 +-
 src/Exception/IllegalStateException.php       |    4 +-
 src/Exception/InvalidArgumentException.php    |    4 +-
 src/Exception/LogicException.php              |    4 +-
 src/Exception/NotImplementedException.php     |    4 +-
 src/Exception/ParseException.php              |   21 +-
 src/Exception/RuntimeException.php            |    4 +-
 src/Expression.php                            |  352 +-
 src/Expression/Builder/AbstractBuilder.php    |  111 +-
 src/Expression/Builder/BuilderFactory.php     |   60 +-
 .../Builder/Factory/OperatorsFactory.php      |   71 +-
 .../Builder/Factory/StatementsFactory.php     |   57 +-
 .../Builder/Operators/AbstractOperator.php    |    4 +-
 .../Operators/AssignPropertyOperator.php      |   18 +-
 .../Operators/AssignVariableOperator.php      |   70 +-
 .../Builder/Operators/BinaryOperator.php      |  110 +-
 .../Builder/Operators/RawOperator.php         |    4 +-
 .../Builder/Operators/UnaryOperator.php       |   63 +-
 src/Expression/Builder/RawExpression.php      |    4 +-
 .../Builder/Statements/AbstractStatement.php  |    4 +-
 .../Statements/CallFunctionStatement.php      |   65 +-
 .../Statements/CallMethodStatement.php        |   16 +-
 .../Statements/CallStaticStatement.php        |   80 +-
 .../Builder/Statements/IfStatement.php        |   53 +-
 .../Builder/Statements/LetStatement.php       |   30 +-
 .../Builder/Statements/RawStatement.php       |    4 +-
 .../Builder/Statements/StatementsBlock.php    |   44 +-
 src/Expression/Closure.php                    |  113 +-
 src/Expression/ClosureArrow.php               |   30 +-
 src/Expression/Constants.php                  |  100 +-
 src/Expression/NativeArray.php                |  513 ++-
 src/Expression/NativeArrayAccess.php          |  288 +-
 src/Expression/PropertyAccess.php             |  185 +-
 src/Expression/PropertyDynamicAccess.php      |  135 +-
 src/Expression/Reference.php                  |   98 +-
 src/Expression/StaticConstantAccess.php       |   78 +-
 src/Expression/StaticPropertyAccess.php       |  138 +-
 src/FileSystem/FileSystemInterface.php        |   82 +-
 src/FileSystem/HardDisk.php                   |  246 +-
 src/FunctionCall.php                          |  729 ++--
 src/FunctionDefinition.php                    |   26 +-
 src/HeadersManager.php                        |   14 +-
 src/LiteralCompiledExpression.php             |    4 +-
 src/Logger/Formatter/CompilerFormatter.php    |   81 +-
 src/MethodCall.php                            |  168 +-
 src/Name.php                                  |  115 +-
 src/Operators/AbstractOperator.php            |  199 +-
 src/Operators/Arithmetical/AddOperator.php    |   10 +-
 .../Arithmetical/ArithmeticalBaseOperator.php |  568 ++-
 src/Operators/Arithmetical/DivOperator.php    |  512 ++-
 src/Operators/Arithmetical/ModOperator.php    |  533 ++-
 src/Operators/Arithmetical/MulOperator.php    |   10 +-
 src/Operators/Arithmetical/SubOperator.php    |   10 +-
 src/Operators/Bitwise/BitwiseAndOperator.php  |   10 +-
 src/Operators/Bitwise/BitwiseBaseOperator.php |  555 ++-
 src/Operators/Bitwise/BitwiseNotOperator.php  |   23 +-
 src/Operators/Bitwise/BitwiseOrOperator.php   |   10 +-
 src/Operators/Bitwise/BitwiseXorOperator.php  |   10 +-
 src/Operators/Bitwise/ShiftLeftOperator.php   |   10 +-
 src/Operators/Bitwise/ShiftRightOperator.php  |   10 +-
 .../Comparison/ComparisonBaseOperator.php     |  764 ++--
 src/Operators/Comparison/EqualsOperator.php   |   34 +-
 .../Comparison/GreaterEqualOperator.php       |   22 +-
 src/Operators/Comparison/GreaterOperator.php  |   22 +-
 .../Comparison/IdenticalOperator.php          |   34 +-
 .../Comparison/LessEqualOperator.php          |   22 +-
 src/Operators/Comparison/LessOperator.php     |   22 +-
 .../Comparison/NotEqualsOperator.php          |   40 +-
 .../Comparison/NotIdenticalOperator.php       |   37 +-
 src/Operators/Logical/AndOperator.php         |   53 +-
 src/Operators/Logical/LogicalBaseOperator.php |  373 +-
 src/Operators/Logical/OrOperator.php          |   50 +-
 src/Operators/Other/CastOperator.php          |   55 +-
 src/Operators/Other/CloneOperator.php         |   21 +-
 src/Operators/Other/ConcatOperator.php        |   71 +-
 src/Operators/Other/EmptyOperator.php         |   17 +-
 src/Operators/Other/FetchOperator.php         |  114 +-
 src/Operators/Other/InstanceOfOperator.php    |   44 +-
 src/Operators/Other/IssetOperator.php         |   75 +-
 src/Operators/Other/LikelyOperator.php        |   20 +-
 src/Operators/Other/NewInstanceOperator.php   |   97 +-
 .../Other/RangeExclusiveOperator.php          |    7 +-
 .../Other/RangeInclusiveOperator.php          |    7 +-
 src/Operators/Other/RequireOnceOperator.php   |   29 +-
 src/Operators/Other/RequireOperator.php       |   32 +-
 src/Operators/Other/ShortTernaryOperator.php  |   29 +-
 src/Operators/Other/TernaryOperator.php       |   37 +-
 src/Operators/Other/TypeHintOperator.php      |    3 +-
 src/Operators/Other/TypeOfOperator.php        |    5 +-
 src/Operators/Other/UnlikelyOperator.php      |   20 +-
 src/Operators/Unary/MinusOperator.php         |   17 +-
 src/Operators/Unary/NotOperator.php           |   19 +-
 src/Optimizers/EvalExpression.php             |  152 +-
 src/Optimizers/FunctionCall/ACosOptimizer.php |    4 +-
 src/Optimizers/FunctionCall/ASinOptimizer.php |    4 +-
 .../FunctionCall/AddslashesOptimizer.php      |   15 +-
 .../FunctionCall/ArrayKeyExistsOptimizer.php  |   14 +-
 .../FunctionCall/ArrayKeysOptimizer.php       |   15 +-
 .../FunctionCall/ArrayMergeOptimizer.php      |    8 +-
 .../FunctionCall/BasenameOptimizer.php        |   15 +-
 .../CallUserFuncArrayOptimizer.php            |   17 +-
 .../FunctionCall/CallUserFuncOptimizer.php    |   15 +-
 .../FunctionCall/CamelizeOptimizer.php        |   19 +-
 src/Optimizers/FunctionCall/CeilOptimizer.php |   10 +-
 .../FunctionCall/ClassExistsOptimizer.php     |   18 +-
 .../FunctionCall/CompareMtimeOptimizer.php    |   14 +-
 src/Optimizers/FunctionCall/CosOptimizer.php  |    4 +-
 .../FunctionCall/CountOptimizer.php           |   10 +-
 .../FunctionCall/Crc32Optimizer.php           |   15 +-
 .../FunctionCall/CreateArrayOptimizer.php     |   19 +-
 .../FunctionCall/CreateInstanceOptimizer.php  |   17 +-
 .../CreateInstanceParamsOptimizer.php         |   17 +-
 .../CreateSymbolTableOptimizer.php            |    9 +-
 src/Optimizers/FunctionCall/DieOptimizer.php  |    4 +-
 .../FunctionCall/DoublevalOptimizer.php       |   10 +-
 .../FunctionCall/EndsWithOptimizer.php        |   28 +-
 src/Optimizers/FunctionCall/EvalOptimizer.php |   15 +-
 src/Optimizers/FunctionCall/ExitOptimizer.php |   10 +-
 .../FunctionCall/ExplodeOptimizer.php         |   31 +-
 .../FunctionCall/FcloseOptimizer.php          |   10 +-
 src/Optimizers/FunctionCall/FeofOptimizer.php |   10 +-
 .../FunctionCall/FileExistsOptimizer.php      |   14 +-
 .../FunctionCall/FileGetContentsOptimizer.php |   17 +-
 .../FunctionCall/FilePutContentsOptimizer.php |   21 +-
 .../FunctionCall/FilemtimeOptimizer.php       |   15 +-
 .../FunctionCall/FloorOptimizer.php           |   10 +-
 .../FunctionCall/FuncGetArgOptimizer.php      |   10 +-
 .../FunctionCall/FuncGetArgsOptimizer.php     |    6 +-
 .../FunctionCall/FuncNumArgsOptimizer.php     |    4 +-
 .../FunctionCall/FunctionExistsOptimizer.php  |    8 +-
 .../FunctionCall/FwriteOptimizer.php          |   21 +-
 .../FunctionCall/GetCalledClassOptimizer.php  |   15 +-
 .../FunctionCall/GetClassLowerOptimizer.php   |   15 +-
 .../FunctionCall/GetClassNsOptimizer.php      |   19 +-
 .../FunctionCall/GetClassOptimizer.php        |   15 +-
 .../FunctionCall/GetDefinedVarsOptimizer.php  |    6 +-
 .../FunctionCall/GetNsClassOptimizer.php      |   15 +-
 .../FunctionCall/GettypeOptimizer.php         |   15 +-
 .../FunctionCall/GlobalsGetOptimizer.php      |   13 +-
 .../FunctionCall/GlobalsSetOptimizer.php      |   16 +-
 .../FunctionCall/HashEqualsOptimizer.php      |   19 +-
 .../FunctionCall/ImplodeOptimizer.php         |   21 +-
 .../FunctionCall/InArrayOptimizer.php         |   14 +-
 .../FunctionCall/InterfaceExistsOptimizer.php |   28 +-
 .../FunctionCall/IntvalOptimizer.php          |   10 +-
 .../FunctionCall/IsArrayOptimizer.php         |    4 +-
 .../FunctionCall/IsBoolOptimizer.php          |    4 +-
 .../FunctionCall/IsCallableOptimizer.php      |   10 +-
 .../FunctionCall/IsIntOptimizer.php           |    4 +-
 .../FunctionCall/IsNullOptimizer.php          |    4 +-
 .../FunctionCall/IsNumericOptimizer.php       |   10 +-
 .../FunctionCall/IsObjectOptimizer.php        |    4 +-
 .../FunctionCall/IsPhpVersionOptimizer.php    |   39 +-
 .../IsPrivatePropertyOptimizer.php            |   10 +-
 .../FunctionCall/IsResourceOptimizer.php      |    4 +-
 .../FunctionCall/IsScalarOptimizer.php        |   10 +-
 .../FunctionCall/IsStringOptimizer.php        |    4 +-
 src/Optimizers/FunctionCall/JoinOptimizer.php |    4 +-
 .../FunctionCall/JsonDecodeOptimizer.php      |   14 +-
 .../FunctionCall/JsonEncodeOptimizer.php      |   14 +-
 .../FunctionCall/LdexpOptimizer.php           |   10 +-
 .../FunctionCall/LtrimOptimizer.php           |    4 +-
 src/Optimizers/FunctionCall/Md5Optimizer.php  |   15 +-
 .../FunctionCall/MemstrOptimizer.php          |   24 +-
 .../FunctionCall/MergeAppendOptimizer.php     |   10 +-
 .../FunctionCall/MethodExistsOptimizer.php    |   14 +-
 .../FunctionCall/MicrotimeOptimizer.php       |   17 +-
 src/Optimizers/FunctionCall/PowOptimizer.php  |   17 +-
 .../FunctionCall/PregMatchAllOptimizer.php    |    4 +-
 .../FunctionCall/PregMatchOptimizer.php       |  133 +-
 .../PrepareVirtualPathOptimizer.php           |   17 +-
 .../FunctionCall/RoundOptimizer.php           |   27 +-
 .../FunctionCall/RtrimOptimizer.php           |    4 +-
 src/Optimizers/FunctionCall/SinOptimizer.php  |    4 +-
 src/Optimizers/FunctionCall/SqrtOptimizer.php |    4 +-
 .../FunctionCall/StartsWithOptimizer.php      |   28 +-
 .../FunctionCall/StrReplaceOptimizer.php      |   19 +-
 .../FunctionCall/StripcslashesOptimizer.php   |   15 +-
 .../FunctionCall/StripslashesOptimizer.php    |   15 +-
 .../FunctionCall/StrlenOptimizer.php          |   10 +-
 .../FunctionCall/StrposOptimizer.php          |   25 +-
 .../FunctionCall/StrtokOptimizer.php          |   10 +-
 .../FunctionCall/StrtolowerOptimizer.php      |   15 +-
 .../FunctionCall/StrtoupperOptimizer.php      |   15 +-
 .../FunctionCall/SubstrOptimizer.php          |   25 +-
 src/Optimizers/FunctionCall/TanOptimizer.php  |    4 +-
 src/Optimizers/FunctionCall/TimeOptimizer.php |   11 +-
 src/Optimizers/FunctionCall/TrimOptimizer.php |   17 +-
 .../FunctionCall/UcfirstOptimizer.php         |   15 +-
 .../FunctionCall/UncamelizeOptimizer.php      |   19 +-
 .../FunctionCall/UniqueKeyOptimizer.php       |   17 +-
 .../FunctionCall/UniquePathKeyOptimizer.php   |   15 +-
 .../FunctionCall/VarDumpOptimizer.php         |   28 +-
 .../FunctionCall/VarExportOptimizer.php       |   37 +-
 .../ZephirStringToHexOptimizer.php            |   15 +-
 src/Optimizers/IsTypeOptimizerAbstract.php    |    6 +-
 src/Optimizers/MathOptimizer.php              |   12 +-
 src/Os.php                                    |    4 +-
 src/Parser/Manager.php                        |    6 +-
 src/Parser/Parser.php                         |   18 +-
 src/Passes/CallGathererPass.php               |   76 +-
 src/Passes/LocalContextPass.php               |  319 +-
 src/Passes/LoopBreakPass.php                  |   14 +-
 src/Passes/MutateGathererPass.php             |   97 +-
 src/Passes/SkipVariantInit.php                |   58 +-
 src/Passes/StaticTypeInference.php            |  177 +-
 src/Statements/BreakStatement.php             |    4 +-
 src/Statements/ContinueStatement.php          |    4 +-
 src/Statements/DeclareStatement.php           |   18 +-
 src/Statements/DoWhileStatement.php           |   11 +-
 src/Statements/EchoStatement.php              |   49 +-
 src/Statements/ForStatement.php               | 1090 +++---
 src/Statements/IfStatement.php                |   30 +-
 src/Statements/Let/ArrayIndex.php             |  435 ++-
 src/Statements/Let/ArrayIndexAppend.php       |   68 +-
 src/Statements/Let/Decr.php                   |   30 +-
 src/Statements/Let/ExportSymbol.php           |   43 +-
 src/Statements/Let/ExportSymbolString.php     |   41 +-
 src/Statements/Let/Incr.php                   |   30 +-
 src/Statements/Let/ObjectDynamicProperty.php  |  163 +-
 .../Let/ObjectDynamicStringProperty.php       |  155 +-
 src/Statements/Let/ObjectProperty.php         |   97 +-
 src/Statements/Let/ObjectPropertyAppend.php   |  221 +-
 .../Let/ObjectPropertyArrayIndex.php          |  453 ++-
 .../Let/ObjectPropertyArrayIndexAppend.php    |   77 +-
 src/Statements/Let/ObjectPropertyDecr.php     |   60 +-
 src/Statements/Let/ObjectPropertyIncr.php     |   55 +-
 src/Statements/Let/StaticProperty.php         |  204 +-
 src/Statements/Let/StaticPropertyAdd.php      |  174 +-
 src/Statements/Let/StaticPropertyAppend.php   |   55 +-
 .../Let/StaticPropertyArrayIndex.php          |   62 +-
 .../Let/StaticPropertyArrayIndexAppend.php    |   67 +-
 src/Statements/Let/StaticPropertySub.php      |  174 +-
 src/Statements/Let/Variable.php               | 1029 +++--
 src/Statements/Let/VariableAppend.php         |  215 +-
 src/Statements/LetStatement.php               |   72 +-
 src/Statements/LoopStatement.php              |   17 +-
 src/Statements/RequireStatement.php           |    4 +-
 src/Statements/ReturnStatement.php            |   35 +-
 src/Statements/StatementAbstract.php          |   14 +-
 src/Statements/SwitchStatement.php            |   68 +-
 src/Statements/ThrowStatement.php             |   45 +-
 src/Statements/TryCatchStatement.php          |   76 +-
 src/Statements/UnsetStatement.php             |   77 +-
 src/Statements/WhileStatement.php             |   14 +-
 src/StatementsBlock.php                       |  125 +-
 src/StaticCall.php                            |  541 ++-
 src/Stubs/DocBlock.php                        |   24 +-
 src/Stubs/Generator.php                       |  197 +-
 src/Stubs/MethodDocBlock.php                  |  227 +-
 src/SymbolTable.php                           | 1023 ++---
 src/TypeAwareInterface.php                    |    4 +-
 src/Types/AbstractType.php                    |   36 +-
 src/Types/ArrayType.php                       |  100 +-
 src/Types/CharType.php                        |   14 +-
 src/Types/DoubleType.php                      |   26 +-
 src/Types/IntType.php                         |   26 +-
 src/Types/StringType.php                      |   48 +-
 src/Types/Types.php                           |  276 +-
 src/Variable/Globals.php                      |   24 +-
 src/Variable/Variable.php                     | 1126 +++---
 src/Zephir.php                                |    5 +-
 339 files changed, 22832 insertions(+), 16152 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 9201b51f68..fd2566c53f 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -29,6 +29,7 @@
     <rule ref="PSR2">
         <exclude name="Generic.Files.LineLength.TooLong"/>
         <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+        <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/>
     </rule>
 
     <!--
diff --git a/src/AliasManager.php b/src/AliasManager.php
index 742d5bcaec..50f0b89007 100644
--- a/src/AliasManager.php
+++ b/src/AliasManager.php
@@ -13,6 +13,9 @@
 
 namespace Zephir;
 
+use function count;
+use function in_array;
+
 /**
  * Manage aliases in a file
  */
@@ -34,18 +37,6 @@ public function add(array $useStatement): void
         }
     }
 
-    /**
-     * Checks if a class name is an existing alias.
-     *
-     * @param string $alias
-     *
-     * @return bool
-     */
-    public function isAlias(string $alias): bool
-    {
-        return isset($this->aliases[$alias]);
-    }
-
     /**
      * Returns the class name according to an existing alias.
      *
@@ -58,16 +49,6 @@ public function getAlias(string $alias): string
         return $this->aliases[$alias];
     }
 
-    /**
-     * Returns key-value pair of aliases.
-     *
-     * @return array
-     */
-    public function getAliases(): array
-    {
-        return $this->aliases;
-    }
-
     /**
      * Returns alias by fully qualified class name.
      *
@@ -79,7 +60,7 @@ public function getAliasForClassName(string $className): string
     {
         $keys = array_keys($this->aliases, trim($className, '\\'));
 
-        if (1 === \count($keys)) {
+        if (1 === count($keys)) {
             return $keys[0];
         }
 
@@ -87,21 +68,25 @@ public function getAliasForClassName(string $className): string
     }
 
     /**
-     * Check if class name use an aliasing in use statement.
+     * Returns key-value pair of aliases.
      *
-     * ex: use Events\ManagerInterface as EventsManagerInterface;
+     * @return array
+     */
+    public function getAliases(): array
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * Checks if a class name is an existing alias.
      *
      * @param string $alias
      *
      * @return bool
      */
-    public function isUseStatementAliased(string $alias): bool
+    public function isAlias(string $alias): bool
     {
-        if ($this->isAlias($alias)) {
-            return $alias !== $this->implicitAlias($this->getAlias($alias));
-        }
-
-        return false;
+        return isset($this->aliases[$alias]);
     }
 
     /**
@@ -115,12 +100,30 @@ public function isAliasPresentFor(string $className): bool
     {
         $extractAlias = $this->implicitAlias($className);
 
-        $isClassDeclared = \in_array($className, $this->aliases);
-        $classAlias = array_flip($this->aliases)[$className] ?? null;
+        $isClassDeclared = in_array($className, $this->aliases);
+        $classAlias      = array_flip($this->aliases)[$className] ?? null;
 
         return $isClassDeclared && $classAlias !== $extractAlias;
     }
 
+    /**
+     * Check if class name use an aliasing in use statement.
+     *
+     * ex: use Events\ManagerInterface as EventsManagerInterface;
+     *
+     * @param string $alias
+     *
+     * @return bool
+     */
+    public function isUseStatementAliased(string $alias): bool
+    {
+        if ($this->isAlias($alias)) {
+            return $alias !== $this->implicitAlias($this->getAlias($alias));
+        }
+
+        return false;
+    }
+
     /**
      * Extract implicit alias from use statement.
      *
@@ -132,6 +135,6 @@ private function implicitAlias(string $className): string
     {
         $parts = explode('\\', $className);
 
-        return $parts[\count($parts) - 1];
+        return $parts[count($parts) - 1];
     }
 }
diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index 605c486618..c39b053f3b 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -28,6 +28,21 @@
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
 
+use function array_reverse;
+use function count;
+use function file_get_contents;
+use function implode;
+use function in_array;
+use function is_array;
+use function is_object;
+use function rtrim;
+use function sprintf;
+use function strlen;
+use function strtoupper;
+use function substr;
+
+use const PHP_EOL;
+
 class Backend
 {
     protected FcallManagerInterface $fcallManager;
@@ -40,467 +55,567 @@ public function __construct(
         $this->fcallManager = new FcallManager();
     }
 
-    /**
-     * Resolves the path to the source kernel files of the backend.
-     */
-    public function getInternalKernelPath(): string
-    {
-        return $this->kernelsPath;
-    }
+    public function addArrayEntry(
+        Variable $variable,
+        $key,
+        $value,
+        CompilationContext $context,
+        $statement = null,
+        $useCodePrinter = true
+    ): void {
+        $type    = null;
+        $keyType = 'assoc';
 
-    /**
-     * Resolves the path to the source template file of the backend.
-     */
-    public function getTemplateFileContents(string $filename): string
-    {
-        $templatePath = rtrim((string) $this->config->get('templatepath', 'backend'), '\\/');
-        if (empty($templatePath)) {
-            $templatePath = $this->templatesPath;
+        if (!isset($key)) {
+            $keyType = 'append';
+        } elseif ($key instanceof CompiledExpression) {
+            $typeKey = $key->getType();
+            if ('variable' === $typeKey || 'mixed' === $typeKey) {
+                $var     = $context->symbolTable->getVariableForRead($key->getCode(), $context);
+                $typeKey = $var->getType();
+            }
+            if (in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
+                $keyType = 'index';
+            }
         }
+        if ('null' == $value) {
+            if (!isset($key)) {
+                $value = $this->resolveValue('null', $context);
+                $context->codePrinter->output(
+                    'zephir_array_append(' . $this->getVariableCode(
+                        $variable
+                    ) . ', ' . $value . ', PH_SEPARATE, "' . Compiler::getShortUserPath(
+                        $statement['file']
+                    ) . '", ' . $statement['line'] . ');'
+                );
 
-        return file_get_contents("$templatePath/engine/$filename");
-    }
+                return;
+            }
+        }
 
-    public function getFcallManager(): FcallManagerInterface
-    {
-        return $this->fcallManager;
-    }
+        switch ($value->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+                $type = 'long';
+                break;
 
-    public function declareVariables($method, $typeToVariables)
-    {
-        $varInitCode = [];
-        $additionalCode = $method ? $this->onPreInitVar($method) : '';
+            case 'double':
+                $type = 'double';
+                break;
 
-        foreach ($typeToVariables as $type => $variables) {
-            [$pointer, $code] = $this->getTypeDefinition($type);
-            $code .= ' ';
-            $groupVariables = [];
+            case 'string':
+                $type = 'stringl';
+                break;
 
-            /**
-             * @var Variable[]
-             */
-            foreach ($variables as $variable) {
-                $nextCode = $this->generateInitCode($groupVariables, $type, $pointer, $variable);
-                if ($nextCode && $additionalCode) {
-                    $additionalCode .= PHP_EOL.$nextCode;
-                } else {
-                    $additionalCode .= $nextCode;
-                }
+            case 'variable':
+            case 'array':
+            case 'mixed':
+                $type = 'zval';
+                break;
+        }
+
+        if (null === $type) {
+            throw new CompilerException('Unknown type mapping: ' . $value->getType());
+        }
+
+        if (isset($key)) {
+            if ('variable' == $key->getType()) {
+                $var    = $context->symbolTable->getVariableForRead($key->getCode(), $context);
+                $keyStr = 'string' == $typeKey ?
+                    'Z_STRVAL_P('
+                    . $this->getVariableCode($var)
+                    . '), Z_STRLEN_P('
+                    . $this->getVariableCode($var)
+                    . ')' :
+                    $this->getVariableCode($var);
+            } else {
+                $keyStr = 'string' == $key->getType() ? 'SL("' . $key->getCode() . '")' : $key->getCode();
             }
+        }
 
-            $varInitCode[] = $code.implode(', ', $groupVariables).';';
+        if ('stringl' == $type) {
+            if ($value instanceof Variable) {
+                $valueStr = 'Z_STRVAL_P('
+                    . $this->getVariableCode($value)
+                    . '), Z_STRLEN_P('
+                    . $this->getVariableCode($value)
+                    . ')';
+            } else {
+                $valueStr = 'SL("' . $value->getCode() . '")';
+            }
+        } elseif ('zval' == $type) {
+            $valueStr = $this->getVariableCode($value);
+        } else {
+            $valueStr = $value->getCode();
         }
 
-        /* Keep order consistent with previous zephir versions (BC-only) */
-        $varInitCode = array_reverse($varInitCode);
-        if ($additionalCode) {
-            $varInitCode[] = $additionalCode;
+        if ('assoc' == $keyType) {
+            $output = 'add_assoc_'
+                . $type
+                . '_ex('
+                . $this->getVariableCode($variable)
+                . ', '
+                . $keyStr
+                . ', '
+                . $valueStr
+                . ');';
+        } elseif ('append' == $keyType) {
+            $output = 'zephir_array_append('
+                . $this->getVariableCode($variable)
+                . ', '
+                . $this->resolveValue($value, $context)
+                . ', PH_SEPARATE, "'
+                . Compiler::getShortUserPath($statement['file'])
+                . '", '
+                . $statement['line']
+                . ');'
+            ;
+        } else {
+            $output = 'add_index_'
+                . $type
+                . '('
+                . $this->getVariableCode($variable)
+                . ', '
+                . $keyStr
+                . ', '
+                . $valueStr
+                . ');'
+            ;
         }
 
-        return $varInitCode;
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
     }
 
-    public function initVar(Variable $variable, CompilationContext $context, bool $useCodePrinter = true, bool $second = false): string
+    public function addStaticProperty($classEntry, $property, $value, CompilationContext $context): void
     {
-        $macro = !$second ? 'ZVAL_NULL' : 'ZEPHIR_INIT_NVAR';
-        $code = $macro.'('.$this->getVariableCode($variable).');';
+        $value = $this->resolveValue($value, $context);
+        $context->codePrinter->output(
+            'zephir_add_static_property_ce('
+            . $classEntry
+            . ', ZEND_STRL("'
+            . $property
+            . '"), '
+            . $value
+            . ');'
+        );
+    }
+
+    public function arrayFetch(
+        Variable $var,
+        Variable $src,
+        $index,
+        $flags,
+        $arrayAccess,
+        CompilationContext $context,
+        $useCodePrinter = true
+    ) {
+        $context->headersManager->add('kernel/array');
+        $isVariable = $index instanceof Variable;
+
+        switch ($index->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $type = 'long';
+                break;
+
+            /* Types which map to the same */
+            case 'variable':
+            case 'mixed':
+            case 'string':
+                $type = $index->getType();
+                break;
+
+            default:
+                throw new CompilerException(
+                    sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
+                    $arrayAccess['right']
+                );
+        }
+        if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
+            $output = 'zephir_array_fetch('
+                . $this->getVariableCode($var)
+                . ', '
+                . $this->getVariableCode($src)
+                . ', '
+                . $this->getVariableCode($index)
+                . ', '
+                . $flags
+                . ', "'
+                . Compiler::getShortUserPath($arrayAccess['file'])
+                . '", '
+                . $arrayAccess['line']
+                . ');';
+        } else {
+            if ($isVariable) {
+                $indexAccess = $this->getVariableCode($index);
+            } else {
+                $indexAccess = $index->getCode();
+                if ('string' == $type) {
+                    $indexAccess = 'SL("' . $indexAccess . '")';
+                }
+            }
+            $output = 'zephir_array_fetch_'
+                . $type
+                . '('
+                . $this->getVariableCode($var)
+                . ', '
+                . $this->getVariableCode($src)
+                . ', '
+                . $indexAccess
+                . ', '
+                . $flags
+                . ', "'
+                . Compiler::getShortUserPath($arrayAccess['file'])
+                . '", '
+                . $arrayAccess['line']
+                . ');';
+        }
+
         if ($useCodePrinter) {
-            $context->codePrinter->output($code);
+            $context->codePrinter->output($output);
         }
 
-        return $code;
+        return $output;
     }
 
-    public function getVariableCode(Variable $variable): string
+    public function arrayIsset(Variable $var, $resolvedExpr, $expression, CompilationContext $context)
     {
-        if ($variable->isDoublePointer()
-            || \in_array($variable->getName(), ['this_ptr', 'return_value'])
-            || \in_array($variable->getType(), ['int', 'long'])) {
-            return $variable->getName();
+        if (!($resolvedExpr instanceof Variable)) {
+            if ('string' == $resolvedExpr->getType()) {
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_array_isset_string('
+                    . $this->getVariableCode($var)
+                    . ', SL("'
+                    . $resolvedExpr->getCode()
+                    . '"))',
+                    $expression
+                );
+            }
         }
 
-        return '&'.$variable->getName();
+        return $this->arrayIsset2($var, $resolvedExpr, $expression, $context);
     }
 
-    public function getBoolCode(Variable $variable, CompilationContext $context, $useCodePrinter = true): string
+    public function arrayIsset2(Variable $var, $resolvedExpr, $expression, CompilationContext $context)
     {
-        $code = '(Z_TYPE_P('.$this->getVariableCode($variable).') == IS_TRUE)';
-        if ($useCodePrinter) {
-            $context->codePrinter->output($code);
+        if (!($resolvedExpr instanceof Variable)) {
+            if ('string' == $resolvedExpr->getType()) {
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_array_isset_string('
+                    . $this->getVariableCode($var)
+                    . ', SS("'
+                    . $resolvedExpr->getCode()
+                    . '"))',
+                    $expression
+                );
+            } else {
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_array_isset_long('
+                    . $this->getVariableCode($var)
+                    . ', '
+                    . $resolvedExpr->getCode() . ')',
+                    $expression
+                );
+            }
         }
 
-        return $code;
+        if ('int' == $resolvedExpr->getType() || 'long' == $resolvedExpr->getType()) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_array_isset_long('
+                . $this->getVariableCode($var)
+                . ', '
+                . $this->getVariableCode($resolvedExpr)
+                . ')',
+                $expression
+            );
+        } elseif (
+            'variable' == $resolvedExpr->getType() ||
+            'string' == $resolvedExpr->getType() ||
+            'mixed' === $resolvedExpr->getType()
+        ) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_array_isset(' . $this->getVariableCode($var) . ', ' . $this->getVariableCode(
+                    $resolvedExpr
+                ) . ')',
+                $expression
+            );
+        }
+
+        throw new CompilerException('[' . $resolvedExpr->getType() . ']', $expression);
     }
 
-    public function getTypeDefinition($type): array
-    {
-        if ($type === 'zend_ulong') {
-            return ['', 'zend_ulong'];
-        } elseif ($type === 'zend_string') {
-            return ['*', 'zend_string'];
+    public function arrayIssetFetch(
+        Variable $target,
+        Variable $var,
+        $resolvedExpr,
+        $flags,
+        $expression,
+        CompilationContext $context
+    ) {
+        if (!($resolvedExpr instanceof Variable)) {
+            $code = $this->getVariableCode($target) . ', ' . $this->getVariableCode($var);
+            if ('string' == $resolvedExpr->getType()) {
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_array_isset_string_fetch('
+                    . $code
+                    . ', SL("'
+                    . $resolvedExpr->getCode()
+                    . '"), '
+                    . $flags
+                    . ')',
+                    $expression
+                );
+            }
         }
 
-        $pointer = null;
-        switch ($type) {
-            case 'int':
-                $code = 'zend_long';
-                break;
+        return $this->arrayIssetFetch2($target, $var, $resolvedExpr, $flags, $expression, $context);
+    }
 
-            case 'uint':
-                $code = 'zend_ulong';
-                break;
+    public function arrayIssetFetch2(
+        Variable $target,
+        Variable $var,
+        $resolvedExpr,
+        $flags,
+        $expression,
+        CompilationContext $context
+    ) {
+        $code = $this->getVariableCode($target) . ', ' . $this->getVariableCode($var);
 
-            case 'char':
-                $code = 'char';
-                break;
+        if (!($resolvedExpr instanceof Variable)) {
+            if ('string' === $resolvedExpr->getType()) {
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_array_isset_string_fetch(' . $code . ', SS("' . $resolvedExpr->getCode(
+                    ) . '"), ' . $flags . ')',
+                    $expression
+                );
+            } elseif (in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_array_isset_long_fetch(' . $code . ', ' . $resolvedExpr->getCode() . ', ' . $flags . ')',
+                    $expression
+                );
+            } else {
+                $resolvedExpr = $context->symbolTable->getVariableForRead($resolvedExpr->getCode(), $context);
+            }
+        }
 
-            case 'uchar':
-                $code = 'unsigned char';
-                break;
+        if (in_array($resolvedExpr->getType(), ['int', 'long'])) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_array_isset_long_fetch(' . $code . ', ' . $this->getVariableCode(
+                    $resolvedExpr
+                ) . ', ' . $flags . ')',
+                $expression
+            );
+        } elseif (in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_array_isset_fetch(' . $code . ', ' . $this->getVariableCode(
+                    $resolvedExpr
+                ) . ', ' . $flags . ')',
+                $expression
+            );
+        }
 
-            case 'long':
-                $code = 'long';
-                break;
+        throw new CompilerException('arrayIssetFetch [' . $resolvedExpr->getType() . ']', $expression);
+    }
 
-            case 'ulong':
-                $code = 'unsigned long';
-                break;
+    public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationContext $context): void
+    {
+        $context->headersManager->add('kernel/array');
+        $variableCode = $this->getVariableCode($variable);
+        if ('string' == $exprIndex->getType()) {
+            $context->codePrinter->output(
+                'zephir_array_unset_string(' . $variableCode . ', SL("' . $exprIndex->getCode() . '"), ' . $flags . ');'
+            );
 
-            case 'bool':
-            case 'zephir_ce_guard':
-                $code = 'zend_bool';
-                break;
+            return;
+        }
 
-            case 'double':
-                $code = 'double';
+        $this->arrayUnset2($variable, $exprIndex, $flags, $context);
+    }
+
+    public function arrayUnset2(Variable $variable, $exprIndex, $flags, CompilationContext $context): void
+    {
+        $context->headersManager->add('kernel/array');
+        $variableCode = $this->getVariableCode($variable);
+        switch ($exprIndex->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $context->codePrinter->output(
+                    'zephir_array_unset_long(' . $variableCode . ', ' . $exprIndex->getCode() . ', ' . $flags . ');'
+                );
                 break;
 
             case 'string':
-            case 'variable':
-            case 'array':
-            case 'null':
-            case 'mixed':
-                $pointer = '*';
-                $code = 'zval';
+                $context->codePrinter->output(
+                    'zephir_array_unset_string(' . $variableCode . ', SS("' . $exprIndex->getCode(
+                    ) . '"), ' . $flags . ');'
+                );
                 break;
 
-            case 'HashTable':
-                $pointer = '*';
-                $code = 'HashTable';
-                break;
-
-            case 'HashPosition':
-                $code = 'HashPosition';
-                break;
-
-            case 'zend_class_entry':
-            case 'static_zend_class_entry':
-                $pointer = '*';
-                $code = 'zend_class_entry';
-                break;
-
-            case 'zend_function':
-                $pointer = '*';
-                $code = 'zend_function';
-                break;
-
-            case 'zend_object_iterator':
-                $pointer = '*';
-                $code = 'zend_object_iterator';
-                break;
+            case 'variable':
+                $variableIndex = $context->symbolTable->getVariableForRead(
+                    $exprIndex->getCode(),
+                    $context,
+                    $exprIndex->getOriginal()
+                );
+                $indexCode     = $this->getVariableCode($variableIndex);
+                switch ($variableIndex->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                        $context->codePrinter->output(
+                            'zephir_array_unset_long(' . $variableCode . ', ' . $indexCode . ', ' . $flags . ');'
+                        );
+                        break;
 
-            case 'zend_property_info':
-                $pointer = '*';
-                $code = 'zend_property_info';
-                break;
+                    case 'string':
+                    case 'variable':
+                    case 'mixed':
+                        $context->codePrinter->output(
+                            'zephir_array_unset(' . $variableCode . ', ' . $indexCode . ', ' . $flags . ');'
+                        );
+                        break;
 
-            case 'zephir_fcall_cache_entry':
-            case 'static_zephir_fcall_cache_entry':
-                $pointer = '*';
-                $code = 'zephir_fcall_cache_entry';
+                    default:
+                        throw new CompilerException(
+                            'Variable type: ' . $variableIndex->getType(
+                            ) . ' cannot be used as array index without cast'
+                        );
+                }
                 break;
 
             default:
-                throw new CompilerException('Unsupported type in declare: '.$type);
+                throw new CompilerException(
+                    'Cannot use expression: ' . $exprIndex->getType() . ' as array index without cast'
+                );
         }
-
-        return [$pointer, $code];
     }
 
-    /**
-     * @param Variable $variableVariable
-     * @param string   $operator
-     * @param string   $value
-     *
-     * @return string
-     *
-     * @throws CompilerException
-     */
-    public function getTypeofCondition(
-        Variable $variableVariable,
-        string $operator,
-        string $value,
-    ): string {
-        $variableName = $this->getVariableCode($variableVariable);
+    public function assignArrayMulti(
+        Variable $variable,
+        $symbolVariable,
+        $offsetExprs,
+        CompilationContext $compilationContext
+    ): void {
+        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
 
-        return match ($value) {
-            'array' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_ARRAY',
-            'object' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_OBJECT',
-            'null' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_NULL',
-            'string' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_STRING',
-            'int', 'long', 'integer' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_LONG',
-            'double', 'float' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_DOUBLE',
-            'boolean', 'bool' => '((Z_TYPE_P('.$variableName.') == IS_TRUE || Z_TYPE_P('.$variableName.') == IS_FALSE) '.$operator.' 1)',
-            'resource' => 'Z_TYPE_P('.$variableName.') '.$operator.' IS_RESOURCE',
-            'callable' => 'zephir_is_callable('.$variableName.') '.$operator.' 1',
-            default => throw new CompilerException(sprintf('Unknown type: "%s" in typeof comparison', $value)),
-        };
+        $symbol  = $this->resolveValue($symbolVariable, $compilationContext, true);
+        $varCode = $this->getVariableCode($variable);
+        $compilationContext->codePrinter->output(
+            sprintf(
+                'zephir_array_update_multi(%s, %s, SL("%s"), %d, %s);',
+                $varCode,
+                $symbol,
+                $keys,
+                $numberParams,
+                implode(', ', $offsetItems)
+            )
+        );
     }
 
-    public function onPreInitVar(Method $method): string
+    public function assignArrayProperty(Variable $variable, $property, $key, $value, CompilationContext $context): void
     {
-        if (!$method instanceof FunctionDefinition && !$method->isInternal()) {
-            return "zval *this_ptr = getThis();\n"; // TODO: think about a better way to solve this.
+        $resolveValue = $this->resolveValue($value, $context);
+        if (isset($key)) {
+            $context->codePrinter->output(
+                'zephir_update_property_array(' . $this->getVariableCode(
+                    $variable
+                ) . ', SL("' . $property . '"), ' . $this->getVariableCode($key) . ', ' . $resolveValue . ');'
+            );
+        } else {
+            $context->codePrinter->output(
+                'zephir_update_property_array_append(' . $this->getVariableCode(
+                    $variable
+                ) . ', SL("' . $property . '"), ' . $resolveValue . ');'
+            );
         }
-
-        return '';
     }
 
-    public function onPreCompile(Method $method, CompilationContext $context): void
+    public function assignBool(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
     {
-        /**
-         * Initialize the properties within create_object, handler code
-         */
-        if (str_starts_with($method->getName(), 'zephir_init_properties')) {
-            $context->codePrinter->increaseLevel();
-            $context->codePrinter->output('{');
-            $context->codePrinter->increaseLevel();
-            $context->codePrinter->output('zval local_this_ptr, *this_ptr = &local_this_ptr;');
-            $context->codePrinter->output('ZEPHIR_CREATE_OBJECT(this_ptr, class_type);');
-            $context->codePrinter->decreaseLevel();
-        }
+        return $this->assignHelper('ZVAL_BOOL', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
     }
 
-    public function onPostCompile(Method $method, CompilationContext $context): void
+    public function assignDouble(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
     {
-        if (str_starts_with($method->getName(), 'zephir_init_properties')) {
-            $context->codePrinter->increaseLevel();
-            $context->codePrinter->output('return Z_OBJ_P(this_ptr);');
-            $context->codePrinter->decreaseLevel();
-            $context->codePrinter->output('}');
-            $context->codePrinter->decreaseLevel();
-        }
+        return $this->assignHelper('ZVAL_DOUBLE', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
     }
 
-    public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable): ?string
+    public function assignLong(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
     {
-        $isComplex = \in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
-
-        if ($isComplex && !$variable->isDoublePointer()) {
-            $groupVariables[] = $variable->getName();
-
-            return match ($variable->getRealname()) {
-                '__$null' => "\t".'ZVAL_NULL(&'.$variable->getName().');',
-                '__$true' => "\t".'ZVAL_BOOL(&'.$variable->getName().', 1);',
-                '__$false' => "\t".'ZVAL_BOOL(&'.$variable->getName().', 0);',
-                default => "\t".'ZVAL_UNDEF(&'.$variable->getName().');',
-            };
-        }
-
-        if ($variable->isLocalOnly()) {
-            $groupVariables[] = $variable->getName();
-
-            return null;
-        }
-
-        if ($variable->isSuperGlobal()) {
-            $groupVariables[] = $variable->getName();
-
-            return null;
-        }
-
-        if ($variable->isDoublePointer()) {
-            /* Double pointers for ZE3 are used as zval * */
-            $ptr = $isComplex ? $pointer : $pointer.$pointer;
-            if ($variable->mustInitNull()) {
-                $groupVariables[] = $ptr.$variable->getName().' = NULL';
-            } else {
-                $groupVariables[] = $ptr.$variable->getName();
-            }
-
-            return null;
-        }
-
-        $defaultValue = $variable->getDefaultInitValue();
-        if (null !== $defaultValue) {
-            switch ($type) {
-                case 'variable':
-                case 'string':
-                case 'array':
-                case 'resource':
-                case 'callable':
-                case 'object':
-                case 'mixed':
-                    $groupVariables[] = $pointer.$variable->getName();
-                    break;
-
-                case 'char':
-                    $defaultValue = (string) $defaultValue;
-                    if (\strlen($defaultValue) > 4) {
-                        if (\strlen($defaultValue) > 10) {
-                            throw new CompilerException("Invalid char literal: '".substr($defaultValue, 0, 10)."...'", $variable->getOriginal());
-                        } else {
-                            throw new CompilerException("Invalid char literal: '".$defaultValue."'", $variable->getOriginal());
-                        }
-                    }
-                    /* no break */
-
-                default:
-                    $groupVariables[] = $pointer.$variable->getName().' = '.$defaultValue;
-                    break;
-            }
-
-            return null;
-        }
-
-        if ($variable->mustInitNull() && $pointer) {
-            $groupVariables[] = $pointer.$variable->getName().' = NULL';
-
-            return null;
-        }
-
-        $groupVariables[] = $pointer.$variable->getName();
-
-        return null;
+        return $this->assignHelper('ZVAL_LONG', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
     }
 
-    /**
-     * @param Variable[]         $variables
-     * @param CompilationContext $context
-     *
-     * @return string
-     *
-     * @throws CompilerException
-     */
-    public function initializeVariableDefaults(array $variables, CompilationContext $context): string
+    public function assignNull(Variable $variable, CompilationContext $context, $useCodePrinter = true)
     {
-        $codePrinter = new Printer();
-        $codePrinter->increaseLevel();
-
-        $oldCodePrinter = $context->codePrinter;
-        $context->codePrinter = $codePrinter;
-
-        $variablesManager = new VariablesManager();
-
-        /* Initialize default values in dynamic variables */
-        foreach ($variables as $variable) {
-            /* Do not initialize unused variable */
-            if ($variable->getNumberUses() < 1) {
-                continue;
-            }
-
-            /* The default init value to be used bellow.
-               Actually this value should be in array form and
-               provide 'type' and 'value' keys. */
-            $value = $variable->getDefaultInitValue();
-            if (!\is_array($value)) {
-                continue;
-            }
-
-            $variablesManager->initializeDefaults($variable, $value, $context);
+        $output = 'ZVAL_NULL(' . $this->getVariableCode($variable) . ');';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
         }
 
-        $context->codePrinter = $oldCodePrinter;
-
-        return $codePrinter->getOutput();
+        return $output;
     }
 
-    public function declareConstant($type, $name, $value, CompilationContext $context): void
-    {
-        $ce = $context->classDefinition->getClassEntry($context);
-
-        $dType = null;
-        switch ($type) {
-            case 'bool':
-                $value = 'false' == $value ? '0' : 1;
-                break;
-
-            case 'long':
-            case 'int':
-                $dType = 'long';
-                break;
-
-            case 'double':
-                break;
-
-            case 'string':
-            case 'char':
-                if ('string' == $type || 'char' == $type) {
-                    $value = '"'.Name::addSlashes($value).'"';
-                }
-                $dType = 'string';
-                break;
-        }
-
-        if (!isset($dType)) {
-            $dType = $type;
-        }
+    public function assignPropertyArrayMulti(
+        Variable $variable,
+        $valueVariable,
+        $propertyName,
+        $offsetExprs,
+        CompilationContext $compilationContext
+    ): void {
+        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
 
-        if ('null' == $dType) {
-            $context->codePrinter->output('zephir_declare_class_constant_null('.$ce.', SL("'.$name.'"));');
-        } else {
-            $context->codePrinter->output('zephir_declare_class_constant_'.$dType.'('.$ce.', SL("'.$name.'"), '.$value.');');
-        }
+        $compilationContext->codePrinter->output(
+            sprintf(
+                'zephir_update_property_array_multi(%s, SL("%s"), %s, SL("%s"), %d, %s);',
+                $variable->getName(),
+                $propertyName,
+                $valueVariable,
+                $keys,
+                $numberParams,
+                implode(', ', $offsetItems)
+            )
+        );
     }
 
-    /**
-     * @param Method             $method
-     * @param CompilationContext $context
-     *
-     * @return string
-     */
-    public function getInternalSignature(Method $method, CompilationContext $context): string
-    {
-        if ($method->isInitializer() && !$method->isStatic()) {
-            return 'zend_object *'.$method->getName().'(zend_class_entry *class_type)';
-        }
-
-        if ($method->isInitializer() && $method->isStatic()) {
-            return 'void '.$method->getName().'()';
-        }
-
-        $signatureParameters = [];
-        $parameters = $method->getParameters();
-        if (\is_object($parameters)) {
-            foreach ($parameters->getParameters() as $parameter) {
-                switch ($parameter['data-type']) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'double':
-                    case 'bool':
-                    case 'char':
-                    case 'uchar':
-                    case 'string':
-                    case 'array':
-                        $signatureParameters[] = 'zval *'.$parameter['name'].'_param_ext';
-                        break;
-
-                    default:
-                        $signatureParameters[] = 'zval *'.$parameter['name'].'_ext ';
-                        break;
-                }
-            }
-        }
-
-        $signaturePattern =
-            'int ht, zend_execute_data *execute_data, zval *return_value, zval *this_ptr, int return_value_used';
-
-        if (\count($signatureParameters)) {
-            $signaturePattern = sprintf('%s, %s', $signaturePattern, implode(', ', $signatureParameters));
-        }
+    public function assignStaticPropertyArrayMulti(
+        $classEntry,
+        $valueVariable,
+        $propertyName,
+        $offsetExprs,
+        CompilationContext $compilationContext
+    ): void {
+        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
+        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
 
-        return "void {$method->getInternalName()}({$signaturePattern})";
+        $offsetStr = $offsetItems ? ', ' . implode(', ', $offsetItems) : '';
+        $compilationContext->codePrinter->output(
+            sprintf(
+                'zephir_update_static_property_array_multi_ce(%s, SL("%s"), %s, SL("%s"), %d%s);',
+                $classEntry,
+                $propertyName,
+                $valueVariable,
+                $keys,
+                $numberParams,
+                $offsetStr
+            )
+        );
     }
 
     /**
@@ -539,285 +654,351 @@ public function assignZval(Variable $variable, $code, CompilationContext $contex
         if (!$variable->isDoublePointer()) {
             $context->symbolTable->mustGrownStack(true);
             $symbolVariable = $this->getVariableCode($variable);
-            $context->codePrinter->output('ZVAL_COPY('.$symbolVariable.', '.$code.');');
+            $context->codePrinter->output('ZVAL_COPY(' . $symbolVariable . ', ' . $code . ');');
         } else {
-            $context->codePrinter->output($variable->getName().' = '.$code.';');
+            $context->codePrinter->output($variable->getName() . ' = ' . $code . ';');
         }
     }
 
-    public function returnString($value, CompilationContext $context, $useCodePrinter = true)
-    {
-        return $this->returnHelper('RETURN_MM_STRING', $value, $context, $useCodePrinter);
-    }
-
-    public function assignLong(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
-    {
-        return $this->assignHelper('ZVAL_LONG', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
-    }
-
-    public function assignDouble(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
-    {
-        return $this->assignHelper('ZVAL_DOUBLE', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
-    }
-
-    public function assignBool(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)
-    {
-        return $this->assignHelper('ZVAL_BOOL', $this->getVariableCode($variable), $value, $context, $useCodePrinter);
+    public function callDynamicFunction(
+        $symbolVariable,
+        Variable $variable,
+        CompilationContext $context,
+        $params = [],
+        $cache = 'NULL',
+        $cacheSlot = 0
+    ): void {
+        $paramStr = null != $params ? ', ' . implode(', ', $params) : '';
+        if (!isset($symbolVariable)) {
+            $context->codePrinter->output(
+                'ZEPHIR_CALL_ZVAL_FUNCTION(NULL, ' . $this->getVariableCode(
+                    $variable
+                ) . ', ' . $cache . ', ' . $cacheSlot . $paramStr . ');'
+            );
+        } elseif ('return_value' == $symbolVariable->getName()) {
+            $context->codePrinter->output(
+                'ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(' . $this->getVariableCode(
+                    $variable
+                ) . ', ' . $cache . ', ' . $cacheSlot . $paramStr . ');'
+            );
+        } else {
+            $context->codePrinter->output(
+                'ZEPHIR_CALL_ZVAL_FUNCTION(' . $this->getVariableCode($symbolVariable) . ', ' . $this->getVariableCode(
+                    $variable
+                ) . ', ' . $cache . ', ' . $cacheSlot . $paramStr . ');'
+            );
+        }
     }
 
-    public function assignNull(Variable $variable, CompilationContext $context, $useCodePrinter = true)
-    {
-        $output = 'ZVAL_NULL('.$this->getVariableCode($variable).');';
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
+    public function callMethod(
+        $symbolVariable,
+        Variable $variable,
+        $methodName,
+        $cachePointer,
+        $params,
+        CompilationContext $context
+    ): void {
+        $paramStr = null != $params ? ', ' . implode(', ', $params) : '';
+        $macro    = 'CALL_METHOD';
+        if ($methodName instanceof Variable) {
+            $macro      = 'CALL_METHOD_ZVAL';
+            $methodName = $this->getVariableCode($methodName);
+        } else {
+            $methodName = '"' . $methodName . '"';
         }
 
-        return $output;
+        if (!isset($symbolVariable)) {
+            $context->codePrinter->output(
+                'ZEPHIR_' . $macro . '(NULL, ' . $this->getVariableCode(
+                    $variable
+                ) . ', ' . $methodName . ', ' . $cachePointer . $paramStr . ');'
+            );
+        } elseif ('return_value' == $symbolVariable->getName()) {
+            $context->codePrinter->output(
+                'ZEPHIR_RETURN_' . $macro . '(' . $this->getVariableCode(
+                    $variable
+                ) . ', ' . $methodName . ', ' . $cachePointer . $paramStr . ');'
+            );
+        } else {
+            $symbol = $this->getVariableCode($symbolVariable);
+            $context->codePrinter->output(
+                'ZEPHIR_' . $macro . '(' . $symbol . ', ' . $this->getVariableCode(
+                    $variable
+                ) . ', ' . $methodName . ', ' . $cachePointer . $paramStr . ');'
+            );
+        }
     }
 
-    public function createClosure(Variable $variable, $classDefinition, CompilationContext $context): void
+    public function checkConstructor(Variable $var, CompilationContext $context): void
     {
-        $symbol = $this->getVariableCode($variable);
-        $context->codePrinter->output(
-            'zephir_create_closure_ex('.$symbol.', NULL, '.$classDefinition->getClassEntry().', SL("__invoke"));'
-        );
+        $context->codePrinter->output('if (zephir_has_constructor(' . $this->getVariableCode($var) . ')) {');
     }
 
-    public function addArrayEntry(Variable $variable, $key, $value, CompilationContext $context, $statement = null, $useCodePrinter = true): void
+    public function checkStrictType($type, $var, CompilationContext $context): void
     {
-        $type = null;
-        $keyType = 'assoc';
-
-        if (!isset($key)) {
-            $keyType = 'append';
-        } elseif ($key instanceof CompiledExpression) {
-            $typeKey = $key->getType();
-            if ('variable' === $typeKey || 'mixed' === $typeKey) {
-                $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
-                $typeKey = $var->getType();
-            }
-            if (\in_array($typeKey, ['int', 'uint', 'long', 'ulong'])) {
-                $keyType = 'index';
-            }
-        }
-        if ('null' == $value) {
-            if (!isset($key)) {
-                $value = $this->resolveValue('null', $context);
-                $context->codePrinter->output('zephir_array_append('.$this->getVariableCode($variable).', '.$value.', PH_SEPARATE, "'.Compiler::getShortUserPath($statement['file']).'", '.$statement['line'].');');
+        $codePrinter = $context->codePrinter;
+        $conditions  = [];
 
-                return;
-            }
+        $inputParamVariable = $context->symbolTable->getVariableForWrite($var['name'], $context);
+        $inputParamCode     = $this->getVariableCode($inputParamVariable);
+        $cond               = 'Z_TYPE_P(' . $inputParamCode . ') != ';
+        if ($context->symbolTable->hasVariable($var['name'] . '_param')) {
+            $parameterVariable = $context->symbolTable->getVariableForWrite($var['name'] . '_param', $context);
+            $parameterCode     = $context->backend->getVariableCode($parameterVariable);
+            $cond              = 'Z_TYPE_P(' . $parameterCode . ') != ';
         }
 
-        switch ($value->getType()) {
+        switch ($type) {
             case 'int':
             case 'uint':
             case 'long':
-            case 'ulong':
-                $type = 'long';
+                $conditions[] = $cond . 'IS_LONG';
+                break;
+            case 'bool':
+                $conditions[] = $cond . 'IS_TRUE';
+                $conditions[] = $cond . 'IS_FALSE';
                 break;
-
             case 'double':
-                $type = 'double';
+                $conditions[] = $cond . 'IS_DOUBLE';
                 break;
-
             case 'string':
-                $type = 'stringl';
+            case 'ulong':
+                $conditions[] = $cond . 'IS_STRING';
+                $conditions[] = $cond . 'IS_NULL';
                 break;
-
-            case 'variable':
             case 'array':
-            case 'mixed':
-                $type = 'zval';
                 break;
+            case 'object':
+            case 'resource':
+                $conditions[] = $cond . 'IS_' . strtoupper($type);
+                break;
+            case 'callable':
+                $conditions[] = 'zephir_is_callable(' . $inputParamCode . ') != 1';
+                break;
+            default:
+                throw new CompilerException('Unknown type ' . $type);
         }
 
-        if (null === $type) {
-            throw new CompilerException('Unknown type mapping: '.$value->getType());
-        }
-
-        if (isset($key)) {
-            if ('variable' == $key->getType()) {
-                $var = $context->symbolTable->getVariableForRead($key->getCode(), $context);
-                $keyStr = 'string' == $typeKey ? 'Z_STRVAL_P('.$this->getVariableCode($var).'), Z_STRLEN_P('.$this->getVariableCode($var).')' : $this->getVariableCode($var);
-            } else {
-                $keyStr = 'string' == $key->getType() ? 'SL("'.$key->getCode().'")' : $key->getCode();
-            }
-        }
+        /* Generate verification code */
+        if (count($conditions)) {
+            $codePrinter->output('if (UNEXPECTED(' . implode(' && ', $conditions) . ')) {');
+            $codePrinter->increaseLevel();
 
-        if ('stringl' == $type) {
-            if ($value instanceof Variable) {
-                $valueStr = 'Z_STRVAL_P('.$this->getVariableCode($value).'), Z_STRLEN_P('.$this->getVariableCode($value).')';
-            } else {
-                $valueStr = 'SL("'.$value->getCode().'")';
-            }
-        } elseif ('zval' == $type) {
-            $valueStr = $this->getVariableCode($value);
-        } else {
-            $valueStr = $value->getCode();
-        }
+            $exceptionMessage = sprintf('SL("Parameter \'%s\' must be of the type %s")', $var['name'], $type);
+            $codePrinter->output(
+                sprintf(
+                    'zephir_throw_exception_string(spl_ce_InvalidArgumentException, %s);',
+                    $exceptionMessage
+                )
+            );
 
-        if ('assoc' == $keyType) {
-            $output = 'add_assoc_'.$type.'_ex('.$this->getVariableCode($variable).', '.$keyStr.', '.$valueStr.');';
-        } elseif ('append' == $keyType) {
-            $output = 'zephir_array_append('.$this->getVariableCode($variable).', '.$this->resolveValue($value, $context).', PH_SEPARATE, "'.Compiler::getShortUserPath($statement['file']).'", '.$statement['line'].');';
-        } else {
-            $output = 'add_index_'.$type.'('.$this->getVariableCode($variable).', '.$keyStr.', '.$valueStr.');';
+            $codePrinter->output('RETURN_MM_NULL();');
+            $codePrinter->decreaseLevel();
+            $codePrinter->output('}');
         }
 
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
+        /* Assign param */
+        switch ($type) {
+            case 'int':
+            case 'long':
+                $codePrinter->output($var['name'] . ' = Z_LVAL_P(' . $parameterCode . ');');
+                break;
+            case 'uint':
+                $codePrinter->output($var['name'] . ' = ZEND_ABS(Z_LVAL_P(' . $parameterCode . '));');
+                break;
+            case 'bool':
+                $codePrinter->output(
+                    $var['name'] . ' = ' . $this->getBoolCode($parameterVariable, $context, false) . ';'
+                );
+                break;
+            case 'double':
+                $codePrinter->output($var['name'] . ' = Z_DVAL_P(' . $parameterCode . ');');
+                break;
+            case 'string':
+            case 'ulong':
+                $context->headersManager->add('kernel/operators');
+                $context->symbolTable->mustGrownStack(true);
+                $codePrinter->output('if (EXPECTED(Z_TYPE_P(' . $parameterCode . ') == IS_STRING)) {');
+                $codePrinter->increaseLevel();
+                $targetVar = $var['name'];
+                $targetVar = '&' . $targetVar;
+                $codePrinter->output('zephir_get_strval(' . $targetVar . ', ' . $var['name'] . '_param);');
+                $codePrinter->decreaseLevel();
+                $codePrinter->output('} else {');
+                $codePrinter->increaseLevel();
+                $this->initVar($inputParamVariable, $context);
+                $codePrinter->decreaseLevel();
+                $codePrinter->output('}');
+                break;
+            case 'array':
+                $context->backend->assignZval($inputParamVariable, $parameterVariable, $context);
+                break;
+            case 'object':
+            case 'resource':
+            case 'callable':
+            case 'mixed':
+                break;
+            default:
+                throw new CompilerException('Unknown type: ' . $type);
         }
     }
 
-    public function arrayIsset(Variable $var, $resolvedExpr, $expression, CompilationContext $context)
+    public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context): void
     {
-        if (!($resolvedExpr instanceof Variable)) {
-            if ('string' == $resolvedExpr->getType()) {
-                return new CompiledExpression('bool', 'zephir_array_isset_string('.$this->getVariableCode($var).', SL("'.$resolvedExpr->getCode().'"))', $expression);
-            }
-        }
-
-        return $this->arrayIsset2($var, $resolvedExpr, $expression, $context);
+        $variable     = $this->getVariableCode($variable);
+        $itemVariable = $this->getVariableCode($itemVariable);
+        $context->codePrinter->output('zephir_concat_self(' . $variable . ', ' . $itemVariable . ');');
     }
 
-    public function arrayIsset2(Variable $var, $resolvedExpr, $expression, CompilationContext $context)
+    public function copyOnWrite(Variable $target, $var, CompilationContext $context): void
     {
-        if (!($resolvedExpr instanceof Variable)) {
-            if ('string' == $resolvedExpr->getType()) {
-                return new CompiledExpression('bool', 'zephir_array_isset_string('.$this->getVariableCode($var).', SS("'.$resolvedExpr->getCode().'"))', $expression);
-            } else {
-                return new CompiledExpression('bool', 'zephir_array_isset_long('.$this->getVariableCode($var).', '.$resolvedExpr->getCode().')', $expression);
-            }
-        }
-
-        if ('int' == $resolvedExpr->getType() || 'long' == $resolvedExpr->getType()) {
-            return new CompiledExpression('bool', 'zephir_array_isset_long('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
-        } elseif ('variable' == $resolvedExpr->getType() || 'string' == $resolvedExpr->getType() || 'mixed' === $resolvedExpr->getType()) {
-            return new CompiledExpression('bool', 'zephir_array_isset('.$this->getVariableCode($var).', '.$this->getVariableCode($resolvedExpr).')', $expression);
-        }
-
-        throw new CompilerException('['.$resolvedExpr->getType().']', $expression);
-    }
+        if ('EG(exception)' === $var) {
+            $context->codePrinter->output('ZVAL_OBJ(' . $this->getVariableCode($target) . ', EG(exception));');
+            $context->codePrinter->output('Z_ADDREF_P(' . $this->getVariableCode($target) . ');');
 
-    public function arrayIssetFetch(Variable $target, Variable $var, $resolvedExpr, $flags, $expression, CompilationContext $context)
-    {
-        if (!($resolvedExpr instanceof Variable)) {
-            $code = $this->getVariableCode($target).', '.$this->getVariableCode($var);
-            if ('string' == $resolvedExpr->getType()) {
-                return new CompiledExpression('bool', 'zephir_array_isset_string_fetch('.$code.', SL("'.$resolvedExpr->getCode().'"), '.$flags.')', $expression);
-            }
+            return;
         }
 
-        return $this->arrayIssetFetch2($target, $var, $resolvedExpr, $flags, $expression, $context);
-    }
-
-    public function arrayIssetFetch2(Variable $target, Variable $var, $resolvedExpr, $flags, $expression, CompilationContext $context)
-    {
-        $code = $this->getVariableCode($target).', '.$this->getVariableCode($var);
-
-        if (!($resolvedExpr instanceof Variable)) {
-            if ('string' === $resolvedExpr->getType()) {
-                return new CompiledExpression('bool', 'zephir_array_isset_string_fetch('.$code.', SS("'.$resolvedExpr->getCode().'"), '.$flags.')', $expression);
-            } elseif (\in_array($resolvedExpr->getType(), ['int', 'uint', 'long'])) {
-                return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$resolvedExpr->getCode().', '.$flags.')', $expression);
-            } else {
-                $resolvedExpr = $context->symbolTable->getVariableForRead($resolvedExpr->getCode(), $context);
-            }
-        }
+        $globalsManager = new Globals();
 
-        if (\in_array($resolvedExpr->getType(), ['int', 'long'])) {
-            return new CompiledExpression('bool', 'zephir_array_isset_long_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
-        } elseif (\in_array($resolvedExpr->getType(), ['variable', 'mixed', 'string'])) {
-            return new CompiledExpression('bool', 'zephir_array_isset_fetch('.$code.', '.$this->getVariableCode($resolvedExpr).', '.$flags.')', $expression);
+        if ($globalsManager->isSuperGlobal($target->getName())) {
+            $context->codePrinter->output(
+                sprintf(
+                    'ZEPHIR_HASH_COPY(%s, %s);',
+                    $this->getVariableCode($target),
+                    $this->resolveValue($var, $context)
+                )
+            );
+        } else {
+            $context->codePrinter->output(
+                sprintf(
+                    'ZEPHIR_CPY_WRT(%s, %s);',
+                    $this->getVariableCode($target),
+                    $this->resolveValue($var, $context)
+                )
+            );
         }
-
-        throw new CompilerException('arrayIssetFetch ['.$resolvedExpr->getType().']', $expression);
     }
 
-    public function propertyIsset(Variable $var, $key)
+    public function createClosure(Variable $variable, $classDefinition, CompilationContext $context): void
     {
-        return new CompiledExpression('bool', 'zephir_isset_property('.$this->getVariableCode($var).', SL("'.$key.'"))', null);
+        $symbol = $this->getVariableCode($variable);
+        $context->codePrinter->output(
+            'zephir_create_closure_ex(' . $symbol . ', NULL, ' . $classDefinition->getClassEntry(
+            ) . ', SL("__invoke"));'
+        );
     }
 
-    public function arrayUnset(Variable $variable, $exprIndex, $flags, CompilationContext $context): void
+    public function declareConstant($type, $name, $value, CompilationContext $context): void
     {
-        $context->headersManager->add('kernel/array');
-        $variableCode = $this->getVariableCode($variable);
-        if ('string' == $exprIndex->getType()) {
-            $context->codePrinter->output('zephir_array_unset_string('.$variableCode.', SL("'.$exprIndex->getCode().'"), '.$flags.');');
-
-            return;
-        }
+        $ce = $context->classDefinition->getClassEntry($context);
 
-        $this->arrayUnset2($variable, $exprIndex, $flags, $context);
-    }
+        $dType = null;
+        switch ($type) {
+            case 'bool':
+                $value = 'false' == $value ? '0' : 1;
+                break;
 
-    public function arrayUnset2(Variable $variable, $exprIndex, $flags, CompilationContext $context): void
-    {
-        $context->headersManager->add('kernel/array');
-        $variableCode = $this->getVariableCode($variable);
-        switch ($exprIndex->getType()) {
-            case 'int':
-            case 'uint':
             case 'long':
-                $context->codePrinter->output('zephir_array_unset_long('.$variableCode.', '.$exprIndex->getCode().', '.$flags.');');
+            case 'int':
+                $dType = 'long';
                 break;
 
-            case 'string':
-                $context->codePrinter->output('zephir_array_unset_string('.$variableCode.', SS("'.$exprIndex->getCode().'"), '.$flags.');');
+            case 'double':
                 break;
 
-            case 'variable':
-                $variableIndex = $context->symbolTable->getVariableForRead($exprIndex->getCode(), $context, $exprIndex->getOriginal());
-                $indexCode = $this->getVariableCode($variableIndex);
-                switch ($variableIndex->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                        $context->codePrinter->output('zephir_array_unset_long('.$variableCode.', '.$indexCode.', '.$flags.');');
-                        break;
-
-                    case 'string':
-                    case 'variable':
-                    case 'mixed':
-                        $context->codePrinter->output('zephir_array_unset('.$variableCode.', '.$indexCode.', '.$flags.');');
-                        break;
-
-                    default:
-                        throw new CompilerException('Variable type: '.$variableIndex->getType().' cannot be used as array index without cast');
+            case 'string':
+            case 'char':
+                if ('string' == $type || 'char' == $type) {
+                    $value = '"' . Name::addSlashes($value) . '"';
                 }
+                $dType = 'string';
                 break;
+        }
+
+        if (!isset($dType)) {
+            $dType = $type;
+        }
 
-            default:
-                throw new CompilerException('Cannot use expression: '.$exprIndex->getType().' as array index without cast');
+        if ('null' == $dType) {
+            $context->codePrinter->output('zephir_declare_class_constant_null(' . $ce . ', SL("' . $name . '"));');
+        } else {
+            $context->codePrinter->output(
+                'zephir_declare_class_constant_' . $dType . '(' . $ce . ', SL("' . $name . '"), ' . $value . ');'
+            );
         }
     }
 
-    public function fetchGlobal(Variable $globalVar, CompilationContext $compilationContext, $useCodePrinter = true)
+    public function declareVariables($method, $typeToVariables)
     {
-        $name = $globalVar->getName();
-        $output = strtr('zephir_get_global(&:name, SL(":name"));', [':name' => $name]);
+        $varInitCode    = [];
+        $additionalCode = $method ? $this->onPreInitVar($method) : '';
 
-        if ($useCodePrinter) {
-            $compilationContext->codePrinter->output($output);
+        foreach ($typeToVariables as $type => $variables) {
+            [$pointer, $code] = $this->getTypeDefinition($type);
+            $code           .= ' ';
+            $groupVariables = [];
+
+            /**
+             * @var Variable[]
+             */
+            foreach ($variables as $variable) {
+                $nextCode = $this->generateInitCode($groupVariables, $type, $pointer, $variable);
+                if ($nextCode && $additionalCode) {
+                    $additionalCode .= PHP_EOL . $nextCode;
+                } else {
+                    $additionalCode .= $nextCode;
+                }
+            }
+
+            $varInitCode[] = $code . implode(', ', $groupVariables) . ';';
         }
 
-        return $output;
+        /* Keep order consistent with previous zephir versions (BC-only) */
+        $varInitCode = array_reverse($varInitCode);
+        if ($additionalCode) {
+            $varInitCode[] = $additionalCode;
+        }
+
+        return $varInitCode;
+    }
+
+    public function destroyIterator(Variable $iteratorVariable, CompilationContext $context): void
+    {
+        $context->codePrinter->output('zend_iterator_dtor(' . $iteratorVariable->getName() . ');');
     }
 
     public function fetchClass(Variable $zendClassEntry, $className, $guarded, CompilationContext $context): void
     {
         $context->headersManager->add('kernel/object');
         if ($guarded) {
-            $context->codePrinter->output('if (!'.$zendClassEntry->getName().') {');
+            $context->codePrinter->output('if (!' . $zendClassEntry->getName() . ') {');
         }
-        $context->codePrinter->output($zendClassEntry->getName().' = zephir_fetch_class_str_ex('.$className.', ZEND_FETCH_CLASS_AUTO);');
+        $context->codePrinter->output(
+            $zendClassEntry->getName() . ' = zephir_fetch_class_str_ex(' . $className . ', ZEND_FETCH_CLASS_AUTO);'
+        );
         if ($guarded) {
             $context->codePrinter->output('}');
         }
     }
 
+    public function fetchClassEntry(string $str): string
+    {
+        return 'zephir_get_internal_ce(SL("' . $str . '"))';
+    }
+
+    public function fetchGlobal(Variable $globalVar, CompilationContext $compilationContext, $useCodePrinter = true)
+    {
+        $name   = $globalVar->getName();
+        $output = strtr('zephir_get_global(&:name, SL(":name"));', [':name' => $name]);
+
+        if ($useCodePrinter) {
+            $compilationContext->codePrinter->output($output);
+        }
+
+        return $output;
+    }
+
     /**
      * @param Variable           $symbolVariable
      * @param Variable           $variableVariable
@@ -840,7 +1021,7 @@ public function fetchProperty(
         }
 
         $variableCode = $this->getVariableCode($variableVariable);
-        $symbol = $this->getVariableCode($symbolVariable);
+        $symbol       = $this->getVariableCode($symbolVariable);
 
         if ($property instanceof Variable) {
             $context->codePrinter->output(
@@ -876,8 +1057,13 @@ public function fetchProperty(
      *
      * @throws Exception
      */
-    public function fetchStaticProperty(Variable $symbolVariable, $classDefinition, $property, $readOnly, CompilationContext $context): void
-    {
+    public function fetchStaticProperty(
+        Variable $symbolVariable,
+        $classDefinition,
+        $property,
+        $readOnly,
+        CompilationContext $context
+    ): void {
         // TODO: maybe optimizations as well as above
         $context->codePrinter->output(
             sprintf(
@@ -891,330 +1077,533 @@ public function fetchStaticProperty(Variable $symbolVariable, $classDefinition,
         );
     }
 
-    /**
-     * @param                    $value
-     * @param CompilationContext $context
-     *
-     * @return bool|string|Variable
-     *
-     * @throws CompilerException
-     */
-    public function resolveValue($value, CompilationContext $context): Variable | bool | string
-    {
-        if ($value instanceof GlobalConstant) {
-            switch ($value->getName()) {
-                case 'ZEPHIR_GLOBAL(global_null)':
-                    $value = 'null';
-                    break;
-                case 'ZEPHIR_GLOBAL(global_true)':
-                    $value = 'true';
-                    break;
-                case 'ZEPHIR_GLOBAL(global_false)':
-                    $value = 'false';
-                    break;
-                default:
-                    throw new CompilerException('Unknown constant '.$value->getName());
-            }
+    public function forStatement(
+        Variable $exprVariable,
+        $keyVariable,
+        $variable,
+        $duplicateKey,
+        $duplicateHash,
+        $statement,
+        $statementBlock,
+        CompilationContext $compilationContext
+    ): void {
+        /**
+         * Create a temporary zval to fetch the items from the hash.
+         */
+        $compilationContext->headersManager->add('kernel/fcall');
+        $compilationContext->symbolTable->mustGrownStack(true);
+        if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_LAST_CALL_STATUS')) {
+            $callStatus = new Variable(
+                'int',
+                'ZEPHIR_LAST_CALL_STATUS',
+                $compilationContext->branchManager->getCurrentBranch()
+            );
+            $callStatus->setIsInitialized(true, $compilationContext);
+            $callStatus->increaseUses();
+            $callStatus->setReadOnly(true);
+            $compilationContext->symbolTable->addRawVariable($callStatus);
         }
+        $tempVariable = $compilationContext->symbolTable->addTemp('variable', $compilationContext);
+        $tempVariable->setIsDoublePointer(true);
+        $tempValidVariable = $compilationContext->symbolTable->addTemp('variable', $compilationContext);
+        $codePrinter       = $compilationContext->codePrinter;
+
+        $codePrinter->output(
+            'zephir_is_iterable(' . $this->getVariableCode(
+                $exprVariable
+            ) . ', ' . $duplicateHash . ', "' . Compiler::getShortUserPath(
+                $statement['file']
+            ) . '", ' . $statement['line'] . ');'
+        );
 
-        if ('null' == $value || 'true' == $value || 'false' == $value) {
-            $varName = '__$'.$value;
-            if (!$context->symbolTable->hasVariable($varName)) {
-                $tempVariable = new Variable('variable', $varName, $context->branchManager->getCurrentBranch());
-                $context->symbolTable->addRawVariable($tempVariable);
-            }
+        $codePrinter->output('if (Z_TYPE_P(' . $this->getVariableCode($exprVariable) . ') == IS_ARRAY) {');
+        $codePrinter->increaseLevel();
 
-            $tempVariable = $context->symbolTable->getVariableForWrite($varName, $context);
-            $tempVariable->increaseUses();
-            $tempVariable->setUsed(true);
+        $reverse = $statement['reverse'] ? 'REVERSE_' : '';
 
-            if ('null' == $value) {
-                $tempVariable->setDynamicTypes('null');
+        if (isset($keyVariable)) {
+            $arrayNumKey = $compilationContext->symbolTable->addTemp('zend_ulong', $compilationContext);
+            $arrayStrKey = $compilationContext->symbolTable->addTemp('zend_string', $compilationContext);
+        }
+
+        if (isset($keyVariable) && isset($variable)) {
+            $macro = 'ZEND_HASH_' . $reverse . 'FOREACH_KEY_VAL';
+            $codePrinter->output(
+                $macro . '(Z_ARRVAL_P(' . $this->getVariableCode($exprVariable) . '), ' . $arrayNumKey->getName(
+                ) . ', ' . $arrayStrKey->getName() . ', ' . $tempVariable->getName() . ')'
+            );
+        } elseif (isset($keyVariable)) {
+            $macro = 'ZEND_HASH_' . $reverse . 'FOREACH_KEY';
+            $codePrinter->output(
+                $macro . '(Z_ARRVAL_P(' . $this->getVariableCode($exprVariable) . '), ' . $arrayNumKey->getName(
+                ) . ', ' . $arrayStrKey->getName() . ')'
+            );
+        } else {
+            $macro = 'ZEND_HASH_' . $reverse . 'FOREACH_VAL';
+            $codePrinter->output(
+                $macro . '(Z_ARRVAL_P(' . $this->getVariableCode($exprVariable) . '), ' . $tempVariable->getName() . ')'
+            );
+        }
+
+        $codePrinter->output('{');
+
+        if (isset($keyVariable)) {
+            $codePrinter->increaseLevel();
+            if ($duplicateKey) {
+                $compilationContext->symbolTable->mustGrownStack(true);
+                $keyVariable->initVariant($compilationContext);
+            }
+            $codePrinter->output('if (' . $arrayStrKey->getName() . ' != NULL) { ');
+            $codePrinter->increaseLevel();
+            if ($duplicateKey) {
+                $codePrinter->output(
+                    'ZVAL_STR_COPY(' . $this->getVariableCode($keyVariable) . ', ' . $arrayStrKey->getName() . ');'
+                );
             } else {
-                $tempVariable->setDynamicTypes('bool');
+                $codePrinter->output(
+                    'ZVAL_STR(' . $this->getVariableCode($keyVariable) . ', ' . $arrayStrKey->getName() . ');'
+                );
             }
+            $codePrinter->decreaseLevel();
+            $codePrinter->output('} else {');
+            $codePrinter->increaseLevel();
+            $codePrinter->output(
+                'ZVAL_LONG(' . $this->getVariableCode($keyVariable) . ', ' . $arrayNumKey->getName() . ');'
+            );
+            $codePrinter->decreaseLevel();
+            $codePrinter->output('}');
+            $codePrinter->decreaseLevel();
+        }
 
-            $value = $this->getVariableCode($tempVariable);
-        } else {
-            if ($value instanceof CompiledExpression) {
-                if (\in_array($value->getType(), ['array', 'variable', 'mixed'])) {
-                    $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context);
-                } else {
-                    return $value->getCode();
-                }
+        if (isset($variable)) {
+            $compilationContext->symbolTable->mustGrownStack(true);
+            $codePrinter->increaseLevel();
+            $variable->initVariant($compilationContext);
+            $codePrinter->output(
+                'ZVAL_COPY(' . $this->getVariableCode($variable) . ', ' . $this->getVariableCode($tempVariable) . ');'
+            );
+            $codePrinter->decreaseLevel();
+        }
+
+        /**
+         * Compile statements in the 'for' block
+         */
+        if (isset($statement['statements'])) {
+            $statementBlock->isLoop(true);
+            if (isset($statement['key'])) {
+                $statementBlock->getMutateGatherer()->increaseMutations($statement['key']);
+            }
+            $statementBlock->getMutateGatherer()->increaseMutations($statement['value']);
+            $statementBlock->compile($compilationContext);
+        }
+
+        $codePrinter->output('} ZEND_HASH_FOREACH_END();');
+        $codePrinter->decreaseLevel();
+
+        $codePrinter->output('} else {');
+        $codePrinter->increaseLevel();
+
+        $codePrinter->output(
+            'ZEPHIR_CALL_METHOD(NULL, ' . $this->getVariableCode($exprVariable) . ', "rewind", NULL, 0);'
+        );
+        $codePrinter->output('zephir_check_call_status();');
+
+        $codePrinter->output('while (1) {');
+        $codePrinter->increaseLevel();
+
+        $codePrinter->output(
+            'ZEPHIR_CALL_METHOD(&' . $tempValidVariable->getName() . ', ' . $this->getVariableCode(
+                $exprVariable
+            ) . ', "valid", NULL, 0);'
+        );
+        $codePrinter->output('zephir_check_call_status();');
+        $codePrinter->output('if (!zend_is_true(&' . $tempValidVariable->getName() . ')) {');
+        $codePrinter->increaseLevel();
+        $codePrinter->output('break;');
+        $codePrinter->decreaseLevel();
+        $codePrinter->output('}');
+
+        if (isset($keyVariable)) {
+            $codePrinter->output(
+                'ZEPHIR_CALL_METHOD(' . $this->getVariableCode($keyVariable) . ', ' . $this->getVariableCode(
+                    $exprVariable
+                ) . ', "key", NULL, 0);'
+            );
+            $codePrinter->output('zephir_check_call_status();');
+        }
+
+        if (isset($variable)) {
+            $codePrinter->output(
+                'ZEPHIR_CALL_METHOD(' . $this->getVariableCode($variable) . ', ' . $this->getVariableCode(
+                    $exprVariable
+                ) . ', "current", NULL, 0);'
+            );
+            $codePrinter->output('zephir_check_call_status();');
+        }
+
+        if (isset($statement['statements'])) {
+            $statementBlock->isLoop(true);
+            if (isset($statement['key'])) {
+                $statementBlock->getMutateGatherer()->increaseMutations($statement['key']);
             }
+            $statementBlock->getMutateGatherer()->increaseMutations($statement['value']);
+            $statementBlock->compile($compilationContext);
+        }
+
+        $codePrinter->output(
+            'ZEPHIR_CALL_METHOD(NULL, ' . $this->getVariableCode($exprVariable) . ', "next", NULL, 0);'
+        );
+        $codePrinter->output('zephir_check_call_status();');
+
+        $codePrinter->decreaseLevel();
+        $codePrinter->output('}');
+
+        $codePrinter->decreaseLevel();
+        $codePrinter->output('}');
+
+        /* Since we do not observe, still do cleanup */
+        $variable?->initVariant($compilationContext);
+        $keyVariable?->initVariant($compilationContext);
+    }
+
+    public function generateInitCode(&$groupVariables, $type, $pointer, Variable $variable): ?string
+    {
+        $isComplex = in_array($type, ['variable', 'string', 'array', 'resource', 'callable', 'object', 'mixed'], true);
+
+        if ($isComplex && !$variable->isDoublePointer()) {
+            $groupVariables[] = $variable->getName();
+
+            return match ($variable->getRealname()) {
+                '__$null'  => "\t" . 'ZVAL_NULL(&' . $variable->getName() . ');',
+                '__$true'  => "\t" . 'ZVAL_BOOL(&' . $variable->getName() . ', 1);',
+                '__$false' => "\t" . 'ZVAL_BOOL(&' . $variable->getName() . ', 0);',
+                default    => "\t" . 'ZVAL_UNDEF(&' . $variable->getName() . ');',
+            };
+        }
+
+        if ($variable->isLocalOnly()) {
+            $groupVariables[] = $variable->getName();
+
+            return null;
+        }
+
+        if ($variable->isSuperGlobal()) {
+            $groupVariables[] = $variable->getName();
+
+            return null;
         }
 
-        if ($value instanceof Variable) {
-            $value = $this->getVariableCode($value);
+        if ($variable->isDoublePointer()) {
+            /* Double pointers for ZE3 are used as zval * */
+            $ptr = $isComplex ? $pointer : $pointer . $pointer;
+            if ($variable->mustInitNull()) {
+                $groupVariables[] = $ptr . $variable->getName() . ' = NULL';
+            } else {
+                $groupVariables[] = $ptr . $variable->getName();
+            }
+
+            return null;
         }
 
-        return $value;
-    }
+        $defaultValue = $variable->getDefaultInitValue();
+        if (null !== $defaultValue) {
+            switch ($type) {
+                case 'variable':
+                case 'string':
+                case 'array':
+                case 'resource':
+                case 'callable':
+                case 'object':
+                case 'mixed':
+                    $groupVariables[] = $pointer . $variable->getName();
+                    break;
 
-    /**
-     * @param Variable           $variable
-     * @param string|Variable    $property
-     * @param mixed              $value
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    public function updateProperty(Variable $variable, $property, $value, CompilationContext $context): void
-    {
-        $value = $this->resolveValue($value, $context);
+                case 'char':
+                    $defaultValue = (string)$defaultValue;
+                    if (strlen($defaultValue) > 4) {
+                        if (strlen($defaultValue) > 10) {
+                            throw new CompilerException(
+                                "Invalid char literal: '" . substr($defaultValue, 0, 10) . "...'",
+                                $variable->getOriginal()
+                            );
+                        } else {
+                            throw new CompilerException(
+                                "Invalid char literal: '" . $defaultValue . "'",
+                                $variable->getOriginal()
+                            );
+                        }
+                    }
+                /* no break */
 
-        if ($property instanceof Variable) {
-            $context->codePrinter->output(
-                sprintf(
-                    'zephir_update_property_zval_zval(%s, %s, %s);',
-                    $this->getVariableCode($variable),
-                    $this->getVariableCode($property),
-                    $value
-                )
-            );
+                default:
+                    $groupVariables[] = $pointer . $variable->getName() . ' = ' . $defaultValue;
+                    break;
+            }
 
-            return;
+            return null;
         }
 
-        $template = 'zephir_update_property_zval(%s, ZEND_STRL("%s"), %s);';
-        /* Are we going to init default object property value? */
-        if ($context->currentMethod && $context->currentMethod->isInitializer()) {
-            $template = 'zephir_update_property_zval_ex(%s, ZEND_STRL("%s"), %s);';
+        if ($variable->mustInitNull() && $pointer) {
+            $groupVariables[] = $pointer . $variable->getName() . ' = NULL';
+
+            return null;
         }
 
-        $context->codePrinter->output(
-            sprintf($template, $this->getVariableCode($variable), $property, $value)
-        );
-    }
+        $groupVariables[] = $pointer . $variable->getName();
 
-    public function updateStaticProperty($classEntry, $property, $value, CompilationContext $context): void
-    {
-        // TODO(serghei): Sort out as well as above
-        $value = $this->resolveValue($value, $context);
-        $context->codePrinter->output('zephir_update_static_property_ce('.$classEntry.', ZEND_STRL("'.$property.'"), '.$value.');');
+        return null;
     }
 
-    public function addStaticProperty($classEntry, $property, $value, CompilationContext $context): void
+    public function getBoolCode(Variable $variable, CompilationContext $context, $useCodePrinter = true): string
     {
-        $value = $this->resolveValue($value, $context);
-        $context->codePrinter->output('zephir_add_static_property_ce('.$classEntry.', ZEND_STRL("'.$property.'"), '.$value.');');
+        $code = '(Z_TYPE_P(' . $this->getVariableCode($variable) . ') == IS_TRUE)';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($code);
+        }
+
+        return $code;
     }
 
-    public function subStaticProperty($classEntry, $property, $value, CompilationContext $context): void
+    public function getFcallManager(): FcallManagerInterface
     {
-        $value = $this->resolveValue($value, $context);
-        $context->codePrinter->output('zephir_sub_static_property_ce('.$classEntry.', ZEND_STRL("'.$property.'"), '.$value.');');
+        return $this->fcallManager;
     }
 
-    public function assignArrayProperty(Variable $variable, $property, $key, $value, CompilationContext $context): void
+    /**
+     * Resolves the path to the source kernel files of the backend.
+     */
+    public function getInternalKernelPath(): string
     {
-        $resolveValue = $this->resolveValue($value, $context);
-        if (isset($key)) {
-            $context->codePrinter->output('zephir_update_property_array('.$this->getVariableCode($variable).', SL("'.$property.'"), '.$this->getVariableCode($key).', '.$resolveValue.');');
-        } else {
-            $context->codePrinter->output('zephir_update_property_array_append('.$this->getVariableCode($variable).', SL("'.$property.'"), '.$resolveValue.');');
-        }
+        return $this->kernelsPath;
     }
 
-    public function callMethod($symbolVariable, Variable $variable, $methodName, $cachePointer, $params, CompilationContext $context): void
+    /**
+     * @param Method             $method
+     * @param CompilationContext $context
+     *
+     * @return string
+     */
+    public function getInternalSignature(Method $method, CompilationContext $context): string
     {
-        $paramStr = null != $params ? ', '.implode(', ', $params) : '';
-        $macro = 'CALL_METHOD';
-        if ($methodName instanceof Variable) {
-            $macro = 'CALL_METHOD_ZVAL';
-            $methodName = $this->getVariableCode($methodName);
-        } else {
-            $methodName = '"'.$methodName.'"';
+        if ($method->isInitializer() && !$method->isStatic()) {
+            return 'zend_object *' . $method->getName() . '(zend_class_entry *class_type)';
         }
 
-        if (!isset($symbolVariable)) {
-            $context->codePrinter->output('ZEPHIR_'.$macro.'(NULL, '.$this->getVariableCode($variable).', '.$methodName.', '.$cachePointer.$paramStr.');');
-        } elseif ('return_value' == $symbolVariable->getName()) {
-            $context->codePrinter->output('ZEPHIR_RETURN_'.$macro.'('.$this->getVariableCode($variable).', '.$methodName.', '.$cachePointer.$paramStr.');');
-        } else {
-            $symbol = $this->getVariableCode($symbolVariable);
-            $context->codePrinter->output('ZEPHIR_'.$macro.'('.$symbol.', '.$this->getVariableCode($variable).', '.$methodName.', '.$cachePointer.$paramStr.');');
+        if ($method->isInitializer() && $method->isStatic()) {
+            return 'void ' . $method->getName() . '()';
         }
-    }
 
-    public function copyOnWrite(Variable $target, $var, CompilationContext $context): void
-    {
-        if ('EG(exception)' === $var) {
-            $context->codePrinter->output('ZVAL_OBJ('.$this->getVariableCode($target).', EG(exception));');
-            $context->codePrinter->output('Z_ADDREF_P('.$this->getVariableCode($target).');');
+        $signatureParameters = [];
+        $parameters          = $method->getParameters();
+        if (is_object($parameters)) {
+            foreach ($parameters->getParameters() as $parameter) {
+                switch ($parameter['data-type']) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'double':
+                    case 'bool':
+                    case 'char':
+                    case 'uchar':
+                    case 'string':
+                    case 'array':
+                        $signatureParameters[] = 'zval *' . $parameter['name'] . '_param_ext';
+                        break;
 
-            return;
+                    default:
+                        $signatureParameters[] = 'zval *' . $parameter['name'] . '_ext ';
+                        break;
+                }
+            }
         }
 
-        $globalsManager = new Globals();
+        $signaturePattern =
+            'int ht, zend_execute_data *execute_data, zval *return_value, zval *this_ptr, int return_value_used';
 
-        if ($globalsManager->isSuperGlobal($target->getName())) {
-            $context->codePrinter->output(sprintf(
-                'ZEPHIR_HASH_COPY(%s, %s);',
-                $this->getVariableCode($target),
-                $this->resolveValue($var, $context)
-            ));
-        } else {
-            $context->codePrinter->output(sprintf(
-                'ZEPHIR_CPY_WRT(%s, %s);',
-                $this->getVariableCode($target),
-                $this->resolveValue($var, $context)
-            ));
+        if (count($signatureParameters)) {
+            $signaturePattern = sprintf('%s, %s', $signaturePattern, implode(', ', $signatureParameters));
         }
+
+        return "void {$method->getInternalName()}({$signaturePattern})";
+    }
+
+    /**
+     * @param string             $type
+     * @param CompilationContext $compilationContext
+     *
+     * @return Variable
+     */
+    public function getScalarTempVariable(
+        string $type,
+        CompilationContext $compilationContext,
+    ): Variable {
+        return $compilationContext->symbolTable->getTempNonTrackedVariable($type, $compilationContext);
     }
 
-    public function forStatement(Variable $exprVariable, $keyVariable, $variable, $duplicateKey, $duplicateHash, $statement, $statementBlock, CompilationContext $compilationContext): void
+    /**
+     * Resolves the path to the source template file of the backend.
+     */
+    public function getTemplateFileContents(string $filename): string
     {
-        /**
-         * Create a temporary zval to fetch the items from the hash.
-         */
-        $compilationContext->headersManager->add('kernel/fcall');
-        $compilationContext->symbolTable->mustGrownStack(true);
-        if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_LAST_CALL_STATUS')) {
-            $callStatus = new Variable('int', 'ZEPHIR_LAST_CALL_STATUS', $compilationContext->branchManager->getCurrentBranch());
-            $callStatus->setIsInitialized(true, $compilationContext);
-            $callStatus->increaseUses();
-            $callStatus->setReadOnly(true);
-            $compilationContext->symbolTable->addRawVariable($callStatus);
+        $templatePath = rtrim((string)$this->config->get('templatepath', 'backend'), '\\/');
+        if (empty($templatePath)) {
+            $templatePath = $this->templatesPath;
         }
-        $tempVariable = $compilationContext->symbolTable->addTemp('variable', $compilationContext);
-        $tempVariable->setIsDoublePointer(true);
-        $tempValidVariable = $compilationContext->symbolTable->addTemp('variable', $compilationContext);
-        $codePrinter = $compilationContext->codePrinter;
 
-        $codePrinter->output('zephir_is_iterable('.$this->getVariableCode($exprVariable).', '.$duplicateHash.', "'.Compiler::getShortUserPath($statement['file']).'", '.$statement['line'].');');
+        return file_get_contents("$templatePath/engine/$filename");
+    }
 
-        $codePrinter->output('if (Z_TYPE_P('.$this->getVariableCode($exprVariable).') == IS_ARRAY) {');
-        $codePrinter->increaseLevel();
+    public function getTypeDefinition($type): array
+    {
+        if ($type === 'zend_ulong') {
+            return ['', 'zend_ulong'];
+        } elseif ($type === 'zend_string') {
+            return ['*', 'zend_string'];
+        }
 
-        $reverse = $statement['reverse'] ? 'REVERSE_' : '';
+        $pointer = null;
+        switch ($type) {
+            case 'int':
+                $code = 'zend_long';
+                break;
 
-        if (isset($keyVariable)) {
-            $arrayNumKey = $compilationContext->symbolTable->addTemp('zend_ulong', $compilationContext);
-            $arrayStrKey = $compilationContext->symbolTable->addTemp('zend_string', $compilationContext);
-        }
+            case 'uint':
+                $code = 'zend_ulong';
+                break;
 
-        if (isset($keyVariable) && isset($variable)) {
-            $macro = 'ZEND_HASH_'.$reverse.'FOREACH_KEY_VAL';
-            $codePrinter->output($macro.'(Z_ARRVAL_P('.$this->getVariableCode($exprVariable).'), '.$arrayNumKey->getName().', '.$arrayStrKey->getName().', '.$tempVariable->getName().')');
-        } elseif (isset($keyVariable)) {
-            $macro = 'ZEND_HASH_'.$reverse.'FOREACH_KEY';
-            $codePrinter->output($macro.'(Z_ARRVAL_P('.$this->getVariableCode($exprVariable).'), '.$arrayNumKey->getName().', '.$arrayStrKey->getName().')');
-        } else {
-            $macro = 'ZEND_HASH_'.$reverse.'FOREACH_VAL';
-            $codePrinter->output($macro.'(Z_ARRVAL_P('.$this->getVariableCode($exprVariable).'), '.$tempVariable->getName().')');
-        }
+            case 'char':
+                $code = 'char';
+                break;
 
-        $codePrinter->output('{');
+            case 'uchar':
+                $code = 'unsigned char';
+                break;
 
-        if (isset($keyVariable)) {
-            $codePrinter->increaseLevel();
-            if ($duplicateKey) {
-                $compilationContext->symbolTable->mustGrownStack(true);
-                $keyVariable->initVariant($compilationContext);
-            }
-            $codePrinter->output('if ('.$arrayStrKey->getName().' != NULL) { ');
-            $codePrinter->increaseLevel();
-            if ($duplicateKey) {
-                $codePrinter->output('ZVAL_STR_COPY('.$this->getVariableCode($keyVariable).', '.$arrayStrKey->getName().');');
-            } else {
-                $codePrinter->output('ZVAL_STR('.$this->getVariableCode($keyVariable).', '.$arrayStrKey->getName().');');
-            }
-            $codePrinter->decreaseLevel();
-            $codePrinter->output('} else {');
-            $codePrinter->increaseLevel();
-            $codePrinter->output('ZVAL_LONG('.$this->getVariableCode($keyVariable).', '.$arrayNumKey->getName().');');
-            $codePrinter->decreaseLevel();
-            $codePrinter->output('}');
-            $codePrinter->decreaseLevel();
-        }
+            case 'long':
+                $code = 'long';
+                break;
 
-        if (isset($variable)) {
-            $compilationContext->symbolTable->mustGrownStack(true);
-            $codePrinter->increaseLevel();
-            $variable->initVariant($compilationContext);
-            $codePrinter->output('ZVAL_COPY('.$this->getVariableCode($variable).', '.$this->getVariableCode($tempVariable).');');
-            $codePrinter->decreaseLevel();
-        }
+            case 'ulong':
+                $code = 'unsigned long';
+                break;
 
-        /**
-         * Compile statements in the 'for' block
-         */
-        if (isset($statement['statements'])) {
-            $statementBlock->isLoop(true);
-            if (isset($statement['key'])) {
-                $statementBlock->getMutateGatherer()->increaseMutations($statement['key']);
-            }
-            $statementBlock->getMutateGatherer()->increaseMutations($statement['value']);
-            $statementBlock->compile($compilationContext);
-        }
+            case 'bool':
+            case 'zephir_ce_guard':
+                $code = 'zend_bool';
+                break;
 
-        $codePrinter->output('} ZEND_HASH_FOREACH_END();');
-        $codePrinter->decreaseLevel();
+            case 'double':
+                $code = 'double';
+                break;
+
+            case 'string':
+            case 'variable':
+            case 'array':
+            case 'null':
+            case 'mixed':
+                $pointer = '*';
+                $code    = 'zval';
+                break;
 
-        $codePrinter->output('} else {');
-        $codePrinter->increaseLevel();
+            case 'HashTable':
+                $pointer = '*';
+                $code    = 'HashTable';
+                break;
 
-        $codePrinter->output('ZEPHIR_CALL_METHOD(NULL, '.$this->getVariableCode($exprVariable).', "rewind", NULL, 0);');
-        $codePrinter->output('zephir_check_call_status();');
+            case 'HashPosition':
+                $code = 'HashPosition';
+                break;
 
-        $codePrinter->output('while (1) {');
-        $codePrinter->increaseLevel();
+            case 'zend_class_entry':
+            case 'static_zend_class_entry':
+                $pointer = '*';
+                $code    = 'zend_class_entry';
+                break;
 
-        $codePrinter->output('ZEPHIR_CALL_METHOD(&'.$tempValidVariable->getName().', '.$this->getVariableCode($exprVariable).', "valid", NULL, 0);');
-        $codePrinter->output('zephir_check_call_status();');
-        $codePrinter->output('if (!zend_is_true(&'.$tempValidVariable->getName().')) {');
-        $codePrinter->increaseLevel();
-        $codePrinter->output('break;');
-        $codePrinter->decreaseLevel();
-        $codePrinter->output('}');
+            case 'zend_function':
+                $pointer = '*';
+                $code    = 'zend_function';
+                break;
 
-        if (isset($keyVariable)) {
-            $codePrinter->output('ZEPHIR_CALL_METHOD('.$this->getVariableCode($keyVariable).', '.$this->getVariableCode($exprVariable).', "key", NULL, 0);');
-            $codePrinter->output('zephir_check_call_status();');
-        }
+            case 'zend_object_iterator':
+                $pointer = '*';
+                $code    = 'zend_object_iterator';
+                break;
 
-        if (isset($variable)) {
-            $codePrinter->output('ZEPHIR_CALL_METHOD('.$this->getVariableCode($variable).', '.$this->getVariableCode($exprVariable).', "current", NULL, 0);');
-            $codePrinter->output('zephir_check_call_status();');
-        }
+            case 'zend_property_info':
+                $pointer = '*';
+                $code    = 'zend_property_info';
+                break;
 
-        if (isset($statement['statements'])) {
-            $statementBlock->isLoop(true);
-            if (isset($statement['key'])) {
-                $statementBlock->getMutateGatherer()->increaseMutations($statement['key']);
-            }
-            $statementBlock->getMutateGatherer()->increaseMutations($statement['value']);
-            $statementBlock->compile($compilationContext);
-        }
+            case 'zephir_fcall_cache_entry':
+            case 'static_zephir_fcall_cache_entry':
+                $pointer = '*';
+                $code    = 'zephir_fcall_cache_entry';
+                break;
 
-        $codePrinter->output('ZEPHIR_CALL_METHOD(NULL, '.$this->getVariableCode($exprVariable).', "next", NULL, 0);');
-        $codePrinter->output('zephir_check_call_status();');
+            default:
+                throw new CompilerException('Unsupported type in declare: ' . $type);
+        }
 
-        $codePrinter->decreaseLevel();
-        $codePrinter->output('}');
+        return [$pointer, $code];
+    }
 
-        $codePrinter->decreaseLevel();
-        $codePrinter->output('}');
+    /**
+     * @param Variable $variableVariable
+     * @param string   $operator
+     * @param string   $value
+     *
+     * @return string
+     *
+     * @throws CompilerException
+     */
+    public function getTypeofCondition(
+        Variable $variableVariable,
+        string $operator,
+        string $value,
+    ): string {
+        $variableName = $this->getVariableCode($variableVariable);
 
-        /* Since we do not observe, still do cleanup */
-        $variable?->initVariant($compilationContext);
-        $keyVariable?->initVariant($compilationContext);
+        return match ($value) {
+            'array'                  => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_ARRAY',
+            'object'                 => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_OBJECT',
+            'null'                   => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_NULL',
+            'string'                 => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_STRING',
+            'int', 'long', 'integer' => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_LONG',
+            'double', 'float'        => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_DOUBLE',
+            'boolean', 'bool'        => '((Z_TYPE_P(' . $variableName . ') == IS_TRUE || Z_TYPE_P(' . $variableName . ') == IS_FALSE) ' . $operator . ' 1)',
+            'resource'               => 'Z_TYPE_P(' . $variableName . ') ' . $operator . ' IS_RESOURCE',
+            'callable'               => 'zephir_is_callable(' . $variableName . ') ' . $operator . ' 1',
+            default                  => throw new CompilerException(
+                sprintf('Unknown type: "%s" in typeof comparison', $value)
+            ),
+        };
     }
 
-    public function destroyIterator(Variable $iteratorVariable, CompilationContext $context): void
+    public function getVariableCode(Variable $variable): string
     {
-        $context->codePrinter->output('zend_iterator_dtor('.$iteratorVariable->getName().');');
+        if (
+            $variable->isDoublePointer() ||
+            in_array($variable->getName(), ['this_ptr', 'return_value']) ||
+            in_array($variable->getType(), ['int', 'long'])
+        ) {
+            return $variable->getName();
+        }
+
+        return '&' . $variable->getName();
     }
 
-    public function ifVariableValueUndefined(Variable $var, CompilationContext $context, $useBody = false, $useCodePrinter = true): string
-    {
+    public function ifVariableValueUndefined(
+        Variable $var,
+        CompilationContext $context,
+        $useBody = false,
+        $useCodePrinter = true
+    ): string {
         if ($var->isDoublePointer()) {
             return $this->ifVariableValueUndefined2($var, $context, $useBody, $useCodePrinter);
         }
-        $body = 'ZEPHIR_IS_EMPTY('.$this->getVariableCode($var).')';
-        $output = 'if ('.$body.') {';
+        $body   = 'ZEPHIR_IS_EMPTY(' . $this->getVariableCode($var) . ')';
+        $output = 'if (' . $body . ') {';
         if ($useCodePrinter) {
             $context->codePrinter->output($output);
         }
@@ -1222,10 +1611,14 @@ public function ifVariableValueUndefined(Variable $var, CompilationContext $cont
         return $useBody ? $body : $output;
     }
 
-    public function ifVariableValueUndefined2(Variable $var, CompilationContext $context, $onlyBody = false, $useCodePrinter = true): string
-    {
-        $body = '!'.$var->getName();
-        $output = 'if ('.$body.') {';
+    public function ifVariableValueUndefined2(
+        Variable $var,
+        CompilationContext $context,
+        $onlyBody = false,
+        $useCodePrinter = true
+    ): string {
+        $body   = '!' . $var->getName();
+        $output = 'if (' . $body . ') {';
         if ($useCodePrinter) {
             $context->codePrinter->output($output);
         }
@@ -1233,24 +1626,6 @@ public function ifVariableValueUndefined2(Variable $var, CompilationContext $con
         return $onlyBody ? $body : $output;
     }
 
-    public function fetchClassEntry(string $str): string
-    {
-        return 'zephir_get_internal_ce(SL("'.$str.'"))';
-    }
-
-    /**
-     * @param string             $type
-     * @param CompilationContext $compilationContext
-     *
-     * @return Variable
-     */
-    public function getScalarTempVariable(
-        string $type,
-        CompilationContext $compilationContext,
-    ): Variable {
-        return $compilationContext->symbolTable->getTempNonTrackedVariable($type, $compilationContext);
-    }
-
     /**
      * Initialize array
      *
@@ -1269,21 +1644,209 @@ public function initArray(Variable $variable, CompilationContext $context, int $
         if (null === $size) {
             $output = "array_init({$code});";
         } else {
-            $output = "zephir_create_array({$code}, {$size}, 0);";
+            $output = "zephir_create_array({$code}, {$size}, 0);";
+        }
+
+        $context->codePrinter->output($output);
+    }
+
+    public function initObject(Variable $variable, $ce, CompilationContext $context, $useCodePrinter = true)
+    {
+        $variableAccess = $this->getVariableCode($variable);
+        if (!isset($ce)) {
+            $output = 'object_init(' . $variableAccess . ');';
+        } else {
+            $output = 'object_init_ex(' . $variableAccess . ', ' . $ce . ');';
+        }
+
+        if ($useCodePrinter) {
+            $context->codePrinter->output($output);
+        }
+
+        return $output;
+    }
+
+    public function initVar(
+        Variable $variable,
+        CompilationContext $context,
+        bool $useCodePrinter = true,
+        bool $second = false
+    ): string {
+        $macro = !$second ? 'ZVAL_NULL' : 'ZEPHIR_INIT_NVAR';
+        $code  = $macro . '(' . $this->getVariableCode($variable) . ');';
+        if ($useCodePrinter) {
+            $context->codePrinter->output($code);
+        }
+
+        return $code;
+    }
+
+    /**
+     * @param Variable[]         $variables
+     * @param CompilationContext $context
+     *
+     * @return string
+     *
+     * @throws CompilerException
+     */
+    public function initializeVariableDefaults(array $variables, CompilationContext $context): string
+    {
+        $codePrinter = new Printer();
+        $codePrinter->increaseLevel();
+
+        $oldCodePrinter       = $context->codePrinter;
+        $context->codePrinter = $codePrinter;
+
+        $variablesManager = new VariablesManager();
+
+        /* Initialize default values in dynamic variables */
+        foreach ($variables as $variable) {
+            /* Do not initialize unused variable */
+            if ($variable->getNumberUses() < 1) {
+                continue;
+            }
+
+            /* The default init value to be used bellow.
+               Actually this value should be in array form and
+               provide 'type' and 'value' keys. */
+            $value = $variable->getDefaultInitValue();
+            if (!is_array($value)) {
+                continue;
+            }
+
+            $variablesManager->initializeDefaults($variable, $value, $context);
+        }
+
+        $context->codePrinter = $oldCodePrinter;
+
+        return $codePrinter->getOutput();
+    }
+
+    public function onPostCompile(Method $method, CompilationContext $context): void
+    {
+        if (str_starts_with($method->getName(), 'zephir_init_properties')) {
+            $context->codePrinter->increaseLevel();
+            $context->codePrinter->output('return Z_OBJ_P(this_ptr);');
+            $context->codePrinter->decreaseLevel();
+            $context->codePrinter->output('}');
+            $context->codePrinter->decreaseLevel();
+        }
+    }
+
+    public function onPreCompile(Method $method, CompilationContext $context): void
+    {
+        /**
+         * Initialize the properties within create_object, handler code
+         */
+        if (str_starts_with($method->getName(), 'zephir_init_properties')) {
+            $context->codePrinter->increaseLevel();
+            $context->codePrinter->output('{');
+            $context->codePrinter->increaseLevel();
+            $context->codePrinter->output('zval local_this_ptr, *this_ptr = &local_this_ptr;');
+            $context->codePrinter->output('ZEPHIR_CREATE_OBJECT(this_ptr, class_type);');
+            $context->codePrinter->decreaseLevel();
+        }
+    }
+
+    public function onPreInitVar(Method $method): string
+    {
+        if (!$method instanceof FunctionDefinition && !$method->isInternal()) {
+            return "zval *this_ptr = getThis();\n"; // TODO: think about a better way to solve this.
+        }
+
+        return '';
+    }
+
+    public function propertyIsset(Variable $var, $key)
+    {
+        return new CompiledExpression(
+            'bool',
+            'zephir_isset_property(' . $this->getVariableCode($var) . ', SL("' . $key . '"))',
+            null
+        );
+    }
+
+    /**
+     * @param                    $value
+     * @param CompilationContext $context
+     *
+     * @return bool|string|Variable
+     *
+     * @throws CompilerException
+     */
+    public function resolveValue($value, CompilationContext $context): Variable|bool|string
+    {
+        if ($value instanceof GlobalConstant) {
+            switch ($value->getName()) {
+                case 'ZEPHIR_GLOBAL(global_null)':
+                    $value = 'null';
+                    break;
+                case 'ZEPHIR_GLOBAL(global_true)':
+                    $value = 'true';
+                    break;
+                case 'ZEPHIR_GLOBAL(global_false)':
+                    $value = 'false';
+                    break;
+                default:
+                    throw new CompilerException('Unknown constant ' . $value->getName());
+            }
+        }
+
+        if ('null' == $value || 'true' == $value || 'false' == $value) {
+            $varName = '__$' . $value;
+            if (!$context->symbolTable->hasVariable($varName)) {
+                $tempVariable = new Variable('variable', $varName, $context->branchManager->getCurrentBranch());
+                $context->symbolTable->addRawVariable($tempVariable);
+            }
+
+            $tempVariable = $context->symbolTable->getVariableForWrite($varName, $context);
+            $tempVariable->increaseUses();
+            $tempVariable->setUsed(true);
+
+            if ('null' == $value) {
+                $tempVariable->setDynamicTypes('null');
+            } else {
+                $tempVariable->setDynamicTypes('bool');
+            }
+
+            $value = $this->getVariableCode($tempVariable);
+        } else {
+            if ($value instanceof CompiledExpression) {
+                if (in_array($value->getType(), ['array', 'variable', 'mixed'])) {
+                    $value = $context->symbolTable->getVariableForWrite($value->getCode(), $context);
+                } else {
+                    return $value->getCode();
+                }
+            }
         }
 
-        $context->codePrinter->output($output);
+        if ($value instanceof Variable) {
+            $value = $this->getVariableCode($value);
+        }
+
+        return $value;
     }
 
-    public function concatSelf(Variable $variable, Variable $itemVariable, CompilationContext $context): void
+    public function returnString($value, CompilationContext $context, $useCodePrinter = true)
     {
-        $variable = $this->getVariableCode($variable);
-        $itemVariable = $this->getVariableCode($itemVariable);
-        $context->codePrinter->output('zephir_concat_self('.$variable.', '.$itemVariable.');');
+        return $this->returnHelper('RETURN_MM_STRING', $value, $context, $useCodePrinter);
     }
 
-    public function updateArray(Variable $symbolVariable, $key, $value, CompilationContext $compilationContext, $flags = null): void
+    public function subStaticProperty($classEntry, $property, $value, CompilationContext $context): void
     {
+        $value = $this->resolveValue($value, $context);
+        $context->codePrinter->output(
+            'zephir_sub_static_property_ce(' . $classEntry . ', ZEND_STRL("' . $property . '"), ' . $value . ');'
+        );
+    }
+
+    public function updateArray(
+        Variable $symbolVariable,
+        $key,
+        $value,
+        CompilationContext $compilationContext,
+        $flags = null
+    ): void {
         $value = $this->resolveValue($value, $compilationContext, true);
         if (!isset($flags)) {
             $flags = 'PH_COPY';
@@ -1293,288 +1856,121 @@ public function updateArray(Variable $symbolVariable, $key, $value, CompilationC
             switch ($key->getType()) {
                 case 'string':
                 case 'variable':
-                    $compilationContext->codePrinter->output('zephir_array_update_zval('.$this->getVariableCode($symbolVariable).', '.$this->getVariableCode($key).', '.$value.', '.$flags.');');
+                    $compilationContext->codePrinter->output(
+                        'zephir_array_update_zval(' . $this->getVariableCode(
+                            $symbolVariable
+                        ) . ', ' . $this->getVariableCode($key) . ', ' . $value . ', ' . $flags . ');'
+                    );
                     break;
 
                 case 'int':
                 case 'uint':
                 case 'long':
-                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCode($symbolVariable).', '.$key->getName().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
+                    $compilationContext->codePrinter->output(
+                        'zephir_array_update_long(' . $this->getVariableCode($symbolVariable) . ', ' . $key->getName(
+                        ) . ', ' . $value . ', ' . $flags . ' ZEPHIR_DEBUG_PARAMS_DUMMY);'
+                    );
                     break;
 
                 default:
-                    throw new CompilerException('updateArray: Found a variable with unsupported type '.$key->getType());
+                    throw new CompilerException(
+                        'updateArray: Found a variable with unsupported type ' . $key->getType()
+                    );
             }
         } elseif ($key instanceof CompiledExpression) {
             switch ($key->getType()) {
                 case 'string':
-                    $compilationContext->codePrinter->output('zephir_array_update_string('.$this->getVariableCode($symbolVariable).', SL("'.$key->getCode().'"), '.$value.', '.$flags.');');
+                    $compilationContext->codePrinter->output(
+                        'zephir_array_update_string(' . $this->getVariableCode(
+                            $symbolVariable
+                        ) . ', SL("' . $key->getCode() . '"), ' . $value . ', ' . $flags . ');'
+                    );
                     break;
 
                 case 'int':
-                    $compilationContext->codePrinter->output('zephir_array_update_long('.$this->getVariableCode($symbolVariable).', '.$key->getCode().', '.$value.', '.$flags.' ZEPHIR_DEBUG_PARAMS_DUMMY);');
+                    $compilationContext->codePrinter->output(
+                        'zephir_array_update_long(' . $this->getVariableCode($symbolVariable) . ', ' . $key->getCode(
+                        ) . ', ' . $value . ', ' . $flags . ' ZEPHIR_DEBUG_PARAMS_DUMMY);'
+                    );
                     break;
 
                 case 'variable':
-                    $this->updateArray($symbolVariable, $compilationContext->symbolTable->getVariableForRead($key->getCode()), $value, $compilationContext, $flags);
+                    $this->updateArray(
+                        $symbolVariable,
+                        $compilationContext->symbolTable->getVariableForRead($key->getCode()),
+                        $value,
+                        $compilationContext,
+                        $flags
+                    );
                     break;
 
                 default:
-                    throw new CompilerException('updateArray: Found an expression with unsupported type '.$key->getType());
+                    throw new CompilerException(
+                        'updateArray: Found an expression with unsupported type ' . $key->getType()
+                    );
             }
         } else {
             throw new CompilerException('?');
         }
     }
 
-    public function initObject(Variable $variable, $ce, CompilationContext $context, $useCodePrinter = true)
-    {
-        $variableAccess = $this->getVariableCode($variable);
-        if (!isset($ce)) {
-            $output = 'object_init('.$variableAccess.');';
-        } else {
-            $output = 'object_init_ex('.$variableAccess.', '.$ce.');';
-        }
-
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
-        }
-
-        return $output;
-    }
-
-    public function arrayFetch(Variable $var, Variable $src, $index, $flags, $arrayAccess, CompilationContext $context, $useCodePrinter = true)
+    /**
+     * @param Variable           $variable
+     * @param string|Variable    $property
+     * @param mixed              $value
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    public function updateProperty(Variable $variable, $property, $value, CompilationContext $context): void
     {
-        $context->headersManager->add('kernel/array');
-        $isVariable = $index instanceof Variable;
-
-        switch ($index->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $type = 'long';
-                break;
+        $value = $this->resolveValue($value, $context);
 
-                /* Types which map to the same */
-            case 'variable':
-            case 'mixed':
-            case 'string':
-                $type = $index->getType();
-                break;
+        if ($property instanceof Variable) {
+            $context->codePrinter->output(
+                sprintf(
+                    'zephir_update_property_zval_zval(%s, %s, %s);',
+                    $this->getVariableCode($variable),
+                    $this->getVariableCode($property),
+                    $value
+                )
+            );
 
-            default:
-                throw new CompilerException(
-                    sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
-                    $arrayAccess['right']
-                );
-        }
-        if ($isVariable && \in_array($index->getType(), ['variable', 'string', 'mixed'])) {
-            $output = 'zephir_array_fetch('.$this->getVariableCode($var).', '.$this->getVariableCode($src).', '.$this->getVariableCode($index).', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
-        } else {
-            if ($isVariable) {
-                $indexAccess = $this->getVariableCode($index);
-            } else {
-                $indexAccess = $index->getCode();
-                if ('string' == $type) {
-                    $indexAccess = 'SL("'.$indexAccess.'")';
-                }
-            }
-            $output = 'zephir_array_fetch_'.$type.'('.$this->getVariableCode($var).', '.$this->getVariableCode($src).', '.$indexAccess.', '.$flags.', "'.Compiler::getShortUserPath($arrayAccess['file']).'", '.$arrayAccess['line'].');';
+            return;
         }
 
-        if ($useCodePrinter) {
-            $context->codePrinter->output($output);
+        $template = 'zephir_update_property_zval(%s, ZEND_STRL("%s"), %s);';
+        /* Are we going to init default object property value? */
+        if ($context->currentMethod && $context->currentMethod->isInitializer()) {
+            $template = 'zephir_update_property_zval_ex(%s, ZEND_STRL("%s"), %s);';
         }
 
-        return $output;
-    }
-
-    public function assignArrayMulti(Variable $variable, $symbolVariable, $offsetExprs, CompilationContext $compilationContext): void
-    {
-        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-
-        $symbol = $this->resolveValue($symbolVariable, $compilationContext, true);
-        $varCode = $this->getVariableCode($variable);
-        $compilationContext->codePrinter->output(
-            sprintf(
-                'zephir_array_update_multi(%s, %s, SL("%s"), %d, %s);',
-                $varCode,
-                $symbol,
-                $keys,
-                $numberParams,
-                implode(', ', $offsetItems)
-            )
-        );
-    }
-
-    public function assignPropertyArrayMulti(Variable $variable, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext): void
-    {
-        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
-
-        $compilationContext->codePrinter->output(
-            sprintf(
-                'zephir_update_property_array_multi(%s, SL("%s"), %s, SL("%s"), %d, %s);',
-                $variable->getName(),
-                $propertyName,
-                $valueVariable,
-                $keys,
-                $numberParams,
-                implode(', ', $offsetItems)
-            )
+        $context->codePrinter->output(
+            sprintf($template, $this->getVariableCode($variable), $property, $value)
         );
     }
 
-    public function assignStaticPropertyArrayMulti($classEntry, $valueVariable, $propertyName, $offsetExprs, CompilationContext $compilationContext): void
+    public function updateStaticProperty($classEntry, $property, $value, CompilationContext $context): void
     {
-        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
-
-        $offsetStr = $offsetItems ? ', '.implode(', ', $offsetItems) : '';
-        $compilationContext->codePrinter->output(
-            sprintf(
-                'zephir_update_static_property_array_multi_ce(%s, SL("%s"), %s, SL("%s"), %d%s);',
-                $classEntry,
-                $propertyName,
-                $valueVariable,
-                $keys,
-                $numberParams,
-                $offsetStr
-            )
+        // TODO(serghei): Sort out as well as above
+        $value = $this->resolveValue($value, $context);
+        $context->codePrinter->output(
+            'zephir_update_static_property_ce(' . $classEntry . ', ZEND_STRL("' . $property . '"), ' . $value . ');'
         );
     }
 
-    public function checkConstructor(Variable $var, CompilationContext $context): void
-    {
-        $context->codePrinter->output('if (zephir_has_constructor('.$this->getVariableCode($var).')) {');
-    }
-
-    public function callDynamicFunction($symbolVariable, Variable $variable, CompilationContext $context, $params = [], $cache = 'NULL', $cacheSlot = 0): void
-    {
-        $paramStr = null != $params ? ', '.implode(', ', $params) : '';
-        if (!isset($symbolVariable)) {
-            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION(NULL, '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
-        } elseif ('return_value' == $symbolVariable->getName()) {
-            $context->codePrinter->output('ZEPHIR_RETURN_CALL_ZVAL_FUNCTION('.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
-        } else {
-            $context->codePrinter->output('ZEPHIR_CALL_ZVAL_FUNCTION('.$this->getVariableCode($symbolVariable).', '.$this->getVariableCode($variable).', '.$cache.', '.$cacheSlot.$paramStr.');');
-        }
-    }
-
-    public function zvalOperator($zvalOperator, Variable $expected, Variable $variableLeft, Variable $variableRight, CompilationContext $compilationContext): void
-    {
+    public function zvalOperator(
+        $zvalOperator,
+        Variable $expected,
+        Variable $variableLeft,
+        Variable $variableRight,
+        CompilationContext $compilationContext
+    ): void {
         $expected = $this->getVariableCode($expected);
-        $op1 = $this->getVariableCode($variableLeft);
-        $op2 = $this->getVariableCode($variableRight);
-
-        $compilationContext->codePrinter->output($zvalOperator.'('.$expected.', '.$op1.', '.$op2.');');
-    }
-
-    public function checkStrictType($type, $var, CompilationContext $context): void
-    {
-        $codePrinter = $context->codePrinter;
-        $conditions = [];
-
-        $inputParamVariable = $context->symbolTable->getVariableForWrite($var['name'], $context);
-        $inputParamCode = $this->getVariableCode($inputParamVariable);
-        $cond = 'Z_TYPE_P('.$inputParamCode.') != ';
-        if ($context->symbolTable->hasVariable($var['name'].'_param')) {
-            $parameterVariable = $context->symbolTable->getVariableForWrite($var['name'].'_param', $context);
-            $parameterCode = $context->backend->getVariableCode($parameterVariable);
-            $cond = 'Z_TYPE_P('.$parameterCode.') != ';
-        }
-
-        switch ($type) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $conditions[] = $cond.'IS_LONG';
-                break;
-            case 'bool':
-                $conditions[] = $cond.'IS_TRUE';
-                $conditions[] = $cond.'IS_FALSE';
-                break;
-            case 'double':
-                $conditions[] = $cond.'IS_DOUBLE';
-                break;
-            case 'string':
-            case 'ulong':
-                $conditions[] = $cond.'IS_STRING';
-                $conditions[] = $cond.'IS_NULL';
-                break;
-            case 'array':
-                break;
-            case 'object':
-            case 'resource':
-                $conditions[] = $cond.'IS_'.strtoupper($type);
-                break;
-            case 'callable':
-                $conditions[] = 'zephir_is_callable('.$inputParamCode.') != 1';
-                break;
-            default:
-                throw new CompilerException('Unknown type '.$type);
-        }
-
-        /* Generate verification code */
-        if (\count($conditions)) {
-            $codePrinter->output('if (UNEXPECTED('.implode(' && ', $conditions).')) {');
-            $codePrinter->increaseLevel();
-
-            $exceptionMessage = sprintf('SL("Parameter \'%s\' must be of the type %s")', $var['name'], $type);
-            $codePrinter->output(
-                sprintf(
-                    'zephir_throw_exception_string(spl_ce_InvalidArgumentException, %s);',
-                    $exceptionMessage
-                )
-            );
-
-            $codePrinter->output('RETURN_MM_NULL();');
-            $codePrinter->decreaseLevel();
-            $codePrinter->output('}');
-        }
+        $op1      = $this->getVariableCode($variableLeft);
+        $op2      = $this->getVariableCode($variableRight);
 
-        /* Assign param */
-        switch ($type) {
-            case 'int':
-            case 'long':
-                $codePrinter->output($var['name'].' = Z_LVAL_P('.$parameterCode.');');
-                break;
-            case 'uint':
-                $codePrinter->output($var['name'].' = ZEND_ABS(Z_LVAL_P('.$parameterCode.'));');
-                break;
-            case 'bool':
-                $codePrinter->output($var['name'].' = '.$this->getBoolCode($parameterVariable, $context, false).';');
-                break;
-            case 'double':
-                $codePrinter->output($var['name'].' = Z_DVAL_P('.$parameterCode.');');
-                break;
-            case 'string':
-            case 'ulong':
-                $context->headersManager->add('kernel/operators');
-                $context->symbolTable->mustGrownStack(true);
-                $codePrinter->output('if (EXPECTED(Z_TYPE_P('.$parameterCode.') == IS_STRING)) {');
-                $codePrinter->increaseLevel();
-                $targetVar = $var['name'];
-                $targetVar = '&'.$targetVar;
-                $codePrinter->output('zephir_get_strval('.$targetVar.', '.$var['name'].'_param);');
-                $codePrinter->decreaseLevel();
-                $codePrinter->output('} else {');
-                $codePrinter->increaseLevel();
-                $this->initVar($inputParamVariable, $context);
-                $codePrinter->decreaseLevel();
-                $codePrinter->output('}');
-                break;
-            case 'array':
-                $context->backend->assignZval($inputParamVariable, $parameterVariable, $context);
-                break;
-            case 'object':
-            case 'resource':
-            case 'callable':
-            case 'mixed':
-                break;
-            default:
-                throw new CompilerException('Unknown type: '.$type);
-        }
+        $compilationContext->codePrinter->output($zvalOperator . '(' . $expected . ', ' . $op1 . ', ' . $op2 . ');');
     }
 
     /**
@@ -1594,10 +1990,10 @@ protected function assignHelper(
         if ($value instanceof Variable) {
             $value = $value->getName();
         } else {
-            $value = 'ZVAL_STRING' === $macro ? '"'.$value.'"' : $value;
+            $value = 'ZVAL_STRING' === $macro ? '"' . $value . '"' : $value;
         }
 
-        $output = $macro.'('.$variableName.', '.$value.');';
+        $output = $macro . '(' . $variableName . ', ' . $value . ');';
         if ($useCodePrinter) {
             $context->codePrinter->output($output);
         }
@@ -1605,12 +2001,17 @@ protected function assignHelper(
         return $output;
     }
 
-    protected function returnHelper(string $macro, $value, CompilationContext $context, $useCodePrinter, $doCopy = null): string
-    {
+    protected function returnHelper(
+        string $macro,
+        $value,
+        CompilationContext $context,
+        $useCodePrinter,
+        $doCopy = null
+    ): string {
         if ($value instanceof Variable) {
             $value = $value->getName();
         } elseif ($macro === 'RETURN_MM_STRING' && !str_starts_with($value, 'ZEPHIR_GLOBAL')) {
-            $value = '"'.$value.'"';
+            $value = '"' . $value . '"';
         }
 
         $copyStr = '';
@@ -1619,10 +2020,10 @@ protected function returnHelper(string $macro, $value, CompilationContext $conte
         } elseif (false === $doCopy) {
             $copyStr = ', 0';
         } elseif (isset($doCopy)) {
-            $copyStr = ', '.$doCopy;
+            $copyStr = ', ' . $doCopy;
         }
 
-        $output = $macro.'('.$value.$copyStr.');';
+        $output = $macro . '(' . $value . $copyStr . ');';
         if ($useCodePrinter) {
             $context->codePrinter->output($output);
         }
@@ -1642,8 +2043,8 @@ protected function returnHelper(string $macro, $value, CompilationContext $conte
      */
     private function resolveOffsetExprs(array $offsetExprs, CompilationContext $compilationContext): array
     {
-        $keys = '';
-        $offsetItems = [];
+        $keys         = '';
+        $offsetItems  = [];
         $numberParams = 0;
 
         foreach ($offsetExprs as $offsetExpr) {
@@ -1658,15 +2059,15 @@ private function resolveOffsetExprs(array $offsetExprs, CompilationContext $comp
                 case 'uint':
                 case 'long':
                 case 'ulong':
-                    $keys .= 'l';
+                    $keys          .= 'l';
                     $offsetItems[] = $offsetExpr->getCode();
                     ++$numberParams;
                     break;
 
                 case 'string':
-                    $keys .= 's';
-                    $offsetItems[] = 'SL("'.$offsetExpr->getCode().'")';
-                    $numberParams += 2;
+                    $keys          .= 's';
+                    $offsetItems[] = 'SL("' . $offsetExpr->getCode() . '")';
+                    $numberParams  += 2;
                     break;
 
                 case 'variable':
@@ -1680,13 +2081,13 @@ private function resolveOffsetExprs(array $offsetExprs, CompilationContext $comp
                         case 'uint':
                         case 'long':
                         case 'ulong':
-                            $keys .= 'l';
+                            $keys          .= 'l';
                             $offsetItems[] = $this->getVariableCode($variableIndex);
                             ++$numberParams;
                             break;
                         case 'string':
                         case 'variable':
-                            $keys .= 'z';
+                            $keys          .= 'z';
                             $offsetItems[] = $this->getVariableCode($variableIndex);
                             ++$numberParams;
                             break;
diff --git a/src/Backend/FcallManager.php b/src/Backend/FcallManager.php
index b6ee89b715..8283db4b24 100644
--- a/src/Backend/FcallManager.php
+++ b/src/Backend/FcallManager.php
@@ -16,38 +16,14 @@
 use Zephir\Code\Printer;
 use Zephir\FileSystem\HardDisk;
 
+use function implode;
+use function ksort;
+use function sprintf;
+
 class FcallManager implements FcallManagerInterface
 {
     protected array $requiredMacros = [];
 
-    /**
-     * @param bool $static
-     * @param int  $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
-     * @param int  $paramCount
-     *
-     * @return string
-     */
-    public function getMacro(bool $static, int $doReturn, int $paramCount): string
-    {
-        $scope = $static ? 'STATIC' : '';
-        $mode = 'CALL_INTERNAL_METHOD_NORETURN_P';
-
-        if ($doReturn) {
-            $mode = 'RETURN_CALL_INTERNAL_METHOD_P';
-            if (2 === $doReturn) {
-                $mode = 'CALL_INTERNAL_METHOD_P';
-            }
-        }
-
-        $macroName = 'ZEPHIR_'.($scope ? $scope.'_' : '').$mode.$paramCount;
-
-        if (!isset($this->requiredMacros[$macroName])) {
-            $this->requiredMacros[$macroName] = [$scope, $mode, $paramCount];
-        }
-
-        return $macroName;
-    }
-
     public function genFcallCode(): void
     {
         $codePrinter = new Printer();
@@ -67,29 +43,29 @@ public function genFcallCode(): void
         ksort($this->requiredMacros);
         foreach ($this->requiredMacros as $name => $info) {
             [$scope, $mode, $paramCount] = $info;
-            $paramsStr = '';
-            $retParam = '';
-            $retValueUsed = '0';
-            $params = [];
-            $zvals = [];
+            $paramsStr      = '';
+            $retParam       = '';
+            $retValueUsed   = '0';
+            $params         = [];
+            $zvals          = [];
             $initStatements = [];
             $postStatements = [];
 
             for ($i = 0; $i < $paramCount; ++$i) {
-                $params[] = 'p'.$i;
+                $params[] = 'p' . $i;
             }
             if ($paramCount) {
-                $paramsStr = ', '.implode(', ', $params);
+                $paramsStr = ', ' . implode(', ', $params);
             }
 
             if ('CALL_INTERNAL_METHOD_P' == $mode) {
-                $retValueUsed = '1';
-                $retParam = 'return_value_ptr';
+                $retValueUsed     = '1';
+                $retParam         = 'return_value_ptr';
                 $initStatements[] = 'ZEPHIR_INIT_NVAR((return_value_ptr)); \\';
             }
-            $objParam = $scope ? 'scope_ce, ' : 'object, ';
-            $macroName = $name.'('.($retParam ? $retParam.', ' : '').$objParam.'method'.$paramsStr.')';
-            $codePrinter->output('#define '.$macroName.' \\');
+            $objParam  = $scope ? 'scope_ce, ' : 'object, ';
+            $macroName = $name . '(' . ($retParam ? $retParam . ', ' : '') . $objParam . 'method' . $paramsStr . ')';
+            $codePrinter->output('#define ' . $macroName . ' \\');
             if (!$retParam) {
                 $retParam = 'return_value';
             }
@@ -107,7 +83,9 @@ public function genFcallCode(): void
             $codePrinter->output('ZEPHIR_BACKUP_SCOPE(); \\');
             if (!$scope) {
                 $codePrinter->output('ZEPHIR_SET_THIS(object); \\');
-                $codePrinter->output('ZEPHIR_SET_SCOPE((Z_OBJ_P(object) ? Z_OBJCE_P(object) : NULL), (Z_OBJ_P(object) ? Z_OBJCE_P(object) : NULL)); \\');
+                $codePrinter->output(
+                    'ZEPHIR_SET_SCOPE((Z_OBJ_P(object) ? Z_OBJCE_P(object) : NULL), (Z_OBJ_P(object) ? Z_OBJCE_P(object) : NULL)); \\'
+                );
             } else {
                 $codePrinter->output('ZEPHIR_SET_THIS_EXPLICIT_NULL(); \\');
                 $codePrinter->output('ZEPHIR_SET_SCOPE(scope_ce, scope_ce); \\');
@@ -115,13 +93,13 @@ public function genFcallCode(): void
 
             /* Create new zval's for parameters */
             for ($i = 0; $i < $paramCount; ++$i) {
-                $zv = '_'.$params[$i];
-                $zvals[] = $zv;
-                $initStatements[] = 'ZVAL_COPY(&'.$zv.', '.$params[$i].'); \\';
-                $postStatements[] = 'Z_TRY_DELREF_P('.$params[$i].'); \\';
+                $zv               = '_' . $params[$i];
+                $zvals[]          = $zv;
+                $initStatements[] = 'ZVAL_COPY(&' . $zv . ', ' . $params[$i] . '); \\';
+                $postStatements[] = 'Z_TRY_DELREF_P(' . $params[$i] . '); \\';
             }
             if ($i) {
-                $codePrinter->output('zval '.implode(', ', $zvals).'; \\');
+                $codePrinter->output('zval ' . implode(', ', $zvals) . '; \\');
             }
             foreach ($initStatements as $statement) {
                 $codePrinter->output($statement);
@@ -133,7 +111,7 @@ public function genFcallCode(): void
                     $retParam,
                     $scope ? 'NULL, ' : $objParam,
                     $retValueUsed,
-                    $i ? ', &'.implode(', &', $zvals) : ''
+                    $i ? ', &' . implode(', &', $zvals) : ''
                 )
             );
 
@@ -157,4 +135,32 @@ public function genFcallCode(): void
         $codePrinter->output('#endif');
         HardDisk::persistByHash($codePrinter->getOutput(), 'ext/kernel/fcall_internal.h');
     }
+
+    /**
+     * @param bool $static
+     * @param int  $doReturn tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
+     * @param int  $paramCount
+     *
+     * @return string
+     */
+    public function getMacro(bool $static, int $doReturn, int $paramCount): string
+    {
+        $scope = $static ? 'STATIC' : '';
+        $mode  = 'CALL_INTERNAL_METHOD_NORETURN_P';
+
+        if ($doReturn) {
+            $mode = 'RETURN_CALL_INTERNAL_METHOD_P';
+            if (2 === $doReturn) {
+                $mode = 'CALL_INTERNAL_METHOD_P';
+            }
+        }
+
+        $macroName = 'ZEPHIR_' . ($scope ? $scope . '_' : '') . $mode . $paramCount;
+
+        if (!isset($this->requiredMacros[$macroName])) {
+            $this->requiredMacros[$macroName] = [$scope, $mode, $paramCount];
+        }
+
+        return $macroName;
+    }
 }
diff --git a/src/Backend/FcallManagerInterface.php b/src/Backend/FcallManagerInterface.php
index 6c6b478470..8b7751461b 100644
--- a/src/Backend/FcallManagerInterface.php
+++ b/src/Backend/FcallManagerInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,20 +9,22 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Backend;
 
 interface FcallManagerInterface
 {
+    public function genFcallCode(): void;
+
     /**
      * Resolve internal fcall attributes to a suitable macro and ensure that it's generated during compilation.
      *
      * @param bool $static
-     * @param int  $doReturn   tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
+     * @param int  $doReturn tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
      * @param int  $paramCount
      *
      * @return string
      */
     public function getMacro(bool $static, int $doReturn, int $paramCount): string;
-
-    public function genFcallCode(): void;
 }
diff --git a/src/Backend/StringsManager.php b/src/Backend/StringsManager.php
index 189ca84d0e..1877d7dee9 100644
--- a/src/Backend/StringsManager.php
+++ b/src/Backend/StringsManager.php
@@ -16,6 +16,16 @@
 use Zephir\FileSystem\HardDisk;
 use Zephir\StringsManager as BaseStringsManager;
 
+use function count;
+use function implode;
+use function ksort;
+use function strlen;
+use function strtoupper;
+use function substr;
+
+use const PHP_EOL;
+use const SORT_STRING;
+
 /**
  * Manages the concatenation keys for the extension and the interned strings
  */
@@ -34,7 +44,7 @@ public function addConcatKey(string $key): void
      */
     public function genConcatCode(): void
     {
-        $code = '
+        $code   = '
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -44,7 +54,7 @@ public function genConcatCode(): void
 #include "ext.h"
 #include "kernel/main.h"
 #include "kernel/memory.h"
-#include "kernel/concat.h"'.PHP_EOL.PHP_EOL;
+#include "kernel/concat.h"' . PHP_EOL . PHP_EOL;
         $pcodeh = '
 #ifndef ZEPHIR_KERNEL_CONCAT_H
 #define ZEPHIR_KERNEL_CONCAT_H
@@ -52,110 +62,139 @@ public function genConcatCode(): void
 #include <Zend/zend.h>
 #include "kernel/main.h"
 ';
-        $codeh = '';
+        $codeh  = '';
 
         $macros = [];
         ksort($this->concatKeys, SORT_STRING);
         foreach ($this->concatKeys as $key => $one) {
-            $len = \strlen($key);
-            $params = [];
+            $len      = strlen($key);
+            $params   = [];
             $zvalCopy = [];
-            $useCopy = [];
-            $avars = [];
-            $zvars = [];
-            $lengths = [];
-            $sparams = [];
-            $lparams = [];
+            $useCopy  = [];
+            $avars    = [];
+            $zvars    = [];
+            $lengths  = [];
+            $sparams  = [];
+            $lparams  = [];
             for ($i = 0; $i < $len; ++$i) {
-                $n = $i + 1;
-                $t = substr($key, $i, 1);
-                $sparams[] = 'op'.$n;
+                $n         = $i + 1;
+                $t         = substr($key, $i, 1);
+                $sparams[] = 'op' . $n;
                 if ('s' == $t) {
-                    $params[] = 'const char *op'.$n.', uint32_t op'.$n.'_len';
-                    $lparams[] = 'op'.$n.', sizeof(op'.$n.')-1';
-                    $lengths[] = 'op'.$n.'_len';
+                    $params[]  = 'const char *op' . $n . ', uint32_t op' . $n . '_len';
+                    $lparams[] = 'op' . $n . ', sizeof(op' . $n . ')-1';
+                    $lengths[] = 'op' . $n . '_len';
                     $avars[$n] = 's';
                 } else {
-                    $params[] = 'zval *op'.$n;
-                    $lparams[] = 'op'.$n;
-                    $zvalCopy[] = 'op'.$n.'_copy';
-                    $useCopy[] = 'use_copy'.$n.' = 0';
-                    $lengths[] = 'Z_STRLEN_P(op'.$n.')';
-                    $zvars[] = $n;
-                    $avars[$n] = 'v';
+                    $params[]   = 'zval *op' . $n;
+                    $lparams[]  = 'op' . $n;
+                    $zvalCopy[] = 'op' . $n . '_copy';
+                    $useCopy[]  = 'use_copy' . $n . ' = 0';
+                    $lengths[]  = 'Z_STRLEN_P(op' . $n . ')';
+                    $zvars[]    = $n;
+                    $avars[$n]  = 'v';
                 }
             }
 
-            $macros[] = '#define ZEPHIR_CONCAT_'.strtoupper($key).'(result, '.implode(', ', $sparams).') \\'.PHP_EOL."\t".' zephir_concat_'.$key.'(result, '.implode(', ', $lparams).', 0);';
-            $macros[] = '#define ZEPHIR_SCONCAT_'.strtoupper($key).'(result, '.implode(', ', $sparams).') \\'.PHP_EOL."\t".' zephir_concat_'.$key.'(result, '.implode(', ', $lparams).', 1);';
+            $macros[] = '#define ZEPHIR_CONCAT_'
+                . strtoupper($key)
+                . '(result, '
+                . implode(', ', $sparams)
+                . ') \\'
+                . PHP_EOL
+                . "\t"
+                . ' zephir_concat_'
+                . $key
+                . '(result, '
+                . implode(', ', $lparams)
+                . ', 0);'
+            ;
+            $macros[] = '#define ZEPHIR_SCONCAT_'
+                . strtoupper($key)
+                . '(result, '
+                . implode(', ', $sparams)
+                . ') \\'
+                . PHP_EOL
+                . "\t"
+                . ' zephir_concat_'
+                . $key
+                . '(result, '
+                . implode(', ', $lparams)
+                . ', 1);'
+            ;
             $macros[] = '';
 
-            $proto = 'void zephir_concat_'.$key.'(zval *result, '.implode(', ', $params).', int self_var)';
+            $proto = 'void zephir_concat_'
+                . $key
+                . '(zval *result, '
+                . implode(', ', $params)
+                . ', int self_var)'
+            ;
 
-            $codeh .= $proto.';'.PHP_EOL;
+            $codeh .= $proto . ';' . PHP_EOL;
 
-            $code .= $proto.'{'.PHP_EOL.PHP_EOL;
+            $code .= $proto . '{' . PHP_EOL . PHP_EOL;
 
-            if (\count($zvalCopy)) {
-                $code .= "\t".'zval result_copy, '.implode(', ', $zvalCopy).';'.PHP_EOL;
-                $code .= "\t".'int use_copy = 0, '.implode(', ', $useCopy).';'.PHP_EOL;
+            if (count($zvalCopy)) {
+                $code .= "\t" . 'zval result_copy, ' . implode(', ', $zvalCopy) . ';' . PHP_EOL;
+                $code .= "\t" . 'int use_copy = 0, ' . implode(', ', $useCopy) . ';' . PHP_EOL;
             } else {
-                $code .= "\t".'zval result_copy;'.PHP_EOL;
-                $code .= "\t".'int use_copy = 0;'.PHP_EOL;
+                $code .= "\t" . 'zval result_copy;' . PHP_EOL;
+                $code .= "\t" . 'int use_copy = 0;' . PHP_EOL;
             }
-            $code .= "\t".'size_t offset = 0, length;'.PHP_EOL.PHP_EOL;
+            $code .= "\t" . 'size_t offset = 0, length;' . PHP_EOL . PHP_EOL;
 
             foreach ($zvars as $zvar) {
-                $code .= "\t".'if (Z_TYPE_P(op'.$zvar.') != IS_STRING) {'.PHP_EOL;
-                $code .= "\t".'   use_copy'.$zvar.' = zend_make_printable_zval(op'.$zvar.', &op'.$zvar.'_copy);'.PHP_EOL;
-                $code .= "\t".'   if (use_copy'.$zvar.') {'.PHP_EOL;
-                $code .= "\t".'       op'.$zvar.' = &op'.$zvar.'_copy;'.PHP_EOL;
-                $code .= "\t".'   }'.PHP_EOL;
-                $code .= "\t".'}'.PHP_EOL.PHP_EOL;
+                $code .= "\t" . 'if (Z_TYPE_P(op' . $zvar . ') != IS_STRING) {' . PHP_EOL;
+                $code .= "\t" . '   use_copy' . $zvar . ' = zend_make_printable_zval(op' . $zvar . ', &op' . $zvar . '_copy);' . PHP_EOL;
+                $code .= "\t" . '   if (use_copy' . $zvar . ') {' . PHP_EOL;
+                $code .= "\t" . '       op' . $zvar . ' = &op' . $zvar . '_copy;' . PHP_EOL;
+                $code .= "\t" . '   }' . PHP_EOL;
+                $code .= "\t" . '}' . PHP_EOL . PHP_EOL;
             }
 
-            $code .= "\t".'length = '.implode(' + ', $lengths).';'.PHP_EOL;
-            $code .= "\t".'if (self_var) {'.PHP_EOL;
+            $code .= "\t" . 'length = ' . implode(' + ', $lengths) . ';' . PHP_EOL;
+            $code .= "\t" . 'if (self_var) {' . PHP_EOL;
             $code .= PHP_EOL;
-            $code .= "\t\t".'if (Z_TYPE_P(result) != IS_STRING) {'.PHP_EOL;
-            $code .= "\t\t\t".'use_copy = zend_make_printable_zval(result, &result_copy);'.PHP_EOL;
-            $code .= "\t\t\t".'if (use_copy) {'.PHP_EOL;
-            $code .= "\t\t\t\t".'ZEPHIR_CPY_WRT_CTOR(result, (&result_copy));'.PHP_EOL;
-            $code .= "\t\t\t".'}'.PHP_EOL;
-            $code .= "\t\t".'}'.PHP_EOL.PHP_EOL;
-            $code .= "\t\t".'offset = Z_STRLEN_P(result);'.PHP_EOL;
-            $code .= "\t\t".'length += offset;'.PHP_EOL;
-            $code .= "\t\t".'Z_STR_P(result) = zend_string_realloc(Z_STR_P(result), length, 0);'.PHP_EOL;
+            $code .= "\t\t" . 'if (Z_TYPE_P(result) != IS_STRING) {' . PHP_EOL;
+            $code .= "\t\t\t" . 'use_copy = zend_make_printable_zval(result, &result_copy);' . PHP_EOL;
+            $code .= "\t\t\t" . 'if (use_copy) {' . PHP_EOL;
+            $code .= "\t\t\t\t" . 'ZEPHIR_CPY_WRT_CTOR(result, (&result_copy));' . PHP_EOL;
+            $code .= "\t\t\t" . '}' . PHP_EOL;
+            $code .= "\t\t" . '}' . PHP_EOL . PHP_EOL;
+            $code .= "\t\t" . 'offset = Z_STRLEN_P(result);' . PHP_EOL;
+            $code .= "\t\t" . 'length += offset;' . PHP_EOL;
+            $code .= "\t\t" . 'Z_STR_P(result) = zend_string_realloc(Z_STR_P(result), length, 0);' . PHP_EOL;
             $code .= PHP_EOL;
-            $code .= "\t".'} else {'.PHP_EOL;
-            $code .= "\t\t".'ZVAL_STR(result, zend_string_alloc(length, 0));'.PHP_EOL;
-            $code .= "\t".'}'.PHP_EOL.PHP_EOL;
+            $code .= "\t" . '} else {' . PHP_EOL;
+            $code .= "\t\t" . 'ZVAL_STR(result, zend_string_alloc(length, 0));' . PHP_EOL;
+            $code .= "\t" . '}' . PHP_EOL . PHP_EOL;
 
             $position = '';
             foreach ($avars as $n => $type) {
                 if ('s' == $type) {
-                    $code .= "\t".'memcpy(Z_STRVAL_P(result) + offset'.$position.', op'.$n.', op'.$n.'_len);'.PHP_EOL;
-                    $position .= ' + op'.$n.'_len';
+                    $code     .= "\t" . 'memcpy(Z_STRVAL_P(result) + offset' . $position . ', op' . $n . ', op' . $n . '_len);' . PHP_EOL;
+                    $position .= ' + op' . $n . '_len';
                 } else {
-                    $code .= "\t".'memcpy(Z_STRVAL_P(result) + offset'.$position.', Z_STRVAL_P(op'.$n.'), Z_STRLEN_P(op'.$n.'));'.PHP_EOL;
-                    $position .= ' + Z_STRLEN_P(op'.$n.')';
+                    $code     .= "\t" . 'memcpy(Z_STRVAL_P(result) + offset' . $position . ', Z_STRVAL_P(op' . $n . '), Z_STRLEN_P(op' . $n . '));' . PHP_EOL;
+                    $position .= ' + Z_STRLEN_P(op' . $n . ')';
                 }
             }
 
-            $code .= "\t".'Z_STRVAL_P(result)[length] = 0;'.PHP_EOL;
-            $code .= "\t".'zend_string_forget_hash_val(Z_STR_P(result));'.PHP_EOL;
+            $code .= "\t" . 'Z_STRVAL_P(result)[length] = 0;' . PHP_EOL;
+            $code .= "\t" . 'zend_string_forget_hash_val(Z_STR_P(result));' . PHP_EOL;
 
             foreach ($zvars as $zvar) {
-                $code .= "\t".'if (use_copy'.$zvar.') {'.PHP_EOL;
-                $code .= "\t".'   zval_dtor(op'.$zvar.');'.PHP_EOL;
-                $code .= "\t".'}'.PHP_EOL.PHP_EOL;
+                $code .= "\t" . 'if (use_copy' . $zvar . ') {' . PHP_EOL;
+                $code .= "\t" . '   zval_dtor(op' . $zvar . ');' . PHP_EOL;
+                $code .= "\t" . '}' . PHP_EOL . PHP_EOL;
             }
 
-            $code .= "\t".'if (use_copy) {'.PHP_EOL;
-            $code .= "\t".'   zval_dtor(&result_copy);'.PHP_EOL;
-            $code .= "\t".'}'.PHP_EOL.PHP_EOL;
+            $code .= "\t" . 'if (use_copy) {' . PHP_EOL;
+            $code .= "\t" . '   zval_dtor(&result_copy);' . PHP_EOL;
+            $code .= "\t" . '}' . PHP_EOL . PHP_EOL;
 
-            $code .= '}'.PHP_EOL.PHP_EOL;
+            $code .= '}' . PHP_EOL . PHP_EOL;
         }
 
         $code .= <<<EOF
@@ -184,10 +223,10 @@ public function genConcatCode(): void
             }
             EOF;
 
-        $codeh .= 'void zephir_concat_function(zval *result, zval *op1, zval *op2);
+        $codeh    .= 'void zephir_concat_function(zval *result, zval *op1, zval *op2);
 #endif /* ZEPHIR_KERNEL_CONCAT_H */
 ';
-        $contents = $pcodeh.implode(PHP_EOL, $macros).PHP_EOL.PHP_EOL.$codeh;
+        $contents = $pcodeh . implode(PHP_EOL, $macros) . PHP_EOL . PHP_EOL . $codeh;
         HardDisk::persistByHash($contents, 'ext/kernel/concat.h');
         HardDisk::persistByHash($code, 'ext/kernel/concat.c');
     }
diff --git a/src/Backend/VariablesManager.php b/src/Backend/VariablesManager.php
index bd3817be47..876fa21286 100644
--- a/src/Backend/VariablesManager.php
+++ b/src/Backend/VariablesManager.php
@@ -18,6 +18,10 @@
 use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
+use function in_array;
+use function sprintf;
+use function strlen;
+use function substr;
 use function Zephir\Backend\ZendEngine3\add_slashes;
 
 class VariablesManager
@@ -57,6 +61,33 @@ public function initializeDefaults(Variable $variable, array $value, Context $co
         }
     }
 
+    /**
+     * Initialize 'array' variables with default values.
+     * Meant for VariablesManager::initializeDefaults.
+     *
+     * @param Variable $variable
+     * @param array    $value
+     * @param Context  $context
+     *
+     * @return void
+     */
+    private function initArrayVar(Variable $variable, array $value, Context $context): void
+    {
+        $context->symbolTable->mustGrownStack(true);
+        $context->backend->initVar($variable, $context);
+
+        switch ($value['type']) {
+            case Types::T_NULL:
+                $context->backend->assignNull($variable, $context);
+                break;
+
+            case Types::T_ARRAY:
+            case 'empty-array':
+                $context->backend->initArray($variable, $context);
+                break;
+        }
+    }
+
     /**
      * Initialize 'dynamic' variables with default values.
      * Meant for VariablesManager::initializeDefaults.
@@ -71,7 +102,7 @@ private function initDynamicVar(Variable $variable, array $value, Context $conte
     {
         /* These are system variables, do not add default values.
            Also see: https://github.com/zephir-lang/zephir/issues/1660 */
-        if (\in_array($variable->getName(), self::RESERVED_NAMES, true)) {
+        if (in_array($variable->getName(), self::RESERVED_NAMES, true)) {
             return;
         }
 
@@ -93,7 +124,7 @@ private function initDynamicVar(Variable $variable, array $value, Context $conte
             case Types::T_CHAR:
             case Types::T_UCHAR:
                 $this->validateCharValue($value);
-                $context->backend->assignLong($variable, "'".$value['value']."'", $context);
+                $context->backend->assignLong($variable, "'" . $value['value'] . "'", $context);
                 break;
 
             case Types::T_NULL:
@@ -143,33 +174,6 @@ private function initStringVar(Variable $variable, array $value, Context $contex
         }
     }
 
-    /**
-     * Initialize 'array' variables with default values.
-     * Meant for VariablesManager::initializeDefaults.
-     *
-     * @param Variable $variable
-     * @param array    $value
-     * @param Context  $context
-     *
-     * @return void
-     */
-    private function initArrayVar(Variable $variable, array $value, Context $context): void
-    {
-        $context->symbolTable->mustGrownStack(true);
-        $context->backend->initVar($variable, $context);
-
-        switch ($value['type']) {
-            case Types::T_NULL:
-                $context->backend->assignNull($variable, $context);
-                break;
-
-            case Types::T_ARRAY:
-            case 'empty-array':
-                $context->backend->initArray($variable, $context);
-                break;
-        }
-    }
-
     /**
      * Validate 'char' value type.
      *
@@ -181,12 +185,12 @@ private function initArrayVar(Variable $variable, array $value, Context $context
      */
     private function validateCharValue(array $value): void
     {
-        if (\strlen($value['value']) > 2) {
+        if (strlen($value['value']) > 2) {
             throw new Exception(
                 sprintf(
                     "Invalid char literal: '%s%s'",
                     substr($value['value'], 0, 10),
-                    \strlen($value['value']) > 10 ? '...' : ''
+                    strlen($value['value']) > 10 ? '...' : ''
                 ),
                 $value
             );
diff --git a/src/Branch.php b/src/Branch.php
index 2583a30687..7c6e93e26e 100644
--- a/src/Branch.php
+++ b/src/Branch.php
@@ -20,34 +20,31 @@
  */
 class Branch
 {
-    public const TYPE_ROOT = 0;
-    public const TYPE_CONDITIONAL_TRUE = 1;
     public const TYPE_CONDITIONAL_FALSE = 2;
-    public const TYPE_LOOP_INFINITE = 3;
-    public const TYPE_LOOP_CONDITIONAL = 4;
-    public const TYPE_SWITCH = 5;
-    public const TYPE_EXTERNAL = 6;
-    public const TYPE_UNKNOWN = 7;
-
-    protected int $level = -1;
-    protected int $type = self::TYPE_ROOT;
-    protected ?bool $unreachable = null;
-    protected ?Branch $parentBranch = null;
+    public const TYPE_CONDITIONAL_TRUE  = 1;
+    public const TYPE_EXTERNAL          = 6;
+    public const TYPE_LOOP_CONDITIONAL  = 4;
+    public const TYPE_LOOP_INFINITE     = 3;
+    public const TYPE_ROOT              = 0;
+    public const TYPE_SWITCH            = 5;
+    public const TYPE_UNKNOWN           = 7;
+
+    protected int                $level            = -1;
+    protected ?Branch            $parentBranch     = null;
     protected ?StatementAbstract $relatedStatement = null;
-
+    protected int                $type             = self::TYPE_ROOT;
+    protected ?bool              $unreachable      = null;
     /**
      * @var mixed
      */
     private $uniqueId;
 
     /**
-     * Set the branch's parent.
-     *
-     * @param Branch $parentBranch
+     * @return int
      */
-    public function setParentBranch(self $parentBranch): void
+    public function getLevel(): int
     {
-        $this->parentBranch = $parentBranch;
+        return $this->level;
     }
 
     /**
@@ -61,13 +58,11 @@ public function getParentBranch(): ?self
     }
 
     /**
-     * Set the type of branch. One of the TYPE_* constants.
-     *
-     * @param int $type
+     * @return StatementAbstract|null
      */
-    public function setType(int $type): void
+    public function getRelatedStatement(): ?StatementAbstract
     {
-        $this->type = $type;
+        return $this->relatedStatement;
     }
 
     /**
@@ -81,13 +76,11 @@ public function getType(): int
     }
 
     /**
-     * Sets if the branch is unreachable.
-     *
-     * @param bool|null $unreachable
+     * @return mixed
      */
-    public function setUnreachable(?bool $unreachable): void
+    public function getUniqueId()
     {
-        $this->unreachable = $unreachable;
+        return $this->uniqueId;
     }
 
     /**
@@ -107,42 +100,48 @@ public function setLevel(int $level): void
     }
 
     /**
-     * @return int
+     * Set the branch's parent.
+     *
+     * @param Branch $parentBranch
      */
-    public function getLevel(): int
+    public function setParentBranch(self $parentBranch): void
     {
-        return $this->level;
+        $this->parentBranch = $parentBranch;
     }
 
     /**
-     * @param $uniqueId
+     * @param StatementAbstract $relatedStatement
      */
-    public function setUniqueId($uniqueId): void
+    public function setRelatedStatement(StatementAbstract $relatedStatement): void
     {
-        $this->uniqueId = $uniqueId;
+        $this->relatedStatement = $relatedStatement;
     }
 
     /**
-     * @return mixed
+     * Set the type of branch. One of the TYPE_* constants.
+     *
+     * @param int $type
      */
-    public function getUniqueId()
+    public function setType(int $type): void
     {
-        return $this->uniqueId;
+        $this->type = $type;
     }
 
     /**
-     * @param StatementAbstract $relatedStatement
+     * @param $uniqueId
      */
-    public function setRelatedStatement(StatementAbstract $relatedStatement): void
+    public function setUniqueId($uniqueId): void
     {
-        $this->relatedStatement = $relatedStatement;
+        $this->uniqueId = $uniqueId;
     }
 
     /**
-     * @return StatementAbstract|null
+     * Sets if the branch is unreachable.
+     *
+     * @param bool|null $unreachable
      */
-    public function getRelatedStatement(): ?StatementAbstract
+    public function setUnreachable(?bool $unreachable): void
     {
-        return $this->relatedStatement;
+        $this->unreachable = $unreachable;
     }
 }
diff --git a/src/BranchManager.php b/src/BranchManager.php
index f5fd84ce9e..70108e38b2 100644
--- a/src/BranchManager.php
+++ b/src/BranchManager.php
@@ -20,11 +20,9 @@ class BranchManager
 {
     protected ?Branch $currentBranch = null;
 
-    protected int $level = 0;
-
-    protected int $uniqueId = 1;
-
+    protected int     $level    = 0;
     protected ?Branch $rootBranch;
+    protected int     $uniqueId = 1;
 
     /**
      * Sets the current active branch in the manager.
@@ -50,18 +48,6 @@ public function addBranch(Branch $branch): void
         }
     }
 
-    /**
-     * Removes a branch from the branch manager.
-     *
-     * @param Branch $branch
-     */
-    public function removeBranch(Branch $branch): void
-    {
-        $parentBranch = $branch->getParentBranch();
-        $this->currentBranch = $parentBranch;
-        --$this->level;
-    }
-
     /**
      * Returns the active branch in the manager.
      *
@@ -77,6 +63,18 @@ public function getCurrentBranchId()
         return $this->currentBranch->getUniqueId();
     }
 
+    /**
+     * Removes a branch from the branch manager.
+     *
+     * @param Branch $branch
+     */
+    public function removeBranch(Branch $branch): void
+    {
+        $parentBranch        = $branch->getParentBranch();
+        $this->currentBranch = $parentBranch;
+        --$this->level;
+    }
+
     public function setRootBranch(Branch $branch): void
     {
         $this->rootBranch = $branch;
diff --git a/src/Builder/FunctionCallBuilder.php b/src/Builder/FunctionCallBuilder.php
index 3cad886d9b..bd964258b7 100644
--- a/src/Builder/FunctionCallBuilder.php
+++ b/src/Builder/FunctionCallBuilder.php
@@ -31,13 +31,13 @@ public function __construct(
     public function get(): array
     {
         return [
-            'type' => 'fcall',
-            'name' => $this->name,
-            'call-type' => $this->type,
+            'type'       => 'fcall',
+            'name'       => $this->name,
+            'call-type'  => $this->type,
             'parameters' => $this->parameters,
-            'file' => $this->file,
-            'line' => $this->line,
-            'char' => $this->char,
+            'file'       => $this->file,
+            'line'       => $this->line,
+            'char'       => $this->char,
         ];
     }
 }
diff --git a/src/Builder/Operators/AbstractOperatorBuilder.php b/src/Builder/Operators/AbstractOperatorBuilder.php
index 99a63335be..5f9226088f 100644
--- a/src/Builder/Operators/AbstractOperatorBuilder.php
+++ b/src/Builder/Operators/AbstractOperatorBuilder.php
@@ -18,12 +18,12 @@
  */
 abstract class AbstractOperatorBuilder
 {
+    protected int $char = 0;
+
     protected ?string $file = null;
 
     protected int $line = 0;
 
-    protected int $char = 0;
-
     /**
      * Returns a builder definition.
      */
diff --git a/src/Builder/Operators/CastOperatorBuilder.php b/src/Builder/Operators/CastOperatorBuilder.php
index e211bca3e0..97386a1d6c 100644
--- a/src/Builder/Operators/CastOperatorBuilder.php
+++ b/src/Builder/Operators/CastOperatorBuilder.php
@@ -31,22 +31,22 @@ public function __construct(
         int $line = 0,
         int $char = 0
     ) {
-        $this->leftOperand = $left;
+        $this->leftOperand  = $left;
         $this->rightOperand = $right;
-        $this->file = $file;
-        $this->line = $line;
-        $this->char = $char;
+        $this->file         = $file;
+        $this->line         = $line;
+        $this->char         = $char;
     }
 
     public function get(): array
     {
         return [
-            'type' => 'cast',
-            'left' => $this->leftOperand,
+            'type'  => 'cast',
+            'left'  => $this->leftOperand,
             'right' => $this->rightOperand->get(),
-            'file' => $this->file,
-            'line' => $this->line,
-            'char' => $this->char,
+            'file'  => $this->file,
+            'line'  => $this->line,
+            'char'  => $this->char,
         ];
     }
 }
diff --git a/src/Builder/Operators/UnaryOperatorBuilder.php b/src/Builder/Operators/UnaryOperatorBuilder.php
index 82e5106a17..48247e27af 100644
--- a/src/Builder/Operators/UnaryOperatorBuilder.php
+++ b/src/Builder/Operators/UnaryOperatorBuilder.php
@@ -13,35 +13,37 @@
 
 namespace Zephir\Builder\Operators;
 
+use function is_object;
+use function method_exists;
+
 /**
  * Allows to manually build a unary operator AST node
  */
 class UnaryOperatorBuilder extends AbstractOperatorBuilder
 {
-    /**
-     * Operator name
-     */
-    protected string $operator;
-
     /**
      * Left Expression
      *
      * @var mixed
      */
     protected $leftExpression;
+    /**
+     * Operator name
+     */
+    protected string $operator;
 
     public function __construct(string $operator, $leftExpression, string $file = null, int $line = 0, int $char = 0)
     {
-        $this->operator = $operator;
+        $this->operator       = $operator;
         $this->leftExpression = $leftExpression;
-        $this->file = $file;
-        $this->line = $line;
-        $this->char = $char;
+        $this->file           = $file;
+        $this->line           = $line;
+        $this->char           = $char;
     }
 
     public function get(): array
     {
-        if (\is_object($this->leftExpression) && method_exists($this->leftExpression, 'get')) {
+        if (is_object($this->leftExpression) && method_exists($this->leftExpression, 'get')) {
             $expr = $this->leftExpression->get();
         } else {
             $expr = $this->leftExpression;
diff --git a/src/Builder/Statements/IfStatementBuilder.php b/src/Builder/Statements/IfStatementBuilder.php
index fbb5acebe0..ba7e431452 100644
--- a/src/Builder/Statements/IfStatementBuilder.php
+++ b/src/Builder/Statements/IfStatementBuilder.php
@@ -31,8 +31,8 @@ public function __construct(
     public function get(): array
     {
         $expression = [
-            'type' => 'if',
-            'expr' => $this->evalExpr->get(),
+            'type'       => 'if',
+            'expr'       => $this->evalExpr->get(),
             'statements' => $this->ifBlock->get(),
         ];
 
diff --git a/src/Builder/Statements/LetStatementBuilder.php b/src/Builder/Statements/LetStatementBuilder.php
index ff04172015..2e92dc76bb 100644
--- a/src/Builder/Statements/LetStatementBuilder.php
+++ b/src/Builder/Statements/LetStatementBuilder.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Builder\Statements;
 
+use function array_merge;
+
 /**
  * Allows to manually build a 'let' statement AST node
  */
@@ -25,7 +27,7 @@ public function __construct(private array $assignments, private mixed $expr)
     public function get(): array
     {
         return [
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [array_merge(['expr' => $this->expr], $this->assignments)],
         ];
     }
diff --git a/src/Cache/FunctionCache.php b/src/Cache/FunctionCache.php
index 85f9aa16cf..e2aba14c24 100644
--- a/src/Cache/FunctionCache.php
+++ b/src/Cache/FunctionCache.php
@@ -47,7 +47,7 @@ public function __construct(protected ?CallGathererPass $gatherer = null)
     public function get(string $functionName, CompilationContext $compilationContext, bool $exists): string
     {
         if (isset($this->cache[$functionName])) {
-            return $this->cache[$functionName].', '.SlotsCache::getExistingFunctionSlot($functionName);
+            return $this->cache[$functionName] . ', ' . SlotsCache::getExistingFunctionSlot($functionName);
         }
 
         if (!$exists) {
@@ -60,21 +60,24 @@ public function get(string $functionName, CompilationContext $compilationContext
         if (!$compilationContext->insideCycle && $this->gatherer !== null) {
             $number = $this->gatherer->getNumberOfFunctionCalls($functionName);
             if ($number <= 1) {
-                return 'NULL, '.$cacheSlot;
+                return 'NULL, ' . $cacheSlot;
             }
         }
 
         if ($compilationContext->insideCycle || $number > 1) {
-            $functionCacheVariable = $compilationContext->symbolTable->getTempVariableForWrite('zephir_fcall_cache_entry', $compilationContext);
+            $functionCacheVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'zephir_fcall_cache_entry',
+                $compilationContext
+            );
             $functionCacheVariable->setMustInitNull(true);
             $functionCacheVariable->setReusable(false);
-            $functionCache = '&'.$functionCacheVariable->getName();
+            $functionCache = '&' . $functionCacheVariable->getName();
         } else {
             $functionCache = 'NULL';
         }
 
         $this->cache[$functionName] = $functionCache;
 
-        return $functionCache.', '.$cacheSlot;
+        return $functionCache . ', ' . $cacheSlot;
     }
 }
diff --git a/src/Cache/Manager.php b/src/Cache/Manager.php
index 1ce933f320..143cc9d5a2 100644
--- a/src/Cache/Manager.php
+++ b/src/Cache/Manager.php
@@ -20,24 +20,16 @@
  */
 class Manager
 {
+    protected ?ClassEntryCache $classEntryCache = null;
+
     protected ?FunctionCache $functionCache = null;
 
+    protected ?CallGathererPass $gatherer = null;
+
     protected ?MethodCache $methodCache = null;
 
     protected ?StaticMethodCache $staticMethodCache = null;
 
-    protected ?ClassEntryCache $classEntryCache = null;
-
-    protected ?CallGathererPass $gatherer = null;
-
-    /**
-     * Sets the CallGathererPass.
-     */
-    public function setGatherer(CallGathererPass $gatherer = null): void
-    {
-        $this->gatherer = $gatherer;
-    }
-
     /**
      * Creates or returns an existing class entry cache.
      */
@@ -85,4 +77,12 @@ public function getStaticMethodCache(): ?StaticMethodCache
 
         return $this->staticMethodCache;
     }
+
+    /**
+     * Sets the CallGathererPass.
+     */
+    public function setGatherer(CallGathererPass $gatherer = null): void
+    {
+        $this->gatherer = $gatherer;
+    }
 }
diff --git a/src/Cache/MethodCache.php b/src/Cache/MethodCache.php
index b5116d7e82..d76ff7097d 100644
--- a/src/Cache/MethodCache.php
+++ b/src/Cache/MethodCache.php
@@ -13,11 +13,18 @@
 
 namespace Zephir\Cache;
 
+use ReflectionClass;
+use ReflectionException;
+use ReflectionMethod;
 use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Passes\CallGathererPass;
 use Zephir\Variable\Variable;
 
+use function count;
+use function in_array;
+use function is_object;
+
 /**
  * Calls in Zephir implement monomorphic and polymorphic caches to
  * improve performance. Method/Functions lookups are cached in a standard
@@ -46,7 +53,7 @@ public function __construct(protected ?CallGathererPass $gatherer = null)
     /**
      * Retrieves/Creates a function cache for a method call.
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function get(CompilationContext $compilationContext, string $methodName, Variable $caller): string
     {
@@ -63,7 +70,12 @@ public function get(CompilationContext $compilationContext, string $methodName,
         } else {
             $classTypes = $caller->getClassTypes();
             foreach ($classTypes as $classType) {
-                if ($compiler->isClass($classType) || $compiler->isInterface($classType) || $compiler->isBundledClass($classType) || $compiler->isBundledInterface($classType)) {
+                if (
+                    $compiler->isClass($classType) ||
+                    $compiler->isInterface($classType) ||
+                    $compiler->isBundledClass($classType) ||
+                    $compiler->isBundledInterface($classType)
+                ) {
                     if ($compiler->isInterface($classType)) {
                         continue;
                     }
@@ -89,15 +101,18 @@ public function get(CompilationContext $compilationContext, string $methodName,
         if (!$numberPoly) {
             // Try to generate a cache based on the fact the variable is not modified within the loop block
             if ($compilationContext->insideCycle && !$caller->isTemporal()) {
-                if (\count($compilationContext->cycleBlocks) && 'variable' == $caller->getType()) {
-                    $currentBlock = $compilationContext->cycleBlocks[\count($compilationContext->cycleBlocks) - 1];
+                if (count($compilationContext->cycleBlocks) && 'variable' == $caller->getType()) {
+                    $currentBlock = $compilationContext->cycleBlocks[count($compilationContext->cycleBlocks) - 1];
 
                     if (0 == $currentBlock->getMutateGatherer(true)->getNumberOfMutations($caller->getName())) {
-                        $functionCache = $compilationContext->symbolTable->getTempVariableForWrite('zephir_fcall_cache_entry', $compilationContext);
+                        $functionCache = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'zephir_fcall_cache_entry',
+                            $compilationContext
+                        );
                         $functionCache->setMustInitNull(true);
                         $functionCache->setReusable(false);
 
-                        return '&'.$functionCache->getName().', 0';
+                        return '&' . $functionCache->getName() . ', 0';
                     }
                 }
             }
@@ -105,24 +120,36 @@ public function get(CompilationContext $compilationContext, string $methodName,
             return 'NULL, 0';
         }
 
-        if (!($method instanceof \ReflectionMethod)) {
+        if (!($method instanceof ReflectionMethod)) {
             if ($method->getClassDefinition()->isExternal()) {
                 return 'NULL, 0';
             }
 
             $completeName = $method->getClassDefinition()->getCompleteName();
             if (isset($this->cache[$completeName][$method->getName()])) {
-                return $this->cache[$completeName][$method->getName()].', '.SlotsCache::getExistingMethodSlot($method);
+                return $this->cache[$completeName][$method->getName()]
+                    . ', '
+                    . SlotsCache::getExistingMethodSlot($method)
+                ;
             }
 
             $gatherer = $this->gatherer;
-            if (\is_object($gatherer)) {
-                $number = $gatherer->getNumberOfMethodCalls($method->getClassDefinition()->getCompleteName(), $method->getName());
+            if (is_object($gatherer)) {
+                $number = $gatherer->getNumberOfMethodCalls(
+                    $method->getClassDefinition()->getCompleteName(),
+                    $method->getName()
+                );
             } else {
                 $number = 0;
             }
 
-            $staticCacheable = !$method->getClassDefinition()->isInterface() && ($compilationContext->currentMethod == $method || $method->getClassDefinition()->isFinal() || $method->isFinal() || $method->isPrivate());
+            $staticCacheable = !$method->getClassDefinition()->isInterface() &&
+                (
+                    $compilationContext->currentMethod == $method ||
+                    $method->getClassDefinition()->isFinal() ||
+                    $method->isFinal() ||
+                    $method->isPrivate()
+                );
             if ($number > 1 || $compilationContext->insideCycle) {
                 $cacheable = true;
             } else {
@@ -130,7 +157,7 @@ public function get(CompilationContext $compilationContext, string $methodName,
             }
         } else {
             $staticCacheable = false;
-            $cacheable = false;
+            $cacheable       = false;
         }
 
         if ('this_ptr' !== $caller->getName()) {
@@ -147,25 +174,28 @@ public function get(CompilationContext $compilationContext, string $methodName,
         }
 
         if ($cacheable) {
-            $functionCacheVar = $compilationContext->symbolTable->getTempVariableForWrite('zephir_fcall_cache_entry', $compilationContext);
+            $functionCacheVar = $compilationContext->symbolTable->getTempVariableForWrite(
+                'zephir_fcall_cache_entry',
+                $compilationContext
+            );
             $functionCacheVar->setMustInitNull(true);
             $functionCacheVar->setReusable(false);
-            $functionCache = '&'.$functionCacheVar->getName();
+            $functionCache = '&' . $functionCacheVar->getName();
         } else {
             $functionCache = 'NULL';
         }
 
-        if (!($method instanceof \ReflectionMethod)) {
+        if (!($method instanceof ReflectionMethod)) {
             $this->cache[$completeName][$method->getName()] = $functionCache;
         }
 
-        return $functionCache.', '.$cacheSlot;
+        return $functionCache . ', ' . $cacheSlot;
     }
 
     /**
      * Checks if the class is suitable for caching.
      *
-     * @param Definition|\ReflectionClass|null $classDefinition
+     * @param Definition|ReflectionClass|null $classDefinition
      *
      * @return bool
      */
@@ -175,12 +205,12 @@ private function isClassCacheable($classDefinition = null): bool
             return true;
         }
 
-        if (!($classDefinition instanceof \ReflectionClass)) {
+        if (!($classDefinition instanceof ReflectionClass)) {
             return false;
         }
 
         return $classDefinition->isInternal()
-               && $classDefinition->isInstantiable()
-               && in_array($classDefinition->getExtension()->getName(), ['Reflection', 'Core', 'SPL']);
+            && $classDefinition->isInstantiable()
+            && in_array($classDefinition->getExtension()->getName(), ['Reflection', 'Core', 'SPL']);
     }
 }
diff --git a/src/Cache/SlotsCache.php b/src/Cache/SlotsCache.php
index 094b8baa70..7e5374b5ba 100644
--- a/src/Cache/SlotsCache.php
+++ b/src/Cache/SlotsCache.php
@@ -24,11 +24,30 @@ class SlotsCache
 {
     public const MAX_SLOTS_NUMBER = 512;
 
-    private static int $slot = 1;
+    private static array $cacheFunctionSlots = [];
 
     private static array $cacheMethodSlots = [];
 
-    private static array $cacheFunctionSlots = [];
+    private static int $slot = 1;
+
+    /**
+     * Returns or creates a cache slot for a function.
+     */
+    public static function getExistingFunctionSlot(string $functionName): int
+    {
+        return self::$cacheFunctionSlots[$functionName] ?? 0;
+    }
+
+    /**
+     * Returns a cache slot for a method.
+     */
+    public static function getExistingMethodSlot(Method $method): int
+    {
+        $className  = $method->getClassDefinition()->getCompleteName();
+        $methodName = $method->getName();
+
+        return self::$cacheMethodSlots[$className][$methodName] ?? 0;
+    }
 
     /**
      * Returns or creates a cache slot for a function.
@@ -53,20 +72,12 @@ public static function getFunctionSlot(string $functionName): int
         return $slot;
     }
 
-    /**
-     * Returns or creates a cache slot for a function.
-     */
-    public static function getExistingFunctionSlot(string $functionName): int
-    {
-        return self::$cacheFunctionSlots[$functionName] ?? 0;
-    }
-
     /**
      * Returns or creates a cache slot for a method.
      */
     public static function getMethodSlot(Method $method): int
     {
-        $className = $method->getClassDefinition()->getCompleteName();
+        $className  = $method->getClassDefinition()->getCompleteName();
         $methodName = $method->getName();
 
         if (isset(self::$cacheMethodSlots[$className][$methodName])) {
@@ -82,15 +93,4 @@ public static function getMethodSlot(Method $method): int
 
         return $slot;
     }
-
-    /**
-     * Returns a cache slot for a method.
-     */
-    public static function getExistingMethodSlot(Method $method): int
-    {
-        $className = $method->getClassDefinition()->getCompleteName();
-        $methodName = $method->getName();
-
-        return self::$cacheMethodSlots[$className][$methodName] ?? 0;
-    }
 }
diff --git a/src/Cache/StaticMethodCache.php b/src/Cache/StaticMethodCache.php
index 18b08aacdf..a61d26ddbf 100644
--- a/src/Cache/StaticMethodCache.php
+++ b/src/Cache/StaticMethodCache.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Cache;
 
+use ReflectionMethod;
 use Zephir\CompilationContext;
 
 /**
@@ -42,7 +43,7 @@ public function get(CompilationContext $compilationContext, $method): string
             return 'NULL, 0';
         }
 
-        if (!($method instanceof \ReflectionMethod)) {
+        if (!($method instanceof ReflectionMethod)) {
             $completeName = $method->getClassDefinition()->getCompleteName();
 
             /**
@@ -53,7 +54,10 @@ public function get(CompilationContext $compilationContext, $method): string
             }
 
             if (isset($this->cache[$completeName][$method->getName()])) {
-                return '&'.$this->cache[$completeName][$method->getName()]->getName().', '.SlotsCache::getExistingMethodSlot($method);
+                return '&'
+                    . $this->cache[$completeName][$method->getName()]->getName()
+                    . ', '
+                    . SlotsCache::getExistingMethodSlot($method);
             }
         }
 
@@ -61,7 +65,10 @@ public function get(CompilationContext $compilationContext, $method): string
             return 'NULL, 0';
         }
 
-        $functionCache = $compilationContext->symbolTable->getTempVariableForWrite('zephir_fcall_cache_entry', $compilationContext);
+        $functionCache = $compilationContext->symbolTable->getTempVariableForWrite(
+            'zephir_fcall_cache_entry',
+            $compilationContext
+        );
 
         if ($method->isPrivate() || $method->isFinal()) {
             $cacheSlot = SlotsCache::getMethodSlot($method);
@@ -72,10 +79,10 @@ public function get(CompilationContext $compilationContext, $method): string
         $functionCache->setMustInitNull(true);
         $functionCache->setReusable(false);
 
-        if (!($method instanceof \ReflectionMethod)) {
+        if (!($method instanceof ReflectionMethod)) {
             $this->cache[$completeName][$method->getName()] = $functionCache;
         }
 
-        return '&'.$functionCache->getName().', '.$cacheSlot;
+        return '&' . $functionCache->getName() . ', ' . $cacheSlot;
     }
 }
diff --git a/src/Call.php b/src/Call.php
index ab2e6fa66d..6e99e8dccc 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -17,6 +17,10 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 
+use function count;
+use function is_array;
+use function is_object;
+
 /**
  * Base class for common functionality in functions/calls
  */
@@ -28,334 +32,165 @@ class Call
      * @var Expression|null
      */
     protected ?Expression $expression = null;
-
     /**
      * @var bool
      */
-    protected bool $mustInit = false;
-
+    protected bool $isExpecting = false;
     /**
-     * @var Variable|null
+     * @var array
      */
-    protected ?Variable $symbolVariable = null;
-
+    protected array $mustCheckForCopy = [];
     /**
      * @var bool
      */
-    protected bool $isExpecting = false;
-
-    /**
-     * @var array
-     */
-    protected array $resolvedParams = [];
-
+    protected bool $mustInit = false;
     /**
      * @var mixed|null
      */
     protected $reflection;
-
     /**
      * @var array
      */
-    protected array $resolvedTypes = [];
-
+    protected array $resolvedDynamicTypes = [];
     /**
      * @var array
      */
-    protected array $resolvedDynamicTypes = [];
-
+    protected array $resolvedParams = [];
     /**
      * @var array
      */
-    protected array $temporalVariables = [];
-
+    protected array $resolvedTypes = [];
+    /**
+     * @var Variable|null
+     */
+    protected ?Variable $symbolVariable = null;
     /**
      * @var array
      */
-    protected array $mustCheckForCopy = [];
+    protected array $temporalVariables = [];
 
     /**
-     * Processes the symbol variable that will be used to return
-     * the result of the symbol call.
+     * Add the last-call-status flag to the current symbol table.
      *
      * @param CompilationContext $compilationContext
      */
-    public function processExpectedReturn(CompilationContext $compilationContext): void
+    public function addCallStatusFlag(CompilationContext $compilationContext): void
     {
-        $expr = $this->expression;
-        $expression = $expr->getExpression();
-
-        /**
-         * Create temporary variable if needed.
-         */
-        $symbolVariable = null;
-        $isExpecting = $expr->isExpectingReturn();
-        if ($isExpecting) {
-            $symbolVariable = $expr->getExpectingVariable();
-            if (\is_object($symbolVariable)) {
-                $readDetector = new ReadDetector();
-                if ($readDetector->detect($symbolVariable->getName(), $expression)) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                        'variable',
-                        $compilationContext,
-                        $expression
-                    );
-                } else {
-                    $this->mustInit = true;
-                }
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
-            }
+        if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_LAST_CALL_STATUS')) {
+            $callStatus = new Variable(
+                'int',
+                'ZEPHIR_LAST_CALL_STATUS',
+                $compilationContext->branchManager->getCurrentBranch()
+            );
+            $callStatus->setIsInitialized(true, $compilationContext);
+            $callStatus->increaseUses();
+            $callStatus->setReadOnly(true);
+            $compilationContext->symbolTable->addRawVariable($callStatus);
         }
-
-        $this->symbolVariable = $symbolVariable;
-        $this->isExpecting = $isExpecting;
     }
 
     /**
-     * Processes the symbol variable that will be used to return
-     * the result of the symbol call.
+     * Checks the last call status or make a label jump to the next catch block.
      *
      * @param CompilationContext $compilationContext
      */
-    public function processExpectedObservedReturn(CompilationContext $compilationContext): void
+    public function addCallStatusOrJump(CompilationContext $compilationContext): void
     {
-        $expr = $this->expression;
-        $expression = $expr->getExpression();
+        $compilationContext->headersManager->add('kernel/fcall');
+        if ($compilationContext->insideTryCatch) {
+            $compilationContext->codePrinter->output(
+                'zephir_check_call_status_or_jump(try_end_' . $compilationContext->currentTryCatch . ');'
+            );
 
-        /**
-         * Create temporary variable if needed.
-         */
-        $mustInit = false;
-        $symbolVariable = null;
-        $isExpecting = $expr->isExpectingReturn();
-        if ($isExpecting) {
-            $symbolVariable = $expr->getExpectingVariable();
-            if (\is_object($symbolVariable)) {
-                $readDetector = new ReadDetector();
-                if ($readDetector->detect($symbolVariable->getName(), $expression)) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
-                } else {
-                    $mustInit = true;
-                }
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
-            }
+            return;
         }
 
-        $this->mustInit = $mustInit;
-        $this->symbolVariable = $symbolVariable;
-        $this->isExpecting = $isExpecting;
-    }
-
-    /**
-     * Check if an external expression is expecting the call return a value.
-     *
-     * @return bool
-     */
-    public function isExpectingReturn(): bool
-    {
-        return $this->isExpecting;
-    }
-
-    /**
-     * Returns if the symbol to be returned by the call must be initialized.
-     *
-     * @return bool
-     */
-    public function mustInitSymbolVariable(): bool
-    {
-        return $this->mustInit;
+        $compilationContext->codePrinter->output('zephir_check_call_status();');
     }
 
     /**
-     * Returns the symbol variable that must be returned by the call.
-     *
-     * @param bool                    $useTemp
-     * @param CompilationContext|null $compilationContext
+     * Checks if temporary parameters must be copied or not.
      *
-     * @return Variable|null
+     * @param CompilationContext $compilationContext
      */
-    public function getSymbolVariable(bool $useTemp = false, CompilationContext $compilationContext = null): ?Variable
+    public function checkTempParameters(CompilationContext $compilationContext): void
     {
-        $symbolVariable = $this->symbolVariable;
-
-        if ($useTemp && !\is_object($symbolVariable)) {
-            return $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+        $compilationContext->headersManager->add('kernel/fcall');
+        foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
+            $compilationContext->codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
-
-        return $symbolVariable;
     }
 
     /**
-     * Resolves parameters.
-     *
-     * @param array              $parameters
-     * @param CompilationContext $compilationContext
-     * @param array              $expression
-     * @param bool               $readOnly
-     *
-     * @return CompiledExpression[]|null
+     * Parameters to check if they must be copied.
      *
-     * @throws Exception
+     * @return array
      */
-    public function getResolvedParamsAsExpr(array $parameters, CompilationContext $compilationContext, array $expression, bool $readOnly = false): ?array
+    public function getMustCheckForCopyVariables(): array
     {
-        if (!$this->resolvedParams) {
-            $hasParametersByName = false;
-            foreach ($parameters as $parameter) {
-                if (isset($parameter['name'])) {
-                    $hasParametersByName = true;
-                    break;
-                }
-            }
-
-            /**
-             * All parameters must be passed by name
-             */
-            if ($hasParametersByName) {
-                foreach ($parameters as $parameter) {
-                    if (!isset($parameter['name'])) {
-                        throw new CompilerException('All parameters must use named', $parameter);
-                    }
-                }
-            }
-
-            if ($hasParametersByName) {
-                if ($this->reflection) {
-                    $positionalParameters = [];
-                    foreach ($this->reflection->getParameters() as $position => $reflectionParameter) {
-                        if (\is_object($reflectionParameter)) {
-                            $positionalParameters[$reflectionParameter->getName()] = $position;
-                        } else {
-                            $positionalParameters[$reflectionParameter['name']] = $position;
-                        }
-                    }
-                    $orderedParameters = [];
-                    foreach ($parameters as $parameter) {
-                        if (isset($positionalParameters[$parameter['name']])) {
-                            $orderedParameters[$positionalParameters[$parameter['name']]] = $parameter;
-                        } else {
-                            throw new CompilerException('Named parameter "'.$parameter['name'].'" is not a valid parameter name, available: '.implode(', ', array_keys($positionalParameters)), $parameter['parameter']);
-                        }
-                    }
-                    $parameters_count = \count($parameters);
-                    for ($i = 0; $i < $parameters_count; ++$i) {
-                        if (!isset($orderedParameters[$i])) {
-                            $orderedParameters[$i] = ['parameter' => ['type' => 'null']];
-                        }
-                    }
-                    $parameters = $orderedParameters;
-                }
-            }
-
-            $params = [];
-            foreach ($parameters as $parameter) {
-                if (\is_array($parameter['parameter'])) {
-                    $paramExpr = new Expression($parameter['parameter']);
-
-                    switch ($parameter['parameter']['type']) {
-                        case 'property-access':
-                        case 'array-access':
-                        case 'static-property-access':
-                            $paramExpr->setReadOnly(true);
-                            break;
-
-                        default:
-                            $paramExpr->setReadOnly($readOnly);
-                            break;
-                    }
-
-                    $params[] = $paramExpr->compile($compilationContext);
-                    continue;
-                }
-
-                if ($parameter['parameter'] instanceof CompiledExpression) {
-                    $params[] = $parameter['parameter'];
-                    continue;
-                }
-
-                throw new CompilerException('Invalid expression ', $expression);
-            }
-            $this->resolvedParams = $params;
-        }
-
-        return $this->resolvedParams;
+        return $this->mustCheckForCopy;
     }
 
     /**
-     * Resolve parameters getting aware that the target function/method could retain or change
-     * the parameters.
+     * Resolve parameters using zvals in the stack and without allocating memory for constants.
      *
      * @param array              $parameters
      * @param CompilationContext $compilationContext
      * @param array              $expression
-     * @param null               $calleeDefinition
      *
      * @return array
      *
      * @throws Exception
      */
-    public function getResolvedParams(array $parameters, CompilationContext $compilationContext, array $expression, $calleeDefinition = null): array
-    {
+    public function getReadOnlyResolvedParams(
+        array $parameters,
+        CompilationContext $compilationContext,
+        array $expression
+    ): array {
         $codePrinter = $compilationContext->codePrinter;
-        $exprParams = $this->getResolvedParamsAsExpr($parameters, $compilationContext, $expression);
+        $exprParams  = $this->getResolvedParamsAsExpr($parameters, $compilationContext, $expression, true);
 
-        $params = [];
-        $types = [];
+        $params       = [];
+        $types        = [];
         $dynamicTypes = [];
-        $mustCheck = [];
+
         foreach ($exprParams as $compiledExpression) {
             $expression = $compiledExpression->getOriginal();
             switch ($compiledExpression->getType()) {
                 case 'null':
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                    $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                    $compilationContext->backend->assignNull($parameterVariable, $compilationContext);
-                    $this->temporalVariables[] = $parameterVariable;
-                    $types[] = $compiledExpression->getType();
-                    $dynamicTypes[] = $compiledExpression->getType();
+                    $params[]       = $compilationContext->backend->resolveValue('null', $compilationContext);
+                    $types[]        = 'null';
+                    $dynamicTypes[] = 'null';
                     break;
 
                 case 'int':
                 case 'uint':
                 case 'long':
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                    $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                    $compilationContext->backend->assignLong($parameterVariable, $compiledExpression->getCode(), $compilationContext);
-                    $this->temporalVariables[] = $parameterVariable;
-                    $types[] = $compiledExpression->getType();
-                    $dynamicTypes[] = $compiledExpression->getType();
-                    break;
-
-                case 'double':
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                    $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                    $compilationContext->backend->assignDouble($parameterVariable, $compiledExpression->getCode(), $compilationContext);
-                    $this->temporalVariables[] = $parameterVariable;
-                    $types[] = $compiledExpression->getType();
-                    break;
-
-                case 'bool':
-                    $value = $compiledExpression->getCode();
-                    if ('true' == $value) {
-                        $value = '1';
-                    } elseif ('false' == $value) {
-                        $value = '0';
-                    }
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                    $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                    $compilationContext->backend->assignBool($parameterVariable, $value, $compilationContext);
-
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable(
+                        'variable',
+                        $compilationContext
+                    );
+                    $compilationContext->backend->assignLong(
+                        $parameterVariable,
+                        $compiledExpression->getCode(),
+                        $compilationContext
+                    );
                     $this->temporalVariables[] = $parameterVariable;
-                    $types[] = $compiledExpression->getType();
-                    $dynamicTypes[] = $compiledExpression->getType();
+                    $params[]                  = '&' . $parameterVariable->getName();
+                    $types[]                   = $parameterVariable->getType();
+                    $dynamicTypes[]            = $parameterVariable->getType();
                     break;
 
+                case 'char':
+                case 'uchar':
                 case 'ulong':
                 case 'string':
                 case 'istring':
-                    $parameterVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+                    $parameterVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                        'variable',
+                        $compilationContext,
+                        $expression
+                    );
 
                     $compilationContext->backend->assignString(
                         $parameterVariable,
@@ -364,79 +199,141 @@ public function getResolvedParams(array $parameters, CompilationContext $compila
                     );
 
                     $this->temporalVariables[] = $parameterVariable;
-                    $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                    $types[] = $compiledExpression->getType();
-                    $dynamicTypes[] = $compiledExpression->getType();
+                    $params[]                  = '&' . $parameterVariable->getName();
+                    $types[]                   = $parameterVariable->getType();
+                    $dynamicTypes[]            = $parameterVariable->getType();
+                    break;
+
+                case 'double':
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable(
+                        'variable',
+                        $compilationContext
+                    );
+                    $codePrinter->output(
+                        'ZVAL_DOUBLE(&' . $parameterVariable->getName() . ', ' . $compiledExpression->getCode() . ');'
+                    );
+                    $this->temporalVariables[] = $parameterVariable;
+                    $params[]                  = '&' . $parameterVariable->getName();
+                    $types[]                   = $parameterVariable->getType();
+                    $dynamicTypes[]            = $parameterVariable->getType();
+                    break;
+
+                case 'bool':
+                    if ('true' == $compiledExpression->getCode()) {
+                        $params[] = $compilationContext->backend->resolveValue('true', $compilationContext);
+                    } else {
+                        if ('false' == $compiledExpression->getCode()) {
+                            $params[] = $compilationContext->backend->resolveValue('false', $compilationContext);
+                        } else {
+                            throw new CompilerException(
+                                'Unable to resolve parameter using zval',
+                                $expression
+                            );
+                        }
+                    }
+                    $types[]        = 'bool';
+                    $dynamicTypes[] = 'bool';
                     break;
 
                 case 'array':
-                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead($compiledExpression->getCode(), $compilationContext, $expression);
-                    $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                    $types[] = $compiledExpression->getType();
-                    $dynamicTypes[] = $compiledExpression->getType();
+                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead(
+                        $compiledExpression->getCode(),
+                        $compilationContext,
+                        $expression
+                    );
+                    $params[]          = $compilationContext->backend->getVariableCode($parameterVariable);
+                    $types[]           = $parameterVariable->getType();
+                    $dynamicTypes[]    = $parameterVariable->getType();
                     break;
 
                 case 'variable':
-                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead($compiledExpression->getCode(), $compilationContext, $expression);
+                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead(
+                        $compiledExpression->getCode(),
+                        $compilationContext,
+                        $expression
+                    );
                     switch ($parameterVariable->getType()) {
                         case 'int':
                         case 'uint':
                         case 'long':
-                            /* ulong must be stored in string */
                         case 'ulong':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                            $params[] = $compilationContext->backend->getVariableCode($parameterTempVariable);
-                            $compilationContext->backend->assignLong($parameterTempVariable, $parameterVariable, $compilationContext);
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable(
+                                'variable',
+                                $compilationContext
+                            );
+                            $codePrinter->output(
+                                'ZVAL_LONG(&' . $parameterTempVariable->getName() . ', ' . $compiledExpression->getCode(
+                                ) . ');'
+                            );
+                            $params[]                  = '&' . $parameterTempVariable->getName();
+                            $types[]                   = $parameterTempVariable->getType();
+                            $dynamicTypes[]            = $parameterTempVariable->getType();
                             $this->temporalVariables[] = $parameterTempVariable;
-                            $types[] = $parameterVariable->getType();
-                            $dynamicTypes[] = $parameterVariable->getType();
+                            break;
+
+                        case 'char':
+                        case 'uchar':
+                            $parameterVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                'variable',
+                                $compilationContext,
+                                $expression
+                            );
+                            $codePrinter->output(
+                                sprintf(
+                                    'ZVAL_STRINGL(&%s, &%s, 1);',
+                                    $parameterVariable->getName(),
+                                    $compiledExpression->getCode()
+                                )
+                            );
+
+                            $this->temporalVariables[] = $parameterVariable;
+                            $params[]                  = '&' . $parameterVariable->getName();
+                            $types[]                   = $parameterVariable->getType();
+                            $dynamicTypes[]            = $parameterVariable->getType();
                             break;
 
                         case 'double':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                            $compilationContext->backend->assignDouble($parameterTempVariable, $parameterVariable, $compilationContext);
-                            $params[] = $compilationContext->backend->getVariableCode($parameterTempVariable);
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable(
+                                'variable',
+                                $compilationContext
+                            );
+                            $codePrinter->output(
+                                'ZVAL_DOUBLE(&' . $parameterTempVariable->getName(
+                                ) . ', ' . $compiledExpression->getCode() . ');'
+                            );
+                            $params[]                  = '&' . $parameterTempVariable->getName();
+                            $types[]                   = $parameterTempVariable->getType();
+                            $dynamicTypes[]            = $parameterTempVariable->getType();
                             $this->temporalVariables[] = $parameterTempVariable;
-                            $types[] = $parameterVariable->getType();
-                            $dynamicTypes[] = $parameterVariable->getType();
                             break;
 
                         case 'bool':
-                            $tempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                            $codePrinter->output('if ('.$parameterVariable->getName().') {');
-                            $codePrinter->increaseLevel();
-                            $compilationContext->backend->assignBool($tempVariable, '1', $compilationContext);
-                            $codePrinter->decreaseLevel();
-                            $codePrinter->output('} else {');
-                            $codePrinter->increaseLevel();
-                            $compilationContext->backend->assignBool($tempVariable, '0', $compilationContext);
-                            $codePrinter->decreaseLevel();
-                            $codePrinter->output('}');
-                            $params[] = $compilationContext->backend->getVariableCode($tempVariable);
-                            $types[] = $parameterVariable->getType();
-                            $dynamicTypes[] = $parameterVariable->getType();
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable(
+                                'variable',
+                                $compilationContext
+                            );
+                            $compilationContext->backend->assignBool(
+                                $parameterTempVariable,
+                                '(' . $parameterVariable->getName() . ' ? 1 : 0)',
+                                $compilationContext
+                            );
+                            $params[]       = $compilationContext->backend->getVariableCode($parameterTempVariable);
+                            $dynamicTypes[] = $parameterTempVariable->getType();
+                            $types[]        = $parameterTempVariable->getType();
                             break;
 
                         case 'string':
-                        case 'array':
-                            $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                            $types[] = $parameterVariable->getType();
-                            $dynamicTypes[] = $parameterVariable->getType();
-                            break;
-
                         case 'variable':
                         case 'mixed':
-                            $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                            $types[] = $parameterVariable->getType();
-                            $dynamicTypes = array_merge(
-                                $dynamicTypes,
-                                array_keys($parameterVariable->getDynamicTypes())
-                            );
+                        case 'array':
+                            $params[]       = $compilationContext->backend->getVariableCode($parameterVariable);
+                            $dynamicTypes[] = $parameterVariable->getType();
+                            $types[]        = $parameterVariable->getType();
                             break;
 
                         default:
                             throw new CompilerException(
-                                'Cannot use variable type: '.$parameterVariable->getType().' as parameter',
+                                'Cannot use variable type: ' . $parameterVariable->getType() . ' as parameter',
                                 $expression
                             );
                     }
@@ -444,61 +341,121 @@ public function getResolvedParams(array $parameters, CompilationContext $compila
 
                 default:
                     throw new CompilerException(
-                        'Cannot use value type: '.$compiledExpression->getType().' as parameter',
+                        'Cannot use value type: ' . $compiledExpression->getType() . ' as parameter',
                         $expression
                     );
             }
         }
 
-        $this->resolvedTypes = $types;
+        $this->resolvedTypes        = $types;
         $this->resolvedDynamicTypes = $dynamicTypes;
-        $this->mustCheckForCopy = $mustCheck;
 
         return $params;
     }
 
     /**
-     * Resolve parameters using zvals in the stack and without allocating memory for constants.
+     * Return resolved parameter dynamic types.
+     *
+     * @return array
+     */
+    public function getResolvedDynamicTypes(): array
+    {
+        return $this->resolvedDynamicTypes;
+    }
+
+    /**
+     * Resolve parameters getting aware that the target function/method could retain or change
+     * the parameters.
      *
      * @param array              $parameters
      * @param CompilationContext $compilationContext
      * @param array              $expression
+     * @param null               $calleeDefinition
      *
      * @return array
      *
      * @throws Exception
      */
-    public function getReadOnlyResolvedParams(array $parameters, CompilationContext $compilationContext, array $expression): array
-    {
+    public function getResolvedParams(
+        array $parameters,
+        CompilationContext $compilationContext,
+        array $expression,
+        $calleeDefinition = null
+    ): array {
         $codePrinter = $compilationContext->codePrinter;
-        $exprParams = $this->getResolvedParamsAsExpr($parameters, $compilationContext, $expression, true);
+        $exprParams  = $this->getResolvedParamsAsExpr($parameters, $compilationContext, $expression);
 
-        $params = [];
-        $types = [];
+        $params       = [];
+        $types        = [];
         $dynamicTypes = [];
-
+        $mustCheck    = [];
         foreach ($exprParams as $compiledExpression) {
             $expression = $compiledExpression->getOriginal();
             switch ($compiledExpression->getType()) {
                 case 'null':
-                    $params[] = $compilationContext->backend->resolveValue('null', $compilationContext);
-                    $types[] = 'null';
-                    $dynamicTypes[] = 'null';
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable(
+                        'variable',
+                        $compilationContext
+                    );
+                    $params[]          = $compilationContext->backend->getVariableCode($parameterVariable);
+                    $compilationContext->backend->assignNull($parameterVariable, $compilationContext);
+                    $this->temporalVariables[] = $parameterVariable;
+                    $types[]                   = $compiledExpression->getType();
+                    $dynamicTypes[]            = $compiledExpression->getType();
                     break;
 
                 case 'int':
                 case 'uint':
                 case 'long':
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                    $compilationContext->backend->assignLong($parameterVariable, $compiledExpression->getCode(), $compilationContext);
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable(
+                        'variable',
+                        $compilationContext
+                    );
+                    $params[]          = $compilationContext->backend->getVariableCode($parameterVariable);
+                    $compilationContext->backend->assignLong(
+                        $parameterVariable,
+                        $compiledExpression->getCode(),
+                        $compilationContext
+                    );
                     $this->temporalVariables[] = $parameterVariable;
-                    $params[] = '&'.$parameterVariable->getName();
-                    $types[] = $parameterVariable->getType();
-                    $dynamicTypes[] = $parameterVariable->getType();
+                    $types[]                   = $compiledExpression->getType();
+                    $dynamicTypes[]            = $compiledExpression->getType();
+                    break;
+
+                case 'double':
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable(
+                        'variable',
+                        $compilationContext
+                    );
+                    $params[]          = $compilationContext->backend->getVariableCode($parameterVariable);
+                    $compilationContext->backend->assignDouble(
+                        $parameterVariable,
+                        $compiledExpression->getCode(),
+                        $compilationContext
+                    );
+                    $this->temporalVariables[] = $parameterVariable;
+                    $types[]                   = $compiledExpression->getType();
+                    break;
+
+                case 'bool':
+                    $value = $compiledExpression->getCode();
+                    if ('true' == $value) {
+                        $value = '1';
+                    } elseif ('false' == $value) {
+                        $value = '0';
+                    }
+                    $parameterVariable = $compilationContext->backend->getScalarTempVariable(
+                        'variable',
+                        $compilationContext
+                    );
+                    $params[]          = $compilationContext->backend->getVariableCode($parameterVariable);
+                    $compilationContext->backend->assignBool($parameterVariable, $value, $compilationContext);
+
+                    $this->temporalVariables[] = $parameterVariable;
+                    $types[]                   = $compiledExpression->getType();
+                    $dynamicTypes[]            = $compiledExpression->getType();
                     break;
 
-                case 'char':
-                case 'uchar':
                 case 'ulong':
                 case 'string':
                 case 'istring':
@@ -515,109 +472,108 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
                     );
 
                     $this->temporalVariables[] = $parameterVariable;
-                    $params[] = '&'.$parameterVariable->getName();
-                    $types[] = $parameterVariable->getType();
-                    $dynamicTypes[] = $parameterVariable->getType();
-                    break;
-
-                case 'double':
-                    $parameterVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                    $codePrinter->output('ZVAL_DOUBLE(&'.$parameterVariable->getName().', '.$compiledExpression->getCode().');');
-                    $this->temporalVariables[] = $parameterVariable;
-                    $params[] = '&'.$parameterVariable->getName();
-                    $types[] = $parameterVariable->getType();
-                    $dynamicTypes[] = $parameterVariable->getType();
-                    break;
-
-                case 'bool':
-                    if ('true' == $compiledExpression->getCode()) {
-                        $params[] = $compilationContext->backend->resolveValue('true', $compilationContext);
-                    } else {
-                        if ('false' == $compiledExpression->getCode()) {
-                            $params[] = $compilationContext->backend->resolveValue('false', $compilationContext);
-                        } else {
-                            throw new CompilerException(
-                                'Unable to resolve parameter using zval',
-                                $expression
-                            );
-                        }
-                    }
-                    $types[] = 'bool';
-                    $dynamicTypes[] = 'bool';
+                    $params[]                  = $compilationContext->backend->getVariableCode($parameterVariable);
+                    $types[]                   = $compiledExpression->getType();
+                    $dynamicTypes[]            = $compiledExpression->getType();
                     break;
 
                 case 'array':
-                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead($compiledExpression->getCode(), $compilationContext, $expression);
-                    $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
-                    $types[] = $parameterVariable->getType();
-                    $dynamicTypes[] = $parameterVariable->getType();
+                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead(
+                        $compiledExpression->getCode(),
+                        $compilationContext,
+                        $expression
+                    );
+                    $params[]          = $compilationContext->backend->getVariableCode($parameterVariable);
+                    $types[]           = $compiledExpression->getType();
+                    $dynamicTypes[]    = $compiledExpression->getType();
                     break;
 
                 case 'variable':
-                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead($compiledExpression->getCode(), $compilationContext, $expression);
+                    $parameterVariable = $compilationContext->symbolTable->getVariableForRead(
+                        $compiledExpression->getCode(),
+                        $compilationContext,
+                        $expression
+                    );
                     switch ($parameterVariable->getType()) {
                         case 'int':
                         case 'uint':
                         case 'long':
+                            /* ulong must be stored in string */
                         case 'ulong':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                            $codePrinter->output('ZVAL_LONG(&'.$parameterTempVariable->getName().', '.$compiledExpression->getCode().');');
-                            $params[] = '&'.$parameterTempVariable->getName();
-                            $types[] = $parameterTempVariable->getType();
-                            $dynamicTypes[] = $parameterTempVariable->getType();
-                            $this->temporalVariables[] = $parameterTempVariable;
-                            break;
-
-                        case 'char':
-                        case 'uchar':
-                            $parameterVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable(
                                 'variable',
-                                $compilationContext,
-                                $expression
+                                $compilationContext
                             );
-                            $codePrinter->output(
-                                sprintf(
-                                    'ZVAL_STRINGL(&%s, &%s, 1);',
-                                    $parameterVariable->getName(),
-                                    $compiledExpression->getCode()
-                                )
+                            $params[]              = $compilationContext->backend->getVariableCode(
+                                $parameterTempVariable
                             );
-
-                            $this->temporalVariables[] = $parameterVariable;
-                            $params[] = '&'.$parameterVariable->getName();
-                            $types[] = $parameterVariable->getType();
-                            $dynamicTypes[] = $parameterVariable->getType();
+                            $compilationContext->backend->assignLong(
+                                $parameterTempVariable,
+                                $parameterVariable,
+                                $compilationContext
+                            );
+                            $this->temporalVariables[] = $parameterTempVariable;
+                            $types[]                   = $parameterVariable->getType();
+                            $dynamicTypes[]            = $parameterVariable->getType();
                             break;
 
                         case 'double':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                            $codePrinter->output('ZVAL_DOUBLE(&'.$parameterTempVariable->getName().', '.$compiledExpression->getCode().');');
-                            $params[] = '&'.$parameterTempVariable->getName();
-                            $types[] = $parameterTempVariable->getType();
-                            $dynamicTypes[] = $parameterTempVariable->getType();
+                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable(
+                                'variable',
+                                $compilationContext
+                            );
+                            $compilationContext->backend->assignDouble(
+                                $parameterTempVariable,
+                                $parameterVariable,
+                                $compilationContext
+                            );
+                            $params[]                  = $compilationContext->backend->getVariableCode(
+                                $parameterTempVariable
+                            );
                             $this->temporalVariables[] = $parameterTempVariable;
+                            $types[]                   = $parameterVariable->getType();
+                            $dynamicTypes[]            = $parameterVariable->getType();
                             break;
 
                         case 'bool':
-                            $parameterTempVariable = $compilationContext->backend->getScalarTempVariable('variable', $compilationContext);
-                            $compilationContext->backend->assignBool($parameterTempVariable, '('.$parameterVariable->getName().' ? 1 : 0)', $compilationContext);
-                            $params[] = $compilationContext->backend->getVariableCode($parameterTempVariable);
-                            $dynamicTypes[] = $parameterTempVariable->getType();
-                            $types[] = $parameterTempVariable->getType();
+                            $tempVariable = $compilationContext->backend->getScalarTempVariable(
+                                'variable',
+                                $compilationContext
+                            );
+                            $codePrinter->output('if (' . $parameterVariable->getName() . ') {');
+                            $codePrinter->increaseLevel();
+                            $compilationContext->backend->assignBool($tempVariable, '1', $compilationContext);
+                            $codePrinter->decreaseLevel();
+                            $codePrinter->output('} else {');
+                            $codePrinter->increaseLevel();
+                            $compilationContext->backend->assignBool($tempVariable, '0', $compilationContext);
+                            $codePrinter->decreaseLevel();
+                            $codePrinter->output('}');
+                            $params[]       = $compilationContext->backend->getVariableCode($tempVariable);
+                            $types[]        = $parameterVariable->getType();
+                            $dynamicTypes[] = $parameterVariable->getType();
                             break;
 
                         case 'string':
-                        case 'variable':
-                        case 'mixed':
                         case 'array':
-                            $params[] = $compilationContext->backend->getVariableCode($parameterVariable);
+                            $params[]       = $compilationContext->backend->getVariableCode($parameterVariable);
+                            $types[]        = $parameterVariable->getType();
                             $dynamicTypes[] = $parameterVariable->getType();
-                            $types[] = $parameterVariable->getType();
+                            break;
+
+                        case 'variable':
+                        case 'mixed':
+                            $params[]     = $compilationContext->backend->getVariableCode($parameterVariable);
+                            $types[]      = $parameterVariable->getType();
+                            $dynamicTypes = array_merge(
+                                $dynamicTypes,
+                                array_keys($parameterVariable->getDynamicTypes())
+                            );
                             break;
 
                         default:
                             throw new CompilerException(
-                                'Cannot use variable type: '.$parameterVariable->getType().' as parameter',
+                                'Cannot use variable type: ' . $parameterVariable->getType() . ' as parameter',
                                 $expression
                             );
                     }
@@ -625,103 +581,265 @@ public function getReadOnlyResolvedParams(array $parameters, CompilationContext
 
                 default:
                     throw new CompilerException(
-                        'Cannot use value type: '.$compiledExpression->getType().' as parameter',
+                        'Cannot use value type: ' . $compiledExpression->getType() . ' as parameter',
                         $expression
                     );
             }
         }
 
-        $this->resolvedTypes = $types;
+        $this->resolvedTypes        = $types;
         $this->resolvedDynamicTypes = $dynamicTypes;
+        $this->mustCheckForCopy     = $mustCheck;
 
         return $params;
     }
 
     /**
-     * Add the last-call-status flag to the current symbol table.
+     * Resolves parameters.
      *
+     * @param array              $parameters
      * @param CompilationContext $compilationContext
+     * @param array              $expression
+     * @param bool               $readOnly
+     *
+     * @return CompiledExpression[]|null
+     *
+     * @throws Exception
      */
-    public function addCallStatusFlag(CompilationContext $compilationContext): void
-    {
-        if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_LAST_CALL_STATUS')) {
-            $callStatus = new Variable('int', 'ZEPHIR_LAST_CALL_STATUS', $compilationContext->branchManager->getCurrentBranch());
-            $callStatus->setIsInitialized(true, $compilationContext);
-            $callStatus->increaseUses();
-            $callStatus->setReadOnly(true);
-            $compilationContext->symbolTable->addRawVariable($callStatus);
+    public function getResolvedParamsAsExpr(
+        array $parameters,
+        CompilationContext $compilationContext,
+        array $expression,
+        bool $readOnly = false
+    ): ?array {
+        if (!$this->resolvedParams) {
+            $hasParametersByName = false;
+            foreach ($parameters as $parameter) {
+                if (isset($parameter['name'])) {
+                    $hasParametersByName = true;
+                    break;
+                }
+            }
+
+            /**
+             * All parameters must be passed by name
+             */
+            if ($hasParametersByName) {
+                foreach ($parameters as $parameter) {
+                    if (!isset($parameter['name'])) {
+                        throw new CompilerException('All parameters must use named', $parameter);
+                    }
+                }
+            }
+
+            if ($hasParametersByName) {
+                if ($this->reflection) {
+                    $positionalParameters = [];
+                    foreach ($this->reflection->getParameters() as $position => $reflectionParameter) {
+                        if (is_object($reflectionParameter)) {
+                            $positionalParameters[$reflectionParameter->getName()] = $position;
+                        } else {
+                            $positionalParameters[$reflectionParameter['name']] = $position;
+                        }
+                    }
+                    $orderedParameters = [];
+                    foreach ($parameters as $parameter) {
+                        if (isset($positionalParameters[$parameter['name']])) {
+                            $orderedParameters[$positionalParameters[$parameter['name']]] = $parameter;
+                        } else {
+                            throw new CompilerException(
+                                'Named parameter "'
+                                . $parameter['name']
+                                . '" is not a valid parameter name, available: '
+                                . implode(', ', array_keys($positionalParameters)),
+                                $parameter['parameter']
+                            );
+                        }
+                    }
+                    $parameters_count = count($parameters);
+                    for ($i = 0; $i < $parameters_count; ++$i) {
+                        if (!isset($orderedParameters[$i])) {
+                            $orderedParameters[$i] = ['parameter' => ['type' => 'null']];
+                        }
+                    }
+                    $parameters = $orderedParameters;
+                }
+            }
+
+            $params = [];
+            foreach ($parameters as $parameter) {
+                if (is_array($parameter['parameter'])) {
+                    $paramExpr = new Expression($parameter['parameter']);
+
+                    switch ($parameter['parameter']['type']) {
+                        case 'property-access':
+                        case 'array-access':
+                        case 'static-property-access':
+                            $paramExpr->setReadOnly(true);
+                            break;
+
+                        default:
+                            $paramExpr->setReadOnly($readOnly);
+                            break;
+                    }
+
+                    $params[] = $paramExpr->compile($compilationContext);
+                    continue;
+                }
+
+                if ($parameter['parameter'] instanceof CompiledExpression) {
+                    $params[] = $parameter['parameter'];
+                    continue;
+                }
+
+                throw new CompilerException('Invalid expression ', $expression);
+            }
+            $this->resolvedParams = $params;
         }
+
+        return $this->resolvedParams;
     }
 
     /**
-     * Checks the last call status or make a label jump to the next catch block.
+     * Return resolved parameter types.
      *
-     * @param CompilationContext $compilationContext
+     * @return array
      */
-    public function addCallStatusOrJump(CompilationContext $compilationContext): void
+    public function getResolvedTypes(): array
     {
-        $compilationContext->headersManager->add('kernel/fcall');
-        if ($compilationContext->insideTryCatch) {
-            $compilationContext->codePrinter->output(
-                'zephir_check_call_status_or_jump(try_end_'.$compilationContext->currentTryCatch.');'
-            );
+        return $this->resolvedTypes;
+    }
 
-            return;
+    /**
+     * Returns the symbol variable that must be returned by the call.
+     *
+     * @param bool                    $useTemp
+     * @param CompilationContext|null $compilationContext
+     *
+     * @return Variable|null
+     */
+    public function getSymbolVariable(bool $useTemp = false, CompilationContext $compilationContext = null): ?Variable
+    {
+        $symbolVariable = $this->symbolVariable;
+
+        if ($useTemp && !is_object($symbolVariable)) {
+            return $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
         }
 
-        $compilationContext->codePrinter->output('zephir_check_call_status();');
+        return $symbolVariable;
     }
 
     /**
-     * Checks if temporary parameters must be copied or not.
+     * Returns the temporal variables generated during the parameter resolving.
      *
-     * @param CompilationContext $compilationContext
+     * @return Variable[]
      */
-    public function checkTempParameters(CompilationContext $compilationContext): void
+    public function getTemporalVariables(): array
     {
-        $compilationContext->headersManager->add('kernel/fcall');
-        foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $compilationContext->codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
-        }
+        return $this->temporalVariables;
     }
 
     /**
-     * Return resolved parameter types.
+     * Check if an external expression is expecting the call return a value.
      *
-     * @return array
+     * @return bool
      */
-    public function getResolvedTypes(): array
+    public function isExpectingReturn(): bool
     {
-        return $this->resolvedTypes;
+        return $this->isExpecting;
     }
 
     /**
-     * Return resolved parameter dynamic types.
+     * Returns if the symbol to be returned by the call must be initialized.
      *
-     * @return array
+     * @return bool
      */
-    public function getResolvedDynamicTypes(): array
+    public function mustInitSymbolVariable(): bool
     {
-        return $this->resolvedDynamicTypes;
+        return $this->mustInit;
     }
 
     /**
-     * Returns the temporal variables generated during the parameter resolving.
+     * Processes the symbol variable that will be used to return
+     * the result of the symbol call.
      *
-     * @return Variable[]
+     * @param CompilationContext $compilationContext
      */
-    public function getTemporalVariables(): array
+    public function processExpectedObservedReturn(CompilationContext $compilationContext): void
     {
-        return $this->temporalVariables;
+        $expr       = $this->expression;
+        $expression = $expr->getExpression();
+
+        /**
+         * Create temporary variable if needed.
+         */
+        $mustInit       = false;
+        $symbolVariable = null;
+        $isExpecting    = $expr->isExpectingReturn();
+        if ($isExpecting) {
+            $symbolVariable = $expr->getExpectingVariable();
+            if (is_object($symbolVariable)) {
+                $readDetector = new ReadDetector();
+                if ($readDetector->detect($symbolVariable->getName(), $expression)) {
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                        'variable',
+                        $compilationContext
+                    );
+                } else {
+                    $mustInit = true;
+                }
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                    'variable',
+                    $compilationContext
+                );
+            }
+        }
+
+        $this->mustInit       = $mustInit;
+        $this->symbolVariable = $symbolVariable;
+        $this->isExpecting    = $isExpecting;
     }
 
     /**
-     * Parameters to check if they must be copied.
+     * Processes the symbol variable that will be used to return
+     * the result of the symbol call.
      *
-     * @return array
+     * @param CompilationContext $compilationContext
      */
-    public function getMustCheckForCopyVariables(): array
+    public function processExpectedReturn(CompilationContext $compilationContext): void
     {
-        return $this->mustCheckForCopy;
+        $expr       = $this->expression;
+        $expression = $expr->getExpression();
+
+        /**
+         * Create temporary variable if needed.
+         */
+        $symbolVariable = null;
+        $isExpecting    = $expr->isExpectingReturn();
+        if ($isExpecting) {
+            $symbolVariable = $expr->getExpectingVariable();
+            if (is_object($symbolVariable)) {
+                $readDetector = new ReadDetector();
+                if ($readDetector->detect($symbolVariable->getName(), $expression)) {
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                        'variable',
+                        $compilationContext,
+                        $expression
+                    );
+                } else {
+                    $this->mustInit = true;
+                }
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
+            }
+        }
+
+        $this->symbolVariable = $symbolVariable;
+        $this->isExpecting    = $isExpecting;
     }
 }
diff --git a/src/Class/Constant.php b/src/Class/Constant.php
index e7dd91a074..032d0bac69 100644
--- a/src/Class/Constant.php
+++ b/src/Class/Constant.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Class;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Expression\Constants;
@@ -30,6 +31,32 @@ public function __construct(
     ) {
     }
 
+    /**
+     * Produce the code to register a class constant.
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function compile(CompilationContext $compilationContext): void
+    {
+        $this->processValue($compilationContext);
+        $constantValue = $this->value['value'] ?? null;
+        $compilationContext->backend->declareConstant(
+            $this->value['type'],
+            $this->getName(),
+            $constantValue,
+            $compilationContext
+        );
+    }
+
+    /**
+     * Returns the docblock related to the constant.
+     */
+    public function getDocBlock(): ?string
+    {
+        return $this->docblock;
+    }
+
     /**
      * Returns the constant's name.
      */
@@ -38,6 +65,14 @@ public function getName(): string
         return $this->name;
     }
 
+    /**
+     * Get type of class constant.
+     */
+    public function getType(): string
+    {
+        return $this->value['type'];
+    }
+
     /**
      * Returns the constant's value.
      */
@@ -62,27 +97,11 @@ public function getValueValue(): mixed
         return $this->value['value'] ?? null;
     }
 
-    /**
-     * Returns the docblock related to the constant.
-     */
-    public function getDocBlock(): ?string
-    {
-        return $this->docblock;
-    }
-
-    /**
-     * Get type of class constant.
-     */
-    public function getType(): string
-    {
-        return $this->value['type'];
-    }
-
     /**
      * Process the value of the class constant if needed.
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function processValue(CompilationContext $compilationContext): void
     {
@@ -90,7 +109,7 @@ public function processValue(CompilationContext $compilationContext): void
             $compiledExpression = (new Constants())->compile($this->value, $compilationContext);
 
             $this->value = [
-                'type' => $compiledExpression->getType(),
+                'type'  => $compiledExpression->getType(),
                 'value' => $compiledExpression->getCode(),
             ];
 
@@ -101,27 +120,9 @@ public function processValue(CompilationContext $compilationContext): void
             $compiledExpression = (new StaticConstantAccess())->compile($this->value, $compilationContext);
 
             $this->value = [
-                'type' => $compiledExpression->getType(),
+                'type'  => $compiledExpression->getType(),
                 'value' => $compiledExpression->getCode(),
             ];
         }
     }
-
-    /**
-     * Produce the code to register a class constant.
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function compile(CompilationContext $compilationContext): void
-    {
-        $this->processValue($compilationContext);
-        $constantValue = $this->value['value'] ?? null;
-        $compilationContext->backend->declareConstant(
-            $this->value['type'],
-            $this->getName(),
-            $constantValue,
-            $compilationContext
-        );
-    }
 }
diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 1e5110587c..6ff79d7114 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Class\Definition;
 
+use ReflectionClass;
+use ReflectionException;
 use Zephir\AliasManager;
 use Zephir\Class\Constant;
 use Zephir\Class\Entry;
@@ -31,613 +33,748 @@
 use Zephir\HeadersManager;
 use Zephir\StatementsBlock;
 
+use function count;
+use function explode;
+use function gettype;
+use function is_array;
+use function ltrim;
+use function metaphone;
+use function method_exists;
+use function sprintf;
+use function str_replace;
+use function strtolower;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * Represents a class/interface and their properties and methods.
  */
 final class Definition extends AbstractDefinition
 {
-    public const TYPE_CLASS = 'class';
+    public const TYPE_CLASS     = 'class';
     public const TYPE_INTERFACE = 'interface';
 
     /**
-     * Class short name
-     *
-     * If didn't specify, then equals to $name
-     *
-     * @see Definition::name
+     * Contains "abstract" in the definition
      */
-    protected string $shortName;
-
+    protected bool $abstract = false;
     /**
-     * Definition type
+     * @var AliasManager|null
      */
-    protected string $type = self::TYPE_CLASS;
-
+    protected ?AliasManager $aliasManager = null;
     /**
-     * Name of inherited class
+     * @var Compiler
      */
-    protected ?string $extendsClass = null;
-
+    protected Compiler $compiler;
     /**
-     * List of implemented interfaces of current class
+     * @var Constant[]
      */
-    protected array $interfaces = [];
-
+    protected array $constants = [];
     /**
-     * Contains "final" in the definition
+     * @var int
      */
-    protected bool $final = false;
-
+    protected int $dependencyRank = 0;
     /**
-     * Contains "abstract" in the definition
+     * @var string
      */
-    protected bool $abstract = false;
-
+    protected string $docBlock = '';
     /**
-     * When class is from external dependency
+     * Name of inherited class
      */
-    protected bool $external = false;
-
+    protected ?string $extendsClass = null;
     /**
      * Definition object of inherited class
      */
     protected ?AbstractDefinition $extendsClassDefinition = null;
-
-    protected array $implementedInterfaceDefinitions = [];
-
     /**
-     * @var Property[]
+     * When class is from external dependency
      */
-    protected array $properties = [];
-
+    protected bool $external = false;
     /**
-     * @var Constant[]
+     * Contains "final" in the definition
      */
-    protected array $constants = [];
-
+    protected bool $final = false;
     /**
-     * @var Method[]
+     * @var array
      */
-    protected array $methods = [];
-
-    protected string $docBlock = '';
-
-    protected ?Docblock $parsedDocblock = null;
-
-    protected int $dependencyRank = 0;
-
-    protected array $originalNode = [];
-
-    protected bool $isBundled = false;
-
-    protected ?AliasManager $aliasManager = null;
-
-    protected Compiler $compiler;
-
-    public function __construct(protected string $namespace, string $name, string $shortName = null)
-    {
-        $this->name = $name;
-        $this->shortName = $shortName ?: $name;
-    }
-
+    protected array $implementedInterfaceDefinitions = [];
     /**
-     * Sets if the class is internal or not.
+     * List of implemented interfaces of current class
      */
-    public function setIsBundled(bool $isBundled): void
-    {
-        $this->isBundled = $isBundled;
-    }
-
+    protected array $interfaces = [];
     /**
-     * Returns whether the class is bundled or not.
+     * @var bool
      */
-    public function isBundled(): bool
-    {
-        return $this->isBundled;
-    }
-
+    protected bool $isBundled = false;
     /**
-     * Sets whether the class is external or not.
+     * @var Method[]
      */
-    public function setIsExternal(bool $isExternal): void
-    {
-        $this->external = $isExternal;
-    }
-
+    protected array $methods = [];
     /**
-     * Returns whether the class is internal or not.
+     * @var array
      */
-    public function isExternal(): bool
-    {
-        return $this->external;
-    }
-
+    protected array $originalNode = [];
     /**
-     * Set the class' type (class/interface).
+     * @var Docblock|null
      */
-    public function setType(string $type): void
-    {
-        $this->type = $type;
-    }
-
+    protected ?Docblock $parsedDocblock = null;
     /**
-     * Returns the class type.
+     * @var Property[]
      */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
+    protected array $properties = [];
     /**
-     * Returns the class name without namespace.
+     * Class short name
+     *
+     * If didn't specify, then equals to $name
+     *
+     * @see Definition::name
      */
-    public function getShortName(): string
-    {
-        return $this->shortName;
-    }
-
+    protected string $shortName;
     /**
-     * Check if the class definition correspond to an interface.
+     * Definition type
      */
-    public function isInterface(): bool
-    {
-        return 'interface' === $this->type;
-    }
+    protected string $type = self::TYPE_CLASS;
 
-    /**
-     * Sets if the class is final.
-     */
-    public function setIsFinal(bool $final): void
+    public function __construct(protected string $namespace, string $name, string $shortName = null)
     {
-        $this->final = $final;
+        $this->name      = $name;
+        $this->shortName = $shortName ?: $name;
     }
 
     /**
-     * Sets if the class is final.
+     * Adds a constant to the definition.
+     *
+     * @throws CompilerException
      */
-    public function setIsAbstract(bool $abstract): void
+    public function addConstant(Constant $constant): void
     {
-        $this->abstract = $abstract;
-    }
+        if (isset($this->constants[$constant->getName()])) {
+            throw new CompilerException("Constant '" . $constant->getName() . "' was defined more than one time");
+        }
 
-    /**
-     * Checks whether the class is abstract or not.
-     */
-    public function isAbstract(): bool
-    {
-        return $this->abstract;
+        $this->constants[$constant->getName()] = $constant;
     }
 
     /**
-     * Checks whether the class is abstract or not.
+     * Creates the initialization method.
      */
-    public function isFinal(): bool
+    public function addInitMethod(StatementsBlock $statementsBlock): void
     {
-        return $this->final;
-    }
+        if ($statementsBlock->isEmpty()) {
+            return;
+        }
 
-    /**
-     * Returns the class name including its namespace.
-     */
-    public function getCompleteName(): string
-    {
-        return $this->namespace.'\\'.$this->shortName;
-    }
+        $initClassName = $this->getCNamespace() . '_' . $this->getName();
+        $classMethod   = new Method(
+            $this,
+            ['internal'],
+            'zephir_init_properties_' . $initClassName,
+            null,
+            $statementsBlock
+        );
 
-    /**
-     * Return the class namespace.
-     */
-    public function getNamespace(): string
-    {
-        return $this->namespace;
+        $classMethod->setIsInitializer(true);
+        $this->addMethod($classMethod);
     }
 
     /**
-     * Set the original node where the class was declared.
+     * Adds a method to the class definition.
+     *
+     * @throws CompilerException
      */
-    public function setOriginalNode(array $originalNode): void
+    public function addMethod(Method $method, array $statement = null): void
     {
-        $this->originalNode = $originalNode;
-    }
+        $methodName = strtolower($method->getName());
+        if (isset($this->methods[$methodName])) {
+            throw new CompilerException(
+                "Method '" . $method->getName() . "' was defined more than one time",
+                $statement
+            );
+        }
 
-    /**
-     * Sets the extended class.
-     */
-    public function setExtendsClass(string $extendsClass): void
-    {
-        $this->extendsClass = $extendsClass;
+        $this->methods[$methodName] = $method;
     }
 
     /**
-     * Sets the implemented interfaces.
+     * Adds a property to the definition.
+     *
+     * @throws CompilerException
      */
-    public function setImplementsInterfaces(array $implementedInterfaces): void
+    public function addProperty(Property $property): void
     {
-        $this->interfaces = [];
-        foreach ($implementedInterfaces as $implementedInterface) {
-            $this->interfaces[] = $implementedInterface['value'];
+        if (isset($this->properties[$property->getName()])) {
+            throw new CompilerException(
+                "Property '" . $property->getName() . "' was defined more than one time",
+                $property->getOriginal()
+            );
         }
-    }
 
-    /**
-     * Returns the extended class.
-     */
-    public function getExtendsClass(): ?string
-    {
-        return $this->extendsClass;
+        $this->properties[$property->getName()] = $property;
     }
 
     /**
-     * Returns the implemented interfaces.
+     * Creates the static initialization method.
      */
-    public function getImplementedInterfaces(): array
+    public function addStaticInitMethod(StatementsBlock $statementsBlock): void
     {
-        return $this->interfaces;
-    }
+        $initClassName = $this->getCNamespace() . '_' . $this->getName();
 
-    /**
-     * Sets the class definition for the extended class.
-     */
-    public function setExtendsClassDefinition(AbstractDefinition $classDefinition): void
-    {
-        $this->extendsClassDefinition = $classDefinition;
+        $classMethod = new Method(
+            $this,
+            ['internal'],
+            'zephir_init_static_properties_' . $initClassName,
+            null,
+            $statementsBlock
+        );
+
+        $classMethod->setIsInitializer(true);
+        $classMethod->setIsStatic(true);
+        $this->addMethod($classMethod);
     }
 
     /**
-     * Returns the class definition related to the extended class.
+     * Builds a class definition from reflection.
      */
-    public function getExtendsClassDefinition(): ?AbstractDefinition
+    public static function buildFromReflection(ReflectionClass $class): self
     {
-        if (!$this->extendsClassDefinition && $this->extendsClass && $this->compiler) {
-            $this->setExtendsClassDefinition($this->compiler->getClassDefinition($this->extendsClass));
-        }
+        $classDefinition = new self($class->getNamespaceName(), $class->getName(), $class->getShortName());
 
-        return $this->extendsClassDefinition;
-    }
-
-    /**
-     * Sets the class definition for the implemented interfaces.
-     */
-    public function setImplementedInterfaceDefinitions(array $implementedInterfaceDefinitions): void
-    {
-        $this->implementedInterfaceDefinitions = $implementedInterfaceDefinitions;
-    }
+        foreach ($class->getMethods() as $method) {
+            $parameters = [];
 
-    /**
-     * Returns the class definition for the implemented interfaces.
-     */
-    public function getImplementedInterfaceDefinitions(): array
-    {
-        return $this->implementedInterfaceDefinitions;
-    }
+            foreach ($method->getParameters() as $row) {
+                $params = [
+                    'type'      => 'parameter',
+                    'name'      => $row->getName(),
+                    'const'     => 0,
+                    'data-type' => 'variable',
+                    'mandatory' => !$row->isOptional(),
+                ];
 
-    /**
-     * Calculate the dependency rank of the class based on its dependencies.
-     */
-    public function getDependencies(): array
-    {
-        $dependencies = [];
-        if ($this->extendsClassDefinition instanceof self) {
-            $dependencies[] = $this->extendsClassDefinition;
-        }
+                if (!$params['mandatory']) {
+                    try {
+                        $params['default'] = $row->getDefaultValue();
+                    } catch (ReflectionException $e) {
+                        // TODO: dummy default value
+                        $params['default'] = true;
+                    }
+                }
 
-        foreach ($this->implementedInterfaceDefinitions as $interfaceDefinition) {
-            if ($interfaceDefinition instanceof self) {
-                $dependencies[] = $interfaceDefinition;
+                $parameters[] = $params;
             }
+
+            $classMethod = new Method(
+                $classDefinition,
+                [],
+                $method->getName(),
+                new Parameters($parameters)
+            );
+            $classMethod->setIsStatic($method->isStatic());
+            $classMethod->setIsBundled(true);
+            $classDefinition->addMethod($classMethod);
         }
 
-        return $dependencies;
-    }
+        foreach ($class->getConstants() as $constantName => $constantValue) {
+            $type          = self::convertPhpConstantType(gettype($constantValue));
+            $classConstant = new Constant($constantName, ['value' => $constantValue, 'type' => $type], null);
+            $classDefinition->addConstant($classConstant);
+        }
 
-    /**
-     * A class definition calls this method to mark this class as a dependency of another.
-     *
-     * @param int $rank
-     */
-    public function increaseDependencyRank(int $rank): void
-    {
-        $this->dependencyRank += $rank + 1;
-    }
+        foreach ($class->getProperties() as $property) {
+            $visibility = [];
 
-    /**
-     * Returns the dependency rank for this class.
-     */
-    public function getDependencyRank(): int
-    {
-        return $this->dependencyRank;
-    }
+            if ($property->isPublic()) {
+                $visibility[] = 'public';
+            }
 
-    /**
-     * Sets the class/interface docBlock.
-     */
-    public function setDocBlock(string $docBlock): void
-    {
-        $this->docBlock = $docBlock;
-    }
+            if ($property->isPrivate()) {
+                $visibility[] = 'private';
+            }
 
-    /**
-     * Returns the class/interface docBlock.
-     */
-    public function getDocBlock(): string
-    {
-        return $this->docBlock;
-    }
+            if ($property->isProtected()) {
+                $visibility[] = 'protected';
+            }
 
-    /**
-     * Returns the parsed docBlock.
-     */
-    public function getParsedDocBlock(): ?DocBlock
-    {
-        if ($this->parsedDocblock instanceof Docblock) {
-            return $this->parsedDocblock;
-        }
+            if ($property->isStatic()) {
+                $visibility[] = 'static';
+            }
 
-        if ($this->docBlock === '') {
-            return null;
+            $classProperty = new Property(
+                $classDefinition,
+                $visibility,
+                $property->getName(),
+                null,
+                null,
+                null
+            );
+            $classDefinition->addProperty($classProperty);
         }
 
-        $this->parsedDocblock = (new DocblockParser('/'.$this->docBlock.'/'))->parse();
+        $classDefinition->setIsBundled(true);
 
-        return $this->parsedDocblock;
+        return $classDefinition;
     }
 
     /**
-     * Adds a property to the definition.
+     * Checks if a class implements an interface.
      *
      * @throws CompilerException
      */
-    public function addProperty(Property $property): void
+    public function checkInterfaceImplements(self $classDefinition, self $interfaceDefinition): void
     {
-        if (isset($this->properties[$property->getName()])) {
-            throw new CompilerException("Property '".$property->getName()."' was defined more than one time", $property->getOriginal());
-        }
+        foreach ($interfaceDefinition->getMethods() as $method) {
+            if (!$classDefinition->hasMethod($method->getName())) {
+                throw new CompilerException(
+                    sprintf(
+                        'Class %s must implement a method called: "%s" as requirement of interface: "%s"',
+                        $classDefinition->getCompleteName(),
+                        $method->getName(),
+                        $interfaceDefinition->getCompleteName()
+                    )
+                );
+            }
 
-        $this->properties[$property->getName()] = $property;
+            if (!$method->hasParameters()) {
+                continue;
+            }
+
+            $implementedMethod = $classDefinition->getMethod($method->getName());
+            if (
+                $implementedMethod->getNumberOfRequiredParameters() > $method->getNumberOfRequiredParameters() ||
+                $implementedMethod->getNumberOfParameters() < $method->getNumberOfParameters()
+            ) {
+                throw new CompilerException(
+                    sprintf(
+                        'Method %s::%s() does not have the same number of required parameters in interface: "%s"',
+                        $classDefinition->getCompleteName(),
+                        $method->getName(),
+                        $interfaceDefinition->getCompleteName()
+                    )
+                );
+            }
+        }
     }
 
     /**
-     * Adds a constant to the definition.
+     * Compiles a class/interface.
      *
-     * @throws CompilerException
+     * @throws Exception
+     * @throws ReflectionException
      */
-    public function addConstant(Constant $constant): void
+    public function compile(CompilationContext $compilationContext): void
     {
-        if (isset($this->constants[$constant->getName()])) {
-            throw new CompilerException("Constant '".$constant->getName()."' was defined more than one time");
-        }
+        $this->compiler = $compilationContext->compiler;
 
-        $this->constants[$constant->getName()] = $constant;
-    }
+        /**
+         * Sets the current object as global class definition
+         */
+        $compilationContext->classDefinition = $this;
 
-    /**
-     * Checks if a class definition has a property.
-     */
-    public function hasProperty(string $name): bool
-    {
-        if (isset($this->properties[$name])) {
-            return true;
-        }
+        /**
+         * Get the global codePrinter.
+         */
+        $codePrinter = $compilationContext->codePrinter;
 
-        $extendsClassDefinition = $this->getExtendsClassDefinition();
+        /**
+         * The ZEPHIR_INIT_CLASS defines properties and constants exported by the class.
+         */
+        $initClassName = $this->getCNamespace() . '_' . $this->getName();
+        $codePrinter->output('ZEPHIR_INIT_CLASS(' . $initClassName . ')');
+        $codePrinter->output('{');
+        $codePrinter->increaseLevel();
 
-        return $extendsClassDefinition instanceof self && $extendsClassDefinition->hasProperty($name);
-    }
+        /**
+         * Method entry.
+         */
+        $methods    = &$this->methods;
+        $initMethod = $this->getLocalOrParentInitMethod();
 
-    /**
-     * Returns a method definition by its name.
-     *
-     * @param string $propertyName
-     *
-     * @return Property|null
-     */
-    public function getProperty(string $propertyName): ?Property
-    {
-        if (isset($this->properties[$propertyName])) {
-            return $this->properties[$propertyName];
+        if (count($methods) > 0 || $initMethod) {
+            $methodEntry = strtolower($this->getCNamespace()) . '_' . strtolower($this->getName()) . '_method_entry';
+        } else {
+            $methodEntry = 'NULL';
         }
 
-        $extendsClassDefinition = $this->getExtendsClassDefinition();
-        if ($extendsClassDefinition instanceof self) {
-            return $extendsClassDefinition->getProperty($propertyName);
+        foreach ($methods as $method) {
+            $method->setupOptimized($compilationContext);
         }
 
-        return null;
-    }
+        $namespace = str_replace('\\', '_', $compilationContext->config->get('namespace'));
 
-    /**
-     * Checks if class definition has a property.
-     */
-    public function hasConstant(string $name): bool
-    {
-        if (isset($this->constants[$name])) {
-            return true;
+        $flags = '0';
+        if ($this->isAbstract()) {
+            $flags = 'ZEND_ACC_EXPLICIT_ABSTRACT_CLASS';
         }
 
-        $extendsClassDefinition = $this->getExtendsClassDefinition();
-        if ($extendsClassDefinition instanceof self && $extendsClassDefinition->hasConstant($name)) {
-            return true;
+        if ($this->isFinal()) {
+            if ('0' === $flags) {
+                $flags = 'ZEND_ACC_FINAL_CLASS';
+            } else {
+                $flags .= '|ZEND_ACC_FINAL_CLASS';
+            }
         }
 
         /**
-         * Check if constant is defined in interfaces
+         * Register the class with extends + interfaces.
          */
-        return $this->hasConstantFromInterfaces($name);
-    }
+        $classExtendsDefinition = null;
+        if ($this->extendsClass) {
+            $classExtendsDefinition = $this->extendsClassDefinition;
+            if ($classExtendsDefinition instanceof self && !$classExtendsDefinition->isBundled()) {
+                $classEntry = $classExtendsDefinition->getClassEntry($compilationContext);
+            } else {
+                $className  = method_exists(
+                    $classExtendsDefinition,
+                    'getCompleteName'
+                ) ? $classExtendsDefinition->getCompleteName() : $classExtendsDefinition->getName();
+                $classEntry = (new Entry('\\' . ltrim($className, '\\'), $compilationContext))->get();
+            }
 
-    /**
-     * Returns a constant definition by its name.
-     *
-     * @throws InvalidArgumentException
-     */
-    public function getConstant(string $constantName): ?Constant
-    {
-        if (isset($this->constants[$constantName])) {
-            return $this->constants[$constantName];
+            if (self::TYPE_CLASS === $this->getType()) {
+                $codePrinter->output(
+                    'ZEPHIR_REGISTER_CLASS_EX(' . $this->getNCNamespace() . ', ' . $this->getName(
+                    ) . ', ' . $namespace . ', ' . strtolower(
+                        $this->getSCName($namespace)
+                    ) . ', ' . $classEntry . ', ' . $methodEntry . ', ' . $flags . ');'
+                );
+            } else {
+                $codePrinter->output(
+                    'ZEPHIR_REGISTER_INTERFACE_EX(' . $this->getNCNamespace() . ', ' . $this->getName(
+                    ) . ', ' . $namespace . ', ' . strtolower(
+                        $this->getSCName($namespace)
+                    ) . ', ' . $classEntry . ', ' . $methodEntry . ');'
+                );
+            }
+        } else {
+            if (self::TYPE_CLASS === $this->getType()) {
+                $codePrinter->output(
+                    'ZEPHIR_REGISTER_CLASS(' . $this->getNCNamespace() . ', ' . $this->getName(
+                    ) . ', ' . $namespace . ', ' . strtolower(
+                        $this->getSCName($namespace)
+                    ) . ', ' . $methodEntry . ', ' . $flags . ');'
+                );
+            } else {
+                $codePrinter->output(
+                    'ZEPHIR_REGISTER_INTERFACE(' . $this->getNCNamespace() . ', ' . $this->getName(
+                    ) . ', ' . $namespace . ', ' . strtolower($this->getSCName($namespace)) . ', ' . $methodEntry . ');'
+                );
+            }
         }
 
-        $extendsClassDefinition = $this->getExtendsClassDefinition();
-        if ($extendsClassDefinition instanceof self && $extendsClassDefinition->hasConstant($constantName)) {
-            return $extendsClassDefinition->getConstant($constantName);
-        }
+        $codePrinter->outputBlankLine();
 
         /**
-         * Gets constant from interfaces
+         * Compile properties.
          */
-        return $this->getConstantFromInterfaces($constantName);
-    }
+        foreach ($this->getProperties() as $property) {
+            $docBlock = $property->getDocBlock();
+            if ($docBlock) {
+                $codePrinter->outputDocBlock($docBlock);
+            }
 
-    /**
-     * Adds a method to the class definition.
-     *
-     * @throws CompilerException
-     */
-    public function addMethod(Method $method, array $statement = null): void
-    {
-        $methodName = strtolower($method->getName());
-        if (isset($this->methods[$methodName])) {
-            throw new CompilerException("Method '".$method->getName()."' was defined more than one time", $statement);
+            $property->compile($compilationContext);
+            $codePrinter->outputBlankLine();
         }
 
-        $this->methods[$methodName] = $method;
-    }
+        $initMethod = $this->getInitMethod();
+        if ($initMethod) {
+            $codePrinter->output(
+                $namespace . '_' . strtolower(
+                    $this->getSCName($namespace)
+                ) . '_ce->create_object = ' . $initMethod->getName() . ';'
+            );
+        }
 
-    /**
-     * Updates an existing method definition.
-     *
-     * @throws CompilerException
-     */
-    public function updateMethod(Method $method, array $statement = null): void
-    {
-        $methodName = strtolower($method->getName());
-        if (!isset($this->methods[$methodName])) {
-            throw new CompilerException("Method '".$method->getName()."' does not exist", $statement);
+        /**
+         * Compile constants.
+         */
+        foreach ($this->getConstants() as $constant) {
+            $docBlock = $constant->getDocBlock();
+            if ($docBlock) {
+                $codePrinter->outputDocBlock($docBlock);
+            }
+
+            $constant->compile($compilationContext);
+            $codePrinter->outputBlankLine();
         }
 
-        $this->methods[$methodName] = $method;
-    }
+        /**
+         * Implemented interfaces.
+         */
+        $interfaces = $this->interfaces;
+        $compiler   = $compilationContext->compiler;
 
-    /**
-     * Returns all properties defined in the class.
-     *
-     * @return Property[]
-     */
-    public function getProperties(): array
-    {
-        return $this->properties;
-    }
+        if (is_array($interfaces)) {
+            $codePrinter->outputBlankLine(true);
 
-    /**
-     * Returns all constants defined in the class.
-     *
-     * @return Constant[]
-     */
-    public function getConstants(): array
-    {
-        return $this->constants;
-    }
+            foreach ($interfaces as $interface) {
+                /**
+                 * Try to find the interface.
+                 */
+                $classEntry = null;
 
-    /**
-     * Returns all methods defined in the class.
-     *
-     * @return Method[]
-     */
-    public function getMethods(): array
-    {
-        return $this->methods;
-    }
+                if ($compiler->isInterface($interface)) {
+                    $classInterfaceDefinition = $compiler->getClassDefinition($interface);
+                    $classEntry               = $classInterfaceDefinition->getClassEntry($compilationContext);
+                } elseif ($compiler->isBundledInterface($interface)) {
+                    $classInterfaceDefinition = $compiler->getInternalClassDefinition($interface);
+                    $classEntry               = (new Entry(
+                        '\\' . $classInterfaceDefinition->getName(),
+                        $compilationContext
+                    ))->get();
+                }
 
-    /**
-     * Checks if the class implements a specific name.
-     *
-     * @param string $methodName
-     *
-     * @return bool
-     */
-    public function hasMethod(string $methodName): bool
-    {
-        $methodNameLower = strtolower($methodName);
-        foreach ($this->methods as $name => $method) {
-            if ($methodNameLower === $name) {
-                return true;
-            }
-        }
+                if (!$classEntry) {
+                    if ($compiler->isClass($interface)) {
+                        throw new CompilerException(
+                            sprintf(
+                                'Cannot locate interface %s when implementing interfaces on %s. ' .
+                                '%s is currently a class',
+                                $interface,
+                                $this->getCompleteName(),
+                                $interface
+                            ),
+                            $this->originalNode
+                        );
+                    } else {
+                        throw new CompilerException(
+                            sprintf(
+                                'Cannot locate interface %s when implementing interfaces on %s',
+                                $interface,
+                                $this->getCompleteName()
+                            ),
+                            $this->originalNode
+                        );
+                    }
+                }
 
-        $extendsClassDefinition = $this->getExtendsClassDefinition();
-        if ($extendsClassDefinition instanceof DefinitionRuntime) {
-            try {
-                $extendsClassDefinition = $this->compiler->getInternalClassDefinition(
-                    $extendsClassDefinition->getName()
+                /**
+                 * We don't check if abstract classes implement the methods in their interfaces
+                 */
+                if (!$this->isAbstract() && !$this->isInterface()) {
+                    $this->checkInterfaceImplements($this, $classInterfaceDefinition);
+                }
+
+                $codePrinter->output(
+                    sprintf(
+                        'zend_class_implements(%s, 1, %s);',
+                        $this->getClassEntry(),
+                        $classEntry
+                    )
                 );
-            } catch (\ReflectionException $e) {
-                // Do nothing
-                return false;
             }
         }
 
-        while ($extendsClassDefinition instanceof self) {
-            if ($extendsClassDefinition->hasMethod($methodName)) {
-                return true;
-            }
+        if (!$this->isAbstract() && !$this->isInterface()) {
+            /**
+             * Interfaces in extended classes may have
+             */
+            if ($classExtendsDefinition instanceof self && !$classExtendsDefinition->isBundled()) {
+                $interfaces = $classExtendsDefinition->getImplementedInterfaces();
+                foreach ($interfaces as $interface) {
+                    $classInterfaceDefinition = null;
+                    if ($compiler->isInterface($interface)) {
+                        $classInterfaceDefinition = $compiler->getClassDefinition($interface);
+                    } elseif ($compiler->isBundledInterface($interface)) {
+                        $classInterfaceDefinition = $compiler->getInternalClassDefinition($interface);
+                    }
 
-            $extendsClassDefinition = $extendsClassDefinition->getExtendsClassDefinition();
+                    if ($classInterfaceDefinition !== null) {
+                        $this->checkInterfaceImplements($this, $classInterfaceDefinition);
+                    }
+                }
+            }
         }
 
-        return false;
-    }
+        $codePrinter->output('return SUCCESS;');
+        $codePrinter->decreaseLevel();
 
-    /**
-     * Returns a method by its name.
-     */
-    public function getMethod(string $methodName, bool $checkExtends = true): ?Method
-    {
-        $methodNameLower = strtolower($methodName);
-        foreach ($this->methods as $name => $method) {
-            if ($methodNameLower === $name) {
-                return $method;
+        $codePrinter->output('}');
+        $codePrinter->outputBlankLine();
+
+        /**
+         * Compile methods
+         */
+        foreach ($methods as $method) {
+            $docBlock = $method->getDocBlock();
+            if ($docBlock) {
+                $codePrinter->outputDocBlock($docBlock);
             }
-        }
 
-        if (!$checkExtends) {
-            return null;
-        }
+            if (self::TYPE_CLASS === $this->getType()) {
+                if (!$method->isInternal()) {
+                    $codePrinter->output(
+                        'PHP_METHOD(' . $this->getCNamespace() . '_' . $this->getName() . ', ' . $method->getName(
+                        ) . ')'
+                    );
+                } else {
+                    $codePrinter->output(
+                        $compilationContext->backend->getInternalSignature($method, $compilationContext)
+                    );
+                }
+                $codePrinter->output('{');
 
-        $extendsClassDefinition = $this->getExtendsClassDefinition();
-        if ($extendsClassDefinition instanceof self) {
-            if ($extendsClassDefinition->hasMethod($methodName)) {
-                return $extendsClassDefinition->getMethod($methodName);
+                if (!$method->isAbstract()) {
+                    $method->compile($compilationContext);
+                }
+
+                $codePrinter->output('}');
+                $codePrinter->outputBlankLine();
+            } else {
+                $codePrinter->output(
+                    'ZEPHIR_DOC_METHOD(' . $this->getCNamespace() . '_' . $this->getName() . ', ' . $method->getName(
+                    ) . ');'
+                );
             }
         }
 
-        return null;
-    }
+        /**
+         * Check whether classes must be exported.
+         */
+        $exportClasses = $compilationContext->config->get('export-classes', 'extra');
+        $exportAPI     = $exportClasses ? 'extern ZEPHIR_API' : 'extern';
 
-    /**
-     * Set a method and its body.
-     */
-    public function setMethod(string $methodName, Method $method): void
-    {
-        $this->methods[$methodName] = $method;
-    }
+        /**
+         * Create a code printer for the header file.
+         */
+        $codePrinter = new Printer();
 
-    /**
-     * Tries to find the most similar name.
-     */
-    public function getPossibleMethodName(string $methodName): ?string
-    {
-        $methodNameLower = strtolower($methodName);
+        $codePrinter->outputBlankLine();
+        $codePrinter->output($exportAPI . ' zend_class_entry *' . $this->getClassEntry() . ';');
+        $codePrinter->outputBlankLine();
 
-        foreach ($this->methods as $name => $method) {
-            if (metaphone($methodNameLower) === metaphone($name)) {
-                return $method->getName();
+        $codePrinter->output('ZEPHIR_INIT_CLASS(' . $this->getCNamespace() . '_' . $this->getName() . ');');
+        $codePrinter->outputBlankLine();
+
+        if (self::TYPE_CLASS === $this->getType() && count($methods) > 0) {
+            foreach ($methods as $method) {
+                if (!$method->isInternal()) {
+                    $codePrinter->output(
+                        'PHP_METHOD(' . $this->getCNamespace() . '_' . $this->getName() . ', ' . $method->getName(
+                        ) . ');'
+                    );
+                } else {
+                    $internalSignature = $compilationContext->backend->getInternalSignature(
+                        $method,
+                        $compilationContext
+                    );
+                    $codePrinter->output($internalSignature . ';');
+                }
             }
+            $codePrinter->outputBlankLine();
         }
 
-        if ($this->extendsClassDefinition instanceof self) {
-            return $this->extendsClassDefinition->getPossibleMethodName($methodName);
+        /**
+         * Specifying Argument Information
+         */
+        foreach ($methods as $method) {
+            $argInfo = new ArgInfoDefinition(
+                $method->getArgInfoName($this),
+                $method,
+                $codePrinter,
+                $compilationContext
+            );
+
+            $argInfo->setBooleanDefinition('_IS_BOOL');
+            $argInfo->setRichFormat(true);
+
+            $argInfo->render();
         }
 
-        return null;
+        if (count($methods) > 0) {
+            $codePrinter->output(
+                sprintf(
+                    'ZEPHIR_INIT_FUNCS(%s_%s_method_entry) {',
+                    strtolower($this->getCNamespace()),
+                    strtolower($this->getName())
+                )
+            );
+
+            foreach ($methods as $method) {
+                if (self::TYPE_CLASS === $this->getType()) {
+                    if (!$method->isInternal()) {
+                        $richFormat = $method->isReturnTypesHintDetermined() && $method->areReturnTypesCompatible();
+
+                        if ($richFormat || $method->hasParameters()) {
+                            $codePrinter->output(
+                                sprintf(
+                                // TODO: Rename to ZEND_ME
+                                    "\tPHP_ME(%s_%s, %s, %s, %s)",
+                                    $this->getCNamespace(),
+                                    $this->getName(),
+                                    $method->getName(),
+                                    $method->getArgInfoName($this),
+                                    $method->getModifiers()
+                                )
+                            );
+                        } else {
+                            $codePrinter->output(
+                                sprintf(
+                                // TODO: Rename to ZEND_ME
+                                    'PHP_ME(%s_%s, %s, %s, %s)',
+                                    $this->getCNamespace(),
+                                    $this->getName(),
+                                    $method->getName(),
+                                    $method->getArgInfoName($this),
+                                    $method->getModifiers()
+                                )
+                            );
+                        }
+                    }
+                } else {
+                    $richFormat = $method->isReturnTypesHintDetermined() && $method->areReturnTypesCompatible();
+
+                    if ($method->isStatic()) {
+                        if ($richFormat || $method->hasParameters()) {
+                            $codePrinter->output(
+                                sprintf(
+                                    "\tZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)",
+                                    $method->getName(),
+                                    $method->getArgInfoName($this)
+                                )
+                            );
+                        } else {
+                            $codePrinter->output(
+                                sprintf(
+                                    'ZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)',
+                                    $method->getName(),
+                                    $method->getArgInfoName($this)
+                                )
+                            );
+                        }
+                    } else {
+                        $isInterface = $method->getClassDefinition()->isInterface();
+                        $codePrinter->output(
+                            sprintf(
+                                "\tPHP_ABSTRACT_ME(%s_%s, %s, %s)",
+                                $this->getCNamespace(),
+                                $this->getName(),
+                                $method->getName(),
+                                $isInterface ? $method->getArgInfoName($this) : 'NULL'
+                            )
+                        );
+                    }
+                }
+            }
+
+            $codePrinter->output("\t" . 'PHP_FE_END');
+            $codePrinter->output('};'); // ZEPHIR_INIT_FUNCS
+        }
+
+        $compilationContext->headerPrinter = $codePrinter;
+    }
+
+    public function getAliasManager(): ?AliasManager
+    {
+        return $this->aliasManager;
+    }
+
+    /**
+     * Returns a valid namespace to be used in C-sources.
+     */
+    public function getCNamespace(): string
+    {
+        return str_replace('\\', '_', $this->namespace);
     }
 
     /**
@@ -660,119 +797,144 @@ public function getClassEntry(CompilationContext $compilationContext = null): st
             $compilationContext->headersManager->add($this->getExternalHeader(), HeadersManager::POSITION_LAST);
         }
 
-        return strtolower(str_replace('\\', '_', $this->namespace).'_'.$this->name).'_ce';
+        return strtolower(str_replace('\\', '_', $this->namespace) . '_' . $this->name) . '_ce';
     }
 
     /**
-     * Returns a valid namespace to be used in C-sources.
+     * Returns the class name including its namespace.
      */
-    public function getCNamespace(): string
+    public function getCompleteName(): string
     {
-        return str_replace('\\', '_', $this->namespace);
+        return $this->namespace . '\\' . $this->shortName;
     }
 
     /**
-     * Returns a valid namespace to be used in C-sources.
+     * Returns a constant definition by its name.
+     *
+     * @throws InvalidArgumentException
      */
-    public function getNCNamespace(): string
+    public function getConstant(string $constantName): ?Constant
     {
-        return str_replace('\\', '\\\\', $this->namespace);
+        if (isset($this->constants[$constantName])) {
+            return $this->constants[$constantName];
+        }
+
+        $extendsClassDefinition = $this->getExtendsClassDefinition();
+        if ($extendsClassDefinition instanceof self && $extendsClassDefinition->hasConstant($constantName)) {
+            return $extendsClassDefinition->getConstant($constantName);
+        }
+
+        /**
+         * Gets constant from interfaces
+         */
+        return $this->getConstantFromInterfaces($constantName);
     }
 
     /**
-     * Class name without namespace prefix for class registration.
+     * Returns all constants defined in the class.
+     *
+     * @return Constant[]
      */
-    public function getSCName(string $namespace): string
+    public function getConstants(): array
     {
-        return str_replace($namespace.'_', '', strtolower(str_replace('\\', '_', $this->namespace).'_'.$this->name));
+        return $this->constants;
     }
 
     /**
-     * Returns an absolute location to the class header.
+     * Calculate the dependency rank of the class based on its dependencies.
      */
-    public function getExternalHeader(): string
+    public function getDependencies(): array
     {
-        $parts = explode('\\', $this->namespace);
+        $dependencies = [];
+        if ($this->extendsClassDefinition instanceof self) {
+            $dependencies[] = $this->extendsClassDefinition;
+        }
+
+        foreach ($this->implementedInterfaceDefinitions as $interfaceDefinition) {
+            if ($interfaceDefinition instanceof self) {
+                $dependencies[] = $interfaceDefinition;
+            }
+        }
 
-        return 'ext/'.strtolower($parts[0].\DIRECTORY_SEPARATOR.str_replace('\\', \DIRECTORY_SEPARATOR, $this->namespace).\DIRECTORY_SEPARATOR.$this->name).'.zep';
+        return $dependencies;
     }
 
     /**
-     * Checks if a class implements an interface.
-     *
-     * @throws CompilerException
+     * Returns the dependency rank for this class.
      */
-    public function checkInterfaceImplements(self $classDefinition, self $interfaceDefinition): void
+    public function getDependencyRank(): int
     {
-        foreach ($interfaceDefinition->getMethods() as $method) {
-            if (!$classDefinition->hasMethod($method->getName())) {
-                throw new CompilerException(
-                    sprintf(
-                        'Class %s must implement a method called: "%s" as requirement of interface: "%s"',
-                        $classDefinition->getCompleteName(),
-                        $method->getName(),
-                        $interfaceDefinition->getCompleteName()
-                    )
-                );
-            }
+        return $this->dependencyRank;
+    }
 
-            if (!$method->hasParameters()) {
-                continue;
-            }
+    /**
+     * Returns the class/interface docBlock.
+     */
+    public function getDocBlock(): string
+    {
+        return $this->docBlock;
+    }
 
-            $implementedMethod = $classDefinition->getMethod($method->getName());
-            if ($implementedMethod->getNumberOfRequiredParameters() > $method->getNumberOfRequiredParameters()
-                || $implementedMethod->getNumberOfParameters() < $method->getNumberOfParameters()
-            ) {
-                throw new CompilerException(
-                    sprintf(
-                        'Method %s::%s() does not have the same number of required parameters in interface: "%s"',
-                        $classDefinition->getCompleteName(),
-                        $method->getName(),
-                        $interfaceDefinition->getCompleteName()
-                    )
-                );
-            }
+    /**
+     * Returns the extended class.
+     */
+    public function getExtendsClass(): ?string
+    {
+        return $this->extendsClass;
+    }
+
+    /**
+     * Returns the class definition related to the extended class.
+     */
+    public function getExtendsClassDefinition(): ?AbstractDefinition
+    {
+        if (!$this->extendsClassDefinition && $this->extendsClass && $this->compiler) {
+            $this->setExtendsClassDefinition($this->compiler->getClassDefinition($this->extendsClass));
         }
+
+        return $this->extendsClassDefinition;
     }
 
     /**
-     * Pre-compiles a class/interface gathering method information required by other methods.
-     *
-     * @throws CompilerException
+     * Returns an absolute location to the class header.
      */
-    public function preCompile(CompilationContext $compilationContext): void
+    public function getExternalHeader(): string
     {
-        $this->compiler = $compilationContext->compiler;
+        $parts = explode('\\', $this->namespace);
 
-        /**
-         * Pre-Compile methods
-         */
-        foreach ($this->methods as $method) {
-            if (self::TYPE_CLASS === $this->getType() && !$method->isAbstract()) {
-                $method->preCompile($compilationContext);
-            }
-        }
+        return 'ext/' . strtolower(
+            $parts[0] . DIRECTORY_SEPARATOR . str_replace(
+                '\\',
+                DIRECTORY_SEPARATOR,
+                $this->namespace
+            ) . DIRECTORY_SEPARATOR . $this->name
+        ) . '.zep';
     }
 
     /**
-     * Returns the initialization method if any does exist.
+     * Returns the class definition for the implemented interfaces.
      */
-    public function getInitMethod(): ?Method
+    public function getImplementedInterfaceDefinitions(): array
     {
-        $initClassName = $this->getCNamespace().'_'.$this->getName();
+        return $this->implementedInterfaceDefinitions;
+    }
 
-        return $this->getMethod('zephir_init_properties_'.$initClassName);
+    /**
+     * Returns the implemented interfaces.
+     */
+    public function getImplementedInterfaces(): array
+    {
+        return $this->interfaces;
     }
 
     /**
      * Returns the initialization method if any does exist.
      */
-    public function getStaticInitMethod(): ?Method
+    public function getInitMethod(): ?Method
     {
-        $initClassName = $this->getCNamespace().'_'.$this->getName();
+        $initClassName = $this->getCNamespace() . '_' . $this->getName();
 
-        return $this->getMethod('zephir_init_static_properties_'.$initClassName);
+        return $this->getMethod('zephir_init_properties_' . $initClassName);
     }
 
     /**
@@ -797,529 +959,449 @@ public function getLocalOrParentInitMethod(): ?Method
     }
 
     /**
-     * Creates the initialization method.
+     * Returns a method by its name.
      */
-    public function addInitMethod(StatementsBlock $statementsBlock): void
+    public function getMethod(string $methodName, bool $checkExtends = true): ?Method
     {
-        if ($statementsBlock->isEmpty()) {
-            return;
+        $methodNameLower = strtolower($methodName);
+        foreach ($this->methods as $name => $method) {
+            if ($methodNameLower === $name) {
+                return $method;
+            }
         }
 
-        $initClassName = $this->getCNamespace().'_'.$this->getName();
-        $classMethod = new Method(
-            $this,
-            ['internal'],
-            'zephir_init_properties_'.$initClassName,
-            null,
-            $statementsBlock
-        );
+        if (!$checkExtends) {
+            return null;
+        }
 
-        $classMethod->setIsInitializer(true);
-        $this->addMethod($classMethod);
+        $extendsClassDefinition = $this->getExtendsClassDefinition();
+        if ($extendsClassDefinition instanceof self) {
+            if ($extendsClassDefinition->hasMethod($methodName)) {
+                return $extendsClassDefinition->getMethod($methodName);
+            }
+        }
+
+        return null;
     }
 
     /**
-     * Creates the static initialization method.
+     * Returns all methods defined in the class.
+     *
+     * @return Method[]
      */
-    public function addStaticInitMethod(StatementsBlock $statementsBlock): void
+    public function getMethods(): array
     {
-        $initClassName = $this->getCNamespace().'_'.$this->getName();
-
-        $classMethod = new Method(
-            $this,
-            ['internal'],
-            'zephir_init_static_properties_'.$initClassName,
-            null,
-            $statementsBlock
-        );
-
-        $classMethod->setIsInitializer(true);
-        $classMethod->setIsStatic(true);
-        $this->addMethod($classMethod);
+        return $this->methods;
     }
 
     /**
-     * Compiles a class/interface.
-     *
-     * @throws Exception
-     * @throws \ReflectionException
+     * Returns a valid namespace to be used in C-sources.
      */
-    public function compile(CompilationContext $compilationContext): void
+    public function getNCNamespace(): string
     {
-        $this->compiler = $compilationContext->compiler;
-
-        /**
-         * Sets the current object as global class definition
-         */
-        $compilationContext->classDefinition = $this;
-
-        /**
-         * Get the global codePrinter.
-         */
-        $codePrinter = $compilationContext->codePrinter;
-
-        /**
-         * The ZEPHIR_INIT_CLASS defines properties and constants exported by the class.
-         */
-        $initClassName = $this->getCNamespace().'_'.$this->getName();
-        $codePrinter->output('ZEPHIR_INIT_CLASS('.$initClassName.')');
-        $codePrinter->output('{');
-        $codePrinter->increaseLevel();
+        return str_replace('\\', '\\\\', $this->namespace);
+    }
 
-        /**
-         * Method entry.
-         */
-        $methods = &$this->methods;
-        $initMethod = $this->getLocalOrParentInitMethod();
+    /**
+     * Return the class namespace.
+     */
+    public function getNamespace(): string
+    {
+        return $this->namespace;
+    }
 
-        if (\count($methods) > 0 || $initMethod) {
-            $methodEntry = strtolower($this->getCNamespace()).'_'.strtolower($this->getName()).'_method_entry';
-        } else {
-            $methodEntry = 'NULL';
+    /**
+     * Returns the parsed docBlock.
+     */
+    public function getParsedDocBlock(): ?DocBlock
+    {
+        if ($this->parsedDocblock instanceof Docblock) {
+            return $this->parsedDocblock;
         }
 
-        foreach ($methods as $method) {
-            $method->setupOptimized($compilationContext);
+        if ($this->docBlock === '') {
+            return null;
         }
 
-        $namespace = str_replace('\\', '_', $compilationContext->config->get('namespace'));
-
-        $flags = '0';
-        if ($this->isAbstract()) {
-            $flags = 'ZEND_ACC_EXPLICIT_ABSTRACT_CLASS';
-        }
+        $this->parsedDocblock = (new DocblockParser('/' . $this->docBlock . '/'))->parse();
 
-        if ($this->isFinal()) {
-            if ('0' === $flags) {
-                $flags = 'ZEND_ACC_FINAL_CLASS';
-            } else {
-                $flags .= '|ZEND_ACC_FINAL_CLASS';
-            }
-        }
+        return $this->parsedDocblock;
+    }
 
-        /**
-         * Register the class with extends + interfaces.
-         */
-        $classExtendsDefinition = null;
-        if ($this->extendsClass) {
-            $classExtendsDefinition = $this->extendsClassDefinition;
-            if ($classExtendsDefinition instanceof self && !$classExtendsDefinition->isBundled()) {
-                $classEntry = $classExtendsDefinition->getClassEntry($compilationContext);
-            } else {
-                $className = method_exists($classExtendsDefinition, 'getCompleteName') ? $classExtendsDefinition->getCompleteName() : $classExtendsDefinition->getName();
-                $classEntry = (new Entry('\\'.ltrim($className, '\\'), $compilationContext))->get();
-            }
+    /**
+     * Tries to find the most similar name.
+     */
+    public function getPossibleMethodName(string $methodName): ?string
+    {
+        $methodNameLower = strtolower($methodName);
 
-            if (self::TYPE_CLASS === $this->getType()) {
-                $codePrinter->output('ZEPHIR_REGISTER_CLASS_EX('.$this->getNCNamespace().', '.$this->getName().', '.$namespace.', '.strtolower($this->getSCName($namespace)).', '.$classEntry.', '.$methodEntry.', '.$flags.');');
-            } else {
-                $codePrinter->output('ZEPHIR_REGISTER_INTERFACE_EX('.$this->getNCNamespace().', '.$this->getName().', '.$namespace.', '.strtolower($this->getSCName($namespace)).', '.$classEntry.', '.$methodEntry.');');
-            }
-        } else {
-            if (self::TYPE_CLASS === $this->getType()) {
-                $codePrinter->output('ZEPHIR_REGISTER_CLASS('.$this->getNCNamespace().', '.$this->getName().', '.$namespace.', '.strtolower($this->getSCName($namespace)).', '.$methodEntry.', '.$flags.');');
-            } else {
-                $codePrinter->output('ZEPHIR_REGISTER_INTERFACE('.$this->getNCNamespace().', '.$this->getName().', '.$namespace.', '.strtolower($this->getSCName($namespace)).', '.$methodEntry.');');
+        foreach ($this->methods as $name => $method) {
+            if (metaphone($methodNameLower) === metaphone($name)) {
+                return $method->getName();
             }
         }
 
-        $codePrinter->outputBlankLine();
-
-        /**
-         * Compile properties.
-         */
-        foreach ($this->getProperties() as $property) {
-            $docBlock = $property->getDocBlock();
-            if ($docBlock) {
-                $codePrinter->outputDocBlock($docBlock);
-            }
-
-            $property->compile($compilationContext);
-            $codePrinter->outputBlankLine();
+        if ($this->extendsClassDefinition instanceof self) {
+            return $this->extendsClassDefinition->getPossibleMethodName($methodName);
         }
 
-        $initMethod = $this->getInitMethod();
-        if ($initMethod) {
-            $codePrinter->output($namespace.'_'.strtolower($this->getSCName($namespace)).'_ce->create_object = '.$initMethod->getName().';');
-        }
+        return null;
+    }
 
-        /**
-         * Compile constants.
-         */
-        foreach ($this->getConstants() as $constant) {
-            $docBlock = $constant->getDocBlock();
-            if ($docBlock) {
-                $codePrinter->outputDocBlock($docBlock);
-            }
+    /**
+     * Returns all properties defined in the class.
+     *
+     * @return Property[]
+     */
+    public function getProperties(): array
+    {
+        return $this->properties;
+    }
 
-            $constant->compile($compilationContext);
-            $codePrinter->outputBlankLine();
+    /**
+     * Returns a method definition by its name.
+     *
+     * @param string $propertyName
+     *
+     * @return Property|null
+     */
+    public function getProperty(string $propertyName): ?Property
+    {
+        if (isset($this->properties[$propertyName])) {
+            return $this->properties[$propertyName];
         }
 
-        /**
-         * Implemented interfaces.
-         */
-        $interfaces = $this->interfaces;
-        $compiler = $compilationContext->compiler;
-
-        if (\is_array($interfaces)) {
-            $codePrinter->outputBlankLine(true);
-
-            foreach ($interfaces as $interface) {
-                /**
-                 * Try to find the interface.
-                 */
-                $classEntry = null;
-
-                if ($compiler->isInterface($interface)) {
-                    $classInterfaceDefinition = $compiler->getClassDefinition($interface);
-                    $classEntry = $classInterfaceDefinition->getClassEntry($compilationContext);
-                } elseif ($compiler->isBundledInterface($interface)) {
-                    $classInterfaceDefinition = $compiler->getInternalClassDefinition($interface);
-                    $classEntry = (new Entry('\\'.$classInterfaceDefinition->getName(), $compilationContext))->get();
-                }
-
-                if (!$classEntry) {
-                    if ($compiler->isClass($interface)) {
-                        throw new CompilerException(
-                            sprintf(
-                                'Cannot locate interface %s when implementing interfaces on %s. '.
-                                '%s is currently a class',
-                                $interface,
-                                $this->getCompleteName(),
-                                $interface
-                            ),
-                            $this->originalNode
-                        );
-                    } else {
-                        throw new CompilerException(
-                            sprintf(
-                                'Cannot locate interface %s when implementing interfaces on %s',
-                                $interface,
-                                $this->getCompleteName()
-                            ),
-                            $this->originalNode
-                        );
-                    }
-                }
-
-                /**
-                 * We don't check if abstract classes implement the methods in their interfaces
-                 */
-                if (!$this->isAbstract() && !$this->isInterface()) {
-                    $this->checkInterfaceImplements($this, $classInterfaceDefinition);
-                }
-
-                $codePrinter->output(sprintf(
-                    'zend_class_implements(%s, 1, %s);',
-                    $this->getClassEntry(),
-                    $classEntry
-                ));
-            }
+        $extendsClassDefinition = $this->getExtendsClassDefinition();
+        if ($extendsClassDefinition instanceof self) {
+            return $extendsClassDefinition->getProperty($propertyName);
         }
 
-        if (!$this->isAbstract() && !$this->isInterface()) {
-            /**
-             * Interfaces in extended classes may have
-             */
-            if ($classExtendsDefinition instanceof self && !$classExtendsDefinition->isBundled()) {
-                $interfaces = $classExtendsDefinition->getImplementedInterfaces();
-                foreach ($interfaces as $interface) {
-                    $classInterfaceDefinition = null;
-                    if ($compiler->isInterface($interface)) {
-                        $classInterfaceDefinition = $compiler->getClassDefinition($interface);
-                    } elseif ($compiler->isBundledInterface($interface)) {
-                        $classInterfaceDefinition = $compiler->getInternalClassDefinition($interface);
-                    }
-
-                    if ($classInterfaceDefinition !== null) {
-                        $this->checkInterfaceImplements($this, $classInterfaceDefinition);
-                    }
-                }
-            }
-        }
+        return null;
+    }
 
-        $codePrinter->output('return SUCCESS;');
-        $codePrinter->decreaseLevel();
+    /**
+     * Class name without namespace prefix for class registration.
+     */
+    public function getSCName(string $namespace): string
+    {
+        return str_replace(
+            $namespace . '_',
+            '',
+            strtolower(str_replace('\\', '_', $this->namespace) . '_' . $this->name)
+        );
+    }
 
-        $codePrinter->output('}');
-        $codePrinter->outputBlankLine();
+    /**
+     * Returns the class name without namespace.
+     */
+    public function getShortName(): string
+    {
+        return $this->shortName;
+    }
 
-        /**
-         * Compile methods
-         */
-        foreach ($methods as $method) {
-            $docBlock = $method->getDocBlock();
-            if ($docBlock) {
-                $codePrinter->outputDocBlock($docBlock);
-            }
+    /**
+     * Returns the initialization method if any does exist.
+     */
+    public function getStaticInitMethod(): ?Method
+    {
+        $initClassName = $this->getCNamespace() . '_' . $this->getName();
 
-            if (self::TYPE_CLASS === $this->getType()) {
-                if (!$method->isInternal()) {
-                    $codePrinter->output('PHP_METHOD('.$this->getCNamespace().'_'.$this->getName().', '.$method->getName().')');
-                } else {
-                    $codePrinter->output($compilationContext->backend->getInternalSignature($method, $compilationContext));
-                }
-                $codePrinter->output('{');
+        return $this->getMethod('zephir_init_static_properties_' . $initClassName);
+    }
 
-                if (!$method->isAbstract()) {
-                    $method->compile($compilationContext);
-                }
+    /**
+     * Returns the class type.
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
 
-                $codePrinter->output('}');
-                $codePrinter->outputBlankLine();
-            } else {
-                $codePrinter->output('ZEPHIR_DOC_METHOD('.$this->getCNamespace().'_'.$this->getName().', '.$method->getName().');');
-            }
+    /**
+     * Checks if class definition has a property.
+     */
+    public function hasConstant(string $name): bool
+    {
+        if (isset($this->constants[$name])) {
+            return true;
         }
 
-        /**
-         * Check whether classes must be exported.
-         */
-        $exportClasses = $compilationContext->config->get('export-classes', 'extra');
-        $exportAPI = $exportClasses ? 'extern ZEPHIR_API' : 'extern';
-
-        /**
-         * Create a code printer for the header file.
-         */
-        $codePrinter = new Printer();
-
-        $codePrinter->outputBlankLine();
-        $codePrinter->output($exportAPI.' zend_class_entry *'.$this->getClassEntry().';');
-        $codePrinter->outputBlankLine();
-
-        $codePrinter->output('ZEPHIR_INIT_CLASS('.$this->getCNamespace().'_'.$this->getName().');');
-        $codePrinter->outputBlankLine();
-
-        if (self::TYPE_CLASS === $this->getType() && \count($methods) > 0) {
-            foreach ($methods as $method) {
-                if (!$method->isInternal()) {
-                    $codePrinter->output('PHP_METHOD('.$this->getCNamespace().'_'.$this->getName().', '.$method->getName().');');
-                } else {
-                    $internalSignature = $compilationContext->backend->getInternalSignature($method, $compilationContext);
-                    $codePrinter->output($internalSignature.';');
-                }
-            }
-            $codePrinter->outputBlankLine();
+        $extendsClassDefinition = $this->getExtendsClassDefinition();
+        if ($extendsClassDefinition instanceof self && $extendsClassDefinition->hasConstant($name)) {
+            return true;
         }
 
         /**
-         * Specifying Argument Information
+         * Check if constant is defined in interfaces
          */
-        foreach ($methods as $method) {
-            $argInfo = new ArgInfoDefinition(
-                $method->getArgInfoName($this),
-                $method,
-                $codePrinter,
-                $compilationContext
-            );
-
-            $argInfo->setBooleanDefinition('_IS_BOOL');
-            $argInfo->setRichFormat(true);
+        return $this->hasConstantFromInterfaces($name);
+    }
 
-            $argInfo->render();
+    /**
+     * Checks if the class implements a specific name.
+     *
+     * @param string $methodName
+     *
+     * @return bool
+     */
+    public function hasMethod(string $methodName): bool
+    {
+        $methodNameLower = strtolower($methodName);
+        foreach ($this->methods as $name => $method) {
+            if ($methodNameLower === $name) {
+                return true;
+            }
         }
 
-        if (\count($methods) > 0) {
-            $codePrinter->output(
-                sprintf(
-                    'ZEPHIR_INIT_FUNCS(%s_%s_method_entry) {',
-                    strtolower($this->getCNamespace()),
-                    strtolower($this->getName())
-                )
-            );
-
-            foreach ($methods as $method) {
-                if (self::TYPE_CLASS === $this->getType()) {
-                    if (!$method->isInternal()) {
-                        $richFormat = $method->isReturnTypesHintDetermined() && $method->areReturnTypesCompatible();
-
-                        if ($richFormat || $method->hasParameters()) {
-                            $codePrinter->output(
-                                sprintf(
-                                    // TODO: Rename to ZEND_ME
-                                    "\tPHP_ME(%s_%s, %s, %s, %s)",
-                                    $this->getCNamespace(),
-                                    $this->getName(),
-                                    $method->getName(),
-                                    $method->getArgInfoName($this),
-                                    $method->getModifiers()
-                                )
-                            );
-                        } else {
-                            $codePrinter->output(
-                                sprintf(
-                                    // TODO: Rename to ZEND_ME
-                                    'PHP_ME(%s_%s, %s, %s, %s)',
-                                    $this->getCNamespace(),
-                                    $this->getName(),
-                                    $method->getName(),
-                                    $method->getArgInfoName($this),
-                                    $method->getModifiers()
-                                )
-                            );
-                        }
-                    }
-                } else {
-                    $richFormat = $method->isReturnTypesHintDetermined() && $method->areReturnTypesCompatible();
-
-                    if ($method->isStatic()) {
-                        if ($richFormat || $method->hasParameters()) {
-                            $codePrinter->output(
-                                sprintf(
-                                    "\tZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)",
-                                    $method->getName(),
-                                    $method->getArgInfoName($this)
-                                )
-                            );
-                        } else {
-                            $codePrinter->output(
-                                sprintf(
-                                    'ZEND_FENTRY(%s, NULL, %s, ZEND_ACC_STATIC|ZEND_ACC_ABSTRACT|ZEND_ACC_PUBLIC)',
-                                    $method->getName(),
-                                    $method->getArgInfoName($this)
-                                )
-                            );
-                        }
-                    } else {
-                        $isInterface = $method->getClassDefinition()->isInterface();
-                        $codePrinter->output(
-                            sprintf(
-                                "\tPHP_ABSTRACT_ME(%s_%s, %s, %s)",
-                                $this->getCNamespace(),
-                                $this->getName(),
-                                $method->getName(),
-                                $isInterface ? $method->getArgInfoName($this) : 'NULL'
-                            )
-                        );
-                    }
-                }
+        $extendsClassDefinition = $this->getExtendsClassDefinition();
+        if ($extendsClassDefinition instanceof DefinitionRuntime) {
+            try {
+                $extendsClassDefinition = $this->compiler->getInternalClassDefinition(
+                    $extendsClassDefinition->getName()
+                );
+            } catch (ReflectionException $e) {
+                // Do nothing
+                return false;
             }
+        }
 
-            $codePrinter->output("\t".'PHP_FE_END');
-            $codePrinter->output('};'); // ZEPHIR_INIT_FUNCS
+        while ($extendsClassDefinition instanceof self) {
+            if ($extendsClassDefinition->hasMethod($methodName)) {
+                return true;
+            }
+
+            $extendsClassDefinition = $extendsClassDefinition->getExtendsClassDefinition();
         }
 
-        $compilationContext->headerPrinter = $codePrinter;
+        return false;
     }
 
-    public function getAliasManager(): ?AliasManager
+    /**
+     * Checks if a class definition has a property.
+     */
+    public function hasProperty(string $name): bool
     {
-        return $this->aliasManager;
+        if (isset($this->properties[$name])) {
+            return true;
+        }
+
+        $extendsClassDefinition = $this->getExtendsClassDefinition();
+
+        return $extendsClassDefinition instanceof self && $extendsClassDefinition->hasProperty($name);
     }
 
-    public function setAliasManager(AliasManager $aliasManager): void
+    /**
+     * A class definition calls this method to mark this class as a dependency of another.
+     *
+     * @param int $rank
+     */
+    public function increaseDependencyRank(int $rank): void
     {
-        $this->aliasManager = $aliasManager;
+        $this->dependencyRank += $rank + 1;
     }
 
     /**
-     * Builds a class definition from reflection.
+     * Checks whether the class is abstract or not.
      */
-    public static function buildFromReflection(\ReflectionClass $class): self
+    public function isAbstract(): bool
     {
-        $classDefinition = new self($class->getNamespaceName(), $class->getName(), $class->getShortName());
+        return $this->abstract;
+    }
 
-        foreach ($class->getMethods() as $method) {
-            $parameters = [];
+    /**
+     * Returns whether the class is bundled or not.
+     */
+    public function isBundled(): bool
+    {
+        return $this->isBundled;
+    }
 
-            foreach ($method->getParameters() as $row) {
-                $params = [
-                    'type' => 'parameter',
-                    'name' => $row->getName(),
-                    'const' => 0,
-                    'data-type' => 'variable',
-                    'mandatory' => !$row->isOptional(),
-                ];
+    /**
+     * Returns whether the class is internal or not.
+     */
+    public function isExternal(): bool
+    {
+        return $this->external;
+    }
 
-                if (!$params['mandatory']) {
-                    try {
-                        $params['default'] = $row->getDefaultValue();
-                    } catch (\ReflectionException $e) {
-                        // TODO: dummy default value
-                        $params['default'] = true;
-                    }
-                }
+    /**
+     * Checks whether the class is abstract or not.
+     */
+    public function isFinal(): bool
+    {
+        return $this->final;
+    }
 
-                $parameters[] = $params;
-            }
+    /**
+     * Check if the class definition correspond to an interface.
+     */
+    public function isInterface(): bool
+    {
+        return 'interface' === $this->type;
+    }
 
-            $classMethod = new Method(
-                $classDefinition,
-                [],
-                $method->getName(),
-                new Parameters($parameters)
-            );
-            $classMethod->setIsStatic($method->isStatic());
-            $classMethod->setIsBundled(true);
-            $classDefinition->addMethod($classMethod);
-        }
+    /**
+     * Pre-compiles a class/interface gathering method information required by other methods.
+     *
+     * @throws CompilerException
+     */
+    public function preCompile(CompilationContext $compilationContext): void
+    {
+        $this->compiler = $compilationContext->compiler;
 
-        foreach ($class->getConstants() as $constantName => $constantValue) {
-            $type = self::convertPhpConstantType(\gettype($constantValue));
-            $classConstant = new Constant($constantName, ['value' => $constantValue, 'type' => $type], null);
-            $classDefinition->addConstant($classConstant);
+        /**
+         * Pre-Compile methods
+         */
+        foreach ($this->methods as $method) {
+            if (self::TYPE_CLASS === $this->getType() && !$method->isAbstract()) {
+                $method->preCompile($compilationContext);
+            }
         }
+    }
 
-        foreach ($class->getProperties() as $property) {
-            $visibility = [];
+    public function setAliasManager(AliasManager $aliasManager): void
+    {
+        $this->aliasManager = $aliasManager;
+    }
 
-            if ($property->isPublic()) {
-                $visibility[] = 'public';
-            }
+    /**
+     * Sets the class/interface docBlock.
+     */
+    public function setDocBlock(string $docBlock): void
+    {
+        $this->docBlock = $docBlock;
+    }
 
-            if ($property->isPrivate()) {
-                $visibility[] = 'private';
-            }
+    /**
+     * Sets the extended class.
+     */
+    public function setExtendsClass(string $extendsClass): void
+    {
+        $this->extendsClass = $extendsClass;
+    }
 
-            if ($property->isProtected()) {
-                $visibility[] = 'protected';
-            }
+    /**
+     * Sets the class definition for the extended class.
+     */
+    public function setExtendsClassDefinition(AbstractDefinition $classDefinition): void
+    {
+        $this->extendsClassDefinition = $classDefinition;
+    }
 
-            if ($property->isStatic()) {
-                $visibility[] = 'static';
-            }
+    /**
+     * Sets the class definition for the implemented interfaces.
+     */
+    public function setImplementedInterfaceDefinitions(array $implementedInterfaceDefinitions): void
+    {
+        $this->implementedInterfaceDefinitions = $implementedInterfaceDefinitions;
+    }
 
-            $classProperty = new Property(
-                $classDefinition,
-                $visibility,
-                $property->getName(),
-                null,
-                null,
-                null
-            );
-            $classDefinition->addProperty($classProperty);
+    /**
+     * Sets the implemented interfaces.
+     */
+    public function setImplementsInterfaces(array $implementedInterfaces): void
+    {
+        $this->interfaces = [];
+        foreach ($implementedInterfaces as $implementedInterface) {
+            $this->interfaces[] = $implementedInterface['value'];
         }
+    }
 
-        $classDefinition->setIsBundled(true);
+    /**
+     * Sets if the class is final.
+     */
+    public function setIsAbstract(bool $abstract): void
+    {
+        $this->abstract = $abstract;
+    }
 
-        return $classDefinition;
+    /**
+     * Sets if the class is internal or not.
+     */
+    public function setIsBundled(bool $isBundled): void
+    {
+        $this->isBundled = $isBundled;
     }
 
-    protected function hasConstantFromInterfaces(string $name): bool
+    /**
+     * Sets whether the class is external or not.
+     */
+    public function setIsExternal(bool $isExternal): void
+    {
+        $this->external = $isExternal;
+    }
+
+    /**
+     * Sets if the class is final.
+     */
+    public function setIsFinal(bool $final): void
+    {
+        $this->final = $final;
+    }
+
+    /**
+     * Set a method and its body.
+     */
+    public function setMethod(string $methodName, Method $method): void
+    {
+        $this->methods[$methodName] = $method;
+    }
+
+    /**
+     * Set the original node where the class was declared.
+     */
+    public function setOriginalNode(array $originalNode): void
+    {
+        $this->originalNode = $originalNode;
+    }
+
+    /**
+     * Set the class' type (class/interface).
+     */
+    public function setType(string $type): void
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * Updates an existing method definition.
+     *
+     * @throws CompilerException
+     */
+    public function updateMethod(Method $method, array $statement = null): void
+    {
+        $methodName = strtolower($method->getName());
+        if (!isset($this->methods[$methodName])) {
+            throw new CompilerException("Method '" . $method->getName() . "' does not exist", $statement);
+        }
+
+        $this->methods[$methodName] = $method;
+    }
+
+    protected function getConstantFromInterfaces(string $name): ?Constant
     {
         if ($interfaces = $this->getImplementedInterfaceDefinitions()) {
             foreach ($interfaces as $interface) {
                 if ($interface instanceof self && $interface->hasConstant($name)) {
-                    return true;
+                    return $interface->getConstant($name);
                 }
             }
         }
 
-        return false;
+        return null;
     }
 
-    protected function getConstantFromInterfaces(string $name): ?Constant
+    protected function hasConstantFromInterfaces(string $name): bool
     {
         if ($interfaces = $this->getImplementedInterfaceDefinitions()) {
             foreach ($interfaces as $interface) {
                 if ($interface instanceof self && $interface->hasConstant($name)) {
-                    return $interface->getConstant($name);
+                    return true;
                 }
             }
         }
 
-        return null;
+        return false;
     }
 
     private static function convertPhpConstantType(string $phpType): string
@@ -1327,9 +1409,9 @@ private static function convertPhpConstantType(string $phpType): string
         $map = [
             'boolean' => 'bool',
             'integer' => 'int',
-            'double' => 'double',
-            'string' => 'string',
-            'NULL' => 'null',
+            'double'  => 'double',
+            'string'  => 'string',
+            'NULL'    => 'null',
         ];
 
         if (!isset($map[$phpType])) {
diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index 78edc8227a..b5cf44b89e 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -13,33 +13,44 @@
 
 namespace Zephir\Class;
 
+use ReflectionClass;
 use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 
+use function array_pop;
+use function class_exists;
+use function end;
+use function explode;
+use function implode;
+use function interface_exists;
+use function preg_match;
+use function sprintf;
+use function str_replace;
+use function strtolower;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * Zend Class Entry detector
  */
 class Entry
 {
     public const NAMESPACE_SEPARATOR = '\\';
-
-    /**
-     * As it was passed: partially or fully.
-     */
-    private string $classname;
-
-    private bool $isInternal = false;
-
     /**
      * Loaded via config/class-entries.php
      */
     private array $classEntries;
+    /**
+     * As it was passed: partially or fully.
+     */
+    private string $classname;
+    private bool   $isInternal = false;
 
     public function __construct(string $className, private CompilationContext $compilationContext)
     {
-        $this->classname = $this->compilationContext->getFullName($className);
-        $this->classEntries = require __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'config/class-entries.php';
+        $this->classname    = $this->compilationContext->getFullName($className);
+        $this->classEntries = require __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'config/class-entries.php';
 
         foreach ($this->classEntries as $key => $val) {
             unset($this->classEntries[$key]);
@@ -47,6 +58,14 @@ public function __construct(string $className, private CompilationContext $compi
         }
     }
 
+    /**
+     * Prepares a class name to be used as a C-string.
+     */
+    public static function escape(string $className): string
+    {
+        return str_replace(static::NAMESPACE_SEPARATOR, '\\\\', $className);
+    }
+
     /**
      * @throws Exception
      */
@@ -72,8 +91,8 @@ public function get(): string
         }
 
         if (class_exists($this->classname) || interface_exists($this->classname)) {
-            $reflection = new \ReflectionClass($this->classname);
-            $className = $reflection->getName();
+            $reflection = new ReflectionClass($this->classname);
+            $className  = $reflection->getName();
 
             /**
              * Check if class is defined internally by an extension, or the core.
@@ -81,13 +100,17 @@ public function get(): string
             if ($reflection->isInternal()) {
                 return sprintf(
                     'zephir_get_internal_ce(SL("%s"))',
-                    str_replace(self::NAMESPACE_SEPARATOR, self::NAMESPACE_SEPARATOR.self::NAMESPACE_SEPARATOR, strtolower($reflection->getName())),
+                    str_replace(
+                        self::NAMESPACE_SEPARATOR,
+                        self::NAMESPACE_SEPARATOR . self::NAMESPACE_SEPARATOR,
+                        strtolower($reflection->getName())
+                    ),
                 );
             }
 
             $classNamespace = explode(self::NAMESPACE_SEPARATOR, $reflection->getNamespaceName());
         } else {
-            $className = $this->classname;
+            $className      = $this->classname;
             $classNamespace = explode(self::NAMESPACE_SEPARATOR, $className);
         }
 
@@ -95,7 +118,11 @@ public function get(): string
          * External class, we don't know its ClassEntry in C world.
          */
         if ($classNamespace[0] === '' || !$this->isInternalClass($classNamespace[0])) {
-            $className = str_replace(self::NAMESPACE_SEPARATOR, self::NAMESPACE_SEPARATOR.self::NAMESPACE_SEPARATOR, strtolower($className));
+            $className = str_replace(
+                self::NAMESPACE_SEPARATOR,
+                self::NAMESPACE_SEPARATOR . self::NAMESPACE_SEPARATOR,
+                strtolower($className)
+            );
 
             return sprintf(
                 'zephir_get_internal_ce(SL("%s"))',
@@ -115,20 +142,15 @@ public function isInternal(): bool
         return $this->isInternal;
     }
 
-    /**
-     * Prepares a class name to be used as a C-string.
-     */
-    public static function escape(string $className): string
-    {
-        return str_replace(static::NAMESPACE_SEPARATOR, '\\\\', $className);
-    }
-
     /**
      * Detect if start of namespace class belongs to project namespace.
      */
     private function isInternalClass(string $className): bool
     {
-        $this->isInternal = preg_match('/^'.$className.'/', $this->compilationContext->classDefinition->getNamespace()) === 1;
+        $this->isInternal = preg_match(
+            '/^' . $className . '/',
+            $this->compilationContext->classDefinition->getNamespace()
+        ) === 1;
 
         return $this->isInternal;
     }
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index f0ccf328a6..c4660fe619 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Class\Method;
 
+use ReflectionException;
 use Zephir\Branch;
 use Zephir\BranchManager;
 use Zephir\Cache\Manager;
@@ -33,50 +34,54 @@
 use Zephir\StatementsBlock;
 use Zephir\SymbolTable;
 
+use function array_diff;
+use function array_key_exists;
+use function array_keys;
+use function count;
+use function implode;
+use function in_array;
+use function is_array;
+use function is_object;
+use function json_decode;
+use function json_encode;
+use function preg_replace;
+use function sprintf;
+use function str_replace;
+use function strtolower;
+
+use const PHP_EOL;
+
 /**
  * Represents a class method
  */
 class Method
 {
     public bool $optimizable = true;
-
-    protected ?Docblock $parsedDocblock = null;
-
     /**
-     * Types returned by the method.
+     * Call Gatherer Pass.
      */
-    protected array $returnTypes = [];
-
+    protected ?CallGathererPass $callGathererPass = null;
+    protected ?Definition       $classDefinition  = null;
     /**
-     * Zend MAY_BE_* types.
+     * Whether the method is abstract or not.
      */
-    protected array $mayBeArgTypes = [
-        'int' => 'MAY_BE_LONG',
-        'false' => 'MAY_BE_FALSE',
-    ];
-
+    protected bool $isAbstract = false;
     /**
-     * Raw-types returned by the method.
+     * Whether the method is bundled with PHP or not.
      */
-    protected ?array $returnTypesRaw = null;
-
+    protected bool $isBundled = false;
     /**
-     * Class type hints returned by the method.
+     * Whether the method is final or not.
      */
-    protected array $returnClassTypes = [];
-
+    protected bool $isFinal = false;
     /**
-     * Whether the variable is void.
+     * Whether the method is an initializer or not.
      */
-    protected bool $void = false;
-
+    protected bool $isInitializer = false;
     /**
-     * Whether the variable is mixed.
-     *
-     * Only for PHP >= 8.0
+     * Whether the method is internal or not.
      */
-    protected bool $mixed = false;
-
+    protected bool $isInternal = false;
     /**
      * Whether the method is public or not.
      */
@@ -85,48 +90,43 @@ class Method
     /**
      * Whether the method is static or not.
      */
-    protected bool $isStatic = false;
-
+    protected bool              $isStatic     = false;
+    protected ?LocalContextPass $localContext = null;
     /**
-     * Whether the method is final or not.
+     * Zend MAY_BE_* types.
      */
-    protected bool $isFinal = false;
-
+    protected array $mayBeArgTypes = [
+        'int'   => 'MAY_BE_LONG',
+        'false' => 'MAY_BE_FALSE',
+    ];
     /**
-     * Whether the method is abstract or not.
+     * Whether the variable is mixed.
+     *
+     * Only for PHP >= 8.0
      */
-    protected bool $isAbstract = false;
-
+    protected bool      $mixed          = false;
+    protected ?Docblock $parsedDocblock = null;
     /**
-     * Whether the method is internal or not.
+     * Class type hints returned by the method.
      */
-    protected bool $isInternal = false;
-
+    protected array $returnClassTypes = [];
     /**
-     * Whether the method is bundled with PHP or not.
+     * Types returned by the method.
      */
-    protected bool $isBundled = false;
-
+    protected array $returnTypes = [];
     /**
-     * Whether the method is an initializer or not.
+     * Raw-types returned by the method.
      */
-    protected bool $isInitializer = false;
-
-    protected ?LocalContextPass $localContext = null;
-
+    protected ?array $returnTypesRaw  = null;
+    protected array  $staticVariables = [];
     /**
      * Static Type Inference Pass.
      */
     protected ?StaticTypeInference $typeInference = null;
-
     /**
-     * Call Gatherer Pass.
+     * Whether the variable is void.
      */
-    protected ?CallGathererPass $callGathererPass = null;
-
-    protected array $staticVariables = [];
-
-    protected ?Definition $classDefinition = null;
+    protected bool $void = false;
 
     public function __construct(
         Definition $classDefinition,
@@ -147,744 +147,306 @@ public function __construct(
     }
 
     /**
-     * Process RAW return types structure.
-     *
-     * Example:
-     *
-     * ```
-     * $returnType = [
-     *  'type' => 'return-type',
-     *  'list' => [
-     *      [
-     *          'type' => 'return-type-parameter',
-     *          'cast' => [
-     *              'type' => 'variable',
-     *              'value' => '\StdClass',
-     *              'file' => './stubs.zep',
-     *              'line' => 21,
-     *              'char' => 48
-     *          ],
-     *          'collection' => 1,
-     *          'file' => './stubs.zep',
-     *          'line' => 21,
-     *          'char' => 48
-     *      ],
-     *      [
-     *          'type' => 'return-type-parameter',
-     *          'data-type' => 'bool',
-     *          'mandatory' => 0,
-     *          'file' => './stubs.zep',
-     *          'line' => 22,
-     *          'char' => 5
-     *      ]
-     *  ],
-     *  'void' => 0,
-     *  'file' => './stubs.zep',
-     *  'line' => 22,
-     *  'char' => 5
-     * ];
-     * ```
-     *
-     * @param array|null $returnType
+     * Checks whether at least one return type hint is bool compatible.
      */
-    public function setReturnTypes(array $returnType = null): void
+    public function areReturnTypesBoolCompatible(): bool
     {
-        $this->returnTypesRaw = $returnType;
-        if (null === $returnType) {
-            return;
-        }
-
-        if (isset($returnType['void']) && $returnType['void']) {
-            $this->void = true;
-
-            return;
-        }
+        return isset($this->returnTypes['bool']);
+    }
 
-        if (!isset($returnType['list'])) {
-            return;
+    /**
+     * Checks if the method have compatible return types.
+     */
+    public function areReturnTypesCompatible(): bool
+    {
+        // void
+        if ($this->isVoid()) {
+            return true;
         }
 
-        $types = [];
-        $castTypes = [];
-
-        foreach ($returnType['list'] as $returnTypeItem) {
-            /**
-             * We continue the loop, because it only works for PHP >= 8.0.
-             */
-            if (isset($returnTypeItem['data-type']) && $returnTypeItem['data-type'] === 'mixed') {
-                $this->mixed = true;
-            }
-
-            if (!isset($returnTypeItem['cast'])) {
-                $types[$returnTypeItem['data-type']] = $returnTypeItem;
-                continue;
-            }
-
-            if (isset($returnTypeItem['cast']['collection'])) {
-                continue;
-            }
+        $totalTypes = count($this->returnTypes);
 
-            if (isset($returnTypeItem['collection']) && $returnTypeItem['collection']) {
-                $types['array'] = [
-                    'type' => 'return-type-parameter',
-                    'data-type' => 'array',
-                    'mandatory' => 0,
-                    'file' => $returnTypeItem['cast']['file'],
-                    'line' => $returnTypeItem['cast']['line'],
-                    'char' => $returnTypeItem['cast']['char'],
-                ];
-            } else {
-                $castTypes[$returnTypeItem['cast']['value']] = $returnTypeItem['cast']['value'];
+        // union types
+        if ($totalTypes > 1) {
+            $diff = array_diff(array_keys($this->returnTypes), array_keys($this->mayBeArgTypes));
+            if (count($diff) === 0) {
+                return true;
             }
         }
 
-        if (\count($castTypes) > 0) {
-            $types['object'] = [];
-            $this->returnClassTypes = $castTypes;
+        // T1 | T2
+        if (2 === $totalTypes && !isset($this->returnTypes['null'])) {
+            return false;
         }
 
-        if (\count($types) > 0) {
-            $this->returnTypes = $types;
+        // null | T1 | T2
+        if ($totalTypes > 2) {
+            return false;
         }
-    }
-
-    public function getReturnTypesRaw(): array
-    {
-        return $this->returnTypesRaw;
-    }
-
-    public function hasReturnTypesRaw(): bool
-    {
-        return !empty($this->returnTypesRaw);
-    }
 
-    /**
-     * Getter for statements block.
-     */
-    public function getStatementsBlock(): StatementsBlock
-    {
-        return $this->statements;
+        return true;
     }
 
     /**
-     * Setter for statements block.
+     * Checks whether at least one return type hint is double compatible.
      */
-    public function setStatementsBlock(StatementsBlock $statementsBlock): void
+    public function areReturnTypesDoubleCompatible(): bool
     {
-        $this->statements = $statementsBlock;
+        return isset($this->returnTypes['double']);
     }
 
     /**
-     * Checks whether the method is empty.
+     * Checks whether at least one return type hint is false compatible.
      */
-    public function isEmpty(): bool
+    public function areReturnTypesFalseCompatible(): bool
     {
-        return $this->statements->isEmpty();
+        return isset($this->returnTypes['false']);
     }
 
     /**
-     * Checks for visibility congruence.
-     *
-     * @throws CompilerException
+     * Checks whether at least one return type hint is integer compatible.
      */
-    public function checkVisibility(array $visibility, string $name, array $original = null): void
+    public function areReturnTypesIntCompatible(): bool
     {
-        if (\count($visibility) > 1) {
-            if (\in_array('public', $visibility) && \in_array('protected', $visibility)) {
-                throw new CompilerException("Method '$name' cannot be 'public' and 'protected' at the same time", $original);
-            }
-
-            if (\in_array('public', $visibility) && \in_array('private', $visibility)) {
-                throw new CompilerException("Method '$name' cannot be 'public' and 'private' at the same time", $original);
-            }
-
-            if (\in_array('private', $visibility) && \in_array('protected', $visibility)) {
-                throw new CompilerException("Method '$name' cannot be 'protected' and 'private' at the same time", $original);
-            }
-
-            if (\in_array('private', $visibility) && \in_array('internal', $visibility)) {
-                throw new CompilerException("Method '$name' cannot be 'internal' and 'private' at the same time", $original);
-            }
-
-            if (\in_array('protected', $visibility) && \in_array('internal', $visibility)) {
-                throw new CompilerException("Method '$name' cannot be 'internal' and 'protected' at the same time", $original);
-            }
-
-            if (\in_array('public', $visibility) && \in_array('internal', $visibility)) {
-                throw new CompilerException("Method '$name' cannot be 'internal' and 'public' at the same time", $original);
-            }
-        }
+        $types = ['int', 'uint', 'char', 'uchar', 'long', 'ulong'];
 
-        if ('__construct' === $name) {
-            if (\in_array('static', $visibility)) {
-                throw new CompilerException("Constructors cannot be 'static'", $original);
-            }
-        } elseif ('__destruct' === $name) {
-            if (\in_array('static', $visibility)) {
-                throw new CompilerException("Destructors cannot be 'static'", $original);
+        foreach ($this->returnTypes as $returnType => $definition) {
+            if (in_array($returnType, $types)) {
+                return true;
             }
         }
 
-        $this->isAbstract = \in_array('abstract', $visibility);
-        $this->isStatic = \in_array('static', $visibility);
-        $this->isFinal = \in_array('final', $visibility);
-        $this->isPublic = \in_array('public', $visibility);
-        $this->isInternal = \in_array('internal', $visibility);
+        return false;
     }
 
     /**
-     * Sets if the method is internal or not.
+     * Checks whether at least one return type hint is null compatible.
      */
-    public function setIsStatic(bool $static): void
+    public function areReturnTypesNullCompatible(): bool
     {
-        $this->isStatic = $static;
+        return isset($this->returnTypes['null']);
     }
 
-    /**
-     * Sets if the method is bundled or not.
-     */
-    public function setIsBundled(bool $bundled): void
+    public function areReturnTypesObjectCompatible(): bool
     {
-        $this->isBundled = $bundled;
+        return isset($this->returnTypes['object']);
     }
 
     /**
-     * Sets if the method is an initializer or not.
+     * Checks whether at least one return type hint is string compatible.
      */
-    public function setIsInitializer(bool $initializer): void
+    public function areReturnTypesStringCompatible(): bool
     {
-        $this->isInitializer = $initializer;
+        return isset($this->returnTypes['string']);
     }
 
     /**
-     * Returns the class definition where the method was declared.
+     * Assigns a default value.
+     *
+     * @throws Exception
+     * @throws ReflectionException
      */
-    public function getClassDefinition(): ?Definition
-    {
-        return $this->classDefinition;
-    }
-
-    /**
-     * Generate internal method's based on the equivalent PHP methods,
-     * allowing bypassing php userspace for internal method calls.
-     */
-    public function setupOptimized(CompilationContext $compilationContext): self
+    public function assignDefaultValue(array $parameter, CompilationContext $compilationContext): string
     {
-        if (!$compilationContext->config->get('internal-call-transformation', 'optimizations')) {
-            return $this;
+        /**
+         * Class-Hinted parameters only can be null?
+         */
+        if (isset($parameter['cast'])) {
+            if ('null' !== $parameter['default']['type']) {
+                throw new CompilerException(
+                    'Class-Hinted parameters only can have "null" as default parameter',
+                    $parameter
+                );
+            }
         }
 
-        $classDefinition = $this->getClassDefinition();
+        $oldCodePrinter = $compilationContext->codePrinter;
+        $codePrinter    = new Printer();
+        $codePrinter->increaseLevel();
+        $codePrinter->increaseLevel();
+        $compilationContext->codePrinter = $codePrinter;
+
+        $paramVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext);
 
         /**
-         * Skip for closures
+         * TODO: Refactoring this place, move to one - static-constant-access
          */
-        if ('__invoke' === $this->getName() || $classDefinition->isInterface()) {
-            return $this;
-        }
+        $dataType = $this->getParamDataType($parameter);
+        switch ($dataType) {
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+                switch ($parameter['default']['type']) {
+                    case 'static-constant-access':
+                        /**
+                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
+                         *
+                         * TODO: Rewrite all to codePrinter
+                         */
+                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+                            $parameter['name'],
+                            $compilationContext,
+                            $parameter['default']
+                        );
+                        $expression     = new Expression($parameter['default']);
+                        $expression->setExpectReturn(true, $symbolVariable);
+                        $compiledExpression = $expression->compile($compilationContext);
 
-        if (!$this->isInternal() && !$classDefinition->isBundled()) {
-            /* Not supported for now */
-            if ($this->getNumberOfRequiredParameters() != $this->getNumberOfParameters()) {
-                return $this;
-            }
+                        if ('int' != $compiledExpression->getType()) {
+                            throw new CompilerException(
+                                'Default parameter value type: '
+                                . $compiledExpression->getType()
+                                . ' cannot be assigned to variable(int)',
+                                $parameter
+                            );
+                        }
 
-            if ($this->isConstructor()) {
-                return $this;
-            }
+                        $parameter['default']['type']  = $compiledExpression->getType();
+                        $parameter['default']['value'] = $compiledExpression->getCode();
 
-            $optimizedName = $this->getName().'_zephir_internal_call';
+                        $compilationContext->codePrinter = $oldCodePrinter;
 
-            $visibility = ['internal'];
+                        return $this->assignDefaultValue($parameter, $compilationContext);
 
-            $statements = null;
-            if ($this->statements) {
-                $statements = new StatementsBlock(json_decode(json_encode($this->statements->getStatements()), true));
-            }
+                    case 'null':
+                        $codePrinter->output($parameter['name'] . ' = 0;');
+                        break;
 
-            $optimizedMethod = new self(
-                $classDefinition,
-                $visibility,
-                $optimizedName,
-                $this->parameters,
-                $statements,
-                $this->docblock,
-                null,
-                $this->expression
-            );
-            $optimizedMethod->typeInference = $this->typeInference;
-            $optimizedMethod->setReturnTypes($this->returnTypes);
-            $classDefinition->addMethod($optimizedMethod);
-        }
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                        $codePrinter->output($parameter['name'] . ' = ' . $parameter['default']['value'] . ';');
+                        break;
 
-        return $this;
-    }
+                    case 'double':
+                        $codePrinter->output($parameter['name'] . ' = (int) ' . $parameter['default']['value'] . ';');
+                        break;
 
-    public function getOptimizedMethod(): self
-    {
-        $optimizedName = $this->getName().'_zephir_internal_call';
-        $optimizedMethod = $this->classDefinition->getMethod($optimizedName, false);
-        if (!$optimizedMethod || !$this->optimizable) {
-            return $this;
-        }
+                    default:
+                        throw new CompilerException(
+                            'Default parameter value type: ' . $parameter['default']['type'] . ' cannot be assigned to variable(int)',
+                            $parameter
+                        );
+                }
+                break;
 
-        return $optimizedMethod;
-    }
+            case 'double':
+                switch ($parameter['default']['type']) {
+                    case 'static-constant-access':
+                        /**
+                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
+                         *
+                         * TODO: Rewrite all to codePrinter
+                         */
+                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+                            $parameter['name'],
+                            $compilationContext,
+                            $parameter['default']
+                        );
+                        $expression     = new Expression($parameter['default']);
+                        $expression->setExpectReturn(true, $symbolVariable);
+                        $compiledExpression = $expression->compile($compilationContext);
 
-    /**
-     * Sets the method name.
-     */
-    public function setName(string $name): void
-    {
-        $this->name = $name;
-    }
+                        if ('double' != $compiledExpression->getType()) {
+                            throw new CompilerException(
+                                'Default parameter value type: '
+                                . $compiledExpression->getType()
+                                . ' cannot be assigned to variable(double)',
+                                $parameter
+                            );
+                        }
 
-    /**
-     * Returns the method name.
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
+                        $parameter['default']['type']  = $compiledExpression->getType();
+                        $parameter['default']['value'] = $compiledExpression->getCode();
 
-    /**
-     * Returns the raw docblock.
-     */
-    public function getDocBlock(): ?string
-    {
-        return $this->docblock;
-    }
+                        $compilationContext->codePrinter = $oldCodePrinter;
 
-    /**
-     * Returns the parsed docblock.
-     */
-    public function getParsedDocBlock(): ?Docblock
-    {
-        if ($this->parsedDocblock) {
-            return $this->parsedDocblock;
-        }
+                        return $this->assignDefaultValue($parameter, $compilationContext);
 
-        if ($this->docblock === null) {
-            return null;
-        }
+                    case 'null':
+                        $codePrinter->output($parameter['name'] . ' = 0;');
+                        break;
 
-        $parser = new DocblockParser('/'.$this->docblock.'/');
-        $this->parsedDocblock = $parser->parse();
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                        $codePrinter->output(
+                            $parameter['name'] . ' = (double) ' . $parameter['default']['value'] . ';'
+                        );
+                        break;
 
-        return $this->parsedDocblock;
-    }
+                    case 'double':
+                        $codePrinter->output($parameter['name'] . ' = ' . $parameter['default']['value'] . ';');
+                        break;
 
-    /**
-     * the starting line of the method in the source file.
-     */
-    public function getLine(): mixed
-    {
-        return $this->expression['line'];
-    }
+                    default:
+                        throw new CompilerException(
+                            'Default parameter value type: ' . $parameter['default']['type'] . ' cannot be assigned to variable(double)',
+                            $parameter
+                        );
+                }
+                break;
 
-    /**
-     * Returns the parameters.
-     */
-    public function getParameters(): ?Parameters
-    {
-        return $this->parameters;
-    }
+            case 'bool':
+                switch ($parameter['default']['type']) {
+                    case 'static-constant-access':
+                        /**
+                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
+                         *
+                         * TODO: Rewrite all to codePrinter
+                         */
+                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+                            $parameter['name'],
+                            $compilationContext,
+                            $parameter['default']
+                        );
+                        $expression     = new Expression($parameter['default']);
+                        $expression->setExpectReturn(true, $symbolVariable);
+                        $compiledExpression = $expression->compile($compilationContext);
 
-    /**
-     * Checks if the method has return-type or cast hints.
-     */
-    public function hasReturnTypes(): bool
-    {
-        return \count($this->returnTypes) || \count($this->returnClassTypes);
-    }
+                        if ('bool' !== $compiledExpression->getType()) {
+                            throw new CompilerException(
+                                'Default parameter value type: '
+                                . $compiledExpression->getType()
+                                . ' cannot be assigned to variable(bool)',
+                                $parameter
+                            );
+                        }
 
-    /**
-     * Checks whether at least one return type hint is null compatible.
-     */
-    public function areReturnTypesNullCompatible(): bool
-    {
-        return isset($this->returnTypes['null']);
-    }
+                        $parameter['default']['type']  = $compiledExpression->getType();
+                        $parameter['default']['value'] = $compiledExpression->getCode();
 
-    /**
-     * Checks whether at least one return type hint is integer compatible.
-     */
-    public function areReturnTypesIntCompatible(): bool
-    {
-        $types = ['int', 'uint', 'char', 'uchar', 'long', 'ulong'];
+                        $compilationContext->codePrinter = $oldCodePrinter;
 
-        foreach ($this->returnTypes as $returnType => $definition) {
-            if (\in_array($returnType, $types)) {
-                return true;
-            }
-        }
+                        return $this->assignDefaultValue($parameter, $compilationContext);
 
-        return false;
-    }
+                    case 'null':
+                        $codePrinter->output($parameter['name'] . ' = 0;');
+                        break;
 
-    /**
-     * Checks whether at least one return type hint is double compatible.
-     */
-    public function areReturnTypesDoubleCompatible(): bool
-    {
-        return isset($this->returnTypes['double']);
-    }
+                    case 'bool':
+                        if ('true' === $parameter['default']['value']) {
+                            $codePrinter->output($parameter['name'] . ' = 1;');
+                        } else {
+                            $codePrinter->output($parameter['name'] . ' = 0;');
+                        }
+                        break;
 
-    /**
-     * Checks whether at least one return type hint is bool compatible.
-     */
-    public function areReturnTypesBoolCompatible(): bool
-    {
-        return isset($this->returnTypes['bool']);
-    }
+                    default:
+                        throw new CompilerException(
+                            'Default parameter value type: '
+                            . $parameter['default']['type']
+                            . ' cannot be assigned to variable(bool)',
+                            $parameter
+                        );
+                }
+                break;
 
-    /**
-     * Checks whether at least one return type hint is false compatible.
-     */
-    public function areReturnTypesFalseCompatible(): bool
-    {
-        return isset($this->returnTypes['false']);
-    }
-
-    /**
-     * Checks whether at least one return type hint is string compatible.
-     */
-    public function areReturnTypesStringCompatible(): bool
-    {
-        return isset($this->returnTypes['string']);
-    }
-
-    public function areReturnTypesObjectCompatible(): bool
-    {
-        return isset($this->returnTypes['object']);
-    }
-
-    /**
-     * Returned type hints by the method.
-     */
-    public function getReturnTypes(): array
-    {
-        return $this->returnTypes;
-    }
-
-    /**
-     * Returned class-type hints by the method.
-     */
-    public function getReturnClassTypes(): array
-    {
-        return $this->returnClassTypes;
-    }
-
-    /**
-     * Returns the number of parameters the method has.
-     */
-    public function hasParameters(): bool
-    {
-        return $this->parameters instanceof Parameters && $this->parameters->count() > 0;
-    }
-
-    /**
-     * Returns the number of parameters the method has.
-     */
-    public function getNumberOfParameters(): int
-    {
-        if ($this->parameters instanceof Parameters) {
-            return $this->parameters->count();
-        }
-
-        return 0;
-    }
-
-    /**
-     * Returns the number of required parameters the method has.
-     */
-    public function getNumberOfRequiredParameters(): int
-    {
-        if ($this->parameters === null) {
-            return 0;
-        }
-
-        $required = 0;
-        foreach ($this->parameters->getParameters() as $parameter) {
-            if (!isset($parameter['default'])) {
-                ++$required;
-            }
-        }
-
-        return $required;
-    }
-
-    /**
-     * Checks whether the method has a specific modifier.
-     */
-    public function hasModifier(string $modifier): bool
-    {
-        return \in_array($modifier, $this->visibility);
-    }
-
-    /**
-     * Returns method visibility modifiers.
-     */
-    public function getVisibility(): array
-    {
-        return $this->visibility;
-    }
-
-    public function isDeprecated(): bool
-    {
-        return !empty($this->visibility) && \in_array('deprecated', $this->visibility, true);
-    }
-
-    /**
-     * Returns the C-modifier flags.
-     *
-     * @throws Exception
-     */
-    public function getModifiers(): string
-    {
-        $modifiers = [];
-        foreach ($this->visibility as $visibility) {
-            switch ($visibility) {
-                case 'public':
-                    $modifiers['ZEND_ACC_PUBLIC'] = $visibility;
-                    break;
-
-                case 'protected':
-                    $modifiers['ZEND_ACC_PROTECTED'] = $visibility;
-                    break;
-
-                case 'private':
-                    $modifiers['ZEND_ACC_PRIVATE'] = $visibility;
-                    break;
-
-                case 'static':
-                    $modifiers['ZEND_ACC_STATIC'] = $visibility;
-                    break;
-
-                case 'final':
-                    $modifiers['ZEND_ACC_FINAL'] = $visibility;
-                    break;
-
-                case 'abstract':
-                    $modifiers['ZEND_ACC_ABSTRACT'] = $visibility;
-                    break;
-
-                case 'deprecated':
-                    $modifiers['ZEND_ACC_DEPRECATED'] = $visibility;
-                    break;
-
-                case 'inline':
-                case 'scoped':
-                case 'internal':
-                    break;
-
-                default:
-                    throw new Exception('Unknown modifier "'.$visibility.'"');
-            }
-        }
-
-        if ('__construct' === $this->name) {
-            $modifiers['ZEND_ACC_CTOR'] = true;
-        } elseif ('__destruct' === $this->name) {
-            $modifiers['ZEND_ACC_DTOR'] = true;
-        }
-
-        return implode('|', array_keys($modifiers));
-    }
-
-    /**
-     * Checks if the method must not return any value.
-     */
-    public function isVoid(): bool
-    {
-        return $this->void;
-    }
-
-    /**
-     * Checks if the methods return type is `mixed`.
-     */
-    public function isMixed(): bool
-    {
-        return $this->mixed;
-    }
-
-    /**
-     * Checks if the method is private.
-     */
-    public function isPrivate(): bool
-    {
-        return \in_array('private', $this->visibility);
-    }
-
-    /**
-     * Checks if the method is protected.
-     */
-    public function isProtected(): bool
-    {
-        return \in_array('protected', $this->visibility);
-    }
-
-    /**
-     * Checks if the method is public.
-     */
-    public function isPublic(): bool
-    {
-        return $this->isPublic;
-    }
-
-    /**
-     * Checks is abstract method?
-     */
-    public function isAbstract(): bool
-    {
-        return $this->isAbstract;
-    }
-
-    /**
-     * Checks whether the method is static.
-     */
-    public function isStatic(): bool
-    {
-        return $this->isStatic;
-    }
-
-    /**
-     * Checks whether the method is final.
-     */
-    public function isFinal(): bool
-    {
-        return $this->isFinal;
-    }
-
-    /**
-     * Checks whether the method is internal.
-     */
-    public function isInternal(): bool
-    {
-        return $this->isInternal;
-    }
-
-    /**
-     * Checks whether the method is bundled.
-     */
-    public function isBundled(): bool
-    {
-        return $this->isBundled;
-    }
-
-    /**
-     * Checks whether the method is an initializer.
-     */
-    public function isInitializer(): bool
-    {
-        return $this->isInitializer;
-    }
-
-    /**
-     * Check whether the current method is a constructor.
-     */
-    public function isConstructor(): bool
-    {
-        return '__construct' === $this->name;
-    }
-
-    /**
-     * Checks if method is a shortcut.
-     */
-    public function isShortcut(): bool
-    {
-        return $this->expression && 'shortcut' === $this->expression['type'];
-    }
-
-    public function getMayBeArgTypes(): array
-    {
-        return $this->mayBeArgTypes;
-    }
-
-    /**
-     * Return shortcut method name.
-     */
-    public function getShortcutName(): mixed
-    {
-        return $this->expression['name'];
-    }
-
-    /**
-     * Returns the call gatherer pass information.
-     */
-    public function getCallGathererPass(): CallGathererPass
-    {
-        return $this->callGathererPass;
-    }
-
-    /**
-     * Replace macros.
-     *
-     * @deprecated
-     */
-    public function removeMemoryStackReferences(SymbolTable $symbolTable, string $containerCode): string
-    {
-        if ($symbolTable->getMustGrownStack()) {
-            return $containerCode;
-        }
-
-        $containerCode = str_replace('ZEPHIR_THROW_EXCEPTION_STR', 'ZEPHIR_THROW_EXCEPTION_STRW', $containerCode);
-        $containerCode = str_replace('ZEPHIR_THROW_EXCEPTION_DEBUG_STR', 'ZEPHIR_THROW_EXCEPTION_DEBUG_STRW', $containerCode);
-        $containerCode = str_replace('ZEPHIR_THROW_EXCEPTION_ZVAL', 'ZEPHIR_THROW_EXCEPTION_ZVALW', $containerCode);
-        $containerCode = str_replace('RETURN_THIS', 'RETURN_THISW', $containerCode);
-        $containerCode = str_replace('RETURN_LCTOR', 'RETURN_LCTORW', $containerCode);
-        $containerCode = str_replace('RETURN_CTOR', 'RETURN_CTORW', $containerCode);
-        $containerCode = str_replace('RETURN_NCTOR', 'RETURN_NCTORW', $containerCode);
-        $containerCode = str_replace('RETURN_CCTOR', 'RETURN_CCTORW', $containerCode);
-        $containerCode = str_replace('RETURN_MM_NULL', 'RETURN_NULL', $containerCode);
-        $containerCode = str_replace('RETURN_MM_BOOL', 'RETURN_BOOL', $containerCode);
-        $containerCode = str_replace('RETURN_MM_FALSE', 'RETURN_FALSE', $containerCode);
-        $containerCode = str_replace('RETURN_MM_TRUE', 'RETURN_TRUE', $containerCode);
-        $containerCode = str_replace('RETURN_MM_STRING', 'RETURN_STRING', $containerCode);
-        $containerCode = str_replace('RETURN_MM_LONG', 'RETURN_LONG', $containerCode);
-        $containerCode = str_replace('RETURN_MM_DOUBLE', 'RETURN_DOUBLE', $containerCode);
-        $containerCode = str_replace('RETURN_MM_FALSE', 'RETURN_FALSE', $containerCode);
-        $containerCode = str_replace('RETURN_MM_EMPTY_STRING', 'RETURN_MM_EMPTY_STRING', $containerCode);
-        $containerCode = str_replace('RETURN_MM_EMPTY_ARRAY', 'RETURN_EMPTY_ARRAY', $containerCode);
-        $containerCode = str_replace('RETURN_MM_MEMBER', 'RETURN_MEMBER', $containerCode);
-
-        return preg_replace('/[ \t]+ZEPHIR_MM_RESTORE\(\);'.PHP_EOL.'/s', '', $containerCode);
-    }
-
-    /**
-     * Assigns a default value.
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function assignDefaultValue(array $parameter, CompilationContext $compilationContext): string
-    {
-        /**
-         * Class-Hinted parameters only can be null?
-         */
-        if (isset($parameter['cast'])) {
-            if ('null' !== $parameter['default']['type']) {
-                throw new CompilerException('Class-Hinted parameters only can have "null" as default parameter', $parameter);
-            }
-        }
-
-        $oldCodePrinter = $compilationContext->codePrinter;
-        $codePrinter = new Printer();
-        $codePrinter->increaseLevel();
-        $codePrinter->increaseLevel();
-        $compilationContext->codePrinter = $codePrinter;
-
-        $paramVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext);
+            case 'string':
+                $compilationContext->symbolTable->mustGrownStack(true);
+                $compilationContext->headersManager->add('kernel/memory');
 
-        /**
-         * TODO: Refactoring this place, move to one - static-constant-access
-         */
-        $dataType = $this->getParamDataType($parameter);
-        switch ($dataType) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
                 switch ($parameter['default']['type']) {
                     case 'static-constant-access':
                         /**
@@ -892,16 +454,25 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                          *
                          * TODO: Rewrite all to codePrinter
                          */
-                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext, $parameter['default']);
-                        $expression = new Expression($parameter['default']);
+                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+                            $parameter['name'],
+                            $compilationContext,
+                            $parameter['default']
+                        );
+                        $expression     = new Expression($parameter['default']);
                         $expression->setExpectReturn(true, $symbolVariable);
                         $compiledExpression = $expression->compile($compilationContext);
 
-                        if ('int' != $compiledExpression->getType()) {
-                            throw new CompilerException('Default parameter value type: '.$compiledExpression->getType().' cannot be assigned to variable(int)', $parameter);
+                        if ('string' != $compiledExpression->getType()) {
+                            throw new CompilerException(
+                                'Default parameter value type: '
+                                . $compiledExpression->getType()
+                                . ' cannot be assigned to variable(string)',
+                                $parameter
+                            );
                         }
 
-                        $parameter['default']['type'] = $compiledExpression->getType();
+                        $parameter['default']['type']  = $compiledExpression->getType();
                         $parameter['default']['value'] = $compiledExpression->getCode();
 
                         $compilationContext->codePrinter = $oldCodePrinter;
@@ -909,25 +480,60 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                         return $this->assignDefaultValue($parameter, $compilationContext);
 
                     case 'null':
-                        $codePrinter->output($parameter['name'].' = 0;');
+                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
+                        $compilationContext->backend->assignString($paramVariable, null, $compilationContext);
                         break;
 
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                        $codePrinter->output($parameter['name'].' = '.$parameter['default']['value'].';');
+                    case 'string':
+                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
+                        $compilationContext->backend->assignString(
+                            $paramVariable,
+                            Name::addSlashes($parameter['default']['value']),
+                            $compilationContext
+                        );
                         break;
 
-                    case 'double':
-                        $codePrinter->output($parameter['name'].' = (int) '.$parameter['default']['value'].';');
+                    default:
+                        throw new CompilerException(
+                            sprintf(
+                                'Default parameter value type: %s cannot be assigned to variable(string)',
+                                $parameter['default']['type']
+                            ),
+                            $parameter
+                        );
+                }
+                break;
+
+            case 'array':
+                $compilationContext->symbolTable->mustGrownStack(true);
+                $compilationContext->headersManager->add('kernel/memory');
+                switch ($parameter['default']['type']) {
+                    case 'null':
+                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
+                        break;
+
+                    case 'empty-array':
+                    case 'array':
+                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
+                        $compilationContext->backend->initArray($paramVariable, $compilationContext);
                         break;
 
                     default:
-                        throw new CompilerException('Default parameter value type: '.$parameter['default']['type'].' cannot be assigned to variable(int)', $parameter);
+                        throw new CompilerException(
+                            'Default parameter value type: '
+                            . $parameter['default']['type']
+                            . ' cannot be assigned to variable(array)',
+                            $parameter
+                        );
                 }
                 break;
 
-            case 'double':
+            case 'variable':
+                $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+                    $parameter['name'],
+                    $compilationContext,
+                    $parameter['default']
+                );
                 switch ($parameter['default']['type']) {
                     case 'static-constant-access':
                         /**
@@ -935,946 +541,1285 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
                          *
                          * TODO: Rewrite all to codePrinter
                          */
-                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext, $parameter['default']);
                         $expression = new Expression($parameter['default']);
                         $expression->setExpectReturn(true, $symbolVariable);
                         $compiledExpression = $expression->compile($compilationContext);
 
-                        if ('double' != $compiledExpression->getType()) {
-                            throw new CompilerException('Default parameter value type: '.$compiledExpression->getType().' cannot be assigned to variable(double)', $parameter);
-                        }
-
-                        $parameter['default']['type'] = $compiledExpression->getType();
+                        $parameter['default']['type']  = $compiledExpression->getType();
                         $parameter['default']['value'] = $compiledExpression->getCode();
 
                         $compilationContext->codePrinter = $oldCodePrinter;
 
                         return $this->assignDefaultValue($parameter, $compilationContext);
 
-                    case 'null':
-                        $codePrinter->output($parameter['name'].' = 0;');
-                        break;
-
                     case 'int':
                     case 'uint':
                     case 'long':
-                        $codePrinter->output($parameter['name'].' = (double) '.$parameter['default']['value'].';');
+                    case 'ulong':
+                        $compilationContext->symbolTable->mustGrownStack(true);
+                        $compilationContext->headersManager->add('kernel/memory');
+                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
+                        $compilationContext->backend->assignLong(
+                            $symbolVariable,
+                            $parameter['default']['value'],
+                            $compilationContext
+                        );
                         break;
 
                     case 'double':
-                        $codePrinter->output($parameter['name'].' = '.$parameter['default']['value'].';');
+                        $compilationContext->symbolTable->mustGrownStack(true);
+                        $compilationContext->headersManager->add('kernel/memory');
+                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
+                        $compilationContext->backend->assignDouble(
+                            $symbolVariable,
+                            $parameter['default']['value'],
+                            $compilationContext
+                        );
+                        break;
+
+                    case 'string':
+                        $compilationContext->symbolTable->mustGrownStack(true);
+                        $compilationContext->headersManager->add('kernel/memory');
+                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
+                        $compilationContext->backend->assignString(
+                            $paramVariable,
+                            Name::addSlashes($parameter['default']['value']),
+                            $compilationContext
+                        );
+                        break;
+
+                    case 'bool':
+                        $expectedMutations = $compilationContext->symbolTable->getExpectedMutations($parameter['name']);
+                        if ($expectedMutations < 2) {
+                            if ('true' == $parameter['default']['value']) {
+                                $compilationContext->backend->assignZval(
+                                    $paramVariable,
+                                    $compilationContext->backend->resolveValue('true', $compilationContext),
+                                    $compilationContext
+                                );
+                            } else {
+                                $compilationContext->backend->assignZval(
+                                    $paramVariable,
+                                    $compilationContext->backend->resolveValue('false', $compilationContext),
+                                    $compilationContext
+                                );
+                            }
+                        } else {
+                            $compilationContext->symbolTable->mustGrownStack(true);
+                            $compilationContext->headersManager->add('kernel/memory');
+                            if ('true' == $parameter['default']['value']) {
+                                $compilationContext->backend->copyOnWrite(
+                                    $paramVariable,
+                                    $compilationContext->backend->resolveValue('true', $compilationContext),
+                                    $compilationContext
+                                );
+                            } else {
+                                $compilationContext->backend->copyOnWrite(
+                                    $paramVariable,
+                                    $compilationContext->backend->resolveValue('false', $compilationContext),
+                                    $compilationContext
+                                );
+                            }
+                        }
+                        break;
+
+                    case 'null':
+                        $expectedMutations = $compilationContext->symbolTable->getExpectedMutations($parameter['name']);
+                        if ($expectedMutations < 2) {
+                            $compilationContext->backend->assignZval(
+                                $symbolVariable,
+                                $compilationContext->backend->resolveValue('null', $compilationContext),
+                                $compilationContext
+                            );
+                        } else {
+                            $compilationContext->symbolTable->mustGrownStack(true);
+                            $compilationContext->headersManager->add('kernel/memory');
+                            $compilationContext->backend->copyOnWrite(
+                                $paramVariable,
+                                $compilationContext->backend->resolveValue('null', $compilationContext),
+                                $compilationContext
+                            );
+                        }
+                        break;
+
+                    case 'empty-array':
+                        $compilationContext->symbolTable->mustGrownStack(true);
+                        $compilationContext->headersManager->add('kernel/memory');
+                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
+                        $compilationContext->backend->initArray($symbolVariable, $compilationContext);
                         break;
 
                     default:
-                        throw new CompilerException('Default parameter value type: '.$parameter['default']['type'].' cannot be assigned to variable(double)', $parameter);
+                        throw new CompilerException(
+                            'Default parameter value type: ' . $parameter['default']['type'] . ' cannot be assigned to variable(variable)',
+                            $parameter
+                        );
                 }
                 break;
 
+            default:
+                throw new CompilerException('Default parameter type: ' . $dataType, $parameter);
+        }
+
+        $compilationContext->codePrinter = $oldCodePrinter;
+
+        return $codePrinter->getOutput();
+    }
+
+    /**
+     * Assigns a zval value to a static low-level type.
+     *
+     * @throws CompilerException
+     */
+    public function assignZvalValue(array $parameter, CompilationContext $compilationContext): string
+    {
+        $dataType = $this->getParamDataType($parameter);
+
+        if (in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
+            return '';
+        }
+
+        $compilationContext->headersManager->add('kernel/operators');
+        $parameterVariable = $compilationContext->symbolTable->getVariableForWrite(
+            $parameter['name'] . '_param',
+            $compilationContext
+        );
+        $parameterCode     = $compilationContext->backend->getVariableCode($parameterVariable);
+        $inputParamVar     = $compilationContext->symbolTable->getVariableForWrite(
+            $parameter['name'],
+            $compilationContext
+        );
+        $inputParamCode    = $compilationContext->backend->getVariableCode($inputParamVar);
+
+        switch ($dataType) {
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+                // Value already passed in `Z_PARAM_LONG()`
+                return '';
+
+            case 'char':
+                return "\t" . $parameter['name'] . ' = zephir_get_charval(' . $parameterCode . ');' . PHP_EOL;
+
             case 'bool':
-                switch ($parameter['default']['type']) {
-                    case 'static-constant-access':
-                        /**
-                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
-                         *
-                         * TODO: Rewrite all to codePrinter
-                         */
-                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext, $parameter['default']);
-                        $expression = new Expression($parameter['default']);
-                        $expression->setExpectReturn(true, $symbolVariable);
-                        $compiledExpression = $expression->compile($compilationContext);
+                return "\t" . $parameter['name'] . ' = zephir_get_boolval(' . $parameterCode . ');' . PHP_EOL;
 
-                        if ('bool' !== $compiledExpression->getType()) {
-                            throw new CompilerException('Default parameter value type: '.$compiledExpression->getType().' cannot be assigned to variable(bool)', $parameter);
-                        }
+            case 'double':
+                return "\t" . $parameter['name'] . ' = zephir_get_doubleval(' . $parameterCode . ');' . PHP_EOL;
 
-                        $parameter['default']['type'] = $compiledExpression->getType();
-                        $parameter['default']['value'] = $compiledExpression->getCode();
+            case 'string':
+                $compilationContext->symbolTable->mustGrownStack(true);
 
-                        $compilationContext->codePrinter = $oldCodePrinter;
+                return "\t" . 'zephir_get_strval(' . $inputParamCode . ', ' . $parameterCode . ');' . PHP_EOL;
+
+            case 'array':
+                $compilationContext->symbolTable->mustGrownStack(true);
+
+                return "\t" . 'zephir_get_arrval(' . $inputParamCode . ', ' . $parameterCode . ');' . PHP_EOL;
+
+            default:
+                throw new CompilerException('Parameter type: ' . $dataType, $parameter);
+        }
+    }
+
+    /**
+     * Assigns a zval value to a static low-level type.
+     *
+     * TODO: rewrite this to build ifs and throw from builders
+     *
+     * @throws CompilerException
+     */
+    public function checkStrictType(array $parameter, CompilationContext $compilationContext): string
+    {
+        $dataType = $this->getParamDataType($parameter);
+
+        $compilationContext->headersManager->add('ext/spl/spl_exceptions');
+        $compilationContext->headersManager->add('kernel/exception');
+
+        $codePrinter = new Printer();
+        $codePrinter->increaseLevel();
+        $oldCodePrinter                  = $compilationContext->codePrinter;
+        $compilationContext->codePrinter = $codePrinter;
+        $compilationContext->backend->checkStrictType($dataType, $parameter, $compilationContext);
+
+        $compilationContext->codePrinter = $oldCodePrinter;
+
+        return $codePrinter->getOutput();
+    }
+
+    /**
+     * Checks for visibility congruence.
+     *
+     * @throws CompilerException
+     */
+    public function checkVisibility(array $visibility, string $name, array $original = null): void
+    {
+        if (count($visibility) > 1) {
+            if (in_array('public', $visibility) && in_array('protected', $visibility)) {
+                throw new CompilerException(
+                    "Method '$name' cannot be 'public' and 'protected' at the same time",
+                    $original
+                );
+            }
+
+            if (in_array('public', $visibility) && in_array('private', $visibility)) {
+                throw new CompilerException(
+                    "Method '$name' cannot be 'public' and 'private' at the same time",
+                    $original
+                );
+            }
+
+            if (in_array('private', $visibility) && in_array('protected', $visibility)) {
+                throw new CompilerException(
+                    "Method '$name' cannot be 'protected' and 'private' at the same time",
+                    $original
+                );
+            }
+
+            if (in_array('private', $visibility) && in_array('internal', $visibility)) {
+                throw new CompilerException(
+                    "Method '$name' cannot be 'internal' and 'private' at the same time",
+                    $original
+                );
+            }
+
+            if (in_array('protected', $visibility) && in_array('internal', $visibility)) {
+                throw new CompilerException(
+                    "Method '$name' cannot be 'internal' and 'protected' at the same time",
+                    $original
+                );
+            }
+
+            if (in_array('public', $visibility) && in_array('internal', $visibility)) {
+                throw new CompilerException(
+                    "Method '$name' cannot be 'internal' and 'public' at the same time",
+                    $original
+                );
+            }
+        }
+
+        if ('__construct' === $name) {
+            if (in_array('static', $visibility)) {
+                throw new CompilerException("Constructors cannot be 'static'", $original);
+            }
+        } elseif ('__destruct' === $name) {
+            if (in_array('static', $visibility)) {
+                throw new CompilerException("Destructors cannot be 'static'", $original);
+            }
+        }
 
-                        return $this->assignDefaultValue($parameter, $compilationContext);
+        $this->isAbstract = in_array('abstract', $visibility);
+        $this->isStatic   = in_array('static', $visibility);
+        $this->isFinal    = in_array('final', $visibility);
+        $this->isPublic   = in_array('public', $visibility);
+        $this->isInternal = in_array('internal', $visibility);
+    }
 
-                    case 'null':
-                        $codePrinter->output($parameter['name'].' = 0;');
-                        break;
+    /**
+     * Compiles the method.
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function compile(CompilationContext $compilationContext): void
+    {
+        /**
+         * Set the method currently being compiled
+         */
+        $compilationContext->currentMethod = $this;
 
-                    case 'bool':
-                        if ('true' === $parameter['default']['value']) {
-                            $codePrinter->output($parameter['name'].' = 1;');
-                        } else {
-                            $codePrinter->output($parameter['name'].' = 0;');
-                        }
-                        break;
+        /**
+         * Assign pre-made compilation passes.
+         */
+        $typeInference    = $this->typeInference;
+        $callGathererPass = $this->callGathererPass;
 
-                    default:
-                        throw new CompilerException('Default parameter value type: '.$parameter['default']['type'].' cannot be assigned to variable(bool)', $parameter);
-                }
-                break;
+        /**
+         * Initialization of parameters happens in a fictitious external branch.
+         */
+        $branch = new Branch();
+        $branch->setType(Branch::TYPE_EXTERNAL);
 
-            case 'string':
-                $compilationContext->symbolTable->mustGrownStack(true);
-                $compilationContext->headersManager->add('kernel/memory');
+        /**
+         * BranchManager helps to create graphs of conditional/loop/root/jump branches.
+         */
+        $branchManager = new BranchManager();
+        $branchManager->addBranch($branch);
 
-                switch ($parameter['default']['type']) {
-                    case 'static-constant-access':
-                        /**
-                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
-                         *
-                         * TODO: Rewrite all to codePrinter
-                         */
-                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext, $parameter['default']);
-                        $expression = new Expression($parameter['default']);
-                        $expression->setExpectReturn(true, $symbolVariable);
-                        $compiledExpression = $expression->compile($compilationContext);
+        $compilationContext->branchManager = $branchManager;
 
-                        if ('string' != $compiledExpression->getType()) {
-                            throw new CompilerException('Default parameter value type: '.$compiledExpression->getType().' cannot be assigned to variable(string)', $parameter);
-                        }
+        /**
+         * Every method has its own symbol table.
+         */
+        $symbolTable = new SymbolTable($compilationContext);
+        if ($this->localContext instanceof LocalContextPass) {
+            $symbolTable->setLocalContext($this->localContext);
+        }
 
-                        $parameter['default']['type'] = $compiledExpression->getType();
-                        $parameter['default']['value'] = $compiledExpression->getCode();
+        foreach ($this->staticVariables as $var) {
+            $localVar = clone $var;
+            $localVar->setIsExternal(true);
+            $localVar->setLocalOnly(true);
+            $localVar->setDynamicTypes($localVar->getType());
+            $localVar->setType('variable');
+            $localVar->setIsDoublePointer(false);
+            $symbolTable->addRawVariable($localVar);
+        }
 
-                        $compilationContext->codePrinter = $oldCodePrinter;
+        /**
+         * Parameters has an additional extra mutation.
+         */
+        if ($this->localContext instanceof LocalContextPass && $this->parameters instanceof Parameters) {
+            foreach ($this->parameters->getParameters() as $parameter) {
+                $this->localContext->increaseMutations($parameter['name']);
+            }
+        }
 
-                        return $this->assignDefaultValue($parameter, $compilationContext);
+        /**
+         * Cache Manager manages function calls, method calls and class entries caches.
+         */
+        $cacheManager = new Manager();
+        $cacheManager->setGatherer($callGathererPass);
 
-                    case 'null':
-                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
-                        $compilationContext->backend->assignString($paramVariable, null, $compilationContext);
-                        break;
+        $compilationContext->cacheManager  = $cacheManager;
+        $compilationContext->typeInference = $typeInference;
+        $compilationContext->symbolTable   = $symbolTable;
 
-                    case 'string':
-                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
-                        $compilationContext->backend->assignString(
-                            $paramVariable,
-                            Name::addSlashes($parameter['default']['value']),
-                            $compilationContext
-                        );
-                        break;
+        $oldCodePrinter = $compilationContext->codePrinter;
 
-                    default:
-                        throw new CompilerException(
-                            sprintf(
-                                'Default parameter value type: %s cannot be assigned to variable(string)',
-                                $parameter['default']['type']
-                            ),
-                            $parameter
-                        );
-                }
-                break;
+        /**
+         * Change the code printer to a single method instance.
+         */
+        $codePrinter                     = new Printer();
+        $compilationContext->codePrinter = $codePrinter;
 
-            case 'array':
-                $compilationContext->symbolTable->mustGrownStack(true);
-                $compilationContext->headersManager->add('kernel/memory');
-                switch ($parameter['default']['type']) {
-                    case 'null':
-                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
-                        break;
+        /**
+         * Set an empty function cache
+         */
+        $compilationContext->functionCache = null;
 
-                    case 'empty-array':
-                    case 'array':
-                        $compilationContext->backend->initVar($paramVariable, $compilationContext);
-                        $compilationContext->backend->initArray($paramVariable, $compilationContext);
-                        break;
+        /**
+         * Reset try/catch and loop counter
+         */
+        $compilationContext->insideCycle     = 0;
+        $compilationContext->insideTryCatch  = 0;
+        $compilationContext->currentTryCatch = 0;
 
-                    default:
-                        throw new CompilerException('Default parameter value type: '.$parameter['default']['type'].' cannot be assigned to variable(array)', $parameter);
-                }
-                break;
+        if ($this->parameters instanceof Parameters) {
+            /**
+             * Round 1. Create variables in parameters in the symbol table.
+             */
+            $substituteVars = [];
+            foreach ($this->parameters->getParameters() as $parameter) {
+                $symbolParam = null;
 
-            case 'variable':
-                $symbolVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext, $parameter['default']);
-                switch ($parameter['default']['type']) {
-                    case 'static-constant-access':
-                        /**
-                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
-                         *
-                         * TODO: Rewrite all to codePrinter
-                         */
-                        $expression = new Expression($parameter['default']);
-                        $expression->setExpectReturn(true, $symbolVariable);
-                        $compiledExpression = $expression->compile($compilationContext);
+                if (isset($parameter['data-type'])) {
+                    switch ($parameter['data-type']) {
+                        case 'object':
+                        case 'callable':
+                        case 'resource':
+                        case 'variable':
+                        case 'mixed':
+                            $symbol = $symbolTable->addVariable(
+                                $parameter['data-type'],
+                                $parameter['name'],
+                                $compilationContext
+                            );
+                            /* TODO: Move this to the respective backend, which requires refactoring how this works */
+                            $symbol->setIsDoublePointer(true);
+                            $substituteVars[$parameter['name']] = $symbolTable->addVariable(
+                                'variable',
+                                $parameter['name'] . '_sub',
+                                $compilationContext
+                            );
+                            break;
 
-                        $parameter['default']['type'] = $compiledExpression->getType();
-                        $parameter['default']['value'] = $compiledExpression->getCode();
+                        default:
+                            $symbol      = $symbolTable->addVariable(
+                                $parameter['data-type'],
+                                $parameter['name'],
+                                $compilationContext
+                            );
+                            $symbolParam = $symbolTable->addVariable(
+                                'variable',
+                                $parameter['name'] . '_param',
+                                $compilationContext
+                            );
+                            /* TODO: Move this to the respective backend, which requires refactoring how this works */
+                            $symbolParam->setIsDoublePointer(true);
 
-                        $compilationContext->codePrinter = $oldCodePrinter;
+                            if ('string' == $parameter['data-type'] || 'array' == $parameter['data-type']) {
+                                $symbol->setMustInitNull(true);
+                            }
+                            break;
+                    }
+                } else {
+                    $symbol = $symbolTable->addVariable('variable', $parameter['name'], $compilationContext);
+                }
 
-                        return $this->assignDefaultValue($parameter, $compilationContext);
+                /**
+                 * ZE3 only
+                 */
+                if (isset($substituteVars[$parameter['name']])) {
+                    $substituteVar = $substituteVars[$parameter['name']];
+                    $substituteVar->increaseUses();
+                }
 
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        $compilationContext->symbolTable->mustGrownStack(true);
-                        $compilationContext->headersManager->add('kernel/memory');
-                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
-                        $compilationContext->backend->assignLong($symbolVariable, $parameter['default']['value'], $compilationContext);
-                        break;
+                /**
+                 * Some parameters can be read-only
+                 */
+                if (!empty($parameter['const'])) {
+                    $symbol->setReadOnly(true);
+                    if (is_object($symbolParam)) {
+                        $symbolParam->setReadOnly(true);
+                    }
+                }
 
-                    case 'double':
-                        $compilationContext->symbolTable->mustGrownStack(true);
-                        $compilationContext->headersManager->add('kernel/memory');
-                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
-                        $compilationContext->backend->assignDouble($symbolVariable, $parameter['default']['value'], $compilationContext);
-                        break;
+                if (is_object($symbolParam)) {
+                    /**
+                     * Parameters are marked as 'external'
+                     */
+                    $symbolParam->setIsExternal(true);
 
-                    case 'string':
-                        $compilationContext->symbolTable->mustGrownStack(true);
-                        $compilationContext->headersManager->add('kernel/memory');
-                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
-                        $compilationContext->backend->assignString(
-                            $paramVariable,
-                            Name::addSlashes($parameter['default']['value']),
-                            $compilationContext
-                        );
-                        break;
+                    /**
+                     * Assuming they're initialized
+                     */
+                    $symbolParam->setIsInitialized(true, $compilationContext);
 
-                    case 'bool':
-                        $expectedMutations = $compilationContext->symbolTable->getExpectedMutations($parameter['name']);
-                        if ($expectedMutations < 2) {
-                            if ('true' == $parameter['default']['value']) {
-                                $compilationContext->backend->assignZval($paramVariable, $compilationContext->backend->resolveValue('true', $compilationContext), $compilationContext);
-                            } else {
-                                $compilationContext->backend->assignZval($paramVariable, $compilationContext->backend->resolveValue('false', $compilationContext), $compilationContext);
-                            }
-                        } else {
-                            $compilationContext->symbolTable->mustGrownStack(true);
-                            $compilationContext->headersManager->add('kernel/memory');
-                            if ('true' == $parameter['default']['value']) {
-                                $compilationContext->backend->copyOnWrite($paramVariable, $compilationContext->backend->resolveValue('true', $compilationContext), $compilationContext);
-                            } else {
-                                $compilationContext->backend->copyOnWrite($paramVariable, $compilationContext->backend->resolveValue('false', $compilationContext), $compilationContext);
-                            }
-                        }
-                        break;
+                    /**
+                     * Initialize auxiliary parameter zvals to null
+                     */
+                    $symbolParam->setMustInitNull(true);
 
-                    case 'null':
-                        $expectedMutations = $compilationContext->symbolTable->getExpectedMutations($parameter['name']);
-                        if ($expectedMutations < 2) {
-                            $compilationContext->backend->assignZval($symbolVariable, $compilationContext->backend->resolveValue('null', $compilationContext), $compilationContext);
+                    /**
+                     * Increase uses
+                     */
+                    $symbolParam->increaseUses();
+                } else {
+                    if (isset($parameter['default'])) {
+                        if (isset($parameter['data-type'])) {
+                            if ('variable' === $parameter['data-type']) {
+                                $symbol->setMustInitNull(true);
+                            }
                         } else {
-                            $compilationContext->symbolTable->mustGrownStack(true);
-                            $compilationContext->headersManager->add('kernel/memory');
-                            $compilationContext->backend->copyOnWrite($paramVariable, $compilationContext->backend->resolveValue('null', $compilationContext), $compilationContext);
+                            $symbol->setMustInitNull(true);
                         }
-                        break;
-
-                    case 'empty-array':
-                        $compilationContext->symbolTable->mustGrownStack(true);
-                        $compilationContext->headersManager->add('kernel/memory');
-                        $compilationContext->backend->initVar($symbolVariable, $compilationContext);
-                        $compilationContext->backend->initArray($symbolVariable, $compilationContext);
-                        break;
-
-                    default:
-                        throw new CompilerException('Default parameter value type: '.$parameter['default']['type'].' cannot be assigned to variable(variable)', $parameter);
+                    }
                 }
-                break;
-
-            default:
-                throw new CompilerException('Default parameter type: '.$dataType, $parameter);
-        }
-
-        $compilationContext->codePrinter = $oldCodePrinter;
-
-        return $codePrinter->getOutput();
-    }
 
-    /**
-     * Assigns a zval value to a static low-level type.
-     *
-     * TODO: rewrite this to build ifs and throw from builders
-     *
-     * @throws CompilerException
-     */
-    public function checkStrictType(array $parameter, CompilationContext $compilationContext): string
-    {
-        $dataType = $this->getParamDataType($parameter);
+                /**
+                 * Original node where the variable was declared
+                 */
+                $symbol->setOriginal($parameter);
 
-        $compilationContext->headersManager->add('ext/spl/spl_exceptions');
-        $compilationContext->headersManager->add('kernel/exception');
+                /**
+                 * Parameters are marked as 'external'
+                 */
+                $symbol->setIsExternal(true);
 
-        $codePrinter = new Printer();
-        $codePrinter->increaseLevel();
-        $oldCodePrinter = $compilationContext->codePrinter;
-        $compilationContext->codePrinter = $codePrinter;
-        $compilationContext->backend->checkStrictType($dataType, $parameter, $compilationContext);
+                /**
+                 * Assuming they're initialized
+                 */
+                $symbol->setIsInitialized(true, $compilationContext);
 
-        $compilationContext->codePrinter = $oldCodePrinter;
+                /**
+                 * Variables with class/type must be objects across the execution
+                 */
+                if (isset($parameter['cast'])) {
+                    $symbol->setDynamicTypes('object');
+                    $symbol->setClassTypes($compilationContext->getFullName($parameter['cast']['value']));
+                } else {
+                    if (isset($parameter['data-type'])) {
+                        if ('variable' === $parameter['data-type']) {
+                            $symbol->setDynamicTypes('undefined');
+                        }
+                    } else {
+                        $symbol->setDynamicTypes('undefined');
+                    }
+                }
+            }
+        }
 
-        return $codePrinter->getOutput();
-    }
+        $compilationContext->backend->onPreCompile($this, $compilationContext);
 
-    /**
-     * Assigns a zval value to a static low-level type.
-     *
-     * @throws CompilerException
-     */
-    public function assignZvalValue(array $parameter, CompilationContext $compilationContext): string
-    {
-        $dataType = $this->getParamDataType($parameter);
+        /**
+         * Compile the block of statements if any
+         */
+        if (is_object($this->statements)) {
+            $compilationContext->staticContext = $this->hasModifier('static');
 
-        if (\in_array($dataType, ['variable', 'callable', 'object', 'resource', 'mixed'])) {
-            return '';
+            /**
+             * Compile the statements block as a 'root' branch
+             */
+            $this->statements->compile($compilationContext, false, Branch::TYPE_ROOT);
         }
 
-        $compilationContext->headersManager->add('kernel/operators');
-        $parameterVariable = $compilationContext->symbolTable->getVariableForWrite($parameter['name'].'_param', $compilationContext);
-        $parameterCode = $compilationContext->backend->getVariableCode($parameterVariable);
-        $inputParamVar = $compilationContext->symbolTable->getVariableForWrite($parameter['name'], $compilationContext);
-        $inputParamCode = $compilationContext->backend->getVariableCode($inputParamVar);
+        /**
+         * Initialize variable default values.
+         */
+        $initVarCode = $compilationContext->backend->initializeVariableDefaults(
+            $symbolTable->getVariables(),
+            $compilationContext
+        );
 
-        switch ($dataType) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-                // Value already passed in `Z_PARAM_LONG()`
-                return '';
+        /**
+         * Fetch parameters from vm-top.
+         */
+        $initCode       = '';
+        $code           = '';
+        $requiredParams = [];
+        $optionalParams = [];
+        if ($this->parameters instanceof Parameters) {
+            /**
+             * Round 2. Fetch the parameters in the method.
+             */
+            $params               = $this->parameters->fetchParameters($this->isInternal);
+            $numberRequiredParams = $this->parameters->countRequiredParameters();
+            $numberOptionalParams = $this->parameters->countOptionalParameters();
+            $requiredParams       = $this->parameters->getRequiredParameters();
+            $optionalParams       = $this->parameters->getOptionalParameters();
 
-            case 'char':
-                return "\t".$parameter['name'].' = zephir_get_charval('.$parameterCode.');'.PHP_EOL;
+            /**
+             * Pass the write detector to the method statement block to check if the parameter
+             * variable is modified so as do the proper separation.
+             */
+            $parametersToSeparate = [];
+            if (is_object($this->statements)) {
+                if (!$this->localContext instanceof LocalContextPass) {
+                    $writeDetector = new WriteDetector();
+                }
 
-            case 'bool':
-                return "\t".$parameter['name'].' = zephir_get_boolval('.$parameterCode.');'.PHP_EOL;
+                foreach ($this->parameters->getParameters() as $parameter) {
+                    $dataType = $parameter['data-type'] ?? 'variable';
 
-            case 'double':
-                return "\t".$parameter['name'].' = zephir_get_doubleval('.$parameterCode.');'.PHP_EOL;
+                    switch ($dataType) {
+                        case 'variable':
+                        case 'string':
+                        case 'array':
+                        case 'resource':
+                        case 'object':
+                        case 'callable':
+                            $name = $parameter['name'];
+                            if (!$this->localContext instanceof LocalContextPass) {
+                                if ($writeDetector->detect($name, $this->statements->getStatements())) {
+                                    $parametersToSeparate[$name] = true;
+                                }
+                            } else {
+                                if ($this->localContext->getNumberOfMutations($name) > 1) {
+                                    $parametersToSeparate[$name] = true;
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
 
-            case 'string':
-                $compilationContext->symbolTable->mustGrownStack(true);
+            /**
+             * Initialize required parameters
+             */
+            foreach ($requiredParams as $parameter) {
+                $mandatory = $parameter['mandatory'] ?? 0;
+                $dataType  = $this->getParamDataType($parameter);
 
-                return "\t".'zephir_get_strval('.$inputParamCode.', '.$parameterCode.');'.PHP_EOL;
+                if ('variable' !== $dataType) {
+                    /**
+                     * Assign value from zval to low level type
+                     */
+                    if ($mandatory) {
+                        $initCode .= $this->checkStrictType($parameter, $compilationContext);
+                    } else {
+                        $initCode .= $this->assignZvalValue($parameter, $compilationContext);
+                    }
+                }
 
-            case 'array':
-                $compilationContext->symbolTable->mustGrownStack(true);
+                switch ($dataType) {
+                    case 'variable':
+                    case 'resource':
+                    case 'object':
+                    case 'callable':
+                        if (isset($parametersToSeparate[$parameter['name']])) {
+                            $symbolTable->mustGrownStack(true);
+                            $initCode .= "\t" . 'ZEPHIR_SEPARATE_PARAM(' . $parameter['name'] . ');' . PHP_EOL;
+                        }
+                        break;
+                }
+            }
 
-                return "\t".'zephir_get_arrval('.$inputParamCode.', '.$parameterCode.');'.PHP_EOL;
+            /**
+             * Initialize optional parameters
+             */
+            foreach ($optionalParams as $parameter) {
+                $mandatory = $parameter['mandatory'] ?? 0;
+                $dataType  = $this->getParamDataType($parameter);
 
-            default:
-                throw new CompilerException('Parameter type: '.$dataType, $parameter);
-        }
-    }
+                $name = match ($dataType) {
+                    'object',
+                    'callable',
+                    'resource',
+                    'variable',
+                    'mixed' => $parameter['name'],
+                    default => $parameter['name'] . '_param',
+                };
 
-    /**
-     * Pre-compiles the method making compilation pass data (static inference, local-context-pass) available to other methods.
-     *
-     * @throws CompilerException
-     */
-    public function preCompile(CompilationContext $compilationContext): void
-    {
-        $localContext = null;
-        $typeInference = null;
-        $callGathererPass = null;
+                /**
+                 * Assign the default value according to the variable's type.
+                 */
+                $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
+                $initCode  .= "\t" . $compilationContext->backend->ifVariableValueUndefined(
+                    $targetVar,
+                    $compilationContext,
+                    false,
+                    false
+                ) . PHP_EOL;
 
-        if (\is_object($this->statements)) {
-            $compilationContext->currentMethod = $this;
+                if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
+                    $substituteVar = $substituteVars[$parameter['name']];
+                    $initCode      .= "\t\t"
+                        . $targetVar->getName()
+                        . ' = &'
+                        . $substituteVar->getName()
+                        . ';'
+                        . PHP_EOL
+                    ;
+                }
+                $initCode .= $this->assignDefaultValue($parameter, $compilationContext);
 
-            /**
-             * This pass checks for zval variables than can be potentially
-             * used without allocating memory and track it
-             * these variables are stored in the stack
-             */
-            if ($compilationContext->config->get('local-context-pass', 'optimizations')) {
-                $localContext = new LocalContextPass();
-                $localContext->pass($this->statements);
-            }
+                if (isset($parametersToSeparate[$name]) || 'variable' !== $dataType) {
+                    $initCode .= "\t" . '} else {' . PHP_EOL;
 
-            /**
-             * This pass tries to infer types for dynamic variables
-             * replacing them by low level variables
-             */
-            if ($compilationContext->config->get('static-type-inference', 'optimizations')) {
-                $typeInference = new StaticTypeInference();
-                $typeInference->pass($this->statements);
-                if ($compilationContext->config->get('static-type-inference-second-pass', 'optimizations')) {
-                    $typeInference->reduce();
-                    $typeInference->pass($this->statements);
+                    if (isset($parametersToSeparate[$name])) {
+                        $initCode .= "\t\t" . 'ZEPHIR_SEPARATE_PARAM(' . $name . ');' . PHP_EOL;
+                    } else {
+                        if ($mandatory) {
+                            $initCode .= $this->checkStrictType($parameter, $compilationContext);
+                        } else {
+                            $initCode .= "\t" . $this->assignZvalValue($parameter, $compilationContext);
+                        }
+                    }
                 }
+
+                $initCode .= "\t" . '}' . PHP_EOL;
             }
 
             /**
-             * This pass counts how many times a specific
+             * Fetch the parameters to zval pointers
              */
-            if ($compilationContext->config->get('call-gatherer-pass', 'optimizations')) {
-                $callGathererPass = new CallGathererPass($compilationContext);
-                $callGathererPass->pass($this->statements);
+            $codePrinter->preOutputBlankLine();
+
+            if (!$this->isInternal()) {
+                $compilationContext->headersManager->add('kernel/memory');
+                if ($symbolTable->getMustGrownStack()) {
+                    $code .= "\t"
+                        . 'zephir_fetch_params(1, '
+                        . $numberRequiredParams
+                        . ', '
+                        . $numberOptionalParams
+                        . ', '
+                        . implode(', ', $params)
+                        . ');'
+                        . PHP_EOL
+                    ;
+                } else {
+                    $code .= "\t"
+                        . 'zephir_fetch_params_without_memory_grow('
+                        . $numberRequiredParams
+                        . ', '
+                        . $numberOptionalParams
+                        . ', '
+                        . implode(', ', $params)
+                        . ');'
+                        . PHP_EOL
+                    ;
+                }
+            } else {
+                foreach ($params as $param) {
+                    /* TODO: Migrate all this code to codeprinter, get rid of temp code printer */
+                    $tempCodePrinter                 = new Printer();
+                    $realCodePrinter                 = $compilationContext->codePrinter;
+                    $compilationContext->codePrinter = $tempCodePrinter;
+                    $paramVar                        = $compilationContext->symbolTable->getVariableForRead(
+                        $param,
+                        $compilationContext
+                    );
+                    $compilationContext->backend->assignZval($paramVar, $param . '_ext', $compilationContext);
+                    $code                            .= "\t" . $tempCodePrinter->getOutput() . PHP_EOL;
+                    $compilationContext->codePrinter = $realCodePrinter;
+                }
             }
         }
 
-        $this->localContext = $localContext;
-        $this->typeInference = $typeInference;
-        $this->callGathererPass = $callGathererPass;
-    }
-
-    /**
-     * Compiles the method.
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function compile(CompilationContext $compilationContext): void
-    {
-        /**
-         * Set the method currently being compiled
-         */
-        $compilationContext->currentMethod = $this;
-
-        /**
-         * Assign pre-made compilation passes.
-         */
-        $typeInference = $this->typeInference;
-        $callGathererPass = $this->callGathererPass;
-
-        /**
-         * Initialization of parameters happens in a fictitious external branch.
-         */
-        $branch = new Branch();
-        $branch->setType(Branch::TYPE_EXTERNAL);
-
-        /**
-         * BranchManager helps to create graphs of conditional/loop/root/jump branches.
-         */
-        $branchManager = new BranchManager();
-        $branchManager->addBranch($branch);
+        $code .= $initCode . $initVarCode;
+        $codePrinter->preOutput($code);
 
-        $compilationContext->branchManager = $branchManager;
+        $compilationContext->headersManager->add('kernel/object');
 
         /**
-         * Every method has its own symbol table.
+         * Fetch used superglobals
          */
-        $symbolTable = new SymbolTable($compilationContext);
-        if ($this->localContext instanceof LocalContextPass) {
-            $symbolTable->setLocalContext($this->localContext);
-        }
+        foreach ($symbolTable->getVariables() as $name => $variable) {
+            if ($variable->isSuperGlobal()) {
+                $globalVar = $symbolTable->getVariable($name);
+                $codePrinter->preOutput(
+                    "\t" . $compilationContext->backend->fetchGlobal($globalVar, $compilationContext, false)
+                );
+            }
 
-        foreach ($this->staticVariables as $var) {
-            $localVar = clone $var;
-            $localVar->setIsExternal(true);
-            $localVar->setLocalOnly(true);
-            $localVar->setDynamicTypes($localVar->getType());
-            $localVar->setType('variable');
-            $localVar->setIsDoublePointer(false);
-            $symbolTable->addRawVariable($localVar);
-        }
+            if ($variable->isLocalStatic()) {
+                $staticVar = $symbolTable->getVariable($name);
 
-        /**
-         * Parameters has an additional extra mutation.
-         */
-        if ($this->localContext instanceof LocalContextPass && $this->parameters instanceof Parameters) {
-            foreach ($this->parameters->getParameters() as $parameter) {
-                $this->localContext->increaseMutations($parameter['name']);
+                $codePrinter->preOutput(
+                    sprintf(
+                        "\t" . 'zephir_read_static_property_ce(&%s, %s, SL("%s"), PH_NOISY_CC%s);',
+                        $staticVar->getName(),
+                        $this->classDefinition->getClassEntry(),
+                        $staticVar->getName(),
+                        ''
+                    )
+                );
             }
         }
 
         /**
-         * Cache Manager manages function calls, method calls and class entries caches.
+         * Check if there are unused variables.
          */
-        $cacheManager = new Manager();
-        $cacheManager->setGatherer($callGathererPass);
+        $usedVariables = [];
+        $completeName  = $this->getClassDefinition()?->getCompleteName() ?: '[unknown]';
 
-        $compilationContext->cacheManager = $cacheManager;
-        $compilationContext->typeInference = $typeInference;
-        $compilationContext->symbolTable = $symbolTable;
+        foreach ($symbolTable->getVariables() as $variable) {
+            if ($variable->getNumberUses() <= 0) {
+                if (!$variable->isExternal()) {
+                    $compilationContext->logger->warning(
+                        'Variable "'
+                        . $variable->getName()
+                        . '" declared but not used in '
+                        . $completeName
+                        . '::'
+                        . $this->getName(),
+                        ['unused-variable', $variable->getOriginal()]
+                    );
+                    continue;
+                }
 
-        $oldCodePrinter = $compilationContext->codePrinter;
+                $compilationContext->logger->warning(
+                    'Variable "'
+                    . $variable->getName()
+                    . '" declared but not used in '
+                    . $completeName
+                    . '::'
+                    . $this->getName(),
+                    ['unused-variable-external', $variable->getOriginal()]
+                );
+            }
 
-        /**
-         * Change the code printer to a single method instance.
-         */
-        $codePrinter = new Printer();
-        $compilationContext->codePrinter = $codePrinter;
+            if (
+                'this_ptr' !== $variable->getName() &&
+                'return_value' !== $variable->getName() &&
+                'return_value_ptr' !== $variable->getName()
+            ) {
+                $type = $variable->getType();
+                if (!isset($usedVariables[$type])) {
+                    $usedVariables[$type] = [];
+                }
 
-        /**
-         * Set an empty function cache
-         */
-        $compilationContext->functionCache = null;
+                $usedVariables[$type][] = $variable;
+            }
+        }
 
         /**
-         * Reset try/catch and loop counter
+         * Check if there are assigned but not used variables
+         * Warn whenever a variable is unused aside from its declaration.
          */
-        $compilationContext->insideCycle = 0;
-        $compilationContext->insideTryCatch = 0;
-        $compilationContext->currentTryCatch = 0;
-
-        if ($this->parameters instanceof Parameters) {
-            /**
-             * Round 1. Create variables in parameters in the symbol table.
-             */
-            $substituteVars = [];
-            foreach ($this->parameters->getParameters() as $parameter) {
-                $symbolParam = null;
-
-                if (isset($parameter['data-type'])) {
-                    switch ($parameter['data-type']) {
-                        case 'object':
-                        case 'callable':
-                        case 'resource':
-                        case 'variable':
-                        case 'mixed':
-                            $symbol = $symbolTable->addVariable($parameter['data-type'], $parameter['name'], $compilationContext);
-                            /* TODO: Move this to the respective backend, which requires refactoring how this works */
-                            $symbol->setIsDoublePointer(true);
-                            $substituteVars[$parameter['name']] = $symbolTable->addVariable('variable', $parameter['name'].'_sub', $compilationContext);
-                            break;
+        foreach ($symbolTable->getVariables() as $variable) {
+            if ($variable->isExternal() || $variable->isTemporal()) {
+                continue;
+            }
 
-                        default:
-                            $symbol = $symbolTable->addVariable($parameter['data-type'], $parameter['name'], $compilationContext);
-                            $symbolParam = $symbolTable->addVariable('variable', $parameter['name'].'_param', $compilationContext);
-                            /* TODO: Move this to the respective backend, which requires refactoring how this works */
-                            $symbolParam->setIsDoublePointer(true);
+            if (
+                'this_ptr' === $variable->getName() ||
+                'return_value' === $variable->getName() ||
+                'return_value_ptr' === $variable->getName() ||
+                'ZEPHIR_LAST_CALL_STATUS' === $variable->getName()
+            ) {
+                continue;
+            }
 
-                            if ('string' == $parameter['data-type'] || 'array' == $parameter['data-type']) {
-                                $symbol->setMustInitNull(true);
-                            }
-                            break;
-                    }
+            if (!$variable->isUsed()) {
+                $node = $variable->getLastUsedNode();
+                if (is_array($node)) {
+                    $expression = $node['expr'] ?? $node;
+                    $compilationContext->logger->warning(
+                        'Variable "'
+                        . $variable->getName()
+                        . '" assigned but not used in '
+                        . $completeName
+                        . '::'
+                        . $this->getName(),
+                        ['unused-variable', $expression]
+                    );
                 } else {
-                    $symbol = $symbolTable->addVariable('variable', $parameter['name'], $compilationContext);
+                    $compilationContext->logger->warning(
+                        'Variable "'
+                        . $variable->getName()
+                        . '" assigned but not used in '
+                        . $completeName
+                        . '::'
+                        . $this->getName(),
+                        ['unused-variable', $variable->getOriginal()]
+                    );
                 }
+            }
+        }
 
-                /**
-                 * ZE3 only
-                 */
-                if (isset($substituteVars[$parameter['name']])) {
-                    $substituteVar = $substituteVars[$parameter['name']];
-                    $substituteVar->increaseUses();
-                }
+        if (count($usedVariables)) {
+            $codePrinter->preOutputBlankLine();
+        }
 
-                /**
-                 * Some parameters can be read-only
-                 */
-                if (!empty($parameter['const'])) {
-                    $symbol->setReadOnly(true);
-                    if (\is_object($symbolParam)) {
-                        $symbolParam->setReadOnly(true);
-                    }
-                }
+        /**
+         * ZEND_PARSE_PARAMETERS
+         */
+        $tempCodePrinter = new Printer();
+        if ($this->parameters instanceof Parameters && $this->parameters->count() > 0) {
+            // Do not declare variable when it is not needed.
+            if ($this->parameters->hasNullableParameters()) {
+                $tempCodePrinter->output("\t" . 'bool is_null_true = 1;');
+            }
 
-                if (\is_object($symbolParam)) {
-                    /**
-                     * Parameters are marked as 'external'
-                     */
-                    $symbolParam->setIsExternal(true);
+            $tempCodePrinter->output(
+                sprintf(
+                    "\t" . 'ZEND_PARSE_PARAMETERS_START(%d, %d)',
+                    $this->parameters->countRequiredParameters(),
+                    $this->parameters->count()
+                )
+            );
 
-                    /**
-                     * Assuming they're initialized
-                     */
-                    $symbolParam->setIsInitialized(true, $compilationContext);
+            foreach ($requiredParams as $requiredParam) {
+                $tempCodePrinter->output("\t\t" . $this->detectParam($requiredParam, $compilationContext));
+            }
 
-                    /**
-                     * Initialize auxiliary parameter zvals to null
-                     */
-                    $symbolParam->setMustInitNull(true);
+            if (!empty($optionalParams)) {
+                $tempCodePrinter->output("\t\t" . 'Z_PARAM_OPTIONAL');
 
-                    /**
-                     * Increase uses
-                     */
-                    $symbolParam->increaseUses();
-                } else {
-                    if (isset($parameter['default'])) {
-                        if (isset($parameter['data-type'])) {
-                            if ('variable' === $parameter['data-type']) {
-                                $symbol->setMustInitNull(true);
-                            }
-                        } else {
-                            $symbol->setMustInitNull(true);
-                        }
-                    }
+                foreach ($optionalParams as $optionalParam) {
+                    $tempCodePrinter->output("\t\t" . $this->detectParam($optionalParam, $compilationContext));
                 }
+            }
 
-                /**
-                 * Original node where the variable was declared
-                 */
-                $symbol->setOriginal($parameter);
+            $tempCodePrinter->output("\t" . 'ZEND_PARSE_PARAMETERS_END();');
+        }
 
-                /**
-                 * Parameters are marked as 'external'
-                 */
-                $symbol->setIsExternal(true);
+        $codePrinter->preOutput($tempCodePrinter->getOutput());
 
-                /**
-                 * Assuming they're initialized
-                 */
-                $symbol->setIsInitialized(true, $compilationContext);
+        /**
+         * Generate the variable definition for variables used.
+         */
+        $initCode = sprintf(
+            "\t%s",
+            implode(
+                PHP_EOL . "\t",
+                $compilationContext->backend->declareVariables(
+                    $this,
+                    $usedVariables
+                )
+            )
+        );
 
-                /**
-                 * Variables with class/type must be objects across the execution
-                 */
-                if (isset($parameter['cast'])) {
-                    $symbol->setDynamicTypes('object');
-                    $symbol->setClassTypes($compilationContext->getFullName($parameter['cast']['value']));
-                } else {
-                    if (isset($parameter['data-type'])) {
-                        if ('variable' === $parameter['data-type']) {
-                            $symbol->setDynamicTypes('undefined');
-                        }
-                    } else {
-                        $symbol->setDynamicTypes('undefined');
-                    }
-                }
+        $codePrinter->preOutput($initCode);
+
+        /**
+         * Finalize the method compilation
+         */
+        if (is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
+            /**
+             * If the last statement is not a 'return' or 'throw' we need to
+             * restore the memory stack if needed.
+             */
+            $lastType = $this->statements->getLastStatementType();
+
+            /**
+             * If a method has return-type hints we need to ensure the last
+             * statement is a 'return' statement
+             */
+            if (
+                'return' !== $lastType &&
+                'throw' !== $lastType &&
+                !$this->hasChildReturnStatementType($statement) &&
+                $this->hasReturnTypes()
+            ) {
+                throw new CompilerException(
+                    'Reached end of the method without returning a valid type specified in the return-type hints',
+                    $this->expression['return-type']
+                );
             }
         }
 
-        $compilationContext->backend->onPreCompile($this, $compilationContext);
+        $compilationContext->backend->onPostCompile($this, $compilationContext);
 
         /**
-         * Compile the block of statements if any
+         * Remove macros that grow/restore the memory frame stack if it wasn't used.
          */
-        if (\is_object($this->statements)) {
-            $compilationContext->staticContext = $this->hasModifier('static');
-
-            /**
-             * Compile the statements block as a 'root' branch
-             */
-            $this->statements->compile($compilationContext, false, Branch::TYPE_ROOT);
-        }
+        $code = $this->removeMemoryStackReferences($symbolTable, $codePrinter->getOutput());
 
         /**
-         * Initialize variable default values.
+         * Restore the compilation context
          */
-        $initVarCode = $compilationContext->backend->initializeVariableDefaults(
-            $symbolTable->getVariables(),
-            $compilationContext
-        );
+        $oldCodePrinter->output($code, false);
+        $compilationContext->codePrinter = $oldCodePrinter;
+
+        $compilationContext->branchManager = null;
+        $compilationContext->cacheManager  = null;
+        $compilationContext->typeInference = null;
+
+        $codePrinter->clear();
+    }
+
+    /**
+     * Determine Z_PARAM_*
+     *
+     * @throws Exception
+     */
+    public function detectParam(array $parameter, CompilationContext $compilationContext): string
+    {
+        $name = $parameter['name'];
+        if (!isset($parameter['data-type'])) {
+            return sprintf('Z_PARAM_ZVAL(%s)', $name);
+        }
 
         /**
-         * Fetch parameters from vm-top.
+         * In case of unknown type, just return generic param type.
          */
-        $initCode = '';
-        $code = '';
-        $requiredParams = [];
-        $optionalParams = [];
-        if ($this->parameters instanceof Parameters) {
-            /**
-             * Round 2. Fetch the parameters in the method.
-             */
-            $params = $this->parameters->fetchParameters($this->isInternal);
-            $numberRequiredParams = $this->parameters->countRequiredParameters();
-            $numberOptionalParams = $this->parameters->countOptionalParameters();
-            $requiredParams = $this->parameters->getRequiredParameters();
-            $optionalParams = $this->parameters->getOptionalParameters();
+        $hasDefaultNull = isset($parameter['default']['type']) && $parameter['default']['type'] === 'null';
+        if ($hasDefaultNull) {
+            $param = sprintf('Z_PARAM_ZVAL_OR_NULL(%s)', $name);
+        } else {
+            $param = sprintf('Z_PARAM_ZVAL(%s)', $name);
+        }
 
-            /**
-             * Pass the write detector to the method statement block to check if the parameter
-             * variable is modified so as do the proper separation.
-             */
-            $parametersToSeparate = [];
-            if (\is_object($this->statements)) {
-                if (!$this->localContext instanceof LocalContextPass) {
-                    $writeDetector = new WriteDetector();
+        switch ($parameter['data-type']) {
+            case 'array':
+                if ($hasDefaultNull) {
+                    $param = sprintf('Z_PARAM_ARRAY_OR_NULL(%s)', $name);
+                } else {
+                    $param = sprintf('Z_PARAM_ARRAY(%s)', $name);
                 }
 
-                foreach ($this->parameters->getParameters() as $parameter) {
-                    $dataType = $parameter['data-type'] ?? 'variable';
+                break;
 
-                    switch ($dataType) {
-                        case 'variable':
-                        case 'string':
-                        case 'array':
-                        case 'resource':
-                        case 'object':
-                        case 'callable':
-                            $name = $parameter['name'];
-                            if (!$this->localContext instanceof LocalContextPass) {
-                                if ($writeDetector->detect($name, $this->statements->getStatements())) {
-                                    $parametersToSeparate[$name] = true;
-                                }
-                            } else {
-                                if ($this->localContext->getNumberOfMutations($name) > 1) {
-                                    $parametersToSeparate[$name] = true;
-                                }
-                            }
-                            break;
-                    }
+            case 'bool':
+                if ($hasDefaultNull) {
+                    $param = sprintf('Z_PARAM_BOOL_OR_NULL(%s, is_null_true)', $name);
+                } else {
+                    $param = sprintf('Z_PARAM_BOOL(%s)', $name);
                 }
-            }
 
-            /**
-             * Initialize required parameters
-             */
-            foreach ($requiredParams as $parameter) {
-                $mandatory = $parameter['mandatory'] ?? 0;
-                $dataType = $this->getParamDataType($parameter);
+                break;
 
-                if ('variable' !== $dataType) {
-                    /**
-                     * Assign value from zval to low level type
-                     */
-                    if ($mandatory) {
-                        $initCode .= $this->checkStrictType($parameter, $compilationContext);
-                    } else {
-                        $initCode .= $this->assignZvalValue($parameter, $compilationContext);
-                    }
+            case 'float':
+                if ($hasDefaultNull) {
+                    $param = sprintf('Z_PARAM_DOUBLE_OR_NULL(%s, is_null_true)', $name);
+                } else {
+                    $param = sprintf('Z_PARAM_DOUBLE(%s)', $name);
                 }
 
-                switch ($dataType) {
-                    case 'variable':
-                    case 'resource':
-                    case 'object':
-                    case 'callable':
-                        if (isset($parametersToSeparate[$parameter['name']])) {
-                            $symbolTable->mustGrownStack(true);
-                            $initCode .= "\t".'ZEPHIR_SEPARATE_PARAM('.$parameter['name'].');'.PHP_EOL;
-                        }
-                        break;
+                break;
+
+            case 'int':
+            case 'uint':
+            case 'long':
+                if ($hasDefaultNull) {
+                    $param = sprintf('Z_PARAM_LONG_OR_NULL(%s, is_null_true)', $name);
+                } else {
+                    $param = sprintf('Z_PARAM_LONG(%s)', $name);
                 }
-            }
 
-            /**
-             * Initialize optional parameters
-             */
-            foreach ($optionalParams as $parameter) {
-                $mandatory = $parameter['mandatory'] ?? 0;
-                $dataType = $this->getParamDataType($parameter);
+                break;
 
-                $name = match ($dataType) {
-                    'object', 'callable', 'resource', 'variable', 'mixed' => $parameter['name'],
-                    default => $parameter['name'].'_param',
-                };
+            case 'object':
+                if ($hasDefaultNull) {
+                    $param = sprintf('Z_PARAM_OBJECT_OF_CLASS_OR_NULL(%s)', $name);
+                } else {
+                    $param = sprintf('Z_PARAM_OBJECT(%s)', $name);
+                }
 
-                /**
-                 * Assign the default value according to the variable's type.
-                 */
-                $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
-                $initCode .= "\t".$compilationContext->backend->ifVariableValueUndefined($targetVar, $compilationContext, false, false).PHP_EOL;
+                break;
 
-                if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
-                    $substituteVar = $substituteVars[$parameter['name']];
-                    $initCode .= "\t\t".$targetVar->getName().' = &'.$substituteVar->getName().';'.PHP_EOL;
+            case 'resource':
+                if ($hasDefaultNull) {
+                    $param = sprintf('Z_PARAM_RESOURCE_OR_NULL(%s)', $name);
+                } else {
+                    $param = sprintf('Z_PARAM_RESOURCE(%s)', $name);
                 }
-                $initCode .= $this->assignDefaultValue($parameter, $compilationContext);
 
-                if (isset($parametersToSeparate[$name]) || 'variable' !== $dataType) {
-                    $initCode .= "\t".'} else {'.PHP_EOL;
+                break;
 
-                    if (isset($parametersToSeparate[$name])) {
-                        $initCode .= "\t\t".'ZEPHIR_SEPARATE_PARAM('.$name.');'.PHP_EOL;
+            case 'string':
+                if ($hasDefaultNull) {
+                    $param = sprintf('Z_PARAM_STR_OR_NULL(%s)', $name);
+                } else {
+                    $param = sprintf('Z_PARAM_STR(%s)', $name);
+                }
+
+                break;
+
+            case 'variable':
+                if (
+                    isset($parameter['cast']) &&
+                    $parameter['cast']['type'] === 'variable' &&
+                    $parameter['cast']['value'] &&
+                    $this->classDefinition !== null
+                ) {
+                    $classEntry = (new ClassEntry($parameter['cast']['value'], $compilationContext))->get();
+                    if ($hasDefaultNull) {
+                        $param = sprintf('Z_PARAM_OBJECT_OF_CLASS_OR_NULL(%s, %s)', $name, $classEntry);
                     } else {
-                        if ($mandatory) {
-                            $initCode .= $this->checkStrictType($parameter, $compilationContext);
-                        } else {
-                            $initCode .= "\t".$this->assignZvalValue($parameter, $compilationContext);
-                        }
+                        $param = sprintf('Z_PARAM_OBJECT_OF_CLASS(%s, %s)', $name, $classEntry);
                     }
                 }
 
-                $initCode .= "\t".'}'.PHP_EOL;
-            }
+                break;
+        }
+
+        return $param;
+    }
+
+    /**
+     * Returns arginfo name for current method.
+     */
+    public function getArgInfoName(Definition $classDefinition = null): string
+    {
+        if ($classDefinition instanceof Definition) {
+            return sprintf(
+                'arginfo_%s_%s_%s',
+                strtolower($classDefinition->getCNamespace()),
+                strtolower($classDefinition->getName()),
+                strtolower($this->getName())
+            );
+        }
+
+        return sprintf('arginfo_%s', strtolower($this->getInternalName()));
+    }
+
+    /**
+     * Returns the call gatherer pass information.
+     */
+    public function getCallGathererPass(): CallGathererPass
+    {
+        return $this->callGathererPass;
+    }
+
+    /**
+     * Returns the class definition where the method was declared.
+     */
+    public function getClassDefinition(): ?Definition
+    {
+        return $this->classDefinition;
+    }
+
+    /**
+     * Returns the raw docblock.
+     */
+    public function getDocBlock(): ?string
+    {
+        return $this->docblock;
+    }
+
+    public function getInternalName(): string
+    {
+        $classDefinition = $this->getClassDefinition();
+
+        return 'zep_' . $classDefinition->getCNamespace() . '_' . $classDefinition->getName() . '_' . $this->getName();
+    }
+
+    /**
+     * the starting line of the method in the source file.
+     */
+    public function getLine(): mixed
+    {
+        return $this->expression['line'];
+    }
 
-            /**
-             * Fetch the parameters to zval pointers
-             */
-            $codePrinter->preOutputBlankLine();
+    public function getMayBeArgTypes(): array
+    {
+        return $this->mayBeArgTypes;
+    }
 
-            if (!$this->isInternal()) {
-                $compilationContext->headersManager->add('kernel/memory');
-                if ($symbolTable->getMustGrownStack()) {
-                    $code .= "\t".'zephir_fetch_params(1, '.$numberRequiredParams.', '.$numberOptionalParams.', '.implode(', ', $params).');'.PHP_EOL;
-                } else {
-                    $code .= "\t".'zephir_fetch_params_without_memory_grow('.$numberRequiredParams.', '.$numberOptionalParams.', '.implode(', ', $params).');'.PHP_EOL;
-                }
-            } else {
-                foreach ($params as $param) {
-                    /* TODO: Migrate all this code to codeprinter, get rid of temp code printer */
-                    $tempCodePrinter = new Printer();
-                    $realCodePrinter = $compilationContext->codePrinter;
-                    $compilationContext->codePrinter = $tempCodePrinter;
-                    $paramVar = $compilationContext->symbolTable->getVariableForRead($param, $compilationContext);
-                    $compilationContext->backend->assignZval($paramVar, $param.'_ext', $compilationContext);
-                    $code .= "\t".$tempCodePrinter->getOutput().PHP_EOL;
-                    $compilationContext->codePrinter = $realCodePrinter;
-                }
-            }
-        }
+    /**
+     * Returns the C-modifier flags.
+     *
+     * @throws Exception
+     */
+    public function getModifiers(): string
+    {
+        $modifiers = [];
+        foreach ($this->visibility as $visibility) {
+            switch ($visibility) {
+                case 'public':
+                    $modifiers['ZEND_ACC_PUBLIC'] = $visibility;
+                    break;
 
-        $code .= $initCode.$initVarCode;
-        $codePrinter->preOutput($code);
+                case 'protected':
+                    $modifiers['ZEND_ACC_PROTECTED'] = $visibility;
+                    break;
 
-        $compilationContext->headersManager->add('kernel/object');
+                case 'private':
+                    $modifiers['ZEND_ACC_PRIVATE'] = $visibility;
+                    break;
 
-        /**
-         * Fetch used superglobals
-         */
-        foreach ($symbolTable->getVariables() as $name => $variable) {
-            if ($variable->isSuperGlobal()) {
-                $globalVar = $symbolTable->getVariable($name);
-                $codePrinter->preOutput("\t".$compilationContext->backend->fetchGlobal($globalVar, $compilationContext, false));
-            }
+                case 'static':
+                    $modifiers['ZEND_ACC_STATIC'] = $visibility;
+                    break;
 
-            if ($variable->isLocalStatic()) {
-                $staticVar = $symbolTable->getVariable($name);
+                case 'final':
+                    $modifiers['ZEND_ACC_FINAL'] = $visibility;
+                    break;
 
-                $codePrinter->preOutput(sprintf(
-                    "\t".'zephir_read_static_property_ce(&%s, %s, SL("%s"), PH_NOISY_CC%s);',
-                    $staticVar->getName(),
-                    $this->classDefinition->getClassEntry(),
-                    $staticVar->getName(),
-                    ''
-                ));
-            }
-        }
+                case 'abstract':
+                    $modifiers['ZEND_ACC_ABSTRACT'] = $visibility;
+                    break;
 
-        /**
-         * Check if there are unused variables.
-         */
-        $usedVariables = [];
-        $completeName = $this->getClassDefinition()?->getCompleteName() ?: '[unknown]';
+                case 'deprecated':
+                    $modifiers['ZEND_ACC_DEPRECATED'] = $visibility;
+                    break;
 
-        foreach ($symbolTable->getVariables() as $variable) {
-            if ($variable->getNumberUses() <= 0) {
-                if (!$variable->isExternal()) {
-                    $compilationContext->logger->warning(
-                        'Variable "'.$variable->getName().'" declared but not used in '.$completeName.'::'.$this->getName(),
-                        ['unused-variable', $variable->getOriginal()]
-                    );
-                    continue;
-                }
+                case 'inline':
+                case 'scoped':
+                case 'internal':
+                    break;
 
-                $compilationContext->logger->warning(
-                    'Variable "'.$variable->getName().'" declared but not used in '.$completeName.'::'.$this->getName(),
-                    ['unused-variable-external', $variable->getOriginal()]
-                );
+                default:
+                    throw new Exception('Unknown modifier "' . $visibility . '"');
             }
+        }
 
-            if ('this_ptr' !== $variable->getName() && 'return_value' !== $variable->getName() && 'return_value_ptr' !== $variable->getName()) {
-                $type = $variable->getType();
-                if (!isset($usedVariables[$type])) {
-                    $usedVariables[$type] = [];
-                }
-
-                $usedVariables[$type][] = $variable;
-            }
+        if ('__construct' === $this->name) {
+            $modifiers['ZEND_ACC_CTOR'] = true;
+        } elseif ('__destruct' === $this->name) {
+            $modifiers['ZEND_ACC_DTOR'] = true;
         }
 
-        /**
-         * Check if there are assigned but not used variables
-         * Warn whenever a variable is unused aside from its declaration.
-         */
-        foreach ($symbolTable->getVariables() as $variable) {
-            if ($variable->isExternal() || $variable->isTemporal()) {
-                continue;
-            }
+        return implode('|', array_keys($modifiers));
+    }
 
-            if ('this_ptr' === $variable->getName() || 'return_value' === $variable->getName() || 'return_value_ptr' === $variable->getName() || 'ZEPHIR_LAST_CALL_STATUS' === $variable->getName()) {
-                continue;
-            }
+    /**
+     * Returns the method name.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
 
-            if (!$variable->isUsed()) {
-                $node = $variable->getLastUsedNode();
-                if (\is_array($node)) {
-                    $expression = $node['expr'] ?? $node;
-                    $compilationContext->logger->warning(
-                        'Variable "'.$variable->getName().'" assigned but not used in '.$completeName.'::'.$this->getName(),
-                        ['unused-variable', $expression]
-                    );
-                } else {
-                    $compilationContext->logger->warning(
-                        'Variable "'.$variable->getName().'" assigned but not used in '.$completeName.'::'.$this->getName(),
-                        ['unused-variable', $variable->getOriginal()]
-                    );
-                }
-            }
+    /**
+     * Returns the number of parameters the method has.
+     */
+    public function getNumberOfParameters(): int
+    {
+        if ($this->parameters instanceof Parameters) {
+            return $this->parameters->count();
         }
 
-        if (\count($usedVariables)) {
-            $codePrinter->preOutputBlankLine();
+        return 0;
+    }
+
+    /**
+     * Returns the number of required parameters the method has.
+     */
+    public function getNumberOfRequiredParameters(): int
+    {
+        if ($this->parameters === null) {
+            return 0;
         }
 
-        /**
-         * ZEND_PARSE_PARAMETERS
-         */
-        $tempCodePrinter = new Printer();
-        if ($this->parameters instanceof Parameters && $this->parameters->count() > 0) {
-            // Do not declare variable when it is not needed.
-            if ($this->parameters->hasNullableParameters()) {
-                $tempCodePrinter->output("\t".'bool is_null_true = 1;');
+        $required = 0;
+        foreach ($this->parameters->getParameters() as $parameter) {
+            if (!isset($parameter['default'])) {
+                ++$required;
             }
+        }
 
-            $tempCodePrinter->output(sprintf(
-                "\t".'ZEND_PARSE_PARAMETERS_START(%d, %d)',
-                $this->parameters->countRequiredParameters(),
-                $this->parameters->count()
-            ));
+        return $required;
+    }
 
-            foreach ($requiredParams as $requiredParam) {
-                $tempCodePrinter->output("\t\t".$this->detectParam($requiredParam, $compilationContext));
-            }
+    public function getOptimizedMethod(): self
+    {
+        $optimizedName   = $this->getName() . '_zephir_internal_call';
+        $optimizedMethod = $this->classDefinition->getMethod($optimizedName, false);
+        if (!$optimizedMethod || !$this->optimizable) {
+            return $this;
+        }
 
-            if (!empty($optionalParams)) {
-                $tempCodePrinter->output("\t\t".'Z_PARAM_OPTIONAL');
+        return $optimizedMethod;
+    }
 
-                foreach ($optionalParams as $optionalParam) {
-                    $tempCodePrinter->output("\t\t".$this->detectParam($optionalParam, $compilationContext));
-                }
-            }
+    /**
+     * Returns the parameters.
+     */
+    public function getParameters(): ?Parameters
+    {
+        return $this->parameters;
+    }
 
-            $tempCodePrinter->output("\t".'ZEND_PARSE_PARAMETERS_END();');
+    /**
+     * Returns the parsed docblock.
+     */
+    public function getParsedDocBlock(): ?Docblock
+    {
+        if ($this->parsedDocblock) {
+            return $this->parsedDocblock;
         }
 
-        $codePrinter->preOutput($tempCodePrinter->getOutput());
-
-        /**
-         * Generate the variable definition for variables used.
-         */
-        $initCode = sprintf(
-            "\t%s",
-            implode(
-                PHP_EOL."\t",
-                $compilationContext->backend->declareVariables(
-                    $this,
-                    $usedVariables
-                )
-            )
-        );
+        if ($this->docblock === null) {
+            return null;
+        }
 
-        $codePrinter->preOutput($initCode);
+        $parser               = new DocblockParser('/' . $this->docblock . '/');
+        $this->parsedDocblock = $parser->parse();
 
-        /**
-         * Finalize the method compilation
-         */
-        if (\is_object($this->statements) && !empty($statement = $this->statements->getLastStatement())) {
-            /**
-             * If the last statement is not a 'return' or 'throw' we need to
-             * restore the memory stack if needed.
-             */
-            $lastType = $this->statements->getLastStatementType();
+        return $this->parsedDocblock;
+    }
 
-            /**
-             * If a method has return-type hints we need to ensure the last
-             * statement is a 'return' statement
-             */
-            if ('return' !== $lastType
-                && 'throw' !== $lastType
-                && !$this->hasChildReturnStatementType($statement)
-                && $this->hasReturnTypes()
-            ) {
-                throw new CompilerException(
-                    'Reached end of the method without returning a valid type specified in the return-type hints',
-                    $this->expression['return-type']
-                );
-            }
-        }
+    /**
+     * Returned class-type hints by the method.
+     */
+    public function getReturnClassTypes(): array
+    {
+        return $this->returnClassTypes;
+    }
 
-        $compilationContext->backend->onPostCompile($this, $compilationContext);
+    /**
+     * Returned type hints by the method.
+     */
+    public function getReturnTypes(): array
+    {
+        return $this->returnTypes;
+    }
 
-        /**
-         * Remove macros that grow/restore the memory frame stack if it wasn't used.
-         */
-        $code = $this->removeMemoryStackReferences($symbolTable, $codePrinter->getOutput());
+    public function getReturnTypesRaw(): array
+    {
+        return $this->returnTypesRaw;
+    }
 
-        /**
-         * Restore the compilation context
-         */
-        $oldCodePrinter->output($code, false);
-        $compilationContext->codePrinter = $oldCodePrinter;
+    /**
+     * Return shortcut method name.
+     */
+    public function getShortcutName(): mixed
+    {
+        return $this->expression['name'];
+    }
 
-        $compilationContext->branchManager = null;
-        $compilationContext->cacheManager = null;
-        $compilationContext->typeInference = null;
+    /**
+     * Getter for statements block.
+     */
+    public function getStatementsBlock(): StatementsBlock
+    {
+        return $this->statements;
+    }
 
-        $codePrinter->clear();
+    /**
+     * Returns method visibility modifiers.
+     */
+    public function getVisibility(): array
+    {
+        return $this->visibility;
     }
 
     /**
@@ -1882,7 +1827,7 @@ public function compile(CompilationContext $compilationContext): void
      */
     public function hasChildReturnStatementType(array $statement): bool
     {
-        if (!isset($statement['statements']) || !\is_array($statement['statements'])) {
+        if (!isset($statement['statements']) || !is_array($statement['statements'])) {
             return false;
         }
 
@@ -1920,28 +1865,144 @@ public function hasChildReturnStatementType(array $statement): bool
         return false;
     }
 
-    public function getInternalName(): string
+    /**
+     * Checks whether the method has a specific modifier.
+     */
+    public function hasModifier(string $modifier): bool
     {
-        $classDefinition = $this->getClassDefinition();
+        return in_array($modifier, $this->visibility);
+    }
+
+    /**
+     * Returns the number of parameters the method has.
+     */
+    public function hasParameters(): bool
+    {
+        return $this->parameters instanceof Parameters && $this->parameters->count() > 0;
+    }
+
+    /**
+     * Checks if the method has return-type or cast hints.
+     */
+    public function hasReturnTypes(): bool
+    {
+        return count($this->returnTypes) || count($this->returnClassTypes);
+    }
 
-        return 'zep_'.$classDefinition->getCNamespace().'_'.$classDefinition->getName().'_'.$this->getName();
+    public function hasReturnTypesRaw(): bool
+    {
+        return !empty($this->returnTypesRaw);
     }
 
     /**
-     * Returns arginfo name for current method.
+     * Checks is abstract method?
      */
-    public function getArgInfoName(Definition $classDefinition = null): string
+    public function isAbstract(): bool
     {
-        if ($classDefinition instanceof Definition) {
-            return sprintf(
-                'arginfo_%s_%s_%s',
-                strtolower($classDefinition->getCNamespace()),
-                strtolower($classDefinition->getName()),
-                strtolower($this->getName())
-            );
-        }
+        return $this->isAbstract;
+    }
 
-        return sprintf('arginfo_%s', strtolower($this->getInternalName()));
+    /**
+     * Checks whether the method is bundled.
+     */
+    public function isBundled(): bool
+    {
+        return $this->isBundled;
+    }
+
+    /**
+     * Check whether the current method is a constructor.
+     */
+    public function isConstructor(): bool
+    {
+        return '__construct' === $this->name;
+    }
+
+    public function isDeprecated(): bool
+    {
+        return !empty($this->visibility) && in_array('deprecated', $this->visibility, true);
+    }
+
+    /**
+     * Checks whether the method is empty.
+     */
+    public function isEmpty(): bool
+    {
+        return $this->statements->isEmpty();
+    }
+
+    /**
+     * Checks whether the method is final.
+     */
+    public function isFinal(): bool
+    {
+        return $this->isFinal;
+    }
+
+    /**
+     * Checks whether the method is an initializer.
+     */
+    public function isInitializer(): bool
+    {
+        return $this->isInitializer;
+    }
+
+    /**
+     * Checks whether the method is internal.
+     */
+    public function isInternal(): bool
+    {
+        return $this->isInternal;
+    }
+
+    /**
+     * Checks if the methods return type is `mixed`.
+     */
+    public function isMixed(): bool
+    {
+        return $this->mixed;
+    }
+
+    /**
+     * Checks if the method is private.
+     */
+    public function isPrivate(): bool
+    {
+        return in_array('private', $this->visibility);
+    }
+
+    /**
+     * Checks if the method is protected.
+     */
+    public function isProtected(): bool
+    {
+        return in_array('protected', $this->visibility);
+    }
+
+    /**
+     * Checks if the method is public.
+     */
+    public function isPublic(): bool
+    {
+        return $this->isPublic;
+    }
+
+    /**
+     * Checks if method's return type is nullable object `?object`.
+     */
+    public function isReturnTypeNullableObject(): bool
+    {
+        return count($this->returnTypes) === 2
+            && isset($this->returnTypes['object'])
+            && isset($this->returnTypes['null']);
+    }
+
+    /**
+     * Checks if method's return type is object `object`.
+     */
+    public function isReturnTypeObject(): bool
+    {
+        return count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
     }
 
     /**
@@ -1968,7 +2029,7 @@ public function isReturnTypesHintDetermined(): bool
             return true;
         }
 
-        if (0 === \count($this->returnTypes)) {
+        if (0 === count($this->returnTypes)) {
             return false;
         }
 
@@ -1981,14 +2042,15 @@ public function isReturnTypesHintDetermined(): bool
             }
 
             if (isset($definition['type']) && 'return-type-annotation' === $definition['type']) {
-                if ($this->areReturnTypesBoolCompatible()
-                    || $this->areReturnTypesDoubleCompatible()
-                    || $this->areReturnTypesIntCompatible()
-                    || $this->areReturnTypesNullCompatible()
-                    || $this->areReturnTypesStringCompatible()
-                    || $this->areReturnTypesFalseCompatible()
-                    || $this->areReturnTypesObjectCompatible()
-                    || \array_key_exists('array', $this->getReturnTypes())
+                if (
+                    $this->areReturnTypesBoolCompatible() ||
+                    $this->areReturnTypesDoubleCompatible() ||
+                    $this->areReturnTypesIntCompatible() ||
+                    $this->areReturnTypesNullCompatible() ||
+                    $this->areReturnTypesStringCompatible() ||
+                    $this->areReturnTypesFalseCompatible() ||
+                    $this->areReturnTypesObjectCompatible() ||
+                    array_key_exists('array', $this->getReturnTypes())
                 ) {
                     continue;
                 }
@@ -2002,166 +2064,319 @@ public function isReturnTypesHintDetermined(): bool
             }
         }
 
-        return true;
+        return true;
+    }
+
+    /**
+     * Checks if method is a shortcut.
+     */
+    public function isShortcut(): bool
+    {
+        return $this->expression && 'shortcut' === $this->expression['type'];
+    }
+
+    /**
+     * Checks whether the method is static.
+     */
+    public function isStatic(): bool
+    {
+        return $this->isStatic;
+    }
+
+    /**
+     * Checks if the method must not return any value.
+     */
+    public function isVoid(): bool
+    {
+        return $this->void;
+    }
+
+    /**
+     * Pre-compiles the method making compilation pass data (static inference, local-context-pass) available to other
+     * methods.
+     *
+     * @throws CompilerException
+     */
+    public function preCompile(CompilationContext $compilationContext): void
+    {
+        $localContext     = null;
+        $typeInference    = null;
+        $callGathererPass = null;
+
+        if (is_object($this->statements)) {
+            $compilationContext->currentMethod = $this;
+
+            /**
+             * This pass checks for zval variables than can be potentially
+             * used without allocating memory and track it
+             * these variables are stored in the stack
+             */
+            if ($compilationContext->config->get('local-context-pass', 'optimizations')) {
+                $localContext = new LocalContextPass();
+                $localContext->pass($this->statements);
+            }
+
+            /**
+             * This pass tries to infer types for dynamic variables
+             * replacing them by low level variables
+             */
+            if ($compilationContext->config->get('static-type-inference', 'optimizations')) {
+                $typeInference = new StaticTypeInference();
+                $typeInference->pass($this->statements);
+                if ($compilationContext->config->get('static-type-inference-second-pass', 'optimizations')) {
+                    $typeInference->reduce();
+                    $typeInference->pass($this->statements);
+                }
+            }
+
+            /**
+             * This pass counts how many times a specific
+             */
+            if ($compilationContext->config->get('call-gatherer-pass', 'optimizations')) {
+                $callGathererPass = new CallGathererPass($compilationContext);
+                $callGathererPass->pass($this->statements);
+            }
+        }
+
+        $this->localContext     = $localContext;
+        $this->typeInference    = $typeInference;
+        $this->callGathererPass = $callGathererPass;
+    }
+
+    /**
+     * Replace macros.
+     *
+     * @deprecated
+     */
+    public function removeMemoryStackReferences(SymbolTable $symbolTable, string $containerCode): string
+    {
+        if ($symbolTable->getMustGrownStack()) {
+            return $containerCode;
+        }
+
+        $containerCode = str_replace('ZEPHIR_THROW_EXCEPTION_STR', 'ZEPHIR_THROW_EXCEPTION_STRW', $containerCode);
+        $containerCode = str_replace(
+            'ZEPHIR_THROW_EXCEPTION_DEBUG_STR',
+            'ZEPHIR_THROW_EXCEPTION_DEBUG_STRW',
+            $containerCode
+        );
+        $containerCode = str_replace('ZEPHIR_THROW_EXCEPTION_ZVAL', 'ZEPHIR_THROW_EXCEPTION_ZVALW', $containerCode);
+        $containerCode = str_replace('RETURN_THIS', 'RETURN_THISW', $containerCode);
+        $containerCode = str_replace('RETURN_LCTOR', 'RETURN_LCTORW', $containerCode);
+        $containerCode = str_replace('RETURN_CTOR', 'RETURN_CTORW', $containerCode);
+        $containerCode = str_replace('RETURN_NCTOR', 'RETURN_NCTORW', $containerCode);
+        $containerCode = str_replace('RETURN_CCTOR', 'RETURN_CCTORW', $containerCode);
+        $containerCode = str_replace('RETURN_MM_NULL', 'RETURN_NULL', $containerCode);
+        $containerCode = str_replace('RETURN_MM_BOOL', 'RETURN_BOOL', $containerCode);
+        $containerCode = str_replace('RETURN_MM_FALSE', 'RETURN_FALSE', $containerCode);
+        $containerCode = str_replace('RETURN_MM_TRUE', 'RETURN_TRUE', $containerCode);
+        $containerCode = str_replace('RETURN_MM_STRING', 'RETURN_STRING', $containerCode);
+        $containerCode = str_replace('RETURN_MM_LONG', 'RETURN_LONG', $containerCode);
+        $containerCode = str_replace('RETURN_MM_DOUBLE', 'RETURN_DOUBLE', $containerCode);
+        $containerCode = str_replace('RETURN_MM_FALSE', 'RETURN_FALSE', $containerCode);
+        $containerCode = str_replace('RETURN_MM_EMPTY_STRING', 'RETURN_MM_EMPTY_STRING', $containerCode);
+        $containerCode = str_replace('RETURN_MM_EMPTY_ARRAY', 'RETURN_EMPTY_ARRAY', $containerCode);
+        $containerCode = str_replace('RETURN_MM_MEMBER', 'RETURN_MEMBER', $containerCode);
+
+        return preg_replace('/[ \t]+ZEPHIR_MM_RESTORE\(\);' . PHP_EOL . '/s', '', $containerCode);
     }
 
     /**
-     * Checks if method's return type is nullable object `?object`.
+     * Sets if the method is bundled or not.
      */
-    public function isReturnTypeNullableObject(): bool
+    public function setIsBundled(bool $bundled): void
     {
-        return \count($this->returnTypes) === 2
-               && isset($this->returnTypes['object'])
-               && isset($this->returnTypes['null']);
+        $this->isBundled = $bundled;
     }
 
     /**
-     * Checks if method's return type is object `object`.
+     * Sets if the method is an initializer or not.
      */
-    public function isReturnTypeObject(): bool
+    public function setIsInitializer(bool $initializer): void
     {
-        return \count($this->returnTypes) === 1 && isset($this->returnTypes['object']);
+        $this->isInitializer = $initializer;
     }
 
     /**
-     * Checks if the method have compatible return types.
+     * Sets if the method is internal or not.
      */
-    public function areReturnTypesCompatible(): bool
+    public function setIsStatic(bool $static): void
     {
-        // void
-        if ($this->isVoid()) {
-            return true;
-        }
-
-        $totalTypes = \count($this->returnTypes);
-
-        // union types
-        if ($totalTypes > 1) {
-            $diff = array_diff(array_keys($this->returnTypes), array_keys($this->mayBeArgTypes));
-            if (\count($diff) === 0) {
-                return true;
-            }
-        }
-
-        // T1 | T2
-        if (2 === $totalTypes && !isset($this->returnTypes['null'])) {
-            return false;
-        }
-
-        // null | T1 | T2
-        if ($totalTypes > 2) {
-            return false;
-        }
+        $this->isStatic = $static;
+    }
 
-        return true;
+    /**
+     * Sets the method name.
+     */
+    public function setName(string $name): void
+    {
+        $this->name = $name;
     }
 
     /**
-     * Determine Z_PARAM_*
+     * Process RAW return types structure.
      *
-     * @throws Exception
+     * Example:
+     *
+     * ```
+     * $returnType = [
+     *  'type' => 'return-type',
+     *  'list' => [
+     *      [
+     *          'type' => 'return-type-parameter',
+     *          'cast' => [
+     *              'type' => 'variable',
+     *              'value' => '\StdClass',
+     *              'file' => './stubs.zep',
+     *              'line' => 21,
+     *              'char' => 48
+     *          ],
+     *          'collection' => 1,
+     *          'file' => './stubs.zep',
+     *          'line' => 21,
+     *          'char' => 48
+     *      ],
+     *      [
+     *          'type' => 'return-type-parameter',
+     *          'data-type' => 'bool',
+     *          'mandatory' => 0,
+     *          'file' => './stubs.zep',
+     *          'line' => 22,
+     *          'char' => 5
+     *      ]
+     *  ],
+     *  'void' => 0,
+     *  'file' => './stubs.zep',
+     *  'line' => 22,
+     *  'char' => 5
+     * ];
+     * ```
+     *
+     * @param array|null $returnType
      */
-    public function detectParam(array $parameter, CompilationContext $compilationContext): string
+    public function setReturnTypes(array $returnType = null): void
     {
-        $name = $parameter['name'];
-        if (!isset($parameter['data-type'])) {
-            return sprintf('Z_PARAM_ZVAL(%s)', $name);
+        $this->returnTypesRaw = $returnType;
+        if (null === $returnType) {
+            return;
         }
 
-        /**
-         * In case of unknown type, just return generic param type.
-         */
-        $hasDefaultNull = isset($parameter['default']['type']) && $parameter['default']['type'] === 'null';
-        if ($hasDefaultNull) {
-            $param = sprintf('Z_PARAM_ZVAL_OR_NULL(%s)', $name);
-        } else {
-            $param = sprintf('Z_PARAM_ZVAL(%s)', $name);
+        if (isset($returnType['void']) && $returnType['void']) {
+            $this->void = true;
+
+            return;
         }
 
-        switch ($parameter['data-type']) {
-            case 'array':
-                if ($hasDefaultNull) {
-                    $param = sprintf('Z_PARAM_ARRAY_OR_NULL(%s)', $name);
-                } else {
-                    $param = sprintf('Z_PARAM_ARRAY(%s)', $name);
-                }
+        if (!isset($returnType['list'])) {
+            return;
+        }
 
-                break;
+        $types     = [];
+        $castTypes = [];
 
-            case 'bool':
-                if ($hasDefaultNull) {
-                    $param = sprintf('Z_PARAM_BOOL_OR_NULL(%s, is_null_true)', $name);
-                } else {
-                    $param = sprintf('Z_PARAM_BOOL(%s)', $name);
-                }
+        foreach ($returnType['list'] as $returnTypeItem) {
+            /**
+             * We continue the loop, because it only works for PHP >= 8.0.
+             */
+            if (isset($returnTypeItem['data-type']) && $returnTypeItem['data-type'] === 'mixed') {
+                $this->mixed = true;
+            }
 
-                break;
+            if (!isset($returnTypeItem['cast'])) {
+                $types[$returnTypeItem['data-type']] = $returnTypeItem;
+                continue;
+            }
 
-            case 'float':
-                if ($hasDefaultNull) {
-                    $param = sprintf('Z_PARAM_DOUBLE_OR_NULL(%s, is_null_true)', $name);
-                } else {
-                    $param = sprintf('Z_PARAM_DOUBLE(%s)', $name);
-                }
+            if (isset($returnTypeItem['cast']['collection'])) {
+                continue;
+            }
 
-                break;
+            if (isset($returnTypeItem['collection']) && $returnTypeItem['collection']) {
+                $types['array'] = [
+                    'type'      => 'return-type-parameter',
+                    'data-type' => 'array',
+                    'mandatory' => 0,
+                    'file'      => $returnTypeItem['cast']['file'],
+                    'line'      => $returnTypeItem['cast']['line'],
+                    'char'      => $returnTypeItem['cast']['char'],
+                ];
+            } else {
+                $castTypes[$returnTypeItem['cast']['value']] = $returnTypeItem['cast']['value'];
+            }
+        }
 
-            case 'int':
-            case 'uint':
-            case 'long':
-                if ($hasDefaultNull) {
-                    $param = sprintf('Z_PARAM_LONG_OR_NULL(%s, is_null_true)', $name);
-                } else {
-                    $param = sprintf('Z_PARAM_LONG(%s)', $name);
-                }
+        if (count($castTypes) > 0) {
+            $types['object']        = [];
+            $this->returnClassTypes = $castTypes;
+        }
 
-                break;
+        if (count($types) > 0) {
+            $this->returnTypes = $types;
+        }
+    }
 
-            case 'object':
-                if ($hasDefaultNull) {
-                    $param = sprintf('Z_PARAM_OBJECT_OF_CLASS_OR_NULL(%s)', $name);
-                } else {
-                    $param = sprintf('Z_PARAM_OBJECT(%s)', $name);
-                }
+    /**
+     * Setter for statements block.
+     */
+    public function setStatementsBlock(StatementsBlock $statementsBlock): void
+    {
+        $this->statements = $statementsBlock;
+    }
 
-                break;
+    /**
+     * Generate internal method's based on the equivalent PHP methods,
+     * allowing bypassing php userspace for internal method calls.
+     */
+    public function setupOptimized(CompilationContext $compilationContext): self
+    {
+        if (!$compilationContext->config->get('internal-call-transformation', 'optimizations')) {
+            return $this;
+        }
 
-            case 'resource':
-                if ($hasDefaultNull) {
-                    $param = sprintf('Z_PARAM_RESOURCE_OR_NULL(%s)', $name);
-                } else {
-                    $param = sprintf('Z_PARAM_RESOURCE(%s)', $name);
-                }
+        $classDefinition = $this->getClassDefinition();
 
-                break;
+        /**
+         * Skip for closures
+         */
+        if ('__invoke' === $this->getName() || $classDefinition->isInterface()) {
+            return $this;
+        }
 
-            case 'string':
-                if ($hasDefaultNull) {
-                    $param = sprintf('Z_PARAM_STR_OR_NULL(%s)', $name);
-                } else {
-                    $param = sprintf('Z_PARAM_STR(%s)', $name);
-                }
+        if (!$this->isInternal() && !$classDefinition->isBundled()) {
+            /* Not supported for now */
+            if ($this->getNumberOfRequiredParameters() != $this->getNumberOfParameters()) {
+                return $this;
+            }
 
-                break;
+            if ($this->isConstructor()) {
+                return $this;
+            }
 
-            case 'variable':
-                if (isset($parameter['cast'])
-                    && $parameter['cast']['type'] === 'variable'
-                    && $parameter['cast']['value']
-                    && $this->classDefinition !== null
-                ) {
-                    $classEntry = (new ClassEntry($parameter['cast']['value'], $compilationContext))->get();
-                    if ($hasDefaultNull) {
-                        $param = sprintf('Z_PARAM_OBJECT_OF_CLASS_OR_NULL(%s, %s)', $name, $classEntry);
-                    } else {
-                        $param = sprintf('Z_PARAM_OBJECT_OF_CLASS(%s, %s)', $name, $classEntry);
-                    }
-                }
+            $optimizedName = $this->getName() . '_zephir_internal_call';
 
-                break;
+            $visibility = ['internal'];
+
+            $statements = null;
+            if ($this->statements) {
+                $statements = new StatementsBlock(json_decode(json_encode($this->statements->getStatements()), true));
+            }
+
+            $optimizedMethod                = new self(
+                $classDefinition,
+                $visibility,
+                $optimizedName,
+                $this->parameters,
+                $statements,
+                $this->docblock,
+                null,
+                $this->expression
+            );
+            $optimizedMethod->typeInference = $this->typeInference;
+            $optimizedMethod->setReturnTypes($this->returnTypes);
+            $classDefinition->addMethod($optimizedMethod);
         }
 
-        return $param;
+        return $this;
     }
 
     /**
diff --git a/src/Class/Method/Parameters.php b/src/Class/Method/Parameters.php
index 9263a02313..a7feb2a384 100644
--- a/src/Class/Method/Parameters.php
+++ b/src/Class/Method/Parameters.php
@@ -13,24 +13,27 @@
 
 namespace Zephir\Class\Method;
 
+use ArrayAccess;
+use Countable;
+use Iterator;
 use Zephir\Exception\CompilerException;
 
+use function count;
+
 /**
  * Represents the parameters defined in a method.
  */
-class Parameters implements \Countable, \Iterator, \ArrayAccess
+class Parameters implements Countable, Iterator, ArrayAccess
 {
-    private int $position = 0;
-
-    /**
-     * List of Required parameters
-     */
-    private array $requiredParameters = [];
-
     /**
      * List of Optional parameters (with default value)
      */
     private array $optionalParameters = [];
+    private int   $position           = 0;
+    /**
+     * List of Required parameters
+     */
+    private array $requiredParameters = [];
 
     /**
      * @throws CompilerException
@@ -40,7 +43,7 @@ public function __construct(private array $parameters)
         foreach ($parameters as $parameter) {
             if (isset($parameter['reference']) && $parameter['reference']) {
                 throw new CompilerException(
-                    'Zephir not support reference parameters for now. '.
+                    'Zephir not support reference parameters for now. ' .
                     'Stay tuned for https://github.com/zephir-lang/zephir/issues/203',
                     $parameter
                 );
@@ -49,42 +52,26 @@ public function __construct(private array $parameters)
     }
 
     /**
-     * Return internal parameters.
+     * @return int
      */
-    public function getParameters(): array
+    public function count(): int
     {
-        return $this->parameters;
+        return count($this->parameters);
     }
 
-    public function getRequiredParameters(): array
+    public function countOptionalParameters(): int
     {
-        return $this->requiredParameters;
+        return count($this->optionalParameters);
     }
 
     public function countRequiredParameters(): int
     {
-        return \count($this->requiredParameters);
-    }
-
-    public function getOptionalParameters(): array
-    {
-        return $this->optionalParameters;
-    }
-
-    public function countOptionalParameters(): int
-    {
-        return \count($this->optionalParameters);
+        return count($this->requiredParameters);
     }
 
-    public function hasNullableParameters(): bool
+    public function current(): mixed
     {
-        foreach ($this->optionalParameters as $parameter) {
-            if (isset($parameter['default']['type']) && $parameter['default']['type'] === 'null') {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->parameters[$this->position];
     }
 
     public function fetchParameters(bool $isMethodInternal): array
@@ -92,7 +79,7 @@ public function fetchParameters(bool $isMethodInternal): array
         $parameters = [];
 
         foreach ($this->parameters as $parameter) {
-            $name = $parameter['name'];
+            $name     = $parameter['name'];
             $dataType = $parameter['data-type'] ?? 'variable';
 
             switch ($dataType) {
@@ -101,11 +88,11 @@ public function fetchParameters(bool $isMethodInternal): array
                 case 'resource':
                 case 'variable':
                 case 'mixed':
-                    $parameters[] = $isMethodInternal ? $name : '&'.$name;
+                    $parameters[] = $isMethodInternal ? $name : '&' . $name;
                     break;
 
                 default:
-                    $parameters[] = ($isMethodInternal ? $name : '&'.$name).'_param';
+                    $parameters[] = ($isMethodInternal ? $name : '&' . $name) . '_param';
                     break;
             }
 
@@ -119,32 +106,38 @@ public function fetchParameters(bool $isMethodInternal): array
         return $parameters;
     }
 
-    /**
-     * @return int
-     */
-    public function count(): int
+    public function getOptionalParameters(): array
     {
-        return \count($this->parameters);
+        return $this->optionalParameters;
     }
 
-    public function rewind(): void
+    /**
+     * Return internal parameters.
+     */
+    public function getParameters(): array
     {
-        $this->position = 0;
+        return $this->parameters;
     }
 
-    public function key(): int
+    public function getRequiredParameters(): array
     {
-        return $this->position;
+        return $this->requiredParameters;
     }
 
-    public function valid(): bool
+    public function hasNullableParameters(): bool
     {
-        return isset($this->parameters[$this->position]);
+        foreach ($this->optionalParameters as $parameter) {
+            if (isset($parameter['default']['type']) && $parameter['default']['type'] === 'null') {
+                return true;
+            }
+        }
+
+        return false;
     }
 
-    public function current(): mixed
+    public function key(): int
     {
-        return $this->parameters[$this->position];
+        return $this->position;
     }
 
     public function next(): void
@@ -171,4 +164,14 @@ public function offsetUnset(mixed $offset): void
     {
         unset($this->parameters[$offset]);
     }
+
+    public function rewind(): void
+    {
+        $this->position = 0;
+    }
+
+    public function valid(): bool
+    {
+        return isset($this->parameters[$this->position]);
+    }
 }
diff --git a/src/Class/Property.php b/src/Class/Property.php
index 0571103cf7..b91a28d3f0 100644
--- a/src/Class/Property.php
+++ b/src/Class/Property.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Class;
 
+use ReflectionException;
 use Zephir\Class\Definition\Definition;
 use Zephir\CompilationContext;
 use Zephir\Exception;
@@ -24,6 +25,13 @@
 use Zephir\StatementsBlock;
 use Zephir\Types\Types;
 
+use function array_keys;
+use function implode;
+use function in_array;
+use function is_array;
+use function is_object;
+use function sprintf;
+
 /**
  * Represents a property class
  */
@@ -39,13 +47,79 @@ public function __construct(
     ) {
         $this->checkVisibility($visibility, $name, $original);
 
-        if (!\is_array($this->defaultValue)) {
-            $this->defaultValue = [];
-            $this->defaultValue['type'] = 'null';
+        if (!is_array($this->defaultValue)) {
+            $this->defaultValue          = [];
+            $this->defaultValue['type']  = 'null';
             $this->defaultValue['value'] = null;
         }
     }
 
+    /**
+     * Checks for visibility congruence.
+     */
+    public function checkVisibility(array $visibility, string $name, array $original = null): void
+    {
+        if (in_array('public', $visibility) && in_array('protected', $visibility)) {
+            throw new CompilerException(
+                "Property '$name' cannot be 'public' and 'protected' at the same time",
+                $original
+            );
+        }
+        if (in_array('public', $visibility) && in_array('private', $visibility)) {
+            throw new CompilerException(
+                "Property '$name' cannot be 'public' and 'private' at the same time",
+                $original
+            );
+        }
+        if (in_array('private', $visibility) && in_array('protected', $visibility)) {
+            throw new CompilerException(
+                "Property '$name' cannot be 'protected' and 'private' at the same time",
+                $original
+            );
+        }
+    }
+
+    /**
+     * Produce the code to register a property.
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function compile(CompilationContext $compilationContext): void
+    {
+        switch ($this->defaultValue['type']) {
+            case 'long':
+            case 'int':
+            case 'string':
+            case 'double':
+            case 'bool':
+                $this->declareProperty($compilationContext, $this->defaultValue['type'], $this->defaultValue['value']);
+                break;
+
+            case 'array':
+            case 'empty-array':
+                $this->initializeArray();
+            // no break
+            case 'null':
+                $this->declareProperty($compilationContext, $this->defaultValue['type'], null);
+                break;
+
+            case 'static-constant-access':
+                $expression         = new Expression($this->defaultValue);
+                $compiledExpression = $expression->compile($compilationContext);
+
+                $this->declareProperty(
+                    $compilationContext,
+                    $compiledExpression->getType(),
+                    $compiledExpression->getCode()
+                );
+                break;
+
+            default:
+                throw new CompilerException('Unknown default type: ' . $this->defaultValue['type'], $this->original);
+        }
+    }
+
     /**
      * Returns the class definition where the method was declared.
      */
@@ -54,6 +128,14 @@ public function getClassDefinition(): Definition
         return $this->classDefinition;
     }
 
+    /**
+     * Returns the docblock related to the property.
+     */
+    public function getDocBlock(): ?string
+    {
+        return $this->docBlock;
+    }
+
     /**
      * Returns the property name.
      */
@@ -62,6 +144,16 @@ public function getName(): string
         return $this->name;
     }
 
+    public function getOriginal(): ?array
+    {
+        return $this->original;
+    }
+
+    public function getType()
+    {
+        return $this->defaultValue['type'];
+    }
+
     public function getValue(): mixed
     {
         if ('array' == $this->defaultValue['type']) {
@@ -77,32 +169,6 @@ public function getValue(): mixed
         return $this->defaultValue['value'];
     }
 
-    public function getType()
-    {
-        return $this->defaultValue['type'];
-    }
-
-    public function getOriginal(): ?array
-    {
-        return $this->original;
-    }
-
-    /**
-     * Checks for visibility congruence.
-     */
-    public function checkVisibility(array $visibility, string $name, array $original = null): void
-    {
-        if (\in_array('public', $visibility) && \in_array('protected', $visibility)) {
-            throw new CompilerException("Property '$name' cannot be 'public' and 'protected' at the same time", $original);
-        }
-        if (\in_array('public', $visibility) && \in_array('private', $visibility)) {
-            throw new CompilerException("Property '$name' cannot be 'public' and 'private' at the same time", $original);
-        }
-        if (\in_array('private', $visibility) && \in_array('protected', $visibility)) {
-            throw new CompilerException("Property '$name' cannot be 'protected' and 'private' at the same time", $original);
-        }
-    }
-
     /**
      * Returns the C-visibility accessors for the model.
      *
@@ -131,7 +197,7 @@ public function getVisibilityAccessor(): string
                     break;
 
                 default:
-                    throw new Exception('Unknown modifier '.$visibility);
+                    throw new Exception('Unknown modifier ' . $visibility);
             }
         }
 
@@ -139,27 +205,11 @@ public function getVisibilityAccessor(): string
     }
 
     /**
-     * Returns the docblock related to the property.
-     */
-    public function getDocBlock(): ?string
-    {
-        return $this->docBlock;
-    }
-
-    /**
-     * Checks whether the variable is static.
-     */
-    public function isStatic(): bool
-    {
-        return \in_array('static', $this->visibility);
-    }
-
-    /**
-     * Checks whether the variable is public.
+     * Checks whether the variable is private.
      */
-    public function isPublic(): bool
+    public function isPrivate(): bool
     {
-        return \in_array('public', $this->visibility);
+        return in_array('private', $this->visibility);
     }
 
     /**
@@ -167,123 +217,23 @@ public function isPublic(): bool
      */
     public function isProtected(): bool
     {
-        return \in_array('protected', $this->visibility);
+        return in_array('protected', $this->visibility);
     }
 
     /**
-     * Checks whether the variable is private.
+     * Checks whether the variable is public.
      */
-    public function isPrivate(): bool
+    public function isPublic(): bool
     {
-        return \in_array('private', $this->visibility);
+        return in_array('public', $this->visibility);
     }
 
     /**
-     * Produce the code to register a property.
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function compile(CompilationContext $compilationContext): void
-    {
-        switch ($this->defaultValue['type']) {
-            case 'long':
-            case 'int':
-            case 'string':
-            case 'double':
-            case 'bool':
-                $this->declareProperty($compilationContext, $this->defaultValue['type'], $this->defaultValue['value']);
-                break;
-
-            case 'array':
-            case 'empty-array':
-                $this->initializeArray();
-                // no break
-            case 'null':
-                $this->declareProperty($compilationContext, $this->defaultValue['type'], null);
-                break;
-
-            case 'static-constant-access':
-                $expression = new Expression($this->defaultValue);
-                $compiledExpression = $expression->compile($compilationContext);
-
-                $this->declareProperty($compilationContext, $compiledExpression->getType(), $compiledExpression->getCode());
-                break;
-
-            default:
-                throw new CompilerException('Unknown default type: '.$this->defaultValue['type'], $this->original);
-        }
-    }
-
-    /**
-     * Removes all initialization statements related to this property.
+     * Checks whether the variable is static.
      */
-    protected function removeInitializationStatements(array &$statements): void
-    {
-        foreach ($statements as $index => $statement) {
-            if (!$this->isStatic()) {
-                if ($statement['expr']['left']['right']['value'] == $this->name) {
-                    unset($statements[$index]);
-                }
-            } else {
-                if ($statement['assignments'][0]['property'] == $this->name) {
-                    unset($statements[$index]);
-                }
-            }
-        }
-    }
-
-    protected function getLetStatement()
-    {
-        $exprBuilder = BuilderFactory::getInstance();
-
-        if ($this->isStatic()) {
-            $className = '\\'.$this->classDefinition->getCompleteName();
-            $expr = $exprBuilder->raw($this->original['default']);
-
-            return $exprBuilder->statements()->let([
-                $exprBuilder->operators()
-                    ->assignStaticProperty($className, $this->name, $expr)
-                    ->setFile($this->original['default']['file'])
-                    ->setLine($this->original['default']['line'])
-                    ->setChar($this->original['default']['char']),
-            ]);
-        }
-
-        $lsb = $exprBuilder->statements()->let([
-            $exprBuilder->operators()
-                ->assignProperty('this', $this->name, $exprBuilder->raw($this->original['default']))
-                ->setFile($this->original['default']['file'])
-                ->setLine($this->original['default']['line'])
-                ->setChar($this->original['default']['char']),
-        ]);
-
-        return $exprBuilder->statements()->ifX()
-            ->setCondition(
-                $exprBuilder->operators()->binary(
-                    BinaryOperator::OPERATOR_EQUALS,
-                    $exprBuilder->operators()->binary(
-                        BinaryOperator::OPERATOR_ACCESS_PROPERTY,
-                        $exprBuilder->variable('this'),
-                        $exprBuilder->literal(Types::T_STRING, $this->name)
-                    ),
-                    $exprBuilder->literal(Types::T_NULL)
-                )
-            )
-            ->setStatements($exprBuilder->statements()->block([$lsb]));
-    }
-
-    protected function getBooleanCode($value): bool | string
+    public function isStatic(): bool
     {
-        if ('true' == $value || true === $value) {
-            return '1';
-        }
-
-        if ('false' == $value || false === $value) {
-            return '0';
-        }
-
-        return (bool) $value;
+        return in_array('static', $this->visibility);
     }
 
     /**
@@ -300,7 +250,7 @@ protected function declareProperty(CompilationContext $compilationContext, $type
     {
         $codePrinter = $compilationContext->codePrinter;
 
-        if (\is_object($value)) {
+        if (is_object($value)) {
             return;
         }
 
@@ -376,27 +326,99 @@ protected function declareProperty(CompilationContext $compilationContext, $type
                 break;
 
             default:
-                throw new CompilerException('Unknown default type: '.$type, $this->original);
+                throw new CompilerException('Unknown default type: ' . $type, $this->original);
+        }
+    }
+
+    protected function getBooleanCode($value): bool|string
+    {
+        if ('true' == $value || true === $value) {
+            return '1';
+        }
+
+        if ('false' == $value || false === $value) {
+            return '0';
+        }
+
+        return (bool)$value;
+    }
+
+    protected function getLetStatement()
+    {
+        $exprBuilder = BuilderFactory::getInstance();
+
+        if ($this->isStatic()) {
+            $className = '\\' . $this->classDefinition->getCompleteName();
+            $expr      = $exprBuilder->raw($this->original['default']);
+
+            return $exprBuilder->statements()->let([
+                $exprBuilder->operators()
+                            ->assignStaticProperty($className, $this->name, $expr)
+                            ->setFile($this->original['default']['file'])
+                            ->setLine($this->original['default']['line'])
+                            ->setChar($this->original['default']['char']),
+            ]);
+        }
+
+        $lsb = $exprBuilder->statements()->let([
+            $exprBuilder->operators()
+                        ->assignProperty('this', $this->name, $exprBuilder->raw($this->original['default']))
+                        ->setFile($this->original['default']['file'])
+                        ->setLine($this->original['default']['line'])
+                        ->setChar($this->original['default']['char']),
+        ]);
+
+        return $exprBuilder->statements()->ifX()
+                           ->setCondition(
+                               $exprBuilder->operators()->binary(
+                                   BinaryOperator::OPERATOR_EQUALS,
+                                   $exprBuilder->operators()->binary(
+                                       BinaryOperator::OPERATOR_ACCESS_PROPERTY,
+                                       $exprBuilder->variable('this'),
+                                       $exprBuilder->literal(Types::T_STRING, $this->name)
+                                   ),
+                                   $exprBuilder->literal(Types::T_NULL)
+                               )
+                           )
+                           ->setStatements($exprBuilder->statements()->block([$lsb]))
+        ;
+    }
+
+    /**
+     * Removes all initialization statements related to this property.
+     */
+    protected function removeInitializationStatements(array &$statements): void
+    {
+        foreach ($statements as $index => $statement) {
+            if (!$this->isStatic()) {
+                if ($statement['expr']['left']['right']['value'] == $this->name) {
+                    unset($statements[$index]);
+                }
+            } else {
+                if ($statement['assignments'][0]['property'] == $this->name) {
+                    unset($statements[$index]);
+                }
+            }
         }
     }
 
     private function initializeArray(): void
     {
-        $classDefinition = $this->classDefinition;
+        $classDefinition       = $this->classDefinition;
         $parentClassDefinition = $classDefinition->getExtendsClassDefinition();
 
         if (!$this->isStatic()) {
             $constructParentMethod = $parentClassDefinition?->getInitMethod();
-            $constructMethod = $classDefinition->getInitMethod();
+            $constructMethod       = $classDefinition->getInitMethod();
         } else {
             $constructParentMethod = $parentClassDefinition?->getStaticInitMethod();
-            $constructMethod = $classDefinition->getStaticInitMethod();
+            $constructMethod       = $classDefinition->getStaticInitMethod();
         }
 
         if ($constructMethod) {
             $statementsBlock = $constructMethod->getStatementsBlock();
             if ($statementsBlock) {
-                $statements = $statementsBlock->getStatements();
+                $statements   = $statementsBlock->getStatements();
                 $letStatement = $this->getLetStatement()->build();
 
                 $needLetStatementAdded = true;
@@ -420,7 +442,8 @@ private function initializeArray(): void
                 }
             } else {
                 $statementsBlockBuilder = BuilderFactory::getInstance()->statements()
-                    ->block([$this->getLetStatement()]);
+                                                        ->block([$this->getLetStatement()])
+                ;
                 $constructMethod->setStatementsBlock(new StatementsBlock($statementsBlockBuilder->build()));
                 $classDefinition->updateMethod($constructMethod);
             }
@@ -430,7 +453,7 @@ private function initializeArray(): void
                 $statements = $constructParentMethod->getStatementsBlock()->getStatements();
             }
             $this->removeInitializationStatements($statements);
-            $statements[] = $this->getLetStatement()->build();
+            $statements[]    = $this->getLetStatement()->build();
             $statementsBlock = new StatementsBlock($statements);
 
             if ($this->isStatic()) {
diff --git a/src/Code/ArgInfoDefinition.php b/src/Code/ArgInfoDefinition.php
index 143e741fd6..897ac0d9f6 100644
--- a/src/Code/ArgInfoDefinition.php
+++ b/src/Code/ArgInfoDefinition.php
@@ -19,13 +19,20 @@
 use Zephir\CompilationContext;
 use Zephir\Exception;
 
+use function array_key_exists;
+use function array_merge;
+use function count;
+use function implode;
+use function is_array;
+use function key;
+use function sprintf;
+use function str_replace;
+
 class ArgInfoDefinition
 {
+    private string      $booleanDefinition = '_IS_BOOL';
     private ?Parameters $parameters;
-
-    private string $booleanDefinition = '_IS_BOOL';
-
-    private bool $richFormat = true;
+    private bool        $richFormat        = true;
 
     public function __construct(
         private string $name,
@@ -37,16 +44,6 @@ public function __construct(
         $this->parameters = $this->functionLike->getParameters();
     }
 
-    public function setBooleanDefinition(string $definition): void
-    {
-        $this->booleanDefinition = $definition;
-    }
-
-    public function setRichFormat(bool $flag): void
-    {
-        $this->richFormat = $flag;
-    }
-
     /**
      * Render argument information.
      *
@@ -60,9 +57,10 @@ public function render(): void
             return;
         }
 
-        if ($this->richFormat
-            && $this->functionLike->isReturnTypesHintDetermined()
-            && $this->functionLike->areReturnTypesCompatible()
+        if (
+            $this->richFormat &&
+            $this->functionLike->isReturnTypesHintDetermined() &&
+            $this->functionLike->areReturnTypesCompatible()
         ) {
             $this->richRenderStart();
 
@@ -75,7 +73,7 @@ public function render(): void
                 sprintf(
                     'ZEND_BEGIN_ARG_INFO_EX(%s, 0, %d, %d)',
                     $this->name,
-                    (int) $this->returnByRef,
+                    (int)$this->returnByRef,
                     $this->functionLike->getNumberOfRequiredParameters()
                 )
             );
@@ -85,9 +83,9 @@ public function render(): void
                     sprintf(
                         'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, IS_STRING, %d)',
                         $this->name,
-                        (int) $this->returnByRef,
+                        (int)$this->returnByRef,
                         $this->functionLike->getNumberOfRequiredParameters(),
-                        (int) $this->functionLike->areReturnTypesNullCompatible()
+                        (int)$this->functionLike->areReturnTypesNullCompatible()
                     )
                 );
             } else {
@@ -108,125 +106,90 @@ public function render(): void
         }
     }
 
-    private function richRenderStart(): void
+    public function setBooleanDefinition(string $definition): void
     {
-        if (\array_key_exists('object', $this->functionLike->getReturnTypes()) && 1 === \count($this->functionLike->getReturnClassTypes())) {
-            $class = key($this->functionLike->getReturnClassTypes());
-            $class = Entry::escape($this->compilationContext->getFullName($class));
+        $this->booleanDefinition = $definition;
+    }
 
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(%s, %d, %d, %s, %d)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                    $class,
-                    (int) $this->functionLike->areReturnTypesNullCompatible()
-                )
-            );
+    public function setRichFormat(bool $flag): void
+    {
+        $this->richFormat = $flag;
+    }
 
-            return;
+    private function allowNull(array $parameter): bool
+    {
+        if (!isset($parameter['default']) || !is_array($parameter['default'])) {
+            return false;
         }
 
-        if ($this->functionLike->isVoid()) {
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                    $this->getReturnType(),
-                    (int) $this->functionLike->areReturnTypesNullCompatible()
-                )
-            );
-
-            if (!$this->hasParameters()) {
-                $this->codePrinter->output('ZEND_END_ARG_INFO()');
-            }
+        if ('null' === $parameter['default']['type']) {
+            return true;
+        }
 
-            $this->codePrinter->outputBlankLine();
+        return false;
+    }
 
-            return;
+    private function defaultArrayValue(array $parameter): string
+    {
+        if ($parameter['default']['type'] === 'empty-array') {
+            return '"[]"';
         }
 
-        if ($this->functionLike->isMixed()) {
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, IS_MIXED, %d)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                    (int) $this->functionLike->areReturnTypesNullCompatible()
-                )
-            );
+        // TODO: Come back later
+        /**
+         * It seems that it is impossible to pass default array with some data inside.
+         * Only empty array, even if manually specify not empty array - it will be ignored,
+         * for example:
+         *
+         * `ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, someDefaultData, IS_ARRAY, 0, "[\"key\" => \"value\"]")`
+         *
+         * Output of default value will be `[]` during method call.
+         */
+        return '"[]"';
+    }
 
-            return;
-        }
+    private function getReturnType(): string
+    {
+        // TODO: Come back here when PHP7.4 is deprecated.
+        /*if (array_key_exists('mixed', $this->functionLike->getReturnTypes())) {
+            return 'IS_MIXED';
+        }*/
 
-        if ($this->functionLike->isReturnTypeNullableObject()) {
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                    'MAY_BE_NULL|MAY_BE_OBJECT',
-                )
-            );
+        if ($this->functionLike->areReturnTypesIntCompatible()) {
+            return 'IS_LONG';
+        }
 
-            return;
+        if ($this->functionLike->areReturnTypesDoubleCompatible()) {
+            return 'IS_DOUBLE';
         }
 
-        if ($this->functionLike->isReturnTypeObject()) {
-            $this->codePrinter->output(
-                sprintf(
-                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
-                    $this->name,
-                    (int) $this->returnByRef,
-                    $this->functionLike->getNumberOfRequiredParameters(),
-                    'MAY_BE_OBJECT',
-                )
-            );
+        if ($this->functionLike->areReturnTypesBoolCompatible()) {
+            return '_IS_BOOL';
+        }
 
-            return;
+        if ($this->functionLike->areReturnTypesStringCompatible()) {
+            return 'IS_STRING';
         }
 
-        if (\count($this->functionLike->getReturnTypes()) > 1) {
-            $types = [];
-            $mayBeTypes = $this->functionLike->getMayBeArgTypes();
-            foreach ($this->functionLike->getReturnTypes() as $type => $typeInfo) {
-                if (!isset($mayBeTypes[$type])) {
-                    continue;
-                }
+        if ($this->functionLike->isVoid()) {
+            return 'IS_VOID';
+        }
 
-                $types[] = $mayBeTypes[$type];
-            }
+        if (array_key_exists('array', $this->functionLike->getReturnTypes())) {
+            return 'IS_ARRAY';
+        }
 
-            if (\count($types) > 1) {
-                $this->codePrinter->output(
-                    sprintf(
-                        'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
-                        $this->name,
-                        (int) $this->returnByRef,
-                        $this->functionLike->getNumberOfRequiredParameters(),
-                        implode('|', $types)
-                    )
-                );
+        return 'IS_NULL';
+    }
 
-                return;
-            }
-        }
+    private function hasParameters(): bool
+    {
+        return null !== $this->parameters && count($this->parameters->getParameters()) > 0;
+    }
 
-        $this->codePrinter->output(
-            sprintf(
-                'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
-                $this->name,
-                (int) $this->returnByRef,
-                $this->functionLike->getNumberOfRequiredParameters(),
-                $this->getReturnType(),
-                (int) $this->functionLike->areReturnTypesNullCompatible()
-            )
-        );
+    private function passByReference(array $parameter)
+    {
+        return $parameter['reference'] ?? 0;
     }
 
     private function renderEnd(): void
@@ -234,7 +197,7 @@ private function renderEnd(): void
         $flag = $this->richFormat ? '1' : '0';
 
         foreach ($this->parameters->getParameters() as $parameter) {
-            switch ("{$flag}:".$parameter['data-type']) {
+            switch ("{$flag}:" . $parameter['data-type']) {
                 case '0:array':
                 case '1:array':
                     if (!isset($parameter['default'])) {
@@ -243,7 +206,7 @@ private function renderEnd(): void
                                 "\tZEND_ARG_ARRAY_INFO(%d, %s, %d)",
                                 $this->passByReference($parameter),
                                 $parameter['name'],
-                                (int) $this->allowNull($parameter)
+                                (int)$this->allowNull($parameter)
                             )
                         );
                     } else {
@@ -252,7 +215,7 @@ private function renderEnd(): void
                                 'ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(%d, %s, IS_ARRAY, %d, %s)',
                                 $this->passByReference($parameter),
                                 $parameter['name'],
-                                (int) $this->allowNull($parameter),
+                                (int)$this->allowNull($parameter),
                                 $this->defaultArrayValue($parameter),
                             )
                         );
@@ -271,7 +234,7 @@ private function renderEnd(): void
                                 $this->passByReference($parameter),
                                 $parameter['name'],
                                 Entry::escape($this->compilationContext->getFullName($parameter['cast']['value'])),
-                                (int) $this->allowNull($parameter)
+                                (int)$this->allowNull($parameter)
                             )
                         );
                     } else {
@@ -293,7 +256,7 @@ private function renderEnd(): void
                             $this->passByReference($parameter),
                             $parameter['name'],
                             $this->booleanDefinition,
-                            (int) $this->allowNull($parameter)
+                            (int)$this->allowNull($parameter)
                         )
                     );
                     break;
@@ -307,7 +270,7 @@ private function renderEnd(): void
                             "\tZEND_ARG_TYPE_INFO(%d, %s, IS_LONG, %d)",
                             $this->passByReference($parameter),
                             $parameter['name'],
-                            (int) $this->allowNull($parameter)
+                            (int)$this->allowNull($parameter)
                         )
                     );
                     break;
@@ -317,7 +280,7 @@ private function renderEnd(): void
                             "\tZEND_ARG_TYPE_INFO(%d, %s, IS_DOUBLE, %d)",
                             $this->passByReference($parameter),
                             $parameter['name'],
-                            (int) $this->allowNull($parameter)
+                            (int)$this->allowNull($parameter)
                         )
                     );
                     break;
@@ -328,7 +291,7 @@ private function renderEnd(): void
                             "\tZEND_ARG_TYPE_INFO(%d, %s, IS_STRING, %d)",
                             $this->passByReference($parameter),
                             $parameter['name'],
-                            (int) $this->allowNull($parameter)
+                            (int)$this->allowNull($parameter)
                         )
                     );
                     break;
@@ -345,82 +308,6 @@ private function renderEnd(): void
         }
     }
 
-    private function hasParameters(): bool
-    {
-        return null !== $this->parameters && \count($this->parameters->getParameters()) > 0;
-    }
-
-    private function defaultArrayValue(array $parameter): string
-    {
-        if ($parameter['default']['type'] === 'empty-array') {
-            return '"[]"';
-        }
-
-        // TODO: Come back later
-        /**
-         * It seems that it is impossible to pass default array with some data inside.
-         * Only empty array, even if manually specify not empty array - it will be ignored,
-         * for example:
-         *
-         * `ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, someDefaultData, IS_ARRAY, 0, "[\"key\" => \"value\"]")`
-         *
-         * Output of default value will be `[]` during method call.
-         */
-        return '"[]"';
-    }
-
-    private function allowNull(array $parameter): bool
-    {
-        if (!isset($parameter['default']) || !\is_array($parameter['default'])) {
-            return false;
-        }
-
-        if ('null' === $parameter['default']['type']) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private function passByReference(array $parameter)
-    {
-        return $parameter['reference'] ?? 0;
-    }
-
-    private function getReturnType(): string
-    {
-        // TODO: Come back here when PHP7.4 is deprecated.
-        /*if (array_key_exists('mixed', $this->functionLike->getReturnTypes())) {
-            return 'IS_MIXED';
-        }*/
-
-        if ($this->functionLike->areReturnTypesIntCompatible()) {
-            return 'IS_LONG';
-        }
-
-        if ($this->functionLike->areReturnTypesDoubleCompatible()) {
-            return 'IS_DOUBLE';
-        }
-
-        if ($this->functionLike->areReturnTypesBoolCompatible()) {
-            return '_IS_BOOL';
-        }
-
-        if ($this->functionLike->areReturnTypesStringCompatible()) {
-            return 'IS_STRING';
-        }
-
-        if ($this->functionLike->isVoid()) {
-            return 'IS_VOID';
-        }
-
-        if (\array_key_exists('array', $this->functionLike->getReturnTypes())) {
-            return 'IS_ARRAY';
-        }
-
-        return 'IS_NULL';
-    }
-
     /**
      * Find from $compatibilityClasses and render specific
      * hardcoded arg info for with specific PHP version
@@ -428,16 +315,16 @@ private function getReturnType(): string
      *
      * This is temporary solution designed specifically for Phalcon project.
      *
+     * @return bool
      * @deprecated used as MVP solution for cross PHP versions support
      *
-     * @return bool
      */
     private function renderPhalconCompatible(): bool
     {
-        $compatibilityClasses = require_once __DIR__.'/../../config/phalcon-compatibility-headers.php';
-        $classDefinition = $this->functionLike->getClassDefinition();
+        $compatibilityClasses  = require_once __DIR__ . '/../../config/phalcon-compatibility-headers.php';
+        $classDefinition       = $this->functionLike->getClassDefinition();
         $implementedInterfaces = $classDefinition !== null ? $classDefinition->getImplementedInterfaces() : [];
-        $extendsClass = $classDefinition !== null ? $classDefinition->getExtendsClass() : null;
+        $extendsClass          = $classDefinition !== null ? $classDefinition->getExtendsClass() : null;
 
         if (empty($implementedInterfaces) && $extendsClass === null) {
             return false;
@@ -469,4 +356,128 @@ private function renderPhalconCompatible(): bool
 
         return $found;
     }
+
+    private function richRenderStart(): void
+    {
+        if (
+            array_key_exists('object', $this->functionLike->getReturnTypes()) &&
+            1 === count($this->functionLike->getReturnClassTypes())
+        ) {
+            $class = key($this->functionLike->getReturnClassTypes());
+            $class = Entry::escape($this->compilationContext->getFullName($class));
+
+            $this->codePrinter->output(
+                sprintf(
+                    'ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(%s, %d, %d, %s, %d)',
+                    $this->name,
+                    (int)$this->returnByRef,
+                    $this->functionLike->getNumberOfRequiredParameters(),
+                    $class,
+                    (int)$this->functionLike->areReturnTypesNullCompatible()
+                )
+            );
+
+            return;
+        }
+
+        if ($this->functionLike->isVoid()) {
+            $this->codePrinter->output(
+                sprintf(
+                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
+                    $this->name,
+                    (int)$this->returnByRef,
+                    $this->functionLike->getNumberOfRequiredParameters(),
+                    $this->getReturnType(),
+                    (int)$this->functionLike->areReturnTypesNullCompatible()
+                )
+            );
+
+            if (!$this->hasParameters()) {
+                $this->codePrinter->output('ZEND_END_ARG_INFO()');
+            }
+
+            $this->codePrinter->outputBlankLine();
+
+            return;
+        }
+
+        if ($this->functionLike->isMixed()) {
+            $this->codePrinter->output(
+                sprintf(
+                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, IS_MIXED, %d)',
+                    $this->name,
+                    (int)$this->returnByRef,
+                    $this->functionLike->getNumberOfRequiredParameters(),
+                    (int)$this->functionLike->areReturnTypesNullCompatible()
+                )
+            );
+
+            return;
+        }
+
+        if ($this->functionLike->isReturnTypeNullableObject()) {
+            $this->codePrinter->output(
+                sprintf(
+                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
+                    $this->name,
+                    (int)$this->returnByRef,
+                    $this->functionLike->getNumberOfRequiredParameters(),
+                    'MAY_BE_NULL|MAY_BE_OBJECT',
+                )
+            );
+
+            return;
+        }
+
+        if ($this->functionLike->isReturnTypeObject()) {
+            $this->codePrinter->output(
+                sprintf(
+                    'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
+                    $this->name,
+                    (int)$this->returnByRef,
+                    $this->functionLike->getNumberOfRequiredParameters(),
+                    'MAY_BE_OBJECT',
+                )
+            );
+
+            return;
+        }
+
+        if (count($this->functionLike->getReturnTypes()) > 1) {
+            $types      = [];
+            $mayBeTypes = $this->functionLike->getMayBeArgTypes();
+            foreach ($this->functionLike->getReturnTypes() as $type => $typeInfo) {
+                if (!isset($mayBeTypes[$type])) {
+                    continue;
+                }
+
+                $types[] = $mayBeTypes[$type];
+            }
+
+            if (count($types) > 1) {
+                $this->codePrinter->output(
+                    sprintf(
+                        'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(%s, %d, %d, %s)',
+                        $this->name,
+                        (int)$this->returnByRef,
+                        $this->functionLike->getNumberOfRequiredParameters(),
+                        implode('|', $types)
+                    )
+                );
+
+                return;
+            }
+        }
+
+        $this->codePrinter->output(
+            sprintf(
+                'ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(%s, %d, %d, %s, %d)',
+                $this->name,
+                (int)$this->returnByRef,
+                $this->functionLike->getNumberOfRequiredParameters(),
+                $this->getReturnType(),
+                (int)$this->functionLike->areReturnTypesNullCompatible()
+            )
+        );
+    }
 }
diff --git a/src/Code/Builder/Struct.php b/src/Code/Builder/Struct.php
index ce00f3041c..c20c7d8c05 100644
--- a/src/Code/Builder/Struct.php
+++ b/src/Code/Builder/Struct.php
@@ -16,6 +16,11 @@
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Exception\RuntimeException;
 
+use function sprintf;
+use function substr;
+
+use const PHP_EOL;
+
 /**
  * Represents an internal extension global structure
  */
@@ -41,13 +46,13 @@ public function __construct(protected string $name, protected string $simpleName
 
     public function __toString(): string
     {
-        $code = 'typedef struct '.$this->name.' { '.PHP_EOL;
+        $code = 'typedef struct ' . $this->name . ' { ' . PHP_EOL;
 
         foreach ($this->properties as $name => $type) {
             $code .= sprintf("\t%s %s;%s", $type, $name, PHP_EOL);
         }
 
-        return $code.'} '.substr($this->name, 1).';'.PHP_EOL;
+        return $code . '} ' . substr($this->name, 1) . ';' . PHP_EOL;
     }
 
     /**
@@ -80,7 +85,7 @@ public function addProperty(string $field, string $type): void
     public function getCDefault(string $name, array $global, string $namespace): string
     {
         if (!isset($global['default'])) {
-            throw new RuntimeException('Field "'.$name.'" does not have a default value');
+            throw new RuntimeException('Field "' . $name . '" does not have a default value');
         }
 
         switch ($global['type']) {
@@ -89,17 +94,17 @@ public function getCDefault(string $name, array $global, string $namespace): str
                 return '';
 
             case 'string':
-                return "\t".$namespace.'_globals->'.$this->simpleName.'.'.$name.' = ZSTR_VAL(zend_string_init(ZEND_STRL("'.$global['default'].'"), 0));';
+                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));';
 
             case 'int':
             case 'uint':
             case 'long':
             case 'double':
             case 'hash':
-                return "\t".$namespace.'_globals->'.$this->simpleName.'.'.$name.' = '.$global['default'].';';
+                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ' . $global['default'] . ';';
 
             default:
-                throw new InvalidArgumentException('Unknown global type: '.$global['type']);
+                throw new InvalidArgumentException('Unknown global type: ' . $global['type']);
         }
     }
 
@@ -116,37 +121,37 @@ public function getCDefault(string $name, array $global, string $namespace): str
      */
     public function getInitEntry(string $name, array $global, string $namespace): string
     {
-        $structName = $this->simpleName.'.'.$name;
-        $iniEntry = $global['ini-entry'] ?? [];
-        $iniName = $iniEntry['name'] ?? $namespace.'.'.$structName;
-        $scope = $iniEntry['scope'] ?? 'PHP_INI_ALL';
+        $structName = $this->simpleName . '.' . $name;
+        $iniEntry   = $global['ini-entry'] ?? [];
+        $iniName    = $iniEntry['name'] ?? $namespace . '.' . $structName;
+        $scope      = $iniEntry['scope'] ?? 'PHP_INI_ALL';
 
         switch ($global['type']) {
             case 'boolean':
             case 'bool':
                 return
-                    'STD_PHP_INI_BOOLEAN("'.
-                    $iniName.
-                    '", "'.
-                    (int) (true === $global['default']).
-                    '", '.
-                    $scope.
-                    ', OnUpdateBool, '.
-                    $structName.
-                    ', zend_'.
-                    $namespace.
-                    '_globals, '.
-                    $namespace.'_globals)';
+                    'STD_PHP_INI_BOOLEAN("' .
+                    $iniName .
+                    '", "' .
+                    (int)(true === $global['default']) .
+                    '", ' .
+                    $scope .
+                    ', OnUpdateBool, ' .
+                    $structName .
+                    ', zend_' .
+                    $namespace .
+                    '_globals, ' .
+                    $namespace . '_globals)';
 
             case 'string':
                 return sprintf(
                     'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
-                    '"'.$iniName.'"',
-                    '"'.$global['default'].'"',
+                    '"' . $iniName . '"',
+                    '"' . $global['default'] . '"',
                     $scope,
                     $structName,
-                    'zend_'.$namespace.'_globals',
-                    $namespace.'_globals',
+                    'zend_' . $namespace . '_globals',
+                    $namespace . '_globals',
                 );
         }
 
@@ -161,11 +166,13 @@ public function getInitEntry(string $name, array $global, string $namespace): st
     protected function convertToCType(string $type): string
     {
         return match ($type) {
-            'boolean', 'bool' => 'zend_bool',
-            'hash' => 'HashTable* ',
-            'string' => 'zend_string* ',
+            'boolean', 'bool'                                => 'zend_bool',
+            'hash'                                           => 'HashTable* ',
+            'string'                                         => 'zend_string* ',
             'int', 'uint', 'long', 'char', 'uchar', 'double' => $type,
-            default => throw new InvalidArgumentException('Unknown global type: '.$type),
+            default                                          => throw new InvalidArgumentException(
+                'Unknown global type: ' . $type
+            ),
         };
     }
 }
diff --git a/src/Code/Printer.php b/src/Code/Printer.php
index 121273f7b8..becefca803 100644
--- a/src/Code/Printer.php
+++ b/src/Code/Printer.php
@@ -13,90 +13,73 @@
 
 namespace Zephir\Code;
 
+use function explode;
+use function preg_replace;
+use function str_repeat;
+use function trim;
+
+use const PHP_EOL;
+
 /**
  * Buffers code, making it look pretty
  */
 class Printer
 {
-    protected string $code = '';
-
-    protected string $lastLine = '';
-
-    protected int $level = 0;
-
-    protected int $currentPrints = 0;
+    protected string $code          = '';
+    protected int    $currentPrints = 0;
+    protected string $lastLine      = '';
+    protected int    $level         = 0;
 
     /**
-     * Add code to the output at the beginning.
-     *
-     * @param string $code
+     * Frees memory used within the code.
      */
-    public function preOutput(string $code): void
+    public function clear(): void
     {
-        $this->lastLine = $code;
-        $this->code = str_repeat("\t", $this->level).$code.PHP_EOL.$this->code;
-        ++$this->currentPrints;
+        $this->code     = '';
+        $this->lastLine = '';
+        $this->level    = 0;
     }
 
     /**
-     * Add code to the output without indentation.
+     * Decrease the indentation level.
      */
-    public function outputNoIndent(string $code): void
+    public function decreaseLevel(): void
     {
-        $this->lastLine = $code;
-        $this->code .= $code.PHP_EOL;
-        ++$this->currentPrints;
+        --$this->level;
     }
 
     /**
-     * Add code to the output.
+     * Returns an approximate number of lines printed by the CodePrinter.
      */
-    public function output(string $code, bool $appendEOL = true): void
+    public function getNumberPrints(): int
     {
-        $this->lastLine = $code;
-        $this->code .= str_repeat("\t", $this->level).$code.($appendEOL ? PHP_EOL : '');
-        ++$this->currentPrints;
+        return $this->currentPrints;
     }
 
     /**
-     * Adds a comment to the output with indentation level.
+     * Returns the output in the buffer.
      */
-    public function outputDocBlock($docblock, bool $replaceTab = true): void
+    public function getOutput(): string
     {
-        $code = '';
-        $docblock = '/'.$docblock.'/';
-
-        foreach (explode("\n", $docblock) as $line) {
-            if ($replaceTab) {
-                $code .= str_repeat("\t", $this->level).preg_replace('/^[ \t]+/', ' ', $line).PHP_EOL;
-            } else {
-                $code .= $line.PHP_EOL;
-            }
-        }
+        return $this->code;
+    }
 
-        $this->lastLine = $code;
-        $this->code .= $code;
-        ++$this->currentPrints;
+    /**
+     * Increase the indentation level.
+     */
+    public function increaseLevel(): void
+    {
+        ++$this->level;
     }
 
     /**
-     * Adds a blank line to the output
-     * Optionally controlling if the blank link must be added if the
-     * previous line added isn't one blank line too.
+     * Add code to the output.
      */
-    public function preOutputBlankLine(bool $ifPrevNotBlank = false): void
+    public function output(string $code, bool $appendEOL = true): void
     {
-        if (!$ifPrevNotBlank) {
-            $this->code = PHP_EOL.$this->code;
-            $this->lastLine = PHP_EOL;
-            ++$this->currentPrints;
-        } else {
-            if (trim($this->lastLine)) {
-                $this->code = PHP_EOL.$this->code;
-                $this->lastLine = PHP_EOL;
-                ++$this->currentPrints;
-            }
-        }
+        $this->lastLine = $code;
+        $this->code     .= str_repeat("\t", $this->level) . $code . ($appendEOL ? PHP_EOL : '');
+        ++$this->currentPrints;
     }
 
     /**
@@ -107,12 +90,12 @@ public function preOutputBlankLine(bool $ifPrevNotBlank = false): void
     public function outputBlankLine(bool $ifPrevNotBlank = false): void
     {
         if (!$ifPrevNotBlank) {
-            $this->code .= PHP_EOL;
+            $this->code     .= PHP_EOL;
             $this->lastLine = PHP_EOL;
             ++$this->currentPrints;
         } else {
             if (trim($this->lastLine)) {
-                $this->code .= PHP_EOL;
+                $this->code     .= PHP_EOL;
                 $this->lastLine = PHP_EOL;
                 ++$this->currentPrints;
             }
@@ -120,44 +103,65 @@ public function outputBlankLine(bool $ifPrevNotBlank = false): void
     }
 
     /**
-     * Increase the indentation level.
+     * Adds a comment to the output with indentation level.
      */
-    public function increaseLevel(): void
+    public function outputDocBlock($docblock, bool $replaceTab = true): void
     {
-        ++$this->level;
-    }
+        $code     = '';
+        $docblock = '/' . $docblock . '/';
 
-    /**
-     * Decrease the indentation level.
-     */
-    public function decreaseLevel(): void
-    {
-        --$this->level;
+        foreach (explode("\n", $docblock) as $line) {
+            if ($replaceTab) {
+                $code .= str_repeat("\t", $this->level) . preg_replace('/^[ \t]+/', ' ', $line) . PHP_EOL;
+            } else {
+                $code .= $line . PHP_EOL;
+            }
+        }
+
+        $this->lastLine = $code;
+        $this->code     .= $code;
+        ++$this->currentPrints;
     }
 
     /**
-     * Returns the output in the buffer.
+     * Add code to the output without indentation.
      */
-    public function getOutput(): string
+    public function outputNoIndent(string $code): void
     {
-        return $this->code;
+        $this->lastLine = $code;
+        $this->code     .= $code . PHP_EOL;
+        ++$this->currentPrints;
     }
 
     /**
-     * Returns an approximate number of lines printed by the CodePrinter.
+     * Add code to the output at the beginning.
+     *
+     * @param string $code
      */
-    public function getNumberPrints(): int
+    public function preOutput(string $code): void
     {
-        return $this->currentPrints;
+        $this->lastLine = $code;
+        $this->code     = str_repeat("\t", $this->level) . $code . PHP_EOL . $this->code;
+        ++$this->currentPrints;
     }
 
     /**
-     * Frees memory used within the code.
+     * Adds a blank line to the output
+     * Optionally controlling if the blank link must be added if the
+     * previous line added isn't one blank line too.
      */
-    public function clear(): void
+    public function preOutputBlankLine(bool $ifPrevNotBlank = false): void
     {
-        $this->code = '';
-        $this->lastLine = '';
-        $this->level = 0;
+        if (!$ifPrevNotBlank) {
+            $this->code     = PHP_EOL . $this->code;
+            $this->lastLine = PHP_EOL;
+            ++$this->currentPrints;
+        } else {
+            if (trim($this->lastLine)) {
+                $this->code     = PHP_EOL . $this->code;
+                $this->lastLine = PHP_EOL;
+                ++$this->currentPrints;
+            }
+        }
     }
 }
diff --git a/src/CompilationContext.php b/src/CompilationContext.php
index 7e2a63e4a9..fb026a6c04 100644
--- a/src/CompilationContext.php
+++ b/src/CompilationContext.php
@@ -24,141 +24,110 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Passes\StaticTypeInference;
 
+use function in_array;
+
 /**
  * This class encapsulates important entities required during compilation
  */
 class CompilationContext
 {
-    public ?Compiler $compiler = null;
-
-    /**
-     * Current code printer.
-     */
-    public ?Printer $codePrinter = null;
-
     /**
-     * Whether the current method is static or not.
+     * Manages class renaming using keyword 'use'.
      */
-    public bool $staticContext = false;
-
+    public ?AliasManager $aliasManager = null;
     /**
-     * Code printer for the header.
+     * The current backend.
      */
-    public ?Printer $headerPrinter = null;
-
+    public ?Backend $backend = null;
     /**
-     * Current symbol table.
+     * Helps to create graphs of conditional/jump branches in a specific method.
      */
-    public ?SymbolTable $symbolTable = null;
-
+    public ?BranchManager $branchManager = null;
     /**
-     * Type inference data.
+     * Manages both function and method call caches.
      */
-    public ?StaticTypeInference $typeInference = null;
-
+    public ?Manager $cacheManager = null;
     /**
      * Represents the class currently being compiled.
      */
     public ?Definition $classDefinition = null;
-
-    /**
-     * Current method or function that being compiled.
-     */
-    public ?Method $currentMethod = null;
-
     /**
-     * Represents the c-headers added to the file.
+     * Current code printer.
      */
-    public ?HeadersManager $headersManager = null;
-
+    public ?Printer  $codePrinter = null;
+    public ?Compiler $compiler    = null;
     /**
-     * Represents interned strings and concatenations made in the project.
+     * Global config.
      */
-    public ?StringsManager $stringsManager = null;
-
+    public ?Config $config = null;
     /**
-     * Tells if the compilation is being made inside a cycle/loop.
+     * The current branch, variables declared in conditional branches
+     * must be market if they're used out of those branches.
      */
-    public int $insideCycle = 0;
-
+    public int $currentBranch = 0;
     /**
-     * Tells if the compilation is being made inside a try/catch block.
+     * Current method or function that being compiled.
      */
-    public int $insideTryCatch = 0;
-
+    public ?Method $currentMethod = null;
     /**
-     * Tells if the compilation is being made inside a switch.
+     * Global consecutive for try/catch blocks.
      */
-    public int $insideSwitch = 0;
-
+    public int $currentTryCatch = 0;
     /**
      * Current cycle/loop block.
      */
     public array $cycleBlocks = [];
-
-    /**
-     * The current branch, variables declared in conditional branches
-     * must be market if they're used out of those branches.
-     */
-    public int $currentBranch = 0;
-
     /**
-     * Global consecutive for try/catch blocks.
+     * Function Cache.
      */
-    public int $currentTryCatch = 0;
-
+    public ?FunctionCache $functionCache = null;
     /**
-     * Helps to create graphs of conditional/jump branches in a specific method.
+     * Code printer for the header.
      */
-    public ?BranchManager $branchManager = null;
-
+    public ?Printer $headerPrinter = null;
     /**
-     * Manages both function and method call caches.
+     * Represents the c-headers added to the file.
      */
-    public ?Manager $cacheManager = null;
-
+    public ?HeadersManager $headersManager = null;
     /**
-     * Manages class renaming using keyword 'use'.
+     * Tells if the compilation is being made inside a cycle/loop.
      */
-    public ?AliasManager $aliasManager = null;
-
+    public int $insideCycle = 0;
     /**
-     * Function Cache.
+     * Tells if the compilation is being made inside a switch.
      */
-    public ?FunctionCache $functionCache = null;
-
+    public int $insideSwitch = 0;
     /**
-     * Global config.
+     * Tells if the compilation is being made inside a try/catch block.
      */
-    public ?Config $config = null;
-
+    public int $insideTryCatch = 0;
     /**
      * Global logger.
      */
     public ?LoggerInterface $logger = null;
-
     /**
-     * The current backend.
+     * Whether the current method is static or not.
      */
-    public ?Backend $backend = null;
-
+    public bool $staticContext = false;
     /**
-     * Transform class/interface name to FQN format.
+     * Represents interned strings and concatenations made in the project.
      */
-    public function getFullName(string $className): string
-    {
-        $isFunction = $this->currentMethod instanceof FunctionDefinition;
-        $namespace = $isFunction ? $this->currentMethod->getNamespace() : $this->classDefinition->getNamespace();
-
-        return Name::fetchFQN($className, $namespace, $this->aliasManager);
-    }
+    public ?StringsManager $stringsManager = null;
+    /**
+     * Current symbol table.
+     */
+    public ?SymbolTable $symbolTable = null;
+    /**
+     * Type inference data.
+     */
+    public ?StaticTypeInference $typeInference = null;
 
     /**
      * Lookup a class from a given class name.
      */
     public function classLookup(string $className, array $statement = null): AbstractDefinition
     {
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $this->getFullName($className);
             if ($this->compiler->isClass($className)) {
                 return $this->compiler->getClassDefinition($className);
@@ -167,7 +136,7 @@ public function classLookup(string $className, array $statement = null): Abstrac
             throw new CompilerException("Cannot locate class '$className'", $statement);
         }
 
-        if (\in_array($className, ['self', 'static'])) {
+        if (in_array($className, ['self', 'static'])) {
             return $this->classDefinition;
         }
 
@@ -184,4 +153,15 @@ public function classLookup(string $className, array $statement = null): Abstrac
 
         return $this->classDefinition->getExtendsClassDefinition();
     }
+
+    /**
+     * Transform class/interface name to FQN format.
+     */
+    public function getFullName(string $className): string
+    {
+        $isFunction = $this->currentMethod instanceof FunctionDefinition;
+        $namespace  = $isFunction ? $this->currentMethod->getNamespace() : $this->classDefinition->getNamespace();
+
+        return Name::fetchFQN($className, $namespace, $this->aliasManager);
+    }
 }
diff --git a/src/CompiledExpression.php b/src/CompiledExpression.php
index e7e07e9aef..aac078f253 100644
--- a/src/CompiledExpression.php
+++ b/src/CompiledExpression.php
@@ -13,6 +13,8 @@
 
 namespace Zephir;
 
+use Closure;
+
 /**
  * This represents a compiled expression, the object can be used to check
  * if the expression type is able to used in certain types of the application.
@@ -24,11 +26,19 @@ public function __construct(protected string $type, protected mixed $code, prote
     }
 
     /**
-     * Returns the type of the compiled expression.
+     * Returns a C representation for a boolean constant.
      */
-    public function getType(): string
+    public function getBooleanCode(): mixed
     {
-        return $this->type;
+        if ('true' === $this->code || true === $this->code) {
+            return '1';
+        }
+
+        if ('false' === $this->code || false === $this->code) {
+            return '0';
+        }
+
+        return $this->code;
     }
 
     /**
@@ -48,19 +58,11 @@ public function getOriginal(): ?array
     }
 
     /**
-     * Returns a C representation for a boolean constant.
+     * Returns the type of the compiled expression.
      */
-    public function getBooleanCode(): mixed
+    public function getType(): string
     {
-        if ('true' === $this->code || true === $this->code) {
-            return '1';
-        }
-
-        if ('false' === $this->code || false === $this->code) {
-            return '0';
-        }
-
-        return $this->code;
+        return $this->type;
     }
 
     /**
@@ -80,7 +82,7 @@ public function isIntCompatibleType(): bool
      */
     public function resolve(?string $result, CompilationContext $compilationContext): string
     {
-        if (!($this->code instanceof \Closure)) {
+        if (!($this->code instanceof Closure)) {
             return $this->code;
         }
 
diff --git a/src/Compiler.php b/src/Compiler.php
index be5604fd84..330db2876f 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -13,8 +13,13 @@
 
 namespace Zephir;
 
+use DirectoryIterator;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use ReflectionClass;
+use ReflectionException;
 use Zephir\Backend\Backend;
 use Zephir\Backend\FcallManagerInterface;
 use Zephir\Backend\StringsManager;
@@ -34,6 +39,20 @@
 use Zephir\FileSystem\HardDisk;
 use Zephir\Parser\Manager;
 
+use function call_user_func;
+use function count;
+use function defined;
+use function dirname;
+use function extension_loaded;
+use function is_array;
+use function is_string;
+use function strlen;
+
+use const DIRECTORY_SEPARATOR;
+use const INFO_GENERAL;
+use const PHP_INT_SIZE;
+use const PHP_ZTS;
+
 final class Compiler
 {
     use LoggerAwareTrait;
@@ -41,52 +60,36 @@ final class Compiler
     /**
      * @var FunctionDefinition[]
      */
-    public array $functionDefinitions = [];
-
-    /**
-     * @var CompilerFile[]
-     */
-    private array $files = [];
-
-    private array $anonymousFiles = [];
-
+    public array  $functionDefinitions = [];
+    private array $anonymousFiles      = [];
+    private array $compiledFiles       = [];
+    private array $constants           = [];
     /**
-     * Additional initializer code.
-     * Used for static property initialization.
+     * @var Definition[]
      */
-    private array $internalInitializers = [];
-
+    private array                 $definitions          = [];
+    private array                 $externalDependencies = [];
+    private array                 $extraFiles           = [];
+    private FcallManagerInterface $fcallManager;
     /**
-     * @var Definition[]
+     * @var CompilerFile[]
      */
-    private array $definitions = [];
-
-    private array $compiledFiles = [];
-
-    private array $constants = [];
-
+    private array $files   = [];
     private array $globals = [];
-
-    private array $externalDependencies = [];
-
     /**
      * @var Definition[]
      */
     private static array $internalDefinitions = [];
-
-    private static bool $loadedPrototypes = false;
-
-    private array $extraFiles = [];
-
+    /**
+     * Additional initializer code.
+     * Used for static property initialization.
+     */
+    private array          $internalInitializers = [];
+    private static bool    $loadedPrototypes     = false;
+    private ?string        $optimizersPath;
+    private ?string        $prototypesPath;
     private StringsManager $stringManager;
-
-    private FcallManagerInterface $fcallManager;
-
-    private ?string $prototypesPath;
-
-    private ?string $optimizersPath;
-
-    private ?string $templatesPath;
+    private ?string        $templatesPath;
 
     public function __construct(
         private Config $config,
@@ -95,81 +98,33 @@ public function __construct(
         private FileSystemInterface $filesystem,
         private CompilerFileFactory $compilerFileFactory,
     ) {
-        $this->logger = new NullLogger();
+        $this->logger        = new NullLogger();
         $this->stringManager = new StringsManager();
-        $this->fcallManager = $this->backend->getFcallManager();
+        $this->fcallManager  = $this->backend->getFcallManager();
 
         try {
             $this->assertRequiredExtensionsIsPresent();
         } catch (RuntimeException $e) {
-            fwrite(STDERR, trim($e->getMessage()).PHP_EOL);
+            fwrite(STDERR, trim($e->getMessage()) . PHP_EOL);
             exit(1);
         }
     }
 
-    public function setPrototypesPath(string $prototypesPath): void
-    {
-        $this->prototypesPath = $prototypesPath;
-    }
-
-    /**
-     * Resolves path to the internal prototypes.
-     */
-    private function resolvePrototypesPath(): ?string
-    {
-        $prototypesPath = $this->prototypesPath;
-
-        // fallback
-        if (empty($prototypesPath)) {
-            $prototypesPath = \dirname(__DIR__).'/prototypes';
-        }
-
-        if (!is_dir($prototypesPath) || !is_readable($prototypesPath)) {
-            throw new IllegalStateException('Unable to resolve internal prototypes directory.');
-        }
-
-        return $prototypesPath;
-    }
-
-    public function setOptimizersPath(string $optimizersPath): void
-    {
-        $this->optimizersPath = $optimizersPath;
-    }
-
     /**
-     * Resolves path to the internal optimizers.
-     *
-     * @throws IllegalStateException in case of absence internal optimizers directory
+     * Inserts an anonymous class definition in the compiler.
      */
-    private function resolveOptimizersPath(): ?string
-    {
-        $optimizersPath = $this->optimizersPath;
-
-        // fallback
-        if (empty($optimizersPath)) {
-            $optimizersPath = __DIR__.'/Optimizers';
-        }
-
-        if (!is_dir($optimizersPath) || !is_readable($optimizersPath)) {
-            throw new IllegalStateException('Unable to resolve internal optimizers directory.');
-        }
-
-        return $optimizersPath;
-    }
-
-    public function setTemplatesPath(string $templatesPath): void
+    public function addClassDefinition(CompilerFileAnonymous $file, Definition $classDefinition): void
     {
-        $this->templatesPath = $templatesPath;
+        $this->definitions[$classDefinition->getCompleteName()]    = $classDefinition;
+        $this->anonymousFiles[$classDefinition->getCompleteName()] = $file;
     }
 
     /**
-     * Gets the Zephir Parser Manager.
-     *
-     * @deprecated
+     * Adds an external dependency to the compiler.
      */
-    public function getParserManager(): Parser\Manager
+    public function addExternalDependency(string $namespace, string $location): void
     {
-        return $this->parserManager;
+        $this->externalDependencies[$namespace] = $location;
     }
 
     /**
@@ -180,7 +135,7 @@ public function addFunction(FunctionDefinition $func, array $statement = []): vo
         $funcName = strtolower($func->getInternalName());
         if (isset($this->functionDefinitions[$funcName])) {
             throw new CompilerException(
-                "Function '".$func->getCompleteName()."' was defined more than one time",
+                "Function '" . $func->getCompleteName() . "' was defined more than one time",
                 $statement
             );
         }
@@ -189,1754 +144,1869 @@ public function addFunction(FunctionDefinition $func, array $statement = []): vo
     }
 
     /**
-     * Loads a class definition in an external dependency.
+     * Generate a HTML API.
      *
-     * @throws CompilerException
-     * @throws IllegalStateException
-     * @throws ParseException
+     * @throws ConfigException
+     * @throws Exception
+     * @throws ReflectionException
      */
-    public function loadExternalClass(string $className, string $location): bool
+    public function api(array $options = [], bool $fromGenerate = false): void
     {
-        $filePath = $location.\DIRECTORY_SEPARATOR.strtolower(str_replace('\\', \DIRECTORY_SEPARATOR, $className)).'.zep';
-
-        /**
-         * Fix the class name.
-         */
-        $className = implode('\\', array_map('ucfirst', explode('\\', $className)));
-
-        if (isset($this->files[$className])) {
-            return true;
-        }
-
-        if (!file_exists($filePath)) {
-            return false;
+        if (!$fromGenerate) {
+            $this->generate();
         }
 
-        /** @var CompilerFile|CompilerFileAnonymous $compilerFile */
-        $compilerFile = $this->compilerFileFactory->create($className, $filePath);
-        $compilerFile->setIsExternal(true);
-        $compilerFile->preCompile($this);
+        $templatesPath = $this->templatesPath ?: dirname(__DIR__) . '/templates';
 
-        $this->files[$className] = $compilerFile;
-        $this->definitions[$className] = $compilerFile->getClassDefinition();
+        $documentator = new Documentation($this->files, $this->config, $templatesPath, $options);
+        $documentator->setLogger($this->logger);
 
-        return true;
+        $this->logger->info('Generating API into ' . $documentator->getOutputDirectory());
+        $documentator->build();
     }
 
-    /**
-     * Allows to check if a class is part of the compiled extension.
-     */
-    public function isClass(string $className): bool
+    public function calculateDependencies(array $files, $_dependency = null): void
     {
-        foreach ($this->definitions as $key => $value) {
-            if (!strcasecmp($key, $className) && 'class' === $value->getType()) {
-                return true;
-            }
-        }
-
         /**
-         * Try to autoload the class from an external dependency
+         * Classes are ordered according to a dependency ranking
+         * Classes with higher rank, need to be initialized first
+         * We first build a dependency tree and then set the rank accordingly
          */
-        foreach ($this->externalDependencies as $namespace => $location) {
-            if (preg_match('#^'.$namespace.'\\\\#i', $className)) {
-                return $this->loadExternalClass($className, $location);
+        if (null === $_dependency) {
+            $dependencyTree = [];
+            foreach ($files as $file) {
+                if (!$file->isExternal()) {
+                    $classDefinition                                     = $file->getClassDefinition();
+                    $dependencyTree[$classDefinition->getCompleteName()] = $classDefinition->getDependencies();
+                }
             }
-        }
-
-        return false;
-    }
 
-    /**
-     * Allows checking if an interface is part of the compiled extension.
-     *
-     * @throws CompilerException
-     * @throws IllegalStateException
-     * @throws ParseException
-     */
-    public function isInterface(string $className): bool
-    {
-        foreach ($this->definitions as $key => $value) {
-            if (!strcasecmp($key, $className) && 'interface' === $value->getType()) {
-                return true;
+            // Make sure the dependencies are loaded first (recursively)
+            foreach ($dependencyTree as $dependencies) {
+                foreach ($dependencies as $dependency) {
+                    $dependency->increaseDependencyRank(0);
+                    $this->calculateDependencies($dependencyTree, $dependency);
+                }
             }
+
+            return;
         }
 
-        /**
-         * Try to autoload the class from an external dependency
-         */
-        foreach ($this->externalDependencies as $namespace => $location) {
-            if (preg_match('#^'.$namespace.'\\\\#i', $className)) {
-                return $this->loadExternalClass($className, $location);
+        $dependencyTree = $files;
+        if (isset($dependencyTree[$_dependency->getCompleteName()])) {
+            foreach ($dependencyTree[$_dependency->getCompleteName()] as $dependency) {
+                $dependency->increaseDependencyRank(0);
+                $this->calculateDependencies($dependencyTree, $dependency);
             }
         }
-
-        return false;
     }
 
     /**
-     * Allows checking if a class is part of PHP.
+     * Check if the project must be phpized again.
+     *
+     * @return bool
      */
-    public function isBundledClass(string $className): bool
+    public function checkIfPhpized(): bool
     {
-        return class_exists($className, false);
+        return !file_exists('ext/Makefile');
     }
 
     /**
-     * Allows checking if an interface is part of PHP.
+     * Compiles the extension without installing it.
+     *
+     * @param bool     $development
+     * @param int|null $jobs
+     *
+     * @throws Exception
      */
-    public function isBundledInterface(string $className): bool
+    public function compile(bool $development = false, int $jobs = null): void
     {
-        return interface_exists($className, false);
-    }
+        $jobs = $jobs ?: 2;
 
-    /**
-     * Returns class the class definition from a given class name.
-     */
-    public function getClassDefinition(string $className): Definition | bool
-    {
-        foreach ($this->definitions as $key => $value) {
-            if (!strcasecmp($key, $className)) {
-                return $value;
-            }
+        /**
+         * Get global namespace.
+         */
+        $namespace     = str_replace('\\', '_', $this->checkDirectory());
+        $extensionName = $this->config->get('extension-name');
+        if (empty($extensionName) || !is_string($extensionName)) {
+            $extensionName = $namespace;
         }
 
-        return false;
-    }
+        $currentDir = getcwd();
+        if (file_exists("$currentDir/compile.log")) {
+            unlink("$currentDir/compile.log");
+        }
 
-    /**
-     * Inserts an anonymous class definition in the compiler.
-     */
-    public function addClassDefinition(CompilerFileAnonymous $file, Definition $classDefinition): void
-    {
-        $this->definitions[$classDefinition->getCompleteName()] = $classDefinition;
-        $this->anonymousFiles[$classDefinition->getCompleteName()] = $file;
-    }
+        if (file_exists("$currentDir/compile-errors.log")) {
+            unlink("$currentDir/compile-errors.log");
+        }
 
-    /**
-     * Returns class the class definition from a given class name.
-     *
-     * @throws \ReflectionException
-     */
-    public function getInternalClassDefinition(string $className): Definition
-    {
-        if (!isset(self::$internalDefinitions[$className])) {
-            $reflection = new \ReflectionClass($className);
-            self::$internalDefinitions[$className] = Definition::buildFromReflection($reflection);
+        if (file_exists("$currentDir/ext/modules/{$namespace}.so")) {
+            unlink("$currentDir/ext/modules/{$namespace}.so");
         }
 
-        return self::$internalDefinitions[$className];
-    }
+        if (Os::isWindows()) {
+            // TODO(klay): Make this better. Looks like it is non standard Env. Var
+            exec('cd ext && %PHP_DEVPACK%\\phpize --clean', $output, $exit);
 
-    /**
-     * Checks if $name is a Zephir constant.
-     */
-    public function isConstant(string $name): bool
-    {
-        return isset($this->constants[$name]);
-    }
+            $releaseFolder = $this->getWindowsReleaseDir();
+            if (file_exists($releaseFolder)) {
+                exec('rd /s /q ' . $releaseFolder, $output, $exit);
+            }
 
-    /**
-     * Returns a Zephir Constant by its name.
-     */
-    public function getConstant(string $name): mixed
-    {
-        return $this->constants[$name];
-    }
-
-    /**
-     * Sets extensions globals.
-     */
-    public function setExtensionGlobals(array $globals): void
-    {
-        foreach ($globals as $key => $value) {
-            $this->globals[$key] = $value;
-        }
-    }
-
-    /**
-     * Checks if a specific extension global is defined.
-     */
-    public function isExtensionGlobal(string $name): bool
-    {
-        return isset($this->globals[$name]);
-    }
+            $this->logger->info('Preparing for PHP compilation...');
+            // TODO(klay): Make this better. Looks like it is non standard Env. Var
+            exec('cd ext && %PHP_DEVPACK%\\phpize', $output, $exit);
 
-    /**
-     * Returns an extension global by its name.
-     */
-    public function getExtensionGlobal(string $name): array
-    {
-        return $this->globals[$name];
-    }
+            /**
+             * fix until patch hits all supported PHP builds.
+             *
+             * @see https://github.com/php/php-src/commit/9a3af83ee2aecff25fd4922ef67c1fb4d2af6201
+             */
+            $fixMarker = '/* zephir_phpize_fix */';
 
-    /**
-     * Returns GCC flags for current compilation.
-     */
-    public function getGccFlags(bool $development = false): string
-    {
-        if (Os::isWindows()) {
-            // TODO
-            return '';
-        }
+            $configureFile = file_get_contents('ext\\configure.js');
+            $configureFix  = ["var PHP_ANALYZER = 'disabled';", "var PHP_PGO = 'no';", "var PHP_PGI = 'no';"];
+            $hasChanged    = false;
 
-        $gccFlags = getenv('CFLAGS');
+            if (!str_contains($configureFile, $fixMarker)) {
+                $configureFile = $fixMarker . PHP_EOL . implode(PHP_EOL, $configureFix) . PHP_EOL . $configureFile;
+                $hasChanged    = true;
+            }
 
-        if (!\is_string($gccFlags)) {
-            if (false === $development) {
-                $gccVersion = $this->getGccVersion();
-                if (version_compare($gccVersion, '4.6.0', '>=')) {
-                    $gccFlags = '-O2 -fvisibility=hidden -Wparentheses -flto -DZEPHIR_RELEASE=1';
-                } else {
-                    $gccFlags = '-O2 -fvisibility=hidden -Wparentheses -DZEPHIR_RELEASE=1';
+            /* fix php's broken phpize patching ... */
+            $marker = 'var build_dir = (dirname ? dirname : "").replace(new RegExp("^..\\\\\\\\"), "");';
+            $pos    = strpos($configureFile, $marker);
+            if (false !== $pos) {
+                $spMarker = 'if (MODE_PHPIZE) {';
+                $sp       = strpos($configureFile, $spMarker, $pos - 200);
+                if (false === $sp) {
+                    throw new CompilerException('outofdate... phpize seems broken again');
                 }
-            } else {
-                $gccFlags = '-O0 -g3';
+                $configureFile = substr($configureFile, 0, $sp) .
+                    'if (false) {' . substr($configureFile, $sp + strlen($spMarker));
+                $hasChanged    = true;
             }
-        }
 
-        return $gccFlags;
-    }
-
-    /**
-     * Returns the php include directories returned by php-config.
-     */
-    public function getPhpIncludeDirs(): string
-    {
-        $this->filesystem->system('php-config --includes', 'stdout', 'php-includes');
+            if ($hasChanged) {
+                file_put_contents('ext\\configure.js', $configureFile);
+            }
 
-        return trim($this->filesystem->read('php-includes'));
-    }
+            $this->logger->info('Preparing configuration file...');
+            exec('cd ext && configure --enable-' . $extensionName);
+        } else {
+            exec('cd ext && make clean && phpize --clean', $output, $exit);
+            $this->logger->info('Preparing for PHP compilation...');
+            exec('cd ext && phpize', $output, $exit);
+            $this->logger->info('Preparing configuration file...');
 
-    /**
-     * Pre-compile headers to speed up compilation.
-     */
-    public function preCompileHeaders(): void
-    {
-        if (Os::isWindows()) {
-            // TODO: Add Windows support
-            return;
+            exec(
+                'cd ext && export CC="gcc" && export CFLAGS="' .
+                $this->getGccFlags($development) .
+                '" && ./configure --enable-' .
+                $extensionName
+            );
         }
 
-        $phpIncludes = $this->getPhpIncludeDirs();
-
-        /** @var \DirectoryIterator $file */
-        foreach (new \DirectoryIterator('ext/kernel') as $file) {
-            if ($file->isDir() || $file->getExtension() !== 'h') {
-                continue;
-            }
-
-            $command = sprintf(
-                'cd ext && gcc -c kernel/%s  -I. %s  -o kernel/%s.gch',
-                $file->getBaseName(),
-                $phpIncludes,
-                $file->getBaseName()
+        $currentDir = getcwd();
+        $this->logger->info('Compiling...');
+        if (Os::isWindows()) {
+            exec(
+                'cd ext && nmake 2>' . $currentDir . '\compile-errors.log 1>' .
+                $currentDir . '\compile.log',
+                $output,
+                $exit
+            );
+        } else {
+            $this->preCompileHeaders();
+            exec(
+                'cd ext && (make -s -j' . $jobs . ' 2>' . $currentDir . '/compile-errors.log 1>' .
+                $currentDir .
+                '/compile.log)',
+                $output,
+                $exit
             );
-
-            $path = $file->getRealPath();
-            if (!file_exists($path.'.gch') || filemtime($path) > filemtime($path.'.gch')) {
-                $this->filesystem->system($command, 'stdout', 'compile-header');
-            }
         }
     }
 
     /**
-     * Generates the C sources from Zephir without compiling them.
+     * Create config.m4 and config.w32 for the extension.
+     *
+     * TODO: move this to backend?
      *
      * @throws Exception
-     * @throws \ReflectionException
      */
-    public function generate(bool $fromGenerate = false): bool
+    public function createConfigFiles(string $project): bool
     {
+        $contentM4 = $this->backend->getTemplateFileContents('config.m4');
+        if (empty($contentM4)) {
+            throw new Exception("Template config.m4 doesn't exist");
+        }
+
+        $contentW32 = $this->backend->getTemplateFileContents('config.w32');
+        if (empty($contentW32)) {
+            throw new Exception("Template config.w32 doesn't exist");
+        }
+
+        $safeProject = 'zend' === $project ? 'zend_' : $project;
+
+        $compiledFiles = array_map(fn($file) => str_replace('.c', '.zep.c', $file), $this->compiledFiles);
+
         /**
-         * Get global namespace.
+         * If export-classes is enabled all headers are copied to include/php/ext.
          */
-        $namespace = $this->checkDirectory();
+        $exportClasses = $this->config->get('export-classes', 'extra');
+        if ($exportClasses) {
+            $compiledHeaders = array_map(fn($file) => str_replace('.c', '.zep.h', $file), $this->compiledFiles);
+        } else {
+            $compiledHeaders = ['php_' . strtoupper($project) . '.h'];
+        }
 
         /**
-         * Check whether there are external dependencies.
+         * Check extra-libs, extra-cflags, package-dependencies exists
          */
-        $externalDependencies = $this->config->get('external-dependencies');
-        if (\is_array($externalDependencies)) {
-            foreach ($externalDependencies as $dependencyNs => $location) {
-                if (!file_exists($location)) {
-                    throw new CompilerException(
-                        sprintf(
-                            'Location of dependency "%s" does not exist. Check the config.json for more information.',
-                            $dependencyNs
-                        )
-                    );
-                }
+        $extraLibs   = (string)$this->config->get('extra-libs');
+        $extraCflags = (string)$this->config->get('extra-cflags');
+        $contentM4   = $this->generatePackageDependenciesM4($contentM4);
 
-                $this->addExternalDependency($dependencyNs, $location);
+        $buildDirs = [];
+
+        foreach ($compiledFiles as $file) {
+            $dir = dirname($file);
+
+            if (!in_array($dir, $buildDirs)) {
+                $buildDirs[] = $dir;
             }
         }
 
+        asort($buildDirs);
+
         /**
-         * Round 1. pre-compile all files in memory
+         * Generate config.m4.
          */
-        $this->recursivePreCompile(str_replace('\\', \DIRECTORY_SEPARATOR, $namespace));
-        if (!\count($this->files)) {
-            throw new Exception(
-                "Zephir files to compile couldn't be found. Did you add a first class to the extension?"
-            );
+        $toReplace = [
+            '%PROJECT_LOWER_SAFE%'   => strtolower($safeProject),
+            '%PROJECT_LOWER%'        => strtolower($project),
+            '%PROJECT_UPPER%'        => strtoupper($project),
+            '%PROJECT_CAMELIZE%'     => ucfirst($project),
+            '%FILES_COMPILED%'       => implode("\n\t", $this->toUnixPaths($compiledFiles)),
+            '%HEADERS_COMPILED%'     => implode(' ', $this->toUnixPaths($compiledHeaders)),
+            '%EXTRA_FILES_COMPILED%' => implode("\n\t", $this->toUnixPaths($this->extraFiles)),
+            '%PROJECT_EXTRA_LIBS%'   => $extraLibs,
+            '%PROJECT_EXTRA_CFLAGS%' => $extraCflags,
+            '%PROJECT_BUILD_DIRS%'   => implode(' ', $buildDirs),
+        ];
+
+        foreach ($toReplace as $mark => $replace) {
+            $contentM4 = str_replace($mark, $replace, $contentM4);
         }
 
+        HardDisk::persistByHash($contentM4, 'ext/config.m4');
+
         /**
-         * Round 2. Check 'extends' and 'implements' dependencies
+         * Generate config.w32.
          */
-        foreach ($this->files as $compileFile) {
-            $compileFile->checkDependencies($this);
+        $toReplace = [
+            '%PROJECT_LOWER_SAFE%'   => strtolower($safeProject),
+            '%PROJECT_LOWER%'        => strtolower($project),
+            '%PROJECT_UPPER%'        => strtoupper($project),
+            '%FILES_COMPILED%'       => implode(
+                "\r\n\t",
+                $this->processAddSources($compiledFiles, strtolower($project))
+            ),
+            '%EXTRA_FILES_COMPILED%' => implode(
+                "\r\n\t",
+                $this->processAddSources($this->extraFiles, strtolower($project))
+            ),
+        ];
+
+        foreach ($toReplace as $mark => $replace) {
+            $contentW32 = str_replace($mark, $replace, $contentW32);
         }
 
+        $needConfigure = HardDisk::persistByHash($contentW32, 'ext/config.w32');
+
         /**
-         * Sort the files by dependency ranking.
+         * php_ext.h.
          */
-        $files = [];
-        $rankedFiles = [];
-        $this->calculateDependencies($this->files);
-
-        foreach ($this->files as $rankFile) {
-            $rank = $rankFile->getClassDefinition()->getDependencyRank();
-            $rankedFiles[$rank][] = $rankFile;
+        $content = $this->backend->getTemplateFileContents('php_ext.h');
+        if (empty($content)) {
+            throw new Exception("Template php_ext.h doesn't exist");
         }
 
-        krsort($rankedFiles);
-        foreach ($rankedFiles as $rankFiles) {
-            $files = array_merge($files, $rankFiles);
+        $toReplace = [
+            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
+        ];
+
+        foreach ($toReplace as $mark => $replace) {
+            $content = str_replace($mark, $replace, $content);
         }
-        $this->files = $files;
+
+        HardDisk::persistByHash($content, 'ext/php_ext.h');
 
         /**
-         * Convert C-constants into PHP constants.
+         * ext.h.
          */
-        $constantsSources = $this->config->get('constants-sources');
-        if (\is_array($constantsSources)) {
-            $this->loadConstantsSources($constantsSources);
+        $content = $this->backend->getTemplateFileContents('ext.h');
+        if (empty($content)) {
+            throw new Exception("Template ext.h doesn't exist");
         }
 
-        /**
-         * Set extension globals.
-         */
-        $globals = $this->config->get('globals');
-        if (\is_array($globals)) {
-            $this->setExtensionGlobals($globals);
+        $toReplace = [
+            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
+        ];
+
+        foreach ($toReplace as $mark => $replace) {
+            $content = str_replace($mark, $replace, $content);
         }
 
+        HardDisk::persistByHash($content, 'ext/ext.h');
+
         /**
-         * Load function optimizers
+         * ext_config.h.
          */
-        if (false === self::$loadedPrototypes) {
-            $optimizersPath = $this->resolveOptimizersPath();
-            FunctionCall::addOptimizerDir("{$optimizersPath}/FunctionCall");
-
-            $customOptimizersPaths = $this->config->get('optimizer-dirs');
-            if (\is_array($customOptimizersPaths)) {
-                foreach ($customOptimizersPaths as $directory) {
-                    FunctionCall::addOptimizerDir(realpath($directory));
-                }
-            }
-
-            /**
-             * Load additional extension prototypes.
-             */
-            $prototypesPath = $this->resolvePrototypesPath();
-            foreach (new \DirectoryIterator($prototypesPath) as $file) {
-                if ($file->isDir() || $file->isDot()) {
-                    continue;
-                }
-
-                // Do not use $file->getRealPath() because it does not work inside phar
-                $realPath = "{$file->getPath()}/{$file->getFilename()}";
-                $extension = $file->getBasename(".{$file->getExtension()}");
-
-                if (!\extension_loaded($extension)) {
-                    require_once $realPath;
-                }
-            }
-
-            /**
-             * Load customer additional extension prototypes.
-             */
-            $prototypeDirs = $this->config->get('prototype-dir');
-            if (\is_array($prototypeDirs)) {
-                foreach ($prototypeDirs as $prototype => $prototypeDir) {
-                    /**
-                     * Check if the extension is installed
-                     */
-                    if (!\extension_loaded($prototype)) {
-                        $prototypeRealpath = realpath($prototypeDir);
-                        if ($prototypeRealpath) {
-                            foreach (new \RecursiveDirectoryIterator($prototypeRealpath) as $file) {
-                                if ($file->isDir()) {
-                                    continue;
-                                }
-
-                                require_once $file->getRealPath();
-                            }
-                        }
-                    }
-                }
-            }
-
-            self::$loadedPrototypes = true;
-        }
-
-        /**
-         * Round 3. Compile all files to C sources.
-         */
-        $files = [];
-
-        $hash = '';
-        foreach ($this->files as $compileFile) {
-            /**
-             * Only compile classes in the local extension, ignore external classes
-             */
-            if (!$compileFile->isExternal()) {
-                $compileFile->compile($this, $this->stringManager);
-                $compiledFile = $compileFile->getCompiledFile();
-
-                $methods = [];
-                $classDefinition = $compileFile->getClassDefinition();
-                foreach ($classDefinition->getMethods() as $method) {
-                    $methods[] = '['.$method->getName().':'.implode('-', $method->getVisibility()).']';
-                    if ($method->isInitializer() && $method->isStatic()) {
-                        $this->internalInitializers[] = "\t".$method->getName().'();';
-                    }
-                }
-
-                $files[] = $compiledFile;
-
-                $hash .= '|'.$compiledFile.':'.$classDefinition->getClassEntry().'['.implode('|', $methods).']';
-            }
+        $content = $this->backend->getTemplateFileContents('ext_config.h');
+        if (empty($content)) {
+            throw new Exception("Template ext_config.h doesn't exist");
         }
 
-        /**
-         * Round 3.2. Compile anonymous classes
-         */
-        foreach ($this->anonymousFiles as $compileFile) {
-            $compileFile->compile($this, $this->stringManager);
-            $compiledFile = $compileFile->getCompiledFile();
-
-            $methods = [];
-            $classDefinition = $compileFile->getClassDefinition();
-            foreach ($classDefinition->getMethods() as $method) {
-                $methods[] = '['.$method->getName().':'.implode('-', $method->getVisibility()).']';
-            }
-
-            $files[] = $compiledFile;
+        $toReplace = [
+            '%PROJECT_LOWER%' => strtolower($project),
+        ];
 
-            $hash .= '|'.$compiledFile.':'.$classDefinition->getClassEntry().'['.implode('|', $methods).']';
+        foreach ($toReplace as $mark => $replace) {
+            $content = str_replace($mark, $replace, $content);
         }
 
-        $hash = md5($hash);
-        $this->compiledFiles = $files;
+        HardDisk::persistByHash($content, 'ext/ext_config.h');
 
         /**
-         * Round 3.3. Load extra C-sources.
+         * ext_clean.
          */
-        $extraSources = $this->config->get('extra-sources');
-        if (\is_array($extraSources)) {
-            $this->extraFiles = $extraSources;
-        } else {
-            $this->extraFiles = [];
+        $content = $this->backend->getTemplateFileContents('clean');
+        if (empty($content)) {
+            throw new Exception("Clean file doesn't exist");
         }
 
-        /**
-         * Round 3.4. Load extra classes sources.
-         */
-        $extraClasses = $this->config->get('extra-classes');
-        if (\is_array($extraClasses)) {
-            foreach ($extraClasses as $value) {
-                if (isset($value['source'])) {
-                    $this->extraFiles[] = $value['source'];
-                }
-            }
+        if (HardDisk::persistByHash($content, 'ext/clean')) {
+            chmod('ext/clean', 0755);
         }
 
         /**
-         * Round 4. Create config.m4 and config.w32 files / Create project.c and project.h files.
+         * ext_install.
          */
-        $namespace = str_replace('\\', '_', $namespace);
-        $extensionName = $this->config->get('extension-name');
-        if (empty($extensionName) || !\is_string($extensionName)) {
-            $extensionName = $namespace;
+        $content = $this->backend->getTemplateFileContents('install');
+        if (empty($content)) {
+            throw new Exception("Install file doesn't exist");
         }
 
-        $needConfigure = $this->createConfigFiles($extensionName);
-        $needConfigure |= $this->createProjectFiles($extensionName);
-        $needConfigure |= $this->checkIfPhpized();
-        // Bitwise returns `int` instead of `bool`.
-        $needConfigure = (bool) $needConfigure;
+        $toReplace = [
+            '%PROJECT_LOWER%' => strtolower($project),
+        ];
 
-        /**
-         * When a new file is added or removed we need to run configure again
-         */
-        if (!$fromGenerate) {
-            if (false === $this->filesystem->exists('compiled-files-sum')) {
-                $needConfigure = true;
-                $this->filesystem->write('compiled-files-sum', $hash);
-            } else {
-                if ($this->filesystem->read('compiled-files-sum') != $hash) {
-                    $needConfigure = true;
-                    $this->filesystem->delete('compiled-files-sum');
-                    $this->filesystem->write('compiled-files-sum', $hash);
-                }
-            }
+        foreach ($toReplace as $mark => $replace) {
+            $content = str_replace($mark, $replace, $content);
         }
 
-        /**
-         * Round 5. Generate concatenation functions
-         */
-        $this->stringManager->genConcatCode();
-        $this->fcallManager->genFcallCode();
-
-        if ($this->config->get('stubs-run-after-generate', 'stubs')) {
-            $this->stubs($fromGenerate);
+        if (HardDisk::persistByHash($content, 'ext/install')) {
+            chmod('ext/install', 0755);
         }
 
-        return $needConfigure;
+        return (bool)$needConfigure;
     }
 
     /**
-     * Compiles the extension without installing it.
+     * Create project.c and project.h according to the current extension.
      *
-     * @param bool     $development
-     * @param int|null $jobs
+     * TODO: Move the part of the logic which depends on templates (backend-specific) to backend?
      *
      * @throws Exception
      */
-    public function compile(bool $development = false, int $jobs = null): void
+    public function createProjectFiles(string $project): bool
     {
-        $jobs = $jobs ?: 2;
+        $needConfigure = $this->checkKernelFiles();
 
         /**
-         * Get global namespace.
+         * project.c.
          */
-        $namespace = str_replace('\\', '_', $this->checkDirectory());
-        $extensionName = $this->config->get('extension-name');
-        if (empty($extensionName) || !\is_string($extensionName)) {
-            $extensionName = $namespace;
+        $content = $this->backend->getTemplateFileContents('project.c');
+        if (empty($content)) {
+            throw new Exception("Template project.c doesn't exist");
         }
 
-        $currentDir = getcwd();
-        if (file_exists("$currentDir/compile.log")) {
-            unlink("$currentDir/compile.log");
-        }
+        $includes        = '';
+        $reqInitializers = '';
+        $reqDestructors  = '';
+        $prqDestructors  = '';
+        $modInitializers = '';
+        $modDestructors  = '';
+        $glbInitializers = '';
+        $glbDestructors  = '';
+        $files           = array_merge($this->files, $this->anonymousFiles);
 
-        if (file_exists("$currentDir/compile-errors.log")) {
-            unlink("$currentDir/compile-errors.log");
-        }
+        /**
+         * Round 1. Calculate the dependency rank
+         */
+        $this->calculateDependencies($files);
 
-        if (file_exists("$currentDir/ext/modules/{$namespace}.so")) {
-            unlink("$currentDir/ext/modules/{$namespace}.so");
-        }
+        $classEntries = [];
+        $classInits   = [];
 
-        if (Os::isWindows()) {
-            // TODO(klay): Make this better. Looks like it is non standard Env. Var
-            exec('cd ext && %PHP_DEVPACK%\\phpize --clean', $output, $exit);
+        $interfaceEntries = [];
+        $interfaceInits   = [];
 
-            $releaseFolder = $this->getWindowsReleaseDir();
-            if (file_exists($releaseFolder)) {
-                exec('rd /s /q '.$releaseFolder, $output, $exit);
+        /**
+         * Round 2. Generate the ZEPHIR_INIT calls according to the dependency rank
+         */
+        /** @var FileInterface $file */
+        foreach ($files as $file) {
+            if ($file->isExternal()) {
+                continue;
             }
 
-            $this->logger->info('Preparing for PHP compilation...');
-            // TODO(klay): Make this better. Looks like it is non standard Env. Var
-            exec('cd ext && %PHP_DEVPACK%\\phpize', $output, $exit);
-
-            /**
-             * fix until patch hits all supported PHP builds.
-             *
-             * @see https://github.com/php/php-src/commit/9a3af83ee2aecff25fd4922ef67c1fb4d2af6201
-             */
-            $fixMarker = '/* zephir_phpize_fix */';
-
-            $configureFile = file_get_contents('ext\\configure.js');
-            $configureFix = ["var PHP_ANALYZER = 'disabled';", "var PHP_PGO = 'no';", "var PHP_PGI = 'no';"];
-            $hasChanged = false;
-
-            if (!str_contains($configureFile, $fixMarker)) {
-                $configureFile = $fixMarker.PHP_EOL.implode(PHP_EOL, $configureFix).PHP_EOL.$configureFile;
-                $hasChanged = true;
+            $classDefinition = $file->getClassDefinition();
+            if ($classDefinition === null) {
+                continue;
             }
 
-            /* fix php's broken phpize patching ... */
-            $marker = 'var build_dir = (dirname ? dirname : "").replace(new RegExp("^..\\\\\\\\"), "");';
-            $pos = strpos($configureFile, $marker);
-            if (false !== $pos) {
-                $spMarker = 'if (MODE_PHPIZE) {';
-                $sp = strpos($configureFile, $spMarker, $pos - 200);
-                if (false === $sp) {
-                    throw new CompilerException('outofdate... phpize seems broken again');
-                }
-                $configureFile = substr($configureFile, 0, $sp).
-                    'if (false) {'.substr($configureFile, $sp + \strlen($spMarker));
-                $hasChanged = true;
+            $dependencyRank = $classDefinition->getDependencyRank();
+            if ('class' === $classDefinition->getType()) {
+                $classEntries[$dependencyRank][] = 'zend_class_entry *' . $classDefinition->getClassEntry() . ';';
+                $classInits[$dependencyRank][]   = 'ZEPHIR_INIT('
+                    . $classDefinition->getCNamespace()
+                    . '_'
+                    . $classDefinition->getName()
+                    . ');'
+                ;
+            } else {
+                $interfaceEntries[$dependencyRank][] = 'zend_class_entry *' . $classDefinition->getClassEntry() . ';';
+                $interfaceInits[$dependencyRank][]   = 'ZEPHIR_INIT('
+                    . $classDefinition->getCNamespace()
+                    . '_'
+                    . $classDefinition->getName()
+                    . ');'
+                ;
             }
+        }
 
-            if ($hasChanged) {
-                file_put_contents('ext\\configure.js', $configureFile);
-            }
+        krsort($classInits);
+        krsort($classEntries);
+        krsort($interfaceInits);
+        krsort($interfaceEntries);
 
-            $this->logger->info('Preparing configuration file...');
-            exec('cd ext && configure --enable-'.$extensionName);
-        } else {
-            exec('cd ext && make clean && phpize --clean', $output, $exit);
-            $this->logger->info('Preparing for PHP compilation...');
-            exec('cd ext && phpize', $output, $exit);
-            $this->logger->info('Preparing configuration file...');
+        $completeInterfaceInits = [];
+        foreach ($interfaceInits as $rankInterfaceInits) {
+            asort($rankInterfaceInits, SORT_STRING);
+            $completeInterfaceInits = array_merge($completeInterfaceInits, $rankInterfaceInits);
+        }
 
-            exec(
-                'cd ext && export CC="gcc" && export CFLAGS="'.
-                $this->getGccFlags($development).
-                '" && ./configure --enable-'.
-                $extensionName
-            );
+        $completeInterfaceEntries = [];
+        foreach ($interfaceEntries as $rankInterfaceEntries) {
+            asort($rankInterfaceEntries, SORT_STRING);
+            $completeInterfaceEntries = array_merge($completeInterfaceEntries, $rankInterfaceEntries);
         }
 
-        $currentDir = getcwd();
-        $this->logger->info('Compiling...');
-        if (Os::isWindows()) {
-            exec(
-                'cd ext && nmake 2>'.$currentDir.'\compile-errors.log 1>'.
-                $currentDir.'\compile.log',
-                $output,
-                $exit
-            );
-        } else {
-            $this->preCompileHeaders();
-            exec(
-                'cd ext && (make -s -j'.$jobs.' 2>'.$currentDir.'/compile-errors.log 1>'.
-                $currentDir.
-                '/compile.log)',
-                $output,
-                $exit
-            );
+        $completeClassInits = [];
+        foreach ($classInits as $rankClassInits) {
+            asort($rankClassInits, SORT_STRING);
+            $completeClassInits = array_merge($completeClassInits, $rankClassInits);
         }
-    }
 
-    /**
-     * Generate a HTML API.
-     *
-     * @throws ConfigException
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function api(array $options = [], bool $fromGenerate = false): void
-    {
-        if (!$fromGenerate) {
-            $this->generate();
+        $completeClassEntries = [];
+        foreach ($classEntries as $rankClassEntries) {
+            asort($rankClassEntries, SORT_STRING);
+            $completeClassEntries = array_merge($completeClassEntries, $rankClassEntries);
         }
 
-        $templatesPath = $this->templatesPath ?: \dirname(__DIR__).'/templates';
-
-        $documentator = new Documentation($this->files, $this->config, $templatesPath, $options);
-        $documentator->setLogger($this->logger);
-
-        $this->logger->info('Generating API into '.$documentator->getOutputDirectory());
-        $documentator->build();
-    }
-
-    /**
-     * Generate IDE stubs.
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function stubs(bool $fromGenerate = false): void
-    {
-        if (!$fromGenerate) {
-            $this->generate();
+        /**
+         * Round 3. Process extension globals
+         */
+        [$globalCode, $globalStruct, $globalsDefault, $initEntries] = $this->processExtensionGlobals($project);
+        if ('zend' == $project) {
+            $safeProject = 'zend_';
+        } else {
+            $safeProject = $project;
         }
 
-        $this->logger->info('Generating stubs...');
-
-        $path = str_replace(
-            [
-                '%version%',
-                '%namespace%',
-            ],
-            [
-                $this->config->get('version'),
-                ucfirst($this->config->get('namespace')),
-            ],
-            $this->config->get('path', 'stubs')
-        );
+        /**
+         * Round 4. Process extension info.
+         */
+        $phpInfo = $this->processExtensionInfo();
 
-        (new Stubs\Generator($this->files))->generate(
-            $this->config->get('namespace'),
-            $path,
-            $this->config->get('indent', 'extra'),
-            $this->config->get('banner', 'stubs') ?? ''
-        );
-    }
+        /**
+         * Round 5. Generate Function entries (FE)
+         */
+        [$feHeader, $feEntries] = $this->generateFunctionInformation();
 
-    /**
-     * Compiles and installs the extension.
-     *
-     * @throws Exception
-     * @throws NotImplementedException
-     * @throws CompilerException
-     */
-    public function install(bool $development = false): void
-    {
-        // Get global namespace
-        $namespace = str_replace('\\', '_', $this->checkDirectory());
-        $currentDir = getcwd();
+        /**
+         * Check if there are module/request/global destructors.
+         */
+        $destructors = $this->config->get('destructors');
+        if (is_array($destructors)) {
+            $invokeRequestDestructors = $this->processCodeInjection($destructors, 'request');
+            $includes                 .= PHP_EOL . $invokeRequestDestructors[0];
+            $reqDestructors           = $invokeRequestDestructors[1];
 
-        if (Os::isWindows()) {
-            throw new NotImplementedException('Installation is not implemented for Windows yet. Aborting.');
-        }
+            $invokePostRequestDestructors = $this->processCodeInjection($destructors, 'post-request');
+            $includes                     .= PHP_EOL . $invokePostRequestDestructors[0];
+            $prqDestructors               = $invokePostRequestDestructors[1];
 
-        $this->logger->info('Installing...');
-        $gccFlags = $this->getGccFlags($development);
+            $invokeModuleDestructors = $this->processCodeInjection($destructors, 'module');
+            $includes                .= PHP_EOL . $invokeModuleDestructors[0];
+            $modDestructors          = $invokeModuleDestructors[1];
 
-        $command = strtr(
-            // TODO: Sort out with sudo
-            'cd ext && export CC="gcc" && export CFLAGS=":cflags" && '.
-            'make 2>> ":stderr" 1>> ":stdout" && '.
-            'sudo make install 2>> ":stderr" 1>> ":stdout"',
-            [
-                ':cflags' => $gccFlags,
-                ':stderr' => "{$currentDir}/compile-errors.log",
-                ':stdout' => "{$currentDir}/compile.log",
-            ]
-        );
+            $invokeGlobalsDestructors = $this->processCodeInjection($destructors, 'globals');
+            $includes                 .= PHP_EOL . $invokeGlobalsDestructors[0];
+            $glbDestructors           = $invokeGlobalsDestructors[1];
+        }
 
-        array_map(function ($entry): void {
-            if (!empty($entry)) {
-                $this->logger->debug(trim($entry));
-            }
-        }, explode('&&', $command));
+        /**
+         * Check if there are module/request/global initializers.
+         */
+        $initializers = $this->config->get('initializers');
+        if (is_array($initializers)) {
+            $invokeRequestInitializers = $this->processCodeInjection($initializers, 'request');
+            $includes                  .= PHP_EOL . $invokeRequestInitializers[0];
+            $reqInitializers           = $invokeRequestInitializers[1];
 
-        exec($command, $output, $exit);
-        $fileName = $this->config->get('extension-name') ?: $namespace;
+            $invokeModuleInitializers = $this->processCodeInjection($initializers, 'module');
+            $includes                 .= PHP_EOL . $invokeModuleInitializers[0];
+            $modInitializers          = $invokeModuleInitializers[1];
 
-        if (false === file_exists("{$currentDir}/ext/modules/{$fileName}.so")) {
-            throw new CompilerException(
-                'Internal extension compilation failed. Check compile-errors.log for more information.'
-            );
+            $invokeGlobalsInitializers = $this->processCodeInjection($initializers, 'globals');
+            $includes                  .= PHP_EOL . $invokeGlobalsInitializers[0];
+            $glbInitializers           = $invokeGlobalsInitializers[1];
         }
-    }
 
-    /**
-     * Create config.m4 and config.w32 for the extension.
-     *
-     * TODO: move this to backend?
-     *
-     * @throws Exception
-     */
-    public function createConfigFiles(string $project): bool
-    {
-        $contentM4 = $this->backend->getTemplateFileContents('config.m4');
-        if (empty($contentM4)) {
-            throw new Exception("Template config.m4 doesn't exist");
-        }
+        /**
+         * Append extra details.
+         */
+        $extraClasses = $this->config->get('extra-classes');
+        if (is_array($extraClasses)) {
+            foreach ($extraClasses as $value) {
+                if (isset($value['init'])) {
+                    $completeClassInits[] = 'ZEPHIR_INIT(' . $value['init'] . ')';
+                }
 
-        $contentW32 = $this->backend->getTemplateFileContents('config.w32');
-        if (empty($contentW32)) {
-            throw new Exception("Template config.w32 doesn't exist");
+                if (isset($value['entry'])) {
+                    $completeClassEntries[] = 'zend_class_entry *' . $value['entry'] . ';';
+                }
+            }
         }
 
-        $safeProject = 'zend' === $project ? 'zend_' : $project;
+        $modRequires = array_map(
+            fn($mod) => sprintf('ZEND_MOD_REQUIRED("%s")', strtolower($mod)),
+            $this->config->get('extensions', 'requires') ?: []
+        );
 
-        $compiledFiles = array_map(fn ($file) => str_replace('.c', '.zep.c', $file), $this->compiledFiles);
+        $toReplace = [
+            '%PROJECT_LOWER_SAFE%'   => strtolower($safeProject),
+            '%PROJECT_LOWER%'        => strtolower($project),
+            '%PROJECT_UPPER%'        => strtoupper($project),
+            '%PROJECT_CAMELIZE%'     => ucfirst($project),
+            '%CLASS_ENTRIES%'        => implode(
+                PHP_EOL,
+                array_merge($completeInterfaceEntries, $completeClassEntries)
+            ),
+            '%CLASS_INITS%'          => implode(
+                PHP_EOL . "\t",
+                array_merge($completeInterfaceInits, $completeClassInits)
+            ),
+            '%INIT_GLOBALS%'         => implode(
+                PHP_EOL . "\t",
+                array_merge((array)$globalsDefault[0], [$glbInitializers])
+            ),
+            '%INIT_MODULE_GLOBALS%'  => $globalsDefault[1],
+            '%DESTROY_GLOBALS%'      => $glbDestructors,
+            '%EXTENSION_INFO%'       => $phpInfo,
+            '%EXTRA_INCLUDES%'       => implode(
+                PHP_EOL,
+                array_unique(explode(PHP_EOL, $includes))
+            ),
+            '%MOD_INITIALIZERS%'     => $modInitializers,
+            '%MOD_DESTRUCTORS%'      => $modDestructors,
+            '%REQ_INITIALIZERS%'     => implode(
+                PHP_EOL . "\t",
+                array_merge($this->internalInitializers, [$reqInitializers])
+            ),
+            '%REQ_DESTRUCTORS%'      => $reqDestructors,
+            '%POSTREQ_DESTRUCTORS%'  => empty($prqDestructors) ? '' : implode(
+                PHP_EOL,
+                [
+                    '#define ZEPHIR_POST_REQUEST 1',
+                    'static PHP_PRSHUTDOWN_FUNCTION(' . strtolower($project) . ')',
+                    '{',
+                    "\t" . implode(
+                        PHP_EOL . "\t",
+                        explode(PHP_EOL, $prqDestructors)
+                    ),
+                    '}',
+                ]
+            ),
+            '%FE_HEADER%'            => $feHeader,
+            '%FE_ENTRIES%'           => $feEntries,
+            '%PROJECT_INI_ENTRIES%'  => implode(PHP_EOL . "\t", $initEntries),
+            '%PROJECT_DEPENDENCIES%' => implode(PHP_EOL . "\t", $modRequires),
+        ];
+        foreach ($toReplace as $mark => $replace) {
+            $content = str_replace($mark, $replace, $content);
+        }
 
         /**
-         * If export-classes is enabled all headers are copied to include/php/ext.
+         * Round 5. Generate and place the entry point of the project
          */
-        $exportClasses = $this->config->get('export-classes', 'extra');
-        if ($exportClasses) {
-            $compiledHeaders = array_map(fn ($file) => str_replace('.c', '.zep.h', $file), $this->compiledFiles);
-        } else {
-            $compiledHeaders = ['php_'.strtoupper($project).'.h'];
-        }
+        HardDisk::persistByHash($content, 'ext/' . $safeProject . '.c');
+        unset($content);
 
         /**
-         * Check extra-libs, extra-cflags, package-dependencies exists
+         * Round 6. Generate the project main header.
          */
-        $extraLibs = (string) $this->config->get('extra-libs');
-        $extraCflags = (string) $this->config->get('extra-cflags');
-        $contentM4 = $this->generatePackageDependenciesM4($contentM4);
-
-        $buildDirs = [];
-
-        foreach ($compiledFiles as $file) {
-            $dir = \dirname($file);
+        $content = $this->backend->getTemplateFileContents('project.h');
+        if (empty($content)) {
+            throw new Exception("Template project.h doesn't exists");
+        }
 
-            if (!in_array($dir, $buildDirs)) {
-                $buildDirs[] = $dir;
+        $includeHeaders = [];
+        foreach ($this->compiledFiles as $file) {
+            if ($file) {
+                $fileH            = str_replace('.c', '.zep.h', $file);
+                $include          = '#include "' . $fileH . '"';
+                $includeHeaders[] = $include;
             }
         }
 
-        asort($buildDirs);
-
         /**
-         * Generate config.m4.
+         * Append extra headers.
          */
-        $toReplace = [
-            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
-            '%PROJECT_LOWER%' => strtolower($project),
-            '%PROJECT_UPPER%' => strtoupper($project),
-            '%PROJECT_CAMELIZE%' => ucfirst($project),
-            '%FILES_COMPILED%' => implode("\n\t", $this->toUnixPaths($compiledFiles)),
-            '%HEADERS_COMPILED%' => implode(' ', $this->toUnixPaths($compiledHeaders)),
-            '%EXTRA_FILES_COMPILED%' => implode("\n\t", $this->toUnixPaths($this->extraFiles)),
-            '%PROJECT_EXTRA_LIBS%' => $extraLibs,
-            '%PROJECT_EXTRA_CFLAGS%' => $extraCflags,
-            '%PROJECT_BUILD_DIRS%' => implode(' ', $buildDirs),
-        ];
-
-        foreach ($toReplace as $mark => $replace) {
-            $contentM4 = str_replace($mark, $replace, $contentM4);
+        $extraClasses = $this->config->get('extra-classes');
+        if (is_array($extraClasses)) {
+            foreach ($extraClasses as $value) {
+                if (isset($value['header'])) {
+                    $include          = '#include "' . $value['header'] . '"';
+                    $includeHeaders[] = $include;
+                }
+            }
         }
 
-        HardDisk::persistByHash($contentM4, 'ext/config.m4');
-
-        /**
-         * Generate config.w32.
-         */
         $toReplace = [
-            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
-            '%PROJECT_LOWER%' => strtolower($project),
-            '%PROJECT_UPPER%' => strtoupper($project),
-            '%FILES_COMPILED%' => implode(
-                "\r\n\t",
-                $this->processAddSources($compiledFiles, strtolower($project))
-            ),
-            '%EXTRA_FILES_COMPILED%' => implode(
-                "\r\n\t",
-                $this->processAddSources($this->extraFiles, strtolower($project))
-            ),
+            '%INCLUDE_HEADERS%' => implode(PHP_EOL, $includeHeaders),
         ];
 
         foreach ($toReplace as $mark => $replace) {
-            $contentW32 = str_replace($mark, $replace, $contentW32);
+            $content = str_replace($mark, $replace, $content);
         }
 
-        $needConfigure = HardDisk::persistByHash($contentW32, 'ext/config.w32');
+        HardDisk::persistByHash($content, 'ext/' . $safeProject . '.h');
+        unset($content);
 
         /**
-         * php_ext.h.
+         * Round 7. Create php_project.h.
          */
-        $content = $this->backend->getTemplateFileContents('php_ext.h');
+        $content = $this->backend->getTemplateFileContents('php_project.h');
         if (empty($content)) {
-            throw new Exception("Template php_ext.h doesn't exist");
+            throw new Exception("Template php_project.h doesn't exist");
         }
 
         $toReplace = [
-            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
+            '%PROJECT_LOWER_SAFE%'       => strtolower($safeProject),
+            '%PROJECT_LOWER%'            => strtolower($project),
+            '%PROJECT_UPPER%'            => strtoupper($project),
+            '%PROJECT_EXTNAME%'          => strtolower($project),
+            '%PROJECT_NAME%'             => mb_convert_encoding($this->config->get('name'), 'ISO-8859-1', 'UTF-8'),
+            '%PROJECT_AUTHOR%'           => mb_convert_encoding($this->config->get('author'), 'ISO-8859-1', 'UTF-8'),
+            '%PROJECT_VERSION%'          => mb_convert_encoding($this->config->get('version'), 'ISO-8859-1', 'UTF-8'),
+            '%PROJECT_DESCRIPTION%'      => mb_convert_encoding(
+                $this->config->get('description'),
+                'ISO-8859-1',
+                'UTF-8'
+            ),
+            '%PROJECT_ZEPVERSION%'       => Zephir::VERSION,
+            '%EXTENSION_GLOBALS%'        => $globalCode,
+            '%EXTENSION_STRUCT_GLOBALS%' => $globalStruct,
         ];
 
         foreach ($toReplace as $mark => $replace) {
             $content = str_replace($mark, $replace, $content);
         }
 
-        HardDisk::persistByHash($content, 'ext/php_ext.h');
+        HardDisk::persistByHash($content, 'ext/php_' . $safeProject . '.h');
+        unset($content);
 
+        return $needConfigure;
+    }
+
+    /**
+     * Generates the C sources from Zephir without compiling them.
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function generate(bool $fromGenerate = false): bool
+    {
         /**
-         * ext.h.
+         * Get global namespace.
          */
-        $content = $this->backend->getTemplateFileContents('ext.h');
-        if (empty($content)) {
-            throw new Exception("Template ext.h doesn't exist");
-        }
+        $namespace = $this->checkDirectory();
 
-        $toReplace = [
-            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
-        ];
+        /**
+         * Check whether there are external dependencies.
+         */
+        $externalDependencies = $this->config->get('external-dependencies');
+        if (is_array($externalDependencies)) {
+            foreach ($externalDependencies as $dependencyNs => $location) {
+                if (!file_exists($location)) {
+                    throw new CompilerException(
+                        sprintf(
+                            'Location of dependency "%s" does not exist. Check the config.json for more information.',
+                            $dependencyNs
+                        )
+                    );
+                }
 
-        foreach ($toReplace as $mark => $replace) {
-            $content = str_replace($mark, $replace, $content);
+                $this->addExternalDependency($dependencyNs, $location);
+            }
         }
 
-        HardDisk::persistByHash($content, 'ext/ext.h');
-
         /**
-         * ext_config.h.
+         * Round 1. pre-compile all files in memory
          */
-        $content = $this->backend->getTemplateFileContents('ext_config.h');
-        if (empty($content)) {
-            throw new Exception("Template ext_config.h doesn't exist");
+        $this->recursivePreCompile(str_replace('\\', DIRECTORY_SEPARATOR, $namespace));
+        if (!count($this->files)) {
+            throw new Exception(
+                "Zephir files to compile couldn't be found. Did you add a first class to the extension?"
+            );
         }
 
-        $toReplace = [
-            '%PROJECT_LOWER%' => strtolower($project),
-        ];
-
-        foreach ($toReplace as $mark => $replace) {
-            $content = str_replace($mark, $replace, $content);
+        /**
+         * Round 2. Check 'extends' and 'implements' dependencies
+         */
+        foreach ($this->files as $compileFile) {
+            $compileFile->checkDependencies($this);
         }
 
-        HardDisk::persistByHash($content, 'ext/ext_config.h');
-
         /**
-         * ext_clean.
+         * Sort the files by dependency ranking.
          */
-        $content = $this->backend->getTemplateFileContents('clean');
-        if (empty($content)) {
-            throw new Exception("Clean file doesn't exist");
+        $files       = [];
+        $rankedFiles = [];
+        $this->calculateDependencies($this->files);
+
+        foreach ($this->files as $rankFile) {
+            $rank                 = $rankFile->getClassDefinition()->getDependencyRank();
+            $rankedFiles[$rank][] = $rankFile;
         }
 
-        if (HardDisk::persistByHash($content, 'ext/clean')) {
-            chmod('ext/clean', 0755);
+        krsort($rankedFiles);
+        foreach ($rankedFiles as $rankFiles) {
+            $files = array_merge($files, $rankFiles);
         }
+        $this->files = $files;
 
         /**
-         * ext_install.
+         * Convert C-constants into PHP constants.
          */
-        $content = $this->backend->getTemplateFileContents('install');
-        if (empty($content)) {
-            throw new Exception("Install file doesn't exist");
-        }
-
-        $toReplace = [
-            '%PROJECT_LOWER%' => strtolower($project),
-        ];
-
-        foreach ($toReplace as $mark => $replace) {
-            $content = str_replace($mark, $replace, $content);
+        $constantsSources = $this->config->get('constants-sources');
+        if (is_array($constantsSources)) {
+            $this->loadConstantsSources($constantsSources);
         }
 
-        if (HardDisk::persistByHash($content, 'ext/install')) {
-            chmod('ext/install', 0755);
+        /**
+         * Set extension globals.
+         */
+        $globals = $this->config->get('globals');
+        if (is_array($globals)) {
+            $this->setExtensionGlobals($globals);
         }
 
-        return (bool) $needConfigure;
-    }
-
-    /**
-     * Process extension globals.
-     *
-     * @throws Exception
-     */
-    public function processExtensionGlobals(string $namespace): array
-    {
-        $globalCode = '';
-        $globalStruct = '';
-        $globalsDefault = [[], []];
-        $initEntries = [];
-
         /**
-         * Generate the extensions globals declaration.
+         * Load function optimizers
          */
-        $globals = $this->config->get('globals');
-        if (\is_array($globals)) {
-            $structures = [];
-            $variables = [];
-            foreach ($globals as $name => $global) {
-                $parts = explode('.', $name);
-                if (isset($parts[1])) {
-                    $structures[$parts[0]][$parts[1]] = $global;
-                } else {
-                    $variables[$parts[0]] = $global;
+        if (false === self::$loadedPrototypes) {
+            $optimizersPath = $this->resolveOptimizersPath();
+            FunctionCall::addOptimizerDir("{$optimizersPath}/FunctionCall");
+
+            $customOptimizersPaths = $this->config->get('optimizer-dirs');
+            if (is_array($customOptimizersPaths)) {
+                foreach ($customOptimizersPaths as $directory) {
+                    FunctionCall::addOptimizerDir(realpath($directory));
                 }
             }
 
             /**
-             * Process compound structures
+             * Load additional extension prototypes.
              */
-            foreach ($structures as $structureName => $internalStructure) {
-                if (preg_match('/^[0-9a-zA-Z_]$/', $structureName)) {
-                    throw new Exception("Struct name: '".$structureName."' contains invalid characters");
+            $prototypesPath = $this->resolvePrototypesPath();
+            foreach (new DirectoryIterator($prototypesPath) as $file) {
+                if ($file->isDir() || $file->isDot()) {
+                    continue;
                 }
 
-                $structBuilder = new Struct('_zephir_struct_'.$structureName, $structureName);
-                foreach ($internalStructure as $field => $global) {
-                    if (preg_match('/^[0-9a-zA-Z_]$/', $field)) {
-                        throw new Exception("Struct field name: '".$field."' contains invalid characters");
-                    }
-
-                    $structBuilder->addProperty($field, $global['type']);
+                // Do not use $file->getRealPath() because it does not work inside phar
+                $realPath  = "{$file->getPath()}/{$file->getFilename()}";
+                $extension = $file->getBasename(".{$file->getExtension()}");
 
-                    $isModuleGlobal = (int) !empty($global['module']);
-                    $globalsDefault[$isModuleGlobal][] = $structBuilder->getCDefault($field, $global, $namespace);
-                    $initEntries[] = $structBuilder->getInitEntry($field, $global, $namespace);
+                if (!extension_loaded($extension)) {
+                    require_once $realPath;
                 }
-
-                $globalStruct .= $structBuilder.PHP_EOL;
-            }
-
-            $globalCode = PHP_EOL;
-            foreach ($structures as $structureName => $internalStructure) {
-                $globalCode .= "\t".'zephir_struct_'.$structureName.' '.$structureName.';'.PHP_EOL;
             }
 
             /**
-             * Process single variables
+             * Load customer additional extension prototypes.
              */
-            foreach ($variables as $name => $global) {
-                if (preg_match('/^[0-9a-zA-Z_]$/', $name)) {
-                    throw new Exception("Extension global variable name: '".$name."' contains invalid characters");
-                }
-
-                if (!isset($global['default'])) {
-                    throw new Exception("Extension global variable name: '".$name."' contains invalid characters");
-                }
+            $prototypeDirs = $this->config->get('prototype-dir');
+            if (is_array($prototypeDirs)) {
+                foreach ($prototypeDirs as $prototype => $prototypeDir) {
+                    /**
+                     * Check if the extension is installed
+                     */
+                    if (!extension_loaded($prototype)) {
+                        $prototypeRealpath = realpath($prototypeDir);
+                        if ($prototypeRealpath) {
+                            foreach (new RecursiveDirectoryIterator($prototypeRealpath) as $file) {
+                                if ($file->isDir()) {
+                                    continue;
+                                }
 
-                $isModuleGlobal = (int) !empty($global['module']);
-                $type = $global['type'];
-                // TODO: Add support for 'hash'
-                // TODO: Zephir\Optimizers\FunctionCall\GlobalsSetOptimizer
-                switch ($global['type']) {
-                    case 'boolean':
-                    case 'bool':
-                        $type = 'zend_bool';
-                        if (true === $global['default']) {
-                            $globalsDefault[$isModuleGlobal][] = "\t".$namespace.'_globals->'.$name.' = 1;';
-                        } else {
-                            $globalsDefault[$isModuleGlobal][] = "\t".$namespace.'_globals->'.$name.' = 0;';
+                                require_once $file->getRealPath();
+                            }
                         }
-                        break;
-
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'double':
-                        $globalsDefault[$isModuleGlobal][] = "\t".$namespace.'_globals->'.$name.' = '.$global['default'].';';
-                        break;
-
-                    case 'char':
-                    case 'uchar':
-                        $globalsDefault[$isModuleGlobal][] = "\t".$namespace.'_globals->'.$name.' = \''.$global['default'].'\';';
-                        break;
-                    case 'string':
-                        $type = 'char *';
-                        $globalsDefault[$isModuleGlobal][] = "\t".$namespace.'_globals->'.$name.' = ZSTR_VAL(zend_string_init(ZEND_STRL("'.$global['default'].'"), 0));';
-                        break;
-                    default:
-                        throw new Exception(
-                            "Unknown type '".$global['type']."' for extension global '".$name."'"
-                        );
+                    }
                 }
+            }
 
-                $globalCode .= "\t".$type.' '.$name.';'.PHP_EOL;
+            self::$loadedPrototypes = true;
+        }
 
-                $iniEntry = $global['ini-entry'] ?? [];
-                $iniName = $iniEntry['name'] ?? $namespace.'.'.$name;
-                $scope = $iniEntry['scope'] ?? 'PHP_INI_ALL';
+        /**
+         * Round 3. Compile all files to C sources.
+         */
+        $files = [];
 
-                switch ($global['type']) {
-                    case 'boolean':
-                    case 'bool':
-                        $initEntries[] =
-                        'STD_PHP_INI_BOOLEAN("'.
-                        $iniName.
-                        '", "'.
-                        (int) (true === $global['default']).
-                        '", '.
-                        $scope.
-                        ', OnUpdateBool, '.
-                        $name.
-                        ', zend_'.
-                        $namespace.
-                        '_globals, '.
-                        $namespace.'_globals)';
-                        break;
+        $hash = '';
+        foreach ($this->files as $compileFile) {
+            /**
+             * Only compile classes in the local extension, ignore external classes
+             */
+            if (!$compileFile->isExternal()) {
+                $compileFile->compile($this, $this->stringManager);
+                $compiledFile = $compileFile->getCompiledFile();
 
-                    case 'string':
-                        $initEntries[] = sprintf(
-                            'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
-                            '"'.$iniName.'"',
-                            '"'.$global['default'].'"',
-                            $scope,
-                            $name,
-                            'zend_'.$namespace.'_globals',
-                            $namespace.'_globals',
-                        );
-                        break;
+                $methods         = [];
+                $classDefinition = $compileFile->getClassDefinition();
+                foreach ($classDefinition->getMethods() as $method) {
+                    $methods[] = '[' . $method->getName() . ':' . implode('-', $method->getVisibility()) . ']';
+                    if ($method->isInitializer() && $method->isStatic()) {
+                        $this->internalInitializers[] = "\t" . $method->getName() . '();';
+                    }
                 }
+
+                $files[] = $compiledFile;
+
+                $hash .= '|'
+                    . $compiledFile
+                    . ':'
+                    . $classDefinition->getClassEntry()
+                    . '['
+                    . implode('|', $methods)
+                    . ']'
+                ;
             }
         }
 
-        $globalsDefault[0] = implode(PHP_EOL, $globalsDefault[0]);
-        $globalsDefault[1] = implode(PHP_EOL, $globalsDefault[1]);
+        /**
+         * Round 3.2. Compile anonymous classes
+         */
+        foreach ($this->anonymousFiles as $compileFile) {
+            $compileFile->compile($this, $this->stringManager);
+            $compiledFile = $compileFile->getCompiledFile();
 
-        return [$globalCode, $globalStruct, $globalsDefault, $initEntries];
-    }
+            $methods         = [];
+            $classDefinition = $compileFile->getClassDefinition();
+            foreach ($classDefinition->getMethods() as $method) {
+                $methods[] = '['
+                    . $method->getName()
+                    . ':'
+                    . implode('-', $method->getVisibility())
+                    . ']'
+                ;
+            }
 
-    /**
-     * Generates phpinfo() sections showing information about the extension.
-     */
-    public function processExtensionInfo(): string
-    {
-        $phpinfo = '';
+            $files[] = $compiledFile;
 
-        $info = $this->config->get('info');
-        if (!\is_array($info)) {
-            return $phpinfo;
+            $hash .= '|'
+                . $compiledFile
+                . ':'
+                . $classDefinition->getClassEntry()
+                . '['
+                . implode('|', $methods)
+                . ']'
+            ;
         }
 
-        foreach ($info as $table) {
-            $phpinfo .= "\t".'php_info_print_table_start();'.PHP_EOL;
-            if (isset($table['header'])) {
-                $headerArray = [];
-                foreach ($table['header'] as $header) {
-                    $headerArray[] = '"'.htmlentities($header).'"';
-                }
+        $hash                = md5($hash);
+        $this->compiledFiles = $files;
 
-                $phpinfo .= "\t".'php_info_print_table_header('.\count($headerArray).', '.
-                    implode(', ', $headerArray).');'.PHP_EOL;
-            }
-
-            if (isset($table['rows'])) {
-                foreach ($table['rows'] as $row) {
-                    $rowArray = [];
-                    foreach ($row as $field) {
-                        $rowArray[] = '"'.htmlentities($field).'"';
-                    }
-
-                    $phpinfo .= "\t".'php_info_print_table_row('.\count($rowArray).', '.
-                        implode(', ', $rowArray).');'.PHP_EOL;
-                }
-            }
-
-            $phpinfo .= "\t".'php_info_print_table_end();'.PHP_EOL;
+        /**
+         * Round 3.3. Load extra C-sources.
+         */
+        $extraSources = $this->config->get('extra-sources');
+        if (is_array($extraSources)) {
+            $this->extraFiles = $extraSources;
+        } else {
+            $this->extraFiles = [];
         }
 
-        return $phpinfo;
-    }
-
-    /**
-     * Process extension code injection.
-     */
-    public function processCodeInjection(array $entries, string $section = 'request'): array
-    {
-        $codes = [];
-        $includes = [];
-
-        if (isset($entries[$section])) {
-            foreach ($entries[$section] as $entry) {
-                if (!empty($entry['code'])) {
-                    $codes[] = $entry['code'].';';
-                }
-
-                if (!empty($entry['include'])) {
-                    $includes[] = '#include "'.$entry['include'].'"';
+        /**
+         * Round 3.4. Load extra classes sources.
+         */
+        $extraClasses = $this->config->get('extra-classes');
+        if (is_array($extraClasses)) {
+            foreach ($extraClasses as $value) {
+                if (isset($value['source'])) {
+                    $this->extraFiles[] = $value['source'];
                 }
             }
         }
 
-        return [implode(PHP_EOL, $includes), implode("\n\t", $codes)];
-    }
+        /**
+         * Round 4. Create config.m4 and config.w32 files / Create project.c and project.h files.
+         */
+        $namespace     = str_replace('\\', '_', $namespace);
+        $extensionName = $this->config->get('extension-name');
+        if (empty($extensionName) || !is_string($extensionName)) {
+            $extensionName = $namespace;
+        }
 
-    /**
-     * Adds an external dependency to the compiler.
-     */
-    public function addExternalDependency(string $namespace, string $location): void
-    {
-        $this->externalDependencies[$namespace] = $location;
-    }
+        $needConfigure = $this->createConfigFiles($extensionName);
+        $needConfigure |= $this->createProjectFiles($extensionName);
+        $needConfigure |= $this->checkIfPhpized();
+        // Bitwise returns `int` instead of `bool`.
+        $needConfigure = (bool)$needConfigure;
 
-    public function calculateDependencies(array $files, $_dependency = null): void
-    {
         /**
-         * Classes are ordered according to a dependency ranking
-         * Classes with higher rank, need to be initialized first
-         * We first build a dependency tree and then set the rank accordingly
+         * When a new file is added or removed we need to run configure again
          */
-        if (null === $_dependency) {
-            $dependencyTree = [];
-            foreach ($files as $file) {
-                if (!$file->isExternal()) {
-                    $classDefinition = $file->getClassDefinition();
-                    $dependencyTree[$classDefinition->getCompleteName()] = $classDefinition->getDependencies();
+        if (!$fromGenerate) {
+            if (false === $this->filesystem->exists('compiled-files-sum')) {
+                $needConfigure = true;
+                $this->filesystem->write('compiled-files-sum', $hash);
+            } else {
+                if ($this->filesystem->read('compiled-files-sum') != $hash) {
+                    $needConfigure = true;
+                    $this->filesystem->delete('compiled-files-sum');
+                    $this->filesystem->write('compiled-files-sum', $hash);
                 }
             }
+        }
 
-            // Make sure the dependencies are loaded first (recursively)
-            foreach ($dependencyTree as $dependencies) {
-                foreach ($dependencies as $dependency) {
-                    $dependency->increaseDependencyRank(0);
-                    $this->calculateDependencies($dependencyTree, $dependency);
-                }
-            }
+        /**
+         * Round 5. Generate concatenation functions
+         */
+        $this->stringManager->genConcatCode();
+        $this->fcallManager->genFcallCode();
 
-            return;
+        if ($this->config->get('stubs-run-after-generate', 'stubs')) {
+            $this->stubs($fromGenerate);
         }
 
-        $dependencyTree = $files;
-        if (isset($dependencyTree[$_dependency->getCompleteName()])) {
-            foreach ($dependencyTree[$_dependency->getCompleteName()] as $dependency) {
-                $dependency->increaseDependencyRank(0);
-                $this->calculateDependencies($dependencyTree, $dependency);
-            }
-        }
+        return $needConfigure;
     }
 
-    /**
-     * Create project.c and project.h according to the current extension.
-     *
-     * TODO: Move the part of the logic which depends on templates (backend-specific) to backend?
-     *
-     * @throws Exception
-     */
-    public function createProjectFiles(string $project): bool
+    public function generateFunctionInformation(): array
     {
-        $needConfigure = $this->checkKernelFiles();
+        $headerPrinter = new Printer();
+        $entryPrinter  = new Printer();
 
         /**
-         * project.c.
+         * Specifying Argument Information
          */
-        $content = $this->backend->getTemplateFileContents('project.c');
-        if (empty($content)) {
-            throw new Exception("Template project.c doesn't exist");
-        }
+        foreach ($this->functionDefinitions as $func) {
+            $argInfo = new ArgInfoDefinition(
+                $func->getArgInfoName(),
+                $func,
+                $headerPrinter,
+                $func->getCallGathererPass()->getCompilationContext()
+            );
 
-        $includes = '';
-        $reqInitializers = '';
-        $reqDestructors = '';
-        $prqDestructors = '';
-        $modInitializers = '';
-        $modDestructors = '';
-        $glbInitializers = '';
-        $glbDestructors = '';
-        $files = array_merge($this->files, $this->anonymousFiles);
+            $funcName    = $func->getInternalName();
+            $argInfoName = $func->getArgInfoName();
 
-        /**
-         * Round 1. Calculate the dependency rank
-         */
-        $this->calculateDependencies($files);
+            $headerPrinter->output('PHP_FUNCTION(' . $funcName . ');');
 
-        $classEntries = [];
-        $classInits = [];
+            $argInfo->setBooleanDefinition('_IS_BOOL');
+            $argInfo->setRichFormat(true);
 
-        $interfaceEntries = [];
-        $interfaceInits = [];
+            $argInfo->render();
 
-        /**
-         * Round 2. Generate the ZEPHIR_INIT calls according to the dependency rank
-         */
-        /** @var FileInterface $file */
-        foreach ($files as $file) {
-            if ($file->isExternal()) {
-                continue;
-            }
+            /** Generate FE's */
+            $paramData = 'NULL';
 
-            $classDefinition = $file->getClassDefinition();
-            if ($classDefinition === null) {
-                continue;
+            $richFormat = $func->isReturnTypesHintDetermined() && $func->areReturnTypesCompatible();
+
+            if ($richFormat || $func->hasParameters()) {
+                $paramData = $argInfoName;
             }
 
-            $dependencyRank = $classDefinition->getDependencyRank();
-            if ('class' === $classDefinition->getType()) {
-                $classEntries[$dependencyRank][] = 'zend_class_entry *'.$classDefinition->getClassEntry().';';
-                $classInits[$dependencyRank][] = 'ZEPHIR_INIT('.$classDefinition->getCNamespace().'_'.$classDefinition->getName().');';
+            if ($func->isGlobal()) {
+                $entryPrinter->output(
+                    'ZEND_NAMED_FE(' . $func->getName() . ', ZEND_FN(' . $funcName . '), ' . $paramData . ')'
+                );
             } else {
-                $interfaceEntries[$dependencyRank][] = 'zend_class_entry *'.$classDefinition->getClassEntry().';';
-                $interfaceInits[$dependencyRank][] = 'ZEPHIR_INIT('.$classDefinition->getCNamespace().'_'.$classDefinition->getName().');';
+                $entryPrinter->output(
+                    'ZEND_NS_NAMED_FE("' . str_replace('\\', '\\\\', $func->getNamespace()) . '", ' .
+                    $func->getName() .
+                    ', ZEND_FN(' . $funcName . '), ' .
+                    $paramData . ')'
+                );
             }
         }
 
-        krsort($classInits);
-        krsort($classEntries);
-        krsort($interfaceInits);
-        krsort($interfaceEntries);
-
-        $completeInterfaceInits = [];
-        foreach ($interfaceInits as $rankInterfaceInits) {
-            asort($rankInterfaceInits, SORT_STRING);
-            $completeInterfaceInits = array_merge($completeInterfaceInits, $rankInterfaceInits);
-        }
+        $entryPrinter->output('ZEND_FE_END');
 
-        $completeInterfaceEntries = [];
-        foreach ($interfaceEntries as $rankInterfaceEntries) {
-            asort($rankInterfaceEntries, SORT_STRING);
-            $completeInterfaceEntries = array_merge($completeInterfaceEntries, $rankInterfaceEntries);
-        }
+        return [$headerPrinter->getOutput(), $entryPrinter->getOutput()];
+    }
 
-        $completeClassInits = [];
-        foreach ($classInits as $rankClassInits) {
-            asort($rankClassInits, SORT_STRING);
-            $completeClassInits = array_merge($completeClassInits, $rankClassInits);
+    /**
+     * Generate package-dependencies config for m4.
+     *
+     * TODO: Move the template depending part to backend?
+     */
+    public function generatePackageDependenciesM4(string $contentM4): string
+    {
+        $packageDependencies = $this->config->get('package-dependencies');
+        if (!is_array($packageDependencies)) {
+            return str_replace('%PROJECT_PACKAGE_DEPENDENCIES%', '', $contentM4);
         }
 
-        $completeClassEntries = [];
-        foreach ($classEntries as $rankClassEntries) {
-            asort($rankClassEntries, SORT_STRING);
-            $completeClassEntries = array_merge($completeClassEntries, $rankClassEntries);
-        }
+        $pkgconfigM4      = $this->backend->getTemplateFileContents('pkg-config.m4');
+        $pkgconfigCheckM4 = $this->backend->getTemplateFileContents('pkg-config-check.m4');
+        $extraCFlags      = '';
 
-        /**
-         * Round 3. Process extension globals
-         */
-        [$globalCode, $globalStruct, $globalsDefault, $initEntries] = $this->processExtensionGlobals($project);
-        if ('zend' == $project) {
-            $safeProject = 'zend_';
-        } else {
-            $safeProject = $project;
-        }
+        foreach ($packageDependencies as $pkg => $version) {
+            $pkgM4Buf = $pkgconfigCheckM4;
 
-        /**
-         * Round 4. Process extension info.
-         */
-        $phpInfo = $this->processExtensionInfo();
+            $operator    = '=';
+            $operatorCmd = '--exact-version';
+            $ar          = explode('=', $version);
 
-        /**
-         * Round 5. Generate Function entries (FE)
-         */
-        [$feHeader, $feEntries] = $this->generateFunctionInformation();
+            if (1 === count($ar)) {
+                if ('*' === $version) {
+                    $version     = '0.0.0';
+                    $operator    = '>=';
+                    $operatorCmd = '--atleast-version';
+                }
+            } else {
+                switch ($ar[0]) {
+                    case '<':
+                        $operator    = '<=';
+                        $operatorCmd = '--max-version';
+                        break;
+                    case '>':
+                        $operator    = '>=';
+                        $operatorCmd = '--atleast-version';
+                        break;
+                }
 
-        /**
-         * Check if there are module/request/global destructors.
-         */
-        $destructors = $this->config->get('destructors');
-        if (\is_array($destructors)) {
-            $invokeRequestDestructors = $this->processCodeInjection($destructors, 'request');
-            $includes .= PHP_EOL.$invokeRequestDestructors[0];
-            $reqDestructors = $invokeRequestDestructors[1];
+                $version = trim($ar[1]);
+            }
 
-            $invokePostRequestDestructors = $this->processCodeInjection($destructors, 'post-request');
-            $includes .= PHP_EOL.$invokePostRequestDestructors[0];
-            $prqDestructors = $invokePostRequestDestructors[1];
+            $toReplace = [
+                '%PACKAGE_LOWER%'                      => strtolower($pkg),
+                '%PACKAGE_UPPER%'                      => strtoupper($pkg),
+                '%PACKAGE_REQUESTED_VERSION%'          => $operator . ' ' . $version,
+                '%PACKAGE_PKG_CONFIG_COMPARE_VERSION%' => $operatorCmd . '=' . $version,
+            ];
 
-            $invokeModuleDestructors = $this->processCodeInjection($destructors, 'module');
-            $includes .= PHP_EOL.$invokeModuleDestructors[0];
-            $modDestructors = $invokeModuleDestructors[1];
+            foreach ($toReplace as $mark => $replace) {
+                $pkgM4Buf = str_replace($mark, $replace, $pkgM4Buf);
+            }
 
-            $invokeGlobalsDestructors = $this->processCodeInjection($destructors, 'globals');
-            $includes .= PHP_EOL.$invokeGlobalsDestructors[0];
-            $glbDestructors = $invokeGlobalsDestructors[1];
+            $pkgconfigM4 .= $pkgM4Buf;
+            $extraCFlags .= '$PHP_' . strtoupper($pkg) . '_INCS ';
         }
 
-        /**
-         * Check if there are module/request/global initializers.
-         */
-        $initializers = $this->config->get('initializers');
-        if (\is_array($initializers)) {
-            $invokeRequestInitializers = $this->processCodeInjection($initializers, 'request');
-            $includes .= PHP_EOL.$invokeRequestInitializers[0];
-            $reqInitializers = $invokeRequestInitializers[1];
-
-            $invokeModuleInitializers = $this->processCodeInjection($initializers, 'module');
-            $includes .= PHP_EOL.$invokeModuleInitializers[0];
-            $modInitializers = $invokeModuleInitializers[1];
+        $contentM4 = str_replace('%PROJECT_EXTRA_CFLAGS%', '%PROJECT_EXTRA_CFLAGS% ' . $extraCFlags, $contentM4);
 
-            $invokeGlobalsInitializers = $this->processCodeInjection($initializers, 'globals');
-            $includes .= PHP_EOL.$invokeGlobalsInitializers[0];
-            $glbInitializers = $invokeGlobalsInitializers[1];
+        return str_replace('%PROJECT_PACKAGE_DEPENDENCIES%', $pkgconfigM4, $contentM4);
+    }
+
+    /**
+     * Returns class the class definition from a given class name.
+     */
+    public function getClassDefinition(string $className): Definition|bool
+    {
+        foreach ($this->definitions as $key => $value) {
+            if (!strcasecmp($key, $className)) {
+                return $value;
+            }
         }
 
-        /**
-         * Append extra details.
-         */
-        $extraClasses = $this->config->get('extra-classes');
-        if (\is_array($extraClasses)) {
-            foreach ($extraClasses as $value) {
-                if (isset($value['init'])) {
-                    $completeClassInits[] = 'ZEPHIR_INIT('.$value['init'].')';
-                }
+        return false;
+    }
 
-                if (isset($value['entry'])) {
-                    $completeClassEntries[] = 'zend_class_entry *'.$value['entry'].';';
+    /**
+     * Returns a Zephir Constant by its name.
+     */
+    public function getConstant(string $name): mixed
+    {
+        return $this->constants[$name];
+    }
+
+    /**
+     * Returns an extension global by its name.
+     */
+    public function getExtensionGlobal(string $name): array
+    {
+        return $this->globals[$name];
+    }
+
+    /**
+     * Returns GCC flags for current compilation.
+     */
+    public function getGccFlags(bool $development = false): string
+    {
+        if (Os::isWindows()) {
+            // TODO
+            return '';
+        }
+
+        $gccFlags = getenv('CFLAGS');
+
+        if (!is_string($gccFlags)) {
+            if (false === $development) {
+                $gccVersion = $this->getGccVersion();
+                if (version_compare($gccVersion, '4.6.0', '>=')) {
+                    $gccFlags = '-O2 -fvisibility=hidden -Wparentheses -flto -DZEPHIR_RELEASE=1';
+                } else {
+                    $gccFlags = '-O2 -fvisibility=hidden -Wparentheses -DZEPHIR_RELEASE=1';
                 }
+            } else {
+                $gccFlags = '-O0 -g3';
             }
         }
 
-        $modRequires = array_map(fn ($mod) => sprintf('ZEND_MOD_REQUIRED("%s")', strtolower($mod)), $this->config->get('extensions', 'requires') ?: []);
+        return $gccFlags;
+    }
 
-        $toReplace = [
-            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
-            '%PROJECT_LOWER%' => strtolower($project),
-            '%PROJECT_UPPER%' => strtoupper($project),
-            '%PROJECT_CAMELIZE%' => ucfirst($project),
-            '%CLASS_ENTRIES%' => implode(
-                PHP_EOL,
-                array_merge($completeInterfaceEntries, $completeClassEntries)
-            ),
-            '%CLASS_INITS%' => implode(
-                PHP_EOL."\t",
-                array_merge($completeInterfaceInits, $completeClassInits)
-            ),
-            '%INIT_GLOBALS%' => implode(
-                PHP_EOL."\t",
-                array_merge((array) $globalsDefault[0], [$glbInitializers])
-            ),
-            '%INIT_MODULE_GLOBALS%' => $globalsDefault[1],
-            '%DESTROY_GLOBALS%' => $glbDestructors,
-            '%EXTENSION_INFO%' => $phpInfo,
-            '%EXTRA_INCLUDES%' => implode(
-                PHP_EOL,
-                array_unique(explode(PHP_EOL, $includes))
-            ),
-            '%MOD_INITIALIZERS%' => $modInitializers,
-            '%MOD_DESTRUCTORS%' => $modDestructors,
-            '%REQ_INITIALIZERS%' => implode(
-                PHP_EOL."\t",
-                array_merge($this->internalInitializers, [$reqInitializers])
-            ),
-            '%REQ_DESTRUCTORS%' => $reqDestructors,
-            '%POSTREQ_DESTRUCTORS%' => empty($prqDestructors) ? '' : implode(
-                PHP_EOL,
-                [
-                    '#define ZEPHIR_POST_REQUEST 1',
-                    'static PHP_PRSHUTDOWN_FUNCTION('.strtolower($project).')',
-                    '{',
-                    "\t".implode(
-                        PHP_EOL."\t",
-                        explode(PHP_EOL, $prqDestructors)
-                    ),
-                    '}',
-                ]
-            ),
-            '%FE_HEADER%' => $feHeader,
-            '%FE_ENTRIES%' => $feEntries,
-            '%PROJECT_INI_ENTRIES%' => implode(PHP_EOL."\t", $initEntries),
-            '%PROJECT_DEPENDENCIES%' => implode(PHP_EOL."\t", $modRequires),
-        ];
-        foreach ($toReplace as $mark => $replace) {
-            $content = str_replace($mark, $replace, $content);
+    /**
+     * Returns class the class definition from a given class name.
+     *
+     * @throws ReflectionException
+     */
+    public function getInternalClassDefinition(string $className): Definition
+    {
+        if (!isset(self::$internalDefinitions[$className])) {
+            $reflection                            = new ReflectionClass($className);
+            self::$internalDefinitions[$className] = Definition::buildFromReflection($reflection);
         }
 
-        /**
-         * Round 5. Generate and place the entry point of the project
-         */
-        HardDisk::persistByHash($content, 'ext/'.$safeProject.'.c');
-        unset($content);
+        return self::$internalDefinitions[$className];
+    }
 
-        /**
-         * Round 6. Generate the project main header.
-         */
-        $content = $this->backend->getTemplateFileContents('project.h');
-        if (empty($content)) {
-            throw new Exception("Template project.h doesn't exists");
+    /**
+     * Gets the Zephir Parser Manager.
+     *
+     * @deprecated
+     */
+    public function getParserManager(): Parser\Manager
+    {
+        return $this->parserManager;
+    }
+
+    /**
+     * Returns the php include directories returned by php-config.
+     */
+    public function getPhpIncludeDirs(): string
+    {
+        $this->filesystem->system('php-config --includes', 'stdout', 'php-includes');
+
+        return trim($this->filesystem->read('php-includes'));
+    }
+
+    /**
+     * Returns a short user path.
+     */
+    public static function getShortUserPath(string $path): string
+    {
+        return str_replace('\\', '/', str_replace(getcwd() . DIRECTORY_SEPARATOR, '', $path));
+    }
+
+    /**
+     * Compiles and installs the extension.
+     *
+     * @throws Exception
+     * @throws NotImplementedException
+     * @throws CompilerException
+     */
+    public function install(bool $development = false): void
+    {
+        // Get global namespace
+        $namespace  = str_replace('\\', '_', $this->checkDirectory());
+        $currentDir = getcwd();
+
+        if (Os::isWindows()) {
+            throw new NotImplementedException('Installation is not implemented for Windows yet. Aborting.');
         }
 
-        $includeHeaders = [];
-        foreach ($this->compiledFiles as $file) {
-            if ($file) {
-                $fileH = str_replace('.c', '.zep.h', $file);
-                $include = '#include "'.$fileH.'"';
-                $includeHeaders[] = $include;
+        $this->logger->info('Installing...');
+        $gccFlags = $this->getGccFlags($development);
+
+        $command = strtr(
+        // TODO: Sort out with sudo
+            'cd ext && export CC="gcc" && export CFLAGS=":cflags" && ' .
+            'make 2>> ":stderr" 1>> ":stdout" && ' .
+            'sudo make install 2>> ":stderr" 1>> ":stdout"',
+            [
+                ':cflags' => $gccFlags,
+                ':stderr' => "{$currentDir}/compile-errors.log",
+                ':stdout' => "{$currentDir}/compile.log",
+            ]
+        );
+
+        array_map(function ($entry): void {
+            if (!empty($entry)) {
+                $this->logger->debug(trim($entry));
+            }
+        }, explode('&&', $command));
+
+        exec($command, $output, $exit);
+        $fileName = $this->config->get('extension-name') ?: $namespace;
+
+        if (false === file_exists("{$currentDir}/ext/modules/{$fileName}.so")) {
+            throw new CompilerException(
+                'Internal extension compilation failed. Check compile-errors.log for more information.'
+            );
+        }
+    }
+
+    /**
+     * Allows checking if a class is part of PHP.
+     */
+    public function isBundledClass(string $className): bool
+    {
+        return class_exists($className, false);
+    }
+
+    /**
+     * Allows checking if an interface is part of PHP.
+     */
+    public function isBundledInterface(string $className): bool
+    {
+        return interface_exists($className, false);
+    }
+
+    /**
+     * Allows to check if a class is part of the compiled extension.
+     */
+    public function isClass(string $className): bool
+    {
+        foreach ($this->definitions as $key => $value) {
+            if (!strcasecmp($key, $className) && 'class' === $value->getType()) {
+                return true;
             }
         }
 
         /**
-         * Append extra headers.
+         * Try to autoload the class from an external dependency
          */
-        $extraClasses = $this->config->get('extra-classes');
-        if (\is_array($extraClasses)) {
-            foreach ($extraClasses as $value) {
-                if (isset($value['header'])) {
-                    $include = '#include "'.$value['header'].'"';
-                    $includeHeaders[] = $include;
-                }
+        foreach ($this->externalDependencies as $namespace => $location) {
+            if (preg_match('#^' . $namespace . '\\\\#i', $className)) {
+                return $this->loadExternalClass($className, $location);
             }
         }
 
-        $toReplace = [
-            '%INCLUDE_HEADERS%' => implode(PHP_EOL, $includeHeaders),
-        ];
+        return false;
+    }
 
-        foreach ($toReplace as $mark => $replace) {
-            $content = str_replace($mark, $replace, $content);
+    /**
+     * Checks if $name is a Zephir constant.
+     */
+    public function isConstant(string $name): bool
+    {
+        return isset($this->constants[$name]);
+    }
+
+    /**
+     * Checks if a specific extension global is defined.
+     */
+    public function isExtensionGlobal(string $name): bool
+    {
+        return isset($this->globals[$name]);
+    }
+
+    /**
+     * Allows checking if an interface is part of the compiled extension.
+     *
+     * @throws CompilerException
+     * @throws IllegalStateException
+     * @throws ParseException
+     */
+    public function isInterface(string $className): bool
+    {
+        foreach ($this->definitions as $key => $value) {
+            if (!strcasecmp($key, $className) && 'interface' === $value->getType()) {
+                return true;
+            }
         }
 
-        HardDisk::persistByHash($content, 'ext/'.$safeProject.'.h');
-        unset($content);
+        /**
+         * Try to autoload the class from an external dependency
+         */
+        foreach ($this->externalDependencies as $namespace => $location) {
+            if (preg_match('#^' . $namespace . '\\\\#i', $className)) {
+                return $this->loadExternalClass($className, $location);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Loads a class definition in an external dependency.
+     *
+     * @throws CompilerException
+     * @throws IllegalStateException
+     * @throws ParseException
+     */
+    public function loadExternalClass(string $className, string $location): bool
+    {
+        $filePath = $location
+            . DIRECTORY_SEPARATOR
+            . strtolower(
+                str_replace('\\', DIRECTORY_SEPARATOR, $className)
+            )
+            . '.zep';
 
         /**
-         * Round 7. Create php_project.h.
+         * Fix the class name.
          */
-        $content = $this->backend->getTemplateFileContents('php_project.h');
-        if (empty($content)) {
-            throw new Exception("Template php_project.h doesn't exist");
+        $className = implode(
+            '\\',
+            array_map(
+                'ucfirst',
+                explode('\\', $className)
+            )
+        );
+
+        if (isset($this->files[$className])) {
+            return true;
         }
 
-        $toReplace = [
-            '%PROJECT_LOWER_SAFE%' => strtolower($safeProject),
-            '%PROJECT_LOWER%' => strtolower($project),
-            '%PROJECT_UPPER%' => strtoupper($project),
-            '%PROJECT_EXTNAME%' => strtolower($project),
-            '%PROJECT_NAME%' => mb_convert_encoding($this->config->get('name'), 'ISO-8859-1', 'UTF-8'),
-            '%PROJECT_AUTHOR%' => mb_convert_encoding($this->config->get('author'), 'ISO-8859-1', 'UTF-8'),
-            '%PROJECT_VERSION%' => mb_convert_encoding($this->config->get('version'), 'ISO-8859-1', 'UTF-8'),
-            '%PROJECT_DESCRIPTION%' => mb_convert_encoding($this->config->get('description'), 'ISO-8859-1', 'UTF-8'),
-            '%PROJECT_ZEPVERSION%' => Zephir::VERSION,
-            '%EXTENSION_GLOBALS%' => $globalCode,
-            '%EXTENSION_STRUCT_GLOBALS%' => $globalStruct,
-        ];
+        if (!file_exists($filePath)) {
+            return false;
+        }
 
-        foreach ($toReplace as $mark => $replace) {
-            $content = str_replace($mark, $replace, $content);
+        /** @var CompilerFile|CompilerFileAnonymous $compilerFile */
+        $compilerFile = $this->compilerFileFactory->create($className, $filePath);
+        $compilerFile->setIsExternal(true);
+        $compilerFile->preCompile($this);
+
+        $this->files[$className]       = $compilerFile;
+        $this->definitions[$className] = $compilerFile->getClassDefinition();
+
+        return true;
+    }
+
+    /**
+     * Pre-compile headers to speed up compilation.
+     */
+    public function preCompileHeaders(): void
+    {
+        if (Os::isWindows()) {
+            // TODO: Add Windows support
+            return;
         }
 
-        HardDisk::persistByHash($content, 'ext/php_'.$safeProject.'.h');
-        unset($content);
+        $phpIncludes = $this->getPhpIncludeDirs();
 
-        return $needConfigure;
+        /** @var DirectoryIterator $file */
+        foreach (new DirectoryIterator('ext/kernel') as $file) {
+            if ($file->isDir() || $file->getExtension() !== 'h') {
+                continue;
+            }
+
+            $command = sprintf(
+                'cd ext && gcc -c kernel/%s  -I. %s  -o kernel/%s.gch',
+                $file->getBaseName(),
+                $phpIncludes,
+                $file->getBaseName()
+            );
+
+            $path = $file->getRealPath();
+            if (!file_exists($path . '.gch') || filemtime($path) > filemtime($path . '.gch')) {
+                $this->filesystem->system($command, 'stdout', 'compile-header');
+            }
+        }
     }
 
-    public function generateFunctionInformation(): array
+    /**
+     * Process extension code injection.
+     */
+    public function processCodeInjection(array $entries, string $section = 'request'): array
     {
-        $headerPrinter = new Printer();
-        $entryPrinter = new Printer();
+        $codes    = [];
+        $includes = [];
+
+        if (isset($entries[$section])) {
+            foreach ($entries[$section] as $entry) {
+                if (!empty($entry['code'])) {
+                    $codes[] = $entry['code'] . ';';
+                }
+
+                if (!empty($entry['include'])) {
+                    $includes[] = '#include "' . $entry['include'] . '"';
+                }
+            }
+        }
+
+        return [implode(PHP_EOL, $includes), implode("\n\t", $codes)];
+    }
+
+    /**
+     * Process extension globals.
+     *
+     * @throws Exception
+     */
+    public function processExtensionGlobals(string $namespace): array
+    {
+        $globalCode     = '';
+        $globalStruct   = '';
+        $globalsDefault = [[], []];
+        $initEntries    = [];
 
         /**
-         * Specifying Argument Information
+         * Generate the extensions globals declaration.
          */
-        foreach ($this->functionDefinitions as $func) {
-            $argInfo = new ArgInfoDefinition(
-                $func->getArgInfoName(),
-                $func,
-                $headerPrinter,
-                $func->getCallGathererPass()->getCompilationContext()
-            );
+        $globals = $this->config->get('globals');
+        if (is_array($globals)) {
+            $structures = [];
+            $variables  = [];
+            foreach ($globals as $name => $global) {
+                $parts = explode('.', $name);
+                if (isset($parts[1])) {
+                    $structures[$parts[0]][$parts[1]] = $global;
+                } else {
+                    $variables[$parts[0]] = $global;
+                }
+            }
 
-            $funcName = $func->getInternalName();
-            $argInfoName = $func->getArgInfoName();
+            /**
+             * Process compound structures
+             */
+            foreach ($structures as $structureName => $internalStructure) {
+                if (preg_match('/^[0-9a-zA-Z_]$/', $structureName)) {
+                    throw new Exception("Struct name: '" . $structureName . "' contains invalid characters");
+                }
 
-            $headerPrinter->output('PHP_FUNCTION('.$funcName.');');
+                $structBuilder = new Struct('_zephir_struct_' . $structureName, $structureName);
+                foreach ($internalStructure as $field => $global) {
+                    if (preg_match('/^[0-9a-zA-Z_]$/', $field)) {
+                        throw new Exception("Struct field name: '" . $field . "' contains invalid characters");
+                    }
 
-            $argInfo->setBooleanDefinition('_IS_BOOL');
-            $argInfo->setRichFormat(true);
+                    $structBuilder->addProperty($field, $global['type']);
 
-            $argInfo->render();
+                    $isModuleGlobal                    = (int)!empty($global['module']);
+                    $globalsDefault[$isModuleGlobal][] = $structBuilder->getCDefault($field, $global, $namespace);
+                    $initEntries[]                     = $structBuilder->getInitEntry($field, $global, $namespace);
+                }
 
-            /** Generate FE's */
-            $paramData = 'NULL';
+                $globalStruct .= $structBuilder . PHP_EOL;
+            }
 
-            $richFormat = $func->isReturnTypesHintDetermined() && $func->areReturnTypesCompatible();
+            $globalCode = PHP_EOL;
+            foreach ($structures as $structureName => $internalStructure) {
+                $globalCode .= "\t" . 'zephir_struct_' . $structureName . ' ' . $structureName . ';' . PHP_EOL;
+            }
 
-            if ($richFormat || $func->hasParameters()) {
-                $paramData = $argInfoName;
+            /**
+             * Process single variables
+             */
+            foreach ($variables as $name => $global) {
+                if (preg_match('/^[0-9a-zA-Z_]$/', $name)) {
+                    throw new Exception("Extension global variable name: '" . $name . "' contains invalid characters");
+                }
+
+                if (!isset($global['default'])) {
+                    throw new Exception("Extension global variable name: '" . $name . "' contains invalid characters");
+                }
+
+                $isModuleGlobal = (int)!empty($global['module']);
+                $type           = $global['type'];
+                // TODO: Add support for 'hash'
+                // TODO: Zephir\Optimizers\FunctionCall\GlobalsSetOptimizer
+                switch ($global['type']) {
+                    case 'boolean':
+                    case 'bool':
+                        $type = 'zend_bool';
+                        if (true === $global['default']) {
+                            $globalsDefault[$isModuleGlobal][] = "\t" . $namespace . '_globals->' . $name . ' = 1;';
+                        } else {
+                            $globalsDefault[$isModuleGlobal][] = "\t" . $namespace . '_globals->' . $name . ' = 0;';
+                        }
+                        break;
+
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'double':
+                        $globalsDefault[$isModuleGlobal][] = "\t" . $namespace . '_globals->' . $name . ' = ' . $global['default'] . ';';
+                        break;
+
+                    case 'char':
+                    case 'uchar':
+                        $globalsDefault[$isModuleGlobal][] = "\t" . $namespace . '_globals->' . $name . ' = \'' . $global['default'] . '\';';
+                        break;
+                    case 'string':
+                        $type                              = 'char *';
+                        $globalsDefault[$isModuleGlobal][] = "\t" . $namespace . '_globals->' . $name . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));';
+                        break;
+                    default:
+                        throw new Exception(
+                            "Unknown type '" . $global['type'] . "' for extension global '" . $name . "'"
+                        );
+                }
+
+                $globalCode .= "\t" . $type . ' ' . $name . ';' . PHP_EOL;
+
+                $iniEntry = $global['ini-entry'] ?? [];
+                $iniName  = $iniEntry['name'] ?? $namespace . '.' . $name;
+                $scope    = $iniEntry['scope'] ?? 'PHP_INI_ALL';
+
+                switch ($global['type']) {
+                    case 'boolean':
+                    case 'bool':
+                        $initEntries[] =
+                            'STD_PHP_INI_BOOLEAN("' .
+                            $iniName .
+                            '", "' .
+                            (int)(true === $global['default']) .
+                            '", ' .
+                            $scope .
+                            ', OnUpdateBool, ' .
+                            $name .
+                            ', zend_' .
+                            $namespace .
+                            '_globals, ' .
+                            $namespace . '_globals)';
+                        break;
+
+                    case 'string':
+                        $initEntries[] = sprintf(
+                            'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
+                            '"' . $iniName . '"',
+                            '"' . $global['default'] . '"',
+                            $scope,
+                            $name,
+                            'zend_' . $namespace . '_globals',
+                            $namespace . '_globals',
+                        );
+                        break;
+                }
             }
+        }
 
-            if ($func->isGlobal()) {
-                $entryPrinter->output(
-                    'ZEND_NAMED_FE('.$func->getName().', ZEND_FN('.$funcName.'), '.$paramData.')'
-                );
-            } else {
-                $entryPrinter->output(
-                    'ZEND_NS_NAMED_FE("'.str_replace('\\', '\\\\', $func->getNamespace()).'", '.
-                    $func->getName().
-                    ', ZEND_FN('.$funcName.'), '.
-                    $paramData.')'
-                );
+        $globalsDefault[0] = implode(PHP_EOL, $globalsDefault[0]);
+        $globalsDefault[1] = implode(PHP_EOL, $globalsDefault[1]);
+
+        return [$globalCode, $globalStruct, $globalsDefault, $initEntries];
+    }
+
+    /**
+     * Generates phpinfo() sections showing information about the extension.
+     */
+    public function processExtensionInfo(): string
+    {
+        $phpinfo = '';
+
+        $info = $this->config->get('info');
+        if (!is_array($info)) {
+            return $phpinfo;
+        }
+
+        foreach ($info as $table) {
+            $phpinfo .= "\t" . 'php_info_print_table_start();' . PHP_EOL;
+            if (isset($table['header'])) {
+                $headerArray = [];
+                foreach ($table['header'] as $header) {
+                    $headerArray[] = '"' . htmlentities($header) . '"';
+                }
+
+                $phpinfo .= "\t" . 'php_info_print_table_header(' . count($headerArray) . ', ' .
+                    implode(', ', $headerArray) . ');' . PHP_EOL;
+            }
+
+            if (isset($table['rows'])) {
+                foreach ($table['rows'] as $row) {
+                    $rowArray = [];
+                    foreach ($row as $field) {
+                        $rowArray[] = '"' . htmlentities($field) . '"';
+                    }
+
+                    $phpinfo .= "\t" . 'php_info_print_table_row(' . count($rowArray) . ', ' .
+                        implode(', ', $rowArray) . ');' . PHP_EOL;
+                }
             }
+
+            $phpinfo .= "\t" . 'php_info_print_table_end();' . PHP_EOL;
         }
 
-        $entryPrinter->output('ZEND_FE_END');
+        return $phpinfo;
+    }
+
+    /**
+     * Sets extensions globals.
+     */
+    public function setExtensionGlobals(array $globals): void
+    {
+        foreach ($globals as $key => $value) {
+            $this->globals[$key] = $value;
+        }
+    }
+
+    public function setOptimizersPath(string $optimizersPath): void
+    {
+        $this->optimizersPath = $optimizersPath;
+    }
+
+    public function setPrototypesPath(string $prototypesPath): void
+    {
+        $this->prototypesPath = $prototypesPath;
+    }
 
-        return [$headerPrinter->getOutput(), $entryPrinter->getOutput()];
+    public function setTemplatesPath(string $templatesPath): void
+    {
+        $this->templatesPath = $templatesPath;
     }
 
     /**
-     * Check if the project must be phpized again.
+     * Generate IDE stubs.
      *
-     * @return bool
+     * @throws Exception
+     * @throws ReflectionException
      */
-    public function checkIfPhpized(): bool
+    public function stubs(bool $fromGenerate = false): void
     {
-        return !file_exists('ext/Makefile');
+        if (!$fromGenerate) {
+            $this->generate();
+        }
+
+        $this->logger->info('Generating stubs...');
+
+        $path = str_replace(
+            [
+                '%version%',
+                '%namespace%',
+            ],
+            [
+                $this->config->get('version'),
+                ucfirst($this->config->get('namespace')),
+            ],
+            $this->config->get('path', 'stubs')
+        );
+
+        (new Stubs\Generator($this->files))->generate(
+            $this->config->get('namespace'),
+            $path,
+            $this->config->get('indent', 'extra'),
+            $this->config->get('banner', 'stubs') ?? ''
+        );
     }
 
     /**
-     * Returns a short user path.
+     * Ensure that required extensions is present.
+     *
+     * @throws RuntimeException
      */
-    public static function getShortUserPath(string $path): string
+    private function assertRequiredExtensionsIsPresent(): void
     {
-        return str_replace('\\', '/', str_replace(getcwd().\DIRECTORY_SEPARATOR, '', $path));
+        $extensionRequires = $this->config->get('extensions', 'requires');
+        if (empty($extensionRequires)) {
+            return;
+        }
+
+        $extensions = [];
+        foreach ($extensionRequires as $value) {
+            // TODO: We'll use this as an object in the future.
+            if (!is_string($value)) {
+                continue;
+            }
+
+            if (!extension_loaded($value)) {
+                $extensions[] = $value;
+            }
+        }
+
+        if (!empty($extensions)) {
+            throw new RuntimeException(
+                sprintf(
+                    'Could not load extension(s): %s. You must load extensions above before build this extension.',
+                    implode(', ', $extensions)
+                )
+            );
+        }
     }
 
     /**
-     * Generate package-dependencies config for m4.
+     * Checks if the current directory is a valid Zephir project.
      *
-     * TODO: Move the template depending part to backend?
+     * @throws Exception
      */
-    public function generatePackageDependenciesM4(string $contentM4): string
+    private function checkDirectory(): string
     {
-        $packageDependencies = $this->config->get('package-dependencies');
-        if (!\is_array($packageDependencies)) {
-            return str_replace('%PROJECT_PACKAGE_DEPENDENCIES%', '', $contentM4);
+        $namespace = $this->config->get('namespace');
+        if (!$namespace) {
+            // TODO: Add more user friendly message.
+            // For example assume if the user call the command from the wrong dir
+            throw new Exception('Extension namespace cannot be loaded');
         }
 
-        $pkgconfigM4 = $this->backend->getTemplateFileContents('pkg-config.m4');
-        $pkgconfigCheckM4 = $this->backend->getTemplateFileContents('pkg-config-check.m4');
-        $extraCFlags = '';
-
-        foreach ($packageDependencies as $pkg => $version) {
-            $pkgM4Buf = $pkgconfigCheckM4;
-
-            $operator = '=';
-            $operatorCmd = '--exact-version';
-            $ar = explode('=', $version);
+        if (!is_string($namespace)) {
+            throw new Exception('Extension namespace is invalid');
+        }
 
-            if (1 === \count($ar)) {
-                if ('*' === $version) {
-                    $version = '0.0.0';
-                    $operator = '>=';
-                    $operatorCmd = '--atleast-version';
-                }
-            } else {
-                switch ($ar[0]) {
-                    case '<':
-                        $operator = '<=';
-                        $operatorCmd = '--max-version';
-                        break;
-                    case '>':
-                        $operator = '>=';
-                        $operatorCmd = '--atleast-version';
-                        break;
-                }
+        if (!$this->filesystem->isInitialized()) {
+            $this->filesystem->initialize();
+        }
 
-                $version = trim($ar[1]);
+        if (!$this->filesystem->exists('.')) {
+            if (!$this->checkIfPhpized()) {
+                $this->logger->info(
+                    'Zephir version has changed, use "zephir fullclean" to perform a full clean of the project'
+                );
             }
 
-            $toReplace = [
-                '%PACKAGE_LOWER%' => strtolower($pkg),
-                '%PACKAGE_UPPER%' => strtoupper($pkg),
-                '%PACKAGE_REQUESTED_VERSION%' => $operator.' '.$version,
-                '%PACKAGE_PKG_CONFIG_COMPARE_VERSION%' => $operatorCmd.'='.$version,
-            ];
+            $this->filesystem->makeDirectory('.');
+        }
 
-            foreach ($toReplace as $mark => $replace) {
-                $pkgM4Buf = str_replace($mark, $replace, $pkgM4Buf);
-            }
+        return $namespace;
+    }
 
-            $pkgconfigM4 .= $pkgM4Buf;
-            $extraCFlags .= '$PHP_'.strtoupper($pkg).'_INCS ';
+    /**
+     * Checks if a file must be copied.
+     *
+     * @param string $src
+     * @param string $dst
+     *
+     * @return bool
+     */
+    private function checkKernelFile(string $src, string $dst): bool
+    {
+        if (preg_match('#kernels/ZendEngine[2-9]/concat\.#', $src)) {
+            return true;
         }
 
-        $contentM4 = str_replace('%PROJECT_EXTRA_CFLAGS%', '%PROJECT_EXTRA_CFLAGS% '.$extraCFlags, $contentM4);
+        if (!file_exists($dst)) {
+            return false;
+        }
 
-        return str_replace('%PROJECT_PACKAGE_DEPENDENCIES%', $pkgconfigM4, $contentM4);
+        return md5_file($src) === md5_file($dst);
     }
 
     /**
-     * Pre-compiles classes creating a CompilerFile definition.
+     * Checks which files in the base kernel must be copied.
      *
-     * @throws IllegalStateException
+     * @throws Exception
      */
-    private function preCompile(string $filePath): void
+    private function checkKernelFiles(): bool
     {
-        if (!$this->parserManager->isAvailable()) {
-            throw new IllegalStateException($this->parserManager->requirements());
+        $kernelPath = 'ext' . DIRECTORY_SEPARATOR . 'kernel';
+
+        if (!file_exists($kernelPath)) {
+            if (!mkdir($kernelPath, 0775, true)) {
+                throw new Exception("Cannot create kernel directory: {$kernelPath}");
+            }
         }
 
-        if (preg_match('#\.zep$#', $filePath)) {
-            $className = str_replace(\DIRECTORY_SEPARATOR, '\\', $filePath);
-            $className = preg_replace('#.zep$#', '', $className);
+        $kernelPath       = realpath($kernelPath);
+        $sourceKernelPath = $this->backend->getInternalKernelPath();
 
-            $className = implode('\\', array_map('ucfirst', explode('\\', $className)));
+        $configured = $this->recursiveProcess(
+            $sourceKernelPath,
+            $kernelPath,
+            '@.*\.[ch]$@',
+            [$this, 'checkKernelFile']
+        );
 
-            $compilerFile = $this->compilerFileFactory->create($className, $filePath);
-            $compilerFile->preCompile($this);
+        if (!$configured) {
+            $this->logger->info('Cleaning old kernel files...');
+            $this->recursiveDeletePath($kernelPath, '@^.*\.[lcho]$@');
 
-            $this->files[$className] = $compilerFile;
-            $this->definitions[$className] = $compilerFile->getClassDefinition();
+            @mkdir($kernelPath);
+
+            $this->logger->info('Copying new kernel files...');
+            $this->recursiveProcess($sourceKernelPath, $kernelPath, '@^.*\.[ch]$@');
         }
+
+        return !$configured;
     }
 
     /**
-     * Recursively pre-compiles all sources found in the given path.
-     *
-     * @throws IllegalStateException
-     * @throws InvalidArgumentException
+     * Returns current GCC version.
      */
-    private function recursivePreCompile(string $path): void
+    private function getGccVersion(): string
     {
-        if (!is_dir($path)) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    "An invalid path was passed to the compiler. Unable to obtain the '%s%s%s' directory.",
-                    getcwd(),
-                    \DIRECTORY_SEPARATOR,
-                    $path
-                )
-            );
+        if (Os::isWindows()) {
+            return '0.0.0';
         }
 
-        /**
-         * Pre compile all files.
-         */
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($path),
-            \RecursiveIteratorIterator::SELF_FIRST
-        );
-
-        $files = [];
-        foreach ($iterator as $item) {
-            if (!$item->isDir()) {
-                $files[] = $item->getPathname();
-            }
+        if ($this->filesystem->exists('gcc-version')) {
+            return $this->filesystem->read('gcc-version');
         }
 
-        sort($files, SORT_STRING);
-        foreach ($files as $file) {
-            $this->preCompile($file);
+        $this->filesystem->system('gcc -dumpversion', 'stdout', 'gcc-version');
+        $lines = $this->filesystem->file('gcc-version');
+        $lines = array_filter($lines);
+
+        $lastLine = $lines[count($lines) - 1];
+        if (preg_match('/\d+\.\d+\.\d+/', $lastLine, $matches)) {
+            return $matches[0];
         }
+
+        return '0.0.0';
     }
 
-    /**
-     * Copies the base kernel to the extension destination.
-     *
-     * TODO:
-     *
-     * @deprecated
-     *
-     * @param        $src
-     * @param        $dest
-     * @param string $pattern
-     * @param mixed  $callback
-     *
-     * @return bool
-     */
-    private function recursiveProcess($src, $dest, $pattern = null, $callback = 'copy')
+    private function getWindowsReleaseDir(): string
     {
-        $success = true;
-        $iterator = new \DirectoryIterator($src);
-        foreach ($iterator as $item) {
-            $pathName = $item->getPathname();
-            if (!is_readable($pathName)) {
-                $this->logger->warning('File is not readable :'.$pathName);
-                continue;
+        if ($this->isZts()) {
+            if (PHP_INT_SIZE === 4) {
+                // 32-bit version of PHP
+                return 'ext\\Release_TS';
             }
 
-            $fileName = $item->getFileName();
-
-            if ($item->isDir()) {
-                if ('.' != $fileName && '..' != $fileName && '.libs' != $fileName) {
-                    if (!is_dir($dest.\DIRECTORY_SEPARATOR.$fileName)) {
-                        mkdir($dest.\DIRECTORY_SEPARATOR.$fileName, 0755, true);
-                    }
-                    $this->recursiveProcess($pathName, $dest.\DIRECTORY_SEPARATOR.$fileName, $pattern, $callback);
-                }
-            } elseif (!$pattern || ($pattern && 1 === preg_match($pattern, $fileName))) {
-                $path = $dest.\DIRECTORY_SEPARATOR.$fileName;
-                $success = $success && \call_user_func($callback, $pathName, $path);
+            if (PHP_INT_SIZE === 8) {
+                // 64-bit version of PHP
+                return 'ext\\x64\\Release_TS';
             }
+
+            // fallback
+            return 'ext\\Release_TS';
         }
 
-        return $success;
+        if (PHP_INT_SIZE === 4) {
+            // 32-bit version of PHP
+            return 'ext\\Release';
+        }
+
+        if (PHP_INT_SIZE === 8) {
+            // 64-bit version of PHP
+            return 'ext\\x64\\Release';
+        }
+
+        // fallback
+        return 'ext\\Release';
     }
 
-    /**
-     * Recursively deletes files in a specified location.
-     *
-     * @deprecated
-     *
-     * @param string $path Directory to deletes files
-     * @param string $mask Regular expression to deletes files
-     */
-    private function recursiveDeletePath($path, $mask): void
+    private function isZts(): bool
     {
-        if (!file_exists($path) || !is_dir($path) || !is_readable($path)) {
-            $this->logger->warning("Directory '{$path}' is not readable. Skip...");
-
-            return;
+        if (defined('PHP_ZTS') && PHP_ZTS === 1) {
+            return true;
         }
 
-        $objects = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($path),
-            \RecursiveIteratorIterator::SELF_FIRST
-        );
+        ob_start();
+        phpinfo(INFO_GENERAL);
 
-        foreach ($objects as $name => $object) {
-            if (preg_match($mask, $name)) {
-                @unlink($name);
-            }
-        }
+        return (bool)preg_match('/Thread\s*Safety\s*enabled/i', strip_tags(ob_get_clean()));
     }
 
     /**
@@ -1950,7 +2020,7 @@ private function loadConstantsSources(array $constantsSources): void
     {
         foreach ($constantsSources as $constantsSource) {
             if (!file_exists($constantsSource)) {
-                throw new Exception("File '".$constantsSource."' with constants definitions");
+                throw new Exception("File '" . $constantsSource . "' with constants definitions");
             }
 
             foreach (file($constantsSource) as $line) {
@@ -1965,6 +2035,31 @@ private function loadConstantsSources(array $constantsSources): void
         }
     }
 
+    /**
+     * Pre-compiles classes creating a CompilerFile definition.
+     *
+     * @throws IllegalStateException
+     */
+    private function preCompile(string $filePath): void
+    {
+        if (!$this->parserManager->isAvailable()) {
+            throw new IllegalStateException($this->parserManager->requirements());
+        }
+
+        if (preg_match('#\.zep$#', $filePath)) {
+            $className = str_replace(DIRECTORY_SEPARATOR, '\\', $filePath);
+            $className = preg_replace('#.zep$#', '', $className);
+
+            $className = implode('\\', array_map('ucfirst', explode('\\', $className)));
+
+            $compilerFile = $this->compilerFileFactory->create($className, $filePath);
+            $compilerFile->preCompile($this);
+
+            $this->files[$className]       = $compilerFile;
+            $this->definitions[$className] = $compilerFile->getClassDefinition();
+        }
+    }
+
     /**
      * Process config.w32 sections.
      *
@@ -1977,7 +2072,7 @@ private function processAddSources(array $sources, string $project): array
     {
         $groupSources = [];
         foreach ($sources as $source) {
-            $dirName = str_replace(\DIRECTORY_SEPARATOR, '/', \dirname($source));
+            $dirName = str_replace(DIRECTORY_SEPARATOR, '/', dirname($source));
             if (!isset($groupSources[$dirName])) {
                 $groupSources[$dirName] = [];
             }
@@ -1987,213 +2082,176 @@ private function processAddSources(array $sources, string $project): array
 
         $groups = [];
         foreach ($groupSources as $dirname => $files) {
-            $groups[] = 'ADD_SOURCES(configure_module_dirname + "/'.$dirname.'", "'.implode(' ', $files).'", "'.$project.'");';
+            $groups[] = 'ADD_SOURCES(configure_module_dirname + "/'
+                . $dirname
+                . '", "'
+                . implode(' ', $files)
+                . '", "'
+                . $project
+                . '");'
+            ;
         }
 
         return $groups;
     }
 
     /**
-     * Ensure that required extensions is present.
+     * Recursively deletes files in a specified location.
+     *
+     * @param string $path Directory to deletes files
+     * @param string $mask Regular expression to deletes files
+     *
+     * @deprecated
      *
-     * @throws RuntimeException
      */
-    private function assertRequiredExtensionsIsPresent(): void
+    private function recursiveDeletePath($path, $mask): void
     {
-        $extensionRequires = $this->config->get('extensions', 'requires');
-        if (empty($extensionRequires)) {
+        if (!file_exists($path) || !is_dir($path) || !is_readable($path)) {
+            $this->logger->warning("Directory '{$path}' is not readable. Skip...");
+
             return;
         }
 
-        $extensions = [];
-        foreach ($extensionRequires as $value) {
-            // TODO: We'll use this as an object in the future.
-            if (!\is_string($value)) {
-                continue;
-            }
+        $objects = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($path),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
 
-            if (!\extension_loaded($value)) {
-                $extensions[] = $value;
+        foreach ($objects as $name => $object) {
+            if (preg_match($mask, $name)) {
+                @unlink($name);
             }
         }
-
-        if (!empty($extensions)) {
-            throw new RuntimeException(
-                sprintf(
-                    'Could not load extension(s): %s. You must load extensions above before build this extension.',
-                    implode(', ', $extensions)
-                )
-            );
-        }
     }
 
     /**
-     * Checks if a file must be copied.
-     *
-     * @param string $src
-     * @param string $dst
+     * Recursively pre-compiles all sources found in the given path.
      *
-     * @return bool
+     * @throws IllegalStateException
+     * @throws InvalidArgumentException
      */
-    private function checkKernelFile(string $src, string $dst): bool
+    private function recursivePreCompile(string $path): void
     {
-        if (preg_match('#kernels/ZendEngine[2-9]/concat\.#', $src)) {
-            return true;
+        if (!is_dir($path)) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    "An invalid path was passed to the compiler. Unable to obtain the '%s%s%s' directory.",
+                    getcwd(),
+                    DIRECTORY_SEPARATOR,
+                    $path
+                )
+            );
         }
 
-        if (!file_exists($dst)) {
-            return false;
+        /**
+         * Pre compile all files.
+         */
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($path),
+            RecursiveIteratorIterator::SELF_FIRST
+        );
+
+        $files = [];
+        foreach ($iterator as $item) {
+            if (!$item->isDir()) {
+                $files[] = $item->getPathname();
+            }
         }
 
-        return md5_file($src) === md5_file($dst);
+        sort($files, SORT_STRING);
+        foreach ($files as $file) {
+            $this->preCompile($file);
+        }
     }
 
     /**
-     * Checks which files in the base kernel must be copied.
+     * Copies the base kernel to the extension destination.
+     *
+     * TODO:
+     *
+     * @param        $src
+     * @param        $dest
+     * @param string $pattern
+     * @param mixed  $callback
+     *
+     * @return bool
+     * @deprecated
      *
-     * @throws Exception
      */
-    private function checkKernelFiles(): bool
+    private function recursiveProcess($src, $dest, $pattern = null, $callback = 'copy')
     {
-        $kernelPath = 'ext'.\DIRECTORY_SEPARATOR.'kernel';
-
-        if (!file_exists($kernelPath)) {
-            if (!mkdir($kernelPath, 0775, true)) {
-                throw new Exception("Cannot create kernel directory: {$kernelPath}");
+        $success  = true;
+        $iterator = new DirectoryIterator($src);
+        foreach ($iterator as $item) {
+            $pathName = $item->getPathname();
+            if (!is_readable($pathName)) {
+                $this->logger->warning('File is not readable :' . $pathName);
+                continue;
             }
-        }
-
-        $kernelPath = realpath($kernelPath);
-        $sourceKernelPath = $this->backend->getInternalKernelPath();
-
-        $configured = $this->recursiveProcess(
-            $sourceKernelPath,
-            $kernelPath,
-            '@.*\.[ch]$@',
-            [$this, 'checkKernelFile']
-        );
-
-        if (!$configured) {
-            $this->logger->info('Cleaning old kernel files...');
-            $this->recursiveDeletePath($kernelPath, '@^.*\.[lcho]$@');
 
-            @mkdir($kernelPath);
+            $fileName = $item->getFileName();
 
-            $this->logger->info('Copying new kernel files...');
-            $this->recursiveProcess($sourceKernelPath, $kernelPath, '@^.*\.[ch]$@');
+            if ($item->isDir()) {
+                if ('.' != $fileName && '..' != $fileName && '.libs' != $fileName) {
+                    if (!is_dir($dest . DIRECTORY_SEPARATOR . $fileName)) {
+                        mkdir($dest . DIRECTORY_SEPARATOR . $fileName, 0755, true);
+                    }
+                    $this->recursiveProcess($pathName, $dest . DIRECTORY_SEPARATOR . $fileName, $pattern, $callback);
+                }
+            } elseif (!$pattern || ($pattern && 1 === preg_match($pattern, $fileName))) {
+                $path    = $dest . DIRECTORY_SEPARATOR . $fileName;
+                $success = $success && call_user_func($callback, $pathName, $path);
+            }
         }
 
-        return !$configured;
+        return $success;
     }
 
     /**
-     * Checks if the current directory is a valid Zephir project.
+     * Resolves path to the internal optimizers.
      *
-     * @throws Exception
+     * @throws IllegalStateException in case of absence internal optimizers directory
      */
-    private function checkDirectory(): string
+    private function resolveOptimizersPath(): ?string
     {
-        $namespace = $this->config->get('namespace');
-        if (!$namespace) {
-            // TODO: Add more user friendly message.
-            // For example assume if the user call the command from the wrong dir
-            throw new Exception('Extension namespace cannot be loaded');
-        }
-
-        if (!\is_string($namespace)) {
-            throw new Exception('Extension namespace is invalid');
-        }
+        $optimizersPath = $this->optimizersPath;
 
-        if (!$this->filesystem->isInitialized()) {
-            $this->filesystem->initialize();
+        // fallback
+        if (empty($optimizersPath)) {
+            $optimizersPath = __DIR__ . '/Optimizers';
         }
 
-        if (!$this->filesystem->exists('.')) {
-            if (!$this->checkIfPhpized()) {
-                $this->logger->info(
-                    'Zephir version has changed, use "zephir fullclean" to perform a full clean of the project'
-                );
-            }
-
-            $this->filesystem->makeDirectory('.');
+        if (!is_dir($optimizersPath) || !is_readable($optimizersPath)) {
+            throw new IllegalStateException('Unable to resolve internal optimizers directory.');
         }
 
-        return $namespace;
+        return $optimizersPath;
     }
 
     /**
-     * Returns current GCC version.
+     * Resolves path to the internal prototypes.
      */
-    private function getGccVersion(): string
+    private function resolvePrototypesPath(): ?string
     {
-        if (Os::isWindows()) {
-            return '0.0.0';
-        }
+        $prototypesPath = $this->prototypesPath;
 
-        if ($this->filesystem->exists('gcc-version')) {
-            return $this->filesystem->read('gcc-version');
+        // fallback
+        if (empty($prototypesPath)) {
+            $prototypesPath = dirname(__DIR__) . '/prototypes';
         }
 
-        $this->filesystem->system('gcc -dumpversion', 'stdout', 'gcc-version');
-        $lines = $this->filesystem->file('gcc-version');
-        $lines = array_filter($lines);
-
-        $lastLine = $lines[\count($lines) - 1];
-        if (preg_match('/\d+\.\d+\.\d+/', $lastLine, $matches)) {
-            return $matches[0];
+        if (!is_dir($prototypesPath) || !is_readable($prototypesPath)) {
+            throw new IllegalStateException('Unable to resolve internal prototypes directory.');
         }
 
-        return '0.0.0';
+        return $prototypesPath;
     }
 
     private function toUnixPaths(array $paths): array
     {
         return array_map(
-            static fn (string $path): string => str_replace(\DIRECTORY_SEPARATOR, '/', $path),
+            static fn(string $path): string => str_replace(DIRECTORY_SEPARATOR, '/', $path),
             $paths
         );
     }
-
-    private function isZts(): bool
-    {
-        if (\defined('PHP_ZTS') && \PHP_ZTS === 1) {
-            return true;
-        }
-
-        ob_start();
-        phpinfo(\INFO_GENERAL);
-
-        return (bool) preg_match('/Thread\s*Safety\s*enabled/i', strip_tags(ob_get_clean()));
-    }
-
-    private function getWindowsReleaseDir(): string
-    {
-        if ($this->isZts()) {
-            if (\PHP_INT_SIZE === 4) {
-                // 32-bit version of PHP
-                return 'ext\\Release_TS';
-            }
-
-            if (\PHP_INT_SIZE === 8) {
-                // 64-bit version of PHP
-                return 'ext\\x64\\Release_TS';
-            }
-
-            // fallback
-            return 'ext\\Release_TS';
-        }
-
-        if (\PHP_INT_SIZE === 4) {
-            // 32-bit version of PHP
-            return 'ext\\Release';
-        }
-
-        if (\PHP_INT_SIZE === 8) {
-            // 64-bit version of PHP
-            return 'ext\\x64\\Release';
-        }
-
-        // fallback
-        return 'ext\\Release';
-    }
 }
diff --git a/src/Compiler/FileInterface.php b/src/Compiler/FileInterface.php
index 0b7f2c0d05..3ca4e5fb8a 100644
--- a/src/Compiler/FileInterface.php
+++ b/src/Compiler/FileInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Compiler;
 
 use Zephir\Class\Definition\Definition;
@@ -22,18 +22,18 @@
 interface FileInterface
 {
     /**
-     * Checks if the class file belongs to an external dependency or not.
+     * Returns the class definition related to the compiled file.
      *
-     * @return bool
+     * @return Definition
      */
-    public function isExternal();
+    public function getClassDefinition();
 
     /**
-     * Returns the class definition related to the compiled file.
+     * Checks if the class file belongs to an external dependency or not.
      *
-     * @return Definition
+     * @return bool
      */
-    public function getClassDefinition();
+    public function isExternal();
 
     /**
      * Pre-compiles a Zephir file.
diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index e2fa41bfea..f1606b0cb8 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -15,6 +15,7 @@
 
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
+use ReflectionException;
 use Zephir\Class\Constant;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Definition\DefinitionRuntime;
@@ -29,6 +30,12 @@
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
 
+use function count;
+use function dirname;
+use function is_array;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * This class represents every file compiled in a project.
  * Every file may contain a class or an interface.
@@ -37,42 +44,35 @@ final class CompilerFile implements FileInterface
 {
     use LoggerAwareTrait;
 
-    private ?string $namespace = null;
-
-    private ?string $className = null;
-
     /**
-     * @var string|null
+     * @var AliasManager
      */
-    private ?string $filePath = null;
-
+    private AliasManager $aliasManager;
     /**
-     * @var bool
+     * @var Definition|null
      */
-    private bool $external = false;
-
+    private ?Definition $classDefinition = null;
+    private ?string     $className       = null;
     /**
-     * Original internal representation (IR) of the file.
-     *
-     * @var array|null
+     * @var string|null
      */
-    private ?array $ir = null;
-
+    private ?string $compiledFile = null;
     /**
-     * @var mixed
+     * @var Config
      */
-    private $originalNode;
-
+    private Config $config;
+    /**
+     * @var bool
+     */
+    private bool $external = false;
     /**
      * @var string|null
      */
-    private ?string $compiledFile = null;
-
+    private ?string $filePath = null;
     /**
-     * @var Definition|null
+     * @var FileSystemInterface
      */
-    private ?Definition $classDefinition = null;
-
+    private FileSystemInterface $filesystem;
     /**
      * @var FunctionDefinition[]
      */
@@ -82,21 +82,17 @@ final class CompilerFile implements FileInterface
      * @var array
      */
     private array $headerCBlocks = [];
-
-    /**
-     * @var Config
-     */
-    private Config $config;
-
     /**
-     * @var AliasManager
+     * Original internal representation (IR) of the file.
+     *
+     * @var array|null
      */
-    private AliasManager $aliasManager;
-
+    private ?array  $ir        = null;
+    private ?string $namespace = null;
     /**
-     * @var FileSystemInterface
+     * @var mixed
      */
-    private FileSystemInterface $filesystem;
+    private $originalNode;
 
     /**
      * CompilerFile constructor.
@@ -110,56 +106,10 @@ public function __construct(
         AliasManager $aliasManager,
         FileSystemInterface $filesystem
     ) {
-        $this->config = $config;
-        $this->logger = new NullLogger();
+        $this->config       = $config;
+        $this->logger       = new NullLogger();
         $this->aliasManager = $aliasManager;
-        $this->filesystem = $filesystem;
-    }
-
-    /**
-     * @param string $filePath
-     */
-    public function setFilePath(string $filePath): void
-    {
-        $this->filePath = $filePath;
-    }
-
-    /**
-     * @param string $className
-     */
-    public function setClassName(string $className): void
-    {
-        $this->className = $className;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return Definition
-     */
-    public function getClassDefinition()
-    {
-        $this->classDefinition->setAliasManager($this->aliasManager);
-
-        return $this->classDefinition;
-    }
-
-    /**
-     * Sets if the class belongs to an external dependency or not.
-     *
-     * @param bool $external
-     */
-    public function setIsExternal($external): void
-    {
-        $this->external = (bool) $external;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isExternal(): bool
-    {
-        return $this->external;
+        $this->filesystem   = $filesystem;
     }
 
     /**
@@ -185,260 +135,419 @@ public function addFunction(Compiler $compiler, FunctionDefinition $func, array
         $this->functionDefinitions[$funcName] = $func;
     }
 
-    /**
-     * Compiles the file generating a JSON intermediate representation.
-     *
-     * @param Compiler $compiler
-     *
-     * @return array
-     *
-     * @throws ParseException
-     * @throws IllegalStateException if the intermediate representation is not of type 'array'
-     */
-    public function genIR(Compiler $compiler): array
+    public function applyClassHeaders(CompilationContext $compilationContext): void
     {
-        $normalizedPath = $this->filesystem->normalizePath($this->filePath);
+        $classDefinition = $this->classDefinition;
 
-        $compilePath = "{$normalizedPath}.json";
-        $zepRealPath = realpath($this->filePath);
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
 
-        if ($this->filesystem->exists($compilePath)) {
-            if ($this->filesystem->modificationTime($compilePath) < filemtime($zepRealPath)) {
-                $this->filesystem->delete($compilePath);
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
+            $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
+            $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
+        } else {
+            $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
+        }
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
             }
         }
 
-        if (!$this->filesystem->exists($compilePath)) {
-            $parser = $compiler->getParserManager()->getParser();
-            $ir = $parser->parse($zepRealPath);
-            $this->filesystem->write($compilePath, json_encode($ir, JSON_PRETTY_PRINT));
-        } else {
-            $ir = json_decode($this->filesystem->read($compilePath), true);
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
         }
 
-        return $ir;
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
     }
 
     /**
-     * Compiles the class/interface contained in the file.
+     * Check dependencies.
      *
-     * @param CompilationContext $compilationContext
+     * @param Compiler $compiler
      *
-     * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
-    public function compileClass(CompilationContext $compilationContext): void
+    public function checkDependencies(Compiler $compiler): void
     {
-        $this->classDefinition->compile($compilationContext);
-    }
+        $classDefinition = $this->classDefinition;
 
-    /**
-     * Compiles a function.
-     *
-     * @param CompilationContext $compilationContext
-     * @param FunctionDefinition $functionDefinition
-     *
-     * @throws Exception
-     */
-    public function compileFunction(CompilationContext $compilationContext, FunctionDefinition $functionDefinition): void
-    {
-        /** Make sure we do not produce calls like ZEPHIR_CALL_SELF */
-        $bakClassDefinition = $compilationContext->classDefinition;
-        $compilationContext->classDefinition = null;
-        $compilationContext->currentMethod = $functionDefinition;
+        $extendedClass = $classDefinition->getExtendsClass();
+        if ($extendedClass) {
+            if ('class' == $classDefinition->getType()) {
+                if ($compiler->isClass($extendedClass)) {
+                    $extendedDefinition = $compiler->getClassDefinition($extendedClass);
+                    $classDefinition->setExtendsClassDefinition($extendedDefinition);
+                } else {
+                    if ($compiler->isBundledClass($extendedClass)) {
+                        $extendedDefinition = $compiler->getInternalClassDefinition($extendedClass);
+                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
+                    } else {
+                        $extendedDefinition = new DefinitionRuntime($extendedClass);
+                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
 
-        $codePrinter = $compilationContext->codePrinter;
-        $codePrinter->output('PHP_FUNCTION('.$functionDefinition->getInternalName().') {');
-        $functionDefinition->compile($compilationContext);
-        $codePrinter->output('}');
-        $codePrinter->outputBlankLine();
+                        $this->logger->warning(
+                            sprintf(
+                                'Cannot locate class "%s" when extending class "%s"',
+                                $extendedClass,
+                                $classDefinition->getCompleteName()
+                            ),
+                            ['nonexistent-class', $this->originalNode]
+                        );
+                    }
+                }
+            } else {
+                // Whether the $extendedClass is part of the compiled extension
+                if ($compiler->isInterface($extendedClass)) {
+                    $extendedDefinition = $compiler->getClassDefinition($extendedClass);
+                    $classDefinition->setExtendsClassDefinition($extendedDefinition);
+                } else {
+                    if ($compiler->isBundledInterface($extendedClass)) {
+                        $extendedDefinition = $compiler->getInternalClassDefinition($extendedClass);
+                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
+                    } else {
+                        $extendedDefinition = new DefinitionRuntime($extendedClass);
+                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
 
-        /* Restore */
-        $compilationContext->classDefinition = $bakClassDefinition;
-        $compilationContext->currentMethod = null;
+                        $this->logger->warning(
+                            sprintf(
+                                'Cannot locate class "%s" when extending interface "%s"',
+                                $extendedClass,
+                                $classDefinition->getCompleteName()
+                            ),
+                            ['nonexistent-class', $this->originalNode]
+                        );
+                    }
+                }
+            }
+        }
+
+        $interfaceDefinitions = [];
+        foreach ($classDefinition->getImplementedInterfaces() as $interface) {
+            if ($compiler->isInterface($interface)) {
+                $interfaceDefinitions[$interface] = $compiler->getClassDefinition($interface);
+            } else {
+                if ($compiler->isBundledInterface($interface)) {
+                    $interfaceDefinitions[$interface] = $compiler->getInternalClassDefinition($interface);
+                } else {
+                    if ($extendedClass !== null) {
+                        $classDefinition->setExtendsClassDefinition(new DefinitionRuntime($extendedClass));
+                    }
+
+                    $this->logger->warning(
+                        sprintf(
+                            'Cannot locate class "%s" when extending interface "%s"',
+                            $interface,
+                            $classDefinition->getCompleteName()
+                        ),
+                        ['nonexistent-class', $this->originalNode]
+                    );
+                }
+            }
+        }
+
+        if (count($interfaceDefinitions) > 0) {
+            $classDefinition->setImplementedInterfaceDefinitions($interfaceDefinitions);
+        }
     }
 
     /**
-     * Compiles a comment as a top-level statement.
+     * Compiles the file.
      *
-     * @param CompilationContext $compilationContext
-     * @param array              $topStatement
+     * @param Compiler       $compiler
+     * @param StringsManager $stringsManager
+     *
+     * @throws CompilerException
      */
-    public function compileComment(CompilationContext $compilationContext, $topStatement): void
+    public function compile(Compiler $compiler, StringsManager $stringsManager): void
     {
-        $compilationContext->codePrinter->output('/'.$topStatement['value'].'/');
-    }
-
-    /**
-     * Creates a definition for an interface.
-     *
-     * @param string $namespace
-     * @param array  $topStatement
-     * @param array  $docblock
-     */
-    public function preCompileInterface($namespace, $topStatement, $docblock): void
-    {
-        $classDefinition = new Definition($namespace, $topStatement['name']);
-        $classDefinition->setIsExternal($this->external);
+        if (!$this->ir) {
+            throw new CompilerException('Unable to locate the intermediate representation of the compiled file');
+        }
 
-        if (isset($topStatement['extends'])) {
-            foreach ($topStatement['extends'] as &$extend) {
-                $extend['value'] = $this->getFullName($extend['value']);
-            }
-            $classDefinition->setImplementsInterfaces($topStatement['extends']);
+        /**
+         * External classes should not be compiled as part of the extension
+         */
+        if ($this->external) {
+            return;
         }
 
-        $classDefinition->setType('interface');
+        /**
+         * Compilation context stores common objects required by compilation entities.
+         */
+        $compilationContext = new CompilationContext();
 
-        if (\is_array($docblock)) {
-            $classDefinition->setDocBlock($docblock['value']);
-        }
+        /**
+         * Set global compiler in the compilation context
+         */
+        $compilationContext->compiler = $compiler;
 
-        if (isset($topStatement['definition'])) {
-            $definition = $topStatement['definition'];
+        /**
+         * Set global config in the compilation context
+         */
+        $compilationContext->config = $this->config;
 
-            /**
-             * Register constants
-             */
-            if (isset($definition['constants'])) {
-                foreach ($definition['constants'] as $constant) {
-                    $classConstant = new Constant(
-                        $constant['name'],
-                        $constant['default'] ?? null,
-                        $constant['docblock'] ?? null
-                    );
-                    $classDefinition->addConstant($classConstant);
-                }
-            }
+        /**
+         * Set global logger in the compilation context
+         */
+        $compilationContext->logger = $this->logger;
 
-            /**
-             * Register methods
-             */
-            if (isset($definition['methods'])) {
-                foreach ($definition['methods'] as $method) {
-                    $classMethod = new Method(
-                        $classDefinition,
-                        $method['visibility'],
-                        $method['name'],
-                        isset($method['parameters']) ? new Parameters($method['parameters']) : null,
-                        null,
-                        $method['docblock'] ?? null,
-                        $method['return-type'] ?? null,
-                        $method
-                    );
-                    $classDefinition->addMethod($classMethod, $method);
-                }
-            }
-        }
+        /**
+         * Set global strings manager
+         */
+        $compilationContext->stringsManager = $stringsManager;
+        $compilationContext->backend        = $compiler->backend;
 
-        $this->classDefinition = $classDefinition;
-    }
+        /**
+         * Headers manager.
+         */
+        $headersManager                     = new HeadersManager();
+        $compilationContext->headersManager = $headersManager;
 
-    /**
-     * Creates a definition for a class.
-     *
-     * @param CompilationContext $compilationContext
-     * @param string             $namespace
-     * @param array              $topStatement
-     * @param array              $docblock
-     */
-    public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock): void
-    {
-        $classDefinition = new Definition($namespace, $topStatement['name']);
-        $classDefinition->setIsExternal($this->external);
+        /**
+         * Main code-printer for the file.
+         */
+        $codePrinter                     = new Printer();
+        $compilationContext->codePrinter = $codePrinter;
 
-        if (isset($topStatement['extends'])) {
-            $classDefinition->setExtendsClass($this->getFullName($topStatement['extends']));
-        }
+        /**
+         * Alias manager
+         */
+        $compilationContext->aliasManager = $this->aliasManager;
 
-        if (isset($topStatement['implements'])) {
-            foreach ($topStatement['implements'] as &$implement) {
-                $implement['value'] = $this->getFullName($implement['value']);
+        $codePrinter->outputBlankLine();
+
+        $class     = false;
+        $interface = false;
+
+        foreach ($this->ir as $topStatement) {
+            switch ($topStatement['type']) {
+                case 'class':
+                case 'interface':
+                    if ($interface || $class) {
+                        throw new CompilerException('More than one class defined in the same file', $topStatement);
+                    }
+                    $class = true;
+                    $this->compileClass($compilationContext);
+                    break;
+
+                case 'comment':
+                    $this->compileComment($compilationContext, $topStatement);
+                    break;
+
+                default:
+                    break;
             }
-            $classDefinition->setImplementsInterfaces($topStatement['implements']);
         }
 
-        if (isset($topStatement['abstract'])) {
-            $classDefinition->setIsAbstract((bool) $topStatement['abstract']);
+        /* ensure functions are handled last */
+        foreach ($this->functionDefinitions as $funcDef) {
+            $this->compileFunction($compilationContext, $funcDef);
         }
 
-        if (isset($topStatement['final'])) {
-            $classDefinition->setIsFinal((bool) $topStatement['final']);
-        }
+        /* apply headers */
+        $this->applyClassHeaders($compilationContext);
 
-        if (\is_array($docblock)) {
-            $classDefinition->setDocBlock($docblock['value']);
+        $classDefinition = $this->classDefinition;
+        if (!$classDefinition) {
+            $this->ir = null;
+
+            return;
         }
 
-        if (isset($topStatement['definition'])) {
-            $definition = $topStatement['definition'];
+        $classDefinition->setOriginalNode($this->originalNode);
 
-            if (isset($definition['properties'])) {
-                foreach ($definition['properties'] as $property) {
-                    /**
-                     * Add property to the definition
-                     */
-                    $classDefinition->addProperty(new Property(
-                        $classDefinition,
-                        $property['visibility'],
-                        $property['name'],
-                        $property['default'] ?? null,
-                        $property['docblock'] ?? null,
-                        $property
-                    ));
+        $completeName = $classDefinition->getCompleteName();
 
-                    /**
-                     * Check and process shortcuts
-                     */
-                    if (isset($property['shortcuts'])) {
-                        $this->processShortcuts($property, $classDefinition);
-                    }
-                }
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
             }
+        }
 
+        /**
+         * If the file does not exist we create it for the first time
+         */
+        if (!file_exists($filePath)) {
+            file_put_contents($filePath, $codePrinter->getOutput());
+            if ($compilationContext->headerPrinter) {
+                file_put_contents($filePathHeader, $compilationContext->headerPrinter->getOutput());
+            }
+        } else {
             /**
-             * Register constants
+             * Use md5 hash to avoid rewrite the file again and again when it hasn't changed
+             * thus avoiding unnecessary recompilations.
              */
-            if (isset($definition['constants'])) {
-                foreach ($definition['constants'] as $constant) {
-                    $classDefinition->addConstant(new Constant(
-                        $constant['name'],
-                        $constant['default'] ?? null,
-                        $constant['docblock'] ?? null
-                    ));
-                }
+            $output = $codePrinter->getOutput();
+            $hash   = $this->filesystem->getHashFile('md5', $filePath, true);
+            if (md5($output) != $hash) {
+                file_put_contents($filePath, $output);
             }
 
-            /**
-             * Register methods
-             */
-            if (isset($definition['methods'])) {
-                foreach ($definition['methods'] as $method) {
-                    $classDefinition->addMethod(new Method(
-                        $classDefinition,
-                        $method['visibility'],
-                        $method['name'],
-                        isset($method['parameters']) ? new Parameters($method['parameters']) : null,
-                        isset($method['statements']) ? new StatementsBlock($method['statements']) : null,
-                        $method['docblock'] ?? null,
-                        $method['return-type'] ?? null,
-                        $method
-                    ), $method);
+            if ($compilationContext->headerPrinter) {
+                $output = $compilationContext->headerPrinter->getOutput();
+                $hash   = $this->filesystem->getHashFile('md5', $filePathHeader, true);
+                if (md5($output) != $hash) {
+                    file_put_contents($filePathHeader, $output);
                 }
             }
         }
 
-        $this->classDefinition = $classDefinition;
+        /**
+         * Add to file compiled
+         */
+        $this->compiledFile = $path . '.c';
+        $this->ir           = null;
+    }
+
+    /**
+     * Compiles the class/interface contained in the file.
+     *
+     * @param CompilationContext $compilationContext
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function compileClass(CompilationContext $compilationContext): void
+    {
+        $this->classDefinition->compile($compilationContext);
+    }
+
+    /**
+     * Compiles a comment as a top-level statement.
+     *
+     * @param CompilationContext $compilationContext
+     * @param array              $topStatement
+     */
+    public function compileComment(CompilationContext $compilationContext, $topStatement): void
+    {
+        $compilationContext->codePrinter->output('/' . $topStatement['value'] . '/');
+    }
+
+    /**
+     * Compiles a function.
+     *
+     * @param CompilationContext $compilationContext
+     * @param FunctionDefinition $functionDefinition
+     *
+     * @throws Exception
+     */
+    public function compileFunction(
+        CompilationContext $compilationContext,
+        FunctionDefinition $functionDefinition
+    ): void {
+        /** Make sure we do not produce calls like ZEPHIR_CALL_SELF */
+        $bakClassDefinition                  = $compilationContext->classDefinition;
+        $compilationContext->classDefinition = null;
+        $compilationContext->currentMethod   = $functionDefinition;
+
+        $codePrinter = $compilationContext->codePrinter;
+        $codePrinter->output('PHP_FUNCTION(' . $functionDefinition->getInternalName() . ') {');
+        $functionDefinition->compile($compilationContext);
+        $codePrinter->output('}');
+        $codePrinter->outputBlankLine();
+
+        /* Restore */
+        $compilationContext->classDefinition = $bakClassDefinition;
+        $compilationContext->currentMethod   = null;
+    }
+
+    /**
+     * Compiles the file generating a JSON intermediate representation.
+     *
+     * @param Compiler $compiler
+     *
+     * @return array
+     *
+     * @throws ParseException
+     * @throws IllegalStateException if the intermediate representation is not of type 'array'
+     */
+    public function genIR(Compiler $compiler): array
+    {
+        $normalizedPath = $this->filesystem->normalizePath($this->filePath);
+
+        $compilePath = "{$normalizedPath}.json";
+        $zepRealPath = realpath($this->filePath);
+
+        if ($this->filesystem->exists($compilePath)) {
+            if ($this->filesystem->modificationTime($compilePath) < filemtime($zepRealPath)) {
+                $this->filesystem->delete($compilePath);
+            }
+        }
+
+        if (!$this->filesystem->exists($compilePath)) {
+            $parser = $compiler->getParserManager()->getParser();
+            $ir     = $parser->parse($zepRealPath);
+            $this->filesystem->write($compilePath, json_encode($ir, JSON_PRETTY_PRINT));
+        } else {
+            $ir = json_decode($this->filesystem->read($compilePath), true);
+        }
 
-        /**
-         * Assign current class definition to the compilation context
-         */
-        $compilationContext->classDefinition = $classDefinition;
+        return $ir;
+    }
 
-        /**
-         * Run pre-compilation passes
-         */
-        $classDefinition->preCompile($compilationContext);
+    /**
+     * {@inheritdoc}
+     *
+     * @return Definition
+     */
+    public function getClassDefinition()
+    {
+        $this->classDefinition->setAliasManager($this->aliasManager);
+
+        return $this->classDefinition;
+    }
+
+    /**
+     * Returns the path to the compiled file.
+     *
+     * @return string
+     */
+    public function getCompiledFile(): string
+    {
+        return $this->compiledFile;
+    }
+
+    /**
+     * Returns the path to the source file.
+     *
+     * @return string
+     */
+    public function getFilePath(): string
+    {
+        return $this->filePath;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isExternal(): bool
+    {
+        return $this->external;
     }
 
     /**
@@ -463,12 +572,12 @@ public function preCompile(Compiler $compiler): void
         /**
          * Compilation context stores common objects required by compilation entities.
          */
-        $compilationContext = new CompilationContext();
-        $compilationContext->compiler = $compiler;
-        $compilationContext->config = $this->config;
-        $compilationContext->logger = $this->logger;
+        $compilationContext               = new CompilationContext();
+        $compilationContext->compiler     = $compiler;
+        $compilationContext->config       = $this->config;
+        $compilationContext->logger       = $this->logger;
         $compilationContext->aliasManager = $this->aliasManager;
-        $compilationContext->backend = $compiler->backend;
+        $compilationContext->backend      = $compiler->backend;
 
         /**
          * Traverse the top level statements looking for the namespace.
@@ -482,7 +591,7 @@ public function preCompile(Compiler $compiler): void
                         throw new CompilerException('The namespace must be defined just one time', $topStatement);
                     }
 
-                    $namespace = $topStatement['name'];
+                    $namespace       = $topStatement['name'];
                     $this->namespace = $namespace;
 
                     if (!preg_match('/^[A-Z]/', $namespace)) {
@@ -541,9 +650,9 @@ public function preCompile(Compiler $compiler): void
             }
         }
 
-        $name = null;
-        $class = false;
-        $interface = false;
+        $name        = null;
+        $class       = false;
+        $interface   = false;
         $lastComment = null;
 
         foreach ($ir as $topStatement) {
@@ -556,10 +665,10 @@ public function preCompile(Compiler $compiler): void
                         );
                     }
                     $class = true;
-                    $name = $topStatement['name'];
+                    $name  = $topStatement['name'];
                     $this->preCompileClass($compilationContext, $namespace, $topStatement, $lastComment);
                     $this->originalNode = $topStatement;
-                    $lastComment = null;
+                    $lastComment        = null;
                     break;
 
                 case 'interface':
@@ -570,10 +679,10 @@ public function preCompile(Compiler $compiler): void
                         );
                     }
                     $interface = true;
-                    $name = $topStatement['name'];
+                    $name      = $topStatement['name'];
                     $this->preCompileInterface($namespace, $topStatement, $lastComment);
                     $this->originalNode = $topStatement;
-                    $lastComment = null;
+                    $lastComment        = null;
                     break;
 
                 case 'use':
@@ -601,11 +710,11 @@ public function preCompile(Compiler $compiler): void
 
         if (!$this->external) {
             $expectedPath = strtolower(
-                str_replace('\\', \DIRECTORY_SEPARATOR, $namespace).\DIRECTORY_SEPARATOR.$name.'.zep'
+                str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR . $name . '.zep'
             );
 
             if (strtolower($this->filePath) != $expectedPath) {
-                $className = $namespace.'\\'.$name;
+                $className = $namespace . '\\' . $name;
 
                 throw new CompilerException(
                     sprintf(
@@ -633,312 +742,242 @@ public function preCompile(Compiler $compiler): void
     }
 
     /**
-     * Returns the path to the compiled file.
-     *
-     * @return string
-     */
-    public function getCompiledFile(): string
-    {
-        return $this->compiledFile;
-    }
-
-    /**
-     * Check dependencies.
-     *
-     * @param Compiler $compiler
-     *
-     * @throws \ReflectionException
-     */
-    public function checkDependencies(Compiler $compiler): void
-    {
-        $classDefinition = $this->classDefinition;
-
-        $extendedClass = $classDefinition->getExtendsClass();
-        if ($extendedClass) {
-            if ('class' == $classDefinition->getType()) {
-                if ($compiler->isClass($extendedClass)) {
-                    $extendedDefinition = $compiler->getClassDefinition($extendedClass);
-                    $classDefinition->setExtendsClassDefinition($extendedDefinition);
-                } else {
-                    if ($compiler->isBundledClass($extendedClass)) {
-                        $extendedDefinition = $compiler->getInternalClassDefinition($extendedClass);
-                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
-                    } else {
-                        $extendedDefinition = new DefinitionRuntime($extendedClass);
-                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
-
-                        $this->logger->warning(
-                            sprintf(
-                                'Cannot locate class "%s" when extending class "%s"',
-                                $extendedClass,
-                                $classDefinition->getCompleteName()
-                            ),
-                            ['nonexistent-class', $this->originalNode]
-                        );
-                    }
-                }
-            } else {
-                // Whether the $extendedClass is part of the compiled extension
-                if ($compiler->isInterface($extendedClass)) {
-                    $extendedDefinition = $compiler->getClassDefinition($extendedClass);
-                    $classDefinition->setExtendsClassDefinition($extendedDefinition);
-                } else {
-                    if ($compiler->isBundledInterface($extendedClass)) {
-                        $extendedDefinition = $compiler->getInternalClassDefinition($extendedClass);
-                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
-                    } else {
-                        $extendedDefinition = new DefinitionRuntime($extendedClass);
-                        $classDefinition->setExtendsClassDefinition($extendedDefinition);
-
-                        $this->logger->warning(
-                            sprintf(
-                                'Cannot locate class "%s" when extending interface "%s"',
-                                $extendedClass,
-                                $classDefinition->getCompleteName()
-                            ),
-                            ['nonexistent-class', $this->originalNode]
-                        );
-                    }
-                }
-            }
-        }
-
-        $interfaceDefinitions = [];
-        foreach ($classDefinition->getImplementedInterfaces() as $interface) {
-            if ($compiler->isInterface($interface)) {
-                $interfaceDefinitions[$interface] = $compiler->getClassDefinition($interface);
-            } else {
-                if ($compiler->isBundledInterface($interface)) {
-                    $interfaceDefinitions[$interface] = $compiler->getInternalClassDefinition($interface);
-                } else {
-                    if ($extendedClass !== null) {
-                        $classDefinition->setExtendsClassDefinition(new DefinitionRuntime($extendedClass));
-                    }
-
-                    $this->logger->warning(
-                        sprintf(
-                            'Cannot locate class "%s" when extending interface "%s"',
-                            $interface,
-                            $classDefinition->getCompleteName()
-                        ),
-                        ['nonexistent-class', $this->originalNode]
-                    );
-                }
-            }
-        }
-
-        if (count($interfaceDefinitions) > 0) {
-            $classDefinition->setImplementedInterfaceDefinitions($interfaceDefinitions);
-        }
-    }
-
-    /**
-     * Compiles the file.
-     *
-     * @param Compiler       $compiler
-     * @param StringsManager $stringsManager
+     * Creates a definition for a class.
      *
-     * @throws CompilerException
+     * @param CompilationContext $compilationContext
+     * @param string             $namespace
+     * @param array              $topStatement
+     * @param array              $docblock
      */
-    public function compile(Compiler $compiler, StringsManager $stringsManager): void
+    public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock): void
     {
-        if (!$this->ir) {
-            throw new CompilerException('Unable to locate the intermediate representation of the compiled file');
-        }
+        $classDefinition = new Definition($namespace, $topStatement['name']);
+        $classDefinition->setIsExternal($this->external);
 
-        /**
-         * External classes should not be compiled as part of the extension
-         */
-        if ($this->external) {
-            return;
+        if (isset($topStatement['extends'])) {
+            $classDefinition->setExtendsClass($this->getFullName($topStatement['extends']));
         }
 
-        /**
-         * Compilation context stores common objects required by compilation entities.
-         */
-        $compilationContext = new CompilationContext();
-
-        /**
-         * Set global compiler in the compilation context
-         */
-        $compilationContext->compiler = $compiler;
-
-        /**
-         * Set global config in the compilation context
-         */
-        $compilationContext->config = $this->config;
-
-        /**
-         * Set global logger in the compilation context
-         */
-        $compilationContext->logger = $this->logger;
-
-        /**
-         * Set global strings manager
-         */
-        $compilationContext->stringsManager = $stringsManager;
-        $compilationContext->backend = $compiler->backend;
-
-        /**
-         * Headers manager.
-         */
-        $headersManager = new HeadersManager();
-        $compilationContext->headersManager = $headersManager;
-
-        /**
-         * Main code-printer for the file.
-         */
-        $codePrinter = new Printer();
-        $compilationContext->codePrinter = $codePrinter;
-
-        /**
-         * Alias manager
-         */
-        $compilationContext->aliasManager = $this->aliasManager;
-
-        $codePrinter->outputBlankLine();
-
-        $class = false;
-        $interface = false;
-
-        foreach ($this->ir as $topStatement) {
-            switch ($topStatement['type']) {
-                case 'class':
-                case 'interface':
-                    if ($interface || $class) {
-                        throw new CompilerException('More than one class defined in the same file', $topStatement);
-                    }
-                    $class = true;
-                    $this->compileClass($compilationContext);
-                    break;
-
-                case 'comment':
-                    $this->compileComment($compilationContext, $topStatement);
-                    break;
-
-                default:
-                    break;
+        if (isset($topStatement['implements'])) {
+            foreach ($topStatement['implements'] as &$implement) {
+                $implement['value'] = $this->getFullName($implement['value']);
             }
+            $classDefinition->setImplementsInterfaces($topStatement['implements']);
         }
 
-        /* ensure functions are handled last */
-        foreach ($this->functionDefinitions as $funcDef) {
-            $this->compileFunction($compilationContext, $funcDef);
+        if (isset($topStatement['abstract'])) {
+            $classDefinition->setIsAbstract((bool)$topStatement['abstract']);
         }
 
-        /* apply headers */
-        $this->applyClassHeaders($compilationContext);
-
-        $classDefinition = $this->classDefinition;
-        if (!$classDefinition) {
-            $this->ir = null;
+        if (isset($topStatement['final'])) {
+            $classDefinition->setIsFinal((bool)$topStatement['final']);
+        }
 
-            return;
+        if (is_array($docblock)) {
+            $classDefinition->setDocBlock($docblock['value']);
         }
 
-        $classDefinition->setOriginalNode($this->originalNode);
+        if (isset($topStatement['definition'])) {
+            $definition = $topStatement['definition'];
 
-        $completeName = $classDefinition->getCompleteName();
+            if (isset($definition['properties'])) {
+                foreach ($definition['properties'] as $property) {
+                    /**
+                     * Add property to the definition
+                     */
+                    $classDefinition->addProperty(
+                        new Property(
+                            $classDefinition,
+                            $property['visibility'],
+                            $property['name'],
+                            $property['default'] ?? null,
+                            $property['docblock'] ?? null,
+                            $property
+                        )
+                    );
 
-        $path = str_replace('\\', \DIRECTORY_SEPARATOR, strtolower($completeName));
+                    /**
+                     * Check and process shortcuts
+                     */
+                    if (isset($property['shortcuts'])) {
+                        $this->processShortcuts($property, $classDefinition);
+                    }
+                }
+            }
 
-        $filePath = 'ext/'.$path.'.zep.c';
-        $filePathHeader = 'ext/'.$path.'.zep.h';
+            /**
+             * Register constants
+             */
+            if (isset($definition['constants'])) {
+                foreach ($definition['constants'] as $constant) {
+                    $classDefinition->addConstant(
+                        new Constant(
+                            $constant['name'],
+                            $constant['default'] ?? null,
+                            $constant['docblock'] ?? null
+                        )
+                    );
+                }
+            }
 
-        if (strpos($path, \DIRECTORY_SEPARATOR)) {
-            $dirname = \dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
+            /**
+             * Register methods
+             */
+            if (isset($definition['methods'])) {
+                foreach ($definition['methods'] as $method) {
+                    $classDefinition->addMethod(
+                        new Method(
+                            $classDefinition,
+                            $method['visibility'],
+                            $method['name'],
+                            isset($method['parameters']) ? new Parameters($method['parameters']) : null,
+                            isset($method['statements']) ? new StatementsBlock($method['statements']) : null,
+                            $method['docblock'] ?? null,
+                            $method['return-type'] ?? null,
+                            $method
+                        ),
+                        $method
+                    );
+                }
             }
         }
 
+        $this->classDefinition = $classDefinition;
+
         /**
-         * If the file does not exist we create it for the first time
+         * Assign current class definition to the compilation context
          */
-        if (!file_exists($filePath)) {
-            file_put_contents($filePath, $codePrinter->getOutput());
-            if ($compilationContext->headerPrinter) {
-                file_put_contents($filePathHeader, $compilationContext->headerPrinter->getOutput());
+        $compilationContext->classDefinition = $classDefinition;
+
+        /**
+         * Run pre-compilation passes
+         */
+        $classDefinition->preCompile($compilationContext);
+    }
+
+    /**
+     * Creates a definition for an interface.
+     *
+     * @param string $namespace
+     * @param array  $topStatement
+     * @param array  $docblock
+     */
+    public function preCompileInterface($namespace, $topStatement, $docblock): void
+    {
+        $classDefinition = new Definition($namespace, $topStatement['name']);
+        $classDefinition->setIsExternal($this->external);
+
+        if (isset($topStatement['extends'])) {
+            foreach ($topStatement['extends'] as &$extend) {
+                $extend['value'] = $this->getFullName($extend['value']);
             }
-        } else {
+            $classDefinition->setImplementsInterfaces($topStatement['extends']);
+        }
+
+        $classDefinition->setType('interface');
+
+        if (is_array($docblock)) {
+            $classDefinition->setDocBlock($docblock['value']);
+        }
+
+        if (isset($topStatement['definition'])) {
+            $definition = $topStatement['definition'];
+
             /**
-             * Use md5 hash to avoid rewrite the file again and again when it hasn't changed
-             * thus avoiding unnecessary recompilations.
+             * Register constants
              */
-            $output = $codePrinter->getOutput();
-            $hash = $this->filesystem->getHashFile('md5', $filePath, true);
-            if (md5($output) != $hash) {
-                file_put_contents($filePath, $output);
+            if (isset($definition['constants'])) {
+                foreach ($definition['constants'] as $constant) {
+                    $classConstant = new Constant(
+                        $constant['name'],
+                        $constant['default'] ?? null,
+                        $constant['docblock'] ?? null
+                    );
+                    $classDefinition->addConstant($classConstant);
+                }
             }
 
-            if ($compilationContext->headerPrinter) {
-                $output = $compilationContext->headerPrinter->getOutput();
-                $hash = $this->filesystem->getHashFile('md5', $filePathHeader, true);
-                if (md5($output) != $hash) {
-                    file_put_contents($filePathHeader, $output);
+            /**
+             * Register methods
+             */
+            if (isset($definition['methods'])) {
+                foreach ($definition['methods'] as $method) {
+                    $classMethod = new Method(
+                        $classDefinition,
+                        $method['visibility'],
+                        $method['name'],
+                        isset($method['parameters']) ? new Parameters($method['parameters']) : null,
+                        null,
+                        $method['docblock'] ?? null,
+                        $method['return-type'] ?? null,
+                        $method
+                    );
+                    $classDefinition->addMethod($classMethod, $method);
                 }
             }
         }
 
-        /**
-         * Add to file compiled
-         */
-        $this->compiledFile = $path.'.c';
-        $this->ir = null;
+        $this->classDefinition = $classDefinition;
     }
 
-    public function applyClassHeaders(CompilationContext $compilationContext): void
+    /**
+     * @param string $className
+     */
+    public function setClassName(string $className): void
     {
-        $classDefinition = $this->classDefinition;
-
-        $separators = str_repeat('../', \count(explode('\\', $classDefinition->getCompleteName())) - 1);
+        $this->className = $className;
+    }
 
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H'.PHP_EOL;
-        $code .= '#include "'.$separators.'ext_config.h"'.PHP_EOL;
-        $code .= '#endif'.PHP_EOL;
-        $code .= PHP_EOL;
+    /**
+     * @param string $filePath
+     */
+    public function setFilePath(string $filePath): void
+    {
+        $this->filePath = $filePath;
+    }
 
-        $code .= '#include <php.h>'.PHP_EOL;
-        $code .= '#include "'.$separators.'php_ext.h"'.PHP_EOL;
-        $code .= '#include "'.$separators.'ext.h"'.PHP_EOL;
-        $code .= PHP_EOL;
+    /**
+     * Sets if the class belongs to an external dependency or not.
+     *
+     * @param bool $external
+     */
+    public function setIsExternal($external): void
+    {
+        $this->external = (bool)$external;
+    }
 
-        if ('class' == $classDefinition->getType()) {
-            $code .= '#include <Zend/zend_operators.h>'.PHP_EOL;
-            $code .= '#include <Zend/zend_exceptions.h>'.PHP_EOL;
-            $code .= '#include <Zend/zend_interfaces.h>'.PHP_EOL;
-        } else {
-            $code .= '#include <Zend/zend_exceptions.h>'.PHP_EOL;
+    /**
+     * Create returns type list.
+     */
+    protected function createReturnsType(array $types, bool $annotated = false): ?array
+    {
+        if (!$types) {
+            return null;
         }
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"'.PHP_EOL;
 
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "'.$header.'.h"'.PHP_EOL;
-            }
-        }
+        $list = [];
 
-        if (\count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks).PHP_EOL;
+        foreach ($types as $type) {
+            $list[] = [
+                'type'      => $annotated ? 'return-type-annotation' : 'return-type-paramater',
+                'data-type' => 'mixed' === $type ? 'variable' : $type,
+                'mandatory' => false,
+            ];
         }
 
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        return [
+            'type' => 'return-type',
+            'list' => $list,
+            'void' => empty($list),
+        ];
     }
 
     /**
-     * Returns the path to the source file.
-     *
-     * @return string
+     * Transform class/interface name to FQN format.
      */
-    public function getFilePath(): string
+    protected function getFullName(string $name): string
     {
-        return $this->filePath;
+        return Name::fetchFQN($name, $this->namespace, $this->aliasManager);
     }
 
     /**
@@ -968,11 +1007,14 @@ protected function processShortcuts(array $property, Definition $classDefinition
             $returnsType = [];
 
             if ($docBlock) {
-                $docBlockParser = new DocblockParser('/'.$docBlock.'/');
+                $docBlockParser = new DocblockParser('/' . $docBlock . '/');
                 $docBlockParsed = $docBlockParser->parse();
 
                 if ($annotations = $docBlockParsed->getAnnotationsByType('var')) {
-                    $returnsType = array_map(fn ($type) => 'mixed' == ($type = trim($type)) ? 'variable' : $type, explode('|', $annotations[0]->getString()));
+                    $returnsType = array_map(
+                        fn($type) => 'mixed' == ($type = trim($type)) ? 'variable' : $type,
+                        explode('|', $annotations[0]->getString())
+                    );
                 }
 
                 // Clear annotations
@@ -982,152 +1024,127 @@ protected function processShortcuts(array $property, Definition $classDefinition
 
             switch ($shortcut['name']) {
                 case 'get':
-                    $classDefinition->addMethod(new Method(
-                        $classDefinition,
-                        ['public'],
-                        'get'.Name::camelize($name),
-                        null,
-                        new StatementsBlock([
-                            [
-                                'type' => 'return',
-                                'expr' => [
-                                    'type' => 'property-access',
-                                    'left' => [
-                                        'type' => 'variable',
-                                        'value' => 'this',
-                                    ],
-                                    'right' => [
-                                        'type' => 'variable',
-                                        'value' => $property['name'],
+                    $classDefinition->addMethod(
+                        new Method(
+                            $classDefinition,
+                            ['public'],
+                            'get' . Name::camelize($name),
+                            null,
+                            new StatementsBlock([
+                                [
+                                    'type' => 'return',
+                                    'expr' => [
+                                        'type'  => 'property-access',
+                                        'left'  => [
+                                            'type'  => 'variable',
+                                            'value' => 'this',
+                                        ],
+                                        'right' => [
+                                            'type'  => 'variable',
+                                            'value' => $property['name'],
+                                        ],
                                     ],
                                 ],
-                            ],
-                        ]),
-                        $docBlock,
-                        $this->createReturnsType($returnsType, true),
+                            ]),
+                            $docBlock,
+                            $this->createReturnsType($returnsType, true),
+                            $shortcut
+                        ),
                         $shortcut
-                    ), $shortcut);
+                    );
                     break;
 
                 case 'set':
-                    $classDefinition->addMethod(new Method(
-                        $classDefinition,
-                        ['public'],
-                        'set'.Name::camelize($name),
-                        new Parameters([
-                            [
-                                'type' => 'parameter',
-                                'name' => $name,
-                                'const' => 0,
-                                'data-type' => 1 == \count($returnsType) ? $returnsType[0] : 'variable',
-                                'mandatory' => 0,
-                            ],
-                        ]),
-                        new StatementsBlock([
-                            [
-                                'type' => 'let',
-                                'assignments' => [
-                                    [
-                                        'assign-type' => 'object-property',
-                                        'operator' => 'assign',
-                                        'variable' => 'this',
-                                        'property' => $property['name'],
-                                        'expr' => [
-                                            'type' => 'variable',
-                                            'value' => $name,
-                                            'file' => $property['file'],
-                                            'line' => $property['line'],
-                                            'char' => $property['char'],
+                    $classDefinition->addMethod(
+                        new Method(
+                            $classDefinition,
+                            ['public'],
+                            'set' . Name::camelize($name),
+                            new Parameters([
+                                [
+                                    'type'      => 'parameter',
+                                    'name'      => $name,
+                                    'const'     => 0,
+                                    'data-type' => 1 == count($returnsType) ? $returnsType[0] : 'variable',
+                                    'mandatory' => 0,
+                                ],
+                            ]),
+                            new StatementsBlock([
+                                [
+                                    'type'        => 'let',
+                                    'assignments' => [
+                                        [
+                                            'assign-type' => 'object-property',
+                                            'operator'    => 'assign',
+                                            'variable'    => 'this',
+                                            'property'    => $property['name'],
+                                            'expr'        => [
+                                                'type'  => 'variable',
+                                                'value' => $name,
+                                                'file'  => $property['file'],
+                                                'line'  => $property['line'],
+                                                'char'  => $property['char'],
+                                            ],
+                                            'file'        => $property['file'],
+                                            'line'        => $property['line'],
+                                            'char'        => $property['char'],
                                         ],
-                                        'file' => $property['file'],
-                                        'line' => $property['line'],
-                                        'char' => $property['char'],
                                     ],
                                 ],
-                            ],
-                            [
-                                'type' => 'return',
-                                'expr' => [
-                                    'type' => 'variable',
-                                    'value' => 'this',
-                                    'file' => $property['file'],
-                                    'line' => $property['line'],
-                                    'char' => $property['char'],
+                                [
+                                    'type' => 'return',
+                                    'expr' => [
+                                        'type'  => 'variable',
+                                        'value' => 'this',
+                                        'file'  => $property['file'],
+                                        'line'  => $property['line'],
+                                        'char'  => $property['char'],
+                                    ],
                                 ],
-                            ],
-                        ]),
-                        $docBlock,
-                        null,
+                            ]),
+                            $docBlock,
+                            null,
+                            $shortcut
+                        ),
                         $shortcut
-                    ), $shortcut);
+                    );
                     break;
 
                 case 'toString':
                 case '__toString':
-                    $classDefinition->addMethod(new Method(
-                        $classDefinition,
-                        ['public'],
-                        '__toString',
-                        null,
-                        new StatementsBlock([
-                            [
-                                'type' => 'return',
-                                'expr' => [
-                                    'type' => 'property-access',
-                                    'left' => [
-                                        'type' => 'variable',
-                                        'value' => 'this',
-                                    ],
-                                    'right' => [
-                                        'type' => 'variable',
-                                        'value' => $property['name'],
+                    $classDefinition->addMethod(
+                        new Method(
+                            $classDefinition,
+                            ['public'],
+                            '__toString',
+                            null,
+                            new StatementsBlock([
+                                [
+                                    'type' => 'return',
+                                    'expr' => [
+                                        'type'  => 'property-access',
+                                        'left'  => [
+                                            'type'  => 'variable',
+                                            'value' => 'this',
+                                        ],
+                                        'right' => [
+                                            'type'  => 'variable',
+                                            'value' => $property['name'],
+                                        ],
                                     ],
                                 ],
-                            ],
-                        ]),
-                        $docBlock,
-                        $this->createReturnsType(['string']),
+                            ]),
+                            $docBlock,
+                            $this->createReturnsType(['string']),
+                            $shortcut
+                        ),
                         $shortcut
-                    ), $shortcut);
+                    );
                     break;
 
                 default:
-                    throw new CompilerException("Unknown shortcut '".$shortcut['name']."'", $shortcut);
+                    throw new CompilerException("Unknown shortcut '" . $shortcut['name'] . "'", $shortcut);
             }
         }
     }
-
-    /**
-     * Transform class/interface name to FQN format.
-     */
-    protected function getFullName(string $name): string
-    {
-        return Name::fetchFQN($name, $this->namespace, $this->aliasManager);
-    }
-
-    /**
-     * Create returns type list.
-     */
-    protected function createReturnsType(array $types, bool $annotated = false): ?array
-    {
-        if (!$types) {
-            return null;
-        }
-
-        $list = [];
-
-        foreach ($types as $type) {
-            $list[] = [
-                'type' => $annotated ? 'return-type-annotation' : 'return-type-paramater',
-                'data-type' => 'mixed' === $type ? 'variable' : $type,
-                'mandatory' => false,
-            ];
-        }
-
-        return [
-            'type' => 'return-type',
-            'list' => $list,
-            'void' => empty($list),
-        ];
-    }
 }
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index cb18d165f1..70f7e1fdfb 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -15,10 +15,16 @@
 
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
+use ReflectionException;
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
 
+use function count;
+use function dirname;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * This class represents an anonymous file created to dump
  * the code produced by an internal closure
@@ -27,13 +33,13 @@ final class CompilerFileAnonymous implements FileInterface
 {
     use LoggerAwareTrait;
 
-    protected ?string $namespace = null;
-    protected ?string $compiledFile = null;
-    protected bool $external = false;
-    protected array $headerCBlocks = [];
-    protected ?CompilationContext $context = null;
-    protected Definition $classDefinition;
-    protected Config $config;
+    protected Definition          $classDefinition;
+    protected ?string             $compiledFile  = null;
+    protected Config              $config;
+    protected ?CompilationContext $context       = null;
+    protected bool                $external      = false;
+    protected array               $headerCBlocks = [];
+    protected ?string             $namespace     = null;
 
     /**
      * CompilerFileAnonymous constructor.
@@ -45,88 +51,9 @@ final class CompilerFileAnonymous implements FileInterface
     public function __construct(Definition $classDefinition, Config $config, CompilationContext $context = null)
     {
         $this->classDefinition = $classDefinition;
-        $this->config = $config;
-        $this->context = $context;
-        $this->logger = new NullLogger();
-    }
-
-    /**
-     * @return Definition
-     */
-    public function getClassDefinition(): Definition
-    {
-        return $this->classDefinition;
-    }
-
-    /**
-     * Sets if the class belongs to an external dependency or not.
-     *
-     * @param bool $external
-     */
-    public function setIsExternal($external): void
-    {
-        $this->external = (bool) $external;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isExternal(): bool
-    {
-        return $this->external;
-    }
-
-    /**
-     * Compiles the class/interface contained in the file.
-     *
-     * @param CompilationContext $compilationContext
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    private function compileClass(CompilationContext $compilationContext): void
-    {
-        $classDefinition = $this->classDefinition;
-
-        /**
-         * Do the compilation
-         */
-        $classDefinition->compile($compilationContext);
-
-        $separators = str_repeat('../', \count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H'.PHP_EOL;
-        $code .= '#include "'.$separators.'ext_config.h"'.PHP_EOL;
-        $code .= '#endif'.PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>'.PHP_EOL;
-        $code .= '#include "'.$separators.'php_ext.h"'.PHP_EOL;
-        $code .= '#include "'.$separators.'ext.h"'.PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <Zend/zend_operators.h>'.PHP_EOL;
-        $code .= '#include <Zend/zend_exceptions.h>'.PHP_EOL;
-        $code .= '#include <Zend/zend_interfaces.h>'.PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"'.PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "'.$header.'.h"'.PHP_EOL;
-            }
-        }
-
-        if (\count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks).PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->config          = $config;
+        $this->context         = $context;
+        $this->logger          = new NullLogger();
     }
 
     /**
@@ -150,22 +77,22 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
             $compilationContext->aliasManager = new AliasManager();
         }
 
-        $compilationContext->compiler = $compiler;
-        $compilationContext->config = $this->config;
-        $compilationContext->logger = $this->logger;
+        $compilationContext->compiler       = $compiler;
+        $compilationContext->config         = $this->config;
+        $compilationContext->logger         = $this->logger;
         $compilationContext->stringsManager = $stringsManager;
-        $compilationContext->backend = $compiler->backend;
+        $compilationContext->backend        = $compiler->backend;
 
         /**
          * Headers manager.
          */
-        $headersManager = new HeadersManager();
+        $headersManager                     = new HeadersManager();
         $compilationContext->headersManager = $headersManager;
 
         /**
          * Main code-printer for the file.
          */
-        $codePrinter = new Printer();
+        $codePrinter                     = new Printer();
         $compilationContext->codePrinter = $codePrinter;
 
         $codePrinter->outputBlankLine();
@@ -174,13 +101,13 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        $path = str_replace('\\', \DIRECTORY_SEPARATOR, strtolower($completeName));
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
 
-        $filePath = 'ext/'.$path.'.zep.c';
-        $filePathHeader = 'ext/'.$path.'.zep.h';
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
 
-        if (strpos($path, \DIRECTORY_SEPARATOR)) {
-            $dirname = \dirname($filePath);
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
             if (!is_dir($dirname)) {
                 mkdir($dirname, 0755, true);
             }
@@ -200,14 +127,14 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
              * thus avoiding unnecessary recompilations.
              */
             $output = $codePrinter->getOutput();
-            $hash = hash_file('md5', $filePath);
+            $hash   = hash_file('md5', $filePath);
             if (md5($output) !== $hash) {
                 file_put_contents($filePath, $output);
             }
 
             if ($compilationContext->headerPrinter) {
                 $output = $compilationContext->headerPrinter->getOutput();
-                $hash = hash_file('md5', $filePathHeader);
+                $hash   = hash_file('md5', $filePathHeader);
                 if (md5($output) !== $hash) {
                     file_put_contents($filePathHeader, $output);
                 }
@@ -217,7 +144,15 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
         /**
          * Add to file compiled
          */
-        $this->compiledFile = $path.'.c';
+        $this->compiledFile = $path . '.c';
+    }
+
+    /**
+     * @return Definition
+     */
+    public function getClassDefinition(): Definition
+    {
+        return $this->classDefinition;
     }
 
     /**
@@ -230,6 +165,14 @@ public function getCompiledFile()
         return $this->compiledFile;
     }
 
+    /**
+     * @return bool
+     */
+    public function isExternal(): bool
+    {
+        return $this->external;
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -241,4 +184,67 @@ public function preCompile(Compiler $compiler): void
     {
         // nothing to do
     }
+
+    /**
+     * Sets if the class belongs to an external dependency or not.
+     *
+     * @param bool $external
+     */
+    public function setIsExternal($external): void
+    {
+        $this->external = (bool)$external;
+    }
+
+    /**
+     * Compiles the class/interface contained in the file.
+     *
+     * @param CompilationContext $compilationContext
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    private function compileClass(CompilationContext $compilationContext): void
+    {
+        $classDefinition = $this->classDefinition;
+
+        /**
+         * Do the compilation
+         */
+        $classDefinition->compile($compilationContext);
+
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
+        $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
+        $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
+    }
 }
diff --git a/src/Config.php b/src/Config.php
index b2e79f74a5..f3d5ff689e 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -13,10 +13,18 @@
 
 namespace Zephir;
 
+use ArrayAccess;
+use JsonSerializable;
+use ReturnTypeWillChange;
+
+use function array_key_exists;
+use function count;
+use function is_array;
+
 /**
  * Manages compiler global configuration.
  */
-class Config implements \ArrayAccess, \JsonSerializable
+class Config implements ArrayAccess, JsonSerializable
 {
     /**
      * Is config changed?
@@ -27,71 +35,71 @@ class Config implements \ArrayAccess, \JsonSerializable
      * Default configuration for project.
      */
     private array $container = [
-        'stubs' => [
-            'path' => 'ide/%version%/%namespace%/',
+        'stubs'         => [
+            'path'                     => 'ide/%version%/%namespace%/',
             'stubs-run-after-generate' => false,
-            'banner' => '',
+            'banner'                   => '',
         ],
-        'api' => [
-            'path' => 'doc/%version%',
+        'api'           => [
+            'path'  => 'doc/%version%',
             'theme' => [
-                'name' => 'zephir',
+                'name'    => 'zephir',
                 'options' => [
-                    'github' => null,
-                    'analytics' => null,
-                    'main_color' => '#3E6496',
-                    'link_color' => '#3E6496',
+                    'github'           => null,
+                    'analytics'        => null,
+                    'main_color'       => '#3E6496',
+                    'link_color'       => '#3E6496',
                     'link_hover_color' => '#5F9AE7',
                 ],
             ],
         ],
-        'warnings' => [
-            'unused-variable' => true,
-            'unused-variable-external' => false,
-            'possible-wrong-parameter' => true,
+        'warnings'      => [
+            'unused-variable'                    => true,
+            'unused-variable-external'           => false,
+            'possible-wrong-parameter'           => true,
             'possible-wrong-parameter-undefined' => false,
-            'nonexistent-function' => true,
-            'nonexistent-class' => true,
-            'non-valid-isset' => true,
-            'non-array-update' => true,
-            'non-valid-objectupdate' => true,
-            'non-valid-fetch' => true,
-            'invalid-array-index' => true,
-            'non-array-append' => true,
-            'invalid-return-type' => true,
-            'unreachable-code' => true,
-            'nonexistent-constant' => true,
-            'not-supported-magic-constant' => true,
-            'non-valid-decrement' => true,
-            'non-valid-increment' => true,
-            'non-valid-clone' => true,
-            'non-valid-new' => true,
-            'non-array-access' => true,
-            'invalid-reference' => true,
-            'invalid-typeof-comparison' => true,
-            'conditional-initialization' => true,
+            'nonexistent-function'               => true,
+            'nonexistent-class'                  => true,
+            'non-valid-isset'                    => true,
+            'non-array-update'                   => true,
+            'non-valid-objectupdate'             => true,
+            'non-valid-fetch'                    => true,
+            'invalid-array-index'                => true,
+            'non-array-append'                   => true,
+            'invalid-return-type'                => true,
+            'unreachable-code'                   => true,
+            'nonexistent-constant'               => true,
+            'not-supported-magic-constant'       => true,
+            'non-valid-decrement'                => true,
+            'non-valid-increment'                => true,
+            'non-valid-clone'                    => true,
+            'non-valid-new'                      => true,
+            'non-array-access'                   => true,
+            'invalid-reference'                  => true,
+            'invalid-typeof-comparison'          => true,
+            'conditional-initialization'         => true,
         ],
         'optimizations' => [
-            'static-type-inference' => true,
+            'static-type-inference'             => true,
             'static-type-inference-second-pass' => true,
-            'local-context-pass' => true,
-            'constant-folding' => true,
-            'static-constant-class-folding' => true,
-            'call-gatherer-pass' => true,
-            'check-invalid-reads' => false,
-            'internal-call-transformation' => false,
+            'local-context-pass'                => true,
+            'constant-folding'                  => true,
+            'static-constant-class-folding'     => true,
+            'call-gatherer-pass'                => true,
+            'check-invalid-reads'               => false,
+            'internal-call-transformation'      => false,
         ],
-        'extra' => [
-            'indent' => 'spaces',
+        'extra'         => [
+            'indent'         => 'spaces',
             'export-classes' => false,
         ],
-        'namespace' => '',
-        'name' => '',
-        'description' => '',
-        'author' => 'Phalcon Team',
-        'version' => '0.0.1',
-        'verbose' => false,
-        'requires' => [
+        'namespace'     => '',
+        'name'          => '',
+        'description'   => '',
+        'author'        => 'Phalcon Team',
+        'version'       => '0.0.1',
+        'verbose'       => false,
+        'requires'      => [
             'extensions' => [],
         ],
     ];
@@ -109,7 +117,15 @@ public function __construct()
      */
     public function __toString()
     {
-        return (string) json_encode($this, JSON_PRETTY_PRINT);
+        return (string)json_encode($this, JSON_PRETTY_PRINT);
+    }
+
+    /**
+     * Writes the configuration if it has been changed.
+     */
+    public function dumpToFile(): void
+    {
+        file_put_contents('config.json', $this);
     }
 
     /**
@@ -190,12 +206,33 @@ public static function fromServer(): self
             }
 
             $_SERVER['argv'] = array_values($argv);
-            $_SERVER['argc'] = \count($argv);
+            $_SERVER['argc'] = count($argv);
         }
 
         return $config;
     }
 
+    /**
+     * Retrieves a configuration setting.
+     *
+     * @param mixed $key
+     * @param mixed $namespace
+     *
+     * @return mixed|null
+     */
+    public function get($key, $namespace = null)
+    {
+        return null !== $namespace ? $this->offsetGet([$namespace => $key]) : $this->offsetGet($key);
+    }
+
+    /**
+     * Specify data which should be serialized to JSON.
+     */
+    public function jsonSerialize(): array
+    {
+        return $this->container;
+    }
+
     /**
      * Allows to check whether a $key is defined.
      *
@@ -205,7 +242,7 @@ public static function fromServer(): self
      */
     public function offsetExists($key): bool
     {
-        return isset($this->container[$key]) || \array_key_exists($key, $this->container);
+        return isset($this->container[$key]) || array_key_exists($key, $this->container);
     }
 
     /**
@@ -215,21 +252,21 @@ public function offsetExists($key): bool
      *
      * @return mixed|null
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        if (!\is_array($offset)) {
+        if (!is_array($offset)) {
             return $this->offsetExists($offset) ? $this->container[$offset] : null;
         }
 
         $namespace = key($offset);
-        $offset = current($offset);
+        $offset    = current($offset);
 
-        if (!$this->offsetExists($namespace) || !\is_array($this->container[$namespace])) {
+        if (!$this->offsetExists($namespace) || !is_array($this->container[$namespace])) {
             return null;
         }
 
-        if (isset($this->container[$namespace][$offset]) || \array_key_exists($offset, $this->container[$namespace])) {
+        if (isset($this->container[$namespace][$offset]) || array_key_exists($offset, $this->container[$namespace])) {
             return $this->container[$namespace][$offset];
         }
 
@@ -242,19 +279,19 @@ public function offsetGet($offset)
      * @param mixed $key
      * @param mixed $value
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetSet($key, $value): void
     {
-        if (!\is_array($key)) {
+        if (!is_array($key)) {
             $this->container[$key] = $value;
 
             return;
         }
 
         $namespace = key($key);
-        $key = current($key);
+        $key       = current($key);
 
-        if (!\array_key_exists($namespace, $this->container)) {
+        if (!array_key_exists($namespace, $this->container)) {
             $this->container[$namespace] = [];
         }
 
@@ -264,29 +301,17 @@ public function offsetSet($key, $value): void
     /**
      * Unsets a $key from internal container.
      *
+     * @param mixed $key
+     *
      * @deprecated
      *
-     * @param mixed $key
      */
-    #[\ReturnTypeWillChange]
+    #[ReturnTypeWillChange]
     public function offsetUnset($key): void
     {
         unset($this->container[$key]);
     }
 
-    /**
-     * Retrieves a configuration setting.
-     *
-     * @param mixed $key
-     * @param mixed $namespace
-     *
-     * @return mixed|null
-     */
-    public function get($key, $namespace = null)
-    {
-        return null !== $namespace ? $this->offsetGet([$namespace => $key]) : $this->offsetGet($key);
-    }
-
     /**
      * Changes a configuration setting.
      *
@@ -299,22 +324,6 @@ public function set($key, $value, $namespace = null): void
         null !== $namespace ? $this->offsetSet([$namespace => $key], $value) : $this->offsetSet($key, $value);
     }
 
-    /**
-     * Writes the configuration if it has been changed.
-     */
-    public function dumpToFile(): void
-    {
-        file_put_contents('config.json', $this);
-    }
-
-    /**
-     * Specify data which should be serialized to JSON.
-     */
-    public function jsonSerialize(): array
-    {
-        return $this->container;
-    }
-
     /**
      * Populate project configuration.
      *
@@ -326,7 +335,7 @@ protected function populate(): void
             return;
         }
 
-        $config = json_decode(file_get_contents('config.json'), true);
+        $config  = json_decode(file_get_contents('config.json'), true);
         $message = 'The config.json file is invalid';
 
         switch (json_last_error()) {
diff --git a/src/ConfigException.php b/src/ConfigException.php
index b65139b77a..c1a9e563bd 100644
--- a/src/ConfigException.php
+++ b/src/ConfigException.php
@@ -17,7 +17,7 @@ class ConfigException extends \Exception
 {
     public function __construct($message = '', $code = 0, \Exception $previous = null)
     {
-        $message .= PHP_EOL.'Please see https://docs.zephir-lang.com/0.12/en/config for more information';
+        $message .= PHP_EOL . 'Please see https://docs.zephir-lang.com/0.12/en/config for more information';
 
         parent::__construct($message, $code, $previous);
     }
diff --git a/src/Console/Application.php b/src/Console/Application.php
index 09207a46dc..749f7c1433 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Console;
 
+use Exception;
 use Symfony\Component\Console\Application as BaseApplication;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Command\HelpCommand;
@@ -27,6 +28,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Throwable;
 use Zephir\Console\Command\ListCommand;
 use Zephir\Zephir;
 
@@ -42,65 +44,6 @@ public function __construct()
         $this->setDispatcher($dispatcher);
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getHelp(): string
-    {
-        return Zephir::LOGO.parent::getHelp();
-    }
-
-    /**
-     * Get Version Number
-     *
-     * @return string The application version
-     */
-    public function getVerNum(): string
-    {
-        $version = explode('-', parent::getVersion());
-        $version = explode('.', $version[0]);
-
-        return $version[0].sprintf('%02s', $version[1]).sprintf('%02s', $version[2]);
-    }
-
-    /**
-     * Gets the application version as integer.
-     *
-     * @return string The application version
-     */
-    public function getVersion(): string
-    {
-        $version = explode('-', parent::getVersion());
-
-        if (isset($version[1]) && str_starts_with($version[1], '$')) {
-            return "{$version[0]}-source";
-        }
-
-        return implode('-', $version);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return string The long application version
-     */
-    public function getLongVersion(): string
-    {
-        $version = explode('-', $this->getVersion());
-        $commit = "({$version[1]})";
-
-        return trim(
-            sprintf(
-                '%s <info>%s</info> by <comment>Andres Gutierrez</comment> and <comment>Serghei Iakovlev</comment> %s',
-                $this->getName(),
-                $version[0],
-                $commit
-            )
-        );
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -109,7 +52,7 @@ public function getLongVersion(): string
      *
      * @return int
      *
-     * @throws \Exception|\Throwable
+     * @throws Exception|Throwable
      */
     public function doRun(InputInterface $input, OutputInterface $output): int
     {
@@ -133,7 +76,7 @@ public function doRun(InputInterface $input, OutputInterface $output): int
         }
 
         $wantsHelp = false;
-        $name = $this->getCommandName($input);
+        $name      = $this->getCommandName($input);
 
         if ($name && 'help' == strtolower($name) && 2 == $_SERVER['argc']) {
             $wantsHelp = true;
@@ -150,12 +93,71 @@ public function doRun(InputInterface $input, OutputInterface $output): int
         try {
             return parent::doRun($input, $output);
         } catch (CommandNotFoundException | RuntimeException $e) {
-            fprintf(STDERR, $e->getMessage().PHP_EOL);
+            fprintf(STDERR, $e->getMessage() . PHP_EOL);
 
             return 1;
         }
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getHelp(): string
+    {
+        return Zephir::LOGO . parent::getHelp();
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string The long application version
+     */
+    public function getLongVersion(): string
+    {
+        $version = explode('-', $this->getVersion());
+        $commit  = "({$version[1]})";
+
+        return trim(
+            sprintf(
+                '%s <info>%s</info> by <comment>Andres Gutierrez</comment> and <comment>Serghei Iakovlev</comment> %s',
+                $this->getName(),
+                $version[0],
+                $commit
+            )
+        );
+    }
+
+    /**
+     * Get Version Number
+     *
+     * @return string The application version
+     */
+    public function getVerNum(): string
+    {
+        $version = explode('-', parent::getVersion());
+        $version = explode('.', $version[0]);
+
+        return $version[0] . sprintf('%02s', $version[1]) . sprintf('%02s', $version[2]);
+    }
+
+    /**
+     * Gets the application version as integer.
+     *
+     * @return string The application version
+     */
+    public function getVersion(): string
+    {
+        $version = explode('-', parent::getVersion());
+
+        if (isset($version[1]) && str_starts_with($version[1], '$')) {
+            return "{$version[0]}-source";
+        }
+
+        return implode('-', $version);
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -188,7 +190,7 @@ protected function getDefaultInputDefinition(): InputDefinition
                 '--verbose',
                 '-v',
                 InputOption::VALUE_NONE,
-                'Displays more detail in error messages from exceptions generated by commands '.
+                'Displays more detail in error messages from exceptions generated by commands ' .
                 '(can also disable with -V)'
             ),
             new InputOption(
diff --git a/src/Console/Command/ApiCommand.php b/src/Console/Command/ApiCommand.php
index dfd76ca35a..8dff8823d1 100644
--- a/src/Console/Command/ApiCommand.php
+++ b/src/Console/Command/ApiCommand.php
@@ -21,6 +21,8 @@
 use Zephir\Compiler;
 use Zephir\Config;
 
+use function in_array;
+
 /**
  * Generates an HTML API based on the classes exposed in the extension.
  */
@@ -39,7 +41,40 @@ protected function configure(): void
             ->setName('api')
             ->setDescription('Generates a HTML API based on the classes exposed in the extension')
             ->setDefinition($this->createDefinition())
-            ->setHelp(sprintf('%s.', $this->getDescription()).PHP_EOL.PHP_EOL.$this->getZflagsHelp());
+            ->setHelp(sprintf('%s.', $this->getDescription()) . PHP_EOL . PHP_EOL . $this->getZflagsHelp())
+        ;
+    }
+
+    protected function createDefinition(): InputDefinition
+    {
+        return new InputDefinition(
+            [
+                new InputOption(
+                    'path',
+                    'p',
+                    InputOption::VALUE_REQUIRED,
+                    'The API theme to be used'
+                ),
+                new InputOption(
+                    'output',
+                    'o',
+                    InputOption::VALUE_REQUIRED,
+                    'Output directory to generate theme'
+                ),
+                new InputOption(
+                    'options',
+                    null,
+                    InputOption::VALUE_REQUIRED,
+                    'Theme options'
+                ),
+                new InputOption(
+                    'url',
+                    null,
+                    InputOption::VALUE_REQUIRED,
+                    'The base URL to be used when generating links'
+                ),
+            ]
+        );
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -58,10 +93,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
     protected function getDefaultOptions(): array
     {
         return [
-            'path' => null,
-            'output' => $this->config->get('path', 'api'),
+            'path'    => null,
+            'output'  => $this->config->get('path', 'api'),
             'options' => null,
-            'url' => $this->config->get('base-url', 'api'),
+            'url'     => $this->config->get('base-url', 'api'),
         ];
     }
 
@@ -72,7 +107,7 @@ protected function sanitizeOptionsFromInput(InputInterface $input): array
         $options = array_filter($input->getOptions(), function ($v, $k) use ($defaults) {
             $allowedOpts = array_keys($defaults);
 
-            return \in_array($k, $allowedOpts, true) && null !== $v;
+            return in_array($k, $allowedOpts, true) && null !== $v;
         }, ARRAY_FILTER_USE_BOTH);
 
         foreach ($options as $option => $value) {
@@ -86,36 +121,4 @@ protected function sanitizeOptionsFromInput(InputInterface $input): array
 
         return $options;
     }
-
-    protected function createDefinition(): InputDefinition
-    {
-        return new InputDefinition(
-            [
-                new InputOption(
-                    'path',
-                    'p',
-                    InputOption::VALUE_REQUIRED,
-                    'The API theme to be used'
-                ),
-                new InputOption(
-                    'output',
-                    'o',
-                    InputOption::VALUE_REQUIRED,
-                    'Output directory to generate theme'
-                ),
-                new InputOption(
-                    'options',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'Theme options'
-                ),
-                new InputOption(
-                    'url',
-                    null,
-                    InputOption::VALUE_REQUIRED,
-                    'The base URL to be used when generating links'
-                ),
-            ]
-        );
-    }
 }
diff --git a/src/Console/Command/BuildCommand.php b/src/Console/Command/BuildCommand.php
index 735ef3922a..1513b78030 100644
--- a/src/Console/Command/BuildCommand.php
+++ b/src/Console/Command/BuildCommand.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Console\Command;
 
+use Exception;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
@@ -36,14 +37,20 @@ protected function configure(): void
             ->setDefinition($this->createDefinition())
             ->addOption('dev', null, InputOption::VALUE_NONE, 'Build the extension in development mode')
             ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Build the extension in production mode')
-            ->setHelp($this->getDevelopmentModeHelp().PHP_EOL.$this->getZflagsHelp());
+            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())
+        ;
+    }
+
+    protected function createDefinition(): InputDefinition
+    {
+        return new InputDefinition([]);
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         // call generate
         $command = $this->getApplication()->find('generate');
-        $io = new SymfonyStyle($input, $output);
+        $io      = new SymfonyStyle($input, $output);
 
         $arguments = [
             'command' => 'generate',
@@ -51,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $command->run(new ArrayInput($arguments), $output);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $io->getErrorStyle()->error($e->getMessage());
 
             return 1;
@@ -59,16 +66,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // call compile
         $command = $this->getApplication()->find('compile');
-        $io = new SymfonyStyle($input, $output);
+        $io      = new SymfonyStyle($input, $output);
 
         $arguments = [
             'command' => 'compile',
-            '--dev' => $this->isDevelopmentModeEnabled($input),
+            '--dev'   => $this->isDevelopmentModeEnabled($input),
         ];
 
         try {
             $command->run(new ArrayInput($arguments), $output);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $io->getErrorStyle()->error($e->getMessage());
 
             return 1;
@@ -76,27 +83,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // call install
         $command = $this->getApplication()->find('install');
-        $io = new SymfonyStyle($input, $output);
+        $io      = new SymfonyStyle($input, $output);
 
         $arguments = [
             'command' => 'install',
-            '--dev' => $this->isDevelopmentModeEnabled($input),
+            '--dev'   => $this->isDevelopmentModeEnabled($input),
         ];
 
         try {
             return $command->run(new ArrayInput($arguments), $output);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $io->getErrorStyle()->error($e->getMessage());
 
             return 1;
         }
     }
 
-    protected function createDefinition(): InputDefinition
-    {
-        return new InputDefinition([]);
-    }
-
     /**
      * @return string
      */
diff --git a/src/Console/Command/CleanCommand.php b/src/Console/Command/CleanCommand.php
index 00a03647d8..938b930964 100644
--- a/src/Console/Command/CleanCommand.php
+++ b/src/Console/Command/CleanCommand.php
@@ -13,9 +13,11 @@
 
 namespace Zephir\Console\Command;
 
+use Exception;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Throwable;
 use Zephir\Exception\FileSystemException;
 use Zephir\FileSystem\FileSystemInterface;
 use Zephir\Os;
@@ -39,7 +41,8 @@ protected function configure(): void
         $this
             ->setName('clean')
             ->setDescription('Cleans any object files created by the extension')
-            ->setHelp(sprintf('%s.', $this->getDescription()));
+            ->setHelp(sprintf('%s.', $this->getDescription()))
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -64,16 +67,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } catch (FileSystemException $e) {
             $io->getErrorStyle()->error(
                 sprintf(
-                    "For reasons beyond Zephir's control, a filesystem error has occurred. ".
-                    'Please note: On Linux/Unix systems the current user must have the delete and execute '.
-                    'permissions on the internal cache directory,  For more information see chmod(1) and chown(1). '.
+                    "For reasons beyond Zephir's control, a filesystem error has occurred. " .
+                    'Please note: On Linux/Unix systems the current user must have the delete and execute ' .
+                    'permissions on the internal cache directory,  For more information see chmod(1) and chown(1). ' .
                     'System error was: %s',
                     $e->getMessage()
                 )
             );
 
             return 1;
-        } catch (\Exception | \Throwable $e) {
+        } catch (Exception | Throwable $e) {
             $io->getErrorStyle()->error($e->getMessage());
 
             return 1;
diff --git a/src/Console/Command/CompileCommand.php b/src/Console/Command/CompileCommand.php
index e5d772120e..321dbc3d56 100644
--- a/src/Console/Command/CompileCommand.php
+++ b/src/Console/Command/CompileCommand.php
@@ -47,14 +47,20 @@ protected function configure(): void
             ->addOption('dev', null, InputOption::VALUE_NONE, 'Compile the extension in development mode')
             ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Compile the extension in production mode')
             ->addOption('jobs', 'j', InputOption::VALUE_REQUIRED, 'Set make -j (job slots)')
-            ->setHelp($this->getDevelopmentModeHelp().PHP_EOL.$this->getZflagsHelp());
+            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())
+        ;
+    }
+
+    protected function createDefinition(): InputDefinition
+    {
+        return new InputDefinition([]);
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
-        $jobs = $input->hasOption('jobs') ? (int) $input->getOption('jobs') : null;
+        $jobs = $input->hasOption('jobs') ? (int)$input->getOption('jobs') : null;
 
         try {
             // TODO: Move all the stuff from the compiler
@@ -71,11 +77,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function createDefinition(): InputDefinition
-    {
-        return new InputDefinition([]);
-    }
-
     /**
      * @return string
      */
diff --git a/src/Console/Command/DevelopmentModeAwareTrait.php b/src/Console/Command/DevelopmentModeAwareTrait.php
index aba669eb56..c9054ac077 100644
--- a/src/Console/Command/DevelopmentModeAwareTrait.php
+++ b/src/Console/Command/DevelopmentModeAwareTrait.php
@@ -15,6 +15,8 @@
 
 use Symfony\Component\Console\Input\InputInterface;
 
+use const PHP_DEBUG;
+
 trait DevelopmentModeAwareTrait
 {
     /**
@@ -27,7 +29,7 @@ trait DevelopmentModeAwareTrait
     protected function isDevelopmentModeEnabled(InputInterface $input): bool
     {
         if (false === $input->getOption('no-dev')) {
-            return $input->getOption('dev') || \PHP_DEBUG;
+            return $input->getOption('dev') || PHP_DEBUG;
         }
 
         return false;
diff --git a/src/Console/Command/FullCleanCommand.php b/src/Console/Command/FullCleanCommand.php
index 5078450e2a..ed00da23a0 100644
--- a/src/Console/Command/FullCleanCommand.php
+++ b/src/Console/Command/FullCleanCommand.php
@@ -32,12 +32,13 @@ protected function configure(): void
         $this
             ->setName('fullclean')
             ->setDescription('Cleans any object files created by the extension (including files generated by phpize)')
-            ->setHelp(sprintf('%s.', $this->getDescription()));
+            ->setHelp(sprintf('%s.', $this->getDescription()))
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $command = $this->getApplication()->find('clean');
+        $command   = $this->getApplication()->find('clean');
         $arguments = ['command' => 'install'];
 
         $io = new SymfonyStyle($input, $output);
@@ -58,9 +59,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } catch (FileSystemException $e) {
             $io->getErrorStyle()->error(
                 sprintf(
-                    "For reasons beyond Zephir's control, a filesystem error has occurred. ".
-                    'Please note: On Linux/Unix systems the current user must have the delete and execute '.
-                    'permissions on the internal cache directory,  For more information see chmod(1) and chown(1). '.
+                    "For reasons beyond Zephir's control, a filesystem error has occurred. " .
+                    'Please note: On Linux/Unix systems the current user must have the delete and execute ' .
+                    'permissions on the internal cache directory,  For more information see chmod(1) and chown(1). ' .
                     'System error was: %s',
                     $e->getMessage()
                 )
diff --git a/src/Console/Command/GenerateCommand.php b/src/Console/Command/GenerateCommand.php
index 1b3d886edc..b77bb82470 100644
--- a/src/Console/Command/GenerateCommand.php
+++ b/src/Console/Command/GenerateCommand.php
@@ -22,6 +22,8 @@
 use Zephir\Exception\ExceptionInterface;
 use Zephir\Exception\InvalidArgumentException;
 
+use function extension_loaded;
+
 /**
  * Generate Command
  *
@@ -46,7 +48,8 @@ protected function configure(): void
             ->setName('generate')
             ->setDescription('Generates C code from the Zephir code without compiling it')
             ->addOption('trace', 't', InputOption::VALUE_NONE, 'Show trace message output (in case of exception error)')
-            ->setHelp(sprintf('%s.', $this->getDescription()).PHP_EOL.PHP_EOL.$this->getZflagsHelp());
+            ->setHelp(sprintf('%s.', $this->getDescription()) . PHP_EOL . PHP_EOL . $this->getZflagsHelp())
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -55,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $trace = $input->getOption('trace');
 
-        if (\extension_loaded('timecop') && 1 == ini_get('timecop.func_override')) {
+        if (extension_loaded('timecop') && 1 == ini_get('timecop.func_override')) {
             $io->getErrorStyle()->warning(
                 <<<MSG
 The timecop extension was detected. It is recommended to disable
@@ -86,7 +89,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         } catch (ExceptionInterface | Exception $e) {
             if ($trace === true) {
-                $io->getErrorStyle()->error($e->getMessage().sprintf(' (Zephir file: %s#%d)', $e->getFile(), $e->getLine()));
+                $io->getErrorStyle()->error(
+                    $e->getMessage() . sprintf(' (Zephir file: %s#%d)', $e->getFile(), $e->getLine())
+                );
                 $io->getErrorStyle()->error($e->getTraceAsString());
             } else {
                 $io->getErrorStyle()->error($e->getMessage());
diff --git a/src/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php
index 101a47e5b0..71a379c078 100644
--- a/src/Console/Command/InitCommand.php
+++ b/src/Console/Command/InitCommand.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Console\Command;
 
+use DirectoryIterator;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
@@ -22,6 +23,15 @@
 use Zephir\Backend\Backend;
 use Zephir\Config;
 
+use function chdir;
+use function extension_loaded;
+use function is_dir;
+use function is_readable;
+use function mkdir;
+use function preg_match;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * Init Command
  *
@@ -29,15 +39,15 @@
  */
 final class InitCommand extends AbstractCommand
 {
-    private Backend $backend;
-    private Config $config;
+    private Backend         $backend;
+    private Config          $config;
     private LoggerInterface $logger;
 
     public function __construct(Backend $backend, Config $config, LoggerInterface $logger)
     {
         $this->backend = $backend;
-        $this->config = $config;
-        $this->logger = $logger;
+        $this->config  = $config;
+        $this->logger  = $logger;
 
         parent::__construct();
     }
@@ -48,7 +58,21 @@ protected function configure(): void
             ->setName('init')
             ->setDescription('Initializes a Zephir extension')
             ->setDefinition($this->createDefinition())
-            ->setHelp(sprintf('%s.', $this->getDescription()));
+            ->setHelp(sprintf('%s.', $this->getDescription()))
+        ;
+    }
+
+    protected function createDefinition(): InputDefinition
+    {
+        return new InputDefinition(
+            [
+                new InputArgument(
+                    'namespace',
+                    InputArgument::REQUIRED,
+                    'The extension namespace'
+                ),
+            ]
+        );
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -56,22 +80,22 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $namespace = $this->sanitizeNamespace($input->getArgument('namespace'));
 
         // Tell the user the name could be reserved by another extension
-        if (\extension_loaded($namespace)) {
+        if (extension_loaded($namespace)) {
             $this->logger->warning('This extension can have conflicts with an existing loaded extension');
         }
 
         $this->config->set('namespace', $namespace);
         $this->config->set('name', $namespace);
 
-        if (!\is_dir("{$namespace}/{$namespace}")) {
-            \mkdir("{$namespace}/{$namespace}", 0755, true);
+        if (!is_dir("{$namespace}/{$namespace}")) {
+            mkdir("{$namespace}/{$namespace}", 0755, true);
         }
 
-        \chdir($namespace);
+        chdir($namespace);
 
         // Create 'kernel'
-        if (!\is_dir('ext/kernel')) {
-            \mkdir('ext/kernel', 0755, true);
+        if (!is_dir('ext/kernel')) {
+            mkdir('ext/kernel', 0755, true);
         }
 
         // Copy the latest kernel files
@@ -82,36 +106,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function createDefinition(): InputDefinition
-    {
-        return new InputDefinition(
-            [
-                new InputArgument(
-                    'namespace',
-                    InputArgument::REQUIRED,
-                    'The extension namespace'
-                ),
-            ]
-        );
-    }
-
-    private function sanitizeNamespace(string $namespace): string
-    {
-        // Prevent "" namespace
-        if (empty($namespace)) {
-            throw new RuntimeException('Not enough arguments (missing: "namespace").');
-        }
-
-        $namespace = strtolower(preg_replace('/[^0-9a-zA-Z]/', '', $namespace));
-
-        // If sanitizing returns an empty string
-        if (empty($namespace)) {
-            throw new RuntimeException('Cannot obtain a valid initial namespace for the project.');
-        }
-
-        return $namespace;
-    }
-
     /**
      * Copies the base kernel to the extension destination.
      *
@@ -124,13 +118,13 @@ private function sanitizeNamespace(string $namespace): string
      */
     private function recursiveProcess(string $src, string $dst, string $pattern = null, string $callback = 'copy'): void
     {
-        $success = true;
-        $iterator = new \DirectoryIterator($src);
+        $success  = true;
+        $iterator = new DirectoryIterator($src);
 
         foreach ($iterator as $item) {
             $pathName = $item->getPathname();
-            if (!\is_readable($pathName)) {
-                $this->logger->error('File is not readable :'.$pathName);
+            if (!is_readable($pathName)) {
+                $this->logger->error('File is not readable :' . $pathName);
                 continue;
             }
 
@@ -138,15 +132,32 @@ private function recursiveProcess(string $src, string $dst, string $pattern = nu
 
             if ($item->isDir()) {
                 if ('.' != $fileName && '..' != $fileName && '.libs' != $fileName) {
-                    if (!\is_dir($dst.\DIRECTORY_SEPARATOR.$fileName)) {
-                        \mkdir($dst.\DIRECTORY_SEPARATOR.$fileName, 0755, true);
+                    if (!is_dir($dst . DIRECTORY_SEPARATOR . $fileName)) {
+                        mkdir($dst . DIRECTORY_SEPARATOR . $fileName, 0755, true);
                     }
-                    $this->recursiveProcess($pathName, $dst.\DIRECTORY_SEPARATOR.$fileName, $pattern, $callback);
+                    $this->recursiveProcess($pathName, $dst . DIRECTORY_SEPARATOR . $fileName, $pattern, $callback);
                 }
-            } elseif ($pattern === null || 1 === \preg_match($pattern, $fileName)) {
-                $path = $dst.\DIRECTORY_SEPARATOR.$fileName;
+            } elseif ($pattern === null || 1 === preg_match($pattern, $fileName)) {
+                $path    = $dst . DIRECTORY_SEPARATOR . $fileName;
                 $success = $success && $callback($pathName, $path);
             }
         }
     }
+
+    private function sanitizeNamespace(string $namespace): string
+    {
+        // Prevent "" namespace
+        if (empty($namespace)) {
+            throw new RuntimeException('Not enough arguments (missing: "namespace").');
+        }
+
+        $namespace = strtolower(preg_replace('/[^0-9a-zA-Z]/', '', $namespace));
+
+        // If sanitizing returns an empty string
+        if (empty($namespace)) {
+            throw new RuntimeException('Cannot obtain a valid initial namespace for the project.');
+        }
+
+        return $namespace;
+    }
 }
diff --git a/src/Console/Command/InstallCommand.php b/src/Console/Command/InstallCommand.php
index aab80d743c..eb7a656bc0 100644
--- a/src/Console/Command/InstallCommand.php
+++ b/src/Console/Command/InstallCommand.php
@@ -23,6 +23,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\NotImplementedException;
 
+use function extension_loaded;
+
 /**
  * Install Command
  *
@@ -34,12 +36,12 @@ final class InstallCommand extends AbstractCommand
     use ZflagsAwareTrait;
 
     private Compiler $compiler;
-    private Config $config;
+    private Config   $config;
 
     public function __construct(Compiler $compiler, Config $config)
     {
         $this->compiler = $compiler;
-        $this->config = $config;
+        $this->config   = $config;
 
         parent::__construct();
     }
@@ -51,7 +53,8 @@ protected function configure(): void
             ->setDescription('Installs the extension in the extension directory (may require root password)')
             ->addOption('dev', null, InputOption::VALUE_NONE, 'Install the extension in development mode')
             ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Install the extension in production mode')
-            ->setHelp($this->getDevelopmentModeHelp().PHP_EOL.$this->getZflagsHelp());
+            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -75,7 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $success = ['Extension installed.'];
 
         $namespace = $this->config->get('namespace');
-        if (!\extension_loaded($namespace)) {
+        if (!extension_loaded($namespace)) {
             $success[] = sprintf('Add "extension=%s.so" to your php.ini', $namespace);
         }
 
diff --git a/src/Console/Command/ListCommand.php b/src/Console/Command/ListCommand.php
index 3a5de699f9..4e43e5fc3f 100644
--- a/src/Console/Command/ListCommand.php
+++ b/src/Console/Command/ListCommand.php
@@ -26,23 +26,23 @@ final class ListCommand extends Command
 
     /**
      * {@inheritdoc}
+     *
+     * @param bool $mergeArgs
      */
-    protected function configure(): void
+    public function mergeApplicationDefinition($mergeArgs = true): void
     {
-        parent::configure();
+        parent::mergeApplicationDefinition($mergeArgs);
 
-        $this->setHidden(true);
+        $this->removeOptions(['dumpversion', 'version']);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @param bool $mergeArgs
      */
-    public function mergeApplicationDefinition($mergeArgs = true): void
+    protected function configure(): void
     {
-        parent::mergeApplicationDefinition($mergeArgs);
+        parent::configure();
 
-        $this->removeOptions(['dumpversion', 'version']);
+        $this->setHidden(true);
     }
 }
diff --git a/src/Console/Command/RemoveOptionsTrait.php b/src/Console/Command/RemoveOptionsTrait.php
index ca3bc4eb8c..62987b8475 100644
--- a/src/Console/Command/RemoveOptionsTrait.php
+++ b/src/Console/Command/RemoveOptionsTrait.php
@@ -16,6 +16,9 @@
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 
+use function array_filter;
+use function in_array;
+
 trait RemoveOptionsTrait
 {
     protected function removeOptions(array $names): void
@@ -23,7 +26,10 @@ protected function removeOptions(array $names): void
         /** @var InputDefinition $definition */
         $definition = $this->getDefinition();
 
-        $filtered = \array_filter($definition->getOptions(), fn (InputOption $option) => !\in_array($option->getName(), $names, true));
+        $filtered = array_filter(
+            $definition->getOptions(),
+            fn(InputOption $option) => !in_array($option->getName(), $names, true)
+        );
 
         $definition->setOptions($filtered);
     }
diff --git a/src/Console/Command/StubsCommand.php b/src/Console/Command/StubsCommand.php
index 5c229d3e2a..2051eab0da 100644
--- a/src/Console/Command/StubsCommand.php
+++ b/src/Console/Command/StubsCommand.php
@@ -44,7 +44,13 @@ protected function configure(): void
             ->setName('stubs')
             ->setDescription('Generates stubs that can be used in a PHP IDE')
             ->setDefinition($this->createDefinition())
-            ->setHelp(sprintf('%s.', $this->getDescription()).PHP_EOL.PHP_EOL.$this->getZflagsHelp());
+            ->setHelp(sprintf('%s.', $this->getDescription()) . PHP_EOL . PHP_EOL . $this->getZflagsHelp())
+        ;
+    }
+
+    protected function createDefinition(): InputDefinition
+    {
+        return new InputDefinition([]);
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -62,9 +68,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return 0;
     }
-
-    protected function createDefinition(): InputDefinition
-    {
-        return new InputDefinition([]);
-    }
 }
diff --git a/src/Detectors/ReadDetector.php b/src/Detectors/ReadDetector.php
index 8740ddf172..d59c7a9407 100644
--- a/src/Detectors/ReadDetector.php
+++ b/src/Detectors/ReadDetector.php
@@ -15,6 +15,8 @@
 
 use Zephir\Variable\Variable;
 
+use function is_array;
+
 /**
  * Detects if a variable is used in a given expression context
  * Since zvals are collected between executions to the same section of code
@@ -43,13 +45,24 @@ public function detect($variable, array $expression): bool
 
         if (in_array($expression['type'], ['fcall', 'mcall', 'scall']) && isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
-                if (\is_array($parameter['parameter']) && 'variable' === $parameter['parameter']['type'] && $variable == $parameter['parameter']['value']) {
+                if (
+                    is_array($parameter['parameter']) &&
+                    'variable' === $parameter['parameter']['type'] &&
+                    $variable == $parameter['parameter']['value']
+                ) {
                     return true;
                 }
             }
         }
 
-        return (isset($expression['left']) && \is_array($expression['left']) && $this->detect($variable, $expression['left']))
-               || (isset($expression['right']) && \is_array($expression['right']) && $this->detect($variable, $expression['right']));
+        return (
+                isset($expression['left']) &&
+                is_array($expression['left']) &&
+                $this->detect($variable, $expression['left'])
+            ) || (
+                isset($expression['right']) &&
+                is_array($expression['right']) &&
+                $this->detect($variable, $expression['right'])
+            );
     }
 }
diff --git a/src/Detectors/WriteDetector.php b/src/Detectors/WriteDetector.php
index 3f18987d03..c330bb2632 100644
--- a/src/Detectors/WriteDetector.php
+++ b/src/Detectors/WriteDetector.php
@@ -22,20 +22,37 @@
  */
 class WriteDetector
 {
-    public const DETECT_NONE = 0;
-
-    public const DETECT_PARAM_PASS = 1;
-
-    public const DETECT_ARRAY_USE = 2;
-
+    public const DETECT_ALL                 = 255;
+    public const DETECT_ARRAY_USE           = 2;
+    public const DETECT_NONE                = 0;
+    public const DETECT_PARAM_PASS          = 1;
     public const DETECT_VALUE_IN_ASSIGNMENT = 4;
-
-    public const DETECT_ALL = 255;
-
     protected int $detectionFlags = 0;
 
     protected array $mutations = [];
 
+    /**
+     * Pass "declare" statement.
+     */
+    public function declareVariables(array $statement): void
+    {
+        if (isset($statement['data-type'])) {
+            if ('variable' != $statement['data-type']) {
+                return;
+            }
+        }
+
+        foreach ($statement['variables'] as $variable) {
+            if (isset($variable['expr'])) {
+                if ('string' == $variable['expr']['type'] || 'empty-array' == $variable['expr']['type'] || 'array' == $variable['expr']['type']) {
+                    continue;
+                }
+            }
+
+            $this->increaseMutations($variable['variable']);
+        }
+    }
+
     /**
      * Do the detection pass on a single variable.
      */
@@ -47,11 +64,11 @@ public function detect(string $variable, array $statements): bool
     }
 
     /**
-     * Sets detection flags.
+     * Returns the number of assignment instructions that mutated a variable.
      */
-    public function setDetectionFlags(int $flags): void
+    public function getNumberOfMutations(string $variable): int
     {
-        $this->detectionFlags = $flags;
+        return $this->mutations[$variable] ?? 0;
     }
 
     /**
@@ -68,52 +85,6 @@ public function increaseMutations(string $variable): self
         return $this;
     }
 
-    /**
-     * Returns the number of assignment instructions that mutated a variable.
-     */
-    public function getNumberOfMutations(string $variable): int
-    {
-        return $this->mutations[$variable] ?? 0;
-    }
-
-    /**
-     * Pass let statements.
-     */
-    public function passLetStatement(array $statement): void
-    {
-        foreach ($statement['assignments'] as $assignment) {
-            if (isset($assignment['expr'])) {
-                $this->passExpression($assignment['expr']);
-            }
-            $this->increaseMutations($assignment['variable']);
-            if (self::DETECT_VALUE_IN_ASSIGNMENT == ($this->detectionFlags & self::DETECT_VALUE_IN_ASSIGNMENT)) {
-                if (isset($assignment['expr'])) {
-                    if ('variable' == $assignment['expr']['type']) {
-                        $this->increaseMutations($assignment['expr']['value']);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Pass call expressions.
-     */
-    public function passCall(array $expression): void
-    {
-        if (isset($expression['parameters'])) {
-            foreach ($expression['parameters'] as $parameter) {
-                $usePass = self::DETECT_PARAM_PASS == ($this->detectionFlags & self::DETECT_PARAM_PASS);
-                if ($usePass && 'variable' == $parameter['parameter']['type']) {
-                    $this->increaseMutations($parameter['parameter']['value']);
-                } else {
-                    $this->passExpression($parameter['parameter']);
-                }
-            }
-        }
-    }
-
     /**
      * Pass array expressions.
      */
@@ -130,9 +101,9 @@ public function passArray(array $expression): void
     }
 
     /**
-     * Pass "new" expressions.
+     * Pass call expressions.
      */
-    public function passNew(array $expression): void
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -146,28 +117,6 @@ public function passNew(array $expression): void
         }
     }
 
-    /**
-     * Pass "declare" statement.
-     */
-    public function declareVariables(array $statement): void
-    {
-        if (isset($statement['data-type'])) {
-            if ('variable' != $statement['data-type']) {
-                return;
-            }
-        }
-
-        foreach ($statement['variables'] as $variable) {
-            if (isset($variable['expr'])) {
-                if ('string' == $variable['expr']['type'] || 'empty-array' == $variable['expr']['type'] || 'array' == $variable['expr']['type']) {
-                    continue;
-                }
-            }
-
-            $this->increaseMutations($variable['variable']);
-        }
-    }
-
     /**
      * Pass expressions.
      */
@@ -270,6 +219,44 @@ public function passExpression(array $expression): void
         }
     }
 
+    /**
+     * Pass let statements.
+     */
+    public function passLetStatement(array $statement): void
+    {
+        foreach ($statement['assignments'] as $assignment) {
+            if (isset($assignment['expr'])) {
+                $this->passExpression($assignment['expr']);
+            }
+            $this->increaseMutations($assignment['variable']);
+            if (self::DETECT_VALUE_IN_ASSIGNMENT == ($this->detectionFlags & self::DETECT_VALUE_IN_ASSIGNMENT)) {
+                if (isset($assignment['expr'])) {
+                    if ('variable' == $assignment['expr']['type']) {
+                        $this->increaseMutations($assignment['expr']['value']);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Pass "new" expressions.
+     */
+    public function passNew(array $expression): void
+    {
+        if (isset($expression['parameters'])) {
+            foreach ($expression['parameters'] as $parameter) {
+                $usePass = self::DETECT_PARAM_PASS == ($this->detectionFlags & self::DETECT_PARAM_PASS);
+                if ($usePass && 'variable' == $parameter['parameter']['type']) {
+                    $this->increaseMutations($parameter['parameter']['value']);
+                } else {
+                    $this->passExpression($parameter['parameter']);
+                }
+            }
+        }
+    }
+
     /**
      * Pass statement block.
      */
@@ -415,4 +402,12 @@ public function passStatementBlock(array $statements): void
             }
         }
     }
+
+    /**
+     * Sets detection flags.
+     */
+    public function setDetectionFlags(int $flags): void
+    {
+        $this->detectionFlags = $flags;
+    }
 }
diff --git a/src/Documentation.php b/src/Documentation.php
index cb76e8c55f..7f3916bb8b 100644
--- a/src/Documentation.php
+++ b/src/Documentation.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 use Psr\Log\LoggerAwareTrait;
@@ -21,6 +21,10 @@
 use Zephir\Documentation\Theme;
 use Zephir\Exception\InvalidArgumentException;
 
+use function is_array;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * Documentation Generator.
  */
@@ -28,22 +32,16 @@ class Documentation
 {
     use LoggerAwareTrait;
 
-    protected $outputDirectory;
-
-    /** @var Config */
-    protected $config;
-
+    protected $baseUrl;
     /** @var CompilerFile[] */
     protected $classes;
-
-    /** @var Theme */
-    protected $theme;
-
+    /** @var Config */
+    protected $config;
     /** @var array */
     protected $options;
-
-    protected $baseUrl;
-
+    protected $outputDirectory;
+    /** @var Theme */
+    protected $theme;
     protected $themesDirectories;
 
     /** @var string|null */
@@ -64,89 +62,15 @@ public function __construct(array $classes, Config $config, $templatesPath, arra
     {
         ksort($classes);
 
-        $this->config = $config;
-        $this->classes = $classes;
-        $this->logger = new NullLogger();
+        $this->config        = $config;
+        $this->classes       = $classes;
+        $this->logger        = new NullLogger();
         $this->templatesPath = $templatesPath;
-        $this->options = $options;
+        $this->options       = $options;
 
         $this->initialize();
     }
 
-    /**
-     * TODO: options => to ApiOptions object
-     * TODO: Validate options.
-     *
-     * @throws ConfigException
-     * @throws Exception
-     */
-    protected function initialize(): void
-    {
-        $themeConfig = $this->config->get('theme', 'api');
-
-        if (!$themeConfig) {
-            throw new ConfigException('Theme configuration is not present');
-        }
-
-        $themeDir = $this->findThemeDirectory($themeConfig, $this->options['path']);
-
-        if (!file_exists($themeDir)) {
-            throw new ConfigException('There is no theme named '.$themeConfig['name']);
-        }
-
-        $outputDir = $this->findOutputDirectory($this->options['output']);
-
-        if (!$outputDir) {
-            throw new ConfigException('Api path (output directory) is not configured');
-        }
-
-        $this->outputDirectory = $outputDir;
-
-        if (!file_exists($outputDir)) {
-            if (!mkdir($outputDir, 0777, true)) {
-                throw new Exception("Can't write output directory $outputDir");
-            }
-        }
-
-        if (!is_writable($outputDir)) {
-            throw new Exception("Can't write output directory $outputDir");
-        }
-
-        $themeConfig['options'] = $this->prepareThemeOptions($themeConfig, $this->options['options']);
-
-        $this->theme = new Theme($themeDir, $outputDir, $themeConfig, $this->config, $this);
-
-        $this->baseUrl = $this->options['url'];
-    }
-
-    /**
-     * Search a theme by its name.
-     *
-     * Return the path to it if it exists. Otherwise NULL.
-     *
-     * @param string $name
-     *
-     * @return string|null
-     */
-    public function findThemePathByName($name)
-    {
-        // check the theme from the config
-        $path = null;
-
-        foreach ($this->themesDirectories as $themeDir) {
-            $path = rtrim($themeDir, '\\/').\DIRECTORY_SEPARATOR.$name;
-            if (!str_starts_with($path, 'phar://')) {
-                $path = realpath($path);
-            }
-
-            if (is_dir($path)) {
-                break;
-            }
-        }
-
-        return $path;
-    }
-
     /**
      * @throws Exception
      */
@@ -207,17 +131,35 @@ public static function classUrl($c)
             $cname = $c->getCompleteName();
         }
 
-        return '/class/'.trim(str_replace('\\', '/', $cname), '/').'.html';
+        return '/class/' . trim(str_replace('\\', '/', $cname), '/') . '.html';
     }
 
-    public static function namespaceUrl($ns)
+    /**
+     * Search a theme by its name.
+     *
+     * Return the path to it if it exists. Otherwise NULL.
+     *
+     * @param string $name
+     *
+     * @return string|null
+     */
+    public function findThemePathByName($name)
     {
-        return '/namespace/'.str_replace('\\', '/', $ns).'.html';
-    }
+        // check the theme from the config
+        $path = null;
 
-    public static function sourceUrl(Definition $c)
-    {
-        return '/source/'.str_replace('\\', '/', $c->getCompleteName()).'.html';
+        foreach ($this->themesDirectories as $themeDir) {
+            $path = rtrim($themeDir, '\\/') . DIRECTORY_SEPARATOR . $name;
+            if (!str_starts_with($path, 'phar://')) {
+                $path = realpath($path);
+            }
+
+            if (is_dir($path)) {
+                break;
+            }
+        }
+
+        return $path;
     }
 
     /**
@@ -230,49 +172,60 @@ public function getOutputDirectory()
         return $this->outputDirectory;
     }
 
+    public static function namespaceUrl($ns)
+    {
+        return '/namespace/' . str_replace('\\', '/', $ns) . '.html';
+    }
+
+    public static function sourceUrl(Definition $c)
+    {
+        return '/source/' . str_replace('\\', '/', $c->getCompleteName()) . '.html';
+    }
+
     /**
-     * Prepare the options by merging the one in the project config with the one in the command line arg "theme-options".
-     *
-     * command line arg "theme-options" can be either a path to a json file containing the options or a raw json string
-     *
-     * @param array       $themeConfig
-     * @param string|null $options
-     *
-     * @return array
+     * TODO: options => to ApiOptions object
+     * TODO: Validate options.
      *
+     * @throws ConfigException
      * @throws Exception
      */
-    private function prepareThemeOptions($themeConfig, $options = null)
+    protected function initialize(): void
     {
-        $parsedOptions = null;
-        if (!empty($options)) {
-            if ('{' == $options[0]) {
-                $parsedOptions = json_decode(trim($options), true);
-                if (!$parsedOptions || !\is_array($parsedOptions)) {
-                    throw new Exception("Unable to parse json from 'theme-options' argument");
-                }
-            } else {
-                if (file_exists($options)) {
-                    $unparsed = file_get_contents($options);
-                    $parsedOptions = json_decode($unparsed, true);
-                    if (!$parsedOptions || !\is_array($parsedOptions)) {
-                        throw new Exception(
-                            sprintf("Unable to parse json from the file '%s'", $options)
-                        );
-                    }
-                } else {
-                    throw new Exception(sprintf("Unable to find file '%s'", $options));
-                }
+        $themeConfig = $this->config->get('theme', 'api');
+
+        if (!$themeConfig) {
+            throw new ConfigException('Theme configuration is not present');
+        }
+
+        $themeDir = $this->findThemeDirectory($themeConfig, $this->options['path']);
+
+        if (!file_exists($themeDir)) {
+            throw new ConfigException('There is no theme named ' . $themeConfig['name']);
+        }
+
+        $outputDir = $this->findOutputDirectory($this->options['output']);
+
+        if (!$outputDir) {
+            throw new ConfigException('Api path (output directory) is not configured');
+        }
+
+        $this->outputDirectory = $outputDir;
+
+        if (!file_exists($outputDir)) {
+            if (!mkdir($outputDir, 0777, true)) {
+                throw new Exception("Can't write output directory $outputDir");
             }
         }
 
-        if (\is_array($parsedOptions)) {
-            $options = array_merge($themeConfig['options'], $parsedOptions);
-        } else {
-            $options = $themeConfig['options'];
+        if (!is_writable($outputDir)) {
+            throw new Exception("Can't write output directory $outputDir");
         }
 
-        return $options;
+        $themeConfig['options'] = $this->prepareThemeOptions($themeConfig, $this->options['options']);
+
+        $this->theme = new Theme($themeDir, $outputDir, $themeConfig, $this->config, $this);
+
+        $this->baseUrl = $this->options['url'];
     }
 
     /**
@@ -291,7 +244,7 @@ private function findOutputDirectory($outputDir)
         $outputDir = str_replace('%version%', $this->config->get('version'), $outputDir);
 
         if ('/' !== $outputDir[0]) {
-            $outputDir = getcwd().'/'.$outputDir;
+            $outputDir = getcwd() . '/' . $outputDir;
         }
 
         return $outputDir;
@@ -319,7 +272,7 @@ private function findThemeDirectory($themeConfig, $path = null)
         // check if there are additional theme paths in the config
         $themeDirectoriesConfig = $this->config->get('theme-directories', 'api');
         if ($themeDirectoriesConfig) {
-            if (\is_array($themeDirectoriesConfig)) {
+            if (is_array($themeDirectoriesConfig)) {
                 $themesDirectories = $themeDirectoriesConfig;
             } else {
                 throw new InvalidArgumentException("Invalid value for theme config 'theme-directories'");
@@ -328,7 +281,7 @@ private function findThemeDirectory($themeConfig, $path = null)
             $themesDirectories = [];
         }
 
-        $themesDirectories[] = $this->templatesPath.'/Api/themes';
+        $themesDirectories[]     = $this->templatesPath . '/Api/themes';
         $this->themesDirectories = $themesDirectories;
 
         // check if the path was set from the command
@@ -353,4 +306,50 @@ private function findThemeDirectory($themeConfig, $path = null)
 
         return $this->findThemePathByName($themeConfig['name']);
     }
+
+    /**
+     * Prepare the options by merging the one in the project config with the one in the command line arg
+     * "theme-options".
+     *
+     * command line arg "theme-options" can be either a path to a json file containing the options or a raw json string
+     *
+     * @param array       $themeConfig
+     * @param string|null $options
+     *
+     * @return array
+     *
+     * @throws Exception
+     */
+    private function prepareThemeOptions($themeConfig, $options = null)
+    {
+        $parsedOptions = null;
+        if (!empty($options)) {
+            if ('{' == $options[0]) {
+                $parsedOptions = json_decode(trim($options), true);
+                if (!$parsedOptions || !is_array($parsedOptions)) {
+                    throw new Exception("Unable to parse json from 'theme-options' argument");
+                }
+            } else {
+                if (file_exists($options)) {
+                    $unparsed      = file_get_contents($options);
+                    $parsedOptions = json_decode($unparsed, true);
+                    if (!$parsedOptions || !is_array($parsedOptions)) {
+                        throw new Exception(
+                            sprintf("Unable to parse json from the file '%s'", $options)
+                        );
+                    }
+                } else {
+                    throw new Exception(sprintf("Unable to find file '%s'", $options));
+                }
+            }
+        }
+
+        if (is_array($parsedOptions)) {
+            $options = array_merge($themeConfig['options'], $parsedOptions);
+        } else {
+            $options = $themeConfig['options'];
+        }
+
+        return $options;
+    }
 }
diff --git a/src/Documentation/Annotation.php b/src/Documentation/Annotation.php
index 43f81b8323..8994233dc9 100644
--- a/src/Documentation/Annotation.php
+++ b/src/Documentation/Annotation.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
 /**
@@ -23,6 +25,11 @@ public function __construct(protected string $name, protected string $string)
         $this->string = trim($string);
     }
 
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
     public function getString(): string
     {
         return $this->string;
@@ -32,9 +39,4 @@ public function setString(string $string): void
     {
         $this->string = $string;
     }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
 }
diff --git a/src/Documentation/Annotation/Link.php b/src/Documentation/Annotation/Link.php
index 00a1f2f922..399c89c43e 100644
--- a/src/Documentation/Annotation/Link.php
+++ b/src/Documentation/Annotation/Link.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\Annotation;
 
 use Zephir\Documentation\Annotation;
@@ -20,28 +20,27 @@
  */
 class Link extends Annotation
 {
-    /** @var string|null */
-    protected $uri;
-
     /** @var string|null */
     protected $linkText;
+    /** @var string|null */
+    protected $uri;
 
-    public function getUri()
+    public function getLinkText()
     {
         if (!$this->contentParsed) {
             $this->parseContent();
         }
 
-        return $this->uri;
+        return $this->linkText;
     }
 
-    public function getLinkText()
+    public function getUri()
     {
         if (!$this->contentParsed) {
             $this->parseContent();
         }
 
-        return $this->linkText;
+        return $this->uri;
     }
 
     protected function parseContent(): void
@@ -51,7 +50,7 @@ protected function parseContent(): void
         $this->uri = $this->string;
 
         if (false !== $spaceIndex) {
-            $this->uri = substr($this->string, 0, $spaceIndex);
+            $this->uri      = substr($this->string, 0, $spaceIndex);
             $this->linkText = substr($this->string, $spaceIndex + 1);
         }
 
diff --git a/src/Documentation/Annotation/ReturnAnnotation.php b/src/Documentation/Annotation/ReturnAnnotation.php
index 9ee0f8a827..e44c0d3015 100644
--- a/src/Documentation/Annotation/ReturnAnnotation.php
+++ b/src/Documentation/Annotation/ReturnAnnotation.php
@@ -20,25 +20,25 @@
  */
 class ReturnAnnotation extends Annotation
 {
-    protected string $returnType;
     protected string $description;
+    protected string $returnType;
 
-    public function getReturnType(): string
+    public function getDescription(): string
     {
         if (!$this->contentParsed) {
             $this->parseContent();
         }
 
-        return $this->returnType;
+        return $this->description;
     }
 
-    public function getDescription(): string
+    public function getReturnType(): string
     {
         if (!$this->contentParsed) {
             $this->parseContent();
         }
 
-        return $this->description;
+        return $this->returnType;
     }
 
     protected function parseContent(): void
@@ -48,7 +48,7 @@ protected function parseContent(): void
         $this->returnType = $this->string;
 
         if (false !== $spaceIndex) {
-            $this->returnType = substr($this->string, 0, $spaceIndex);
+            $this->returnType  = substr($this->string, 0, $spaceIndex);
             $this->description = substr($this->string, $spaceIndex + 1);
         }
 
diff --git a/src/Documentation/Annotation/See.php b/src/Documentation/Annotation/See.php
index 0c3dfbe74f..d6ed471b3e 100644
--- a/src/Documentation/Annotation/See.php
+++ b/src/Documentation/Annotation/See.php
@@ -49,7 +49,7 @@ protected function parseContent(): void
 
         if (false !== $spaceIndex) {
             $this->resource = substr($this->string, 0, $spaceIndex);
-            $this->text = substr($this->string, $spaceIndex + 1);
+            $this->text     = substr($this->string, $spaceIndex + 1);
         }
 
         $this->contentParsed = true;
diff --git a/src/Documentation/Docblock.php b/src/Documentation/Docblock.php
index 03d6a412b3..80896e03f6 100644
--- a/src/Documentation/Docblock.php
+++ b/src/Documentation/Docblock.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
 /**
@@ -16,16 +18,14 @@
  */
 class Docblock
 {
-    /**
-     * @var string
-     */
-    protected string $description;
-
     /**
      * @var Annotation[]
      */
     protected array $annotations = [];
-
+    /**
+     * @var string
+     */
+    protected string $description;
     /**
      * @var string
      */
@@ -40,27 +40,53 @@ public function __toString()
     }
 
     /**
-     * @return string
+     * @param Annotation $annotation
      */
-    public function getDescription(): string
+    public function addAnnotation(Annotation $annotation): void
     {
-        return $this->description;
+        $this->annotations[] = $annotation;
     }
 
     /**
-     * @return Annotation[]
+     * @return string
      */
-    public function getAnnotations(): array
+    public function generate(): string
     {
-        return $this->annotations;
+        $docBlock         = '**';
+        $summaryBlock     = $this->getSummary();
+        $descriptionBlock = $this->getDescription();
+        $annotationsBlock = $this->getAnnotations();
+
+        if ($summaryBlock) {
+            $docBlock .= PHP_EOL . ' * ' . $summaryBlock;
+        }
+
+        if ($descriptionBlock) {
+            $docBlock .= PHP_EOL . ' *';
+            $docBlock .= PHP_EOL . ' *';
+
+            foreach (explode("\n", $descriptionBlock) as $line) {
+                $docBlock .= PHP_EOL . ' * ' . trim($line);
+            }
+
+            $docBlock .= PHP_EOL . ' *';
+        }
+
+        if ($annotationsBlock) {
+            foreach ($annotationsBlock as $annotation) {
+                $docBlock .= PHP_EOL . ' * @' . $annotation->getName() . ' ' . $annotation->getString();
+            }
+        }
+
+        return $docBlock . PHP_EOL . ' *';
     }
 
     /**
-     * @param Annotation[] $annotations
+     * @return Annotation[]
      */
-    public function setAnnotations(array $annotations)
+    public function getAnnotations(): array
     {
-        $this->annotations = $annotations;
+        return $this->annotations;
     }
 
     /**
@@ -82,68 +108,42 @@ public function getAnnotationsByType(string $type): array
     }
 
     /**
-     * @param string $description
+     * @return string
      */
-    public function setDescription(string $description)
+    public function getDescription(): string
     {
-        $this->description = $description;
+        return $this->description;
     }
 
     /**
-     * @param Annotation $annotation
+     * @return string
      */
-    public function addAnnotation(Annotation $annotation): void
+    public function getSummary(): string
     {
-        $this->annotations[] = $annotation;
+        return $this->summary;
     }
 
     /**
-     * @return string
+     * @param Annotation[] $annotations
      */
-    public function getSummary(): string
+    public function setAnnotations(array $annotations)
     {
-        return $this->summary;
+        $this->annotations = $annotations;
     }
 
     /**
-     * @param string $summary
+     * @param string $description
      */
-    public function setSummary(string $summary): void
+    public function setDescription(string $description)
     {
-        $this->summary = $summary;
+        $this->description = $description;
     }
 
     /**
-     * @return string
+     * @param string $summary
      */
-    public function generate(): string
+    public function setSummary(string $summary): void
     {
-        $docBlock = '**';
-        $summaryBlock = $this->getSummary();
-        $descriptionBlock = $this->getDescription();
-        $annotationsBlock = $this->getAnnotations();
-
-        if ($summaryBlock) {
-            $docBlock .= PHP_EOL.' * '.$summaryBlock;
-        }
-
-        if ($descriptionBlock) {
-            $docBlock .= PHP_EOL.' *';
-            $docBlock .= PHP_EOL.' *';
-
-            foreach (explode("\n", $descriptionBlock) as $line) {
-                $docBlock .= PHP_EOL.' * '.trim($line);
-            }
-
-            $docBlock .= PHP_EOL.' *';
-        }
-
-        if ($annotationsBlock) {
-            foreach ($annotationsBlock as $annotation) {
-                $docBlock .= PHP_EOL.' * @'.$annotation->getName().' '.$annotation->getString();
-            }
-        }
-
-        return $docBlock.PHP_EOL.' *';
+        $this->summary = $summary;
     }
 }
diff --git a/src/Documentation/DocblockParser.php b/src/Documentation/DocblockParser.php
index 098bc575e1..b2572db476 100644
--- a/src/Documentation/DocblockParser.php
+++ b/src/Documentation/DocblockParser.php
@@ -9,8 +9,12 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
+use function strlen;
+
 /**
  * Helper to parse raw docblocks to structured object.
  */
@@ -18,33 +22,30 @@ class DocblockParser
 {
     protected $annotation;
     protected $annotationLen;
+    protected $annotationNameOpen;
+    protected $annotationOpen;
+    protected $commentOpen;
 
+    // Parsing helpers
+    protected $currentAnnotationContentStr;
+    protected $currentAnnotationStr;
     protected $currentChar;
     protected $currentCharIndex;
     protected $currentLine;
-
-    // Parsing helpers
-    protected $ignoreSpaces;
-    protected $ignoreStar;
-    protected $commentOpen;
-    protected $annotationNameOpen;
-    protected $annotationOpen;
-    protected $summaryOpen;
     protected $descriptionOpen;
-
-    // parsed data
-    protected $currentAnnotationStr;
-    protected $currentAnnotationContentStr;
-    protected $summaryStr;
     protected $descriptionStr;
 
+    // parsed data
     /**
      * @var Docblock
      */
     protected $docblockObj;
+    protected $ignoreSpaces;
+    protected $ignoreStar;
+    protected $summaryOpen;
+    protected $summaryStr;
 
     /**
-     * @param string $annotation a row annotation string begining with /**
      */
     public function __construct(string $annotation)
     {
@@ -52,49 +53,13 @@ public function __construct(string $annotation)
     }
 
     /**
-     * check if there is a currently parsed annotation, registers it, and stops the current annotation parsing.
-     */
-    private function __tryRegisterAnnotation(): void
-    {
-        if (($this->annotationNameOpen || $this->annotationOpen) && $this->currentAnnotationStr !== '') {
-            $annotation = $this->__createAnnotation($this->currentAnnotationStr, $this->currentAnnotationContentStr);
-            $this->docblockObj->addAnnotation($annotation);
-        }
-
-        $this->annotationNameOpen = false;
-        $this->annotationOpen = false;
-    }
-
-    /**
-     * @param string $name   the annotation name
-     * @param string $string the annotation name
+     * return the parsed docblock. It will return null until you run the parse() method.
      *
-     * @return \Zephir\Documentation\Annotation
+     * @return Docblock the parsed docblock
      */
-    private function __createAnnotation($name, $string)
+    public function getParsedDocblock()
     {
-        switch ($name) {
-            case 'link':
-                $annotation = new Annotation\Link($name, $string);
-                $annotation->getLinkText();
-                break;
-
-            case 'return':
-                $annotation = new Annotation\ReturnAnnotation($name, $string);
-                $annotation->getReturnType();
-                break;
-
-            case 'see':
-                $annotation = new Annotation\See($name, $string);
-                $annotation->getResource();
-                break;
-
-            default:
-                $annotation = new Annotation($name, $string);
-                break;
-        }
-
-        return $annotation;
+        return $this->docblockObj;
     }
 
     /**
@@ -106,24 +71,24 @@ public function parse()
     {
         $this->docblockObj = new Docblock();
 
-        $this->ignoreSpaces = false;
-        $this->ignoreStar = true;
-        $this->commentOpen = false;
+        $this->ignoreSpaces       = false;
+        $this->ignoreStar         = true;
+        $this->commentOpen        = false;
         $this->annotationNameOpen = false;
-        $this->annotationOpen = false;
-        $this->summaryOpen = true;
-        $this->descriptionOpen = false;
+        $this->annotationOpen     = false;
+        $this->summaryOpen        = true;
+        $this->descriptionOpen    = false;
 
-        $this->currentAnnotationStr = null;
+        $this->currentAnnotationStr        = null;
         $this->currentAnnotationContentStr = null;
 
-        $this->summaryStr = '';
+        $this->summaryStr     = '';
         $this->descriptionStr = '';
 
-        $this->currentLine = 0;
+        $this->currentLine      = 0;
         $this->currentCharIndex = 0;
-        $this->annotationLen = \strlen($this->annotation);
-        $this->currentChar = $this->annotation[0];
+        $this->annotationLen    = strlen($this->annotation);
+        $this->currentChar      = $this->annotation[0];
 
         while (null !== $this->currentChar) {
             $currentChar = $this->currentChar;
@@ -159,10 +124,10 @@ public function parse()
                             $this->descriptionOpen = false;
                         }
 
-                        $this->currentAnnotationStr = '';
+                        $this->currentAnnotationStr        = '';
                         $this->currentAnnotationContentStr = '';
 
-                        $this->ignoreSpaces = false;
+                        $this->ignoreSpaces       = false;
                         $this->annotationNameOpen = true;
                     } elseif ($this->annotationNameOpen || $this->annotationOpen) {
                         // stop annotation parsing on new line
@@ -170,11 +135,11 @@ public function parse()
                             $this->__tryRegisterAnnotation();
 
                             $this->ignoreSpaces = false;
-                            $this->ignoreStar = true;
+                            $this->ignoreStar   = true;
                         } elseif ($this->annotationNameOpen) {
                             if (ctype_space($currentChar)) {
                                 $this->annotationNameOpen = false;
-                                $this->annotationOpen = true;
+                                $this->annotationOpen     = true;
                             } else {
                                 $this->currentAnnotationStr .= $currentChar;
                             }
@@ -184,9 +149,9 @@ public function parse()
                     } elseif ($this->summaryOpen) {
                         // stop summary on new line
                         if ($this->summaryStr !== '' && ("\n" == $currentChar || "\r" == $currentChar)) {
-                            $this->summaryOpen = false;
+                            $this->summaryOpen     = false;
                             $this->descriptionOpen = true;
-                            $this->ignoreStar = true;
+                            $this->ignoreStar      = true;
                         } else {
                             $this->summaryStr .= $currentChar;
                         }
@@ -211,13 +176,49 @@ public function parse()
     }
 
     /**
-     * return the parsed docblock. It will return null until you run the parse() method.
+     * @param string $name   the annotation name
+     * @param string $string the annotation name
      *
-     * @return Docblock the parsed docblock
+     * @return Annotation
      */
-    public function getParsedDocblock()
+    private function __createAnnotation($name, $string)
     {
-        return $this->docblockObj;
+        switch ($name) {
+            case 'link':
+                $annotation = new Annotation\Link($name, $string);
+                $annotation->getLinkText();
+                break;
+
+            case 'return':
+                $annotation = new Annotation\ReturnAnnotation($name, $string);
+                $annotation->getReturnType();
+                break;
+
+            case 'see':
+                $annotation = new Annotation\See($name, $string);
+                $annotation->getResource();
+                break;
+
+            default:
+                $annotation = new Annotation($name, $string);
+                break;
+        }
+
+        return $annotation;
+    }
+
+    /**
+     * check if there is a currently parsed annotation, registers it, and stops the current annotation parsing.
+     */
+    private function __tryRegisterAnnotation(): void
+    {
+        if (($this->annotationNameOpen || $this->annotationOpen) && $this->currentAnnotationStr !== '') {
+            $annotation = $this->__createAnnotation($this->currentAnnotationStr, $this->currentAnnotationContentStr);
+            $this->docblockObj->addAnnotation($annotation);
+        }
+
+        $this->annotationNameOpen = false;
+        $this->annotationOpen     = false;
     }
 
     /**
diff --git a/src/Documentation/File/ClassFile.php b/src/Documentation/File/ClassFile.php
index a278b10063..110b3fc899 100644
--- a/src/Documentation/File/ClassFile.php
+++ b/src/Documentation/File/ClassFile.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\File;
 
 use Zephir\Class\Definition\Definition;
@@ -25,33 +27,28 @@ public function __construct(protected CompilerFile $compilerFile)
         $this->class = $compilerFile->getClassDefinition();
     }
 
-    public function getTemplateName(): string
-    {
-        return 'class.phtml';
-    }
-
     public function getData(): array
     {
         $nsPieces = explode('\\', $this->class->getNamespace());
 
         $nsPatches = [];
-        $nsStr = '';
+        $nsStr     = '';
 
         foreach ($nsPieces as $n) {
             if ($nsStr !== '') {
                 $nsStr .= '\\';
             }
-            $nsStr .= $n;
+            $nsStr         .= $n;
             $nsPatches[$n] = $nsStr;
         }
 
         return [
             'classDefinition' => $this->class,
-            'compilerFile' => $this->compilerFile,
-            'className' => $this->class->getName(),
-            'classNamespace' => $this->class->getNamespace(),
-            'fullName' => $this->class->getCompleteName(),
-            'methods' => $this->class->getMethods(),
+            'compilerFile'    => $this->compilerFile,
+            'className'       => $this->class->getName(),
+            'classNamespace'  => $this->class->getNamespace(),
+            'fullName'        => $this->class->getCompleteName(),
+            'methods'         => $this->class->getMethods(),
             'namespacePieces' => $nsPatches,
         ];
     }
@@ -60,4 +57,9 @@ public function getOutputFile(): string
     {
         return Documentation::classUrl($this->class);
     }
+
+    public function getTemplateName(): string
+    {
+        return 'class.phtml';
+    }
 }
diff --git a/src/Documentation/File/ClassesFile.php b/src/Documentation/File/ClassesFile.php
index 4d5f8ce1b2..5bb01a79de 100644
--- a/src/Documentation/File/ClassesFile.php
+++ b/src/Documentation/File/ClassesFile.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\File;
 
 use Zephir\Class\Definition\Definition;
@@ -20,11 +22,6 @@ public function __construct(protected Definition $classes)
     {
     }
 
-    public function getTemplateName(): string
-    {
-        return 'classes.phtml';
-    }
-
     public function getData(): array
     {
         return [
@@ -36,4 +33,9 @@ public function getOutputFile(): string
     {
         return 'classes.html';
     }
+
+    public function getTemplateName(): string
+    {
+        return 'classes.phtml';
+    }
 }
diff --git a/src/Documentation/File/IndexFile.php b/src/Documentation/File/IndexFile.php
index e2f0595fea..20275e15c2 100644
--- a/src/Documentation/File/IndexFile.php
+++ b/src/Documentation/File/IndexFile.php
@@ -22,17 +22,12 @@ public function __construct(protected NamespaceAccessor $namespaceAccessor)
     {
     }
 
-    public function getTemplateName(): string
-    {
-        return 'index.phtml';
-    }
-
     public function getData(): array
     {
         return [
             'namespaceAccessor' => $this->namespaceAccessor,
-            'namespacesTree' => $this->namespaceAccessor->getNamespaceTree(),
-            'namespaces' => $this->namespaceAccessor->getByNamespace(),
+            'namespacesTree'    => $this->namespaceAccessor->getNamespaceTree(),
+            'namespaces'        => $this->namespaceAccessor->getByNamespace(),
         ];
     }
 
@@ -40,4 +35,9 @@ public function getOutputFile(): string
     {
         return 'index.html';
     }
+
+    public function getTemplateName(): string
+    {
+        return 'index.phtml';
+    }
 }
diff --git a/src/Documentation/File/NamespaceFile.php b/src/Documentation/File/NamespaceFile.php
index 0316f6d7cf..c5fba5bfcd 100644
--- a/src/Documentation/File/NamespaceFile.php
+++ b/src/Documentation/File/NamespaceFile.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\File;
 
 use Zephir\Documentation;
@@ -21,16 +23,6 @@ public function __construct(protected NamespaceHelper $namespaceHelper)
     {
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getTemplateName(): string
-    {
-        return 'namespace.phtml';
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -40,8 +32,8 @@ public function getData(): array
     {
         return [
             'namespaceHelper' => $this->namespaceHelper,
-            'subNamespaces' => $this->namespaceHelper->getNamespaces(),
-            'subClasses' => $this->namespaceHelper->getClasses(),
+            'subNamespaces'   => $this->namespaceHelper->getNamespaces(),
+            'subClasses'      => $this->namespaceHelper->getClasses(),
         ];
     }
 
@@ -54,4 +46,14 @@ public function getOutputFile(): string
     {
         return Documentation::namespaceUrl($this->namespaceHelper->getFullNamespace());
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getTemplateName(): string
+    {
+        return 'namespace.phtml';
+    }
 }
diff --git a/src/Documentation/File/NamespacesFile.php b/src/Documentation/File/NamespacesFile.php
index 5a58c8a371..460510fe34 100644
--- a/src/Documentation/File/NamespacesFile.php
+++ b/src/Documentation/File/NamespacesFile.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\File;
 
 use Zephir\Documentation\FileInterface;
@@ -20,17 +22,12 @@ public function __construct(protected NamespaceAccessor $namespaceAccessor)
     {
     }
 
-    public function getTemplateName(): string
-    {
-        return 'namespaces.phtml';
-    }
-
     public function getData(): array
     {
         return [
             'namespaceAccessor' => $this->namespaceAccessor,
-            'namespacesTree' => $this->namespaceAccessor->getNamespaceTree(),
-            'namespaces' => $this->namespaceAccessor->getByNamespace(),
+            'namespacesTree'    => $this->namespaceAccessor->getNamespaceTree(),
+            'namespaces'        => $this->namespaceAccessor->getByNamespace(),
         ];
     }
 
@@ -38,4 +35,9 @@ public function getOutputFile(): string
     {
         return 'namespaces.html';
     }
+
+    public function getTemplateName(): string
+    {
+        return 'namespaces.phtml';
+    }
 }
diff --git a/src/Documentation/File/Sitemap.php b/src/Documentation/File/Sitemap.php
index b4863c002c..7ff60dc950 100644
--- a/src/Documentation/File/Sitemap.php
+++ b/src/Documentation/File/Sitemap.php
@@ -9,33 +9,27 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\File;
 
 use Zephir\Documentation\FileInterface;
 
+use const DIRECTORY_SEPARATOR;
+
 class Sitemap implements FileInterface
 {
+    protected $baseUrl;
     protected $classes;
     protected $namespaces;
-    protected $baseUrl;
     private $baseDir;
 
     public function __construct($baseDir, $baseUrl, $classList, $namespaceList)
     {
-        $this->classes = $classList;
+        $this->classes    = $classList;
         $this->namespaces = $namespaceList;
-        $this->baseUrl = rtrim($baseUrl, '\\/').\DIRECTORY_SEPARATOR;
-        $this->baseDir = $baseDir;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getTemplateName(): string
-    {
-        return $this->baseDir.'/Api/sitemap.php';
+        $this->baseUrl    = rtrim($baseUrl, '\\/') . DIRECTORY_SEPARATOR;
+        $this->baseDir    = $baseDir;
     }
 
     /**
@@ -46,9 +40,9 @@ public function getTemplateName(): string
     public function getData(): array
     {
         return [
-            'classes' => $this->classes,
+            'classes'    => $this->classes,
             'namespaces' => $this->namespaces,
-            'baseUrl' => $this->baseUrl,
+            'baseUrl'    => $this->baseUrl,
         ];
     }
 
@@ -61,4 +55,14 @@ public function getOutputFile(): string
     {
         return 'sitemap.xml';
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getTemplateName(): string
+    {
+        return $this->baseDir . '/Api/sitemap.php';
+    }
 }
diff --git a/src/Documentation/File/SourceFile.php b/src/Documentation/File/SourceFile.php
index 1f7ec6dd1a..b07f9a77c7 100644
--- a/src/Documentation/File/SourceFile.php
+++ b/src/Documentation/File/SourceFile.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation\File;
 
 use Zephir\Class\Definition\Definition;
@@ -18,13 +20,13 @@ class SourceFile extends ClassFile
 {
     protected Definition $class;
 
-    public function getTemplateName(): string
+    public function getOutputFile(): string
     {
-        return 'source.phtml';
+        return Documentation::sourceUrl($this->class);
     }
 
-    public function getOutputFile(): string
+    public function getTemplateName(): string
     {
-        return Documentation::sourceUrl($this->class);
+        return 'source.phtml';
     }
 }
diff --git a/src/Documentation/FileInterface.php b/src/Documentation/FileInterface.php
index 1080e5a587..3e3e28cd09 100644
--- a/src/Documentation/FileInterface.php
+++ b/src/Documentation/FileInterface.php
@@ -9,14 +9,16 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
 interface FileInterface
 {
     /**
-     * @return string
+     * @return array
      */
-    public function getTemplateName(): string;
+    public function getData(): array;
 
     /**
      * @return string
@@ -24,7 +26,7 @@ public function getTemplateName(): string;
     public function getOutputFile(): string;
 
     /**
-     * @return array
+     * @return string
      */
-    public function getData(): array;
+    public function getTemplateName(): string;
 }
diff --git a/src/Documentation/NamespaceAccessor.php b/src/Documentation/NamespaceAccessor.php
index 103dc6c3f6..839ed6430a 100644
--- a/src/Documentation/NamespaceAccessor.php
+++ b/src/Documentation/NamespaceAccessor.php
@@ -9,56 +9,45 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
+use Zephir\CompilerFile;
+
 class NamespaceAccessor
 {
+    protected $byNamespace;
     /**
-     * @var \Zephir\CompilerFile[]
+     * @var CompilerFile[]
      */
     protected $classes;
-
     protected $namespaceTree;
 
-    protected $byNamespace;
-
     /**
-     * @param \Zephir\CompilerFile[] $files
+     * @param CompilerFile[] $files
      */
     public function __construct($files)
     {
         $this->classes = $files;
     }
 
-    /**
-     * @return NamespaceHelper[]
-     */
-    public function getByNamespace()
-    {
-        return $this->byNamespace;
-    }
-
-    public function getNamespaceTree()
-    {
-        return $this->namespaceTree;
-    }
-
     public function build(): void
     {
         $byNamespace = [];
-        $tree = [];
+        $tree        = [];
 
         foreach ($this->classes as $class) {
-            $ns = explode('\\', $class->getClassDefinition()->getNamespace());
+            $ns        = explode('\\', $class->getClassDefinition()->getNamespace());
             $actualStr = '';
             foreach ($ns as $n) {
                 if ($actualStr !== '') {
-                    $previous = $byNamespace[$actualStr];
+                    $previous  = $byNamespace[$actualStr];
                     $actualStr .= '\\';
-                    $isRoot = false;
+                    $isRoot    = false;
                 } else {
                     $previous = null;
-                    $isRoot = true;
+                    $isRoot   = true;
                 }
                 $actualStr .= $n;
 
@@ -82,7 +71,20 @@ public function build(): void
             $nh->addClass($class);
         }
 
-        $this->byNamespace = $byNamespace;
+        $this->byNamespace   = $byNamespace;
         $this->namespaceTree = $tree;
     }
+
+    /**
+     * @return NamespaceHelper[]
+     */
+    public function getByNamespace()
+    {
+        return $this->byNamespace;
+    }
+
+    public function getNamespaceTree()
+    {
+        return $this->namespaceTree;
+    }
 }
diff --git a/src/Documentation/NamespaceHelper.php b/src/Documentation/NamespaceHelper.php
index 30b75d1718..9100864b5e 100644
--- a/src/Documentation/NamespaceHelper.php
+++ b/src/Documentation/NamespaceHelper.php
@@ -9,22 +9,25 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
 use Zephir\CompilerFile;
 
+use function count;
+
 class NamespaceHelper
 {
+    protected array  $classes    = [];
     protected string $endNamespace;
+    protected array  $namespaces = [];
     protected string $parentName;
 
-    protected array $classes = [];
-    protected array $namespaces = [];
-
     public function __construct(protected string $fullNamespace)
     {
-        $ex = explode('\\', $fullNamespace);
-        $this->endNamespace = $ex[\count($ex) - 1];
+        $ex                 = explode('\\', $fullNamespace);
+        $this->endNamespace = $ex[count($ex) - 1];
 
         array_pop($ex);
 
@@ -36,14 +39,19 @@ public function addClass(CompilerFile $c): void
         $this->classes[] = $c;
     }
 
+    public function getClasses(): array
+    {
+        return $this->classes;
+    }
+
     public function getFullNamespace(): string
     {
         return $this->fullNamespace;
     }
 
-    public function getShortName(): string
+    public function getNamespaces(): array
     {
-        return $this->endNamespace;
+        return $this->namespaces;
     }
 
     public function getParentName(): string
@@ -51,13 +59,8 @@ public function getParentName(): string
         return $this->parentName;
     }
 
-    public function getClasses(): array
-    {
-        return $this->classes;
-    }
-
-    public function getNamespaces(): array
+    public function getShortName(): string
     {
-        return $this->namespaces;
+        return $this->endNamespace;
     }
 }
diff --git a/src/Documentation/Template.php b/src/Documentation/Template.php
index c66c2dc15d..8213423ddd 100644
--- a/src/Documentation/Template.php
+++ b/src/Documentation/Template.php
@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
 use Zephir\Class\Definition\Definition;
@@ -17,14 +19,16 @@
 use Zephir\Documentation;
 use Zephir\Exception;
 
+use function is_string;
+
 class Template
 {
     protected string $pathToRoot = './';
-    protected $themeOptions;
     /**
      * @var Config
      */
     protected $projectConfig;
+    protected $themeOptions;
 
     /**
      * Template constructor.
@@ -48,19 +52,47 @@ public function __construct(
         }
     }
 
-    private function getTemplatePath($fileName)
+    /**
+     * @return string
+     */
+    public function getPathToRoot(): string
     {
-        if ('/' == $fileName[0] || str_starts_with($fileName, 'phar://')) {
-            return $fileName;
+        return $this->pathToRoot;
+    }
+
+    public function parse()
+    {
+        foreach ($this->data as $name => $value) {
+            $$name = $value;
         }
+        $path = $this->getTemplatePath($this->template);
+        ob_start();
+        include $path;
+        $content = ob_get_clean();
 
-        $inputFilename = $this->theme->getThemePathExtendsAware($fileName);
+        return $content;
+    }
 
-        if (!file_exists($inputFilename)) {
-            throw new Exception("Template not found : $inputFilename");
-        }
+    public function partial(string $fileName, array $data = [])
+    {
+        $newLevel = $this->nestedLevel + 1;
 
-        return $inputFilename;
+        $template = new self($this->theme, array_merge($this->data, $data), $fileName, $newLevel);
+        $template->setPathToRoot($this->getPathToRoot());
+        $template->setThemeOptions($this->themeOptions);
+        $template->setProjectConfig($this->projectConfig);
+
+        return $template->parse();
+    }
+
+    /**
+     * the path to root for the hyperlink in the templates.
+     *
+     * @param string $pathToRoot
+     */
+    public function setPathToRoot(string $pathToRoot): void
+    {
+        $this->pathToRoot = $pathToRoot;
     }
 
     /**
@@ -83,16 +115,6 @@ public function setThemeOptions($themeOptions): void
         $this->themeOptions = $themeOptions;
     }
 
-    /**
-     * the path to root for the hyperlink in the templates.
-     *
-     * @param string $pathToRoot
-     */
-    public function setPathToRoot(string $pathToRoot): void
-    {
-        $this->pathToRoot = $pathToRoot;
-    }
-
     /**
      * Generate an url relative to the current directory.
      *
@@ -102,10 +124,10 @@ public function setPathToRoot(string $pathToRoot): void
      */
     public function url(string $url): string
     {
-        if (\is_string($url)) {
+        if (is_string($url)) {
             if ('/' == $url[0]) {
-                return $this->getPathToRoot().ltrim($url, '/');
-            } elseif (\is_string($url)) {
+                return $this->getPathToRoot() . ltrim($url, '/');
+            } elseif (is_string($url)) {
                 return $url;
             }
         } elseif ($url instanceof Definition) {
@@ -117,42 +139,24 @@ public function url(string $url): string
         return '';
     }
 
-    /**
-     * @return string
-     */
-    public function getPathToRoot(): string
-    {
-        return $this->pathToRoot;
-    }
-
     public function write($outputFile): void
     {
         $content = $this->parse();
         file_put_contents($outputFile, $content);
     }
 
-    public function parse()
+    private function getTemplatePath($fileName)
     {
-        foreach ($this->data as $name => $value) {
-            $$name = $value;
+        if ('/' == $fileName[0] || str_starts_with($fileName, 'phar://')) {
+            return $fileName;
         }
-        $path = $this->getTemplatePath($this->template);
-        ob_start();
-        include $path;
-        $content = ob_get_clean();
-
-        return $content;
-    }
 
-    public function partial(string $fileName, array $data = [])
-    {
-        $newLevel = $this->nestedLevel + 1;
+        $inputFilename = $this->theme->getThemePathExtendsAware($fileName);
 
-        $template = new self($this->theme, array_merge($this->data, $data), $fileName, $newLevel);
-        $template->setPathToRoot($this->getPathToRoot());
-        $template->setThemeOptions($this->themeOptions);
-        $template->setProjectConfig($this->projectConfig);
+        if (!file_exists($inputFilename)) {
+            throw new Exception("Template not found : $inputFilename");
+        }
 
-        return $template->parse();
+        return $inputFilename;
     }
 }
diff --git a/src/Documentation/Theme.php b/src/Documentation/Theme.php
index df204b4aa4..ddc3243771 100644
--- a/src/Documentation/Theme.php
+++ b/src/Documentation/Theme.php
@@ -9,36 +9,39 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Documentation;
 
 use Zephir\Documentation;
 use Zephir\Exception;
 
+use function count;
+use function is_array;
+
 class Theme
 {
-    protected $themeDir;
-    protected $outputDir;
-    protected $themeConfig;
-    protected $options;
-    protected $projectConfig;
     /**
      * @var Documentation
      */
     protected $documentation;
-
     /**
      * @var Theme
      */
     protected $extendedTheme;
-
+    protected $options;
+    protected $outputDir;
+    protected $projectConfig;
+    protected $themeConfig;
+    protected $themeDir;
     protected $themeInfos = [];
 
     public function __construct($themeDir, $outputDir, $themeConfig, $config, Documentation $documentation)
     {
-        $this->outputDir = $outputDir;
-        $this->themeConfig = $themeConfig;
-        $this->themeDir = $themeDir;
-        $this->options = $themeConfig['options'];
+        $this->outputDir     = $outputDir;
+        $this->themeConfig   = $themeConfig;
+        $this->themeDir      = $themeDir;
+        $this->options       = $themeConfig['options'];
         $this->projectConfig = $config;
         $this->documentation = $documentation;
 
@@ -52,7 +55,7 @@ public function __construct($themeDir, $outputDir, $themeConfig, $config, Docume
                 if (isset($themeInfos['extends'])) {
                     $extThemePath = $documentation->findThemePathByName($themeInfos['extends']);
                     if (!$extThemePath) {
-                        throw new Exception('Unable to find extended theme '.$themeInfos['extends']);
+                        throw new Exception('Unable to find extended theme ' . $themeInfos['extends']);
                     }
 
                     $this->extendedTheme = new self($extThemePath, $outputDir, $themeConfig, $config, $documentation);
@@ -61,30 +64,98 @@ public function __construct($themeDir, $outputDir, $themeConfig, $config, Docume
         }
     }
 
+    public function buildJsonClassDefinition($classList, NamespaceAccessor $nsA)
+    {
+        $output = [
+            'allClasses'    => [],
+            'allNamespaces' => [],
+            'classes'       => [],
+            'namespaces'    => [],
+        ];
+
+        foreach ($classList as $class) {
+            $cDef  = $class->getClassDefinition();
+            $cName = $cDef->getCompleteName();
+
+            $output['allClasses'][$cName] = [
+                'type'      => $cDef->getType(),
+                'name'      => $cName,
+                'shortname' => $cDef->getName(),
+            ];
+
+            if (!strpos($cName, '\\') > 0) {
+                $output['classes'][] = $cName;
+            }
+        }
+
+        $namespaces = $nsA->getByNamespace();
+
+        foreach ($namespaces as $ns) {
+            $subclasses    = [];
+            $subnamespaces = [];
+
+            foreach ($ns->getClasses() as $scs) {
+                $subclasses[] = $scs->getClassDefinition()->getCompleteName();
+            }
+
+            foreach ($ns->getNamespaces() as $sns) {
+                $subnamespaces[] = $sns->getFullNamespace();
+            }
+
+            $output['allNamespaces'][$ns->getFullNamespace()] = [
+                'name'       => $ns->getFullNamespace(),
+                'shortName'  => $ns->getShortName(),
+                'parentName' => $ns->getParentName(),
+                'classes'    => $subclasses,
+                'namespaces' => $subnamespaces,
+            ];
+
+            if (!strpos($ns->getFullNamespace(), '\\') > 0) {
+                $output['namespaces'][] = $ns->getFullNamespace();
+            }
+        }
+
+        return json_encode($output);
+    }
+
     /**
-     * from : https://stackoverflow.com/questions/2050859/copy-entire-contents-of-a-directory-to-another-using-php.
-     *
-     * @param $src
-     * @param $dst
-     * @param $files
+     * copy the static directory of the theme into the output directory.
      */
-    private function __copyDir($src, $dst, &$files = null): void
+    public function buildStaticDirectory(): void
     {
-        $dir = opendir($src);
-        @mkdir($dst);
-        while (false !== ($file = readdir($dir))) {
-            if (('.' != $file) && ('..' != $file)) {
-                if (is_dir($src.'/'.$file)) {
-                    $this->__copyDir($src.'/'.$file, $dst.'/'.$file, $files);
-                } else {
-                    copy($src.'/'.$file, $dst.'/'.$file);
-                    if (\is_array($files)) {
-                        $files[] = $dst.'/'.$file;
-                    }
+        $outputStt = $this->getOutputPath('asset');
+
+        if (!file_exists($outputStt)) {
+            mkdir($outputStt, 0777, true);
+        }
+
+        if ($this->extendedTheme) {
+            $this->extendedTheme->buildStaticDirectory();
+        }
+
+        $themeStt = $this->getThemePath('static');
+
+        if ($themeStt) {
+            $files = [];
+
+            $this->__copyDir($themeStt, $outputStt . '/static', $files);
+
+            foreach ($files as $f) {
+                foreach ($this->options as $optName => $opt) {
+                    $fcontent = file_get_contents($f);
+                    $fcontent = str_replace('%_' . $optName . '_%', $opt, $fcontent);
+
+                    file_put_contents($f, $fcontent);
                 }
             }
         }
-        closedir($dir);
+    }
+
+    public function createFile($path, $content): void
+    {
+        $outputFile = $this->getOutputPath($path);
+        touch($outputFile);
+        file_put_contents($outputFile, $content);
     }
 
     /**
@@ -98,17 +169,17 @@ public function drawFile(FileInterface $file): void
     {
         $outputFile = ltrim($file->getOutputFile(), '/');
 
-        $output = pathinfo($this->outputDir.'/'.$outputFile);
-        $outputDirname = $output['dirname'];
+        $output         = pathinfo($this->outputDir . '/' . $outputFile);
+        $outputDirname  = $output['dirname'];
         $outputBasename = $output['basename'];
-        $outputFilename = $outputDirname.'/'.$outputBasename;
+        $outputFilename = $outputDirname . '/' . $outputBasename;
 
         // todo : check if writable
         if (!file_exists($outputDirname)) {
             mkdir($outputDirname, 0777, true);
         }
 
-        $subDirNumber = \count(explode('/', $outputFile)) - 1;
+        $subDirNumber = count(explode('/', $outputFile)) - 1;
 
         if ($subDirNumber > 0) {
             $pathToRoot = str_repeat('../', $subDirNumber);
@@ -125,6 +196,16 @@ public function drawFile(FileInterface $file): void
         $template->write($outputFilename);
     }
 
+    public function getOutputPath($path)
+    {
+        $path         = pathinfo($this->outputDir . '/' . $path);
+        $pathDirname  = $path['dirname'];
+        $pathBasename = $path['basename'];
+        $pathFilename = $pathDirname . '/' . $pathBasename;
+
+        return $pathFilename;
+    }
+
     /**
      * Get assets from the theme info (theme.json file placed inside the theme directory).
      *
@@ -162,97 +243,24 @@ public function getThemeInfoExtendAware($name)
     }
 
     /**
-     * copy the static directory of the theme into the output directory.
+     * find the path to a file in the theme.
+     *
+     * @param $path
+     *
+     * @return string
      */
-    public function buildStaticDirectory(): void
-    {
-        $outputStt = $this->getOutputPath('asset');
-
-        if (!file_exists($outputStt)) {
-            mkdir($outputStt, 0777, true);
-        }
-
-        if ($this->extendedTheme) {
-            $this->extendedTheme->buildStaticDirectory();
-        }
-
-        $themeStt = $this->getThemePath('static');
-
-        if ($themeStt) {
-            $files = [];
-
-            $this->__copyDir($themeStt, $outputStt.'/static', $files);
-
-            foreach ($files as $f) {
-                foreach ($this->options as $optName => $opt) {
-                    $fcontent = file_get_contents($f);
-                    $fcontent = str_replace('%_'.$optName.'_%', $opt, $fcontent);
-
-                    file_put_contents($f, $fcontent);
-                }
-            }
-        }
-    }
-
-    public function buildJsonClassDefinition($classList, NamespaceAccessor $nsA)
+    public function getThemePath($path)
     {
-        $output = [
-            'allClasses' => [],
-            'allNamespaces' => [],
-            'classes' => [],
-            'namespaces' => [],
-        ];
-
-        foreach ($classList as $class) {
-            $cDef = $class->getClassDefinition();
-            $cName = $cDef->getCompleteName();
-
-            $output['allClasses'][$cName] = [
-                'type' => $cDef->getType(),
-                'name' => $cName,
-                'shortname' => $cDef->getName(),
-            ];
-
-            if (!strpos($cName, '\\') > 0) {
-                $output['classes'][] = $cName;
-            }
-        }
-
-        $namespaces = $nsA->getByNamespace();
-
-        foreach ($namespaces as $ns) {
-            $subclasses = [];
-            $subnamespaces = [];
-
-            foreach ($ns->getClasses() as $scs) {
-                $subclasses[] = $scs->getClassDefinition()->getCompleteName();
-            }
-
-            foreach ($ns->getNamespaces() as $sns) {
-                $subnamespaces[] = $sns->getFullNamespace();
-            }
-
-            $output['allNamespaces'][$ns->getFullNamespace()] = [
-                'name' => $ns->getFullNamespace(),
-                'shortName' => $ns->getShortName(),
-                'parentName' => $ns->getParentName(),
-                'classes' => $subclasses,
-                'namespaces' => $subnamespaces,
-            ];
+        $path         = pathinfo($this->themeDir . '/' . $path);
+        $pathDirname  = $path['dirname'];
+        $pathBasename = $path['basename'];
+        $pathFilename = $pathDirname . '/' . $pathBasename;
 
-            if (!strpos($ns->getFullNamespace(), '\\') > 0) {
-                $output['namespaces'][] = $ns->getFullNamespace();
-            }
+        if (!file_exists($pathFilename)) {
+            return null;
         }
 
-        return json_encode($output);
-    }
-
-    public function createFile($path, $content): void
-    {
-        $outputFile = $this->getOutputPath($path);
-        touch($outputFile);
-        file_put_contents($outputFile, $content);
+        return $pathFilename;
     }
 
     /**
@@ -275,33 +283,28 @@ public function getThemePathExtendsAware($path)
     }
 
     /**
-     * find the path to a file in the theme.
-     *
-     * @param $path
+     * from : https://stackoverflow.com/questions/2050859/copy-entire-contents-of-a-directory-to-another-using-php.
      *
-     * @return string
+     * @param $src
+     * @param $dst
+     * @param $files
      */
-    public function getThemePath($path)
+    private function __copyDir($src, $dst, &$files = null): void
     {
-        $path = pathinfo($this->themeDir.'/'.$path);
-        $pathDirname = $path['dirname'];
-        $pathBasename = $path['basename'];
-        $pathFilename = $pathDirname.'/'.$pathBasename;
-
-        if (!file_exists($pathFilename)) {
-            return null;
+        $dir = opendir($src);
+        @mkdir($dst);
+        while (false !== ($file = readdir($dir))) {
+            if (('.' != $file) && ('..' != $file)) {
+                if (is_dir($src . '/' . $file)) {
+                    $this->__copyDir($src . '/' . $file, $dst . '/' . $file, $files);
+                } else {
+                    copy($src . '/' . $file, $dst . '/' . $file);
+                    if (is_array($files)) {
+                        $files[] = $dst . '/' . $file;
+                    }
+                }
+            }
         }
-
-        return $pathFilename;
-    }
-
-    public function getOutputPath($path)
-    {
-        $path = pathinfo($this->outputDir.'/'.$path);
-        $pathDirname = $path['dirname'];
-        $pathBasename = $path['basename'];
-        $pathFilename = $pathDirname.'/'.$pathBasename;
-
-        return $pathFilename;
+        closedir($dir);
     }
 }
diff --git a/src/Exception.php b/src/Exception.php
index 826eee47cd..3efe3fbe26 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 /**
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index b00ba82822..1e750fefbb 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,15 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
+use Exception;
+use Throwable;
+
+use function is_array;
+
 /**
  * Exceptions generated by the compiler
  */
@@ -21,15 +26,15 @@ class CompilerException extends RuntimeException
     /**
      * CompilerException constructor.
      *
-     * @param string                $message  the Exception message to throw [optional]
-     * @param array|null            $extra    extra info [optional]
-     * @param int                   $code     the Exception code [optional]
-     * @param \Exception|\Throwable $previous the previous throwable used for the exception chaining [optional]
+     * @param string              $message  the Exception message to throw [optional]
+     * @param array|null          $extra    extra info [optional]
+     * @param int                 $code     the Exception code [optional]
+     * @param Exception|Throwable $previous the previous throwable used for the exception chaining [optional]
      */
     public function __construct(string $message = '', $extra = null, $code = 0, $previous = null)
     {
-        if (\is_array($extra) && isset($extra['file'])) {
-            $message .= ' in '.$extra['file'].' on line '.$extra['line'];
+        if (is_array($extra) && isset($extra['file'])) {
+            $message .= ' in ' . $extra['file'] . ' on line ' . $extra['line'];
         }
 
         $this->extra = $extra;
diff --git a/src/Exception/ExceptionExtraAwareTrait.php b/src/Exception/ExceptionExtraAwareTrait.php
index 525bafd2d4..f95f0d918c 100644
--- a/src/Exception/ExceptionExtraAwareTrait.php
+++ b/src/Exception/ExceptionExtraAwareTrait.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 trait ExceptionExtraAwareTrait
@@ -20,27 +20,19 @@ trait ExceptionExtraAwareTrait
      */
     protected ?array $extra = [];
 
-    /**
-     * @return array
-     */
-    public function getExtra(): array
-    {
-        return $this->extra;
-    }
-
     /**
      * @return string
      */
     public function getErrorRegion(): string
     {
         $region = '';
-        $extra = $this->getExtra();
+        $extra  = $this->getExtra();
 
         if (isset($extra['file']) && file_exists($extra['file'])) {
             $lines = file($extra['file']);
 
             if (isset($lines[$extra['line'] - 1])) {
-                $line = $lines[$extra['line'] - 1];
+                $line   = $lines[$extra['line'] - 1];
                 $region .= sprintf("\t%s", str_replace("\t", ' ', $line));
 
                 if (($extra['char'] - 1) > 0) {
@@ -51,4 +43,12 @@ public function getErrorRegion(): string
 
         return $region;
     }
+
+    /**
+     * @return array
+     */
+    public function getExtra(): array
+    {
+        return $this->extra;
+    }
 }
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index e32573059a..ed87b9dd61 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 /**
@@ -19,16 +19,16 @@
 interface ExceptionInterface
 {
     /**
-     * Gets extra info.
+     * Returns the code block in which the error occurred.
      *
-     * @return array
+     * @return string
      */
-    public function getExtra();
+    public function getErrorRegion();
 
     /**
-     * Returns the code block in which the error occurred.
+     * Gets extra info.
      *
-     * @return string
+     * @return array
      */
-    public function getErrorRegion();
+    public function getExtra();
 }
diff --git a/src/Exception/FileSystemException.php b/src/Exception/FileSystemException.php
index e8a783a006..349303d27c 100644
--- a/src/Exception/FileSystemException.php
+++ b/src/Exception/FileSystemException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 class FileSystemException extends RuntimeException
diff --git a/src/Exception/IllegalOperationException.php b/src/Exception/IllegalOperationException.php
index e84161747e..20dcbca594 100644
--- a/src/Exception/IllegalOperationException.php
+++ b/src/Exception/IllegalOperationException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 use Zephir\TypeAwareInterface;
diff --git a/src/Exception/IllegalStateException.php b/src/Exception/IllegalStateException.php
index e65aad898d..4712fb39e2 100644
--- a/src/Exception/IllegalStateException.php
+++ b/src/Exception/IllegalStateException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 class IllegalStateException extends RuntimeException
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 34c8e1f475..14ac255948 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
index f787a8c0b6..cc45e9af27 100644
--- a/src/Exception/LogicException.php
+++ b/src/Exception/LogicException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 /**
diff --git a/src/Exception/NotImplementedException.php b/src/Exception/NotImplementedException.php
index baedd64015..2583febe6d 100644
--- a/src/Exception/NotImplementedException.php
+++ b/src/Exception/NotImplementedException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 /**
diff --git a/src/Exception/ParseException.php b/src/Exception/ParseException.php
index f8f503009c..a35a32396d 100644
--- a/src/Exception/ParseException.php
+++ b/src/Exception/ParseException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,15 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
+use Exception;
+use Throwable;
+
+use function is_array;
+
 /**
  * Exceptions generated by parsing actions
  */
@@ -21,15 +26,15 @@ class ParseException extends RuntimeException
     /**
      * ParseException constructor.
      *
-     * @param string                $message  the Exception message to throw [optional]
-     * @param array|null            $extra    extra info [optional]
-     * @param int                   $code     the Exception code [optional]
-     * @param \Exception|\Throwable $previous the previous throwable used for the exception chaining [optional]
+     * @param string              $message  the Exception message to throw [optional]
+     * @param array|null          $extra    extra info [optional]
+     * @param int                 $code     the Exception code [optional]
+     * @param Exception|Throwable $previous the previous throwable used for the exception chaining [optional]
      */
     public function __construct($message = '', $extra = null, $code = 0, $previous = null)
     {
-        if (\is_array($extra) && isset($extra['file'])) {
-            $message .= ' in '.$extra['file'].' on line '.$extra['line'];
+        if (is_array($extra) && isset($extra['file'])) {
+            $message .= ' in ' . $extra['file'] . ' on line ' . $extra['line'];
         }
 
         $this->extra = $extra;
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index b18c79244e..da441dd5ef 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Exception;
 
 /**
diff --git a/src/Expression.php b/src/Expression.php
index 6d6e43bed9..2dff3b835e 100644
--- a/src/Expression.php
+++ b/src/Expression.php
@@ -13,6 +13,7 @@
 
 namespace Zephir;
 
+use ReflectionException;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression\Closure;
 use Zephir\Expression\ClosureArrow;
@@ -68,157 +69,24 @@
 use Zephir\Operators\Unary\NotOperator;
 use Zephir\Variable\Variable;
 
+use function strlen;
+
 /**
  * Represents an expression.
  * Most language constructs in a language are expressions.
  */
 class Expression
 {
-    protected bool $noisy = true;
-    protected bool $expecting = true;
-    protected bool $readOnly = false;
-    protected bool $evalMode = false;
+    protected bool      $evalMode          = false;
+    protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
+    protected bool      $noisy             = true;
+    protected bool      $readOnly          = false;
 
     public function __construct(protected array $expression)
     {
     }
 
-    /**
-     * Returns the original expression.
-     *
-     * @return array
-     */
-    public function getExpression(): array
-    {
-        return $this->expression;
-    }
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
-     */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
-
-    /**
-     * Checks if the result of the evaluated expression is read only.
-     *
-     * @return bool
-     */
-    public function isReadOnly(): bool
-    {
-        return $this->readOnly;
-    }
-
-    /**
-     * Checks if the returned value by the expression
-     * is expected to be assigned to an external symbol.
-     *
-     * @return bool
-     */
-    public function isExpectingReturn(): bool
-    {
-        return $this->expecting;
-    }
-
-    /**
-     * Returns the variable which is expected to return the
-     * result of the expression evaluation.
-     *
-     * @return Variable|null
-     */
-    public function getExpectingVariable(): ?Variable
-    {
-        return $this->expectingVariable;
-    }
-
-    /**
-     * Sets whether the expression must be resolved in "noisy" mode.
-     *
-     * @param bool $noisy
-     */
-    public function setNoisy(bool $noisy): void
-    {
-        $this->noisy = $noisy;
-    }
-
-    /**
-     * Checks whether the expression must be resolved in "noisy" mode.
-     *
-     * @return bool
-     */
-    public function isNoisy(): bool
-    {
-        return $this->noisy;
-    }
-
-    /**
-     * Sets if the expression is being evaluated in an evaluation like the ones in 'if' and 'while' statements.
-     *
-     * @param bool $evalMode
-     */
-    public function setEvalMode(bool $evalMode): void
-    {
-        $this->evalMode = $evalMode;
-    }
-
-    /**
-     * Compiles foo = [].
-     *
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     */
-    public function emptyArray(array $expression, CompilationContext $compilationContext): CompiledExpression
-    {
-        /**
-         * Resolves the symbol that expects the value
-         */
-        if ($this->expecting) {
-            if ($this->expectingVariable) {
-                $symbolVariable = &$this->expectingVariable;
-                $symbolVariable->initVariant($compilationContext);
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
-            }
-        } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
-        }
-
-        /**
-         * Variable that receives property accesses must be polymorphic
-         */
-        if (!$symbolVariable->isVariable() && 'array' != $symbolVariable->getType()) {
-            throw new CompilerException('Cannot use variable: '.$symbolVariable->getName().'('.$symbolVariable->getType().') to create empty array', $expression);
-        }
-
-        /**
-         * Mark the variable as an 'array'
-         */
-        $symbolVariable->setDynamicTypes('array');
-        $compilationContext->backend->initArray($symbolVariable, $compilationContext);
-
-        return new CompiledExpression('array', $symbolVariable->getRealName(), $expression);
-    }
-
     /**
      * Resolves an expression.
      *
@@ -228,12 +96,12 @@ public function emptyArray(array $expression, CompilationContext $compilationCon
      *
      * @throws CompilerException|Exception
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): CompiledExpression
     {
         $expression = $this->expression;
-        $type = $expression['type'];
+        $type       = $expression['type'];
 
         switch ($type) {
             case 'null':
@@ -249,19 +117,37 @@ public function compile(CompilationContext $compilationContext): CompiledExpress
                 return new LiteralCompiledExpression($type, $expression['value'], $expression);
 
             case 'string':
-                return new LiteralCompiledExpression('string', str_replace(PHP_EOL, '\\n', $expression['value']), $expression);
+                return new LiteralCompiledExpression(
+                    'string',
+                    str_replace(PHP_EOL, '\\n', $expression['value']),
+                    $expression
+                );
             case 'istring':
-                return new LiteralCompiledExpression('istring', str_replace(PHP_EOL, '\\n', $expression['value']), $expression);
+                return new LiteralCompiledExpression(
+                    'istring',
+                    str_replace(PHP_EOL, '\\n', $expression['value']),
+                    $expression
+                );
 
             case 'char':
-                if (!\strlen($expression['value'])) {
+                if (!strlen($expression['value'])) {
                     throw new CompilerException('Invalid empty char literal', $expression);
                 }
-                if (\strlen($expression['value']) > 2) {
-                    if (\strlen($expression['value']) > 10) {
-                        throw new CompilerException("Invalid char literal: '".substr($expression['value'], 0, 10)."...'", $expression);
+                if (strlen($expression['value']) > 2) {
+                    if (strlen($expression['value']) > 10) {
+                        throw new CompilerException(
+                            "Invalid char literal: '"
+                            . substr($expression['value'], 0, 10)
+                            . "...'",
+                            $expression
+                        );
                     } else {
-                        throw new CompilerException("Invalid char literal: '".$expression['value']."'", $expression);
+                        throw new CompilerException(
+                            "Invalid char literal: '"
+                            . $expression['value']
+                            . "'",
+                            $expression
+                        );
                     }
                 }
 
@@ -465,12 +351,16 @@ public function compile(CompilationContext $compilationContext): CompiledExpress
                     );
                 }
                 $numberPrints = $compilationContext->codePrinter->getNumberPrints();
-                $expr = new self($expression['left']);
+                $expr         = new self($expression['left']);
                 $expr->setExpectReturn($this->expecting, $this->expectingVariable);
                 $resolved = $expr->compile($compilationContext);
                 if (($compilationContext->codePrinter->getNumberPrints() - $numberPrints) <= 1) {
                     if (str_contains($resolved->getCode(), ' ')) {
-                        return new CompiledExpression($resolved->getType(), '('.$resolved->getCode().')', $expression);
+                        return new CompiledExpression(
+                            $resolved->getType(),
+                            '(' . $resolved->getCode() . ')',
+                            $expression
+                        );
                     }
                 }
 
@@ -508,7 +398,10 @@ public function compile(CompilationContext $compilationContext): CompiledExpress
 
             case 'likely':
                 if (!$this->evalMode) {
-                    throw new CompilerException("'likely' operator can only be used in evaluation expressions", $expression);
+                    throw new CompilerException(
+                        "'likely' operator can only be used in evaluation expressions",
+                        $expression
+                    );
                 }
                 $expr = new LikelyOperator();
                 $expr->setReadOnly($this->isReadOnly());
@@ -517,7 +410,10 @@ public function compile(CompilationContext $compilationContext): CompiledExpress
 
             case 'unlikely':
                 if (!$this->evalMode) {
-                    throw new CompilerException("'unlikely' operator can only be used in evaluation expressions", $expression);
+                    throw new CompilerException(
+                        "'unlikely' operator can only be used in evaluation expressions",
+                        $expression
+                    );
                 }
                 $expr = new UnlikelyOperator();
                 $expr->setReadOnly($this->isReadOnly());
@@ -549,7 +445,7 @@ public function compile(CompilationContext $compilationContext): CompiledExpress
                 break;
 
             default:
-                throw new CompilerException('Unknown expression: '.$type, $expression);
+                throw new CompilerException('Unknown expression: ' . $type, $expression);
         }
 
         $compilableExpression->setReadOnly($this->isReadOnly());
@@ -557,4 +453,154 @@ public function compile(CompilationContext $compilationContext): CompiledExpress
 
         return $compilableExpression->compile($expression, $compilationContext);
     }
+
+    /**
+     * Compiles foo = [].
+     *
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression
+     */
+    public function emptyArray(array $expression, CompilationContext $compilationContext): CompiledExpression
+    {
+        /**
+         * Resolves the symbol that expects the value
+         */
+        if ($this->expecting) {
+            if ($this->expectingVariable) {
+                $symbolVariable = &$this->expectingVariable;
+                $symbolVariable->initVariant($compilationContext);
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
+            }
+        } else {
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
+        }
+
+        /**
+         * Variable that receives property accesses must be polymorphic
+         */
+        if (!$symbolVariable->isVariable() && 'array' != $symbolVariable->getType()) {
+            throw new CompilerException(
+                'Cannot use variable: '
+                . $symbolVariable->getName()
+                . '('
+                . $symbolVariable->getType()
+                . ') to create empty array',
+                $expression
+            );
+        }
+
+        /**
+         * Mark the variable as an 'array'
+         */
+        $symbolVariable->setDynamicTypes('array');
+        $compilationContext->backend->initArray($symbolVariable, $compilationContext);
+
+        return new CompiledExpression('array', $symbolVariable->getRealName(), $expression);
+    }
+
+    /**
+     * Returns the variable which is expected to return the
+     * result of the expression evaluation.
+     *
+     * @return Variable|null
+     */
+    public function getExpectingVariable(): ?Variable
+    {
+        return $this->expectingVariable;
+    }
+
+    /**
+     * Returns the original expression.
+     *
+     * @return array
+     */
+    public function getExpression(): array
+    {
+        return $this->expression;
+    }
+
+    /**
+     * Checks if the returned value by the expression
+     * is expected to be assigned to an external symbol.
+     *
+     * @return bool
+     */
+    public function isExpectingReturn(): bool
+    {
+        return $this->expecting;
+    }
+
+    /**
+     * Checks whether the expression must be resolved in "noisy" mode.
+     *
+     * @return bool
+     */
+    public function isNoisy(): bool
+    {
+        return $this->noisy;
+    }
+
+    /**
+     * Checks if the result of the evaluated expression is read only.
+     *
+     * @return bool
+     */
+    public function isReadOnly(): bool
+    {
+        return $this->readOnly;
+    }
+
+    /**
+     * Sets if the expression is being evaluated in an evaluation like the ones in 'if' and 'while' statements.
+     *
+     * @param bool $evalMode
+     */
+    public function setEvalMode(bool $evalMode): void
+    {
+        $this->evalMode = $evalMode;
+    }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets whether the expression must be resolved in "noisy" mode.
+     *
+     * @param bool $noisy
+     */
+    public function setNoisy(bool $noisy): void
+    {
+        $this->noisy = $noisy;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/Builder/AbstractBuilder.php b/src/Expression/Builder/AbstractBuilder.php
index 9bfd599a25..b505f5b968 100644
--- a/src/Expression/Builder/AbstractBuilder.php
+++ b/src/Expression/Builder/AbstractBuilder.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,63 +9,66 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder;
 
+use function is_array;
+use function is_object;
+
 abstract class AbstractBuilder
 {
+    private $char;
     private $file;
     private $line;
-    private $char;
 
     /**
-     * @param string $file
-     * @param int    $line
-     * @param null   $char
-     *
-     * @return $this
+     * @return array
      */
-    public function setParseInfo($file, $line, $char = null)
+    public function build()
     {
-        $this->setFile($file);
-        $this->setLine($line);
+        $expression = $this->preBuild();
 
-        if (null !== $char) {
-            $this->setChar($char);
+        if (!isset($expression['file']) && (($file = $this->getFile()) && null !== $file)) {
+            $expression['file'] = $file;
         }
 
-        return $this;
+        if (!isset($expression['line']) && (($line = $this->getLine()) && null !== $line)) {
+            $expression['line'] = $line;
+        }
+
+        if (!isset($expression['char']) && (($char = $this->getChar()) && null !== $char)) {
+            $expression['char'] = $char;
+        }
+
+        return $this->resolve($expression);
     }
 
     /**
-     * @param string $file
+     * @return array
      *
-     * @return AbstractBuilder
+     * @deprecated since version 0.8.0, to be removed in 1.0.
+     *             Use {@link \Zephir\Builder\AbstractBuilder::build()}
      */
-    public function setFile($file)
+    public function get()
     {
-        $this->file = $file;
-
-        return $this;
+        return $this->build();
     }
 
     /**
-     * @return string
+     * @return int
      */
-    public function getFile()
+    public function getChar()
     {
-        return $this->file;
+        return $this->char;
     }
 
     /**
-     * @param string $line
-     *
-     * @return AbstractBuilder
+     * @return string
      */
-    public function setLine($line)
+    public function getFile()
     {
-        $this->line = $line;
-
-        return $this;
+        return $this->file;
     }
 
     /**
@@ -91,44 +92,46 @@ public function setChar($char)
     }
 
     /**
-     * @return int
+     * @param string $file
+     *
+     * @return AbstractBuilder
      */
-    public function getChar()
+    public function setFile($file)
     {
-        return $this->char;
+        $this->file = $file;
+
+        return $this;
     }
 
     /**
-     * @return array
+     * @param string $line
      *
-     * @deprecated since version 0.8.0, to be removed in 1.0.
-     *             Use {@link \Zephir\Builder\AbstractBuilder::build()}
+     * @return AbstractBuilder
      */
-    public function get()
+    public function setLine($line)
     {
-        return $this->build();
+        $this->line = $line;
+
+        return $this;
     }
 
     /**
-     * @return array
+     * @param string $file
+     * @param int    $line
+     * @param null   $char
+     *
+     * @return $this
      */
-    public function build()
+    public function setParseInfo($file, $line, $char = null)
     {
-        $expression = $this->preBuild();
-
-        if (!isset($expression['file']) && (($file = $this->getFile()) && null !== $file)) {
-            $expression['file'] = $file;
-        }
-
-        if (!isset($expression['line']) && (($line = $this->getLine()) && null !== $line)) {
-            $expression['line'] = $line;
-        }
+        $this->setFile($file);
+        $this->setLine($line);
 
-        if (!isset($expression['char']) && (($char = $this->getChar()) && null !== $char)) {
-            $expression['char'] = $char;
+        if (null !== $char) {
+            $this->setChar($char);
         }
 
-        return $this->resolve($expression);
+        return $this;
     }
 
     /**
@@ -143,7 +146,7 @@ abstract protected function preBuild();
      */
     protected function resolve($expr)
     {
-        if (\is_array($expr)) {
+        if (is_array($expr)) {
             foreach ($expr as &$value) {
                 if (!is_scalar($value)) {
                     $value = $this->resolve($value);
@@ -153,7 +156,7 @@ protected function resolve($expr)
             return $expr;
         }
 
-        if (\is_object($expr) && $expr instanceof self) {
+        if (is_object($expr) && $expr instanceof self) {
             return $expr->build();
         }
 
diff --git a/src/Expression/Builder/BuilderFactory.php b/src/Expression/Builder/BuilderFactory.php
index 66b9e9817c..40de0981ea 100644
--- a/src/Expression/Builder/BuilderFactory.php
+++ b/src/Expression/Builder/BuilderFactory.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder;
 
 use Zephir\Expression\Builder\Factory\OperatorsFactory;
@@ -18,15 +18,13 @@
 
 class BuilderFactory
 {
+    /** @var self */
+    protected static $instance;
     /** @var OperatorsFactory */
     protected $operatorsFactory;
-
     /** @var StatementsFactory */
     protected $statementsFactory;
 
-    /** @var self */
-    protected static $instance;
-
     /**
      * @return self
      */
@@ -39,6 +37,20 @@ public static function getInstance()
         return static::$instance;
     }
 
+    /**
+     * @param      $type
+     * @param null $value
+     *
+     * @return RawExpression
+     */
+    public function literal($type, $value = null)
+    {
+        return $this->raw([
+            'type'  => $type,
+            'value' => $value,
+        ]);
+    }
+
     /**
      * @return OperatorsFactory
      */
@@ -51,6 +63,16 @@ public function operators()
         return $this->operatorsFactory;
     }
 
+    /**
+     * @param $expression
+     *
+     * @return RawExpression
+     */
+    public function raw($expression)
+    {
+        return new RawExpression($expression);
+    }
+
     /**
      * @return StatementsFactory
      */
@@ -71,32 +93,8 @@ public function statements()
     public function variable($name)
     {
         return $this->raw([
-            'type' => 'variable',
+            'type'  => 'variable',
             'value' => $name,
         ]);
     }
-
-    /**
-     * @param      $type
-     * @param null $value
-     *
-     * @return RawExpression
-     */
-    public function literal($type, $value = null)
-    {
-        return $this->raw([
-            'type' => $type,
-            'value' => $value,
-        ]);
-    }
-
-    /**
-     * @param $expression
-     *
-     * @return RawExpression
-     */
-    public function raw($expression)
-    {
-        return new RawExpression($expression);
-    }
 }
diff --git a/src/Expression/Builder/Factory/OperatorsFactory.php b/src/Expression/Builder/Factory/OperatorsFactory.php
index 79028fc380..adbf873eca 100644
--- a/src/Expression/Builder/Factory/OperatorsFactory.php
+++ b/src/Expression/Builder/Factory/OperatorsFactory.php
@@ -27,17 +27,6 @@ public function __construct(protected BuilderFactory $factory)
     {
     }
 
-    /**
-     * @param null                 $variable
-     * @param AbstractBuilder|null $expression
-     *
-     * @return AssignVariableOperator
-     */
-    public function assignVariable($variable = null, AbstractBuilder $expression = null): AssignVariableOperator
-    {
-        return new AssignVariableOperator($variable, $expression);
-    }
-
     /**
      * @param null                 $variable
      * @param null                 $property
@@ -45,8 +34,11 @@ public function assignVariable($variable = null, AbstractBuilder $expression = n
      *
      * @return AssignPropertyOperator
      */
-    public function assignProperty($variable = null, $property = null, AbstractBuilder $expression = null): AssignPropertyOperator
-    {
+    public function assignProperty(
+        $variable = null,
+        $property = null,
+        AbstractBuilder $expression = null
+    ): AssignPropertyOperator {
         $assignProperty = new AssignPropertyOperator($variable, $property, $expression);
         $assignProperty->setType($assignProperty::TYPE_ASSIGN_OBJECT_PROPERTY);
 
@@ -60,8 +52,11 @@ public function assignProperty($variable = null, $property = null, AbstractBuild
      *
      * @return AssignPropertyOperator
      */
-    public function assignStaticProperty($variable = null, $property = null, AbstractBuilder $expression = null): AssignPropertyOperator
-    {
+    public function assignStaticProperty(
+        $variable = null,
+        $property = null,
+        AbstractBuilder $expression = null
+    ): AssignPropertyOperator {
         $assignProperty = $this->assignProperty($variable, $property, $expression);
         $assignProperty->setType($assignProperty::TYPE_ASSIGN_STATIC_PROPERTY);
 
@@ -69,26 +64,29 @@ public function assignStaticProperty($variable = null, $property = null, Abstrac
     }
 
     /**
-     * @param null                 $operator
-     * @param AbstractBuilder|null $leftExpression
-     * @param AbstractBuilder|null $rightExpression
+     * @param null                 $variable
+     * @param AbstractBuilder|null $expression
      *
-     * @return BinaryOperator
+     * @return AssignVariableOperator
      */
-    public function binary($operator = null, AbstractBuilder $leftExpression = null, AbstractBuilder $rightExpression = null)
+    public function assignVariable($variable = null, AbstractBuilder $expression = null): AssignVariableOperator
     {
-        return new BinaryOperator($operator, $leftExpression, $rightExpression);
+        return new AssignVariableOperator($variable, $expression);
     }
 
     /**
-     * @param string|null          $operator
-     * @param AbstractBuilder|null $expression
+     * @param null                 $operator
+     * @param AbstractBuilder|null $leftExpression
+     * @param AbstractBuilder|null $rightExpression
      *
-     * @return UnaryOperator
+     * @return BinaryOperator
      */
-    public function unary($operator = null, AbstractBuilder $expression = null)
-    {
-        return new UnaryOperator($operator, $expression);
+    public function binary(
+        $operator = null,
+        AbstractBuilder $leftExpression = null,
+        AbstractBuilder $rightExpression = null
+    ) {
+        return new BinaryOperator($operator, $leftExpression, $rightExpression);
     }
 
     /**
@@ -100,8 +98,8 @@ public function unary($operator = null, AbstractBuilder $expression = null)
     public function cast($type, AbstractBuilder $expression)
     {
         return $this->raw([
-            'type' => BinaryOperator::OPERATOR_CAST,
-            'left' => $type,
+            'type'  => BinaryOperator::OPERATOR_CAST,
+            'left'  => $type,
             'right' => $expression,
         ]);
     }
@@ -115,8 +113,8 @@ public function cast($type, AbstractBuilder $expression)
     public function hint($type, AbstractBuilder $expression)
     {
         return $this->raw([
-            'type' => BinaryOperator::OPERATOR_TYPE_HINT,
-            'left' => $type,
+            'type'  => BinaryOperator::OPERATOR_TYPE_HINT,
+            'left'  => $type,
             'right' => $expression,
         ]);
     }
@@ -130,4 +128,15 @@ public function raw(array $expression)
     {
         return new RawOperator($expression);
     }
+
+    /**
+     * @param string|null          $operator
+     * @param AbstractBuilder|null $expression
+     *
+     * @return UnaryOperator
+     */
+    public function unary($operator = null, AbstractBuilder $expression = null)
+    {
+        return new UnaryOperator($operator, $expression);
+    }
 }
diff --git a/src/Expression/Builder/Factory/StatementsFactory.php b/src/Expression/Builder/Factory/StatementsFactory.php
index e2dd8e4175..6148a8be9c 100644
--- a/src/Expression/Builder/Factory/StatementsFactory.php
+++ b/src/Expression/Builder/Factory/StatementsFactory.php
@@ -28,6 +28,16 @@ public function __construct(protected BuilderFactory $factory)
     {
     }
 
+    /**
+     * @param array|null $statements
+     *
+     * @return StatementsBlock
+     */
+    public function block(array $statements = null)
+    {
+        return new StatementsBlock($statements);
+    }
+
     /**
      * @param string     $name
      * @param array|null $parameters
@@ -41,13 +51,18 @@ public function functionCall($name, $parameters = null, $type = CallFunctionStat
     }
 
     /**
-     * @param array|null $statements
+     * @param AbstractOperator|null $condition
+     * @param StatementsBlock|null  $statements
+     * @param StatementsBlock|null  $elseStatements
      *
-     * @return StatementsBlock
+     * @return IfStatement
      */
-    public function block(array $statements = null)
-    {
-        return new StatementsBlock($statements);
+    public function ifX(
+        AbstractOperator $condition = null,
+        StatementsBlock $statements = null,
+        StatementsBlock $elseStatements = null
+    ) {
+        return new IfStatement($condition, $statements, $elseStatements);
     }
 
     /**
@@ -61,28 +76,13 @@ public function let(array $assignments = null)
     }
 
     /**
-     * @param AbstractOperator|null $condition
-     * @param StatementsBlock|null  $statements
-     * @param StatementsBlock|null  $elseStatements
-     *
-     * @return IfStatement
-     */
-    public function ifX(AbstractOperator $condition = null, StatementsBlock $statements = null, StatementsBlock $elseStatements = null)
-    {
-        return new IfStatement($condition, $statements, $elseStatements);
-    }
-
-    /**
-     * @param AbstractBuilder $expression
+     * @param array $expression
      *
      * @return RawStatement
      */
-    public function returnX(AbstractBuilder $expression)
+    public function raw(array $expression)
     {
-        return $this->raw([
-            'type' => 'return',
-            'expr' => $expression,
-        ]);
+        return new RawStatement($expression);
     }
 
     /**
@@ -93,18 +93,21 @@ public function returnX(AbstractBuilder $expression)
     public function rawC($value)
     {
         return $this->raw([
-            'type' => 'cblock',
+            'type'  => 'cblock',
             'value' => $value,
         ]);
     }
 
     /**
-     * @param array $expression
+     * @param AbstractBuilder $expression
      *
      * @return RawStatement
      */
-    public function raw(array $expression)
+    public function returnX(AbstractBuilder $expression)
     {
-        return new RawStatement($expression);
+        return $this->raw([
+            'type' => 'return',
+            'expr' => $expression,
+        ]);
     }
 }
diff --git a/src/Expression/Builder/Operators/AbstractOperator.php b/src/Expression/Builder/Operators/AbstractOperator.php
index 124497d1d3..07705b8596 100644
--- a/src/Expression/Builder/Operators/AbstractOperator.php
+++ b/src/Expression/Builder/Operators/AbstractOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Operators;
 
 use Zephir\Expression\Builder\AbstractBuilder;
diff --git a/src/Expression/Builder/Operators/AssignPropertyOperator.php b/src/Expression/Builder/Operators/AssignPropertyOperator.php
index 5590d3be6b..ed1cb6b167 100644
--- a/src/Expression/Builder/Operators/AssignPropertyOperator.php
+++ b/src/Expression/Builder/Operators/AssignPropertyOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Operators;
 
 use Zephir\Expression\Builder\AbstractBuilder;
@@ -38,6 +38,11 @@ public function getProperty(): string
         return $this->property;
     }
 
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
     public function setProperty(string $property): static
     {
         $this->property = $property;
@@ -45,11 +50,6 @@ public function setProperty(string $property): static
         return $this;
     }
 
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
     public function setType(string $type): static
     {
         $this->type = $type;
@@ -59,9 +59,9 @@ public function setType(string $type): static
 
     protected function preBuild(): array
     {
-        $expression = parent::preBuild();
+        $expression                = parent::preBuild();
         $expression['assign-type'] = $this->getType();
-        $expression['property'] = $this->getProperty();
+        $expression['property']    = $this->getProperty();
 
         return $expression;
     }
diff --git a/src/Expression/Builder/Operators/AssignVariableOperator.php b/src/Expression/Builder/Operators/AssignVariableOperator.php
index 9b91c3f0a5..ef2dc7c851 100644
--- a/src/Expression/Builder/Operators/AssignVariableOperator.php
+++ b/src/Expression/Builder/Operators/AssignVariableOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Operators;
 
 use Zephir\Expression\Builder\AbstractBuilder;
@@ -18,40 +18,40 @@
 class AssignVariableOperator extends AbstractOperator
 {
     // =
-    public const OPERATOR_ASSIGN = 'assign';
+    public const OPERATOR_ADD = 'add-assign';
 
     // +=
-    public const OPERATOR_ADD = 'add-assign';
+    public const OPERATOR_ASSIGN = 'assign';
 
     // -=
-    public const OPERATOR_SUB = 'sub-assign';
+    public const OPERATOR_BITWISE_AND = 'bitwise-and-assign';
 
     // *=
-    public const OPERATOR_MUL = 'mul-assign';
+    public const OPERATOR_BITWISE_OR = 'bitwise-or-assign';
 
     // /=
-    public const OPERATOR_DIV = 'div-assign';
+    public const OPERATOR_BITWISE_SHIFTLEFT = 'bitwise-shiftleft-assign';
 
     // .=
-    public const OPERATOR_CONCAT = 'concat-assign';
+    public const OPERATOR_BITWISE_SHIFTRIGHT = 'bitwise-shiftright-assign';
 
     // %=
-    public const OPERATOR_MOD = 'mod-assign';
+    public const OPERATOR_BITWISE_XOR = 'bitwise-xor-assign';
 
     // &=
-    public const OPERATOR_BITWISE_AND = 'bitwise-and-assign';
+    public const OPERATOR_CONCAT = 'concat-assign';
 
     // |=
-    public const OPERATOR_BITWISE_OR = 'bitwise-or-assign';
+    public const OPERATOR_DIV = 'div-assign';
 
     // ^=
-    public const OPERATOR_BITWISE_XOR = 'bitwise-xor-assign';
+    public const OPERATOR_MOD = 'mod-assign';
 
     // <<=
-    public const OPERATOR_BITWISE_SHIFTLEFT = 'bitwise-shiftleft-assign';
+    public const OPERATOR_MUL = 'mul-assign';
 
     // >>=
-    public const OPERATOR_BITWISE_SHIFTRIGHT = 'bitwise-shiftright-assign';
+    public const OPERATOR_SUB = 'sub-assign';
     private string $operator = self::OPERATOR_ASSIGN;
 
     public function __construct(private $variable = null, private ?AbstractBuilder $expression = null)
@@ -66,23 +66,11 @@ public function __construct(private $variable = null, private ?AbstractBuilder $
     }
 
     /**
-     * @return string
-     */
-    public function getVariable()
-    {
-        return $this->variable;
-    }
-
-    /**
-     * @param string $variable
-     *
-     * @return $this
+     * @return mixed
      */
-    public function setVariable($variable)
+    public function getExpression()
     {
-        $this->variable = $variable;
-
-        return $this;
+        return $this->expression;
     }
 
     /**
@@ -94,11 +82,11 @@ public function getOperator()
     }
 
     /**
-     * @return mixed
+     * @return string
      */
-    public function getExpression()
+    public function getVariable()
     {
-        return $this->expression;
+        return $this->variable;
     }
 
     /**
@@ -113,6 +101,18 @@ public function setExpression($expression)
         return $this;
     }
 
+    /**
+     * @param string $variable
+     *
+     * @return $this
+     */
+    public function setVariable($variable)
+    {
+        $this->variable = $variable;
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -120,9 +120,9 @@ protected function preBuild()
     {
         return [
             'assign-type' => 'variable',
-            'variable' => $this->getVariable(),
-            'operator' => $this->getOperator(),
-            'expr' => $this->getExpression(),
+            'variable'    => $this->getVariable(),
+            'operator'    => $this->getOperator(),
+            'expr'        => $this->getExpression(),
         ];
     }
 }
diff --git a/src/Expression/Builder/Operators/BinaryOperator.php b/src/Expression/Builder/Operators/BinaryOperator.php
index b7ebbd57a9..29ee39314a 100644
--- a/src/Expression/Builder/Operators/BinaryOperator.php
+++ b/src/Expression/Builder/Operators/BinaryOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Operators;
 
 use Zephir\Expression\Builder\AbstractBuilder;
@@ -21,103 +21,102 @@
 class BinaryOperator extends AbstractOperator
 {
     // x + y
-    public const OPERATOR_ADD = 'add';
+    public const OPERATOR_ACCESS_ARRAY = 'array-access';
 
     // x - y
-    public const OPERATOR_SUB = 'sub';
+    public const OPERATOR_ACCESS_PROPERTY = 'property-access';
 
     // x * y
-    public const OPERATOR_MUL = 'mul';
+    public const OPERATOR_ACCESS_PROPERTY_DYNAMIC = 'property-dynamic-access';
 
     // x / y
-    public const OPERATOR_DIV = 'div';
+    public const OPERATOR_ACCESS_PROPERTY_STRING = 'property-string-access';
 
     // x % y
-    public const OPERATOR_MOD = 'mod';
+    public const OPERATOR_ACCESS_STATIC_CONSTANT = 'static-constant-access';
 
     // x . y
-    public const OPERATOR_CONCAT = 'concat';
+    public const OPERATOR_ACCESS_STATIC_PROPERTY = 'static-property-access';
 
     // x && y
-    public const OPERATOR_AND = 'and';
+    public const OPERATOR_ADD = 'add';
 
     // x || y
-    public const OPERATOR_OR = 'or';
+    public const OPERATOR_AND = 'and';
 
     // x | y
-    public const OPERATOR_BITWISE_OR = 'bitwise_or';
+    public const OPERATOR_BITWISE_AND = 'bitwise_and';
 
     // x & y
-    public const OPERATOR_BITWISE_AND = 'bitwise_and';
+    public const OPERATOR_BITWISE_OR = 'bitwise_or';
 
     // x ^ y
-    public const OPERATOR_BITWISE_XOR = 'bitwise_xor';
+    public const OPERATOR_BITWISE_SHIFT_LEFT = 'bitwise_shiftleft';
 
     // x << y
-    public const OPERATOR_BITWISE_SHIFT_LEFT = 'bitwise_shiftleft';
+    public const OPERATOR_BITWISE_SHIFT_RIGHT = 'bitwise_shiftright';
 
     // x >> y
-    public const OPERATOR_BITWISE_SHIFT_RIGHT = 'bitwise_shiftright';
+    public const OPERATOR_BITWISE_XOR = 'bitwise_xor';
 
     // x instanceof y
-    public const OPERATOR_INSTANCEOF = 'instanceof';
+    public const OPERATOR_CAST = 'cast';
 
     // x .. y
-    public const OPERATOR_IRANGE = 'irange';
+    public const OPERATOR_CONCAT = 'concat';
 
     // x ... y
-    public const OPERATOR_ERANGE = 'erange';
+    public const OPERATOR_DIV = 'div';
 
     // x == y
     public const OPERATOR_EQUALS = 'equals';
 
     // x != y
-    public const OPERATOR_NOT_EQUALS = 'not-equals';
+    public const OPERATOR_ERANGE = 'erange';
 
     // x ==- y
-    public const OPERATOR_IDENTICAL = 'identical';
+    public const OPERATOR_GREATER = 'greater';
 
     // x !== y
-    public const OPERATOR_NOT_IDENTICAL = 'not-identical';
+    public const OPERATOR_GREATER_EQUAL = 'greater-equal';
 
     // x < y
-    public const OPERATOR_LESS = 'less';
+    public const OPERATOR_IDENTICAL = 'identical';
 
     // x > y
-    public const OPERATOR_GREATER = 'greater';
+    public const OPERATOR_INSTANCEOF = 'instanceof';
 
     // x <= y
-    public const OPERATOR_LESS_EQUAL = 'less-equal';
+    public const OPERATOR_IRANGE = 'irange';
 
     // x >= y
-    public const OPERATOR_GREATER_EQUAL = 'greater-equal';
+    public const OPERATOR_LESS = 'less';
 
     // (type) a
-    public const OPERATOR_CAST = 'cast';
+    public const OPERATOR_LESS_EQUAL = 'less-equal';
 
     // <type> a
-    public const OPERATOR_TYPE_HINT = 'type-hint';
+    public const OPERATOR_MOD = 'mod';
 
     // x -> y
-    public const OPERATOR_ACCESS_PROPERTY = 'property-access';
+    public const OPERATOR_MUL = 'mul';
 
     // x -> {y}
-    public const OPERATOR_ACCESS_PROPERTY_DYNAMIC = 'property-dynamic-access';
+    public const OPERATOR_NOT_EQUALS = 'not-equals';
 
     // x -> {"string"}
-    public const OPERATOR_ACCESS_PROPERTY_STRING = 'property-string-access';
+    public const OPERATOR_NOT_IDENTICAL = 'not-identical';
 
     // x :: y
-    public const OPERATOR_ACCESS_STATIC_PROPERTY = 'static-property-access';
+    public const OPERATOR_OR = 'or';
 
     // x :: CONSTANT
-    public const OPERATOR_ACCESS_STATIC_CONSTANT = 'static-constant-access';
+    public const OPERATOR_SUB = 'sub';
 
     // x [{expr}]
-    public const OPERATOR_ACCESS_ARRAY = 'array-access';
-
-    private $operator;
+    public const OPERATOR_TYPE_HINT = 'type-hint';
     private $leftExpression;
+    private $operator;
     private $rightExpression;
 
     /**
@@ -125,8 +124,11 @@ class BinaryOperator extends AbstractOperator
      * @param AbstractBuilder|null $leftExpression
      * @param AbstractBuilder|null $rightExpression
      */
-    public function __construct($operator = null, AbstractBuilder $leftExpression = null, AbstractBuilder $rightExpression = null)
-    {
+    public function __construct(
+        $operator = null,
+        AbstractBuilder $leftExpression = null,
+        AbstractBuilder $rightExpression = null
+    ) {
         if (null !== $operator) {
             $this->setOperator($operator);
         }
@@ -141,31 +143,27 @@ public function __construct($operator = null, AbstractBuilder $leftExpression =
     }
 
     /**
-     * @return string
+     * @return AbstractBuilder
      */
-    public function getOperator()
+    public function getLeftExpression()
     {
-        return $this->operator;
+        return $this->leftExpression;
     }
 
     /**
-     * @param string $operator
-     *
-     * @return BinaryOperator
+     * @return string
      */
-    public function setOperator($operator)
+    public function getOperator()
     {
-        $this->operator = $operator;
-
-        return $this;
+        return $this->operator;
     }
 
     /**
      * @return AbstractBuilder
      */
-    public function getLeftExpression()
+    public function getRightExpression()
     {
-        return $this->leftExpression;
+        return $this->rightExpression;
     }
 
     /**
@@ -181,11 +179,15 @@ public function setLeftExpression(AbstractBuilder $leftExpression)
     }
 
     /**
-     * @return AbstractBuilder
+     * @param string $operator
+     *
+     * @return BinaryOperator
      */
-    public function getRightExpression()
+    public function setOperator($operator)
     {
-        return $this->rightExpression;
+        $this->operator = $operator;
+
+        return $this;
     }
 
     /**
@@ -206,8 +208,8 @@ public function setRightExpression(AbstractBuilder $rightExpression)
     protected function preBuild()
     {
         return [
-            'type' => $this->getOperator(),
-            'left' => $this->getLeftExpression(),
+            'type'  => $this->getOperator(),
+            'left'  => $this->getLeftExpression(),
             'right' => $this->getRightExpression(),
         ];
     }
diff --git a/src/Expression/Builder/Operators/RawOperator.php b/src/Expression/Builder/Operators/RawOperator.php
index 9f87858942..cbcfbc82c3 100644
--- a/src/Expression/Builder/Operators/RawOperator.php
+++ b/src/Expression/Builder/Operators/RawOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Operators;
 
 class RawOperator extends AbstractOperator
diff --git a/src/Expression/Builder/Operators/UnaryOperator.php b/src/Expression/Builder/Operators/UnaryOperator.php
index 6d208aa79b..b2fa1cacf1 100644
--- a/src/Expression/Builder/Operators/UnaryOperator.php
+++ b/src/Expression/Builder/Operators/UnaryOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Operators;
 
 use Zephir\Expression\Builder\AbstractBuilder;
@@ -21,49 +21,48 @@
 class UnaryOperator extends AbstractOperator
 {
     // y = &a
-    public const OPERATOR_REFERENCE = 'reference';
+    public const OPERATOR_BITWISE_NOT = 'bitwise_not';
 
     // y = !a
-    public const OPERATOR_NOT = 'not';
+    public const OPERATOR_CLONE = 'clone';
 
     // y = ~a
-    public const OPERATOR_BITWISE_NOT = 'bitwise_not';
+    public const OPERATOR_EMPTY = 'empty';
 
     // y = -a
-    public const OPERATOR_MINUS = 'minus';
+    public const OPERATOR_ISSET = 'isset';
 
     // y = +a
-    public const OPERATOR_PLUS = 'plus';
+    public const OPERATOR_LIKELY = 'likely';
 
     // y = isset a
-    public const OPERATOR_ISSET = 'isset';
+    public const OPERATOR_LIST = 'list';
 
     // y = require a
-    public const OPERATOR_REQUIRE = 'require';
+    public const OPERATOR_MINUS = 'minus';
 
     // y = require_once a
-    public const OPERATOR_REQUIRE_ONCE = 'require_once';
+    public const OPERATOR_NOT = 'not';
 
     // y = clone a
-    public const OPERATOR_CLONE = 'clone';
+    public const OPERATOR_PLUS = 'plus';
 
     // y = empty a
-    public const OPERATOR_EMPTY = 'empty';
+    public const OPERATOR_REFERENCE = 'reference';
 
     // y = likely a
-    public const OPERATOR_LIKELY = 'likely';
+    public const OPERATOR_REQUIRE = 'require';
 
     // y = unlikely a
-    public const OPERATOR_UNLIKELY = 'unlikely';
+    public const OPERATOR_REQUIRE_ONCE = 'require_once';
 
     // y = list a
-    public const OPERATOR_LIST = 'list';
-
-    // y = typeof a
     public const OPERATOR_TYPEOF = 'typeof';
 
-    private $operator;
+    // y = typeof a
+    public const OPERATOR_UNLIKELY = 'unlikely';
     private $expression;
+    private $operator;
 
     /**
      * @param null                 $operator
@@ -80,6 +79,14 @@ public function __construct($operator = null, AbstractBuilder $expression = null
         }
     }
 
+    /**
+     * @return mixed
+     */
+    public function getExpression()
+    {
+        return $this->expression;
+    }
+
     /**
      * @return mixed
      */
@@ -89,33 +96,25 @@ public function getOperator()
     }
 
     /**
-     * @param $operator
+     * @param AbstractBuilder $expression
      *
      * @return $this
      */
-    public function setOperator($operator)
+    public function setExpression(AbstractBuilder $expression)
     {
-        $this->operator = $operator;
+        $this->expression = $expression;
 
         return $this;
     }
 
     /**
-     * @return mixed
-     */
-    public function getExpression()
-    {
-        return $this->expression;
-    }
-
-    /**
-     * @param AbstractBuilder $expression
+     * @param $operator
      *
      * @return $this
      */
-    public function setExpression(AbstractBuilder $expression)
+    public function setOperator($operator)
     {
-        $this->expression = $expression;
+        $this->operator = $operator;
 
         return $this;
     }
diff --git a/src/Expression/Builder/RawExpression.php b/src/Expression/Builder/RawExpression.php
index 3993402bbf..45b0c0e154 100644
--- a/src/Expression/Builder/RawExpression.php
+++ b/src/Expression/Builder/RawExpression.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder;
 
 /**
diff --git a/src/Expression/Builder/Statements/AbstractStatement.php b/src/Expression/Builder/Statements/AbstractStatement.php
index c6776c0d9a..b11df243b2 100644
--- a/src/Expression/Builder/Statements/AbstractStatement.php
+++ b/src/Expression/Builder/Statements/AbstractStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
 use Zephir\Expression\Builder\AbstractBuilder;
diff --git a/src/Expression/Builder/Statements/CallFunctionStatement.php b/src/Expression/Builder/Statements/CallFunctionStatement.php
index fba9fc362c..c83539c430 100644
--- a/src/Expression/Builder/Statements/CallFunctionStatement.php
+++ b/src/Expression/Builder/Statements/CallFunctionStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,10 +9,14 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
 use Zephir\FunctionCall;
 
+use function is_array;
+
 /**
  * Allows to manually build a function call AST node
  */
@@ -34,9 +36,8 @@ class CallFunctionStatement extends AbstractStatement
      * {"f"}(x, y, ... , N).
      */
     public const TYPE_CALL_DYNAMIC_STRING = FunctionCall::CALL_DYNAMIC_STRING;
-
-    private $name;
     private $arguments;
+    private $name;
     private $typeCall;
 
     /**
@@ -60,21 +61,13 @@ public function __construct(string $name = null, array $parameters = null, int $
     }
 
     /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
+     * @param $argument
      *
      * @return $this
      */
-    public function setName($name)
+    public function addArgument($argument)
     {
-        $this->name = $name;
+        $this->arguments[] = $argument;
 
         return $this;
     }
@@ -88,15 +81,11 @@ public function getArguments()
     }
 
     /**
-     * @param array $arguments
-     *
-     * @return $this
+     * @return string
      */
-    public function setArguments(array $arguments = null)
+    public function getName()
     {
-        $this->arguments = $arguments;
-
-        return $this;
+        return $this->name;
     }
 
     /**
@@ -108,25 +97,37 @@ public function getTypeCall()
     }
 
     /**
-     * @param int $typeCall
+     * @param array $arguments
      *
      * @return $this
      */
-    public function setTypeCall($typeCall)
+    public function setArguments(array $arguments = null)
     {
-        $this->typeCall = $typeCall;
+        $this->arguments = $arguments;
 
         return $this;
     }
 
     /**
-     * @param $argument
+     * @param string $name
      *
      * @return $this
      */
-    public function addArgument($argument)
+    public function setName($name)
     {
-        $this->arguments[] = $argument;
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * @param int $typeCall
+     *
+     * @return $this
+     */
+    public function setTypeCall($typeCall)
+    {
+        $this->typeCall = $typeCall;
 
         return $this;
     }
@@ -138,16 +139,16 @@ protected function preBuild()
     {
         if ($arguments = $this->getArguments()) {
             foreach ($arguments as &$argument) {
-                if (!\is_array($argument) || !isset($argument['parameter'])) {
+                if (!is_array($argument) || !isset($argument['parameter'])) {
                     $argument = ['parameter' => $argument];
                 }
             }
         }
 
         return [
-            'type' => 'fcall',
-            'name' => $this->getName(),
-            'call-type' => $this->getTypeCall(),
+            'type'       => 'fcall',
+            'name'       => $this->getName(),
+            'call-type'  => $this->getTypeCall(),
             'parameters' => $arguments,
         ];
     }
diff --git a/src/Expression/Builder/Statements/CallMethodStatement.php b/src/Expression/Builder/Statements/CallMethodStatement.php
index 20510e5ce0..fabdfadd82 100644
--- a/src/Expression/Builder/Statements/CallMethodStatement.php
+++ b/src/Expression/Builder/Statements/CallMethodStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
 /**
@@ -26,8 +26,12 @@ class CallMethodStatement extends CallFunctionStatement
      * @param array|null $parameters
      * @param int        $type
      */
-    public function __construct($variable = null, $name = null, array $parameters = null, $type = self::TYPE_CALL_DIRECT)
-    {
+    public function __construct(
+        $variable = null,
+        $name = null,
+        array $parameters = null,
+        $type = self::TYPE_CALL_DIRECT
+    ) {
         parent::__construct($name, $parameters, $type);
 
         if (null !== $name) {
@@ -60,8 +64,8 @@ public function setVariable($variable)
      */
     protected function preBuild()
     {
-        $expression = parent::preBuild();
-        $expression['type'] = 'mcall';
+        $expression             = parent::preBuild();
+        $expression['type']     = 'mcall';
         $expression['variable'] = $this->getVariable();
 
         return $expression;
diff --git a/src/Expression/Builder/Statements/CallStaticStatement.php b/src/Expression/Builder/Statements/CallStaticStatement.php
index 7309c3b2d3..7449da116e 100644
--- a/src/Expression/Builder/Statements/CallStaticStatement.php
+++ b/src/Expression/Builder/Statements/CallStaticStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,18 +9,22 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
+use function is_array;
+
 /**
  * Allows to manually build a static function call AST node
  */
 class CallStaticStatement extends AbstractStatement
 {
-    private $class;
-    private $method;
     private $arguments;
-    private $dynamicClass = false;
+    private $class;
+    private $dynamicClass  = false;
     private $dynamicMethod = false;
+    private $method;
 
     /**
      * @param null       $class
@@ -47,21 +49,17 @@ public function __construct($class = null, $method = null, array $parameters = n
     /**
      * @return mixed
      */
-    public function getClass()
+    public function getArguments()
     {
-        return $this->class;
+        return $this->arguments;
     }
 
     /**
-     * @param mixed $class
-     *
-     * @return CallStaticStatement
+     * @return mixed
      */
-    public function setClass($class)
+    public function getClass()
     {
-        $this->class = $class;
-
-        return $this;
+        return $this->class;
     }
 
     /**
@@ -73,23 +71,19 @@ public function getMethod()
     }
 
     /**
-     * @param mixed $method
-     *
-     * @return CallStaticStatement
+     * @return bool
      */
-    public function setMethod($method)
+    public function isDynamicClass()
     {
-        $this->method = $method;
-
-        return $this;
+        return $this->dynamicClass;
     }
 
     /**
-     * @return mixed
+     * @return bool
      */
-    public function getArguments()
+    public function isDynamicMethod()
     {
-        return $this->arguments;
+        return $this->dynamicMethod;
     }
 
     /**
@@ -105,11 +99,15 @@ public function setArguments($arguments)
     }
 
     /**
-     * @return bool
+     * @param mixed $class
+     *
+     * @return CallStaticStatement
      */
-    public function isDynamicClass()
+    public function setClass($class)
     {
-        return $this->dynamicClass;
+        $this->class = $class;
+
+        return $this;
     }
 
     /**
@@ -125,21 +123,25 @@ public function setDynamicClass($dynamicClass)
     }
 
     /**
-     * @return bool
+     * @param bool $dynamicMethod
+     *
+     * @return CallStaticStatement
      */
-    public function isDynamicMethod()
+    public function setDynamicMethod($dynamicMethod)
     {
-        return $this->dynamicMethod;
+        $this->dynamicMethod = $dynamicMethod;
+
+        return $this;
     }
 
     /**
-     * @param bool $dynamicMethod
+     * @param mixed $method
      *
      * @return CallStaticStatement
      */
-    public function setDynamicMethod($dynamicMethod)
+    public function setMethod($method)
     {
-        $this->dynamicMethod = $dynamicMethod;
+        $this->method = $method;
 
         return $this;
     }
@@ -151,19 +153,19 @@ protected function preBuild()
     {
         if ($arguments = $this->getArguments()) {
             foreach ($arguments as &$argument) {
-                if (!\is_array($argument) || !isset($argument['parameter'])) {
+                if (!is_array($argument) || !isset($argument['parameter'])) {
                     $argument = ['parameter' => $argument];
                 }
             }
         }
 
         return [
-            'type' => 'scall',
-            'class' => $this->getClass(),
-            'name' => $this->getMethod(),
-            'parameters' => $arguments,
+            'type'          => 'scall',
+            'class'         => $this->getClass(),
+            'name'          => $this->getMethod(),
+            'parameters'    => $arguments,
             'dynamic-class' => $this->isDynamicClass(),
-            'dynamic' => $this->isDynamicMethod(),
+            'dynamic'       => $this->isDynamicMethod(),
         ];
     }
 }
diff --git a/src/Expression/Builder/Statements/IfStatement.php b/src/Expression/Builder/Statements/IfStatement.php
index ea3bf01e77..e62697c189 100644
--- a/src/Expression/Builder/Statements/IfStatement.php
+++ b/src/Expression/Builder/Statements/IfStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
 use Zephir\Expression\Builder\Operators\AbstractOperator;
@@ -24,24 +24,25 @@ class IfStatement extends AbstractStatement
      * @var AbstractOperator
      */
     private $condition;
-
     /**
      * @var StatementsBlock
      */
-    private $statements;
-
+    private $elseStatements;
     /**
      * @var StatementsBlock
      */
-    private $elseStatements;
+    private $statements;
 
     /**
      * @param AbstractOperator|null $condition
      * @param StatementsBlock|null  $statements
      * @param StatementsBlock|null  $elseStatements
      */
-    public function __construct(AbstractOperator $condition = null, StatementsBlock $statements = null, StatementsBlock $elseStatements = null)
-    {
+    public function __construct(
+        AbstractOperator $condition = null,
+        StatementsBlock $statements = null,
+        StatementsBlock $elseStatements = null
+    ) {
         if (null !== $condition) {
             $this->setCondition($condition);
         }
@@ -64,15 +65,11 @@ public function getCondition()
     }
 
     /**
-     * @param $condition
-     *
-     * @return $this
+     * @return StatementsBlock
      */
-    public function setCondition(AbstractOperator $condition)
+    public function getElseStatements()
     {
-        $this->condition = $condition;
-
-        return $this;
+        return $this->elseStatements;
     }
 
     /**
@@ -84,33 +81,37 @@ public function getStatements()
     }
 
     /**
-     * @param StatementsBlock $statements
+     * @param $condition
      *
      * @return $this
      */
-    public function setStatements(StatementsBlock $statements)
+    public function setCondition(AbstractOperator $condition)
     {
-        $this->statements = $statements;
+        $this->condition = $condition;
 
         return $this;
     }
 
     /**
-     * @return StatementsBlock
+     * @param StatementsBlock $elseStatements
+     *
+     * @return $this
      */
-    public function getElseStatements()
+    public function setElseStatements(StatementsBlock $elseStatements)
     {
-        return $this->elseStatements;
+        $this->elseStatements = $elseStatements;
+
+        return $this;
     }
 
     /**
-     * @param StatementsBlock $elseStatements
+     * @param StatementsBlock $statements
      *
      * @return $this
      */
-    public function setElseStatements(StatementsBlock $elseStatements)
+    public function setStatements(StatementsBlock $statements)
     {
-        $this->elseStatements = $elseStatements;
+        $this->statements = $statements;
 
         return $this;
     }
@@ -121,8 +122,8 @@ public function setElseStatements(StatementsBlock $elseStatements)
     protected function preBuild()
     {
         $expression = [
-            'type' => 'if',
-            'expr' => $this->getCondition(),
+            'type'       => 'if',
+            'expr'       => $this->getCondition(),
             'statements' => $this->getStatements(),
         ];
 
diff --git a/src/Expression/Builder/Statements/LetStatement.php b/src/Expression/Builder/Statements/LetStatement.php
index e5c9c4c22a..c7f224a505 100644
--- a/src/Expression/Builder/Statements/LetStatement.php
+++ b/src/Expression/Builder/Statements/LetStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
 /**
@@ -30,6 +30,18 @@ public function __construct(array $assignments = null)
         }
     }
 
+    /**
+     * @param mixed $assignment
+     *
+     * @return $this
+     */
+    public function addAssignment($assignment)
+    {
+        $this->assignments[] = $assignment;
+
+        return $this;
+    }
+
     /**
      * @return mixed
      */
@@ -50,25 +62,13 @@ public function setAssignments($assignments)
         return $this;
     }
 
-    /**
-     * @param mixed $assignment
-     *
-     * @return $this
-     */
-    public function addAssignment($assignment)
-    {
-        $this->assignments[] = $assignment;
-
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      */
     protected function preBuild()
     {
         return [
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => $this->getAssignments(),
         ];
     }
diff --git a/src/Expression/Builder/Statements/RawStatement.php b/src/Expression/Builder/Statements/RawStatement.php
index fecb6883ed..a687cbf9c9 100644
--- a/src/Expression/Builder/Statements/RawStatement.php
+++ b/src/Expression/Builder/Statements/RawStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
 class RawStatement extends AbstractStatement
diff --git a/src/Expression/Builder/Statements/StatementsBlock.php b/src/Expression/Builder/Statements/StatementsBlock.php
index 94c560d0e8..d7daf014c1 100644
--- a/src/Expression/Builder/Statements/StatementsBlock.php
+++ b/src/Expression/Builder/Statements/StatementsBlock.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression\Builder\Statements;
 
 use Zephir\Expression\Builder\AbstractBuilder;
@@ -32,26 +32,6 @@ public function __construct(array $statements = null)
         }
     }
 
-    /**
-     * @return array
-     */
-    public function getStatements()
-    {
-        return $this->statements;
-    }
-
-    /**
-     * @param array $statements
-     *
-     * @return $this
-     */
-    public function setStatements($statements)
-    {
-        $this->statements = $statements;
-
-        return $this;
-    }
-
     /**
      * @param $statement
      *
@@ -72,6 +52,26 @@ public function build()
         return $this->resolve($this->preBuild());
     }
 
+    /**
+     * @return array
+     */
+    public function getStatements()
+    {
+        return $this->statements;
+    }
+
+    /**
+     * @param array $statements
+     *
+     * @return $this
+     */
+    public function setStatements($statements)
+    {
+        $this->statements = $statements;
+
+        return $this;
+    }
+
     /**
      * @return array
      */
diff --git a/src/Expression/Closure.php b/src/Expression/Closure.php
index b7b90f8972..53111d34aa 100644
--- a/src/Expression/Closure.php
+++ b/src/Expression/Closure.php
@@ -24,6 +24,8 @@
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
 
+use function is_array;
+
 /**
  * Creates an anonymous function within the extension simulating a closure
  */
@@ -33,44 +35,18 @@ class Closure
      * @var bool
      */
     protected bool $expecting = true;
-
-    /**
-     * @var bool
-     */
-    protected bool $readOnly = false;
-
     /**
      * @var Variable|null
      */
     protected ?Variable $expectingVariable = null;
-
     /**
      * Unique closure ID.
      */
     protected static $id = 0;
-
     /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
+     * @var bool
      */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
+    protected bool $readOnly = false;
 
     /**
      * Creates a closure.
@@ -86,7 +62,7 @@ public function compile(array $expression, CompilationContext $compilationContex
     {
         $classDefinition = new Definition(
             $compilationContext->config->get('namespace'),
-            self::$id.'__closure'
+            self::$id . '__closure'
         );
 
         $classDefinition->setIsFinal(true);
@@ -104,21 +80,25 @@ public function compile(array $expression, CompilationContext $compilationContex
         $block = $expression['right'] ?? [];
 
         $staticVariables = [];
-        if (isset($expression['use']) && \is_array($expression['use'])) {
+        if (isset($expression['use']) && is_array($expression['use'])) {
             foreach ($expression['use'] as $parameter) {
-                $staticVariables[$parameter['name']] = $compilationContext->symbolTable->getVariable($parameter['name']);
+                $staticVariables[$parameter['name']] = $compilationContext->symbolTable->getVariable(
+                    $parameter['name']
+                );
             }
         }
 
         foreach ($staticVariables as $var) {
-            $classDefinition->addProperty(new Property(
-                $classDefinition,
-                ['public', 'static'],
-                $var->getName(),
-                null,
-                null,
-                null
-            ));
+            $classDefinition->addProperty(
+                new Property(
+                    $classDefinition,
+                    ['public', 'static'],
+                    $var->getName(),
+                    null,
+                    null,
+                    null
+                )
+            );
         }
 
         $classMethod = new Method(
@@ -140,10 +120,18 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
             }
         } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
         }
 
         $symbolVariable->initVariant($compilationContext);
@@ -152,11 +140,20 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         foreach ($staticVariables as $var) {
             if (in_array($var->getType(), ['variable', 'array'])) {
-                $compilationContext->backend->updateStaticProperty($classDefinition->getClassEntry(), $var->getName(), $var, $compilationContext);
+                $compilationContext->backend->updateStaticProperty(
+                    $classDefinition->getClassEntry(),
+                    $var->getName(),
+                    $var,
+                    $compilationContext
+                );
                 continue;
             }
 
-            $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+            $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                'variable',
+                $compilationContext,
+                true
+            );
 
             switch ($var->getType()) {
                 case 'int':
@@ -180,11 +177,39 @@ public function compile(array $expression, CompilationContext $compilationContex
                     break;
             }
 
-            $compilationContext->backend->updateStaticProperty($classDefinition->getClassEntry(), $var->getName(), $tempVariable, $compilationContext);
+            $compilationContext->backend->updateStaticProperty(
+                $classDefinition->getClassEntry(),
+                $var->getName(),
+                $tempVariable,
+                $compilationContext
+            );
         }
 
         ++self::$id;
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/ClosureArrow.php b/src/Expression/ClosureArrow.php
index 75ba6eff5e..a3b940ce81 100644
--- a/src/Expression/ClosureArrow.php
+++ b/src/Expression/ClosureArrow.php
@@ -42,7 +42,7 @@ public function compile(array $expression, CompilationContext $compilationContex
     {
         $classDefinition = new Definition(
             $compilationContext->config->get('namespace'),
-            self::$id.'__closure'
+            self::$id . '__closure'
         );
 
         $classDefinition->setIsFinal(true);
@@ -57,22 +57,22 @@ public function compile(array $expression, CompilationContext $compilationContex
          */
         $parameters = new Parameters([
             [
-                'type' => 'parameter',
-                'name' => $expression['left']['value'],
-                'const' => 0,
+                'type'      => 'parameter',
+                'name'      => $expression['left']['value'],
+                'const'     => 0,
                 'data-type' => 'variable',
                 'mandatory' => 0,
                 'reference' => 0,
-                'file' => $expression['left']['file'],
-                'line' => $expression['left']['line'],
-                'char' => $expression['left']['char'],
+                'file'      => $expression['left']['file'],
+                'line'      => $expression['left']['line'],
+                'char'      => $expression['left']['char'],
             ],
         ]);
 
-        $exprBuilder = BuilderFactory::getInstance();
+        $exprBuilder           = BuilderFactory::getInstance();
         $statementBlockBuilder = $exprBuilder->statements()->block([
             $exprBuilder->statements()
-                ->returnX($exprBuilder->raw($expression['right'])),
+                        ->returnX($exprBuilder->raw($expression['right'])),
         ]);
 
         $block = $statementBlockBuilder->build();
@@ -95,10 +95,18 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
             }
         } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
         }
 
         $symbolVariable->initVariant($compilationContext);
diff --git a/src/Expression/Constants.php b/src/Expression/Constants.php
index 3f8048e5a6..3be318a004 100644
--- a/src/Expression/Constants.php
+++ b/src/Expression/Constants.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression;
 
 use Zephir\CompilationContext;
@@ -20,23 +20,22 @@
 use Zephir\Name;
 use Zephir\Variable\Variable;
 
+use function constant;
+use function defined;
+use function gettype;
+use function in_array;
+
 /**
  * Resolves PHP or Zephir constants into C-Code
  */
 class Constants
 {
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
-    protected ?Variable $expectingVariable = null;
-
     /**
      * Reserved ENV Constants.
      *
      * @see https://www.php.net/manual/ru/reserved.constants.php
      */
-    protected array $envConstants = [
+    protected array     $envConstants      = [
         'PHP_VERSION',
         'PHP_MAJOR_VERSION',
         'PHP_MINOR_VERSION',
@@ -56,7 +55,8 @@ class Constants
         'PHP_LIBDIR',
         'PHP_DATADIR',
     ];
-
+    protected bool      $expecting         = true;
+    protected ?Variable $expectingVariable = null;
     /**
      * Magic constants.
      *
@@ -72,31 +72,13 @@ class Constants
         '__METHOD__',
         '__NAMESPACE__',
     ];
-
-    protected array $resources = [
+    protected bool  $readOnly       = false;
+    protected array $resources      = [
         'STDIN',
         'STDOUT',
         'STDERR',
     ];
 
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
-
     /**
      * Resolves a PHP constant value into C-code.
      *
@@ -109,16 +91,16 @@ public function setReadOnly(bool $readOnly): void
      */
     public function compile(array $expression, CompilationContext $compilationContext)
     {
-        $isPhpConstant = false;
+        $isPhpConstant    = false;
         $isZephirConstant = false;
 
         $constantName = $expression['value'];
 
         $mergedConstants = array_merge($this->envConstants, $this->magicConstants, $this->resources);
-        if (!\defined($expression['value']) && !\in_array($constantName, $mergedConstants)) {
+        if (!defined($expression['value']) && !in_array($constantName, $mergedConstants)) {
             if (!$compilationContext->compiler->isConstant($constantName)) {
                 $compilationContext->logger->warning(
-                    "Constant '".$constantName."' does not exist at compile time",
+                    "Constant '" . $constantName . "' does not exist at compile time",
                     ['nonexistent-constant', $expression]
                 );
             } else {
@@ -128,15 +110,15 @@ public function compile(array $expression, CompilationContext $compilationContex
             $isPhpConstant = !str_contains($constantName, 'VERSION');
         }
 
-        if ($isZephirConstant && !\in_array($constantName, $this->resources)) {
+        if ($isZephirConstant && !in_array($constantName, $this->resources)) {
             $constant = $compilationContext->compiler->getConstant($constantName);
 
             return new LiteralCompiledExpression($constant[0], $constant[1], $expression);
         }
 
-        if ($isPhpConstant && !\in_array($constantName, $mergedConstants)) {
-            $constantName = \constant($constantName);
-            $type = strtolower(\gettype($constantName));
+        if ($isPhpConstant && !in_array($constantName, $mergedConstants)) {
+            $constantName = constant($constantName);
+            $type         = strtolower(gettype($constantName));
 
             switch ($type) {
                 case 'integer':
@@ -155,7 +137,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             }
         }
 
-        if (\in_array($constantName, $this->magicConstants)) {
+        if (in_array($constantName, $this->magicConstants)) {
             switch ($constantName) {
                 case '__CLASS__':
                     return new CompiledExpression(
@@ -172,7 +154,8 @@ public function compile(array $expression, CompilationContext $compilationContex
                 case '__METHOD__':
                     return new CompiledExpression(
                         'string',
-                        $compilationContext->classDefinition->getName().':'.$compilationContext->currentMethod->getName(),
+                        $compilationContext->classDefinition->getName(
+                        ) . ':' . $compilationContext->currentMethod->getName(),
                         $expression
                     );
                 case '__FUNCTION__':
@@ -184,7 +167,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             }
 
             $compilationContext->logger->warning(
-                "Magic constant '".$constantName."' is not supported",
+                "Magic constant '" . $constantName . "' is not supported",
                 ['not-supported-magic-constant', $expression]
             );
 
@@ -198,15 +181,46 @@ public function compile(array $expression, CompilationContext $compilationContex
             $symbolVariable->setMustInitNull(true);
             $symbolVariable->initVariant($compilationContext);
         } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
         }
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Cannot use variable: '.$symbolVariable->getType().' to assign property value', $expression);
+            throw new CompilerException(
+                'Cannot use variable: '
+                . $symbolVariable->getType()
+                . ' to assign property value',
+                $expression
+            );
         }
 
-        $compilationContext->codePrinter->output('ZEPHIR_GET_CONSTANT('.$compilationContext->backend->getVariableCode($symbolVariable).', "'.$expression['value'].'");');
+        $compilationContext->codePrinter->output(
+            'ZEPHIR_GET_CONSTANT(' . $compilationContext->backend->getVariableCode(
+                $symbolVariable
+            ) . ', "' . $expression['value'] . '");'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/NativeArray.php b/src/Expression/NativeArray.php
index 32ba85bde0..bd69231a9c 100644
--- a/src/Expression/NativeArray.php
+++ b/src/Expression/NativeArray.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -21,138 +22,17 @@
 use Zephir\GlobalConstant;
 use Zephir\Variable\Variable;
 
+use function count;
+use function function_exists;
+
 /**
  * Resolves expressions that create arrays
  */
 class NativeArray
 {
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
+    protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
-     */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
-
-    /**
-     * Resolves an item to be added in an array.
-     *
-     * @param CompiledExpression $exprCompiled
-     * @param CompilationContext $compilationContext
-     *
-     * @return Variable
-     */
-    public function getArrayValue(CompiledExpression $exprCompiled, CompilationContext $compilationContext)
-    {
-        switch ($exprCompiled->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $compilationContext->backend->assignLong($tempVar, $exprCompiled->getCode(), $compilationContext);
-
-                return $tempVar;
-
-            case 'char':
-            case 'uchar':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $compilationContext->backend->assignLong($tempVar, '\''.$exprCompiled->getCode().'\'', $compilationContext);
-
-                return $tempVar;
-
-            case 'double':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $compilationContext->backend->assignDouble($tempVar, $exprCompiled->getCode(), $compilationContext);
-
-                return $tempVar;
-
-            case 'bool':
-                if ('true' === $exprCompiled->getCode()) {
-                    return new GlobalConstant('ZEPHIR_GLOBAL(global_true)');
-                }
-
-                if ('false' === $exprCompiled->getCode()) {
-                    return new GlobalConstant('ZEPHIR_GLOBAL(global_false)');
-                }
-
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $compilationContext->backend->assignBool($tempVar, $exprCompiled->getCode(), $compilationContext);
-
-                return $tempVar;
-
-            case 'null':
-                return new GlobalConstant('ZEPHIR_GLOBAL(global_null)');
-
-            case 'string':
-            case 'ulong':
-                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $compilationContext->backend->assignString($tempVar, $exprCompiled->getCode(), $compilationContext);
-
-                return $tempVar;
-
-            case 'array':
-                return $compilationContext->symbolTable->getVariableForRead($exprCompiled->getCode(), $compilationContext, $exprCompiled->getOriginal());
-
-            case 'variable':
-                $itemVariable = $compilationContext->symbolTable->getVariableForRead($exprCompiled->getCode(), $compilationContext, $exprCompiled->getOriginal());
-                switch ($itemVariable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignLong($tempVar, $itemVariable, $compilationContext);
-
-                        return $tempVar;
-
-                    case 'double':
-                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignDouble($tempVar, $itemVariable, $compilationContext);
-
-                        return $tempVar;
-
-                    case 'bool':
-                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignBool($tempVar, $itemVariable, $compilationContext);
-
-                        return $tempVar;
-
-                    case 'string':
-                    case 'variable':
-                    case 'array':
-                    case 'mixed':
-                        return $itemVariable;
-
-                    default:
-                        throw new CompilerException('Unknown '.$itemVariable->getType(), $itemVariable);
-                }
-                break;
-
-            default:
-                throw new CompilerException('Unknown', $exprCompiled);
-        }
-    }
+    protected bool      $readOnly          = false;
 
     /**
      * Compiles an array initialization.
@@ -162,7 +42,7 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
      *
      * @return CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext)
@@ -174,13 +54,26 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
                 if ('variable' != $symbolVariable->getType() && 'array' != $symbolVariable->getType()) {
-                    throw new CompilerException('Cannot use variable type: '.$symbolVariable->getType().' as an array', $expression);
+                    throw new CompilerException(
+                        'Cannot use variable type: '
+                        . $symbolVariable->getType()
+                        . ' as an array',
+                        $expression
+                    );
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('array', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'array',
+                    $compilationContext,
+                    $expression
+                );
             }
         } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('array', $compilationContext, $expression);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'array',
+                $compilationContext,
+                $expression
+            );
         }
 
         if (!isset($expression['left'])) {
@@ -203,15 +96,19 @@ public function compile(array $expression, CompilationContext $compilationContex
          * This calculates a prime number bigger than the current array size to possibly
          * reduce hash collisions when adding new members to the array.
          */
-        $arrayLength = \count($expression['left']);
-        if ($arrayLength >= 33 && \function_exists('gmp_nextprime')) {
-            $arrayLength = (int) gmp_strval(gmp_nextprime($arrayLength - 1));
+        $arrayLength = count($expression['left']);
+        if ($arrayLength >= 33 && function_exists('gmp_nextprime')) {
+            $arrayLength = (int)gmp_strval(gmp_nextprime($arrayLength - 1));
         }
 
         if ($this->expectingVariable && $symbolVariable->getVariantInits() >= 1) {
             $symbolVariable = $compilationContext->symbolTable->addTemp('variable', $compilationContext);
             $symbolVariable->initVariant($compilationContext);
-            $compilationContext->backend->initArray($symbolVariable, $compilationContext, $arrayLength > 0 ? $arrayLength : null);
+            $compilationContext->backend->initArray(
+                $symbolVariable,
+                $compilationContext,
+                $arrayLength > 0 ? $arrayLength : null
+            );
             $symbolVariable->setDynamicTypes('array');
         } else {
             if ($this->expectingVariable) {
@@ -222,16 +119,20 @@ public function compile(array $expression, CompilationContext $compilationContex
              * Mark the variable as an array
              */
             $symbolVariable->setDynamicTypes('array');
-            $compilationContext->backend->initArray($symbolVariable, $compilationContext, $arrayLength > 0 ? $arrayLength : null);
+            $compilationContext->backend->initArray(
+                $symbolVariable,
+                $compilationContext,
+                $arrayLength > 0 ? $arrayLength : null
+            );
         }
         foreach ($expression['left'] as $item) {
             if (!isset($item['key'])) {
-                $expr = new Expression($item['value']);
+                $expr         = new Expression($item['value']);
                 $resolvedExpr = $expr->compile($compilationContext);
                 $itemVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
-                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-                $item = $compilationContext->backend->resolveValue($itemVariable, $compilationContext);
-                $codePrinter->output('zephir_array_fast_append('.$symbol.', '.$item.');');
+                $symbol       = $compilationContext->backend->getVariableCode($symbolVariable);
+                $item         = $compilationContext->backend->resolveValue($itemVariable, $compilationContext);
+                $codePrinter->output('zephir_array_fast_append(' . $symbol . ', ' . $item . ');');
                 if ($itemVariable->isTemporal()) {
                     $itemVariable->setIdle(true);
                 }
@@ -239,12 +140,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                 continue;
             }
 
-            $exprKey = new Expression($item['key']);
+            $exprKey         = new Expression($item['key']);
             $resolvedExprKey = $exprKey->compile($compilationContext);
 
             switch ($resolvedExprKey->getType()) {
                 case 'string':
-                    $expr = new Expression($item['value']);
+                    $expr         = new Expression($item['value']);
                     $resolvedExpr = $expr->compile($compilationContext);
                     switch ($resolvedExpr->getType()) {
                         case 'int':
@@ -253,33 +154,65 @@ public function compile(array $expression, CompilationContext $compilationContex
                         case 'ulong':
                         case 'string':
                         case 'double':
-                            $compilationContext->backend->addArrayEntry($symbolVariable, $resolvedExprKey, $resolvedExpr, $compilationContext);
+                            $compilationContext->backend->addArrayEntry(
+                                $symbolVariable,
+                                $resolvedExprKey,
+                                $resolvedExpr,
+                                $compilationContext
+                            );
                             break;
 
                         case 'bool':
                             $compilationContext->headersManager->add('kernel/array');
                             if ('true' == $resolvedExpr->getCode()) {
-                                $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, 'true', $compilationContext, 'PH_COPY | PH_SEPARATE');
+                                $compilationContext->backend->updateArray(
+                                    $symbolVariable,
+                                    $resolvedExprKey,
+                                    'true',
+                                    $compilationContext,
+                                    'PH_COPY | PH_SEPARATE'
+                                );
                             } else {
-                                $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, 'false', $compilationContext, 'PH_COPY | PH_SEPARATE');
+                                $compilationContext->backend->updateArray(
+                                    $symbolVariable,
+                                    $resolvedExprKey,
+                                    'false',
+                                    $compilationContext,
+                                    'PH_COPY | PH_SEPARATE'
+                                );
                             }
                             break;
 
                         case 'null':
-                            $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, 'null', $compilationContext, 'PH_COPY | PH_SEPARATE');
+                            $compilationContext->backend->updateArray(
+                                $symbolVariable,
+                                $resolvedExprKey,
+                                'null',
+                                $compilationContext,
+                                'PH_COPY | PH_SEPARATE'
+                            );
                             break;
 
                         case 'array':
                         case 'variable':
                             $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
-                            $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, $valueVariable, $compilationContext, 'PH_COPY | PH_SEPARATE');
+                            $compilationContext->backend->updateArray(
+                                $symbolVariable,
+                                $resolvedExprKey,
+                                $valueVariable,
+                                $compilationContext,
+                                'PH_COPY | PH_SEPARATE'
+                            );
                             if ($valueVariable->isTemporal()) {
                                 $valueVariable->setIdle(true);
                             }
                             break;
 
                         default:
-                            throw new CompilerException('Invalid value type: '.$resolvedExpr->getType(), $item['value']);
+                            throw new CompilerException(
+                                'Invalid value type: ' . $resolvedExpr->getType(),
+                                $item['value']
+                            );
                     }
                     break;
 
@@ -287,7 +220,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 case 'uint':
                 case 'long':
                 case 'ulong':
-                    $expr = new Expression($item['value']);
+                    $expr         = new Expression($item['value']);
                     $resolvedExpr = $expr->compile($compilationContext);
                     switch ($resolvedExpr->getType()) {
                         case 'int':
@@ -296,43 +229,79 @@ public function compile(array $expression, CompilationContext $compilationContex
                         case 'ulong':
                         case 'double':
                         case 'string':
-                            $compilationContext->backend->addArrayEntry($symbolVariable, $resolvedExprKey, $resolvedExpr, $compilationContext);
+                            $compilationContext->backend->addArrayEntry(
+                                $symbolVariable,
+                                $resolvedExprKey,
+                                $resolvedExpr,
+                                $compilationContext
+                            );
                             break;
 
                         case 'bool':
                             if ('true' == $resolvedExpr->getCode()) {
-                                $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, 'true', $compilationContext, 'PH_COPY');
+                                $compilationContext->backend->updateArray(
+                                    $symbolVariable,
+                                    $resolvedExprKey,
+                                    'true',
+                                    $compilationContext,
+                                    'PH_COPY'
+                                );
                             } else {
-                                $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, 'false', $compilationContext, 'PH_COPY');
+                                $compilationContext->backend->updateArray(
+                                    $symbolVariable,
+                                    $resolvedExprKey,
+                                    'false',
+                                    $compilationContext,
+                                    'PH_COPY'
+                                );
                             }
                             break;
 
                         case 'null':
-                            $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, 'null', $compilationContext, 'PH_COPY');
+                            $compilationContext->backend->updateArray(
+                                $symbolVariable,
+                                $resolvedExprKey,
+                                'null',
+                                $compilationContext,
+                                'PH_COPY'
+                            );
                             break;
 
                         case 'array':
                         case 'variable':
                             $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
-                            $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, $valueVariable, $compilationContext, 'PH_COPY');
+                            $compilationContext->backend->updateArray(
+                                $symbolVariable,
+                                $resolvedExprKey,
+                                $valueVariable,
+                                $compilationContext,
+                                'PH_COPY'
+                            );
                             if ($valueVariable->isTemporal()) {
                                 $valueVariable->setIdle(true);
                             }
                             break;
 
                         default:
-                            throw new CompilerException('Invalid value type: '.$item['value']['type'], $item['value']);
+                            throw new CompilerException(
+                                'Invalid value type: ' . $item['value']['type'],
+                                $item['value']
+                            );
                     }
                     break;
 
                 case 'variable':
-                    $variableVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExprKey->getCode(), $compilationContext, $item['key']);
+                    $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                        $resolvedExprKey->getCode(),
+                        $compilationContext,
+                        $item['key']
+                    );
                     switch ($variableVariable->getType()) {
                         case 'int':
                         case 'uint':
                         case 'long':
                         case 'ulong':
-                            $expr = new Expression($item['value']);
+                            $expr         = new Expression($item['value']);
                             $resolvedExpr = $expr->compile($compilationContext);
                             switch ($resolvedExpr->getType()) {
                                 case 'int':
@@ -343,71 +312,122 @@ public function compile(array $expression, CompilationContext $compilationContex
                                 case 'double':
                                 case 'null':
                                 case 'string':
-                                    $compilationContext->backend->addArrayEntry($symbolVariable, $resolvedExprKey, $resolvedExpr, $compilationContext);
+                                    $compilationContext->backend->addArrayEntry(
+                                        $symbolVariable,
+                                        $resolvedExprKey,
+                                        $resolvedExpr,
+                                        $compilationContext
+                                    );
                                     break;
 
                                 case 'variable':
                                     $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
-                                    $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, $valueVariable, $compilationContext, 'PH_COPY');
+                                    $compilationContext->backend->updateArray(
+                                        $symbolVariable,
+                                        $resolvedExprKey,
+                                        $valueVariable,
+                                        $compilationContext,
+                                        'PH_COPY'
+                                    );
                                     if ($valueVariable->isTemporal()) {
                                         $valueVariable->setIdle(true);
                                     }
                                     break;
 
                                 default:
-                                    throw new CompilerException('Invalid value type: '.$item['value']['type'], $item['value']);
+                                    throw new CompilerException(
+                                        'Invalid value type: ' . $item['value']['type'],
+                                        $item['value']
+                                    );
                             }
                             break;
 
                         case 'string':
-                            $expr = new Expression($item['value']);
+                            $expr         = new Expression($item['value']);
                             $resolvedExpr = $expr->compile($compilationContext);
                             switch ($resolvedExpr->getType()) {
                                 case 'int':
                                 case 'uint':
                                 case 'long':
                                 case 'ulong':
-                                    $codePrinter->output('add_assoc_long_ex('.$symbolVariable->getName().', Z_STRVAL_P('.$resolvedExprKey->getCode().'), Z_STRLEN_P('.$item['key']['value'].'), '.$resolvedExpr->getCode().');');
+                                    $codePrinter->output(
+                                        'add_assoc_long_ex(' . $symbolVariable->getName(
+                                        ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
+                                        ) . '), Z_STRLEN_P(' . $item['key']['value'] . '), ' . $resolvedExpr->getCode(
+                                        ) . ');'
+                                    );
                                     break;
 
                                 case 'double':
-                                    $codePrinter->output('add_assoc_double_ex('.$symbolVariable->getName().', Z_STRVAL_P('.$resolvedExprKey->getCode().'), Z_STRLEN_P('.$item['key']['value'].'), '.$resolvedExpr->getCode().');');
+                                    $codePrinter->output(
+                                        'add_assoc_double_ex(' . $symbolVariable->getName(
+                                        ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
+                                        ) . '), Z_STRLEN_P(' . $item['key']['value'] . '), ' . $resolvedExpr->getCode(
+                                        ) . ');'
+                                    );
                                     break;
 
                                 case 'bool':
-                                    $codePrinter->output('add_assoc_bool_ex('.$symbolVariable->getName().', Z_STRVAL_P('.$resolvedExprKey->getCode().'), Z_STRLEN_P('.$item['key']['value'].'), '.$resolvedExpr->getBooleanCode().');');
+                                    $codePrinter->output(
+                                        'add_assoc_bool_ex(' . $symbolVariable->getName(
+                                        ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
+                                        ) . '), Z_STRLEN_P(' . $item['key']['value'] . '), ' . $resolvedExpr->getBooleanCode(
+                                        ) . ');'
+                                    );
                                     break;
 
                                 case 'string':
-                                    $compilationContext->backend->addArrayEntry($symbolVariable, $resolvedExprKey, $resolvedExpr, $compilationContext);
+                                    $compilationContext->backend->addArrayEntry(
+                                        $symbolVariable,
+                                        $resolvedExprKey,
+                                        $resolvedExpr,
+                                        $compilationContext
+                                    );
                                     break;
 
                                 case 'null':
-                                    $codePrinter->output('add_assoc_null_ex('.$symbolVariable->getName().', Z_STRVAL_P('.$resolvedExprKey->getCode().'), Z_STRLEN_P('.$item['key']['value'].') + 1);');
+                                    $codePrinter->output(
+                                        'add_assoc_null_ex(' . $symbolVariable->getName(
+                                        ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
+                                        ) . '), Z_STRLEN_P(' . $item['key']['value'] . ') + 1);'
+                                    );
                                     break;
 
                                 case 'variable':
                                     $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
-                                    $compilationContext->backend->updateArray($symbolVariable, $resolvedExprKey, $resolvedExpr, $compilationContext);
+                                    $compilationContext->backend->updateArray(
+                                        $symbolVariable,
+                                        $resolvedExprKey,
+                                        $resolvedExpr,
+                                        $compilationContext
+                                    );
                                     if ($valueVariable->isTemporal()) {
                                         $valueVariable->setIdle(true);
                                     }
                                     break;
 
                                 default:
-                                    throw new CompilerException('Invalid value type: '.$resolvedExpr->getType(), $item['value']);
+                                    throw new CompilerException(
+                                        'Invalid value type: ' . $resolvedExpr->getType(),
+                                        $item['value']
+                                    );
                             }
                             break;
 
                         case 'variable':
-                            $expr = new Expression($item['value']);
+                            $expr         = new Expression($item['value']);
                             $resolvedExpr = $expr->compile($compilationContext);
                             switch ($resolvedExpr->getType()) {
                                 case 'null':
                                 case 'variable':
                                 case 'bool':
                                     $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
-                                    $compilationContext->backend->updateArray($symbolVariable, $variableVariable, $valueVariable, $compilationContext);
+                                    $compilationContext->backend->updateArray(
+                                        $symbolVariable,
+                                        $variableVariable,
+                                        $valueVariable,
+                                        $compilationContext
+                                    );
 
                                     if ($valueVariable->isTemporal()) {
                                         $valueVariable->setIdle(true);
@@ -415,20 +435,169 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     break;
 
                                 default:
-                                    throw new CompilerException('Invalid value type: '.$item['value']['type'], $item['value']);
+                                    throw new CompilerException(
+                                        'Invalid value type: ' . $item['value']['type'],
+                                        $item['value']
+                                    );
                             }
                             break;
 
                         default:
-                            throw new CompilerException('Cannot use variable type: '.$variableVariable->getType().' as array index', $item['key']);
+                            throw new CompilerException(
+                                'Cannot use variable type: ' . $variableVariable->getType() . ' as array index',
+                                $item['key']
+                            );
                     }
                     break;
 
                 default:
-                    throw new CompilerException('Invalid key type: '.$resolvedExprKey->getType(), $item['key']);
+                    throw new CompilerException('Invalid key type: ' . $resolvedExprKey->getType(), $item['key']);
             }
         }
 
         return new CompiledExpression('array', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * Resolves an item to be added in an array.
+     *
+     * @param CompiledExpression $exprCompiled
+     * @param CompilationContext $compilationContext
+     *
+     * @return Variable
+     */
+    public function getArrayValue(CompiledExpression $exprCompiled, CompilationContext $compilationContext)
+    {
+        switch ($exprCompiled->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $compilationContext->backend->assignLong($tempVar, $exprCompiled->getCode(), $compilationContext);
+
+                return $tempVar;
+
+            case 'char':
+            case 'uchar':
+                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $compilationContext->backend->assignLong(
+                    $tempVar,
+                    '\'' . $exprCompiled->getCode() . '\'',
+                    $compilationContext
+                );
+
+                return $tempVar;
+
+            case 'double':
+                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $compilationContext->backend->assignDouble($tempVar, $exprCompiled->getCode(), $compilationContext);
+
+                return $tempVar;
+
+            case 'bool':
+                if ('true' === $exprCompiled->getCode()) {
+                    return new GlobalConstant('ZEPHIR_GLOBAL(global_true)');
+                }
+
+                if ('false' === $exprCompiled->getCode()) {
+                    return new GlobalConstant('ZEPHIR_GLOBAL(global_false)');
+                }
+
+                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $compilationContext->backend->assignBool($tempVar, $exprCompiled->getCode(), $compilationContext);
+
+                return $tempVar;
+
+            case 'null':
+                return new GlobalConstant('ZEPHIR_GLOBAL(global_null)');
+
+            case 'string':
+            case 'ulong':
+                $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $compilationContext->backend->assignString($tempVar, $exprCompiled->getCode(), $compilationContext);
+
+                return $tempVar;
+
+            case 'array':
+                return $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiled->getCode(),
+                    $compilationContext,
+                    $exprCompiled->getOriginal()
+                );
+
+            case 'variable':
+                $itemVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiled->getCode(),
+                    $compilationContext,
+                    $exprCompiled->getOriginal()
+                );
+                switch ($itemVariable->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignLong($tempVar, $itemVariable, $compilationContext);
+
+                        return $tempVar;
+
+                    case 'double':
+                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignDouble($tempVar, $itemVariable, $compilationContext);
+
+                        return $tempVar;
+
+                    case 'bool':
+                        $tempVar = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignBool($tempVar, $itemVariable, $compilationContext);
+
+                        return $tempVar;
+
+                    case 'string':
+                    case 'variable':
+                    case 'array':
+                    case 'mixed':
+                        return $itemVariable;
+
+                    default:
+                        throw new CompilerException('Unknown ' . $itemVariable->getType(), $itemVariable);
+                }
+                break;
+
+            default:
+                throw new CompilerException('Unknown', $exprCompiled);
+        }
+    }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/NativeArrayAccess.php b/src/Expression/NativeArrayAccess.php
index 84f0f273cf..bdb9b30adb 100644
--- a/src/Expression/NativeArrayAccess.php
+++ b/src/Expression/NativeArrayAccess.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -25,46 +26,10 @@
  */
 class NativeArrayAccess
 {
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
+    protected bool      $expecting = true;
     protected ?Variable $expectingVariable;
-
-    protected bool $noisy = true;
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
-     */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
-
-    /**
-     * Sets whether the expression must be resolved in "noisy" mode.
-     *
-     * @param bool $noisy
-     */
-    public function setNoisy(bool $noisy): void
-    {
-        $this->noisy = $noisy;
-    }
+    protected bool      $noisy     = true;
+    protected bool      $readOnly  = false;
 
     /**
      * Compiles foo[x] = {expr}.
@@ -75,7 +40,7 @@ public function setNoisy(bool $noisy): void
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
@@ -91,7 +56,11 @@ public function compile($expression, CompilationContext $compilationContext)
          */
         switch ($exprVariable->getType()) {
             case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead($exprVariable->getCode(), $compilationContext, $expression);
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprVariable->getCode(),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableVariable->getType()) {
                     case 'variable':
                     case 'array':
@@ -99,12 +68,18 @@ public function compile($expression, CompilationContext $compilationContext)
                         break;
 
                     default:
-                        throw new CompilerException('Variable type: '.$variableVariable->getType().' cannot be used as array', $expression['left']);
+                        throw new CompilerException(
+                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as array',
+                            $expression['left']
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException('Cannot use expression: '.$exprVariable->getType().' as an array', $expression['left']);
+                throw new CompilerException(
+                    'Cannot use expression: ' . $exprVariable->getType() . ' as an array',
+                    $expression['left']
+                );
         }
 
         /**
@@ -121,64 +96,36 @@ public function compile($expression, CompilationContext $compilationContext)
     }
 
     /**
-     * @param array              $expression
-     * @param Variable           $variableVariable
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
      *
-     * @throws \ReflectionException
-     * @throws Exception
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
      */
-    protected function accessStringOffset(array $expression, Variable $variableVariable, CompilationContext $compilationContext): CompiledExpression
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
     {
-        if ($this->expecting) {
-            if ($this->expectingVariable) {
-                $symbolVariable = $this->expectingVariable;
-                if ('char' != $symbolVariable->getType() && 'uchar' != $symbolVariable->getType()) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('uchar', $compilationContext);
-                }
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('uchar', $compilationContext);
-            }
-        }
-
-        /**
-         * Right part of expression is the index.
-         */
-        $expr = new Expression($expression['right']);
-        $exprIndex = $expr->compile($compilationContext);
-
-        $codePrinter = $compilationContext->codePrinter;
-        $variableCode = $compilationContext->backend->getVariableCode($variableVariable);
-
-        switch ($exprIndex->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $compilationContext->headersManager->add('kernel/operators');
-                $codePrinter->output($symbolVariable->getName().' = ZEPHIR_STRING_OFFSET('.$variableCode.', '.$exprIndex->getCode().');');
-                break;
-
-            case 'variable':
-                $variableIndex = $compilationContext->symbolTable->getVariableForRead($exprIndex->getCode(), $compilationContext, $expression);
-                switch ($variableIndex->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                        $codePrinter->output($symbolVariable->getName().' = ZEPHIR_STRING_OFFSET('.$variableCode.', '.$variableIndex->getName().');');
-                        break;
-
-                    default:
-                        throw new CompilerException('Cannot use index type '.$variableIndex->getType().' as offset', $expression['right']);
-                }
-                break;
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
 
-            default:
-                throw new CompilerException('Cannot use index type '.$exprIndex->getType().' as offset', $expression['right']);
-        }
+    /**
+     * Sets whether the expression must be resolved in "noisy" mode.
+     *
+     * @param bool $noisy
+     */
+    public function setNoisy(bool $noisy): void
+    {
+        $this->noisy = $noisy;
+    }
 
-        return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
     }
 
     /**
@@ -189,10 +136,13 @@ protected function accessStringOffset(array $expression, Variable $variableVaria
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
-    protected function accessDimensionArray(array $expression, Variable $variableVariable, CompilationContext $compilationContext): CompiledExpression
-    {
+    protected function accessDimensionArray(
+        array $expression,
+        Variable $variableVariable,
+        CompilationContext $compilationContext
+    ): CompiledExpression {
         $arrayAccess = $expression;
 
         if ('variable' == $variableVariable->getType()) {
@@ -214,7 +164,7 @@ protected function accessDimensionArray(array $expression, Variable $variableVar
         /**
          * Resolves the symbol that expects the value.
          */
-        $readOnly = false;
+        $readOnly       = false;
         $symbolVariable = $this->expectingVariable;
 
         if ($this->readOnly) {
@@ -226,7 +176,9 @@ protected function accessDimensionArray(array $expression, Variable $variableVar
                 if ('return_value' != $symbolVariable->getName()) {
                     $line = $compilationContext->symbolTable->getLastCallLine();
                     if (false === $line || ($line > 0 && $line < $expression['line'])) {
-                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations($symbolVariable->getName());
+                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(
+                            $symbolVariable->getName()
+                        );
                         if (1 == $numberMutations) {
                             if ($symbolVariable->getNumberMutations() == $numberMutations) {
                                 $symbolVariable->setMemoryTracked(false);
@@ -244,11 +196,19 @@ protected function accessDimensionArray(array $expression, Variable $variableVar
                         $symbolVariable->observeVariant($compilationContext);
                         $this->readOnly = false;
                     } else {
-                        $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedUninitializedVariable('variable', $compilationContext, $expression);
+                        $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedUninitializedVariable(
+                            'variable',
+                            $compilationContext,
+                            $expression
+                        );
                     }
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedUninitializedVariable('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedUninitializedVariable(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
             }
         } else {
             if ($this->expecting && $this->expectingVariable) {
@@ -259,7 +219,9 @@ protected function accessDimensionArray(array $expression, Variable $variableVar
                 if ('return_value' !== $symbolVariable->getName()) {
                     $line = $compilationContext->symbolTable->getLastCallLine();
                     if (false === $line || ($line > 0 && $line < $expression['line'])) {
-                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations($symbolVariable->getName());
+                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(
+                            $symbolVariable->getName()
+                        );
                         if (1 == $numberMutations) {
                             if ($symbolVariable->getNumberMutations() == $numberMutations) {
                                 $symbolVariable->setMemoryTracked(false);
@@ -277,11 +239,17 @@ protected function accessDimensionArray(array $expression, Variable $variableVar
                         $symbolVariable->observeVariant($compilationContext);
                         $this->readOnly = false;
                     } else {
-                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
+                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve(
+                            'variable',
+                            $compilationContext
+                        );
                     }
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve(
+                    'variable',
+                    $compilationContext
+                );
             }
         }
 
@@ -289,7 +257,10 @@ protected function accessDimensionArray(array $expression, Variable $variableVar
          * Variable that receives property accesses must be polymorphic
          */
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Cannot use variable: '.$symbolVariable->getType().' to assign array index', $expression);
+            throw new CompilerException(
+                'Cannot use variable: ' . $symbolVariable->getType() . ' to assign array index',
+                $expression
+            );
         }
 
         /**
@@ -306,16 +277,113 @@ protected function accessDimensionArray(array $expression, Variable $variableVar
         /**
          * Right part of expression is the index.
          */
-        $expr = new Expression($arrayAccess['right']);
+        $expr      = new Expression($arrayAccess['right']);
         $exprIndex = $expr->compile($compilationContext);
         $compilationContext->headersManager->add('kernel/array');
 
         if ('variable' === $exprIndex->getType()) {
-            $exprIndex = $compilationContext->symbolTable->getVariableForRead($exprIndex->getCode(), $compilationContext, $expression);
+            $exprIndex = $compilationContext->symbolTable->getVariableForRead(
+                $exprIndex->getCode(),
+                $compilationContext,
+                $expression
+            );
         }
 
-        $compilationContext->backend->arrayFetch($symbolVariable, $variableVariable, $exprIndex, $flags, $arrayAccess, $compilationContext);
+        $compilationContext->backend->arrayFetch(
+            $symbolVariable,
+            $variableVariable,
+            $exprIndex,
+            $flags,
+            $arrayAccess,
+            $compilationContext
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param array              $expression
+     * @param Variable           $variableVariable
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression
+     *
+     * @throws ReflectionException
+     * @throws Exception
+     */
+    protected function accessStringOffset(
+        array $expression,
+        Variable $variableVariable,
+        CompilationContext $compilationContext
+    ): CompiledExpression {
+        if ($this->expecting) {
+            if ($this->expectingVariable) {
+                $symbolVariable = $this->expectingVariable;
+                if ('char' != $symbolVariable->getType() && 'uchar' != $symbolVariable->getType()) {
+                    $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                        'uchar',
+                        $compilationContext
+                    );
+                }
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'uchar',
+                    $compilationContext
+                );
+            }
+        }
+
+        /**
+         * Right part of expression is the index.
+         */
+        $expr      = new Expression($expression['right']);
+        $exprIndex = $expr->compile($compilationContext);
+
+        $codePrinter  = $compilationContext->codePrinter;
+        $variableCode = $compilationContext->backend->getVariableCode($variableVariable);
+
+        switch ($exprIndex->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $compilationContext->headersManager->add('kernel/operators');
+                $codePrinter->output(
+                    $symbolVariable->getName(
+                    ) . ' = ZEPHIR_STRING_OFFSET(' . $variableCode . ', ' . $exprIndex->getCode() . ');'
+                );
+                break;
+
+            case 'variable':
+                $variableIndex = $compilationContext->symbolTable->getVariableForRead(
+                    $exprIndex->getCode(),
+                    $compilationContext,
+                    $expression
+                );
+                switch ($variableIndex->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                        $codePrinter->output(
+                            $symbolVariable->getName(
+                            ) . ' = ZEPHIR_STRING_OFFSET(' . $variableCode . ', ' . $variableIndex->getName() . ');'
+                        );
+                        break;
+
+                    default:
+                        throw new CompilerException(
+                            'Cannot use index type ' . $variableIndex->getType() . ' as offset',
+                            $expression['right']
+                        );
+                }
+                break;
+
+            default:
+                throw new CompilerException(
+                    'Cannot use index type ' . $exprIndex->getType() . ' as offset',
+                    $expression['right']
+                );
+        }
+
+        return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
+    }
 }
diff --git a/src/Expression/PropertyAccess.php b/src/Expression/PropertyAccess.php
index acc6654f59..86e6e11b5e 100644
--- a/src/Expression/PropertyAccess.php
+++ b/src/Expression/PropertyAccess.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression;
 
 use Zephir\CompilationContext;
@@ -24,46 +24,10 @@
  */
 class PropertyAccess
 {
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
-    protected $expectingVariable;
-
-    protected bool $noisy = true;
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
-     */
-    public function setReadOnly($readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
-
-    /**
-     * Sets whether the expression must be resolved in "noisy" mode.
-     *
-     * @param bool $noisy
-     */
-    public function setNoisy(bool $noisy): void
-    {
-        $this->noisy = $noisy;
-    }
+    protected bool      $expecting = true;
+    protected ?Variable $expectingVariable;
+    protected bool      $noisy     = true;
+    protected bool      $readOnly  = false;
 
     /**
      * Resolves the access to a property in an object.
@@ -83,24 +47,34 @@ public function compile($expression, CompilationContext $compilationContext)
 
         switch ($exprVariable->getType()) {
             case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead($exprVariable->getCode(), $compilationContext, $expression);
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprVariable->getCode(),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableVariable->getType()) {
                     case 'variable':
                         break;
 
                     default:
-                        throw new CompilerException('Variable type: '.$variableVariable->getType().' cannot be used as object', $propertyAccess['left']);
+                        throw new CompilerException(
+                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',
+                            $propertyAccess['left']
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException('Cannot use expression: '.$exprVariable->getType().' as an object', $propertyAccess['left']);
+                throw new CompilerException(
+                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',
+                    $propertyAccess['left']
+                );
         }
 
         $property = $propertyAccess['right']['value'];
 
-        $propertyDefinition = null;
-        $classDefinition = null;
+        $propertyDefinition     = null;
+        $classDefinition        = null;
         $currentClassDefinition = $compilationContext->classDefinition;
 
         /**
@@ -109,7 +83,14 @@ public function compile($expression, CompilationContext $compilationContext)
         if ('this' == $variableVariable->getRealName()) {
             $classDefinition = $currentClassDefinition;
             if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $expression);
+                throw new CompilerException(
+                    "Class '"
+                    . $classDefinition->getCompleteName()
+                    . "' does not have a property called: '"
+                    . $property
+                    . "'",
+                    $expression
+                );
             }
 
             $propertyDefinition = $classDefinition->getProperty($property);
@@ -120,16 +101,22 @@ public function compile($expression, CompilationContext $compilationContext)
              */
             if ($variableVariable->hasAnyDynamicType('object')) {
                 $classType = current($variableVariable->getClassTypes());
-                $compiler = $compilationContext->compiler;
+                $compiler  = $compilationContext->compiler;
 
                 if ($classType !== false && $compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
-                        throw new CompilerException('Cannot locate class definition for class: '.$classType, $expression);
+                        throw new CompilerException(
+                            'Cannot locate class definition for class: ' . $classType,
+                            $expression
+                        );
                     }
 
                     if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException("Class '".$classType."' does not have a property called: '".$property."'", $expression);
+                        throw new CompilerException(
+                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
+                            $expression
+                        );
                     }
 
                     $propertyDefinition = $classDefinition->getProperty($property);
@@ -143,7 +130,10 @@ public function compile($expression, CompilationContext $compilationContext)
          */
         if ($propertyDefinition) {
             if ($propertyDefinition->isStatic()) {
-                throw new CompilerException("Attempt to access static property '".$property."' as non static", $expression);
+                throw new CompilerException(
+                    "Attempt to access static property '" . $property . "' as non static",
+                    $expression
+                );
             }
 
             if (!$propertyDefinition->isPublic()) {
@@ -155,17 +145,28 @@ public function compile($expression, CompilationContext $compilationContext)
                     if ($propertyDefinition->isPrivate()) {
                         $declarationDefinition = $propertyDefinition->getClassDefinition();
                         if ($declarationDefinition !== $currentClassDefinition) {
-                            throw new CompilerException("Attempt to access private property '".$property."' outside of its declared class context: '".$declarationDefinition->getCompleteName()."'", $expression);
+                            throw new CompilerException(
+                                "Attempt to access private property '"
+                                . $property
+                                . "' outside of its declared class context: '"
+                                . $declarationDefinition->getCompleteName()
+                                . "'",
+                                $expression
+                            );
                         }
                     }
                 } else {
-                    if ($propertyDefinition->isProtected()) {
-                    } else {
-                        if ($propertyDefinition->isPrivate()) {
-                            $declarationDefinition = $propertyDefinition->getClassDefinition();
-                            if ($declarationDefinition !== $currentClassDefinition) {
-                                throw new CompilerException("Attempt to access private property '".$property."' outside of its declared class context: '".$declarationDefinition->getCompleteName()."'", $expression);
-                            }
+                    if (!$propertyDefinition->isProtected() && $propertyDefinition->isPrivate()) {
+                        $declarationDefinition = $propertyDefinition->getClassDefinition();
+                        if ($declarationDefinition !== $currentClassDefinition) {
+                            throw new CompilerException(
+                                "Attempt to access private property '"
+                                . $property
+                                . "' outside of its declared class context: '"
+                                . $declarationDefinition->getCompleteName()
+                                . "'",
+                                $expression
+                            );
                         }
                     }
                 }
@@ -175,7 +176,7 @@ public function compile($expression, CompilationContext $compilationContext)
         /**
          * Resolves the symbol that expects the value.
          */
-        $readOnly = false;
+        $readOnly           = false;
         $makeSymbolVariable = false;
         if ($this->expecting) {
             if ($this->expectingVariable) {
@@ -188,7 +189,9 @@ public function compile($expression, CompilationContext $compilationContext)
                 if ('return_value' != $symbolVariable->getName()) {
                     $line = $compilationContext->symbolTable->getLastCallLine();
                     if (false === $line || ($line > 0 && $line < $expression['line'])) {
-                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations($symbolVariable->getName());
+                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(
+                            $symbolVariable->getName()
+                        );
                         if (1 == $numberMutations) {
                             if ($symbolVariable->getNumberMutations() == $numberMutations) {
                                 $symbolVariable->setMemoryTracked(false);
@@ -221,9 +224,15 @@ public function compile($expression, CompilationContext $compilationContext)
 
         if ($makeSymbolVariable) {
             if ($readOnly) {
-                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext);
+                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext
+                );
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve(
+                    'variable',
+                    $compilationContext
+                );
             }
         }
 
@@ -231,7 +240,12 @@ public function compile($expression, CompilationContext $compilationContext)
          * Variable that receives a property value must be polymorphic
          */
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Cannot use variable: '.$symbolVariable->getType().' to assign property value', $expression);
+            throw new CompilerException(
+                'Cannot use variable: '
+                . $symbolVariable->getType()
+                . ' to assign property value',
+                $expression
+            );
         }
 
         /**
@@ -239,8 +253,47 @@ public function compile($expression, CompilationContext $compilationContext)
          */
         $symbolVariable->setDynamicTypes('undefined');
         $compilationContext->headersManager->add('kernel/object');
-        $compilationContext->backend->fetchProperty($symbolVariable, $variableVariable, $property, $readOnly, $compilationContext);
+        $compilationContext->backend->fetchProperty(
+            $symbolVariable,
+            $variableVariable,
+            $property,
+            $readOnly,
+            $compilationContext
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets whether the expression must be resolved in "noisy" mode.
+     *
+     * @param bool $noisy
+     */
+    public function setNoisy(bool $noisy): void
+    {
+        $this->noisy = $noisy;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly($readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index 72599000f4..f16633be7d 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Expression;
 
 use Zephir\CompilationContext;
@@ -25,46 +25,10 @@
  */
 class PropertyDynamicAccess
 {
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
-    protected $expectingVariable;
-
-    protected bool $noisy = true;
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool     $expecting
-     * @param Variable $expectingVariable
-     */
-    public function setExpectReturn($expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
-     */
-    public function setReadOnly($readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
-
-    /**
-     * Sets whether the expression must be resolved in "noisy" mode.
-     *
-     * @param bool $noisy
-     */
-    public function setNoisy($noisy): void
-    {
-        $this->noisy = $noisy;
-    }
+    protected bool      $expecting = true;
+    protected ?Variable $expectingVariable = null;
+    protected bool      $noisy     = true;
+    protected bool      $readOnly  = false;
 
     /**
      * Resolves the access to a property in an object.
@@ -78,32 +42,49 @@ public function compile($expression, CompilationContext $compilationContext)
     {
         $propertyAccess = $expression;
 
-        $expr = new Expression($propertyAccess['left']);
+        $expr         = new Expression($propertyAccess['left']);
         $exprVariable = $expr->compile($compilationContext);
 
         switch ($exprVariable->getType()) {
             case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead($exprVariable->getCode(), $compilationContext, $expression);
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprVariable->getCode(),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableVariable->getType()) {
                     case 'variable':
                         break;
                     default:
-                        throw new CompilerException('Variable type: '.$variableVariable->getType().' cannot be used as object', $propertyAccess['left']);
+                        throw new CompilerException(
+                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',
+                            $propertyAccess['left']
+                        );
                 }
                 break;
             default:
-                throw new CompilerException('Cannot use expression: '.$exprVariable->getType().' as an object', $propertyAccess['left']);
+                throw new CompilerException(
+                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',
+                    $propertyAccess['left']
+                );
         }
 
         switch ($propertyAccess['right']['type']) {
             case 'variable':
-                $propertyVariable = $compilationContext->symbolTable->getVariableForRead($propertyAccess['right']['value'], $compilationContext, $expression);
+                $propertyVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $propertyAccess['right']['value'],
+                    $compilationContext,
+                    $expression
+                );
                 break;
             case 'string':
                 $propertyVariable = null;
                 break;
             default:
-                throw new CompilerException('Variable type: '.$propertyAccess['right']['type'].' cannot be used as object', $propertyAccess['left']);
+                throw new CompilerException(
+                    'Variable type: ' . $propertyAccess['right']['type'] . ' cannot be used as object',
+                    $propertyAccess['left']
+                );
         }
 
         /**
@@ -115,10 +96,16 @@ public function compile($expression, CompilationContext $compilationContext)
                 if ('return_value' != $symbolVariable->getName()) {
                     $symbolVariable->observeVariant($compilationContext);
                 } else {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve(
+                        'variable',
+                        $compilationContext
+                    );
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve('variable', $compilationContext);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserve(
+                    'variable',
+                    $compilationContext
+                );
             }
         }
 
@@ -126,7 +113,12 @@ public function compile($expression, CompilationContext $compilationContext)
          * Variable that receives a property value must be polymorphic
          */
         if ($symbolVariable && !$symbolVariable->isVariable()) {
-            throw new CompilerException('Cannot use variable: '.$symbolVariable->getType().' to assign property value', $expression);
+            throw new CompilerException(
+                'Cannot use variable: '
+                . $symbolVariable->getType()
+                . ' to assign property value',
+                $expression
+            );
         }
 
         /*
@@ -137,8 +129,47 @@ public function compile($expression, CompilationContext $compilationContext)
         $compilationContext->headersManager->add('kernel/object');
 
         $property = $propertyVariable ?: Name::addSlashes($expression['right']['value']);
-        $compilationContext->backend->fetchProperty($symbolVariable, $variableVariable, $property, false, $compilationContext);
+        $compilationContext->backend->fetchProperty(
+            $symbolVariable,
+            $variableVariable,
+            $property,
+            false,
+            $compilationContext
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool     $expecting
+     * @param Variable $expectingVariable
+     */
+    public function setExpectReturn($expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets whether the expression must be resolved in "noisy" mode.
+     *
+     * @param bool $noisy
+     */
+    public function setNoisy($noisy): void
+    {
+        $this->noisy = $noisy;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly($readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/Reference.php b/src/Expression/Reference.php
index ebad811eb3..858eab139a 100644
--- a/src/Expression/Reference.php
+++ b/src/Expression/Reference.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -31,18 +32,15 @@ class Reference
      * Expecting the value
      */
     protected bool $expecting = true;
-
-    /**
-     * Result of the evaluated expression is read only or not
-     */
-    protected bool $readOnly = false;
-
     /**
      * Expecting variable
      */
     protected ?Variable $expectingVariable = null;
-
-    private array $validTypes = [
+    /**
+     * Result of the evaluated expression is read only or not
+     */
+    protected bool $readOnly   = false;
+    private array  $validTypes = [
         'variable',
         'string',
         'object',
@@ -50,34 +48,11 @@ class Reference
         'callable',
     ];
 
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
-     */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
-
     /**
      * Compiles a reference to a value.
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -88,13 +63,26 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
                 if ('variable' !== $symbolVariable->getType()) {
-                    throw new CompilerException('Cannot use variable type: '.$symbolVariable->getType().' to store a reference', $expression);
+                    throw new CompilerException(
+                        'Cannot use variable type: '
+                        . $symbolVariable->getType()
+                        . ' to store a reference',
+                        $expression
+                    );
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
             }
         } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -102,20 +90,52 @@ public function compile(array $expression, CompilationContext $compilationContex
         $left = $leftExpr->compile($compilationContext);
 
         if (!in_array($left->getType(), $this->validTypes)) {
-            throw new CompilerException('Cannot obtain a reference from type: '.$left->getType(), $expression);
+            throw new CompilerException('Cannot obtain a reference from type: ' . $left->getType(), $expression);
         }
 
-        $leftVariable = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression);
+        $leftVariable = $compilationContext->symbolTable->getVariableForRead(
+            $left->getCode(),
+            $compilationContext,
+            $expression
+        );
         if (!in_array($leftVariable->getType(), $this->validTypes)) {
-            throw new CompilerException('Cannot obtain reference from variable type: '.$leftVariable->getType(), $expression);
+            throw new CompilerException(
+                'Cannot obtain reference from variable type: ' . $leftVariable->getType(),
+                $expression
+            );
         }
 
         $symbolVariable->setMustInitNull(true);
         $compilationContext->symbolTable->mustGrownStack(true);
 
         $symbolVariable->increaseVariantIfNull();
-        $compilationContext->codePrinter->output('ZEPHIR_MAKE_REFERENCE('.$symbolVariable->getName().', '.$leftVariable->getName().');');
+        $compilationContext->codePrinter->output(
+            'ZEPHIR_MAKE_REFERENCE(' . $symbolVariable->getName() . ', ' . $leftVariable->getName() . ');'
+        );
 
         return new CompiledExpression('reference', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/StaticConstantAccess.php b/src/Expression/StaticConstantAccess.php
index 16638d7d1f..735ca79de8 100644
--- a/src/Expression/StaticConstantAccess.php
+++ b/src/Expression/StaticConstantAccess.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\Class\Constant;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -20,39 +21,17 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 
+use function gettype;
+use function in_array;
+
 /**
  * Resolves class constants
  */
 class StaticConstantAccess
 {
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
+    protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     *
-     * @param bool $readOnly
-     */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
+    protected bool      $readOnly          = false;
 
     /**
      * Access a static constant class.
@@ -63,19 +42,19 @@ public function setReadOnly(bool $readOnly): void
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $compiler = &$compilationContext->compiler;
+        $compiler  = &$compilationContext->compiler;
         $className = $expression['left']['value'];
-        $constant = $expression['right']['value'];
+        $constant  = $expression['right']['value'];
 
         /**
          * Fetch the class definition according to the class where the constant
          * is supposed to be declared
          */
-        if (!\in_array($className, ['this', 'self', 'static', 'parent'])) {
+        if (!in_array($className, ['this', 'self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className) || $compiler->isInterface($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -83,15 +62,15 @@ public function compile(array $expression, CompilationContext $compilationContex
                 if ($compiler->isBundledClass($className) || $compiler->isBundledInterface($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $expression['left']);
+                    throw new CompilerException("Cannot locate class '" . $className . "'", $expression['left']);
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static', 'this'])) {
+            if (in_array($className, ['self', 'static', 'this'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } elseif ('parent' === $className) {
                 $classDefinition = $compilationContext->classDefinition;
-                $extendsClass = $classDefinition->getExtendsClass();
+                $extendsClass    = $classDefinition->getExtendsClass();
                 if (!$extendsClass) {
                     throw new CompilerException(
                         sprintf(
@@ -153,7 +132,7 @@ public function compile(array $expression, CompilationContext $compilationContex
              */
             if (!$symbolVariable->isVariable()) {
                 throw new CompilerException(
-                    'Cannot use variable: '.$symbolVariable->getType().' to assign class constants',
+                    'Cannot use variable: ' . $symbolVariable->getType() . ' to assign class constants',
                     $expression
                 );
             }
@@ -177,10 +156,10 @@ public function compile(array $expression, CompilationContext $compilationContex
         if ($constantDefinition instanceof Constant) {
             $constantDefinition->processValue($compilationContext);
             $value = $constantDefinition->getValueValue();
-            $type = $constantDefinition->getValueType();
+            $type  = $constantDefinition->getValueType();
         } else {
             $value = $constantDefinition;
-            $type = \gettype($value);
+            $type  = gettype($value);
             if ('integer' === $type) {
                 $type = 'int';
             }
@@ -196,7 +175,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 break;
             default:
                 $compilationContext->logger->warning(
-                    "Constant '".$constantDefinition->getName()."' does not exist at compile time",
+                    "Constant '" . $constantDefinition->getName() . "' does not exist at compile time",
                     ['nonexistent-constant', $expression]
                 );
 
@@ -205,4 +184,27 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         return new CompiledExpression($type, $value, $expression);
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Expression/StaticPropertyAccess.php b/src/Expression/StaticPropertyAccess.php
index 6f48f7b5a7..effcb917a5 100644
--- a/src/Expression/StaticPropertyAccess.php
+++ b/src/Expression/StaticPropertyAccess.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Expression;
 
+use ReflectionException;
 use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -20,52 +21,34 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 
+use function in_array;
+
 /**
  * Resolves class static properties
  */
 class StaticPropertyAccess
 {
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
+    protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Sets if the result of the evaluated expression is read only.
-     */
-    public function setReadOnly(bool $readOnly): void
-    {
-        $this->readOnly = $readOnly;
-    }
+    protected bool      $readOnly          = false;
 
     /**
      * Access a static property.
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
         $className = $expression['left']['value'];
-        $compiler = $compilationContext->compiler;
-        $property = $expression['right']['value'];
+        $compiler  = $compilationContext->compiler;
+        $property  = $expression['right']['value'];
 
         /**
          * Fetch the class definition according to the class where the constant
          * is supposed to be declared
          */
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -73,17 +56,24 @@ public function compile(array $expression, CompilationContext $compilationContex
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $expression['left']);
+                    throw new CompilerException("Cannot locate class '" . $className . "'", $expression['left']);
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' === $className) {
                     $classDefinition = $compilationContext->classDefinition;
                     if (!$classDefinition->getExtendsClass()) {
-                        throw new CompilerException('Cannot access static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $expression);
+                        throw new CompilerException(
+                            'Cannot access static property "'
+                            . $property
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $expression
+                        );
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -92,25 +82,55 @@ public function compile(array $expression, CompilationContext $compilationContex
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $expression);
+            throw new CompilerException(
+                "Class '"
+                . $classDefinition->getCompleteName()
+                . "' does not have a property called: '"
+                . $property
+                . "'",
+                $expression
+            );
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $expression);
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $expression
+            );
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $expression);
+                throw new CompilerException(
+                    "Cannot access private static property '"
+                    . $classDefinition->getCompleteName()
+                    . '::'
+                    . $property
+                    . "' out of its declaring context",
+                    $expression
+                );
             }
         }
 
-        if ($propertyDefinition->isProtected()) {
-            if ($classDefinition != $compilationContext->classDefinition && $classDefinition != $compilationContext->classDefinition->getExtendsClassDefinition()) {
-                throw new CompilerException("Cannot access protected static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $expression);
-            }
+        if (
+            $propertyDefinition->isProtected() &&
+            $classDefinition != $compilationContext->classDefinition &&
+            $classDefinition != $compilationContext->classDefinition->getExtendsClassDefinition()
+        ) {
+            throw new CompilerException(
+                "Cannot access protected static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "' out of its declaring context",
+                $expression
+            );
         }
 
         /**
@@ -120,20 +140,32 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
                 if ('return_value' === $symbolVariable->getName()) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext);
+                    $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                        'variable',
+                        $compilationContext
+                    );
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext);
+                $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext
+                );
             }
         } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext);
+            $symbolVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                'variable',
+                $compilationContext
+            );
         }
 
         /**
          * Variable that receives property accesses must be polymorphic
          */
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Cannot use variable: '.$symbolVariable->getType().' to assign class constants', $expression);
+            throw new CompilerException(
+                'Cannot use variable: ' . $symbolVariable->getType() . ' to assign class constants',
+                $expression
+            );
         }
 
         $symbolVariable->setDynamicTypes('undefined');
@@ -143,8 +175,32 @@ public function compile(array $expression, CompilationContext $compilationContex
             $symbolVariable->observeVariant($compilationContext);
         }
 
-        $compilationContext->backend->fetchStaticProperty($symbolVariable, $classDefinition, $property, $this->readOnly, $compilationContext);
+        $compilationContext->backend->fetchStaticProperty(
+            $symbolVariable,
+            $classDefinition,
+            $property,
+            $this->readOnly,
+            $compilationContext
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/FileSystem/FileSystemInterface.php b/src/FileSystem/FileSystemInterface.php
index 2b89cd29a5..c7be16d36a 100644
--- a/src/FileSystem/FileSystemInterface.php
+++ b/src/FileSystem/FileSystemInterface.php
@@ -16,34 +16,25 @@
 interface FileSystemInterface
 {
     /**
-     * Checks if the filesystem is initialized.
-     *
-     * @return bool
-     */
-    public function isInitialized(): bool;
-
-    /**
-     * Initialize the filesystem.
+     * Attempts to remove recursively the temporary directory with all subdirectories and files.
      */
-    public function initialize();
+    public function clean(): void;
 
     /**
-     * Checks whether a temporary entry does exist.
+     * Deletes a temporary entry.
      *
      * @param string $path
-     *
-     * @return bool
      */
-    public function exists(string $path): bool;
+    public function delete(string $path);
 
     /**
-     * Creates a directory inside the temporary container.
+     * Checks whether a temporary entry does exist.
      *
      * @param string $path
      *
      * @return bool
      */
-    public function makeDirectory(string $path): bool;
+    public function exists(string $path): bool;
 
     /**
      * Returns a temporary entry as an array.
@@ -55,62 +46,72 @@ public function makeDirectory(string $path): bool;
     public function file(string $path): array;
 
     /**
-     * Requires a file from the temporary directory.
+     * Generate a hash value using the contents of a given file.
      *
-     * @param string $path
+     * @param string $algorithm
+     * @param string $sourceFile
+     * @param bool   $useCache
      *
-     * @return mixed
+     * @return string
      */
-    public function requireFile(string $path);
+    public function getHashFile(string $algorithm, string $sourceFile, bool $useCache = false): string;
 
     /**
-     * Attempts to remove recursively the temporary directory with all subdirectories and files.
+     * Initialize the filesystem.
      */
-    public function clean(): void;
+    public function initialize();
 
     /**
-     * Writes data into a temporary entry.
+     * Checks if the filesystem is initialized.
+     *
+     * @return bool
+     */
+    public function isInitialized(): bool;
+
+    /**
+     * Creates a directory inside the temporary container.
      *
      * @param string $path
-     * @param string $data
+     *
+     * @return bool
      */
-    public function write(string $path, string $data);
+    public function makeDirectory(string $path): bool;
 
     /**
-     * Writes data from a temporary entry.
+     * Returns the modification time of a temporary entry.
      *
      * @param string $path
      *
-     * @return string
+     * @return int
      */
-    public function read(string $path): string;
+    public function modificationTime(string $path): int;
 
     /**
-     * Deletes a temporary entry.
+     * Normalizes path to be used as a temporary entry.
      *
      * @param string $path
+     *
+     * @return string
      */
-    public function delete(string $path);
+    public function normalizePath(string $path): string;
 
     /**
-     * Generate a hash value using the contents of a given file.
+     * Writes data from a temporary entry.
      *
-     * @param string $algorithm
-     * @param string $sourceFile
-     * @param bool   $useCache
+     * @param string $path
      *
      * @return string
      */
-    public function getHashFile(string $algorithm, string $sourceFile, bool $useCache = false): string;
+    public function read(string $path): string;
 
     /**
-     * Returns the modification time of a temporary entry.
+     * Requires a file from the temporary directory.
      *
      * @param string $path
      *
-     * @return int
+     * @return mixed
      */
-    public function modificationTime(string $path): int;
+    public function requireFile(string $path);
 
     /**
      * Executes a command and saves the result into a temporary entry.
@@ -122,11 +123,10 @@ public function modificationTime(string $path): int;
     public function system(string $command, string $descriptor, string $destination);
 
     /**
-     * Normalizes path to be used as a temporary entry.
+     * Writes data into a temporary entry.
      *
      * @param string $path
-     *
-     * @return string
+     * @param string $data
      */
-    public function normalizePath(string $path): string;
+    public function write(string $path, string $data);
 }
diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 5f78512dbd..0b5b3e85da 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -13,6 +13,11 @@
 
 namespace Zephir\FileSystem;
 
+use FilesystemIterator;
+use Generator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use SplFileInfo;
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Zephir;
 
@@ -23,24 +28,23 @@
  */
 class HardDisk implements FileSystemInterface
 {
-    /**
-     * Initialize checker
-     */
-    private bool $initialized = false;
-
     /**
      * Root or base path
      *
      * Path to where all cached files and folders are collected.
      */
     private string $basePath;
+    /**
+     * Initialize checker
+     */
+    private bool $initialized = false;
 
     /**
      * @throws InvalidArgumentException
      */
     public function __construct(string $basePath, private string $localPath = Zephir::VERSION)
     {
-        $this->basePath = $this->rightTrimPath($basePath);
+        $this->basePath  = $this->rightTrimPath($basePath);
         $this->localPath = $this->rightTrimPath($localPath);
 
         if (empty($this->localPath)) {
@@ -48,135 +52,51 @@ public function __construct(string $basePath, private string $localPath = Zephir
         }
     }
 
-    private function rightTrimPath(string $path): string
-    {
-        return rtrim($path, '\\/');
-    }
-
-    public function isInitialized(): bool
-    {
-        return $this->initialized;
-    }
-
     /**
-     * Start File System
+     * Recursive directory clean
      */
-    public function initialize(): void
-    {
-        $this->initialized = true;
-    }
-
-    public function exists(string $path): bool
-    {
-        if ('.' === $path || empty($path)) {
-            $path = $this->localPath;
-        } else {
-            $path = "{$this->localPath}/{$path}";
-        }
-
-        return is_file($this->basePath.DIRECTORY_SEPARATOR.$path);
-    }
-
-    public function makeDirectory(string $path): bool
+    public function clean(): void
     {
-        if ('.' === $path || empty($path)) {
-            $path = $this->localPath;
-        } else {
-            $path = "{$this->localPath}/{$path}";
+        if (!is_dir($this->basePath . DIRECTORY_SEPARATOR . $this->localPath)) {
+            return;
         }
 
-        $dir = $this->basePath.DIRECTORY_SEPARATOR.$path;
-
-        if (is_dir($dir)) {
-            chmod($dir, 0755);
+        $contents = $this->listDirectoryRecursively(
+            $this->basePath . DIRECTORY_SEPARATOR . $this->localPath,
+            RecursiveIteratorIterator::CHILD_FIRST,
+        );
 
-            return true;
+        /** @var SplFileInfo $file */
+        foreach ($contents as $file) {
+            $this->deleteFileInfoObject($file);
         }
 
-        mkdir($this->basePath.DIRECTORY_SEPARATOR.$path, 0755, true);
-
-        return is_dir($path);
-    }
-
-    public function file(string $path): array
-    {
-        $contents = file_get_contents($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
-
-        return preg_split("/\r\n|\n|\r/", $contents);
-    }
-
-    public function modificationTime(string $path): int
-    {
-        return filemtime($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
-    }
+        unset($contents);
 
-    public function read(string $path): string
-    {
-        return file_get_contents($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
+        rmdir($this->basePath . DIRECTORY_SEPARATOR . $this->localPath);
     }
 
     public function delete(string $path): void
     {
-        unlink($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
-    }
-
-    public function write(string $path, string $data): void
-    {
-        file_put_contents($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}", $data);
+        unlink($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . "/{$path}");
     }
 
-    public function system(string $command, string $descriptor, string $destination): void
+    public function exists(string $path): bool
     {
-        // fallback
-        $redirect = "{$this->localPath}/{$destination}";
-        if (!empty($this->basePath)) {
-            $redirect = "{$this->basePath}/{$this->localPath}/{$destination}";
+        if ('.' === $path || empty($path)) {
+            $path = $this->localPath;
+        } else {
+            $path = "{$this->localPath}/{$path}";
         }
 
-        switch ($descriptor) {
-            default:
-            case 'stdout':
-                system("{$command} > ".escapeshellarg($redirect));
-                break;
-            case 'stderr':
-                system("{$command} 2> ".escapeshellarg($redirect));
-                break;
-        }
+        return is_file($this->basePath . DIRECTORY_SEPARATOR . $path);
     }
 
-    public function requireFile(string $path): mixed
-    {
-        if (!empty($this->basePath)) {
-            return require "{$this->basePath}/{$this->localPath}/{$path}";
-        }
-
-        $code = file_get_contents($this->basePath.DIRECTORY_SEPARATOR.$this->localPath."/{$path}");
-
-        return eval(str_replace('<?php ', '', $code));
-    }
-
-    /**
-     * Recursive directory clean
-     */
-    public function clean(): void
+    public function file(string $path): array
     {
-        if (!is_dir($this->basePath.DIRECTORY_SEPARATOR.$this->localPath)) {
-            return;
-        }
-
-        $contents = $this->listDirectoryRecursively(
-            $this->basePath.DIRECTORY_SEPARATOR.$this->localPath,
-            \RecursiveIteratorIterator::CHILD_FIRST,
-        );
+        $contents = file_get_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . "/{$path}");
 
-        /** @var \SplFileInfo $file */
-        foreach ($contents as $file) {
-            $this->deleteFileInfoObject($file);
-        }
-
-        unset($contents);
-
-        rmdir($this->basePath.DIRECTORY_SEPARATOR.$this->localPath);
+        return preg_split("/\r\n|\n|\r/", $contents);
     }
 
     /**
@@ -220,6 +140,45 @@ public function getHashFile(string $algorithm, string $sourceFile, bool $useCach
         return file_get_contents($cacheFile);
     }
 
+    /**
+     * Start File System
+     */
+    public function initialize(): void
+    {
+        $this->initialized = true;
+    }
+
+    public function isInitialized(): bool
+    {
+        return $this->initialized;
+    }
+
+    public function makeDirectory(string $path): bool
+    {
+        if ('.' === $path || empty($path)) {
+            $path = $this->localPath;
+        } else {
+            $path = "{$this->localPath}/{$path}";
+        }
+
+        $dir = $this->basePath . DIRECTORY_SEPARATOR . $path;
+
+        if (is_dir($dir)) {
+            chmod($dir, 0755);
+
+            return true;
+        }
+
+        mkdir($this->basePath . DIRECTORY_SEPARATOR . $path, 0755, true);
+
+        return is_dir($path);
+    }
+
+    public function modificationTime(string $path): int
+    {
+        return filemtime($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . "/{$path}");
+    }
+
     public function normalizePath(string $path): string
     {
         return str_replace(['\\', ':', '/'], '_', $path);
@@ -228,7 +187,7 @@ public function normalizePath(string $path): string
     /**
      * Checks if the content of the file on the disk is the same as the content.
      */
-    public static function persistByHash(string $data, string $path): int | bool
+    public static function persistByHash(string $data, string $path): int|bool
     {
         if (!file_exists($path)) {
             return file_put_contents($path, $data);
@@ -241,25 +200,70 @@ public static function persistByHash(string $data, string $path): int | bool
         return false;
     }
 
-    protected function deleteFileInfoObject(\SplFileInfo $file): bool
+    public function read(string $path): string
+    {
+        return file_get_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . "/{$path}");
+    }
+
+    public function requireFile(string $path): mixed
+    {
+        if (!empty($this->basePath)) {
+            return require "{$this->basePath}/{$this->localPath}/{$path}";
+        }
+
+        $code = file_get_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . "/{$path}");
+
+        return eval(str_replace('<?php ', '', $code));
+    }
+
+    public function system(string $command, string $descriptor, string $destination): void
+    {
+        // fallback
+        $redirect = "{$this->localPath}/{$destination}";
+        if (!empty($this->basePath)) {
+            $redirect = "{$this->basePath}/{$this->localPath}/{$destination}";
+        }
+
+        switch ($descriptor) {
+            default:
+            case 'stdout':
+                system("{$command} > " . escapeshellarg($redirect));
+                break;
+            case 'stderr':
+                system("{$command} 2> " . escapeshellarg($redirect));
+                break;
+        }
+    }
+
+    public function write(string $path, string $data): void
+    {
+        file_put_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . "/{$path}", $data);
+    }
+
+    protected function deleteFileInfoObject(SplFileInfo $file): bool
     {
         switch ($file->getType()) {
             case 'dir':
-                return @rmdir((string) $file->getRealPath());
+                return @rmdir((string)$file->getRealPath());
             case 'link':
                 return @unlink($file->getPathname());
             default:
-                return @unlink((string) $file->getRealPath());
+                return @unlink((string)$file->getRealPath());
         }
     }
 
     private function listDirectoryRecursively(
         string $path,
-        int $mode = \RecursiveIteratorIterator::SELF_FIRST
-    ): \Generator {
-        yield from new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
+        int $mode = RecursiveIteratorIterator::SELF_FIRST
+    ): Generator {
+        yield from new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
             $mode
         );
     }
+
+    private function rightTrimPath(string $path): string
+    {
+        return rtrim($path, '\\/');
+    }
 }
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 6818376635..57acc265ae 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,44 +9,119 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
+use ReflectionException;
+use ReflectionFunction;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+use function function_exists;
+use function is_array;
+use function is_object;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * Call functions. By default, functions are called in the PHP userland if an optimizer
  * was not found or there is not a user-handler for it
  */
 class FunctionCall extends Call
 {
+    /**
+     * Function is called using a dynamic variable as method name.
+     */
+    public const CALL_DYNAMIC = 2;
+    /**
+     * Function is called using a dynamic string as method name.
+     */
+    public const CALL_DYNAMIC_STRING = 3;
     /**
      * Function is called using a normal method name.
      */
     public const CALL_NORMAL = 1;
+    protected static $functionReflection   = [];
+    protected static $optimizerDirectories = [];
+    protected static $optimizers           = [];
 
     /**
-     * Function is called using a dynamic variable as method name.
+     * Appends an optimizer directory to the directory list.
+     *
+     * @param string $directory
      */
-    public const CALL_DYNAMIC = 2;
+    public static function addOptimizerDir($directory): void
+    {
+        self::$optimizerDirectories[] = $directory;
+    }
 
     /**
-     * Function is called using a dynamic string as method name.
+     * Compiles a function.
+     *
+     * @param Expression         $expr
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression
+     *
+     * @throws CompilerException|Exception
      */
-    public const CALL_DYNAMIC_STRING = 3;
+    public function compile(Expression $expr, CompilationContext $compilationContext)
+    {
+        $this->expression = $expr;
+        $expression       = $expr->getExpression();
 
-    protected static $optimizers = [];
+        switch ($expression['call-type']) {
+            case self::CALL_NORMAL:
+                return $this->_callNormal($expression, $compilationContext);
+            case self::CALL_DYNAMIC:
+                return $this->_callDynamic($expression, $compilationContext);
+        }
 
-    protected static $functionReflection = [];
+        return new CompiledExpression('null', null, $expression);
+    }
 
-    protected static $optimizerDirectories = [];
+    /**
+     * Checks if a function exists or is a built-in Zephir function.
+     *
+     * @param string             $functionName
+     * @param CompilationContext $context
+     *
+     * @return bool
+     */
+    public function functionExists($functionName, CompilationContext $context)
+    {
+        if (function_exists($functionName)) {
+            return true;
+        }
+        if ($this->isBuiltInFunction($functionName)) {
+            return true;
+        }
+
+        $internalName = ['f__' . $functionName];
+        if (isset($context->classDefinition)) {
+            $lowerNamespace = strtolower($context->classDefinition->getNamespace());
+            $prefix         = 'f_' . str_replace('\\', '_', $lowerNamespace);
+
+            $internalName[] = $prefix . '_' . $functionName;
+        }
+
+        foreach ($internalName as $name) {
+            if (isset($context->compiler->functionDefinitions[$name])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 
     /**
      * Process the ReflectionFunction for the specified function name.
      *
      * @param string $funcName
      *
-     * @return \ReflectionFunction|null
+     * @return ReflectionFunction|null
      */
     public function getReflector($funcName)
     {
@@ -57,17 +130,17 @@ public function getReflector($funcName)
          */
         if (!isset(self::$functionReflection[$funcName])) {
             try {
-                $reflectionFunction = new \ReflectionFunction($funcName);
-            } catch (\ReflectionException $e) {
+                $reflectionFunction = new ReflectionFunction($funcName);
+            } catch (ReflectionException $e) {
                 $reflectionFunction = null;
             }
             self::$functionReflection[$funcName] = $reflectionFunction;
-            $this->reflection = $reflectionFunction;
+            $this->reflection                    = $reflectionFunction;
 
             return $reflectionFunction;
         }
         $reflectionFunction = self::$functionReflection[$funcName];
-        $this->reflection = $reflectionFunction;
+        $this->reflection   = $reflectionFunction;
 
         return $reflectionFunction;
     }
@@ -104,262 +177,149 @@ public function isBuiltInFunction(string $functionName)
     }
 
     /**
-     * Checks if a function exists or is a built-in Zephir function.
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
      *
-     * @param string             $functionName
-     * @param CompilationContext $context
+     * @return CompiledExpression
      *
-     * @return bool
+     * @throws CompilerException
      */
-    public function functionExists($functionName, CompilationContext $context)
+    protected function _callDynamic(array $expression, CompilationContext $compilationContext)
     {
-        if (\function_exists($functionName)) {
-            return true;
-        }
-        if ($this->isBuiltInFunction($functionName)) {
-            return true;
-        }
+        $variable = $compilationContext->symbolTable->getVariableForRead(
+            $expression['name'],
+            $compilationContext,
+            $expression
+        );
 
-        $internalName = ['f__'.$functionName];
-        if (isset($context->classDefinition)) {
-            $lowerNamespace = strtolower($context->classDefinition->getNamespace());
-            $prefix = 'f_'.str_replace('\\', '_', $lowerNamespace);
+        switch ($variable->getType()) {
+            case 'variable':
+            case 'string':
+                break;
 
-            $internalName[] = $prefix.'_'.$functionName;
+            default:
+                throw new CompilerException(
+                    'Variable type: ' . $variable->getType() . ' cannot be used as dynamic caller',
+                    $expression['left']
+                );
         }
 
-        foreach ($internalName as $name) {
-            if (isset($context->compiler->functionDefinitions[$name])) {
-                return true;
-            }
+        /**
+         * Resolve parameters
+         */
+        if (isset($expression['parameters'])) {
+            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
+        } else {
+            $params = [];
         }
 
-        return false;
-    }
-
-    /**
-     * Compiles a function.
-     *
-     * @param Expression         $expr
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     *
-     * @throws CompilerException|Exception
-     */
-    public function compile(Expression $expr, CompilationContext $compilationContext)
-    {
-        $this->expression = $expr;
-        $expression = $expr->getExpression();
-
-        switch ($expression['call-type']) {
-            case self::CALL_NORMAL:
-                return $this->_callNormal($expression, $compilationContext);
-            case self::CALL_DYNAMIC:
-                return $this->_callDynamic($expression, $compilationContext);
-        }
+        $codePrinter = $compilationContext->codePrinter;
 
-        return new CompiledExpression('null', null, $expression);
-    }
+        /**
+         * Process the expected symbol to be returned
+         */
+        $this->processExpectedObservedReturn($compilationContext);
 
-    /**
-     * Appends an optimizer directory to the directory list.
-     *
-     * @param string $directory
-     */
-    public static function addOptimizerDir($directory): void
-    {
-        self::$optimizerDirectories[] = $directory;
-    }
+        /**
+         * At this point the function will be called in the PHP userland.
+         * PHP functions only return zvals so we need to validate the target variable is also a zval.
+         */
+        $symbolVariable = $this->getSymbolVariable();
+        if ($symbolVariable) {
+            if (!$symbolVariable->isVariable()) {
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
+            }
 
-    /**
-     * This method gets the reflection of a function
-     * to check if any of their parameters are passed by reference
-     * Built-in functions rarely change the parameters if they aren't passed by reference.
-     *
-     * @param string $funcName
-     * @param array  $expression
-     *
-     * @return bool
-     *
-     * @throws CompilerException
-     */
-    protected function isReadOnly($funcName, array $expression)
-    {
-        if ($this->isBuiltInFunction($funcName)) {
-            return false;
+            /**
+             * We don't know the exact dynamic type returned by the method call
+             */
+            $symbolVariable->setDynamicTypes('undefined');
         }
 
-        /*
-         * These functions are supposed to be read-only but they change parameters ref-count
+        /**
+         * Include fcall header
          */
-        switch ($funcName) {
-            case 'min':
-            case 'max':
-            case 'array_fill':
-            case 'array_pad':
-            case 'call_user_func':
-            case 'call_user_func_array':
-                return false;
-        }
+        $compilationContext->headersManager->add('kernel/fcall');
 
-        $reflector = $this->getReflector($funcName);
-        if (!$reflector instanceof \ReflectionFunction) {
-            return false;
-        }
+        /**
+         * Add the last call status to the current symbol table
+         */
+        $this->addCallStatusFlag($compilationContext);
 
-        $messageFormat = "The number of parameters passed is lesser than the number of required parameters by '%s'";
+        /**
+         * Call functions must grown the stack
+         */
+        $compilationContext->symbolTable->mustGrownStack(true);
 
-        if (isset($expression['parameters'])) {
-            /**
-             * Check if the number of parameters.
-             */
-            $numberParameters = \count($expression['parameters']);
-            if ('unpack' == $funcName
-                && (0 == version_compare(PHP_VERSION, '7.1.0')
-                    || 0 == version_compare(PHP_VERSION, '7.1.1'))
-            ) {
-                if ($numberParameters < 2) {
-                    throw new CompilerException(sprintf($messageFormat, $funcName), $expression);
+        if (!isset($expression['parameters'])) {
+            if ($this->isExpectingReturn()) {
+                if ('return_value' != $symbolVariable->getName()) {
+                    if ($this->mustInitSymbolVariable()) {
+                        $symbolVariable->setMustInitNull(true);
+                        $symbolVariable->trackVariant($compilationContext);
+                    }
                 }
+                $compilationContext->backend->callDynamicFunction($symbolVariable, $variable, $compilationContext);
             } else {
-                if ($numberParameters < $reflector->getNumberOfRequiredParameters()) {
-                    throw new CompilerException(sprintf($messageFormat, $funcName), $expression);
-                }
+                $compilationContext->backend->callDynamicFunction(null, $variable, $compilationContext);
             }
         } else {
-            if ($reflector->getNumberOfRequiredParameters() > 0) {
-                throw new CompilerException(sprintf($messageFormat, $funcName), $expression);
-            }
-        }
-
-        if ($reflector->getNumberOfParameters() > 0) {
-            foreach ($reflector->getParameters() as $parameter) {
-                if ($parameter->isPassedByReference()) {
-                    return false;
+            if (count($params)) {
+                if ($this->isExpectingReturn()) {
+                    if ('return_value' != $symbolVariable->getName()) {
+                        if ($this->mustInitSymbolVariable()) {
+                            $symbolVariable->setMustInitNull(true);
+                            $symbolVariable->trackVariant($compilationContext);
+                        }
+                    }
+                    $compilationContext->backend->callDynamicFunction(
+                        $symbolVariable,
+                        $variable,
+                        $compilationContext,
+                        $params
+                    );
+                } else {
+                    $compilationContext->backend->callDynamicFunction(null, $variable, $compilationContext, $params);
                 }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Once the function processes the parameters we should mark
-     * specific parameters to be passed by reference.
-     *
-     * @param string             $funcName
-     * @param array              $parameters
-     * @param CompilationContext $compilationContext
-     * @param array              $references
-     * @param array              $expression
-     */
-    protected function markReferences(
-        $funcName,
-        $parameters,
-        CompilationContext $compilationContext,
-        &$references,
-        $expression
-    ): void {
-        if ($this->isBuiltInFunction($funcName)) {
-            return;
-        }
-
-        $reflector = $this->getReflector($funcName);
-        if ($reflector) {
-            $numberParameters = \count($parameters);
-            if ($numberParameters > 0) {
-                $n = 1;
-                $funcParameters = $reflector->getParameters();
-                foreach ($funcParameters as $parameter) {
-                    if ($numberParameters >= $n) {
-                        if ($parameter->isPassedByReference()) {
-                            /* TODO hack, fix this better */
-                            if ('&' === $parameters[$n - 1][0]) {
-                                $parameters[$n - 1] = substr($parameters[$n - 1], 1);
-                            }
-
-                            if (!preg_match('/^[a-zA-Z0-9$_]+$/', $parameters[$n - 1])) {
-                                $compilationContext->logger->warning(
-                                    'Cannot mark complex expression as reference',
-                                    ['invalid-reference', $expression]
-                                );
-                                continue;
-                            }
-
-                            $variable = $compilationContext->symbolTable->getVariable($parameters[$n - 1]);
-                            if ($variable) {
-                                $variable->setDynamicTypes('undefined');
-                                $referenceSymbol = $compilationContext->backend->getVariableCode($variable);
-                                $compilationContext->codePrinter->output('ZEPHIR_MAKE_REF('.$referenceSymbol.');');
-                                $references[] = $parameters[$n - 1];
-                            }
+            } else {
+                if ($this->isExpectingReturn()) {
+                    if ('return_value' != $symbolVariable->getName()) {
+                        if ($this->mustInitSymbolVariable()) {
+                            $symbolVariable->setMustInitNull(true);
+                            $symbolVariable->trackVariant($compilationContext);
                         }
                     }
-                    ++$n;
+                    $compilationContext->backend->callDynamicFunction($symbolVariable, $variable, $compilationContext);
+                } else {
+                    $compilationContext->backend->callDynamicFunction(null, $variable, $compilationContext);
                 }
             }
         }
-    }
-
-    /**
-     * Tries to find specific an specialized optimizer for function calls.
-     *
-     * @param string             $funcName
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $compilationContext
-     *
-     * @return bool|mixed
-     *
-     * @throws Exception
-     */
-    protected function optimize($funcName, array $expression, Call $call, CompilationContext $compilationContext)
-    {
-        $optimizer = false;
 
-        /*
-         * Check if the optimizer is already cached
+        /**
+         * Temporary variables must be copied if they have more than one reference
          */
-        if (!isset(self::$optimizers[$funcName])) {
-            $camelizeFunctionName = Name::camelize($funcName);
-
-            /*
-             * Check every optimizer directory for an optimizer
-             */
-            foreach (self::$optimizerDirectories as $directory) {
-                $path = $directory.\DIRECTORY_SEPARATOR.$camelizeFunctionName.'Optimizer.php';
-                $className = 'Zephir\Optimizers\FunctionCall\\'.$camelizeFunctionName.'Optimizer';
-
-                if (file_exists($path)) {
-                    if (!class_exists($className, false)) {
-                        require_once $path;
-                    }
-
-                    if (!class_exists($className, false)) {
-                        throw new Exception("Class {$className} cannot be loaded");
-                    }
-
-                    $optimizer = new $className();
-
-                    if (!($optimizer instanceof OptimizerAbstract)) {
-                        throw new Exception("Class {$className} must be instance of OptimizerAbstract");
-                    }
+        foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
+            $codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
+        }
 
-                    break;
-                }
-            }
+        $this->addCallStatusOrJump($compilationContext);
 
-            self::$optimizers[$funcName] = $optimizer;
-        } else {
-            $optimizer = self::$optimizers[$funcName];
+        /**
+         * We can mark temporary variables generated as idle
+         */
+        foreach ($this->getTemporalVariables() as $tempVariable) {
+            $tempVariable->setIdle(true);
         }
 
-        if ($optimizer) {
-            return $optimizer->optimize($expression, $call, $compilationContext);
+        if ($this->isExpectingReturn()) {
+            return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        return false;
+        return new CompiledExpression('null', null, $expression);
     }
 
     /**
@@ -368,7 +328,7 @@ protected function optimize($funcName, array $expression, Call $call, Compilatio
      *
      * @return CompiledExpression
      *
-     * @throws Exception|\Zephir\Exception\CompilerException
+     * @throws Exception|CompilerException
      */
     protected function _callNormal(array $expression, CompilationContext $compilationContext)
     {
@@ -382,7 +342,7 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
          * Try to optimize function calls using existing optimizers.
          */
         $compiledExpr = $this->optimize($funcName, $expression, $this, $compilationContext);
-        if (\is_object($compiledExpr)) {
+        if (is_object($compiledExpr)) {
             return $compiledExpr;
         }
 
@@ -462,18 +422,18 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
          * Check if the function can have an inline cache.
          */
         $functionCache = $compilationContext->cacheManager->getFunctionCache();
-        $cachePointer = $functionCache->get($funcName, $compilationContext, $exists);
+        $cachePointer  = $functionCache->get($funcName, $compilationContext, $exists);
 
         /**
          * Add the last call status to the current symbol table
          */
         $this->addCallStatusFlag($compilationContext);
 
-        if (!\count($params)) {
+        if (!count($params)) {
             if ($this->isExpectingReturn()) {
                 if ('return_value' == $symbolVariable->getName()) {
                     $codePrinter->output(
-                        'ZEPHIR_RETURN_CALL_FUNCTION("'.$funcName.'", '.$cachePointer.');'
+                        'ZEPHIR_RETURN_CALL_FUNCTION("' . $funcName . '", ' . $cachePointer . ');'
                     );
                 } else {
                     if ($this->mustInitSymbolVariable()) {
@@ -481,20 +441,20 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
                         $symbolVariable->trackVariant($compilationContext);
                     }
                     $codePrinter->output(
-                        'ZEPHIR_CALL_FUNCTION('.$symbol.', "'.$funcName.'", '.$cachePointer.');'
+                        'ZEPHIR_CALL_FUNCTION(' . $symbol . ', "' . $funcName . '", ' . $cachePointer . ');'
                     );
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_FUNCTION(NULL, "'.$funcName.'", '.$cachePointer.');');
+                $codePrinter->output('ZEPHIR_CALL_FUNCTION(NULL, "' . $funcName . '", ' . $cachePointer . ');');
             }
         } else {
             if ($this->isExpectingReturn()) {
                 if ('return_value' == $symbolVariable->getName()) {
                     $codePrinter->output(
                         strtr('ZEPHIR_RETURN_CALL_FUNCTION(":func", :pointer, :params);', [
-                            ':func' => $funcName,
+                            ':func'    => $funcName,
                             ':pointer' => $cachePointer,
-                            ':params' => implode(', ', $params),
+                            ':params'  => implode(', ', $params),
                         ])
                     );
                 } else {
@@ -505,19 +465,19 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
 
                     $codePrinter->output(
                         strtr('ZEPHIR_CALL_FUNCTION(:symbol, ":func", :pointer, :params);', [
-                            ':symbol' => $symbol,
-                            ':func' => $funcName,
+                            ':symbol'  => $symbol,
+                            ':func'    => $funcName,
                             ':pointer' => $cachePointer,
-                            ':params' => implode(', ', $params),
+                            ':params'  => implode(', ', $params),
                         ])
                     );
                 }
             } else {
                 $codePrinter->output(
                     strtr('ZEPHIR_CALL_FUNCTION(NULL, ":func", :pointer, :params);', [
-                        ':func' => $funcName,
+                        ':func'    => $funcName,
                         ':pointer' => $cachePointer,
-                        ':params' => implode(', ', $params),
+                        ':params'  => implode(', ', $params),
                     ])
                 );
             }
@@ -527,14 +487,14 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
 
-        if (\is_array($references)) {
+        if (is_array($references)) {
             foreach ($references as $reference) {
                 $variable = $compilationContext->symbolTable->getVariable($reference, $compilationContext);
                 $compilationContext->codePrinter->output(
-                    'ZEPHIR_UNREF('.$compilationContext->backend->getVariableCode($variable).');'
+                    'ZEPHIR_UNREF(' . $compilationContext->backend->getVariableCode($variable) . ');'
                 );
             }
         }
@@ -556,148 +516,195 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
     }
 
     /**
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
+     * This method gets the reflection of a function
+     * to check if any of their parameters are passed by reference
+     * Built-in functions rarely change the parameters if they aren't passed by reference.
      *
-     * @return CompiledExpression
+     * @param string $funcName
+     * @param array  $expression
+     *
+     * @return bool
      *
      * @throws CompilerException
      */
-    protected function _callDynamic(array $expression, CompilationContext $compilationContext)
+    protected function isReadOnly($funcName, array $expression)
     {
-        $variable = $compilationContext->symbolTable->getVariableForRead(
-            $expression['name'],
-            $compilationContext,
-            $expression
-        );
-
-        switch ($variable->getType()) {
-            case 'variable':
-            case 'string':
-                break;
-
-            default:
-                throw new CompilerException(
-                    'Variable type: '.$variable->getType().' cannot be used as dynamic caller',
-                    $expression['left']
-                );
+        if ($this->isBuiltInFunction($funcName)) {
+            return false;
         }
 
-        /**
-         * Resolve parameters
+        /*
+         * These functions are supposed to be read-only but they change parameters ref-count
          */
-        if (isset($expression['parameters'])) {
-            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
-        } else {
-            $params = [];
+        switch ($funcName) {
+            case 'min':
+            case 'max':
+            case 'array_fill':
+            case 'array_pad':
+            case 'call_user_func':
+            case 'call_user_func_array':
+                return false;
         }
 
-        $codePrinter = $compilationContext->codePrinter;
-
-        /**
-         * Process the expected symbol to be returned
-         */
-        $this->processExpectedObservedReturn($compilationContext);
+        $reflector = $this->getReflector($funcName);
+        if (!$reflector instanceof ReflectionFunction) {
+            return false;
+        }
 
-        /**
-         * At this point the function will be called in the PHP userland.
-         * PHP functions only return zvals so we need to validate the target variable is also a zval.
-         */
-        $symbolVariable = $this->getSymbolVariable();
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
+        $messageFormat = "The number of parameters passed is lesser than the number of required parameters by '%s'";
 
+        if (isset($expression['parameters'])) {
             /**
-             * We don't know the exact dynamic type returned by the method call
+             * Check if the number of parameters.
              */
-            $symbolVariable->setDynamicTypes('undefined');
-        }
-
-        /**
-         * Include fcall header
-         */
-        $compilationContext->headersManager->add('kernel/fcall');
-
-        /**
-         * Add the last call status to the current symbol table
-         */
-        $this->addCallStatusFlag($compilationContext);
-
-        /**
-         * Call functions must grown the stack
-         */
-        $compilationContext->symbolTable->mustGrownStack(true);
-
-        if (!isset($expression['parameters'])) {
-            if ($this->isExpectingReturn()) {
-                if ('return_value' != $symbolVariable->getName()) {
-                    if ($this->mustInitSymbolVariable()) {
-                        $symbolVariable->setMustInitNull(true);
-                        $symbolVariable->trackVariant($compilationContext);
-                    }
+            $numberParameters = count($expression['parameters']);
+            if (
+                'unpack' == $funcName &&
+                (
+                    0 == version_compare(PHP_VERSION, '7.1.0') ||
+                    0 == version_compare(PHP_VERSION, '7.1.1')
+                )
+            ) {
+                if ($numberParameters < 2) {
+                    throw new CompilerException(sprintf($messageFormat, $funcName), $expression);
                 }
-                $compilationContext->backend->callDynamicFunction($symbolVariable, $variable, $compilationContext);
             } else {
-                $compilationContext->backend->callDynamicFunction(null, $variable, $compilationContext);
+                if ($numberParameters < $reflector->getNumberOfRequiredParameters()) {
+                    throw new CompilerException(sprintf($messageFormat, $funcName), $expression);
+                }
             }
         } else {
-            if (\count($params)) {
-                if ($this->isExpectingReturn()) {
-                    if ('return_value' != $symbolVariable->getName()) {
-                        if ($this->mustInitSymbolVariable()) {
-                            $symbolVariable->setMustInitNull(true);
-                            $symbolVariable->trackVariant($compilationContext);
-                        }
-                    }
-                    $compilationContext->backend->callDynamicFunction(
-                        $symbolVariable,
-                        $variable,
-                        $compilationContext,
-                        $params
-                    );
-                } else {
-                    $compilationContext->backend->callDynamicFunction(null, $variable, $compilationContext, $params);
+            if ($reflector->getNumberOfRequiredParameters() > 0) {
+                throw new CompilerException(sprintf($messageFormat, $funcName), $expression);
+            }
+        }
+
+        if ($reflector->getNumberOfParameters() > 0) {
+            foreach ($reflector->getParameters() as $parameter) {
+                if ($parameter->isPassedByReference()) {
+                    return false;
                 }
-            } else {
-                if ($this->isExpectingReturn()) {
-                    if ('return_value' != $symbolVariable->getName()) {
-                        if ($this->mustInitSymbolVariable()) {
-                            $symbolVariable->setMustInitNull(true);
-                            $symbolVariable->trackVariant($compilationContext);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Once the function processes the parameters we should mark
+     * specific parameters to be passed by reference.
+     *
+     * @param string             $funcName
+     * @param array              $parameters
+     * @param CompilationContext $compilationContext
+     * @param array              $references
+     * @param array              $expression
+     */
+    protected function markReferences(
+        $funcName,
+        $parameters,
+        CompilationContext $compilationContext,
+        &$references,
+        $expression
+    ): void {
+        if ($this->isBuiltInFunction($funcName)) {
+            return;
+        }
+
+        $reflector = $this->getReflector($funcName);
+        if ($reflector) {
+            $numberParameters = count($parameters);
+            if ($numberParameters > 0) {
+                $n              = 1;
+                $funcParameters = $reflector->getParameters();
+                foreach ($funcParameters as $parameter) {
+                    if ($numberParameters >= $n) {
+                        if ($parameter->isPassedByReference()) {
+                            /* TODO hack, fix this better */
+                            if ('&' === $parameters[$n - 1][0]) {
+                                $parameters[$n - 1] = substr($parameters[$n - 1], 1);
+                            }
+
+                            if (!preg_match('/^[a-zA-Z0-9$_]+$/', $parameters[$n - 1])) {
+                                $compilationContext->logger->warning(
+                                    'Cannot mark complex expression as reference',
+                                    ['invalid-reference', $expression]
+                                );
+                                continue;
+                            }
+
+                            $variable = $compilationContext->symbolTable->getVariable($parameters[$n - 1]);
+                            if ($variable) {
+                                $variable->setDynamicTypes('undefined');
+                                $referenceSymbol = $compilationContext->backend->getVariableCode($variable);
+                                $compilationContext->codePrinter->output('ZEPHIR_MAKE_REF(' . $referenceSymbol . ');');
+                                $references[] = $parameters[$n - 1];
+                            }
                         }
                     }
-                    $compilationContext->backend->callDynamicFunction($symbolVariable, $variable, $compilationContext);
-                } else {
-                    $compilationContext->backend->callDynamicFunction(null, $variable, $compilationContext);
+                    ++$n;
                 }
             }
         }
+    }
 
-        /**
-         * Temporary variables must be copied if they have more than one reference
+    /**
+     * Tries to find specific an specialized optimizer for function calls.
+     *
+     * @param string             $funcName
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $compilationContext
+     *
+     * @return bool|mixed
+     *
+     * @throws Exception
+     */
+    protected function optimize($funcName, array $expression, Call $call, CompilationContext $compilationContext)
+    {
+        $optimizer = false;
+
+        /*
+         * Check if the optimizer is already cached
          */
-        foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
-        }
+        if (!isset(self::$optimizers[$funcName])) {
+            $camelizeFunctionName = Name::camelize($funcName);
 
-        $this->addCallStatusOrJump($compilationContext);
+            /*
+             * Check every optimizer directory for an optimizer
+             */
+            foreach (self::$optimizerDirectories as $directory) {
+                $path      = $directory . DIRECTORY_SEPARATOR . $camelizeFunctionName . 'Optimizer.php';
+                $className = 'Zephir\Optimizers\FunctionCall\\' . $camelizeFunctionName . 'Optimizer';
 
-        /**
-         * We can mark temporary variables generated as idle
-         */
-        foreach ($this->getTemporalVariables() as $tempVariable) {
-            $tempVariable->setIdle(true);
+                if (file_exists($path)) {
+                    if (!class_exists($className, false)) {
+                        require_once $path;
+                    }
+
+                    if (!class_exists($className, false)) {
+                        throw new Exception("Class {$className} cannot be loaded");
+                    }
+
+                    $optimizer = new $className();
+
+                    if (!($optimizer instanceof OptimizerAbstract)) {
+                        throw new Exception("Class {$className} must be instance of OptimizerAbstract");
+                    }
+
+                    break;
+                }
+            }
+
+            self::$optimizers[$funcName] = $optimizer;
+        } else {
+            $optimizer = self::$optimizers[$funcName];
         }
 
-        if ($this->isExpectingReturn()) {
-            return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        if ($optimizer) {
+            return $optimizer->optimize($expression, $call, $compilationContext);
         }
 
-        return new CompiledExpression('null', null, $expression);
+        return false;
     }
 }
diff --git a/src/FunctionDefinition.php b/src/FunctionDefinition.php
index 0775857f51..bc3a4efd59 100644
--- a/src/FunctionDefinition.php
+++ b/src/FunctionDefinition.php
@@ -42,36 +42,36 @@ public function __construct(
      */
     public function getInternalName(): string
     {
-        return ($this->isGlobal() ? 'g_' : 'f_').str_replace('\\', '_', $this->namespace).'_'.$this->getName();
+        return ($this->isGlobal() ? 'g_' : 'f_') . str_replace('\\', '_', $this->namespace) . '_' . $this->getName();
     }
 
-    public function isGlobal(): bool
+    public function getNamespace(): string
     {
-        return $this->isGlobal;
+        return $this->namespace;
     }
 
-    public function setGlobal(bool $global): void
+    public function getVisibility(): array
     {
-        $this->isGlobal = $global;
+        return [];
     }
 
-    public function getNamespace(): string
+    public function hasModifier(string $modifier): bool
     {
-        return $this->namespace;
+        return false;
     }
 
-    public function setNamespace(string $namespace): void
+    public function isGlobal(): bool
     {
-        $this->namespace = $namespace;
+        return $this->isGlobal;
     }
 
-    public function hasModifier(string $modifier): bool
+    public function setGlobal(bool $global): void
     {
-        return false;
+        $this->isGlobal = $global;
     }
 
-    public function getVisibility(): array
+    public function setNamespace(string $namespace): void
     {
-        return [];
+        $this->namespace = $namespace;
     }
 }
diff --git a/src/HeadersManager.php b/src/HeadersManager.php
index 37ae87fb10..f53400b5fd 100644
--- a/src/HeadersManager.php
+++ b/src/HeadersManager.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,14 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
+use InvalidArgumentException;
+
+use function is_string;
+
 /**
  * Manages the c-headers that must be added to a file
  */
@@ -55,12 +59,12 @@ class HeadersManager
      * @param string $path
      * @param int    $position
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function add($path, $position = 0): void
     {
-        if (!\is_string($path)) {
-            throw new \InvalidArgumentException('$path must be only string type');
+        if (!is_string($path)) {
+            throw new InvalidArgumentException('$path must be only string type');
         }
 
         if (!$position) {
diff --git a/src/LiteralCompiledExpression.php b/src/LiteralCompiledExpression.php
index f4b9b9dad1..613a9ce6a8 100644
--- a/src/LiteralCompiledExpression.php
+++ b/src/LiteralCompiledExpression.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 /**
diff --git a/src/Logger/Formatter/CompilerFormatter.php b/src/Logger/Formatter/CompilerFormatter.php
index cf6c7b9c19..05bf3a570a 100644
--- a/src/Logger/Formatter/CompilerFormatter.php
+++ b/src/Logger/Formatter/CompilerFormatter.php
@@ -16,6 +16,10 @@
 use Monolog\Formatter\LineFormatter;
 use Zephir\Config;
 
+use function array_key_exists;
+use function count;
+use function is_array;
+
 /**
  * Formatter for warnings/notices/errors generated in compilation.
  */
@@ -49,9 +53,10 @@ public function format(array $record): string
         $output = str_replace('%context%', '', $output);
 
         // ignore empty context or invalid format
-        if (!empty($vars['context'])
-            && \is_array($vars['context'])
-            && 2 == \count($vars['context'])
+        if (
+            !empty($vars['context']) &&
+            is_array($vars['context']) &&
+            2 == count($vars['context'])
         ) {
             $type = $vars['context'][0];
             $node = $vars['context'][1];
@@ -68,14 +73,14 @@ public function format(array $record): string
             } else {
                 $vars['file'] = $node['file'];
                 $vars['line'] = $node['line'];
-                $output .= PHP_EOL;
+                $output       .= PHP_EOL;
 
                 $lines = $this->getFileContents($node['file']);
                 if (isset($lines[$node['line'] - 1])) {
-                    $line = $lines[$node['line'] - 1];
-                    $output .= "\t".str_replace("\t", ' ', $line);
+                    $line   = $lines[$node['line'] - 1];
+                    $output .= "\t" . str_replace("\t", ' ', $line);
                     if (($node['char'] - 1) > 0) {
-                        $output .= PHP_EOL."\t".str_repeat('-', $node['char'] - 1).'^'.PHP_EOL;
+                        $output .= PHP_EOL . "\t" . str_repeat('-', $node['char'] - 1) . '^' . PHP_EOL;
                     }
                 }
             }
@@ -90,37 +95,6 @@ public function format(array $record): string
         return $this->cleanExtraPlaceholders($output);
     }
 
-    private function replacePlaceholders(array $vars, $output)
-    {
-        // WARNING -> Warning
-        if (\array_key_exists('level_name', $vars)) {
-            $vars['level_name'] = ucfirst(strtolower($vars['level_name']));
-        }
-
-        foreach ($vars as $var => $val) {
-            $placeholder = '%'.$var.'%';
-            $realValue = $this->stringify($val);
-
-            if (!str_contains($output, $placeholder)) {
-                continue;
-            }
-
-            // Strip level name from entries like "Info: Installing..."
-            if ('%level_name%' === $placeholder) {
-                switch ($realValue) {
-                    case 'Debug':
-                    case 'Info':
-                        $output = str_replace('%level_name%: ', '', $output);
-                        continue 2;
-                }
-            }
-
-            $output = str_replace('%'.$var.'%', $realValue, $output);
-        }
-
-        return $output;
-    }
-
     /**
      * Remove leftover %extra.xxx% and %context.xxx% (if any).
      */
@@ -147,4 +121,35 @@ private function getFileContents(string $file): array
 
         return $this->filesContent[$file];
     }
+
+    private function replacePlaceholders(array $vars, $output)
+    {
+        // WARNING -> Warning
+        if (array_key_exists('level_name', $vars)) {
+            $vars['level_name'] = ucfirst(strtolower($vars['level_name']));
+        }
+
+        foreach ($vars as $var => $val) {
+            $placeholder = '%' . $var . '%';
+            $realValue   = $this->stringify($val);
+
+            if (!str_contains($output, $placeholder)) {
+                continue;
+            }
+
+            // Strip level name from entries like "Info: Installing..."
+            if ('%level_name%' === $placeholder) {
+                switch ($realValue) {
+                    case 'Debug':
+                    case 'Info':
+                        $output = str_replace('%level_name%: ', '', $output);
+                        continue 2;
+                }
+            }
+
+            $output = str_replace('%' . $var . '%', $realValue, $output);
+        }
+
+        return $output;
+    }
 }
diff --git a/src/MethodCall.php b/src/MethodCall.php
index 53e62298b4..97a04ffed5 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,33 +9,40 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
+use ReflectionException;
+use ReflectionMethod;
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
+use Zephir\Types\AbstractType;
 use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
+use function count;
+use function is_array;
+use function is_object;
+
 /**
  * Call methods in a non-static context
  */
 class MethodCall extends Call
 {
-    /**
-     * Function is called using a normal method name.
-     */
-    public const CALL_NORMAL = 1;
-
     /**
      * Function is called using a dynamic variable as method name.
      */
     public const CALL_DYNAMIC = 2;
-
     /**
      * Function is called using a dynamic string as method name.
      */
     public const CALL_DYNAMIC_STRING = 3;
+    /**
+     * Function is called using a normal method name.
+     */
+    public const CALL_NORMAL = 1;
 
     /**
      * Compiles a method call.
@@ -48,7 +53,7 @@ class MethodCall extends Call
      * @return mixed|CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(Expression $expr, CompilationContext $compilationContext): mixed
     {
@@ -72,16 +77,16 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         break;
                     default:
                         /* Check if there is a built-in type optimizer available */
-                        $builtInTypeClass = 'Zephir\Types\\'.ucfirst($variableVariable->getType()).'Type';
+                        $builtInTypeClass = 'Zephir\Types\\' . ucfirst($variableVariable->getType()) . 'Type';
                         if (class_exists($builtInTypeClass)) {
                             /**
-                             * @var \Zephir\Types\AbstractType
+                             * @var AbstractType
                              */
                             $builtInType = new $builtInTypeClass();
-                            $caller = $exprCompiledVariable;
+                            $caller      = $exprCompiledVariable;
                         } else {
                             throw new CompilerException(
-                                'Methods cannot be called on variable type: '.$variableVariable->getType(),
+                                'Methods cannot be called on variable type: ' . $variableVariable->getType(),
                                 $expression
                             );
                         }
@@ -89,13 +94,13 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 break;
             default:
                 /* Check if there is a built-in type optimizer available */
-                $builtInTypeClass = 'Zephir\Types\\'.ucfirst($exprCompiledVariable->getType()).'Type';
+                $builtInTypeClass = 'Zephir\Types\\' . ucfirst($exprCompiledVariable->getType()) . 'Type';
                 if (class_exists($builtInTypeClass)) {
                     $builtInType = new $builtInTypeClass();
-                    $caller = $exprCompiledVariable;
+                    $caller      = $exprCompiledVariable;
                 } else {
                     throw new CompilerException(
-                        'Cannot use expression: '.$exprCompiledVariable->getType().' as method caller',
+                        'Cannot use expression: ' . $exprCompiledVariable->getType() . ' as method caller',
                         $expression['variable']
                     );
                 }
@@ -117,16 +122,16 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 $expression
             );
 
-            if (\is_object($builtInType)) {
+            if (is_object($builtInType)) {
                 throw new CompilerException(
-                    'Dynamic method invocation for type: '.$variableMethod->getType().' is not supported',
+                    'Dynamic method invocation for type: ' . $variableMethod->getType() . ' is not supported',
                     $expression
                 );
             }
 
             if ($variableMethod->isNotVariableAndString()) {
                 throw new CompilerException(
-                    'Cannot use variable type: '.$variableMethod->getType().' as dynamic method name',
+                    'Cannot use variable type: ' . $variableMethod->getType() . ' as dynamic method name',
                     $expression
                 );
             }
@@ -137,11 +142,11 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         /**
          * Create temporary variable if needed.
          */
-        $mustInit = false;
+        $mustInit    = false;
         $isExpecting = $expr->isExpectingReturn();
         if ($isExpecting) {
             $symbolVariable = $expr->getExpectingVariable();
-            if (\is_object($symbolVariable)) {
+            if (is_object($symbolVariable)) {
                 $readDetector = new ReadDetector();
                 if ($caller == $symbolVariable || $readDetector->detect($symbolVariable->getName(), $expression)) {
                     $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
@@ -201,7 +206,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                             $interfaces = null;
                         }
 
-                        if (\is_array($interfaces)) {
+                        if (is_array($interfaces)) {
                             $compiler = $compilationContext->compiler;
                             foreach ($interfaces as $interface) {
                                 $classInterfaceDefinition = $compiler->getClassDefinition($interface);
@@ -210,14 +215,14 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                     $classInterfaceDefinition = $compiler->getInternalClassDefinition($interface);
                                     if (!$classInterfaceDefinition) {
                                         throw new CompilerException(
-                                            "Couldn't locate internal or external interface: ".$interface,
+                                            "Couldn't locate internal or external interface: " . $interface,
                                             $expression
                                         );
                                     }
                                 }
 
                                 if ($classInterfaceDefinition->hasMethod($methodName)) {
-                                    $found = true;
+                                    $found       = true;
                                     $classMethod = $classInterfaceDefinition->getMethod($methodName);
                                     break;
                                 }
@@ -261,7 +266,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     if ($classMethod->isPrivate()) {
                         if ($classMethod->getClassDefinition() !== $classDefinition) {
                             throw new CompilerException(
-                                "Cannot call private method '".$expression['name']."' out of its scope",
+                                "Cannot call private method '" . $expression['name'] . "' out of its scope",
                                 $expression
                             );
                         }
@@ -271,7 +276,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                      * Try to produce an exception if method is called with a wrong number of parameters
                      */
                     if (isset($expression['parameters'])) {
-                        $callNumberParameters = \count($expression['parameters']);
+                        $callNumberParameters = count($expression['parameters']);
                     } else {
                         $callNumberParameters = 0;
                     }
@@ -282,7 +287,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         if ($callNumberParameters > $numberParameters) {
                             throw new CompilerException(
                                 sprintf(
-                                    "Method '%s::%s' called with a wrong number of parameters, ".
+                                    "Method '%s::%s' called with a wrong number of parameters, " .
                                     'the method has: %d, passed: %d',
                                     $classDefinition->getCompleteName(),
                                     $expression['name'],
@@ -297,7 +302,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     if ($callNumberParameters < $expectedNumberParameters) {
                         throw new CompilerException(
                             sprintf(
-                                "Method '%s::%s' called with a wrong number of parameters, ".
+                                "Method '%s::%s' called with a wrong number of parameters, " .
                                 'the method has: %d, passed: %d',
                                 $classDefinition->getCompleteName(),
                                 $expression['name'],
@@ -318,14 +323,15 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 if ($check && $variableVariable->hasAnyDynamicType('object')) {
                     $classTypes = $variableVariable->getClassTypes();
 
-                    if (\count($classTypes)) {
+                    if (count($classTypes)) {
                         $numberImplemented = 0;
-                        $compiler = $compilationContext->compiler;
+                        $compiler          = $compilationContext->compiler;
                         foreach ($classTypes as $classType) {
-                            if ($compiler->isClass($classType)
-                                || $compiler->isInterface($classType)
-                                || $compiler->isBundledClass($classType)
-                                || $compiler->isBundledInterface($classType)
+                            if (
+                                $compiler->isClass($classType) ||
+                                $compiler->isInterface($classType) ||
+                                $compiler->isBundledClass($classType) ||
+                                $compiler->isBundledInterface($classType)
                             ) {
                                 if ($compiler->isClass($classType) || $compiler->isInterface($classType)) {
                                     $classDefinition = $compiler->getClassDefinition($classType);
@@ -335,14 +341,14 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
                                 if (!$classDefinition) {
                                     throw new CompilerException(
-                                        'Cannot locate class definition for class '.$classType,
+                                        'Cannot locate class definition for class ' . $classType,
                                         $expression
                                     );
                                 }
 
                                 if (!$classDefinition->hasMethod($methodName)) {
                                     if (!$classDefinition->isInterface()) {
-                                        if (1 == \count($classTypes)) {
+                                        if (1 == count($classTypes)) {
                                             throw new CompilerException(
                                                 sprintf(
                                                     "Class '%s' does not implement method: '%s'",
@@ -376,9 +382,10 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                 /*
                                  * Check visibility for protected methods
                                  */
-                                if ($method->isProtected()
-                                    && $method->getClassDefinition() != $classDefinition
-                                    && $method->getClassDefinition() != $classDefinition->getExtendsClass()
+                                if (
+                                    $method->isProtected() &&
+                                    $method->getClassDefinition() != $classDefinition &&
+                                    $method->getClassDefinition() != $classDefinition->getExtendsClass()
                                 ) {
                                     throw new CompilerException(
                                         sprintf(
@@ -396,12 +403,12 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                  */
                                 if ($method instanceof Method && !$method->isBundled()) {
                                     if (isset($expression['parameters'])) {
-                                        $callNumberParameters = \count($expression['parameters']);
+                                        $callNumberParameters = count($expression['parameters']);
                                     } else {
                                         $callNumberParameters = 0;
                                     }
 
-                                    $classMethod = $classDefinition->getMethod($methodName);
+                                    $classMethod              = $classDefinition->getMethod($methodName);
                                     $expectedNumberParameters = $classMethod->getNumberOfRequiredParameters();
 
                                     if (!$expectedNumberParameters && $callNumberParameters > 0) {
@@ -410,7 +417,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                             $className = $classDefinition->getCompleteName();
                                             throw new CompilerException(
                                                 sprintf(
-                                                    "Method '%s::%s' called with a wrong number of parameters, ".
+                                                    "Method '%s::%s' called with a wrong number of parameters, " .
                                                     'the method has: %d, passed: %s',
                                                     $className,
                                                     $expression['name'],
@@ -425,7 +432,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                     if ($callNumberParameters < $expectedNumberParameters) {
                                         throw new CompilerException(
                                             sprintf(
-                                                "Method '%s::%s' called with a wrong number of parameters, ".
+                                                "Method '%s::%s' called with a wrong number of parameters, " .
                                                 'the method has: %d, passed: %d',
                                                 $classDefinition->getCompleteName(),
                                                 $expression['name'],
@@ -446,7 +453,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                             } else {
                                 ++$numberImplemented;
                                 $compilationContext->logger->warning(
-                                    'Class "'.$classType.'" does not exist at compile time',
+                                    'Class "' . $classType . '" does not exist at compile time',
                                     ['nonexistent-class', $expression]
                                 );
                             }
@@ -454,7 +461,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
                         if (0 == $numberImplemented) {
                             if (!$classDefinition->isInterface()) {
-                                if (\count($classTypes) > 1) {
+                                if (count($classTypes) > 1) {
                                     throw new CompilerException(
                                         sprintf(
                                             "None of classes: '%s' implement method: '%s'",
@@ -531,7 +538,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             $references = [];
             if (self::CALL_NORMAL == $type || self::CALL_DYNAMIC_STRING == $type) {
                 if (isset($method)) {
-                    if ($method instanceof \ReflectionMethod) {
+                    if ($method instanceof ReflectionMethod) {
                         $position = 0;
                         foreach ($method->getParameters() as $parameter) {
                             if ($parameter->isPassedByReference()) {
@@ -566,10 +573,10 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 $method ?? null
             );
 
-            if (\count($references)) {
+            if (count($references)) {
                 foreach ($params as $position => $param) {
                     if (isset($references[$position])) {
-                        $compilationContext->codePrinter->output('Z_SET_ISREF_P('.$param.');');
+                        $compilationContext->codePrinter->output('Z_SET_ISREF_P(' . $param . ');');
                     }
                 }
             }
@@ -577,7 +584,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             // We check here if a correct parameter type is passed to the called method
             if (self::CALL_NORMAL == $type) {
                 if (isset($method) && $method instanceof Method && isset($expression['parameters'])) {
-                    $resolvedTypes = $this->getResolvedTypes();
+                    $resolvedTypes        = $this->getResolvedTypes();
                     $resolvedDynamicTypes = $this->getResolvedDynamicTypes();
 
                     foreach ($method->getParameters() as $n => $parameter) {
@@ -591,7 +598,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                              */
                             if ($resolvedTypes[$n] != $parameter['data-type']) {
                                 $template = sprintf(
-                                    'Passing possible incorrect type for parameter: %s::%s(%s), '.
+                                    'Passing possible incorrect type for parameter: %s::%s(%s), ' .
                                     'passing: %s, expecting: %s',
                                     $classDefinition->getCompleteName(),
                                     $method->getName(),
@@ -675,16 +682,16 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                         }
                                         break;
 
-                                        /**
-                                         * Passing polymorphic variables to static typed parameters
-                                         * could lead to potential unexpected type coercions
-                                         */
+                                    /**
+                                     * Passing polymorphic variables to static typed parameters
+                                     * could lead to potential unexpected type coercions
+                                     */
                                     case 'variable':
                                         if ($resolvedDynamicTypes[$n] != $parameter['data-type']) {
                                             if ('undefined' == $resolvedDynamicTypes[$n]) {
                                                 $compilationContext->logger->warning(
                                                     sprintf(
-                                                        'Passing possible incorrect type for parameter: %s::%s(%s), '.
+                                                        'Passing possible incorrect type for parameter: %s::%s(%s), ' .
                                                         'passing: undefined, expecting: %s',
                                                         $classDefinition->getCompleteName(),
                                                         $method->getName(),
@@ -718,13 +725,13 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             $realMethod = $this->getRealCalledMethod($compilationContext, $variableVariable, $methodName);
 
             $isInternal = false;
-            if (\is_object($realMethod[1])) {
+            if (is_object($realMethod[1])) {
                 $realMethod[1] = $realMethod[1]->getOptimizedMethod();
-                $method = $realMethod[1];
-                $isInternal = $realMethod[1]->isInternal();
+                $method        = $realMethod[1];
+                $isInternal    = $realMethod[1]->isInternal();
                 if ($isInternal && $realMethod[0] > 1) {
                     throw new CompilerException(
-                        "Cannot resolve method: '".$expression['name']."' in polymorphic variable",
+                        "Cannot resolve method: '" . $expression['name'] . "' in polymorphic variable",
                         $expression
                     );
                 }
@@ -745,7 +752,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     $variableVariable,
                     $methodName,
                     $cachePointer,
-                    \count($params) ? $params : null,
+                    count($params) ? $params : null,
                     $compilationContext
                 );
             } else {
@@ -754,22 +761,27 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     $symbolCode = $compilationContext->backend->getVariableCode($symbolVariable);
                 }
                 $variableCode = $compilationContext->backend->getVariableCode($variableVariable);
-                $paramCount = \count($params);
-                $paramsStr = $paramCount ? ', '.implode(', ', $params) : '';
+                $paramCount   = count($params);
+                $paramsStr    = $paramCount ? ', ' . implode(', ', $params) : '';
 
                 if ($isExpecting) {
                     if ('return_value' == $symbolVariable->getName()) {
                         $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);
-                        $codePrinter->output($macro.'('.$variableCode.', '.$method->getInternalName().$paramsStr.');');
+                        $codePrinter->output(
+                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'
+                        );
                     } else {
                         $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);
                         $codePrinter->output(
-                            $macro.'('.$symbolCode.', '.$variableCode.', '.$method->getInternalName().$paramsStr.');'
+                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(
+                            ) . $paramsStr . ');'
                         );
                     }
                 } else {
                     $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);
-                    $codePrinter->output($macro.'('.$variableCode.', '.$method->getInternalName().$paramsStr.');');
+                    $codePrinter->output(
+                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'
+                    );
                 }
             }
         } else {
@@ -791,7 +803,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     $variableVariable,
                     $variableMethod,
                     $cachePointer,
-                    \count($params) ? $params : null,
+                    count($params) ? $params : null,
                     $compilationContext
                 );
             }
@@ -799,7 +811,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
         // Temporary variables must be copied if they have more than one reference
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
 
         // We can mark temporary variables generated as idle
@@ -809,10 +821,10 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
         // Release parameters marked as references
         if (isset($expression['parameters'])) {
-            if (\count($references)) {
+            if (count($references)) {
                 foreach ($params as $position => $param) {
                     if (isset($references[$position])) {
-                        $compilationContext->codePrinter->output('Z_UNSET_ISREF_P('.$param.');');
+                        $compilationContext->codePrinter->output('Z_UNSET_ISREF_P(' . $param . ');');
                     }
                 }
             }
@@ -836,14 +848,17 @@ public function compile(Expression $expr, CompilationContext $compilationContext
      *
      * @return array
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
-    private function getRealCalledMethod(CompilationContext $compilationContext, Variable $caller, string $methodName): array
-    {
+    private function getRealCalledMethod(
+        CompilationContext $compilationContext,
+        Variable $caller,
+        string $methodName
+    ): array {
         $compiler = $compilationContext->compiler;
 
         $numberPoly = 0;
-        $method = null;
+        $method     = null;
 
         if ('this' == $caller->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
@@ -858,9 +873,10 @@ private function getRealCalledMethod(CompilationContext $compilationContext, Var
                     continue;
                 }
 
-                if ($compiler->isClass($classType)
-                    || $compiler->isBundledClass($classType)
-                    || $compiler->isBundledInterface($classType)
+                if (
+                    $compiler->isClass($classType) ||
+                    $compiler->isBundledClass($classType) ||
+                    $compiler->isBundledInterface($classType)
                 ) {
                     if ($compiler->isClass($classType)) {
                         $classDefinition = $compiler->getClassDefinition($classType);
diff --git a/src/Name.php b/src/Name.php
index 1838ee4601..1afab8ac44 100644
--- a/src/Name.php
+++ b/src/Name.php
@@ -13,46 +13,11 @@
 
 namespace Zephir;
 
+use function in_array;
+use function strlen;
+
 final class Name
 {
-    public static function camelize(string $string): string
-    {
-        return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
-    }
-
-    /**
-     * Transform class/interface name to
-     * Fully qualified path name (FQN) format.
-     */
-    public static function fetchFQN(
-        string $class,
-        string $namespace = null,
-        AliasManager $aliasManager = null
-    ): string {
-        /**
-         * Absolute class/interface name
-         */
-        if ('\\' === $class[0]) {
-            return substr($class, 1);
-        }
-
-        /**
-         * If class/interface name not begin with \
-         * maybe an alias or a sub-namespace
-         */
-        $firstSepPos = strpos($class, '\\');
-        if (false !== $firstSepPos) {
-            $baseName = substr($class, 0, $firstSepPos);
-            if ($aliasManager && $aliasManager->isAlias($baseName)) {
-                return $aliasManager->getAlias($baseName).'\\'.substr($class, $firstSepPos + 1);
-            }
-        } elseif ($aliasManager && $aliasManager->isAlias($class)) {
-            return $aliasManager->getAlias($class);
-        }
-
-        return $namespace ? $namespace.'\\'.$class : $class;
-    }
-
     /**
      * Prepares a string to be used as a C-string.
      *
@@ -71,38 +36,52 @@ public static function fetchFQN(
      *  \'              | 27              | Apostrophe or single quotation mark
      *  \"              | 22              | Double quotation mark
      *  \?              | 3F              | Question mark (used to avoid trigraphs)
-     *  \nnn            | any             | The byte whose numerical value is given by nnn interpreted as an octal number
-     *  \xhh…           | any             | The byte whose numerical value is given by hh… interpreted as a hexadecimal number
+     *  \nnn            | any             | The byte whose numerical value is given by nnn interpreted as an octal
+     *  number
+     *  \xhh…           | any             | The byte whose numerical value is given by hh… interpreted as a hexadecimal
+     *  number
      */
     public static function addSlashes(string $string): string
     {
-        $escape = '\\';
+        $escape      = '\\';
         $controlChar = [
-            'a', 'b', 'e', 'f', 'n', 'r', 't', 'v', '\\', '\'', '"', '?', 'x',
+            'a',
+            'b',
+            'e',
+            'f',
+            'n',
+            'r',
+            't',
+            'v',
+            '\\',
+            '\'',
+            '"',
+            '?',
+            'x',
         ];
 
-        $new = '';
-        $last = \strlen($string) - 1;
+        $new  = '';
+        $last = strlen($string) - 1;
 
         for ($i = 0, $next = 1; $i <= $last; ++$i, ++$next) {
-            $ch = $string[$i];
+            $ch    = $string[$i];
             $after = $i !== $last ? $string[$next] : null;
 
             if ($ch === $escape) {
-                if (\in_array($after, $controlChar, true) || is_numeric($after)) {
+                if (in_array($after, $controlChar, true) || is_numeric($after)) {
                     // should not escape native C control chars
-                    $new .= $ch.$after;
+                    $new .= $ch . $after;
                     ++$i;
                     ++$next;
                     continue;
                 }
 
-                $new .= $escape.$ch;
+                $new .= $escape . $ch;
                 continue;
             }
 
             if ('"' === $ch) {
-                $new .= $escape.$ch;
+                $new .= $escape . $ch;
                 continue;
             }
 
@@ -111,4 +90,42 @@ public static function addSlashes(string $string): string
 
         return $new;
     }
+
+    public static function camelize(string $string): string
+    {
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
+    }
+
+    /**
+     * Transform class/interface name to
+     * Fully qualified path name (FQN) format.
+     */
+    public static function fetchFQN(
+        string $class,
+        string $namespace = null,
+        AliasManager $aliasManager = null
+    ): string {
+        /**
+         * Absolute class/interface name
+         */
+        if ('\\' === $class[0]) {
+            return substr($class, 1);
+        }
+
+        /**
+         * If class/interface name not begin with \
+         * maybe an alias or a sub-namespace
+         */
+        $firstSepPos = strpos($class, '\\');
+        if (false !== $firstSepPos) {
+            $baseName = substr($class, 0, $firstSepPos);
+            if ($aliasManager && $aliasManager->isAlias($baseName)) {
+                return $aliasManager->getAlias($baseName) . '\\' . substr($class, $firstSepPos + 1);
+            }
+        } elseif ($aliasManager && $aliasManager->isAlias($class)) {
+            return $aliasManager->getAlias($class);
+        }
+
+        return $namespace ? $namespace . '\\' . $class : $class;
+    }
 }
diff --git a/src/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
index 330435ef0d..0e90bc02ce 100644
--- a/src/Operators/AbstractOperator.php
+++ b/src/Operators/AbstractOperator.php
@@ -16,65 +16,15 @@
 use Zephir\CompilationContext;
 use Zephir\Variable\Variable;
 
+use function is_object;
+
 abstract class AbstractOperator
 {
-    protected string $operator;
-
-    protected bool $expecting = true;
-
-    protected bool $readOnly = false;
-
-    protected bool $literalOnly = true;
-
+    protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
-
-    /**
-     * Sets if the variable must be resolved into a direct variable symbol
-     * create a temporary value or ignore the return value.
-     *
-     * @param bool          $expecting
-     * @param Variable|null $expectingVariable
-     */
-    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
-    {
-        $this->expecting = $expecting;
-        $this->expectingVariable = $expectingVariable;
-    }
-
-    /**
-     * Returns the expected variable for assignment or creates a temporary variable to
-     * store the result. This method returns a variable that is always stored in the heap.
-     *
-     * @param CompilationContext $compilationContext
-     * @param array              $expression
-     * @param bool               $init
-     *
-     * @return Variable|null
-     */
-    public function getExpectedNonLiteral(CompilationContext $compilationContext, array $expression, bool $init = true): ?Variable
-    {
-        $symbolVariable = $this->expectingVariable;
-
-        if (!$this->expecting) {
-            return $symbolVariable;
-        }
-
-        if ($symbolVariable !== null) {
-            if ('variable' === $symbolVariable->getType() && !$symbolVariable->isLocalOnly()) {
-                if (!$init) {
-                    return $symbolVariable;
-                }
-
-                $symbolVariable->initVariant($compilationContext);
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
-            }
-        } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
-        }
-
-        return $symbolVariable;
-    }
+    protected bool      $literalOnly       = true;
+    protected string    $operator;
+    protected bool      $readOnly          = false;
 
     /**
      * Returns the expected variable for assignment or creates a temporary variable to
@@ -93,7 +43,7 @@ public function getExpected(CompilationContext $compilationContext, array $expre
         }
 
         $symbolVariable = $this->expectingVariable;
-        if (\is_object($symbolVariable)) {
+        if (is_object($symbolVariable)) {
             if ('variable' === $symbolVariable->getType()) {
                 if (!$init) {
                     return $symbolVariable;
@@ -102,23 +52,43 @@ public function getExpected(CompilationContext $compilationContext, array $expre
             } else {
                 if (!$this->readOnly) {
                     if (!$this->literalOnly) {
-                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $expression
+                        );
                     } else {
-                        $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite('variable', $compilationContext);
+                        $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
                     }
                 } else {
-                    $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite('variable', $compilationContext);
+                    $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
+                        'variable',
+                        $compilationContext
+                    );
                 }
             }
         } else {
             if (!$this->readOnly) {
                 if (!$this->literalOnly) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                        'variable',
+                        $compilationContext,
+                        $expression
+                    );
                 } else {
-                    $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite('variable', $compilationContext);
+                    $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite(
+                        'variable',
+                        $compilationContext
+                    );
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite('variable', $compilationContext);
+                $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
             }
         }
 
@@ -135,26 +105,40 @@ public function getExpected(CompilationContext $compilationContext, array $expre
      *
      * @return Variable
      */
-    public function getExpectedComplexLiteral(CompilationContext $compilationContext, string $type = 'variable'): ?Variable
-    {
+    public function getExpectedComplexLiteral(
+        CompilationContext $compilationContext,
+        string $type = 'variable'
+    ): ?Variable {
         $symbolVariable = $this->expectingVariable;
 
         if ($this->expecting) {
-            if (\is_object($symbolVariable)) {
+            if (is_object($symbolVariable)) {
                 if ($symbolVariable->getType() === $type || 'return_value' === $symbolVariable->getName()) {
                     $symbolVariable->initVariant($compilationContext);
                 } else {
                     if (!$this->readOnly) {
-                        $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite($type, $compilationContext);
+                        $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite(
+                            $type,
+                            $compilationContext
+                        );
                     } else {
-                        $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite($type, $compilationContext);
+                        $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
+                            $type,
+                            $compilationContext
+                        );
                     }
                 }
             } else {
                 if (!$this->readOnly) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite($type, $compilationContext);
+                    $symbolVariable = $compilationContext->symbolTable->getTempComplexLiteralVariableForWrite(
+                        $type,
+                        $compilationContext
+                    );
                 } else {
-                    $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite($type, $compilationContext);
+                    $symbolVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
+                        $type,
+                        $compilationContext
+                    );
                 }
             }
         }
@@ -163,23 +147,59 @@ public function getExpectedComplexLiteral(CompilationContext $compilationContext
     }
 
     /**
-     * Sets if the result of the evaluated expression is read only.
+     * Returns the expected variable for assignment or creates a temporary variable to
+     * store the result. This method returns a variable that is always stored in the heap.
      *
-     * @return bool
+     * @param CompilationContext $compilationContext
+     * @param array              $expression
+     * @param bool               $init
+     *
+     * @return Variable|null
      */
-    public function isExpecting(): bool
-    {
-        return $this->expecting;
+    public function getExpectedNonLiteral(
+        CompilationContext $compilationContext,
+        array $expression,
+        bool $init = true
+    ): ?Variable {
+        $symbolVariable = $this->expectingVariable;
+
+        if (!$this->expecting) {
+            return $symbolVariable;
+        }
+
+        if ($symbolVariable !== null) {
+            if ('variable' === $symbolVariable->getType() && !$symbolVariable->isLocalOnly()) {
+                if (!$init) {
+                    return $symbolVariable;
+                }
+
+                $symbolVariable->initVariant($compilationContext);
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
+            }
+        } else {
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
+        }
+
+        return $symbolVariable;
     }
 
     /**
      * Sets if the result of the evaluated expression is read only.
      *
-     * @param bool $readOnly
+     * @return bool
      */
-    public function setReadOnly(bool $readOnly): void
+    public function isExpecting(): bool
     {
-        $this->readOnly = $readOnly;
+        return $this->expecting;
     }
 
     /**
@@ -191,4 +211,27 @@ public function isReadOnly(): bool
     {
         return $this->readOnly;
     }
+
+    /**
+     * Sets if the variable must be resolved into a direct variable symbol
+     * create a temporary value or ignore the return value.
+     *
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
+     */
+    public function setExpectReturn(bool $expecting, Variable $expectingVariable = null): void
+    {
+        $this->expecting         = $expecting;
+        $this->expectingVariable = $expectingVariable;
+    }
+
+    /**
+     * Sets if the result of the evaluated expression is read only.
+     *
+     * @param bool $readOnly
+     */
+    public function setReadOnly(bool $readOnly): void
+    {
+        $this->readOnly = $readOnly;
+    }
 }
diff --git a/src/Operators/Arithmetical/AddOperator.php b/src/Operators/Arithmetical/AddOperator.php
index 3e75f95e52..f7011b12e5 100644
--- a/src/Operators/Arithmetical/AddOperator.php
+++ b/src/Operators/Arithmetical/AddOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Arithmetical;
 
 /**
@@ -18,9 +18,7 @@
  */
 class AddOperator extends ArithmeticalBaseOperator
 {
-    protected string $operator = '+';
-
-    protected string $bitOperator = '|';
-
+    protected string $bitOperator  = '|';
+    protected string $operator     = '+';
     protected string $zvalOperator = 'zephir_add_function';
 }
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index eddf1dc13a..379a1f4df1 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Arithmetical;
 
 use Zephir\CompilationContext;
@@ -29,55 +29,6 @@ class ArithmeticalBaseOperator extends AbstractOperator
 {
     protected bool $literalOnly = true;
 
-    /**
-     * This tries to perform arithmetical operations.
-     *
-     * Probably gcc/clang will optimize them without this optimization
-     *
-     * @see https://en.wikipedia.org/wiki/Constant_folding
-     *
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return bool|CompiledExpression
-     */
-    public function optimizeConstantFolding(array $expression, CompilationContext $compilationContext)
-    {
-        if ('int' != $expression['left']['type'] && 'double' != $expression['left']['type']) {
-            return false;
-        }
-
-        if ($compilationContext->config->get('constant-folding', 'optimizations')) {
-            if ('int' == $expression['left']['type'] && 'int' == $expression['right']['type']) {
-                switch ($this->operator) {
-                    case '+':
-                        return new CompiledExpression('int', $expression['left']['value'] + $expression['right']['value'], $expression);
-
-                    case '-':
-                        return new CompiledExpression('int', $expression['left']['value'] - $expression['right']['value'], $expression);
-
-                    case '*':
-                        return new CompiledExpression('int', $expression['left']['value'] * $expression['right']['value'], $expression);
-                }
-            }
-
-            if (('double' == $expression['left']['type'] && 'double' == $expression['right']['type']) || ('double' == $expression['left']['type'] && 'int' == $expression['right']['type']) || ('int' == $expression['left']['type'] && 'double' == $expression['right']['type'])) {
-                switch ($this->operator) {
-                    case '+':
-                        return new CompiledExpression('double', $expression['left']['value'] + $expression['right']['value'], $expression);
-
-                    case '-':
-                        return new CompiledExpression('double', $expression['left']['value'] - $expression['right']['value'], $expression);
-
-                    case '*':
-                        return new CompiledExpression('double', $expression['left']['value'] * $expression['right']['value'], $expression);
-                }
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Compiles the arithmetical operation.
      *
@@ -122,42 +73,84 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('double', '((double) '.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            '((double) ' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', '(double) ('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    '(double) (' . $left->getCode(
+                                    ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $variableRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' zephir_get_numberval('.$variableRight.'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode(
+                                    ) . ' ' . $this->operator . ' zephir_get_numberval(' . $variableRight . '))',
+                                    $expression
+                                );
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'int' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'int' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -168,13 +161,25 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'long':
                     case 'ulong':
                     case 'double':
-                        return new CompiledExpression('long', '('.$left->getBooleanCode().' + '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'long',
+                            '(' . $left->getBooleanCode() . ' + ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
 
                     default:
-                        throw new CompilerException("Cannot operate 'bool' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -184,40 +189,81 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('double', '('.$left->getCode().' '.$this->operator.' (double) ('.$right->getCode().'))', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' (double) (' . $right->getCode() . '))',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('double', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('double', '('.$left->getCode().' '.$this->operator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'ulong':
                             case 'bool':
-                                return new CompiledExpression('double', '('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', '(double) ('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    '(double) (' . $left->getCode(
+                                    ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $variableRight = $compilationContext->backend->getVariableCode($variableRight, $compilationContext);
-
-                                return new CompiledExpression('double', '('.$left->getCode().' '.$this->operator.' zephir_get_numberval('.$variableRight.'))', $expression);
+                                $variableRight = $compilationContext->backend->getVariableCode(
+                                    $variableRight,
+                                    $compilationContext
+                                );
+
+                                return new CompiledExpression(
+                                    'double',
+                                    '(' . $left->getCode(
+                                    ) . ' ' . $this->operator . ' zephir_get_numberval(' . $variableRight . '))',
+                                    $expression
+                                );
 
                             default:
-                                throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                    ) . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'double' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -229,7 +275,11 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'variable':
-                $variableLeft = $compilationContext->symbolTable->getVariableForRead($left->resolve(null, $compilationContext), $compilationContext, $expression);
+                $variableLeft = $compilationContext->symbolTable->getVariableForRead(
+                    $left->resolve(null, $compilationContext),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableLeft->getType()) {
                     case 'int':
                     case 'uint':
@@ -241,34 +291,67 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'long':
                             case 'ulong':
                             case 'double':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
                                     case 'bool':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', '((double) '.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            '((double) ' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        $variableRight = $compilationContext->backend->getVariableCode($variableRight, $compilationContext);
+                                        $variableRight = $compilationContext->backend->getVariableCode(
+                                            $variableRight,
+                                            $compilationContext
+                                        );
 
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' zephir_get_numberval('.$variableRight.'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_get_numberval(' . $variableRight . '))',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -278,30 +361,58 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        $variableRight = $compilationContext->backend->getVariableCode($variableRight, $compilationContext);
+                                        $variableRight = $compilationContext->backend->getVariableCode(
+                                            $variableRight,
+                                            $compilationContext
+                                        );
 
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' zephir_get_numberval('.$variableRight.'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_get_numberval(' . $variableRight . '))',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('char') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('char') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('char') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('char') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -311,37 +422,75 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
                                     case 'double':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        $variableRight = $compilationContext->backend->getVariableCode($variableRight, $compilationContext);
+                                        $variableRight = $compilationContext->backend->getVariableCode(
+                                            $variableRight,
+                                            $compilationContext
+                                        );
 
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' zephir_get_numberval('.$variableRight.'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_get_numberval(' . $variableRight . '))',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -351,42 +500,87 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('double', '('.$left->getCode().' '.$this->operator.' (double) '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' (double) ' . $right->getCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('double', '('.$variableLeft->getName().' '.$this->operator.'  (double) '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . '  (double) ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' zephir_get_numberval('.$variableRight.'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_get_numberval(' . $variableRight . '))',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -397,7 +591,11 @@ public function compile($expression, CompilationContext $compilationContext)
                             /* a(var) + a(x) */
                             case 'array':
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(var) */
                                     case 'array':
@@ -405,7 +603,13 @@ public function compile($expression, CompilationContext $compilationContext)
                                         $compilationContext->headersManager->add('kernel/operators');
 
                                         $expected = $this->getExpected($compilationContext, $expression);
-                                        $compilationContext->backend->zvalOperator($this->zvalOperator, $expected, $variableLeft, $variableRight, $compilationContext);
+                                        $compilationContext->backend->zvalOperator(
+                                            $this->zvalOperator,
+                                            $expected,
+                                            $variableLeft,
+                                            $variableRight,
+                                            $compilationContext
+                                        );
 
                                         if ($variableLeft->isTemporal()) {
                                             $variableLeft->setIdle(true);
@@ -414,12 +618,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $variableRight->setIdle(true);
                                         }
 
-                                        $expected->setDynamicTypes($this->getDynamicTypes($variableLeft, $variableRight));
+                                        $expected->setDynamicTypes(
+                                            $this->getDynamicTypes($variableLeft, $variableRight)
+                                        );
 
                                         return new CompiledExpression('variable', $expected->getName(), $expression);
 
                                     default:
-                                        throw new CompilerException("Cannot operate 'array with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate 'array with variable ('" . $variableRight->getType() . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
                         }
@@ -439,15 +648,27 @@ public function compile($expression, CompilationContext $compilationContext)
                                 $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                                 $op2 = $right->getCode();
                                 if ('double' == $right->getType()) {
-                                    return new CompiledExpression('double', '(zephir_get_numberval('.$op1.') '.$op.' '.$op2.')', $expression);
+                                    return new CompiledExpression(
+                                        'double',
+                                        '(zephir_get_numberval(' . $op1 . ') ' . $op . ' ' . $op2 . ')',
+                                        $expression
+                                    );
                                 } else {
-                                    return new CompiledExpression('int', '(zephir_get_numberval('.$op1.') '.$op.' '.$op2.')', $expression);
+                                    return new CompiledExpression(
+                                        'int',
+                                        '(zephir_get_numberval(' . $op1 . ') ' . $op . ' ' . $op2 . ')',
+                                        $expression
+                                    );
                                 }
                                 break;
 
-                                /* a(var) + a(x) */
+                            /* a(var) + a(x) */
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
                                     case 'int':
@@ -470,21 +691,32 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
                                         break;
 
-                                        /* a(var) + a(bool) */
+                                    /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableLeft = $compilationContext->backend->getVariableCode($variableLeft);
 
-                                        return new CompiledExpression('int', '(zephir_get_numberval('.$variableLeft.') '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(zephir_get_numberval(' . $variableLeft . ') ' . $this->operator . ' ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
                                         break;
 
-                                        /* a(var) + a(var) */
+                                    /* a(var) + a(var) */
                                     case 'variable':
                                     case 'array':
                                         $compilationContext->headersManager->add('kernel/operators');
 
                                         $expected = $this->getExpected($compilationContext, $expression);
-                                        $compilationContext->backend->zvalOperator($this->zvalOperator, $expected, $variableLeft, $variableRight, $compilationContext);
+                                        $compilationContext->backend->zvalOperator(
+                                            $this->zvalOperator,
+                                            $expected,
+                                            $variableLeft,
+                                            $variableRight,
+                                            $compilationContext
+                                        );
 
                                         if ($variableLeft->isTemporal()) {
                                             $variableLeft->setIdle(true);
@@ -493,30 +725,112 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $variableRight->setIdle(true);
                                         }
 
-                                        $expected->setDynamicTypes($this->getDynamicTypes($variableLeft, $variableRight));
+                                        $expected->setDynamicTypes(
+                                            $this->getDynamicTypes($variableLeft, $variableRight)
+                                        );
 
                                         return new CompiledExpression('variable', $expected->getName(), $expression);
 
                                     default:
-                                        throw new CompilerException("Cannot operate 'variable' with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate 'variable' with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Unknown '".$variableLeft->getType()."'", $expression);
+                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unsupported type: '.$left->getType(), $expression);
+                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
         }
     }
 
+    /**
+     * This tries to perform arithmetical operations.
+     *
+     * Probably gcc/clang will optimize them without this optimization
+     *
+     * @see https://en.wikipedia.org/wiki/Constant_folding
+     *
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return bool|CompiledExpression
+     */
+    public function optimizeConstantFolding(array $expression, CompilationContext $compilationContext)
+    {
+        if ('int' != $expression['left']['type'] && 'double' != $expression['left']['type']) {
+            return false;
+        }
+
+        if ($compilationContext->config->get('constant-folding', 'optimizations')) {
+            if ('int' == $expression['left']['type'] && 'int' == $expression['right']['type']) {
+                switch ($this->operator) {
+                    case '+':
+                        return new CompiledExpression(
+                            'int',
+                            $expression['left']['value'] + $expression['right']['value'],
+                            $expression
+                        );
+
+                    case '-':
+                        return new CompiledExpression(
+                            'int',
+                            $expression['left']['value'] - $expression['right']['value'],
+                            $expression
+                        );
+
+                    case '*':
+                        return new CompiledExpression(
+                            'int',
+                            $expression['left']['value'] * $expression['right']['value'],
+                            $expression
+                        );
+                }
+            }
+
+            if (('double' == $expression['left']['type'] && 'double' == $expression['right']['type']) || ('double' == $expression['left']['type'] && 'int' == $expression['right']['type']) || ('int' == $expression['left']['type'] && 'double' == $expression['right']['type'])) {
+                switch ($this->operator) {
+                    case '+':
+                        return new CompiledExpression(
+                            'double',
+                            $expression['left']['value'] + $expression['right']['value'],
+                            $expression
+                        );
+
+                    case '-':
+                        return new CompiledExpression(
+                            'double',
+                            $expression['left']['value'] - $expression['right']['value'],
+                            $expression
+                        );
+
+                    case '*':
+                        return new CompiledExpression(
+                            'double',
+                            $expression['left']['value'] * $expression['right']['value'],
+                            $expression
+                        );
+                }
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Returns proper dynamic types.
      *
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 90ace66432..ca229e1a97 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Arithmetical;
 
+use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -23,10 +24,8 @@
  */
 class DivOperator extends ArithmeticalBaseOperator
 {
-    protected string $operator = '/';
-
-    protected string $bitOperator = '-';
-
+    protected string $bitOperator  = '-';
+    protected string $operator     = '/';
     protected string $zvalOperator = 'div_function';
 
     /**
@@ -38,11 +37,11 @@ class DivOperator extends ArithmeticalBaseOperator
     public function compile($expression, CompilationContext $compilationContext)
     {
         if (!isset($expression['left'])) {
-            throw new \Exception('Missing left part of the expression');
+            throw new Exception('Missing left part of the expression');
         }
 
         if (!isset($expression['right'])) {
-            throw new \Exception('Missing right part of the expression');
+            throw new Exception('Missing right part of the expression');
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -65,39 +64,75 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('double', 'zephir_safe_div_long_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('double', 'zephir_safe_div_long_double((double) '.$left->getCode().', '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_long_double((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getCode().' - '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'ulong':
                             case 'bool':
-                                return new CompiledExpression('double', 'zephir_safe_div_long_long('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_div_long_double('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('double', 'zephir_safe_div_long_zval('.$left->getCode().', '.$variableRightCode.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
+                                    $expression
+                                );
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'int' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'int' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -108,13 +143,25 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'long':
                     case 'ulong':
                     case 'double':
-                        return new CompiledExpression('long', '('.$left->getBooleanCode().' - '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'long',
+                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
 
                     default:
-                        throw new CompilerException("Cannot operate 'bool' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -124,40 +171,78 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('double', 'zephir_safe_div_double_long('.$left->getCode().', (double) ('.$right->getCode().'))', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_double_long(' . $left->getCode() . ', (double) (' . $right->getCode(
+                            ) . '))',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('double', 'zephir_safe_div_double_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('double', 'zephir_safe_div_double_long('.$left->getCode().', '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'ulong':
                             case 'bool':
-                                return new CompiledExpression('double', 'zephir_safe_div_double_long('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_div_double_double('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_double_double(' . $left->getCode(
+                                    ) . ', ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('double', 'zephir_safe_div_double_zval('.$left->getCode().', '.$symbolRight.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
+                                    $expression
+                                );
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                    ) . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'double' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -165,12 +250,19 @@ public function compile($expression, CompilationContext $compilationContext)
             case 'array':
                 switch ($right->getType()) {
                     default:
-                        throw new CompilerException('Operation is not supported between '.$right->getType(), $expression);
+                        throw new CompilerException(
+                            'Operation is not supported between ' . $right->getType(),
+                            $expression
+                        );
                 }
                 break;
 
             case 'variable':
-                $variableLeft = $compilationContext->symbolTable->getVariableForRead($left->resolve(null, $compilationContext), $compilationContext, $expression);
+                $variableLeft = $compilationContext->symbolTable->getVariableForRead(
+                    $left->resolve(null, $compilationContext),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableLeft->getType()) {
                     case 'int':
                     case 'uint':
@@ -181,42 +273,83 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('double', 'zephir_safe_div_long_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_div_long_double('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
                                     case 'bool':
-                                        return new CompiledExpression('double', 'zephir_safe_div_long_long('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_long_long(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_div_long_double('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_long_double(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression('double', 'zephir_safe_div_long_zval('.$variableLeft->getName().', &'.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
+                                                ) . ', &' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
                                         } else {
-                                            $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
-
-                                            return new CompiledExpression('double', 'zephir_safe_div_long_zval('.$variableLeft->getName().', '.$variableRightCode.')', $expression);
+                                            $variableRightCode = $compilationContext->backend->getVariableCode(
+                                                $variableRight
+                                            );
+
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
+                                                ) . ', ' . $variableRightCode . ')',
+                                                $expression
+                                            );
                                         }
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -226,44 +359,91 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('bool', '('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('double', 'zephir_safe_div_long_long('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_long_long(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_div_long_double('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_long_double(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('double', 'zephir_safe_div_long_long('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_long_long(' . $variableLeft->getName(
+                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression('double', 'zephir_safe_div_long_zval('.$variableLeft->getName().', &'.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
+                                                ) . ', &' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
                                         } else {
-                                            $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
-
-                                            return new CompiledExpression('double', 'zephir_safe_div_long_zval('.$variableLeft->getName().', '.$variableRightCode.')', $expression);
+                                            $variableRightCode = $compilationContext->backend->getVariableCode(
+                                                $variableRight
+                                            );
+
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
+                                                ) . ', ' . $variableRightCode . ')',
+                                                $expression
+                                            );
                                         }
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -274,39 +454,79 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'long':
                             case 'ulong':
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_div_double_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('double', 'zephir_safe_div_double_long('.$variableLeft->getName().',  (double) '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_double_long(' . $variableLeft->getName(
+                                            ) . ',  (double) ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_div_double_long('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_double_long(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('double', 'zephir_safe_div_double_zval('.$variableLeft->getName().', '.$symbolRight.')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_double_zval(' . $variableLeft->getName(
+                                            ) . ', ' . $symbolRight . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -324,38 +544,67 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'ulong':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_div_zval_long('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_zval_long(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
 
                             case 'double':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_div_zval_double('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_zval_double(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
 
-                                /* a(var) + a(x) */
+                            /* a(var) + a(x) */
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('double', 'zephir_safe_div_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_div_zval_double('.$op1.', '.$variableRight->getName().')', $expression);
-
-                                        /* a(var) + a(bool) */
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_zval_double(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
+
+                                    /* a(var) + a(bool) */
                                     case 'bool':
-                                        return new CompiledExpression('int', 'zephir_safe_div_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
-
-                                        /* a(var) + a(var) */
+                                        return new CompiledExpression(
+                                            'int',
+                                            'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
+
+                                    /* a(var) + a(var) */
                                     case 'variable':
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        $expected = $this->getExpected($compilationContext, $expression);
+                                        $expected     = $this->getExpected($compilationContext, $expression);
                                         $expectedCode = $compilationContext->backend->getVariableCode($expected);
-                                        $compilationContext->codePrinter->output($this->zvalOperator.'('.$expectedCode.', '.$op1.', '.$op2.');');
+                                        $compilationContext->codePrinter->output(
+                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'
+                                        );
 
                                         if ($variableLeft->isTemporal()) {
                                             $variableLeft->setIdle(true);
@@ -367,12 +616,19 @@ public function compile($expression, CompilationContext $compilationContext)
                                         return new CompiledExpression('variable', $expected->getName(), $expression);
 
                                     default:
-                                        throw new CompilerException("Cannot operate 'variable' with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate 'variable' with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -385,68 +641,128 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'ulong':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_div_zval_long('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_zval_long(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
 
                             case 'double':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_div_zval_double('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_zval_double(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
                                     case 'bool':
-                                        return new CompiledExpression('double', 'zephir_safe_div_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_div_zval_double('.$op1.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_zval_double(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
-                                        $variableRight = $compilationContext->symbolTable->getVariableForRead($variableRight->getCode(), $compilationContext, $expression);
-                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);
+                                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                            $variableRight->getCode(),
+                                            $compilationContext,
+                                            $expression
+                                        );
+                                        $op2           = $compilationContext->backend->getVariableCode($variableRight);
                                         switch ($variableRight->getType()) {
                                             case 'int':
-                                                return new CompiledExpression('double', 'zephir_safe_div_zval_long('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                                return new CompiledExpression(
+                                                    'double',
+                                                    'zephir_safe_div_zval_long(' . $variableLeft->getName(
+                                                    ) . ', ' . $variableRight->getName() . ')',
+                                                    $expression
+                                                );
 
                                             case 'double':
-                                                return new CompiledExpression('double', 'zephir_safe_div_zval_double('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                                return new CompiledExpression(
+                                                    'double',
+                                                    'zephir_safe_div_zval_double(' . $variableLeft->getName(
+                                                    ) . ', ' . $variableRight->getName() . ')',
+                                                    $expression
+                                                );
 
                                             case 'bool':
-                                                return new CompiledExpression('bool', $variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName(), $expression);
+                                                return new CompiledExpression(
+                                                    'bool',
+                                                    $variableLeft->getName(
+                                                    ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName(),
+                                                    $expression
+                                                );
 
                                             case 'variable':
-                                                $expected = $this->getExpected($compilationContext, $expression);
-                                                $expectedCode = $compilationContext->backend->getVariableCode($expected);
-                                                $compilationContext->codePrinter->output($this->zvalOperator.'('.$expectedCode.', '.$op1.', '.$op2.');');
-
-                                                return new CompiledExpression('variable', $expected->getName(), $expression);
+                                                $expected     = $this->getExpected($compilationContext, $expression);
+                                                $expectedCode = $compilationContext->backend->getVariableCode(
+                                                    $expected
+                                                );
+                                                $compilationContext->codePrinter->output(
+                                                    $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'
+                                                );
+
+                                                return new CompiledExpression(
+                                                    'variable',
+                                                    $expected->getName(),
+                                                    $expression
+                                                );
 
                                             default:
-                                                throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                                throw new CompilerException(
+                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                                    ) . "')",
+                                                    $expression
+                                                );
                                         }
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate 'variable' with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate 'variable' with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Unknown '".$variableLeft->getType()."'", $expression);
+                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unsupported type: '.$left->getType(), $expression);
+                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
         }
     }
 }
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 47cb83ca57..b9f301e1fb 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Arithmetical;
 
+use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -23,10 +24,8 @@
  */
 class ModOperator extends ArithmeticalBaseOperator
 {
-    protected string $operator = '%';
-
-    protected string $bitOperator = '-';
-
+    protected string $bitOperator  = '-';
+    protected string $operator     = '%';
     protected string $zvalOperator = 'mod_function';
 
     /**
@@ -38,11 +37,11 @@ class ModOperator extends ArithmeticalBaseOperator
     public function compile($expression, CompilationContext $compilationContext)
     {
         if (!isset($expression['left'])) {
-            throw new \Exception('Missing left part of the expression');
+            throw new Exception('Missing left part of the expression');
         }
 
         if (!isset($expression['right'])) {
-            throw new \Exception('Missing right part of the expression');
+            throw new Exception('Missing right part of the expression');
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -65,42 +64,84 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('double', 'zephir_safe_mod_long_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('double', 'zephir_safe_mod_long_double((double) '.$left->getCode().', '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_long_double((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getCode().' - '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'ulong':
                             case 'bool':
-                                return new CompiledExpression('double', 'zephir_safe_mod_long_long('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_mod_long_double('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 if ($variableRight->isLocalOnly()) {
-                                    return new CompiledExpression('double', 'zephir_safe_mod_long_zval('.$left->getCode().', &'.$variableRight->getName().')', $expression);
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_zval(' . $left->getCode(
+                                        ) . ', &' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
                                 } else {
-                                    return new CompiledExpression('double', 'zephir_safe_mod_long_zval('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_zval(' . $left->getCode(
+                                        ) . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'int' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'int' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -111,13 +152,25 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'long':
                     case 'ulong':
                     case 'double':
-                        return new CompiledExpression('long', '('.$left->getBooleanCode().' - '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'long',
+                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
 
                     default:
-                        throw new CompilerException("Cannot operate 'bool' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -127,42 +180,87 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('double', 'zephir_safe_mod_double_long('.$left->getCode().', (double) ('.$right->getCode().'))', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_double_long(' . $left->getCode() . ', (double) (' . $right->getCode(
+                            ) . '))',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('double', 'zephir_safe_mod_double_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('double', 'zephir_safe_mod_double_long('.$left->getCode().', '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'ulong':
                             case 'bool':
-                                return new CompiledExpression('double', 'zephir_safe_mod_double_long('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_mod_double_double('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_double_double(' . $left->getCode(
+                                    ) . ', ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 if ($variableRight->isLocalOnly()) {
-                                    return new CompiledExpression('double', 'zephir_safe_mod_double_zval('.$left->getCode().', &'.$variableRight->getName().')', $expression);
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_double_zval(' . $left->getCode(
+                                        ) . ', &' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
                                 } else {
-                                    return new CompiledExpression('double', 'zephir_safe_mod_double_zval('.$left->getCode().', '.$variableRight->getName().')', $expression);
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_double_zval(' . $left->getCode(
+                                        ) . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('double') with variable('"
+                                    . $variableRight->getType()
+                                    . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'double' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -170,12 +268,19 @@ public function compile($expression, CompilationContext $compilationContext)
             case 'array':
                 switch ($right->getType()) {
                     default:
-                        throw new CompilerException('Operation is not supported between '.$right->getType(), $expression);
+                        throw new CompilerException(
+                            'Operation is not supported between ' . $right->getType(),
+                            $expression
+                        );
                 }
                 break;
 
             case 'variable':
-                $variableLeft = $compilationContext->symbolTable->getVariableForRead($left->resolve(null, $compilationContext), $compilationContext, $expression);
+                $variableLeft = $compilationContext->symbolTable->getVariableForRead(
+                    $left->resolve(null, $compilationContext),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableLeft->getType()) {
                     case 'int':
                     case 'uint':
@@ -186,39 +291,79 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('double', 'zephir_safe_mod_long_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_mod_long_double('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
                                     case 'bool':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_long_long('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_long(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_long_double('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_double(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression('double', 'zephir_safe_mod_long_zval('.$variableLeft->getName().', &'.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
+                                                ) . ', &' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
                                         } else {
-                                            return new CompiledExpression('double', 'zephir_safe_mod_long_zval('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
+                                                ) . ', ' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
                                         }
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('"
+                                            . $variableRight->getType()
+                                            . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -228,42 +373,105 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('bool', '('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_long_long('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_long('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $variableRight->getName()
+                                            . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_long_double('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_double('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $variableRight->getName()
+                                            . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_long_long('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_long('
+                                            . $variableLeft->getName()
+                                            . ' '
+                                            . $this->bitOperator
+                                            . ' '
+                                            . $variableRight->getName()
+                                            . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression('double', 'zephir_safe_mod_long_zval('.$variableLeft->getName().', &'.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval('
+                                                . $variableLeft->getName()
+                                                . ', &'
+                                                . $variableRight->getName()
+                                                . ')',
+                                                $expression
+                                            );
                                         } else {
-                                            return new CompiledExpression('double', 'zephir_safe_mod_long_zval('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval('
+                                                . $variableLeft->getName()
+                                                . ', '
+                                                . $variableRight->getName()
+                                                . ')',
+                                                $expression
+                                            );
                                         }
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('"
+                                            . $variableRight->getType()
+                                            . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -274,48 +482,96 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'long':
                             case 'ulong':
                             case 'double':
-                                return new CompiledExpression('double', 'zephir_safe_mod_double_long('.$left->getCode().', '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_double_long('.$variableLeft->getName().',  (double) '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_double_long(' . $variableLeft->getName(
+                                            ) . ',  (double) ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_double_long('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_double_long(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression('double', 'zephir_safe_mod_double_zval('.$variableLeft->getName().', &'.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_double_zval(' . $variableLeft->getName(
+                                                ) . ', &' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
                                         } else {
-                                            return new CompiledExpression('double', 'zephir_safe_mod_double_zval('.$variableLeft->getName().', '.$variableRight->getName().')', $expression);
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_double_zval(' . $variableLeft->getName(
+                                                ) . ', ' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
                                         }
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
                     case 'string':
                     case 'array':
-                        throw new CompilerException('Cannot operate '.$variableLeft->getType()." variables'", $expression);
+                        throw new CompilerException(
+                            'Cannot operate ' . $variableLeft->getType() . " variables'",
+                            $expression
+                        );
                     case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
@@ -326,40 +582,64 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'ulong':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_mod_zval_long('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_zval_long(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
                                 break;
 
                             case 'double':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_mod_zval_double('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_zval_double(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
                                 break;
 
-                                /* a(var) + a(x) */
+                            /* a(var) + a(x) */
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('double', 'zephir_safe_mod_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
                                         break;
 
-                                        /* a(var) + a(bool) */
+                                    /* a(var) + a(bool) */
                                     case 'bool':
-                                        return new CompiledExpression('int', 'zephir_safe_mod_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
                                         break;
 
-                                        /* a(var) + a(var) */
+                                    /* a(var) + a(var) */
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
                                         $expected = $this->getExpected($compilationContext, $expression);
-                                        $symbol = $compilationContext->backend->getVariableCode($expected);
-                                        $compilationContext->codePrinter->output($this->zvalOperator.'('.$symbol.', '.$op1.', '.$op2.');');
+                                        $symbol   = $compilationContext->backend->getVariableCode($expected);
+                                        $compilationContext->codePrinter->output(
+                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'
+                                        );
 
                                         if ($variableLeft->isTemporal()) {
                                             $variableLeft->setIdle(true);
@@ -368,15 +648,26 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $variableRight->setIdle(true);
                                         }
 
-                                        return new CompiledExpression('variable', $expected->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'variable',
+                                            $expected->getName(),
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot operate 'variable' with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate 'variable' with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -389,15 +680,27 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'ulong':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_mod_zval_long('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_zval_long(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
 
                             case 'double':
                                 $op2 = $right->getCode();
 
-                                return new CompiledExpression('double', 'zephir_safe_mod_zval_double('.$op1.', '.$op2.')', $expression);
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_zval_double(' . $op1 . ', ' . $op2 . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
@@ -406,52 +709,98 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
 
-                                        return new CompiledExpression('double', 'zephir_safe_mod_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
                                         break;
 
                                     case 'variable':
-                                        $variableRight = $compilationContext->symbolTable->getVariableForRead($variableRight->getCode(), $compilationContext, $expression);
+                                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                            $variableRight->getCode(),
+                                            $compilationContext,
+                                            $expression
+                                        );
                                         switch ($variableRight->getType()) {
                                             case 'int':
-                                                return new CompiledExpression('double', 'zephir_safe_mod_zval_long('.$op1.', '.$variableRight->getName().')', $expression);
+                                                return new CompiledExpression(
+                                                    'double',
+                                                    'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
+                                                    ) . ')',
+                                                    $expression
+                                                );
 
                                             case 'double':
-                                                return new CompiledExpression('double', 'zephir_safe_mod_zval_double('.$op1.', '.$variableRight->getName().')', $expression);
+                                                return new CompiledExpression(
+                                                    'double',
+                                                    'zephir_safe_mod_zval_double(' . $op1 . ', ' . $variableRight->getName(
+                                                    ) . ')',
+                                                    $expression
+                                                );
 
                                             case 'bool':
-                                                return new CompiledExpression('bool', $op1.' '.$this->bitOperator.' '.$variableRight->getName(), $expression);
+                                                return new CompiledExpression(
+                                                    'bool',
+                                                    $op1 . ' ' . $this->bitOperator . ' ' . $variableRight->getName(),
+                                                    $expression
+                                                );
 
                                             case 'variable':
                                                 $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
                                                 $expected = $this->getExpected($compilationContext, $expression);
-                                                $symbol = $compilationContext->backend->getVariableCode($expected);
-                                                $compilationContext->codePrinter->output($this->zvalOperator.'('.$symbol.', '.$op1.', '.$op2.');');
+                                                $symbol   = $compilationContext->backend->getVariableCode($expected);
+                                                $compilationContext->codePrinter->output(
+                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'
+                                                );
 
-                                                return new CompiledExpression('variable', $expected->getName(), $expression);
+                                                return new CompiledExpression(
+                                                    'variable',
+                                                    $expected->getName(),
+                                                    $expression
+                                                );
 
                                             default:
-                                                throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                                throw new CompilerException(
+                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                                    ) . "')",
+                                                    $expression
+                                                );
                                         }
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate 'variable' with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate 'variable' with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Unknown '".$variableLeft->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Unknown '" . $variableLeft->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException('Unsupported type: '.$left->getType(), $expression);
+                throw new CompilerException(
+                    'Unsupported type: ' . $left->getType(),
+                    $expression
+                );
         }
     }
 }
diff --git a/src/Operators/Arithmetical/MulOperator.php b/src/Operators/Arithmetical/MulOperator.php
index bce444acfb..dba7fc2bd7 100644
--- a/src/Operators/Arithmetical/MulOperator.php
+++ b/src/Operators/Arithmetical/MulOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Arithmetical;
 
 /**
@@ -18,9 +18,7 @@
  */
 class MulOperator extends ArithmeticalBaseOperator
 {
-    protected string $operator = '*';
-
-    protected string $bitOperator = '+';
-
+    protected string $bitOperator  = '+';
+    protected string $operator     = '*';
     protected string $zvalOperator = 'mul_function';
 }
diff --git a/src/Operators/Arithmetical/SubOperator.php b/src/Operators/Arithmetical/SubOperator.php
index 0fe4ddcbff..343ad5784e 100644
--- a/src/Operators/Arithmetical/SubOperator.php
+++ b/src/Operators/Arithmetical/SubOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Arithmetical;
 
 /**
@@ -18,9 +18,7 @@
  */
 class SubOperator extends ArithmeticalBaseOperator
 {
-    protected string $operator = '-';
-
-    protected string $bitOperator = '&';
-
+    protected string $bitOperator  = '&';
+    protected string $operator     = '-';
     protected string $zvalOperator = 'zephir_sub_function';
 }
diff --git a/src/Operators/Bitwise/BitwiseAndOperator.php b/src/Operators/Bitwise/BitwiseAndOperator.php
index a682f51a14..5ba88a96be 100644
--- a/src/Operators/Bitwise/BitwiseAndOperator.php
+++ b/src/Operators/Bitwise/BitwiseAndOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,13 +9,13 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Bitwise;
 
 class BitwiseAndOperator extends BitwiseBaseOperator
 {
-    protected string $operator = '&';
-
-    protected string $bitOperator = '&';
-
+    protected string $bitOperator  = '&';
+    protected string $operator     = '&';
     protected string $zvalOperator = 'zephir_bitwise_and_function';
 }
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index a0f896cacb..65d01a7dc1 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -27,72 +27,6 @@ class BitwiseBaseOperator extends AbstractOperator
 {
     protected bool $literalOnly = true;
 
-    /**
-     * This tries to perform arithmetical operations
-     * Probably gcc/clang will optimize them without this optimization.
-     *
-     * @see https://en.wikipedia.org/wiki/Constant_folding
-     *
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression|null
-     */
-    public function optimizeConstantFolding(array $expression, CompilationContext $compilationContext): ?CompiledExpression
-    {
-        if (!$compilationContext->config->get('constant-folding', 'optimizations')) {
-            return null;
-        }
-
-        switch ($expression['left']['type']) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-                // continue to next switch
-                break;
-            default:
-                return null;
-                break;
-        }
-
-        switch ($expression['right']['type']) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-                // continue to operator switch
-                break;
-            default:
-                return null;
-                break;
-        }
-
-        /*
-         * Return value will be always int
-         */
-        switch ($this->operator) {
-            case '&':
-                return new CompiledExpression('int', $expression['left']['value'] & $expression['right']['value'], $expression);
-
-            case '|':
-                return new CompiledExpression('int', $expression['left']['value'] | $expression['right']['value'], $expression);
-
-            case '^':
-                return new CompiledExpression('int', $expression['left']['value'] ^ $expression['right']['value'], $expression);
-
-            case '<<':
-                return new CompiledExpression('int', $expression['left']['value'] << $expression['right']['value'], $expression);
-
-            case '>>':
-                return new CompiledExpression('int', $expression['left']['value'] >> $expression['right']['value'], $expression);
-        }
-
-        return null;
-    }
-
     /**
      * @param array              $expression
      * @param CompilationContext $compilationContext
@@ -139,40 +73,77 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'ulong':
                     case 'char':
                     case 'uchar':
-                        return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' (int) ('.$right->getCode().'))', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' (int) (' . $right->getCode() . '))',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'bool':
                             case 'ulong':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' (int) ('.$variableRight->getName().'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode(
+                                    ) . ' ' . $this->operator . ' (int) (' . $variableRight->getName() . '))',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $symbol = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' zephir_get_numberval('.$symbol.'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode(
+                                    ) . ' ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
+                                    $expression
+                                );
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
                         }
                         break;
                     default:
-                        throw new CompilerException("Cannot operate 'int' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'int' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -183,38 +154,73 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'long':
                     case 'ulong':
                     case 'double':
-                        return new CompiledExpression('int', '('.$left->getBooleanCode().' '.$this->bitOperator.'(('.$right->getCode().') ? 1 : 0))', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . '((' . $right->getCode(
+                            ) . ') ? 1 : 0))',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('int', '('.$left->getBooleanCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($expression['right']['value'], $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $expression['right']['value'],
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'bool':
                             case 'ulong':
-                                return new CompiledExpression('int', '((int) ('.$left->getBooleanCode().') '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getBooleanCode(
+                                    ) . ') ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('int', '((int) ('.$left->getBooleanCode().') '.$this->operator.' (int) ('.$variableRight->getName().'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getBooleanCode(
+                                    ) . ') ' . $this->operator . ' (int) (' . $variableRight->getName() . '))',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $symbol = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('int', '((int) ('.$left->getBooleanCode().') '.$this->operator.' zephir_get_numberval('.$symbol.'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getBooleanCode(
+                                    ) . ') ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
+                                    $expression
+                                );
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate ('bool') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate ('bool') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'bool' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -224,41 +230,81 @@ public function compile($expression, CompilationContext $compilationContext)
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '((int) (' . $left->getCode() . ') ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' (int) ('.$right->getCode().'))', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '((int) (' . $left->getCode() . ') ' . $this->operator . ' (int) (' . $right->getCode(
+                            ) . '))',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '((int) (' . $left->getCode() . ') ' . $this->operator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($expression['right']['value'], $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $expression['right']['value'],
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
                             case 'bool':
                             case 'ulong':
-                                return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getCode(
+                                    ) . ') ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' (int) ('.$variableRight->getName().'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getCode(
+                                    ) . ') ' . $this->operator . ' (int) (' . $variableRight->getName() . '))',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $symbol = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' zephir_get_numberval('.$symbol.'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getCode(
+                                    ) . ') ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
+                                    $expression
+                                );
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                    ) . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot operate 'double' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot operate 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -270,7 +316,11 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'variable':
-                $variableLeft = $compilationContext->symbolTable->getVariableForRead($left->resolve(null, $compilationContext), $compilationContext, $expression);
+                $variableLeft = $compilationContext->symbolTable->getVariableForRead(
+                    $left->resolve(null, $compilationContext),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableLeft->getType()) {
                     case 'int':
                     case 'uint':
@@ -286,10 +336,18 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'double':
                             case 'char':
                             case 'uchar':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
@@ -298,25 +356,47 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'char':
                                     case 'bool':
                                     case 'uchar':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' (int) ('.$variableRight->getName().'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' (int) (' . $variableRight->getName() . '))',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $symbol = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' (int) (zephir_get_numberval('.$symbol.')))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' (int) (zephir_get_numberval(' . $symbol . ')))',
+                                            $expression
+                                        );
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -326,40 +406,80 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('int', '('.$left->getCode().' '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' (int) ('.$variableRight->getName().'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' (int) (' . $variableRight->getName() . '))',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $symbol = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' zephir_get_numberval('.$symbol.'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
+                                            $expression
+                                        );
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -369,43 +489,89 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getCode() . ') ' . $this->operator . ' ' . $right->getCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'double':
-                                return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->operator.' (int) ('.$right->getCode().'))', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getCode(
+                                    ) . ') ' . $this->operator . ' (int) (' . $right->getCode() . '))',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('int', '((int) ('.$left->getCode().') '.$this->bitOperator.' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'int',
+                                    '((int) (' . $left->getCode(
+                                    ) . ') ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($expression['right']['value'], $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $expression['right']['value'],
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('int', '((int) ('.$variableLeft->getName().') '.$this->operator.'  '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '((int) (' . $variableLeft->getName(
+                                            ) . ') ' . $this->operator . '  ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
                                     case 'double':
-                                        return new CompiledExpression('int', '((int) ('.$variableLeft->getName().') '.$this->operator.' (int) ('.$variableRight->getName().'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '((int) (' . $variableLeft->getName(
+                                            ) . ') ' . $this->operator . ' (int) (' . $variableRight->getName() . '))',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('int', '((int) ('.$variableLeft->getName().') '.$this->bitOperator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '((int) (' . $variableLeft->getName(
+                                            ) . ') ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $symbol = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('int', '((int) ('.$variableLeft->getName().') '.$this->operator.' (int) (zephir_get_numberval('.$symbol.')))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '((int) (' . $variableLeft->getName(
+                                            ) . ') ' . $this->operator . ' (int) (zephir_get_numberval(' . $symbol . ')))',
+                                            $expression
+                                        );
 
                                         break;
 
                                     default:
-                                        throw new CompilerException("Cannot operate variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -420,20 +586,32 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'ulong':
                             case 'double':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $op = $this->operator;
+                                $op  = $this->operator;
                                 $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                                 $op2 = $right->getCode();
                                 if ('double' == $right->getType()) {
-                                    return new CompiledExpression('int', '((int) (zephir_get_numberval('.$op1.')) '.$op.' (int) ('.$op2.'))', $expression);
+                                    return new CompiledExpression(
+                                        'int',
+                                        '((int) (zephir_get_numberval(' . $op1 . ')) ' . $op . ' (int) (' . $op2 . '))',
+                                        $expression
+                                    );
                                 } else {
-                                    return new CompiledExpression('int', '((int) (zephir_get_numberval('.$op1.')) '.$op.' '.$op2.')', $expression);
+                                    return new CompiledExpression(
+                                        'int',
+                                        '((int) (zephir_get_numberval(' . $op1 . ')) ' . $op . ' ' . $op2 . ')',
+                                        $expression
+                                    );
                                 }
                                 break;
 
-                                /* a(var) + a(x) */
+                            /* a(var) + a(x) */
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
-                                $symbol = $compilationContext->backend->getVariableCode($variableLeft);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
+                                $symbol        = $compilationContext->backend->getVariableCode($variableLeft);
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
                                     case 'int':
@@ -442,25 +620,37 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'ulong':
                                         $compilationContext->headersManager->add('kernel/operators');
 
-                                        return new CompiledExpression('int', '((int) (zephir_get_numberval('.$symbol.')) '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
                                         break;
 
-                                        /* a(var) + a(bool) */
+                                    /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
 
-                                        return new CompiledExpression('int', '((int) (zephir_get_numberval('.$symbol.')) '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
                                         break;
 
-                                        /* a(var) + a(var) */
+                                    /* a(var) + a(var) */
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op1 = $symbol;
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        $expected = $this->getExpected($compilationContext, $expression);
+                                        $expected       = $this->getExpected($compilationContext, $expression);
                                         $expectedSymbol = $compilationContext->backend->getVariableCode($expected);
-                                        $compilationContext->codePrinter->output($this->zvalOperator.'('.$expectedSymbol.', '.$op1.', '.$op2.');');
+                                        $compilationContext->codePrinter->output(
+                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'
+                                        );
 
                                         if ($variableLeft->isTemporal()) {
                                             $variableLeft->setIdle(true);
@@ -472,22 +662,117 @@ public function compile($expression, CompilationContext $compilationContext)
                                         return new CompiledExpression('variable', $expected->getName(), $expression);
 
                                     default:
-                                        throw new CompilerException("Cannot operate 'variable' with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot operate 'variable' with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Unknown '".$variableLeft->getType()."'", $expression);
+                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unsupported type: '.$left->getType(), $expression);
+                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
         }
     }
+
+    /**
+     * This tries to perform arithmetical operations
+     * Probably gcc/clang will optimize them without this optimization.
+     *
+     * @see https://en.wikipedia.org/wiki/Constant_folding
+     *
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression|null
+     */
+    public function optimizeConstantFolding(
+        array $expression,
+        CompilationContext $compilationContext
+    ): ?CompiledExpression {
+        if (!$compilationContext->config->get('constant-folding', 'optimizations')) {
+            return null;
+        }
+
+        switch ($expression['left']['type']) {
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+            case 'double':
+                // continue to next switch
+                break;
+            default:
+                return null;
+                break;
+        }
+
+        switch ($expression['right']['type']) {
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+            case 'double':
+                // continue to operator switch
+                break;
+            default:
+                return null;
+                break;
+        }
+
+        /*
+         * Return value will be always int
+         */
+        switch ($this->operator) {
+            case '&':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] & $expression['right']['value'],
+                    $expression
+                );
+
+            case '|':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] | $expression['right']['value'],
+                    $expression
+                );
+
+            case '^':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] ^ $expression['right']['value'],
+                    $expression
+                );
+
+            case '<<':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] << $expression['right']['value'],
+                    $expression
+                );
+
+            case '>>':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] >> $expression['right']['value'],
+                    $expression
+                );
+        }
+
+        return null;
+    }
 }
diff --git a/src/Operators/Bitwise/BitwiseNotOperator.php b/src/Operators/Bitwise/BitwiseNotOperator.php
index e7a7b2dd07..6395803a65 100644
--- a/src/Operators/Bitwise/BitwiseNotOperator.php
+++ b/src/Operators/Bitwise/BitwiseNotOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Bitwise;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -28,7 +29,7 @@ class BitwiseNotOperator extends AbstractOperator
      *
      * @return CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile($expression, CompilationContext $compilationContext)
@@ -47,30 +48,38 @@ public function compile($expression, CompilationContext $compilationContext)
             case 'uint':
             case 'long':
             case 'ulong':
-                return new CompiledExpression('int', '~('.$left->getCode().')', $expression);
+                return new CompiledExpression('int', '~(' . $left->getCode() . ')', $expression);
 
             case 'variable':
-                $variable = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression['left']);
+                $variable = $compilationContext->symbolTable->getVariableForRead(
+                    $left->getCode(),
+                    $compilationContext,
+                    $expression['left']
+                );
                 switch ($variable->getType()) {
                     case 'bool':
                     case 'int':
                     case 'uint':
                     case 'long':
-                        return new CompiledExpression('int', '~'.$variable->getName(), $expression);
+                        return new CompiledExpression('int', '~' . $variable->getName(), $expression);
 
                     case 'variable':
                     case 'mixed':
                         $compilationContext->headersManager->add('kernel/operators');
 
-                        return new CompiledExpression('int', '~zephir_get_intval('.$variable->getName().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '~zephir_get_intval(' . $variable->getName() . ')',
+                            $expression
+                        );
 
                     default:
-                        throw new CompilerException('Unknown type: '.$variable->getType(), $expression);
+                        throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type: '.$left->getType(), $expression);
+                throw new CompilerException('Unknown type: ' . $left->getType(), $expression);
         }
     }
 }
diff --git a/src/Operators/Bitwise/BitwiseOrOperator.php b/src/Operators/Bitwise/BitwiseOrOperator.php
index f7d60420eb..46837cdaca 100644
--- a/src/Operators/Bitwise/BitwiseOrOperator.php
+++ b/src/Operators/Bitwise/BitwiseOrOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,13 +9,13 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Bitwise;
 
 class BitwiseOrOperator extends BitwiseBaseOperator
 {
-    protected string $operator = '|';
-
-    protected string $bitOperator = '|';
-
+    protected string $bitOperator  = '|';
+    protected string $operator     = '|';
     protected string $zvalOperator = 'zephir_bitwise_or_function';
 }
diff --git a/src/Operators/Bitwise/BitwiseXorOperator.php b/src/Operators/Bitwise/BitwiseXorOperator.php
index d440bf45ab..8a882f95c2 100644
--- a/src/Operators/Bitwise/BitwiseXorOperator.php
+++ b/src/Operators/Bitwise/BitwiseXorOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,13 +9,13 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Bitwise;
 
 class BitwiseXorOperator extends BitwiseBaseOperator
 {
-    protected string $operator = '^';
-
-    protected string $bitOperator = '^';
-
+    protected string $bitOperator  = '^';
+    protected string $operator     = '^';
     protected string $zvalOperator = 'zephir_bitwise_xor_function';
 }
diff --git a/src/Operators/Bitwise/ShiftLeftOperator.php b/src/Operators/Bitwise/ShiftLeftOperator.php
index e2eeb7920c..c796e39918 100644
--- a/src/Operators/Bitwise/ShiftLeftOperator.php
+++ b/src/Operators/Bitwise/ShiftLeftOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,13 +9,13 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Bitwise;
 
 class ShiftLeftOperator extends BitwiseBaseOperator
 {
-    protected string $operator = '<<';
-
-    protected string $bitOperator = '<<';
-
+    protected string $bitOperator  = '<<';
+    protected string $operator     = '<<';
     protected string $zvalOperator = 'zephir_shift_left_function';
 }
diff --git a/src/Operators/Bitwise/ShiftRightOperator.php b/src/Operators/Bitwise/ShiftRightOperator.php
index 688d1cd622..c15a210850 100644
--- a/src/Operators/Bitwise/ShiftRightOperator.php
+++ b/src/Operators/Bitwise/ShiftRightOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,13 +9,13 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Bitwise;
 
 class ShiftRightOperator extends BitwiseBaseOperator
 {
-    protected string $operator = '>>';
-
-    protected string $bitOperator = '>>';
-
+    protected string $bitOperator  = '>>';
+    protected string $operator     = '>>';
     protected string $zvalOperator = 'zephir_shift_right_function';
 }
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index 887c24f8ec..9a5f0d9244 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Comparison;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -27,140 +28,6 @@ class ComparisonBaseOperator extends AbstractOperator
 {
     protected bool $commutative = false;
 
-    /**
-     * @param array              $expr
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression|null
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function optimizeTypeOf(array $expr, CompilationContext $compilationContext): ?CompiledExpression
-    {
-        if (!isset($expr['left'])) {
-            return null;
-        }
-
-        if (!isset($expr['right']) && !isset($expr['right']['value'])) {
-            return null;
-        }
-
-        if ('typeof' !== $expr['left']['type']) {
-            return null;
-        }
-
-        if ('string' !== $expr['right']['type']) {
-            $compilationContext->logger->warning(
-                "Possible invalid comparison for 'typeof' operator with non-string",
-                ['invalid-typeof-comparison', $expr['right']]
-            );
-
-            return null;
-        }
-
-        switch ($expr['type']) {
-            case 'identical':
-            case 'equals':
-                $operator = '==';
-                break;
-
-            case 'not-identical':
-            case 'not-equals':
-                $operator = '!=';
-                break;
-
-            default:
-                return null;
-        }
-
-        $code = (new Expression($expr['left']['left']))->compile($compilationContext)->getCode();
-        $variableVariable = $compilationContext->symbolTable->getVariableForRead($code, $compilationContext, $expr);
-
-        if ('string' !== $expr['right']['type']) {
-            throw new CompilerException('Right expression of typeof operator must be "string" type', $expr['right']);
-        }
-
-        $value = strtolower($expr['right']['value']);
-
-        switch ($variableVariable->getType()) {
-            case 'double':
-                switch ($value) {
-                    case 'double':
-                    case 'float':
-                        $condition = '1 '.$operator.' 1';
-                        break;
-
-                    default:
-                        $condition = '1 '.$operator.' 0';
-                        break;
-                }
-                break;
-
-            case 'int':
-            case 'integer':
-            case 'long':
-                switch ($value) {
-                    case 'int':
-                    case 'integer':
-                    case 'long':
-                        $condition = '1 '.$operator.' 1';
-                        break;
-
-                    default:
-                        $condition = '1 '.$operator.' 0';
-                        break;
-                }
-                break;
-
-            case 'bool':
-                switch ($value) {
-                    case 'bool':
-                    case 'boolean':
-                        $condition = '1 '.$operator.' 1';
-                        break;
-
-                    default:
-                        $condition = '1 '.$operator.' 0';
-                        break;
-                }
-                break;
-
-            case 'array':
-                switch ($value) {
-                    case 'array':
-                        $condition = '1 '.$operator.' 1';
-                        break;
-
-                    default:
-                        $condition = '1 '.$operator.' 0';
-                        break;
-                }
-                break;
-
-            case 'string':
-                switch ($value) {
-                    case 'string':
-                        $condition = '1 '.$operator.' 1';
-                        break;
-
-                    default:
-                        $condition = '1 '.$operator.' 0';
-                        break;
-                }
-                break;
-
-            case 'variable':
-                $condition = $compilationContext->backend->getTypeofCondition($variableVariable, $operator, $value);
-                break;
-
-            default:
-                return null;
-        }
-
-        return new CompiledExpression('bool', $condition, $expr);
-    }
-
     /**
      * Compile the expression.
      *
@@ -169,7 +36,7 @@ public function optimizeTypeOf(array $expr, CompilationContext $compilationConte
      *
      * @return CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext)
@@ -199,23 +66,39 @@ public function compile(array $expression, CompilationContext $compilationContex
             case 'null':
                 switch ($right->getType()) {
                     case 'null':
-                        return new CompiledExpression('bool', '(0 '.$this->operator.' 0)', $expression);
+                        return new CompiledExpression('bool', '(0 ' . $this->operator . ' 0)', $expression);
 
                     case 'int':
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('bool', '(0 '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(0 ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'char':
                     case 'uchar':
-                        return new CompiledExpression('bool', '(\'\\0\' '.$this->operator.' \''.$right->getCode().'\')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(\'\\0\' ' . $this->operator . ' \'' . $right->getCode() . '\')',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('bool', '(0 '.$this->operator.' (int) '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(0 ' . $this->operator . ' (int) ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression['left']
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
@@ -224,23 +107,34 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case 'double':
                                 $compilationContext->headersManager->add('kernel/operators');
 
-                                return new CompiledExpression('bool', '0 '.$this->operator.' '.$variableRight->getName(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '0 ' . $this->operator . ' ' . $variableRight->getName(),
+                                    $expression
+                                );
 
                             case 'variable':
                             case 'mixed':
                             case 'string':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $condition = $compilationContext->backend->getTypeofCondition($variableRight, $this->operator, 'null');
+                                $condition = $compilationContext->backend->getTypeofCondition(
+                                    $variableRight,
+                                    $this->operator,
+                                    'null'
+                                );
 
                                 return new CompiledExpression('bool', $condition, $expression);
 
                             default:
-                                throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                throw new CompilerException(
+                                    'Unknown type: ' . $variableRight->getType(),
+                                    $expression['right']
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type: '.$right->getType(), $expression);
+                        throw new CompilerException('Unknown type: ' . $right->getType(), $expression);
                 }
                 break;
 
@@ -253,23 +147,39 @@ public function compile(array $expression, CompilationContext $compilationContex
             case 'uchar':
                 switch ($right->getType()) {
                     case 'null':
-                        return new CompiledExpression('bool', $left->getCode().' '.$this->operator, $expression);
+                        return new CompiledExpression('bool', $left->getCode() . ' ' . $this->operator, $expression);
 
                     case 'int':
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$right->getCode(), $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode(),
+                            $expression
+                        );
 
                     case 'char':
                     case 'uchar':
-                        return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' \''.$right->getCode().'\'', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getCode() . ' ' . $this->operator . ' \'' . $right->getCode() . '\'',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' (int) '.$right->getCode(), $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getCode() . ' ' . $this->operator . ' (int) ' . $right->getCode(),
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression['left']
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
@@ -278,48 +188,86 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case 'double':
                                 $compilationContext->headersManager->add('kernel/operators');
 
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$variableRight->getName(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(),
+                                    $expression
+                                );
 
                             case 'variable':
                             case 'mixed':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $variableCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('bool', $this->zvalLongNegOperator.'('.$variableCode.', '.$left->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalLongNegOperator . '(' . $variableCode . ', ' . $left->getCode() . ')',
+                                    $expression
+                                );
 
                             default:
-                                throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                throw new CompilerException(
+                                    'Unknown type: ' . $variableRight->getType(),
+                                    $expression['right']
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Cannot compare '.$left->getType().' with '.$right->getType(), $expression);
+                        throw new CompilerException(
+                            'Cannot compare ' . $left->getType() . ' with ' . $right->getType(),
+                            $expression
+                        );
                 }
                 break;
 
             case 'bool':
                 switch ($right->getType()) {
                     case 'null':
-                        return new CompiledExpression('bool', $left->getBooleanCode().' '.$this->operator.' 0', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getBooleanCode() . ' ' . $this->operator . ' 0',
+                            $expression
+                        );
 
                     case 'int':
                     case 'uint':
                     case 'long':
                     case 'ulong':
-                        return new CompiledExpression('bool', $left->getBooleanCode().' '.$this->operator.' '.$right->getCode(), $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getBooleanCode() . ' ' . $this->operator . ' ' . $right->getCode(),
+                            $expression
+                        );
 
                     case 'char':
                     case 'uchar':
-                        return new CompiledExpression('bool', $left->getBooleanCode().' '.$this->operator.' \''.$right->getCode().'\'', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getBooleanCode() . ' ' . $this->operator . ' \'' . $right->getCode() . '\'',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('bool', $left->getBooleanCode().' '.$this->operator.' (int) '.$right->getCode(), $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getBooleanCode() . ' ' . $this->operator . ' (int) ' . $right->getCode(),
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', $left->getBooleanCode().' '.$this->operator.' '.$right->getBooleanCode(), $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            $left->getBooleanCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode(),
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression['left']
+                        );
                         switch ($variableRight->getType()) {
                             case 'int':
                             case 'uint':
@@ -328,27 +276,45 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case 'double':
                                 $compilationContext->headersManager->add('kernel/operators');
 
-                                return new CompiledExpression('bool', $left->getBooleanCode().' '.$this->operator.' '.$variableRight->getName(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getBooleanCode() . ' ' . $this->operator . ' ' . $variableRight->getName(),
+                                    $expression
+                                );
 
                             case 'variable':
                             case 'mixed':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $boolOperator = '1' == $left->getBooleanCode() ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;
+                                $boolOperator  = '1' == $left->getBooleanCode(
+                                ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;
                                 $variableRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('bool', $boolOperator.'('.$variableRight.')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $boolOperator . '(' . $variableRight . ')',
+                                    $expression
+                                );
                             default:
-                                throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                throw new CompilerException(
+                                    'Unknown type: ' . $variableRight->getType(),
+                                    $expression['right']
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Cannot compare '.$left->getType().' with '.$right->getType(), $expression);
+                        throw new CompilerException(
+                            'Cannot compare ' . $left->getType() . ' with ' . $right->getType(),
+                            $expression
+                        );
                 }
                 break;
 
             case 'string':
-                $variableLeft = $compilationContext->symbolTable->getTempLocalVariableForWrite('variable', $compilationContext);
+                $variableLeft     = $compilationContext->symbolTable->getTempLocalVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
                 $variableLeftCode = $compilationContext->backend->getVariableCode($variableLeft);
                 $compilationContext->backend->assignString(
                     $variableLeft,
@@ -358,17 +324,29 @@ public function compile(array $expression, CompilationContext $compilationContex
                 );
                 switch ($right->getType()) {
                     case 'null':
-                        return new CompiledExpression('bool', $this->zvalNullOperator.'('.$variableLeftCode.')', $expression['left']);
+                        return new CompiledExpression(
+                            'bool',
+                            $this->zvalNullOperator . '(' . $variableLeftCode . ')',
+                            $expression['left']
+                        );
                         break;
 
                     case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
 
-                        return new CompiledExpression('bool', $this->zvalStringOperator.'('.$variableLeftCode.', "'.$right->getCode().'")', $expression['left']);
+                        return new CompiledExpression(
+                            'bool',
+                            $this->zvalStringOperator . '(' . $variableLeftCode . ', "' . $right->getCode() . '")',
+                            $expression['left']
+                        );
                         break;
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression['left']
+                        );
                         switch ($variableRight->getType()) {
                             case 'string':
                             case 'variable':
@@ -376,21 +354,32 @@ public function compile(array $expression, CompilationContext $compilationContex
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $variableRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('bool', $this->zvalOperator.'('.$variableLeftCode.', '.$variableRight.')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalOperator . '(' . $variableLeftCode . ', ' . $variableRight . ')',
+                                    $expression
+                                );
                                 break;
 
                             default:
-                                throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                throw new CompilerException(
+                                    'Unknown type: ' . $variableRight->getType(),
+                                    $expression['right']
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type: '.$right->getType(), $expression['left']);
+                        throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                 }
                 break;
 
             case 'variable':
-                $variable = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression['left']);
+                $variable     = $compilationContext->symbolTable->getVariableForRead(
+                    $left->getCode(),
+                    $compilationContext,
+                    $expression['left']
+                );
                 $variableCode = $compilationContext->backend->getVariableCode($variable);
                 switch ($variable->getType()) {
                     case 'int':
@@ -405,17 +394,33 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case 'long':
                             case 'ulong':
                             case 'double':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$right->getCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode(),
+                                    $expression
+                                );
 
                             case 'char':
                             case 'uchar':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' \''.$right->getCode().'\'', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' \'' . $right->getCode() . '\'',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$right->getBooleanCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode(),
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['left']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
@@ -424,24 +429,41 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     case 'char':
                                     case 'uchar':
                                     case 'double':
-                                        return new CompiledExpression('bool', $variable->getName().' '.$this->operator.' '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $variable->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'variable':
                                     case 'mixed':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
-                                        $variableCode = $compilationContext->backend->getVariableCode($variable);
-
-                                        return new CompiledExpression('bool', $this->zvalLongNegOperator.'('.$variableRightCode.', '.$variableCode.')', $expression);
+                                        $variableRightCode = $compilationContext->backend->getVariableCode(
+                                            $variableRight
+                                        );
+                                        $variableCode      = $compilationContext->backend->getVariableCode($variable);
+
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalLongNegOperator . '(' . $variableRightCode . ', ' . $variableCode . ')',
+                                            $expression
+                                        );
                                         break;
 
                                     default:
-                                        throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                        throw new CompilerException(
+                                            'Unknown type: ' . $variableRight->getType(),
+                                            $expression['right']
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException('Cannot compare variable: '.$variable->getType().' with: '.$right->getType(), $expression);
+                                throw new CompilerException(
+                                    'Cannot compare variable: ' . $variable->getType() . ' with: ' . $right->getType(),
+                                    $expression
+                                );
                         }
                         break;
 
@@ -452,56 +474,105 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case 'long':
                             case 'ulong':
                             case 'double':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$right->getCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode(),
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$right->getBooleanCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode(),
+                                    $expression
+                                );
 
                             case 'char':
                             case 'uchar':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' \''.$right->getCode().'\'', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' \'' . $right->getCode() . '\'',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['left']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
                                     case 'double':
-                                        return new CompiledExpression('bool', $variable->getName().' '.$this->operator.' '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $variable->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'variable':
                                     case 'mixed':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
-                                        $variableCode = $compilationContext->backend->getVariableCode($variable);
+                                        $variableRightCode = $compilationContext->backend->getVariableCode(
+                                            $variableRight
+                                        );
+                                        $variableCode      = $compilationContext->backend->getVariableCode($variable);
 
-                                        return new CompiledExpression('bool', $this->zvalDoubleNegOperator.'('.$variableRightCode.', '.$variableCode.')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalDoubleNegOperator . '(' . $variableRightCode . ', ' . $variableCode . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                        throw new CompilerException(
+                                            'Unknown type: ' . $variableRight->getType(),
+                                            $expression['right']
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException('Cannot compare variable: '.$variable->getType().' with: '.$right->getType(), $expression);
+                                throw new CompilerException(
+                                    'Cannot compare variable: ' . $variable->getType() . ' with: ' . $right->getType(),
+                                    $expression
+                                );
                         }
                         break;
 
                     case 'bool':
                         switch ($right->getType()) {
                             case 'int':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$right->getCode(), $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode(),
+                                    $expression['left']
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' '.$right->getBooleanCode(), $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode(),
+                                    $expression['left']
+                                );
 
                             case 'null':
-                                return new CompiledExpression('bool', $left->getCode().' '.$this->operator.' 0', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $left->getCode() . ' ' . $this->operator . ' 0',
+                                    $expression['left']
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['left']
+                                );
 
                                 switch ($variableRight->getType()) {
                                     case 'int':
@@ -510,33 +581,59 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     case 'ulong':
                                     case 'bool':
                                     case 'double':
-                                        return new CompiledExpression('bool', $variable->getName().' '.$this->operator.' '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $variable->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'variable':
                                     case 'mixed':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        $boolOperator = '1' == $left->getBooleanCode() ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;
-                                        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
-
-                                        return new CompiledExpression('bool', $boolOperator.'('.$variableRightCode.')', $expression);
+                                        $boolOperator      = '1' == $left->getBooleanCode(
+                                        ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;
+                                        $variableRightCode = $compilationContext->backend->getVariableCode(
+                                            $variableRight
+                                        );
+
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $boolOperator . '(' . $variableRightCode . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                        throw new CompilerException(
+                                            'Unknown type: ' . $variableRight->getType(),
+                                            $expression['right']
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException('Cannot compare variable: '.$variable->getType().' with: '.$right->getType(), $expression);
+                                throw new CompilerException(
+                                    'Cannot compare variable: ' . $variable->getType() . ' with: ' . $right->getType(),
+                                    $expression
+                                );
                         }
                         break;
 
                     case 'array':
                         switch ($right->getType()) {
                             case 'null':
-                                return new CompiledExpression('bool', $this->zvalNullOperator.'('.$variableCode.')', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalNullOperator . '(' . $variableCode . ')',
+                                    $expression['left']
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['left']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'string':
                                     case 'variable':
@@ -545,15 +642,22 @@ public function compile(array $expression, CompilationContext $compilationContex
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('bool', $this->zvalOperator.'('.$variableCode.', '.$variableRight.')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalOperator . '(' . $variableCode . ', ' . $variableRight . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                        throw new CompilerException(
+                                            'Unknown type: ' . $variableRight->getType(),
+                                            $expression['right']
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException('Unknown type: '.$right->getType(), $expression['left']);
+                                throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
                         break;
 
@@ -562,13 +666,25 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                         switch ($right->getType()) {
                             case 'null':
-                                return new CompiledExpression('bool', $this->zvalNullOperator.'('.$variableCode.')', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalNullOperator . '(' . $variableCode . ')',
+                                    $expression['left']
+                                );
 
                             case 'string':
-                                return new CompiledExpression('bool', $this->zvalStringOperator.'('.$variableCode.', "'.$right->getCode().'")', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalStringOperator . '(' . $variableCode . ', "' . $right->getCode() . '")',
+                                    $expression['left']
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['left']
+                                );
 
                                 switch ($variableRight->getType()) {
                                     case 'string':
@@ -576,15 +692,22 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     case 'mixed':
                                         $variableRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('bool', $this->zvalOperator.'('.$variableCode.', '.$variableRight.')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalOperator . '(' . $variableCode . ', ' . $variableRight . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                        throw new CompilerException(
+                                            'Unknown type: ' . $variableRight->getType(),
+                                            $expression['right']
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException('Unknown type: '.$right->getType(), $expression['left']);
+                                throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
                         break;
 
@@ -594,7 +717,11 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                         switch ($right->getType()) {
                             case 'null':
-                                $condition = $compilationContext->backend->getTypeofCondition($variable, $this->operator, 'null');
+                                $condition = $compilationContext->backend->getTypeofCondition(
+                                    $variable,
+                                    $this->operator,
+                                    'null'
+                                );
 
                                 return new CompiledExpression('bool', $condition, $expression['left']);
 
@@ -603,34 +730,70 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case 'long':
                             case 'ulong':
                             case 'double':
-                                return new CompiledExpression('bool', $this->zvalLongOperator.'('.$variableCode.', '.$right->getCode().')', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalLongOperator . '(' . $variableCode . ', ' . $right->getCode() . ')',
+                                    $expression['left']
+                                );
 
                             case 'char':
                             case 'uchar':
-                                return new CompiledExpression('bool', $this->zvalLongOperator.'('.$variableCode.', \''.$right->getCode().'\')', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalLongOperator . '(' . $variableCode . ', \'' . $right->getCode() . '\')',
+                                    $expression['left']
+                                );
 
                             case 'bool':
-                                $zvalBoolOperator = 'true' === $right->getCode() ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;
+                                $zvalBoolOperator = 'true' === $right->getCode(
+                                ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;
 
-                                return new CompiledExpression('bool', $zvalBoolOperator.'('.$variableCode.')', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $zvalBoolOperator . '(' . $variableCode . ')',
+                                    $expression['left']
+                                );
 
                             case 'string':
-                                return new CompiledExpression('bool', $this->zvalStringOperator.'('.$variableCode.', "'.$right->getCode().'")', $expression['left']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $this->zvalStringOperator . '(' . $variableCode . ', "' . $right->getCode() . '")',
+                                    $expression['left']
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['left']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['left']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        return new CompiledExpression('bool', $this->zvalLongOperator.'('.$variableCode.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalLongOperator . '(' . $variableCode . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('bool', $this->zvalDoubleOperator.'('.$variableCode.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalDoubleOperator . '(' . $variableCode . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', $this->zvalBoolOperator.'('.$variableCode.', '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalBoolOperator . '(' . $variableCode . ', ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
 
                                     case 'string':
                                     case 'variable':
@@ -638,25 +801,166 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     case 'array':
                                         $variableRight = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('bool', $this->zvalOperator.'('.$variableCode.', '.$variableRight.')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $this->zvalOperator . '(' . $variableCode . ', ' . $variableRight . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException('Unknown type: '.$variableRight->getType(), $expression['right']);
+                                        throw new CompilerException(
+                                            'Unknown type: ' . $variableRight->getType(),
+                                            $expression['right']
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException('Unknown type: '.$right->getType(), $expression['left']);
+                                throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type: '.$variable->getType(), $expression);
+                        throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type: '.$left->getType(), $expression);
+                throw new CompilerException('Unknown type: ' . $left->getType(), $expression);
+        }
+    }
+
+    /**
+     * @param array              $expr
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression|null
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function optimizeTypeOf(array $expr, CompilationContext $compilationContext): ?CompiledExpression
+    {
+        if (!isset($expr['left'])) {
+            return null;
+        }
+
+        if (!isset($expr['right']) && !isset($expr['right']['value'])) {
+            return null;
+        }
+
+        if ('typeof' !== $expr['left']['type']) {
+            return null;
         }
+
+        if ('string' !== $expr['right']['type']) {
+            $compilationContext->logger->warning(
+                "Possible invalid comparison for 'typeof' operator with non-string",
+                ['invalid-typeof-comparison', $expr['right']]
+            );
+
+            return null;
+        }
+
+        switch ($expr['type']) {
+            case 'identical':
+            case 'equals':
+                $operator = '==';
+                break;
+
+            case 'not-identical':
+            case 'not-equals':
+                $operator = '!=';
+                break;
+
+            default:
+                return null;
+        }
+
+        $code             = (new Expression($expr['left']['left']))->compile($compilationContext)->getCode();
+        $variableVariable = $compilationContext->symbolTable->getVariableForRead($code, $compilationContext, $expr);
+
+        if ('string' !== $expr['right']['type']) {
+            throw new CompilerException('Right expression of typeof operator must be "string" type', $expr['right']);
+        }
+
+        $value = strtolower($expr['right']['value']);
+
+        switch ($variableVariable->getType()) {
+            case 'double':
+                switch ($value) {
+                    case 'double':
+                    case 'float':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
+                break;
+
+            case 'int':
+            case 'integer':
+            case 'long':
+                switch ($value) {
+                    case 'int':
+                    case 'integer':
+                    case 'long':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
+                break;
+
+            case 'bool':
+                switch ($value) {
+                    case 'bool':
+                    case 'boolean':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
+                break;
+
+            case 'array':
+                switch ($value) {
+                    case 'array':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
+                break;
+
+            case 'string':
+                switch ($value) {
+                    case 'string':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
+                break;
+
+            case 'variable':
+                $condition = $compilationContext->backend->getTypeofCondition($variableVariable, $operator, $value);
+                break;
+
+            default:
+                return null;
+        }
+
+        return new CompiledExpression('bool', $condition, $expr);
     }
 }
diff --git a/src/Operators/Comparison/EqualsOperator.php b/src/Operators/Comparison/EqualsOperator.php
index f61aefc135..acb8ff8891 100644
--- a/src/Operators/Comparison/EqualsOperator.php
+++ b/src/Operators/Comparison/EqualsOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,29 +9,21 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class EqualsOperator extends ComparisonBaseOperator
 {
-    protected bool $commutative = true;
-
-    protected string $operator = '==';
-
-    protected string $bitOperator = '==';
-
-    protected string $zvalOperator = 'ZEPHIR_IS_EQUAL';
-
-    protected string $zvalLongOperator = 'ZEPHIR_IS_LONG';
-
-    protected string $zvalLongNegOperator = 'ZEPHIR_IS_LONG';
-
-    protected string $zvalStringOperator = 'ZEPHIR_IS_STRING';
-
-    protected string $zvalBoolOperator = 'ZEPHIR_IS_BOOL_VALUE';
-
-    protected string $zvalBoolTrueOperator = 'ZEPHIR_IS_TRUE';
-
+    protected string $bitOperator           = '==';
+    protected bool   $commutative           = true;
+    protected string $operator              = '==';
     protected string $zvalBoolFalseOperator = 'ZEPHIR_IS_FALSE';
-
-    protected string $zvalNullOperator = 'ZEPHIR_IS_NULL';
+    protected string $zvalBoolOperator      = 'ZEPHIR_IS_BOOL_VALUE';
+    protected string $zvalBoolTrueOperator  = 'ZEPHIR_IS_TRUE';
+    protected string $zvalLongNegOperator   = 'ZEPHIR_IS_LONG';
+    protected string $zvalLongOperator      = 'ZEPHIR_IS_LONG';
+    protected string $zvalNullOperator      = 'ZEPHIR_IS_NULL';
+    protected string $zvalOperator          = 'ZEPHIR_IS_EQUAL';
+    protected string $zvalStringOperator    = 'ZEPHIR_IS_STRING';
 }
diff --git a/src/Operators/Comparison/GreaterEqualOperator.php b/src/Operators/Comparison/GreaterEqualOperator.php
index 00d2bed1e8..54595fe554 100644
--- a/src/Operators/Comparison/GreaterEqualOperator.php
+++ b/src/Operators/Comparison/GreaterEqualOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,21 +9,17 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class GreaterEqualOperator extends ComparisonBaseOperator
 {
-    protected string $operator = '>=';
-
-    protected string $bitOperator = '>=';
-
-    protected string $zvalOperator = 'ZEPHIR_GE';
-
-    protected string $zvalLongOperator = 'ZEPHIR_GE_LONG';
-
-    protected string $zvalLongNegOperator = 'ZEPHIR_LE_LONG';
-
-    protected string $zvalDoubleOperator = '!ZEPHIR_LT_DOUBLE';
-
+    protected string $bitOperator           = '>=';
+    protected string $operator              = '>=';
     protected string $zvalDoubleNegOperator = '!ZEPHIR_GT_DOUBLE';
+    protected string $zvalDoubleOperator    = '!ZEPHIR_LT_DOUBLE';
+    protected string $zvalLongNegOperator   = 'ZEPHIR_LE_LONG';
+    protected string $zvalLongOperator      = 'ZEPHIR_GE_LONG';
+    protected string $zvalOperator          = 'ZEPHIR_GE';
 }
diff --git a/src/Operators/Comparison/GreaterOperator.php b/src/Operators/Comparison/GreaterOperator.php
index 74399fda81..b4dbae682c 100644
--- a/src/Operators/Comparison/GreaterOperator.php
+++ b/src/Operators/Comparison/GreaterOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,21 +9,17 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class GreaterOperator extends ComparisonBaseOperator
 {
-    protected string $operator = '>';
-
-    protected string $bitOperator = '>';
-
-    protected string $zvalOperator = 'ZEPHIR_GT';
-
-    protected string $zvalLongOperator = 'ZEPHIR_GT_LONG';
-
-    protected string $zvalLongNegOperator = 'ZEPHIR_LT_LONG';
-
-    protected string $zvalDoubleOperator = 'ZEPHIR_GT_DOUBLE';
-
+    protected string $bitOperator           = '>';
+    protected string $operator              = '>';
     protected string $zvalDoubleNegOperator = 'ZEPHIR_LT_DOUBLE';
+    protected string $zvalDoubleOperator    = 'ZEPHIR_GT_DOUBLE';
+    protected string $zvalLongNegOperator   = 'ZEPHIR_LT_LONG';
+    protected string $zvalLongOperator      = 'ZEPHIR_GT_LONG';
+    protected string $zvalOperator          = 'ZEPHIR_GT';
 }
diff --git a/src/Operators/Comparison/IdenticalOperator.php b/src/Operators/Comparison/IdenticalOperator.php
index 1dc122790d..c67a1f71e6 100644
--- a/src/Operators/Comparison/IdenticalOperator.php
+++ b/src/Operators/Comparison/IdenticalOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,29 +9,21 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class IdenticalOperator extends ComparisonBaseOperator
 {
-    protected bool $commutative = true;
-
-    protected string $operator = '==';
-
-    protected string $bitOperator = '==';
-
-    protected string $zvalOperator = 'ZEPHIR_IS_IDENTICAL';
-
-    protected string $zvalLongOperator = 'ZEPHIR_IS_LONG_IDENTICAL';
-
-    protected string $zvalLongNegOperator = 'ZEPHIR_IS_LONG_IDENTICAL';
-
-    protected string $zvalStringOperator = 'ZEPHIR_IS_STRING_IDENTICAL';
-
-    protected string $zvalBoolOperator = 'ZEPHIR_IS_BOOL_IDENTICAL';
-
-    protected string $zvalBoolTrueOperator = 'ZEPHIR_IS_TRUE_IDENTICAL';
-
+    protected string $bitOperator           = '==';
+    protected bool   $commutative           = true;
+    protected string $operator              = '==';
     protected string $zvalBoolFalseOperator = 'ZEPHIR_IS_FALSE_IDENTICAL';
-
-    protected string $zvalNullOperator = 'ZEPHIR_IS_NULL';
+    protected string $zvalBoolOperator      = 'ZEPHIR_IS_BOOL_IDENTICAL';
+    protected string $zvalBoolTrueOperator  = 'ZEPHIR_IS_TRUE_IDENTICAL';
+    protected string $zvalLongNegOperator   = 'ZEPHIR_IS_LONG_IDENTICAL';
+    protected string $zvalLongOperator      = 'ZEPHIR_IS_LONG_IDENTICAL';
+    protected string $zvalNullOperator      = 'ZEPHIR_IS_NULL';
+    protected string $zvalOperator          = 'ZEPHIR_IS_IDENTICAL';
+    protected string $zvalStringOperator    = 'ZEPHIR_IS_STRING_IDENTICAL';
 }
diff --git a/src/Operators/Comparison/LessEqualOperator.php b/src/Operators/Comparison/LessEqualOperator.php
index aa65b56b27..f2a1d31fdf 100644
--- a/src/Operators/Comparison/LessEqualOperator.php
+++ b/src/Operators/Comparison/LessEqualOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,21 +9,17 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class LessEqualOperator extends ComparisonBaseOperator
 {
-    protected string $operator = '<=';
-
-    protected string $bitOperator = '<=';
-
-    protected string $zvalOperator = 'ZEPHIR_LE';
-
-    protected string $zvalLongOperator = 'ZEPHIR_LE_LONG';
-
-    protected string $zvalLongNegOperator = 'ZEPHIR_GE_LONG';
-
-    protected string $zvalDoubleOperator = '!ZEPHIR_GT_DOUBLE';
-
+    protected string $bitOperator           = '<=';
+    protected string $operator              = '<=';
     protected string $zvalDoubleNegOperator = '!ZEPHIR_LT_DOUBLE';
+    protected string $zvalDoubleOperator    = '!ZEPHIR_GT_DOUBLE';
+    protected string $zvalLongNegOperator   = 'ZEPHIR_GE_LONG';
+    protected string $zvalLongOperator      = 'ZEPHIR_LE_LONG';
+    protected string $zvalOperator          = 'ZEPHIR_LE';
 }
diff --git a/src/Operators/Comparison/LessOperator.php b/src/Operators/Comparison/LessOperator.php
index 55ded8ff9c..675f72c62e 100644
--- a/src/Operators/Comparison/LessOperator.php
+++ b/src/Operators/Comparison/LessOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,21 +9,17 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class LessOperator extends ComparisonBaseOperator
 {
-    protected string $operator = '<';
-
-    protected string $bitOperator = '<';
-
-    protected string $zvalOperator = 'ZEPHIR_LT';
-
-    protected string $zvalLongOperator = 'ZEPHIR_LT_LONG';
-
-    protected string $zvalLongNegOperator = 'ZEPHIR_GT_LONG';
-
-    protected string $zvalDoubleOperator = 'ZEPHIR_LT_DOUBLE';
-
+    protected string $bitOperator           = '<';
+    protected string $operator              = '<';
     protected string $zvalDoubleNegOperator = 'ZEPHIR_GT_DOUBLE';
+    protected string $zvalDoubleOperator    = 'ZEPHIR_LT_DOUBLE';
+    protected string $zvalLongNegOperator   = 'ZEPHIR_GT_LONG';
+    protected string $zvalLongOperator      = 'ZEPHIR_LT_LONG';
+    protected string $zvalOperator          = 'ZEPHIR_LT';
 }
diff --git a/src/Operators/Comparison/NotEqualsOperator.php b/src/Operators/Comparison/NotEqualsOperator.php
index 7e5c25c815..e51c936067 100644
--- a/src/Operators/Comparison/NotEqualsOperator.php
+++ b/src/Operators/Comparison/NotEqualsOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,33 +9,23 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class NotEqualsOperator extends ComparisonBaseOperator
 {
-    protected bool $commutative = true;
-
-    protected bool $inverse = true;
-
-    protected string $operator = '!=';
-
-    protected string $bitOperator = '!=';
-
-    protected string $zvalOperator = '!ZEPHIR_IS_EQUAL';
-
-    protected string $zvalLongOperator = '!ZEPHIR_IS_LONG';
-
-    protected string $zvalLongNegOperator = '!ZEPHIR_IS_LONG';
-
-    protected string $zvalDoubleOperator = '!ZEPHIR_IS_DOUBLE';
-
-    protected string $zvalStringOperator = '!ZEPHIR_IS_STRING';
-
-    protected string $zvalBoolOperator = '!ZEPHIR_IS_BOOL_VALUE';
-
-    protected string $zvalBoolTrueOperator = '!ZEPHIR_IS_TRUE';
-
+    protected string $bitOperator           = '!=';
+    protected bool   $commutative           = true;
+    protected bool   $inverse               = true;
+    protected string $operator              = '!=';
     protected string $zvalBoolFalseOperator = '!ZEPHIR_IS_FALSE';
-
-    protected string $zvalNullOperator = '!ZEPHIR_IS_NULL';
+    protected string $zvalBoolOperator      = '!ZEPHIR_IS_BOOL_VALUE';
+    protected string $zvalBoolTrueOperator  = '!ZEPHIR_IS_TRUE';
+    protected string $zvalDoubleOperator    = '!ZEPHIR_IS_DOUBLE';
+    protected string $zvalLongNegOperator   = '!ZEPHIR_IS_LONG';
+    protected string $zvalLongOperator      = '!ZEPHIR_IS_LONG';
+    protected string $zvalNullOperator      = '!ZEPHIR_IS_NULL';
+    protected string $zvalOperator          = '!ZEPHIR_IS_EQUAL';
+    protected string $zvalStringOperator    = '!ZEPHIR_IS_STRING';
 }
diff --git a/src/Operators/Comparison/NotIdenticalOperator.php b/src/Operators/Comparison/NotIdenticalOperator.php
index 4c308f2fa6..45c3e39aad 100644
--- a/src/Operators/Comparison/NotIdenticalOperator.php
+++ b/src/Operators/Comparison/NotIdenticalOperator.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,31 +9,22 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Operators\Comparison;
 
 class NotIdenticalOperator extends ComparisonBaseOperator
 {
-    protected bool $commutative = true;
-
-    protected bool $inverse = true;
-
-    protected string $operator = '!=';
-
-    protected string $bitOperator = '!=';
-
-    protected string $zvalOperator = '!ZEPHIR_IS_IDENTICAL';
-
-    protected string $zvalLongOperator = '!ZEPHIR_IS_LONG_IDENTICAL';
-
-    protected string $zvalLongNegOperator = '!ZEPHIR_IS_LONG_IDENTICAL';
-
-    protected string $zvalStringOperator = '!ZEPHIR_IS_STRING_IDENTICAL';
-
-    protected string $zvalBoolOperator = '!ZEPHIR_IS_BOOL_IDENTICAL';
-
-    protected string $zvalBoolTrueOperator = '!ZEPHIR_IS_TRUE_IDENTICAL';
-
+    protected string $bitOperator           = '!=';
+    protected bool   $commutative           = true;
+    protected bool   $inverse               = true;
+    protected string $operator              = '!=';
     protected string $zvalBoolFalseOperator = '!ZEPHIR_IS_FALSE_IDENTICAL';
-
-    protected string $zvalNullOperator = '!ZEPHIR_IS_NULL';
+    protected string $zvalBoolOperator      = '!ZEPHIR_IS_BOOL_IDENTICAL';
+    protected string $zvalBoolTrueOperator  = '!ZEPHIR_IS_TRUE_IDENTICAL';
+    protected string $zvalLongNegOperator   = '!ZEPHIR_IS_LONG_IDENTICAL';
+    protected string $zvalLongOperator      = '!ZEPHIR_IS_LONG_IDENTICAL';
+    protected string $zvalNullOperator      = '!ZEPHIR_IS_NULL';
+    protected string $zvalOperator          = '!ZEPHIR_IS_IDENTICAL';
+    protected string $zvalStringOperator    = '!ZEPHIR_IS_STRING_IDENTICAL';
 }
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index 4869779d1f..992f644543 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Operators\Logical;
 
+use Exception;
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -21,9 +23,8 @@
 
 class AndOperator extends LogicalBaseOperator
 {
-    protected string $operator = '&&';
-
     protected string $bitOperator = '&&';
+    protected string $operator    = '&&';
 
     /**
      * @param                    $expression
@@ -31,17 +32,17 @@ class AndOperator extends LogicalBaseOperator
      *
      * @return CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws \Zephir\Exception
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
         if (!isset($expression['left'])) {
-            throw new \Exception('Missing left part of the expression');
+            throw new Exception('Missing left part of the expression');
         }
 
         if (!isset($expression['right'])) {
-            throw new \Exception('Missing right part of the expression');
+            throw new Exception('Missing right part of the expression');
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -61,19 +62,19 @@ public function compile($expression, CompilationContext $compilationContext): Co
             case 'uint':
             case 'uchar':
                 $assignExprLeft = [
-                    'type' => $left->getType(),
+                    'type'  => $left->getType(),
                     'value' => $left->getCode(),
                 ];
                 break;
             case 'variable':
                 $assignExprLeft = [
-                    'type' => 'variable',
+                    'type'  => 'variable',
                     'value' => $left->getCode(),
                 ];
                 break;
             case 'null':
                 $assignExprLeft = [
-                    'type' => 'null',
+                    'type'  => 'null',
                     'value' => null,
                 ];
                 break;
@@ -87,22 +88,22 @@ public function compile($expression, CompilationContext $compilationContext): Co
          * Create an implicit 'let' operation to update the evaluated left operator.
          */
         $statement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $flagVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $assignExprLeft,
-                    'file' => $expression['left']['file'],
-                    'line' => $expression['left']['line'],
-                    'char' => $expression['left']['char'],
+                    'variable'    => $flagVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $assignExprLeft,
+                    'file'        => $expression['left']['file'],
+                    'line'        => $expression['left']['line'],
+                    'char'        => $expression['left']['char'],
                 ],
             ],
         ]);
         $statement->compile($compilationContext);
 
-        $compilationContext->codePrinter->output('if ('.$flagVariable->getName().') {');
+        $compilationContext->codePrinter->output('if (' . $flagVariable->getName() . ') {');
         $compilationContext->codePrinter->increaseLevel();
 
         $rightExpr = new Expression($expression['right']);
@@ -117,19 +118,19 @@ public function compile($expression, CompilationContext $compilationContext): Co
             case 'uint':
             case 'uchar':
                 $assignExprRight = [
-                    'type' => $right->getType(),
+                    'type'  => $right->getType(),
                     'value' => $right->getCode(),
                 ];
                 break;
             case 'variable':
                 $assignExprRight = [
-                    'type' => 'variable',
+                    'type'  => 'variable',
                     'value' => $right->getCode(),
                 ];
                 break;
             case 'null':
                 $assignExprRight = [
-                    'type' => 'null',
+                    'type'  => 'null',
                     'value' => null,
                 ];
                 break;
@@ -143,16 +144,16 @@ public function compile($expression, CompilationContext $compilationContext): Co
          * Create an implicit 'let' operation to update the evaluated right operator.
          */
         $statement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $flagVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $assignExprRight,
-                    'file' => $expression['right']['file'],
-                    'line' => $expression['right']['line'],
-                    'char' => $expression['right']['char'],
+                    'variable'    => $flagVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $assignExprRight,
+                    'file'        => $expression['right']['file'],
+                    'line'        => $expression['right']['line'],
+                    'char'        => $expression['right']['char'],
                 ],
             ],
         ]);
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index 6131252824..f09f25fe29 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -46,35 +46,67 @@ public function compile($expression, CompilationContext $compilationContext): Co
             case 'int':
                 switch ($right->getType()) {
                     case 'int':
-                        return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'double':
-                        return new CompiledExpression('double', '((double) '.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'double',
+                            '((double) ' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('int', '('.$left->getCode().' '.$this->operator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'int',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'bool':
                             case 'double':
                             case 'int':
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $variableCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                return new CompiledExpression('bool', '('.$left->getCode().' '.$this->operator.' zephir_is_true('.$variableCode.'))', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getCode(
+                                    ) . ' ' . $this->operator . ' zephir_is_true(' . $variableCode . '))',
+                                    $expression
+                                );
 
                             default:
-                                throw new CompilerException("Cannot compare variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot compare variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot compare 'int' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot compare 'int' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -82,45 +114,84 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 switch ($right->getType()) {
                     case 'int':
                     case 'double':
-                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' (('.$right->getCode().') ? 1 : 0))', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ((' . $right->getCode() . ') ? 1 : 0))',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression);
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
                         switch ($variableRight->getType()) {
                             case 'bool':
                             case 'double':
                             case 'int':
-                                return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getBooleanCode(
+                                    ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
                                 $variableCode = $compilationContext->backend->getVariableCode($variableRight);
                                 $compilationContext->headersManager->add('kernel/operators');
 
-                                return new CompiledExpression('bool', '('.$left->getBooleanCode().' '.$this->operator.' zephir_is_true('.$variableCode.'))', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $left->getBooleanCode(
+                                    ) . ' ' . $this->operator . ' zephir_is_true(' . $variableCode . '))',
+                                    $expression
+                                );
 
                             default:
-                                throw new CompilerException("Cannot add variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                throw new CompilerException(
+                                    "Cannot add variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Cannot compare 'bool' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot compare 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
             case 'double':
                 switch ($right->getType()) {
                     case 'double':
                     case 'int':
-                        return new CompiledExpression('bool', '('.$left->getCode().' '.$this->operator.' '.$right->getCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
 
                     case 'bool':
-                        return new CompiledExpression('bool', '('.$left->getCode().' '.$this->operator.' '.$right->getBooleanCode().')', $expression);
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
 
                     default:
-                        throw new CompilerException("Cannot compare 'double' with '".$right->getType()."'", $expression);
+                        throw new CompilerException(
+                            "Cannot compare 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
                 }
                 break;
 
@@ -129,67 +200,131 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 break;
 
             case 'variable':
-                $variableLeft = $compilationContext->symbolTable->getVariableForRead($left->resolve(null, $compilationContext), $compilationContext, $expression);
+                $variableLeft = $compilationContext->symbolTable->getVariableForRead(
+                    $left->resolve(null, $compilationContext),
+                    $compilationContext,
+                    $expression
+                );
                 switch ($variableLeft->getType()) {
                     case 'int':
                         switch ($right->getType()) {
                             case 'int':
-                                return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $variableLeft->getName() . ' ' . $this->operator . ' ' . $right->getCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'bool':
                                     case 'double':
                                     case 'int':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('int', '('.$variableLeft->getName().' '.$this->operator.' zephir_is_true('.$variableCode.'))', $expression);
+                                        return new CompiledExpression(
+                                            'int',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_is_true(' . $variableCode . '))',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot compare variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot compare variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot compare variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot compare variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
                     case 'bool':
                         switch ($right->getType()) {
                             case 'int':
-                                return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->operator.' '.$right->getCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $variableLeft->getName() . ' ' . $this->operator . ' ' . $right->getCode(
+                                    ) . ')',
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$right->getBooleanCode().')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $variableLeft->getName() . ' ' . $right->getBooleanCode() . ')',
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->operator.' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$variableRight->getName().')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName() . ' ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' '.$this->operator.' zephir_is_true('.$variableCode.'))', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_is_true(' . $variableCode . '))',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot compare variable('int') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot compare variable('int') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot compare variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot compare variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -197,36 +332,74 @@ public function compile($expression, CompilationContext $compilationContext): Co
                         switch ($right->getType()) {
                             case 'double':
                             case 'int':
-                                return new CompiledExpression('bool', $variableLeft->getName().' '.$this->operator.' '.$right->getCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $variableLeft->getName() . ' ' . $this->operator . ' ' . $right->getCode(),
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', $variableLeft->getName().' '.$right->getBooleanCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    $variableLeft->getName() . ' ' . $right->getBooleanCode(),
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
-                                        return new CompiledExpression('bool', $variableLeft->getName().' '.$this->operator.'  (double) '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $variableLeft->getName(
+                                            ) . ' ' . $this->operator . '  (double) ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('bool', $variableLeft->getName().' '.$this->operator.'  '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $variableLeft->getName(
+                                            ) . ' ' . $this->operator . '  ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', $variableLeft->getName().' '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $variableLeft->getName() . ' ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('bool', $variableLeft->getName().' '.$this->operator.' zephir_is_true('.$variableCode.')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            $variableLeft->getName(
+                                            ) . ' ' . $this->operator . ' zephir_is_true(' . $variableCode . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot compare variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot compare variable('double') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot compare variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot compare variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -234,39 +407,86 @@ public function compile($expression, CompilationContext $compilationContext): Co
                         switch ($right->getType()) {
                             case 'double':
                             case 'int':
-                                return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->operator.' '.$right->getCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $variableLeft->getName() . ' && Z_STRLEN_P(' . $variableLeft->getName(
+                                    ) . ')) ' . $this->operator . ' ' . $right->getCode(),
+                                    $expression
+                                );
 
                             case 'bool':
-                                return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$right->getBooleanCode(), $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    '(' . $variableLeft->getName() . ' && Z_STRLEN_P(' . $variableLeft->getName(
+                                    ) . ')) ' . $right->getBooleanCode(),
+                                    $expression
+                                );
 
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->getCode(),
+                                    $compilationContext,
+                                    $expression['right']
+                                );
                                 switch ($variableRight->getType()) {
                                     case 'int':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->operator.' '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName() . ' && Z_STRLEN_P(' . $variableLeft->getName(
+                                            ) . ')) ' . $this->operator . ' ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'double':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->operator.'  '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName() . ' && Z_STRLEN_P(' . $variableLeft->getName(
+                                            ) . ')) ' . $this->operator . '  ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'string':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$this->operator.' ('.$variableRight->getName().' && Z_STRLEN_P('.$variableRight->getName().'))', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName() . ' && Z_STRLEN_P(' . $variableLeft->getName(
+                                            ) . ')) ' . $this->operator . ' (' . $variableRight->getName(
+                                            ) . ' && Z_STRLEN_P(' . $variableRight->getName() . '))',
+                                            $expression
+                                        );
 
                                     case 'bool':
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().')) '.$variableRight->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName() . ' && Z_STRLEN_P(' . $variableLeft->getName(
+                                            ) . ')) ' . $variableRight->getName(),
+                                            $expression
+                                        );
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $variableCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                                        return new CompiledExpression('bool', '('.$variableLeft->getName().' && Z_STRLEN_P('.$variableLeft->getName().'))  '.$this->operator.' zephir_is_true('.$variableCode.')', $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            '(' . $variableLeft->getName() . ' && Z_STRLEN_P(' . $variableLeft->getName(
+                                            ) . '))  ' . $this->operator . ' zephir_is_true(' . $variableCode . ')',
+                                            $expression
+                                        );
 
                                     default:
-                                        throw new CompilerException("Cannot compare variable('double') with variable('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot compare variable('double') with variable('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot compare variable('int') with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot compare variable('int') with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
@@ -278,16 +498,24 @@ public function compile($expression, CompilationContext $compilationContext): Co
                             case 'bool':
                             case 'double':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $op = $this->operator;
+                                $op  = $this->operator;
                                 $op1 = $variableLeftCode;
                                 $op2 = $right->getCode();
                                 $compilationContext->headersManager->add('kernel/operators');
 
-                                return new CompiledExpression('bool', 'zephir_is_true('.$op1.') '.$op.' '.$op2, $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    'zephir_is_true(' . $op1 . ') ' . $op . ' ' . $op2,
+                                    $expression
+                                );
 
-                                /* a(var) && a(x) */
+                            /* a(var) && a(x) */
                             case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead($right->resolve(null, $compilationContext), $compilationContext, $expression);
+                                $variableRight     = $compilationContext->symbolTable->getVariableForRead(
+                                    $right->resolve(null, $compilationContext),
+                                    $compilationContext,
+                                    $expression
+                                );
                                 $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
                                 switch ($variableRight->getType()) {
                                     /* a(var) && a(int) */
@@ -296,9 +524,13 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     case 'int':
                                         $compilationContext->headersManager->add('kernel/operators');
 
-                                        return new CompiledExpression('bool', 'zephir_is_true('.$variableLeftCode.') '.$this->operator.' '.$variableRightCode, $expression);
+                                        return new CompiledExpression(
+                                            'bool',
+                                            'zephir_is_true(' . $variableLeftCode . ') ' . $this->operator . ' ' . $variableRightCode,
+                                            $expression
+                                        );
 
-                                        /* a(var) && a(var) */
+                                    /* a(var) && a(var) */
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op1 = $variableLeftCode;
@@ -306,30 +538,43 @@ public function compile($expression, CompilationContext $compilationContext): Co
 
                                         $expected = $this->getExpected($compilationContext, $expression);
                                         if ($expected->isLocalOnly()) {
-                                            $compilationContext->codePrinter->output('add_function(&'.$expected->getName().', '.$op1.', '.$op2.');');
+                                            $compilationContext->codePrinter->output(
+                                                'add_function(&' . $expected->getName(
+                                                ) . ', ' . $op1 . ', ' . $op2 . ');'
+                                            );
                                         } else {
-                                            $compilationContext->codePrinter->output('add_function('.$expected->getName().', '.$op1.', '.$op2.');');
+                                            $compilationContext->codePrinter->output(
+                                                'add_function(' . $expected->getName(
+                                                ) . ', ' . $op1 . ', ' . $op2 . ');'
+                                            );
                                         }
 
                                         return new CompiledExpression('variable', $expected->getName(), $expression);
 
                                     default:
-                                        throw new CompilerException("Cannot compare 'variable' with variable ('".$variableRight->getType()."')", $expression);
+                                        throw new CompilerException(
+                                            "Cannot compare 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
+                                            $expression
+                                        );
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException("Cannot compare 'variable' with '".$right->getType()."'", $expression);
+                                throw new CompilerException(
+                                    "Cannot compare 'variable' with '" . $right->getType() . "'",
+                                    $expression
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException("Unknown '".$variableLeft->getType()."'", $expression);
+                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unsupported type: '.$left->getType(), $expression);
+                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
         }
     }
 }
diff --git a/src/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
index 54be169b90..8f2bad3d98 100644
--- a/src/Operators/Logical/OrOperator.php
+++ b/src/Operators/Logical/OrOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Logical;
 
+use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -21,18 +22,17 @@
 
 class OrOperator extends LogicalBaseOperator
 {
-    protected string $operator = '||';
-
     protected string $bitOperator = '||';
+    protected string $operator    = '||';
 
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
         if (!isset($expression['left'])) {
-            throw new \Exception('Missing left part of the expression');
+            throw new Exception('Missing left part of the expression');
         }
 
         if (!isset($expression['right'])) {
-            throw new \Exception('Missing right part of the expression');
+            throw new Exception('Missing right part of the expression');
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -52,19 +52,19 @@ public function compile($expression, CompilationContext $compilationContext): Co
             case 'uint':
             case 'uchar':
                 $assignExprLeft = [
-                    'type' => $left->getType(),
+                    'type'  => $left->getType(),
                     'value' => $left->getCode(),
                 ];
                 break;
             case 'variable':
                 $assignExprLeft = [
-                    'type' => 'variable',
+                    'type'  => 'variable',
                     'value' => $left->getCode(),
                 ];
                 break;
             case 'null':
                 $assignExprLeft = [
-                    'type' => 'null',
+                    'type'  => 'null',
                     'value' => null,
                 ];
                 break;
@@ -78,22 +78,22 @@ public function compile($expression, CompilationContext $compilationContext): Co
          * Create an implicit 'let' operation to update the evaluated left operator.
          */
         $statement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $flagVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $assignExprLeft,
-                    'file' => $expression['left']['file'],
-                    'line' => $expression['left']['line'],
-                    'char' => $expression['left']['char'],
+                    'variable'    => $flagVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $assignExprLeft,
+                    'file'        => $expression['left']['file'],
+                    'line'        => $expression['left']['line'],
+                    'char'        => $expression['left']['char'],
                 ],
             ],
         ]);
         $statement->compile($compilationContext);
 
-        $compilationContext->codePrinter->output('if (!('.$flagVariable->getName().')) {');
+        $compilationContext->codePrinter->output('if (!(' . $flagVariable->getName() . ')) {');
         $compilationContext->codePrinter->increaseLevel();
 
         $rightExpr = new Expression($expression['right']);
@@ -108,19 +108,19 @@ public function compile($expression, CompilationContext $compilationContext): Co
             case 'uint':
             case 'uchar':
                 $assignExprRight = [
-                    'type' => $right->getType(),
+                    'type'  => $right->getType(),
                     'value' => $right->getCode(),
                 ];
                 break;
             case 'variable':
                 $assignExprRight = [
-                    'type' => 'variable',
+                    'type'  => 'variable',
                     'value' => $right->getCode(),
                 ];
                 break;
             case 'null':
                 $assignExprRight = [
-                    'type' => 'null',
+                    'type'  => 'null',
                     'value' => null,
                 ];
                 break;
@@ -134,16 +134,16 @@ public function compile($expression, CompilationContext $compilationContext): Co
          * Create an implicit 'let' operation to update the evaluated right operator.
          */
         $statement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $flagVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $assignExprRight,
-                    'file' => $expression['right']['file'],
-                    'line' => $expression['right']['line'],
-                    'char' => $expression['right']['char'],
+                    'variable'    => $flagVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $assignExprRight,
+                    'file'        => $expression['right']['file'],
+                    'line'        => $expression['right']['line'],
+                    'char'        => $expression['right']['char'],
                 ],
             ],
         ]);
diff --git a/src/Operators/Other/CastOperator.php b/src/Operators/Other/CastOperator.php
index 4fcaa8a344..b812214bf9 100644
--- a/src/Operators/Other/CastOperator.php
+++ b/src/Operators/Other/CastOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Detectors\ReadDetector;
@@ -36,12 +37,12 @@ class CastOperator extends AbstractOperator
      *
      * @return CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
         try {
-            $expr = new Expression($expression['right']);
+            $expr     = new Expression($expression['right']);
             $resolved = $expr->compile($compilationContext);
         } catch (Exception $e) {
             throw new CompilerException($e->getMessage(), $expression, $e->getCode(), $e);
@@ -61,7 +62,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                         return new CompiledExpression('int', $resolved->getCode(), $expression);
 
                     case Types::T_DOUBLE:
-                        return new CompiledExpression('int', '(int) '.$resolved->getCode(), $expression);
+                        return new CompiledExpression('int', '(int) ' . $resolved->getCode(), $expression);
 
                     case Types::T_BOOL:
                         return new CompiledExpression('int', $resolved->getBooleanCode(), $expression);
@@ -80,7 +81,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $compilationContext
                         );
 
-                        $original = $resolved->getOriginal();
+                        $original             = $resolved->getOriginal();
                         $original['operator'] = 'assign';
 
                         $let = new LetVariable();
@@ -96,7 +97,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                         return new CompiledExpression(
                             'int',
-                            'zephir_get_intval_ex('.$symbol.')',
+                            'zephir_get_intval_ex(' . $symbol . ')',
                             $expression
                         );
 
@@ -107,9 +108,9 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $compilationContext,
                             $expression
                         );
-                        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                        $symbol         = $compilationContext->backend->getVariableCode($symbolVariable);
 
-                        return new CompiledExpression('int', 'zephir_get_intval('.$symbol.')', $expression);
+                        return new CompiledExpression('int', 'zephir_get_intval(' . $symbol . ')', $expression);
 
                     case Types::T_VARIABLE:
                         $compilationContext->headersManager->add('kernel/operators');
@@ -128,7 +129,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case Types::T_BOOL:
                                 return new CompiledExpression(
                                     'int',
-                                    '(int) ('.$symbolVariable->getName().')',
+                                    '(int) (' . $symbolVariable->getName() . ')',
                                     $expression
                                 );
 
@@ -140,7 +141,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                                 return new CompiledExpression(
                                     'int',
-                                    'zephir_get_intval('.$symbol.')',
+                                    'zephir_get_intval(' . $symbol . ')',
                                     $expression
                                 );
 
@@ -179,7 +180,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                         );
 
                     case Types::T_DOUBLE:
-                        return new CompiledExpression('long', '(long) '.$resolved->getCode(), $expression);
+                        return new CompiledExpression('long', '(long) ' . $resolved->getCode(), $expression);
 
                     case Types::T_BOOL:
                         return new CompiledExpression('long', $resolved->getBooleanCode(), $expression);
@@ -194,7 +195,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                         return new CompiledExpression(
                             'long',
-                            'zephir_get_intval('.$symbolVariable->getName().')',
+                            'zephir_get_intval(' . $symbolVariable->getName() . ')',
                             $expression
                         );
 
@@ -214,7 +215,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             case Types::T_DOUBLE:
                                 return new CompiledExpression(
                                     'long',
-                                    '(long) ('.$symbolVariable->getName().')',
+                                    '(long) (' . $symbolVariable->getName() . ')',
                                     $expression
                                 );
 
@@ -224,7 +225,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                                 return new CompiledExpression(
                                     'long',
-                                    'zephir_get_intval('.$symbol.')',
+                                    'zephir_get_intval(' . $symbol . ')',
                                     $expression
                                 );
 
@@ -277,11 +278,11 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $compilationContext,
                             $expression
                         );
-                        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                        $symbol         = $compilationContext->backend->getVariableCode($symbolVariable);
 
                         return new CompiledExpression(
                             'double',
-                            'zephir_get_doubleval('.$symbol.')',
+                            'zephir_get_doubleval(' . $symbol . ')',
                             $expression
                         );
 
@@ -348,7 +349,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                     case Types::T_INT:
                         return new CompiledExpression(
                             'bool',
-                            '(zend_bool) '.$resolved->getCode(),
+                            '(zend_bool) ' . $resolved->getCode(),
                             $expression
                         );
 
@@ -370,7 +371,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $compilationContext,
                             $expression
                         );
-                        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                        $symbol         = $compilationContext->backend->getVariableCode($symbolVariable);
 
                         if ($symbolVariable->isTemporal()) {
                             $symbolVariable->setIdle(true);
@@ -487,7 +488,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $compilationContext
                                 );
 
-                                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                                $symbol       = $compilationContext->backend->getVariableCode($symbolVariable);
                                 $resolvedCode = $compilationContext->backend->getVariableCode($resolvedVariable);
 
                                 $compilationContext->codePrinter->output(
@@ -511,7 +512,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                 $symbolVariable->setMustInitNull(true);
                                 $symbolVariable->setIsInitialized(true, $compilationContext);
                                 $symbolVariable->increaseUses();
-                                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                                $symbol       = $compilationContext->backend->getVariableCode($symbolVariable);
                                 $resolvedCode = $compilationContext->backend->getVariableCode($resolvedVariable);
 
                                 $compilationContext->codePrinter->output(
@@ -553,12 +554,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                         $symbolVariable->setMustInitNull(true);
                         $symbolVariable->setIsInitialized(true, $compilationContext);
                         $symbolVariable->increaseUses();
-                        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                        $symbol           = $compilationContext->backend->getVariableCode($symbolVariable);
                         $resolvedVariable = $compilationContext->symbolTable->getVariableForRead(
                             $resolved->getCode(),
                             $compilationContext
                         );
-                        $resolvedCode = $compilationContext->backend->getVariableCode($resolvedVariable);
+                        $resolvedCode     = $compilationContext->backend->getVariableCode($resolvedVariable);
 
                         $compilationContext->codePrinter->output(
                             sprintf('zephir_get_arrval(%s, %s);', $symbol, $resolvedCode)
@@ -592,14 +593,14 @@ public function compile(array $expression, CompilationContext $compilationContex
                             'variable',
                             $compilationContext
                         );
-                        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                        $symbol         = $compilationContext->backend->getVariableCode($symbolVariable);
 
                         /**
                          * zephir_convert_to_object use zval variable
                          * before use with it we create a new variable and assign value of literal.
                          */
-                        $let = new LetVariable();
-                        $original = $resolved->getOriginal();
+                        $let                  = new LetVariable();
+                        $original             = $resolved->getOriginal();
                         $original['operator'] = 'assign';
                         $let->assign(
                             $symbolVariable->getName(),
@@ -610,7 +611,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $original
                         );
 
-                        $compilationContext->codePrinter->output('zephir_convert_to_object('.$symbol.');');
+                        $compilationContext->codePrinter->output('zephir_convert_to_object(' . $symbol . ');');
 
                         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
 
@@ -622,12 +623,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $compilationContext,
                             $expression
                         );
-                        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                        $symbol         = $compilationContext->backend->getVariableCode($symbolVariable);
                         if ($symbolVariable->isTemporal()) {
                             $symbolVariable->setIdle(true);
                         }
 
-                        $compilationContext->codePrinter->output('zephir_convert_to_object('.$symbol.');');
+                        $compilationContext->codePrinter->output('zephir_convert_to_object(' . $symbol . ');');
 
                         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
 
diff --git a/src/Operators/Other/CloneOperator.php b/src/Operators/Other/CloneOperator.php
index 66a4bbe6b3..774be84c36 100644
--- a/src/Operators/Other/CloneOperator.php
+++ b/src/Operators/Other/CloneOperator.php
@@ -43,12 +43,19 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $exprCompiledVariable = $exprVariable->compile($compilationContext);
         if ('variable' !== $exprCompiledVariable->getType()) {
-            throw new CompilerException('Expression type: '.$exprCompiledVariable->getType().' cannot be used as array', $expression);
+            throw new CompilerException(
+                'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as array',
+                $expression
+            );
         }
 
-        $clonedVariable = $compilationContext->symbolTable->getVariableForRead($exprCompiledVariable->getCode(), $compilationContext, $expression);
+        $clonedVariable = $compilationContext->symbolTable->getVariableForRead(
+            $exprCompiledVariable->getCode(),
+            $compilationContext,
+            $expression
+        );
         if ('variable' !== $clonedVariable->getType()) {
-            throw new CompilerException('Variable type: '.$exprVariable->getType().' cannot be cloned');
+            throw new CompilerException('Variable type: ' . $exprVariable->getType() . ' cannot be cloned');
         }
 
         if ($clonedVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
@@ -70,11 +77,13 @@ public function compile(array $expression, CompilationContext $compilationContex
         $symbolVariable->setDynamicTypes($clonedVariable->getDynamicTypes());
         $symbolVariable->setClassTypes($clonedVariable->getClassTypes());
 
-        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+        $symbol       = $compilationContext->backend->getVariableCode($symbolVariable);
         $clonedSymbol = $compilationContext->backend->getVariableCode($clonedVariable);
 
-        $compilationContext->codePrinter->output('if (zephir_clone('.$symbol.', '.$clonedSymbol.') == FAILURE) {');
-        $compilationContext->codePrinter->output("\t".'return;');
+        $compilationContext->codePrinter->output(
+            'if (zephir_clone(' . $symbol . ', ' . $clonedSymbol . ') == FAILURE) {'
+        );
+        $compilationContext->codePrinter->output("\t" . 'return;');
         $compilationContext->codePrinter->output('}');
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
diff --git a/src/Operators/Other/ConcatOperator.php b/src/Operators/Other/ConcatOperator.php
index 7a34d072a7..94c5d641fe 100644
--- a/src/Operators/Other/ConcatOperator.php
+++ b/src/Operators/Other/ConcatOperator.php
@@ -21,6 +21,8 @@
 use Zephir\Name;
 use Zephir\Operators\AbstractOperator;
 
+use function is_array;
+
 /**
  * Perform concatenations and optimizations
  */
@@ -52,7 +54,7 @@ public function compile(array $expression, CompilationContext $compilationContex
          * Try to optimize the concatenation.
          */
         $optimized = $this->_getOptimizedConcat($expression, $compilationContext, $isFullString);
-        if (\is_array($optimized)) {
+        if (is_array($optimized)) {
             if (!$isFullString) {
                 $expected = $this->getExpectedComplexLiteral($compilationContext);
             } else {
@@ -72,34 +74,48 @@ public function compile(array $expression, CompilationContext $compilationContex
          * If the expression cannot be optimized, fall back to the standard compilation.
          */
         $leftExpr = new Expression($expression['left']);
-        $left = $this->compileExpression($leftExpr, $compilationContext, $expression['left']['type']);
+        $left     = $this->compileExpression($leftExpr, $compilationContext, $expression['left']['type']);
 
         if ('variable' == $left->getType()) {
-            $variableLeft = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression['right']);
+            $variableLeft = $compilationContext->symbolTable->getVariableForRead(
+                $left->getCode(),
+                $compilationContext,
+                $expression['right']
+            );
             $variableLeft = $compilationContext->backend->getVariableCode($variableLeft);
         }
 
         $rightExpr = new Expression($expression['right']);
-        $right = $this->compileExpression($rightExpr, $compilationContext, $expression['left']['type']);
+        $right     = $this->compileExpression($rightExpr, $compilationContext, $expression['left']['type']);
 
         if ('variable' == $right->getType()) {
-            $variableRight = $compilationContext->symbolTable->getVariableForRead($right->getCode(), $compilationContext, $expression['right']);
+            $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                $right->getCode(),
+                $compilationContext,
+                $expression['right']
+            );
             $variableRight = $compilationContext->backend->getVariableCode($variableRight);
         }
 
-        $expected = $this->getExpectedComplexLiteral($compilationContext);
+        $expected     = $this->getExpectedComplexLiteral($compilationContext);
         $expectedCode = $compilationContext->backend->getVariableCode($expected);
 
         if ('string' == $left->getType() && 'variable' == $right->getType()) {
-            $compilationContext->codePrinter->output('ZEPHIR_CONCAT_SV('.$expectedCode.', "'.$left->getCode().'", '.$variableRight.');');
+            $compilationContext->codePrinter->output(
+                'ZEPHIR_CONCAT_SV(' . $expectedCode . ', "' . $left->getCode() . '", ' . $variableRight . ');'
+            );
         }
 
         if ('variable' == $left->getType() && 'string' == $right->getType()) {
-            $compilationContext->codePrinter->output('ZEPHIR_CONCAT_VS('.$expectedCode.', '.$variableLeft.', "'.$right->getCode().'");');
+            $compilationContext->codePrinter->output(
+                'ZEPHIR_CONCAT_VS(' . $expectedCode . ', ' . $variableLeft . ', "' . $right->getCode() . '");'
+            );
         }
 
         if ('variable' == $left->getType() && 'variable' == $right->getType()) {
-            $compilationContext->codePrinter->output('zephir_concat_function('.$expectedCode.', '.$variableLeft.', '.$variableRight.');');
+            $compilationContext->codePrinter->output(
+                'zephir_concat_function(' . $expectedCode . ', ' . $variableLeft . ', ' . $variableRight . ');'
+            );
         }
 
         $expected->setDynamicTypes('string');
@@ -116,8 +132,11 @@ public function compile(array $expression, CompilationContext $compilationContex
      *
      * @throws CompilerException
      */
-    private function _getOptimizedConcat(array $expression, CompilationContext $compilationContext, &$isFullString): array
-    {
+    private function _getOptimizedConcat(
+        array $expression,
+        CompilationContext $compilationContext,
+        &$isFullString
+    ): array {
         $originalExpr = $expression;
         $isFullString = true;
 
@@ -127,7 +146,7 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
             if ('concat' == $expression['left']['type']) {
                 $expression = $expression['left'];
             } else {
-                $parts[] = $expression['left'];
+                $parts[]    = $expression['left'];
                 $expression = null;
             }
         }
@@ -136,11 +155,11 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
             $parts[] = $expression['left'];
         }
 
-        $key = '';
+        $key         = '';
         $concatParts = [];
-        $parts = array_reverse($parts);
+        $parts       = array_reverse($parts);
         foreach ($parts as $part) {
-            $expr = new Expression($part);
+            $expr         = new Expression($part);
             $compiledExpr = $this->compileExpression($expr, $compilationContext, $part['type']);
 
             switch ($compiledExpr->getType()) {
@@ -152,13 +171,13 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
                     );
                     switch ($variable->getType()) {
                         case 'variable':
-                            $key .= 'v';
+                            $key           .= 'v';
                             $concatParts[] = $compilationContext->backend->getVariableCode($variable);
-                            $isFullString = false;
+                            $isFullString  = false;
                             break;
 
                         case 'string':
-                            $key .= 'v';
+                            $key           .= 'v';
                             $concatParts[] = $compilationContext->backend->getVariableCode($variable);
                             break;
 
@@ -166,7 +185,7 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
                         case 'uint':
                         case 'long':
                         case 'ulong':
-                            $key .= 'v';
+                            $key          .= 'v';
                             $tempVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
                                 'variable',
                                 $compilationContext
@@ -180,7 +199,7 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
                             break;
 
                         case 'double':
-                            $key .= 'v';
+                            $key          .= 'v';
                             $tempVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
                                 'variable',
                                 $compilationContext
@@ -205,15 +224,15 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
                     break;
 
                 case 'string':
-                    $key .= 's';
-                    $concatParts[] = '"'.Name::addSlashes($compiledExpr->getCode()).'"';
+                    $key           .= 's';
+                    $concatParts[] = '"' . Name::addSlashes($compiledExpr->getCode()) . '"';
                     break;
 
                 case 'int':
                 case 'uint':
                 case 'long':
                 case 'ulong':
-                    $key .= 'v';
+                    $key          .= 'v';
                     $tempVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
                         'variable',
                         $compilationContext
@@ -225,11 +244,11 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
                             $compiledExpr->getCode()
                         )
                     );
-                    $concatParts[] = '&'.$tempVariable->getName();
+                    $concatParts[] = '&' . $tempVariable->getName();
                     break;
 
                 case 'double':
-                    $key .= 'v';
+                    $key          .= 'v';
                     $tempVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
                         'variable',
                         $compilationContext
@@ -241,7 +260,7 @@ private function _getOptimizedConcat(array $expression, CompilationContext $comp
                             $compiledExpr->getCode()
                         )
                     );
-                    $concatParts[] = '&'.$tempVariable->getName();
+                    $concatParts[] = '&' . $tempVariable->getName();
                     break;
 
                 default:
diff --git a/src/Operators/Other/EmptyOperator.php b/src/Operators/Other/EmptyOperator.php
index a2499d599a..8a7eb6a573 100644
--- a/src/Operators/Other/EmptyOperator.php
+++ b/src/Operators/Other/EmptyOperator.php
@@ -49,11 +49,22 @@ public function compile(array $expression, CompilationContext $compilationContex
             throw new CompilerException("'empty' operand only can be a variable", $expression['left']);
         }
 
-        $variableLeft = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression['left']);
+        $variableLeft = $compilationContext->symbolTable->getVariableForRead(
+            $left->getCode(),
+            $compilationContext,
+            $expression['left']
+        );
         if (!$variableLeft->isVariable() && !$variableLeft->isString() && !$variableLeft->isArray()) {
-            throw new CompilerException("Only dynamic/string variables can be used in 'empty' operators", $expression['left']);
+            throw new CompilerException(
+                "Only dynamic/string variables can be used in 'empty' operators",
+                $expression['left']
+            );
         }
 
-        return new CompiledExpression('bool', 'ZEPHIR_IS_EMPTY('.$compilationContext->backend->getVariableCode($variableLeft).')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'ZEPHIR_IS_EMPTY(' . $compilationContext->backend->getVariableCode($variableLeft) . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Operators/Other/FetchOperator.php b/src/Operators/Other/FetchOperator.php
index c3fa062454..a22b55a748 100644
--- a/src/Operators/Other/FetchOperator.php
+++ b/src/Operators/Other/FetchOperator.php
@@ -38,9 +38,16 @@ public function compile(array $expression, CompilationContext $compilationContex
     {
         $compilationContext->headersManager->add('kernel/array');
 
-        $variable = $compilationContext->symbolTable->getVariableForWrite($expression['left']['value'], $compilationContext, $expression['left']);
+        $variable = $compilationContext->symbolTable->getVariableForWrite(
+            $expression['left']['value'],
+            $compilationContext,
+            $expression['left']
+        );
         if ('variable' != $variable->getType()) {
-            throw new CompilerException('Cannot use variable type: '.$variable->gettype().' in "fetch" operator', $expression);
+            throw new CompilerException(
+                'Cannot use variable type: ' . $variable->gettype() . ' in "fetch" operator',
+                $expression
+            );
         }
 
         /**
@@ -51,7 +58,10 @@ public function compile(array $expression, CompilationContext $compilationContex
              * TODO: use a read detector here
              */
             $readOnly = false;
-            $line = max($compilationContext->symbolTable->getLastCallLine(), $compilationContext->symbolTable->getLastUnsetLine());
+            $line     = max(
+                $compilationContext->symbolTable->getLastCallLine(),
+                $compilationContext->symbolTable->getLastUnsetLine()
+            );
             if (false === $line || ($line > 0 && $line < $expression['line'])) {
                 $numberMutations = $compilationContext->symbolTable->getExpectedMutations($variable->getName());
                 if (1 == $numberMutations) {
@@ -84,12 +94,22 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 $exprCompiledVariable = $exprVariable->compile($compilationContext);
                 if ('variable' != $exprCompiledVariable->getType()) {
-                    throw new CompilerException('Expression type: '.$exprCompiledVariable->getType().' cannot be used as array', $expression['right']['left']);
+                    throw new CompilerException(
+                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as array',
+                        $expression['right']['left']
+                    );
                 }
 
-                $evalVariable = $compilationContext->symbolTable->getVariableForRead($exprCompiledVariable->getCode(), $compilationContext, $expression['right']['left']);
+                $evalVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiledVariable->getCode(),
+                    $compilationContext,
+                    $expression['right']['left']
+                );
                 if ('variable' != $evalVariable->getType() && 'array' != $evalVariable->getType()) {
-                    throw new CompilerException('Variable type: '.$variable->getType().' cannot be used as array', $expression['right']['left']);
+                    throw new CompilerException(
+                        'Variable type: ' . $variable->getType() . ' cannot be used as array',
+                        $expression['right']['left']
+                    );
                 }
 
                 if ('variable' == $evalVariable->getType()) {
@@ -106,7 +126,14 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $expr->setNoisy(false);
                 $resolvedExpr = $expr->compile($compilationContext);
 
-                return $compilationContext->backend->arrayIssetFetch($variable, $evalVariable, $resolvedExpr, $flags, $expression, $compilationContext);
+                return $compilationContext->backend->arrayIssetFetch(
+                    $variable,
+                    $evalVariable,
+                    $resolvedExpr,
+                    $flags,
+                    $expression,
+                    $compilationContext
+                );
                 break;
 
             case 'property-access':
@@ -116,12 +143,22 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 $exprCompiledVariable = $exprVariable->compile($compilationContext);
                 if ('variable' != $exprCompiledVariable->getType()) {
-                    throw new CompilerException('Expression type: '.$exprCompiledVariable->getType().' cannot be used as object', $expression['right']['left']);
+                    throw new CompilerException(
+                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',
+                        $expression['right']['left']
+                    );
                 }
 
-                $evalVariable = $compilationContext->symbolTable->getVariableForRead($exprCompiledVariable->getCode(), $compilationContext, $expression['right']['left']);
+                $evalVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiledVariable->getCode(),
+                    $compilationContext,
+                    $expression['right']['left']
+                );
                 if ('variable' != $evalVariable->getType()) {
-                    throw new CompilerException('Variable type: '.$variable->getType().' cannot be used as object', $expression['right']['left']);
+                    throw new CompilerException(
+                        'Variable type: ' . $variable->getType() . ' cannot be used as object',
+                        $expression['right']['left']
+                    );
                 }
 
                 if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
@@ -134,10 +171,14 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $property = $expression['right']['right']['value'];
 
                 $compilationContext->headersManager->add('kernel/object');
-                $symbol = $compilationContext->backend->getVariableCode($variable);
+                $symbol     = $compilationContext->backend->getVariableCode($variable);
                 $evalSymbol = $compilationContext->backend->getVariableCode($evalVariable);
 
-                return new CompiledExpression('bool', 'zephir_fetch_property('.$symbol.', '.$evalSymbol.', SL("'.$property.'"), PH_SILENT_CC)', $expression);
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_fetch_property(' . $symbol . ', ' . $evalSymbol . ', SL("' . $property . '"), PH_SILENT_CC)',
+                    $expression
+                );
 
             case 'property-dynamic-access':
                 $exprVariable = new Expression($expression['right']['left']);
@@ -146,12 +187,22 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 $exprCompiledVariable = $exprVariable->compile($compilationContext);
                 if ('variable' != $exprCompiledVariable->getType()) {
-                    throw new CompilerException('Expression type: '.$exprCompiledVariable->getType().' cannot be used as object', $expression['right']['left']);
+                    throw new CompilerException(
+                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',
+                        $expression['right']['left']
+                    );
                 }
 
-                $evalVariable = $compilationContext->symbolTable->getVariableForRead($exprCompiledVariable->getCode(), $compilationContext, $expression['right']['left']);
+                $evalVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiledVariable->getCode(),
+                    $compilationContext,
+                    $expression['right']['left']
+                );
                 if ('variable' != $evalVariable->getType()) {
-                    throw new CompilerException('Variable type: '.$evalVariable->getType().' cannot be used as object', $expression['right']['left']);
+                    throw new CompilerException(
+                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',
+                        $expression['right']['left']
+                    );
                 }
 
                 if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
@@ -166,24 +217,43 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 $exprCompiledVariableProperty = $exprVariableProperty->compile($compilationContext);
                 if ('variable' != $exprCompiledVariableProperty->getType()) {
-                    throw new CompilerException('Expression type: '.$exprCompiledVariableProperty->getType().' cannot be used in property-dynamic-access', $expression['right']['right']);
+                    throw new CompilerException(
+                        'Expression type: ' . $exprCompiledVariableProperty->getType(
+                        ) . ' cannot be used in property-dynamic-access',
+                        $expression['right']['right']
+                    );
                 }
 
-                $evalVariableProperty = $compilationContext->symbolTable->getVariableForRead($exprCompiledVariableProperty->getCode(), $compilationContext, $expression['right']['right']);
+                $evalVariableProperty = $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiledVariableProperty->getCode(),
+                    $compilationContext,
+                    $expression['right']['right']
+                );
                 if ('variable' != $evalVariableProperty->getType() && 'string' != $evalVariableProperty->getType()) {
-                    throw new CompilerException('Variable type: '.$evalVariableProperty->getType().' cannot be used in property-dynamic-access', $expression['right']['right']);
+                    throw new CompilerException(
+                        'Variable type: ' . $evalVariableProperty->getType(
+                        ) . ' cannot be used in property-dynamic-access',
+                        $expression['right']['right']
+                    );
                 }
 
                 $compilationContext->headersManager->add('kernel/object');
 
-                $symbol = $compilationContext->backend->getVariableCode($variable);
-                $evalSymbol = $compilationContext->backend->getVariableCode($evalVariable);
+                $symbol             = $compilationContext->backend->getVariableCode($variable);
+                $evalSymbol         = $compilationContext->backend->getVariableCode($evalVariable);
                 $evalPropertySymbol = $compilationContext->backend->getVariableCode($evalVariableProperty);
 
-                return new CompiledExpression('bool', 'zephir_fetch_property_zval('.$symbol.', '.$evalSymbol.', '.$evalPropertySymbol.', PH_SILENT_CC)', $expression);
+                return new CompiledExpression(
+                    'bool',
+                    'zephir_fetch_property_zval(' . $symbol . ', ' . $evalSymbol . ', ' . $evalPropertySymbol . ', PH_SILENT_CC)',
+                    $expression
+                );
 
             default:
-                throw new CompilerException('Cannot use this expression for "fetch" operators: '.$expression['right']['type'], $expression);
+                throw new CompilerException(
+                    'Cannot use this expression for "fetch" operators: ' . $expression['right']['type'],
+                    $expression
+                );
         }
     }
 }
diff --git a/src/Operators/Other/InstanceOfOperator.php b/src/Operators/Other/InstanceOfOperator.php
index f7eac3c004..ab91a4a1d2 100644
--- a/src/Operators/Other/InstanceOfOperator.php
+++ b/src/Operators/Other/InstanceOfOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\Class\Entry;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -33,11 +34,11 @@ class InstanceOfOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile($expression, CompilationContext $context): CompiledExpression
     {
-        $left = new Expression($expression['left']);
+        $left     = new Expression($expression['left']);
         $resolved = $left->compile($context);
 
         if ('variable' != $resolved->getType()) {
@@ -49,8 +50,8 @@ public function compile($expression, CompilationContext $context): CompiledExpre
             throw new CompilerException("InstanceOf requires a 'dynamic variable' in the left operand", $expression);
         }
 
-        $right = new Expression($expression['right']);
-        $resolved = $right->compile($context);
+        $right            = new Expression($expression['right']);
+        $resolved         = $right->compile($context);
         $resolvedVariable = $resolved->getCode();
 
         switch ($resolved->getType()) {
@@ -71,25 +72,29 @@ public function compile($expression, CompilationContext $context): CompiledExpre
                             if ('Traversable' === $className) {
                                 $symbol = $context->backend->getVariableCode($symbolVariable);
 
-                                return new CompiledExpression('bool', 'zephir_zval_is_traversable('.$symbol.')', $expression);
+                                return new CompiledExpression(
+                                    'bool',
+                                    'zephir_zval_is_traversable(' . $symbol . ')',
+                                    $expression
+                                );
                             }
 
                             if ($context->compiler->isClass($className)) {
                                 $classDefinition = $context->compiler->getClassDefinition($className);
-                                $classEntry = $classDefinition->getClassEntry($context);
+                                $classEntry      = $classDefinition->getClassEntry($context);
                             } else {
                                 if ($context->compiler->isInterface($className)) {
                                     $classDefinition = $context->compiler->getClassDefinition($className);
-                                    $classEntry = $classDefinition->getClassEntry($context);
+                                    $classEntry      = $classDefinition->getClassEntry($context);
                                 } else {
                                     if (!class_exists($className, false)) {
-                                        $code = 'SL("'.trim(Entry::escape($className), '\\').'")';
+                                        $code = 'SL("' . trim(Entry::escape($className), '\\') . '")';
                                     } else {
-                                        $entry = (new Entry($resolvedVariable, $context));
+                                        $entry      = (new Entry($resolvedVariable, $context));
                                         $classEntry = $entry->get();
 
                                         if (!$entry->isInternal()) {
-                                            $code = 'SL("'.trim(Entry::escape($className), '\\').'")';
+                                            $code = 'SL("' . trim(Entry::escape($className), '\\') . '")';
                                         }
                                     }
                                 }
@@ -105,12 +110,17 @@ public function compile($expression, CompilationContext $context): CompiledExpre
                         $tempVariable = $context->symbolTable->getTempVariableForWrite('string', $context);
                         $tempVariable->setMustInitNull(true);
                         $tempVariableName = $tempVariable->getName();
-                        $context->codePrinter->output('zephir_get_strval('.$tempVariableName.', '.$resolvedVariable.');');
+                        $context->codePrinter->output(
+                            'zephir_get_strval(' . $tempVariableName . ', ' . $resolvedVariable . ');'
+                        );
                         $code = $this->prepareBackendSpecificCode($tempVariableName, $context);
                         break;
 
                     default:
-                        throw new CompilerException("InstanceOf requires a 'variable' or a 'string' in the right operand", $expression);
+                        throw new CompilerException(
+                            "InstanceOf requires a 'variable' or a 'string' in the right operand",
+                            $expression
+                        );
                 }
         }
 
@@ -118,17 +128,21 @@ public function compile($expression, CompilationContext $context): CompiledExpre
         $context->headersManager->add('kernel/object');
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($code)) {
-            return new CompiledExpression('bool', 'zephir_is_instance_of('.$symbol.', '.$code.')', $expression);
+            return new CompiledExpression('bool', 'zephir_is_instance_of(' . $symbol . ', ' . $code . ')', $expression);
         }
 
-        return new CompiledExpression('bool', 'zephir_instance_of_ev('.$symbol.', '.$classEntry.')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_instance_of_ev(' . $symbol . ', ' . $classEntry . ')',
+            $expression
+        );
     }
 
     private function prepareBackendSpecificCode($variable, CompilationContext $context): string
     {
         return strtr('Z_STRVAL_P(:p:name), Z_STRLEN_P(:p:name)', [
             ':name' => $variable,
-            ':p' => '&',
+            ':p'    => '&',
         ]);
     }
 }
diff --git a/src/Operators/Other/IssetOperator.php b/src/Operators/Other/IssetOperator.php
index 0666448753..43a31afd69 100644
--- a/src/Operators/Other/IssetOperator.php
+++ b/src/Operators/Other/IssetOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -28,13 +29,13 @@ class IssetOperator extends AbstractOperator
     /**
      * Compiles an 'isset' operator.
      *
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -50,17 +51,27 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 $exprCompiledVariable = $exprVariable->compile($compilationContext);
                 if (!in_array($exprCompiledVariable->getType(), ['variable', 'array'], true)) {
-                    throw new CompilerException('Expression type: '.$exprCompiledVariable->getType().' cannot be used as array', $left['left']);
+                    throw new CompilerException(
+                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as array',
+                        $left['left']
+                    );
                 }
 
-                $variable = $compilationContext->symbolTable->getVariableForRead($exprCompiledVariable->getCode(), $compilationContext, $left['left']);
+                $variable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiledVariable->getCode(),
+                    $compilationContext,
+                    $left['left']
+                );
                 switch ($variable->getType()) {
                     case 'array':
                     case 'variable':
                         break;
 
                     default:
-                        throw new CompilerException('Variable type: '.$variable->getType().' cannot be used as array', $left['left']);
+                        throw new CompilerException(
+                            'Variable type: ' . $variable->getType() . ' cannot be used as array',
+                            $left['left']
+                        );
                         break;
                 }
 
@@ -82,17 +93,31 @@ public function compile(array $expression, CompilationContext $compilationContex
                     case 'int':
                     case 'long':
                     case 'string':
-                        return $compilationContext->backend->arrayIsset($variable, $resolvedExpr, $left['right'], $compilationContext);
+                        return $compilationContext->backend->arrayIsset(
+                            $variable,
+                            $resolvedExpr,
+                            $left['right'],
+                            $compilationContext
+                        );
 
                     case 'variable':
                     case 'mixed':
-                        $indexVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $left['right']);
+                        $indexVariable = $compilationContext->symbolTable->getVariableForRead(
+                            $resolvedExpr->getCode(),
+                            $compilationContext,
+                            $left['right']
+                        );
 
-                        return $compilationContext->backend->arrayIsset($variable, $indexVariable, $left['right'], $compilationContext);
+                        return $compilationContext->backend->arrayIsset(
+                            $variable,
+                            $indexVariable,
+                            $left['right'],
+                            $compilationContext
+                        );
                         break;
 
                     default:
-                        throw new CompilerException('['.$left['right']['type'].']', $expression);
+                        throw new CompilerException('[' . $left['right']['type'] . ']', $expression);
                 }
                 break;
 
@@ -105,12 +130,22 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 $exprCompiledVariable = $exprVariable->compile($compilationContext);
                 if ('variable' !== $exprCompiledVariable->getType()) {
-                    throw new CompilerException('Expression type: '.$exprCompiledVariable->getType().' cannot be used as object', $left['left']);
+                    throw new CompilerException(
+                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',
+                        $left['left']
+                    );
                 }
 
-                $variable = $compilationContext->symbolTable->getVariableForRead($exprCompiledVariable->getCode(), $compilationContext, $left['left']);
+                $variable = $compilationContext->symbolTable->getVariableForRead(
+                    $exprCompiledVariable->getCode(),
+                    $compilationContext,
+                    $left['left']
+                );
                 if ('variable' !== $variable->getType()) {
-                    throw new CompilerException('Variable type: '.$variable->getType().' cannot be used as object', $left['left']);
+                    throw new CompilerException(
+                        'Variable type: ' . $variable->getType() . ' cannot be used as object',
+                        $left['left']
+                    );
                 }
 
                 if ($variable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
@@ -132,22 +167,30 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                 switch ($resolvedExpr->getType()) {
                     case 'variable':
-                        $indexVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $left['right']);
+                        $indexVariable = $compilationContext->symbolTable->getVariableForRead(
+                            $resolvedExpr->getCode(),
+                            $compilationContext,
+                            $left['right']
+                        );
                         switch ($indexVariable->getType()) {
                             case 'variable':
                             case 'mixed':
                             case 'string':
                                 $indexVariableCode = $compilationContext->backend->getVariableCode($indexVariable);
 
-                                return new CompiledExpression('bool', 'zephir_isset_property_zval('.$variableCode.', '.$indexVariableCode.')', $left['right']);
+                                return new CompiledExpression(
+                                    'bool',
+                                    'zephir_isset_property_zval(' . $variableCode . ', ' . $indexVariableCode . ')',
+                                    $left['right']
+                                );
 
                             default:
-                                throw new CompilerException('['.$indexVariable->getType().']', $expression);
+                                throw new CompilerException('[' . $indexVariable->getType() . ']', $expression);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('['.$expression['left']['right']['type'].']', $expression);
+                        throw new CompilerException('[' . $expression['left']['right']['type'] . ']', $expression);
                 }
                 break;
 
diff --git a/src/Operators/Other/LikelyOperator.php b/src/Operators/Other/LikelyOperator.php
index ef2bc03a72..d3a5b97752 100644
--- a/src/Operators/Other/LikelyOperator.php
+++ b/src/Operators/Other/LikelyOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -32,7 +33,7 @@ class LikelyOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -45,23 +46,30 @@ public function compile(array $expression, CompilationContext $compilationContex
         $left = $leftExpr->compile($compilationContext);
 
         if ('bool' === $left->getType()) {
-            return new CompiledExpression('bool', 'EXPECTED('.$left->getCode().')', $expression);
+            return new CompiledExpression('bool', 'EXPECTED(' . $left->getCode() . ')', $expression);
         }
 
         if ('variable' === $left->getType()) {
-            $variable = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression['left']);
+            $variable = $compilationContext->symbolTable->getVariableForRead(
+                $left->getCode(),
+                $compilationContext,
+                $expression['left']
+            );
             switch ($variable->getType()) {
                 case 'bool':
-                    return new CompiledExpression('bool', 'EXPECTED('.$variable->getName().')', $expression);
+                    return new CompiledExpression('bool', 'EXPECTED(' . $variable->getName() . ')', $expression);
 
                 default:
                     $compilationContext->headersManager->add('kernel/operators');
                     $symbol = $compilationContext->backend->getVariableCode($variable);
 
-                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true('.$symbol.'))', $expression);
+                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true(' . $symbol . '))', $expression);
             }
         }
 
-        throw new CompilerException("Cannot use expression type: '".$left->getType()."' in 'likely' operator", $expression['left']);
+        throw new CompilerException(
+            "Cannot use expression type: '" . $left->getType() . "' in 'likely' operator",
+            $expression['left']
+        );
     }
 }
diff --git a/src/Operators/Other/NewInstanceOperator.php b/src/Operators/Other/NewInstanceOperator.php
index 4b96cff893..6933331e29 100644
--- a/src/Operators/Other/NewInstanceOperator.php
+++ b/src/Operators/Other/NewInstanceOperator.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionClass;
+use ReflectionException;
 use Zephir\Class\Entry;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -22,6 +24,8 @@
 use Zephir\MethodCall;
 use Zephir\Operators\AbstractOperator;
 
+use function count;
+
 /**
  * Creates a new instance of a class
  */
@@ -37,7 +41,7 @@ class NewInstanceOperator extends AbstractOperator
      *
      * @return CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
@@ -48,7 +52,7 @@ public function compile(array $expression, CompilationContext $compilationContex
          * Resolves the symbol that expects the value
          */
         $this->literalOnly = false;
-        $symbolVariable = $this->getExpectedNonLiteral($compilationContext, $expression);
+        $symbolVariable    = $this->getExpectedNonLiteral($compilationContext, $expression);
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException('Objects can only be instantiated into dynamic variables', $expression);
         }
@@ -76,7 +80,7 @@ public function compile(array $expression, CompilationContext $compilationContex
             $className = $compilationContext->classDefinition->getCompleteName();
         } else {
             $className = $expression['class'];
-            $dynamic = $expression['dynamic'];
+            $dynamic   = $expression['dynamic'];
             if (!$dynamic) {
                 $className = $compilationContext->getFullName($expression['class']);
             }
@@ -90,10 +94,10 @@ public function compile(array $expression, CompilationContext $compilationContex
          * stdclass doesn't have constructors.
          */
         $lowerClassName = strtolower($className);
-        $isStdClass = 'stdclass' === $lowerClassName || '\stdclass' === $lowerClassName;
+        $isStdClass     = 'stdclass' === $lowerClassName || '\stdclass' === $lowerClassName;
 
         if ($isStdClass) {
-            if (isset($expression['parameters']) && \count($expression['parameters']) > 0) {
+            if (isset($expression['parameters']) && count($expression['parameters']) > 0) {
                 throw new CompilerException('stdclass does not receive parameters in its constructor', $expression);
             }
 
@@ -109,7 +113,11 @@ public function compile(array $expression, CompilationContext $compilationContex
              * Classes inside the same extension
              */
             if ($classDefinition) {
-                $compilationContext->backend->initObject($symbolVariable, $classDefinition->getClassEntry($compilationContext), $compilationContext);
+                $compilationContext->backend->initObject(
+                    $symbolVariable,
+                    $classDefinition->getClassEntry($compilationContext),
+                    $compilationContext
+                );
                 $symbolVariable->setClassTypes($className);
                 $symbolVariable->setAssociatedClass($classDefinition);
             } else {
@@ -117,28 +125,45 @@ public function compile(array $expression, CompilationContext $compilationContex
                  * Classes outside the extension
                  */
                 if ($dynamic) {
-                    $classNameVariable = $compilationContext->symbolTable->getVariableForRead($className, $compilationContext, $expression);
+                    $classNameVariable = $compilationContext->symbolTable->getVariableForRead(
+                        $className,
+                        $compilationContext,
+                        $expression
+                    );
                     if ($classNameVariable->isNotVariableAndString()) {
-                        throw new CompilerException('Only dynamic/string variables can be used in new operator. '.$classNameVariable->getName(), $expression);
+                        throw new CompilerException(
+                            'Only dynamic/string variables can be used in new operator. ' . $classNameVariable->getName(
+                            ),
+                            $expression
+                        );
                     }
 
                     /**
                      * Use a safe string version of the variable to avoid segfaults
                      */
                     $compilationContext->headersManager->add('kernel/object');
-                    $safeSymbolVariable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext);
+                    $safeSymbolVariable = $compilationContext->symbolTable->getTempVariable(
+                        'variable',
+                        $compilationContext
+                    );
                     $safeSymbolVariable->setMustInitNull(true);
                     $safeSymbolVariable->setIsInitialized(true, $compilationContext);
                     $safeSymbolVariable->increaseUses();
-                    $safeSymbol = $compilationContext->backend->getVariableCode($safeSymbolVariable);
+                    $safeSymbol      = $compilationContext->backend->getVariableCode($safeSymbolVariable);
                     $classNameSymbol = $compilationContext->backend->getVariableCode($classNameVariable);
 
-                    $compilationContext->codePrinter->output('zephir_fetch_safe_class('.$safeSymbol.', '.$classNameSymbol.');');
-                    $classNameToFetch = 'Z_STRVAL_P('.$safeSymbol.'), Z_STRLEN_P('.$safeSymbol.')';
-                    $zendClassEntry = $compilationContext->cacheManager->getClassEntryCache()->get($classNameToFetch, true, $compilationContext);
-                    $classEntry = $zendClassEntry->getName();
-
-                    $compilationContext->codePrinter->output('if(!'.$classEntry.') {');
+                    $compilationContext->codePrinter->output(
+                        'zephir_fetch_safe_class(' . $safeSymbol . ', ' . $classNameSymbol . ');'
+                    );
+                    $classNameToFetch = 'Z_STRVAL_P(' . $safeSymbol . '), Z_STRLEN_P(' . $safeSymbol . ')';
+                    $zendClassEntry   = $compilationContext->cacheManager->getClassEntryCache()->get(
+                        $classNameToFetch,
+                        true,
+                        $compilationContext
+                    );
+                    $classEntry       = $zendClassEntry->getName();
+
+                    $compilationContext->codePrinter->output('if(!' . $classEntry . ') {');
                     $compilationContext->codePrinter->increaseLevel();
                     $compilationContext->codePrinter->output('RETURN_MM_NULL();');
                     $compilationContext->codePrinter->decreaseLevel();
@@ -146,15 +171,19 @@ public function compile(array $expression, CompilationContext $compilationContex
                 } else {
                     if (!class_exists($className, false)) {
                         $compilationContext->logger->warning(
-                            'Class "'.$className.'" does not exist at compile time',
+                            'Class "' . $className . '" does not exist at compile time',
                             ['nonexistent-class', $expression]
                         );
-                        $classNameToFetch = 'SL("'.Entry::escape($className).'")';
+                        $classNameToFetch = 'SL("' . Entry::escape($className) . '")';
 
-                        $zendClassEntry = $compilationContext->cacheManager->getClassEntryCache()->get($classNameToFetch, false, $compilationContext);
-                        $classEntry = $zendClassEntry->getName();
+                        $zendClassEntry = $compilationContext->cacheManager->getClassEntryCache()->get(
+                            $classNameToFetch,
+                            false,
+                            $compilationContext
+                        );
+                        $classEntry     = $zendClassEntry->getName();
                     } else {
-                        $reflectionClass = new \ReflectionClass($className);
+                        $reflectionClass = new ReflectionClass($className);
                         if ($reflectionClass->isInterface()) {
                             throw new CompilerException('Interfaces cannot be instantiated', $expression);
                         }
@@ -210,24 +239,24 @@ public function compile(array $expression, CompilationContext $compilationContex
         /* TODO: use the MethodBuilder here */
         if (isset($expression['parameters'])) {
             $callExpr = new Expression([
-                'variable' => ['type' => 'variable', 'value' => $symbolVariable->getRealName()],
-                'name' => '__construct',
+                'variable'   => ['type' => 'variable', 'value' => $symbolVariable->getRealName()],
+                'name'       => '__construct',
                 'parameters' => $expression['parameters'],
-                'call-type' => MethodCall::CALL_NORMAL,
-                'file' => $expression['file'],
-                'line' => $expression['line'],
-                'char' => $expression['char'],
-                'check' => $callConstructor,
+                'call-type'  => MethodCall::CALL_NORMAL,
+                'file'       => $expression['file'],
+                'line'       => $expression['line'],
+                'char'       => $expression['char'],
+                'check'      => $callConstructor,
             ]);
         } else {
             $callExpr = new Expression([
-                'variable' => ['type' => 'variable', 'value' => $symbolVariable->getRealName()],
-                'name' => '__construct',
+                'variable'  => ['type' => 'variable', 'value' => $symbolVariable->getRealName()],
+                'name'      => '__construct',
                 'call-type' => MethodCall::CALL_NORMAL,
-                'file' => $expression['file'],
-                'line' => $expression['line'],
-                'char' => $expression['char'],
-                'check' => $callConstructor,
+                'file'      => $expression['file'],
+                'line'      => $expression['line'],
+                'char'      => $expression['char'],
+                'check'     => $callConstructor,
             ]);
         }
 
diff --git a/src/Operators/Other/RangeExclusiveOperator.php b/src/Operators/Other/RangeExclusiveOperator.php
index c98ec91d09..21afa4eacc 100644
--- a/src/Operators/Other/RangeExclusiveOperator.php
+++ b/src/Operators/Other/RangeExclusiveOperator.php
@@ -49,8 +49,11 @@ public function compile(array $expression, CompilationContext $compilationContex
         /**
          * Implicit type coercing.
          */
-        $castBuilder = $exprBuilder->operators()->cast('array', $exprBuilder->statements()
-            ->functionCall('range', [$expression['left'], $expression['right']]));
+        $castBuilder = $exprBuilder->operators()->cast(
+            'array',
+            $exprBuilder->statements()
+                        ->functionCall('range', [$expression['left'], $expression['right']])
+        );
 
         $expression = new Expression($castBuilder->build());
         $expression->setReadOnly($this->readOnly);
diff --git a/src/Operators/Other/RangeInclusiveOperator.php b/src/Operators/Other/RangeInclusiveOperator.php
index 44c5a3c8f1..0ac26ca7a3 100644
--- a/src/Operators/Other/RangeInclusiveOperator.php
+++ b/src/Operators/Other/RangeInclusiveOperator.php
@@ -49,8 +49,11 @@ public function compile(array $expression, CompilationContext $compilationContex
         /**
          * Implicit type coercing.
          */
-        $castBuilder = $exprBuilder->operators()->cast(Types::T_ARRAY, $exprBuilder->statements()
-            ->functionCall('range', [$expression['left'], $expression['right']]));
+        $castBuilder = $exprBuilder->operators()->cast(
+            Types::T_ARRAY,
+            $exprBuilder->statements()
+                        ->functionCall('range', [$expression['left'], $expression['right']])
+        );
 
         $expression = new Expression($castBuilder->build());
         $expression->setReadOnly($this->readOnly);
diff --git a/src/Operators/Other/RequireOnceOperator.php b/src/Operators/Other/RequireOnceOperator.php
index a28c72e4c3..a3122c28d4 100644
--- a/src/Operators/Other/RequireOnceOperator.php
+++ b/src/Operators/Other/RequireOnceOperator.php
@@ -25,7 +25,7 @@
 class RequireOnceOperator extends AbstractOperator
 {
     /**
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
@@ -40,8 +40,12 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $exprPath = $expr->compile($compilationContext);
         if ('variable' === $exprPath->getType()) {
-            $exprVariable = $compilationContext->symbolTable->getVariableForRead($exprPath->getCode(), $compilationContext, $expression);
-            $exprVar = $compilationContext->backend->getVariableCode($exprVariable);
+            $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+                $exprPath->getCode(),
+                $compilationContext,
+                $expression
+            );
+            $exprVar      = $compilationContext->backend->getVariableCode($exprVariable);
             if ('variable' === $exprVariable->getType()) {
                 if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
                     $compilationContext->logger->warning(
@@ -51,14 +55,21 @@ public function compile(array $expression, CompilationContext $compilationContex
                 }
             }
         } else {
-            $exprVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+            $exprVar = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
             $compilationContext->backend->assignString($exprVar, $exprPath->getCode(), $compilationContext);
             $exprVar = $compilationContext->backend->getVariableCode($exprVar);
         }
 
         $symbolVariable = false;
         if ($this->isExpecting()) {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                'variable',
+                $compilationContext
+            );
         }
 
         $compilationContext->headersManager->add('kernel/memory');
@@ -67,13 +78,13 @@ public function compile(array $expression, CompilationContext $compilationContex
         $codePrinter = $compilationContext->codePrinter;
 
         if ($symbolVariable) {
-            $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&'.$symbolVariable->getName().');');
+            $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-            $codePrinter->output('if (zephir_require_once_zval_ret('.$symbol.', '.$exprVar.') == FAILURE) {');
+            $codePrinter->output('if (zephir_require_once_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
         } else {
-            $codePrinter->output('if (zephir_require_once_zval('.$exprVar.') == FAILURE) {');
+            $codePrinter->output('if (zephir_require_once_zval(' . $exprVar . ') == FAILURE) {');
         }
-        $codePrinter->output("\t".'RETURN_MM_NULL();');
+        $codePrinter->output("\t" . 'RETURN_MM_NULL();');
         $codePrinter->output('}');
 
         if ($symbolVariable) {
diff --git a/src/Operators/Other/RequireOperator.php b/src/Operators/Other/RequireOperator.php
index 04001afe7c..208c46c6f0 100644
--- a/src/Operators/Other/RequireOperator.php
+++ b/src/Operators/Other/RequireOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -25,13 +26,13 @@
 class RequireOperator extends AbstractOperator
 {
     /**
-     * @param array              $expression
+     * @param array $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -41,8 +42,12 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $exprPath = $expr->compile($compilationContext);
         if ('variable' === $exprPath->getType()) {
-            $exprVariable = $compilationContext->symbolTable->getVariableForRead($exprPath->getCode(), $compilationContext, $expression);
-            $exprVar = $compilationContext->backend->getVariableCode($exprVariable);
+            $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+                $exprPath->getCode(),
+                $compilationContext,
+                $expression
+            );
+            $exprVar      = $compilationContext->backend->getVariableCode($exprVariable);
             if ('variable' === $exprVariable->getType()) {
                 if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
                     $compilationContext->logger->warning(
@@ -52,14 +57,21 @@ public function compile(array $expression, CompilationContext $compilationContex
                 }
             }
         } else {
-            $exprVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $expression);
+            $exprVar = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
             $compilationContext->backend->assignString($exprVar, $exprPath->getCode(), $compilationContext);
             $exprVar = $compilationContext->backend->getVariableCode($exprVar);
         }
 
         $symbolVariable = false;
         if ($this->isExpecting()) {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                'variable',
+                $compilationContext
+            );
         }
 
         $compilationContext->headersManager->add('kernel/memory');
@@ -68,13 +80,13 @@ public function compile(array $expression, CompilationContext $compilationContex
         $codePrinter = $compilationContext->codePrinter;
 
         if ($symbolVariable) {
-            $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&'.$symbolVariable->getName().');');
+            $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-            $codePrinter->output('if (zephir_require_zval_ret('.$symbol.', '.$exprVar.') == FAILURE) {');
+            $codePrinter->output('if (zephir_require_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
         } else {
-            $codePrinter->output('if (zephir_require_zval('.$exprVar.') == FAILURE) {');
+            $codePrinter->output('if (zephir_require_zval(' . $exprVar . ') == FAILURE) {');
         }
-        $codePrinter->output("\t".'RETURN_MM_NULL();');
+        $codePrinter->output("\t" . 'RETURN_MM_NULL();');
         $codePrinter->output('}');
 
         if ($symbolVariable) {
diff --git a/src/Operators/Other/ShortTernaryOperator.php b/src/Operators/Other/ShortTernaryOperator.php
index 029cfc5912..09a3213362 100644
--- a/src/Operators/Other/ShortTernaryOperator.php
+++ b/src/Operators/Other/ShortTernaryOperator.php
@@ -49,7 +49,10 @@ public function compile($expression, CompilationContext $compilationContext): Co
         $returnVariable->setLocalOnly(false);
 
         if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
-            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext
+            );
             if ($returnVariable->isTemporal()) {
                 $returnVariable->skipInitVariant(2);
             }
@@ -66,12 +69,12 @@ public function compile($expression, CompilationContext $compilationContext): Co
                  */
                 new LetStatementBuilder([
                     'assign-type' => 'variable',
-                    'variable' => $returnVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $expression['extra'],
-                    'file' => $expression['file'],
-                    'line' => $expression['line'],
-                    'char' => $expression['char'],
+                    'variable'    => $returnVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $expression['extra'],
+                    'file'        => $expression['file'],
+                    'line'        => $expression['line'],
+                    'char'        => $expression['char'],
                 ], $expression['extra']),
             ]),
             new StatementsBlockBuilder([
@@ -80,12 +83,12 @@ public function compile($expression, CompilationContext $compilationContext): Co
                  */
                 new LetStatementBuilder([
                     'assign-type' => 'variable',
-                    'variable' => $returnVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $expression['left'],
-                    'file' => $expression['file'],
-                    'line' => $expression['line'],
-                    'char' => $expression['char'],
+                    'variable'    => $returnVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $expression['left'],
+                    'file'        => $expression['file'],
+                    'line'        => $expression['line'],
+                    'char'        => $expression['char'],
                 ], $expression['extra']),
             ])
         );
diff --git a/src/Operators/Other/TernaryOperator.php b/src/Operators/Other/TernaryOperator.php
index 9ed0f29464..37a28e5412 100644
--- a/src/Operators/Other/TernaryOperator.php
+++ b/src/Operators/Other/TernaryOperator.php
@@ -44,15 +44,18 @@ public function compile($expression, CompilationContext $compilationContext): Co
         $returnVariable->setLocalOnly(false);
 
         if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
-            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext
+            );
             if ($returnVariable->isTemporal()) {
                 $returnVariable->skipInitVariant(2);
             }
         }
 
-        $expr = new EvalExpression();
+        $expr      = new EvalExpression();
         $condition = $expr->optimize($expression['left'], $compilationContext);
-        $compilationContext->codePrinter->output('if ('.$condition.') {');
+        $compilationContext->codePrinter->output('if (' . $condition . ') {');
 
         $compilationContext->codePrinter->increaseLevel();
 
@@ -60,16 +63,16 @@ public function compile($expression, CompilationContext $compilationContext): Co
          * Create an implicit 'let' operation to update the evaluated left operator.
          */
         $statement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $returnVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $expression['right'],
-                    'file' => $expression['file'],
-                    'line' => $expression['line'],
-                    'char' => $expression['char'],
+                    'variable'    => $returnVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $expression['right'],
+                    'file'        => $expression['file'],
+                    'line'        => $expression['line'],
+                    'char'        => $expression['char'],
                 ],
             ],
         ]);
@@ -83,16 +86,16 @@ public function compile($expression, CompilationContext $compilationContext): Co
          * Create an implicit 'let' operation to update the evaluated left operator.
          */
         $statement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $returnVariable->getName(),
-                    'operator' => 'assign',
-                    'expr' => $expression['extra'],
-                    'file' => $expression['file'],
-                    'line' => $expression['line'],
-                    'char' => $expression['char'],
+                    'variable'    => $returnVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $expression['extra'],
+                    'file'        => $expression['file'],
+                    'line'        => $expression['line'],
+                    'char'        => $expression['char'],
                 ],
             ],
         ]);
diff --git a/src/Operators/Other/TypeHintOperator.php b/src/Operators/Other/TypeHintOperator.php
index 6baf09c6e6..c687bbc42e 100644
--- a/src/Operators/Other/TypeHintOperator.php
+++ b/src/Operators/Other/TypeHintOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -31,7 +32,7 @@ class TypeHintOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/src/Operators/Other/TypeOfOperator.php b/src/Operators/Other/TypeOfOperator.php
index cb1fac6c31..e029e7c51f 100644
--- a/src/Operators/Other/TypeOfOperator.php
+++ b/src/Operators/Other/TypeOfOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -33,7 +34,7 @@ class TypeOfOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -42,7 +43,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
         }
 
         $functionCall = BuilderFactory::getInstance()->statements()->functionCall('gettype', [$expression['left']]);
-        $expression = new Expression($functionCall->build());
+        $expression   = new Expression($functionCall->build());
 
         return $expression->compile($compilationContext);
     }
diff --git a/src/Operators/Other/UnlikelyOperator.php b/src/Operators/Other/UnlikelyOperator.php
index 8c4e33af3e..38d807e747 100644
--- a/src/Operators/Other/UnlikelyOperator.php
+++ b/src/Operators/Other/UnlikelyOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -34,7 +35,7 @@ class UnlikelyOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -47,23 +48,30 @@ public function compile($expression, CompilationContext $compilationContext): Co
         $left = $leftExpr->compile($compilationContext);
 
         if ('bool' === $left->getType()) {
-            return new CompiledExpression('bool', 'UNEXPECTED('.$left->getCode().')', $expression);
+            return new CompiledExpression('bool', 'UNEXPECTED(' . $left->getCode() . ')', $expression);
         }
 
         if ('variable' === $left->getType()) {
-            $variable = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression['left']);
+            $variable = $compilationContext->symbolTable->getVariableForRead(
+                $left->getCode(),
+                $compilationContext,
+                $expression['left']
+            );
             switch ($variable->getType()) {
                 case 'bool':
-                    return new CompiledExpression('bool', 'UNEXPECTED('.$variable->getName().')', $expression);
+                    return new CompiledExpression('bool', 'UNEXPECTED(' . $variable->getName() . ')', $expression);
 
                 default:
                     $compilationContext->headersManager->add('kernel/operators');
                     $symbol = $compilationContext->backend->getVariableCode($variable);
 
-                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true('.$symbol.'))', $expression);
+                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true(' . $symbol . '))', $expression);
             }
         }
 
-        throw new CompilerException("Cannot use expression type: '".$left->getType()."' in 'unlikely' operator", $expression['left']);
+        throw new CompilerException(
+            "Cannot use expression type: '" . $left->getType() . "' in 'unlikely' operator",
+            $expression['left']
+        );
     }
 }
diff --git a/src/Operators/Unary/MinusOperator.php b/src/Operators/Unary/MinusOperator.php
index 38a3c94415..7808b6501c 100644
--- a/src/Operators/Unary/MinusOperator.php
+++ b/src/Operators/Unary/MinusOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Unary;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -31,7 +32,7 @@ class MinusOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -49,7 +50,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
             case 'long':
             case 'ulong':
             case 'double':
-                return new CompiledExpression($left->getType(), '-'.$left->getCode(), $expression);
+                return new CompiledExpression($left->getType(), '-' . $left->getCode(), $expression);
 
             case 'variable':
                 $variable = $compilationContext->symbolTable->getVariable($left->getCode());
@@ -59,21 +60,25 @@ public function compile($expression, CompilationContext $compilationContext): Co
                     case 'long':
                     case 'ulong':
                     case 'double':
-                        return new CompiledExpression($variable->getType(), '-'.$variable->getName(), $expression);
+                        return new CompiledExpression($variable->getType(), '-' . $variable->getName(), $expression);
 
                     case 'variable':
                         $compilationContext->headersManager->add('kernel/operators');
-                        $compilationContext->codePrinter->output('zephir_negate('.$compilationContext->backend->getVariableCode($variable).');');
+                        $compilationContext->codePrinter->output(
+                            'zephir_negate(' . $compilationContext->backend->getVariableCode($variable) . ');'
+                        );
 
                         return new CompiledExpression('variable', $variable->getName(), $expression);
 
                     default:
-                        throw new CompilerException("Cannot operate minus with variable of '".$left->getType()."' type");
+                        throw new CompilerException(
+                            "Cannot operate minus with variable of '" . $left->getType() . "' type"
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException("Cannot operate minus with '".$left->getType()."' type");
+                throw new CompilerException("Cannot operate minus with '" . $left->getType() . "' type");
         }
     }
 }
diff --git a/src/Operators/Unary/NotOperator.php b/src/Operators/Unary/NotOperator.php
index ab9b10969f..7a55b2c13c 100644
--- a/src/Operators/Unary/NotOperator.php
+++ b/src/Operators/Unary/NotOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Unary;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -29,7 +30,7 @@ class NotOperator extends AbstractOperator
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
@@ -47,31 +48,35 @@ public function compile($expression, CompilationContext $compilationContext): Co
             case 'uint':
             case 'long':
             case 'ulong':
-                return new CompiledExpression('bool', '!('.$left->getCode().')', $expression);
+                return new CompiledExpression('bool', '!(' . $left->getCode() . ')', $expression);
 
             case 'variable':
-                $variable = $compilationContext->symbolTable->getVariableForRead($left->getCode(), $compilationContext, $expression['left']);
+                $variable = $compilationContext->symbolTable->getVariableForRead(
+                    $left->getCode(),
+                    $compilationContext,
+                    $expression['left']
+                );
                 switch ($variable->getType()) {
                     case 'bool':
                     case 'int':
                     case 'uint':
                     case 'long':
-                        return new CompiledExpression('bool', '!'.$variable->getName(), $expression);
+                        return new CompiledExpression('bool', '!' . $variable->getName(), $expression);
 
                     case 'variable':
                     case 'mixed':
                         $compilationContext->headersManager->add('kernel/operators');
                         $symbol = $compilationContext->backend->getVariableCode($variable);
 
-                        return new CompiledExpression('bool', '!zephir_is_true('.$symbol.')', $expression);
+                        return new CompiledExpression('bool', '!zephir_is_true(' . $symbol . ')', $expression);
 
                     default:
-                        throw new CompilerException('Unknown type: '.$variable->getType(), $expression);
+                        throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type: '.$left->getType(), $expression);
+                throw new CompilerException('Unknown type: ' . $left->getType(), $expression);
         }
     }
 }
diff --git a/src/Optimizers/EvalExpression.php b/src/Optimizers/EvalExpression.php
index b87fe6af19..444372ba7c 100644
--- a/src/Optimizers/EvalExpression.php
+++ b/src/Optimizers/EvalExpression.php
@@ -21,45 +21,54 @@
 use Zephir\LiteralCompiledExpression;
 use Zephir\Variable\Variable;
 
+use function is_object;
+
 /**
- * Resolves evaluation of expressions returning a C-int expression that can be used by 'if'/'while'/'do-while' statements
+ * Resolves evaluation of expressions returning a C-int expression that can be used by 'if'/'while'/'do-while'
+ * statements
  */
 class EvalExpression
 {
-    protected ?bool $unreachable = null;
+    protected ?bool $unreachable     = null;
     protected ?bool $unreachableElse = null;
-    protected array $usedVariables = [];
+    protected array $usedVariables   = [];
 
     /**
-     * Skips the not operator by recursively optimizing the expression at its right.
-     *
-     * @param array              $expr
-     * @param CompilationContext $compilationContext
-     *
-     * @return string|null
+     * Returns the variable evaluated by the EvalExpression.
      *
-     * @throws Exception
+     * @return Variable
      */
-    public function optimizeNot(array $expr, CompilationContext $compilationContext): ?string
+    public function getEvalVariable()
     {
-        /**
-         * Compile the expression negating the evaluated expression
-         */
-        if ('not' == $expr['type']) {
-            $conditions = $this->optimize($expr['left'], $compilationContext);
-            if (false !== $conditions) {
-                if (null !== $this->unreachable) {
-                    $this->unreachable = !$this->unreachable;
-                }
-                if (null !== $this->unreachableElse) {
-                    $this->unreachableElse = !$this->unreachableElse;
-                }
+        return end($this->usedVariables);
+    }
 
-                return '!('.$conditions.')';
-            }
-        }
+    /**
+     * @return array
+     */
+    public function getUsedVariables(): array
+    {
+        return $this->usedVariables;
+    }
 
-        return null;
+    /**
+     * Checks if the evaluation produce unreachable code.
+     *
+     * @return bool|null
+     */
+    public function isUnreachable(): ?bool
+    {
+        return $this->unreachable;
+    }
+
+    /**
+     * Checks if the evaluation not produce unreachable code.
+     *
+     * @return bool|null
+     */
+    public function isUnreachableElse(): ?bool
+    {
+        return $this->unreachableElse;
     }
 
     /**
@@ -96,8 +105,8 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
         /**
          * Possible corrupted expression?
          */
-        if (!\is_object($compiledExpression)) {
-            throw new CompilerException('Corrupted expression: '.$exprRaw['type'], $exprRaw);
+        if (!is_object($compiledExpression)) {
+            throw new CompilerException('Corrupted expression: ' . $exprRaw['type'], $exprRaw);
         }
 
         /**
@@ -142,9 +151,13 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                 return $code;
 
             case 'variable':
-                $variableRight = $compilationContext->symbolTable->getVariableForRead($compiledExpression->getCode(), $compilationContext, $exprRaw);
+                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                    $compiledExpression->getCode(),
+                    $compilationContext,
+                    $exprRaw
+                );
                 $possibleValue = $variableRight->getPossibleValue();
-                if (\is_object($possibleValue)) {
+                if (is_object($possibleValue)) {
                     $possibleValueBranch = $variableRight->getPossibleValueBranch();
                     if ($possibleValueBranch instanceof Branch) {
                         /**
@@ -166,7 +179,7 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                                         break;
 
                                     case 'int':
-                                        if (!(int) $possibleValue->getCode()) {
+                                        if (!(int)$possibleValue->getCode()) {
                                             $this->unreachable = true;
                                         } else {
                                             $this->unreachableElse = true;
@@ -174,7 +187,7 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                                         break;
 
                                     case 'double':
-                                        if (!(float) $possibleValue->getCode()) {
+                                        if (!(float)$possibleValue->getCode()) {
                                             $this->unreachable = true;
                                         } else {
                                             $this->unreachableElse = true;
@@ -206,59 +219,66 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                         return $variableRight->getName();
 
                     case 'string':
-                        return '!('.$compilationContext->backend->ifVariableValueUndefined($variableRight, $compilationContext, true, false).')';
+                        return '!('
+                            . $compilationContext->backend->ifVariableValueUndefined(
+                                $variableRight,
+                                $compilationContext,
+                                true,
+                                false
+                            )
+                            . ')';
 
                     case 'variable':
                         $compilationContext->headersManager->add('kernel/operators');
                         $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
 
-                        return 'zephir_is_true('.$variableRightCode.')';
+                        return 'zephir_is_true(' . $variableRightCode . ')';
 
                     default:
-                        throw new CompilerException("Variable can't be evaluated ".$variableRight->getType(), $exprRaw);
+                        throw new CompilerException(
+                            "Variable can't be evaluated " . $variableRight->getType(),
+                            $exprRaw
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException('Expression '.$compiledExpression->getType()." can't be evaluated", $exprRaw);
+                throw new CompilerException(
+                    'Expression ' . $compiledExpression->getType() . " can't be evaluated",
+                    $exprRaw
+                );
         }
     }
 
     /**
-     * Checks if the evaluation produce unreachable code.
+     * Skips the not operator by recursively optimizing the expression at its right.
      *
-     * @return bool|null
-     */
-    public function isUnreachable(): ?bool
-    {
-        return $this->unreachable;
-    }
-
-    /**
-     * Checks if the evaluation not produce unreachable code.
+     * @param array              $expr
+     * @param CompilationContext $compilationContext
      *
-     * @return bool|null
-     */
-    public function isUnreachableElse(): ?bool
-    {
-        return $this->unreachableElse;
-    }
-
-    /**
-     * Returns the variable evaluated by the EvalExpression.
+     * @return string|null
      *
-     * @return Variable
+     * @throws Exception
      */
-    public function getEvalVariable()
+    public function optimizeNot(array $expr, CompilationContext $compilationContext): ?string
     {
-        return end($this->usedVariables);
-    }
+        /**
+         * Compile the expression negating the evaluated expression
+         */
+        if ('not' == $expr['type']) {
+            $conditions = $this->optimize($expr['left'], $compilationContext);
+            if (false !== $conditions) {
+                if (null !== $this->unreachable) {
+                    $this->unreachable = !$this->unreachable;
+                }
+                if (null !== $this->unreachableElse) {
+                    $this->unreachableElse = !$this->unreachableElse;
+                }
 
-    /**
-     * @return array
-     */
-    public function getUsedVariables(): array
-    {
-        return $this->usedVariables;
+                return '!(' . $conditions . ')';
+            }
+        }
+
+        return null;
     }
 }
diff --git a/src/Optimizers/FunctionCall/ACosOptimizer.php b/src/Optimizers/FunctionCall/ACosOptimizer.php
index e9eb0d5931..c225ec1753 100644
--- a/src/Optimizers/FunctionCall/ACosOptimizer.php
+++ b/src/Optimizers/FunctionCall/ACosOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\MathOptimizer;
diff --git a/src/Optimizers/FunctionCall/ASinOptimizer.php b/src/Optimizers/FunctionCall/ASinOptimizer.php
index 3bd2887e64..2b34bcd84d 100644
--- a/src/Optimizers/FunctionCall/ASinOptimizer.php
+++ b/src/Optimizers/FunctionCall/ASinOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\MathOptimizer;
diff --git a/src/Optimizers/FunctionCall/AddslashesOptimizer.php b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
index ee744241d4..a7a0acad8a 100644
--- a/src/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * AddslashesOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) > 1) {
+        if (count($expression['parameters']) > 1) {
             return false;
         }
 
@@ -53,7 +55,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
 
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -67,7 +72,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_addslashes('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_addslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index 7982ac6335..a05e5d9beb 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * ArrayKeysExistsOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -50,6 +52,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         // Note: the first parameter is key in php array_key_exists
-        return new CompiledExpression('bool', 'zephir_array_key_exists('.$resolvedParams[1].', '.$resolvedParams[0].')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_array_key_exists(' . $resolvedParams[1] . ', ' . $resolvedParams[0] . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index c4766558ff..869d9435a5 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * ArrayKeysOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -53,7 +55,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/array');
@@ -66,7 +71,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_array_keys('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_array_keys(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index 25cf3f20e7..a81bf765ae 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * ArrayMergeOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index b1b8b03c72..bfeaf68ff0 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * BasenameOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -55,7 +57,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
@@ -66,7 +71,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_basename('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_basename(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index 315b973ff4..aba3da31e0 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CallUserFuncArrayOptimizer.
  *
@@ -39,7 +41,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -51,7 +53,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if (!$symbolVariable->isVariable()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         } else {
             $symbolVariable = $context->symbolTable->addTemp('variable', $context);
@@ -77,7 +82,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_CALL_USER_FUNC_ARRAY('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+        $context->codePrinter->output(
+            'ZEPHIR_CALL_USER_FUNC_ARRAY(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index 36a1f61d9d..27df94855d 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CallUserFuncOptimizer.
  *
@@ -39,7 +41,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -51,7 +53,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if (!$symbolVariable->isVariable()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         } else {
             $symbolVariable = $context->symbolTable->addTemp('variable', $context);
@@ -77,7 +82,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_CALL_USER_FUNC('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('ZEPHIR_CALL_USER_FUNC(' . $symbol . ', ' . $resolvedParams[0] . ');');
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index 0bba183e61..38b04e5b72 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CamelizeOptimizer.
  *
@@ -41,12 +43,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) < 1 || \count($expression['parameters']) > 2) {
+        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
             throw new CompilerException("'camelize' only accepts one or two parameters");
         }
 
         $delimiter = 'NULL ';
-        if (2 == \count($expression['parameters'])) {
+        if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
             }
@@ -59,7 +61,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         if ($call->mustInitSymbolVariable()) {
@@ -77,7 +82,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_camelize('.$symbol.', '.$resolvedParams[0].', '.$delimiter.' );');
+        $context->codePrinter->output(
+            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/CeilOptimizer.php b/src/Optimizers/FunctionCall/CeilOptimizer.php
index 932bac520a..2139d3d059 100644
--- a/src/Optimizers/FunctionCall/CeilOptimizer.php
+++ b/src/Optimizers/FunctionCall/CeilOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CeilOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -49,6 +51,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('double', 'zephir_ceil('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('double', 'zephir_ceil(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/ClassExistsOptimizer.php b/src/Optimizers/FunctionCall/ClassExistsOptimizer.php
index 09f9de7d12..817b5426d2 100644
--- a/src/Optimizers/FunctionCall/ClassExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ClassExistsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * ClassExistsOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) < 1) {
+        if (count($expression['parameters']) < 1) {
             throw new CompilerException("'class_exists' require one or two parameters");
         }
 
@@ -50,15 +52,19 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         /*
          * Process autoload
          */
-        if (2 == \count($resolvedParams)) {
+        if (2 == count($resolvedParams)) {
             $context->headersManager->add('kernel/operators');
-            $autoload = 'zephir_is_true('.$resolvedParams[1].') ';
+            $autoload = 'zephir_is_true(' . $resolvedParams[1] . ') ';
         } else {
             $autoload = '1';
         }
 
         $context->headersManager->add('kernel/object');
 
-        return new CompiledExpression('bool', 'zephir_class_exists('.$resolvedParams[0].', '.$autoload.')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_class_exists(' . $resolvedParams[0] . ', ' . $autoload . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php b/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
index 211c2b6fec..767483fd08 100644
--- a/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CompareMtimeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CompareMtimeOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -54,6 +56,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_compare_mtime('.$resolvedParams[0].', '.$resolvedParams[1].')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_compare_mtime(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/CosOptimizer.php b/src/Optimizers/FunctionCall/CosOptimizer.php
index 8c6af2d6f5..4121c7f5ca 100644
--- a/src/Optimizers/FunctionCall/CosOptimizer.php
+++ b/src/Optimizers/FunctionCall/CosOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\MathOptimizer;
diff --git a/src/Optimizers/FunctionCall/CountOptimizer.php b/src/Optimizers/FunctionCall/CountOptimizer.php
index c74018f9d3..b0174a5352 100644
--- a/src/Optimizers/FunctionCall/CountOptimizer.php
+++ b/src/Optimizers/FunctionCall/CountOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CountOptimizer.
  *
@@ -38,12 +40,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('int', 'zephir_fast_count_int('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('int', 'zephir_fast_count_int(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index dd3474ce5b..cf0e1c44f3 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Crc32Optimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -63,7 +68,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_crc32('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_crc32(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
index 8e5e809fcd..c6a028aa21 100644
--- a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CreateArrayOptimizer.
  *
@@ -38,7 +40,7 @@ class CreateArrayOptimizer extends OptimizerAbstract
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
         if (isset($expression['parameters'])) {
-            if (\count($expression['parameters']) > 1) {
+            if (count($expression['parameters']) > 1) {
                 throw new CompilerException('This function only requires one parameter', $expression);
             }
         }
@@ -50,7 +52,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         /*
@@ -74,9 +79,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if ($resolvedParams) {
-            $context->codePrinter->output('zephir_create_array('.$symbol.', zephir_get_intval('.$resolvedParams[0].'), 1);');
+            $context->codePrinter->output(
+                'zephir_create_array(' . $symbol . ', zephir_get_intval(' . $resolvedParams[0] . '), 1);'
+            );
         } else {
-            $context->codePrinter->output('zephir_create_array('.$symbol.', 0, 1);');
+            $context->codePrinter->output('zephir_create_array(' . $symbol . ', 0, 1);');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 0983bb23b2..59deadb13c 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CreateInstanceOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             throw new CompilerException('This function only requires one parameter', $expression);
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         /*
@@ -76,7 +81,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output(
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         $call->checkTempParameters($context);
         $call->addCallStatusOrJump($context);
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index ec4fed4a73..7b34c76be1 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CreateInstanceParamsOptimizer.
  *
@@ -37,7 +39,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             throw new CompilerException('This function only requires two parameter', $expression);
         }
 
@@ -48,7 +50,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         /*
@@ -71,7 +76,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+        $context->codePrinter->output(
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
 
         $call->addCallStatusOrJump($context);
 
diff --git a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
index 8224396cfe..d7c5eca749 100644
--- a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * CreateSymbolTableOptimizer.
  *
@@ -38,7 +40,7 @@ class CreateSymbolTableOptimizer extends OptimizerAbstract
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
         if (isset($expression['parameters'])) {
-            if (0 != \count($expression['parameters'])) {
+            if (0 != count($expression['parameters'])) {
                 throw new CompilerException("This function doesn't require parameters", $expression);
             }
         }
@@ -51,7 +53,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if (!$symbolVariable->isVariable()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
diff --git a/src/Optimizers/FunctionCall/DieOptimizer.php b/src/Optimizers/FunctionCall/DieOptimizer.php
index 4dfc46ac00..25f983a4de 100644
--- a/src/Optimizers/FunctionCall/DieOptimizer.php
+++ b/src/Optimizers/FunctionCall/DieOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 /**
diff --git a/src/Optimizers/FunctionCall/DoublevalOptimizer.php b/src/Optimizers/FunctionCall/DoublevalOptimizer.php
index aa5a1ad0b6..d3e274050e 100644
--- a/src/Optimizers/FunctionCall/DoublevalOptimizer.php
+++ b/src/Optimizers/FunctionCall/DoublevalOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * DoublevalOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -49,6 +51,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('double', 'zephir_get_doubleval('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('double', 'zephir_get_doubleval(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/EndsWithOptimizer.php b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
index 0176f76ace..ba62fd59d1 100644
--- a/src/Optimizers/FunctionCall/EndsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * EndsWithOptimizer.
  *
@@ -38,7 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters']) && 3 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters']) && 3 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,13 +54,25 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/string');
 
         if (isset($str)) {
-            return new CompiledExpression('bool', 'zephir_end_with_str('.$resolvedParams[0].', SL("'.$str.'"))', $expression);
+            return new CompiledExpression(
+                'bool',
+                'zephir_end_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
+                $expression
+            );
         }
 
-        if (2 == \count($expression['parameters'])) {
-            return new CompiledExpression('bool', 'zephir_end_with('.$resolvedParams[0].', '.$resolvedParams[1].', NULL)', $expression);
+        if (2 == count($expression['parameters'])) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
+                $expression
+            );
         } else {
-            return new CompiledExpression('bool', 'zephir_end_with('.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].')', $expression);
+            return new CompiledExpression(
+                'bool',
+                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
+                $expression
+            );
         }
     }
 }
diff --git a/src/Optimizers/FunctionCall/EvalOptimizer.php b/src/Optimizers/FunctionCall/EvalOptimizer.php
index a826500899..213ad32974 100644
--- a/src/Optimizers/FunctionCall/EvalOptimizer.php
+++ b/src/Optimizers/FunctionCall/EvalOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,14 +9,19 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Zephir\Optimizers\FunctionCall\EvalOptimizer.
  */
@@ -34,11 +37,11 @@ class EvalOptimizer extends OptimizerAbstract
      * @return bool|CompiledExpression|mixed
      *
      * @throws CompilerException
-     * @throws \Zephir\Exception
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (!isset($expression['parameters']) || \count($expression['parameters']) > 1) {
+        if (!isset($expression['parameters']) || count($expression['parameters']) > 1) {
             return false;
         }
 
@@ -64,9 +67,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $evalContext = str_replace(
-            [getcwd().'\\', getcwd().'/'],
+            [getcwd() . '\\', getcwd() . '/'],
             '',
-            $expression['file'].':'.$expression['line']
+            $expression['file'] . ':' . $expression['line']
         );
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
diff --git a/src/Optimizers/FunctionCall/ExitOptimizer.php b/src/Optimizers/FunctionCall/ExitOptimizer.php
index 233d8af3a0..6651e0be7c 100644
--- a/src/Optimizers/FunctionCall/ExitOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExitOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Optimizes calls to 'exit' using internal function
  */
@@ -35,7 +37,7 @@ class ExitOptimizer extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (isset($expression['parameters']) && \count($expression['parameters']) > 1) {
+        if (isset($expression['parameters']) && count($expression['parameters']) > 1) {
             return false;
         }
 
@@ -47,7 +49,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $context->codePrinter->output('zephir_exit_empty();');
         } else {
             $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-            $context->codePrinter->output('zephir_exit('.$resolvedParams[0].');');
+            $context->codePrinter->output('zephir_exit(' . $resolvedParams[0] . ');');
         }
 
         return new CompiledExpression('void ', '', $expression);
diff --git a/src/Optimizers/FunctionCall/ExplodeOptimizer.php b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
index 317253c14a..4e935ac09c 100644
--- a/src/Optimizers/FunctionCall/ExplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -20,6 +20,8 @@
 use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Optimizes calls to 'explode' using internal function
  */
@@ -39,7 +41,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (!isset($expression['parameters'])) {
             return false;
         }
-        if (\count($expression['parameters']) < 2) {
+        if (count($expression['parameters']) < 2) {
             throw new CompilerException("'explode' require two parameter");
         }
 
@@ -50,23 +52,26 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         /**
          * Process limit.
          */
-        $limit = 'LONG_MAX';
+        $limit       = 'LONG_MAX';
         $limitOffset = 2;
-        if (3 == \count($expression['parameters']) && 'int' == $expression['parameters'][2]['parameter']['type']) {
-            $limit = $expression['parameters'][2]['parameter']['value'].' ';
+        if (3 == count($expression['parameters']) && 'int' == $expression['parameters'][2]['parameter']['type']) {
+            $limit = $expression['parameters'][2]['parameter']['value'] . ' ';
             unset($expression['parameters'][2]);
         }
 
         if ('string' == $expression['parameters'][0]['parameter']['type']) {
             $str = Name::addSlashes($expression['parameters'][0]['parameter']['value']);
             unset($expression['parameters'][0]);
-            if (2 == \count($expression['parameters'])) {
+            if (2 == count($expression['parameters'])) {
                 $limitOffset = 1;
             }
         }
@@ -75,7 +80,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         if (isset($resolvedParams[$limitOffset])) {
             $context->headersManager->add('kernel/operators');
-            $limit = 'zephir_get_intval('.$resolvedParams[$limitOffset].') ';
+            $limit = 'zephir_get_intval(' . $resolvedParams[$limitOffset] . ') ';
         }
 
         $context->headersManager->add('kernel/string');
@@ -86,12 +91,16 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
-            $context->codePrinter->output('zephir_fast_explode_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].', '.$limit.');');
+            $context->codePrinter->output(
+                'zephir_fast_explode_str(' . $symbol . ', SL("' . $str . '"), ' . $resolvedParams[0] . ', ' . $limit . ');'
+            );
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_fast_explode('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$limit.');');
+        $context->codePrinter->output(
+            'zephir_fast_explode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $limit . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/FcloseOptimizer.php b/src/Optimizers/FunctionCall/FcloseOptimizer.php
index 225bae500a..209b2db340 100644
--- a/src/Optimizers/FunctionCall/FcloseOptimizer.php
+++ b/src/Optimizers/FunctionCall/FcloseOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FcloseOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -49,6 +51,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_fclose('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('bool', 'zephir_fclose(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/FeofOptimizer.php b/src/Optimizers/FunctionCall/FeofOptimizer.php
index 17a2b8355b..7cc8289ab2 100644
--- a/src/Optimizers/FunctionCall/FeofOptimizer.php
+++ b/src/Optimizers/FunctionCall/FeofOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FeofOptimizer.
  *
@@ -38,7 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -46,6 +48,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_feof('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('bool', 'zephir_feof(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/FileExistsOptimizer.php b/src/Optimizers/FunctionCall/FileExistsOptimizer.php
index 01fd640b5f..fc515e1988 100644
--- a/src/Optimizers/FunctionCall/FileExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FileExistsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FileExistsOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -49,6 +51,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', '(zephir_file_exists('.$resolvedParams[0].') == SUCCESS)', $expression);
+        return new CompiledExpression(
+            'bool',
+            '(zephir_file_exists(' . $resolvedParams[0] . ') == SUCCESS)',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
index ec39325a1c..acefbf9a62 100644
--- a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FileGetContentsOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -55,7 +57,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
@@ -65,11 +70,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
         if ($symbolVariable) {
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_file_get_contents('.$symbol.', '.$resolvedParams[0].');');
+            $context->codePrinter->output('zephir_file_get_contents(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_file_get_contents(NULL, '.$resolvedParams[0].');');
+            $context->codePrinter->output('zephir_file_get_contents(NULL, ' . $resolvedParams[0] . ');');
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php b/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
index 46e28d0c1e..d7e808ad3d 100644
--- a/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FilePutContentsOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -55,7 +57,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable();
         if ($symbolVariable) {
             if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
@@ -65,11 +70,15 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             if ($call->mustInitSymbolVariable()) {
                 $symbolVariable->initVariant($context);
             }
-            $context->codePrinter->output('zephir_file_put_contents('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+            $context->codePrinter->output(
+                'zephir_file_put_contents(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            );
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_file_put_contents(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].');');
+            $context->codePrinter->output(
+                'zephir_file_put_contents(NULL, ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            );
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index ef35b0e954..bfafa3cd4d 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FilemtimeOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -55,7 +57,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable) {
             if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
@@ -66,7 +71,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_filemtime('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_filemtime(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/FloorOptimizer.php b/src/Optimizers/FunctionCall/FloorOptimizer.php
index 5992072cc8..fd9bc9188e 100644
--- a/src/Optimizers/FunctionCall/FloorOptimizer.php
+++ b/src/Optimizers/FunctionCall/FloorOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FloorOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -49,6 +51,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('double', 'zephir_floor('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('double', 'zephir_floor(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
index fa0a3fea81..47f848390d 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Zephir\Optimizers\FunctionCall\FuncGetArgOptimizer.
  *
@@ -39,11 +41,11 @@ class FuncGetArgOptimizer extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (!isset($expression['parameters']) || 1 != \count($expression['parameters'])) {
+        if (!isset($expression['parameters']) || 1 != count($expression['parameters'])) {
             throw new CompilerException(
                 sprintf(
                     'func_get_arg() expects at exactly 1 parameter, %d given',
-                    isset($expression['parameters']) ? \count($expression['parameters']) : 0
+                    isset($expression['parameters']) ? count($expression['parameters']) : 0
                 ),
                 $expression
             );
diff --git a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index baf9938a61..0ab9734a32 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -55,7 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->headersManager->add('kernel/main');
-        $context->codePrinter->output('zephir_get_args('.$symbol.');');
+        $context->codePrinter->output('zephir_get_args(' . $symbol . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
index 556d8497ae..93eb084f89 100644
--- a/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
diff --git a/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php b/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
index ff3dec2ad9..d75f825b55 100644
--- a/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FunctionExistsOptimizer.php
@@ -19,6 +19,8 @@
 use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Optimizes calls to 'function_exists' using internal function
  */
@@ -33,7 +35,7 @@ class FunctionExistsOptimizer extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (!isset($expression['parameters']) || 1 !== \count($expression['parameters'])) {
+        if (!isset($expression['parameters']) || 1 !== count($expression['parameters'])) {
             return false;
         }
 
@@ -48,14 +50,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (isset($str)) {
             return new CompiledExpression(
                 'bool',
-                '(zephir_function_exists_ex(ZEND_STRL("'.strtolower($str).'")) == SUCCESS)',
+                '(zephir_function_exists_ex(ZEND_STRL("' . strtolower($str) . '")) == SUCCESS)',
                 $expression
             );
         }
 
         return new CompiledExpression(
             'bool',
-            '(zephir_function_exists('.$resolvedParams[0].') == SUCCESS)',
+            '(zephir_function_exists(' . $resolvedParams[0] . ') == SUCCESS)',
             $expression
         );
     }
diff --git a/src/Optimizers/FunctionCall/FwriteOptimizer.php b/src/Optimizers/FunctionCall/FwriteOptimizer.php
index 5274061afe..bc49fe3faa 100644
--- a/src/Optimizers/FunctionCall/FwriteOptimizer.php
+++ b/src/Optimizers/FunctionCall/FwriteOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * FwriteOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -55,7 +57,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable();
         if ($symbolVariable) {
             if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
@@ -65,11 +70,15 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $symbolVariable->initVariant($context);
             }
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_fwrite('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+            $context->codePrinter->output(
+                'zephir_fwrite(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            );
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         } else {
-            $context->codePrinter->output('zephir_fwrite(NULL, '.$resolvedParams[0].', '.$resolvedParams[1].');');
+            $context->codePrinter->output(
+                'zephir_fwrite(NULL, ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            );
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
index 1600bb4242..6d0cc30603 100644
--- a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * GetCalledClassOptimizer.
  *
@@ -38,7 +40,7 @@ class GetCalledClassOptimizer extends OptimizerAbstract
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
         if (isset($expression['parameters'])) {
-            $numberParameters = \count($expression['parameters']);
+            $numberParameters = count($expression['parameters']);
             if (0 != $numberParameters) {
                 return false;
             }
@@ -51,7 +53,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         if ($call->mustInitSymbolVariable()) {
@@ -63,7 +68,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('string');
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_get_called_class('.$symbol.');');
+        $context->codePrinter->output('zephir_get_called_class(' . $symbol . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index f7fd107846..3b75edbb34 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * GetClassLowerOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $numberParameters = \count($expression['parameters']);
+        $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters) {
             throw new CompilerException("'get_class_lower' only accepts one parameters", $expression);
         }
@@ -53,7 +55,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/object');
@@ -67,7 +72,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 1);');
+        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 1);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index fcc30868f0..ad5a71ce73 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * GetClassNsOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $numberParameters = \count($expression['parameters']);
+        $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters && 2 != $numberParameters) {
             throw new CompilerException("'get_class_ns' only accepts one or two parameters", $expression);
         }
@@ -53,7 +55,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/object');
@@ -67,9 +72,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (!isset($resolvedParams[1])) {
-            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', 0);');
+            $context->codePrinter->output('zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
         } else {
-            $context->codePrinter->output('zephir_get_class_ns('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+            $context->codePrinter->output(
+                'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            );
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index a1529d3ce2..9b352d0c5c 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * GetClassOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $numberParameters = \count($expression['parameters']);
+        $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters && 2 != $numberParameters) {
             throw new CompilerException("'get_class' only accepts one or two parameters", $expression);
         }
@@ -53,7 +55,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
         $context->headersManager->add('kernel/object');
 
@@ -66,7 +71,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class('.$symbol.', '.$resolvedParams[0].', 0);');
+        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index 939452794c..3039d3d2e6 100644
--- a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -50,7 +50,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->headersManager->add('kernel/variables');
-        $context->codePrinter->output('zephir_get_defined_vars('.$symbol.');');
+        $context->codePrinter->output('zephir_get_defined_vars(' . $symbol . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
index d131f30882..4c814b3861 100644
--- a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * GetNsClassOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             throw new CompilerException("'get_class_ns' only accepts one parameter");
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/object');
@@ -64,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_get_ns_class('.$symbol.', '.$resolvedParams[0].', 0);');
+        $context->codePrinter->output('zephir_get_ns_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/GettypeOptimizer.php b/src/Optimizers/FunctionCall/GettypeOptimizer.php
index 12a0ced719..0b41b1a8fd 100644
--- a/src/Optimizers/FunctionCall/GettypeOptimizer.php
+++ b/src/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * GettypeOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $symbolVariable->setDynamicTypes('string');
@@ -63,7 +68,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_gettype('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_gettype(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/GlobalsGetOptimizer.php b/src/Optimizers/FunctionCall/GlobalsGetOptimizer.php
index 89364dc379..5051573b60 100644
--- a/src/Optimizers/FunctionCall/GlobalsGetOptimizer.php
+++ b/src/Optimizers/FunctionCall/GlobalsGetOptimizer.php
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * `globals_get()` internal function.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return null;
         }
 
-        if (1 !== \count($expression['parameters'])) {
+        if (1 !== count($expression['parameters'])) {
             throw new CompilerException("'globals_get' only accepts one parameter", $expression);
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $globalName = $expression['parameters'][0]['parameter']['value'];
 
         if (!$context->compiler->isExtensionGlobal($globalName)) {
-            throw new CompilerException("Global '".$globalName."' cannot be read because it isn't defined", $expression);
+            throw new CompilerException(
+                "Global '" . $globalName . "' cannot be read because it isn't defined",
+                $expression
+            );
         }
 
         $type = $context->compiler->getExtensionGlobal($globalName)['type'];
@@ -60,9 +65,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (str_contains($globalName, '.')) {
             $parts = explode('.', $globalName);
 
-            return new CompiledExpression($type, 'ZEPHIR_GLOBAL('.$parts[0].').'.$parts[1], $expression);
+            return new CompiledExpression($type, 'ZEPHIR_GLOBAL(' . $parts[0] . ').' . $parts[1], $expression);
         }
 
-        return new CompiledExpression($type, 'ZEPHIR_GLOBAL('.$globalName.')', $expression);
+        return new CompiledExpression($type, 'ZEPHIR_GLOBAL(' . $globalName . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
index 93599ab0bb..52f5f89dd7 100644
--- a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
+++ b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
@@ -20,6 +20,9 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+use function is_string;
+
 /**
  * `globals_set()` internal function.
  *
@@ -42,7 +45,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException("'globals_set' requires two parameters", $expression);
         }
 
-        if (2 !== \count($expression['parameters'])) {
+        if (2 !== count($expression['parameters'])) {
             throw new CompilerException("'globals_set' only accepts two parameters", $expression);
         }
 
@@ -63,9 +66,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         try {
             $globalDefinition = $context->compiler->getExtensionGlobal($globalName);
-            $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+            $resolvedParams   = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-            if (!isset($resolvedParams[0]) || empty($resolvedParams[0]) || !\is_string($resolvedParams[0])) {
+            if (!isset($resolvedParams[0]) || empty($resolvedParams[0]) || !is_string($resolvedParams[0])) {
                 throw new CompilerException(
                     "Unable to reslove value for '{$globalName}' global variable.",
                     $expression
@@ -80,7 +83,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             }
 
             $internalAccessor = $this->resolveInternalAccessor($globalName);
-            $internalValue = $this->resolveInternalValue($globalDefinition, $expression, $globalName, $resolvedParams[0]);
+            $internalValue    = $this->resolveInternalValue(
+                $globalDefinition,
+                $expression,
+                $globalName,
+                $resolvedParams[0]
+            );
 
             $context->codePrinter->output("{$internalAccessor} = {$internalValue};");
 
diff --git a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
index b1bfa95fdf..ee62d9240d 100644
--- a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
+++ b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * HashEqualsOptimizer.
  *
@@ -37,7 +39,7 @@ class HashEqualsOptimizer extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (!isset($expression['parameters']) || 2 != \count($expression['parameters'])) {
+        if (!isset($expression['parameters']) || 2 != count($expression['parameters'])) {
             throw new CompilerException("'hash_equals' requires two parameters", $expression);
         }
 
@@ -48,7 +50,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -62,6 +67,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
 
-        return new CompiledExpression('bool', 'zephir_hash_equals('.$resolvedParams[0].', '.$resolvedParams[1].')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_hash_equals(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/ImplodeOptimizer.php b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
index e1dabd0228..f2f9207e18 100644
--- a/src/Optimizers/FunctionCall/ImplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -20,6 +20,8 @@
 use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Optimizes calls to 'implode' using internal function
  */
@@ -40,7 +42,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -51,7 +53,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         if ('string' == $expression['parameters'][0]['parameter']['type']) {
@@ -70,12 +75,16 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
-            $context->codePrinter->output('zephir_fast_join_str('.$symbol.', SL("'.$str.'"), '.$resolvedParams[0].');');
+            $context->codePrinter->output(
+                'zephir_fast_join_str(' . $symbol . ', SL("' . $str . '"), ' . $resolvedParams[0] . ');'
+            );
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_fast_join('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+        $context->codePrinter->output(
+            'zephir_fast_join(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index 567a1ad22a..b6717aa1a1 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * InArrayOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -49,6 +51,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_fast_in_array('.$resolvedParams[0].', '.$resolvedParams[1].')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_fast_in_array(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php b/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
index 3f5a8839c3..b0db2203ef 100644
--- a/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * InterfaceExistsOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) < 1) {
+        if (count($expression['parameters']) < 1) {
             throw new CompilerException("'class_exists' require one or two parameters");
         }
 
@@ -49,20 +51,30 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          * Process autoload.
          */
         $autoload = '1 ';
-        if (2 == \count($expression['parameters']) && ('int' == $expression['parameters'][1]['parameter']['type'] || 'bool' == $expression['parameters'][1]['parameter']['type'])) {
-            $autoload = $expression['parameters'][1]['parameter']['value'].' ';
+        if (
+            2 == count($expression['parameters']) &&
+            (
+                'int' == $expression['parameters'][1]['parameter']['type'] ||
+                'bool' == $expression['parameters'][1]['parameter']['type']
+            )
+        ) {
+            $autoload = $expression['parameters'][1]['parameter']['value'] . ' ';
             unset($expression['parameters'][1]);
         }
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if (2 == \count($resolvedParams)) {
+        if (2 == count($resolvedParams)) {
             $context->headersManager->add('kernel/operators');
-            $autoload = 'zephir_is_true('.$resolvedParams[1].') ';
+            $autoload = 'zephir_is_true(' . $resolvedParams[1] . ') ';
         }
 
         $context->headersManager->add('kernel/object');
 
-        return new CompiledExpression('bool', 'zephir_interface_exists('.$resolvedParams[0].', '.$autoload.')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_interface_exists(' . $resolvedParams[0] . ', ' . $autoload . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/IntvalOptimizer.php b/src/Optimizers/FunctionCall/IntvalOptimizer.php
index d91914bb45..5e238548d4 100644
--- a/src/Optimizers/FunctionCall/IntvalOptimizer.php
+++ b/src/Optimizers/FunctionCall/IntvalOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * IntvalOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -49,6 +51,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('long', 'zephir_get_intval('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('long', 'zephir_get_intval(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/IsArrayOptimizer.php b/src/Optimizers/FunctionCall/IsArrayOptimizer.php
index 7b2991309d..31efa1df97 100644
--- a/src/Optimizers/FunctionCall/IsArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsArrayOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\IsTypeOptimizerAbstract;
diff --git a/src/Optimizers/FunctionCall/IsBoolOptimizer.php b/src/Optimizers/FunctionCall/IsBoolOptimizer.php
index 6b1e0c097b..7904b7696d 100644
--- a/src/Optimizers/FunctionCall/IsBoolOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsBoolOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\IsTypeOptimizerAbstract;
diff --git a/src/Optimizers/FunctionCall/IsCallableOptimizer.php b/src/Optimizers/FunctionCall/IsCallableOptimizer.php
index 3c6708ff21..dfe5b7dcdd 100644
--- a/src/Optimizers/FunctionCall/IsCallableOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsCallableOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * IsCallableOptimizer.
  *
@@ -38,12 +40,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_is_callable('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('bool', 'zephir_is_callable(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/IsIntOptimizer.php b/src/Optimizers/FunctionCall/IsIntOptimizer.php
index e38140c83b..f8a51646f2 100644
--- a/src/Optimizers/FunctionCall/IsIntOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsIntOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\IsTypeOptimizerAbstract;
diff --git a/src/Optimizers/FunctionCall/IsNullOptimizer.php b/src/Optimizers/FunctionCall/IsNullOptimizer.php
index 181b7973e2..771bf773a0 100644
--- a/src/Optimizers/FunctionCall/IsNullOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsNullOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\IsTypeOptimizerAbstract;
diff --git a/src/Optimizers/FunctionCall/IsNumericOptimizer.php b/src/Optimizers/FunctionCall/IsNumericOptimizer.php
index 08d446fceb..31911055c1 100644
--- a/src/Optimizers/FunctionCall/IsNumericOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsNumericOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * IsNumericOptimizer.
  *
@@ -38,7 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -46,6 +48,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_is_numeric('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('bool', 'zephir_is_numeric(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/IsObjectOptimizer.php b/src/Optimizers/FunctionCall/IsObjectOptimizer.php
index 135ce8b87d..4532e87929 100644
--- a/src/Optimizers/FunctionCall/IsObjectOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsObjectOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\IsTypeOptimizerAbstract;
diff --git a/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php b/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
index 87c435e377..2418904aca 100644
--- a/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * IsPhpVersionOptimizer.
  *
@@ -27,12 +29,12 @@
 class IsPhpVersionOptimizer extends OptimizerAbstract
 {
     protected $allowedTypes = [
-        'string' => true,
-        'int' => true,
-        'long' => true,
-        'double' => true,
-        'uint' => true,
-        'ulong' => true,
+        'string'  => true,
+        'int'     => true,
+        'long'    => true,
+        'double'  => true,
+        'uint'    => true,
+        'ulong'   => true,
         'istring' => true,
     ];
 
@@ -49,22 +51,29 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             throw new CompilerException('This function only requires one parameter', $expression);
         }
 
         $variableType = $expression['parameters'][0]['parameter']['type'];
 
         if (!isset($this->allowedTypes[$variableType])) {
-            throw new CompilerException("This function requires a scalar types parameter, $variableType given", $expression);
+            throw new CompilerException(
+                "This function requires a scalar types parameter, $variableType given",
+                $expression
+            );
         }
 
-        preg_match('/^(?<major>\d+)(?:\.(?<minor>!?\d+))?(?:\.(?<patch>!?\d+))?(?:[^Ee0-9.]+.*)?$/', $expression['parameters'][0]['parameter']['value'], $matches);
-        if (!\count($matches)) {
+        preg_match(
+            '/^(?<major>\d+)(?:\.(?<minor>!?\d+))?(?:\.(?<patch>!?\d+))?(?:[^Ee0-9.]+.*)?$/',
+            $expression['parameters'][0]['parameter']['value'],
+            $matches
+        );
+        if (!count($matches)) {
             throw new CompilerException('Could not parse PHP version', $expression);
         }
 
-        $minorVersion = 0;
+        $minorVersion   = 0;
         $releaseVersion = 0;
 
         $majorVersion = $matches['major'] * 10000;
@@ -77,8 +86,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $releaseVersion = $matches['patch'];
         }
 
-        $versionId = (int) ($majorVersion + $minorVersion + $releaseVersion);
+        $versionId = (int)($majorVersion + $minorVersion + $releaseVersion);
 
-        return new CompiledExpression('bool', 'zephir_is_php_version('.$versionId.')', $expression);
+        return new CompiledExpression('bool', 'zephir_is_php_version(' . $versionId . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php b/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
index 3f0f62a75b..97b5c5586a 100644
--- a/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -20,6 +20,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Zephir\Optimizers\FunctionCall\IsPrivatePropertyOptimizer.
  *
@@ -42,7 +44,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -51,7 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         try {
             $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-            return new CompiledExpression('bool', 'zephir_is_private_prop('.$resolvedParams[0].')', $expression);
+            return new CompiledExpression('bool', 'zephir_is_private_prop(' . $resolvedParams[0] . ')', $expression);
         } catch (Exception $e) {
             throw new CompilerException($e->getMessage(), $expression);
         }
diff --git a/src/Optimizers/FunctionCall/IsResourceOptimizer.php b/src/Optimizers/FunctionCall/IsResourceOptimizer.php
index 2c845c6f6c..8b4968f06d 100644
--- a/src/Optimizers/FunctionCall/IsResourceOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsResourceOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\IsTypeOptimizerAbstract;
diff --git a/src/Optimizers/FunctionCall/IsScalarOptimizer.php b/src/Optimizers/FunctionCall/IsScalarOptimizer.php
index 6987f807d5..d91eda7efd 100644
--- a/src/Optimizers/FunctionCall/IsScalarOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsScalarOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * IsScalarOptimizer.
  *
@@ -40,12 +42,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('bool', 'zephir_is_scalar('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('bool', 'zephir_is_scalar(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/IsStringOptimizer.php b/src/Optimizers/FunctionCall/IsStringOptimizer.php
index 98b5373551..42bfd00834 100644
--- a/src/Optimizers/FunctionCall/IsStringOptimizer.php
+++ b/src/Optimizers/FunctionCall/IsStringOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\IsTypeOptimizerAbstract;
diff --git a/src/Optimizers/FunctionCall/JoinOptimizer.php b/src/Optimizers/FunctionCall/JoinOptimizer.php
index c539fd8b57..30f33dee90 100644
--- a/src/Optimizers/FunctionCall/JoinOptimizer.php
+++ b/src/Optimizers/FunctionCall/JoinOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 /**
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index 5e06af921e..b1257e1bee 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * JsonDecodeOptimizer.
  *
@@ -64,9 +66,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         /*
          * Process encode options
          */
-        if (\count($resolvedParams) >= 2) {
+        if (count($resolvedParams) >= 2) {
             $context->headersManager->add('kernel/operators');
-            $options = 'zephir_get_intval('.$resolvedParams[1].') ';
+            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
         } else {
             $options = '0 ';
         }
@@ -76,7 +78,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_json_decode('.$symbol.', '.$resolvedParams[0].', '.$options.');');
+        $context->codePrinter->output(
+            'zephir_json_decode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index 3585bdfb38..d1fdbedece 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * JsonEncodeOptimizer.
  *
@@ -59,9 +61,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         /*
          * Process encode options
          */
-        if (\count($resolvedParams) >= 2) {
+        if (count($resolvedParams) >= 2) {
             $context->headersManager->add('kernel/operators');
-            $options = 'zephir_get_intval('.$resolvedParams[1].') ';
+            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
         } else {
             $options = '0 ';
         }
@@ -71,7 +73,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_json_encode('.$symbol.', '.$resolvedParams[0].', '.$options.');');
+        $context->codePrinter->output(
+            'zephir_json_encode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/LdexpOptimizer.php b/src/Optimizers/FunctionCall/LdexpOptimizer.php
index a86091a034..52e539c9d0 100644
--- a/src/Optimizers/FunctionCall/LdexpOptimizer.php
+++ b/src/Optimizers/FunctionCall/LdexpOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\MathOptimizer;
 
+use function count;
+
 /**
  * LdexpOptimizer.
  *
@@ -47,7 +49,7 @@ public function getFunctionName()
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (!isset($expression['parameters']) || 2 != \count($expression['parameters'])) {
+        if (!isset($expression['parameters']) || 2 != count($expression['parameters'])) {
             throw new CompilerException(sprintf("'%s' requires two parameters", $this->getFunctionName()), $expression);
         }
 
@@ -57,7 +59,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         return new CompiledExpression(
             'double',
-            'zephir_'.$this->getFunctionName().'('.$resolvedParams[0].', '.$resolvedParams[1].')',
+            'zephir_' . $this->getFunctionName() . '(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
             $expression
         );
     }
diff --git a/src/Optimizers/FunctionCall/LtrimOptimizer.php b/src/Optimizers/FunctionCall/LtrimOptimizer.php
index 8d77755144..3049cdb909 100644
--- a/src/Optimizers/FunctionCall/LtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/LtrimOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 /**
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index 067033b6fe..b09a1cc8e7 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * MD5Optimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -64,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_md5('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_md5(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/MemstrOptimizer.php b/src/Optimizers/FunctionCall/MemstrOptimizer.php
index bfdec812e4..c5fc3456ae 100644
--- a/src/Optimizers/FunctionCall/MemstrOptimizer.php
+++ b/src/Optimizers/FunctionCall/MemstrOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -20,6 +20,8 @@
 use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * MemnstrOptimizer.
  *
@@ -40,7 +42,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -54,9 +56,21 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/string');
 
         if (isset($str)) {
-            return new CompiledExpression('bool', 'zephir_memnstr_str('.$resolvedParams[0].', SL("'.$str.'"), "'.Compiler::getShortUserPath($expression['file']).'", '.$expression['line'].')', $expression);
+            return new CompiledExpression(
+                'bool',
+                'zephir_memnstr_str(' . $resolvedParams[0] . ', SL("' . $str . '"), "' . Compiler::getShortUserPath(
+                    $expression['file']
+                ) . '", ' . $expression['line'] . ')',
+                $expression
+            );
         }
 
-        return new CompiledExpression('bool', 'zephir_memnstr('.$resolvedParams[0].', '.$resolvedParams[1].', "'.Compiler::getShortUserPath($expression['file']).'", '.$expression['line'].')', $expression);
+        return new CompiledExpression(
+            'bool',
+            'zephir_memnstr(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', "' . Compiler::getShortUserPath(
+                $expression['file']
+            ) . '", ' . $expression['line'] . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/MergeAppendOptimizer.php b/src/Optimizers/FunctionCall/MergeAppendOptimizer.php
index c16033c8d3..ba782c0fca 100644
--- a/src/Optimizers/FunctionCall/MergeAppendOptimizer.php
+++ b/src/Optimizers/FunctionCall/MergeAppendOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * MergeAppendOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -53,7 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/array');
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        $context->codePrinter->output('zephir_merge_append('.$resolvedParams[0].', '.$resolvedParams[1].');');
+        $context->codePrinter->output('zephir_merge_append(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');');
 
         return new CompiledExpression('null', null, $expression);
     }
diff --git a/src/Optimizers/FunctionCall/MethodExistsOptimizer.php b/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
index 09927f623a..dcee158063 100644
--- a/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/MethodExistsOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Name;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Optimizes calls to 'method_exists' using internal function
  */
@@ -37,7 +39,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,14 +54,16 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (isset($str)) {
             return new CompiledExpression(
                 'bool',
-                '(zephir_method_exists_ex('.$resolvedParams[0].', ZEND_STRL("'.strtolower($str).'")) == SUCCESS)',
+                '(zephir_method_exists_ex(' . $resolvedParams[0] . ', ZEND_STRL("' . strtolower(
+                    $str
+                ) . '")) == SUCCESS)',
                 $expression
             );
         }
 
         return new CompiledExpression(
             'bool',
-            '(zephir_method_exists('.$resolvedParams[0].', '.$resolvedParams[1].')  == SUCCESS)',
+            '(zephir_method_exists(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')  == SUCCESS)',
             $expression
         );
     }
diff --git a/src/Optimizers/FunctionCall/MicrotimeOptimizer.php b/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
index 1733beaebd..a8bfa1d4d1 100644
--- a/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * MicrotimeOptimizer.
  *
@@ -38,7 +40,7 @@ class MicrotimeOptimizer extends OptimizerAbstract
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
         /* microtime has one optional parameter (get_as_float) */
-        if (isset($expression['parameters']) && \count($expression['parameters']) > 2) {
+        if (isset($expression['parameters']) && count($expression['parameters']) > 2) {
             return false;
         }
 
@@ -49,7 +51,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/time');
@@ -60,14 +65,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             if ($call->mustInitSymbolVariable()) {
                 $symbolVariable->initVariant($context);
             }
-            $context->codePrinter->output('zephir_microtime('.$symbol.', NULL);');
+            $context->codePrinter->output('zephir_microtime(' . $symbol . ', NULL);');
         } else {
             $symbolVariable->setDynamicTypes('double');
             $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
             if ($call->mustInitSymbolVariable()) {
                 $symbolVariable->initVariant($context);
             }
-            $context->codePrinter->output('zephir_microtime('.$symbol.', '.$resolvedParams[0].');');
+            $context->codePrinter->output('zephir_microtime(' . $symbol . ', ' . $resolvedParams[0] . ');');
         }
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/PowOptimizer.php b/src/Optimizers/FunctionCall/PowOptimizer.php
index ce27675458..c7d4b8bfda 100644
--- a/src/Optimizers/FunctionCall/PowOptimizer.php
+++ b/src/Optimizers/FunctionCall/PowOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * PowOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/operators');
@@ -63,7 +68,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_pow_function('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+        $context->codePrinter->output(
+            'zephir_pow_function(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php b/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
index f1e4d081f6..ba9ab34a4d 100644
--- a/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchAllOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 /**
diff --git a/src/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
index 8a752078d4..81f6f938c1 100644
--- a/src/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -21,6 +21,9 @@
 use Zephir\Optimizers\OptimizerAbstract;
 use Zephir\Variable\Variable;
 
+use function count;
+use function in_array;
+
 /**
  * Zephir\Optimizers\FunctionCall\PregMatchOptimizer.
  *
@@ -43,21 +46,21 @@ class PregMatchOptimizer extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        if (!isset($expression['parameters']) || \count($expression['parameters']) < 2) {
+        if (!isset($expression['parameters']) || count($expression['parameters']) < 2) {
             throw new CompilerException(
                 sprintf(
                     'preg_match() expects at least 2 parameters, %d given',
-                    isset($expression['parameters']) ? \count($expression['parameters']) : 0
+                    isset($expression['parameters']) ? count($expression['parameters']) : 0
                 ),
                 $expression
             );
         }
 
-        if (\count($expression['parameters']) > 5) {
+        if (count($expression['parameters']) > 5) {
             throw new CompilerException(
                 sprintf(
                     'preg_match() expects at most 5 parameters, %d given',
-                    \count($expression['parameters'])
+                    count($expression['parameters'])
                 ),
                 $expression
             );
@@ -89,7 +92,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $symbolVariable->initVariant($context);
             }
 
-            $symbol = $context->backend->getVariableCode($symbolVariable);
+            $symbol        = $context->backend->getVariableCode($symbolVariable);
             $matchesSymbol = $context->backend->getVariableCode($matches);
 
             $context->codePrinter->output(
@@ -111,63 +114,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
     }
 
-    /**
-     * Process optional parameters.
-     *
-     *     preg_match(pattern, subject, matches, flags, offset)
-     *
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return array
-     *
-     * @throws CompilerException
-     */
-    private function processOptionals(array &$expression, Call $call, CompilationContext $context)
-    {
-        $flags = null;
-        $offset = null;
-
-        $offsetParamOffset = 4;
-        if (isset($expression['parameters'][4]) && 'int' === $expression['parameters'][4]['parameter']['type']) {
-            $offset = $expression['parameters'][4]['parameter']['value'].' ';
-            unset($expression['parameters'][4]);
-        }
-
-        if (isset($expression['parameters'][3]) && 'int' === $expression['parameters'][3]['parameter']['type']) {
-            $flags = $expression['parameters'][3]['parameter']['value'].' ';
-            $offsetParamOffset = 3;
-            unset($expression['parameters'][3]);
-        }
-
-        try {
-            $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-            if (null === $offset && isset($resolvedParams[$offsetParamOffset])) {
-                $context->headersManager->add('kernel/operators');
-                $offset = 'zephir_get_intval('.$resolvedParams[$offsetParamOffset].') ';
-            }
-
-            if (null === $flags && isset($resolvedParams[3])) {
-                $context->headersManager->add('kernel/operators');
-                $flags = 'zephir_get_intval('.$resolvedParams[3].') ';
-            }
-        } catch (Exception $e) {
-            throw new CompilerException($e->getMessage(), $expression, $e->getCode(), $e);
-        }
-
-        if (null === $flags) {
-            $flags = '0 ';
-        }
-
-        if (null === $offset) {
-            $offset = '0 ';
-        }
-
-        return [$flags, $offset];
-    }
-
     /**
      * Process the matches result.
      *
@@ -196,7 +142,7 @@ private function createMatches(array $expression, CompilationContext $context)
                 );
             }
 
-            if (!\in_array($variable->getType(), ['variable', 'array'], true)) {
+            if (!in_array($variable->getType(), ['variable', 'array'], true)) {
                 throw new CompilerException(
                     sprintf(
                         "The '%s' variable must be either a variable or an array, got %s",
@@ -220,4 +166,61 @@ private function createMatches(array $expression, CompilationContext $context)
 
         return $variable;
     }
+
+    /**
+     * Process optional parameters.
+     *
+     *     preg_match(pattern, subject, matches, flags, offset)
+     *
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return array
+     *
+     * @throws CompilerException
+     */
+    private function processOptionals(array &$expression, Call $call, CompilationContext $context)
+    {
+        $flags  = null;
+        $offset = null;
+
+        $offsetParamOffset = 4;
+        if (isset($expression['parameters'][4]) && 'int' === $expression['parameters'][4]['parameter']['type']) {
+            $offset = $expression['parameters'][4]['parameter']['value'] . ' ';
+            unset($expression['parameters'][4]);
+        }
+
+        if (isset($expression['parameters'][3]) && 'int' === $expression['parameters'][3]['parameter']['type']) {
+            $flags             = $expression['parameters'][3]['parameter']['value'] . ' ';
+            $offsetParamOffset = 3;
+            unset($expression['parameters'][3]);
+        }
+
+        try {
+            $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+            if (null === $offset && isset($resolvedParams[$offsetParamOffset])) {
+                $context->headersManager->add('kernel/operators');
+                $offset = 'zephir_get_intval(' . $resolvedParams[$offsetParamOffset] . ') ';
+            }
+
+            if (null === $flags && isset($resolvedParams[3])) {
+                $context->headersManager->add('kernel/operators');
+                $flags = 'zephir_get_intval(' . $resolvedParams[3] . ') ';
+            }
+        } catch (Exception $e) {
+            throw new CompilerException($e->getMessage(), $expression, $e->getCode(), $e);
+        }
+
+        if (null === $flags) {
+            $flags = '0 ';
+        }
+
+        if (null === $offset) {
+            $offset = '0 ';
+        }
+
+        return [$flags, $offset];
+    }
 }
diff --git a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
index 9a3d88bce0..10c8f41b65 100644
--- a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
+++ b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * PrepareVirtualPathOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             return false;
         }
 
@@ -55,7 +57,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
 
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
@@ -65,7 +70,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_prepare_virtual_path('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+        $context->codePrinter->output(
+            'zephir_prepare_virtual_path(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/RoundOptimizer.php b/src/Optimizers/FunctionCall/RoundOptimizer.php
index 965b082ba7..3aeb9eb1d7 100644
--- a/src/Optimizers/FunctionCall/RoundOptimizer.php
+++ b/src/Optimizers/FunctionCall/RoundOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * RoundOptimizer.
  *
@@ -42,7 +44,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) > 4) {
+        if (count($expression['parameters']) > 4) {
             return false;
         }
 
@@ -53,7 +55,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/math');
@@ -66,28 +71,28 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         /* Todo: move var return type -> double as with round, floor */
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        switch (\count($expression['parameters'])) {
+        switch (count($expression['parameters'])) {
             /*
              * Only float $val
              */
             case 1:
                 $context->codePrinter->output(
-                    'zephir_round('.$symbol.', '.$resolvedParams[0].', NULL, NULL);'
+                    'zephir_round(' . $symbol . ', ' . $resolvedParams[0] . ', NULL, NULL);'
                 );
                 break;
 
-                /*
-                 * float $val, int $mode
-                 */
+            /*
+             * float $val, int $mode
+             */
             case 2:
                 $context->codePrinter->output(
-                    'zephir_round('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', NULL);'
+                    'zephir_round(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL);'
                 );
                 break;
 
             default:
                 $context->codePrinter->output(
-                    'zephir_round('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].');'
+                    'zephir_round(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ');'
                 );
                 break;
         }
diff --git a/src/Optimizers/FunctionCall/RtrimOptimizer.php b/src/Optimizers/FunctionCall/RtrimOptimizer.php
index 6c7a8884e1..a07580f223 100644
--- a/src/Optimizers/FunctionCall/RtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/RtrimOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 /**
diff --git a/src/Optimizers/FunctionCall/SinOptimizer.php b/src/Optimizers/FunctionCall/SinOptimizer.php
index a212e5b5bd..fae801a78b 100644
--- a/src/Optimizers/FunctionCall/SinOptimizer.php
+++ b/src/Optimizers/FunctionCall/SinOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\MathOptimizer;
diff --git a/src/Optimizers/FunctionCall/SqrtOptimizer.php b/src/Optimizers/FunctionCall/SqrtOptimizer.php
index c895045991..351d28b00c 100644
--- a/src/Optimizers/FunctionCall/SqrtOptimizer.php
+++ b/src/Optimizers/FunctionCall/SqrtOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\MathOptimizer;
diff --git a/src/Optimizers/FunctionCall/StartsWithOptimizer.php b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
index 333c673344..78a1d575cf 100644
--- a/src/Optimizers/FunctionCall/StartsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StartsWithOptimizer.
  *
@@ -38,7 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters']) && 3 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters']) && 3 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,13 +54,25 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/string');
 
         if (isset($str)) {
-            return new CompiledExpression('bool', 'zephir_start_with_str('.$resolvedParams[0].', SL("'.$str.'"))', $expression);
+            return new CompiledExpression(
+                'bool',
+                'zephir_start_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
+                $expression
+            );
         }
 
-        if (2 == \count($expression['parameters'])) {
-            return new CompiledExpression('bool', 'zephir_start_with('.$resolvedParams[0].', '.$resolvedParams[1].', NULL)', $expression);
+        if (2 == count($expression['parameters'])) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
+                $expression
+            );
         } else {
-            return new CompiledExpression('bool', 'zephir_start_with('.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].')', $expression);
+            return new CompiledExpression(
+                'bool',
+                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
+                $expression
+            );
         }
     }
 }
diff --git a/src/Optimizers/FunctionCall/StrReplaceOptimizer.php b/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
index fc719c9701..c23fc7d569 100644
--- a/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StrReplaceOptimizer.
  *
@@ -41,8 +43,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (3 != \count($expression['parameters'])) {
-            if (4 == \count($expression['parameters'])) {
+        if (3 != count($expression['parameters'])) {
+            if (4 == count($expression['parameters'])) {
                 return false;
             }
             throw new CompilerException("'str_replace' only accepts three parameter", $expression);
@@ -55,7 +57,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -74,7 +79,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_fast_str_replace('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$resolvedParams[2].');');
+        $context->codePrinter->output(
+            'zephir_fast_str_replace(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
index bbf9474ac9..3c5556b2ce 100644
--- a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StripcslashesOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) > 1) {
+        if (count($expression['parameters']) > 1) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable();
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -66,7 +71,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_stripcslashes('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_stripcslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
index 9dd0f31eee..0875ba1ea4 100644
--- a/src/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StripslashesOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) > 1) {
+        if (count($expression['parameters']) > 1) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable();
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -65,7 +70,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_stripslashes('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_stripslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/StrlenOptimizer.php b/src/Optimizers/FunctionCall/StrlenOptimizer.php
index a64931781f..a27c098c2a 100644
--- a/src/Optimizers/FunctionCall/StrlenOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrlenOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StrlenOptimizer.
  *
@@ -38,7 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -46,6 +48,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        return new CompiledExpression('int', 'zephir_fast_strlen_ev('.$resolvedParams[0].')', $expression);
+        return new CompiledExpression('int', 'zephir_fast_strlen_ev(' . $resolvedParams[0] . ')', $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/StrposOptimizer.php b/src/Optimizers/FunctionCall/StrposOptimizer.php
index 559a6eb3f4..e3ada49f40 100644
--- a/src/Optimizers/FunctionCall/StrposOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrposOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StrposOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) < 2) {
+        if (count($expression['parameters']) < 2) {
             throw new CompilerException("'strpos' require two or three parameters");
         }
 
@@ -49,15 +51,15 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          * Process offset.
          */
         $offset = '0 ';
-        if (\count($expression['parameters']) >= 3 && 'int' == $expression['parameters'][2]['parameter']['type']) {
-            $offset = $expression['parameters'][2]['parameter']['value'].' ';
+        if (count($expression['parameters']) >= 3 && 'int' == $expression['parameters'][2]['parameter']['type']) {
+            $offset = $expression['parameters'][2]['parameter']['value'] . ' ';
             unset($expression['parameters'][2]);
         }
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if (\count($resolvedParams) >= 3) {
+        if (count($resolvedParams) >= 3) {
             $context->headersManager->add('kernel/operators');
-            $offset = 'zephir_get_intval('.$resolvedParams[2].') ';
+            $offset = 'zephir_get_intval(' . $resolvedParams[2] . ') ';
         }
 
         /*
@@ -67,7 +69,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -77,7 +82,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_strpos('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].', '.$offset.');');
+        $context->codePrinter->output(
+            'zephir_fast_strpos(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $offset . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/StrtokOptimizer.php b/src/Optimizers/FunctionCall/StrtokOptimizer.php
index 683b7b4971..de10a7bc9f 100644
--- a/src/Optimizers/FunctionCall/StrtokOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtokOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * Class StrtokOptimizer.
  *
@@ -41,11 +43,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
-        if (1 == \count($expression['parameters'])) {
+        if (1 == count($expression['parameters'])) {
             return new CompiledExpression('bool', 'false', $expression);
         }
 
diff --git a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
index 6c91c13e2b..1437dceee4 100644
--- a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StrtolowerOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -64,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_strtolower('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_fast_strtolower(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index bbfd4a1a70..76c01118fe 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * StrtoupperOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -64,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_strtoupper('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_fast_strtoupper(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/SubstrOptimizer.php b/src/Optimizers/FunctionCall/SubstrOptimizer.php
index 0d263ee1dd..ae5f0b68ec 100644
--- a/src/Optimizers/FunctionCall/SubstrOptimizer.php
+++ b/src/Optimizers/FunctionCall/SubstrOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * SubstrOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) < 2 || \count($expression['parameters']) > 3) {
+        if (count($expression['parameters']) < 2 || count($expression['parameters']) > 3) {
             throw new CompilerException("'substr' require two or three parameters");
         }
 
@@ -49,8 +51,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          * Process parameters.
          */
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        $params = [];
-        $flags = '0';
+        $params         = [];
+        $flags          = '0';
 
         for ($param = 1; $param <= 2; ++$param) {
             if (!isset($expression['parameters'][$param])) {
@@ -61,10 +63,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 continue;
             }
             if ('int' == $expression['parameters'][$param]['parameter']['type']) {
-                $params[] = $expression['parameters'][$param]['parameter']['value'].' ';
+                $params[] = $expression['parameters'][$param]['parameter']['value'] . ' ';
             } else {
                 $context->headersManager->add('kernel/operators');
-                $params[] = 'zephir_get_intval('.$resolvedParams[$param].')';
+                $params[] = 'zephir_get_intval(' . $resolvedParams[$param] . ')';
             }
         }
 
@@ -75,7 +77,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -86,7 +91,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_substr('.$symbol.', '.$resolvedParams[0].', '.$params[0].', '.$params[1].', '.$flags.');');
+        $context->codePrinter->output(
+            'zephir_substr(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $params[0] . ', ' . $params[1] . ', ' . $flags . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/TanOptimizer.php b/src/Optimizers/FunctionCall/TanOptimizer.php
index 7b624e94b0..e384f3c23b 100644
--- a/src/Optimizers/FunctionCall/TanOptimizer.php
+++ b/src/Optimizers/FunctionCall/TanOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Optimizers\MathOptimizer;
diff --git a/src/Optimizers/FunctionCall/TimeOptimizer.php b/src/Optimizers/FunctionCall/TimeOptimizer.php
index fe1d94ab76..97f52af919 100644
--- a/src/Optimizers/FunctionCall/TimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/TimeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -48,7 +48,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/time');
@@ -58,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_time('.$symbol.');');
+        $context->codePrinter->output('zephir_time(' . $symbol . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index 5a03d4eb3a..efe0bf4033 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * TrimOptimizer.
  *
@@ -44,7 +46,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $charlist = 'NULL ';
-        if (2 == \count($expression['parameters'])) {
+        if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
             }
@@ -58,7 +60,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
 
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -76,7 +81,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_trim('.$symbol.', '.$resolvedParams[0].', '.$charlist.', '.static::$TRIM_WHERE.');');
+        $context->codePrinter->output(
+            'zephir_fast_trim(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $charlist . ', ' . static::$TRIM_WHERE . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index ffe21505c7..0f6f007699 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * UcfirstOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -63,7 +68,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_ucfirst('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_ucfirst(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 1c62bd6fe0..5d67787e51 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * UncamelizeOptimizer.
  *
@@ -41,12 +43,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) < 1 || \count($expression['parameters']) > 2) {
+        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
             throw new CompilerException("'uncamelize' only accepts one or two parameters");
         }
 
         $delimiter = 'NULL ';
-        if (2 == \count($expression['parameters'])) {
+        if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
             }
@@ -59,7 +61,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -77,7 +82,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_uncamelize('.$symbol.', '.$resolvedParams[0].', '.$delimiter.' );');
+        $context->codePrinter->output(
+            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index 9f773fb68e..4855dc2108 100644
--- a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * UniqueKeyOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != \count($expression['parameters'])) {
+        if (2 != count($expression['parameters'])) {
             throw new CompilerException("'unique_key' only accepts two parameter", $expression);
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -65,7 +70,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_unique_key('.$symbol.', '.$resolvedParams[0].', '.$resolvedParams[1].');');
+        $context->codePrinter->output(
+            'zephir_unique_key(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
index 34186930e1..5be14ab699 100644
--- a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * UniquePathKeyOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != \count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             throw new CompilerException("'unique_path_key' only accepts one parameter", $expression);
         }
 
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         if ($call->mustInitSymbolVariable()) {
@@ -64,7 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_unique_path_key('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_unique_path_key(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index ac9ca9891b..9a549f5201 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -61,22 +61,22 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $variable->initVariant($context);
 
                 $statement = new LetStatement([
-                    'type' => 'let',
+                    'type'        => 'let',
                     'assignments' => [
                         [
                             'assign-type' => $type,
-                            'variable' => $variable->getName(),
-                            'operator' => 'assign',
-                            'expr' => [
-                                'type' => $resolvedParam->getType(),
+                            'variable'    => $variable->getName(),
+                            'operator'    => 'assign',
+                            'expr'        => [
+                                'type'  => $resolvedParam->getType(),
                                 'value' => $resolvedParam->getCode(),
-                                'file' => $expression['file'],
-                                'line' => $expression['line'],
-                                'char' => $expression['char'],
+                                'file'  => $expression['file'],
+                                'line'  => $expression['line'],
+                                'char'  => $expression['char'],
                             ],
-                            'file' => $expression['file'],
-                            'line' => $expression['line'],
-                            'char' => $expression['char'],
+                            'file'        => $expression['file'],
+                            'line'        => $expression['line'],
+                            'char'        => $expression['char'],
                         ],
                     ],
                 ]);
@@ -89,7 +89,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             }
 
             $symbol = $context->backend->getVariableCode($variable);
-            $context->codePrinter->output('zephir_var_dump('.$symbol.');');
+            $context->codePrinter->output('zephir_var_dump(' . $symbol . ');');
         }
 
         return new CompiledExpression('null', 'null', $expression);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 6d9cd46b51..34b982d438 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -50,13 +50,16 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable();
         if ($symbolVariable) {
             if (!$symbolVariable->isVariable()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
         $context->headersManager->add('kernel/variables');
         $resolvedParams = $call->getResolvedParamsAsExpr($expression['parameters'], $context, $expression);
-        $resolvedParam = $resolvedParams[0];
+        $resolvedParam  = $resolvedParams[0];
 
         if (!$symbolVariable || !$symbolVariable->isVariable()) {
             /*
@@ -75,22 +78,22 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $variable->initVariant($context);
 
             $statement = new LetStatement([
-                'type' => 'let',
+                'type'        => 'let',
                 'assignments' => [
                     [
                         'assign-type' => $type,
-                        'variable' => $variable->getName(),
-                        'operator' => 'assign',
-                        'expr' => [
-                            'type' => $resolvedParam->getType(),
+                        'variable'    => $variable->getName(),
+                        'operator'    => 'assign',
+                        'expr'        => [
+                            'type'  => $resolvedParam->getType(),
                             'value' => $resolvedParam->getCode(),
-                            'file' => $expression['file'],
-                            'line' => $expression['line'],
-                            'char' => $expression['char'],
+                            'file'  => $expression['file'],
+                            'line'  => $expression['line'],
+                            'char'  => $expression['char'],
                         ],
-                        'file' => $expression['file'],
-                        'line' => $expression['line'],
-                        'char' => $expression['char'],
+                        'file'        => $expression['file'],
+                        'line'        => $expression['line'],
+                        'char'        => $expression['char'],
                     ],
                 ],
             ]);
@@ -113,12 +116,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $symbolVariable->initVariant($context);
             }
             $symbol = $context->backend->getVariableCode($symbolVariable);
-            $context->codePrinter->output('zephir_var_export_ex('.$symbol.', '.$variableSymbol.');');
+            $context->codePrinter->output('zephir_var_export_ex(' . $symbol . ', ' . $variableSymbol . ');');
 
             return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
         }
 
-        $context->codePrinter->output('zephir_var_export('.$variableSymbol.');');
+        $context->codePrinter->output('zephir_var_export(' . $variableSymbol . ');');
 
         return new CompiledExpression('null', 'null', $expression);
     }
diff --git a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
index 32e9aa45ad..fd79b7ad0b 100644
--- a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
+++ b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Optimizers\FunctionCall;
 
 use Zephir\Call;
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function count;
+
 /**
  * ZephirStringToHexOptimizer.
  *
@@ -41,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) > 1) {
+        if (count($expression['parameters']) > 1) {
             return false;
         }
 
@@ -53,7 +55,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
 
         if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
         }
 
         $context->headersManager->add('kernel/string');
@@ -67,7 +72,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_string_to_hex('.$symbol.', '.$resolvedParams[0].');');
+        $context->codePrinter->output('zephir_string_to_hex(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/IsTypeOptimizerAbstract.php b/src/Optimizers/IsTypeOptimizerAbstract.php
index 17186a38b8..cf1c70e793 100644
--- a/src/Optimizers/IsTypeOptimizerAbstract.php
+++ b/src/Optimizers/IsTypeOptimizerAbstract.php
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 
+use function count;
+
 abstract class IsTypeOptimizerAbstract extends OptimizerAbstract
 {
     /**
@@ -31,7 +33,7 @@ abstract class IsTypeOptimizerAbstract extends OptimizerAbstract
      */
     public function optimize(array $expression, Call $call, CompilationContext $context): ?CompiledExpression
     {
-        if (!isset($expression['parameters']) || \count($expression['parameters']) !== 1) {
+        if (!isset($expression['parameters']) || count($expression['parameters']) !== 1) {
             return null;
         }
 
@@ -44,7 +46,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 $resolvedParam,
             );
         } else {
-            $condition = 'Z_TYPE_P('.$resolvedParam.') == '.$this->getType();
+            $condition = 'Z_TYPE_P(' . $resolvedParam . ') == ' . $this->getType();
         }
 
         return new CompiledExpression('bool', $condition, $expression);
diff --git a/src/Optimizers/MathOptimizer.php b/src/Optimizers/MathOptimizer.php
index 36e1fb3ba6..12fdcf55a0 100644
--- a/src/Optimizers/MathOptimizer.php
+++ b/src/Optimizers/MathOptimizer.php
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 
+use function count;
+
 abstract class MathOptimizer extends OptimizerAbstract
 {
     /**
@@ -42,7 +44,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (\count($expression['parameters']) > 1) {
+        if (count($expression['parameters']) > 1) {
             return false;
         }
 
@@ -53,7 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         /**
          * Get CompiledExpression(s) for resolved var(s).
          */
-        $resolvedParams = $call->getResolvedParamsAsExpr($expression['parameters'], $context, $expression);
+        $resolvedParams     = $call->getResolvedParamsAsExpr($expression['parameters'], $context, $expression);
         $compiledExpression = $resolvedParams[0];
 
         switch ($compiledExpression->getType()) {
@@ -83,7 +85,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
                         return new CompiledExpression(
                             'double',
-                            'zephir_'.$this->getFunctionName().'('.$context->backend->getVariableCode($variable).')',
+                            'zephir_' . $this->getFunctionName() . '(' . $context->backend->getVariableCode(
+                                $variable
+                            ) . ')',
                             $expression
                         );
                         break;
@@ -104,7 +108,7 @@ protected function passNativeFCall($compiledExpression, $expression)
     {
         return new CompiledExpression(
             'double',
-            $this->getFunctionName().'('.$compiledExpression->getCode().')',
+            $this->getFunctionName() . '(' . $compiledExpression->getCode() . ')',
             $expression
         );
     }
diff --git a/src/Os.php b/src/Os.php
index 40b3308333..558c3e3679 100644
--- a/src/Os.php
+++ b/src/Os.php
@@ -13,6 +13,8 @@
 
 namespace Zephir;
 
+use const PHP_OS;
+
 class Os
 {
     /**
@@ -20,6 +22,6 @@ class Os
      */
     public static function isWindows(): bool
     {
-        return 0 === stripos(\PHP_OS, 'WIN');
+        return 0 === stripos(PHP_OS, 'WIN');
     }
 }
diff --git a/src/Parser/Manager.php b/src/Parser/Manager.php
index f1d0f0ef65..58a049761c 100644
--- a/src/Parser/Manager.php
+++ b/src/Parser/Manager.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,12 +9,14 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Parser;
 
 class Manager
 {
     public const MINIMUM_PARSER_VERSION = '1.5.0';
-    public const PARSER_HOME_PAGE = 'https://github.com/zephir-lang/php-zephir-parser';
+    public const PARSER_HOME_PAGE       = 'https://github.com/zephir-lang/php-zephir-parser';
 
     public function __construct(protected Parser $parser)
     {
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 9973cbebc9..76b795e152 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -17,26 +17,28 @@
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Exception\ParseException;
 
+use function function_exists;
+
 class Parser
 {
     /**
-     * Check if Zephir Parser available.
+     * Gets Zephir Parser version.
      *
-     * @return bool
+     * @return string|null
      */
-    public function isAvailable(): bool
+    public function getVersion(): ?string
     {
-        return \function_exists('zephir_parse_file');
+        return phpversion('zephir_parser') ?: null;
     }
 
     /**
-     * Gets Zephir Parser version.
+     * Check if Zephir Parser available.
      *
-     * @return string|null
+     * @return bool
      */
-    public function getVersion(): ?string
+    public function isAvailable(): bool
     {
-        return phpversion('zephir_parser') ?: null;
+        return function_exists('zephir_parse_file');
     }
 
     /**
diff --git a/src/Passes/CallGathererPass.php b/src/Passes/CallGathererPass.php
index 5a8af0da8b..558d4b2df5 100644
--- a/src/Passes/CallGathererPass.php
+++ b/src/Passes/CallGathererPass.php
@@ -80,24 +80,6 @@ public function pass(StatementsBlock $block): void
         $this->passStatementBlock($block->getStatements());
     }
 
-    public function passLetStatement(array $statement): void
-    {
-        foreach ($statement['assignments'] as $assignment) {
-            if (isset($assignment['expr'])) {
-                $this->passExpression($assignment['expr']);
-            }
-        }
-    }
-
-    public function passCall(array $expression): void
-    {
-        if (isset($expression['parameters'])) {
-            foreach ($expression['parameters'] as $parameter) {
-                $this->passExpression($parameter['parameter']);
-            }
-        }
-    }
-
     public function passArray(array $expression): void
     {
         foreach ($expression['left'] as $item) {
@@ -105,25 +87,7 @@ public function passArray(array $expression): void
         }
     }
 
-    public function passNew(array $expression): void
-    {
-        if (!$expression['dynamic']) {
-            $className = $this->compilationContext->getFullName($expression['class']);
-            if (!isset($this->methodCalls[$className]['__construct'])) {
-                $this->methodCalls[$className]['__construct'] = 1;
-            } else {
-                ++$this->methodCalls[$className]['__construct'];
-            }
-        }
-
-        if (isset($expression['parameters'])) {
-            foreach ($expression['parameters'] as $parameter) {
-                $this->passExpression($parameter['parameter']);
-            }
-        }
-    }
-
-    public function passNewType(array $expression): void
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -208,7 +172,7 @@ public function passExpression(array $expression): void
                 if (isset($expression['variable']['value'])) {
                     if ('this' == $expression['variable']['value']) {
                         $methodName = $expression['name'];
-                        $className = $this->compilationContext->classDefinition->getCompleteName();
+                        $className  = $this->compilationContext->classDefinition->getCompleteName();
                         if (!isset($this->methodCalls[$className][$methodName])) {
                             $this->methodCalls[$className][$methodName] = 1;
                         } else {
@@ -261,6 +225,42 @@ public function passExpression(array $expression): void
         }
     }
 
+    public function passLetStatement(array $statement): void
+    {
+        foreach ($statement['assignments'] as $assignment) {
+            if (isset($assignment['expr'])) {
+                $this->passExpression($assignment['expr']);
+            }
+        }
+    }
+
+    public function passNew(array $expression): void
+    {
+        if (!$expression['dynamic']) {
+            $className = $this->compilationContext->getFullName($expression['class']);
+            if (!isset($this->methodCalls[$className]['__construct'])) {
+                $this->methodCalls[$className]['__construct'] = 1;
+            } else {
+                ++$this->methodCalls[$className]['__construct'];
+            }
+        }
+
+        if (isset($expression['parameters'])) {
+            foreach ($expression['parameters'] as $parameter) {
+                $this->passExpression($parameter['parameter']);
+            }
+        }
+    }
+
+    public function passNewType(array $expression): void
+    {
+        if (isset($expression['parameters'])) {
+            foreach ($expression['parameters'] as $parameter) {
+                $this->passExpression($parameter['parameter']);
+            }
+        }
+    }
+
     public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
diff --git a/src/Passes/LocalContextPass.php b/src/Passes/LocalContextPass.php
index efa8cb5acc..567feaf9c4 100644
--- a/src/Passes/LocalContextPass.php
+++ b/src/Passes/LocalContextPass.php
@@ -15,6 +15,10 @@
 
 use Zephir\StatementsBlock;
 
+use function constant;
+use function defined;
+use function gettype;
+
 /**
  * This pass tries to check whether variables only do exist in the local context of the method block
  * or if they're used externally which will un allow variables to be placed in the stack
@@ -28,25 +32,11 @@
  */
 class LocalContextPass
 {
-    protected array $variables = [];
-
-    protected array $mutations = [];
-
-    protected array $uses = [];
-
-    protected int $lastCallLine = 0;
-
-    protected int $lastUnsetLine = 0;
-
-    /**
-     * Do the compilation pass.
-     *
-     * @param StatementsBlock $block
-     */
-    public function pass(StatementsBlock $block): void
-    {
-        $this->passStatementBlock($block->getStatements());
-    }
+    protected int   $lastCallLine  = 0;
+    protected int   $lastUnsetLine = 0;
+    protected array $mutations     = [];
+    protected array $uses          = [];
+    protected array $variables     = [];
 
     public function declareVariables(array $statement): void
     {
@@ -56,9 +46,10 @@ public function declareVariables(array $statement): void
 
         foreach ($statement['variables'] as $variable) {
             if (isset($variable['expr'])) {
-                if ('string' === $variable['expr']['type']
-                    || 'empty-array' === $variable['expr']['type']
-                    || 'array' === $variable['expr']['type']
+                if (
+                    'string' === $variable['expr']['type'] ||
+                    'empty-array' === $variable['expr']['type'] ||
+                    'array' === $variable['expr']['type']
                 ) {
                     $this->variables[$variable['variable']] = false;
                     continue;
@@ -72,40 +63,35 @@ public function declareVariables(array $statement): void
     }
 
     /**
-     * Marks a variable to mandatory be stored in the heap.
+     * Returns the line where the latest call in the method was made.
      *
-     * @param string $variable
+     * @return int
      */
-    public function markVariableNoLocal(string $variable): void
+    public function getLastCallLine(): int
     {
-        if (isset($this->variables[$variable])) {
-            $this->variables[$variable] = false;
-        }
+        return $this->lastCallLine;
     }
 
     /**
-     * Marks the latest use/read of a variable.
+     * Returns the line where the latest unset operation was made.
      *
-     * @param string $variable
-     * @param array  $node
+     * @return int
      */
-    public function markLastUse(string $variable, array $node): void
+    public function getLastUnsetLine(): int
     {
-        if (isset($node['line'])) {
-            $this->uses[$variable] = $node['line'];
-        }
+        return $this->lastUnsetLine;
     }
 
     /**
-     * Asks the local context information whether a variable can be stored in the stack instead of the heap.
+     * Returns the number of assignment instructions that mutated a variable.
      *
      * @param string $variable
      *
-     * @return bool
+     * @return int
      */
-    public function shouldBeLocal(string $variable): bool
+    public function getNumberOfMutations(string $variable): int
     {
-        return !empty($this->variables[$variable]);
+        return $this->mutations[$variable] ?? 0;
     }
 
     /**
@@ -123,141 +109,38 @@ public function increaseMutations(string $variable): void
     }
 
     /**
-     * Returns the number of assignment instructions that mutated a variable.
+     * Marks the latest use/read of a variable.
      *
      * @param string $variable
-     *
-     * @return int
+     * @param array  $node
      */
-    public function getNumberOfMutations(string $variable): int
+    public function markLastUse(string $variable, array $node): void
     {
-        return $this->mutations[$variable] ?? 0;
+        if (isset($node['line'])) {
+            $this->uses[$variable] = $node['line'];
+        }
     }
 
     /**
-     * Returns the line where the latest call in the method was made.
+     * Marks a variable to mandatory be stored in the heap.
      *
-     * @return int
+     * @param string $variable
      */
-    public function getLastCallLine(): int
+    public function markVariableNoLocal(string $variable): void
     {
-        return $this->lastCallLine;
+        if (isset($this->variables[$variable])) {
+            $this->variables[$variable] = false;
+        }
     }
 
     /**
-     * Returns the line where the latest unset operation was made.
+     * Do the compilation pass.
      *
-     * @return int
+     * @param StatementsBlock $block
      */
-    public function getLastUnsetLine(): int
-    {
-        return $this->lastUnsetLine;
-    }
-
-    public function passLetStatement(array $statement): void
-    {
-        foreach ($statement['assignments'] as $assignment) {
-            if (isset($assignment['expr'])) {
-                $this->passExpression($assignment['expr']);
-            }
-            $this->increaseMutations($assignment['variable']);
-
-            switch ($assignment['assign-type']) {
-                case 'variable':
-                    switch ($assignment['operator']) {
-                        case 'mul-assign':
-                        case 'sub-assign':
-                        case 'add-assign':
-                            $this->markVariableNoLocal($assignment['variable']);
-                            break;
-                    }
-
-                    switch ($assignment['expr']['type']) {
-                        case 'property-access':
-                        case 'property-dynamic-access':
-                        case 'property-string-access':
-                        case 'array-access':
-                        case 'static-property-access':
-                        case 'static-constant-access':
-                        case 'string':
-                        case 'array':
-                        case 'empty-array':
-                        case 'fcall':
-                        case 'mcall':
-                        case 'scall':
-                        case 'concat':
-                        case 'clone':
-                        case 'require':
-                        case 'require_once':
-                        case 'type-hint':
-                        case 'minus':
-                        case 'new':
-                        case 'new-type':
-                        case 'closure':
-                        case 'closure-arrow':
-                        case 'reference':
-                        case 'irange':
-                        case 'erange':
-                            $this->markVariableNoLocal($assignment['variable']);
-                            break;
-
-                        case 'constant':
-                            if (\defined($assignment['expr']['value'])) {
-                                if ('string' === \gettype(\constant($assignment['expr']['value']))) {
-                                    $this->markVariableNoLocal($assignment['variable']);
-                                }
-                            }
-                            break;
-
-                        case 'variable':
-                            $this->markVariableNoLocal($assignment['expr']['value']);
-                            $this->markVariableNoLocal($assignment['variable']);
-                            break;
-
-                        case 'cast':
-                            switch ($assignment['expr']['left']) {
-                                case 'array':
-                                case 'string':
-                                    $this->markVariableNoLocal($assignment['variable']);
-                                    break;
-                            }
-                            break;
-                    }
-                    break;
-
-                case 'object-property':
-                case 'array-index':
-                case 'object-property-array-index':
-                case 'object-property-append':
-                    if ($assignment['expr']['type'] == 'variable') {
-                        $this->markVariableNoLocal($assignment['expr']['value']);
-                    }
-                    $this->markVariableNoLocal($assignment['variable']);
-                    break;
-
-                case 'variable-append':
-                    $this->markVariableNoLocal($assignment['variable']);
-                    switch ($assignment['expr']['type']) {
-                        case 'variable':
-                            $this->markVariableNoLocal($assignment['expr']['value']);
-                            break;
-                    }
-                    break;
-            }
-        }
-    }
-
-    public function passCall(array $expression): void
+    public function pass(StatementsBlock $block): void
     {
-        if (isset($expression['parameters'])) {
-            foreach ($expression['parameters'] as $parameter) {
-                if ('variable' == $parameter['parameter']['type']) {
-                    $this->markVariableNoLocal($parameter['parameter']['value']);
-                } else {
-                    $this->passExpression($parameter['parameter']);
-                }
-            }
-        }
+        $this->passStatementBlock($block->getStatements());
     }
 
     public function passArray(array $expression): void
@@ -271,7 +154,7 @@ public function passArray(array $expression): void
         }
     }
 
-    public function passNew(array $expression): void
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -405,6 +288,112 @@ public function passExpression(array $expression): void
         }
     }
 
+    public function passLetStatement(array $statement): void
+    {
+        foreach ($statement['assignments'] as $assignment) {
+            if (isset($assignment['expr'])) {
+                $this->passExpression($assignment['expr']);
+            }
+            $this->increaseMutations($assignment['variable']);
+
+            switch ($assignment['assign-type']) {
+                case 'variable':
+                    switch ($assignment['operator']) {
+                        case 'mul-assign':
+                        case 'sub-assign':
+                        case 'add-assign':
+                            $this->markVariableNoLocal($assignment['variable']);
+                            break;
+                    }
+
+                    switch ($assignment['expr']['type']) {
+                        case 'property-access':
+                        case 'property-dynamic-access':
+                        case 'property-string-access':
+                        case 'array-access':
+                        case 'static-property-access':
+                        case 'static-constant-access':
+                        case 'string':
+                        case 'array':
+                        case 'empty-array':
+                        case 'fcall':
+                        case 'mcall':
+                        case 'scall':
+                        case 'concat':
+                        case 'clone':
+                        case 'require':
+                        case 'require_once':
+                        case 'type-hint':
+                        case 'minus':
+                        case 'new':
+                        case 'new-type':
+                        case 'closure':
+                        case 'closure-arrow':
+                        case 'reference':
+                        case 'irange':
+                        case 'erange':
+                            $this->markVariableNoLocal($assignment['variable']);
+                            break;
+
+                        case 'constant':
+                            if (defined($assignment['expr']['value'])) {
+                                if ('string' === gettype(constant($assignment['expr']['value']))) {
+                                    $this->markVariableNoLocal($assignment['variable']);
+                                }
+                            }
+                            break;
+
+                        case 'variable':
+                            $this->markVariableNoLocal($assignment['expr']['value']);
+                            $this->markVariableNoLocal($assignment['variable']);
+                            break;
+
+                        case 'cast':
+                            switch ($assignment['expr']['left']) {
+                                case 'array':
+                                case 'string':
+                                    $this->markVariableNoLocal($assignment['variable']);
+                                    break;
+                            }
+                            break;
+                    }
+                    break;
+
+                case 'object-property':
+                case 'array-index':
+                case 'object-property-array-index':
+                case 'object-property-append':
+                    if ($assignment['expr']['type'] == 'variable') {
+                        $this->markVariableNoLocal($assignment['expr']['value']);
+                    }
+                    $this->markVariableNoLocal($assignment['variable']);
+                    break;
+
+                case 'variable-append':
+                    $this->markVariableNoLocal($assignment['variable']);
+                    switch ($assignment['expr']['type']) {
+                        case 'variable':
+                            $this->markVariableNoLocal($assignment['expr']['value']);
+                            break;
+                    }
+                    break;
+            }
+        }
+    }
+
+    public function passNew(array $expression): void
+    {
+        if (isset($expression['parameters'])) {
+            foreach ($expression['parameters'] as $parameter) {
+                if ('variable' == $parameter['parameter']['type']) {
+                    $this->markVariableNoLocal($parameter['parameter']['value']);
+                } else {
+                    $this->passExpression($parameter['parameter']);
+                }
+            }
+        }
+    }
+
     public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
@@ -569,4 +558,16 @@ public function passStatementBlock(array $statements): void
             }
         }
     }
+
+    /**
+     * Asks the local context information whether a variable can be stored in the stack instead of the heap.
+     *
+     * @param string $variable
+     *
+     * @return bool
+     */
+    public function shouldBeLocal(string $variable): bool
+    {
+        return !empty($this->variables[$variable]);
+    }
 }
diff --git a/src/Passes/LoopBreakPass.php b/src/Passes/LoopBreakPass.php
index 42f0585744..f41e9ebaca 100644
--- a/src/Passes/LoopBreakPass.php
+++ b/src/Passes/LoopBreakPass.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Passes;
 
 use Zephir\StatementsBlock;
@@ -23,6 +23,11 @@ class LoopBreakPass
 {
     protected bool $hasBreak = false;
 
+    public function hasBreak(): bool
+    {
+        return $this->hasBreak;
+    }
+
     /**
      * Do the compilation pass.
      *
@@ -54,9 +59,4 @@ public function passStatementBlock(array $statements): void
             }
         }
     }
-
-    public function hasBreak(): bool
-    {
-        return $this->hasBreak;
-    }
 }
diff --git a/src/Passes/MutateGathererPass.php b/src/Passes/MutateGathererPass.php
index e5a7923272..390281ac63 100644
--- a/src/Passes/MutateGathererPass.php
+++ b/src/Passes/MutateGathererPass.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Passes;
 
 use Zephir\StatementsBlock;
@@ -21,19 +21,8 @@
  */
 class MutateGathererPass
 {
-    protected array $variables = [];
-
     protected array $mutations = [];
-
-    /**
-     * Do the compilation pass.
-     *
-     * @param StatementsBlock $block
-     */
-    public function pass(StatementsBlock $block): void
-    {
-        $this->passStatementBlock($block->getStatements());
-    }
+    protected array $variables = [];
 
     public function declareVariables(array $statement): void
     {
@@ -44,6 +33,18 @@ public function declareVariables(array $statement): void
         }
     }
 
+    /**
+     * Returns the number of assignment instructions that mutated a variable.
+     *
+     * @param string $variable
+     *
+     * @return int
+     */
+    public function getNumberOfMutations(string $variable): int
+    {
+        return $this->mutations[$variable] ?? 0;
+    }
+
     /**
      * Increase the number of mutations a variable has inside a statement block.
      *
@@ -63,36 +64,13 @@ public function increaseMutations(string $variable): static
     }
 
     /**
-     * Pass let statements.
-     *
-     * @param array $statement
-     */
-    public function passLetStatement(array $statement): void
-    {
-        foreach ($statement['assignments'] as $assignment) {
-            if (isset($assignment['expr'])) {
-                $this->passExpression($assignment['expr']);
-            }
-            $this->increaseMutations($assignment['variable']);
-        }
-    }
-
-    /**
-     * Pass call expressions.
+     * Do the compilation pass.
      *
-     * @param array $expression
+     * @param StatementsBlock $block
      */
-    public function passCall(array $expression): void
+    public function pass(StatementsBlock $block): void
     {
-        if (isset($expression['parameters'])) {
-            foreach ($expression['parameters'] as $parameter) {
-                if ('variable' == $parameter['parameter']['type']) {
-                    $this->increaseMutations($parameter['parameter']['value']);
-                } else {
-                    $this->passExpression($parameter['parameter']);
-                }
-            }
-        }
+        $this->passStatementBlock($block->getStatements());
     }
 
     /**
@@ -110,15 +88,17 @@ public function passArray(array $expression): void
     }
 
     /**
-     * Pass "new" expressions.
+     * Pass call expressions.
      *
      * @param array $expression
      */
-    public function passNew(array $expression): void
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
-                if ('variable' != $parameter['parameter']['type']) {
+                if ('variable' == $parameter['parameter']['type']) {
+                    $this->increaseMutations($parameter['parameter']['value']);
+                } else {
                     $this->passExpression($parameter['parameter']);
                 }
             }
@@ -236,15 +216,34 @@ public function passExpression(array $expression): void
     }
 
     /**
-     * Returns the number of assignment instructions that mutated a variable.
+     * Pass let statements.
      *
-     * @param string $variable
+     * @param array $statement
+     */
+    public function passLetStatement(array $statement): void
+    {
+        foreach ($statement['assignments'] as $assignment) {
+            if (isset($assignment['expr'])) {
+                $this->passExpression($assignment['expr']);
+            }
+            $this->increaseMutations($assignment['variable']);
+        }
+    }
+
+    /**
+     * Pass "new" expressions.
      *
-     * @return int
+     * @param array $expression
      */
-    public function getNumberOfMutations(string $variable): int
+    public function passNew(array $expression): void
     {
-        return $this->mutations[$variable] ?? 0;
+        if (isset($expression['parameters'])) {
+            foreach ($expression['parameters'] as $parameter) {
+                if ('variable' != $parameter['parameter']['type']) {
+                    $this->passExpression($parameter['parameter']);
+                }
+            }
+        }
     }
 
     /**
diff --git a/src/Passes/SkipVariantInit.php b/src/Passes/SkipVariantInit.php
index 1fd968bac5..10ed26c74a 100644
--- a/src/Passes/SkipVariantInit.php
+++ b/src/Passes/SkipVariantInit.php
@@ -15,6 +15,8 @@
 
 use Zephir\StatementsBlock;
 
+use function count;
+
 /**
  * In 'if'/'else' statements sometimes dynamical variables are initialized in every branch
  * Same case in 'switch' statements
@@ -25,6 +27,34 @@ class SkipVariantInit
 
     protected array $variablesToSkip = [];
 
+    /**
+     * Returns a list of variables that are initialized in every analyzed branch.
+     */
+    public function getVariables(): array
+    {
+        $variableStats = [];
+
+        foreach ($this->variablesToSkip as $variables) {
+            foreach ($variables as $variable => $one) {
+                if (!isset($variableStats[$variable])) {
+                    $variableStats[$variable] = 1;
+                } else {
+                    ++$variableStats[$variable];
+                }
+            }
+        }
+
+        $variables      = [];
+        $numberBranches = count($this->branches);
+        foreach ($variableStats as $variable => $number) {
+            if ($number == $numberBranches) {
+                $variables[] = $variable;
+            }
+        }
+
+        return $variables;
+    }
+
     /**
      * Do the compilation pass.
      */
@@ -75,34 +105,6 @@ public function passStatementBlock($branchNumber, array $statements): void
         }
     }
 
-    /**
-     * Returns a list of variables that are initialized in every analyzed branch.
-     */
-    public function getVariables(): array
-    {
-        $variableStats = [];
-
-        foreach ($this->variablesToSkip as $variables) {
-            foreach ($variables as $variable => $one) {
-                if (!isset($variableStats[$variable])) {
-                    $variableStats[$variable] = 1;
-                } else {
-                    ++$variableStats[$variable];
-                }
-            }
-        }
-
-        $variables = [];
-        $numberBranches = \count($this->branches);
-        foreach ($variableStats as $variable => $number) {
-            if ($number == $numberBranches) {
-                $variables[] = $variable;
-            }
-        }
-
-        return $variables;
-    }
-
     public function setVariablesToSkip(int $branchNumber, array $variablesToSkip): void
     {
         $this->variablesToSkip[$branchNumber] = $variablesToSkip;
diff --git a/src/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
index 80698457e4..74a7d5e2f5 100644
--- a/src/Passes/StaticTypeInference.php
+++ b/src/Passes/StaticTypeInference.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,30 +9,23 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Passes;
 
 use Zephir\StatementsBlock;
 
+use function is_string;
+
 /**
  * This pass try to infer typing on dynamic variables so the compiler
  * can replace them by low level types automatically
  */
 class StaticTypeInference
 {
+    protected array $infered   = [];
     protected array $variables = [];
 
-    protected array $infered = [];
-
-    /**
-     * Do the compilation pass.
-     *
-     * @param StatementsBlock $block
-     */
-    public function pass(StatementsBlock $block): void
-    {
-        $this->passStatementBlock($block->getStatements());
-    }
-
     public function declareVariables(array $statement): void
     {
         foreach ($statement['variables'] as $variable) {
@@ -51,15 +42,23 @@ public function declareVariables(array $statement): void
     }
 
     /**
-     * Marks a variable to mandatory be stored in the heap if a type has not been defined for it.
+     * Asks the local context information whether a variable can be stored in the stack instead of the heap.
      *
      * @param string $variable
-     * @param string $type
+     *
+     * @return bool
      */
-    public function markVariableIfUnknown($variable, $type): void
+    public function getInferedType($variable)
     {
-        $this->variables[$variable] = $type;
-        $this->infered[$variable] = $type;
+        if (isset($this->variables[$variable])) {
+            $type = $this->variables[$variable];
+            if ('variable' != $type && 'undefined' != $type && 'string' != $type && 'istring' != $type && 'array' != $type && 'null' != $type && 'numeric' != $type) {
+                // echo $variable, ' ', $type, PHP_EOL;
+                return $type;
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -169,81 +168,25 @@ public function markVariable($variable, $type): void
     }
 
     /**
-     * Process the found infered types and schedule a new pass.
+     * Marks a variable to mandatory be stored in the heap if a type has not been defined for it.
      *
-     * @return bool
+     * @param string $variable
+     * @param string $type
      */
-    public function reduce(): bool
+    public function markVariableIfUnknown($variable, $type): void
     {
-        $pass = false;
-        foreach ($this->variables as $variable => $type) {
-            if ('variable' == $type || 'string' == $type || 'istring' == $type || 'array' == $type || 'null' == $type || 'numeric' == $type) {
-                unset($this->variables[$variable]);
-            } else {
-                $pass = true;
-                $this->infered[$variable] = $type;
-            }
-        }
-
-        return $pass;
+        $this->variables[$variable] = $type;
+        $this->infered[$variable]   = $type;
     }
 
     /**
-     * Asks the local context information whether a variable can be stored in the stack instead of the heap.
-     *
-     * @param string $variable
+     * Do the compilation pass.
      *
-     * @return bool
+     * @param StatementsBlock $block
      */
-    public function getInferedType($variable)
-    {
-        if (isset($this->variables[$variable])) {
-            $type = $this->variables[$variable];
-            if ('variable' != $type && 'undefined' != $type && 'string' != $type && 'istring' != $type && 'array' != $type && 'null' != $type && 'numeric' != $type) {
-                // echo $variable, ' ', $type, PHP_EOL;
-                return $type;
-            }
-        }
-
-        return false;
-    }
-
-    public function passLetStatement(array $statement): void
-    {
-        foreach ($statement['assignments'] as $assignment) {
-            switch ($assignment['assign-type']) {
-                case 'variable':
-                    $type = $this->passExpression($assignment['expr']);
-                    if (\is_string($type)) {
-                        $this->markVariable($assignment['variable'], $type);
-                    }
-                    break;
-
-                case 'object-property':
-                case 'array-index':
-                case 'object-property-array-index':
-                case 'object-property-append':
-                case 'static-property-access':
-                    $this->markVariable($assignment['variable'], 'variable');
-                    break;
-
-                case 'variable-append':
-                    $this->markVariable($assignment['variable'], 'variable');
-                    break;
-
-                default:
-                    // echo $assignment['assign-type'];
-            }
-        }
-    }
-
-    public function passCall(array $expression): void
+    public function pass(StatementsBlock $block): void
     {
-        if (isset($expression['parameters'])) {
-            foreach ($expression['parameters'] as $parameter) {
-                $this->passExpression($parameter['parameter']);
-            }
-        }
+        $this->passStatementBlock($block->getStatements());
     }
 
     public function passArray(array $expression): void
@@ -253,7 +196,7 @@ public function passArray(array $expression): void
         }
     }
 
-    public function passNew(array $expression): void
+    public function passCall(array $expression): void
     {
         if (isset($expression['parameters'])) {
             foreach ($expression['parameters'] as $parameter) {
@@ -301,7 +244,7 @@ public function passExpression(array $expression)
             case 'bitwise_xor':
             case 'bitwise_shiftleft':
             case 'bitwise_shiftright':
-                $left = $this->passExpression($expression['left']);
+                $left  = $this->passExpression($expression['left']);
                 $right = $this->passExpression($expression['right']);
                 if ('int' == $left && 'int' == $right) {
                     return 'int';
@@ -340,7 +283,7 @@ public function passExpression(array $expression)
                 return 'numeric';
 
             case 'mod':
-                $left = $this->passExpression($expression['left']);
+                $left  = $this->passExpression($expression['left']);
                 $right = $this->passExpression($expression['right']);
                 if ('long' == $left && 'long' == $right) {
                     return 'long';
@@ -474,6 +417,44 @@ public function passExpression(array $expression)
         }
     }
 
+    public function passLetStatement(array $statement): void
+    {
+        foreach ($statement['assignments'] as $assignment) {
+            switch ($assignment['assign-type']) {
+                case 'variable':
+                    $type = $this->passExpression($assignment['expr']);
+                    if (is_string($type)) {
+                        $this->markVariable($assignment['variable'], $type);
+                    }
+                    break;
+
+                case 'object-property':
+                case 'array-index':
+                case 'object-property-array-index':
+                case 'object-property-append':
+                case 'static-property-access':
+                    $this->markVariable($assignment['variable'], 'variable');
+                    break;
+
+                case 'variable-append':
+                    $this->markVariable($assignment['variable'], 'variable');
+                    break;
+
+                default:
+                    // echo $assignment['assign-type'];
+            }
+        }
+    }
+
+    public function passNew(array $expression): void
+    {
+        if (isset($expression['parameters'])) {
+            foreach ($expression['parameters'] as $parameter) {
+                $this->passExpression($parameter['parameter']);
+            }
+        }
+    }
+
     public function passStatementBlock(array $statements): void
     {
         foreach ($statements as $statement) {
@@ -587,4 +568,24 @@ public function passStatementBlock(array $statements): void
             }
         }
     }
+
+    /**
+     * Process the found infered types and schedule a new pass.
+     *
+     * @return bool
+     */
+    public function reduce(): bool
+    {
+        $pass = false;
+        foreach ($this->variables as $variable => $type) {
+            if ('variable' == $type || 'string' == $type || 'istring' == $type || 'array' == $type || 'null' == $type || 'numeric' == $type) {
+                unset($this->variables[$variable]);
+            } else {
+                $pass                     = true;
+                $this->infered[$variable] = $type;
+            }
+        }
+
+        return $pass;
+    }
 }
diff --git a/src/Statements/BreakStatement.php b/src/Statements/BreakStatement.php
index d31d9c00ff..3f6ea3d9ff 100644
--- a/src/Statements/BreakStatement.php
+++ b/src/Statements/BreakStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
diff --git a/src/Statements/ContinueStatement.php b/src/Statements/ContinueStatement.php
index 4ecea903ee..deb8ed1612 100644
--- a/src/Statements/ContinueStatement.php
+++ b/src/Statements/ContinueStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
diff --git a/src/Statements/DeclareStatement.php b/src/Statements/DeclareStatement.php
index c8deeb7660..b0ec7bb6cb 100644
--- a/src/Statements/DeclareStatement.php
+++ b/src/Statements/DeclareStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,12 +9,16 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression\Builder\BuilderFactory;
 
+use function is_string;
+
 /**
  * This creates variables in the current symbol table
  */
@@ -36,12 +38,12 @@ public function compile(CompilationContext $compilationContext): void
         }
 
         $typeInference = $compilationContext->typeInference;
-        $symbolTable = $compilationContext->symbolTable;
+        $symbolTable   = $compilationContext->symbolTable;
 
         foreach ($statement['variables'] as $variable) {
             $varName = $variable['variable'];
             if ($symbolTable->hasVariableInBranch($varName, $compilationContext->branchManager->getCurrentBranch())) {
-                throw new CompilerException("Variable '".$varName."' is already defined", $variable);
+                throw new CompilerException("Variable '" . $varName . "' is already defined", $variable);
             }
 
             $currentType = $statement['data-type'];
@@ -52,7 +54,7 @@ public function compile(CompilationContext $compilationContext): void
             if ($typeInference) {
                 if ('variable' === $currentType) {
                     $type = $typeInference->getInferedType($varName);
-                    if (\is_string($type)) {
+                    if (is_string($type)) {
                         $currentType = $type;
                     }
                 }
@@ -74,7 +76,7 @@ public function compile(CompilationContext $compilationContext): void
              * Variables are added to the symbol table.
              */
             $symbolVariable = $symbolTable->addVariable($currentType, $varName, $compilationContext);
-            $varName = $symbolVariable->getName();
+            $varName        = $symbolVariable->getName();
 
             /**
              * Set the node where the variable is declared
@@ -88,10 +90,10 @@ public function compile(CompilationContext $compilationContext): void
             }
 
             if (isset($variable['expr'])) {
-                $builder = BuilderFactory::getInstance();
+                $builder    = BuilderFactory::getInstance();
                 $letBuilder = $builder->statements()->let([
                     $builder->operators()
-                        ->assignVariable($varName, $builder->raw($variable['expr'])),
+                            ->assignVariable($varName, $builder->raw($variable['expr'])),
                 ]);
 
                 $letStatement = new LetStatement($letBuilder->build());
diff --git a/src/Statements/DoWhileStatement.php b/src/Statements/DoWhileStatement.php
index 4f8de3f8bb..5f3838084e 100644
--- a/src/Statements/DoWhileStatement.php
+++ b/src/Statements/DoWhileStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Optimizers\EvalExpression;
@@ -26,12 +27,12 @@ class DoWhileStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
     {
-        $exprRaw = $this->statement['expr'];
+        $exprRaw     = $this->statement['expr'];
         $codePrinter = $compilationContext->codePrinter;
 
         $codePrinter->output('do {');
@@ -61,6 +62,6 @@ public function compile(CompilationContext $compilationContext): void
         /**
          * Compound conditions can be evaluated in a single line of the C-code
          */
-        $codePrinter->output('} while ('.$condition.');');
+        $codePrinter->output('} while (' . $condition . ');');
     }
 }
diff --git a/src/Statements/EchoStatement.php b/src/Statements/EchoStatement.php
index ebb53df522..df203af1e4 100644
--- a/src/Statements/EchoStatement.php
+++ b/src/Statements/EchoStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
@@ -27,7 +28,7 @@ class EchoStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
@@ -39,29 +40,31 @@ public function compile(CompilationContext $compilationContext): void
 
             switch ($resolvedExpr->getType()) {
                 case 'int':
-                    $compilationContext->codePrinter->output('php_printf("%d", '.$resolvedExpr->getCode().');');
+                    $compilationContext->codePrinter->output('php_printf("%d", ' . $resolvedExpr->getCode() . ');');
                     break;
 
                 case 'bool':
-                    $compilationContext->codePrinter->output('php_printf("%s", '.$resolvedExpr->getBooleanCode().' ? "1": "");');
+                    $compilationContext->codePrinter->output(
+                        'php_printf("%s", ' . $resolvedExpr->getBooleanCode() . ' ? "1": "");'
+                    );
                     break;
 
                 case 'double':
-                    $compilationContext->codePrinter->output('php_printf("%f", '.$resolvedExpr->getCode().');');
+                    $compilationContext->codePrinter->output('php_printf("%f", ' . $resolvedExpr->getCode() . ');');
                     break;
 
                 case 'char':
                 case 'uchar':
-                    $compilationContext->codePrinter->output('php_printf("%c", \''.$resolvedExpr->getCode().'\');');
+                    $compilationContext->codePrinter->output('php_printf("%c", \'' . $resolvedExpr->getCode() . '\');');
                     break;
 
                 case 'long':
-                    $compilationContext->codePrinter->output('php_printf("%ld", '.$resolvedExpr->getCode().');');
+                    $compilationContext->codePrinter->output('php_printf("%ld", ' . $resolvedExpr->getCode() . ');');
                     break;
 
                 case 'string':
                     $compilationContext->codePrinter->output(
-                        'php_printf("%s", "'.Name::addSlashes($resolvedExpr->getCode()).'");'
+                        'php_printf("%s", "' . Name::addSlashes($resolvedExpr->getCode()) . '");'
                     );
                     break;
 
@@ -69,45 +72,55 @@ public function compile(CompilationContext $compilationContext): void
                     break;
 
                 case 'variable':
-                    $variable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $echoExpr);
+                    $variable = $compilationContext->symbolTable->getVariableForRead(
+                        $resolvedExpr->getCode(),
+                        $compilationContext,
+                        $echoExpr
+                    );
                     switch ($variable->getType()) {
                         case 'int':
-                            $compilationContext->codePrinter->output('php_printf("%d", '.$variable->getName().');');
+                            $compilationContext->codePrinter->output('php_printf("%d", ' . $variable->getName() . ');');
                             break;
 
                         case 'long':
-                            $compilationContext->codePrinter->output('php_printf("%ld", '.$variable->getName().');');
+                            $compilationContext->codePrinter->output(
+                                'php_printf("%ld", ' . $variable->getName() . ');'
+                            );
                             break;
 
                         case 'double':
-                            $compilationContext->codePrinter->output('php_printf("%f", '.$variable->getName().');');
+                            $compilationContext->codePrinter->output('php_printf("%f", ' . $variable->getName() . ');');
                             break;
 
                         case 'uchar':
                         case 'char':
-                            $compilationContext->codePrinter->output('php_printf("%c", '.$variable->getName().');');
+                            $compilationContext->codePrinter->output('php_printf("%c", ' . $variable->getName() . ');');
                             break;
 
                         case 'bool':
-                            $compilationContext->codePrinter->output('php_printf("%s", '.$variable->getName().' ? "1": "");');
+                            $compilationContext->codePrinter->output(
+                                'php_printf("%s", ' . $variable->getName() . ' ? "1": "");'
+                            );
                             break;
 
                         case 'string':
                         case 'variable':
                         case 'mixed':
-                            $compilationContext->codePrinter->output('zend_print_zval('.$compilationContext->backend->getVariableCode($variable).', 0);');
+                            $compilationContext->codePrinter->output(
+                                'zend_print_zval(' . $compilationContext->backend->getVariableCode($variable) . ', 0);'
+                            );
                             break;
 
                         case 'null':
                             break;
 
                         default:
-                            throw new CompilerException('Unknown type: '.$variable->getType(), $echoExpr);
+                            throw new CompilerException('Unknown type: ' . $variable->getType(), $echoExpr);
                     }
                     break;
 
                 default:
-                    throw new CompilerException('Unknown type: '.$resolvedExpr->getType(), $echoExpr);
+                    throw new CompilerException('Unknown type: ' . $resolvedExpr->getType(), $echoExpr);
             }
         }
     }
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 0552d6d3a0..0041d1c942 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Detectors\ForValueUseDetector;
@@ -26,8 +27,388 @@
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
 
+use function count;
+
 class ForStatement extends StatementAbstract
 {
+    /**
+     * @param CompilationContext $compilationContext
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function compile(CompilationContext $compilationContext): void
+    {
+        $exprRaw = $this->statement['expr'];
+
+        /*
+         * TODO: implement optimizers here
+         */
+        if ('fcall' === $exprRaw['type']) {
+            if ('range' === $exprRaw['name']) {
+                $status = $this->compileRange($exprRaw, $compilationContext);
+                if (false !== $status) {
+                    return;
+                }
+            }
+
+            if ('iterator' === $exprRaw['name']) {
+                $status = $this->compileIterator($exprRaw, $compilationContext);
+                if (false !== $status) {
+                    return;
+                }
+            }
+        }
+
+        $expr = new Expression($exprRaw);
+        $expr->setReadOnly(true);
+        $expression = $expr->compile($compilationContext);
+
+        /**
+         * Check for traversing a constant string
+         */
+        if ('string' === $expression->getType()) {
+            $this->compileStringTraverse($expression, $compilationContext);
+
+            return;
+        }
+
+        if ('variable' !== $expression->getType() && 'array' !== $expression->getType()) {
+            throw new CompilerException('Unknown type: ' . $expression->getType(), $exprRaw);
+        }
+
+        $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+            $expression->getCode(),
+            $compilationContext,
+            $this->statement['expr'],
+        );
+        switch ($exprVariable->getType()) {
+            case 'variable':
+            case 'array':
+                $this->compileHashTraverse($compilationContext, $exprVariable);
+                break;
+
+            case 'string':
+                $this->compileStringTraverse($expression, $compilationContext, $exprVariable);
+                break;
+
+            default:
+                throw new CompilerException('Cannot traverse value type: ' . $exprVariable->getType(), $exprRaw);
+        }
+    }
+
+    /**
+     * Compiles traversing of hash values.
+     *
+     * - Evaluated expression must be a zval
+     * - A key must be a zval
+     * - A value must be a zval
+     *
+     * @param CompilationContext $compilationContext
+     * @param Variable           $exprVariable
+     */
+    public function compileHashTraverse(
+        CompilationContext $compilationContext,
+        Variable $exprVariable
+    ): void {
+        /**
+         * Initialize 'key' variable
+         */
+        if (isset($this->statement['key'])) {
+            if ('_' != $this->statement['key']) {
+                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['key'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $keyVariable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['key']
+                        . ' type: '
+                        . $keyVariable->getType()
+                        . ' as key in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+            }
+
+            $keyVariable->setMustInitNull(true);
+            $keyVariable->setIsInitialized(true, $compilationContext);
+            $keyVariable->setDynamicTypes('undefined');
+        }
+
+        /**
+         * Initialize 'value' variable
+         */
+        if (isset($this->statement['value'])) {
+            if ('_' != $this->statement['value']) {
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['value'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $variable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['value']
+                        . ' type: '
+                        . $variable->getType()
+                        . ' as value in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+            }
+
+            $variable->setMustInitNull(true);
+            $variable->setIsInitialized(true, $compilationContext);
+            $variable->increaseVariantIfNull();
+            $variable->setDynamicTypes('undefined');
+        }
+
+        /**
+         * Variables are initialized in a different way inside cycle
+         */
+        ++$compilationContext->insideCycle;
+
+        $duplicateHash = '0';
+        $duplicateKey  = true;
+
+        /**
+         * We have to check if hashes are modified within the for's block.
+         */
+        $st = null;
+        if (isset($this->statement['statements'])) {
+            /**
+             * Create the statements block here to obtain the last use line.
+             */
+            $st = new StatementsBlock($this->statement['statements']);
+
+            $detector = new ForValueUseDetector();
+            if ($detector->detect($exprVariable->getName(), $this->statement['statements'])) {
+                $duplicateHash = '1';
+            }
+
+            /**
+             * Detect if the key is modified or passed to an external scope
+             */
+            if (isset($this->statement['key'])) {
+                if (!$keyVariable->isTemporal()) {
+                    $detector->setDetectionFlags(ForValueUseDetector::DETECT_ALL);
+                    if ($detector->detect($keyVariable->getName(), $this->statement['statements'])) {
+                        $duplicateKey = true;
+                    }
+                }
+            }
+        }
+
+        $compilationContext->backend->forStatement(
+            $exprVariable,
+            isset($this->statement['key']) ? $keyVariable : null,
+            isset($this->statement['value']) ? $variable : null,
+            $duplicateKey,
+            $duplicateHash,
+            $this->statement,
+            $st,
+            $compilationContext
+        );
+
+        /**
+         * Restore the cycle counter
+         */
+        --$compilationContext->insideCycle;
+    }
+
+    /**
+     * Compiles a 'for' statement that use an 'iterator' as expression.
+     *
+     * @param array              $exprRaw
+     * @param CompilationContext $compilationContext
+     *
+     * @return void
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function compileIterator(array $exprRaw, CompilationContext $compilationContext): void
+    {
+        $iteratorVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+            'zend_object_iterator',
+            $compilationContext
+        );
+        $compilationContext->headersManager->add('kernel/iterator');
+        $codePrinter = $compilationContext->codePrinter;
+
+        /**
+         * Resolve first parameter of iterator(p).
+         */
+        $expr = new Expression($exprRaw['parameters'][0]['parameter']);
+        $expr->setReadOnly(false);
+        $expression = $expr->compile($compilationContext);
+
+        if ('variable' != $expression->getType()) {
+            throw new CompilerException('Unknown type: ' . $expression->getType(), $exprRaw);
+        }
+
+        $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+            $expression->getCode(),
+            $compilationContext,
+            $this->statement['expr']
+        );
+
+        /**
+         * Initialize 'key' variable
+         */
+        if (isset($this->statement['key'])) {
+            if ('_' != $this->statement['key']) {
+                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['key'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $keyVariable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['key']
+                        . ' type: '
+                        . $keyVariable->getType()
+                        . ' as key in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                /**
+                 * Anonymous key variable.
+                 */
+                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+                $keyVariable->increaseUses();
+            }
+
+            $keyVariable->setMustInitNull(true);
+            $keyVariable->setIsInitialized(true, $compilationContext);
+            $keyVariable->setDynamicTypes('undefined');
+        }
+
+        /**
+         * Initialize 'value' variable
+         */
+        if (isset($this->statement['value'])) {
+            if ('_' != $this->statement['value']) {
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['value'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $variable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['value']
+                        . ' type: '
+                        . $variable->getType()
+                        . ' as value in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                /**
+                 * Anonymous value variable.
+                 */
+                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $variable->increaseUses();
+            }
+
+            $variable->setMustInitNull(true);
+            $variable->setIsInitialized(true, $compilationContext);
+            $variable->setDynamicTypes('undefined');
+        }
+
+        /**
+         * Variables are initialized in a different way inside cycle
+         */
+        ++$compilationContext->insideCycle;
+
+        $codePrinter->output(
+            $iteratorVariable->getName() . ' = zephir_get_iterator(' . $compilationContext->backend->getVariableCode(
+                $exprVariable
+            ) . ');'
+        );
+
+        $codePrinter->output($iteratorVariable->getName() . '->funcs->rewind(' . $iteratorVariable->getName() . ');');
+        $codePrinter->output(
+            'for (;'
+            . $iteratorVariable->getName()
+            . '->funcs->valid('
+            . $iteratorVariable->getName()
+            . ') == SUCCESS && !EG(exception); '
+            . $iteratorVariable->getName()
+            . '->funcs->move_forward('
+            . $iteratorVariable->getName()
+            . ')) {'
+        );
+
+        if (isset($this->statement['key'])) {
+            $compilationContext->symbolTable->mustGrownStack(true);
+            $codePrinter->output(
+                "\t"
+                . 'ZEPHIR_GET_IMKEY('
+                . $this->statement['key']
+                . ', '
+                . $iteratorVariable->getName()
+                . ');'
+            );
+        }
+
+        if (isset($this->statement['value'])) {
+            $compilationContext->symbolTable->mustGrownStack(true);
+            $codePrinter->increaseLevel();
+            $codePrinter->output('{');
+            $codePrinter->increaseLevel();
+            $compilationContext->symbolTable->mustGrownStack(true);
+            $compilationContext->codePrinter->output(
+                'ZEPHIR_ITERATOR_COPY('
+                . $compilationContext->backend->getVariableCode($variable)
+                . ', '
+                . $iteratorVariable->getName()
+                . ');'
+            );
+            $codePrinter->decreaseLevel();
+            $codePrinter->output('}');
+            $codePrinter->decreaseLevel();
+        }
+
+        /**
+         * Compile statements in the 'for' block
+         */
+        if (isset($this->statement['statements'])) {
+            $st = new StatementsBlock($this->statement['statements']);
+            $st->isLoop(true);
+            if (isset($this->statement['key'])) {
+                $st->getMutateGatherer()->increaseMutations($this->statement['key']);
+            }
+            $st->getMutateGatherer()->increaseMutations($this->statement['value']);
+            $st->compile($compilationContext);
+        }
+
+        /**
+         * Restore the cycle counter
+         */
+        --$compilationContext->insideCycle;
+
+        $codePrinter->output('}');
+
+        $compilationContext->backend->destroyIterator($iteratorVariable, $compilationContext);
+    }
+
     /**
      * Compiles a for statement that use a 'range' as expression.
      *
@@ -36,24 +417,27 @@ class ForStatement extends StatementAbstract
      *
      * @return bool
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compileRange(array $exprRaw, CompilationContext $compilationContext): bool
     {
-        if (!\count($exprRaw['parameters'])) {
+        if (!count($exprRaw['parameters'])) {
             return false;
         }
 
-        if (\count($exprRaw['parameters']) > 3) {
+        if (count($exprRaw['parameters']) > 3) {
             return false;
         }
 
         $functionCall = new FunctionCall();
-        $parameters = $functionCall->getResolvedParamsAsExpr($exprRaw['parameters'], $compilationContext, $exprRaw);
+        $parameters   = $functionCall->getResolvedParamsAsExpr($exprRaw['parameters'], $compilationContext, $exprRaw);
 
-        if (2 != \count($parameters) && 3 != \count($parameters)) {
-            throw new CompilerException('Wrong number of parameters', $this->statement['expr']);
+        if (2 != count($parameters) && 3 != count($parameters)) {
+            throw new CompilerException(
+                'Wrong number of parameters',
+                $this->statement['expr']
+            );
         }
 
         if ('variable' != $parameters[0]->getType()) {
@@ -78,20 +462,32 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
             /**
              * This variable is used to check if the loop is in its first iteration.
              */
-            $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite('long', $compilationContext, $this->statement);
+            $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'long',
+                $compilationContext,
+                $this->statement
+            );
             $keyVariable->increaseUses();
         }
 
         /**
          * This variable is used to check if the loop is in its first iteration.
          */
-        $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite('bool', $compilationContext, $this->statement);
+        $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+            'bool',
+            $compilationContext,
+            $this->statement
+        );
 
         if ('variable' != $parameters[0]->getType()) {
             $tempVariable = $compilationContext->symbolTable->addTemp($parameters[0]->getType(), $compilationContext);
         } else {
-            $rangeVariable = $compilationContext->symbolTable->getVariableForRead($parameters[0]->getCode(), $compilationContext, $this->statement['expr']);
-            $tempVariable = $compilationContext->symbolTable->addTemp($rangeVariable->getType(), $compilationContext);
+            $rangeVariable = $compilationContext->symbolTable->getVariableForRead(
+                $parameters[0]->getCode(),
+                $compilationContext,
+                $this->statement['expr']
+            );
+            $tempVariable  = $compilationContext->symbolTable->addTemp($rangeVariable->getType(), $compilationContext);
         }
 
         /**
@@ -99,24 +495,38 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
          * inside the cycle
          */
         if ('variable' != $parameters[1]->getType()) {
-            $upperBoundVariable = $compilationContext->symbolTable->getTempVariable($parameters[1]->getType(), $compilationContext);
+            $upperBoundVariable = $compilationContext->symbolTable->getTempVariable(
+                $parameters[1]->getType(),
+                $compilationContext
+            );
         } else {
-            $rangeVariable = $compilationContext->symbolTable->getVariableForRead($parameters[1]->getCode(), $compilationContext, $this->statement['expr']);
-            $upperBoundVariable = $compilationContext->symbolTable->getTempVariable($rangeVariable->getType(), $compilationContext);
+            $rangeVariable      = $compilationContext->symbolTable->getVariableForRead(
+                $parameters[1]->getCode(),
+                $compilationContext,
+                $this->statement['expr']
+            );
+            $upperBoundVariable = $compilationContext->symbolTable->getTempVariable(
+                $rangeVariable->getType(),
+                $compilationContext
+            );
         }
 
         /**
          * Create an implicit 'let' operation to set the current value in the upper bound of the range.
          */
         $builderLet = $exprBuilder->statements()->let();
-        $builderLet->setAssignments([$exprBuilder->operators()
-            ->assignVariable($upperBoundVariable->getName(), $exprBuilder->literal($parameters[1]->getType(), $parameters[1]->getCode())
-                ->setFile($this->statement['file'])
-                ->setLine($this->statement['line'])
-                ->setChar($this->statement['char']))
-            ->setFile($this->statement['file'])
-            ->setLine($this->statement['line'])
-            ->setChar($this->statement['char']),
+        $builderLet->setAssignments([
+            $exprBuilder->operators()
+                        ->assignVariable(
+                            $upperBoundVariable->getName(),
+                            $exprBuilder->literal($parameters[1]->getType(), $parameters[1]->getCode())
+                                        ->setFile($this->statement['file'])
+                                        ->setLine($this->statement['line'])
+                                        ->setChar($this->statement['char'])
+                        )
+                        ->setFile($this->statement['file'])
+                        ->setLine($this->statement['line'])
+                        ->setChar($this->statement['char']),
         ]);
 
         $statement = new LetStatement($builderLet->build());
@@ -126,28 +536,36 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
             /**
              * Create an implicit 'let' operation for the initialize expression
              */
-            $builderLet->setAssignments([$exprBuilder->operators()
-                ->assignVariable($tempVariable->getName(), $exprBuilder->variable($upperBoundVariable->getName())
-                    ->setFile($this->statement['file'])
-                    ->setLine($this->statement['line'])
-                    ->setChar($this->statement['char']))
-                ->setFile($this->statement['file'])
-                ->setLine($this->statement['line'])
-                ->setChar($this->statement['char']),
+            $builderLet->setAssignments([
+                $exprBuilder->operators()
+                            ->assignVariable(
+                                $tempVariable->getName(),
+                                $exprBuilder->variable($upperBoundVariable->getName())
+                                            ->setFile($this->statement['file'])
+                                            ->setLine($this->statement['line'])
+                                            ->setChar($this->statement['char'])
+                            )
+                            ->setFile($this->statement['file'])
+                            ->setLine($this->statement['line'])
+                            ->setChar($this->statement['char']),
             ]);
             $statement = new LetStatement($builderLet->build());
         } else {
             /**
              * Create an implicit 'let' operation for the initialize expression
              */
-            $builderLet->setAssignments([$exprBuilder->operators()
-                ->assignVariable($tempVariable->getName(), $exprBuilder->literal($parameters[0]->getType(), $parameters[0]->getCode())
-                    ->setFile($this->statement['file'])
-                    ->setLine($this->statement['line'])
-                    ->setChar($this->statement['char']))
-                ->setFile($this->statement['file'])
-                ->setLine($this->statement['line'])
-                ->setChar($this->statement['char']),
+            $builderLet->setAssignments([
+                $exprBuilder->operators()
+                            ->assignVariable(
+                                $tempVariable->getName(),
+                                $exprBuilder->literal($parameters[0]->getType(), $parameters[0]->getCode())
+                                            ->setFile($this->statement['file'])
+                                            ->setLine($this->statement['line'])
+                                            ->setChar($this->statement['char'])
+                            )
+                            ->setFile($this->statement['file'])
+                            ->setLine($this->statement['line'])
+                            ->setChar($this->statement['char']),
             ]);
             $statement = new LetStatement($builderLet->build());
         }
@@ -158,28 +576,28 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
-            $codePrinter->output($keyVariable->getName().' = 0;');
+            $codePrinter->output($keyVariable->getName() . ' = 0;');
         }
-        $codePrinter->output($flagVariable->getName().' = 0;');
+        $codePrinter->output($flagVariable->getName() . ' = 0;');
 
         if ($this->statement['reverse']) {
             $conditionExpr = [
-                'type' => 'greater-equal',
-                'left' => ['type' => 'variable', 'value' => $tempVariable->getName()],
+                'type'  => 'greater-equal',
+                'left'  => ['type' => 'variable', 'value' => $tempVariable->getName()],
                 'right' => ['type' => $parameters[0]->getType(), 'value' => $parameters[0]->getCode()],
             ];
         } else {
             $conditionExpr = [
-                'type' => 'less-equal',
-                'left' => ['type' => 'variable', 'value' => $tempVariable->getName()],
+                'type'  => 'less-equal',
+                'left'  => ['type' => 'variable', 'value' => $tempVariable->getName()],
                 'right' => ['type' => 'variable', 'value' => $upperBoundVariable->getName()],
             ];
         }
 
-        $expr = new EvalExpression();
+        $expr      = new EvalExpression();
         $condition = $expr->optimize($conditionExpr, $compilationContext);
 
-        $codePrinter->output('if ('.$condition.') {');
+        $codePrinter->output('if (' . $condition . ') {');
         $codePrinter->increaseLevel();
 
         /**
@@ -190,46 +608,46 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
         $codePrinter->output('while (1) {');
         $codePrinter->increaseLevel();
 
-        $codePrinter->output('if ('.$flagVariable->getName().') {');
+        $codePrinter->output('if (' . $flagVariable->getName() . ') {');
 
         $codePrinter->increaseLevel();
 
         if (isset($this->statement['key'])) {
-            $codePrinter->output($keyVariable->getName().'++;');
+            $codePrinter->output($keyVariable->getName() . '++;');
         }
 
         if ($this->statement['reverse']) {
             if (!isset($parameters[2])) {
                 $statement = new LetStatement([
-                    'type' => 'let',
+                    'type'        => 'let',
                     'assignments' => [
                         [
                             'assign-type' => 'decr',
-                            'variable' => $tempVariable->getName(),
-                            'file' => $this->statement['file'],
-                            'line' => $this->statement['line'],
-                            'char' => $this->statement['char'],
+                            'variable'    => $tempVariable->getName(),
+                            'file'        => $this->statement['file'],
+                            'line'        => $this->statement['line'],
+                            'char'        => $this->statement['char'],
                         ],
                     ],
                 ]);
             } else {
                 $statement = new LetStatement([
-                    'type' => 'let',
+                    'type'        => 'let',
                     'assignments' => [
                         [
                             'assign-type' => 'variable',
-                            'operator' => 'sub-assign',
-                            'variable' => $tempVariable->getName(),
-                            'expr' => [
-                                'type' => $parameters[2]->getType(),
+                            'operator'    => 'sub-assign',
+                            'variable'    => $tempVariable->getName(),
+                            'expr'        => [
+                                'type'  => $parameters[2]->getType(),
                                 'value' => $parameters[2]->getCode(),
-                                'file' => $this->statement['file'],
-                                'line' => $this->statement['line'],
-                                'char' => $this->statement['char'],
+                                'file'  => $this->statement['file'],
+                                'line'  => $this->statement['line'],
+                                'char'  => $this->statement['char'],
                             ],
-                            'file' => $this->statement['file'],
-                            'line' => $this->statement['line'],
-                            'char' => $this->statement['char'],
+                            'file'        => $this->statement['file'],
+                            'line'        => $this->statement['line'],
+                            'char'        => $this->statement['char'],
                         ],
                     ],
                 ]);
@@ -237,35 +655,35 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
         } else {
             if (!isset($parameters[2])) {
                 $statement = new LetStatement([
-                    'type' => 'let',
+                    'type'        => 'let',
                     'assignments' => [
                         [
                             'assign-type' => 'incr',
-                            'variable' => $tempVariable->getName(),
-                            'file' => $this->statement['file'],
-                            'line' => $this->statement['line'],
-                            'char' => $this->statement['char'],
+                            'variable'    => $tempVariable->getName(),
+                            'file'        => $this->statement['file'],
+                            'line'        => $this->statement['line'],
+                            'char'        => $this->statement['char'],
                         ],
                     ],
                 ]);
             } else {
                 $statement = new LetStatement([
-                    'type' => 'let',
+                    'type'        => 'let',
                     'assignments' => [
                         [
                             'assign-type' => 'variable',
-                            'operator' => 'add-assign',
-                            'variable' => $tempVariable->getName(),
-                            'expr' => [
-                                'type' => $parameters[2]->getType(),
+                            'operator'    => 'add-assign',
+                            'variable'    => $tempVariable->getName(),
+                            'expr'        => [
+                                'type'  => $parameters[2]->getType(),
                                 'value' => $parameters[2]->getCode(),
-                                'file' => $this->statement['file'],
-                                'line' => $this->statement['line'],
-                                'char' => $this->statement['char'],
+                                'file'  => $this->statement['file'],
+                                'line'  => $this->statement['line'],
+                                'char'  => $this->statement['char'],
                             ],
-                            'file' => $this->statement['file'],
-                            'line' => $this->statement['line'],
-                            'char' => $this->statement['char'],
+                            'file'        => $this->statement['file'],
+                            'line'        => $this->statement['line'],
+                            'char'        => $this->statement['char'],
                         ],
                     ],
                 ]);
@@ -274,226 +692,100 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
         $statement->compile($compilationContext);
 
         /**
-         * Multi-line conditions would need to be regenerated here.
-         */
-        $condition = $expr->optimize($conditionExpr, $compilationContext);
-        $codePrinter->output('if (!('.$condition.')) {');
-        $codePrinter->output("\t".'break;');
-        $codePrinter->output('}');
-
-        $codePrinter->decreaseLevel();
-
-        $codePrinter->output('} else {');
-        $codePrinter->output("\t".$flagVariable->getName().' = 1;');
-        $codePrinter->output('}');
-
-        /**
-         * Initialize 'key' variable
-         */
-        if (isset($this->statement['key'])) {
-            /**
-             * Check for anonymous variables
-             */
-            if ('_' != $this->statement['key']) {
-                $keyVariableName = $this->statement['key'];
-            } else {
-                $keyVariableName = $keyVariable->getName();
-            }
-
-            /**
-             * Create an implicit 'let' operation, TODO: use a builder.
-             */
-            $statement = new LetStatement([
-                'type' => 'let',
-                'assignments' => [
-                    [
-                        'assign-type' => 'variable',
-                        'variable' => $keyVariableName,
-                        'operator' => 'assign',
-                        'expr' => [
-                            'type' => 'variable',
-                            'value' => $keyVariable->getName(),
-                            'file' => $this->statement['file'],
-                            'line' => $this->statement['line'],
-                            'char' => $this->statement['char'],
-                        ],
-                        'file' => $this->statement['file'],
-                        'line' => $this->statement['line'],
-                        'char' => $this->statement['char'],
-                    ],
-                ],
-            ]);
-
-            $statement->compile($compilationContext);
-        }
-
-        /**
-         * Initialize 'value' variable
-         */
-        if (isset($this->statement['value'])) {
-            /**
-             * Check for anonymous variables
-             */
-            if ('_' != $this->statement['value']) {
-                $valueVariable = $this->statement['value'];
-            } else {
-                $valueVariable = $tempVariable->getName();
-            }
-
-            /**
-             * Create an implicit 'let' operation, TODO: use a builder.
-             */
-            $statement = new LetStatement([
-                'type' => 'let',
-                'assignments' => [
-                    [
-                        'assign-type' => 'variable',
-                        'variable' => $valueVariable,
-                        'operator' => 'assign',
-                        'expr' => [
-                            'type' => 'variable',
-                            'value' => $tempVariable->getName(),
-                            'file' => $this->statement['file'],
-                            'line' => $this->statement['line'],
-                            'char' => $this->statement['char'],
-                        ],
-                        'file' => $this->statement['file'],
-                        'line' => $this->statement['line'],
-                        'char' => $this->statement['char'],
-                    ],
-                ],
-            ]);
-
-            $statement->compile($compilationContext);
-        }
-
-        $codePrinter->decreaseLevel();
-
-        /**
-         * Compile statements in the 'for' block
-         */
-        if (isset($this->statement['statements'])) {
-            $st = new StatementsBlock($this->statement['statements']);
-            $st->isLoop(true);
-            if (isset($this->statement['key'])) {
-                $st->getMutateGatherer()->increaseMutations($this->statement['key']);
-            }
-            $st->getMutateGatherer()->increaseMutations($this->statement['value']);
-            $st->compile($compilationContext);
-        }
-
-        /**
-         * Restore the cycle counter
-         */
-        --$compilationContext->insideCycle;
-
-        $codePrinter->output('}');
-        $codePrinter->decreaseLevel();
-        $codePrinter->output('}');
-
-        return true;
-    }
-
-    /**
-     * Compiles a 'for' statement that use an 'iterator' as expression.
-     *
-     * @param array              $exprRaw
-     * @param CompilationContext $compilationContext
-     *
-     * @return void
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function compileIterator(array $exprRaw, CompilationContext $compilationContext): void
-    {
-        $iteratorVariable = $compilationContext->symbolTable->getTempVariableForWrite('zend_object_iterator', $compilationContext);
-        $compilationContext->headersManager->add('kernel/iterator');
-        $codePrinter = $compilationContext->codePrinter;
-
-        /**
-         * Resolve first parameter of iterator(p).
+         * Multi-line conditions would need to be regenerated here.
          */
-        $expr = new Expression($exprRaw['parameters'][0]['parameter']);
-        $expr->setReadOnly(false);
-        $expression = $expr->compile($compilationContext);
+        $condition = $expr->optimize($conditionExpr, $compilationContext);
+        $codePrinter->output('if (!(' . $condition . ')) {');
+        $codePrinter->output("\t" . 'break;');
+        $codePrinter->output('}');
 
-        if ('variable' != $expression->getType()) {
-            throw new CompilerException('Unknown type: '.$expression->getType(), $exprRaw);
-        }
+        $codePrinter->decreaseLevel();
 
-        $exprVariable = $compilationContext->symbolTable->getVariableForRead($expression->getCode(), $compilationContext, $this->statement['expr']);
+        $codePrinter->output('} else {');
+        $codePrinter->output("\t" . $flagVariable->getName() . ' = 1;');
+        $codePrinter->output('}');
 
         /**
          * Initialize 'key' variable
          */
         if (isset($this->statement['key'])) {
+            /**
+             * Check for anonymous variables
+             */
             if ('_' != $this->statement['key']) {
-                $keyVariable = $compilationContext->symbolTable->getVariableForWrite($this->statement['key'], $compilationContext, $this->statement['expr']);
-                if ('variable' != $keyVariable->getType()) {
-                    throw new CompilerException('Cannot use variable: '.$this->statement['key'].' type: '.$keyVariable->getType().' as key in hash traversal', $this->statement['expr']);
-                }
+                $keyVariableName = $this->statement['key'];
             } else {
-                /**
-                 * Anonymous key variable.
-                 */
-                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $keyVariable->increaseUses();
+                $keyVariableName = $keyVariable->getName();
             }
 
-            $keyVariable->setMustInitNull(true);
-            $keyVariable->setIsInitialized(true, $compilationContext);
-            $keyVariable->setDynamicTypes('undefined');
+            /**
+             * Create an implicit 'let' operation, TODO: use a builder.
+             */
+            $statement = new LetStatement([
+                'type'        => 'let',
+                'assignments' => [
+                    [
+                        'assign-type' => 'variable',
+                        'variable'    => $keyVariableName,
+                        'operator'    => 'assign',
+                        'expr'        => [
+                            'type'  => 'variable',
+                            'value' => $keyVariable->getName(),
+                            'file'  => $this->statement['file'],
+                            'line'  => $this->statement['line'],
+                            'char'  => $this->statement['char'],
+                        ],
+                        'file'        => $this->statement['file'],
+                        'line'        => $this->statement['line'],
+                        'char'        => $this->statement['char'],
+                    ],
+                ],
+            ]);
+
+            $statement->compile($compilationContext);
         }
 
         /**
          * Initialize 'value' variable
          */
         if (isset($this->statement['value'])) {
+            /**
+             * Check for anonymous variables
+             */
             if ('_' != $this->statement['value']) {
-                $variable = $compilationContext->symbolTable->getVariableForWrite($this->statement['value'], $compilationContext, $this->statement['expr']);
-                if ('variable' != $variable->getType()) {
-                    throw new CompilerException('Cannot use variable: '.$this->statement['value'].' type: '.$variable->getType().' as value in hash traversal', $this->statement['expr']);
-                }
+                $valueVariable = $this->statement['value'];
             } else {
-                /**
-                 * Anonymous value variable.
-                 */
-                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $variable->increaseUses();
+                $valueVariable = $tempVariable->getName();
             }
 
-            $variable->setMustInitNull(true);
-            $variable->setIsInitialized(true, $compilationContext);
-            $variable->setDynamicTypes('undefined');
-        }
-
-        /**
-         * Variables are initialized in a different way inside cycle
-         */
-        ++$compilationContext->insideCycle;
-
-        $codePrinter->output($iteratorVariable->getName().' = zephir_get_iterator('.$compilationContext->backend->getVariableCode($exprVariable).');');
-
-        $codePrinter->output($iteratorVariable->getName().'->funcs->rewind('.$iteratorVariable->getName().');');
-        $codePrinter->output('for (;'.$iteratorVariable->getName().'->funcs->valid('.$iteratorVariable->getName().') == SUCCESS && !EG(exception); '.$iteratorVariable->getName().'->funcs->move_forward('.$iteratorVariable->getName().')) {');
+            /**
+             * Create an implicit 'let' operation, TODO: use a builder.
+             */
+            $statement = new LetStatement([
+                'type'        => 'let',
+                'assignments' => [
+                    [
+                        'assign-type' => 'variable',
+                        'variable'    => $valueVariable,
+                        'operator'    => 'assign',
+                        'expr'        => [
+                            'type'  => 'variable',
+                            'value' => $tempVariable->getName(),
+                            'file'  => $this->statement['file'],
+                            'line'  => $this->statement['line'],
+                            'char'  => $this->statement['char'],
+                        ],
+                        'file'        => $this->statement['file'],
+                        'line'        => $this->statement['line'],
+                        'char'        => $this->statement['char'],
+                    ],
+                ],
+            ]);
 
-        if (isset($this->statement['key'])) {
-            $compilationContext->symbolTable->mustGrownStack(true);
-            $codePrinter->output("\t".'ZEPHIR_GET_IMKEY('.$this->statement['key'].', '.$iteratorVariable->getName().');');
+            $statement->compile($compilationContext);
         }
 
-        if (isset($this->statement['value'])) {
-            $compilationContext->symbolTable->mustGrownStack(true);
-            $codePrinter->increaseLevel();
-            $codePrinter->output('{');
-            $codePrinter->increaseLevel();
-            $compilationContext->symbolTable->mustGrownStack(true);
-            $compilationContext->codePrinter->output('ZEPHIR_ITERATOR_COPY('.$compilationContext->backend->getVariableCode($variable).', '.$iteratorVariable->getName().');');
-            $codePrinter->decreaseLevel();
-            $codePrinter->output('}');
-            $codePrinter->decreaseLevel();
-        }
+        $codePrinter->decreaseLevel();
 
         /**
          * Compile statements in the 'for' block
@@ -513,9 +805,11 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
          */
         --$compilationContext->insideCycle;
 
+        $codePrinter->output('}');
+        $codePrinter->decreaseLevel();
         $codePrinter->output('}');
 
-        $compilationContext->backend->destroyIterator($iteratorVariable, $compilationContext);
+        return true;
     }
 
     /**
@@ -525,7 +819,7 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
      * - Every value must be a char/integer or compatible.
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compileStringTraverse(
         CompiledExpression $expression,
@@ -539,7 +833,11 @@ public function compileStringTraverse(
          */
         if (isset($this->statement['key'])) {
             if ('_' != $this->statement['key']) {
-                $keyVariable = $compilationContext->symbolTable->getVariableForWrite($this->statement['key'], $compilationContext, $this->statement['expr']);
+                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['key'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
                 switch ($keyVariable->getType()) {
                     case 'int':
                     case 'uint':
@@ -549,7 +847,14 @@ public function compileStringTraverse(
                     case 'uchar':
                         break;
                     default:
-                        throw new CompilerException('Cannot use variable: '.$this->statement['key'].' type: '.$keyVariable->getType().' as key in string traversal', $this->statement['expr']);
+                        throw new CompilerException(
+                            'Cannot use variable: '
+                            . $this->statement['key']
+                            . ' type: '
+                            . $keyVariable->getType()
+                            . ' as key in string traversal',
+                            $this->statement['expr']
+                        );
                 }
             } else {
                 $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite('int', $compilationContext);
@@ -565,7 +870,11 @@ public function compileStringTraverse(
          */
         if (isset($this->statement['value'])) {
             if ('_' != $this->statement['value']) {
-                $variable = $compilationContext->symbolTable->getVariableForWrite($this->statement['value'], $compilationContext, $this->statement['expr']);
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['value'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
                 switch ($variable->getType()) {
                     case 'int':
                     case 'uint':
@@ -575,7 +884,14 @@ public function compileStringTraverse(
                     case 'uchar':
                         break;
                     default:
-                        throw new CompilerException('Cannot use variable: '.$this->statement['value'].' type: '.$variable->getType().' as value in string traversal', $this->statement['expr']);
+                        throw new CompilerException(
+                            'Cannot use variable: '
+                            . $this->statement['value']
+                            . ' type: '
+                            . $variable->getType()
+                            . ' as value in string traversal',
+                            $this->statement['expr']
+                        );
                 }
             } else {
                 $variable = $compilationContext->symbolTable->getTempVariableForWrite('char', $compilationContext);
@@ -592,7 +908,10 @@ public function compileStringTraverse(
          * Create a temporary value to store the constant string
          */
         if ('string' == $expression->getType()) {
-            $constantVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite('variable', $compilationContext);
+            $constantVariable = $compilationContext->symbolTable->getTempLocalVariableForWrite(
+                'variable',
+                $compilationContext
+            );
 
             $compilationContext->backend->assignString(
                 $constantVariable,
@@ -607,17 +926,46 @@ public function compileStringTraverse(
 
         $stringVariableCode = $compilationContext->backend->getVariableCode($stringVariable);
         if ($this->statement['reverse']) {
-            $codePrinter->output('for ('.$tempVariable->getName().' = Z_STRLEN_P('.$stringVariableCode.'); '.$tempVariable->getName().' >= 0; '.$tempVariable->getName().'--) {');
+            $codePrinter->output(
+                'for ('
+                . $tempVariable->getName()
+                . ' = Z_STRLEN_P('
+                . $stringVariableCode
+                . '); '
+                . $tempVariable->getName()
+                . ' >= 0; '
+                . $tempVariable->getName()
+                . '--) {'
+            );
         } else {
-            $codePrinter->output('for ('.$tempVariable->getName().' = 0; '.$tempVariable->getName().' < Z_STRLEN_P('.$stringVariableCode.'); '.$tempVariable->getName().'++) {');
+            $codePrinter->output(
+                'for ('
+                . $tempVariable->getName()
+                . ' = 0; '
+                . $tempVariable->getName()
+                . ' < Z_STRLEN_P('
+                . $stringVariableCode
+                . '); '
+                . $tempVariable->getName()
+                . '++) {'
+            );
         }
 
         if (isset($this->statement['key'])) {
-            $codePrinter->output("\t".$keyVariable->getName().' = '.$tempVariable->getName().'; ');
+            $codePrinter->output(
+                "\t"
+                . $keyVariable->getName()
+                . ' = '
+                . $tempVariable->getName()
+                . '; '
+            );
         }
 
         $compilationContext->headersManager->add('kernel/operators');
-        $codePrinter->output("\t".$variable->getName().' = ZEPHIR_STRING_OFFSET('.$stringVariableCode.', '.$tempVariable->getName().');');
+        $codePrinter->output(
+            "\t" . $variable->getName(
+            ) . ' = ZEPHIR_STRING_OFFSET(' . $stringVariableCode . ', ' . $tempVariable->getName() . ');'
+        );
 
         /**
          * Variables are initialized in a different way inside cycle
@@ -641,172 +989,4 @@ public function compileStringTraverse(
 
         $codePrinter->output('}');
     }
-
-    /**
-     * Compiles traversing of hash values.
-     *
-     * - Evaluated expression must be a zval
-     * - A key must be a zval
-     * - A value must be a zval
-     *
-     * @param CompilationContext $compilationContext
-     * @param Variable           $exprVariable
-     */
-    public function compileHashTraverse(CompilationContext $compilationContext, Variable $exprVariable): void
-    {
-        /**
-         * Initialize 'key' variable
-         */
-        if (isset($this->statement['key'])) {
-            if ('_' != $this->statement['key']) {
-                $keyVariable = $compilationContext->symbolTable->getVariableForWrite($this->statement['key'], $compilationContext, $this->statement['expr']);
-                if ('variable' != $keyVariable->getType()) {
-                    throw new CompilerException('Cannot use variable: '.$this->statement['key'].' type: '.$keyVariable->getType().' as key in hash traversal', $this->statement['expr']);
-                }
-            } else {
-                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-            }
-
-            $keyVariable->setMustInitNull(true);
-            $keyVariable->setIsInitialized(true, $compilationContext);
-            $keyVariable->setDynamicTypes('undefined');
-        }
-
-        /**
-         * Initialize 'value' variable
-         */
-        if (isset($this->statement['value'])) {
-            if ('_' != $this->statement['value']) {
-                $variable = $compilationContext->symbolTable->getVariableForWrite($this->statement['value'], $compilationContext, $this->statement['expr']);
-                if ('variable' != $variable->getType()) {
-                    throw new CompilerException('Cannot use variable: '.$this->statement['value'].' type: '.$variable->getType().' as value in hash traversal', $this->statement['expr']);
-                }
-            } else {
-                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-            }
-
-            $variable->setMustInitNull(true);
-            $variable->setIsInitialized(true, $compilationContext);
-            $variable->increaseVariantIfNull();
-            $variable->setDynamicTypes('undefined');
-        }
-
-        /**
-         * Variables are initialized in a different way inside cycle
-         */
-        ++$compilationContext->insideCycle;
-
-        $duplicateHash = '0';
-        $duplicateKey = true;
-
-        /**
-         * We have to check if hashes are modified within the for's block.
-         */
-        $st = null;
-        if (isset($this->statement['statements'])) {
-            /**
-             * Create the statements block here to obtain the last use line.
-             */
-            $st = new StatementsBlock($this->statement['statements']);
-
-            $detector = new ForValueUseDetector();
-            if ($detector->detect($exprVariable->getName(), $this->statement['statements'])) {
-                $duplicateHash = '1';
-            }
-
-            /**
-             * Detect if the key is modified or passed to an external scope
-             */
-            if (isset($this->statement['key'])) {
-                if (!$keyVariable->isTemporal()) {
-                    $detector->setDetectionFlags(ForValueUseDetector::DETECT_ALL);
-                    if ($detector->detect($keyVariable->getName(), $this->statement['statements'])) {
-                        $duplicateKey = true;
-                    }
-                }
-            }
-        }
-
-        $compilationContext->backend->forStatement(
-            $exprVariable,
-            isset($this->statement['key']) ? $keyVariable : null,
-            isset($this->statement['value']) ? $variable : null,
-            $duplicateKey,
-            $duplicateHash,
-            $this->statement,
-            $st,
-            $compilationContext
-        );
-
-        /**
-         * Restore the cycle counter
-         */
-        --$compilationContext->insideCycle;
-    }
-
-    /**
-     * @param CompilationContext $compilationContext
-     *
-     * @throws Exception
-     * @throws \ReflectionException
-     */
-    public function compile(CompilationContext $compilationContext): void
-    {
-        $exprRaw = $this->statement['expr'];
-
-        /*
-         * TODO: implement optimizers here
-         */
-        if ('fcall' === $exprRaw['type']) {
-            if ('range' === $exprRaw['name']) {
-                $status = $this->compileRange($exprRaw, $compilationContext);
-                if (false !== $status) {
-                    return;
-                }
-            }
-
-            if ('iterator' === $exprRaw['name']) {
-                $status = $this->compileIterator($exprRaw, $compilationContext);
-                if (false !== $status) {
-                    return;
-                }
-            }
-        }
-
-        $expr = new Expression($exprRaw);
-        $expr->setReadOnly(true);
-        $expression = $expr->compile($compilationContext);
-
-        /**
-         * Check for traversing a constant string
-         */
-        if ('string' === $expression->getType()) {
-            $this->compileStringTraverse($expression, $compilationContext);
-
-            return;
-        }
-
-        if ('variable' !== $expression->getType() && 'array' !== $expression->getType()) {
-            throw new CompilerException('Unknown type: '.$expression->getType(), $exprRaw);
-        }
-
-        $exprVariable = $compilationContext->symbolTable->getVariableForRead(
-            $expression->getCode(),
-            $compilationContext,
-            $this->statement['expr'],
-        );
-        switch ($exprVariable->getType()) {
-            case 'variable':
-            case 'array':
-                $this->compileHashTraverse($compilationContext, $exprVariable);
-                break;
-
-            case 'string':
-                $this->compileStringTraverse($expression, $compilationContext, $exprVariable);
-                break;
-
-            default:
-                throw new CompilerException('Cannot traverse value type: '.$exprVariable->getType(), $exprRaw);
-        }
-    }
 }
diff --git a/src/Statements/IfStatement.php b/src/Statements/IfStatement.php
index 763f519d43..734106df63 100644
--- a/src/Statements/IfStatement.php
+++ b/src/Statements/IfStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\Branch;
 use Zephir\CompilationContext;
 use Zephir\Detectors\ReadDetector;
@@ -21,6 +22,8 @@
 use Zephir\Passes\SkipVariantInit;
 use Zephir\StatementsBlock;
 
+use function is_object;
+
 /**
  * 'If' statement, the same as in PHP/C
  */
@@ -29,21 +32,21 @@ class IfStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
     {
         $exprRaw = $this->statement['expr'];
 
-        $expr = new EvalExpression();
+        $expr      = new EvalExpression();
         $condition = $expr->optimize($exprRaw, $compilationContext);
 
         /**
          * This pass tries to move dynamic variable initialization out of the if/else branch
          */
         if (isset($this->statement['statements']) && (isset($this->statement['else_statements']) || isset($this->statement['elseif_statements']))) {
-            $readDetector = new ReadDetector();
+            $readDetector    = new ReadDetector();
             $skipVariantInit = new SkipVariantInit();
 
             $skipVariantInit->setVariablesToSkip(0, $expr->getUsedVariables());
@@ -59,7 +62,10 @@ public function compile(CompilationContext $compilationContext): void
 
             if (isset($this->statement['elseif_statements'])) {
                 foreach ($this->statement['elseif_statements'] as $key => $statement) {
-                    $this->statement['elseif_statements'][$key]['condition'] = $expr->optimize($statement['expr'], $compilationContext);
+                    $this->statement['elseif_statements'][$key]['condition'] = $expr->optimize(
+                        $statement['expr'],
+                        $compilationContext
+                    );
 
                     ++$lastBranchId;
                     $skipVariantInit->setVariablesToSkip($lastBranchId, $expr->getUsedVariables());
@@ -74,7 +80,7 @@ public function compile(CompilationContext $compilationContext): void
 
             $symbolTable = $compilationContext->symbolTable;
             foreach ($skipVariantInit->getVariables() as $variable) {
-                if ($symbolTable->hasVariable((string) $variable)) {
+                if ($symbolTable->hasVariable((string)$variable)) {
                     $symbolVariable = $symbolTable->getVariable($variable);
                     if ('variable' === $symbolVariable->getType()) {
                         if (!$readDetector->detect($variable, $exprRaw)) {
@@ -86,14 +92,14 @@ public function compile(CompilationContext $compilationContext): void
             }
         }
 
-        $compilationContext->codePrinter->output('if ('.$condition.') {');
+        $compilationContext->codePrinter->output('if (' . $condition . ') {');
         $this->evalExpression = $expr;
 
         /**
          * Try to mark latest temporary variable used as idle.
          */
         $evalVariable = $expr->getEvalVariable();
-        if (\is_object($evalVariable)) {
+        if (is_object($evalVariable)) {
             if ($evalVariable->isTemporal()) {
                 $evalVariable->setIdle(true);
             }
@@ -103,7 +109,7 @@ public function compile(CompilationContext $compilationContext): void
          * Compile statements in the 'if' block
          */
         if (isset($this->statement['statements'])) {
-            $st = new StatementsBlock($this->statement['statements']);
+            $st     = new StatementsBlock($this->statement['statements']);
             $branch = $st->compile($compilationContext, $expr->isUnreachable(), Branch::TYPE_CONDITIONAL_TRUE);
             $branch->setRelatedStatement($this);
         }
@@ -118,7 +124,7 @@ public function compile(CompilationContext $compilationContext): void
                 }
 
                 $st = new StatementsBlock($statement['statements']);
-                $compilationContext->codePrinter->output('} else if ('.$statement['condition'].') {');
+                $compilationContext->codePrinter->output('} else if (' . $statement['condition'] . ') {');
                 $branch = $st->compile($compilationContext, $expr->isUnreachable(), Branch::TYPE_CONDITIONAL_TRUE);
                 $branch->setRelatedStatement($this);
             }
@@ -129,7 +135,7 @@ public function compile(CompilationContext $compilationContext): void
          */
         if (isset($this->statement['else_statements'])) {
             $compilationContext->codePrinter->output('} else {');
-            $st = new StatementsBlock($this->statement['else_statements']);
+            $st     = new StatementsBlock($this->statement['else_statements']);
             $branch = $st->compile($compilationContext, $expr->isUnreachableElse(), Branch::TYPE_CONDITIONAL_FALSE);
             $branch->setRelatedStatement($this);
         }
diff --git a/src/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
index ba4de5f814..e8131d1af3 100644
--- a/src/Statements/Let/ArrayIndex.php
+++ b/src/Statements/Let/ArrayIndex.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,15 +9,20 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\GlobalConstant;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function count;
+
 /**
  * ArrayIndex.
  *
@@ -38,32 +41,54 @@ class ArrayIndex
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         /*
          * Arrays must be stored in the HEAP
          */
         if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is local only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is read only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is read only",
+                $statement
+            );
         }
 
         if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is local only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
         }
 
         /*
          * Only dynamic variables can be used as arrays
          */
         if ($symbolVariable->isNotVariableAndArray()) {
-            throw new CompilerException("Cannot use variable type: '".$symbolVariable->getType()."' as array", $statement);
+            throw new CompilerException(
+                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+                $statement
+            );
         }
 
         if ('variable' == $symbolVariable->getType()) {
@@ -85,106 +110,89 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
         /*
          * Choose one-offset or multiple-offset functions
          */
-        if (1 == \count($statement['index-expr'])) {
+        if (1 == count($statement['index-expr'])) {
             $this->_assignArrayIndexSingle($variable, $symbolVariable, $resolvedExpr, $compilationContext, $statement);
         } else {
-            $this->_assignArrayIndexMultiple($variable, $symbolVariable, $resolvedExpr, $compilationContext, $statement);
+            $this->_assignArrayIndexMultiple(
+                $variable,
+                $symbolVariable,
+                $resolvedExpr,
+                $compilationContext,
+                $statement
+            );
         }
     }
 
     /**
-     * Resolves an item that will be assigned to an array offset.
+     * Compiles foo[y][x] = {expr} (multiple offset).
      *
+     * @param string             $variable
+     * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
-     *
-     * @return GlobalConstant|ZephirVariable
+     * @param array              $statement
      *
      * @throws CompilerException
+     * @throws Exception
      */
-    protected function _getResolvedArrayItem(CompiledExpression $resolvedExpr, CompilationContext $compilationContext)
-    {
-        switch ($resolvedExpr->getType()) {
-            case 'null':
-                $symbolVariable = new GlobalConstant('ZEPHIR_GLOBAL(global_null)');
-                break;
-
-            case 'int':
-            case 'uint':
-            case 'long':
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                $compilationContext->backend->assignLong($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
-                break;
-
-            case 'char':
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                $compilationContext->backend->assignLong($symbolVariable, '\''.$resolvedExpr->getCode().'\'', $compilationContext);
-                break;
-
-            case 'double':
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                $compilationContext->backend->assignDouble($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
-                break;
-
-            case 'bool':
-                if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $symbolVariable = new GlobalConstant('ZEPHIR_GLOBAL(global_true)');
-                } else {
-                    if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $symbolVariable = new GlobalConstant('ZEPHIR_GLOBAL(global_false)');
-                    } else {
-                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                        $compilationContext->backend->assignBool($symbolVariable, $resolvedExpr->getBooleanCode(), $compilationContext);
-                    }
-                }
-                break;
+    protected function _assignArrayIndexMultiple(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
+        $offsetExprs = [];
 
-            case 'string':
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                $compilationContext->backend->assignString($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
-                break;
+        foreach ($statement['index-expr'] as $indexExpr) {
+            $expression = new Expression($indexExpr);
+            $expression->setReadOnly(true);
+            $exprIndex = $expression->compile($compilationContext);
 
-            case 'array':
-                $symbolVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $resolvedExpr->getOriginal());
-                break;
+            switch ($exprIndex->getType()) {
+                case 'int':
+                case 'uint':
+                case 'long':
+                case 'ulong':
+                case 'string':
+                case 'variable':
+                    break;
+                default:
+                    throw new CompilerException(
+                        sprintf(
+                            'Index: %s cannot be used as array index in assignment without cast',
+                            $exprIndex->getType()
+                        ),
+                        $indexExpr
+                    );
+            }
 
-            case 'variable':
-                $variableExpr = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $resolvedExpr->getOriginal());
-                switch ($variableExpr->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                        $compilationContext->backend->assignLong($symbolVariable, $variableExpr, $compilationContext);
-                        break;
+            $offsetExprs[] = $exprIndex;
+        }
 
-                    case 'double':
-                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                        $compilationContext->backend->assignDouble($symbolVariable, $variableExpr, $compilationContext);
-                        break;
+        $compilationContext->headersManager->add('kernel/array');
 
-                    case 'bool':
-                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $resolvedExpr->getOriginal());
-                        $compilationContext->backend->assignBool($symbolVariable, $variableExpr, $compilationContext);
-                        break;
+        /**
+         * Create a temporal zval (if needed).
+         */
+        $symbolVariable = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
 
-                    case 'variable':
-                    case 'string':
-                    case 'array':
-                        $symbolVariable = $variableExpr;
-                        break;
+        $targetVariable = $compilationContext->symbolTable->getVariableForWrite(
+            $variable,
+            $compilationContext,
+            $statement
+        );
 
-                    default:
-                        throw new CompilerException('Variable: '.$variableExpr->getType().' cannot be assigned to array offset', $resolvedExpr->getOriginal());
-                }
-                break;
+        $compilationContext->backend->assignArrayMulti(
+            $targetVariable,
+            $symbolVariable,
+            $offsetExprs,
+            $compilationContext
+        );
 
-            default:
-                throw new CompilerException('Expression: '.$resolvedExpr->getType().' cannot be assigned to array offset', $resolvedExpr->getOriginal());
+        if ($symbolVariable->isTemporal()) {
+            $symbolVariable->setIdle(true);
         }
-
-        return $symbolVariable;
     }
 
     /**
@@ -198,10 +206,15 @@ protected function _getResolvedArrayItem(CompiledExpression $resolvedExpr, Compi
      *
      * @throws CompilerException
      */
-    protected function _assignArrayIndexSingle($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    protected function _assignArrayIndexSingle(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         $expression = new Expression($statement['index-expr'][0]);
-        $exprIndex = $expression->compile($compilationContext);
+        $exprIndex  = $expression->compile($compilationContext);
 
         switch ($exprIndex->getType()) {
             case 'int':
@@ -212,14 +225,19 @@ protected function _assignArrayIndexSingle($variable, ZephirVariable $symbolVari
             case 'variable':
                 break;
             default:
-                throw new CompilerException('Index: '.$exprIndex->getType().' cannot be used as array offset in assignment without cast', $statement['index-expr'][0]);
+                throw new CompilerException(
+                    'Index: '
+                    . $exprIndex->getType()
+                    . ' cannot be used as array offset in assignment without cast',
+                    $statement['index-expr'][0]
+                );
         }
 
         /**
          * Create a temporal zval (if needed).
          */
         $realSymbolVariable = $symbolVariable;
-        $symbolVariable = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
+        $symbolVariable     = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
 
         $flags = 'PH_COPY | PH_SEPARATE';
 
@@ -231,11 +249,21 @@ protected function _assignArrayIndexSingle($variable, ZephirVariable $symbolVari
             case 'long':
             case 'ulong':
             case 'string':
-                $compilationContext->backend->updateArray($realSymbolVariable, $exprIndex, $symbolVariable, $compilationContext, $flags);
+                $compilationContext->backend->updateArray(
+                    $realSymbolVariable,
+                    $exprIndex,
+                    $symbolVariable,
+                    $compilationContext,
+                    $flags
+                );
                 break;
 
             case 'variable':
-                $variableIndex = $compilationContext->symbolTable->getVariableForRead($exprIndex->getCode(), $compilationContext, $statement);
+                $variableIndex = $compilationContext->symbolTable->getVariableForRead(
+                    $exprIndex->getCode(),
+                    $compilationContext,
+                    $statement
+                );
                 switch ($variableIndex->getType()) {
                     case 'int':
                     case 'uint':
@@ -243,86 +271,189 @@ protected function _assignArrayIndexSingle($variable, ZephirVariable $symbolVari
                     case 'ulong':
                     case 'string':
                     case 'variable':
-                        $compilationContext->backend->updateArray($realSymbolVariable, $variableIndex, $symbolVariable, $compilationContext, $flags);
+                        $compilationContext->backend->updateArray(
+                            $realSymbolVariable,
+                            $variableIndex,
+                            $symbolVariable,
+                            $compilationContext,
+                            $flags
+                        );
                         break;
                     default:
-                        throw new CompilerException('Variable: '.$variableIndex->getType().' cannot be used as array index', $statement);
+                        throw new CompilerException(
+                            'Variable: '
+                            . $variableIndex->getType()
+                            . ' cannot be used as array index',
+                            $statement
+                        );
                 }
                 break;
             default:
-                throw new CompilerException('Value: '.$exprIndex->getType().' cannot be used as array index', $statement);
+                throw new CompilerException(
+                    'Value: ' . $exprIndex->getType() . ' cannot be used as array index',
+                    $statement
+                );
         }
     }
 
     /**
-     * Compiles foo[y][x] = {expr} (multiple offset).
+     * Resolves an item that will be assigned to an array offset.
      *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
-     * @param array              $statement
+     *
+     * @return GlobalConstant|ZephirVariable
      *
      * @throws CompilerException
-     * @throws \Zephir\Exception
      */
-    protected function _assignArrayIndexMultiple(
-        $variable,
-        ZephirVariable $symbolVariable,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        $statement
-    ): void {
-        $offsetExprs = [];
+    protected function _getResolvedArrayItem(CompiledExpression $resolvedExpr, CompilationContext $compilationContext)
+    {
+        switch ($resolvedExpr->getType()) {
+            case 'null':
+                $symbolVariable = new GlobalConstant('ZEPHIR_GLOBAL(global_null)');
+                break;
 
-        foreach ($statement['index-expr'] as $indexExpr) {
-            $expression = new Expression($indexExpr);
-            $expression->setReadOnly(true);
-            $exprIndex = $expression->compile($compilationContext);
+            case 'int':
+            case 'uint':
+            case 'long':
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $resolvedExpr->getOriginal()
+                );
+                $compilationContext->backend->assignLong(
+                    $symbolVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                break;
 
-            switch ($exprIndex->getType()) {
-                case 'int':
-                case 'uint':
-                case 'long':
-                case 'ulong':
-                case 'string':
-                case 'variable':
-                    break;
-                default:
-                    throw new CompilerException(
-                        sprintf(
-                            'Index: %s cannot be used as array index in assignment without cast',
-                            $exprIndex->getType()
-                        ),
-                        $indexExpr
-                    );
-            }
+            case 'char':
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $resolvedExpr->getOriginal()
+                );
+                $compilationContext->backend->assignLong(
+                    $symbolVariable,
+                    '\'' . $resolvedExpr->getCode() . '\'',
+                    $compilationContext
+                );
+                break;
 
-            $offsetExprs[] = $exprIndex;
-        }
+            case 'double':
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $resolvedExpr->getOriginal()
+                );
+                $compilationContext->backend->assignDouble(
+                    $symbolVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                break;
 
-        $compilationContext->headersManager->add('kernel/array');
+            case 'bool':
+                if ('1' == $resolvedExpr->getBooleanCode()) {
+                    $symbolVariable = new GlobalConstant('ZEPHIR_GLOBAL(global_true)');
+                } else {
+                    if ('0' == $resolvedExpr->getBooleanCode()) {
+                        $symbolVariable = new GlobalConstant('ZEPHIR_GLOBAL(global_false)');
+                    } else {
+                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $resolvedExpr->getOriginal()
+                        );
+                        $compilationContext->backend->assignBool(
+                            $symbolVariable,
+                            $resolvedExpr->getBooleanCode(),
+                            $compilationContext
+                        );
+                    }
+                }
+                break;
 
-        /**
-         * Create a temporal zval (if needed).
-         */
-        $symbolVariable = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
+            case 'string':
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $resolvedExpr->getOriginal()
+                );
+                $compilationContext->backend->assignString(
+                    $symbolVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                break;
 
-        $targetVariable = $compilationContext->symbolTable->getVariableForWrite(
-            $variable,
-            $compilationContext,
-            $statement
-        );
+            case 'array':
+                $symbolVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $resolvedExpr->getOriginal()
+                );
+                break;
 
-        $compilationContext->backend->assignArrayMulti(
-            $targetVariable,
-            $symbolVariable,
-            $offsetExprs,
-            $compilationContext
-        );
+            case 'variable':
+                $variableExpr = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $resolvedExpr->getOriginal()
+                );
+                switch ($variableExpr->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $resolvedExpr->getOriginal()
+                        );
+                        $compilationContext->backend->assignLong($symbolVariable, $variableExpr, $compilationContext);
+                        break;
 
-        if ($symbolVariable->isTemporal()) {
-            $symbolVariable->setIdle(true);
+                    case 'double':
+                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $resolvedExpr->getOriginal()
+                        );
+                        $compilationContext->backend->assignDouble($symbolVariable, $variableExpr, $compilationContext);
+                        break;
+
+                    case 'bool':
+                        $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $resolvedExpr->getOriginal()
+                        );
+                        $compilationContext->backend->assignBool($symbolVariable, $variableExpr, $compilationContext);
+                        break;
+
+                    case 'variable':
+                    case 'string':
+                    case 'array':
+                        $symbolVariable = $variableExpr;
+                        break;
+
+                    default:
+                        throw new CompilerException(
+                            'Variable: ' . $variableExpr->getType() . ' cannot be assigned to array offset',
+                            $resolvedExpr->getOriginal()
+                        );
+                }
+                break;
+
+            default:
+                throw new CompilerException(
+                    'Expression: ' . $resolvedExpr->getType() . ' cannot be assigned to array offset',
+                    $resolvedExpr->getOriginal()
+                );
         }
+
+        return $symbolVariable;
     }
 }
diff --git a/src/Statements/Let/ArrayIndexAppend.php b/src/Statements/Let/ArrayIndexAppend.php
index 613f6993b4..7cb5445300 100644
--- a/src/Statements/Let/ArrayIndexAppend.php
+++ b/src/Statements/Let/ArrayIndexAppend.php
@@ -37,36 +37,59 @@ class ArrayIndexAppend extends ArrayIndex
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         /*
          * Arrays must be stored in the HEAP
          */
         if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is local only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is read only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is read only",
+                $statement
+            );
         }
 
         if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is local only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
         }
 
         /*
          * Only dynamic variables and arrays can be used as arrays
          */
         if ($symbolVariable->isNotVariableAndArray()) {
-            throw new CompilerException("Cannot use variable type: '".$symbolVariable->getType()."' as array", $statement);
+            throw new CompilerException(
+                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+                $statement
+            );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
+            throw new CompilerException(
+                'Cannot use non-initialized variable as an object',
+                $statement
+            );
         }
 
         /*
@@ -91,8 +114,13 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
      * @param CompilationContext $compilationContext
      * @param array              $statement
      */
-    protected function _assignArrayIndexMultiple($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    protected function _assignArrayIndexMultiple(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         $offsetExprs = [];
         foreach ($statement['index-expr'] as $indexExpr) {
             $expression = new Expression($indexExpr);
@@ -108,7 +136,12 @@ protected function _assignArrayIndexMultiple($variable, ZephirVariable $symbolVa
                 case 'variable':
                     break;
                 default:
-                    throw new CompilerException('Index: '.$exprIndex->getType().' cannot be used as array index in assignment without cast', $indexExpr);
+                    throw new CompilerException(
+                        'Index: '
+                        . $exprIndex->getType()
+                        . ' cannot be used as array index in assignment without cast',
+                        $indexExpr
+                    );
             }
 
             $offsetExprs[] = $exprIndex;
@@ -120,9 +153,18 @@ protected function _assignArrayIndexMultiple($variable, ZephirVariable $symbolVa
          * Create a temporal zval (if needed).
          */
         $symbolVariable = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
-        $targetVariable = $compilationContext->symbolTable->getVariableForWrite($variable, $compilationContext, $statement);
+        $targetVariable = $compilationContext->symbolTable->getVariableForWrite(
+            $variable,
+            $compilationContext,
+            $statement
+        );
 
         $offsetExprs[] = 'a';
-        $compilationContext->backend->assignArrayMulti($targetVariable, $symbolVariable, $offsetExprs, $compilationContext);
+        $compilationContext->backend->assignArrayMulti(
+            $targetVariable,
+            $symbolVariable,
+            $offsetExprs,
+            $compilationContext
+        );
     }
 }
diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index e17862057e..96f26e8c99 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -34,14 +34,24 @@ class Decr
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is read only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is read only",
+                $statement
+            );
         }
 
         $codePrinter = $compilationContext->codePrinter;
@@ -54,7 +64,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompilationCon
             case 'double':
             case 'char':
             case 'uchar':
-                $codePrinter->output($variable.'--;');
+                $codePrinter->output($variable . '--;');
                 break;
 
             case 'variable':
@@ -79,11 +89,13 @@ public function assign($variable, ZephirVariable $symbolVariable, CompilationCon
                 if (!$symbolVariable->isLocalOnly()) {
                     $symbolVariable->separate($compilationContext);
                 }
-                $codePrinter->output('zephir_decrement('.$compilationContext->backend->getVariableCode($symbolVariable).');');
+                $codePrinter->output(
+                    'zephir_decrement(' . $compilationContext->backend->getVariableCode($symbolVariable) . ');'
+                );
                 break;
 
             default:
-                throw new CompilerException('Cannot decrement variable: '.$symbolVariable->getType(), $statement);
+                throw new CompilerException('Cannot decrement variable: ' . $symbolVariable->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/ExportSymbol.php b/src/Statements/Let/ExportSymbol.php
index f2dacfb513..dd2f1a6619 100644
--- a/src/Statements/Let/ExportSymbol.php
+++ b/src/Statements/Let/ExportSymbol.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -31,43 +31,48 @@ class ExportSymbol
      * @param string             $variable
      * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         $codePrinter = $compilationContext->codePrinter;
 
         $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);
         $variable->setMustInitNull(true);
 
         $letStatement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $variable->getName(),
-                    'operator' => 'assign',
-                    'expr' => [
-                        'type' => $resolvedExpr->getType(),
+                    'variable'    => $variable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => [
+                        'type'  => $resolvedExpr->getType(),
                         'value' => $resolvedExpr->getCode(),
-                        'file' => $statement['file'],
-                        'line' => $statement['line'],
-                        'char' => $statement['char'],
+                        'file'  => $statement['file'],
+                        'line'  => $statement['line'],
+                        'char'  => $statement['char'],
                     ],
-                    'file' => $statement['file'],
-                    'line' => $statement['line'],
-                    'char' => $statement['char'],
+                    'file'        => $statement['file'],
+                    'line'        => $statement['line'],
+                    'char'        => $statement['char'],
                 ],
             ],
         ]);
         $letStatement->compile($compilationContext);
 
-        $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+        $symbol   = $compilationContext->backend->getVariableCode($symbolVariable);
         $variable = $compilationContext->backend->getVariableCode($variable);
 
-        $codePrinter->output('if (zephir_set_symbol('.$symbol.', '.$variable.') == FAILURE) {');
-        $codePrinter->output("\t".'return;');
+        $codePrinter->output('if (zephir_set_symbol(' . $symbol . ', ' . $variable . ') == FAILURE) {');
+        $codePrinter->output("\t" . 'return;');
         $codePrinter->output('}');
     }
 }
diff --git a/src/Statements/Let/ExportSymbolString.php b/src/Statements/Let/ExportSymbolString.php
index ceb8c0c5ac..66cf1708c3 100644
--- a/src/Statements/Let/ExportSymbolString.php
+++ b/src/Statements/Let/ExportSymbolString.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -31,40 +31,47 @@ class ExportSymbolString
      * @param string             $variable
      * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      */
-    public function assign($variable, ZephirVariable $symbolVariable = null, CompiledExpression $resolvedExpr = null, CompilationContext $compilationContext = null, $statement = null): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable = null,
+        CompiledExpression $resolvedExpr = null,
+        CompilationContext $compilationContext = null,
+        $statement = null
+    ): void {
         $codePrinter = $compilationContext->codePrinter;
 
         $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);
         $variable->setMustInitNull(true);
 
         $letStatement = new LetStatement([
-            'type' => 'let',
+            'type'        => 'let',
             'assignments' => [
                 [
                     'assign-type' => 'variable',
-                    'variable' => $variable->getName(),
-                    'operator' => 'assign',
-                    'expr' => [
-                        'type' => $resolvedExpr->getType(),
+                    'variable'    => $variable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => [
+                        'type'  => $resolvedExpr->getType(),
                         'value' => $resolvedExpr->getCode(),
-                        'file' => $statement['file'],
-                        'line' => $statement['line'],
-                        'char' => $statement['char'],
+                        'file'  => $statement['file'],
+                        'line'  => $statement['line'],
+                        'char'  => $statement['char'],
                     ],
-                    'file' => $statement['file'],
-                    'line' => $statement['line'],
-                    'char' => $statement['char'],
+                    'file'        => $statement['file'],
+                    'line'        => $statement['line'],
+                    'char'        => $statement['char'],
                 ],
             ],
         ]);
         $letStatement->compile($compilationContext);
 
         $symbol = $compilationContext->backend->getVariableCode($variable);
-        $codePrinter->output('if (zephir_set_symbol_str(SS("'.$statement['variable'].'"), '.$symbol.') == FAILURE) {');
+        $codePrinter->output(
+            'if (zephir_set_symbol_str(SS("' . $statement['variable'] . '"), ' . $symbol . ') == FAILURE) {'
+        );
         $codePrinter->output('  return;');
         $codePrinter->output('}');
     }
diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index b11b0995ce..0616cdc9e0 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -34,17 +34,29 @@ class Incr
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if ($symbolVariable->isReadOnly()) {
             /*
              * TODO: implement increment of objects members
              */
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is read only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is read only",
+                $statement
+            );
         }
 
         $codePrinter = &$compilationContext->codePrinter;
@@ -57,7 +69,7 @@ public function assign($variable, ZephirVariable $symbolVariable, CompilationCon
             case 'double':
             case 'char':
             case 'uchar':
-                $codePrinter->output($variable.'++;');
+                $codePrinter->output($variable . '++;');
                 break;
 
             case 'variable':
@@ -76,11 +88,11 @@ public function assign($variable, ZephirVariable $symbolVariable, CompilationCon
                     $symbolVariable->separate($compilationContext);
                 }
                 $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-                $codePrinter->output('zephir_increment('.$symbol.');');
+                $codePrinter->output('zephir_increment(' . $symbol . ');');
                 break;
 
             default:
-                throw new CompilerException('Cannot increment: '.$symbolVariable->getType(), $statement);
+                throw new CompilerException('Cannot increment: ' . $symbolVariable->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/ObjectDynamicProperty.php b/src/Statements/Let/ObjectDynamicProperty.php
index 20de5311ad..16b97db57a 100644
--- a/src/Statements/Let/ObjectDynamicProperty.php
+++ b/src/Statements/Let/ObjectDynamicProperty.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements\Let;
 
+use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -33,35 +34,63 @@ class ObjectDynamicProperty
      * @param array              $statement
      *
      * @throws CompilerException
-     * @throws \Exception
+     * @throws Exception
      */
-    public function assign(string $variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
-    {
+    public function assign(
+        string $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException("Variable type '".$symbolVariable->getType()."' cannot be used as object", $statement);
+            throw new CompilerException(
+                "Variable type '" . $symbolVariable->getType() . "' cannot be used as object",
+                $statement
+            );
         }
 
         $propertyName = $statement['property'];
 
-        $propertyVariable = $compilationContext->symbolTable->getVariableForRead($propertyName, $compilationContext, $statement);
+        $propertyVariable = $compilationContext->symbolTable->getVariableForRead(
+            $propertyName,
+            $compilationContext,
+            $statement
+        );
         if ($propertyVariable->isNotVariableAndMixedAndString()) {
-            throw new CompilerException("Cannot use variable type '".$propertyVariable->getType()."' to update object property", $statement);
+            throw new CompilerException(
+                "Cannot use variable type '" . $propertyVariable->getType() . "' to update object property",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate static property '".$compilationContext->classDefinition->getCompleteName().'::'.$propertyName."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate static property '" . $compilationContext->classDefinition->getCompleteName(
+                ) . '::' . $propertyName . "' because it is not initialized",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Cannot use variable type: '.$symbolVariable->getType().' as an object', $statement);
+            throw new CompilerException(
+                'Cannot use variable type: ' . $symbolVariable->getType() . ' as an object',
+                $statement
+            );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
+            throw new CompilerException(
+                'Cannot use non-initialized variable as an object',
+                $statement
+            );
         }
 
         /**
@@ -81,20 +110,45 @@ public function assign(string $variable, ZephirVariable $symbolVariable, Compile
 
         switch ($resolvedExpr->getType()) {
             case 'null':
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, 'null', $compilationContext);
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyVariableName,
+                    'null',
+                    $compilationContext
+                );
                 break;
 
             case 'int':
             case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
                 $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $tempVariable, $compilationContext);
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyVariableName,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+                $compilationContext->backend->assignString(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyVariableName,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'bool':
@@ -103,25 +157,51 @@ public function assign(string $variable, ZephirVariable $symbolVariable, Compile
                 } elseif ('0' == $resolvedExpr->getBooleanCode()) {
                     $value = 'false';
                 } else {
-                    throw new \Exception('?');
+                    throw new Exception('?');
                 }
 
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $value, $compilationContext);
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyVariableName,
+                    $value,
+                    $compilationContext
+                );
                 break;
 
             case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $codePrinter->output('array_init('.$tempVariable->getName().');');
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+                $codePrinter->output('array_init(' . $tempVariable->getName() . ');');
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyVariableName,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'array':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $variableVariable, $compilationContext);
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyVariableName,
+                    $variableVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
                 switch ($variableVariable->getType()) {
                     case 'int':
                     case 'uint':
@@ -129,34 +209,55 @@ public function assign(string $variable, ZephirVariable $symbolVariable, Compile
                     case 'ulong':
                     case 'char':
                     case 'uchar':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
                         $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $tempVariable, $compilationContext);
+                        $compilationContext->backend->updateProperty(
+                            $symbolVariable,
+                            $propertyVariableName,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
                         $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateProperty($symbolVariable, $propertyVariableName, $tempVariable, $compilationContext);
+                        $compilationContext->backend->updateProperty(
+                            $symbolVariable,
+                            $propertyVariableName,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'string':
                     case 'variable':
                     case 'array':
                     case 'mixed':
-                        $compilationContext->backend->updateProperty($symbolVariable, $propertyVariable, $resolvedExpr, $compilationContext);
+                        $compilationContext->backend->updateProperty(
+                            $symbolVariable,
+                            $propertyVariable,
+                            $resolvedExpr,
+                            $compilationContext
+                        );
                         if ($symbolVariable->isTemporal()) {
                             $symbolVariable->setIdle(true);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type '.$variableVariable->getType(), $statement);
+                        throw new CompilerException('Unknown type ' . $variableVariable->getType(), $statement);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type '.$resolvedExpr->getType(), $statement);
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/ObjectDynamicStringProperty.php b/src/Statements/Let/ObjectDynamicStringProperty.php
index 1d45a06f79..c77024a1b2 100644
--- a/src/Statements/Let/ObjectDynamicStringProperty.php
+++ b/src/Statements/Let/ObjectDynamicStringProperty.php
@@ -13,11 +13,15 @@
 
 namespace Zephir\Statements\Let;
 
+use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function gettype;
+use function is_string;
+
 /**
  * Updates object properties dynamically
  */
@@ -33,30 +37,51 @@ class ObjectDynamicStringProperty
      * @param array              $statement
      *
      * @throws CompilerException
-     * @throws \Exception
+     * @throws Exception
      */
-    public function assign(string $variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
-    {
+    public function assign(
+        string $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if ('variable' !== $symbolVariable->getType()) {
-            throw new CompilerException("Variable type '".$symbolVariable->getType()."' cannot be used as object", $statement);
+            throw new CompilerException(
+                "Variable type '" . $symbolVariable->getType() . "' cannot be used as object",
+                $statement
+            );
         }
 
         $propertyName = $statement['property'];
 
-        if (!\is_string($propertyName)) {
-            throw new CompilerException('Expected string to update object property, '.\gettype($propertyName).' received', $statement);
+        if (!is_string($propertyName)) {
+            throw new CompilerException(
+                'Expected string to update object property, ' . gettype($propertyName) . ' received',
+                $statement
+            );
         }
 
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate static property '".$compilationContext->classDefinition->getCompleteName().'::'.$propertyName."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate static property '" . $compilationContext->classDefinition->getCompleteName(
+                ) . '::' . $propertyName . "' because it is not initialized",
+                $statement
+            );
         }
 
         if ('variable' != $symbolVariable->getType()) {
-            throw new CompilerException('Cannot use variable type: '.$symbolVariable->getType().' as an object', $statement);
+            throw new CompilerException(
+                'Cannot use variable type: ' . $symbolVariable->getType() . ' as an object',
+                $statement
+            );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
@@ -77,20 +102,45 @@ public function assign(string $variable, ZephirVariable $symbolVariable, Compile
 
         switch ($resolvedExpr->getType()) {
             case 'null':
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyName, 'null', $compilationContext);
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyName,
+                    'null',
+                    $compilationContext
+                );
                 break;
 
             case 'int':
             case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
                 $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $compilationContext);
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyName,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+                $compilationContext->backend->assignString(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyName,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'bool':
@@ -99,24 +149,50 @@ public function assign(string $variable, ZephirVariable $symbolVariable, Compile
                 } elseif ('0' == $resolvedExpr->getBooleanCode()) {
                     $value = 'false';
                 } else {
-                    throw new \Exception('?');
+                    throw new Exception('?');
                 }
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $value, $compilationContext);
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyName,
+                    $value,
+                    $compilationContext
+                );
                 break;
 
             case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
                 $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $compilationContext);
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyName,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'array':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
-                $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $variableVariable, $compilationContext);
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
+                $compilationContext->backend->updateProperty(
+                    $symbolVariable,
+                    $propertyName,
+                    $variableVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
                 switch ($variableVariable->getType()) {
                     case 'int':
                     case 'uint':
@@ -124,33 +200,54 @@ public function assign(string $variable, ZephirVariable $symbolVariable, Compile
                     case 'ulong':
                     case 'char':
                     case 'uchar':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
                         $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $compilationContext);
+                        $compilationContext->backend->updateProperty(
+                            $symbolVariable,
+                            $propertyName,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
                         $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $compilationContext);
+                        $compilationContext->backend->updateProperty(
+                            $symbolVariable,
+                            $propertyName,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'string':
                     case 'variable':
                     case 'array':
-                        $compilationContext->backend->updateProperty($symbolVariable, $propertyName, $resolvedExpr, $compilationContext);
+                        $compilationContext->backend->updateProperty(
+                            $symbolVariable,
+                            $propertyName,
+                            $resolvedExpr,
+                            $compilationContext
+                        );
                         if ($symbolVariable->isTemporal()) {
                             $symbolVariable->setIdle(true);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type '.$variableVariable->getType(), $statement);
+                        throw new CompilerException('Unknown type ' . $variableVariable->getType(), $statement);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type '.$resolvedExpr->getType(), $statement);
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/ObjectProperty.php b/src/Statements/Let/ObjectProperty.php
index c88d8ea05a..309b1e393a 100644
--- a/src/Statements/Let/ObjectProperty.php
+++ b/src/Statements/Let/ObjectProperty.php
@@ -26,11 +26,11 @@ class ObjectProperty
     /**
      * Compiles foo->x = {expr}.
      *
-     * @param string         $variable
+     * @param string $variable
      * @param ZephirVariable $symbolVariable
-     * @param Expression     $expression
-     * @param Context        $context
-     * @param array          $statement
+     * @param Expression $expression
+     * @param Context $context
+     * @param array $statement
      *
      * @return void
      *
@@ -58,7 +58,7 @@ public function assign(
         }
 
         $propertyName = $statement['property'];
-        $className = $context->classDefinition->getCompleteName();
+        $className    = $context->classDefinition->getCompleteName();
 
         if (!$symbolVariable->isInitialized()) {
             throw new Exception(
@@ -79,7 +79,10 @@ public function assign(
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new Exception('Cannot use non-initialized variable as an object', $statement);
+            throw new Exception(
+                'Cannot use non-initialized variable as an object',
+                $statement
+            );
         }
 
         /*
@@ -135,8 +138,18 @@ public function assign(
 
                         $resolvedVariable = $context->symbolTable->getTempVariableForWrite('variable', $context);
                         $context->backend->assignLong($resolvedVariable, $expression->getBooleanCode(), $context);
-                        $context->backend->fetchProperty($tempVariable, $symbolVariable, $propertyName, false, $context);
-                        $codePrinter->output($functionName.'('.$context->backend->getVariableCode($tempVariable).', '.$context->backend->getVariableCode($resolvedVariable).')');
+                        $context->backend->fetchProperty(
+                            $tempVariable,
+                            $symbolVariable,
+                            $propertyName,
+                            false,
+                            $context
+                        );
+                        $codePrinter->output(
+                            $functionName . '(' . $context->backend->getVariableCode(
+                                $tempVariable
+                            ) . ', ' . $context->backend->getVariableCode($resolvedVariable) . ')'
+                        );
                         break;
 
                     case 'assign':
@@ -145,7 +158,13 @@ public function assign(
                         break;
 
                     default:
-                        throw new Exception("Operator '".$statement['operator']."' is not supported for object property: ".$tempVariable->getType(), $statement);
+                        throw new Exception(
+                            "Operator '"
+                            . $statement['operator']
+                            . "' is not supported for object property: "
+                            . $tempVariable->getType(),
+                            $statement
+                        );
                 }
 
                 $context->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $context);
@@ -157,11 +176,21 @@ public function assign(
                 switch ($statement['operator']) {
                     case 'assign':
                         $tempVariable->initNonReferenced($context);
-                        $context->backend->assignLong($tempVariable, '\''.$expression->getBooleanCode().'\'', $context);
+                        $context->backend->assignLong(
+                            $tempVariable,
+                            '\'' . $expression->getBooleanCode() . '\'',
+                            $context
+                        );
                         break;
 
                     default:
-                        throw new Exception("Operator '".$statement['operator']."' is not supported for object property: ".$tempVariable->getType(), $statement);
+                        throw new Exception(
+                            "Operator '"
+                            . $statement['operator']
+                            . "' is not supported for object property: "
+                            . $tempVariable->getType(),
+                            $statement
+                        );
                 }
 
                 $context->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $context);
@@ -188,8 +217,18 @@ public function assign(
 
                         $resolvedVariable = $context->symbolTable->getTempVariableForWrite('variable', $context);
                         $context->backend->assignDouble($resolvedVariable, $expression->getBooleanCode(), $context);
-                        $context->backend->fetchProperty($tempVariable, $symbolVariable, $propertyName, false, $context);
-                        $codePrinter->output($functionName.'('.$context->backend->getVariableCode($tempVariable).', '.$context->backend->getVariableCode($resolvedVariable).')');
+                        $context->backend->fetchProperty(
+                            $tempVariable,
+                            $symbolVariable,
+                            $propertyName,
+                            false,
+                            $context
+                        );
+                        $codePrinter->output(
+                            $functionName . '(' . $context->backend->getVariableCode(
+                                $tempVariable
+                            ) . ', ' . $context->backend->getVariableCode($resolvedVariable) . ')'
+                        );
                         break;
 
                     case 'assign':
@@ -198,7 +237,13 @@ public function assign(
                         break;
 
                     default:
-                        throw new Exception("Operator '".$statement['operator']."' is not supported for object property: ".$tempVariable->getType(), $statement);
+                        throw new Exception(
+                            "Operator '"
+                            . $statement['operator']
+                            . "' is not supported for object property: "
+                            . $tempVariable->getType(),
+                            $statement
+                        );
                 }
 
                 $context->backend->updateProperty($symbolVariable, $propertyName, $tempVariable, $context);
@@ -210,7 +255,15 @@ public function assign(
 
                 switch ($statement['operator']) {
                     case 'concat-assign':
-                        $codePrinter->output('zephir_concat_self_str(&'.$tempVariable->getName().', "'.$expression->getCode().'", sizeof("'.$expression->getCode().'") - 1);');
+                        $codePrinter->output(
+                            'zephir_concat_self_str(&'
+                            . $tempVariable->getName()
+                            . ', "'
+                            . $expression->getCode()
+                            . '", sizeof("'
+                            . $expression->getCode()
+                            . '") - 1);'
+                        );
                         break;
                     case 'assign':
                         /* We only can use nonReferenced variables for not refcounted stuff in ZE3 */
@@ -228,7 +281,7 @@ public function assign(
                 break;
 
             case 'bool':
-                $codePrinter->output('if ('.$expression->getBooleanCode().') {');
+                $codePrinter->output('if (' . $expression->getBooleanCode() . ') {');
                 $codePrinter->increaseLevel();
                 $context->backend->updateProperty($symbolVariable, $propertyName, 'true', $context);
                 $codePrinter->decreaseLevel();
@@ -239,7 +292,7 @@ public function assign(
                 $codePrinter->output('}');
                 break;
 
-                /* unreachable code */
+            /* unreachable code */
             case 'empty-array':
                 $tempVariable = $context->symbolTable->getTempNonTrackedVariable('variable', $context);
 
@@ -249,7 +302,11 @@ public function assign(
                 break;
 
             case 'variable':
-                $variableVariable = $context->symbolTable->getVariableForRead($expression->getCode(), $context, $statement);
+                $variableVariable = $context->symbolTable->getVariableForRead(
+                    $expression->getCode(),
+                    $context,
+                    $statement
+                );
                 switch ($variableVariable->getType()) {
                     case 'int':
                     case 'uint':
@@ -271,7 +328,7 @@ public function assign(
                         break;
 
                     case 'bool':
-                        $codePrinter->output('if ('.$variableVariable->getName().') {');
+                        $codePrinter->output('if (' . $variableVariable->getName() . ') {');
                         $codePrinter->increaseLevel();
                         $context->backend->updateProperty($symbolVariable, $propertyName, 'true', $context);
                         $codePrinter->decreaseLevel();
@@ -293,7 +350,7 @@ public function assign(
                         break;
 
                     default:
-                        throw new Exception('Unknown type '.$variableVariable->getType(), $statement);
+                        throw new Exception('Unknown type ' . $variableVariable->getType(), $statement);
                 }
                 break;
 
diff --git a/src/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
index 3e17ee39f5..16e31164b5 100644
--- a/src/Statements/Let/ObjectPropertyAppend.php
+++ b/src/Statements/Let/ObjectPropertyAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -36,14 +36,25 @@ class ObjectPropertyAppend
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Attempt to use variable type: '.$symbolVariable->getType().' as object', $statement);
+            throw new CompilerException(
+                'Attempt to use variable type: ' . $symbolVariable->getType() . ' as object',
+                $statement
+            );
         }
 
         $codePrinter = $compilationContext->codePrinter;
@@ -58,7 +69,11 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
             if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+                throw new CompilerException(
+                    "Class '" . $classDefinition->getCompleteName(
+                    ) . "' does not have a property called: '" . $property . "'",
+                    $statement
+                );
             }
         } else {
             /*
@@ -67,16 +82,22 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
              */
             if ($symbolVariable->hasAnyDynamicType('object')) {
                 $classType = current($symbolVariable->getClassTypes());
-                $compiler = $compilationContext->compiler;
+                $compiler  = $compilationContext->compiler;
 
                 if ($compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
-                        throw new CompilerException('Cannot locate class definition for class: '.$classType, $statement);
+                        throw new CompilerException(
+                            'Cannot locate class definition for class: ' . $classType,
+                            $statement
+                        );
                     }
 
                     if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException("Class '".$classType."' does not have a property called: '".$property."'", $statement);
+                        throw new CompilerException(
+                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
+                            $statement
+                        );
                     }
                 }
             }
@@ -84,25 +105,57 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
 
         switch ($resolvedExpr->getType()) {
             case 'null':
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, 'null', $compilationContext);
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    'null',
+                    $compilationContext
+                );
                 break;
 
             case 'bool':
-                $codePrinter->output('if ('.$resolvedExpr->getBooleanCode().') {');
+                $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
                 $codePrinter->increaseLevel();
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, 'true', $compilationContext);
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    'true',
+                    $compilationContext
+                );
                 $codePrinter->decreaseLevel();
                 $codePrinter->output('} else {');
                 $codePrinter->increaseLevel();
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, 'false', $compilationContext);
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    'false',
+                    $compilationContext
+                );
                 $codePrinter->decreaseLevel();
                 $codePrinter->output('}');
                 break;
 
             case 'char':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignLong($tempVariable, '\''.$resolvedExpr->getCode().'\'', $compilationContext);
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    '\'' . $resolvedExpr->getCode() . '\'',
+                    $compilationContext
+                );
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
@@ -111,66 +164,148 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             case 'int':
             case 'long':
             case 'uint':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $tempVariable, $compilationContext);
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'double':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignDouble($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignDouble(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $tempVariable->initVariant($compilationContext);
-                $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $tempVariable, $compilationContext);
+                $compilationContext->backend->assignString(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'array':
-                $variableExpr = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
-                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $variableExpr, $compilationContext);
+                $variableExpr = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
+                $compilationContext->backend->assignArrayProperty(
+                    $symbolVariable,
+                    $property,
+                    null,
+                    $variableExpr,
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
-                $variableExpr = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
+                $variableExpr = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
                 switch ($variableExpr->getType()) {
                     case 'int':
                     case 'long':
                     case 'uint':
                     case 'char':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
                         $compilationContext->backend->assignLong($tempVariable, $variableExpr, $compilationContext);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $tempVariable, $compilationContext);
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            null,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
                         }
                         break;
 
                     case 'double':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
                         $compilationContext->backend->assignDouble($tempVariable, $variableExpr, $compilationContext);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $tempVariable, $compilationContext);
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            null,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
                         }
                         break;
 
                     case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
                         $compilationContext->backend->assignBool($tempVariable, $variableExpr, $compilationContext);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $tempVariable, $compilationContext);
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            null,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
                         }
@@ -182,19 +317,31 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
                     case 'array':
                     case 'resource':
                     case 'object':
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, null, $variableExpr, $compilationContext);
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            null,
+                            $variableExpr,
+                            $compilationContext
+                        );
                         if ($variableExpr->isTemporal()) {
                             $variableExpr->setIdle(true);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Variable: '.$variableExpr->getType().' cannot be appended to array property', $statement);
+                        throw new CompilerException(
+                            'Variable: ' . $variableExpr->getType() . ' cannot be appended to array property',
+                            $statement
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException('Expression: '.$resolvedExpr->getType().' cannot be appended to array property', $statement);
+                throw new CompilerException(
+                    'Expression: ' . $resolvedExpr->getType() . ' cannot be appended to array property',
+                    $statement
+                );
         }
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index 555abbdd7d..46dfa1a859 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -19,6 +19,8 @@
 use Zephir\Expression;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function count;
+
 /**
  * ObjectPropertyArrayIndex.
  *
@@ -32,28 +34,122 @@ class ObjectPropertyArrayIndex extends ArrayIndex
      * @param string             $variable
      * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is not initialized",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Attempt to use variable type: '.$symbolVariable->getType().' as object', $statement);
+            throw new CompilerException(
+                'Attempt to use variable type: '
+                . $symbolVariable->getType()
+                . ' as object',
+                $statement
+            );
         }
 
         /*
          * Update the property according to the number of array-offsets
          */
-        if (1 == \count($statement['index-expr'])) {
-            $this->_assignPropertyArraySingleIndex($variable, $symbolVariable, $resolvedExpr, $compilationContext, $statement);
+        if (1 == count($statement['index-expr'])) {
+            $this->_assignPropertyArraySingleIndex(
+                $variable,
+                $symbolVariable,
+                $resolvedExpr,
+                $compilationContext,
+                $statement
+            );
         } else {
-            $this->_assignPropertyArrayMultipleIndex($variable, $symbolVariable, $resolvedExpr, $compilationContext, $statement);
+            $this->_assignPropertyArrayMultipleIndex(
+                $variable,
+                $symbolVariable,
+                $resolvedExpr,
+                $compilationContext,
+                $statement
+            );
+        }
+    }
+
+    /**
+     * Compiles x->y[a][b] = {expr} (multiple offset assignment).
+     *
+     * @param string             $variable
+     * @param ZephirVariable     $symbolVariable
+     * @param CompiledExpression $resolvedExpr
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     *
+     * @throws CompilerException
+     */
+    protected function _assignPropertyArrayMultipleIndex(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
+        $property = $statement['property'];
+        $compilationContext->headersManager->add('kernel/object');
+
+        /**
+         * Create a temporal zval (if needed).
+         */
+        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
+
+        /**
+         * Only string/variable/int.
+         */
+        $offsetExprs = [];
+        foreach ($statement['index-expr'] as $indexExpr) {
+            $indexExpression = new Expression($indexExpr);
+
+            $resolvedIndex = $indexExpression->compile($compilationContext);
+            switch ($resolvedIndex->getType()) {
+                case 'string':
+                case 'int':
+                case 'uint':
+                case 'ulong':
+                case 'long':
+                case 'variable':
+                    break;
+                default:
+                    throw new CompilerException(
+                        'Expression: '
+                        . $resolvedIndex->getType()
+                        . ' cannot be used as index without cast',
+                        $statement['index-expr']
+                    );
+            }
+
+            $offsetExprs[] = $resolvedIndex;
+        }
+
+        $compilationContext->backend->assignPropertyArrayMulti(
+            $symbolVariable,
+            $variableExpr,
+            $property,
+            $offsetExprs,
+            $compilationContext
+        );
+
+        if ($variableExpr->isTemporal()) {
+            $variableExpr->setIdle(true);
         }
     }
 
@@ -68,8 +164,13 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
      *
      * @throws CompilerException
      */
-    protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
-    {
+    protected function _assignPropertyArraySingleIndex(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
 
@@ -77,7 +178,7 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
          * Only string/variable/int.
          */
         $indexExpression = new Expression($statement['index-expr'][0]);
-        $resolvedIndex = $indexExpression->compile($compilationContext);
+        $resolvedIndex   = $indexExpression->compile($compilationContext);
 
         switch ($resolvedIndex->getType()) {
             case 'string':
@@ -88,11 +189,20 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
             case 'variable':
                 break;
             default:
-                throw new CompilerException('Expression: '.$resolvedIndex->getType().' cannot be used as index without cast', $statement);
+                throw new CompilerException(
+                    'Expression: '
+                    . $resolvedIndex->getType()
+                    . ' cannot be used as index without cast',
+                    $statement
+                );
         }
 
         if ('variable' == $resolvedIndex->getType()) {
-            $indexVariable = $compilationContext->symbolTable->getVariableForRead($resolvedIndex->getCode(), $compilationContext, $statement);
+            $indexVariable = $compilationContext->symbolTable->getVariableForRead(
+                $resolvedIndex->getCode(),
+                $compilationContext,
+                $statement
+            );
             switch ($indexVariable->getType()) {
                 case 'string':
                 case 'int':
@@ -103,7 +213,12 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
                 case 'mixed':
                     break;
                 default:
-                    throw new CompilerException('Variable: '.$indexVariable->getType().' cannot be used as index without cast', $statement);
+                    throw new CompilerException(
+                        'Variable: '
+                        . $indexVariable->getType()
+                        . ' cannot be used as index without cast',
+                        $statement
+                    );
             }
 
             if ('variable' == $indexVariable->getType()) {
@@ -120,22 +235,46 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
             case 'int':
             case 'uint':
             case 'long':
-                $indexVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                $compilationContext->backend->assignLong($indexVariable, $resolvedIndex->getCode(), $compilationContext);
+                $indexVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $statement
+                );
+                $compilationContext->backend->assignLong(
+                    $indexVariable,
+                    $resolvedIndex->getCode(),
+                    $compilationContext
+                );
                 break;
 
             case 'string':
-                $indexVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                $compilationContext->backend->assignString($indexVariable, $resolvedIndex->getCode(), $compilationContext);
+                $indexVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $statement
+                );
+                $compilationContext->backend->assignString(
+                    $indexVariable,
+                    $resolvedIndex->getCode(),
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
-                $variableIndex = $compilationContext->symbolTable->getVariableForRead($resolvedIndex->getCode(), $compilationContext, $statement['index-expr']);
+                $variableIndex = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedIndex->getCode(),
+                    $compilationContext,
+                    $statement['index-expr']
+                );
                 switch ($variableIndex->getType()) {
                     case 'int':
                     case 'uint':
                     case 'long':
-                        $indexVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
+                        $indexVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $statement
+                        );
                         $compilationContext->backend->assignLong($indexVariable, $variableIndex, $compilationContext);
                         break;
                 }
@@ -148,7 +287,14 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
             if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+                throw new CompilerException(
+                    "Class '"
+                    . $classDefinition->getCompleteName()
+                    . "' does not have a property called: '"
+                    . $property
+                    . "'",
+                    $statement
+                );
             }
         } else {
             /**
@@ -157,16 +303,22 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
              */
             if ($symbolVariable->hasAnyDynamicType('object')) {
                 $classType = current($symbolVariable->getClassTypes());
-                $compiler = $compilationContext->compiler;
+                $compiler  = $compilationContext->compiler;
 
                 if ($classType !== false && $compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
-                        throw new CompilerException('Cannot locate class definition for class: '.$classType, $statement);
+                        throw new CompilerException(
+                            'Cannot locate class definition for class: ' . $classType,
+                            $statement
+                        );
                     }
 
                     if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException("Class '".$classType."' does not have a property called: '".$property."'", $statement);
+                        throw new CompilerException(
+                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
+                            $statement
+                        );
                     }
                 }
             }
@@ -178,142 +330,229 @@ protected function _assignPropertyArraySingleIndex($variable, ZephirVariable $sy
             case 'string':
                 switch ($resolvedExpr->getType()) {
                     case 'null':
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, 'null', $compilationContext);
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            $indexVariable,
+                            'null',
+                            $compilationContext
+                        );
                         break;
 
                     case 'bool':
                         $booleanCode = $resolvedExpr->getBooleanCode();
                         if ('1' == $booleanCode) {
-                            $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, 'true', $compilationContext);
+                            $compilationContext->backend->assignArrayProperty(
+                                $symbolVariable,
+                                $property,
+                                $indexVariable,
+                                'true',
+                                $compilationContext
+                            );
                         } elseif ('0' == $booleanCode) {
-                            $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, 'false', $compilationContext);
+                            $compilationContext->backend->assignArrayProperty(
+                                $symbolVariable,
+                                $property,
+                                $indexVariable,
+                                'false',
+                                $compilationContext
+                            );
                         } else {
-                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                'variable',
+                                $compilationContext
+                            );
                             $compilationContext->backend->assignBool($tempVariable, $booleanCode, $compilationContext);
-                            $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $tempVariable, $compilationContext);
+                            $compilationContext->backend->assignArrayProperty(
+                                $symbolVariable,
+                                $property,
+                                $indexVariable,
+                                $tempVariable,
+                                $compilationContext
+                            );
                         }
                         break;
 
                     case 'int':
                     case 'long':
                     case 'uint':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $tempVariable, $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignLong(
+                            $tempVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            $indexVariable,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'char':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignLong($tempVariable, '\''.$resolvedExpr->getCode().'\'', $compilationContext);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $tempVariable, $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignLong(
+                            $tempVariable,
+                            '\'' . $resolvedExpr->getCode() . '\'',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            $indexVariable,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'double':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignDouble($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $tempVariable, $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignDouble(
+                            $tempVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            $indexVariable,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'string':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $tempVariable, $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignString(
+                            $tempVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            $indexVariable,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         break;
 
                     case 'array':
-                        $variableExpr = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement['index-expr']);
-                        $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $variableExpr, $compilationContext);
+                        $variableExpr = $compilationContext->symbolTable->getVariableForRead(
+                            $resolvedExpr->getCode(),
+                            $compilationContext,
+                            $statement['index-expr']
+                        );
+                        $compilationContext->backend->assignArrayProperty(
+                            $symbolVariable,
+                            $property,
+                            $indexVariable,
+                            $variableExpr,
+                            $compilationContext
+                        );
                         break;
 
                     case 'variable':
-                        $variableExpr = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement['index-expr']);
+                        $variableExpr = $compilationContext->symbolTable->getVariableForRead(
+                            $resolvedExpr->getCode(),
+                            $compilationContext,
+                            $statement['index-expr']
+                        );
                         switch ($variableExpr->getType()) {
                             case 'bool':
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                                $compilationContext->backend->assignBool($tempVariable, $variableExpr, $compilationContext);
-                                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $tempVariable, $compilationContext);
+                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                    'variable',
+                                    $compilationContext
+                                );
+                                $compilationContext->backend->assignBool(
+                                    $tempVariable,
+                                    $variableExpr,
+                                    $compilationContext
+                                );
+                                $compilationContext->backend->assignArrayProperty(
+                                    $symbolVariable,
+                                    $property,
+                                    $indexVariable,
+                                    $tempVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             case 'int':
                             case 'long':
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                                $compilationContext->backend->assignLong($tempVariable, $variableExpr, $compilationContext);
-                                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $tempVariable, $compilationContext);
+                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                    'variable',
+                                    $compilationContext
+                                );
+                                $compilationContext->backend->assignLong(
+                                    $tempVariable,
+                                    $variableExpr,
+                                    $compilationContext
+                                );
+                                $compilationContext->backend->assignArrayProperty(
+                                    $symbolVariable,
+                                    $property,
+                                    $indexVariable,
+                                    $tempVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             case 'variable':
                             case 'mixed':
                             case 'string':
                             case 'array':
-                                $compilationContext->backend->assignArrayProperty($symbolVariable, $property, $indexVariable, $variableExpr, $compilationContext);
+                                $compilationContext->backend->assignArrayProperty(
+                                    $symbolVariable,
+                                    $property,
+                                    $indexVariable,
+                                    $variableExpr,
+                                    $compilationContext
+                                );
                                 if ($variableExpr->isTemporal()) {
                                     $variableExpr->setIdle(true);
                                 }
                                 break;
 
                             default:
-                                throw new CompilerException('Cannot update variable type: '.$variableExpr->getType(), $statement);
+                                throw new CompilerException(
+                                    'Cannot update variable type: ' . $variableExpr->getType(),
+                                    $statement
+                                );
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Variable index: '.$indexVariable->getType().' cannot be updated into array property', $statement);
+                        throw new CompilerException(
+                            'Variable index: '
+                            . $indexVariable->getType()
+                            . ' cannot be updated into array property',
+                            $statement
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException('Index: '.$resolvedIndex->getType().' cannot be updated into array property', $statement);
-        }
-    }
-
-    /**
-     * Compiles x->y[a][b] = {expr} (multiple offset assignment).
-     *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws CompilerException
-     */
-    protected function _assignPropertyArrayMultipleIndex($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
-    {
-        $property = $statement['property'];
-        $compilationContext->headersManager->add('kernel/object');
-
-        /**
-         * Create a temporal zval (if needed).
-         */
-        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
-
-        /**
-         * Only string/variable/int.
-         */
-        $offsetExprs = [];
-        foreach ($statement['index-expr'] as $indexExpr) {
-            $indexExpression = new Expression($indexExpr);
-
-            $resolvedIndex = $indexExpression->compile($compilationContext);
-            switch ($resolvedIndex->getType()) {
-                case 'string':
-                case 'int':
-                case 'uint':
-                case 'ulong':
-                case 'long':
-                case 'variable':
-                    break;
-                default:
-                    throw new CompilerException('Expression: '.$resolvedIndex->getType().' cannot be used as index without cast', $statement['index-expr']);
-            }
-
-            $offsetExprs[] = $resolvedIndex;
-        }
-
-        $compilationContext->backend->assignPropertyArrayMulti($symbolVariable, $variableExpr, $property, $offsetExprs, $compilationContext);
-
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
+                throw new CompilerException(
+                    'Index: '
+                    . $resolvedIndex->getType()
+                    . ' cannot be updated into array property',
+                    $statement
+                );
         }
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
index af559bf02c..63363e8b61 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -20,6 +21,8 @@
 use Zephir\Expression;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function count;
+
 /**
  * Updates object properties dynamically
  */
@@ -31,17 +34,28 @@ class ObjectPropertyArrayIndexAppend extends ArrayIndex
      * @param string             $variable
      * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException('Attempt to use variable type: '.$symbolVariable->getType().' as object', $statement);
+            throw new CompilerException(
+                'Attempt to use variable type: ' . $symbolVariable->getType() . ' as object',
+                $statement
+            );
         }
 
         $this->_assignPropertyArrayMultipleIndex($symbolVariable, $resolvedExpr, $compilationContext, $statement);
@@ -55,11 +69,15 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
      * @param CompilationContext $compilationContext
      * @param array              $statement
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
-    protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, array $statement): void
-    {
+    protected function _assignPropertyArrayMultipleIndex(
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
 
@@ -68,7 +86,7 @@ protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVaria
          */
         $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
 
-        if (\count($statement['index-expr']) > 16) {
+        if (count($statement['index-expr']) > 16) {
             throw new CompilerException('Too many array indexes', $statement);
         }
 
@@ -89,7 +107,12 @@ protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVaria
                 case 'variable':
                     break;
                 default:
-                    throw new CompilerException('Expression: '.$resolvedIndex->getType().' cannot be used as index without cast', $statement);
+                    throw new CompilerException(
+                        'Expression: '
+                        . $resolvedIndex->getType()
+                        . ' cannot be used as index without cast',
+                        $statement
+                    );
             }
 
             $offsetExprs[] = $resolvedIndex;
@@ -101,7 +124,11 @@ protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVaria
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
             if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+                throw new CompilerException(
+                    "Class '" . $classDefinition->getCompleteName(
+                    ) . "' does not have a property called: '" . $property . "'",
+                    $statement
+                );
             }
         } else {
             /**
@@ -110,22 +137,38 @@ protected function _assignPropertyArrayMultipleIndex(ZephirVariable $symbolVaria
              */
             if ($symbolVariable->hasAnyDynamicType('object')) {
                 $classType = current($symbolVariable->getClassTypes());
-                $compiler = $compilationContext->compiler;
+                $compiler  = $compilationContext->compiler;
 
                 if ($compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
-                        throw new CompilerException('Cannot locate class definition for class: '.$classType, $statement);
+                        throw new CompilerException(
+                            'Cannot locate class definition for class: ' . $classType,
+                            $statement
+                        );
                     }
 
                     if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException("Class '".$classType."' does not have a property called: '".$property."'", $statement);
+                        throw new CompilerException(
+                            "Class '"
+                            . $classType
+                            . "' does not have a property called: '"
+                            . $property
+                            . "'",
+                            $statement
+                        );
                     }
                 }
             }
         }
 
         $offsetExprs[] = 'a';
-        $compilationContext->backend->assignPropertyArrayMulti($symbolVariable, $variableExpr, $property, $offsetExprs, $compilationContext);
+        $compilationContext->backend->assignPropertyArrayMulti(
+            $symbolVariable,
+            $variableExpr,
+            $property,
+            $offsetExprs,
+            $compilationContext
+        );
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index d34d812135..51286b2b66 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -33,32 +33,52 @@ class ObjectPropertyDecr
      * @param array              $statement
      * @param mixed              $property
      */
-    public function assign($variable, $property, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        $property,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         /*
          * Arrays must be stored in the HEAP
          */
         if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is local only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         /*
          * Only dynamic variables can be used as arrays
          */
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException("Cannot use variable type: '".$symbolVariable->getType()."' as array", $statement);
+            throw new CompilerException(
+                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+                $statement
+            );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
+            throw new CompilerException(
+                'Cannot use non-initialized variable as an object',
+                $statement
+            );
         }
 
         /*
@@ -77,7 +97,11 @@ public function assign($variable, $property, ZephirVariable $symbolVariable, Com
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
             if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+                throw new CompilerException(
+                    "Class '" . $classDefinition->getCompleteName(
+                    ) . "' does not have a property called: '" . $property . "'",
+                    $statement
+                );
             }
         } else {
             /*
@@ -86,22 +110,30 @@ public function assign($variable, $property, ZephirVariable $symbolVariable, Com
              */
             if ($symbolVariable->hasAnyDynamicType('object')) {
                 $classType = current($symbolVariable->getClassTypes());
-                $compiler = $compilationContext->compiler;
+                $compiler  = $compilationContext->compiler;
 
                 if ($compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
-                        throw new CompilerException('Cannot locate class definition for class: '.$classType, $statement);
+                        throw new CompilerException(
+                            'Cannot locate class definition for class: ' . $classType,
+                            $statement
+                        );
                     }
 
                     if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException("Class '".$classType."' does not have a property called: '".$property."'", $statement);
+                        throw new CompilerException(
+                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
+                            $statement
+                        );
                     }
                 }
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
-        $compilationContext->codePrinter->output('RETURN_ON_FAILURE(zephir_property_decr('.$symbolVariable->getName().', SL("'.$property.'")));');
+        $compilationContext->codePrinter->output(
+            'RETURN_ON_FAILURE(zephir_property_decr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
+        );
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 0f560b55a5..7d46d90c79 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -33,28 +33,45 @@ class ObjectPropertyIncr
      * @param CompilationContext $compilationContext
      * @param array              $statement
      */
-    public function assign($variable, $property, ZephirVariable $symbolVariable, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        $property,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         /*
          * Arrays must be stored in the HEAP
          */
         if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is local only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
         }
 
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         /*
          * Only dynamic variables can be used as arrays
          */
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException("Cannot use variable type: '".$symbolVariable->getType()."' as array", $statement);
+            throw new CompilerException(
+                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+                $statement
+            );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
@@ -77,7 +94,11 @@ public function assign($variable, $property, ZephirVariable $symbolVariable, Com
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
             if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+                throw new CompilerException(
+                    "Class '" . $classDefinition->getCompleteName(
+                    ) . "' does not have a property called: '" . $property . "'",
+                    $statement
+                );
             }
         } else {
             /*
@@ -86,22 +107,30 @@ public function assign($variable, $property, ZephirVariable $symbolVariable, Com
              */
             if ($symbolVariable->hasAnyDynamicType('object')) {
                 $classType = current($symbolVariable->getClassTypes());
-                $compiler = $compilationContext->compiler;
+                $compiler  = $compilationContext->compiler;
 
                 if ($compiler->isClass($classType)) {
                     $classDefinition = $compiler->getClassDefinition($classType);
                     if (!$classDefinition) {
-                        throw new CompilerException('Cannot locate class definition for class: '.$classType, $statement);
+                        throw new CompilerException(
+                            'Cannot locate class definition for class: ' . $classType,
+                            $statement
+                        );
                     }
 
                     if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException("Class '".$classType."' does not have a property called: '".$property."'", $statement);
+                        throw new CompilerException(
+                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
+                            $statement
+                        );
                     }
                 }
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
-        $compilationContext->codePrinter->output('RETURN_ON_FAILURE(zephir_property_incr('.$symbolVariable->getName().', SL("'.$property.'")));');
+        $compilationContext->codePrinter->output(
+            'RETURN_ON_FAILURE(zephir_property_incr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
+        );
     }
 }
diff --git a/src/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
index 627a5f3cea..d4290fe49f 100644
--- a/src/Statements/Let/StaticProperty.php
+++ b/src/Statements/Let/StaticProperty.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements\Let;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
@@ -33,7 +34,7 @@ class StaticProperty
      * @param CompilationContext $compilationContext
      * @param array              $statement
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function assignStatic(
         string $className,
@@ -96,9 +97,22 @@ public function assignStatic(
             case 'int':
             case 'uint':
             case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getBooleanCode(), $compilationContext);
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    $resolvedExpr->getBooleanCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->updateStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
@@ -106,18 +120,44 @@ public function assignStatic(
 
             case 'char':
             case 'uchar':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignLong($tempVariable, '\''.$resolvedExpr->getCode().'\'', $compilationContext);
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    '\'' . $resolvedExpr->getCode() . '\'',
+                    $compilationContext
+                );
+                $compilationContext->backend->updateStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'double':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignDouble($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignDouble(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->updateStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
@@ -133,36 +173,69 @@ public function assignStatic(
                     );
                 }
 
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $tempVariable->initVariant($compilationContext);
 
                 if ($resolvedExpr->getCode()) {
-                    $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getCode(), $compilationContext);
+                    $compilationContext->backend->assignString(
+                        $tempVariable,
+                        $resolvedExpr->getCode(),
+                        $compilationContext
+                    );
                 } else {
-                    $codePrinter->output('ZVAL_EMPTY_STRING('.$tempVariable->getName().');');
+                    $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
                 }
 
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
 
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $compilationContext->backend->updateStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'bool':
                 if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->updateStaticProperty($classEntry, $property, 'true', $compilationContext);
+                    $compilationContext->backend->updateStaticProperty(
+                        $classEntry,
+                        $property,
+                        'true',
+                        $compilationContext
+                    );
                 } else {
                     if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->updateStaticProperty($classEntry, $property, 'false', $compilationContext);
+                        $compilationContext->backend->updateStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
                     } else {
-                        $codePrinter->output('if ('.$resolvedExpr->getBooleanCode().') {');
+                        $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->updateStaticProperty($classEntry, $property, 'true', $compilationContext);
+                        $compilationContext->backend->updateStaticProperty(
+                            $classEntry,
+                            $property,
+                            'true',
+                            $compilationContext
+                        );
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('} else {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->updateStaticProperty($classEntry, $property, 'false', $compilationContext);
+                        $compilationContext->backend->updateStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('}');
                     }
@@ -170,16 +243,30 @@ public function assignStatic(
                 break;
 
             case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $compilationContext->backend->updateStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'array':
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, $resolvedExpr, $compilationContext);
+                $compilationContext->backend->updateStaticProperty(
+                    $classEntry,
+                    $property,
+                    $resolvedExpr,
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
@@ -212,7 +299,12 @@ public function assignStatic(
                         );
 
                         $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->updateStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
 
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
@@ -235,8 +327,17 @@ public function assignStatic(
                             true
                         );
 
-                        $compilationContext->backend->assignDouble($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->assignDouble(
+                            $tempVariable,
+                            $variableVariable,
+                            $compilationContext
+                        );
+                        $compilationContext->backend->updateStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
 
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
@@ -244,9 +345,18 @@ public function assignStatic(
                         break;
 
                     case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
                         $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->updateStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
                         }
@@ -260,9 +370,9 @@ public function assignStatic(
                                     'variable',
                                     $compilationContext
                                 );
-                                $expression = new Expression([
-                                    'type' => 'static-property-access',
-                                    'left' => [
+                                $expression   = new Expression([
+                                    'type'  => 'static-property-access',
+                                    'left'  => [
                                         'value' => $statement['variable'],
                                     ],
                                     'right' => [
@@ -277,13 +387,24 @@ public function assignStatic(
                                     throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);
                                 }
 
-                                $variableVariableCode = $compilationContext->backend->getVariableCode($variableVariable);
-                                $tempVariableCode = $compilationContext->backend->getVariableCode($tempVariable);
-                                $compilationContext->codePrinter->output('SEPARATE_ZVAL('.$variableVariableCode.');');
-                                $compilationContext->codePrinter->output('zephir_concat_function('.$variableVariableCode.', '.$tempVariableCode.', '.$variableVariableCode.');');
-                                // no break
+                                $variableVariableCode = $compilationContext->backend->getVariableCode(
+                                    $variableVariable
+                                );
+                                $tempVariableCode     = $compilationContext->backend->getVariableCode($tempVariable);
+                                $compilationContext->codePrinter->output(
+                                    'SEPARATE_ZVAL(' . $variableVariableCode . ');'
+                                );
+                                $compilationContext->codePrinter->output(
+                                    'zephir_concat_function(' . $variableVariableCode . ', ' . $tempVariableCode . ', ' . $variableVariableCode . ');'
+                                );
+                            // no break
                             case 'assign':
-                                $compilationContext->backend->updateStaticProperty($classEntry, $property, $variableVariable, $compilationContext);
+                                $compilationContext->backend->updateStaticProperty(
+                                    $classEntry,
+                                    $property,
+                                    $variableVariable,
+                                    $compilationContext
+                                );
                                 if ($variableVariable->isTemporal()) {
                                     $variableVariable->setIdle(true);
                                 }
@@ -298,19 +419,24 @@ public function assignStatic(
                         break;
                     case 'variable':
                     case 'array':
-                        $compilationContext->backend->updateStaticProperty($classEntry, $property, $variableVariable, $compilationContext);
+                        $compilationContext->backend->updateStaticProperty(
+                            $classEntry,
+                            $property,
+                            $variableVariable,
+                            $compilationContext
+                        );
                         if ($variableVariable->isTemporal()) {
                             $variableVariable->setIdle(true);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type '.$variableVariable->getType(), $statement);
+                        throw new CompilerException('Unknown type ' . $variableVariable->getType(), $statement);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type '.$resolvedExpr->getType(), $statement);
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/StaticPropertyAdd.php b/src/Statements/Let/StaticPropertyAdd.php
index af1df7c2d4..67a18b2b7c 100644
--- a/src/Statements/Let/StaticPropertyAdd.php
+++ b/src/Statements/Let/StaticPropertyAdd.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -99,9 +99,22 @@ public function assignStatic(
             case 'int':
             case 'uint':
             case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getBooleanCode(), $compilationContext);
-                $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    $resolvedExpr->getBooleanCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->addStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
@@ -109,54 +122,113 @@ public function assignStatic(
 
             case 'char':
             case 'uchar':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignLong($tempVariable, '\''.$resolvedExpr->getCode().'\'', $compilationContext);
-                $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    '\'' . $resolvedExpr->getCode() . '\'',
+                    $compilationContext
+                );
+                $compilationContext->backend->addStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'double':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignDouble($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignDouble(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->addStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $tempVariable->initVariant($compilationContext);
 
                 if ($resolvedExpr->getCode()) {
-                    $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getCode(), $compilationContext);
+                    $compilationContext->backend->assignString(
+                        $tempVariable,
+                        $resolvedExpr->getCode(),
+                        $compilationContext
+                    );
                 } else {
-                    $codePrinter->output('ZVAL_EMPTY_STRING('.$tempVariable->getName().');');
+                    $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
                 }
 
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
 
-                $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $compilationContext->backend->addStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'bool':
                 if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->addStaticProperty($classEntry, $property, 'true', $compilationContext);
+                    $compilationContext->backend->addStaticProperty(
+                        $classEntry,
+                        $property,
+                        'true',
+                        $compilationContext
+                    );
                 } else {
                     if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->addStaticProperty($classEntry, $property, 'false', $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
                     } else {
-                        $codePrinter->output('if ('.$resolvedExpr->getBooleanCode().') {');
+                        $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->addStaticProperty($classEntry, $property, 'true', $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
+                            $classEntry,
+                            $property,
+                            'true',
+                            $compilationContext
+                        );
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('} else {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->addStaticProperty($classEntry, $property, 'false', $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('}');
                     }
@@ -164,16 +236,30 @@ public function assignStatic(
                 break;
 
             case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $compilationContext->backend->addStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'array':
-                $compilationContext->backend->addStaticProperty($classEntry, $property, $resolvedExpr, $compilationContext);
+                $compilationContext->backend->addStaticProperty(
+                    $classEntry,
+                    $property,
+                    $resolvedExpr,
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
@@ -197,7 +283,12 @@ public function assignStatic(
                         );
 
                         $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
 
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
@@ -211,8 +302,17 @@ public function assignStatic(
                             true
                         );
 
-                        $compilationContext->backend->assignDouble($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->assignDouble(
+                            $tempVariable,
+                            $variableVariable,
+                            $compilationContext
+                        );
+                        $compilationContext->backend->addStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
 
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
@@ -220,15 +320,29 @@ public function assignStatic(
                         break;
 
                     case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
                         $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->addStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
                         }
                         break;
                     default:
-                        $compilationContext->backend->addStaticProperty($classEntry, $property, $variableVariable, $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
+                            $classEntry,
+                            $property,
+                            $variableVariable,
+                            $compilationContext
+                        );
                         if ($variableVariable->isTemporal()) {
                             $variableVariable->setIdle(true);
                         }
@@ -238,7 +352,7 @@ public function assignStatic(
                 break;
 
             default:
-                throw new CompilerException('Unknown type '.$resolvedExpr->getType(), $statement);
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 86e6af7204..f3a99d81e0 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\Class\Property;
@@ -19,6 +19,8 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 
+use function in_array;
+
 /**
  * StaticPropertyAppend.
  *
@@ -46,7 +48,7 @@ public function assignStatic(
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -54,18 +56,25 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
+                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
+                    $extendsClass    = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
+                        throw new CompilerException(
+                            'Cannot assign static property "'
+                            . $property
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $statement
+                        );
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -74,24 +83,48 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+            throw new CompilerException(
+                "Class '" . $classDefinition->getCompleteName(
+                ) . "' does not have a property called: '" . $property . "'",
+                $statement
+            );
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
+                throw new CompilerException(
+                    "Cannot access private static property '"
+                    . $classDefinition->getCompleteName()
+                    . '::'
+                    . $property
+                    . "' out of its declaring context",
+                    $statement
+                );
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
+        $this->_assignStaticPropertyArrayMultipleIndex(
+            $classEntry,
+            $property,
+            $resolvedExpr,
+            $compilationContext,
+            $statement
+        );
     }
 
     /**
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 8e9e6e1882..38ab381166 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\Class\Property;
@@ -20,6 +20,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
+use function in_array;
+
 /**
  * Zephir\Statements\Let\StaticPropertyArrayIndex.
  *
@@ -47,7 +49,7 @@ public function assignStatic(
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -55,18 +57,25 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
+                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
+                    $extendsClass    = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
+                        throw new CompilerException(
+                            'Cannot assign static property "'
+                            . $property
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $statement
+                        );
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -75,24 +84,48 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+            throw new CompilerException(
+                "Class '" . $classDefinition->getCompleteName(
+                ) . "' does not have a property called: '" . $property . "'",
+                $statement
+            );
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
+                throw new CompilerException(
+                    "Cannot access private static property '"
+                    . $classDefinition->getCompleteName()
+                    . '::'
+                    . $property
+                    . "' out of its declaring context",
+                    $statement
+                );
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
+        $this->_assignStaticPropertyArrayMultipleIndex(
+            $classEntry,
+            $property,
+            $resolvedExpr,
+            $compilationContext,
+            $statement
+        );
     }
 
     /**
@@ -101,7 +134,7 @@ public function assignStatic(
      * @param string             $classEntry
      * @param string             $property
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      *
      * @throws Exception
@@ -140,7 +173,10 @@ protected function _assignStaticPropertyArrayMultipleIndex(
                     break;
                 default:
                     throw new CompilerException(
-                        sprintf('Expression: %s cannot be used as index without cast', $resolvedIndex->getType()),
+                        sprintf(
+                            'Expression: %s cannot be used as index without cast',
+                            $resolvedIndex->getType()
+                        ),
                         $statement['index-expr']
                     );
             }
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index c51d0ef6ff..960f22ce14 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\Class\Property;
@@ -20,6 +20,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
+use function in_array;
+
 /**
  * StaticPropertyArrayIndexAppend.
  *
@@ -47,7 +49,7 @@ public function assignStatic(
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -55,18 +57,28 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
+                    throw new CompilerException(
+                        "Cannot locate class '" . $className . "'",
+                        $statement
+                    );
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
+                    $extendsClass    = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
+                        throw new CompilerException(
+                            'Cannot assign static property "'
+                            . $property
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $statement
+                        );
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -75,24 +87,50 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+            throw new CompilerException(
+                "Class '" . $classDefinition->getCompleteName(
+                ) . "' does not have a property called: '"
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
+                throw new CompilerException(
+                    "Cannot access private static property '"
+                    . $classDefinition->getCompleteName()
+                    . '::'
+                    . $property
+                    . "' out of its declaring context",
+                    $statement
+                );
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
+        $this->_assignStaticPropertyArrayMultipleIndex(
+            $classEntry,
+            $property,
+            $resolvedExpr,
+            $compilationContext,
+            $statement
+        );
     }
 
     /**
@@ -101,7 +139,7 @@ public function assignStatic(
      * @param string             $classEntry
      * @param string             $property
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      *
      * @throws Exception
@@ -139,7 +177,10 @@ protected function _assignStaticPropertyArrayMultipleIndex(
                     break;
                 default:
                     throw new CompilerException(
-                        sprintf('Expression: %s cannot be used as index without cast', $resolvedIndex->getType()),
+                        sprintf(
+                            'Expression: %s cannot be used as index without cast',
+                            $resolvedIndex->getType()
+                        ),
                         $statement['index-expr']
                     );
             }
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index c9a4fa5de1..ce06c10be3 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -99,9 +99,22 @@ public function assignStatic(
             case 'int':
             case 'uint':
             case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getBooleanCode(), $compilationContext);
-                $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    $resolvedExpr->getBooleanCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
@@ -109,54 +122,113 @@ public function assignStatic(
 
             case 'char':
             case 'uchar':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignLong($tempVariable, '\''.$resolvedExpr->getCode().'\'', $compilationContext);
-                $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    '\'' . $resolvedExpr->getCode() . '\'',
+                    $compilationContext
+                );
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'double':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
-                $compilationContext->backend->assignDouble($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignDouble(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $tempVariable->initVariant($compilationContext);
 
                 if ($resolvedExpr->getCode()) {
-                    $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getCode(), $compilationContext);
+                    $compilationContext->backend->assignString(
+                        $tempVariable,
+                        $resolvedExpr->getCode(),
+                        $compilationContext
+                    );
                 } else {
-                    $codePrinter->output('ZVAL_EMPTY_STRING('.$tempVariable->getName().');');
+                    $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
                 }
 
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
 
-                $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 break;
 
             case 'bool':
                 if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->subStaticProperty($classEntry, $property, 'true', $compilationContext);
+                    $compilationContext->backend->subStaticProperty(
+                        $classEntry,
+                        $property,
+                        'true',
+                        $compilationContext
+                    );
                 } else {
                     if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->subStaticProperty($classEntry, $property, 'false', $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
                     } else {
-                        $codePrinter->output('if ('.$resolvedExpr->getBooleanCode().') {');
+                        $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->subStaticProperty($classEntry, $property, 'true', $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            'true',
+                            $compilationContext
+                        );
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('} else {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->subStaticProperty($classEntry, $property, 'false', $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('}');
                     }
@@ -164,16 +236,30 @@ public function assignStatic(
                 break;
 
             case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
                 $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
                 if ($tempVariable->isTemporal()) {
                     $tempVariable->setIdle(true);
                 }
                 break;
 
             case 'array':
-                $compilationContext->backend->subStaticProperty($classEntry, $property, $resolvedExpr, $compilationContext);
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $resolvedExpr,
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
@@ -197,7 +283,12 @@ public function assignStatic(
                         );
 
                         $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
 
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
@@ -211,8 +302,17 @@ public function assignStatic(
                             true
                         );
 
-                        $compilationContext->backend->assignDouble($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->assignDouble(
+                            $tempVariable,
+                            $variableVariable,
+                            $compilationContext
+                        );
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
 
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
@@ -220,15 +320,29 @@ public function assignStatic(
                         break;
 
                     case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable('variable', $compilationContext, true);
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
                         $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->subStaticProperty($classEntry, $property, $tempVariable, $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
                         if ($tempVariable->isTemporal()) {
                             $tempVariable->setIdle(true);
                         }
                         break;
                     default:
-                        $compilationContext->backend->subStaticProperty($classEntry, $property, $variableVariable, $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $variableVariable,
+                            $compilationContext
+                        );
                         if ($variableVariable->isTemporal()) {
                             $variableVariable->setIdle(true);
                         }
@@ -238,7 +352,7 @@ public function assignStatic(
                 break;
 
             default:
-                throw new CompilerException('Unknown type '.$resolvedExpr->getType(), $statement);
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 4df0c74ac6..2b7256696b 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\Code\Printer;
@@ -51,7 +51,10 @@ public function assign(
         array $statement
     ): void {
         if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is read only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is read only",
+                $statement
+            );
         }
 
         $codePrinter = $compilationContext->codePrinter;
@@ -63,7 +66,10 @@ public function assign(
             $symbolVariable->setIsInitialized(true, $compilationContext);
         } else {
             if (!$symbolVariable->isInitialized()) {
-                throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+                throw new CompilerException(
+                    "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                    $statement
+                );
             }
         }
 
@@ -89,11 +95,25 @@ public function assign(
                 break;
 
             case 'array':
-                $this->doArrayAssignment($codePrinter, $resolvedExpr, $symbolVariable, $variable, $statement, $compilationContext);
+                $this->doArrayAssignment(
+                    $codePrinter,
+                    $resolvedExpr,
+                    $symbolVariable,
+                    $variable,
+                    $statement,
+                    $compilationContext
+                );
                 break;
 
             case 'string':
-                $this->doStringAssignment($codePrinter, $resolvedExpr, $symbolVariable, $variable, $statement, $compilationContext);
+                $this->doStringAssignment(
+                    $codePrinter,
+                    $resolvedExpr,
+                    $symbolVariable,
+                    $variable,
+                    $statement,
+                    $compilationContext
+                );
                 break;
 
             case 'bool':
@@ -102,46 +122,104 @@ public function assign(
 
             case 'variable':
             case 'mixed':
-                $this->doVariableAssignment($codePrinter, $resolvedExpr, $symbolVariable, $variable, $statement, $compilationContext, $readDetector);
+                $this->doVariableAssignment(
+                    $codePrinter,
+                    $resolvedExpr,
+                    $symbolVariable,
+                    $variable,
+                    $statement,
+                    $compilationContext,
+                    $readDetector
+                );
                 break;
 
             default:
-                throw new CompilerException('Unknown type: '.$type, $statement);
+                throw new CompilerException('Unknown type: ' . $type, $statement);
         }
     }
 
     /**
-     * Performs numeric assignment.
+     * Performs array assignment.
+     *
+     * @param Printer            $codePrinter
+     * @param CompiledExpression $resolvedExpr
+     * @param ZephirVariable     $symbolVariable
+     * @param string             $variable
+     * @param array              $statement
+     * @param CompilationContext $compilationContext
      *
      * @throws CompilerException
-     * @throws \Zephir\Exception\IllegalOperationException
+     * @throws IllegalOperationException
      */
-    private function doNumericAssignment(
+    private function doArrayAssignment(
         Printer $codePrinter,
         CompiledExpression $resolvedExpr,
+        ZephirVariable $symbolVariable,
         string $variable,
         array $statement,
         CompilationContext $compilationContext
     ): void {
         switch ($resolvedExpr->getType()) {
-            case 'null':
+            case 'variable':
+            case 'array':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = 0;');
-                        break;
+                        if ($variable != $resolvedExpr->getCode()) {
+                            $symbolVariable->setMustInitNull(true);
+                            $compilationContext->symbolTable->mustGrownStack(true);
 
-                    case 'add-assign':
-                        $codePrinter->output($variable.' += 0;');
-                        break;
+                            /* Inherit the dynamic type data from the assigned value */
+                            $symbolVariable->setDynamicTypes('array');
+                            $symbolVariable->increaseVariantIfNull();
+                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
 
-                    case 'sub-assign':
-                        $codePrinter->output($variable.' -= 0;');
+                            $codePrinter->output(
+                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(
+                                    $resolvedExpr,
+                                    $compilationContext
+                                ) . ');'
+                            );
+                        }
                         break;
 
-                    case 'mul-assign':
-                        $codePrinter->output($variable.' *= 0;');
-                        break;
+                    default:
+                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());
+                }
+                break;
+
+            default:
+                throw new CompilerException(
+                    "Cannot '" . $statement['operator'] . "' " . $resolvedExpr->getType() . ' for array type',
+                    $resolvedExpr->getOriginal()
+                );
+        }
+    }
 
+    /**
+     * Performs boolean assignment.
+     *
+     * @param Printer            $codePrinter
+     * @param CompiledExpression $resolvedExpr
+     * @param string             $variable
+     * @param array              $statement
+     * @param CompilationContext $compilationContext
+     *
+     * @throws CompilerException
+     * @throws IllegalOperationException
+     */
+    private function doBoolAssignment(
+        Printer $codePrinter,
+        CompiledExpression $resolvedExpr,
+        string $variable,
+        array $statement,
+        CompilationContext $compilationContext
+    ): void {
+        switch ($resolvedExpr->getType()) {
+            case 'null':
+                switch ($statement['operator']) {
+                    case 'assign':
+                        $codePrinter->output($variable . ' = 0;');
+                        break;
                     default:
                         throw new IllegalOperationException($statement, $resolvedExpr);
                 }
@@ -153,51 +231,167 @@ private function doNumericAssignment(
             case 'ulong':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = '.$resolvedExpr->getCode().';');
+                        $codePrinter->output($variable . ' = ((' . $resolvedExpr->getCode() . ') ? 1 : 0);');
                         break;
+                    default:
+                        throw new IllegalOperationException($statement, $resolvedExpr);
+                }
+                break;
 
-                    case 'add-assign':
-                        $codePrinter->output($variable.' += '.$resolvedExpr->getCode().';');
+            case 'double':
+                switch ($statement['operator']) {
+                    case 'assign':
+                        $codePrinter->output($variable . ' = ((' . $resolvedExpr->getCode() . ' != 0.0) ? 1 : 0);');
                         break;
+                    default:
+                        throw new IllegalOperationException($statement, $resolvedExpr);
+                }
+                break;
 
-                    case 'sub-assign':
-                        $codePrinter->output($variable.' -= '.$resolvedExpr->getCode().';');
+            case 'char':
+            case 'uchar':
+                switch ($statement['operator']) {
+                    case 'assign':
+                        $codePrinter->output($variable . ' = ((\'' . $resolvedExpr->getCode() . '\') ? 1 : 0);');
                         break;
+                    default:
+                        throw new IllegalOperationException($statement, $resolvedExpr);
+                }
+                break;
 
-                    case 'mul-assign':
-                        $codePrinter->output($variable.' *= '.$resolvedExpr->getCode().';');
+            case 'bool':
+                switch ($statement['operator']) {
+                    case 'assign':
+                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getBooleanCode() . ';');
                         break;
+                    default:
+                        throw new IllegalOperationException($statement, $resolvedExpr);
+                }
+                break;
 
-                    case 'div-assign':
-                        $codePrinter->output($variable.' /= '.$resolvedExpr->getCode().';');
+            case 'variable':
+                $itemVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
+                switch ($itemVariable->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        switch ($statement['operator']) {
+                            case 'assign':
+                                $codePrinter->output($variable . ' = ((' . $itemVariable->getName() . ') ? 1 : 0);');
+                                break;
+                            default:
+                                throw new IllegalOperationException($statement, $itemVariable);
+                        }
                         break;
 
-                    case 'mod-assign':
-                        $codePrinter->output($variable.' %= '.$resolvedExpr->getCode().';');
+                    case 'double':
+                        switch ($statement['operator']) {
+                            case 'assign':
+                                $codePrinter->output(
+                                    $variable . ' = ((' . $itemVariable->getName() . ' != 0.0) ? 1 : 0);'
+                                );
+                                break;
+                            default:
+                                throw new IllegalOperationException($statement, $itemVariable);
+                        }
+                        break;
+
+                    case 'bool':
+                        switch ($statement['operator']) {
+                            case 'assign':
+                                $codePrinter->output($variable . ' = ' . $itemVariable->getName() . ';');
+                                break;
+                            default:
+                                throw new IllegalOperationException($statement, $itemVariable);
+                        }
+                        break;
+
+                    case 'variable':
+                    case 'mixed':
+                    case 'string':
+                    case 'array':
+                        switch ($statement['operator']) {
+                            case 'assign':
+                                $compilationContext->headersManager->add('kernel/operators');
+                                $codePrinter->output(
+                                    $variable . ' = zephir_is_true(' . $compilationContext->backend->getVariableCode(
+                                        $itemVariable
+                                    ) . ');'
+                                );
+                                break;
+
+                            default:
+                                throw new IllegalOperationException($statement, $itemVariable);
+                        }
                         break;
 
+                    default:
+                        throw new CompilerException('Cannot assign variable: ' . $itemVariable->getType(), $statement);
+                }
+                break;
+
+            default:
+                throw new CompilerException('Unknown type: ' . $resolvedExpr->getType(), $statement);
+        }
+    }
+
+    /**
+     * Performs double assignment.
+     *
+     * @throws CompilerException
+     * @throws IllegalOperationException
+     */
+    private function doDoubleAssignment(
+        Printer $codePrinter,
+        CompiledExpression $resolvedExpr,
+        string $variable,
+        array $statement,
+        CompilationContext $compilationContext
+    ): void {
+        switch ($resolvedExpr->getType()) {
+            case 'null':
+                switch ($statement['operator']) {
+                    case 'assign':
+                        $codePrinter->output($variable . ' = 0.0;');
+                        break;
+                    case 'add-assign':
+                        $codePrinter->output($variable . ' += 0.0;');
+                        break;
+                    case 'sub-assign':
+                        $codePrinter->output($variable . ' -= 0.0;');
+                        break;
+                    case 'mul-assign':
+                        $codePrinter->output($variable . ' *= 0.0;');
+                        break;
                     default:
                         throw new IllegalOperationException($statement, $resolvedExpr);
                 }
                 break;
 
-            case 'char':
-            case 'uchar':
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = \''.$resolvedExpr->getCode().'\';');
+                        $codePrinter->output($variable . ' = (double) (' . $resolvedExpr->getCode() . ');');
                         break;
 
                     case 'add-assign':
-                        $codePrinter->output($variable.' += \''.$resolvedExpr->getCode().'\';');
+                        $codePrinter->output($variable . ' += (double) (' . $resolvedExpr->getCode() . ');');
                         break;
 
                     case 'sub-assign':
-                        $codePrinter->output($variable.' -= \''.$resolvedExpr->getCode().'\';');
+                        $codePrinter->output($variable . ' -= (double) (' . $resolvedExpr->getCode() . ');');
                         break;
 
                     case 'mul-assign':
-                        $codePrinter->output($variable.' *= \''.$resolvedExpr->getCode().'\';');
+                        $codePrinter->output($variable . ' *= (double) (' . $resolvedExpr->getCode() . ');');
                         break;
 
                     default:
@@ -208,19 +402,19 @@ private function doNumericAssignment(
             case 'double':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = (long) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     case 'add-assign':
-                        $codePrinter->output($variable.' += (long) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' += ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     case 'sub-assign':
-                        $codePrinter->output($variable.' -= (long) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' -= ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     case 'mul-assign':
-                        $codePrinter->output($variable.' *= (long) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' *= ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     default:
@@ -231,15 +425,19 @@ private function doNumericAssignment(
             case 'bool':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = '.$resolvedExpr->getBooleanCode().';');
+                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getBooleanCode() . ';');
                         break;
 
                     case 'add-assign':
-                        $codePrinter->output($variable.' += '.$resolvedExpr->getBooleanCode().';');
+                        $codePrinter->output($variable . ' += ' . $resolvedExpr->getBooleanCode() . ';');
                         break;
 
                     case 'sub-assign':
-                        $codePrinter->output($variable.' -= '.$resolvedExpr->getBooleanCode().';');
+                        $codePrinter->output($variable . ' -= ' . $resolvedExpr->getBooleanCode() . ';');
+                        break;
+
+                    case 'mul-assign':
+                        $codePrinter->output($variable . ' *= ' . $resolvedExpr->getBooleanCode() . ';');
                         break;
 
                     default:
@@ -248,40 +446,30 @@ private function doNumericAssignment(
                 break;
 
             case 'variable':
-                $itemVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
+                $itemVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
                 switch ($itemVariable->getType()) {
                     case 'int':
                     case 'uint':
                     case 'long':
                     case 'ulong':
                     case 'bool':
-                    case 'char':
-                    case 'uchar':
                         switch ($statement['operator']) {
                             case 'assign':
-                                $codePrinter->output($variable.' = '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' = (double) ' . $itemVariable->getName() . ';');
                                 break;
-
                             case 'add-assign':
-                                $codePrinter->output($variable.' += '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' += (double) ' . $itemVariable->getName() . ';');
                                 break;
-
                             case 'sub-assign':
-                                $codePrinter->output($variable.' -= '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' -= (double) ' . $itemVariable->getName() . ';');
                                 break;
-
                             case 'mul-assign':
-                                $codePrinter->output($variable.' *= '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' *= (double) ' . $itemVariable->getName() . ';');
                                 break;
-
-                            case 'div-assign':
-                                $codePrinter->output($variable.' /= '.$itemVariable->getName().';');
-                                break;
-
-                            case 'mod-assign':
-                                $codePrinter->output($variable.' %= '.$itemVariable->getName().';');
-                                break;
-
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
                         }
@@ -290,16 +478,16 @@ private function doNumericAssignment(
                     case 'double':
                         switch ($statement['operator']) {
                             case 'assign':
-                                $codePrinter->output($variable.' = (long) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' = ' . $itemVariable->getName() . ';');
                                 break;
                             case 'add-assign':
-                                $codePrinter->output($variable.' += (long) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' += ' . $itemVariable->getName() . ';');
                                 break;
                             case 'sub-assign':
-                                $codePrinter->output($variable.' -= (long) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' -= ' . $itemVariable->getName() . ';');
                                 break;
                             case 'mul-assign':
-                                $codePrinter->output($variable.' *= (long) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' *= ' . $itemVariable->getName() . ';');
                                 break;
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
@@ -309,46 +497,47 @@ private function doNumericAssignment(
                     case 'variable':
                     case 'mixed':
                         $compilationContext->headersManager->add('kernel/operators');
-                        $exprVariable = $compilationContext->symbolTable->getVariableForWrite($resolvedExpr->resolve(null, $compilationContext), $compilationContext);
-                        $exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);
+                        $exprVariableCode = $compilationContext->backend->getVariableCode($itemVariable);
                         switch ($statement['operator']) {
                             case 'assign':
-                                $codePrinter->output($variable.' = zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');
                                 break;
-
                             case 'add-assign':
-                                $codePrinter->output($variable.' += zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output(
+                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'
+                                );
                                 break;
-
                             case 'sub-assign':
-                                $codePrinter->output($variable.' -= zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output(
+                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'
+                                );
                                 break;
-
                             case 'mul-assign':
-                                $codePrinter->output($variable.' *= zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output(
+                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'
+                                );
                                 break;
-
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type: '.$itemVariable->getType(), $statement);
+                        throw new CompilerException('Unknown type: ' . $itemVariable->getType(), $statement);
                 }
                 break;
             default:
-                throw new CompilerException("Value type '".$resolvedExpr->getType()."' cannot be assigned to variable: int", $statement);
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
 
     /**
-     * Performs double assignment.
+     * Performs numeric assignment.
      *
      * @throws CompilerException
      * @throws IllegalOperationException
      */
-    private function doDoubleAssignment(
+    private function doNumericAssignment(
         Printer $codePrinter,
         CompiledExpression $resolvedExpr,
         string $variable,
@@ -359,17 +548,21 @@ private function doDoubleAssignment(
             case 'null':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = 0.0;');
+                        $codePrinter->output($variable . ' = 0;');
                         break;
+
                     case 'add-assign':
-                        $codePrinter->output($variable.' += 0.0;');
+                        $codePrinter->output($variable . ' += 0;');
                         break;
+
                     case 'sub-assign':
-                        $codePrinter->output($variable.' -= 0.0;');
+                        $codePrinter->output($variable . ' -= 0;');
                         break;
+
                     case 'mul-assign':
-                        $codePrinter->output($variable.' *= 0.0;');
+                        $codePrinter->output($variable . ' *= 0;');
                         break;
+
                     default:
                         throw new IllegalOperationException($statement, $resolvedExpr);
                 }
@@ -381,19 +574,27 @@ private function doDoubleAssignment(
             case 'ulong':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = (double) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     case 'add-assign':
-                        $codePrinter->output($variable.' += (double) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' += ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     case 'sub-assign':
-                        $codePrinter->output($variable.' -= (double) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' -= ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     case 'mul-assign':
-                        $codePrinter->output($variable.' *= (double) ('.$resolvedExpr->getCode().');');
+                        $codePrinter->output($variable . ' *= ' . $resolvedExpr->getCode() . ';');
+                        break;
+
+                    case 'div-assign':
+                        $codePrinter->output($variable . ' /= ' . $resolvedExpr->getCode() . ';');
+                        break;
+
+                    case 'mod-assign':
+                        $codePrinter->output($variable . ' %= ' . $resolvedExpr->getCode() . ';');
                         break;
 
                     default:
@@ -401,22 +602,23 @@ private function doDoubleAssignment(
                 }
                 break;
 
-            case 'double':
+            case 'char':
+            case 'uchar':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = '.$resolvedExpr->getCode().';');
+                        $codePrinter->output($variable . ' = \'' . $resolvedExpr->getCode() . '\';');
                         break;
 
                     case 'add-assign':
-                        $codePrinter->output($variable.' += '.$resolvedExpr->getCode().';');
+                        $codePrinter->output($variable . ' += \'' . $resolvedExpr->getCode() . '\';');
                         break;
 
                     case 'sub-assign':
-                        $codePrinter->output($variable.' -= '.$resolvedExpr->getCode().';');
+                        $codePrinter->output($variable . ' -= \'' . $resolvedExpr->getCode() . '\';');
                         break;
 
                     case 'mul-assign':
-                        $codePrinter->output($variable.' *= '.$resolvedExpr->getCode().';');
+                        $codePrinter->output($variable . ' *= \'' . $resolvedExpr->getCode() . '\';');
                         break;
 
                     default:
@@ -424,22 +626,41 @@ private function doDoubleAssignment(
                 }
                 break;
 
-            case 'bool':
+            case 'double':
                 switch ($statement['operator']) {
                     case 'assign':
-                        $codePrinter->output($variable.' = '.$resolvedExpr->getBooleanCode().';');
+                        $codePrinter->output($variable . ' = (long) (' . $resolvedExpr->getCode() . ');');
                         break;
 
                     case 'add-assign':
-                        $codePrinter->output($variable.' += '.$resolvedExpr->getBooleanCode().';');
+                        $codePrinter->output($variable . ' += (long) (' . $resolvedExpr->getCode() . ');');
                         break;
 
                     case 'sub-assign':
-                        $codePrinter->output($variable.' -= '.$resolvedExpr->getBooleanCode().';');
+                        $codePrinter->output($variable . ' -= (long) (' . $resolvedExpr->getCode() . ');');
                         break;
 
                     case 'mul-assign':
-                        $codePrinter->output($variable.' *= '.$resolvedExpr->getBooleanCode().';');
+                        $codePrinter->output($variable . ' *= (long) (' . $resolvedExpr->getCode() . ');');
+                        break;
+
+                    default:
+                        throw new IllegalOperationException($statement, $resolvedExpr);
+                }
+                break;
+
+            case 'bool':
+                switch ($statement['operator']) {
+                    case 'assign':
+                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getBooleanCode() . ';');
+                        break;
+
+                    case 'add-assign':
+                        $codePrinter->output($variable . ' += ' . $resolvedExpr->getBooleanCode() . ';');
+                        break;
+
+                    case 'sub-assign':
+                        $codePrinter->output($variable . ' -= ' . $resolvedExpr->getBooleanCode() . ';');
                         break;
 
                     default:
@@ -448,26 +669,44 @@ private function doDoubleAssignment(
                 break;
 
             case 'variable':
-                $itemVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
+                $itemVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
                 switch ($itemVariable->getType()) {
                     case 'int':
                     case 'uint':
                     case 'long':
                     case 'ulong':
                     case 'bool':
+                    case 'char':
+                    case 'uchar':
                         switch ($statement['operator']) {
                             case 'assign':
-                                $codePrinter->output($variable.' = (double) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' = ' . $itemVariable->getName() . ';');
                                 break;
+
                             case 'add-assign':
-                                $codePrinter->output($variable.' += (double) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' += ' . $itemVariable->getName() . ';');
                                 break;
+
                             case 'sub-assign':
-                                $codePrinter->output($variable.' -= (double) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' -= ' . $itemVariable->getName() . ';');
                                 break;
+
                             case 'mul-assign':
-                                $codePrinter->output($variable.' *= (double) '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' *= ' . $itemVariable->getName() . ';');
                                 break;
+
+                            case 'div-assign':
+                                $codePrinter->output($variable . ' /= ' . $itemVariable->getName() . ';');
+                                break;
+
+                            case 'mod-assign':
+                                $codePrinter->output($variable . ' %= ' . $itemVariable->getName() . ';');
+                                break;
+
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
                         }
@@ -476,16 +715,16 @@ private function doDoubleAssignment(
                     case 'double':
                         switch ($statement['operator']) {
                             case 'assign':
-                                $codePrinter->output($variable.' = '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' = (long) ' . $itemVariable->getName() . ';');
                                 break;
                             case 'add-assign':
-                                $codePrinter->output($variable.' += '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' += (long) ' . $itemVariable->getName() . ';');
                                 break;
                             case 'sub-assign':
-                                $codePrinter->output($variable.' -= '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' -= (long) ' . $itemVariable->getName() . ';');
                                 break;
                             case 'mul-assign':
-                                $codePrinter->output($variable.' *= '.$itemVariable->getName().';');
+                                $codePrinter->output($variable . ' *= (long) ' . $itemVariable->getName() . ';');
                                 break;
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
@@ -495,31 +734,48 @@ private function doDoubleAssignment(
                     case 'variable':
                     case 'mixed':
                         $compilationContext->headersManager->add('kernel/operators');
-                        $exprVariableCode = $compilationContext->backend->getVariableCode($itemVariable);
+                        $exprVariable     = $compilationContext->symbolTable->getVariableForWrite(
+                            $resolvedExpr->resolve(null, $compilationContext),
+                            $compilationContext
+                        );
+                        $exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);
                         switch ($statement['operator']) {
                             case 'assign':
-                                $codePrinter->output($variable.' = zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');
                                 break;
+
                             case 'add-assign':
-                                $codePrinter->output($variable.' += zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output(
+                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'
+                                );
                                 break;
+
                             case 'sub-assign':
-                                $codePrinter->output($variable.' -= zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output(
+                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'
+                                );
                                 break;
+
                             case 'mul-assign':
-                                $codePrinter->output($variable.' *= zephir_get_numberval('.$exprVariableCode.');');
+                                $codePrinter->output(
+                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'
+                                );
                                 break;
+
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type: '.$itemVariable->getType(), $statement);
+                        throw new CompilerException('Unknown type: ' . $itemVariable->getType(), $statement);
                 }
                 break;
             default:
-                throw new CompilerException('Unknown type '.$resolvedExpr->getType(), $statement);
+                throw new CompilerException(
+                    "Value type '" . $resolvedExpr->getType() . "' cannot be assigned to variable: int",
+                    $statement
+                );
         }
     }
 
@@ -527,7 +783,7 @@ private function doDoubleAssignment(
      * Performs string assignment.
      *
      * @throws CompilerException
-     * @throws \Zephir\Exception\IllegalOperationException
+     * @throws IllegalOperationException
      */
     private function doStringAssignment(
         Printer $codePrinter,
@@ -556,10 +812,17 @@ private function doStringAssignment(
                 switch ($statement['operator']) {
                     case 'assign':
                         $symbolVariable->initVariant($compilationContext);
-                        $compilationContext->backend->assignString($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
+                        $compilationContext->backend->assignString(
+                            $symbolVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
                         break;
                     case 'concat-assign':
-                        $codePrinter->output('zephir_concat_self_str(&'.$variable.', "'.$resolvedExpr->getCode().'", sizeof("'.$resolvedExpr->getCode().'") - 1);');
+                        $codePrinter->output(
+                            'zephir_concat_self_str(&' . $variable . ', "' . $resolvedExpr->getCode(
+                            ) . '", sizeof("' . $resolvedExpr->getCode() . '") - 1);'
+                        );
                         break;
                     default:
                         throw new IllegalOperationException($statement, $resolvedExpr);
@@ -571,13 +834,20 @@ private function doStringAssignment(
                     case 'assign':
                         $symbolVariable->initVariant($compilationContext);
                         if ($resolvedExpr->getCode()) {
-                            $compilationContext->backend->assignString($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
+                            $compilationContext->backend->assignString(
+                                $symbolVariable,
+                                $resolvedExpr->getCode(),
+                                $compilationContext
+                            );
                         } else {
                             $compilationContext->backend->assignString($symbolVariable, null, $compilationContext);
                         }
                         break;
                     case 'concat-assign':
-                        $codePrinter->output('zephir_concat_self_str(&'.$variable.', "'.$resolvedExpr->getCode().'", sizeof("'.$resolvedExpr->getCode().'") - 1);');
+                        $codePrinter->output(
+                            'zephir_concat_self_str(&' . $variable . ', "' . $resolvedExpr->getCode(
+                            ) . '", sizeof("' . $resolvedExpr->getCode() . '") - 1);'
+                        );
                         break;
                     default:
                         throw new IllegalOperationException($statement, $resolvedExpr);
@@ -590,7 +860,11 @@ private function doStringAssignment(
                     case 'assign':
                         $symbolVariable->initVariant($compilationContext);
                         if ($resolvedExpr->getCode()) {
-                            $compilationContext->backend->assignString($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
+                            $compilationContext->backend->assignString(
+                                $symbolVariable,
+                                $resolvedExpr->getCode(),
+                                $compilationContext
+                            );
                         } else {
                             $compilationContext->backend->assignString($symbolVariable, null, $compilationContext);
                         }
@@ -598,7 +872,10 @@ private function doStringAssignment(
 
                     case 'concat-assign':
                         $compilationContext->headersManager->add('kernel/operators');
-                        $codePrinter->output('zephir_concat_self_str(&'.$variable.', "'.$resolvedExpr->getCode().'", sizeof("'.$resolvedExpr->getCode().'") - 1);');
+                        $codePrinter->output(
+                            'zephir_concat_self_str(&' . $variable . ', "' . $resolvedExpr->getCode(
+                            ) . '", sizeof("' . $resolvedExpr->getCode() . '") - 1);'
+                        );
                         break;
 
                     default:
@@ -607,7 +884,11 @@ private function doStringAssignment(
                 break;
 
             case 'variable':
-                $itemVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
+                $itemVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
                 switch ($itemVariable->getType()) {
                     case 'int':
                     case 'uint':
@@ -618,13 +899,18 @@ private function doStringAssignment(
                                 $symbolVariable->initVariant($compilationContext);
                                 $compilationContext->headersManager->add('kernel/string');
                                 // FIXME: Most likely this code is outdated and no longer works.
-                                $codePrinter->output('Z_STRLEN_P('.$variable.') = zephir_spprintf(&Z_STRVAL_P('.$variable.'), 0, "%ld", '.$itemVariable->getName().');');
-                                $codePrinter->output('Z_TYPE_P('.$variable.') = IS_STRING;');
+                                $codePrinter->output(
+                                    'Z_STRLEN_P(' . $variable . ') = zephir_spprintf(&Z_STRVAL_P(' . $variable . '), 0, "%ld", ' . $itemVariable->getName(
+                                    ) . ');'
+                                );
+                                $codePrinter->output('Z_TYPE_P(' . $variable . ') = IS_STRING;');
                                 break;
 
                             case 'concat-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $codePrinter->output('zephir_concat_self_long(&'.$variable.', '.$itemVariable->getName().');');
+                                $codePrinter->output(
+                                    'zephir_concat_self_long(&' . $variable . ', ' . $itemVariable->getName() . ');'
+                                );
                                 break;
 
                             default:
@@ -639,13 +925,18 @@ private function doStringAssignment(
                                 $symbolVariable->initVariant($compilationContext);
                                 $compilationContext->headersManager->add('kernel/string');
                                 // FIXME: Most likely this code is outdated and no longer works.
-                                $codePrinter->output('Z_STRLEN_P('.$variable.') = zephir_spprintf(&Z_STRVAL_P('.$variable.'), 0, "%c", '.$itemVariable->getName().');');
-                                $codePrinter->output('Z_TYPE_P('.$variable.') = IS_STRING;');
+                                $codePrinter->output(
+                                    'Z_STRLEN_P(' . $variable . ') = zephir_spprintf(&Z_STRVAL_P(' . $variable . '), 0, "%c", ' . $itemVariable->getName(
+                                    ) . ');'
+                                );
+                                $codePrinter->output('Z_TYPE_P(' . $variable . ') = IS_STRING;');
                                 break;
 
                             case 'concat-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $codePrinter->output('zephir_concat_self_char(&'.$variable.', '.$itemVariable->getName().');');
+                                $codePrinter->output(
+                                    'zephir_concat_self_char(&' . $variable . ', ' . $itemVariable->getName() . ');'
+                                );
                                 break;
 
                             default:
@@ -660,13 +951,21 @@ private function doStringAssignment(
                                 $symbolVariable->increaseVariantIfNull();
                                 $compilationContext->symbolTable->mustGrownStack(true);
                                 if ($variable != $itemVariable->getName()) {
-                                    $compilationContext->backend->copyOnWrite($symbolVariable, $itemVariable, $compilationContext);
+                                    $compilationContext->backend->copyOnWrite(
+                                        $symbolVariable,
+                                        $itemVariable,
+                                        $compilationContext
+                                    );
                                 }
                                 break;
 
                             case 'concat-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $compilationContext->backend->concatSelf($symbolVariable, $itemVariable, $compilationContext);
+                                $compilationContext->backend->concatSelf(
+                                    $symbolVariable,
+                                    $itemVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             default:
@@ -681,196 +980,20 @@ private function doStringAssignment(
                                 $symbolVariable->setMustInitNull(true);
                                 $compilationContext->symbolTable->mustGrownStack(true);
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $codePrinter->output('zephir_get_strval('.$compilationContext->backend->getVariableCode($symbolVariable).', '.$compilationContext->backend->getVariableCode($itemVariable).');');
+                                $codePrinter->output(
+                                    'zephir_get_strval(' . $compilationContext->backend->getVariableCode(
+                                        $symbolVariable
+                                    ) . ', ' . $compilationContext->backend->getVariableCode($itemVariable) . ');'
+                                );
                                 break;
 
                             case 'concat-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $compilationContext->backend->concatSelf($symbolVariable, $itemVariable, $compilationContext);
-                                break;
-
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
-                        break;
-
-                    default:
-                        throw new CompilerException('Unknown type: '.$itemVariable->getType(), $statement);
-                }
-                break;
-
-            default:
-                throw new CompilerException('Unknown type '.$resolvedExpr->getType(), $statement);
-        }
-    }
-
-    /**
-     * Performs array assignment.
-     *
-     * @param Printer            $codePrinter
-     * @param CompiledExpression $resolvedExpr
-     * @param ZephirVariable     $symbolVariable
-     * @param string             $variable
-     * @param array              $statement
-     * @param CompilationContext $compilationContext
-     *
-     * @throws CompilerException
-     * @throws IllegalOperationException
-     */
-    private function doArrayAssignment(
-        Printer $codePrinter,
-        CompiledExpression $resolvedExpr,
-        ZephirVariable $symbolVariable,
-        string $variable,
-        array $statement,
-        CompilationContext $compilationContext
-    ): void {
-        switch ($resolvedExpr->getType()) {
-            case 'variable':
-            case 'array':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        if ($variable != $resolvedExpr->getCode()) {
-                            $symbolVariable->setMustInitNull(true);
-                            $compilationContext->symbolTable->mustGrownStack(true);
-
-                            /* Inherit the dynamic type data from the assigned value */
-                            $symbolVariable->setDynamicTypes('array');
-                            $symbolVariable->increaseVariantIfNull();
-                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-
-                            $codePrinter->output('ZEPHIR_CPY_WRT('.$symbol.', '.$compilationContext->backend->resolveValue($resolvedExpr, $compilationContext).');');
-                        }
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());
-                }
-                break;
-
-            default:
-                throw new CompilerException("Cannot '".$statement['operator']."' ".$resolvedExpr->getType().' for array type', $resolvedExpr->getOriginal());
-        }
-    }
-
-    /**
-     * Performs boolean assignment.
-     *
-     * @param Printer            $codePrinter
-     * @param CompiledExpression $resolvedExpr
-     * @param string             $variable
-     * @param array              $statement
-     * @param CompilationContext $compilationContext
-     *
-     * @throws CompilerException
-     * @throws IllegalOperationException
-     */
-    private function doBoolAssignment(
-        Printer $codePrinter,
-        CompiledExpression $resolvedExpr,
-        string $variable,
-        array $statement,
-        CompilationContext $compilationContext
-    ): void {
-        switch ($resolvedExpr->getType()) {
-            case 'null':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable.' = 0;');
-                        break;
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
-                break;
-
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable.' = (('.$resolvedExpr->getCode().') ? 1 : 0);');
-                        break;
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
-                break;
-
-            case 'double':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable.' = (('.$resolvedExpr->getCode().' != 0.0) ? 1 : 0);');
-                        break;
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
-                break;
-
-            case 'char':
-            case 'uchar':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable.' = ((\''.$resolvedExpr->getCode().'\') ? 1 : 0);');
-                        break;
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
-                break;
-
-            case 'bool':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable.' = '.$resolvedExpr->getBooleanCode().';');
-                        break;
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
-                break;
-
-            case 'variable':
-                $itemVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
-                switch ($itemVariable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable.' = (('.$itemVariable->getName().') ? 1 : 0);');
-                                break;
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
-                        break;
-
-                    case 'double':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable.' = (('.$itemVariable->getName().' != 0.0) ? 1 : 0);');
-                                break;
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
-                        break;
-
-                    case 'bool':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable.' = '.$itemVariable->getName().';');
-                                break;
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
-                        break;
-
-                    case 'variable':
-                    case 'mixed':
-                    case 'string':
-                    case 'array':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $compilationContext->headersManager->add('kernel/operators');
-                                $codePrinter->output($variable.' = zephir_is_true('.$compilationContext->backend->getVariableCode($itemVariable).');');
+                                $compilationContext->backend->concatSelf(
+                                    $symbolVariable,
+                                    $itemVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             default:
@@ -879,12 +1002,12 @@ private function doBoolAssignment(
                         break;
 
                     default:
-                        throw new CompilerException('Cannot assign variable: '.$itemVariable->getType(), $statement);
+                        throw new CompilerException('Unknown type: ' . $itemVariable->getType(), $statement);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type: '.$resolvedExpr->getType(), $statement);
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
 
@@ -947,37 +1070,70 @@ private function doVariableAssignment(
                                 break;
                         }
 
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                        $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getCode(), $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
+                        $compilationContext->backend->assignLong(
+                            $tempVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
 
                         $compilationContext->symbolTable->mustGrownStack(true);
                         $compilationContext->headersManager->add('kernel/operators');
-                        $codePrinter->output($functionName.'('.$symbol.', '.$compilationContext->backend->getVariableCode($tempVariable).');');
+                        $codePrinter->output(
+                            $functionName . '(' . $symbol . ', ' . $compilationContext->backend->getVariableCode(
+                                $tempVariable
+                            ) . ');'
+                        );
                         break;
 
                     case 'assign':
                         $symbolVariable->setDynamicTypes('long');
                         if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
-                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('int', $compilationContext);
-                            $codePrinter->output($tempVariable->getName().' = '.$resolvedExpr->getCode().';');
+                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                'int',
+                                $compilationContext
+                            );
+                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignLong($symbolVariable, $tempVariable, $compilationContext);
+                            $compilationContext->backend->assignLong(
+                                $symbolVariable,
+                                $tempVariable,
+                                $compilationContext
+                            );
                         } else {
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignLong($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
+                            $compilationContext->backend->assignLong(
+                                $symbolVariable,
+                                $resolvedExpr->getCode(),
+                                $compilationContext
+                            );
                         }
                         break;
 
                     case 'div-assign':
                         $symbolVariable->setDynamicTypes('double');
                         if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
-                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('double', $compilationContext);
-                            $codePrinter->output($tempVariable->getName().' = '.$resolvedExpr->getCode().';');
+                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                'double',
+                                $compilationContext
+                            );
+                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble($symbolVariable, $tempVariable, $compilationContext);
+                            $compilationContext->backend->assignDouble(
+                                $symbolVariable,
+                                $tempVariable,
+                                $compilationContext
+                            );
                         } else {
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
+                            $compilationContext->backend->assignDouble(
+                                $symbolVariable,
+                                $resolvedExpr->getCode(),
+                                $compilationContext
+                            );
                         }
                         break;
 
@@ -992,13 +1148,24 @@ private function doVariableAssignment(
                     case 'assign':
                         $symbolVariable->setDynamicTypes('long');
                         if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
-                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('char', $compilationContext);
-                            $codePrinter->output($tempVariable->getName().' = '.$resolvedExpr->getCode().';');
+                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                'char',
+                                $compilationContext
+                            );
+                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignLong($symbolVariable, $tempVariable, $compilationContext);
+                            $compilationContext->backend->assignLong(
+                                $symbolVariable,
+                                $tempVariable,
+                                $compilationContext
+                            );
                         } else {
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignLong($symbolVariable, '\''.$resolvedExpr->getCode().'\'', $compilationContext);
+                            $compilationContext->backend->assignLong(
+                                $symbolVariable,
+                                '\'' . $resolvedExpr->getCode() . '\'',
+                                $compilationContext
+                            );
                         }
 
                         break;
@@ -1026,25 +1193,47 @@ private function doVariableAssignment(
                                 break;
                         }
 
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext
+                        );
                         $tempVariable->setDynamicTypes('double');
-                        $compilationContext->backend->assignDouble($tempVariable, $resolvedExpr->getCode(), $compilationContext);
+                        $compilationContext->backend->assignDouble(
+                            $tempVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
 
                         $compilationContext->symbolTable->mustGrownStack(true);
                         $compilationContext->headersManager->add('kernel/operators');
-                        $codePrinter->output($functionName.'('.$compilationContext->backend->getVariableCode($symbolVariable).', '.$compilationContext->backend->getVariableCode($tempVariable).');');
+                        $codePrinter->output(
+                            $functionName . '(' . $compilationContext->backend->getVariableCode(
+                                $symbolVariable
+                            ) . ', ' . $compilationContext->backend->getVariableCode($tempVariable) . ');'
+                        );
                         break;
 
                     case 'assign':
                         $symbolVariable->setDynamicTypes('double');
                         if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
-                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('double', $compilationContext);
-                            $codePrinter->output($tempVariable->getName().' = '.$resolvedExpr->getCode().';');
+                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                'double',
+                                $compilationContext
+                            );
+                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble($symbolVariable, $tempVariable, $compilationContext);
+                            $compilationContext->backend->assignDouble(
+                                $symbolVariable,
+                                $tempVariable,
+                                $compilationContext
+                            );
                         } else {
                             $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble($symbolVariable, $resolvedExpr->getCode(), $compilationContext);
+                            $compilationContext->backend->assignDouble(
+                                $symbolVariable,
+                                $resolvedExpr->getCode(),
+                                $compilationContext
+                            );
                         }
                         break;
                     default:
@@ -1065,13 +1254,26 @@ private function doVariableAssignment(
                                 $compilationContext->backend->assignBool($symbolVariable, '0', $compilationContext);
                             } else {
                                 if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
-                                    $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('double', $compilationContext);
-                                    $codePrinter->output($tempVariable->getName().' = '.$resolvedExpr->getBooleanCode().';');
+                                    $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                        'double',
+                                        $compilationContext
+                                    );
+                                    $codePrinter->output(
+                                        $tempVariable->getName() . ' = ' . $resolvedExpr->getBooleanCode() . ';'
+                                    );
                                     $symbolVariable->initVariant($compilationContext);
-                                    $compilationContext->backend->assignBool($symbolVariable, $tempVariable, $compilationContext);
+                                    $compilationContext->backend->assignBool(
+                                        $symbolVariable,
+                                        $tempVariable,
+                                        $compilationContext
+                                    );
                                 } else {
                                     $symbolVariable->initVariant($compilationContext);
-                                    $compilationContext->backend->assignBool($symbolVariable, $resolvedExpr->getBooleanCode(), $compilationContext);
+                                    $compilationContext->backend->assignBool(
+                                        $symbolVariable,
+                                        $resolvedExpr->getBooleanCode(),
+                                        $compilationContext
+                                    );
                                 }
                             }
                         }
@@ -1086,12 +1288,18 @@ private function doVariableAssignment(
                     case 'assign':
                         $symbolVariable->initVariant($compilationContext);
                         $symbolVariable->setDynamicTypes('string');
-                        $compilationContext->backend->assignString($symbolVariable, Name::addSlashes($resolvedExpr->getCode()), $compilationContext);
+                        $compilationContext->backend->assignString(
+                            $symbolVariable,
+                            Name::addSlashes($resolvedExpr->getCode()),
+                            $compilationContext
+                        );
                         break;
 
                     case 'concat-assign':
                         $compilationContext->headersManager->add('kernel/operators');
-                        $codePrinter->output('zephir_concat_self_str(&'.$variable.', SL("'.$resolvedExpr->getCode().'"));');
+                        $codePrinter->output(
+                            'zephir_concat_self_str(&' . $variable . ', SL("' . $resolvedExpr->getCode() . '"));'
+                        );
                         break;
 
                     default:
@@ -1111,7 +1319,12 @@ private function doVariableAssignment(
                             $symbolVariable->increaseVariantIfNull();
                             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
 
-                            $codePrinter->output('ZEPHIR_CPY_WRT('.$symbol.', '.$compilationContext->backend->resolveValue($resolvedExpr, $compilationContext).');');
+                            $codePrinter->output(
+                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(
+                                    $resolvedExpr,
+                                    $compilationContext
+                                ) . ');'
+                            );
                         }
                         break;
 
@@ -1121,7 +1334,11 @@ private function doVariableAssignment(
                 break;
 
             case 'variable':
-                $itemVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $resolvedExpr->getOriginal());
+                $itemVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $resolvedExpr->getOriginal()
+                );
                 switch ($itemVariable->getType()) {
                     case 'int':
                     case 'uint':
@@ -1133,25 +1350,53 @@ private function doVariableAssignment(
                             case 'assign':
                                 $symbolVariable->initVariant($compilationContext);
                                 $symbolVariable->setDynamicTypes('long');
-                                $compilationContext->backend->assignLong($symbolVariable, $itemVariable, $compilationContext);
+                                $compilationContext->backend->assignLong(
+                                    $symbolVariable,
+                                    $itemVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             case 'add-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $symbolVariable->initVariant($compilationContext);
                                 $symbolVariable->setDynamicTypes('long');
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite($itemVariable->getType(), $compilationContext);
-                                $codePrinter->output($tempVariable->getName().' = zephir_get_numberval('.$compilationContext->backend->getVariableCode($symbolVariable).') + '.$itemVariable->getName().';');
-                                $compilationContext->backend->assignLong($symbolVariable, $tempVariable, $compilationContext);
+                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                    $itemVariable->getType(),
+                                    $compilationContext
+                                );
+                                $codePrinter->output(
+                                    $tempVariable->getName(
+                                    ) . ' = zephir_get_numberval(' . $compilationContext->backend->getVariableCode(
+                                        $symbolVariable
+                                    ) . ') + ' . $itemVariable->getName() . ';'
+                                );
+                                $compilationContext->backend->assignLong(
+                                    $symbolVariable,
+                                    $tempVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             case 'sub-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
                                 $symbolVariable->initVariant($compilationContext);
                                 $symbolVariable->setDynamicTypes('long');
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite($itemVariable->getType(), $compilationContext);
-                                $codePrinter->output($tempVariable->getName().' = zephir_get_numberval('.$compilationContext->backend->getVariableCode($symbolVariable).');');
-                                $compilationContext->backend->assignLong($symbolVariable, $tempVariable->getName().' - '.$itemVariable->getName(), $compilationContext);
+                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                    $itemVariable->getType(),
+                                    $compilationContext
+                                );
+                                $codePrinter->output(
+                                    $tempVariable->getName(
+                                    ) . ' = zephir_get_numberval(' . $compilationContext->backend->getVariableCode(
+                                        $symbolVariable
+                                    ) . ');'
+                                );
+                                $compilationContext->backend->assignLong(
+                                    $symbolVariable,
+                                    $tempVariable->getName() . ' - ' . $itemVariable->getName(),
+                                    $compilationContext
+                                );
                                 break;
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
@@ -1163,7 +1408,11 @@ private function doVariableAssignment(
                             case 'assign':
                                 $symbolVariable->initVariant($compilationContext);
                                 $symbolVariable->setDynamicTypes('double');
-                                $compilationContext->backend->assignDouble($symbolVariable, $itemVariable, $compilationContext);
+                                $compilationContext->backend->assignDouble(
+                                    $symbolVariable,
+                                    $itemVariable,
+                                    $compilationContext
+                                );
                                 break;
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
@@ -1175,7 +1424,11 @@ private function doVariableAssignment(
                             case 'assign':
                                 $symbolVariable->initVariant($compilationContext);
                                 $symbolVariable->setDynamicTypes('bool');
-                                $compilationContext->backend->assignBool($symbolVariable, $itemVariable, $compilationContext);
+                                $compilationContext->backend->assignBool(
+                                    $symbolVariable,
+                                    $itemVariable,
+                                    $compilationContext
+                                );
                                 break;
                             default:
                                 throw new IllegalOperationException($statement, $itemVariable);
@@ -1194,12 +1447,21 @@ private function doVariableAssignment(
                                     $symbolVariable->increaseVariantIfNull();
                                     $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
 
-                                    $codePrinter->output('ZEPHIR_CPY_WRT('.$symbol.', '.$compilationContext->backend->resolveValue($resolvedExpr, $compilationContext).');');
+                                    $codePrinter->output(
+                                        'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(
+                                            $resolvedExpr,
+                                            $compilationContext
+                                        ) . ');'
+                                    );
                                 }
                                 break;
 
                             default:
-                                throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());
+                                throw new IllegalOperationException(
+                                    $statement,
+                                    $resolvedExpr,
+                                    $resolvedExpr->getOriginal()
+                                );
                         }
                         break;
 
@@ -1216,7 +1478,11 @@ private function doVariableAssignment(
                                     $symbolVariable->setClassTypes($itemVariable->getClassTypes());
                                     $symbolVariable->increaseVariantIfNull();
 
-                                    $compilationContext->backend->copyOnWrite($symbolVariable, $itemVariable, $compilationContext);
+                                    $compilationContext->backend->copyOnWrite(
+                                        $symbolVariable,
+                                        $itemVariable,
+                                        $compilationContext
+                                    );
                                     if ($itemVariable->isTemporal()) {
                                         $itemVariable->setIdle(true);
                                     }
@@ -1225,19 +1491,31 @@ private function doVariableAssignment(
 
                             case 'concat-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $compilationContext->backend->concatSelf($symbolVariable, $itemVariable, $compilationContext);
+                                $compilationContext->backend->concatSelf(
+                                    $symbolVariable,
+                                    $itemVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             case 'add-assign':
                                 $compilationContext->symbolTable->mustGrownStack(true);
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $codePrinter->output('ZEPHIR_ADD_ASSIGN('.$compilationContext->backend->getVariableCode($symbolVariable).', '.$compilationContext->backend->getVariableCode($itemVariable).');');
+                                $codePrinter->output(
+                                    'ZEPHIR_ADD_ASSIGN(' . $compilationContext->backend->getVariableCode(
+                                        $symbolVariable
+                                    ) . ', ' . $compilationContext->backend->getVariableCode($itemVariable) . ');'
+                                );
                                 break;
 
                             case 'sub-assign':
                                 $compilationContext->symbolTable->mustGrownStack(true);
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $codePrinter->output('ZEPHIR_SUB_ASSIGN('.$compilationContext->backend->getVariableCode($symbolVariable).', '.$compilationContext->backend->getVariableCode($itemVariable).');');
+                                $codePrinter->output(
+                                    'ZEPHIR_SUB_ASSIGN(' . $compilationContext->backend->getVariableCode(
+                                        $symbolVariable
+                                    ) . ', ' . $compilationContext->backend->getVariableCode($itemVariable) . ');'
+                                );
                                 break;
 
                             default:
@@ -1257,7 +1535,11 @@ private function doVariableAssignment(
                                     $symbolVariable->setClassTypes($itemVariable->getClassTypes());
                                     $symbolVariable->increaseVariantIfNull();
 
-                                    $compilationContext->backend->copyOnWrite($symbolVariable, $itemVariable, $compilationContext);
+                                    $compilationContext->backend->copyOnWrite(
+                                        $symbolVariable,
+                                        $itemVariable,
+                                        $compilationContext
+                                    );
                                     if ($itemVariable->isTemporal()) {
                                         $itemVariable->setIdle(true);
                                     }
@@ -1266,7 +1548,11 @@ private function doVariableAssignment(
 
                             case 'concat-assign':
                                 $compilationContext->headersManager->add('kernel/operators');
-                                $compilationContext->backend->concatSelf($symbolVariable, $itemVariable, $compilationContext);
+                                $compilationContext->backend->concatSelf(
+                                    $symbolVariable,
+                                    $itemVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             default:
@@ -1275,12 +1561,15 @@ private function doVariableAssignment(
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type: '.$itemVariable->getType(), $resolvedExpr->getOriginal());
+                        throw new CompilerException(
+                            'Unknown type: ' . $itemVariable->getType(),
+                            $resolvedExpr->getOriginal()
+                        );
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type: '.$resolvedExpr->getType(), $resolvedExpr->getOriginal());
+                throw new CompilerException('Unknown type: ' . $resolvedExpr->getType(), $resolvedExpr->getOriginal());
         }
     }
 }
diff --git a/src/Statements/Let/VariableAppend.php b/src/Statements/Let/VariableAppend.php
index d0bf3f1526..196f126a63 100644
--- a/src/Statements/Let/VariableAppend.php
+++ b/src/Statements/Let/VariableAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\CompilationContext;
@@ -36,25 +36,42 @@ class VariableAppend
      *
      * @throws CompilerException
      */
-    public function assign($variable, ZephirVariable $symbolVariable, CompiledExpression $resolvedExpr, CompilationContext $compilationContext, $statement): void
-    {
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
         if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is not initialized", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
         }
 
         if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is read only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is read only",
+                $statement
+            );
         }
 
         if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException("Cannot mutate variable '".$variable."' because it is local only", $statement);
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
         }
 
         /*
          * Only dynamic variables and arrays can be used as arrays
          */
         if ($symbolVariable->isNotVariableAndArray()) {
-            throw new CompilerException("Cannot use variable type: '".$symbolVariable->getType()."' as an array", $statement);
+            throw new CompilerException(
+                "Cannot use variable type: '" . $symbolVariable->getType() . "' as an array",
+                $statement
+            );
         }
 
         if ('variable' == $symbolVariable->getType()) {
@@ -75,69 +92,187 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
             case 'mixed':
                 switch ($resolvedExpr->getType()) {
                     case 'null':
-                        $compilationContext->backend->addArrayEntry($symbolVariable, null, 'null', $compilationContext, $statement);
+                        $compilationContext->backend->addArrayEntry(
+                            $symbolVariable,
+                            null,
+                            'null',
+                            $compilationContext,
+                            $statement
+                        );
                         break;
 
                     case 'int':
                     case 'uint':
                     case 'long':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                        $compilationContext->backend->assignLong($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                        $compilationContext->backend->addArrayEntry($symbolVariable, null, $tempVariable, $compilationContext, $statement);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $statement
+                        );
+                        $compilationContext->backend->assignLong(
+                            $tempVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
+                        $compilationContext->backend->addArrayEntry(
+                            $symbolVariable,
+                            null,
+                            $tempVariable,
+                            $compilationContext,
+                            $statement
+                        );
                         $tempVariable->setIdle(true);
                         break;
 
                     case 'double':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                        $compilationContext->backend->assignDouble($tempVariable, $resolvedExpr->getCode(), $compilationContext);
-                        $compilationContext->backend->addArrayEntry($symbolVariable, null, $tempVariable, $compilationContext, $statement);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $statement
+                        );
+                        $compilationContext->backend->assignDouble(
+                            $tempVariable,
+                            $resolvedExpr->getCode(),
+                            $compilationContext
+                        );
+                        $compilationContext->backend->addArrayEntry(
+                            $symbolVariable,
+                            null,
+                            $tempVariable,
+                            $compilationContext,
+                            $statement
+                        );
                         $tempVariable->setIdle(true);
                         break;
 
                     case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                        $compilationContext->backend->assignBool($tempVariable, $resolvedExpr->getBooleanCode(), $compilationContext);
-                        $compilationContext->backend->addArrayEntry($symbolVariable, null, $tempVariable, $compilationContext, $statement);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $statement
+                        );
+                        $compilationContext->backend->assignBool(
+                            $tempVariable,
+                            $resolvedExpr->getBooleanCode(),
+                            $compilationContext
+                        );
+                        $compilationContext->backend->addArrayEntry(
+                            $symbolVariable,
+                            null,
+                            $tempVariable,
+                            $compilationContext,
+                            $statement
+                        );
                         $tempVariable->setIdle(true);
                         break;
 
                     case 'ulong':
                     case 'string':
-                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                        $compilationContext->backend->assignString($tempVariable, $resolvedExpr->getBooleanCode(), $compilationContext);
-                        $compilationContext->backend->addArrayEntry($symbolVariable, null, $tempVariable, $compilationContext, $statement);
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                            'variable',
+                            $compilationContext,
+                            $statement
+                        );
+                        $compilationContext->backend->assignString(
+                            $tempVariable,
+                            $resolvedExpr->getBooleanCode(),
+                            $compilationContext
+                        );
+                        $compilationContext->backend->addArrayEntry(
+                            $symbolVariable,
+                            null,
+                            $tempVariable,
+                            $compilationContext,
+                            $statement
+                        );
                         $tempVariable->setIdle(true);
                         break;
 
                     case 'array':
-                        $exprVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
-                        $compilationContext->backend->addArrayEntry($symbolVariable, null, $exprVariable, $compilationContext, $statement);
+                        $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+                            $resolvedExpr->getCode(),
+                            $compilationContext,
+                            $statement
+                        );
+                        $compilationContext->backend->addArrayEntry(
+                            $symbolVariable,
+                            null,
+                            $exprVariable,
+                            $compilationContext,
+                            $statement
+                        );
                         break;
 
                     case 'variable':
                     case 'mixed':
-                        $exprVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $statement);
+                        $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+                            $resolvedExpr->getCode(),
+                            $compilationContext,
+                            $statement
+                        );
                         switch ($exprVariable->getType()) {
                             case 'int':
                             case 'uint':
                             case 'long':
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                                $compilationContext->backend->assignLong($tempVariable, $exprVariable, $compilationContext);
-                                $compilationContext->backend->addArrayEntry($symbolVariable, null, $tempVariable, $compilationContext, $statement);
+                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                    'variable',
+                                    $compilationContext,
+                                    $statement
+                                );
+                                $compilationContext->backend->assignLong(
+                                    $tempVariable,
+                                    $exprVariable,
+                                    $compilationContext
+                                );
+                                $compilationContext->backend->addArrayEntry(
+                                    $symbolVariable,
+                                    null,
+                                    $tempVariable,
+                                    $compilationContext,
+                                    $statement
+                                );
                                 $tempVariable->setIdle(true);
                                 break;
 
                             case 'double':
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                                $compilationContext->backend->assignDouble($tempVariable, $exprVariable, $compilationContext);
-                                $compilationContext->backend->addArrayEntry($symbolVariable, null, $tempVariable, $compilationContext, $statement);
+                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                    'variable',
+                                    $compilationContext,
+                                    $statement
+                                );
+                                $compilationContext->backend->assignDouble(
+                                    $tempVariable,
+                                    $exprVariable,
+                                    $compilationContext
+                                );
+                                $compilationContext->backend->addArrayEntry(
+                                    $symbolVariable,
+                                    null,
+                                    $tempVariable,
+                                    $compilationContext,
+                                    $statement
+                                );
                                 $tempVariable->setIdle(true);
                                 break;
 
                             case 'bool':
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $statement);
-                                $compilationContext->backend->assignBool($tempVariable, $exprVariable, $compilationContext);
-                                $compilationContext->backend->addArrayEntry($symbolVariable, null, $tempVariable, $compilationContext, $statement);
+                                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                                    'variable',
+                                    $compilationContext,
+                                    $statement
+                                );
+                                $compilationContext->backend->assignBool(
+                                    $tempVariable,
+                                    $exprVariable,
+                                    $compilationContext
+                                );
+                                $compilationContext->backend->addArrayEntry(
+                                    $symbolVariable,
+                                    null,
+                                    $tempVariable,
+                                    $compilationContext,
+                                    $statement
+                                );
                                 $tempVariable->setIdle(true);
                                 break;
 
@@ -145,21 +280,27 @@ public function assign($variable, ZephirVariable $symbolVariable, CompiledExpres
                             case 'mixed':
                             case 'string':
                             case 'array':
-                                $compilationContext->backend->addArrayEntry($symbolVariable, null, $exprVariable, $compilationContext, $statement);
+                                $compilationContext->backend->addArrayEntry(
+                                    $symbolVariable,
+                                    null,
+                                    $exprVariable,
+                                    $compilationContext,
+                                    $statement
+                                );
                                 break;
 
                             default:
-                                throw new CompilerException('Unknown type: '.$exprVariable->getType(), $statement);
+                                throw new CompilerException('Unknown type: ' . $exprVariable->getType(), $statement);
                         }
                         break;
 
                     default:
-                        throw new CompilerException('Unknown type: '.$resolvedExpr->getType(), $statement);
+                        throw new CompilerException('Unknown type: ' . $resolvedExpr->getType(), $statement);
                 }
                 break;
 
             default:
-                throw new CompilerException('Unknown type: '.$type, $statement);
+                throw new CompilerException('Unknown type: ' . $type, $statement);
         }
     }
 }
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index 003086b74a..3beb3d35af 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
@@ -43,6 +43,8 @@
 use Zephir\Statements\Let\Variable as LetVariable;
 use Zephir\Statements\Let\VariableAppend as LetVariableAppend;
 
+use function is_object;
+
 /**
  * LetStatement.
  *
@@ -81,11 +83,19 @@ public function compile(CompilationContext $compilationContext): void
                 case 'array-index-append':
                 case 'string-dynamic-object-property':
                 case 'variable-dynamic-object-property':
-                    $symbolVariable = $compilationContext->symbolTable->getVariableForUpdate($variable, $compilationContext, $assignment);
+                    $symbolVariable = $compilationContext->symbolTable->getVariableForUpdate(
+                        $variable,
+                        $compilationContext,
+                        $assignment
+                    );
                     break;
 
                 default:
-                    $symbolVariable = $compilationContext->symbolTable->getVariableForWrite($variable, $compilationContext, $assignment);
+                    $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+                        $variable,
+                        $compilationContext,
+                        $assignment
+                    );
                     break;
             }
 
@@ -136,7 +146,7 @@ public function compile(CompilationContext $compilationContext): void
                 /*
                  * Bad implemented operators could return values different than objects
                  */
-                if (!\is_object($resolvedExpr)) {
+                if (!is_object($resolvedExpr)) {
                     throw new CompilerException('Resolved expression is not valid', $assignment['expr']);
                 }
             }
@@ -151,7 +161,14 @@ public function compile(CompilationContext $compilationContext): void
             switch ($assignment['assign-type']) {
                 case 'variable':
                     $let = new LetVariable();
-                    $let->assign($variable, $symbolVariable, $resolvedExpr, $readDetector, $compilationContext, $assignment);
+                    $let->assign(
+                        $variable,
+                        $symbolVariable,
+                        $resolvedExpr,
+                        $readDetector,
+                        $compilationContext,
+                        $assignment
+                    );
                     break;
 
                 case 'variable-append':
@@ -189,22 +206,46 @@ public function compile(CompilationContext $compilationContext): void
                         }
                     }
 
-                    $let->assignStatic($variable, $assignment['property'], $resolvedExpr, $compilationContext, $assignment);
+                    $let->assignStatic(
+                        $variable,
+                        $assignment['property'],
+                        $resolvedExpr,
+                        $compilationContext,
+                        $assignment
+                    );
                     break;
 
                 case 'static-property-append':
                     $let = new LetStaticPropertyAppend();
-                    $let->assignStatic($variable, $assignment['property'], $resolvedExpr, $compilationContext, $assignment);
+                    $let->assignStatic(
+                        $variable,
+                        $assignment['property'],
+                        $resolvedExpr,
+                        $compilationContext,
+                        $assignment
+                    );
                     break;
 
                 case 'static-property-array-index':
                     $let = new LetStaticPropertyArrayIndex();
-                    $let->assignStatic($variable, $assignment['property'], $resolvedExpr, $compilationContext, $assignment);
+                    $let->assignStatic(
+                        $variable,
+                        $assignment['property'],
+                        $resolvedExpr,
+                        $compilationContext,
+                        $assignment
+                    );
                     break;
 
                 case 'static-property-array-index-append':
                     $let = new LetStaticPropertyArrayIndexAppend();
-                    $let->assignStatic($variable, $assignment['property'], $resolvedExpr, $compilationContext, $assignment);
+                    $let->assignStatic(
+                        $variable,
+                        $assignment['property'],
+                        $resolvedExpr,
+                        $compilationContext,
+                        $assignment
+                    );
                     break;
 
                 case 'array-index':
@@ -263,7 +304,7 @@ public function compile(CompilationContext $compilationContext): void
                     break;
 
                 default:
-                    throw new CompilerException('Unknown assignment: '.$assignment['assign-type'], $assignment);
+                    throw new CompilerException('Unknown assignment: ' . $assignment['assign-type'], $assignment);
             }
         }
     }
@@ -303,7 +344,9 @@ protected function replaceAssignBitwiseOnDirect(array $assignment): array
         }
 
         if ($assignment['assign-type'] !== 'variable') {
-            throw new CompilerException("Operator '".$assignment['operator']."' is not supported assign-type: ".$assignment['assign-type']);
+            throw new CompilerException(
+                "Operator '" . $assignment['operator'] . "' is not supported assign-type: " . $assignment['assign-type']
+            );
         }
 
         $builderExpr = BuilderFactory::getInstance();
@@ -311,8 +354,9 @@ protected function replaceAssignBitwiseOnDirect(array $assignment): array
         $leftExpression = $builderExpr->variable($assignment['variable']);
 
         $assignment['expr'] = $builderExpr->operators()
-            ->binary($operator, $leftExpression, $builderExpr->raw($assignment['expr']))
-            ->build();
+                                          ->binary($operator, $leftExpression, $builderExpr->raw($assignment['expr']))
+                                          ->build()
+        ;
 
         $assignment['operator'] = AssignVariableOperator::OPERATOR_ASSIGN;
 
diff --git a/src/Statements/LoopStatement.php b/src/Statements/LoopStatement.php
index 0361524ef8..5d5f361b26 100644
--- a/src/Statements/LoopStatement.php
+++ b/src/Statements/LoopStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\Branch;
 use Zephir\CompilationContext;
 use Zephir\Exception;
@@ -28,7 +29,7 @@ class LoopStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
@@ -44,7 +45,10 @@ public function compile(CompilationContext $compilationContext): void
          * Compile statements in the 'loop' block
          */
         if (!isset($this->statement['statements'])) {
-            throw new CompilerException("Infinite loop without at least a 'break' statement is not allowed", $this->statement);
+            throw new CompilerException(
+                "Infinite loop without at least a 'break' statement is not allowed",
+                $this->statement
+            );
         }
 
         $st = new StatementsBlock($this->statement['statements']);
@@ -55,7 +59,10 @@ public function compile(CompilationContext $compilationContext): void
         $loopBreakPass = new LoopBreakPass();
         $loopBreakPass->pass($st);
         if (!$loopBreakPass->hasBreak()) {
-            throw new CompilerException("Infinite loop without at least a 'break' statement is not allowed", $this->statement);
+            throw new CompilerException(
+                "Infinite loop without at least a 'break' statement is not allowed",
+                $this->statement
+            );
         }
 
         $st->isLoop(true);
diff --git a/src/Statements/RequireStatement.php b/src/Statements/RequireStatement.php
index 599a354828..d63ef6cdfe 100644
--- a/src/Statements/RequireStatement.php
+++ b/src/Statements/RequireStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 2112ea0f8c..d7155996a6 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
@@ -32,7 +33,7 @@ final class ReturnStatement extends StatementAbstract
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -64,7 +65,7 @@ public function compile(CompilationContext $compilationContext): void
                             /**
                              * If the property is accessed on 'this', we check if the property does exist.
                              */
-                            $property = $statement['expr']['right']['value'];
+                            $property        = $statement['expr']['right']['value'];
                             $classDefinition = $compilationContext->classDefinition;
                             if (!$classDefinition->hasProperty($property)) {
                                 throw new CompilerException(
@@ -78,7 +79,7 @@ public function compile(CompilationContext $compilationContext): void
                             }
 
                             $compilationContext->headersManager->add('kernel/object');
-                            $codePrinter->output('RETURN_MM_MEMBER(getThis(), "'.$property.'");');
+                            $codePrinter->output('RETURN_MM_MEMBER(getThis(), "' . $property . '");');
 
                             return;
                         }
@@ -119,7 +120,11 @@ public function compile(CompilationContext $compilationContext): void
                         break;
 
                     case Types::T_BOOL:
-                        if (!$currentMethod->areReturnTypesBoolCompatible() && !$currentMethod->isMixed() && !$currentMethod->areReturnTypesFalseCompatible()) {
+                        if (
+                            !$currentMethod->areReturnTypesBoolCompatible() &&
+                            !$currentMethod->isMixed() &&
+                            !$currentMethod->areReturnTypesFalseCompatible()
+                        ) {
                             throw new InvalidTypeException($resolvedExpr->getType(), $statement['expr']);
                         }
                         break;
@@ -201,15 +206,15 @@ public function compile(CompilationContext $compilationContext): void
                 case Types::T_ULONG:
                 case Types::T_CHAR:
                 case Types::T_UCHAR:
-                    $codePrinter->output('RETURN_MM_LONG('.$resolvedExpr->getCode().');');
+                    $codePrinter->output('RETURN_MM_LONG(' . $resolvedExpr->getCode() . ');');
                     break;
 
                 case Types::T_BOOL:
-                    $codePrinter->output('RETURN_MM_BOOL('.$resolvedExpr->getBooleanCode().');');
+                    $codePrinter->output('RETURN_MM_BOOL(' . $resolvedExpr->getBooleanCode() . ');');
                     break;
 
                 case Types::T_DOUBLE:
-                    $codePrinter->output('RETURN_MM_DOUBLE('.$resolvedExpr->getCode().');');
+                    $codePrinter->output('RETURN_MM_DOUBLE(' . $resolvedExpr->getCode() . ');');
                     break;
 
                 case Types::T_STRING:
@@ -222,7 +227,7 @@ public function compile(CompilationContext $compilationContext): void
 
                 case Types::T_ARRAY:
                     if ('return_value' != $resolvedExpr->getCode()) {
-                        $codePrinter->output('RETURN_CTOR('.$resolvedExpr->getCode().');');
+                        $codePrinter->output('RETURN_CTOR(' . $resolvedExpr->getCode() . ');');
                     } else {
                         $codePrinter->output(self::RETURN_RETURN);
                     }
@@ -245,23 +250,23 @@ public function compile(CompilationContext $compilationContext): void
                         case Types::T_ULONG:
                         case Types::T_CHAR:
                         case Types::T_UCHAR:
-                            $codePrinter->output('RETURN_MM_LONG('.$symbolVariable->getName().');');
+                            $codePrinter->output('RETURN_MM_LONG(' . $symbolVariable->getName() . ');');
                             break;
 
                         case Types::T_DOUBLE:
-                            $codePrinter->output('RETURN_MM_DOUBLE('.$symbolVariable->getName().');');
+                            $codePrinter->output('RETURN_MM_DOUBLE(' . $symbolVariable->getName() . ');');
                             break;
 
                         case Types::T_STRING:
                         case Types::T_ISTRING:
                         case Types::T_ARRAY:
                             $codePrinter->output(
-                                'RETURN_CTOR('.$compilationContext->backend->getVariableCode($symbolVariable).');'
+                                'RETURN_CTOR(' . $compilationContext->backend->getVariableCode($symbolVariable) . ');'
                             );
                             break;
 
                         case Types::T_BOOL:
-                            $codePrinter->output('RETURN_MM_BOOL('.$symbolVariable->getName().');');
+                            $codePrinter->output('RETURN_MM_BOOL(' . $symbolVariable->getName() . ');');
                             break;
 
                         case Types::T_VARIABLE:
@@ -322,7 +327,7 @@ public function compile(CompilationContext $compilationContext): void
                     break;
 
                 default:
-                    throw new CompilerException("Cannot return '".$resolvedExpr->getType()."'", $statement['expr']);
+                    throw new CompilerException("Cannot return '" . $resolvedExpr->getType() . "'", $statement['expr']);
             }
 
             return;
diff --git a/src/Statements/StatementAbstract.php b/src/Statements/StatementAbstract.php
index 144ea49393..6ccf421a60 100644
--- a/src/Statements/StatementAbstract.php
+++ b/src/Statements/StatementAbstract.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
@@ -24,15 +24,15 @@ public function __construct(protected array $statement)
     {
     }
 
-    public function getEvalExpression(): ?EvalExpression
-    {
-        return $this->evalExpression;
-    }
-
     /**
      * Compiles the statement.
      *
      * @param CompilationContext $compilationContext
      */
     abstract public function compile(CompilationContext $compilationContext);
+
+    public function getEvalExpression(): ?EvalExpression
+    {
+        return $this->evalExpression;
+    }
 }
diff --git a/src/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
index 3016b1fcc7..169821e522 100644
--- a/src/Statements/SwitchStatement.php
+++ b/src/Statements/SwitchStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\Branch;
 use Zephir\CompilationContext;
 use Zephir\Exception;
@@ -20,6 +21,8 @@
 use Zephir\Optimizers\EvalExpression;
 use Zephir\StatementsBlock;
 
+use function count;
+
 /**
  * Switch statement, the same as in PHP/C
  */
@@ -28,7 +31,7 @@ class SwitchStatement extends StatementAbstract
     /**
      * @param CompilationContext $compilationContext
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function compile(CompilationContext $compilationContext): void
@@ -53,62 +56,69 @@ public function compile(CompilationContext $compilationContext): void
                 /**
                  * Create a temporary variable.
                  */
-                $tempVariable = $compilationContext->symbolTable->getTempVariable($resolvedExpr->getType(), $compilationContext);
+                $tempVariable = $compilationContext->symbolTable->getTempVariable(
+                    $resolvedExpr->getType(),
+                    $compilationContext
+                );
 
                 /**
                  * Simulate an assignment to the temporary variable.
                  */
                 $statement = new LetStatement([
-                    'type' => 'let',
+                    'type'        => 'let',
                     'assignments' => [
                         [
                             'assign-type' => 'variable',
-                            'operator' => 'assign',
-                            'variable' => $tempVariable->getName(),
-                            'expr' => [
-                                'type' => $resolvedExpr->getType(),
+                            'operator'    => 'assign',
+                            'variable'    => $tempVariable->getName(),
+                            'expr'        => [
+                                'type'  => $resolvedExpr->getType(),
                                 'value' => $resolvedExpr->getCode(),
-                                'file' => $exprRaw['file'],
-                                'line' => $exprRaw['line'],
-                                'char' => $exprRaw['char'],
+                                'file'  => $exprRaw['file'],
+                                'line'  => $exprRaw['line'],
+                                'char'  => $exprRaw['char'],
                             ],
-                            'file' => $exprRaw['file'],
-                            'line' => $exprRaw['line'],
-                            'char' => $exprRaw['char'],
+                            'file'        => $exprRaw['file'],
+                            'line'        => $exprRaw['line'],
+                            'char'        => $exprRaw['char'],
                         ],
                     ],
                 ]);
                 $statement->compile($compilationContext);
             } else {
-                $tempVariable = $compilationContext->symbolTable->getVariableForRead($resolvedExpr->getCode(), $compilationContext, $exprRaw);
+                $tempVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $exprRaw
+                );
             }
 
-            $clauses = $this->normalizeClauses($this->statement['clauses']);
+            $clauses  = $this->normalizeClauses($this->statement['clauses']);
             $tempLeft = ['type' => 'variable', 'value' => $tempVariable->getRealName()];
 
             /**
              * In the first round we group case clauses that have block statements
              * with the ones that does not have one.
              */
-            $blocks = [];
-            $exprStack = [];
+            $blocks       = [];
+            $exprStack    = [];
             $defaultBlock = null;
             foreach ($clauses as $clause) {
                 if ('case' == $clause['type']) {
                     $expr = [
-                        'type' => 'equals',
-                        'left' => $tempLeft,
+                        'type'  => 'equals',
+                        'left'  => $tempLeft,
                         'right' => $clause['expr'],
                     ];
                     if (!isset($clause['statements'])) {
                         $exprStack[] = $expr;
                     } else {
                         $exprStack[] = $expr;
-                        $blocks[] = [
-                            'expr' => $exprStack,
+                        $blocks[]    = [
+                            'expr'  => $exprStack,
                             'block' => $clause['statements'],
                         ];
-                        $exprStack = [];
+                        $exprStack   = [];
                     }
                 } else {
                     if ('default' == $clause['type']) {
@@ -124,19 +134,19 @@ public function compile(CompilationContext $compilationContext): void
             foreach ($blocks as $block) {
                 $expressions = $block['expr'];
 
-                if (1 == \count($expressions)) {
+                if (1 == count($expressions)) {
                     $condition = $evalExpr->optimize($expressions[0], $compilationContext);
-                    $codePrinter->output('if ('.$condition.') {');
+                    $codePrinter->output('if (' . $condition . ') {');
                 } else {
                     $orConditions = [];
                     foreach ($expressions as $expression) {
                         $orConditions[] = $evalExpr->optimize($expression, $compilationContext);
                     }
-                    $codePrinter->output('if ('.implode(' || ', $orConditions).') {');
+                    $codePrinter->output('if (' . implode(' || ', $orConditions) . ') {');
                 }
 
                 if (isset($block['block'])) {
-                    $st = new StatementsBlock($block['block']);
+                    $st     = new StatementsBlock($block['block']);
                     $branch = $st->compile($compilationContext, false, Branch::TYPE_SWITCH);
                     $branch->setRelatedStatement($this);
                 }
@@ -169,7 +179,7 @@ public function normalizeClauses($clauses)
             }
         }
 
-        if ($defaultIndex === \count($clauses) - 1) {
+        if ($defaultIndex === count($clauses) - 1) {
             return $clauses;
         }
 
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index d4e4f2e43d..95c4a2f494 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\Class\Entry;
 use Zephir\Code\Printer;
 use Zephir\CompilationContext;
@@ -22,6 +23,9 @@
 use Zephir\Expression;
 use Zephir\Name;
 
+use function count;
+use function in_array;
+
 /**
  * Throws exceptions
  */
@@ -31,24 +35,25 @@ class ThrowStatement extends StatementAbstract
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
         $compilationContext->headersManager->add('kernel/exception');
 
         $codePrinter = $compilationContext->codePrinter;
-        $statement = $this->statement;
-        $expr = $statement['expr'];
+        $statement   = $this->statement;
+        $expr        = $statement['expr'];
 
         /**
          * This optimizes throw new Exception("hello")
          */
         if (!$compilationContext->insideTryCatch) {
-            if (isset($expr['class'])
-                && isset($expr['parameters'])
-                && 1 == \count($expr['parameters'])
-                && 'string' == $expr['parameters'][0]['parameter']['type']
+            if (
+                isset($expr['class']) &&
+                isset($expr['parameters']) &&
+                1 == count($expr['parameters']) &&
+                'string' == $expr['parameters'][0]['parameter']['type']
             ) {
                 $className = Name::fetchFQN(
                     $expr['class'],
@@ -58,7 +63,7 @@ public function compile(CompilationContext $compilationContext): void
 
                 if ($compilationContext->compiler->isClass($className)) {
                     $classDefinition = $compilationContext->compiler->getClassDefinition($className);
-                    $message = $expr['parameters'][0]['parameter']['value'];
+                    $message         = $expr['parameters'][0]['parameter']['value'];
                     try {
                         $class = $classDefinition->getClassEntry($compilationContext);
                         $this->throwStringException($codePrinter, $class, $message, $expr);
@@ -70,14 +75,14 @@ public function compile(CompilationContext $compilationContext): void
                 } else {
                     if ($compilationContext->compiler->isBundledClass($className)) {
                         $classEntry = (new Entry($expr['class'], $compilationContext))->get();
-                        $message = $expr['parameters'][0]['parameter']['value'];
+                        $message    = $expr['parameters'][0]['parameter']['value'];
                         $this->throwStringException($codePrinter, $classEntry, $message, $expr);
 
                         return;
                     }
                 }
             } else {
-                if (\in_array($expr['type'], ['string', 'char', 'int', 'double'])) {
+                if (in_array($expr['type'], ['string', 'char', 'int', 'double'])) {
                     $class = (new Entry('Exception', $compilationContext))->get();
 
                     $this->throwStringException($codePrinter, $class, $expr['value'], $expr);
@@ -88,15 +93,15 @@ public function compile(CompilationContext $compilationContext): void
         }
 
         try {
-            $throwExpr = new Expression($expr);
+            $throwExpr    = new Expression($expr);
             $resolvedExpr = $throwExpr->compile($compilationContext);
         } catch (Exception $e) {
             throw new CompilerException($e->getMessage(), $expr, $e->getCode(), $e);
         }
 
-        if (!\in_array($resolvedExpr->getType(), ['variable', 'string'])) {
+        if (!in_array($resolvedExpr->getType(), ['variable', 'string'])) {
             throw new CompilerException(
-                "Expression '".$resolvedExpr->getType().'" cannot be used as exception',
+                "Expression '" . $resolvedExpr->getType() . '" cannot be used as exception',
                 $expr
             );
         }
@@ -107,25 +112,25 @@ public function compile(CompilationContext $compilationContext): void
             $expr
         );
 
-        if (!\in_array($variableVariable->getType(), ['variable', 'string'])) {
+        if (!in_array($variableVariable->getType(), ['variable', 'string'])) {
             throw new CompilerException(
-                "Variable '".$variableVariable->getType()."' cannot be used as exception",
+                "Variable '" . $variableVariable->getType() . "' cannot be used as exception",
                 $expr
             );
         }
 
         $variableCode = $compilationContext->backend->getVariableCode($variableVariable);
-        $file = Compiler::getShortUserPath($statement['expr']['file']);
-        $line = $statement['expr']['line'];
+        $file         = Compiler::getShortUserPath($statement['expr']['file']);
+        $line         = $statement['expr']['line'];
 
         $codePrinter->output(
-            'zephir_throw_exception_debug('.$variableCode.', "'.$file.'", '.$line.');'
+            'zephir_throw_exception_debug(' . $variableCode . ', "' . $file . '", ' . $line . ');'
         );
 
         if (!$compilationContext->insideTryCatch) {
             $codePrinter->output('return;');
         } else {
-            $codePrinter->output('goto try_end_'.$compilationContext->currentTryCatch.';');
+            $codePrinter->output('goto try_end_' . $compilationContext->currentTryCatch . ';');
             $codePrinter->outputBlankLine();
         }
 
@@ -145,7 +150,7 @@ public function compile(CompilationContext $compilationContext): void
     private function throwStringException(Printer $printer, string $class, string $message, array $expression): void
     {
         $message = Name::addSlashes($message);
-        $path = Compiler::getShortUserPath($expression['file']);
+        $path    = Compiler::getShortUserPath($expression['file']);
         $printer->output(
             sprintf(
                 'ZEPHIR_THROW_EXCEPTION_DEBUG_STR(%s, "%s", "%s", %s);',
diff --git a/src/Statements/TryCatchStatement.php b/src/Statements/TryCatchStatement.php
index 8a75af39f3..fdeacb6f48 100644
--- a/src/Statements/TryCatchStatement.php
+++ b/src/Statements/TryCatchStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
@@ -19,6 +19,8 @@
 use Zephir\Expression\Builder\Operators\BinaryOperator;
 use Zephir\StatementsBlock;
 
+use function count;
+
 /**
  * Try/Catch statement the same as in PHP
  */
@@ -32,7 +34,7 @@ public function compile(CompilationContext $compilationContext): void
         $currentTryCatch = ++$compilationContext->currentTryCatch;
 
         $codePrinter->outputBlankLine();
-        $codePrinter->output('/* try_start_'.$currentTryCatch.': */');
+        $codePrinter->output('/* try_start_' . $currentTryCatch . ': */');
         $codePrinter->outputBlankLine();
 
         if (isset($this->statement['statements'])) {
@@ -41,7 +43,7 @@ public function compile(CompilationContext $compilationContext): void
         }
 
         $codePrinter->outputBlankLine();
-        $codePrinter->output('try_end_'.$currentTryCatch.':');
+        $codePrinter->output('try_end_' . $currentTryCatch . ':');
 
         /**
          * If 'try' is the latest statement add a 'dummy' statement to avoid compilation errors
@@ -57,23 +59,40 @@ public function compile(CompilationContext $compilationContext): void
             $codePrinter->output('if (EG(exception)) {');
             $codePrinter->increaseLevel();
 
-            $exc_var = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $compilationContext);
+            $exc_var = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $compilationContext
+            );
             $compilationContext->backend->copyOnWrite($exc_var, 'EG(exception)', $compilationContext);
 
             $exprBuilder = BuilderFactory::getInstance();
-            $ifs = [];
+            $ifs         = [];
 
             foreach ($this->statement['catches'] as $catch) {
                 if (isset($catch['variable'])) {
-                    $variable = $compilationContext->symbolTable->getVariableForWrite($catch['variable']['value'], $compilationContext, $catch['variable']);
+                    $variable = $compilationContext->symbolTable->getVariableForWrite(
+                        $catch['variable']['value'],
+                        $compilationContext,
+                        $catch['variable']
+                    );
                     if ('variable' != $variable->getType()) {
-                        throw new CompilerException('Only dynamic variables can be used to catch exceptions', $catch['exception']);
+                        throw new CompilerException(
+                            'Only dynamic variables can be used to catch exceptions',
+                            $catch['exception']
+                        );
                     }
                 } else {
-                    $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext, $compilationContext);
+                    $variable = $compilationContext->symbolTable->getTempVariableForWrite(
+                        'variable',
+                        $compilationContext,
+                        $compilationContext
+                    );
                 }
 
-                $assignExceptionVarStmt = $exprBuilder->statements()->rawC('ZEPHIR_CPY_WRT(&'.$variable->getName().', &'.$exc_var->getName().');');
+                $assignExceptionVarStmt = $exprBuilder->statements()->rawC(
+                    'ZEPHIR_CPY_WRT(&' . $variable->getName() . ', &' . $exc_var->getName() . ');'
+                );
 
                 /**
                  * TODO:, use a builder here
@@ -86,26 +105,31 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 foreach ($catch['classes'] as $class) {
                     $ifs[] = $exprBuilder->statements()->ifX()
-                        ->setCondition(
-                            $exprBuilder->operators()->binary(
-                                BinaryOperator::OPERATOR_INSTANCEOF,
-                                $exprBuilder->variable($exc_var->getName()),
-                                $exprBuilder->variable($class['value'])
-                            )
-                        )
-                        ->setStatements($exprBuilder->statements()->block(array_merge(
-                            [
-                                $exprBuilder->statements()->rawC('zend_clear_exception();'),
-                                $assignExceptionVarStmt,
-                            ],
-                            $catch['statements'] ?? []
-                        )));
+                                         ->setCondition(
+                                             $exprBuilder->operators()->binary(
+                                                 BinaryOperator::OPERATOR_INSTANCEOF,
+                                                 $exprBuilder->variable($exc_var->getName()),
+                                                 $exprBuilder->variable($class['value'])
+                                             )
+                                         )
+                                         ->setStatements(
+                                             $exprBuilder->statements()->block(
+                                                 array_merge(
+                                                     [
+                                                         $exprBuilder->statements()->rawC('zend_clear_exception();'),
+                                                         $assignExceptionVarStmt,
+                                                     ],
+                                                     $catch['statements'] ?? []
+                                                 )
+                                             )
+                                         )
+                    ;
                 }
             }
 
             $primaryIf = $ifs[0];
-            $lastIf = $ifs[0];
-            for ($i = 1; $i < \count($ifs); ++$i) {
+            $lastIf    = $ifs[0];
+            for ($i = 1; $i < count($ifs); ++$i) {
                 $lastIf->setElseStatements($exprBuilder->statements()->block([$ifs[$i]]));
                 $lastIf = $ifs[$i];
             }
diff --git a/src/Statements/UnsetStatement.php b/src/Statements/UnsetStatement.php
index b6da495c60..b917773e91 100644
--- a/src/Statements/UnsetStatement.php
+++ b/src/Statements/UnsetStatement.php
@@ -13,11 +13,14 @@
 
 namespace Zephir\Statements;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
+use function in_array;
+
 /**
  * unset() statement
  */
@@ -27,7 +30,7 @@ class UnsetStatement extends StatementAbstract
      * @param CompilationContext $compilationContext
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(CompilationContext $compilationContext): void
     {
@@ -51,8 +54,12 @@ public function compile(CompilationContext $compilationContext): void
 
                 $expr = new Expression($expression['left']);
                 $expr->setReadOnly(true);
-                $exprVar = $expr->compile($compilationContext);
-                $variable = $compilationContext->symbolTable->getVariableForWrite($exprVar->getCode(), $compilationContext, $this->statement);
+                $exprVar  = $expr->compile($compilationContext);
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $exprVar->getCode(),
+                    $compilationContext,
+                    $this->statement
+                );
 
                 $expr = new Expression($expression['right']);
                 $expr->setReadOnly(true);
@@ -63,21 +70,33 @@ public function compile(CompilationContext $compilationContext): void
             case 'property-dinamic-access':
                 $expr = new Expression($expression['left']);
                 $expr->setReadOnly(true);
-                $exprVar = $expr->compile($compilationContext);
-                $variable = $compilationContext->symbolTable->getVariableForWrite($exprVar->getCode(), $compilationContext, $this->statement);
+                $exprVar      = $expr->compile($compilationContext);
+                $variable     = $compilationContext->symbolTable->getVariableForWrite(
+                    $exprVar->getCode(),
+                    $compilationContext,
+                    $this->statement
+                );
                 $variableCode = $compilationContext->backend->getVariableCode($variable);
 
                 $compilationContext->headersManager->add('kernel/object');
-                $compilationContext->codePrinter->output('zephir_unset_property('.$variableCode.', "'.$expression['right']['value'].'");');
+                $compilationContext->codePrinter->output(
+                    'zephir_unset_property(' . $variableCode . ', "' . $expression['right']['value'] . '");'
+                );
 
                 return;
 
             default:
-                throw new CompilerException('Cannot use expression type: '.$expression['type'].' in "unset"', $expression);
+                throw new CompilerException(
+                    'Cannot use expression type: ' . $expression['type'] . ' in "unset"',
+                    $expression
+                );
         }
 
-        if (!\in_array($variable->getType(), ['variable', 'array'])) {
-            throw new CompilerException('Cannot use variable type: '.$variable->gettype().' in "unset"', $expression['left']);
+        if (!in_array($variable->getType(), ['variable', 'array'])) {
+            throw new CompilerException(
+                'Cannot use variable type: ' . $variable->gettype() . ' in "unset"',
+                $expression['left']
+            );
         }
 
         if ($variable->hasDifferentDynamicType(['undefined', 'array', 'object', 'null'])) {
@@ -97,36 +116,50 @@ public function compile(CompilationContext $compilationContext): void
      * @return CompilationContext
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
-    private function generateUnsetPropertyFromObject(array $expression, CompilationContext $compilationContext): CompilationContext
-    {
+    private function generateUnsetPropertyFromObject(
+        array $expression,
+        CompilationContext $compilationContext
+    ): CompilationContext {
         $expr = new Expression($expression['right']);
         $expr->setReadOnly(true);
         $exprVar = $expr->compile($compilationContext);
 
         switch ($exprVar->getType()) {
             case 'variable':
-                $variable = $compilationContext->symbolTable->getVariableForRead($exprVar->getCode(), $compilationContext, $this->statement);
+                $variable    = $compilationContext->symbolTable->getVariableForRead(
+                    $exprVar->getCode(),
+                    $compilationContext,
+                    $this->statement
+                );
                 $variableRef = $compilationContext->backend->getVariableCode($variable);
                 break;
 
             default:
                 $expr = new Expression($expression['left']);
                 $expr->setReadOnly(true);
-                $exprVar = $expr->compile($compilationContext);
-                $variable = $compilationContext->symbolTable->getVariableForWrite($exprVar->getCode(), $compilationContext, $this->statement);
+                $exprVar  = $expr->compile($compilationContext);
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $exprVar->getCode(),
+                    $compilationContext,
+                    $this->statement
+                );
 
                 $variableRef = $compilationContext->backend->getVariableCode($variable);
 
                 // TODO: Add more types check when parser will support them, see ArrayAccessTest.zep
                 switch ($expression['right']['type']) {
                     case 'string':
-                        $compilationContext->codePrinter->output('ZVAL_STR('.$variableRef.', "'.$expression['right']['value'].'");');
+                        $compilationContext->codePrinter->output(
+                            'ZVAL_STR(' . $variableRef . ', "' . $expression['right']['value'] . '");'
+                        );
                         break;
 
                     case 'int':
-                        $compilationContext->codePrinter->output('ZVAL_LONG('.$variableRef.', '.$expression['right']['value'].');');
+                        $compilationContext->codePrinter->output(
+                            'ZVAL_LONG(' . $variableRef . ', ' . $expression['right']['value'] . ');'
+                        );
                         break;
                 }
                 break;
@@ -134,13 +167,17 @@ private function generateUnsetPropertyFromObject(array $expression, CompilationC
 
         $expr = new Expression($expression['left']['left']);
         $expr->setReadOnly(true);
-        $exprVar = $expr->compile($compilationContext);
-        $variable = $compilationContext->symbolTable->getVariableForWrite($exprVar->getCode(), $compilationContext, $this->statement);
+        $exprVar      = $expr->compile($compilationContext);
+        $variable     = $compilationContext->symbolTable->getVariableForWrite(
+            $exprVar->getCode(),
+            $compilationContext,
+            $this->statement
+        );
         $variableCode = $compilationContext->backend->getVariableCode($variable);
 
         $compilationContext->headersManager->add('kernel/object');
         $compilationContext->codePrinter->output(
-            'zephir_unset_property_array('.$variableCode.', ZEND_STRL("'.$expression['left']['right']['value'].'"), '.$variableRef.');'
+            'zephir_unset_property_array(' . $variableCode . ', ZEND_STRL("' . $expression['left']['right']['value'] . '"), ' . $variableRef . ');'
         );
 
         return $compilationContext;
diff --git a/src/Statements/WhileStatement.php b/src/Statements/WhileStatement.php
index d548850957..7eebf11db2 100644
--- a/src/Statements/WhileStatement.php
+++ b/src/Statements/WhileStatement.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
@@ -29,7 +29,7 @@ class WhileStatement extends StatementAbstract
      */
     public function compile(CompilationContext $compilationContext): void
     {
-        $exprRaw = $this->statement['expr'];
+        $exprRaw     = $this->statement['expr'];
         $codePrinter = $compilationContext->codePrinter;
 
         /*
@@ -44,12 +44,12 @@ public function compile(CompilationContext $compilationContext): void
          */
         ++$compilationContext->insideCycle;
 
-        $expr = new EvalExpression();
-        $condition = $expr->optimize($exprRaw, $compilationContext);
+        $expr                 = new EvalExpression();
+        $condition            = $expr->optimize($exprRaw, $compilationContext);
         $this->evalExpression = $expr;
 
-        $codePrinter->output('if (!('.$condition.')) {');
-        $codePrinter->output("\t".'break;');
+        $codePrinter->output('if (!(' . $condition . ')) {');
+        $codePrinter->output("\t" . 'break;');
         $codePrinter->output('}');
 
         $codePrinter->decreaseLevel();
diff --git a/src/StatementsBlock.php b/src/StatementsBlock.php
index 7930c06ed8..14af14f71d 100644
--- a/src/StatementsBlock.php
+++ b/src/StatementsBlock.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
+use ReflectionException;
 use Zephir\Passes\MutateGathererPass;
 use Zephir\Statements\BreakStatement;
 use Zephir\Statements\ContinueStatement;
@@ -32,24 +33,23 @@
 use Zephir\Statements\UnsetStatement;
 use Zephir\Statements\WhileStatement;
 
+use function count;
+
 /**
  * This represents a single basic block in Zephir.
  * A statements block is simply a container of instructions that execute sequentially.
  */
 class StatementsBlock
 {
-    protected ?bool $unreachable = null;
-
     protected $debug = false;
-
-    protected $loop = false;
-
-    protected $mutateGatherer;
-
     /**
      * @var array|null
      */
     protected $lastStatement;
+    protected $loop = false;
+
+    protected $mutateGatherer;
+    protected ?bool $unreachable = null;
 
     public function __construct(protected $statements)
     {
@@ -65,20 +65,6 @@ public function __construct(protected $statements)
         $this->debug = filter_var($debug, FILTER_VALIDATE_BOOLEAN);
     }
 
-    /**
-     * Sets whether the statements block belongs to a loop.
-     *
-     * @param bool $loop
-     *
-     * @return StatementsBlock
-     */
-    public function isLoop(bool $loop): static
-    {
-        $this->loop = $loop;
-
-        return $this;
-    }
-
     /**
      * @param CompilationContext $compilationContext
      * @param bool               $unreachable
@@ -87,10 +73,13 @@ public function isLoop(bool $loop): static
      * @return Branch
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
-    public function compile(CompilationContext $compilationContext, bool $unreachable = null, int $branchType = Branch::TYPE_UNKNOWN): Branch
-    {
+    public function compile(
+        CompilationContext $compilationContext,
+        bool $unreachable = null,
+        int $branchType = Branch::TYPE_UNKNOWN
+    ): Branch {
         $compilationContext->codePrinter->increaseLevel();
         ++$compilationContext->currentBranch;
 
@@ -137,7 +126,7 @@ public function compile(CompilationContext $compilationContext, bool $unreachabl
                 if (isset($statement['file'])) {
                     if ('declare' != $statement['type'] && 'comment' != $statement['type']) {
                         $compilationContext->codePrinter->outputNoIndent(
-                            '#line '.$statement['line'].' "'.$statement['file'].'"'
+                            '#line ' . $statement['line'] . ' "' . $statement['file'] . '"'
                         );
                     }
                 }
@@ -289,19 +278,19 @@ public function compile(CompilationContext $compilationContext, bool $unreachabl
                     $expr = new Expression($statement['expr']);
                     $expr->setExpectReturn(false);
                     $compiledExpression = $expr->compile($compilationContext);
-                    $compilationContext->codePrinter->output($compiledExpression->getCode().';');
+                    $compilationContext->codePrinter->output($compiledExpression->getCode() . ';');
                     break;
 
                 case 'mcall':
                     $methodCall = new MethodCall();
-                    $expr = new Expression($statement['expr']);
+                    $expr       = new Expression($statement['expr']);
                     $expr->setExpectReturn(false);
                     $methodCall->compile($expr, $compilationContext);
                     break;
 
                 case 'fcall':
                     $functionCall = new FunctionCall();
-                    $expr = new Expression($statement['expr']);
+                    $expr         = new Expression($statement['expr']);
                     $expr->setExpectReturn(false);
                     $compiledExpression = $functionCall->compile($expr, $compilationContext);
                     switch ($compiledExpression->getType()) {
@@ -313,14 +302,14 @@ public function compile(CompilationContext $compilationContext, bool $unreachabl
                         case 'char':
                         case 'uchar':
                         case 'bool':
-                            $compilationContext->codePrinter->output($compiledExpression->getCode().';');
+                            $compilationContext->codePrinter->output($compiledExpression->getCode() . ';');
                             break;
                     }
                     break;
 
                 case 'scall':
                     $methodCall = new StaticCall();
-                    $expr = new Expression($statement['expr']);
+                    $expr       = new Expression($statement['expr']);
                     $expr->setExpectReturn(false);
                     $methodCall->compile($expr, $compilationContext);
                     break;
@@ -334,7 +323,7 @@ public function compile(CompilationContext $compilationContext, bool $unreachabl
                     break;
 
                 default:
-                    throw new Exception('Unsupported statement: '.$statement['type']);
+                    throw new Exception('Unsupported statement: ' . $statement['type']);
             }
 
             if ('comment' != $statement['type']) {
@@ -364,43 +353,53 @@ public function compile(CompilationContext $compilationContext, bool $unreachabl
     }
 
     /**
-     * Returns the statements in the block.
+     * Returns the last statement executed.
      *
-     * @return array
+     * @return array|null
      */
-    public function getStatements(): array
+    public function getLastStatement()
     {
-        return $this->statements;
+        return $this->lastStatement;
     }
 
     /**
-     * Setter for statements.
+     * Returns the type of the last statement executed.
      *
-     * @param array $statements
+     * @return string
      */
-    public function setStatements(array $statements): void
+    public function getLastStatementType()
     {
-        $this->statements = $statements;
+        return $this->lastStatement['type'];
     }
 
     /**
-     * Returns the type of the last statement executed.
+     * Create/Returns a mutate gatherer pass for this block.
      *
-     * @return string
+     * @param bool $pass
+     *
+     * @return MutateGathererPass
      */
-    public function getLastStatementType()
+    public function getMutateGatherer(bool $pass = false): MutateGathererPass
     {
-        return $this->lastStatement['type'];
+        if (!$this->mutateGatherer) {
+            $this->mutateGatherer = new MutateGathererPass();
+        }
+
+        if ($pass) {
+            $this->mutateGatherer->pass($this);
+        }
+
+        return $this->mutateGatherer;
     }
 
     /**
-     * Returns the last statement executed.
+     * Returns the statements in the block.
      *
-     * @return array|null
+     * @return array
      */
-    public function getLastStatement()
+    public function getStatements(): array
     {
-        return $this->lastStatement;
+        return $this->statements;
     }
 
     /**
@@ -410,26 +409,30 @@ public function getLastStatement()
      */
     public function isEmpty(): bool
     {
-        return 0 === \count($this->statements);
+        return 0 === count($this->statements);
     }
 
     /**
-     * Create/Returns a mutate gatherer pass for this block.
+     * Sets whether the statements block belongs to a loop.
      *
-     * @param bool $pass
+     * @param bool $loop
      *
-     * @return MutateGathererPass
+     * @return StatementsBlock
      */
-    public function getMutateGatherer(bool $pass = false): MutateGathererPass
+    public function isLoop(bool $loop): static
     {
-        if (!$this->mutateGatherer) {
-            $this->mutateGatherer = new MutateGathererPass();
-        }
+        $this->loop = $loop;
 
-        if ($pass) {
-            $this->mutateGatherer->pass($this);
-        }
+        return $this;
+    }
 
-        return $this->mutateGatherer;
+    /**
+     * Setter for statements.
+     *
+     * @param array $statements
+     */
+    public function setStatements(array $statements): void
+    {
+        $this->statements = $statements;
     }
 }
diff --git a/src/StaticCall.php b/src/StaticCall.php
index 984b39ff72..81270e8dcc 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,14 +9,22 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
+use ReflectionException;
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 
+use function count;
+use function in_array;
+use function is_object;
+use function is_string;
+
 /**
  * Call methods in a static context
  */
@@ -33,13 +39,13 @@ class StaticCall extends Call
      * @return CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function compile(Expression $expr, CompilationContext $compilationContext): CompiledExpression
     {
         $expression = $expr->getExpression();
 
-        $methodName = strtolower($expression['name']);
+        $methodName    = strtolower($expression['name']);
         $dynamicMethod = $expression['dynamic'] ?? false;
 
         $symbolVariable = null;
@@ -47,19 +53,25 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         /**
          * Create temporary variable if needed.
          */
-        $mustInit = false;
+        $mustInit    = false;
         $isExpecting = $expr->isExpectingReturn();
         if ($isExpecting) {
             $symbolVariable = $expr->getExpectingVariable();
-            if (\is_object($symbolVariable)) {
+            if (is_object($symbolVariable)) {
                 $readDetector = new ReadDetector();
                 if ($readDetector->detect($symbolVariable->getName(), $expression)) {
-                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
+                    $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                        'variable',
+                        $compilationContext
+                    );
                 } else {
                     $mustInit = true;
                 }
             } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify('variable', $compilationContext);
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                    'variable',
+                    $compilationContext
+                );
             }
         }
 
@@ -73,7 +85,10 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             $symbolVariable->setDynamicTypes('undefined');
 
             if (!$symbolVariable->isVariable()) {
-                throw new CompilerException('Returned values by functions can only be assigned to variant variables', $expression);
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
             }
         }
 
@@ -86,11 +101,11 @@ public function compile(Expression $expr, CompilationContext $compilationContext
 
         $dynamicClass = $expression['dynamic-class'];
         if (!$dynamicClass) {
-            $className = $expression['class'];
+            $className       = $expression['class'];
             $classDefinition = false;
 
-            if (!\in_array($className, ['self', 'static', 'parent'])) {
-                if (\is_string($className)) {
+            if (!in_array($className, ['self', 'static', 'parent'])) {
+                if (is_string($className)) {
                     $className = $compilationContext->getFullName($className);
                     if ($compiler->isClass($className)) {
                         $classDefinition = $compiler->getClassDefinition($className);
@@ -98,7 +113,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         if ($compiler->isBundledClass($className)) {
                             $classDefinition = $compiler->getInternalClassDefinition($className);
                         } else {
-                            throw new CompilerException('Class name: '.$className.' does not exist', $expression);
+                            throw new CompilerException('Class name: ' . $className . ' does not exist', $expression);
                         }
                     }
                 } else {
@@ -107,7 +122,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         if ($compiler->isClass($singleClass)) {
                             $classDefinition = $compiler->getClassDefinition($singleClass);
                         } else {
-                            throw new CompilerException('Class name: '.$className.' does not exist', $expression);
+                            throw new CompilerException('Class name: ' . $className . ' does not exist', $expression);
                         }
                     }
                 }
@@ -117,10 +132,17 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                 if ('parent' === $className) {
                     $extendsClass = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot call method "'.$methodName.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $expression);
+                        throw new CompilerException(
+                            'Cannot call method "'
+                            . $methodName
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $expression
+                        );
                     }
                     $currentClassDefinition = $classDefinition;
-                    $classDefinition = $classDefinition->getExtendsClassDefinition();
+                    $classDefinition        = $classDefinition->getExtendsClassDefinition();
                 }
             }
         }
@@ -134,19 +156,41 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             if (!$classDefinition->hasMethod($methodName)) {
                 $possibleMethod = $classDefinition->getPossibleMethodName($methodName);
                 if ($possibleMethod) {
-                    throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not implement static method: '".$expression['name']."'. Did you mean '".$possibleMethod."'?", $expression);
+                    throw new CompilerException(
+                        "Class '"
+                        . $classDefinition->getCompleteName()
+                        . "' does not implement static method: '"
+                        . $expression['name']
+                        . "'. Did you mean '"
+                        . $possibleMethod
+                        . "'?",
+                        $expression
+                    );
                 } else {
-                    throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not implement static method: '".$expression['name']."'", $expression);
+                    throw new CompilerException(
+                        "Class '"
+                        . $classDefinition->getCompleteName()
+                        . "' does not implement static method: '"
+                        . $expression['name']
+                        . "'",
+                        $expression
+                    );
                 }
             } else {
                 $method = $classDefinition->getMethod($methodName);
 
                 if ($method->isPrivate() && $method->getClassDefinition() !== $compilationContext->classDefinition) {
-                    throw new CompilerException("Cannot call private method '".$methodName."' out of its scope", $expression);
+                    throw new CompilerException(
+                        "Cannot call private method '" . $methodName . "' out of its scope",
+                        $expression
+                    );
                 }
 
-                if (!\in_array($className, ['self', 'static', 'parent']) && !$method->isStatic()) {
-                    throw new CompilerException("Cannot call non-static method '".$methodName."' in a static way", $expression);
+                if (!in_array($className, ['self', 'static', 'parent']) && !$method->isStatic()) {
+                    throw new CompilerException(
+                        "Cannot call non-static method '" . $methodName . "' in a static way",
+                        $expression
+                    );
                 }
 
                 if (!$classDefinition->hasMethod('__callStatic')) {
@@ -154,27 +198,53 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         /**
                          * Try to produce an exception if method is called with a wrong number of parameters
                          */
-                        $callNumberParameters = isset($expression['parameters']) ? \count($expression['parameters']) : 0;
+                        $callNumberParameters = isset($expression['parameters']) ? count(
+                            $expression['parameters']
+                        ) : 0;
 
-                        $classMethod = $classDefinition->getMethod($methodName);
+                        $classMethod              = $classDefinition->getMethod($methodName);
                         $expectedNumberParameters = $classMethod->getNumberOfRequiredParameters();
 
                         if (!$expectedNumberParameters && $callNumberParameters > 0) {
                             $numberParameters = $classMethod->getNumberOfParameters();
                             if ($callNumberParameters > $numberParameters) {
-                                throw new CompilerException("Method '".$classDefinition->getCompleteName().'::'.$expression['name']."' called with a wrong number of parameters, the method has: ".$expectedNumberParameters.', passed: '.$callNumberParameters, $expression);
+                                throw new CompilerException(
+                                    "Method '" . $classDefinition->getCompleteName(
+                                    ) . '::' . $expression['name']
+                                    . "' called with a wrong number of parameters, the method has: "
+                                    . $expectedNumberParameters
+                                    . ', passed: '
+                                    . $callNumberParameters,
+                                    $expression
+                                );
                             }
                         }
 
                         if ($callNumberParameters < $expectedNumberParameters) {
-                            throw new CompilerException("Method '".$classDefinition->getCompleteName().'::'.$expression['name']."' called with a wrong number of parameters, the method has: ".$expectedNumberParameters.', passed: '.$callNumberParameters, $expression);
+                            throw new CompilerException(
+                                "Method '"
+                                . $classDefinition->getCompleteName()
+                                . '::'
+                                . $expression['name']
+                                . "' called with a wrong number of parameters, the method has: "
+                                . $expectedNumberParameters
+                                . ', passed: '
+                                . $callNumberParameters,
+                                $expression
+                            );
                         }
                     }
                 } else {
                     if (!isset($method)) {
                         $method = $classDefinition->getMethod('__callStatic');
-                        if ($method->isPrivate() && $method->getClassDefinition() !== $compilationContext->classDefinition) {
-                            throw new CompilerException("Cannot call private magic method '__call' out of its scope", $expression);
+                        if (
+                            $method->isPrivate() &&
+                            $method->getClassDefinition() !== $compilationContext->classDefinition
+                        ) {
+                            throw new CompilerException(
+                                "Cannot call private magic method '__call' out of its scope",
+                                $expression
+                            );
                         }
                     }
                 }
@@ -187,21 +257,64 @@ public function compile(Expression $expr, CompilationContext $compilationContext
          */
         if (!$dynamicMethod) {
             if ($dynamicClass) {
-                $this->callFromDynamicClass($methodName, $expression, $symbolVariable, $mustInit, $isExpecting, $compilationContext);
+                $this->callFromDynamicClass(
+                    $methodName,
+                    $expression,
+                    $symbolVariable,
+                    $mustInit,
+                    $isExpecting,
+                    $compilationContext
+                );
             } else {
-                if (\in_array($className, ['self', 'static']) || $classDefinition == $compilationContext->classDefinition) {
-                    $this->call(strtoupper($className), $methodName, $expression, $mustInit, $isExpecting, $compilationContext, $symbolVariable, $method ?? null);
+                if (
+                    in_array($className, ['self', 'static']) ||
+                    $classDefinition == $compilationContext->classDefinition
+                ) {
+                    $this->call(
+                        strtoupper($className),
+                        $methodName,
+                        $expression,
+                        $mustInit,
+                        $isExpecting,
+                        $compilationContext,
+                        $symbolVariable,
+                        $method ?? null
+                    );
                 } else {
                     if ('parent' == $className) {
-                        $this->callParent($methodName, $expression, $symbolVariable, $mustInit, $isExpecting, $currentClassDefinition, $compilationContext, $method ?? null);
+                        $this->callParent(
+                            $methodName,
+                            $expression,
+                            $symbolVariable,
+                            $mustInit,
+                            $isExpecting,
+                            $currentClassDefinition,
+                            $compilationContext,
+                            $method ?? null
+                        );
                     } else {
-                        $this->callFromClass($methodName, $expression, $symbolVariable, $mustInit, $isExpecting, $classDefinition, $compilationContext, $method ?? null);
+                        $this->callFromClass(
+                            $methodName,
+                            $expression,
+                            $symbolVariable,
+                            $mustInit,
+                            $isExpecting,
+                            $classDefinition,
+                            $compilationContext,
+                            $method ?? null
+                        );
                     }
                 }
             }
         } else {
             if ($dynamicClass) {
-                $this->callFromDynamicClassDynamicMethod($expression, $symbolVariable, $mustInit, $isExpecting, $compilationContext);
+                $this->callFromDynamicClassDynamicMethod(
+                    $expression,
+                    $symbolVariable,
+                    $mustInit,
+                    $isExpecting,
+                    $compilationContext
+                );
             }
         }
 
@@ -241,7 +354,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
     /**
      * Calls static methods on the 'self/static' context.
      *
-     * @param string             $context            SELF / STATIC
+     * @param string             $context SELF / STATIC
      * @param string             $methodName
      * @param array              $expression
      * @param bool               $mustInit
@@ -262,7 +375,7 @@ protected function call(
         Variable $symbolVariable = null,
         Method $method = null
     ): void {
-        if (!\in_array($context, ['SELF', 'STATIC'])) {
+        if (!in_array($context, ['SELF', 'STATIC'])) {
             $context = 'SELF';
         }
 
@@ -288,11 +401,11 @@ protected function call(
         /**
          * Check if the  method call can have an inline cache.
          */
-        $methodCache = $compilationContext->cacheManager->getStaticMethodCache();
+        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();
         $cachePointer = $methodCache->get($compilationContext, $method ?? null);
 
         $params = [];
-        if (isset($expression['parameters']) && \count($expression['parameters'])) {
+        if (isset($expression['parameters']) && count($expression['parameters'])) {
             $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
         }
 
@@ -300,33 +413,41 @@ protected function call(
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
-        $paramCount = \count($params);
-        $paramsStr = $paramCount ? ', '.implode(', ', $params) : '';
+        $paramCount = count($params);
+        $paramsStr  = $paramCount ? ', ' . implode(', ', $params) : '';
 
         $isInternal = isset($method) && $method->isInternal();
         if (!$isInternal) {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_'.$context.'("'.$methodName.'", '.$cachePointer.$paramsStr.');');
+                    $codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_' . $context . '("' . $methodName . '", ' . $cachePointer . $paramsStr . ');'
+                    );
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_'.$context.'('.$symbol.', "'.$methodName.'", '.$cachePointer.$paramsStr.');');
+                    $codePrinter->output(
+                        'ZEPHIR_CALL_' . $context . '(' . $symbol . ', "' . $methodName . '", ' . $cachePointer . $paramsStr . ');'
+                    );
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_'.$context.'(NULL, "'.$methodName.'", '.$cachePointer.$paramsStr.');');
+                $codePrinter->output(
+                    'ZEPHIR_CALL_' . $context . '(NULL, "' . $methodName . '", ' . $cachePointer . $paramsStr . ');'
+                );
             }
         } else {
             $ce = $method->getClassDefinition()->getClassEntry($compilationContext);
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
                     $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);
-                    $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
+                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');
                 } else {
                     $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);
-                    $codePrinter->output($macro.'('.$symbol.', '.$ce.', '.$method->getInternalName().$paramsStr.');');
+                    $codePrinter->output(
+                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'
+                    );
                 }
             } else {
                 $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);
-                $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
+                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');
             }
         }
 
@@ -334,14 +455,14 @@ protected function call(
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
 
         $this->addCallStatusOrJump($compilationContext);
     }
 
     /**
-     * Calls static methods on the 'parent' context.
+     * Calls static methods on some class context.
      *
      * @param string             $methodName
      * @param array              $expression
@@ -354,10 +475,30 @@ protected function call(
      *
      * @throws Exception
      */
-    protected function callParent(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method): void
-    {
+    protected function callFromClass(
+        $methodName,
+        array $expression,
+        $symbolVariable,
+        $mustInit,
+        $isExpecting,
+        Definition $classDefinition,
+        CompilationContext $compilationContext,
+        Method $method
+    ): void {
         $codePrinter = $compilationContext->codePrinter;
-        $classCe = $classDefinition->getClassEntry($compilationContext);
+
+        if ($classDefinition->isBundled()) {
+            $classEntryVariable = $compilationContext->symbolTable->addTemp('zend_class_entry', $compilationContext);
+            $compilationContext->backend->fetchClass(
+                $classEntryVariable,
+                'SL("' . str_replace('\\', '\\\\', $classDefinition->getName()) . '")',
+                false,
+                $compilationContext
+            );
+            $classEntry = $classEntryVariable->getName();
+        } else {
+            $classEntry = $classDefinition->getClassEntry($compilationContext);
+        }
 
         /**
          * Call static methods must grown the stack
@@ -369,36 +510,57 @@ protected function callParent(string $methodName, array $expression, $symbolVari
             $symbolVariable->trackVariant($compilationContext);
         }
 
+        $method = $method->getOptimizedMethod();
+
         /**
          * Check if the  method call can have an inline cache.
          */
-        $methodCache = $compilationContext->cacheManager->getStaticMethodCache();
-        $cachePointer = $methodCache->get($compilationContext, $method ?? null);
+        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();
+        $cachePointer = $methodCache->get($compilationContext, $method);
 
         $params = [];
-        if (isset($expression['parameters']) && \count($expression['parameters'])) {
+        if (isset($expression['parameters']) && count($expression['parameters'])) {
             $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
         }
 
-        if (!\count($params)) {
+        if ($symbolVariable) {
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+        }
+
+        $paramCount = count($params);
+        $paramsStr  = $paramCount ? ', ' . implode(', ', $params) : '';
+
+        if ($method->isInternal()) {
+            $ce = $classDefinition->getClassEntry($compilationContext);
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_PARENT('.$classCe.', getThis(), "'.$methodName.'", '.$cachePointer.');');
+                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);
+                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_PARENT(&'.$symbolVariable->getName().', '.$classCe.', getThis(), "'.$methodName.'", '.$cachePointer.');');
+                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);
+                    $codePrinter->output(
+                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'
+                    );
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_PARENT(NULL, '.$classCe.', getThis(), "'.$methodName.'", '.$cachePointer.');');
+                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);
+                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');
             }
         } else {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_PARENT('.$classCe.', getThis(), "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                    $codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_CE_STATIC(' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . $paramsStr . ');'
+                    );
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_PARENT(&'.$symbolVariable->getName().', '.$classCe.', getThis(), "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                    $codePrinter->output(
+                        'ZEPHIR_CALL_CE_STATIC(' . $symbol . ', ' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . $paramsStr . ');'
+                    );
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_PARENT(NULL, '.$classCe.', getThis(), "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                $codePrinter->output(
+                    'ZEPHIR_CALL_CE_STATIC(NULL, ' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . $paramsStr . ');'
+                );
             }
         }
 
@@ -406,91 +568,78 @@ protected function callParent(string $methodName, array $expression, $symbolVari
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
 
         $this->addCallStatusOrJump($compilationContext);
     }
 
     /**
-     * Calls static methods on some class context.
+     * Calls static methods on using a dynamic variable as class.
      *
      * @param string             $methodName
      * @param array              $expression
      * @param Variable           $symbolVariable
      * @param bool               $mustInit
      * @param bool               $isExpecting
-     * @param Definition         $classDefinition
      * @param CompilationContext $compilationContext
-     * @param Method             $method
-     *
-     * @throws Exception
      */
-    protected function callFromClass($methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, Definition $classDefinition, CompilationContext $compilationContext, Method $method): void
-    {
-        $codePrinter = $compilationContext->codePrinter;
-
-        if ($classDefinition->isBundled()) {
-            $classEntryVariable = $compilationContext->symbolTable->addTemp('zend_class_entry', $compilationContext);
-            $compilationContext->backend->fetchClass($classEntryVariable, 'SL("'.str_replace('\\', '\\\\', $classDefinition->getName()).'")', false, $compilationContext);
-            $classEntry = $classEntryVariable->getName();
-        } else {
-            $classEntry = $classDefinition->getClassEntry($compilationContext);
-        }
-
-        /**
-         * Call static methods must grown the stack
-         */
-        $compilationContext->symbolTable->mustGrownStack(true);
-
-        if ($mustInit) {
-            $symbolVariable->setMustInitNull(true);
-            $symbolVariable->trackVariant($compilationContext);
-        }
-
-        $method = $method->getOptimizedMethod();
-
-        /**
-         * Check if the  method call can have an inline cache.
-         */
-        $methodCache = $compilationContext->cacheManager->getStaticMethodCache();
-        $cachePointer = $methodCache->get($compilationContext, $method);
-
-        $params = [];
-        if (isset($expression['parameters']) && \count($expression['parameters'])) {
-            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
-        }
+    protected function callFromDynamicClass(
+        string $methodName,
+        array $expression,
+        $symbolVariable,
+        $mustInit,
+        $isExpecting,
+        CompilationContext $compilationContext
+    ): void {
+        [$params, $classEntry] = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
 
         if ($symbolVariable) {
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
-        $paramCount = \count($params);
-        $paramsStr = $paramCount ? ', '.implode(', ', $params) : '';
+        $cachePointer = 'NULL, 0';
 
-        if ($method->isInternal()) {
-            $ce = $classDefinition->getClassEntry($compilationContext);
+        if (!count($params)) {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);
-                    $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_CE_STATIC(' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . ');'
+                    );
                 } else {
-                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);
-                    $codePrinter->output($macro.'('.$symbol.', '.$ce.', '.$method->getInternalName().$paramsStr.');');
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_CALL_CE_STATIC(' . $symbol . ', ' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . ');'
+                    );
                 }
             } else {
-                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);
-                $codePrinter->output($macro.'('.$ce.', '.$method->getInternalName().$paramsStr.');');
+                $compilationContext->codePrinter->output(
+                    'ZEPHIR_CALL_CE_STATIC(NULL, ' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . ');'
+                );
             }
         } else {
             if ($isExpecting) {
                 if ('return_value' == $symbolVariable->getName()) {
-                    $codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.$paramsStr.');');
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_CE_STATIC(' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . ', ' . implode(
+                            ', ',
+                            $params
+                        ) . ');'
+                    );
                 } else {
-                    $codePrinter->output('ZEPHIR_CALL_CE_STATIC('.$symbol.', '.$classEntry.', "'.$methodName.'", '.$cachePointer.$paramsStr.');');
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_CALL_CE_STATIC(' . $symbol . ', ' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . ', ' . implode(
+                            ', ',
+                            $params
+                        ) . ');'
+                    );
                 }
             } else {
-                $codePrinter->output('ZEPHIR_CALL_CE_STATIC(NULL, '.$classEntry.', "'.$methodName.'", '.$cachePointer.$paramsStr.');');
+                $compilationContext->codePrinter->output(
+                    'ZEPHIR_CALL_CE_STATIC(NULL, ' . $classEntry . ', "' . $methodName . '", ' . $cachePointer . ', ' . implode(
+                        ', ',
+                        $params
+                    ) . ');'
+                );
             }
         }
 
@@ -498,51 +647,85 @@ protected function callFromClass($methodName, array $expression, $symbolVariable
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $compilationContext->codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
 
         $this->addCallStatusOrJump($compilationContext);
     }
 
     /**
-     * Calls static methods on using a dynamic variable as class.
+     * Calls static methods on using a dynamic variable as class and a dynamic method.
      *
-     * @param string             $methodName
      * @param array              $expression
      * @param Variable           $symbolVariable
      * @param bool               $mustInit
      * @param bool               $isExpecting
      * @param CompilationContext $compilationContext
      */
-    protected function callFromDynamicClass(string $methodName, array $expression, $symbolVariable, $mustInit, $isExpecting, CompilationContext $compilationContext): void
-    {
+    protected function callFromDynamicClassDynamicMethod(
+        array $expression,
+        $symbolVariable,
+        bool $mustInit,
+        bool $isExpecting,
+        CompilationContext $compilationContext
+    ): void {
         [$params, $classEntry] = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
 
+        /**
+         * Obtain the method name from the variable.
+         */
+        $methodNameVariable = $compilationContext->symbolTable->getVariableForRead(
+            $expression['name'],
+            $compilationContext,
+            $expression
+        );
+        if ($methodNameVariable->isNotVariableAndString()) {
+            throw new CompilerException('Only dynamic/string variables can be used in dynamic methods', $expression);
+        }
+
         if ($symbolVariable) {
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
         }
 
         $cachePointer = 'NULL, 0';
 
-        if (!\count($params)) {
+        if (!count($params)) {
             if ($isExpecting) {
-                if ('return_value' == $symbolVariable->getName()) {
-                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
+                if ('return_value' === $symbolVariable->getName()) {
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL(' . $classEntry . ', ' . $methodNameVariable->getName(
+                        ) . ', ' . $cachePointer . ');'
+                    );
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC('.$symbol.', '.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_CALL_CE_STATIC_ZVAL(' . $symbol . ', ' . $classEntry . ', ' . $methodNameVariable->getName(
+                        ) . ', ' . $cachePointer . ');'
+                    );
                 }
             } else {
-                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC(NULL, '.$classEntry.', "'.$methodName.'", '.$cachePointer.');');
+                $compilationContext->codePrinter->output(
+                    'ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, ' . $classEntry . ', ' . $methodNameVariable->getName(
+                    ) . ', ' . $cachePointer . ');'
+                );
             }
         } else {
             if ($isExpecting) {
-                if ('return_value' == $symbolVariable->getName()) {
-                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC('.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                if ('return_value' === $symbolVariable->getName()) {
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL(' . $classEntry . ', ' . $methodNameVariable->getName(
+                        ) . ', ' . $cachePointer . ', ' . implode(', ', $params) . ');'
+                    );
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC('.$symbol.', '.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                    $compilationContext->codePrinter->output(
+                        'ZEPHIR_CALL_CE_STATIC_ZVAL(' . $symbol . ', ' . $classEntry . ', ' . $methodNameVariable->getName(
+                        ) . ', ' . $cachePointer . ', ' . implode(', ', $params) . ');'
+                    );
                 }
             } else {
-                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC(NULL, '.$classEntry.', "'.$methodName.'", '.$cachePointer.', '.implode(', ', $params).');');
+                $compilationContext->codePrinter->output(
+                    'ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, ' . $classEntry . ', ' . $methodNameVariable->getName(
+                    ) . ', ' . $cachePointer . ', ' . implode(', ', $params) . ');'
+                );
             }
         }
 
@@ -550,58 +733,102 @@ protected function callFromDynamicClass(string $methodName, array $expression, $
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $compilationContext->codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $compilationContext->codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
 
         $this->addCallStatusOrJump($compilationContext);
     }
 
     /**
-     * Calls static methods on using a dynamic variable as class and a dynamic method.
+     * Calls static methods on the 'parent' context.
      *
+     * @param string             $methodName
      * @param array              $expression
      * @param Variable           $symbolVariable
      * @param bool               $mustInit
      * @param bool               $isExpecting
+     * @param Definition         $classDefinition
      * @param CompilationContext $compilationContext
+     * @param Method             $method
+     *
+     * @throws Exception
      */
-    protected function callFromDynamicClassDynamicMethod(array $expression, $symbolVariable, bool $mustInit, bool $isExpecting, CompilationContext $compilationContext): void
-    {
-        [$params, $classEntry] = $this->fetchClassParams($expression, $compilationContext, $symbolVariable, $mustInit);
+    protected function callParent(
+        string $methodName,
+        array $expression,
+        $symbolVariable,
+        $mustInit,
+        $isExpecting,
+        Definition $classDefinition,
+        CompilationContext $compilationContext,
+        Method $method
+    ): void {
+        $codePrinter = $compilationContext->codePrinter;
+        $classCe     = $classDefinition->getClassEntry($compilationContext);
 
         /**
-         * Obtain the method name from the variable.
+         * Call static methods must grown the stack
          */
-        $methodNameVariable = $compilationContext->symbolTable->getVariableForRead($expression['name'], $compilationContext, $expression);
-        if ($methodNameVariable->isNotVariableAndString()) {
-            throw new CompilerException('Only dynamic/string variables can be used in dynamic methods', $expression);
-        }
+        $compilationContext->symbolTable->mustGrownStack(true);
 
-        if ($symbolVariable) {
-            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+        if ($mustInit) {
+            $symbolVariable->setMustInitNull(true);
+            $symbolVariable->trackVariant($compilationContext);
         }
 
-        $cachePointer = 'NULL, 0';
+        /**
+         * Check if the  method call can have an inline cache.
+         */
+        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();
+        $cachePointer = $methodCache->get($compilationContext, $method ?? null);
+
+        $params = [];
+        if (isset($expression['parameters']) && count($expression['parameters'])) {
+            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);
+        }
 
-        if (!\count($params)) {
+        if (!count($params)) {
             if ($isExpecting) {
-                if ('return_value' === $symbolVariable->getName()) {
-                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL('.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
+                if ('return_value' == $symbolVariable->getName()) {
+                    $codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_PARENT(' . $classCe . ', getThis(), "' . $methodName . '", ' . $cachePointer . ');'
+                    );
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL('.$symbol.', '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
+                    $codePrinter->output(
+                        'ZEPHIR_CALL_PARENT(&' . $symbolVariable->getName(
+                        ) . ', ' . $classCe . ', getThis(), "' . $methodName . '", ' . $cachePointer . ');'
+                    );
                 }
             } else {
-                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.');');
+                $codePrinter->output(
+                    'ZEPHIR_CALL_PARENT(NULL, ' . $classCe . ', getThis(), "' . $methodName . '", ' . $cachePointer . ');'
+                );
             }
         } else {
             if ($isExpecting) {
-                if ('return_value' === $symbolVariable->getName()) {
-                    $compilationContext->codePrinter->output('ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL('.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
+                if ('return_value' == $symbolVariable->getName()) {
+                    $codePrinter->output(
+                        'ZEPHIR_RETURN_CALL_PARENT(' . $classCe . ', getThis(), "' . $methodName . '", ' . $cachePointer . ', ' . implode(
+                            ', ',
+                            $params
+                        ) . ');'
+                    );
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL('.$symbol.', '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
+                    $codePrinter->output(
+                        'ZEPHIR_CALL_PARENT(&' . $symbolVariable->getName(
+                        ) . ', ' . $classCe . ', getThis(), "' . $methodName . '", ' . $cachePointer . ', ' . implode(
+                            ', ',
+                            $params
+                        ) . ');'
+                    );
                 }
             } else {
-                $compilationContext->codePrinter->output('ZEPHIR_CALL_CE_STATIC_ZVAL(NULL, '.$classEntry.', '.$methodNameVariable->getName().', '.$cachePointer.', '.implode(', ', $params).');');
+                $codePrinter->output(
+                    'ZEPHIR_CALL_PARENT(NULL, ' . $classCe . ', getThis(), "' . $methodName . '", ' . $cachePointer . ', ' . implode(
+                        ', ',
+                        $params
+                    ) . ');'
+                );
             }
         }
 
@@ -609,14 +836,18 @@ protected function callFromDynamicClassDynamicMethod(array $expression, $symbolV
          * Temporary variables must be copied if they have more than one reference
          */
         foreach ($this->getMustCheckForCopyVariables() as $checkVariable) {
-            $compilationContext->codePrinter->output('zephir_check_temp_parameter('.$checkVariable.');');
+            $codePrinter->output('zephir_check_temp_parameter(' . $checkVariable . ');');
         }
 
         $this->addCallStatusOrJump($compilationContext);
     }
 
-    private function fetchClassParams(array $expression, CompilationContext $compilationContext, Variable $symbolVariable, bool $mustInit): array
-    {
+    private function fetchClassParams(
+        array $expression,
+        CompilationContext $compilationContext,
+        Variable $symbolVariable,
+        bool $mustInit
+    ): array {
         /**
          * Call static methods must grow the stack
          */
@@ -635,7 +866,11 @@ private function fetchClassParams(array $expression, CompilationContext $compila
         /**
          * Obtain the class entry from the variable.
          */
-        $classNameVariable = $compilationContext->symbolTable->getVariableForRead($expression['class'], $compilationContext, $expression);
+        $classNameVariable = $compilationContext->symbolTable->getVariableForRead(
+            $expression['class'],
+            $compilationContext,
+            $expression
+        );
         if ($classNameVariable->isNotVariableAndString()) {
             throw new CompilerException('Only dynamic/string variables can be used in dynamic classes', $expression);
         }
diff --git a/src/Stubs/DocBlock.php b/src/Stubs/DocBlock.php
index 41f5320fc4..211062b2b4 100644
--- a/src/Stubs/DocBlock.php
+++ b/src/Stubs/DocBlock.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Stubs;
 
+use function count;
+
 /**
  * @author Gusakov Nikita <dev@nkt.me>
  */
@@ -21,13 +23,11 @@ class DocBlock
     /**
      * @var string
      */
-    protected string $indent;
-
+    protected string $description = '';
     /**
      * @var string
      */
-    protected string $description = '';
-
+    protected string $indent;
     /**
      * @var array
      */
@@ -40,8 +40,8 @@ class DocBlock
     public function __construct(?string $source, string $indent = '    ')
     {
         $this->indent = $indent;
-        $lines = explode("\n", trim($source ?: ''));
-        $count = \count($lines);
+        $lines        = explode("\n", trim($source ?: ''));
+        $count        = count($lines);
 
         foreach ($lines as $i => $line) {
             $line = preg_replace('#^([\s\t]+)?/?([*]+)([\s\t]+)?$#im', '', rtrim($line));
@@ -58,11 +58,11 @@ public function __construct(?string $source, string $indent = '    ')
                 $this->lines[] = $cleaned;
             } else {
                 $line = preg_replace('#([\s\t]+)?[*]#', '', $line);
-                $line = preg_replace('#([\s\t]+)?[*]([\s\t]){1,2}#', '$1* ', ' * '.$line);
+                $line = preg_replace('#([\s\t]+)?[*]([\s\t]){1,2}#', '$1* ', ' * ' . $line);
                 $line = preg_replace('#[*]([\s\t])+$#', '*', $line);
                 $line = preg_replace('#\t#', $indent, $line);
 
-                $this->lines[] = array_pop($this->lines)."\n{$this->indent}".$line;
+                $this->lines[] = array_pop($this->lines) . "\n{$this->indent}" . $line;
             }
         }
 
@@ -71,7 +71,7 @@ public function __construct(?string $source, string $indent = '    ')
             $description = explode("\n", $description);
 
             $cleaned = [];
-            $empty = 0;
+            $empty   = 0;
             foreach ($description as $i => $line) {
                 if (preg_match('#^([\s\t]+)?[*]([\s\t]+)?$#', $line)) {
                     ++$empty;
@@ -100,7 +100,7 @@ public function __construct(?string $source, string $indent = '    ')
      */
     public function __toString(): string
     {
-        $doc = '';
+        $doc    = '';
         $indent = $this->indent;
 
         if (!empty($this->description)) {
@@ -108,13 +108,13 @@ public function __toString(): string
         }
 
         if (!empty($this->lines)) {
-            $lines = array_map(fn ($line) => "$indent * $line", $this->lines);
+            $lines = array_map(fn($line) => "$indent * $line", $this->lines);
 
             if (!empty($doc)) {
                 $doc .= "\n$indent *";
             }
 
-            $doc .= "\n".implode("\n", $lines);
+            $doc .= "\n" . implode("\n", $lines);
         }
 
         return '' === $doc ? '' : "$indent/**$doc\n$indent */";
diff --git a/src/Stubs/Generator.php b/src/Stubs/Generator.php
index 049cd823a2..e388bcae0d 100644
--- a/src/Stubs/Generator.php
+++ b/src/Stubs/Generator.php
@@ -22,6 +22,11 @@
 use Zephir\CompilerFile;
 use Zephir\Exception;
 
+use function array_key_exists;
+use function in_array;
+
+use const DIRECTORY_SEPARATOR;
+
 class Generator
 {
     /**
@@ -64,24 +69,29 @@ public function generate(string $namespace, string $path, string $indent, string
         $indent = 'tabs' === $indent ? "\t" : '    ';
 
         foreach ($this->files as $file) {
-            $class = $file->getClassDefinition();
+            $class  = $file->getClassDefinition();
             $source = $this->buildClass($class, $indent, $banner);
 
-            $filename = ucfirst($class->getName()).'.php';
-            $filePath = $path.str_ireplace(
+            $filename = ucfirst($class->getName()) . '.php';
+            $filePath = $path
+            . str_ireplace(
                 $namespace,
                 '',
-                str_replace($namespace.'\\\\', \DIRECTORY_SEPARATOR, $class->getNamespace())
+                str_replace(
+                    $namespace . '\\\\',
+                    DIRECTORY_SEPARATOR,
+                    $class->getNamespace()
+                )
             );
-            $filePath = str_replace('\\', \DIRECTORY_SEPARATOR, $filePath);
-            $filePath = str_replace(\DIRECTORY_SEPARATOR.\DIRECTORY_SEPARATOR, \DIRECTORY_SEPARATOR, $filePath);
+            $filePath = str_replace('\\', DIRECTORY_SEPARATOR, $filePath);
+            $filePath = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $filePath);
 
             if (!is_dir($filePath)) {
                 mkdir($filePath, 0777, true);
             }
 
-            $filePath = realpath($filePath).'/';
-            file_put_contents($filePath.$filename, $source);
+            $filePath = realpath($filePath) . '/';
+            file_put_contents($filePath . $filename, $source);
         }
     }
 
@@ -98,21 +108,21 @@ public function generate(string $namespace, string $path, string $indent, string
      */
     protected function buildClass(Definition $class, string $indent, string $banner): string
     {
-        $source = '<?php'.PHP_EOL.PHP_EOL;
-        $source .= '' === $banner ? '' : $banner.PHP_EOL;
-        $source .= "namespace {$class->getNamespace()};".PHP_EOL;
+        $source = '<?php' . PHP_EOL . PHP_EOL;
+        $source .= '' === $banner ? '' : $banner . PHP_EOL;
+        $source .= "namespace {$class->getNamespace()};" . PHP_EOL;
 
         /** @var AliasManager $aliasManager */
         $aliasManager = $class->getAliasManager();
-        $aliases = $aliasManager->getAliases();
+        $aliases      = $aliasManager->getAliases();
 
         if (!empty($aliases)) {
             $source .= PHP_EOL;
 
             foreach ($aliases as $alias => $fqn) {
                 $isAliased = $aliasManager->isUseStatementAliased($alias);
-                $asAlias = $isAliased ? ' as '.$alias : '';
-                $source .= 'use '.$fqn.$asAlias.';'.PHP_EOL;
+                $asAlias   = $isAliased ? ' as ' . $alias : '';
+                $source    .= 'use ' . $fqn . $asAlias . ';' . PHP_EOL;
             }
         }
 
@@ -120,8 +130,8 @@ protected function buildClass(Definition $class, string $indent, string $banner)
 
         $docBlock = (new DocBlock($class->getDocBlock(), ''));
 
-        if ('' !== (string) $docBlock) {
-            $source .= $docBlock.PHP_EOL;
+        if ('' !== (string)$docBlock) {
+            $source .= $docBlock . PHP_EOL;
         }
 
         if ($class->isFinal()) {
@@ -130,7 +140,7 @@ protected function buildClass(Definition $class, string $indent, string $banner)
             $source .= 'abstract ';
         }
 
-        $source .= $class->getType().' '.$class->getName();
+        $source .= $class->getType() . ' ' . $class->getName();
 
         if ($class->getExtendsClass()) {
             $extendsClassDefinition = $class->getExtendsClassDefinition();
@@ -145,13 +155,14 @@ protected function buildClass(Definition $class, string $indent, string $banner)
 
             $hasAliasForExtends = $aliasManager->isAlias($extendsClassDefinition->getShortName());
 
-            $source .= ' extends '.($hasAliasForExtends || $extendsClassDefinition->isBundled() ? '' : '\\');
-            $source .= $hasAliasForExtends ? $extendsClassDefinition->getShortName() : $extendsClassDefinition->getCompleteName();
+            $source .= ' extends ' . ($hasAliasForExtends || $extendsClassDefinition->isBundled() ? '' : '\\');
+            $source .= $hasAliasForExtends ? $extendsClassDefinition->getShortName(
+            ) : $extendsClassDefinition->getCompleteName();
         }
 
         if ($interfaces = $class->getImplementedInterfaces()) {
             foreach ($interfaces as $key => $interface) {
-                $interfaces[$key] = '\\'.trim($interface, '\\');
+                $interfaces[$key] = '\\' . trim($interface, '\\');
 
                 if ($aliasManager->isAliasPresentFor($interface)) {
                     $interfaces[$key] = $aliasManager->getAliasForClassName($interface);
@@ -159,20 +170,20 @@ protected function buildClass(Definition $class, string $indent, string $banner)
             }
 
             $keyword = 'interface' == $class->getType() ? ' extends ' : ' implements ';
-            $source .= $keyword.implode(', ', $interfaces);
+            $source  .= $keyword . implode(', ', $interfaces);
         }
 
-        $source .= PHP_EOL.'{'.PHP_EOL;
+        $source .= PHP_EOL . '{' . PHP_EOL;
 
         /**
          * Build Class constants
          */
         $constants = [];
         foreach ($class->getConstants() as $constant) {
-            $constants[] = $this->buildConstant($constant, $indent).PHP_EOL;
+            $constants[] = $this->buildConstant($constant, $indent) . PHP_EOL;
         }
 
-        $source .= implode(PHP_EOL, $constants).PHP_EOL;
+        $source .= implode(PHP_EOL, $constants) . PHP_EOL;
         unset($constants);
 
         /**
@@ -180,10 +191,10 @@ protected function buildClass(Definition $class, string $indent, string $banner)
          */
         $properties = [];
         foreach ($class->getProperties() as $property) {
-            $properties[] = $this->buildProperty($property, $indent).PHP_EOL;
+            $properties[] = $this->buildProperty($property, $indent) . PHP_EOL;
         }
 
-        $source .= implode(PHP_EOL, $properties).PHP_EOL;
+        $source .= implode(PHP_EOL, $properties) . PHP_EOL;
         unset($properties);
 
         /**
@@ -195,45 +206,13 @@ protected function buildClass(Definition $class, string $indent, string $banner)
                 continue;
             }
 
-            $methods[] = $this->buildMethod($method, 'interface' === $class->getType(), $indent).PHP_EOL;
+            $methods[] = $this->buildMethod($method, 'interface' === $class->getType(), $indent) . PHP_EOL;
         }
 
         $source .= implode(PHP_EOL, $methods);
         unset($methods);
 
-        return $source.'}'.PHP_EOL;
-    }
-
-    /**
-     * Build property.
-     *
-     * @param Property $property
-     * @param string   $indent
-     *
-     * @return string
-     */
-    protected function buildProperty(Property $property, string $indent): string
-    {
-        $visibility = 'public';
-
-        if (false === $property->isPublic()) {
-            $visibility = $property->isProtected() ? 'protected' : 'private';
-        }
-
-        if ($property->isStatic()) {
-            $visibility = 'static '.$visibility;
-        }
-
-        $source = $indent.$visibility.' $'.$property->getName();
-        $original = $property->getOriginal();
-
-        if (isset($original['default'])) {
-            $source .= ' = '.$this->wrapPHPValue([
-                'default' => $original['default'],
-            ]);
-        }
-
-        return $this->fetchDocBlock($property->getDocBlock(), $indent).$source.';';
+        return $source . '}' . PHP_EOL;
     }
 
     /**
@@ -244,13 +223,13 @@ protected function buildProperty(Property $property, string $indent): string
      */
     protected function buildConstant(Constant $constant, string $indent): string
     {
-        $source = 'const '.$constant->getName();
+        $source = 'const ' . $constant->getName();
 
         $value = $this->wrapPHPValue([
             'default' => $constant->getValue(),
         ]);
 
-        return $this->fetchDocBlock($constant->getDocBlock(), $indent).$indent.$source.' = '.$value.';';
+        return $this->fetchDocBlock($constant->getDocBlock(), $indent) . $indent . $source . ' = ' . $value . ';';
     }
 
     /**
@@ -265,8 +244,8 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
         $modifier = implode(' ', array_diff($method->getVisibility(), $this->ignoreModifiers));
 
         $methodParameters = $method->getParameters();
-        $aliasManager = $method->getClassDefinition()->getAliasManager();
-        $docBlock = new MethodDocBlock($method, $aliasManager, $indent);
+        $aliasManager     = $method->getClassDefinition()->getAliasManager();
+        $docBlock         = new MethodDocBlock($method, $aliasManager, $indent);
 
         $parameters = [];
 
@@ -275,30 +254,30 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
                 $paramStr = '';
                 if (isset($parameter['cast'])) {
                     if ($aliasManager->isAlias($parameter['cast']['value'])) {
-                        $cast = '\\'.$aliasManager->getAlias($parameter['cast']['value']);
+                        $cast = '\\' . $aliasManager->getAlias($parameter['cast']['value']);
                     } else {
                         $cast = $parameter['cast']['value'];
                     }
 
-                    $paramStr .= $cast.' ';
+                    $paramStr .= $cast . ' ';
                 } elseif (isset($parameter['data-type']) && 'array' === $parameter['data-type']) {
                     $paramStr .= 'array ';
                 } elseif (isset($parameter['data-type'])) {
-                    if (\in_array($parameter['data-type'], ['bool', 'boolean'])) {
+                    if (in_array($parameter['data-type'], ['bool', 'boolean'])) {
                         $paramStr .= 'bool ';
                     } elseif ('double' == $parameter['data-type']) {
                         $paramStr .= 'float ';
-                    } elseif (\in_array($parameter['data-type'], ['int', 'uint', 'long', 'ulong', 'uchar'])) {
+                    } elseif (in_array($parameter['data-type'], ['int', 'uint', 'long', 'ulong', 'uchar'])) {
                         $paramStr .= 'int ';
-                    } elseif (\in_array($parameter['data-type'], ['char', 'string'])) {
+                    } elseif (in_array($parameter['data-type'], ['char', 'string'])) {
                         $paramStr .= 'string ';
                     }
                 }
 
-                $paramStr .= '$'.$parameter['name'];
+                $paramStr .= '$' . $parameter['name'];
 
                 if (isset($parameter['default'])) {
-                    $paramStr .= ' = '.$this->wrapPHPValue($parameter);
+                    $paramStr .= ' = ' . $this->wrapPHPValue($parameter);
                 }
 
                 $parameters[] = $paramStr;
@@ -309,7 +288,7 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
         if ($method->hasReturnTypes()) {
             $supported = 0;
 
-            if (\array_key_exists('object', $method->getReturnTypes())) {
+            if (array_key_exists('object', $method->getReturnTypes())) {
                 $return = key($method->getReturnClassTypes());
                 ++$supported;
             }
@@ -334,17 +313,17 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
                 ++$supported;
             }
 
-            if (\array_key_exists('array', $method->getReturnTypes())) {
+            if (array_key_exists('array', $method->getReturnTypes())) {
                 $return = 'array';
                 ++$supported;
             }
 
             if (!empty($return) && $method->areReturnTypesNullCompatible()) {
-                $return = '?'.$return;
+                $return = '?' . $return;
             }
 
             // PHP doesn't support multiple return types (yet?)
-            if ($supported > 1 || \array_key_exists('variable', $method->getReturnTypes())) {
+            if ($supported > 1 || array_key_exists('variable', $method->getReturnTypes())) {
                 $return = '';
             }
         } elseif ($method->isVoid()) {
@@ -352,22 +331,54 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
         }
 
         if (!empty($return)) {
-            $return = ': '.$return;
+            $return = ': ' . $return;
         }
 
-        $function = trim($modifier.' function', ' ').' ';
-        $methodBody = $indent.$function.$method->getName().'('.implode(', ', $parameters).')'.$return;
+        $function   = trim($modifier . ' function', ' ') . ' ';
+        $methodBody = $indent . $function . $method->getName() . '(' . implode(', ', $parameters) . ')' . $return;
 
         if ($isInterface || $method->isAbstract()) {
             $methodBody .= ';';
         } else {
-            $methodBody .= PHP_EOL.$indent.'{'.PHP_EOL.$indent.'}';
+            $methodBody .= PHP_EOL . $indent . '{' . PHP_EOL . $indent . '}';
         }
 
         $docs = $docBlock->processMethodDocBlock();
-        $docs = $docs ? $docs.PHP_EOL : '';
+        $docs = $docs ? $docs . PHP_EOL : '';
+
+        return $docs . $methodBody;
+    }
+
+    /**
+     * Build property.
+     *
+     * @param Property $property
+     * @param string   $indent
+     *
+     * @return string
+     */
+    protected function buildProperty(Property $property, string $indent): string
+    {
+        $visibility = 'public';
+
+        if (false === $property->isPublic()) {
+            $visibility = $property->isProtected() ? 'protected' : 'private';
+        }
+
+        if ($property->isStatic()) {
+            $visibility = 'static ' . $visibility;
+        }
+
+        $source   = $indent . $visibility . ' $' . $property->getName();
+        $original = $property->getOriginal();
+
+        if (isset($original['default'])) {
+            $source .= ' = ' . $this->wrapPHPValue([
+                    'default' => $original['default'],
+                ]);
+        }
 
-        return $docs.$methodBody;
+        return $this->fetchDocBlock($property->getDocBlock(), $indent) . $source . ';';
     }
 
     /**
@@ -388,7 +399,7 @@ protected function wrapPHPValue(array $parameter): string
 
             case 'string':
             case 'char':
-                $returnValue = '\''.addslashes($parameter['default']['value']).'\'';
+                $returnValue = '\'' . addslashes($parameter['default']['value']) . '\'';
                 break;
 
             case 'empty-array':
@@ -403,22 +414,22 @@ protected function wrapPHPValue(array $parameter): string
 
                     if (isset($value['key'])) {
                         $source .= $this->wrapPHPValue([
-                            'default' => $value['key'],
-                            'type' => $value['key']['type'],
-                        ]).' => ';
+                                'default' => $value['key'],
+                                'type'    => $value['key']['type'],
+                            ]) . ' => ';
                     }
 
-                    $parameters[] = $source.$this->wrapPHPValue([
-                        'default' => $value['value'],
-                        'type' => $value['value']['type'],
-                    ]);
+                    $parameters[] = $source . $this->wrapPHPValue([
+                            'default' => $value['value'],
+                            'type'    => $value['value']['type'],
+                        ]);
                 }
 
-                $returnValue = '['.implode(', ', $parameters).']';
+                $returnValue = '[' . implode(', ', $parameters) . ']';
                 break;
 
             case 'static-constant-access':
-                $returnValue = $parameter['default']['left']['value'].'::'.$parameter['default']['right']['value'];
+                $returnValue = $parameter['default']['left']['value'] . '::' . $parameter['default']['right']['value'];
                 break;
 
             case 'int':
@@ -436,13 +447,13 @@ protected function wrapPHPValue(array $parameter): string
                 );
         }
 
-        return (string) $returnValue;
+        return (string)$returnValue;
     }
 
     private function fetchDocBlock(?string $docBlock, string $indent): string
     {
         $docBlock = (new DocBlock($docBlock, $indent))->__toString();
 
-        return $docBlock ? $docBlock.PHP_EOL : '';
+        return $docBlock ? $docBlock . PHP_EOL : '';
     }
 }
diff --git a/src/Stubs/MethodDocBlock.php b/src/Stubs/MethodDocBlock.php
index 35120a734b..ad79d53921 100644
--- a/src/Stubs/MethodDocBlock.php
+++ b/src/Stubs/MethodDocBlock.php
@@ -24,40 +24,33 @@
  */
 class MethodDocBlock extends DocBlock
 {
+    /**
+     * @var AliasManager
+     */
+    private AliasManager $aliasManager;
+    /**
+     * @var Method
+     */
+    private Method $classMethod;
+    /**
+     * @var bool
+     */
+    private bool  $deprecated;
     private array $parameters = [];
-
     /**
      * Parameters which are described by User into docblock
      *
      * @var array
      */
     private array $predefinedParams = [];
-
     /**
      * @var array
      */
     private array $return = [];
-
     /**
      * @var string|mixed
      */
     private string $shortcutName;
-
-    /**
-     * @var bool
-     */
-    private bool $deprecated;
-
-    /**
-     * @var AliasManager
-     */
-    private AliasManager $aliasManager;
-
-    /**
-     * @var Method
-     */
-    private Method $classMethod;
-
     /**
      * @var Types
      */
@@ -71,11 +64,11 @@ public function __construct(
     ) {
         parent::__construct($method->getDocBlock(), $indent);
 
-        $this->deprecated = $method->isDeprecated();
+        $this->deprecated   = $method->isDeprecated();
         $this->aliasManager = $aliasManager;
         $this->shortcutName = $method->isShortcut() ? $method->getShortcutName() : '';
-        $this->classMethod = $method;
-        $this->types = $types ?? new Types();
+        $this->classMethod  = $method;
+        $this->types        = $types ?? new Types();
     }
 
     /**
@@ -97,66 +90,6 @@ public function processMethodDocBlock(): string
         return $this->__toString();
     }
 
-    protected function parseMethodReturnType(Method $method): void
-    {
-        $return = [];
-        foreach ($method->getReturnTypes() as $type) {
-            if (isset($type['data-type'])) {
-                $dataType = 'variable' === $type['data-type'] ? 'mixed' : $type['data-type'];
-                $return[$dataType] = $dataType;
-            }
-        }
-
-        $returnClassTypes = $method->getReturnClassTypes();
-        if ($returnClassTypes) {
-            foreach ($returnClassTypes as $key => $returnClassType) {
-                if ($this->aliasManager->isAlias($returnClassType)) {
-                    $returnClassTypes[$key] = '\\'.$this->aliasManager->getAlias($returnClassType);
-                }
-            }
-
-            $return = array_merge($return, $returnClassTypes);
-        }
-
-        /**
-         * Prepare return types for Collections compatible types.
-         * Only for complex types.
-         */
-        $collections = [];
-        if ($method->hasReturnTypesRaw()) {
-            $returnClassTypes = $method->getReturnTypesRaw();
-
-            if (!empty($returnClassTypes['list'])) {
-                foreach ($returnClassTypes['list'] as $returnType) {
-                    if (empty($returnType['cast']) || !$returnType['collection']) {
-                        continue;
-                    }
-
-                    $key = $returnType['cast']['value'];
-                    $type = $key;
-
-                    if ($this->aliasManager->isAlias($type)) {
-                        $type = '\\'.$this->aliasManager->getAlias($type);
-                    }
-
-                    $return[$key] = $type.'[]';
-                    $collections[$type.'[]'] = $returnType;
-                }
-            }
-        }
-
-        $processedTypes = !empty($method->getReturnClassTypes()) ? $return : null;
-        $returnType = $this->types->getReturnTypeAnnotation(
-            $this->classMethod,
-            $processedTypes ?: array_merge($method->getReturnTypes(), $collections)
-        );
-
-        if (!empty($returnType)) {
-            // Empty line in array - it's an empty description. Don't remove it!
-            $this->return = [$returnType, ''];
-        }
-    }
-
     /**
      * Parse DocBlock and returns extracted groups.
      */
@@ -181,12 +114,12 @@ protected function parseLines(): void
 
         foreach ($this->lines as $line) {
             $parsedLine = $this->parseDocBlockParam($line);
-            $docType = $parsedLine['doctype'] ?? null;
+            $docType    = $parsedLine['doctype'] ?? null;
 
-            $dollar = $parsedLine['dollar'] ?? '';
-            $identifier = $parsedLine['name'] ?? false;
+            $dollar      = $parsedLine['dollar'] ?? '';
+            $identifier  = $parsedLine['name'] ?? false;
             $description = $parsedLine['description'] ?? '';
-            $type = $parsedLine['type'] ?? '';
+            $type        = $parsedLine['type'] ?? '';
 
             // Remember docblock @param to avoid param duplication when parse input args.
             if ($identifier) {
@@ -201,11 +134,11 @@ protected function parseLines(): void
                 $this->predefinedParams['return'] = true;
 
                 $mixed = str_replace('var', 'mixed', $type);
-                $line = str_replace($type, $mixed, $line);
+                $line  = str_replace($type, $mixed, $line);
             }
 
             if ('$' !== $dollar && $identifier && 'return' !== $docType) {
-                $line = '@'.$docType.' '.trim($type).' $'.trim($identifier.' '.$description);
+                $line = '@' . $docType . ' ' . trim($type) . ' $' . trim($identifier . ' ' . $description);
             }
 
             if ('var' === $docType) {
@@ -214,12 +147,12 @@ protected function parseLines(): void
 
             if ('var' === $docType && 'set' === $this->shortcutName) {
                 $docType = 'param';
-                $name = array_keys($this->parameters);
-                $name = $name[0];
+                $name    = array_keys($this->parameters);
+                $name    = $name[0];
             } elseif ('var' == $docType && 'get' == $this->shortcutName) {
                 $docType = 'return';
             } else {
-                $name = $identifier ? '$'.trim($identifier, '$') : '';
+                $name = $identifier ? '$' . trim($identifier, '$') : '';
             }
 
             switch ($docType) {
@@ -237,39 +170,63 @@ protected function parseLines(): void
         $this->lines = $lines;
     }
 
-    private function appendReturnLine(): void
+    protected function parseMethodReturnType(Method $method): void
     {
-        if (!isset($this->predefinedParams['return'])) {
-            [$type, $description] = $this->return;
-
-            $return = $this->aliasManager->getAliasForClassName($type).' '.$description;
-            $this->lines[] = '@return '.trim($return, ' ');
+        $return = [];
+        foreach ($method->getReturnTypes() as $type) {
+            if (isset($type['data-type'])) {
+                $dataType          = 'variable' === $type['data-type'] ? 'mixed' : $type['data-type'];
+                $return[$dataType] = $dataType;
+            }
         }
-    }
 
-    private function parseMethodParameters(Method $method): void
-    {
-        $parameters = $method->getParameters();
-        $aliasManager = $method->getClassDefinition()->getAliasManager();
+        $returnClassTypes = $method->getReturnClassTypes();
+        if ($returnClassTypes) {
+            foreach ($returnClassTypes as $key => $returnClassType) {
+                if ($this->aliasManager->isAlias($returnClassType)) {
+                    $returnClassTypes[$key] = '\\' . $this->aliasManager->getAlias($returnClassType);
+                }
+            }
 
-        if ($parameters === null) {
-            return;
+            $return = array_merge($return, $returnClassTypes);
         }
 
-        foreach ($parameters as $parameter) {
-            if (isset($parameter['cast'])) {
-                if ($aliasManager->isAlias($parameter['cast']['value'])) {
-                    $type = '\\'.$aliasManager->getAlias($parameter['cast']['value']);
-                } else {
-                    $type = $parameter['cast']['value'];
+        /**
+         * Prepare return types for Collections compatible types.
+         * Only for complex types.
+         */
+        $collections = [];
+        if ($method->hasReturnTypesRaw()) {
+            $returnClassTypes = $method->getReturnTypesRaw();
+
+            if (!empty($returnClassTypes['list'])) {
+                foreach ($returnClassTypes['list'] as $returnType) {
+                    if (empty($returnType['cast']) || !$returnType['collection']) {
+                        continue;
+                    }
+
+                    $key  = $returnType['cast']['value'];
+                    $type = $key;
+
+                    if ($this->aliasManager->isAlias($type)) {
+                        $type = '\\' . $this->aliasManager->getAlias($type);
+                    }
+
+                    $return[$key]              = $type . '[]';
+                    $collections[$type . '[]'] = $returnType;
                 }
-            } elseif (isset($parameter['data-type'])) {
-                $type = 'variable' === $parameter['data-type'] ? 'mixed' : $parameter['data-type'];
-            } else {
-                $type = 'mixed';
             }
+        }
 
-            $this->parameters['$'.trim($parameter['name'], '$')] = [$type, ''];
+        $processedTypes = !empty($method->getReturnClassTypes()) ? $return : null;
+        $returnType     = $this->types->getReturnTypeAnnotation(
+            $this->classMethod,
+            $processedTypes ?: array_merge($method->getReturnTypes(), $collections)
+        );
+
+        if (!empty($returnType)) {
+            // Empty line in array - it's an empty description. Don't remove it!
+            $this->return = [$returnType, ''];
         }
     }
 
@@ -283,8 +240,8 @@ private function appendParametersLines(): void
             if (!isset($this->predefinedParams[trim($name, '$')])) {
                 [$type, $description] = $parameter;
 
-                $param = $type.' '.$name.' '.$description;
-                $this->lines[] = '@param '.trim($param, ' ');
+                $param         = $type . ' ' . $name . ' ' . $description;
+                $this->lines[] = '@param ' . trim($param, ' ');
             }
         }
 
@@ -294,4 +251,40 @@ private function appendParametersLines(): void
 
         $this->lines = array_unique($this->lines);
     }
+
+    private function appendReturnLine(): void
+    {
+        if (!isset($this->predefinedParams['return'])) {
+            [$type, $description] = $this->return;
+
+            $return        = $this->aliasManager->getAliasForClassName($type) . ' ' . $description;
+            $this->lines[] = '@return ' . trim($return, ' ');
+        }
+    }
+
+    private function parseMethodParameters(Method $method): void
+    {
+        $parameters   = $method->getParameters();
+        $aliasManager = $method->getClassDefinition()->getAliasManager();
+
+        if ($parameters === null) {
+            return;
+        }
+
+        foreach ($parameters as $parameter) {
+            if (isset($parameter['cast'])) {
+                if ($aliasManager->isAlias($parameter['cast']['value'])) {
+                    $type = '\\' . $aliasManager->getAlias($parameter['cast']['value']);
+                } else {
+                    $type = $parameter['cast']['value'];
+                }
+            } elseif (isset($parameter['data-type'])) {
+                $type = 'variable' === $parameter['data-type'] ? 'mixed' : $parameter['data-type'];
+            } else {
+                $type = 'mixed';
+            }
+
+            $this->parameters['$' . trim($parameter['name'], '$')] = [$type, ''];
+        }
+    }
 }
diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index 352064a44d..5e9a8f015e 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -18,25 +18,44 @@
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
 
+use function count;
+use function is_object;
+use function strlen;
+
 /**
  * A symbol table stores all the variables defined in a method, their data types and default values.
  */
 class SymbolTable
 {
-    protected bool $mustGrownStack = false;
+    /**
+     * @var array
+     */
+    protected array $branchTempVariables = [];
 
+    /**
+     * @var array
+     */
     protected array $branchVariables = [];
 
-    protected int $tempVarCount = 0;
-
-    protected array $branchTempVariables = [];
+    /**
+     * @var Globals
+     */
+    protected Globals $globalsManager;
 
     /**
      * @var LocalContextPass
      */
-    protected $localContext;
+    protected LocalContextPass $localContext;
 
-    protected Globals $globalsManager;
+    /**
+     * @var bool
+     */
+    protected bool $mustGrownStack = false;
+
+    /**
+     * @var int
+     */
+    protected int $tempVarCount   = 0;
 
     public function __construct(protected CompilationContext $compilationContext)
     {
@@ -59,55 +78,51 @@ public function __construct(protected CompilationContext $compilationContext)
         $returnValue->increaseUses();
         $this->branchVariables[1]['return_value'] = $returnValue;
 
-        $returnValue = new Variable('variable', 'return_value_ptr', $compilationContext->branchManager->getCurrentBranch());
+        $returnValue = new Variable(
+            'variable',
+            'return_value_ptr',
+            $compilationContext->branchManager->getCurrentBranch()
+        );
         $returnValue->setIsInitialized(true, $compilationContext);
         $returnValue->increaseUses();
         $this->branchVariables[1]['return_value_ptr'] = $returnValue;
     }
 
-    public function resolveVariableToBranch($name, CompilationContext $compilationContext): ?Branch
-    {
-        $currentBranch = $compilationContext->branchManager->getCurrentBranch();
-
-        do {
-            $currentId = $currentBranch->getUniqueId();
-            if (isset($this->branchVariables[$currentId][$name])) {
-                return $currentBranch;
-            }
-            $currentBranch = $currentBranch->getParentBranch();
-        } while (null != $currentBranch);
-
-        return null;
-    }
-
     /**
-     * Sets the local context information.
+     * Adds a raw variable to the symbol table (root branch).
      *
-     * @param LocalContextPass $localContext
+     * @param Variable $variable
+     *
+     * @return Variable
      */
-    public function setLocalContext(LocalContextPass $localContext): void
+    public function addRawVariable(Variable $variable): Variable
     {
-        $this->localContext = $localContext;
+        if (!isset($this->branchVariables[1])) {
+            $this->branchVariables[1] = [];
+        }
+        $this->branchVariables[1][$variable->getName()] = $variable;
+
+        return $variable;
     }
 
     /**
-     * Check if a variable is declared in the current symbol table.
+     * Creates a temporary variable.
      *
-     * @param string                  $name
-     * @param CompilationContext|null $compilationContext
+     * @param string             $type
+     * @param CompilationContext $context
      *
-     * @return bool
+     * @return Variable
      */
-    public function hasVariable(string $name, CompilationContext $compilationContext = null): bool
-    {
-        return false !== $this->getVariable($name, $compilationContext ?: $this->compilationContext);
-    }
-
-    public function hasVariableInBranch($name, Branch $compareBranch, CompilationContext $compilationContext = null): bool
+    public function addTemp($type, CompilationContext $context)
     {
-        $branch = $this->resolveVariableToBranch($name, $compilationContext ?: $this->compilationContext);
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->setTemporal(true);
+        $variable->increaseUses();
+        $variable->increaseMutates();
 
-        return $branch instanceof Branch && $branch === $compareBranch;
+        return $variable;
     }
 
     /**
@@ -125,14 +140,14 @@ public function addVariable(
         CompilationContext $compilationContext
     ): Variable {
         $currentBranch = $compilationContext->branchManager->getCurrentBranch();
-        $branchId = $currentBranch->getUniqueId();
+        $branchId      = $currentBranch->getUniqueId();
         if ($this->globalsManager->isSuperGlobal($name) || 'zephir_fcall_cache_entry' == $type) {
             $branchId = 1;
         }
 
         $varName = $name;
         if ($branchId > 1 && Branch::TYPE_ROOT != $currentBranch->getType()) {
-            $varName = $name.Variable::BRANCH_MAGIC.$branchId;
+            $varName = $name . Variable::BRANCH_MAGIC . $branchId;
         }
 
         $variable = new Variable($type, $varName, $currentBranch);
@@ -154,130 +169,434 @@ public function addVariable(
     }
 
     /**
-     * Adds a raw variable to the symbol table (root branch).
+     * Returns the number of expected mutations for a variable.
      *
-     * @param Variable $variable
+     * @param string $variable
      *
-     * @return Variable
+     * @return int
      */
-    public function addRawVariable(Variable $variable): Variable
+    public function getExpectedMutations(string $variable): int
     {
-        if (!isset($this->branchVariables[1])) {
-            $this->branchVariables[1] = [];
+        if ($this->localContext) {
+            return $this->localContext->getNumberOfMutations($variable);
         }
-        $this->branchVariables[1][$variable->getName()] = $variable;
 
-        return $variable;
+        return 0;
     }
 
     /**
-     * Returns a variable in the symbol table.
-     *
-     * @param                         $name
-     * @param CompilationContext|null $compilationContext
+     * Returns the last line where any kind of call was performed within the method
+     * This is not necessary related to the symbol table but this information is gathered
+     * by the LocalContextPass.
      *
-     * @return bool|Variable
+     * @return int
      */
-    public function getVariable($name, CompilationContext $compilationContext = null)
+    public function getLastCallLine(): int
     {
-        /* Check if the variable already is referencing a branch */
-        $pos = strpos($name, Variable::BRANCH_MAGIC);
-        if ($pos > -1) {
-            $branchId = (int) substr($name, $pos + \strlen(Variable::BRANCH_MAGIC));
-            $name = substr($name, 0, $pos);
-        } else {
-            $compilationContext = $compilationContext ?: $this->compilationContext;
-            $branch = $this->resolveVariableToBranch($name, $compilationContext);
-            if (!$branch) {
-                return false;
-            }
-            $branchId = $branch->getUniqueId();
-        }
-        if (!isset($this->branchVariables[$branchId]) || !isset($this->branchVariables[$branchId][$name])) {
-            return false;
+        if ($this->localContext) {
+            return $this->localContext->getLastCallLine();
         }
 
-        return $this->branchVariables[$branchId][$name];
+        return 0;
     }
 
     /**
-     * Returns all the variables defined in the symbol table.
+     * Returns the last line where an 'unset' operation was made within the current method
+     * This is not necessary related to the symbol table but this information is gathered
+     * by the LocalContextPass.
      *
-     * @return Variable[]
+     * @return int
      */
-    public function getVariables()
+    public function getLastUnsetLine(): int
     {
-        $ret = [];
-        foreach ($this->branchVariables as $vars) {
-            foreach ($vars as $var) {
-                $ret[$var->getName()] = $var;
-            }
+        if ($this->localContext) {
+            return $this->localContext->getLastUnsetLine();
         }
 
-        return $ret;
+        return 0;
     }
 
     /**
-     * Return a variable in the symbol table, it will be used for a read operation.
+     * Returns if the current symbol label must add a memory frame.
      *
-     * @param string             $name
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
+     * @return bool
+     */
+    public function getMustGrownStack(): bool
+    {
+        return $this->mustGrownStack;
+    }
+
+    /**
+     * @return int
+     */
+    public function getNextTempVar(): int
+    {
+        return $this->tempVarCount++;
+    }
+
+    /**
+     * Creates a temporary variable to be used in a write operation
+     * the body of the variable is freed between iterations instead of
+     * request a new full zval variable.
      *
-     * @return Variable
+     * @param string             $type
+     * @param CompilationContext $context
      *
-     * @throws CompilerException
+     * @return Variable
      */
-    public function getVariableForRead($name, CompilationContext $compilationContext = null, array $statement = null)
+    public function getTempComplexLiteralVariableForWrite($type, CompilationContext $context)
     {
-        /**
-         * Validate that 'this' cannot be used in a static function
-         */
-        if ('this' == $name || 'this_ptr' == $name) {
-            if ($compilationContext->staticContext) {
-                throw new CompilerException("Cannot use variable 'this' in static context", $statement);
+        $variable = $this->reuseTempVariable($type, 'heap-literal');
+        if (is_object($variable)) {
+            $variable->increaseUses();
+            $variable->increaseMutates();
+            if ('variable' == $type || 'string' == $type || 'array' == $type) {
+                $variable->initComplexLiteralVariant($context);
             }
+
+            return $variable;
         }
 
-        /**
-         * Create superglobals just in time
-         */
-        if ($this->globalsManager->isSuperGlobal($name)) {
-            if (!$this->hasVariable($name)) {
-                /**
-                 * TODO: injecting globals, initialize to null and check first?
-                 */
-                $variable = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());
-                $variable->setIsInitialized(true, $compilationContext);
-                $variable->setDynamicTypes('array');
-                $variable->setIsExternal(true);
-                $this->addRawVariable($variable);
-            } else {
-                $variable = $this->getVariable($name);
-            }
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->increaseUses();
+        $variable->increaseMutates();
+        $variable->setTemporal(true);
+        if ('variable' == $type || 'string' == $type || 'array' == $type) {
+            $variable->initComplexLiteralVariant($context);
+        }
+
+        $this->registerTempVariable($type, 'heap-literal', $variable);
+
+        return $variable;
+    }
+
+    /**
+     * Creates a temporary variable to be used in a write operation.
+     *
+     * @param string             $type
+     * @param CompilationContext $context
+     *
+     * @return Variable
+     */
+    public function getTempLocalVariableForWrite($type, CompilationContext $context)
+    {
+        $variable = $this->reuseTempVariable($type, 'stack');
+        if (is_object($variable)) {
             $variable->increaseUses();
+            $variable->increaseMutates();
+            $variable->setLocalOnly(true);
+            if ('variable' == $type || 'string' == $type || 'array' == $type) {
+                $variable->initVariant($context);
+            }
 
             return $variable;
         }
 
-        if (!$this->hasVariable($name)) {
-            throw new CompilerException("Cannot read variable '".$name."' because it wasn't declared", $statement);
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->increaseUses();
+        $variable->increaseMutates();
+        $variable->setLocalOnly(true);
+        $variable->setTemporal(true);
+        if ('variable' == $type || 'string' == $type || 'array' == $type) {
+            $variable->initVariant($context);
         }
 
-        $variable = $this->getVariable($name);
-        if (!$variable->isInitialized()) {
-            /* DON'T REMOVE THIS!! */
-            throw new CompilerException("Variable '".$name."' cannot be read because it's not initialized", $statement);
+        $this->registerTempVariable($type, 'stack', $variable);
+
+        return $variable;
+    }
+
+    /**
+     * Creates a temporary variable to be used in a read-only operation within native-array-access and property-access
+     * These kind of variables MUST not be tracked by the Zephir memory manager.
+     *
+     * @param string             $type
+     * @param CompilationContext $context
+     *
+     * @return Variable
+     */
+    public function getTempNonTrackedUninitializedVariable($type, CompilationContext $context)
+    {
+        $variable = $this->reuseTempVariable($type, 'non-tracked-uninitialized');
+        if (is_object($variable)) {
+            $variable->increaseUses();
+            $variable->increaseMutates();
+
+            return $variable;
         }
 
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->setTemporal(true);
+        $variable->setMemoryTracked(false);
         $variable->increaseUses();
+        $variable->increaseMutates();
 
-        /**
-         * Analise branches to detect possible initialization of variables in conditional branches
+        $this->registerTempVariable($type, 'non-tracked-uninitialized', $variable);
+
+        return $variable;
+    }
+
+    /**
+     * Creates a temporary variable to be used to point to a heap variable
+     * These kind of variables MUST not be tracked by the Zephir memory manager.
+     *
+     * @param                    $type
+     * @param CompilationContext $context
+     * @param bool               $initNonReferenced
+     *
+     * @return Variable
+     */
+    public function getTempNonTrackedVariable($type, CompilationContext $context, $initNonReferenced = false)
+    {
+        $variable = $this->reuseTempVariable($type, 'non-tracked');
+
+        if (is_object($variable)) {
+            $variable->increaseUses();
+            $variable->increaseMutates();
+            if ($initNonReferenced) {
+                $variable->initNonReferenced($context);
+            }
+
+            return $variable;
+        }
+
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->setTemporal(true);
+        $variable->setMemoryTracked(false);
+        $variable->increaseUses();
+        $variable->increaseMutates();
+
+        $this->registerTempVariable($type, 'non-tracked', $variable);
+
+        if ($initNonReferenced) {
+            $variable->initNonReferenced($context);
+        }
+
+        return $variable;
+    }
+
+    /**
+     * Returns a temporal variable.
+     *
+     * @param string             $type
+     * @param CompilationContext $compilationContext
+     *
+     * @return Variable
+     */
+    public function getTempVariable(string $type, CompilationContext $compilationContext): Variable
+    {
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $compilationContext);
+        $variable->setTemporal(true);
+
+        return $variable;
+    }
+
+    /**
+     * Creates a temporary variable to be used as intermediate variable of a read operation
+     * Variables are automatically tracked by the memory manager.
+     *
+     * @param string             $type
+     * @param CompilationContext $context
+     *
+     * @return Variable
+     */
+    public function getTempVariableForObserve($type, CompilationContext $context)
+    {
+        $variable = $this->reuseTempVariable($type, 'observe');
+        if (is_object($variable)) {
+            $variable->increaseUses();
+            $variable->increaseMutates();
+            $variable->observeVariant($context);
+
+            return $variable;
+        }
+
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->setTemporal(true);
+        $variable->increaseUses();
+        $variable->increaseMutates();
+        $variable->observeVariant($context);
+
+        $this->registerTempVariable($type, 'observe', $variable);
+
+        return $variable;
+    }
+
+    /**
+     * Creates a temporary variable to be used as intermediate variable in a call operation
+     * Variables are automatically tracked by the memory manager.
+     *
+     * @param string             $type
+     * @param CompilationContext $context
+     *
+     * @return Variable
+     */
+    public function getTempVariableForObserveOrNullify($type, CompilationContext $context)
+    {
+        $variable = $this->reuseTempVariable($type, 'observe-nullify');
+        if (is_object($variable)) {
+            $variable->increaseUses();
+            $variable->increaseMutates();
+            $variable->observeOrNullifyVariant($context);
+
+            return $variable;
+        }
+
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->setTemporal(true);
+        $variable->increaseUses();
+        $variable->increaseMutates();
+        $variable->observeOrNullifyVariant($context);
+
+        $this->registerTempVariable($type, 'observe-nullify', $variable);
+
+        return $variable;
+    }
+
+    /**
+     * Creates a temporary variable to be used in a write operation.
+     *
+     * @param string             $type
+     * @param CompilationContext $context
+     * @param mixed              $init
+     *
+     * @return Variable
+     */
+    public function getTempVariableForWrite(string $type, CompilationContext $context, $init = true): Variable
+    {
+        $variable = $this->reuseTempVariable($type, 'heap');
+        if (is_object($variable)) {
+            $variable->increaseUses();
+            $variable->increaseMutates();
+            if ($init && ('variable' == $type || 'string' == $type || 'array' == $type)) {
+                $variable->initVariant($context);
+            }
+
+            return $variable;
+        }
+
+        $tempVar  = $this->getNextTempVar();
+        $variable = $this->addVariable($type, '_' . $tempVar, $context);
+        $variable->setIsInitialized(true, $context);
+        $variable->setTemporal(true);
+        $variable->increaseUses();
+        $variable->increaseMutates();
+        if ('variable' == $type || 'string' == $type || 'array' == $type) {
+            $variable->initVariant($context);
+        }
+
+        $this->registerTempVariable($type, 'heap', $variable);
+
+        return $variable;
+    }
+
+    /**
+     * Returns a variable in the symbol table.
+     *
+     * @param                         $name
+     * @param CompilationContext|null $compilationContext
+     *
+     * @return bool|Variable
+     */
+    public function getVariable($name, CompilationContext $compilationContext = null)
+    {
+        /* Check if the variable already is referencing a branch */
+        $pos = strpos($name, Variable::BRANCH_MAGIC);
+        if ($pos > -1) {
+            $branchId = (int)substr($name, $pos + strlen(Variable::BRANCH_MAGIC));
+            $name     = substr($name, 0, $pos);
+        } else {
+            $compilationContext = $compilationContext ?: $this->compilationContext;
+            $branch             = $this->resolveVariableToBranch($name, $compilationContext);
+            if (!$branch) {
+                return false;
+            }
+            $branchId = $branch->getUniqueId();
+        }
+        if (!isset($this->branchVariables[$branchId]) || !isset($this->branchVariables[$branchId][$name])) {
+            return false;
+        }
+
+        return $this->branchVariables[$branchId][$name];
+    }
+
+    /**
+     * Return a variable in the symbol table, it will be used for a read operation.
+     *
+     * @param string             $name
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     *
+     * @return Variable
+     *
+     * @throws CompilerException
+     */
+    public function getVariableForRead($name, CompilationContext $compilationContext = null, array $statement = null)
+    {
+        /**
+         * Validate that 'this' cannot be used in a static function
+         */
+        if ('this' == $name || 'this_ptr' == $name) {
+            if ($compilationContext->staticContext) {
+                throw new CompilerException("Cannot use variable 'this' in static context", $statement);
+            }
+        }
+
+        /**
+         * Create superglobals just in time
+         */
+        if ($this->globalsManager->isSuperGlobal($name)) {
+            if (!$this->hasVariable($name)) {
+                /**
+                 * TODO: injecting globals, initialize to null and check first?
+                 */
+                $variable = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());
+                $variable->setIsInitialized(true, $compilationContext);
+                $variable->setDynamicTypes('array');
+                $variable->setIsExternal(true);
+                $this->addRawVariable($variable);
+            } else {
+                $variable = $this->getVariable($name);
+            }
+            $variable->increaseUses();
+
+            return $variable;
+        }
+
+        if (!$this->hasVariable($name)) {
+            throw new CompilerException("Cannot read variable '" . $name . "' because it wasn't declared", $statement);
+        }
+
+        $variable = $this->getVariable($name);
+        if (!$variable->isInitialized()) {
+            /* DON'T REMOVE THIS!! */
+            throw new CompilerException(
+                "Variable '" . $name . "' cannot be read because it's not initialized",
+                $statement
+            );
+        }
+
+        $variable->increaseUses();
+
+        /**
+         * Analise branches to detect possible initialization of variables in conditional branches
          */
         if (!$variable->isTemporal() && !$variable->getSkipVariant()) {
             if ('return_value' != $name && 'this' != $name) {
-                if (\is_object($compilationContext) && \is_object($compilationContext->branchManager)) {
+                if (is_object($compilationContext) && is_object($compilationContext->branchManager)) {
                     if ($compilationContext->config->get('check-invalid-reads', 'optimizations')) {
                         switch ($variable->getType()) {
                             case 'variable':
@@ -297,15 +616,21 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                     /** @var Branch[] $branches */
                     $branches = array_reverse($initBranches);
 
-                    if (1 == \count($branches)) {
+                    if (1 == count($branches)) {
                         if (Branch::TYPE_CONDITIONAL_TRUE == $branches[0]->getType()) {
                             if (true === $branches[0]->isUnreachable()) {
-                                throw new CompilerException('Initialization of variable "'.$name.'" depends on unreachable branch, consider initialize it at its declaration', $statement);
+                                throw new CompilerException(
+                                    'Initialization of variable "' . $name . '" depends on unreachable branch, consider initialize it at its declaration',
+                                    $statement
+                                );
                             }
                         } else {
                             if (Branch::TYPE_CONDITIONAL_FALSE == $branches[0]->getType()) {
                                 if (false === $branches[0]->isUnreachable()) {
-                                    throw new CompilerException('Initialization of variable "'.$name.'" depends on unreachable branch, consider initialize at its declaration', $statement);
+                                    throw new CompilerException(
+                                        'Initialization of variable "' . $name . '" depends on unreachable branch, consider initialize at its declaration',
+                                        $statement
+                                    );
                                 }
                             }
                         }
@@ -314,7 +639,10 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                         while ($tempBranch) {
                             if (Branch::TYPE_CONDITIONAL_TRUE == $tempBranch->getType()) {
                                 if (true === $tempBranch->isUnreachable()) {
-                                    throw new CompilerException('Initialization of variable "'.$name.'" depends on unreachable branch, consider initialize it at its declaration', $statement);
+                                    throw new CompilerException(
+                                        'Initialization of variable "' . $name . '" depends on unreachable branch, consider initialize it at its declaration',
+                                        $statement
+                                    );
                                 }
                             }
 
@@ -347,7 +675,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                          * Variable was initialized in a sub-branch, and it's being used in a parent branch.
                          */
                         $possibleBadAssignment = $currentBranch->getLevel() < $branches[0]->getLevel();
-                        if ($possibleBadAssignment && \count($branches) === 1) {
+                        if ($possibleBadAssignment && count($branches) === 1) {
                             /**
                              * Variable is assigned just once, and it's assigned in a conditional branch
                              */
@@ -355,11 +683,14 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                                 $evalExpression = $branches[0]->getRelatedStatement()->getEvalExpression();
 
                                 if (true === $evalExpression->isUnreachable()) {
-                                    throw new CompilerException("Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration", $statement);
+                                    throw new CompilerException(
+                                        "Variable '" . $name . "' was assigned for the first time in conditional branch, consider initialize it at its declaration",
+                                        $statement
+                                    );
                                 } else {
                                     $variable->enableDefaultAutoInitValue();
                                     $compilationContext->logger->warning(
-                                        "Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration",
+                                        "Variable '" . $name . "' was assigned for the first time in conditional branch, consider initialize it at its declaration",
                                         ['conditional-initialization', $statement]
                                     );
                                 }
@@ -368,11 +699,14 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                                     $evalExpression = $branches[0]->getRelatedStatement()->getEvalExpression();
 
                                     if (true === $evalExpression->isUnreachableElse()) {
-                                        throw new CompilerException("Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration", $statement);
+                                        throw new CompilerException(
+                                            "Variable '" . $name . "' was assigned for the first time in conditional branch, consider initialize it at its declaration",
+                                            $statement
+                                        );
                                     } else {
                                         $variable->enableDefaultAutoInitValue();
                                         $compilationContext->logger->warning(
-                                            "Variable '".$name."' was assigned for the first time in conditional branch, consider initialize it at its declaration",
+                                            "Variable '" . $name . "' was assigned for the first time in conditional branch, consider initialize it at its declaration",
                                             ['conditional-initialization', $statement]
                                         );
                                     }
@@ -393,20 +727,18 @@ public function getVariableForRead($name, CompilationContext $compilationContext
     }
 
     /**
-     * Return a variable in the symbol table, it will be used for a write operation
-     * Some variables aren't writable themselves but their members do.
+     * Return a variable in the symbol table, it will be used for a mutating operation
+     * This method implies mutation of one of the members of the variable but no the variables itself.
      *
      * @param string             $name
      * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @return bool|\Zephir\Variable\Variable
+     * @param array|null         $statement
      *
-     * @throws CompilerException
+     * @return Variable
      */
-    public function getVariableForWrite($name, CompilationContext $compilationContext, array $statement = null)
+    public function getVariableForUpdate(string $name, CompilationContext $compilationContext, array $statement = null)
     {
-        /*
+        /**
          * Create superglobals just in time
          */
         if ($this->globalsManager->isSuperGlobal($name)) {
@@ -428,7 +760,7 @@ public function getVariableForWrite($name, CompilationContext $compilationContex
         }
 
         if (!$this->hasVariable($name)) {
-            throw new CompilerException("Cannot mutate variable '".$name."' because it wasn't defined", $statement);
+            throw new CompilerException("Cannot mutate variable '" . $name . "' because it wasn't defined", $statement);
         }
 
         $variable = $this->getVariable($name);
@@ -440,28 +772,26 @@ public function getVariableForWrite($name, CompilationContext $compilationContex
          * We discard mutations inside loops because iterations could use the value
          * and Zephir only provides top-down compilation
          */
-        if (!$compilationContext->insideCycle) {
-            $variable->setUsed(false, $statement);
-        } else {
-            $variable->setUsed(true, $statement);
-        }
+        $variable->setUsed(true, $statement);
 
         return $variable;
     }
 
     /**
-     * Return a variable in the symbol table, it will be used for a mutating operation
-     * This method implies mutation of one of the members of the variable but no the variables itself.
+     * Return a variable in the symbol table, it will be used for a write operation
+     * Some variables aren't writable themselves but their members do.
      *
      * @param string             $name
      * @param CompilationContext $compilationContext
-     * @param array|null         $statement
+     * @param array              $statement
      *
-     * @return Variable
+     * @return bool|Variable
+     *
+     * @throws CompilerException
      */
-    public function getVariableForUpdate(string $name, CompilationContext $compilationContext, array $statement = null)
+    public function getVariableForWrite($name, CompilationContext $compilationContext, array $statement = null)
     {
-        /**
+        /*
          * Create superglobals just in time
          */
         if ($this->globalsManager->isSuperGlobal($name)) {
@@ -483,7 +813,7 @@ public function getVariableForUpdate(string $name, CompilationContext $compilati
         }
 
         if (!$this->hasVariable($name)) {
-            throw new CompilerException("Cannot mutate variable '".$name."' because it wasn't defined", $statement);
+            throw new CompilerException("Cannot mutate variable '" . $name . "' because it wasn't defined", $statement);
         }
 
         $variable = $this->getVariable($name);
@@ -495,326 +825,53 @@ public function getVariableForUpdate(string $name, CompilationContext $compilati
          * We discard mutations inside loops because iterations could use the value
          * and Zephir only provides top-down compilation
          */
-        $variable->setUsed(true, $statement);
-
-        return $variable;
-    }
-
-    /**
-     * Return a variable in the symbol table, it will be used for a write operation.
-     *
-     * @param bool $mustGrownStack
-     */
-    public function mustGrownStack(bool $mustGrownStack): void
-    {
-        $this->mustGrownStack = $mustGrownStack;
-    }
-
-    /**
-     * Returns if the current symbol label must add a memory frame.
-     *
-     * @return bool
-     */
-    public function getMustGrownStack(): bool
-    {
-        return $this->mustGrownStack;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNextTempVar(): int
-    {
-        return $this->tempVarCount++;
-    }
-
-    /**
-     * Returns a temporal variable.
-     *
-     * @param string             $type
-     * @param CompilationContext $compilationContext
-     *
-     * @return Variable
-     */
-    public function getTempVariable(string $type, CompilationContext $compilationContext): Variable
-    {
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $compilationContext);
-        $variable->setTemporal(true);
-
-        return $variable;
-    }
-
-    /**
-     * Creates a temporary variable to be used in a write operation.
-     *
-     * @param string             $type
-     * @param CompilationContext $context
-     * @param mixed              $init
-     *
-     * @return Variable
-     */
-    public function getTempVariableForWrite(string $type, CompilationContext $context, $init = true): Variable
-    {
-        $variable = $this->reuseTempVariable($type, 'heap');
-        if (\is_object($variable)) {
-            $variable->increaseUses();
-            $variable->increaseMutates();
-            if ($init && ('variable' == $type || 'string' == $type || 'array' == $type)) {
-                $variable->initVariant($context);
-            }
-
-            return $variable;
-        }
-
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->setTemporal(true);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-        if ('variable' == $type || 'string' == $type || 'array' == $type) {
-            $variable->initVariant($context);
-        }
-
-        $this->registerTempVariable($type, 'heap', $variable);
-
-        return $variable;
-    }
-
-    /**
-     * Creates a temporary variable to be used to point to a heap variable
-     * These kind of variables MUST not be tracked by the Zephir memory manager.
-     *
-     * @param                    $type
-     * @param CompilationContext $context
-     * @param bool               $initNonReferenced
-     *
-     * @return Variable
-     */
-    public function getTempNonTrackedVariable($type, CompilationContext $context, $initNonReferenced = false)
-    {
-        $variable = $this->reuseTempVariable($type, 'non-tracked');
-
-        if (\is_object($variable)) {
-            $variable->increaseUses();
-            $variable->increaseMutates();
-            if ($initNonReferenced) {
-                $variable->initNonReferenced($context);
-            }
-
-            return $variable;
-        }
-
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->setTemporal(true);
-        $variable->setMemoryTracked(false);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-
-        $this->registerTempVariable($type, 'non-tracked', $variable);
-
-        if ($initNonReferenced) {
-            $variable->initNonReferenced($context);
-        }
-
-        return $variable;
-    }
-
-    /**
-     * Creates a temporary variable to be used in a read-only operation within native-array-access and property-access
-     * These kind of variables MUST not be tracked by the Zephir memory manager.
-     *
-     * @param string             $type
-     * @param CompilationContext $context
-     *
-     * @return Variable
-     */
-    public function getTempNonTrackedUninitializedVariable($type, CompilationContext $context)
-    {
-        $variable = $this->reuseTempVariable($type, 'non-tracked-uninitialized');
-        if (\is_object($variable)) {
-            $variable->increaseUses();
-            $variable->increaseMutates();
-
-            return $variable;
-        }
-
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->setTemporal(true);
-        $variable->setMemoryTracked(false);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-
-        $this->registerTempVariable($type, 'non-tracked-uninitialized', $variable);
-
-        return $variable;
-    }
-
-    /**
-     * Creates a temporary variable to be used in a write operation
-     * the body of the variable is freed between iterations instead of
-     * request a new full zval variable.
-     *
-     * @param string             $type
-     * @param CompilationContext $context
-     *
-     * @return Variable
-     */
-    public function getTempComplexLiteralVariableForWrite($type, CompilationContext $context)
-    {
-        $variable = $this->reuseTempVariable($type, 'heap-literal');
-        if (\is_object($variable)) {
-            $variable->increaseUses();
-            $variable->increaseMutates();
-            if ('variable' == $type || 'string' == $type || 'array' == $type) {
-                $variable->initComplexLiteralVariant($context);
-            }
-
-            return $variable;
-        }
-
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-        $variable->setTemporal(true);
-        if ('variable' == $type || 'string' == $type || 'array' == $type) {
-            $variable->initComplexLiteralVariant($context);
+        if (!$compilationContext->insideCycle) {
+            $variable->setUsed(false, $statement);
+        } else {
+            $variable->setUsed(true, $statement);
         }
 
-        $this->registerTempVariable($type, 'heap-literal', $variable);
-
         return $variable;
     }
 
     /**
-     * Creates a temporary variable to be used in a write operation.
-     *
-     * @param string             $type
-     * @param CompilationContext $context
+     * Returns all the variables defined in the symbol table.
      *
-     * @return Variable
+     * @return Variable[]
      */
-    public function getTempLocalVariableForWrite($type, CompilationContext $context)
+    public function getVariables()
     {
-        $variable = $this->reuseTempVariable($type, 'stack');
-        if (\is_object($variable)) {
-            $variable->increaseUses();
-            $variable->increaseMutates();
-            $variable->setLocalOnly(true);
-            if ('variable' == $type || 'string' == $type || 'array' == $type) {
-                $variable->initVariant($context);
+        $ret = [];
+        foreach ($this->branchVariables as $vars) {
+            foreach ($vars as $var) {
+                $ret[$var->getName()] = $var;
             }
-
-            return $variable;
         }
 
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-        $variable->setLocalOnly(true);
-        $variable->setTemporal(true);
-        if ('variable' == $type || 'string' == $type || 'array' == $type) {
-            $variable->initVariant($context);
-        }
-
-        $this->registerTempVariable($type, 'stack', $variable);
-
-        return $variable;
-    }
-
-    /**
-     * Creates a temporary variable.
-     *
-     * @param string             $type
-     * @param CompilationContext $context
-     *
-     * @return Variable
-     */
-    public function addTemp($type, CompilationContext $context)
-    {
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->setTemporal(true);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-
-        return $variable;
+        return $ret;
     }
 
     /**
-     * Creates a temporary variable to be used as intermediate variable of a read operation
-     * Variables are automatically tracked by the memory manager.
+     * Check if a variable is declared in the current symbol table.
      *
-     * @param string             $type
-     * @param CompilationContext $context
+     * @param string                  $name
+     * @param CompilationContext|null $compilationContext
      *
-     * @return Variable
+     * @return bool
      */
-    public function getTempVariableForObserve($type, CompilationContext $context)
+    public function hasVariable(string $name, CompilationContext $compilationContext = null): bool
     {
-        $variable = $this->reuseTempVariable($type, 'observe');
-        if (\is_object($variable)) {
-            $variable->increaseUses();
-            $variable->increaseMutates();
-            $variable->observeVariant($context);
-
-            return $variable;
-        }
-
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->setTemporal(true);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-        $variable->observeVariant($context);
-
-        $this->registerTempVariable($type, 'observe', $variable);
-
-        return $variable;
+        return false !== $this->getVariable($name, $compilationContext ?: $this->compilationContext);
     }
 
-    /**
-     * Creates a temporary variable to be used as intermediate variable in a call operation
-     * Variables are automatically tracked by the memory manager.
-     *
-     * @param string             $type
-     * @param CompilationContext $context
-     *
-     * @return Variable
-     */
-    public function getTempVariableForObserveOrNullify($type, CompilationContext $context)
-    {
-        $variable = $this->reuseTempVariable($type, 'observe-nullify');
-        if (\is_object($variable)) {
-            $variable->increaseUses();
-            $variable->increaseMutates();
-            $variable->observeOrNullifyVariant($context);
-
-            return $variable;
-        }
-
-        $tempVar = $this->getNextTempVar();
-        $variable = $this->addVariable($type, '_'.$tempVar, $context);
-        $variable->setIsInitialized(true, $context);
-        $variable->setTemporal(true);
-        $variable->increaseUses();
-        $variable->increaseMutates();
-        $variable->observeOrNullifyVariant($context);
-
-        $this->registerTempVariable($type, 'observe-nullify', $variable);
+    public function hasVariableInBranch(
+        $name,
+        Branch $compareBranch,
+        CompilationContext $compilationContext = null
+    ): bool {
+        $branch = $this->resolveVariableToBranch($name, $compilationContext ?: $this->compilationContext);
 
-        return $variable;
+        return $branch instanceof Branch && $branch === $compareBranch;
     }
 
     /**
@@ -826,7 +883,7 @@ public function getTempVariableForObserveOrNullify($type, CompilationContext $co
     public function markTemporalVariablesIdle(CompilationContext $compilationContext): void
     {
         $compilationContext = $compilationContext ?: $this->compilationContext;
-        $branchId = $compilationContext->branchManager->getCurrentBranchId();
+        $branchId           = $compilationContext->branchManager->getCurrentBranchId();
 
         if (!isset($this->branchTempVariables[$branchId])) {
             return;
@@ -835,10 +892,10 @@ public function markTemporalVariablesIdle(CompilationContext $compilationContext
         foreach ($this->branchTempVariables[$branchId] as $typeVariables) {
             foreach ($typeVariables as $variables) {
                 foreach ($variables as $variable) {
-                    $pos = strpos($variable->getName(), Variable::BRANCH_MAGIC);
+                    $pos           = strpos($variable->getName(), Variable::BRANCH_MAGIC);
                     $otherBranchId = 1;
                     if ($pos > -1) {
-                        $otherBranchId = (int) substr($variable->getName(), $pos + \strlen(Variable::BRANCH_MAGIC));
+                        $otherBranchId = (int)substr($variable->getName(), $pos + strlen(Variable::BRANCH_MAGIC));
                     }
                     if ($branchId == $otherBranchId) {
                         $variable->setIdle(true);
@@ -849,51 +906,38 @@ public function markTemporalVariablesIdle(CompilationContext $compilationContext
     }
 
     /**
-     * Returns the number of expected mutations for a variable.
-     *
-     * @param string $variable
+     * Return a variable in the symbol table, it will be used for a write operation.
      *
-     * @return int
+     * @param bool $mustGrownStack
      */
-    public function getExpectedMutations(string $variable): int
+    public function mustGrownStack(bool $mustGrownStack): void
     {
-        if ($this->localContext) {
-            return $this->localContext->getNumberOfMutations($variable);
-        }
-
-        return 0;
+        $this->mustGrownStack = $mustGrownStack;
     }
 
-    /**
-     * Returns the last line where any kind of call was performed within the method
-     * This is not necessary related to the symbol table but this information is gathered
-     * by the LocalContextPass.
-     *
-     * @return int
-     */
-    public function getLastCallLine(): int
+    public function resolveVariableToBranch($name, CompilationContext $compilationContext): ?Branch
     {
-        if ($this->localContext) {
-            return $this->localContext->getLastCallLine();
-        }
+        $currentBranch = $compilationContext->branchManager->getCurrentBranch();
 
-        return 0;
+        do {
+            $currentId = $currentBranch->getUniqueId();
+            if (isset($this->branchVariables[$currentId][$name])) {
+                return $currentBranch;
+            }
+            $currentBranch = $currentBranch->getParentBranch();
+        } while (null != $currentBranch);
+
+        return null;
     }
 
     /**
-     * Returns the last line where an 'unset' operation was made within the current method
-     * This is not necessary related to the symbol table but this information is gathered
-     * by the LocalContextPass.
+     * Sets the local context information.
      *
-     * @return int
+     * @param LocalContextPass $localContext
      */
-    public function getLastUnsetLine(): int
+    public function setLocalContext(LocalContextPass $localContext): void
     {
-        if ($this->localContext) {
-            return $this->localContext->getLastUnsetLine();
-        }
-
-        return 0;
+        $this->localContext = $localContext;
     }
 
     /**
@@ -904,10 +948,14 @@ public function getLastUnsetLine(): int
      * @param Variable           $variable
      * @param CompilationContext $compilationContext
      */
-    protected function registerTempVariable($type, $location, Variable $variable, CompilationContext $compilationContext = null): void
-    {
+    protected function registerTempVariable(
+        $type,
+        $location,
+        Variable $variable,
+        CompilationContext $compilationContext = null
+    ): void {
         $compilationContext = $compilationContext ?: $this->compilationContext;
-        $branchId = $compilationContext->branchManager->getCurrentBranchId();
+        $branchId           = $compilationContext->branchManager->getCurrentBranchId();
 
         if (!isset($this->branchTempVariables[$branchId][$location][$type])) {
             $this->branchTempVariables[$branchId][$location][$type] = [];
@@ -924,10 +972,13 @@ protected function registerTempVariable($type, $location, Variable $variable, Co
      *
      * @return Variable|null
      */
-    protected function reuseTempVariable(string $type, string $location, CompilationContext $compilationContext = null): ?Variable
-    {
+    protected function reuseTempVariable(
+        string $type,
+        string $location,
+        CompilationContext $compilationContext = null
+    ): ?Variable {
         $compilationContext = $compilationContext ?: $this->compilationContext;
-        $branchId = $compilationContext->branchManager->getCurrentBranchId();
+        $branchId           = $compilationContext->branchManager->getCurrentBranchId();
 
         if (isset($this->branchTempVariables[$branchId][$location][$type])) {
             foreach ($this->branchTempVariables[$branchId][$location][$type] as $variable) {
diff --git a/src/TypeAwareInterface.php b/src/TypeAwareInterface.php
index 55523edf16..1bf666ed9f 100644
--- a/src/TypeAwareInterface.php
+++ b/src/TypeAwareInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir;
 
 interface TypeAwareInterface
diff --git a/src/Types/AbstractType.php b/src/Types/AbstractType.php
index 76e6e63b49..9c346a4ad0 100644
--- a/src/Types/AbstractType.php
+++ b/src/Types/AbstractType.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Types;
 
+use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -28,6 +29,18 @@ abstract class AbstractType
      */
     protected array $methodMap = [];
 
+    public function getMethodMap(): array
+    {
+        return $this->methodMap;
+    }
+
+    /**
+     * Get the name of the type.
+     *
+     * @return string
+     */
+    abstract public function getTypeName(): string;
+
     /**
      * Intercepts calls to built-in methods.
      *
@@ -40,7 +53,7 @@ abstract class AbstractType
      * @return bool|CompiledExpression
      *
      * @throws Exception
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function invokeMethod(
         $methodName,
@@ -84,10 +97,11 @@ public function invokeMethod(
             }
 
             $functionCall = BuilderFactory::getInstance()->statements()
-                ->functionCall($this->methodMap[$methodName], $parameters)
-                ->setFile($expression['file'])
-                ->setLine($expression['line'])
-                ->setChar($expression['char']);
+                                          ->functionCall($this->methodMap[$methodName], $parameters)
+                                          ->setFile($expression['file'])
+                                          ->setLine($expression['line'])
+                                          ->setChar($expression['char'])
+            ;
 
             $expression = new Expression($functionCall->build());
 
@@ -100,18 +114,6 @@ public function invokeMethod(
         );
     }
 
-    /**
-     * Get the name of the type.
-     *
-     * @return string
-     */
-    abstract public function getTypeName(): string;
-
-    public function getMethodMap(): array
-    {
-        return $this->methodMap;
-    }
-
     /**
      * Returns the number of the parameter where the object must be bound.
      */
diff --git a/src/Types/ArrayType.php b/src/Types/ArrayType.php
index 3d9996cf06..fa20863e6c 100644
--- a/src/Types/ArrayType.php
+++ b/src/Types/ArrayType.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,8 +9,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Types;
 
+use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -26,49 +27,49 @@
 class ArrayType extends AbstractType
 {
     public array $methodMap = [
-        'join' => 'join',
-        'reversed' => 'array_reverse',
-        'rev' => 'array_reverse',
-        'diff' => 'array_diff',
-        'flip' => 'array_flip',
-        'fill' => 'array_fill',
-        'walk' => 'array_walk',
-        'haskey' => 'array_key_exists',
-        'keys' => 'array_keys',
-        'values' => 'array_values',
-        'split' => 'array_chunk',
-        'combine' => 'array_combine',
-        'intersect' => 'array_intersect',
-        'merge' => 'array_merge',
-        'mergerecursive' => 'array_merge_recursive',
-        'pad' => 'array_pad',
-        'pop' => 'array_pop',
-        'push' => 'array_push',
-        'rand' => 'array_rand',
-        'replace' => 'array_replace',
-        'map' => 'array_map',
+        'join'             => 'join',
+        'reversed'         => 'array_reverse',
+        'rev'              => 'array_reverse',
+        'diff'             => 'array_diff',
+        'flip'             => 'array_flip',
+        'fill'             => 'array_fill',
+        'walk'             => 'array_walk',
+        'haskey'           => 'array_key_exists',
+        'keys'             => 'array_keys',
+        'values'           => 'array_values',
+        'split'            => 'array_chunk',
+        'combine'          => 'array_combine',
+        'intersect'        => 'array_intersect',
+        'merge'            => 'array_merge',
+        'mergerecursive'   => 'array_merge_recursive',
+        'pad'              => 'array_pad',
+        'pop'              => 'array_pop',
+        'push'             => 'array_push',
+        'rand'             => 'array_rand',
+        'replace'          => 'array_replace',
+        'map'              => 'array_map',
         'replacerecursive' => 'array_replace_recursive',
-        'shift' => 'array_shift',
-        'slice' => 'array_slice',
-        'splice' => 'array_splice',
-        'sum' => 'array_sum',
-        'unique' => 'array_unique',
-        'prepend' => 'array_unshift',
-        'count' => 'count',
-        'current' => 'current',
-        'each' => 'each',
-        'end' => 'end',
-        'key' => 'key',
-        'next' => 'next',
-        'prev' => 'prev',
-        'reset' => 'reset',
-        'sort' => 'sort',
-        'sortbykey' => 'ksort',
-        'reversesort' => 'rsort',
+        'shift'            => 'array_shift',
+        'slice'            => 'array_slice',
+        'splice'           => 'array_splice',
+        'sum'              => 'array_sum',
+        'unique'           => 'array_unique',
+        'prepend'          => 'array_unshift',
+        'count'            => 'count',
+        'current'          => 'current',
+        'each'             => 'each',
+        'end'              => 'end',
+        'key'              => 'key',
+        'next'             => 'next',
+        'prev'             => 'prev',
+        'reset'            => 'reset',
+        'sort'             => 'sort',
+        'sortbykey'        => 'ksort',
+        'reversesort'      => 'rsort',
         'reversesortbykey' => 'krsort',
-        'shuffle' => 'shuffle',
-        'tojson' => 'json_encode',
-        'reduce' => 'array_reduce',
+        'shuffle'          => 'shuffle',
+        'tojson'           => 'json_encode',
+        'reduce'           => 'array_reduce',
     ];
 
     public function getTypeName(): string
@@ -86,17 +87,18 @@ public function getTypeName(): string
      *
      * @return bool|CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function join($caller, CompilationContext $compilationContext, Call $call, array $expression)
     {
         $functionCall = BuilderFactory::getInstance()->statements()
-            ->functionCall('join', $expression['parameters'])
-            ->addArgument($caller)
-            ->setFile($expression['file'])
-            ->setLine($expression['line'])
-            ->setChar($expression['char']);
+                                      ->functionCall('join', $expression['parameters'])
+                                      ->addArgument($caller)
+                                      ->setFile($expression['file'])
+                                      ->setLine($expression['line'])
+                                      ->setChar($expression['char'])
+        ;
 
         $expression = new Expression($functionCall->build());
 
diff --git a/src/Types/CharType.php b/src/Types/CharType.php
index 2233f73f6f..b748c20ab3 100644
--- a/src/Types/CharType.php
+++ b/src/Types/CharType.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Types;
 
+use ReflectionException;
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -37,17 +38,18 @@ public function getTypeName(): string
      *
      * @return bool|mixed|CompiledExpression
      *
-     * @throws \ReflectionException
+     * @throws ReflectionException
      * @throws Exception
      */
     public function toHex($caller, CompilationContext $compilationContext, Call $call, array $expression)
     {
-        $exprBuilder = BuilderFactory::getInstance();
+        $exprBuilder  = BuilderFactory::getInstance();
         $functionCall = $exprBuilder->statements()
-            ->functionCall('zephir_string_to_hex', [$caller])
-            ->setFile($expression['file'])
-            ->setLine($expression['line'])
-            ->setChar($expression['char']);
+                                    ->functionCall('zephir_string_to_hex', [$caller])
+                                    ->setFile($expression['file'])
+                                    ->setLine($expression['line'])
+                                    ->setChar($expression['char'])
+        ;
 
         $expression = new Expression($functionCall->build());
 
diff --git a/src/Types/DoubleType.php b/src/Types/DoubleType.php
index 49dddc27fd..f0097a0f0b 100644
--- a/src/Types/DoubleType.php
+++ b/src/Types/DoubleType.php
@@ -19,20 +19,20 @@
 class DoubleType extends AbstractType
 {
     public array $methodMap = [
-        'abs' => 'abs',
+        'abs'      => 'abs',
         'tobinary' => 'decbin',
-        'tohex' => 'dechex',
-        'tooctal' => 'decoct',
-        'pow' => 'pow',
-        'sqrt' => 'sqrt',
-        'exp' => 'exp',
-        'sin' => 'sin',
-        'cos' => 'cos',
-        'tan' => 'tan',
-        'asin' => 'asin',
-        'acos' => 'acos',
-        'atan' => 'atan',
-        'log' => 'log',
+        'tohex'    => 'dechex',
+        'tooctal'  => 'decoct',
+        'pow'      => 'pow',
+        'sqrt'     => 'sqrt',
+        'exp'      => 'exp',
+        'sin'      => 'sin',
+        'cos'      => 'cos',
+        'tan'      => 'tan',
+        'asin'     => 'asin',
+        'acos'     => 'acos',
+        'atan'     => 'atan',
+        'log'      => 'log',
     ];
 
     public function getTypeName(): string
diff --git a/src/Types/IntType.php b/src/Types/IntType.php
index 9cd5cc490e..0172c68cae 100644
--- a/src/Types/IntType.php
+++ b/src/Types/IntType.php
@@ -19,20 +19,20 @@
 class IntType extends AbstractType
 {
     public array $methodMap = [
-        'abs' => 'abs',
+        'abs'      => 'abs',
         'tobinary' => 'decbin',
-        'tohex' => 'dechex',
-        'tooctal' => 'decoct',
-        'pow' => 'pow',
-        'sqrt' => 'sqrt',
-        'exp' => 'exp',
-        'sin' => 'sin',
-        'cos' => 'cos',
-        'tan' => 'tan',
-        'asin' => 'asin',
-        'acos' => 'acos',
-        'atan' => 'atan',
-        'log' => 'log',
+        'tohex'    => 'dechex',
+        'tooctal'  => 'decoct',
+        'pow'      => 'pow',
+        'sqrt'     => 'sqrt',
+        'exp'      => 'exp',
+        'sin'      => 'sin',
+        'cos'      => 'cos',
+        'tan'      => 'tan',
+        'asin'     => 'asin',
+        'acos'     => 'acos',
+        'atan'     => 'atan',
+        'log'      => 'log',
     ];
 
     public function getTypeName(): string
diff --git a/src/Types/StringType.php b/src/Types/StringType.php
index 419102c61d..263cc53e55 100644
--- a/src/Types/StringType.php
+++ b/src/Types/StringType.php
@@ -21,31 +21,31 @@
 class StringType extends AbstractType
 {
     public array $methodMap = [
-        'index' => 'strpos',
-        'trim' => 'trim',
-        'trimleft' => 'ltrim',
-        'trimright' => 'rtrim',
-        'length' => 'strlen',
-        'lower' => 'strtolower',
-        'upper' => 'strtoupper',
-        'lowerfirst' => 'lcfirst',
-        'upperfirst' => 'ucfirst',
-        'format' => 'sprintf',
-        'md5' => 'md5',
-        'sha1' => 'sha1',
-        'nl2br' => 'nl2br',
-        'parsecsv' => 'str_getcsv',
-        'parsejson' => 'json_decode',
-        'tojson' => 'json_encode',
-        'repeat' => 'str_repeat',
-        'shuffle' => 'str_shuffle',
-        'split' => 'str_split',
-        'compare' => 'strcmp',
-        'comparelocale' => 'strcoll',
-        'rev' => 'strrev',
+        'index'            => 'strpos',
+        'trim'             => 'trim',
+        'trimleft'         => 'ltrim',
+        'trimright'        => 'rtrim',
+        'length'           => 'strlen',
+        'lower'            => 'strtolower',
+        'upper'            => 'strtoupper',
+        'lowerfirst'       => 'lcfirst',
+        'upperfirst'       => 'ucfirst',
+        'format'           => 'sprintf',
+        'md5'              => 'md5',
+        'sha1'             => 'sha1',
+        'nl2br'            => 'nl2br',
+        'parsecsv'         => 'str_getcsv',
+        'parsejson'        => 'json_decode',
+        'tojson'           => 'json_encode',
+        'repeat'           => 'str_repeat',
+        'shuffle'          => 'str_shuffle',
+        'split'            => 'str_split',
+        'compare'          => 'strcmp',
+        'comparelocale'    => 'strcoll',
+        'rev'              => 'strrev',
         'htmlspecialchars' => 'htmlspecialchars',
-        'camelize' => 'camelize',
-        'uncamelize' => 'uncamelize',
+        'camelize'         => 'camelize',
+        'uncamelize'       => 'uncamelize',
     ];
 
     public function getTypeName(): string
diff --git a/src/Types/Types.php b/src/Types/Types.php
index 08034d6028..a408e31e2a 100644
--- a/src/Types/Types.php
+++ b/src/Types/Types.php
@@ -15,31 +15,35 @@
 
 use Zephir\Class\Method\Method;
 
+use function array_key_exists;
+use function count;
+use function in_array;
+
 final class Types
 {
-    public const T_INT = 'int';
-    public const T_UINT = 'uint';
-    public const T_CHAR = 'char';
-    public const T_UCHAR = 'uchar';
-    public const T_LONG = 'long';
-    public const T_ULONG = 'ulong';
-    public const T_DOUBLE = 'double';
-    public const T_FLOAT = 'float';
-    public const T_NUMBER = 'number';
-    public const T_NULL = 'null';
-    public const T_BOOL = 'bool';
-    public const T_FALSE = 'false';
-    public const T_STRING = 'string';
-    public const T_ISTRING = 'istring';
-    public const T_VARIABLE = 'variable';
-    public const T_MIXED = 'mixed';
-    public const T_ARRAY = 'array';
-    public const T_VOID = 'void';
-    public const T_OBJECT = 'object';
-    public const T_CALLABLE = 'callable';
-    public const T_RESOURCE = 'resource';
-    public const T_ITERABLE = 'iterable';
+    public const T_ARRAY     = 'array';
+    public const T_BOOL      = 'bool';
+    public const T_CALLABLE  = 'callable';
+    public const T_CHAR      = 'char';
+    public const T_DOUBLE    = 'double';
+    public const T_FALSE     = 'false';
+    public const T_FLOAT     = 'float';
+    public const T_INT       = 'int';
+    public const T_ISTRING   = 'istring';
+    public const T_ITERABLE  = 'iterable';
+    public const T_LONG      = 'long';
+    public const T_MIXED     = 'mixed';
+    public const T_NULL      = 'null';
+    public const T_NUMBER    = 'number';
+    public const T_OBJECT    = 'object';
+    public const T_RESOURCE  = 'resource';
+    public const T_STRING    = 'string';
+    public const T_UCHAR     = 'uchar';
+    public const T_UINT      = 'uint';
+    public const T_ULONG     = 'ulong';
     public const T_UNDEFINED = 'undefined';
+    public const T_VARIABLE  = 'variable';
+    public const T_VOID      = 'void';
 
     /**
      * Gets PHP compatible return type from class method.
@@ -51,23 +55,23 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
         }
 
         $isProcessedReturnType = null !== $returnTypes;
-        $returnTypes ??= $method->getReturnTypes();
-        $typesCount = \count($returnTypes);
+        $returnTypes           ??= $method->getReturnTypes();
+        $typesCount            = count($returnTypes);
 
-        $isDynamic = \in_array('var', array_keys($returnTypes));
+        $isDynamic  = in_array('var', array_keys($returnTypes));
         $isNullable = $this->isNullable($returnTypes);
 
-        $isBool = $this->areReturnTypesBoolCompatible($returnTypes);
-        $isNull = $this->areReturnTypesNullCompatible($returnTypes);
-        $isVoid = $this->areReturnTypesVoidCompatible($returnTypes);
-        $isArray = $this->areReturnTypesArrayCompatible($returnTypes);
-        $isDouble = $this->areReturnTypesFloatCompatible($returnTypes);
-        $isString = $this->areReturnTypesStringCompatible($returnTypes);
-        $isObject = $this->areReturnTypesObjectCompatible($returnTypes);
-        $isInteger = $this->areReturnTypesIntegerCompatible($returnTypes);
-        $isNumeric = $this->isNumeric($returnTypes);
-        $isIterable = $this->areReturnTypesIterableCompatible($returnTypes);
-        $isResource = $this->areReturnTypesResourceCompatible($returnTypes);
+        $isBool       = $this->areReturnTypesBoolCompatible($returnTypes);
+        $isNull       = $this->areReturnTypesNullCompatible($returnTypes);
+        $isVoid       = $this->areReturnTypesVoidCompatible($returnTypes);
+        $isArray      = $this->areReturnTypesArrayCompatible($returnTypes);
+        $isDouble     = $this->areReturnTypesFloatCompatible($returnTypes);
+        $isString     = $this->areReturnTypesStringCompatible($returnTypes);
+        $isObject     = $this->areReturnTypesObjectCompatible($returnTypes);
+        $isInteger    = $this->areReturnTypesIntegerCompatible($returnTypes);
+        $isNumeric    = $this->isNumeric($returnTypes);
+        $isIterable   = $this->areReturnTypesIterableCompatible($returnTypes);
+        $isResource   = $this->areReturnTypesResourceCompatible($returnTypes);
         $isCollection = $this->areReturnTypesCollectionCompatible($returnTypes);
 
         $isTypeHinted = $method->isReturnTypesHintDetermined();
@@ -80,19 +84,19 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
         }
 
         if ($isInteger) {
-            return self::T_INT.$nullableType;
+            return self::T_INT . $nullableType;
         }
 
         if ($isDouble) {
-            return self::T_FLOAT.$nullableType;
+            return self::T_FLOAT . $nullableType;
         }
 
         if ($isBool) {
-            return self::T_BOOL.$nullableType;
+            return self::T_BOOL . $nullableType;
         }
 
         if ($isString) {
-            return self::T_STRING.$nullableType;
+            return self::T_STRING . $nullableType;
         }
 
         if ($isNull && 1 === $typesCount) {
@@ -116,7 +120,7 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
         }
 
         if ($method->areReturnTypesCompatible() && !$isTypeHinted) {
-            return self::T_MIXED.$nullableType;
+            return self::T_MIXED . $nullableType;
         }
 
         if ($isTypeHinted && !$isBasicTypes && !$isDynamic && !$isNullable) {
@@ -130,32 +134,81 @@ public function getReturnTypeAnnotation(Method $method, array $returnTypes = nul
                 }
             });
 
-            return implode('|', array_values($withoutNullable)).$nullableType;
+            return implode('|', array_values($withoutNullable)) . $nullableType;
         }
 
         if ($isCollection) {
             return implode('|', array_values($returnTypes));
         }
 
-        return self::T_MIXED.$nullableType;
+        return self::T_MIXED . $nullableType;
     }
 
     /**
-     * Match Zephir types with Integer type.
+     * Match Zephir types with Array type.
      */
-    private function areReturnTypesIntegerCompatible(array $types): bool
+    private function areReturnTypesArrayCompatible(array $types): bool
     {
-        return $this->areReturnTypesCompatible(
-            $types,
-            [
-                self::T_INT,
-                self::T_UINT,
-                self::T_CHAR,
-                self::T_UCHAR,
-                self::T_LONG,
-                self::T_ULONG,
-            ]
-        );
+        return $this->areReturnTypesCompatible($types, [self::T_ARRAY]);
+    }
+
+    /**
+     * Match Zephir types with Boolean type.
+     */
+    private function areReturnTypesBoolCompatible(array $types): bool
+    {
+        return $this->areReturnTypesCompatible($types, [self::T_BOOL]);
+    }
+
+    /**
+     * Match Zephir types with Collections.
+     */
+    private function areReturnTypesCollectionCompatible(array $types): bool
+    {
+        $result = false;
+
+        foreach ($types as $type => $data) {
+            if (str_contains($type, '[]')) {
+                $result = true;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Match if return types from Zephir are compatible
+     * with allowed return types from PHP.
+     *
+     * Examples:
+     *  $types = [
+     *      'variable' => [
+     *          'type' => 'return-type-parameter',
+     *          'data-type' => 'variable',
+     *          'mandatory' => 0,
+     *          'file' => '../path-to-file/stubs.zep',
+     *          'line' => 21,
+     *          'char' => 48,
+     *       ]
+     *  ]
+     */
+    private function areReturnTypesCompatible(array $types, array $allowedTypes, bool $isNullable = false): bool
+    {
+        $result = null;
+
+        if ($isNullable) {
+            $allowedTypes[] = self::T_NULL;
+        }
+
+        foreach ($types as $type => $data) {
+            $areEquals = in_array($type, $allowedTypes);
+
+            $result = isset($result)
+                ? ($areEquals && $result)
+                : $areEquals;
+        }
+
+        return $result ?? false;
     }
 
     /**
@@ -173,42 +226,37 @@ private function areReturnTypesFloatCompatible(array $types): bool
     }
 
     /**
-     * Match Zephir types with Boolean type.
-     */
-    private function areReturnTypesBoolCompatible(array $types): bool
-    {
-        return $this->areReturnTypesCompatible($types, [self::T_BOOL]);
-    }
-
-    /**
-     * Match Zephir types with String type.
+     * Match Zephir types with Integer type.
      */
-    private function areReturnTypesStringCompatible(array $types): bool
+    private function areReturnTypesIntegerCompatible(array $types): bool
     {
         return $this->areReturnTypesCompatible(
             $types,
             [
-                self::T_STRING,
-                self::T_ISTRING,
-            ],
-            $this->isNullable($types)
+                self::T_INT,
+                self::T_UINT,
+                self::T_CHAR,
+                self::T_UCHAR,
+                self::T_LONG,
+                self::T_ULONG,
+            ]
         );
     }
 
     /**
-     * Match Zephir types with Null type.
+     * Match Zephir types with Iterable type.
      */
-    private function areReturnTypesNullCompatible(array $types): bool
+    private function areReturnTypesIterableCompatible(array $types): bool
     {
-        return $this->areReturnTypesCompatible($types, [self::T_NULL]);
+        return $this->areReturnTypesCompatible($types, [self::T_ITERABLE]);
     }
 
     /**
-     * Match Zephir types with Array type.
+     * Match Zephir types with Null type.
      */
-    private function areReturnTypesArrayCompatible(array $types): bool
+    private function areReturnTypesNullCompatible(array $types): bool
     {
-        return $this->areReturnTypesCompatible($types, [self::T_ARRAY]);
+        return $this->areReturnTypesCompatible($types, [self::T_NULL]);
     }
 
     /**
@@ -219,14 +267,6 @@ private function areReturnTypesObjectCompatible(array $types): bool
         return $this->areReturnTypesCompatible($types, [self::T_OBJECT]);
     }
 
-    /**
-     * Match Zephir types with Iterable type.
-     */
-    private function areReturnTypesIterableCompatible(array $types): bool
-    {
-        return $this->areReturnTypesCompatible($types, [self::T_ITERABLE]);
-    }
-
     /**
      * Match Zephir types with Resource type.
      */
@@ -236,19 +276,18 @@ private function areReturnTypesResourceCompatible(array $types): bool
     }
 
     /**
-     * Match Zephir types with Collections.
+     * Match Zephir types with String type.
      */
-    private function areReturnTypesCollectionCompatible(array $types): bool
+    private function areReturnTypesStringCompatible(array $types): bool
     {
-        $result = false;
-
-        foreach ($types as $type => $data) {
-            if (str_contains($type, '[]')) {
-                $result = true;
-            }
-        }
-
-        return $result;
+        return $this->areReturnTypesCompatible(
+            $types,
+            [
+                self::T_STRING,
+                self::T_ISTRING,
+            ],
+            $this->isNullable($types)
+        );
     }
 
     /**
@@ -259,56 +298,21 @@ private function areReturnTypesVoidCompatible(array $types): bool
         return $this->areReturnTypesCompatible($types, [self::T_VOID]);
     }
 
-    /**
-     * Check if Zephir types is a Numeric type compatible.
-     */
-    private function isNumeric(array $types): bool
-    {
-        return $this->areReturnTypesCompatible($types, [self::T_NUMBER]);
-    }
-
     /**
      * Check if Zephir types can be Nullable.
      */
     private function isNullable(array $types): bool
     {
-        return (\array_key_exists(self::T_NULL, $types)
-            || \in_array(self::T_NULL, $types))
-            && 1 !== \count($types);
+        return (array_key_exists(self::T_NULL, $types)
+                || in_array(self::T_NULL, $types))
+            && 1 !== count($types);
     }
 
     /**
-     * Match if return types from Zephir are compatible
-     * with allowed return types from PHP.
-     *
-     * Examples:
-     *  $types = [
-     *      'variable' => [
-     *          'type' => 'return-type-parameter',
-     *          'data-type' => 'variable',
-     *          'mandatory' => 0,
-     *          'file' => '../path-to-file/stubs.zep',
-     *          'line' => 21,
-     *          'char' => 48,
-     *       ]
-     *  ]
+     * Check if Zephir types is a Numeric type compatible.
      */
-    private function areReturnTypesCompatible(array $types, array $allowedTypes, bool $isNullable = false): bool
+    private function isNumeric(array $types): bool
     {
-        $result = null;
-
-        if ($isNullable) {
-            $allowedTypes[] = self::T_NULL;
-        }
-
-        foreach ($types as $type => $data) {
-            $areEquals = \in_array($type, $allowedTypes);
-
-            $result = isset($result)
-                ? ($areEquals && $result)
-                : $areEquals;
-        }
-
-        return $result ?? false;
+        return $this->areReturnTypesCompatible($types, [self::T_NUMBER]);
     }
 }
diff --git a/src/Variable/Globals.php b/src/Variable/Globals.php
index d41b7c64ea..5a56df04e5 100644
--- a/src/Variable/Globals.php
+++ b/src/Variable/Globals.php
@@ -22,14 +22,22 @@ final class Globals
      * Names of super global variables.
      */
     protected array $superGlobals = [
-        '_GET',     // The variables passed to the current script via the URL parameters.
-        '_POST',    // The variables passed to the current script via the HTTP POST method.
-        '_ENV',     // An array in which the environment variable names are element keys, and the environment variable value strings are element values.
-        '_COOKIE',  // The variables passed to the current script via HTTP Cookies.
-        '_SERVER',  // Server and execution environment information, such as headers, paths, and script locations.
-        '_SESSION', // The session variables available to the current script.
-        '_REQUEST', // By default, contains the contents of $_COOKIE, $_GET, and $_POST.
-        '_FILES',   // The items uploaded to the current script via the HTTP POST method.
+        '_GET',
+        // The variables passed to the current script via the URL parameters.
+        '_POST',
+        // The variables passed to the current script via the HTTP POST method.
+        '_ENV',
+        // An array in which the environment variable names are element keys, and the environment variable value strings are element values.
+        '_COOKIE',
+        // The variables passed to the current script via HTTP Cookies.
+        '_SERVER',
+        // Server and execution environment information, such as headers, paths, and script locations.
+        '_SESSION',
+        // The session variables available to the current script.
+        '_REQUEST',
+        // By default, contains the contents of $_COOKIE, $_GET, and $_POST.
+        '_FILES',
+        // The items uploaded to the current script via the HTTP POST method.
     ];
 
     /**
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index 8ceab884d2..dcc40cecd1 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Variable;
 
+use ReflectionClass;
 use Zephir\Branch;
 use Zephir\BranchManager;
 use Zephir\Class\Definition\Definition;
@@ -21,106 +22,85 @@
 use Zephir\Exception\CompilerException;
 use Zephir\TypeAwareInterface;
 
+use function in_array;
+use function is_string;
+
 /**
  * This represents a variable in a symbol table
  */
 class Variable implements TypeAwareInterface
 {
-    public const VAR_THIS_POINTER = 'this_ptr';
-
+    public const BRANCH_MAGIC     = '$$';
     public const VAR_RETURN_VALUE = 'return_value';
-
-    public const BRANCH_MAGIC = '$$';
-
+    public const VAR_THIS_POINTER = 'this_ptr';
+    protected Definition|ReflectionClass|null $associatedClass  = null;
+    protected array                           $classTypes       = [];
+    protected mixed                           $defaultInitValue = null;
+    protected bool                            $doublePointer    = false;
     /**
      * Current dynamic type of the variable.
      *
      * @var array
      */
     protected array $dynamicTypes = ['unknown' => true];
-
     /**
-     * Branch where the variable was initialized for the first time.
+     * @var Globals
      */
-    protected bool $initBranch = false;
-
+    protected Globals $globalsManager;
     /**
-     * Compiled variable's name.
+     * Temporal variables are marked as idle.
      */
-    protected string $lowName = '';
-
+    protected bool $idle = false;
     /**
-     * Number of times the variable has been read.
+     * Branch where the variable was initialized for the first time.
      */
-    protected int $numberUses = 0;
-
+    protected bool  $initBranch   = false;
+    protected array $initBranches = [];
     /**
-     * Whether the variable is temporal or not.
+     * Whether the variable has received any assignment.
      */
-    protected bool $temporal = false;
-
+    protected bool $initialized = false;
+    protected bool $isExternal  = false;
+    protected bool $localOnly   = false;
     /**
-     * Temporal variables are marked as idle.
+     * Compiled variable's name.
      */
-    protected bool $idle = false;
-
+    protected string $lowName       = '';
+    protected bool   $memoryTracked = true;
+    protected bool   $mustInitNull  = false;
     /**
-     * Reusable temporary variables?
+     * AST node where the variable was originally declared or created.
      */
-    protected bool $reusable = true;
-
+    protected ?array $node = null;
     /**
      * Number of mutations to the variable.
      */
     protected int $numberMutates = 0;
-
-    /**
-     * Whether the variable has received any assignment.
-     */
-    protected bool $initialized = false;
-
-    protected array $initBranches = [];
-
-    protected bool $isExternal = false;
-
-    protected int $variantInits = 0;
-
-    protected bool $mustInitNull = false;
-
-    protected bool $readOnly = false;
-
-    protected bool $localOnly = false;
-
-    protected bool $memoryTracked = true;
-
-    protected bool $doublePointer = false;
-
-    protected mixed $defaultInitValue = null;
-
-    protected array $classTypes = [];
-
-    protected Definition | \ReflectionClass | null $associatedClass = null;
-
     /**
      * Initialization skips.
      */
     protected int $numberSkips = 0;
-
     /**
-     * AST node where the variable was originally declared or created.
+     * Number of times the variable has been read.
      */
-    protected ?array $node = null;
-
+    protected int $numberUses = 0;
     /**
      * Possible constant value assigned to the variable.
      */
     protected mixed $possibleValue = null;
-
     /**
      * Branch where the variable got its last possible value.
      */
     protected mixed $possibleValueBranch = null;
-
+    protected bool  $readOnly            = false;
+    /**
+     * Reusable temporary variables?
+     */
+    protected bool $reusable = true;
+    /**
+     * Whether the variable is temporal or not.
+     */
+    protected bool $temporal = false;
     /**
      * Whether the variable was used or not.
      */
@@ -129,105 +109,123 @@ class Variable implements TypeAwareInterface
     /**
      * Last AST node where the variable was used.
      */
-    protected ?array $usedNode = null;
-
-    /**
-     * @var Globals
-     */
-    protected Globals $globalsManager;
+    protected ?array $usedNode     = null;
+    protected int    $variantInits = 0;
 
     public function __construct(protected string $type, protected string $name, protected ?Branch $branch = null)
     {
         $this->globalsManager = new Globals();
-        $this->type = \in_array($type, ['callable', 'object', 'resource'], true) ? 'variable' : $type;
+        $this->type           = in_array($type, ['callable', 'object', 'resource'], true) ? 'variable' : $type;
     }
 
     /**
-     * Get init branch.
-     *
-     * @return bool
+     * Sets an automatic safe default init value according to its type.
      */
-    public function getInitBranch(): bool
+    public function enableDefaultAutoInitValue(): void
     {
-        return $this->initBranch;
+        switch ($this->type) {
+            case 'char':
+            case 'boolean':
+            case 'bool':
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+            case 'double':
+            case 'zephir_ce_guard':
+                $this->defaultInitValue = 0;
+                break;
+
+            case 'variable':
+            case 'string':
+            case 'array':
+                $this->defaultInitValue = null;
+                $this->setDynamicTypes('null');
+                $this->setMustInitNull(true);
+                $this->setLocalOnly(false);
+                break;
+
+            default:
+                throw new CompilerException(
+                    'Cannot create an automatic safe default value for variable type: ' . $this->type
+                );
+        }
     }
 
     /**
-     * Get init marked branch.
-     *
-     * @return Branch[]
+     * Returns the class related to the variable.
      */
-    public function getInitBranches(): array
+    public function getAssociatedClass(): Definition|ReflectionClass|null
     {
-        return $this->initBranches;
+        return $this->associatedClass;
     }
 
     /**
-     * Sets the type of variable.
+     * Get the branch where the variable was declared.
      *
-     * @param string $type
+     * @return Branch|null
      */
-    public function setType(string $type): void
+    public function getBranch(): ?Branch
     {
-        $this->type = $type;
+        return $this->branch;
     }
 
     /**
-     * Returns the type of variable.
+     * Returns the PHP classes associated to the variable.
      *
-     * @return string
+     * @return array
      */
-    public function getType(): string
+    public function getClassTypes(): array
     {
-        return $this->type;
+        return $this->classTypes;
     }
 
     /**
-     * Sets if the variable is local-only scoped.
+     * Returns the default init value.
      *
-     * @param bool $localOnly
+     * @return mixed
      */
-    public function setLocalOnly(bool $localOnly): void
+    public function getDefaultInitValue(): mixed
     {
-        $this->localOnly = $localOnly;
+        return $this->defaultInitValue;
     }
 
     /**
-     * Checks if the variable is local-only scoped.
+     * Returns the current dynamic type in a polymorphic variable.
      *
-     * @return bool
+     * @return array
      */
-    public function isLocalOnly(): bool
+    public function getDynamicTypes(): array
     {
-        return $this->localOnly;
+        return $this->dynamicTypes;
     }
 
     /**
-     * Marks the variable to be defined as a double pointer.
+     * Get init branch.
      *
-     * @param bool $doublePointer
+     * @return bool
      */
-    public function setIsDoublePointer(bool $doublePointer): void
+    public function getInitBranch(): bool
     {
-        $this->doublePointer = $doublePointer;
+        return $this->initBranch;
     }
 
     /**
-     * Returns the variable.
+     * Get init marked branch.
+     *
+     * @return Branch[]
      */
-    public function isDoublePointer(): bool
+    public function getInitBranches(): array
     {
-        return $this->doublePointer;
+        return $this->initBranches;
     }
 
     /**
-     * Returns variable's real name.
-     *
-     * @return string
+     * Returns the last node where the variable was assigned or used.
      */
-    public function getRealName(): string
+    public function getLastUsedNode(): ?array
     {
-        return $this->name;
+        return $this->usedNode;
     }
 
     /**
@@ -241,533 +239,510 @@ public function getName(): string
     }
 
     /**
-     * Sets the compiled variable's name.
+     * Returns the number of mutations performed over the variable.
      *
-     * @param string $lowName
+     * @return int
      */
-    public function setLowName(string $lowName): void
+    public function getNumberMutations(): int
     {
-        $this->lowName = $lowName;
+        return $this->numberMutates;
     }
 
     /**
-     * Sets if the variable is read only.
+     * Return the number of uses.
      *
-     * @param bool $readOnly
+     * @return int
      */
-    public function setReadOnly(bool $readOnly): void
+    public function getNumberUses(): int
     {
-        $this->readOnly = $readOnly;
+        return $this->numberUses;
     }
 
     /**
-     * Returns if the variable is read only.
+     * Returns the original AST node where the variable was declared.
      *
-     * @return bool
+     * @return array
      */
-    public function isReadOnly(): bool
+    public function getOriginal(): array
     {
-        return $this->readOnly;
+        if ($this->node) {
+            return $this->node;
+        }
+
+        return ['file' => 'unknown', 'line' => 0, 'char' => 0];
     }
 
     /**
-     * Sets whether the variable is temporal or not.
+     * Returns the latest CompiledExpression assigned to a variable.
      *
-     * @param bool $temporal
+     * @return mixed
      */
-    public function setTemporal(bool $temporal): void
+    public function getPossibleValue(): mixed
     {
-        $this->temporal = $temporal;
+        return $this->possibleValue;
     }
 
     /**
-     * Returns whether the variable is temporal or not.
-     *
-     * @return bool
+     * Returns the branch where the variable was assigned for the last time.
      */
-    public function isTemporal(): bool
+    public function getPossibleValueBranch(): ?Branch
     {
-        return $this->temporal;
+        return $this->possibleValueBranch;
     }
 
     /**
-     * Once a temporal variable is unused in a specific branch it is marked as idle.
+     * Returns variable's real name.
      *
-     * @param bool $idle
+     * @return string
      */
-    public function setIdle(bool $idle): void
+    public function getRealName(): string
     {
-        $this->idle = false;
-
-        if ($this->reusable) {
-            $this->classTypes = [];
-            $this->dynamicTypes = ['unknown' => true];
-            $this->idle = $idle;
-        }
+        return $this->name;
     }
 
     /**
-     * Checks if the variable is idle.
+     * Get the number of initializations remaining to skip.
      *
-     * @return bool
+     * @return int
      */
-    public function isIdle(): bool
+    public function getSkipVariant(): int
     {
-        return $this->idle;
+        return $this->numberSkips;
     }
 
     /**
-     * Some temporary variables can't be reused.
+     * Returns the type of variable.
      *
-     * @param bool $reusable
+     * @return string
      */
-    public function setReusable(bool $reusable): void
+    public function getType(): string
     {
-        $this->reusable = $reusable;
+        return $this->type;
     }
 
     /**
-     * Checks if the temporary variable is reusable.
+     * Get the number of times the variable has been initialized.
      *
-     * @return bool
+     * @return int
      */
-    public function isReusable(): bool
+    public function getVariantInits(): int
     {
-        return $this->reusable;
+        return $this->variantInits;
     }
 
     /**
-     * Sets the latest node where a variable was used.
+     * Checks if the variable has any of the passed dynamic.
      *
-     * @param bool       $used
-     * @param array|null $node
+     * @param array|string $types
+     *
+     * @return bool
      */
-    public function setUsed(bool $used, array $node = null): void
+    public function hasAnyDynamicType(array|string $types): bool
     {
-        $this->used = $used;
-        $this->usedNode = $node;
+        if (is_string($types)) {
+            $types = [$types];
+        }
+
+        foreach ($types as $type) {
+            if (isset($this->dynamicTypes[$type])) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**
-     * Checks whether the last value assigned was used.
+     * Check if the variable has at least one dynamic type to the ones passed in the list.
+     *
+     * @param array $types
      *
      * @return bool
      */
-    public function isUsed(): bool
+    public function hasDifferentDynamicType(array $types): bool
     {
-        return $this->used;
-    }
+        $number = 0;
+        foreach ($types as $type) {
+            if (isset($this->dynamicTypes[$type])) {
+                ++$number;
+            }
+        }
 
-    /**
-     * Returns the last node where the variable was assigned or used.
-     */
-    public function getLastUsedNode(): ?array
-    {
-        return $this->usedNode;
+        return 0 === $number;
     }
 
     /**
-     * Sets if the variable is not tracked by the memory manager.
-     *
-     * @param bool $memoryTracked
+     * Increase the number of mutations a variable may have.
      */
-    public function setMemoryTracked(bool $memoryTracked): void
+    public function increaseMutates(): void
     {
-        $this->memoryTracked = $memoryTracked;
+        ++$this->numberMutates;
     }
 
     /**
-     * Checks if the variable is tracked by the memory manager.
-     *
-     * @return bool
+     * Increase the number of uses a variable may have.
      */
-    public function isMemoryTracked(): bool
+    public function increaseUses(): void
     {
-        return $this->memoryTracked;
+        ++$this->numberUses;
     }
 
     /**
-     * Get the branch where the variable was declared.
-     *
-     * @return Branch|null
+     * Increase the number of times the variable has been initialized.
      */
-    public function getBranch(): ?Branch
+    public function increaseVariantIfNull(): void
     {
-        return $this->branch;
+        ++$this->variantInits;
     }
 
     /**
-     * Set the original AST node where the variable was declared.
+     * Initializes a variant variable that is intended to have the special
+     * behavior of only freed its body value instead of the full variable.
      *
-     * @param array $node
+     * @param CompilationContext $compilationContext
      */
-    public function setOriginal(array $node): void
+    public function initComplexLiteralVariant(CompilationContext $compilationContext): void
     {
-        $this->node = $node;
+        if ($this->numberSkips) {
+            --$this->numberSkips;
+
+            return;
+        }
+
+        if (self::VAR_THIS_POINTER != $this->getName() && self::VAR_RETURN_VALUE != $this->getName()) {
+            if (!$this->initBranch) {
+                $this->initBranch = $compilationContext->currentBranch === 0;
+            }
+
+            $compilationContext->headersManager->add('kernel/memory');
+            $compilationContext->symbolTable->mustGrownStack(true);
+            if (!$this->isLocalOnly()) {
+                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
+                    $this->mustInitNull = true;
+                    $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&' . $this->getName() . ');');
+                } else {
+                    $compilationContext->backend->initVar($this, $compilationContext);
+                }
+            } else {
+                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
+                    $this->mustInitNull = true;
+                    $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&' . $this->getName() . ');');
+                }
+            }
+
+            ++$this->variantInits;
+        }
     }
 
     /**
-     * Returns the original AST node where the variable was declared.
+     * Allocate memory for variable and init it null val
      *
-     * @return array
+     * @param CompilationContext $compilationContext
      */
-    public function getOriginal(): array
+    public function initNonReferenced(CompilationContext $compilationContext): void
     {
-        if ($this->node) {
-            return $this->node;
-        }
-
-        return ['file' => 'unknown', 'line' => 0, 'char' => 0];
+        $compilationContext->codePrinter->output('ZVAL_UNDEF(&' . $this->getName() . ');');
     }
 
     /**
-     * Sets the PHP class related to variable.
+     * Initializes a variant variable.
      *
-     * @param array|string $classTypes
+     * @param CompilationContext $compilationContext
      */
-    public function setClassTypes(array | string $classTypes): void
+    public function initVariant(CompilationContext $compilationContext): void
     {
-        if (\is_string($classTypes)) {
-            if (!\in_array($classTypes, $this->classTypes)) {
-                $this->classTypes[] = $classTypes;
-            }
+        if ($this->numberSkips) {
+            --$this->numberSkips;
 
             return;
         }
 
-        foreach ($classTypes as $classType) {
-            if (!\in_array($classType, $this->classTypes)) {
-                $this->classTypes[] = $classType;
+        /**
+         * Variables are allocated for the first time using ZVAL_NULL
+         * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
+         * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
+         */
+        if (self::VAR_THIS_POINTER !== $this->getName() && self::VAR_RETURN_VALUE !== $this->getName()) {
+            if (!$this->initBranch) {
+                $this->initBranch = $compilationContext->currentBranch === 0;
+            }
+
+            $compilationContext->headersManager->add('kernel/memory');
+            $compilationContext->symbolTable->mustGrownStack(true);
+
+            if (!$this->isLocalOnly()) {
+                if ($compilationContext->insideCycle) {
+                    $this->mustInitNull = true;
+                    $compilationContext->backend->initVar($this, $compilationContext, true, true);
+                } else {
+                    if ($this->variantInits > 0) {
+                        if ($this->initBranch) {
+                            $compilationContext->codePrinter->output('ZEPHIR_INIT_BNVAR(' . $this->getName() . ');');
+                        } else {
+                            $this->mustInitNull = true;
+                            $compilationContext->backend->initVar($this, $compilationContext, true, true);
+                        }
+                    } else {
+                        $compilationContext->backend->initVar($this, $compilationContext);
+                    }
+                }
+            } else {
+                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
+                    $this->mustInitNull = true;
+                    $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&' . $this->getName() . ');');
+                }
             }
+
+            ++$this->variantInits;
+            $this->associatedClass = null;
         }
     }
 
     /**
-     * Returns the PHP classes associated to the variable.
+     * Shortcut is type double?
      *
-     * @return array
+     * @return bool
      */
-    public function getClassTypes(): array
+    public function isArray(): bool
     {
-        return $this->classTypes;
+        return 'array' === $this->type;
     }
 
     /**
-     * Sets the PHP class related to variable.
+     * Shortcut is type bool?
      *
-     * @param \ReflectionClass|Definition $associatedClass
+     * @return bool
      */
-    public function setAssociatedClass(\ReflectionClass | Definition $associatedClass): void
+    public function isBoolean(): bool
     {
-        $this->associatedClass = $associatedClass;
+        return 'bool' === $this->type;
     }
 
     /**
-     * Returns the class related to the variable.
+     * Shortcut is type double?
+     *
+     * @return bool
      */
-    public function getAssociatedClass(): Definition | \ReflectionClass | null
+    public function isDouble(): bool
     {
-        return $this->associatedClass;
+        return 'double' === $this->type;
     }
 
     /**
-     * Sets the current dynamic type in a polymorphic variable.
-     *
-     * @param array|string $types
+     * Returns the variable.
      */
-    public function setDynamicTypes(array | string $types): void
+    public function isDoublePointer(): bool
     {
-        unset($this->dynamicTypes['unknown']);
-
-        if (\is_string($types)) {
-            $types = [$types];
-        }
-
-        foreach ($types as $type) {
-            if (!isset($this->dynamicTypes[$type])) {
-                $this->dynamicTypes[$type] = true;
-            }
-        }
+        return $this->doublePointer;
     }
 
     /**
-     * Returns the current dynamic type in a polymorphic variable.
+     * Check if the variable is a parameter.
      *
-     * @return array
+     * @return bool
      */
-    public function getDynamicTypes(): array
+    public function isExternal(): bool
     {
-        return $this->dynamicTypes;
+        return $this->isExternal;
     }
 
     /**
-     * Checks if the variable has any of the passed dynamic.
-     *
-     * @param array|string $types
+     * Checks if the variable is idle.
      *
      * @return bool
      */
-    public function hasAnyDynamicType(array | string $types): bool
+    public function isIdle(): bool
     {
-        if (\is_string($types)) {
-            $types = [$types];
-        }
-
-        foreach ($types as $type) {
-            if (isset($this->dynamicTypes[$type])) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->idle;
     }
 
     /**
-     * Check if the variable has at least one dynamic type to the ones passed in the list.
-     *
-     * @param array $types
+     * Check if the variable is initialized or not.
      *
      * @return bool
      */
-    public function hasDifferentDynamicType(array $types): bool
+    public function isInitialized(): bool
     {
-        $number = 0;
-        foreach ($types as $type) {
-            if (isset($this->dynamicTypes[$type])) {
-                ++$number;
-            }
-        }
-
-        return 0 === $number;
+        return $this->initialized;
     }
 
     /**
-     * Increase the number of uses a variable may have.
+     * Shortcut is type int?
+     *
+     * @return bool
      */
-    public function increaseUses(): void
+    public function isInt(): bool
     {
-        ++$this->numberUses;
+        return 'int' === $this->type;
     }
 
     /**
-     * Increase the number of mutations a variable may have.
+     * Checks if the variable is local-only scoped.
+     *
+     * @return bool
      */
-    public function increaseMutates(): void
+    public function isLocalOnly(): bool
     {
-        ++$this->numberMutates;
+        return $this->localOnly;
     }
 
     /**
-     * Return the number of uses.
+     * Checks if a variable is a local static.
      *
-     * @return int
+     * @return bool
      */
-    public function getNumberUses(): int
+    public function isLocalStatic(): bool
     {
-        return $this->numberUses;
+        return $this->isExternal && $this->localOnly;
     }
 
     /**
-     * Returns the number of mutations performed over the variable.
+     * Checks if the variable is tracked by the memory manager.
      *
-     * @return int
+     * @return bool
      */
-    public function getNumberMutations(): int
+    public function isMemoryTracked(): bool
     {
-        return $this->numberMutates;
+        return $this->memoryTracked;
     }
 
     /**
-     * Sets if the variable is initialized
-     * This allow to throw an exception if the variable is being read without prior initialization.
+     * Shortcut is type mixed?
      *
-     * @param bool               $initialized
-     * @param CompilationContext $compilationContext
+     * @return bool
      */
-    public function setIsInitialized(bool $initialized, CompilationContext $compilationContext): void
+    public function isMixed(): bool
     {
-        $this->initialized = $initialized;
-
-        if (!$initialized || !$compilationContext->branchManager instanceof BranchManager) {
-            return;
-        }
-
-        $currentBranch = $compilationContext->branchManager->getCurrentBranch();
-
-        if ($currentBranch instanceof Branch) {
-            $this->initBranches[] = $currentBranch;
-        }
+        return 'mixed' === $this->type;
     }
 
     /**
-     * Check if the variable is initialized or not.
+     * Shortcut is type variable or string?
      *
      * @return bool
      */
-    public function isInitialized(): bool
+    public function isNotVariable(): bool
     {
-        return $this->initialized;
+        return !$this->isVariable();
     }
 
     /**
-     * Set if the symbol is a parameter of the method or not.
+     * Shortcut is type variable or array?
      *
-     * @param bool $isExternal
+     * @return bool
      */
-    public function setIsExternal(bool $isExternal): void
+    public function isNotVariableAndArray(): bool
     {
-        $this->isExternal = $isExternal;
-        $this->variantInits = 1;
+        return !$this->isVariable() && !$this->isArray();
     }
 
     /**
-     * Check if the variable is a parameter.
+     * Shortcut is type variable or mixed or string?
      *
      * @return bool
      */
-    public function isExternal(): bool
+    public function isNotVariableAndMixedAndString(): bool
     {
-        return $this->isExternal;
+        return !$this->isVariable() && !$this->isMixed() && !$this->isString();
     }
 
     /**
-     * Get if the variable must be initialized to null.
+     * Shortcut is type variable or string?
      *
      * @return bool
      */
-    public function mustInitNull(): bool
+    public function isNotVariableAndString(): bool
     {
-        return $this->mustInitNull;
+        return !$this->isVariable() && !$this->isString();
     }
 
     /**
-     * Set if the variable must be initialized to null.
+     * Returns if the variable is read only.
      *
-     * @param bool $mustInitNull
+     * @return bool
      */
-    public function setMustInitNull(bool $mustInitNull): void
+    public function isReadOnly(): bool
     {
-        $this->mustInitNull = $mustInitNull;
+        return $this->readOnly;
     }
 
     /**
-     * Sets the default init value.
+     * Checks if the temporary variable is reusable.
      *
-     * @param mixed $value
-     */
-    public function setDefaultInitValue(mixed $value): void
-    {
-        $this->defaultInitValue = $value;
-    }
-
-    /**
-     * Sets an automatic safe default init value according to its type.
+     * @return bool
      */
-    public function enableDefaultAutoInitValue(): void
+    public function isReusable(): bool
     {
-        switch ($this->type) {
-            case 'char':
-            case 'boolean':
-            case 'bool':
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-            case 'zephir_ce_guard':
-                $this->defaultInitValue = 0;
-                break;
-
-            case 'variable':
-            case 'string':
-            case 'array':
-                $this->defaultInitValue = null;
-                $this->setDynamicTypes('null');
-                $this->setMustInitNull(true);
-                $this->setLocalOnly(false);
-                break;
-
-            default:
-                throw new CompilerException('Cannot create an automatic safe default value for variable type: '.$this->type);
-        }
+        return $this->reusable;
     }
 
     /**
-     * Returns the default init value.
+     * Shortcut is type string?
      *
-     * @return mixed
+     * @return bool
      */
-    public function getDefaultInitValue(): mixed
+    public function isString(): bool
     {
-        return $this->defaultInitValue;
+        return 'string' === $this->type;
     }
 
     /**
-     * Separates variables before being updated.
+     * Checks if a variable is a super global.
      *
-     * @param CompilationContext $compilationContext
+     * @return bool
      */
-    public function separate(CompilationContext $compilationContext): void
+    public function isSuperGlobal(): bool
     {
-        if (!\in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
-            $compilationContext->codePrinter->output('SEPARATE_ZVAL('.$compilationContext->backend->getVariableCode($this).');');
-        }
+        return $this->isExternal && $this->globalsManager->isSuperGlobal($this->name);
     }
 
     /**
-     * Skips variable initialization.
+     * Returns whether the variable is temporal or not.
      *
-     * @param int $numberSkips
+     * @return bool
      */
-    public function skipInitVariant(int $numberSkips): void
+    public function isTemporal(): bool
     {
-        $this->numberSkips += $numberSkips;
+        return $this->temporal;
     }
 
     /**
-     * Get the number of initializations remaining to skip.
+     * Checks whether the last value assigned was used.
      *
-     * @return int
+     * @return bool
      */
-    public function getSkipVariant(): int
+    public function isUsed(): bool
     {
-        return $this->numberSkips;
+        return $this->used;
     }
 
     /**
-     * Allocate memory for variable and init it null val
+     * Shortcut is type variable?
      *
-     * @param CompilationContext $compilationContext
+     * @return bool
      */
-    public function initNonReferenced(CompilationContext $compilationContext): void
+    public function isVariable(): bool
     {
-        $compilationContext->codePrinter->output('ZVAL_UNDEF(&'.$this->getName().');');
+        return 'variable' === $this->type;
     }
 
     /**
-     * Get the number of times the variable has been initialized.
+     * Get if the variable must be initialized to null.
      *
-     * @return int
-     */
-    public function getVariantInits(): int
-    {
-        return $this->variantInits;
-    }
-
-    /**
-     * Increase the number of times the variable has been initialized.
+     * @return bool
      */
-    public function increaseVariantIfNull(): void
+    public function mustInitNull(): bool
     {
-        ++$this->variantInits;
+        return $this->mustInitNull;
     }
 
     /**
-     * Initializes a variant variable.
+     * Observes a variable in the memory frame without initialization or nullify
+     * an existing allocated variable.
      *
      * @param CompilationContext $compilationContext
      */
-    public function initVariant(CompilationContext $compilationContext): void
+    public function observeOrNullifyVariant(CompilationContext $compilationContext): void
     {
         if ($this->numberSkips) {
             --$this->numberSkips;
@@ -775,128 +750,22 @@ public function initVariant(CompilationContext $compilationContext): void
             return;
         }
 
-        /**
-         * Variables are allocated for the first time using ZVAL_NULL
-         * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
-         * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
-         */
-        if (self::VAR_THIS_POINTER !== $this->getName() && self::VAR_RETURN_VALUE !== $this->getName()) {
-            if (!$this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch === 0;
-            }
-
-            $compilationContext->headersManager->add('kernel/memory');
-            $compilationContext->symbolTable->mustGrownStack(true);
-
-            if (!$this->isLocalOnly()) {
-                if ($compilationContext->insideCycle) {
-                    $this->mustInitNull = true;
-                    $compilationContext->backend->initVar($this, $compilationContext, true, true);
-                } else {
-                    if ($this->variantInits > 0) {
-                        if ($this->initBranch) {
-                            $compilationContext->codePrinter->output('ZEPHIR_INIT_BNVAR('.$this->getName().');');
-                        } else {
-                            $this->mustInitNull = true;
-                            $compilationContext->backend->initVar($this, $compilationContext, true, true);
-                        }
-                    } else {
-                        $compilationContext->backend->initVar($this, $compilationContext);
-                    }
-                }
-            } else {
-                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
-                    $this->mustInitNull = true;
-                    $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&'.$this->getName().');');
-                }
-            }
-
-            ++$this->variantInits;
-            $this->associatedClass = null;
-        }
-    }
-
-    /**
-     * Tells the compiler a generated code will track the variable.
-     *
-     * @param CompilationContext $compilationContext
-     */
-    public function trackVariant(CompilationContext $compilationContext): void
-    {
-        if ($this->numberSkips) {
-            --$this->numberSkips;
-
+        if (in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
             return;
         }
 
-        /**
-         * Variables are allocated for the first time using ZVAL_NULL
-         * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
-         * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
-         */
-        if (self::VAR_THIS_POINTER !== $this->getName() && self::VAR_RETURN_VALUE !== $this->getName()) {
-            if (!$this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch === 0;
-            }
-
-            if (!$this->isLocalOnly()) {
-                $compilationContext->symbolTable->mustGrownStack(true);
-                if ($compilationContext->insideCycle) {
-                    $this->mustInitNull = true;
-                } else {
-                    if ($this->variantInits > 0) {
-                        if (!$this->initBranch) {
-                            $this->mustInitNull = true;
-                        }
-                    }
-                }
-            } else {
-                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
-                    $this->mustInitNull = true;
-                }
-            }
-
-            ++$this->variantInits;
-        }
-    }
-
-    /**
-     * Initializes a variant variable that is intended to have the special
-     * behavior of only freed its body value instead of the full variable.
-     *
-     * @param CompilationContext $compilationContext
-     */
-    public function initComplexLiteralVariant(CompilationContext $compilationContext): void
-    {
-        if ($this->numberSkips) {
-            --$this->numberSkips;
-
-            return;
+        if (!$this->initBranch) {
+            $this->initBranch = $compilationContext->currentBranch === 0;
         }
 
-        if (self::VAR_THIS_POINTER != $this->getName() && self::VAR_RETURN_VALUE != $this->getName()) {
-            if (!$this->initBranch) {
-                $this->initBranch = $compilationContext->currentBranch === 0;
-            }
-
-            $compilationContext->headersManager->add('kernel/memory');
-            $compilationContext->symbolTable->mustGrownStack(true);
-            if (!$this->isLocalOnly()) {
-                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
-                    $this->mustInitNull = true;
-                    $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&'.$this->getName().');');
-                } else {
-                    $compilationContext->backend->initVar($this, $compilationContext);
-                }
-            } else {
-                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
-                    $this->mustInitNull = true;
-                    $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&'.$this->getName().');');
-                }
-            }
-
-            ++$this->variantInits;
+        $compilationContext->headersManager->add('kernel/memory');
+        $compilationContext->symbolTable->mustGrownStack(true);
+        if ($this->variantInits > 0 || $compilationContext->insideCycle) {
+            $this->mustInitNull = true;
         }
+
+        ++$this->variantInits;
+        $this->setMustInitNull(true);
     }
 
     /**
@@ -924,7 +793,7 @@ public function observeVariant(CompilationContext $compilationContext): void
 
             if ($this->variantInits > 0 || $compilationContext->insideCycle) {
                 $this->mustInitNull = true;
-                $compilationContext->codePrinter->output('ZEPHIR_OBS_NVAR('.$symbol.');');
+                $compilationContext->codePrinter->output('ZEPHIR_OBS_NVAR(' . $symbol . ');');
             }
 
             ++$this->variantInits;
@@ -932,194 +801,305 @@ public function observeVariant(CompilationContext $compilationContext): void
     }
 
     /**
-     * Observes a variable in the memory frame without initialization or nullify
-     * an existing allocated variable.
+     * Separates variables before being updated.
      *
      * @param CompilationContext $compilationContext
      */
-    public function observeOrNullifyVariant(CompilationContext $compilationContext): void
+    public function separate(CompilationContext $compilationContext): void
     {
-        if ($this->numberSkips) {
-            --$this->numberSkips;
+        if (!in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
+            $compilationContext->codePrinter->output(
+                'SEPARATE_ZVAL(' . $compilationContext->backend->getVariableCode($this) . ');'
+            );
+        }
+    }
+
+    /**
+     * Sets the PHP class related to variable.
+     *
+     * @param ReflectionClass|Definition $associatedClass
+     */
+    public function setAssociatedClass(ReflectionClass|Definition $associatedClass): void
+    {
+        $this->associatedClass = $associatedClass;
+    }
+
+    /**
+     * Sets the PHP class related to variable.
+     *
+     * @param array|string $classTypes
+     */
+    public function setClassTypes(array|string $classTypes): void
+    {
+        if (is_string($classTypes)) {
+            if (!in_array($classTypes, $this->classTypes)) {
+                $this->classTypes[] = $classTypes;
+            }
 
             return;
         }
 
-        if (\in_array($this->getName(), [self::VAR_THIS_POINTER, self::VAR_RETURN_VALUE], true)) {
-            return;
+        foreach ($classTypes as $classType) {
+            if (!in_array($classType, $this->classTypes)) {
+                $this->classTypes[] = $classType;
+            }
         }
+    }
 
-        if (!$this->initBranch) {
-            $this->initBranch = $compilationContext->currentBranch === 0;
+    /**
+     * Sets the default init value.
+     *
+     * @param mixed $value
+     */
+    public function setDefaultInitValue(mixed $value): void
+    {
+        $this->defaultInitValue = $value;
+    }
+
+    /**
+     * Sets the current dynamic type in a polymorphic variable.
+     *
+     * @param array|string $types
+     */
+    public function setDynamicTypes(array|string $types): void
+    {
+        unset($this->dynamicTypes['unknown']);
+
+        if (is_string($types)) {
+            $types = [$types];
         }
 
-        $compilationContext->headersManager->add('kernel/memory');
-        $compilationContext->symbolTable->mustGrownStack(true);
-        if ($this->variantInits > 0 || $compilationContext->insideCycle) {
-            $this->mustInitNull = true;
+        foreach ($types as $type) {
+            if (!isset($this->dynamicTypes[$type])) {
+                $this->dynamicTypes[$type] = true;
+            }
         }
+    }
 
-        ++$this->variantInits;
-        $this->setMustInitNull(true);
+    /**
+     * Once a temporal variable is unused in a specific branch it is marked as idle.
+     *
+     * @param bool $idle
+     */
+    public function setIdle(bool $idle): void
+    {
+        $this->idle = false;
+
+        if ($this->reusable) {
+            $this->classTypes   = [];
+            $this->dynamicTypes = ['unknown' => true];
+            $this->idle         = $idle;
+        }
     }
 
     /**
-     * Checks if a variable is a super global.
+     * Marks the variable to be defined as a double pointer.
      *
-     * @return bool
+     * @param bool $doublePointer
      */
-    public function isSuperGlobal(): bool
+    public function setIsDoublePointer(bool $doublePointer): void
     {
-        return $this->isExternal && $this->globalsManager->isSuperGlobal($this->name);
+        $this->doublePointer = $doublePointer;
     }
 
     /**
-     * Checks if a variable is a local static.
+     * Set if the symbol is a parameter of the method or not.
      *
-     * @return bool
+     * @param bool $isExternal
      */
-    public function isLocalStatic(): bool
+    public function setIsExternal(bool $isExternal): void
     {
-        return $this->isExternal && $this->localOnly;
+        $this->isExternal   = $isExternal;
+        $this->variantInits = 1;
     }
 
     /**
-     * Shortcut is type variable?
+     * Sets if the variable is initialized
+     * This allow to throw an exception if the variable is being read without prior initialization.
      *
-     * @return bool
+     * @param bool               $initialized
+     * @param CompilationContext $compilationContext
      */
-    public function isVariable(): bool
+    public function setIsInitialized(bool $initialized, CompilationContext $compilationContext): void
     {
-        return 'variable' === $this->type;
+        $this->initialized = $initialized;
+
+        if (!$initialized || !$compilationContext->branchManager instanceof BranchManager) {
+            return;
+        }
+
+        $currentBranch = $compilationContext->branchManager->getCurrentBranch();
+
+        if ($currentBranch instanceof Branch) {
+            $this->initBranches[] = $currentBranch;
+        }
     }
 
     /**
-     * Shortcut is type mixed?
+     * Sets if the variable is local-only scoped.
      *
-     * @return bool
+     * @param bool $localOnly
      */
-    public function isMixed(): bool
+    public function setLocalOnly(bool $localOnly): void
     {
-        return 'mixed' === $this->type;
+        $this->localOnly = $localOnly;
     }
 
     /**
-     * Shortcut is type bool?
+     * Sets the compiled variable's name.
      *
-     * @return bool
+     * @param string $lowName
      */
-    public function isBoolean(): bool
+    public function setLowName(string $lowName): void
     {
-        return 'bool' === $this->type;
+        $this->lowName = $lowName;
     }
 
     /**
-     * Shortcut is type string?
+     * Sets if the variable is not tracked by the memory manager.
      *
-     * @return bool
+     * @param bool $memoryTracked
      */
-    public function isString(): bool
+    public function setMemoryTracked(bool $memoryTracked): void
     {
-        return 'string' === $this->type;
+        $this->memoryTracked = $memoryTracked;
     }
 
     /**
-     * Shortcut is type int?
+     * Set if the variable must be initialized to null.
      *
-     * @return bool
+     * @param bool $mustInitNull
      */
-    public function isInt(): bool
+    public function setMustInitNull(bool $mustInitNull): void
     {
-        return 'int' === $this->type;
+        $this->mustInitNull = $mustInitNull;
     }
 
     /**
-     * Shortcut is type double?
+     * Set the original AST node where the variable was declared.
      *
-     * @return bool
+     * @param array $node
      */
-    public function isDouble(): bool
+    public function setOriginal(array $node): void
     {
-        return 'double' === $this->type;
+        $this->node = $node;
     }
 
     /**
-     * Shortcut is type double?
+     * Sets the latest CompiledExpression assigned to a variable.
      *
-     * @return bool
+     * @param CompiledExpression $possibleValue
+     * @param CompilationContext $compilationContext
      */
-    public function isArray(): bool
+    public function setPossibleValue(CompiledExpression $possibleValue, CompilationContext $compilationContext): void
     {
-        return 'array' === $this->type;
+        $this->possibleValue       = $possibleValue;
+        $this->possibleValueBranch = $compilationContext->branchManager->getCurrentBranch();
     }
 
     /**
-     * Shortcut is type variable or string?
+     * Sets if the variable is read only.
      *
-     * @return bool
+     * @param bool $readOnly
      */
-    public function isNotVariable(): bool
+    public function setReadOnly(bool $readOnly): void
     {
-        return !$this->isVariable();
+        $this->readOnly = $readOnly;
     }
 
     /**
-     * Shortcut is type variable or string?
+     * Some temporary variables can't be reused.
      *
-     * @return bool
+     * @param bool $reusable
      */
-    public function isNotVariableAndString(): bool
+    public function setReusable(bool $reusable): void
     {
-        return !$this->isVariable() && !$this->isString();
+        $this->reusable = $reusable;
     }
 
     /**
-     * Shortcut is type variable or mixed or string?
+     * Sets whether the variable is temporal or not.
      *
-     * @return bool
+     * @param bool $temporal
      */
-    public function isNotVariableAndMixedAndString(): bool
+    public function setTemporal(bool $temporal): void
     {
-        return !$this->isVariable() && !$this->isMixed() && !$this->isString();
+        $this->temporal = $temporal;
     }
 
     /**
-     * Shortcut is type variable or array?
+     * Sets the type of variable.
      *
-     * @return bool
+     * @param string $type
      */
-    public function isNotVariableAndArray(): bool
+    public function setType(string $type): void
     {
-        return !$this->isVariable() && !$this->isArray();
+        $this->type = $type;
     }
 
     /**
-     * Sets the latest CompiledExpression assigned to a variable.
+     * Sets the latest node where a variable was used.
      *
-     * @param CompiledExpression $possibleValue
-     * @param CompilationContext $compilationContext
+     * @param bool       $used
+     * @param array|null $node
      */
-    public function setPossibleValue(CompiledExpression $possibleValue, CompilationContext $compilationContext): void
+    public function setUsed(bool $used, array $node = null): void
     {
-        $this->possibleValue = $possibleValue;
-        $this->possibleValueBranch = $compilationContext->branchManager->getCurrentBranch();
+        $this->used     = $used;
+        $this->usedNode = $node;
     }
 
     /**
-     * Returns the latest CompiledExpression assigned to a variable.
+     * Skips variable initialization.
      *
-     * @return mixed
+     * @param int $numberSkips
      */
-    public function getPossibleValue(): mixed
+    public function skipInitVariant(int $numberSkips): void
     {
-        return $this->possibleValue;
+        $this->numberSkips += $numberSkips;
     }
 
     /**
-     * Returns the branch where the variable was assigned for the last time.
+     * Tells the compiler a generated code will track the variable.
+     *
+     * @param CompilationContext $compilationContext
      */
-    public function getPossibleValueBranch(): ?Branch
+    public function trackVariant(CompilationContext $compilationContext): void
     {
-        return $this->possibleValueBranch;
+        if ($this->numberSkips) {
+            --$this->numberSkips;
+
+            return;
+        }
+
+        /**
+         * Variables are allocated for the first time using ZVAL_NULL
+         * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
+         * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
+         */
+        if (self::VAR_THIS_POINTER !== $this->getName() && self::VAR_RETURN_VALUE !== $this->getName()) {
+            if (!$this->initBranch) {
+                $this->initBranch = $compilationContext->currentBranch === 0;
+            }
+
+            if (!$this->isLocalOnly()) {
+                $compilationContext->symbolTable->mustGrownStack(true);
+                if ($compilationContext->insideCycle) {
+                    $this->mustInitNull = true;
+                } else {
+                    if ($this->variantInits > 0) {
+                        if (!$this->initBranch) {
+                            $this->mustInitNull = true;
+                        }
+                    }
+                }
+            } else {
+                if ($this->variantInits > 0 || $compilationContext->insideCycle) {
+                    $this->mustInitNull = true;
+                }
+            }
+
+            ++$this->variantInits;
+        }
     }
 }
diff --git a/src/Zephir.php b/src/Zephir.php
index f900f84a3c..6967197c08 100644
--- a/src/Zephir.php
+++ b/src/Zephir.php
@@ -15,9 +15,7 @@
 
 final class Zephir
 {
-    public const VERSION = '0.17.0-$Id$';
-
-    public const LOGO = <<<'ASCII'
+    public const LOGO    = <<<'ASCII'
  _____              __    _
 /__  /  ___  ____  / /_  (_)____
   / /  / _ \/ __ \/ __ \/ / ___/
@@ -27,4 +25,5 @@ final class Zephir
 
 
 ASCII;
+    public const VERSION = '0.17.0-$Id$';
 }

From d066605def142e5412af6883c22f7107acb6fb7a Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:20:44 -0600
Subject: [PATCH 204/375] fixing the fixer

---
 .php-cs-fixer.dist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 824a5efce3..6626c7ac51 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -49,7 +49,7 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@PHPUnit48Migration:risky' => true,
-        '@PSR2' => true,
+        '@PSR12' => true,
         'php_unit_no_expectation_annotation' => false,
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => false,

From 86e4908442b7217646351ef74be595fc262b6fc4 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:21:58 -0600
Subject: [PATCH 205/375] correcting var for symbol table

---
 src/SymbolTable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index 5e9a8f015e..2f4ba05731 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -45,7 +45,7 @@ class SymbolTable
     /**
      * @var LocalContextPass
      */
-    protected LocalContextPass $localContext;
+    protected ?LocalContextPass $localContext = null;
 
     /**
      * @var bool

From 448dfda5f71cf3f58649501d467cd11aa4e0115f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:25:32 -0600
Subject: [PATCH 206/375] adding public to prototype constants

---
 prototypes/memcached.php | 190 +++++++++++++++++++--------------------
 prototypes/mongo.php     |  22 ++---
 prototypes/phalcon.php   |   8 +-
 prototypes/redis.php     |  36 ++++----
 4 files changed, 128 insertions(+), 128 deletions(-)

diff --git a/prototypes/memcached.php b/prototypes/memcached.php
index 1c1d4bde0c..92d7f6c0dd 100644
--- a/prototypes/memcached.php
+++ b/prototypes/memcached.php
@@ -10,101 +10,101 @@
  */
 class Memcached
 {
-    const OPT_COMPRESSION = -1001;
-    const OPT_COMPRESSION_TYPE = -1004;
-    const OPT_PREFIX_KEY = -1002;
-    const OPT_SERIALIZER = -1003;
-    const OPT_HASH = 2;
-    const OPT_DISTRIBUTION = 9;
-    const OPT_LIBKETAMA_COMPATIBLE = 16;
-    const OPT_LIBKETAMA_HASH = 17;
-    const OPT_TCP_KEEPALIVE = 32;
-    const OPT_BUFFER_WRITES = 10;
-    const OPT_BINARY_PROTOCOL = 18;
-    const OPT_NO_BLOCK = 0;
-    const OPT_TCP_NODELAY = 1;
-    const OPT_SOCKET_SEND_SIZE = 4;
-    const OPT_SOCKET_RECV_SIZE = 5;
-    const OPT_CONNECT_TIMEOUT = 14;
-    const OPT_RETRY_TIMEOUT = 15;
-    const OPT_SEND_TIMEOUT = 19;
-    const OPT_RECV_TIMEOUT = 20;
-    const OPT_POLL_TIMEOUT = 8;
-    const OPT_CACHE_LOOKUPS = 6;
-
-    const HAVE_IGBINARY = 0;
-    const HAVE_JSON = 0;
-    const HAVE_SESSION = 1;
-    const HAVE_SASL = 0;
-
-    const HASH_DEFAULT = 0;
-    const HASH_MD5 = 1;
-    const HASH_CRC = 2;
-    const HASH_FNV1_64 = 3;
-    const HASH_FNV1A_64 = 4;
-    const HASH_FNV1_32 = 5;
-    const HASH_FNV1A_32 = 6;
-    const HASH_HSIEH = 7;
-    const HASH_MURMUR = 8;
-
-    const DISTRIBUTION_MODULA = 0;
-    const DISTRIBUTION_CONSISTENT = 1;
-    const DISTRIBUTION_VIRTUAL_BUCKET = 6;
-    const OPT_SERVER_FAILURE_LIMIT = 21;
-    const OPT_AUTO_EJECT_HOSTS = 28;
-    const OPT_HASH_WITH_PREFIX_KEY = 25;
-    const OPT_NOREPLY = 26;
-    const OPT_SORT_HOSTS = 12;
-    const OPT_VERIFY_KEY = 13;
-    const OPT_USE_UDP = 27;
-    const OPT_NUMBER_OF_REPLICAS = 29;
-    const OPT_RANDOMIZE_REPLICA_READ = 30;
-    const OPT_REMOVE_FAILED_SERVERS = 35;
-
-    const RES_SUCCESS = 0;
-    const RES_FAILURE = 1;
-    const RES_HOST_LOOKUP_FAILURE = 2;
-    const RES_UNKNOWN_READ_FAILURE = 7;
-    const RES_PROTOCOL_ERROR = 8;
-
-    const RES_CLIENT_ERROR = 9;
-    const RES_SERVER_ERROR = 10;
-    const RES_WRITE_FAILURE = 5;
-
-    const RES_DATA_EXISTS = 12;
-    const RES_NOTSTORED = 14;
-    const RES_NOTFOUND = 16;
-    const RES_PARTIAL_READ = 18;
-    const RES_SOME_ERRORS = 19;
-    const RES_NO_SERVERS = 20;
-    const RES_END = 21;
-    const RES_ERRNO = 26;
-    const RES_BUFFERED = 32;
-    const RES_TIMEOUT = 31;
-    const RES_BAD_KEY_PROVIDED = 33;
-    const RES_STORED = 15;
-    const RES_DELETED = 22;
-    const RES_STAT = 24;
-    const RES_ITEM = 25;
-    const RES_NOT_SUPPORTED = 28;
-    const RES_FETCH_NOTFINISHED = 30;
-    const RES_SERVER_MARKED_DEAD = 35;
-    const RES_UNKNOWN_STAT_KEY = 36;
-    const RES_INVALID_HOST_PROTOCOL = 34;
-    const RES_MEMORY_ALLOCATION_FAILURE = 17;
-    const RES_CONNECTION_SOCKET_CREATE_FAILURE = 11;
-    const RES_PAYLOAD_FAILURE = -1001;
-
-    const SERIALIZER_PHP = 1;
-    const SERIALIZER_IGBINARY = 2;
-    const SERIALIZER_JSON = 3;
-    const SERIALIZER_JSON_ARRAY = 4;
-
-    const COMPRESSION_FASTLZ = 2;
-    const COMPRESSION_ZLIB = 1;
-
-    const GET_PRESERVE_ORDER = 1;
-    const GET_ERROR_RETURN_VALUE = false;
+    public const OPT_COMPRESSION = -1001;
+    public const OPT_COMPRESSION_TYPE = -1004;
+    public const OPT_PREFIX_KEY = -1002;
+    public const OPT_SERIALIZER = -1003;
+    public const OPT_HASH = 2;
+    public const OPT_DISTRIBUTION = 9;
+    public const OPT_LIBKETAMA_COMPATIBLE = 16;
+    public const OPT_LIBKETAMA_HASH = 17;
+    public const OPT_TCP_KEEPALIVE = 32;
+    public const OPT_BUFFER_WRITES = 10;
+    public const OPT_BINARY_PROTOCOL = 18;
+    public const OPT_NO_BLOCK = 0;
+    public const OPT_TCP_NODELAY = 1;
+    public const OPT_SOCKET_SEND_SIZE = 4;
+    public const OPT_SOCKET_RECV_SIZE = 5;
+    public const OPT_CONNECT_TIMEOUT = 14;
+    public const OPT_RETRY_TIMEOUT = 15;
+    public const OPT_SEND_TIMEOUT = 19;
+    public const OPT_RECV_TIMEOUT = 20;
+    public const OPT_POLL_TIMEOUT = 8;
+    public const OPT_CACHE_LOOKUPS = 6;
+
+    public const HAVE_IGBINARY = 0;
+    public const HAVE_JSON = 0;
+    public const HAVE_SESSION = 1;
+    public const HAVE_SASL = 0;
+
+    public const HASH_DEFAULT = 0;
+    public const HASH_MD5 = 1;
+    public const HASH_CRC = 2;
+    public const HASH_FNV1_64 = 3;
+    public const HASH_FNV1A_64 = 4;
+    public const HASH_FNV1_32 = 5;
+    public const HASH_FNV1A_32 = 6;
+    public const HASH_HSIEH = 7;
+    public const HASH_MURMUR = 8;
+
+    public const DISTRIBUTION_MODULA = 0;
+    public const DISTRIBUTION_CONSISTENT = 1;
+    public const DISTRIBUTION_VIRTUAL_BUCKET = 6;
+    public const OPT_SERVER_FAILURE_LIMIT = 21;
+    public const OPT_AUTO_EJECT_HOSTS = 28;
+    public const OPT_HASH_WITH_PREFIX_KEY = 25;
+    public const OPT_NOREPLY = 26;
+    public const OPT_SORT_HOSTS = 12;
+    public const OPT_VERIFY_KEY = 13;
+    public const OPT_USE_UDP = 27;
+    public const OPT_NUMBER_OF_REPLICAS = 29;
+    public const OPT_RANDOMIZE_REPLICA_READ = 30;
+    public const OPT_REMOVE_FAILED_SERVERS = 35;
+
+    public const RES_SUCCESS = 0;
+    public const RES_FAILURE = 1;
+    public const RES_HOST_LOOKUP_FAILURE = 2;
+    public const RES_UNKNOWN_READ_FAILURE = 7;
+    public const RES_PROTOCOL_ERROR = 8;
+
+    public const RES_CLIENT_ERROR = 9;
+    public const RES_SERVER_ERROR = 10;
+    public const RES_WRITE_FAILURE = 5;
+
+    public const RES_DATA_EXISTS = 12;
+    public const RES_NOTSTORED = 14;
+    public const RES_NOTFOUND = 16;
+    public const RES_PARTIAL_READ = 18;
+    public const RES_SOME_ERRORS = 19;
+    public const RES_NO_SERVERS = 20;
+    public const RES_END = 21;
+    public const RES_ERRNO = 26;
+    public const RES_BUFFERED = 32;
+    public const RES_TIMEOUT = 31;
+    public const RES_BAD_KEY_PROVIDED = 33;
+    public const RES_STORED = 15;
+    public const RES_DELETED = 22;
+    public const RES_STAT = 24;
+    public const RES_ITEM = 25;
+    public const RES_NOT_SUPPORTED = 28;
+    public const RES_FETCH_NOTFINISHED = 30;
+    public const RES_SERVER_MARKED_DEAD = 35;
+    public const RES_UNKNOWN_STAT_KEY = 36;
+    public const RES_INVALID_HOST_PROTOCOL = 34;
+    public const RES_MEMORY_ALLOCATION_FAILURE = 17;
+    public const RES_CONNECTION_SOCKET_CREATE_FAILURE = 11;
+    public const RES_PAYLOAD_FAILURE = -1001;
+
+    public const SERIALIZER_PHP = 1;
+    public const SERIALIZER_IGBINARY = 2;
+    public const SERIALIZER_JSON = 3;
+    public const SERIALIZER_JSON_ARRAY = 4;
+
+    public const COMPRESSION_FASTLZ = 2;
+    public const COMPRESSION_ZLIB = 1;
+
+    public const GET_PRESERVE_ORDER = 1;
+    public const GET_ERROR_RETURN_VALUE = false;
 
     /**
      * @see https://php.net/manual/en/memcached.construct.php
diff --git a/prototypes/mongo.php b/prototypes/mongo.php
index c61abfbd8d..ab2218483a 100644
--- a/prototypes/mongo.php
+++ b/prototypes/mongo.php
@@ -29,9 +29,9 @@ class MongoId
 if (!class_exists('MongoDB', false)) {
     class MongoDB
     {
-        const PROFILING_OFF = 0;
-        const PROFILING_SLOW = 1;
-        const PROFILING_ON = 2;
+        public const PROFILING_OFF = 0;
+        public const PROFILING_SLOW = 1;
+        public const PROFILING_ON = 2;
 
         /**
          * Creates a new database.
@@ -50,14 +50,14 @@ public function __construct(MongoClient $conn, $name)
 if (!class_exists('MongoClient', false)) {
     class MongoClient
     {
-        const VERSION = '';
-        const DEFAULT_HOST = 'localhost';
-        const DEFAULT_PORT = 27017;
-        const RP_PRIMARY = 'primary';
-        const RP_PRIMARY_PREFERRED = 'primaryPreferred';
-        const RP_SECONDARY = 'secondary';
-        const RP_SECONDARY_PREFERRED = 'secondaryPreferred';
-        const RP_NEAREST = 'nearest';
+        public const VERSION = '';
+        public const DEFAULT_HOST = 'localhost';
+        public const DEFAULT_PORT = 27017;
+        public const RP_PRIMARY = 'primary';
+        public const RP_PRIMARY_PREFERRED = 'primaryPreferred';
+        public const RP_SECONDARY = 'secondary';
+        public const RP_SECONDARY_PREFERRED = 'secondaryPreferred';
+        public const RP_NEAREST = 'nearest';
 
         /**
          * Gets a database.
diff --git a/prototypes/phalcon.php b/prototypes/phalcon.php
index bf062afde4..07f63a4422 100644
--- a/prototypes/phalcon.php
+++ b/prototypes/phalcon.php
@@ -35,12 +35,12 @@ class Application
 namespace Phalcon\Mvc\Model {
     class Query
     {
-        const TYPE_SELECT = 309;
+        public const TYPE_SELECT = 309;
 
-        const TYPE_INSERT = 306;
+        public const TYPE_INSERT = 306;
 
-        const TYPE_UPDATE = 300;
+        public const TYPE_UPDATE = 300;
 
-        const TYPE_DELETE = 303;
+        public const TYPE_DELETE = 303;
     }
 }
diff --git a/prototypes/redis.php b/prototypes/redis.php
index 62ccb2f29f..fb8caa2144 100644
--- a/prototypes/redis.php
+++ b/prototypes/redis.php
@@ -13,40 +13,40 @@ class redis
     /**
      * Options.
      */
-    const OPT_SERIALIZER = 1;
-    const OPT_PREFIX = 2;
-    const OPT_READ_TIMEOUT = 3;
-    const OPT_SCAN = 4;
+    public public const OPT_SERIALIZER = 1;
+    public public const OPT_PREFIX = 2;
+    public public const OPT_READ_TIMEOUT = 3;
+    public public const OPT_SCAN = 4;
 
     /**
      * Serializers.
      */
-    const SERIALIZER_NONE = 0;
-    const SERIALIZER_PHP = 1;
-    const SERIALIZER_IGBINARY = 2;
+    public public const SERIALIZER_NONE = 0;
+    public public const SERIALIZER_PHP = 1;
+    public public const SERIALIZER_IGBINARY = 2;
 
     /**
      * Multi.
      */
-    const ATOMIC = 0;
-    const MULTI = 1;
-    const PIPELINE = 2;
+    public public const ATOMIC = 0;
+    public public const MULTI = 1;
+    public public const PIPELINE = 2;
 
     /**
      * Type.
      */
-    const REDIS_NOT_FOUND = 0;
-    const REDIS_STRING = 1;
-    const REDIS_SET = 2;
-    const REDIS_LIST = 3;
-    const REDIS_ZSET = 4;
-    const REDIS_HASH = 5;
+    public public const REDIS_NOT_FOUND = 0;
+    public public const REDIS_STRING = 1;
+    public public const REDIS_SET = 2;
+    public public const REDIS_LIST = 3;
+    public public const REDIS_ZSET = 4;
+    public public const REDIS_HASH = 5;
 
     /**
      * Scan.
      */
-    const SCAN_NORETRY = 0;
-    const SCAN_RETRY = 1;
+    public public const SCAN_NORETRY = 0;
+    public public const SCAN_RETRY = 1;
 
     public function connect($host, $port = 6379, $timeout = 0.0)
     {

From c6c89d0ad7aaf624faf20aba9b916f7507dacc43 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:45:17 -0600
Subject: [PATCH 207/375] fixing imports

---
 src/AliasManager.php                          |  4 ++
 src/Call.php                                  |  4 ++
 src/Class/Definition/Definition.php           | 12 ++---
 src/Class/Entry.php                           |  6 +--
 src/Class/Method/Method.php                   | 10 ++--
 src/CompilationContext.php                    |  1 +
 src/CompiledExpression.php                    |  2 +
 src/Compiler.php                              | 49 +++++++++++++++++++
 src/CompilerFile.php                          | 23 +++++++++
 src/CompilerFileAnonymous.php                 | 14 ++++++
 src/Config.php                                | 18 +++++++
 src/ConfigException.php                       |  2 +
 src/Console/Application.php                   | 10 ++++
 src/Console/Command/ApiCommand.php            |  8 +++
 src/Console/Command/BuildCommand.php          |  2 +
 src/Console/Command/CleanCommand.php          |  3 ++
 src/Console/Command/CompileCommand.php        |  2 +
 src/Console/Command/FullCleanCommand.php      |  3 ++
 src/Console/Command/GenerateCommand.php       |  4 ++
 src/Console/Command/InitCommand.php           |  4 ++
 src/Console/Command/InstallCommand.php        |  3 ++
 src/Console/Command/StubsCommand.php          |  4 ++
 src/Console/ErrorListener.php                 |  5 ++
 src/Detectors/ReadDetector.php                |  3 ++
 src/Detectors/WriteDetector.php               |  2 +
 src/Documentation.php                         | 15 ++++++
 src/Documentation/Annotation.php              |  2 +
 src/Documentation/Annotation/Link.php         |  3 ++
 .../Annotation/ReturnAnnotation.php           |  3 ++
 src/Documentation/Annotation/See.php          |  3 ++
 src/Documentation/Docblock.php                |  5 ++
 src/Documentation/DocblockParser.php          |  3 ++
 src/Documentation/File/ClassFile.php          |  2 +
 src/Documentation/File/Sitemap.php            |  2 +
 src/Documentation/NamespaceAccessor.php       |  2 +
 src/Documentation/NamespaceHelper.php         |  3 ++
 src/Documentation/Template.php                |  6 +++
 src/Documentation/Theme.php                   | 19 +++++++
 src/Exception/ExceptionExtraAwareTrait.php    |  6 +++
 src/Exception/IllegalOperationException.php   |  2 +
 src/Exception/InvalidTypeException.php        |  2 +
 src/Expression.php                            |  4 ++
 src/Expression/Builder/AbstractBuilder.php    |  1 +
 src/Expression/Closure.php                    |  1 +
 src/Expression/Constants.php                  |  2 +
 src/Expression/NativeArray.php                |  2 +
 src/Expression/PropertyAccess.php             |  2 +
 src/Expression/Reference.php                  |  2 +
 src/Expression/StaticConstantAccess.php       |  1 +
 src/FileSystem/HardDisk.php                   | 22 +++++++++
 src/FunctionCall.php                          | 11 +++++
 src/HeadersManager.php                        |  1 +
 src/Logger/Formatter/CompilerFormatter.php    |  9 ++++
 src/MethodCall.php                            |  5 ++
 src/Name.php                                  |  5 ++
 .../Arithmetical/ArithmeticalBaseOperator.php |  2 +
 .../Comparison/ComparisonBaseOperator.php     |  2 +
 src/Optimizers/EvalExpression.php             |  2 +
 src/Optimizers/IsTypeOptimizerAbstract.php    |  1 +
 src/Os.php                                    |  2 +
 src/Parser/Manager.php                        |  3 ++
 src/Parser/Parser.php                         |  4 ++
 src/Passes/CallGathererPass.php               |  2 +
 src/Passes/LocalContextPass.php               |  2 +
 src/Passes/MutateGathererPass.php             |  2 +
 src/Passes/SkipVariantInit.php                |  1 +
 src/Passes/StaticTypeInference.php            |  2 +
 src/Statements/Let/ArrayIndex.php             |  1 +
 src/Statements/Let/ObjectProperty.php         | 12 ++---
 src/Statements/Let/ObjectPropertyAppend.php   |  2 +
 .../Let/ObjectPropertyArrayIndex.php          |  1 +
 .../Let/ObjectPropertyArrayIndexAppend.php    |  1 +
 src/Statements/Let/ObjectPropertyDecr.php     |  2 +
 src/Statements/Let/ObjectPropertyIncr.php     |  2 +
 src/Statements/Let/StaticProperty.php         |  2 +
 .../Let/StaticPropertyArrayIndex.php          |  1 +
 .../Let/StaticPropertyArrayIndexAppend.php    |  1 +
 src/Statements/Let/StaticPropertySub.php      |  2 +
 src/Statements/Let/Variable.php               |  2 +
 src/Statements/ReturnStatement.php            |  2 +
 src/Statements/SwitchStatement.php            |  1 +
 src/Statements/ThrowStatement.php             |  1 +
 src/Statements/TryCatchStatement.php          |  1 +
 src/StatementsBlock.php                       |  6 +++
 src/StaticCall.php                            |  5 ++
 src/Stubs/DocBlock.php                        | 11 +++++
 src/Stubs/Generator.php                       | 33 +++++++++----
 src/Stubs/MethodDocBlock.php                  |  7 +++
 src/SymbolTable.php                           |  3 ++
 src/Types/AbstractType.php                    |  4 ++
 src/Variable/Globals.php                      |  2 +
 91 files changed, 445 insertions(+), 29 deletions(-)

diff --git a/src/AliasManager.php b/src/AliasManager.php
index 50f0b89007..99b8e81d20 100644
--- a/src/AliasManager.php
+++ b/src/AliasManager.php
@@ -13,8 +13,12 @@
 
 namespace Zephir;
 
+use function array_flip;
+use function array_keys;
 use function count;
+use function explode;
 use function in_array;
+use function trim;
 
 /**
  * Manage aliases in a file
diff --git a/src/Call.php b/src/Call.php
index 6e99e8dccc..1ea89d39f7 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -17,9 +17,13 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 
+use function array_keys;
+use function array_merge;
 use function count;
+use function implode;
 use function is_array;
 use function is_object;
+use function sprintf;
 
 /**
  * Base class for common functionality in functions/calls
diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 6ff79d7114..077cdf50b0 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -903,12 +903,12 @@ public function getExternalHeader(): string
         $parts = explode('\\', $this->namespace);
 
         return 'ext/' . strtolower(
-            $parts[0] . DIRECTORY_SEPARATOR . str_replace(
-                '\\',
-                DIRECTORY_SEPARATOR,
-                $this->namespace
-            ) . DIRECTORY_SEPARATOR . $this->name
-        ) . '.zep';
+                $parts[0] . DIRECTORY_SEPARATOR . str_replace(
+                    '\\',
+                    DIRECTORY_SEPARATOR,
+                    $this->namespace
+                ) . DIRECTORY_SEPARATOR . $this->name
+            ) . '.zep';
     }
 
     /**
diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index b5cf44b89e..ec53e64f55 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -148,9 +148,9 @@ public function isInternal(): bool
     private function isInternalClass(string $className): bool
     {
         $this->isInternal = preg_match(
-            '/^' . $className . '/',
-            $this->compilationContext->classDefinition->getNamespace()
-        ) === 1;
+                '/^' . $className . '/',
+                $this->compilationContext->classDefinition->getNamespace()
+            ) === 1;
 
         return $this->isInternal;
     }
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index c4660fe619..71300d0e0c 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1167,11 +1167,11 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
                 $initCode  .= "\t" . $compilationContext->backend->ifVariableValueUndefined(
-                    $targetVar,
-                    $compilationContext,
-                    false,
-                    false
-                ) . PHP_EOL;
+                        $targetVar,
+                        $compilationContext,
+                        false,
+                        false
+                    ) . PHP_EOL;
 
                 if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
                     $substituteVar = $substituteVars[$parameter['name']];
diff --git a/src/CompilationContext.php b/src/CompilationContext.php
index fb026a6c04..b189e607be 100644
--- a/src/CompilationContext.php
+++ b/src/CompilationContext.php
@@ -25,6 +25,7 @@
 use Zephir\Passes\StaticTypeInference;
 
 use function in_array;
+use function sprintf;
 
 /**
  * This class encapsulates important entities required during compilation
diff --git a/src/CompiledExpression.php b/src/CompiledExpression.php
index aac078f253..88eb2ea9f0 100644
--- a/src/CompiledExpression.php
+++ b/src/CompiledExpression.php
@@ -15,6 +15,8 @@
 
 use Closure;
 
+use function in_array;
+
 /**
  * This represents a compiled expression, the object can be used to check
  * if the expression type is able to used in certain types of the application.
diff --git a/src/Compiler.php b/src/Compiler.php
index 330db2876f..8baa496163 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -39,19 +39,68 @@
 use Zephir\FileSystem\HardDisk;
 use Zephir\Parser\Manager;
 
+use function array_filter;
+use function array_map;
+use function array_merge;
+use function array_unique;
+use function asort;
+use function basename;
 use function call_user_func;
+use function chmod;
+use function class_exists;
 use function count;
 use function defined;
 use function dirname;
+use function exec;
+use function explode;
 use function extension_loaded;
+use function file;
+use function file_exists;
+use function file_get_contents;
+use function file_put_contents;
+use function filemtime;
+use function fwrite;
+use function getcwd;
+use function getenv;
+use function htmlentities;
+use function implode;
+use function in_array;
+use function interface_exists;
 use function is_array;
+use function is_dir;
+use function is_readable;
 use function is_string;
+use function krsort;
+use function md5;
+use function md5_file;
+use function mkdir;
+use function ob_get_clean;
+use function ob_start;
+use function phpinfo;
+use function preg_match;
+use function preg_replace;
+use function realpath;
+use function sprintf;
+use function str_replace;
+use function strcasecmp;
+use function strip_tags;
 use function strlen;
+use function strpos;
+use function strtolower;
+use function strtoupper;
+use function substr;
+use function trim;
+use function ucfirst;
+use function unlink;
+use function version_compare;
 
 use const DIRECTORY_SEPARATOR;
 use const INFO_GENERAL;
+use const PHP_EOL;
 use const PHP_INT_SIZE;
 use const PHP_ZTS;
+use const SORT_STRING;
+use const STDERR;
 
 final class Compiler
 {
diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index f1606b0cb8..bdd60e7158 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -30,11 +30,34 @@
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
 
+use function array_map;
 use function count;
 use function dirname;
+use function explode;
+use function file_exists;
+use function file_put_contents;
+use function filemtime;
+use function implode;
 use function is_array;
 
+use function is_dir;
+use function json_decode;
+use function json_encode;
+use function md5;
+use function mkdir;
+use function preg_match;
+use function realpath;
+use function sprintf;
+use function str_repeat;
+use function str_replace;
+use function strpos;
+use function strtolower;
+use function substr;
+use function trim;
+
 use const DIRECTORY_SEPARATOR;
+use const JSON_PRETTY_PRINT;
+use const PHP_EOL;
 
 /**
  * This class represents every file compiled in a project.
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index 70f7e1fdfb..e7aa2aa7cc 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -23,7 +23,21 @@
 use function count;
 use function dirname;
 
+use function explode;
+use function file_exists;
+use function file_put_contents;
+use function hash_file;
+use function implode;
+use function is_dir;
+use function md5;
+use function mkdir;
+use function str_repeat;
+use function str_replace;
+use function strpos;
+use function strtolower;
+
 use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
 
 /**
  * This class represents an anonymous file created to dump
diff --git a/src/Config.php b/src/Config.php
index f3d5ff689e..c133ca5e6a 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -18,8 +18,26 @@
 use ReturnTypeWillChange;
 
 use function array_key_exists;
+use function array_values;
 use function count;
+use function current;
+use function file_exists;
+use function file_get_contents;
+use function file_put_contents;
 use function is_array;
+use function json_decode;
+use function json_encode;
+use function json_last_error;
+use function key;
+use function preg_match;
+
+use const JSON_ERROR_CTRL_CHAR;
+use const JSON_ERROR_DEPTH;
+use const JSON_ERROR_NONE;
+use const JSON_ERROR_STATE_MISMATCH;
+use const JSON_ERROR_SYNTAX;
+use const JSON_ERROR_UTF8;
+use const JSON_PRETTY_PRINT;
 
 /**
  * Manages compiler global configuration.
diff --git a/src/ConfigException.php b/src/ConfigException.php
index c1a9e563bd..90499af2ea 100644
--- a/src/ConfigException.php
+++ b/src/ConfigException.php
@@ -13,6 +13,8 @@
 
 namespace Zephir;
 
+use const PHP_EOL;
+
 class ConfigException extends \Exception
 {
     public function __construct($message = '', $code = 0, \Exception $previous = null)
diff --git a/src/Console/Application.php b/src/Console/Application.php
index 749f7c1433..a0147fd234 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -32,6 +32,16 @@
 use Zephir\Console\Command\ListCommand;
 use Zephir\Zephir;
 
+use function explode;
+use function fprintf;
+use function implode;
+use function sprintf;
+use function strtolower;
+use function trim;
+
+use const PHP_EOL;
+use const STDERR;
+
 final class Application extends BaseApplication
 {
     public function __construct()
diff --git a/src/Console/Command/ApiCommand.php b/src/Console/Command/ApiCommand.php
index 8dff8823d1..c71ad8d3fb 100644
--- a/src/Console/Command/ApiCommand.php
+++ b/src/Console/Command/ApiCommand.php
@@ -21,7 +21,15 @@
 use Zephir\Compiler;
 use Zephir\Config;
 
+use function array_filter;
+use function array_keys;
+use function array_merge;
 use function in_array;
+use function preg_match;
+use function sprintf;
+
+use const ARRAY_FILTER_USE_BOTH;
+use const PHP_EOL;
 
 /**
  * Generates an HTML API based on the classes exposed in the extension.
diff --git a/src/Console/Command/BuildCommand.php b/src/Console/Command/BuildCommand.php
index 1513b78030..c24ba0c053 100644
--- a/src/Console/Command/BuildCommand.php
+++ b/src/Console/Command/BuildCommand.php
@@ -21,6 +21,8 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
+use const PHP_EOL;
+
 /**
  * Generates/Compiles/Installs a Zephir extension.
  */
diff --git a/src/Console/Command/CleanCommand.php b/src/Console/Command/CleanCommand.php
index 938b930964..21f88d259a 100644
--- a/src/Console/Command/CleanCommand.php
+++ b/src/Console/Command/CleanCommand.php
@@ -22,6 +22,9 @@
 use Zephir\FileSystem\FileSystemInterface;
 use Zephir\Os;
 
+use function sprintf;
+use function system;
+
 /**
  * Cleans any object files created by the extension.
  */
diff --git a/src/Console/Command/CompileCommand.php b/src/Console/Command/CompileCommand.php
index 321dbc3d56..6da74cf34a 100644
--- a/src/Console/Command/CompileCommand.php
+++ b/src/Console/Command/CompileCommand.php
@@ -21,6 +21,8 @@
 use Zephir\Compiler;
 use Zephir\Exception\CompilerException;
 
+use const PHP_EOL;
+
 /**
  * Compile a Zephir extension.
  */
diff --git a/src/Console/Command/FullCleanCommand.php b/src/Console/Command/FullCleanCommand.php
index ed00da23a0..39b46e9190 100644
--- a/src/Console/Command/FullCleanCommand.php
+++ b/src/Console/Command/FullCleanCommand.php
@@ -20,6 +20,9 @@
 use Zephir\Exception\FileSystemException;
 use Zephir\Os;
 
+use function sprintf;
+use function system;
+
 /**
  * Full Clean Command
  *
diff --git a/src/Console/Command/GenerateCommand.php b/src/Console/Command/GenerateCommand.php
index b77bb82470..94346f6f5e 100644
--- a/src/Console/Command/GenerateCommand.php
+++ b/src/Console/Command/GenerateCommand.php
@@ -23,6 +23,10 @@
 use Zephir\Exception\InvalidArgumentException;
 
 use function extension_loaded;
+use function ini_get;
+use function sprintf;
+
+use const PHP_EOL;
 
 /**
  * Generate Command
diff --git a/src/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php
index 71a379c078..8185bcc1c6 100644
--- a/src/Console/Command/InitCommand.php
+++ b/src/Console/Command/InitCommand.php
@@ -30,6 +30,10 @@
 use function mkdir;
 use function preg_match;
 
+use function preg_replace;
+use function sprintf;
+use function strtolower;
+
 use const DIRECTORY_SEPARATOR;
 
 /**
diff --git a/src/Console/Command/InstallCommand.php b/src/Console/Command/InstallCommand.php
index eb7a656bc0..0a4b6bfeb0 100644
--- a/src/Console/Command/InstallCommand.php
+++ b/src/Console/Command/InstallCommand.php
@@ -24,6 +24,9 @@
 use Zephir\Exception\NotImplementedException;
 
 use function extension_loaded;
+use function sprintf;
+
+use const PHP_EOL;
 
 /**
  * Install Command
diff --git a/src/Console/Command/StubsCommand.php b/src/Console/Command/StubsCommand.php
index 2051eab0da..9070e5e07d 100644
--- a/src/Console/Command/StubsCommand.php
+++ b/src/Console/Command/StubsCommand.php
@@ -20,6 +20,10 @@
 use Zephir\Compiler;
 use Zephir\Exception\ExceptionInterface;
 
+use function sprintf;
+
+use const PHP_EOL;
+
 /**
  * Stubs Command
  *
diff --git a/src/Console/ErrorListener.php b/src/Console/ErrorListener.php
index ca9028d8d3..ece6e2d7f8 100644
--- a/src/Console/ErrorListener.php
+++ b/src/Console/ErrorListener.php
@@ -17,6 +17,11 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\ExceptionInterface;
 
+use function filter_var;
+use function getenv;
+
+use const FILTER_VALIDATE_BOOLEAN;
+
 class ErrorListener
 {
     public function onCommandError(ConsoleErrorEvent $event): void
diff --git a/src/Detectors/ReadDetector.php b/src/Detectors/ReadDetector.php
index d59c7a9407..01900ed983 100644
--- a/src/Detectors/ReadDetector.php
+++ b/src/Detectors/ReadDetector.php
@@ -15,7 +15,10 @@
 
 use Zephir\Variable\Variable;
 
+use function in_array;
 use function is_array;
+use function strpos;
+use function substr;
 
 /**
  * Detects if a variable is used in a given expression context
diff --git a/src/Detectors/WriteDetector.php b/src/Detectors/WriteDetector.php
index c330bb2632..66b12442c0 100644
--- a/src/Detectors/WriteDetector.php
+++ b/src/Detectors/WriteDetector.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Detectors;
 
+use const PHP_EOL;
+
 /**
  * Detects whether a variable is mutated in a given context
  * If a variable is not modified in a local context (method block) we can avoid allocate
diff --git a/src/Documentation.php b/src/Documentation.php
index 7f3916bb8b..701cd4be30 100644
--- a/src/Documentation.php
+++ b/src/Documentation.php
@@ -21,8 +21,23 @@
 use Zephir\Documentation\Theme;
 use Zephir\Exception\InvalidArgumentException;
 
+use function array_merge;
+use function file_exists;
+use function file_get_contents;
+use function getcwd;
 use function is_array;
 
+use function is_dir;
+use function is_writable;
+use function json_decode;
+use function ksort;
+use function mkdir;
+use function realpath;
+use function rtrim;
+use function sprintf;
+use function str_replace;
+use function trim;
+
 use const DIRECTORY_SEPARATOR;
 
 /**
diff --git a/src/Documentation/Annotation.php b/src/Documentation/Annotation.php
index 8994233dc9..9518ac8a02 100644
--- a/src/Documentation/Annotation.php
+++ b/src/Documentation/Annotation.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Documentation;
 
+use function trim;
+
 /**
  * A parsed Annotation
  */
diff --git a/src/Documentation/Annotation/Link.php b/src/Documentation/Annotation/Link.php
index 399c89c43e..cdb9c3208a 100644
--- a/src/Documentation/Annotation/Link.php
+++ b/src/Documentation/Annotation/Link.php
@@ -15,6 +15,9 @@
 
 use Zephir\Documentation\Annotation;
 
+use function strpos;
+use function substr;
+
 /**
  * A link annotation that looks like  `(@)link uri text`.
  */
diff --git a/src/Documentation/Annotation/ReturnAnnotation.php b/src/Documentation/Annotation/ReturnAnnotation.php
index e44c0d3015..56b027a47c 100644
--- a/src/Documentation/Annotation/ReturnAnnotation.php
+++ b/src/Documentation/Annotation/ReturnAnnotation.php
@@ -15,6 +15,9 @@
 
 use Zephir\Documentation\Annotation;
 
+use function strpos;
+use function substr;
+
 /**
  * A return annotation that looks like  `(@)return type description`.
  */
diff --git a/src/Documentation/Annotation/See.php b/src/Documentation/Annotation/See.php
index d6ed471b3e..0fcc87fdc7 100644
--- a/src/Documentation/Annotation/See.php
+++ b/src/Documentation/Annotation/See.php
@@ -15,6 +15,9 @@
 
 use Zephir\Documentation\Annotation;
 
+use function strpos;
+use function substr;
+
 /**
  * A link annotation that looks like  `(@)link uri text`.
  */
diff --git a/src/Documentation/Docblock.php b/src/Documentation/Docblock.php
index 80896e03f6..ccb6df4f22 100644
--- a/src/Documentation/Docblock.php
+++ b/src/Documentation/Docblock.php
@@ -13,6 +13,11 @@
 
 namespace Zephir\Documentation;
 
+use function explode;
+use function trim;
+
+use const PHP_EOL;
+
 /**
  * A parsed Annotation
  */
diff --git a/src/Documentation/DocblockParser.php b/src/Documentation/DocblockParser.php
index b2572db476..b2a27a5285 100644
--- a/src/Documentation/DocblockParser.php
+++ b/src/Documentation/DocblockParser.php
@@ -14,6 +14,9 @@
 namespace Zephir\Documentation;
 
 use function strlen;
+use function trim;
+
+use const PHP_EOL;
 
 /**
  * Helper to parse raw docblocks to structured object.
diff --git a/src/Documentation/File/ClassFile.php b/src/Documentation/File/ClassFile.php
index 110b3fc899..35676df799 100644
--- a/src/Documentation/File/ClassFile.php
+++ b/src/Documentation/File/ClassFile.php
@@ -18,6 +18,8 @@
 use Zephir\Documentation;
 use Zephir\Documentation\FileInterface;
 
+use function explode;
+
 class ClassFile implements FileInterface
 {
     protected Definition $class;
diff --git a/src/Documentation/File/Sitemap.php b/src/Documentation/File/Sitemap.php
index 7ff60dc950..60ceb086a0 100644
--- a/src/Documentation/File/Sitemap.php
+++ b/src/Documentation/File/Sitemap.php
@@ -15,6 +15,8 @@
 
 use Zephir\Documentation\FileInterface;
 
+use function rtrim;
+
 use const DIRECTORY_SEPARATOR;
 
 class Sitemap implements FileInterface
diff --git a/src/Documentation/NamespaceAccessor.php b/src/Documentation/NamespaceAccessor.php
index 839ed6430a..ddd0cd39ec 100644
--- a/src/Documentation/NamespaceAccessor.php
+++ b/src/Documentation/NamespaceAccessor.php
@@ -15,6 +15,8 @@
 
 use Zephir\CompilerFile;
 
+use function explode;
+
 class NamespaceAccessor
 {
     protected $byNamespace;
diff --git a/src/Documentation/NamespaceHelper.php b/src/Documentation/NamespaceHelper.php
index 9100864b5e..6a9846c503 100644
--- a/src/Documentation/NamespaceHelper.php
+++ b/src/Documentation/NamespaceHelper.php
@@ -15,7 +15,10 @@
 
 use Zephir\CompilerFile;
 
+use function array_pop;
 use function count;
+use function explode;
+use function implode;
 
 class NamespaceHelper
 {
diff --git a/src/Documentation/Template.php b/src/Documentation/Template.php
index 8213423ddd..12803af96c 100644
--- a/src/Documentation/Template.php
+++ b/src/Documentation/Template.php
@@ -19,7 +19,13 @@
 use Zephir\Documentation;
 use Zephir\Exception;
 
+use function array_merge;
+use function file_exists;
+use function file_put_contents;
 use function is_string;
+use function ltrim;
+use function ob_get_clean;
+use function ob_start;
 
 class Template
 {
diff --git a/src/Documentation/Theme.php b/src/Documentation/Theme.php
index ddc3243771..bf6760434d 100644
--- a/src/Documentation/Theme.php
+++ b/src/Documentation/Theme.php
@@ -16,8 +16,27 @@
 use Zephir\Documentation;
 use Zephir\Exception;
 
+use function array_unshift;
+use function closedir;
+use function copy;
 use function count;
+use function explode;
+use function file_exists;
+use function file_get_contents;
+use function file_put_contents;
 use function is_array;
+use function is_dir;
+use function json_decode;
+use function json_encode;
+use function ltrim;
+use function mkdir;
+use function opendir;
+use function pathinfo;
+use function readdir;
+use function str_repeat;
+use function str_replace;
+use function strpos;
+use function touch;
 
 class Theme
 {
diff --git a/src/Exception/ExceptionExtraAwareTrait.php b/src/Exception/ExceptionExtraAwareTrait.php
index f95f0d918c..3ccb013dbd 100644
--- a/src/Exception/ExceptionExtraAwareTrait.php
+++ b/src/Exception/ExceptionExtraAwareTrait.php
@@ -13,6 +13,12 @@
 
 namespace Zephir\Exception;
 
+use function file;
+use function file_exists;
+use function sprintf;
+use function str_repeat;
+use function str_replace;
+
 trait ExceptionExtraAwareTrait
 {
     /**
diff --git a/src/Exception/IllegalOperationException.php b/src/Exception/IllegalOperationException.php
index 20dcbca594..b46afe8c72 100644
--- a/src/Exception/IllegalOperationException.php
+++ b/src/Exception/IllegalOperationException.php
@@ -15,6 +15,8 @@
 
 use Zephir\TypeAwareInterface;
 
+use function sprintf;
+
 class IllegalOperationException extends CompilerException
 {
     /**
diff --git a/src/Exception/InvalidTypeException.php b/src/Exception/InvalidTypeException.php
index fad4b82b46..d89e5efd43 100644
--- a/src/Exception/InvalidTypeException.php
+++ b/src/Exception/InvalidTypeException.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Exception;
 
+use function sprintf;
+
 final class InvalidTypeException extends CompilerException
 {
     /**
diff --git a/src/Expression.php b/src/Expression.php
index 2dff3b835e..9619d3c8ec 100644
--- a/src/Expression.php
+++ b/src/Expression.php
@@ -69,7 +69,11 @@
 use Zephir\Operators\Unary\NotOperator;
 use Zephir\Variable\Variable;
 
+use function str_replace;
 use function strlen;
+use function substr;
+
+use const PHP_EOL;
 
 /**
  * Represents an expression.
diff --git a/src/Expression/Builder/AbstractBuilder.php b/src/Expression/Builder/AbstractBuilder.php
index b505f5b968..be0339483e 100644
--- a/src/Expression/Builder/AbstractBuilder.php
+++ b/src/Expression/Builder/AbstractBuilder.php
@@ -15,6 +15,7 @@
 
 use function is_array;
 use function is_object;
+use function is_scalar;
 
 abstract class AbstractBuilder
 {
diff --git a/src/Expression/Closure.php b/src/Expression/Closure.php
index 53111d34aa..bd0117e67a 100644
--- a/src/Expression/Closure.php
+++ b/src/Expression/Closure.php
@@ -24,6 +24,7 @@
 use Zephir\StatementsBlock;
 use Zephir\Variable\Variable;
 
+use function in_array;
 use function is_array;
 
 /**
diff --git a/src/Expression/Constants.php b/src/Expression/Constants.php
index 3be318a004..cf655012ff 100644
--- a/src/Expression/Constants.php
+++ b/src/Expression/Constants.php
@@ -20,10 +20,12 @@
 use Zephir\Name;
 use Zephir\Variable\Variable;
 
+use function array_merge;
 use function constant;
 use function defined;
 use function gettype;
 use function in_array;
+use function strtolower;
 
 /**
  * Resolves PHP or Zephir constants into C-Code
diff --git a/src/Expression/NativeArray.php b/src/Expression/NativeArray.php
index bd69231a9c..bb0e309e3c 100644
--- a/src/Expression/NativeArray.php
+++ b/src/Expression/NativeArray.php
@@ -24,6 +24,8 @@
 
 use function count;
 use function function_exists;
+use function gmp_nextprime;
+use function gmp_strval;
 
 /**
  * Resolves expressions that create arrays
diff --git a/src/Expression/PropertyAccess.php b/src/Expression/PropertyAccess.php
index 86e6e11b5e..9d52903b47 100644
--- a/src/Expression/PropertyAccess.php
+++ b/src/Expression/PropertyAccess.php
@@ -19,6 +19,8 @@
 use Zephir\Expression;
 use Zephir\Variable\Variable;
 
+use function current;
+
 /**
  * Resolves expressions that read properties
  */
diff --git a/src/Expression/Reference.php b/src/Expression/Reference.php
index 858eab139a..34182bacef 100644
--- a/src/Expression/Reference.php
+++ b/src/Expression/Reference.php
@@ -21,6 +21,8 @@
 use Zephir\Expression;
 use Zephir\Variable\Variable;
 
+use function in_array;
+
 /**
  * Expression Reference
  *
diff --git a/src/Expression/StaticConstantAccess.php b/src/Expression/StaticConstantAccess.php
index 735ca79de8..4181ce8ee3 100644
--- a/src/Expression/StaticConstantAccess.php
+++ b/src/Expression/StaticConstantAccess.php
@@ -23,6 +23,7 @@
 
 use function gettype;
 use function in_array;
+use function sprintf;
 
 /**
  * Resolves class constants
diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 0b5b3e85da..75a0e51d53 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -21,6 +21,28 @@
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Zephir;
 
+use function chmod;
+use function escapeshellarg;
+use function file_exists;
+use function file_get_contents;
+use function file_put_contents;
+use function filemtime;
+use function hash_file;
+use function is_dir;
+use function is_file;
+use function md5;
+use function md5_file;
+use function mkdir;
+use function preg_split;
+use function rmdir;
+use function rtrim;
+use function sprintf;
+use function str_replace;
+use function system;
+use function unlink;
+
+use const DIRECTORY_SEPARATOR;
+
 /**
  * Local Hard Disk
  *
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 57acc265ae..74b5b27c78 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -18,12 +18,23 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use function class_exists;
 use function count;
+use function file_exists;
 use function function_exists;
+use function implode;
 use function is_array;
 use function is_object;
 
+use function preg_match;
+use function sprintf;
+use function str_replace;
+use function strtolower;
+use function substr;
+use function version_compare;
+
 use const DIRECTORY_SEPARATOR;
+use const PHP_VERSION;
 
 /**
  * Call functions. By default, functions are called in the PHP userland if an optimizer
diff --git a/src/HeadersManager.php b/src/HeadersManager.php
index f53400b5fd..2794b4d2df 100644
--- a/src/HeadersManager.php
+++ b/src/HeadersManager.php
@@ -15,6 +15,7 @@
 
 use InvalidArgumentException;
 
+use function array_merge;
 use function is_string;
 
 /**
diff --git a/src/Logger/Formatter/CompilerFormatter.php b/src/Logger/Formatter/CompilerFormatter.php
index 05bf3a570a..20f681c7fa 100644
--- a/src/Logger/Formatter/CompilerFormatter.php
+++ b/src/Logger/Formatter/CompilerFormatter.php
@@ -18,7 +18,16 @@
 
 use function array_key_exists;
 use function count;
+use function file;
+use function file_exists;
 use function is_array;
+use function preg_replace;
+use function str_repeat;
+use function str_replace;
+use function strtolower;
+use function ucfirst;
+
+use const PHP_EOL;
 
 /**
  * Formatter for warnings/notices/errors generated in compilation.
diff --git a/src/MethodCall.php b/src/MethodCall.php
index 97a04ffed5..bb8f91668a 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -22,9 +22,14 @@
 use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
+use function class_exists;
 use function count;
+use function implode;
 use function is_array;
 use function is_object;
+use function sprintf;
+use function strtolower;
+use function ucfirst;
 
 /**
  * Call methods in a non-static context
diff --git a/src/Name.php b/src/Name.php
index 1afab8ac44..99529c6dd5 100644
--- a/src/Name.php
+++ b/src/Name.php
@@ -14,7 +14,12 @@
 namespace Zephir;
 
 use function in_array;
+use function is_numeric;
+use function str_replace;
 use function strlen;
+use function strpos;
+use function substr;
+use function ucwords;
 
 final class Name
 {
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 379a1f4df1..26f5398db1 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -21,6 +21,8 @@
 use Zephir\Operators\AbstractOperator;
 use Zephir\Variable\Variable;
 
+use function sprintf;
+
 /**
  * This is the base operator for commutative, associative and distributive
  * arithmetic operators
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index 9a5f0d9244..f3e15799d9 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -21,6 +21,8 @@
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
 
+use function strtolower;
+
 /**
  * This is the base operator for comparison operators
  */
diff --git a/src/Optimizers/EvalExpression.php b/src/Optimizers/EvalExpression.php
index 444372ba7c..329939e679 100644
--- a/src/Optimizers/EvalExpression.php
+++ b/src/Optimizers/EvalExpression.php
@@ -21,6 +21,8 @@
 use Zephir\LiteralCompiledExpression;
 use Zephir\Variable\Variable;
 
+use function end;
+use function is_numeric;
 use function is_object;
 
 /**
diff --git a/src/Optimizers/IsTypeOptimizerAbstract.php b/src/Optimizers/IsTypeOptimizerAbstract.php
index cf1c70e793..0777736506 100644
--- a/src/Optimizers/IsTypeOptimizerAbstract.php
+++ b/src/Optimizers/IsTypeOptimizerAbstract.php
@@ -19,6 +19,7 @@
 use Zephir\Exception;
 
 use function count;
+use function sprintf;
 
 abstract class IsTypeOptimizerAbstract extends OptimizerAbstract
 {
diff --git a/src/Os.php b/src/Os.php
index 558c3e3679..28412c5acb 100644
--- a/src/Os.php
+++ b/src/Os.php
@@ -13,6 +13,8 @@
 
 namespace Zephir;
 
+use function stripos;
+
 use const PHP_OS;
 
 class Os
diff --git a/src/Parser/Manager.php b/src/Parser/Manager.php
index 58a049761c..5956de1a42 100644
--- a/src/Parser/Manager.php
+++ b/src/Parser/Manager.php
@@ -13,6 +13,9 @@
 
 namespace Zephir\Parser;
 
+use function sprintf;
+use function version_compare;
+
 class Manager
 {
     public const MINIMUM_PARSER_VERSION = '1.5.0';
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 76b795e152..d74f4f179a 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -17,7 +17,11 @@
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Exception\ParseException;
 
+use function file_get_contents;
 use function function_exists;
+use function is_file;
+use function is_readable;
+use function phpversion;
 
 class Parser
 {
diff --git a/src/Passes/CallGathererPass.php b/src/Passes/CallGathererPass.php
index 558d4b2df5..a8aeed5110 100644
--- a/src/Passes/CallGathererPass.php
+++ b/src/Passes/CallGathererPass.php
@@ -17,6 +17,8 @@
 use Zephir\FunctionCall;
 use Zephir\StatementsBlock;
 
+use const PHP_EOL;
+
 /**
  * This pass counts how many times the same function is called inside a
  * statements block. It also counts how many times a method is calling
diff --git a/src/Passes/LocalContextPass.php b/src/Passes/LocalContextPass.php
index 567feaf9c4..b72008ae5f 100644
--- a/src/Passes/LocalContextPass.php
+++ b/src/Passes/LocalContextPass.php
@@ -19,6 +19,8 @@
 use function defined;
 use function gettype;
 
+use const PHP_EOL;
+
 /**
  * This pass tries to check whether variables only do exist in the local context of the method block
  * or if they're used externally which will un allow variables to be placed in the stack
diff --git a/src/Passes/MutateGathererPass.php b/src/Passes/MutateGathererPass.php
index 390281ac63..eb1a066180 100644
--- a/src/Passes/MutateGathererPass.php
+++ b/src/Passes/MutateGathererPass.php
@@ -15,6 +15,8 @@
 
 use Zephir\StatementsBlock;
 
+use const PHP_EOL;
+
 /**
  * Counts variables mutated inside a specific statement block
  * Non-mutated variables can be promoted to use an inline cache
diff --git a/src/Passes/SkipVariantInit.php b/src/Passes/SkipVariantInit.php
index 10ed26c74a..3fba77353a 100644
--- a/src/Passes/SkipVariantInit.php
+++ b/src/Passes/SkipVariantInit.php
@@ -16,6 +16,7 @@
 use Zephir\StatementsBlock;
 
 use function count;
+use function in_array;
 
 /**
  * In 'if'/'else' statements sometimes dynamical variables are initialized in every branch
diff --git a/src/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
index 74a7d5e2f5..681abd3cfc 100644
--- a/src/Passes/StaticTypeInference.php
+++ b/src/Passes/StaticTypeInference.php
@@ -17,6 +17,8 @@
 
 use function is_string;
 
+use const PHP_EOL;
+
 /**
  * This pass try to infer typing on dynamic variables so the compiler
  * can replace them by low level types automatically
diff --git a/src/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
index e8131d1af3..d212a953ef 100644
--- a/src/Statements/Let/ArrayIndex.php
+++ b/src/Statements/Let/ArrayIndex.php
@@ -22,6 +22,7 @@
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function count;
+use function sprintf;
 
 /**
  * ArrayIndex.
diff --git a/src/Statements/Let/ObjectProperty.php b/src/Statements/Let/ObjectProperty.php
index 309b1e393a..7e2cf258e1 100644
--- a/src/Statements/Let/ObjectProperty.php
+++ b/src/Statements/Let/ObjectProperty.php
@@ -18,6 +18,8 @@
 use Zephir\Exception\CompilerException as Exception;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function sprintf;
+
 /**
  * Adds/Updates an array index
  */
@@ -26,15 +28,13 @@ class ObjectProperty
     /**
      * Compiles foo->x = {expr}.
      *
-     * @param string $variable
+     * @param string         $variable
      * @param ZephirVariable $symbolVariable
-     * @param Expression $expression
-     * @param Context $context
-     * @param array $statement
+     * @param Expression     $expression
+     * @param Context        $context
+     * @param array          $statement
      *
      * @return void
-     *
-     * @throws Exception
      */
     public function assign(
         string $variable,
diff --git a/src/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
index 16e31164b5..dabc296fbd 100644
--- a/src/Statements/Let/ObjectPropertyAppend.php
+++ b/src/Statements/Let/ObjectPropertyAppend.php
@@ -18,6 +18,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function current;
+
 /**
  * ObjectPropertyAppend.
  *
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index 46dfa1a859..a52f41de57 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -20,6 +20,7 @@
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function count;
+use function current;
 
 /**
  * ObjectPropertyArrayIndex.
diff --git a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
index 63363e8b61..1efea1f7d0 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -22,6 +22,7 @@
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function count;
+use function current;
 
 /**
  * Updates object properties dynamically
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index 51286b2b66..bee7126e2b 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -17,6 +17,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function current;
+
 /**
  * ObjectPropertyDecr.
  *
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 7d46d90c79..29364111b8 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -17,6 +17,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function current;
+
 /**
  * ObjectPropertyIncr.
  *
diff --git a/src/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
index d4290fe49f..40f21b166e 100644
--- a/src/Statements/Let/StaticProperty.php
+++ b/src/Statements/Let/StaticProperty.php
@@ -20,6 +20,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
+use function sprintf;
+
 /**
  * Updates static properties
  */
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 38ab381166..f6fc6fa233 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -21,6 +21,7 @@
 use Zephir\Expression;
 
 use function in_array;
+use function sprintf;
 
 /**
  * Zephir\Statements\Let\StaticPropertyArrayIndex.
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index 960f22ce14..f2ebb979a3 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -21,6 +21,7 @@
 use Zephir\Expression;
 
 use function in_array;
+use function sprintf;
 
 /**
  * StaticPropertyArrayIndexAppend.
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index ce06c10be3..afb0b8afaa 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -19,6 +19,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalOperationException;
 
+use function sprintf;
+
 /**
  * StaticPropertySub.
  *
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 2b7256696b..1276b183de 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -22,6 +22,8 @@
 use Zephir\Name;
 use Zephir\Variable\Variable as ZephirVariable;
 
+use function array_keys;
+
 /**
  * Zephir\Statements\Let\Variable.
  *
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index d7155996a6..417cdcd857 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -22,6 +22,8 @@
 use Zephir\Name;
 use Zephir\Types\Types;
 
+use function sprintf;
+
 /**
  * Return statement is used to assign variables
  */
diff --git a/src/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
index 169821e522..e3eca50c22 100644
--- a/src/Statements/SwitchStatement.php
+++ b/src/Statements/SwitchStatement.php
@@ -22,6 +22,7 @@
 use Zephir\StatementsBlock;
 
 use function count;
+use function implode;
 
 /**
  * Switch statement, the same as in PHP/C
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index 95c4a2f494..ed20f116cd 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -25,6 +25,7 @@
 
 use function count;
 use function in_array;
+use function sprintf;
 
 /**
  * Throws exceptions
diff --git a/src/Statements/TryCatchStatement.php b/src/Statements/TryCatchStatement.php
index fdeacb6f48..6534a15e3b 100644
--- a/src/Statements/TryCatchStatement.php
+++ b/src/Statements/TryCatchStatement.php
@@ -19,6 +19,7 @@
 use Zephir\Expression\Builder\Operators\BinaryOperator;
 use Zephir\StatementsBlock;
 
+use function array_merge;
 use function count;
 
 /**
diff --git a/src/StatementsBlock.php b/src/StatementsBlock.php
index 14af14f71d..ab47e4296d 100644
--- a/src/StatementsBlock.php
+++ b/src/StatementsBlock.php
@@ -33,7 +33,13 @@
 use Zephir\Statements\UnsetStatement;
 use Zephir\Statements\WhileStatement;
 
+use function array_pop;
 use function count;
+use function filter_var;
+use function getenv;
+use function sprintf;
+
+use const FILTER_VALIDATE_BOOLEAN;
 
 /**
  * This represents a single basic block in Zephir.
diff --git a/src/StaticCall.php b/src/StaticCall.php
index 81270e8dcc..cbbbcfef09 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -21,9 +21,14 @@
 use Zephir\Variable\Variable;
 
 use function count;
+use function implode;
 use function in_array;
 use function is_object;
 use function is_string;
+use function sprintf;
+use function str_replace;
+use function strtolower;
+use function strtoupper;
 
 /**
  * Call methods in a static context
diff --git a/src/Stubs/DocBlock.php b/src/Stubs/DocBlock.php
index 211062b2b4..90bf686f39 100644
--- a/src/Stubs/DocBlock.php
+++ b/src/Stubs/DocBlock.php
@@ -13,7 +13,18 @@
 
 namespace Zephir\Stubs;
 
+use function array_map;
+use function array_pop;
+use function array_reverse;
+use function array_shift;
 use function count;
+use function explode;
+use function implode;
+use function preg_match;
+use function preg_replace;
+use function rtrim;
+use function str_replace;
+use function trim;
 
 /**
  * @author Gusakov Nikita <dev@nkt.me>
diff --git a/src/Stubs/Generator.php b/src/Stubs/Generator.php
index e388bcae0d..c8c8147c13 100644
--- a/src/Stubs/Generator.php
+++ b/src/Stubs/Generator.php
@@ -22,10 +22,25 @@
 use Zephir\CompilerFile;
 use Zephir\Exception;
 
+use function addslashes;
+use function array_diff;
 use function array_key_exists;
+use function file_put_contents;
+use function implode;
 use function in_array;
 
+use function is_dir;
+use function key;
+use function mkdir;
+use function realpath;
+use function sprintf;
+use function str_ireplace;
+use function str_replace;
+use function trim;
+use function ucfirst;
+
 use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
 
 class Generator
 {
@@ -74,15 +89,15 @@ public function generate(string $namespace, string $path, string $indent, string
 
             $filename = ucfirst($class->getName()) . '.php';
             $filePath = $path
-            . str_ireplace(
-                $namespace,
-                '',
-                str_replace(
-                    $namespace . '\\\\',
-                    DIRECTORY_SEPARATOR,
-                    $class->getNamespace()
-                )
-            );
+                . str_ireplace(
+                    $namespace,
+                    '',
+                    str_replace(
+                        $namespace . '\\\\',
+                        DIRECTORY_SEPARATOR,
+                        $class->getNamespace()
+                    )
+                );
             $filePath = str_replace('\\', DIRECTORY_SEPARATOR, $filePath);
             $filePath = str_replace(DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR, $filePath);
 
diff --git a/src/Stubs/MethodDocBlock.php b/src/Stubs/MethodDocBlock.php
index ad79d53921..e6fe1792ef 100644
--- a/src/Stubs/MethodDocBlock.php
+++ b/src/Stubs/MethodDocBlock.php
@@ -17,6 +17,13 @@
 use Zephir\Class\Method\Method;
 use Zephir\Types\Types;
 
+use function array_keys;
+use function array_merge;
+use function array_unique;
+use function preg_match;
+use function str_replace;
+use function trim;
+
 /**
  * Stubs Generator.
  *
diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index 2f4ba05731..5205f7c6c7 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -18,9 +18,12 @@
 use Zephir\Variable\Globals;
 use Zephir\Variable\Variable;
 
+use function array_reverse;
 use function count;
 use function is_object;
 use function strlen;
+use function strpos;
+use function substr;
 
 /**
  * A symbol table stores all the variables defined in a method, their data types and default values.
diff --git a/src/Types/AbstractType.php b/src/Types/AbstractType.php
index 9c346a4ad0..d50328f75d 100644
--- a/src/Types/AbstractType.php
+++ b/src/Types/AbstractType.php
@@ -22,6 +22,10 @@
 use Zephir\Expression;
 use Zephir\Expression\Builder\BuilderFactory;
 
+use function array_unshift;
+use function method_exists;
+use function sprintf;
+
 abstract class AbstractType
 {
     /**
diff --git a/src/Variable/Globals.php b/src/Variable/Globals.php
index 5a56df04e5..bc6f226ce3 100644
--- a/src/Variable/Globals.php
+++ b/src/Variable/Globals.php
@@ -13,6 +13,8 @@
 
 namespace Zephir\Variable;
 
+use function in_array;
+
 /**
  * Represents a central knowledge base on global variables.
  */

From 8cddbbd12233bc3afc2fdbd93d745019b802b0d3 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:46:01 -0600
Subject: [PATCH 208/375] fixing imports phpcs

---
 src/Class/Definition/Definition.php | 12 ++++++------
 src/Class/Entry.php                 |  6 +++---
 src/Class/Method/Method.php         | 10 +++++-----
 src/CompilerFile.php                |  1 -
 src/CompilerFileAnonymous.php       |  1 -
 src/Console/Command/InitCommand.php |  1 -
 src/Documentation.php               |  1 -
 src/FunctionCall.php                |  1 -
 src/Stubs/Generator.php             |  1 -
 9 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 077cdf50b0..6ff79d7114 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -903,12 +903,12 @@ public function getExternalHeader(): string
         $parts = explode('\\', $this->namespace);
 
         return 'ext/' . strtolower(
-                $parts[0] . DIRECTORY_SEPARATOR . str_replace(
-                    '\\',
-                    DIRECTORY_SEPARATOR,
-                    $this->namespace
-                ) . DIRECTORY_SEPARATOR . $this->name
-            ) . '.zep';
+            $parts[0] . DIRECTORY_SEPARATOR . str_replace(
+                '\\',
+                DIRECTORY_SEPARATOR,
+                $this->namespace
+            ) . DIRECTORY_SEPARATOR . $this->name
+        ) . '.zep';
     }
 
     /**
diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index ec53e64f55..b5cf44b89e 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -148,9 +148,9 @@ public function isInternal(): bool
     private function isInternalClass(string $className): bool
     {
         $this->isInternal = preg_match(
-                '/^' . $className . '/',
-                $this->compilationContext->classDefinition->getNamespace()
-            ) === 1;
+            '/^' . $className . '/',
+            $this->compilationContext->classDefinition->getNamespace()
+        ) === 1;
 
         return $this->isInternal;
     }
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 71300d0e0c..c4660fe619 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1167,11 +1167,11 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
                 $initCode  .= "\t" . $compilationContext->backend->ifVariableValueUndefined(
-                        $targetVar,
-                        $compilationContext,
-                        false,
-                        false
-                    ) . PHP_EOL;
+                    $targetVar,
+                    $compilationContext,
+                    false,
+                    false
+                ) . PHP_EOL;
 
                 if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
                     $substituteVar = $substituteVars[$parameter['name']];
diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index bdd60e7158..ccac3008e3 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -39,7 +39,6 @@
 use function filemtime;
 use function implode;
 use function is_array;
-
 use function is_dir;
 use function json_decode;
 use function json_encode;
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index e7aa2aa7cc..c5ab3cf487 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -22,7 +22,6 @@
 
 use function count;
 use function dirname;
-
 use function explode;
 use function file_exists;
 use function file_put_contents;
diff --git a/src/Console/Command/InitCommand.php b/src/Console/Command/InitCommand.php
index 8185bcc1c6..42a4a4bfe8 100644
--- a/src/Console/Command/InitCommand.php
+++ b/src/Console/Command/InitCommand.php
@@ -29,7 +29,6 @@
 use function is_readable;
 use function mkdir;
 use function preg_match;
-
 use function preg_replace;
 use function sprintf;
 use function strtolower;
diff --git a/src/Documentation.php b/src/Documentation.php
index 701cd4be30..d54810e998 100644
--- a/src/Documentation.php
+++ b/src/Documentation.php
@@ -26,7 +26,6 @@
 use function file_get_contents;
 use function getcwd;
 use function is_array;
-
 use function is_dir;
 use function is_writable;
 use function json_decode;
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 74b5b27c78..ae4e0faf71 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -25,7 +25,6 @@
 use function implode;
 use function is_array;
 use function is_object;
-
 use function preg_match;
 use function sprintf;
 use function str_replace;
diff --git a/src/Stubs/Generator.php b/src/Stubs/Generator.php
index c8c8147c13..3512442e4b 100644
--- a/src/Stubs/Generator.php
+++ b/src/Stubs/Generator.php
@@ -28,7 +28,6 @@
 use function file_put_contents;
 use function implode;
 use function in_array;
-
 use function is_dir;
 use function key;
 use function mkdir;

From 46cece9f8b7cd20ea2741c3552d789d3a0e5bba5 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:48:53 -0600
Subject: [PATCH 209/375] disabling phpfixer

---
 .github/workflows/main.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d64be7ad21..a63732de5f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,10 +45,11 @@ jobs:
           phpcs --version
           phpcs --runtime-set ignore_warnings_on_exit true
 
-      - name: Run PHP CS Fixer
-        if: always()
-        run: |
-          php-cs-fixer fix --diff --dry-run -v --using-cache=no
+# Disabling for now until I figure out the rules
+#      - name: Run PHP CS Fixer
+#        if: always()
+#        run: |
+#          php-cs-fixer fix --diff --dry-run -v --using-cache=no
 
       - name: Run Shell Check
         if: always()

From 5f75f38113386a0c6d0c0318bda7c3a30e2f75e6 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 17:50:21 -0600
Subject: [PATCH 210/375] fixing typo

---
 prototypes/redis.php | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/prototypes/redis.php b/prototypes/redis.php
index fb8caa2144..8e00e86b2c 100644
--- a/prototypes/redis.php
+++ b/prototypes/redis.php
@@ -13,40 +13,40 @@ class redis
     /**
      * Options.
      */
-    public public const OPT_SERIALIZER = 1;
-    public public const OPT_PREFIX = 2;
-    public public const OPT_READ_TIMEOUT = 3;
-    public public const OPT_SCAN = 4;
+    public const OPT_SERIALIZER = 1;
+    public const OPT_PREFIX = 2;
+    public const OPT_READ_TIMEOUT = 3;
+    public const OPT_SCAN = 4;
 
     /**
      * Serializers.
      */
-    public public const SERIALIZER_NONE = 0;
-    public public const SERIALIZER_PHP = 1;
-    public public const SERIALIZER_IGBINARY = 2;
+    public const SERIALIZER_NONE = 0;
+    public const SERIALIZER_PHP = 1;
+    public const SERIALIZER_IGBINARY = 2;
 
     /**
      * Multi.
      */
-    public public const ATOMIC = 0;
-    public public const MULTI = 1;
-    public public const PIPELINE = 2;
+    public const ATOMIC = 0;
+    public const MULTI = 1;
+    public const PIPELINE = 2;
 
     /**
      * Type.
      */
-    public public const REDIS_NOT_FOUND = 0;
-    public public const REDIS_STRING = 1;
-    public public const REDIS_SET = 2;
-    public public const REDIS_LIST = 3;
-    public public const REDIS_ZSET = 4;
-    public public const REDIS_HASH = 5;
+    public const REDIS_NOT_FOUND = 0;
+    public const REDIS_STRING = 1;
+    public const REDIS_SET = 2;
+    public const REDIS_LIST = 3;
+    public const REDIS_ZSET = 4;
+    public const REDIS_HASH = 5;
 
     /**
      * Scan.
      */
-    public public const SCAN_NORETRY = 0;
-    public public const SCAN_RETRY = 1;
+    public const SCAN_NORETRY = 0;
+    public const SCAN_RETRY = 1;
 
     public function connect($host, $port = 6379, $timeout = 0.0)
     {

From 08b83b73b3204e1a77e22aed7acb0b7d0a823d9e Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 27 Nov 2023 20:20:58 -0600
Subject: [PATCH 211/375] refactoring require/require_once operators -
 duplicate code

---
 src/Operators/Other/RequireOnceOperator.php | 75 ++-------------------
 src/Operators/Other/RequireOperator.php     | 19 ++++--
 2 files changed, 20 insertions(+), 74 deletions(-)

diff --git a/src/Operators/Other/RequireOnceOperator.php b/src/Operators/Other/RequireOnceOperator.php
index a3122c28d4..404af6a582 100644
--- a/src/Operators/Other/RequireOnceOperator.php
+++ b/src/Operators/Other/RequireOnceOperator.php
@@ -22,75 +22,10 @@
 /**
  * Includes once a plain PHP file
  */
-class RequireOnceOperator extends AbstractOperator
+class RequireOnceOperator extends RequireOperator
 {
-    /**
-     * @param array $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     *
-     * @throws Exception
-     */
-    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
-    {
-        $expr = new Expression($expression['left']);
-        $expr->setReadOnly(true);
-        $expr->setExpectReturn(true);
-
-        $exprPath = $expr->compile($compilationContext);
-        if ('variable' === $exprPath->getType()) {
-            $exprVariable = $compilationContext->symbolTable->getVariableForRead(
-                $exprPath->getCode(),
-                $compilationContext,
-                $expression
-            );
-            $exprVar      = $compilationContext->backend->getVariableCode($exprVariable);
-            if ('variable' === $exprVariable->getType()) {
-                if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
-                    $compilationContext->logger->warning(
-                        'Possible attempt to use invalid type as path in "require_once" operator',
-                        ['non-valid-require-once', $expression]
-                    );
-                }
-            }
-        } else {
-            $exprVar = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext,
-                $expression
-            );
-            $compilationContext->backend->assignString($exprVar, $exprPath->getCode(), $compilationContext);
-            $exprVar = $compilationContext->backend->getVariableCode($exprVar);
-        }
-
-        $symbolVariable = false;
-        if ($this->isExpecting()) {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
-                'variable',
-                $compilationContext
-            );
-        }
-
-        $compilationContext->headersManager->add('kernel/memory');
-        $compilationContext->headersManager->add('kernel/require');
-
-        $codePrinter = $compilationContext->codePrinter;
-
-        if ($symbolVariable) {
-            $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
-            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-            $codePrinter->output('if (zephir_require_once_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
-        } else {
-            $codePrinter->output('if (zephir_require_once_zval(' . $exprVar . ') == FAILURE) {');
-        }
-        $codePrinter->output("\t" . 'RETURN_MM_NULL();');
-        $codePrinter->output('}');
-
-        if ($symbolVariable) {
-            return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
-        }
-
-        return new CompiledExpression('null', null, $expression);
-    }
+    protected string $operatorName = 'require_once';
+    protected string $warningName  = 'non-valid-require-once';
+    protected string $zvalName     = 'zephir_require_once_zval';
+    protected string $zvalNameRet  = 'zephir_require_once_zval_ret';
 }
diff --git a/src/Operators/Other/RequireOperator.php b/src/Operators/Other/RequireOperator.php
index 208c46c6f0..e0661c77ca 100644
--- a/src/Operators/Other/RequireOperator.php
+++ b/src/Operators/Other/RequireOperator.php
@@ -25,6 +25,11 @@
  */
 class RequireOperator extends AbstractOperator
 {
+    protected string $operatorName = 'require';
+    protected string $warningName  = 'non-valid-require';
+    protected string $zvalName     = 'zephir_require_zval';
+    protected string $zvalNameRet  = 'zephir_require_zval_ret';
+
     /**
      * @param array $expression
      * @param CompilationContext $compilationContext
@@ -51,8 +56,10 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ('variable' === $exprVariable->getType()) {
                 if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
                     $compilationContext->logger->warning(
-                        'Possible attempt to use invalid type as path in "require" operator',
-                        ['non-valid-require', $expression]
+                        'Possible attempt to use invalid type as path in "'
+                        . $this->operatorName
+                        . '" operator',
+                        [$this->warningName, $expression]
                     );
                 }
             }
@@ -82,9 +89,13 @@ public function compile(array $expression, CompilationContext $compilationContex
         if ($symbolVariable) {
             $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-            $codePrinter->output('if (zephir_require_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
+            $codePrinter->output(
+                'if (' . $this->zvalNameRet . '(' . $symbol . ', ' . $exprVar . ') == FAILURE) {'
+            );
         } else {
-            $codePrinter->output('if (zephir_require_zval(' . $exprVar . ') == FAILURE) {');
+            $codePrinter->output(
+                'if (' . $this->zvalName . '(' . $exprVar . ') == FAILURE) {'
+            );
         }
         $codePrinter->output("\t" . 'RETURN_MM_NULL();');
         $codePrinter->output('}');

From 62362b7bc3dd476187b1dea7a5996c82df2142b7 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 07:44:53 -0600
Subject: [PATCH 212/375] refactoring likely/unlikely

---
 src/Operators/Other/LikelyOperator.php      | 32 +++++++++--
 src/Operators/Other/RequireOnceOperator.php |  6 ---
 src/Operators/Other/UnlikelyOperator.php    | 60 ++-------------------
 3 files changed, 30 insertions(+), 68 deletions(-)

diff --git a/src/Operators/Other/LikelyOperator.php b/src/Operators/Other/LikelyOperator.php
index d3a5b97752..b16a356dcd 100644
--- a/src/Operators/Other/LikelyOperator.php
+++ b/src/Operators/Other/LikelyOperator.php
@@ -26,6 +26,9 @@
  */
 class LikelyOperator extends AbstractOperator
 {
+    protected string $expressionName = 'EXPECTED';
+    protected string $operatorName   = 'likely';
+
     /**
      * @param array              $expression
      * @param CompilationContext $compilationContext
@@ -38,7 +41,10 @@ class LikelyOperator extends AbstractOperator
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
         if (!isset($expression['left'])) {
-            throw new CompilerException("Invalid 'left' operand for 'likely' expression", $expression['left']);
+            throw new CompilerException(
+                "Invalid 'left' operand for '" . $this->operatorName . "' expression",
+                $expression['left']
+            );
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -46,7 +52,11 @@ public function compile(array $expression, CompilationContext $compilationContex
         $left = $leftExpr->compile($compilationContext);
 
         if ('bool' === $left->getType()) {
-            return new CompiledExpression('bool', 'EXPECTED(' . $left->getCode() . ')', $expression);
+            return new CompiledExpression(
+                'bool',
+                $this->expressionName . '(' . $left->getCode() . ')',
+                $expression
+            );
         }
 
         if ('variable' === $left->getType()) {
@@ -57,18 +67,30 @@ public function compile(array $expression, CompilationContext $compilationContex
             );
             switch ($variable->getType()) {
                 case 'bool':
-                    return new CompiledExpression('bool', 'EXPECTED(' . $variable->getName() . ')', $expression);
+                    return new CompiledExpression(
+                        'bool',
+                        $this->expressionName . '(' . $variable->getName() . ')',
+                        $expression
+                    );
 
                 default:
                     $compilationContext->headersManager->add('kernel/operators');
                     $symbol = $compilationContext->backend->getVariableCode($variable);
 
-                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true(' . $symbol . '))', $expression);
+                    return new CompiledExpression(
+                        'bool',
+                        'UNEXPECTED(zephir_is_true(' . $symbol . '))',
+                        $expression
+                    );
             }
         }
 
         throw new CompilerException(
-            "Cannot use expression type: '" . $left->getType() . "' in 'likely' operator",
+            "Cannot use expression type: '"
+            . $left->getType()
+            . "' in '"
+            . $this->operatorName
+            . "' operator",
             $expression['left']
         );
     }
diff --git a/src/Operators/Other/RequireOnceOperator.php b/src/Operators/Other/RequireOnceOperator.php
index 404af6a582..eaee389208 100644
--- a/src/Operators/Other/RequireOnceOperator.php
+++ b/src/Operators/Other/RequireOnceOperator.php
@@ -13,12 +13,6 @@
 
 namespace Zephir\Operators\Other;
 
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception;
-use Zephir\Expression;
-use Zephir\Operators\AbstractOperator;
-
 /**
  * Includes once a plain PHP file
  */
diff --git a/src/Operators/Other/UnlikelyOperator.php b/src/Operators/Other/UnlikelyOperator.php
index 38d807e747..81bd2d390e 100644
--- a/src/Operators/Other/UnlikelyOperator.php
+++ b/src/Operators/Other/UnlikelyOperator.php
@@ -13,65 +13,11 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception;
-use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-use Zephir\Operators\AbstractOperator;
-
 /**
  * Adds a branch prediction hint when evaluating an expression
  */
-class UnlikelyOperator extends AbstractOperator
+class UnlikelyOperator extends LikelyOperator
 {
-    /**
-     * Compile unlikely operator
-     *
-     * @param                    $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     *
-     * @throws Exception
-     * @throws ReflectionException
-     */
-    public function compile($expression, CompilationContext $compilationContext): CompiledExpression
-    {
-        if (!isset($expression['left'])) {
-            throw new CompilerException("Invalid 'left' operand for 'unlikely' expression", $expression['left']);
-        }
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
-
-        if ('bool' === $left->getType()) {
-            return new CompiledExpression('bool', 'UNEXPECTED(' . $left->getCode() . ')', $expression);
-        }
-
-        if ('variable' === $left->getType()) {
-            $variable = $compilationContext->symbolTable->getVariableForRead(
-                $left->getCode(),
-                $compilationContext,
-                $expression['left']
-            );
-            switch ($variable->getType()) {
-                case 'bool':
-                    return new CompiledExpression('bool', 'UNEXPECTED(' . $variable->getName() . ')', $expression);
-
-                default:
-                    $compilationContext->headersManager->add('kernel/operators');
-                    $symbol = $compilationContext->backend->getVariableCode($variable);
-
-                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true(' . $symbol . '))', $expression);
-            }
-        }
-
-        throw new CompilerException(
-            "Cannot use expression type: '" . $left->getType() . "' in 'unlikely' operator",
-            $expression['left']
-        );
-    }
+    protected string $expressionName = 'UNEXPECTED';
+    protected string $operatorName   = 'unlikely';
 }

From 631c86847b70264d15a65fa7b86ebe6bb0f859a2 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 11:05:20 -0600
Subject: [PATCH 213/375] refactoring and reusing code

---
 .docker/8.0/Dockerfile                        |   4 +-
 .docker/8.1/Dockerfile                        |   4 +-
 .docker/8.2/Dockerfile                        |   4 +-
 .docker/8.3/Dockerfile                        |   2 +
 composer.json                                 |   4 +-
 src/Operators/Other/LikelyOperator.php        |   2 +-
 .../FunctionCall/EndsWithOptimizer.php        |  59 +------
 .../FunctionCall/StartsWithOptimizer.php      |  22 ++-
 src/Statements/Let/ObjectPropertyDecr.php     |  37 ++++-
 src/Statements/Let/ObjectPropertyIncr.php     | 112 +-------------
 src/Statements/Let/StaticPropertyAppend.php   | 144 ++----------------
 .../Let/StaticPropertyArrayIndex.php          |  53 +++++--
 12 files changed, 110 insertions(+), 337 deletions(-)

diff --git a/.docker/8.0/Dockerfile b/.docker/8.0/Dockerfile
index 42cff4e91b..97fd99e14e 100644
--- a/.docker/8.0/Dockerfile
+++ b/.docker/8.0/Dockerfile
@@ -13,10 +13,10 @@ RUN apt update -y && apt install -y \
     libicu-dev \
     libgmp-dev \
     libzip-dev && \
-    pecl install psr zephir_parser
+    pecl install psr xdebug zephir_parser
 
 RUN docker-php-ext-install zip gmp intl mysqli && \
-    docker-php-ext-enable psr zephir_parser
+    docker-php-ext-enable psr zephir_parser xdebug
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases
diff --git a/.docker/8.1/Dockerfile b/.docker/8.1/Dockerfile
index 08ba38e352..2b2852edfa 100644
--- a/.docker/8.1/Dockerfile
+++ b/.docker/8.1/Dockerfile
@@ -13,10 +13,10 @@ RUN apt update -y && apt install -y \
     libicu-dev \
     libgmp-dev \
     libzip-dev && \
-    pecl install psr zephir_parser
+    pecl install psr xdebug zephir_parser
 
 RUN docker-php-ext-install zip gmp intl mysqli && \
-    docker-php-ext-enable psr zephir_parser
+    docker-php-ext-enable psr zephir_parser xdebug
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases
diff --git a/.docker/8.2/Dockerfile b/.docker/8.2/Dockerfile
index eecd0a7ede..9dc1208777 100644
--- a/.docker/8.2/Dockerfile
+++ b/.docker/8.2/Dockerfile
@@ -13,10 +13,10 @@ RUN apt update -y && apt install -y \
     libicu-dev \
     libgmp-dev \
     libzip-dev && \
-    pecl install psr zephir_parser
+    pecl install psr xdebug zephir_parser
 
 RUN docker-php-ext-install zip gmp intl mysqli && \
-    docker-php-ext-enable psr zephir_parser
+    docker-php-ext-enable psr zephir_parser xdebug
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases
diff --git a/.docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
index 743d3b7f70..35a0eace55 100644
--- a/.docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -14,9 +14,11 @@ RUN apt update -y && apt install -y \
     libgmp-dev \
     libzip-dev && \
     pecl install psr zephir_parser
+#    pecl install psr zephir_parser xdebug
 
 RUN docker-php-ext-install zip gmp intl mysqli && \
     docker-php-ext-enable psr zephir_parser
+#    docker-php-ext-enable psr zephir_parser xdebug
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases
diff --git a/composer.json b/composer.json
index 7971f1f043..54516e2823 100644
--- a/composer.json
+++ b/composer.json
@@ -77,8 +77,8 @@
     "cs": "./vendor/bin/phpcs --standard=phpcs.xml.dist",
     "cs-fix": "./vendor/bin/phpcbf --standard=phpcs.xml.dist",
     "test": "./vendor/bin/phpunit --testsuite Zephir",
-    "test-coverage": "./vendor/bin/phpunit --testsuite Zephir --coverage-html ./tests/output/coverage",
-    "test-coverage-html": "./vendor/bin/phpunit --testsuite Zephir --coverage-php ./tests/output/coverage/coverage.xml"
+    "test-coverage": "./vendor/bin/phpunit --testsuite Zephir --coverage-php ./tests/output/coverage/coverage.xml",
+    "test-coverage-html": "./vendor/bin/phpunit --testsuite Zephir --coverage-html ./tests/output/coverage"
   },
   "scripts-descriptions": {
     "cs": "Run PHPCS",
diff --git a/src/Operators/Other/LikelyOperator.php b/src/Operators/Other/LikelyOperator.php
index b16a356dcd..9842a49dd9 100644
--- a/src/Operators/Other/LikelyOperator.php
+++ b/src/Operators/Other/LikelyOperator.php
@@ -79,7 +79,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                     return new CompiledExpression(
                         'bool',
-                        'UNEXPECTED(zephir_is_true(' . $symbol . '))',
+                        $this->expressionName . '(zephir_is_true(' . $symbol . '))',
                         $expression
                     );
             }
diff --git a/src/Optimizers/FunctionCall/EndsWithOptimizer.php b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
index ba62fd59d1..f75f1e7cc5 100644
--- a/src/Optimizers/FunctionCall/EndsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
@@ -13,66 +13,13 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * EndsWithOptimizer.
  *
  * Like 'strpos' but it returns a boolean value
  */
-class EndsWithOptimizer extends OptimizerAbstract
+class EndsWithOptimizer extends StartsWithOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters']) && 3 != count($expression['parameters'])) {
-            return false;
-        }
-
-        if ('string' == $expression['parameters'][1]['parameter']['type']) {
-            $str = $expression['parameters'][1]['parameter']['value'];
-            unset($expression['parameters'][1]);
-        }
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        if (isset($str)) {
-            return new CompiledExpression(
-                'bool',
-                'zephir_end_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
-                $expression
-            );
-        }
-
-        if (2 == count($expression['parameters'])) {
-            return new CompiledExpression(
-                'bool',
-                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
-                $expression
-            );
-        } else {
-            return new CompiledExpression(
-                'bool',
-                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
-                $expression
-            );
-        }
-    }
+    protected string $zephirMethodStr = 'zephir_end_with_str';
+    protected string $zephirMethod    = 'zephir_end_with';
 }
diff --git a/src/Optimizers/FunctionCall/StartsWithOptimizer.php b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
index 78a1d575cf..fdf4610f74 100644
--- a/src/Optimizers/FunctionCall/StartsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
@@ -27,6 +27,9 @@
  */
 class StartsWithOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethodStr = 'zephir_start_with_str';
+    protected string $zephirMethod    = 'zephir_start_with';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -40,7 +43,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (2 != count($expression['parameters']) && 3 != count($expression['parameters'])) {
+        if (
+            2 != count($expression['parameters']) &&
+            3 != count($expression['parameters'])
+        ) {
             return false;
         }
 
@@ -49,14 +55,18 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             unset($expression['parameters'][1]);
         }
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         $context->headersManager->add('kernel/string');
 
         if (isset($str)) {
             return new CompiledExpression(
                 'bool',
-                'zephir_start_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
+                $this->zephirMethodStr . '(' . $resolvedParams[0] . ', SL("' . $str . '"))',
                 $expression
             );
         }
@@ -64,13 +74,15 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (2 == count($expression['parameters'])) {
             return new CompiledExpression(
                 'bool',
-                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
+                $this->zephirMethod . '(' . $resolvedParams[0] . ', '
+                . $resolvedParams[1] . ', NULL)',
                 $expression
             );
         } else {
             return new CompiledExpression(
                 'bool',
-                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
+                $this->zephirMethod . '(' . $resolvedParams[0] . ', '
+                . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
                 $expression
             );
         }
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index bee7126e2b..5d96bbd04f 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -26,6 +26,8 @@
  */
 class ObjectPropertyDecr
 {
+    protected string $zephirMethod = 'zephir_property_decr';
+
     /**
      * Compiles obj->x--.
      *
@@ -44,7 +46,9 @@ public function assign(
     ): void {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is not initialized",
                 $statement
             );
         }
@@ -54,14 +58,18 @@ public function assign(
          */
         if ($symbolVariable->isLocalOnly()) {
             throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is local only",
                 $statement
             );
         }
 
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is not initialized",
                 $statement
             );
         }
@@ -71,7 +79,9 @@ public function assign(
          */
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException(
-                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+                "Cannot use variable type: '"
+                . $symbolVariable->getType()
+                . "' as array",
                 $statement
             );
         }
@@ -100,8 +110,11 @@ public function assign(
             $classDefinition = $compilationContext->classDefinition;
             if (!$classDefinition->hasProperty($property)) {
                 throw new CompilerException(
-                    "Class '" . $classDefinition->getCompleteName(
-                    ) . "' does not have a property called: '" . $property . "'",
+                    "Class '"
+                    . $classDefinition->getCompleteName()
+                    . "' does not have a property called: '"
+                    . $property
+                    . "'",
                     $statement
                 );
             }
@@ -125,7 +138,11 @@ public function assign(
 
                     if (!$classDefinition->hasProperty($property)) {
                         throw new CompilerException(
-                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
+                            "Class '"
+                            . $classType
+                            . "' does not have a property called: '"
+                            . $property
+                            . "'",
                             $statement
                         );
                     }
@@ -135,7 +152,11 @@ public function assign(
 
         $compilationContext->headersManager->add('kernel/object');
         $compilationContext->codePrinter->output(
-            'RETURN_ON_FAILURE(zephir_property_decr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
+            'RETURN_ON_FAILURE(' . $this->zephirMethod . '('
+            . $symbolVariable->getName()
+            . ', SL("'
+            . $property
+            . '")));'
         );
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 29364111b8..2a9e08c0e8 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -24,115 +24,7 @@
  *
  * Increments an object property
  */
-class ObjectPropertyIncr
+class ObjectPropertyIncr extends ObjectPropertyDecr
 {
-    /**
-     * Compiles obj->x++.
-     *
-     * @param string             $variable
-     * @param string             $property
-     * @param ZephirVariable     $symbolVariable
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     */
-    public function assign(
-        $variable,
-        $property,
-        ZephirVariable $symbolVariable,
-        CompilationContext $compilationContext,
-        $statement
-    ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
-
-        /*
-         * Arrays must be stored in the HEAP
-         */
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
-
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
-
-        /*
-         * Only dynamic variables can be used as arrays
-         */
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
-        }
-
-        /*
-         * Trying to use a non-object dynamic variable as object
-         */
-        if ($symbolVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
-            $compilationContext->logger->warning(
-                'Possible attempt to increment non-object dynamic variable',
-                ['non-object-update', $statement]
-            );
-        }
-
-        /*
-         * Check if the variable to update is defined
-         */
-        if ('this' == $symbolVariable->getRealName()) {
-            $classDefinition = $compilationContext->classDefinition;
-            if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException(
-                    "Class '" . $classDefinition->getCompleteName(
-                    ) . "' does not have a property called: '" . $property . "'",
-                    $statement
-                );
-            }
-        } else {
-            /*
-             * If we know the class related to a variable we could check if the property
-             * is defined on that class
-             */
-            if ($symbolVariable->hasAnyDynamicType('object')) {
-                $classType = current($symbolVariable->getClassTypes());
-                $compiler  = $compilationContext->compiler;
-
-                if ($compiler->isClass($classType)) {
-                    $classDefinition = $compiler->getClassDefinition($classType);
-                    if (!$classDefinition) {
-                        throw new CompilerException(
-                            'Cannot locate class definition for class: ' . $classType,
-                            $statement
-                        );
-                    }
-
-                    if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException(
-                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
-                            $statement
-                        );
-                    }
-                }
-            }
-        }
-
-        $compilationContext->headersManager->add('kernel/object');
-        $compilationContext->codePrinter->output(
-            'RETURN_ON_FAILURE(zephir_property_incr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
-        );
-    }
+    protected string $zephirMethod = 'zephir_property_incr';
 }
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index f3a99d81e0..45279839b7 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -13,155 +13,31 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\Class\Property;
+use ReflectionException;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception;
-use Zephir\Exception\CompilerException;
-
-use function in_array;
 
 /**
  * StaticPropertyAppend.
  *
  * Updates object properties dynamically
  */
-class StaticPropertyAppend extends ArrayIndex
+class StaticPropertyAppend extends StaticPropertyArrayIndex
 {
     /**
-     * Compiles ClassName::foo[index] = {expr}.
-     *
-     * @param string             $className
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext
      * @param array              $statement
+     * @param CompilationContext $compilationContext
      *
+     * @return array
      * @throws Exception
-     * @throws CompilerException
+     * @throws ReflectionException
      */
-    public function assignStatic(
-        $className,
-        $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        array $statement
-    ): void {
-        $compiler = $compilationContext->compiler;
-        if (!in_array($className, ['self', 'static', 'parent'])) {
-            $className = $compilationContext->getFullName($className);
-            if ($compiler->isClass($className)) {
-                $classDefinition = $compiler->getClassDefinition($className);
-            } else {
-                if ($compiler->isBundledClass($className)) {
-                    $classDefinition = $compiler->getInternalClassDefinition($className);
-                } else {
-                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
-                }
-            }
-        } else {
-            if (in_array($className, ['self', 'static'])) {
-                $classDefinition = $compilationContext->classDefinition;
-            } else {
-                if ('parent' == $className) {
-                    $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass    = $classDefinition->getExtendsClass();
-                    if (!$extendsClass) {
-                        throw new CompilerException(
-                            'Cannot assign static property "'
-                            . $property
-                            . '" on parent because class '
-                            . $classDefinition->getCompleteName()
-                            . ' does not extend any class',
-                            $statement
-                        );
-                    } else {
-                        $classDefinition = $classDefinition->getExtendsClassDefinition();
-                    }
-                }
-            }
-        }
-
-        if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException(
-                "Class '" . $classDefinition->getCompleteName(
-                ) . "' does not have a property called: '" . $property . "'",
-                $statement
-            );
-        }
-
-        /** @var Property $propertyDefinition */
-        $propertyDefinition = $classDefinition->getProperty($property);
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                "Cannot access non-static property '"
-                . $classDefinition->getCompleteName()
-                . '::'
-                . $property
-                . "'",
-                $statement
-            );
-        }
-
-        if ($propertyDefinition->isPrivate()) {
-            if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException(
-                    "Cannot access private static property '"
-                    . $classDefinition->getCompleteName()
-                    . '::'
-                    . $property
-                    . "' out of its declaring context",
-                    $statement
-                );
-            }
-        }
-
-        $compilationContext->headersManager->add('kernel/object');
-        $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex(
-            $classEntry,
-            $property,
-            $resolvedExpr,
-            $compilationContext,
-            $statement
-        );
-    }
-
-    /**
-     * Compiles x::y[a][b][] = {expr} (multiple offset assignment).
-     *
-     * @param string             $classEntry
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     */
-    protected function _assignStaticPropertyArrayMultipleIndex(
-        $classEntry,
-        $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        array $statement
-    ): void {
-        $property = $statement['property'];
-        $compilationContext->headersManager->add('kernel/object');
-
-        /**
-         * Create a temporal zval (if needed).
-         */
-        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
-
+    protected function getExpressions(
+        array $statement,
+        CompilationContext $compilationContext
+    ): array {
         $offsetExpressions[] = 'a';
-        $compilationContext->backend->assignStaticPropertyArrayMulti(
-            $classEntry,
-            $variableExpr,
-            $property,
-            $offsetExpressions,
-            $compilationContext
-        );
 
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
-        }
+        return $offsetExpressions;
     }
 }
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index f6fc6fa233..232ea18d93 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements\Let;
 
+use ReflectionException;
 use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -43,8 +44,8 @@ class StaticPropertyArrayIndex extends ArrayIndex
      * @throws CompilerException
      */
     public function assignStatic(
-        $className,
-        $property,
+        string $className,
+        string $property,
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
@@ -58,7 +59,10 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
+                    throw new CompilerException(
+                        "Cannot locate class '" . $className . "'",
+                        $statement
+                    );
                 }
             }
         } else {
@@ -146,7 +150,7 @@ protected function _assignStaticPropertyArrayMultipleIndex(
         $property,
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
-        $statement
+        array $statement
     ): void {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
@@ -156,6 +160,35 @@ protected function _assignStaticPropertyArrayMultipleIndex(
          */
         $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
 
+        /**
+         * Only string/variable/int.
+         */
+        $offsetExpressions = $this->getExpressions($statement, $compilationContext);
+        $compilationContext->backend->assignStaticPropertyArrayMulti(
+            $classEntry,
+            $variableExpr,
+            $property,
+            $offsetExpressions,
+            $compilationContext
+        );
+
+        if ($variableExpr->isTemporal()) {
+            $variableExpr->setIdle(true);
+        }
+    }
+
+    /**
+     * @param array              $statement
+     * @param CompilationContext $compilationContext
+     *
+     * @return array
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    protected function getExpressions(
+        array $statement,
+        CompilationContext $compilationContext
+    ): array {
         /**
          * Only string/variable/int.
          */
@@ -185,16 +218,6 @@ protected function _assignStaticPropertyArrayMultipleIndex(
             $offsetExpressions[] = $resolvedIndex;
         }
 
-        $compilationContext->backend->assignStaticPropertyArrayMulti(
-            $classEntry,
-            $variableExpr,
-            $property,
-            $offsetExpressions,
-            $compilationContext
-        );
-
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
-        }
+        return $offsetExpressions;
     }
 }

From 332d48c2b8e4fe61d6593afff754862100c8d1ea Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 14:04:12 -0600
Subject: [PATCH 214/375] refactoring and removing duplicate code

---
 src/Operators/AbstractOperator.php            |  35 +++++
 .../Arithmetical/ArithmeticalBaseOperator.php |   9 +-
 src/Operators/Arithmetical/DivOperator.php    |   9 +-
 src/Operators/Arithmetical/ModOperator.php    |   9 +-
 src/Operators/Bitwise/BitwiseBaseOperator.php |   9 +-
 src/Operators/Bitwise/BitwiseNotOperator.php  |   4 +-
 .../Comparison/ComparisonBaseOperator.php     |   9 +-
 src/Operators/Logical/AndOperator.php         | 128 ++++++++---------
 src/Operators/Logical/LogicalBaseOperator.php |   9 +-
 src/Operators/Logical/OrOperator.php          | 136 ++----------------
 src/Operators/Other/ConcatOperator.php        |   9 +-
 src/Operators/Unary/MinusOperator.php         |   4 +-
 src/Operators/Unary/NotOperator.php           |   4 +-
 .../FunctionCall/StripcslashesOptimizer.php   |  50 +------
 .../FunctionCall/StripslashesOptimizer.php    |   6 +-
 .../FunctionCall/StrtolowerOptimizer.php      |  48 +------
 .../FunctionCall/StrtoupperOptimizer.php      |   6 +-
 src/Statements/Let/Decr.php                   |  62 +++++---
 src/Statements/Let/Incr.php                   |  81 +----------
 src/Statements/Let/StaticPropertyAppend.php   | 115 +++++++++++++--
 .../Let/StaticPropertyArrayIndex.php          | 114 ++++-----------
 .../Let/StaticPropertyArrayIndexAppend.php    |  68 ++-------
 22 files changed, 327 insertions(+), 597 deletions(-)

diff --git a/src/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
index 0e90bc02ce..02eccf06a7 100644
--- a/src/Operators/AbstractOperator.php
+++ b/src/Operators/AbstractOperator.php
@@ -14,6 +14,7 @@
 namespace Zephir\Operators;
 
 use Zephir\CompilationContext;
+use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 
 use function is_object;
@@ -234,4 +235,38 @@ public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
+
+    /**
+     * @param array $expression
+     *
+     * @return void
+     */
+    protected function checkLeftOperator(array $expression): void
+    {
+        if (!isset($expression['left'])) {
+            throw new CompilerException(
+                'Missing left part of the expression',
+                $expression
+            );
+        }
+
+        if (!isset($expression['right'])) {
+            throw new CompilerException('Missing right part of the expression', $expression);
+        }
+    }
+
+    /**
+     * @param array $expression
+     *
+     * @return void
+     */
+    protected function checkRightOperator(array $expression): void
+    {
+        if (!isset($expression['right'])) {
+            throw new CompilerException(
+                'Missing right part of the expression',
+                $expression
+            );
+        }
+    }
 }
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 26f5398db1..f0c5e8facf 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -44,13 +44,8 @@ class ArithmeticalBaseOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         // Check for constant folding optimizations
         if ($optimized = $this->optimizeConstantFolding($expression, $compilationContext)) {
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index ca229e1a97..3c90ca46e6 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -36,13 +36,8 @@ class DivOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index b9f301e1fb..287d39ca0e 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -36,13 +36,8 @@ class ModOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index 65d01a7dc1..e01e2a2da8 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -35,13 +35,8 @@ class BitwiseBaseOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         /**
          * Check for constant folding optimizations.
diff --git a/src/Operators/Bitwise/BitwiseNotOperator.php b/src/Operators/Bitwise/BitwiseNotOperator.php
index 6395803a65..5f2f85fedf 100644
--- a/src/Operators/Bitwise/BitwiseNotOperator.php
+++ b/src/Operators/Bitwise/BitwiseNotOperator.php
@@ -34,9 +34,7 @@ class BitwiseNotOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
+        $this->checkLeftOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index f3e15799d9..b9f41e0ccb 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -48,13 +48,8 @@ public function compile(array $expression, CompilationContext $compilationContex
             return $conditions;
         }
 
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index 992f644543..2d29962d20 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -20,6 +20,10 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Statements\LetStatement;
+use Zephir\Types\Types;
+use Zephir\Variable\Variable;
+
+use function delete;
 
 class AndOperator extends LogicalBaseOperator
 {
@@ -37,13 +41,8 @@ class AndOperator extends LogicalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
@@ -54,35 +53,29 @@ public function compile($expression, CompilationContext $compilationContext): Co
          */
         $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite('bool', $compilationContext);
 
-        switch ($left->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprLeft = [
-                    'type'  => $left->getType(),
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprLeft = [
-                    'type'  => 'variable',
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprLeft = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprLeft)) {
-            throw new CompilerException($left->getType(), $expression['left']);
-        }
+        $assignExprLeft = match ($left->getType()) {
+            Types::T_INT,
+            Types::T_BOOL,
+            Types::T_CHAR,
+            Types::T_DOUBLE,
+            Types::T_UINT,
+            Types::T_UCHAR    => [
+                'type'  => $left->getType(),
+                'value' => $left->getCode(),
+            ],
+            Types::T_VARIABLE => [
+                'type'  => 'variable',
+                'value' => $left->getCode(),
+            ],
+            Types::T_NULL     => [
+                'type'  => 'null',
+                'value' => null,
+            ],
+            default           => throw new CompilerException(
+                $left->getType(),
+                $expression['left']
+            ),
+        };
 
         /**
          * Create an implicit 'let' operation to update the evaluated left operator.
@@ -103,42 +96,35 @@ public function compile($expression, CompilationContext $compilationContext): Co
         ]);
         $statement->compile($compilationContext);
 
-        $compilationContext->codePrinter->output('if (' . $flagVariable->getName() . ') {');
+        $compilationContext->codePrinter->output($this->getOutput($flagVariable));
         $compilationContext->codePrinter->increaseLevel();
 
         $rightExpr = new Expression($expression['right']);
         $rightExpr->setReadOnly($this->readOnly);
         $right = $rightExpr->compile($compilationContext);
 
-        switch ($right->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprRight = [
-                    'type'  => $right->getType(),
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprRight = [
-                    'type'  => 'variable',
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprRight = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprRight)) {
-            throw new CompilerException($right->getType(), $expression['right']);
-        }
+        $assignExprRight = match ($right->getType()) {
+            Types::T_INT,
+            Types::T_BOOL,
+            Types::T_CHAR,
+            Types::T_DOUBLE,
+            Types::T_UINT,
+            Types::T_UCHAR    => [
+                'type'  => $right->getType(),
+                'value' => $right->getCode(),
+            ],
+            Types::T_VARIABLE => [
+                'type'  => 'variable',
+                'value' => $right->getCode(),
+            ],
+            Types::T_NULL     => [
+                'type'  => 'null',
+                'value' => null,
+            ],
+            default           => throw new CompilerException(
+                $right->getType(), $expression['right']
+            ),
+        };
 
         /**
          * Create an implicit 'let' operation to update the evaluated right operator.
@@ -164,4 +150,14 @@ public function compile($expression, CompilationContext $compilationContext): Co
 
         return new CompiledExpression('bool', $flagVariable->getName(), $expression);
     }
+
+    /**
+     * @param Variable $variable
+     *
+     * @return string
+     */
+    protected function getOutput(Variable $variable): string
+    {
+        return 'if (!(' . $variable->getName() . ')) {';
+    }
 }
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index f09f25fe29..ebf78f2c2c 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -26,13 +26,8 @@ class LogicalBaseOperator extends AbstractOperator
 {
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
index 8f2bad3d98..bb2835d217 100644
--- a/src/Operators/Logical/OrOperator.php
+++ b/src/Operators/Logical/OrOperator.php
@@ -19,139 +19,21 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Statements\LetStatement;
+use Zephir\Variable\Variable;
 
 class OrOperator extends LogicalBaseOperator
 {
     protected string $bitOperator = '||';
     protected string $operator    = '||';
 
-    public function compile($expression, CompilationContext $compilationContext): CompiledExpression
-    {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly($this->readOnly);
-        $left = $leftExpr->compile($compilationContext);
-
-        /**
-         * This variable is used to check if the compound and expression is evaluated as true or false.
-         */
-        $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite('bool', $compilationContext);
-
-        switch ($left->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprLeft = [
-                    'type'  => $left->getType(),
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprLeft = [
-                    'type'  => 'variable',
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprLeft = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprLeft)) {
-            throw new CompilerException($left->getType(), $expression['left']);
-        }
-
-        /**
-         * Create an implicit 'let' operation to update the evaluated left operator.
-         */
-        $statement = new LetStatement([
-            'type'        => 'let',
-            'assignments' => [
-                [
-                    'assign-type' => 'variable',
-                    'variable'    => $flagVariable->getName(),
-                    'operator'    => 'assign',
-                    'expr'        => $assignExprLeft,
-                    'file'        => $expression['left']['file'],
-                    'line'        => $expression['left']['line'],
-                    'char'        => $expression['left']['char'],
-                ],
-            ],
-        ]);
-        $statement->compile($compilationContext);
 
-        $compilationContext->codePrinter->output('if (!(' . $flagVariable->getName() . ')) {');
-        $compilationContext->codePrinter->increaseLevel();
-
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly($this->readOnly);
-        $right = $rightExpr->compile($compilationContext);
-
-        switch ($right->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprRight = [
-                    'type'  => $right->getType(),
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprRight = [
-                    'type'  => 'variable',
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprRight = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprRight)) {
-            throw new CompilerException($right->getType(), $expression['right']);
-        }
-
-        /**
-         * Create an implicit 'let' operation to update the evaluated right operator.
-         */
-        $statement = new LetStatement([
-            'type'        => 'let',
-            'assignments' => [
-                [
-                    'assign-type' => 'variable',
-                    'variable'    => $flagVariable->getName(),
-                    'operator'    => 'assign',
-                    'expr'        => $assignExprRight,
-                    'file'        => $expression['right']['file'],
-                    'line'        => $expression['right']['line'],
-                    'char'        => $expression['right']['char'],
-                ],
-            ],
-        ]);
-        $statement->compile($compilationContext);
-
-        $compilationContext->codePrinter->decreaseLevel();
-        $compilationContext->codePrinter->output('}');
-
-        return new CompiledExpression('bool', $flagVariable->getName(), $expression);
+    /**
+     * @param Variable $variable
+     *
+     * @return string
+     */
+    protected function getOutput(Variable $variable): string
+    {
+        return 'if (!(' . $variable->getName() . ')) {';
     }
 }
diff --git a/src/Operators/Other/ConcatOperator.php b/src/Operators/Other/ConcatOperator.php
index 94c5d641fe..c3e5d62ea5 100644
--- a/src/Operators/Other/ConcatOperator.php
+++ b/src/Operators/Other/ConcatOperator.php
@@ -40,13 +40,8 @@ class ConcatOperator extends AbstractOperator
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeftOperator($expression);
+        $this->checkRightOperator($expression);
 
         $compilationContext->headersManager->add('kernel/concat');
 
diff --git a/src/Operators/Unary/MinusOperator.php b/src/Operators/Unary/MinusOperator.php
index 7808b6501c..be4e43cb87 100644
--- a/src/Operators/Unary/MinusOperator.php
+++ b/src/Operators/Unary/MinusOperator.php
@@ -36,9 +36,7 @@ class MinusOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression');
-        }
+        $this->checkLeftOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Unary/NotOperator.php b/src/Operators/Unary/NotOperator.php
index 7a55b2c13c..7454ab9e0d 100644
--- a/src/Operators/Unary/NotOperator.php
+++ b/src/Operators/Unary/NotOperator.php
@@ -34,9 +34,7 @@ class NotOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
+        $this->checkLeftOperator($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
index 3c5556b2ce..6bad3b0868 100644
--- a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -26,53 +26,7 @@
  *
  * Optimizes calls to 'stripcslashes' using internal function
  */
-class StripcslashesOptimizer extends OptimizerAbstract
+class StripcslashesOptimizer extends StripslashesOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (count($expression['parameters']) > 1) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_stripcslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'stripcslashes';
 }
diff --git a/src/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
index 0875ba1ea4..c15b27b2aa 100644
--- a/src/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -28,6 +28,8 @@
  */
 class StripslashesOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'stripslashes';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -70,7 +72,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_stripslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
index 1437dceee4..89564a1400 100644
--- a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -26,51 +26,7 @@
  *
  * Optimizes calls to 'strtolower' using internal function
  */
-class StrtolowerOptimizer extends OptimizerAbstract
+class StrtolowerOptimizer extends StrtoupperOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_strtolower(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_fast_strtolower';
 }
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index 76c01118fe..56a72cd6dc 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -28,6 +28,8 @@
  */
 class StrtoupperOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_fast_strtoupper';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -69,7 +71,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_strtoupper(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index 96f26e8c99..d042d4c621 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -15,6 +15,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
+use Zephir\Types\Types;
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
@@ -24,6 +25,11 @@
  */
 class Decr
 {
+    protected string $operator = '--';
+    protected string $verb = 'decrement';
+    protected string $warningName = 'non-valid-decrement';
+    protected string $zephirMethod = 'zephir_decrement';
+
     /**
      * Compiles x--.
      *
@@ -38,18 +44,25 @@ public function assign(
         $variable,
         ZephirVariable $symbolVariable,
         CompilationContext $compilationContext,
-        $statement
+        array $statement
     ): void {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is not initialized",
                 $statement
             );
         }
 
         if ($symbolVariable->isReadOnly()) {
+            /*
+             * TODO: implement increment of objects members
+             */
             throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is read only",
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is read only",
                 $statement
             );
         }
@@ -57,31 +70,34 @@ public function assign(
         $codePrinter = $compilationContext->codePrinter;
 
         switch ($symbolVariable->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-            case 'char':
-            case 'uchar':
-                $codePrinter->output($variable . '--;');
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
+            case Types::T_DOUBLE:
+            case Types::T_CHAR:
+            case Types::T_UCHAR:
+                $codePrinter->output($variable . $this->operator . ';');
                 break;
 
-            case 'variable':
-                /*
+            case Types::T_VARIABLE:
+                /**
                  * Variable is probably not initialized here
                  */
                 if ($symbolVariable->hasAnyDynamicType('unknown')) {
-                    throw new CompilerException('Attempt to decrement uninitialized variable', $statement);
+                    throw new CompilerException(
+                        'Attempt to decrement uninitialized variable',
+                        $statement
+                    );
                 }
 
-                /*
-                 * Decrement non-numeric variables could be expensive
+                /**
+                 * Increment/Decrement non-numeric variables could be expensive
                  */
                 if (!$symbolVariable->hasAnyDynamicType(['undefined', 'int', 'long', 'double', 'uint'])) {
                     $compilationContext->logger->warning(
-                        'Possible attempt to decrement non-numeric dynamic variable',
-                        ['non-valid-decrement', $statement]
+                        'Possible attempt to ' . $this->verb . ' non-numeric dynamic variable',
+                        [$this->warningName, $statement]
                     );
                 }
 
@@ -90,12 +106,18 @@ public function assign(
                     $symbolVariable->separate($compilationContext);
                 }
                 $codePrinter->output(
-                    'zephir_decrement(' . $compilationContext->backend->getVariableCode($symbolVariable) . ');'
+                    $this->zephirMethod
+                    . '(' . $compilationContext->backend->getVariableCode($symbolVariable) . ');'
                 );
+
                 break;
 
             default:
-                throw new CompilerException('Cannot decrement variable: ' . $symbolVariable->getType(), $statement);
+                throw new CompilerException(
+                    'Cannot ' . $this->verb . ' variable: '
+                    . $symbolVariable->getType(),
+                    $statement
+                );
         }
     }
 }
diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index 0616cdc9e0..56e4e2c227 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -13,86 +13,15 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\CompilationContext;
-use Zephir\Exception\CompilerException;
-use Zephir\Variable\Variable as ZephirVariable;
-
 /**
  * Incr.
  *
  * Increments a variable
  */
-class Incr
+class Incr extends Decr
 {
-    /**
-     * Compiles x++.
-     *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws CompilerException
-     */
-    public function assign(
-        $variable,
-        ZephirVariable $symbolVariable,
-        CompilationContext $compilationContext,
-        $statement
-    ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isReadOnly()) {
-            /*
-             * TODO: implement increment of objects members
-             */
-            throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is read only",
-                $statement
-            );
-        }
-
-        $codePrinter = &$compilationContext->codePrinter;
-
-        switch ($symbolVariable->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-            case 'char':
-            case 'uchar':
-                $codePrinter->output($variable . '++;');
-                break;
-
-            case 'variable':
-                /*
-                 * Update non-numeric dynamic variables could be expensive
-                 */
-                if (!$symbolVariable->hasAnyDynamicType(['undefined', 'long', 'double'])) {
-                    $compilationContext->logger->warning(
-                        'Possible attempt to increment non-numeric dynamic variable',
-                        ['non-valid-increment', $statement]
-                    );
-                }
-
-                $compilationContext->headersManager->add('kernel/operators');
-                if (!$symbolVariable->isLocalOnly()) {
-                    $symbolVariable->separate($compilationContext);
-                }
-                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-                $codePrinter->output('zephir_increment(' . $symbol . ');');
-                break;
-
-            default:
-                throw new CompilerException('Cannot increment: ' . $symbolVariable->getType(), $statement);
-        }
-    }
+    protected string $operator = '++';
+    protected string $verb = 'increment';
+    protected string $warningName = 'non-valid-increment';
+    protected string $zephirMethod = 'zephir_increment';
 }
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 45279839b7..86e6af7204 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
@@ -9,35 +11,124 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-declare(strict_types=1);
-
 namespace Zephir\Statements\Let;
 
-use ReflectionException;
+use Zephir\Class\Property;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
 use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 
 /**
  * StaticPropertyAppend.
  *
  * Updates object properties dynamically
  */
-class StaticPropertyAppend extends StaticPropertyArrayIndex
+class StaticPropertyAppend extends ArrayIndex
 {
     /**
-     * @param array              $statement
+     * Compiles ClassName::foo[index] = {expr}.
+     *
+     * @param string             $className
+     * @param string             $property
+     * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
+     * @param array              $statement
      *
-     * @return array
      * @throws Exception
-     * @throws ReflectionException
+     * @throws CompilerException
+     */
+    public function assignStatic(
+        $className,
+        $property,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
+        $compiler = $compilationContext->compiler;
+        if (!\in_array($className, ['self', 'static', 'parent'])) {
+            $className = $compilationContext->getFullName($className);
+            if ($compiler->isClass($className)) {
+                $classDefinition = $compiler->getClassDefinition($className);
+            } else {
+                if ($compiler->isBundledClass($className)) {
+                    $classDefinition = $compiler->getInternalClassDefinition($className);
+                } else {
+                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
+                }
+            }
+        } else {
+            if (\in_array($className, ['self', 'static'])) {
+                $classDefinition = $compilationContext->classDefinition;
+            } else {
+                if ('parent' == $className) {
+                    $classDefinition = $compilationContext->classDefinition;
+                    $extendsClass = $classDefinition->getExtendsClass();
+                    if (!$extendsClass) {
+                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
+                    } else {
+                        $classDefinition = $classDefinition->getExtendsClassDefinition();
+                    }
+                }
+            }
+        }
+
+        if (!$classDefinition->hasProperty($property)) {
+            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+        }
+
+        /** @var Property $propertyDefinition */
+        $propertyDefinition = $classDefinition->getProperty($property);
+        if (!$propertyDefinition->isStatic()) {
+            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
+        }
+
+        if ($propertyDefinition->isPrivate()) {
+            if ($classDefinition != $compilationContext->classDefinition) {
+                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
+            }
+        }
+
+        $compilationContext->headersManager->add('kernel/object');
+        $classEntry = $classDefinition->getClassEntry($compilationContext);
+        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
+    }
+
+    /**
+     * Compiles x::y[a][b][] = {expr} (multiple offset assignment).
+     *
+     * @param string             $classEntry
+     * @param string             $property
+     * @param CompiledExpression $resolvedExpr
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
      */
-    protected function getExpressions(
-        array $statement,
-        CompilationContext $compilationContext
-    ): array {
+    protected function _assignStaticPropertyArrayMultipleIndex(
+        $classEntry,
+        $property,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
+        $property = $statement['property'];
+        $compilationContext->headersManager->add('kernel/object');
+
+        /**
+         * Create a temporal zval (if needed).
+         */
+        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
+
         $offsetExpressions[] = 'a';
+        $compilationContext->backend->assignStaticPropertyArrayMulti(
+            $classEntry,
+            $variableExpr,
+            $property,
+            $offsetExpressions,
+            $compilationContext
+        );
 
-        return $offsetExpressions;
+        if ($variableExpr->isTemporal()) {
+            $variableExpr->setIdle(true);
+        }
     }
 }
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 232ea18d93..8e9e6e1882 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
@@ -9,11 +11,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-declare(strict_types=1);
-
 namespace Zephir\Statements\Let;
 
-use ReflectionException;
 use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -21,9 +20,6 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
-use function in_array;
-use function sprintf;
-
 /**
  * Zephir\Statements\Let\StaticPropertyArrayIndex.
  *
@@ -44,14 +40,14 @@ class StaticPropertyArrayIndex extends ArrayIndex
      * @throws CompilerException
      */
     public function assignStatic(
-        string $className,
-        string $property,
+        $className,
+        $property,
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!in_array($className, ['self', 'static', 'parent'])) {
+        if (!\in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -59,28 +55,18 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException(
-                        "Cannot locate class '" . $className . "'",
-                        $statement
-                    );
+                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
                 }
             }
         } else {
-            if (in_array($className, ['self', 'static'])) {
+            if (\in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass    = $classDefinition->getExtendsClass();
+                    $extendsClass = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException(
-                            'Cannot assign static property "'
-                            . $property
-                            . '" on parent because class '
-                            . $classDefinition->getCompleteName()
-                            . ' does not extend any class',
-                            $statement
-                        );
+                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -89,48 +75,24 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException(
-                "Class '" . $classDefinition->getCompleteName(
-                ) . "' does not have a property called: '" . $property . "'",
-                $statement
-            );
+            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                "Cannot access non-static property '"
-                . $classDefinition->getCompleteName()
-                . '::'
-                . $property
-                . "'",
-                $statement
-            );
+            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException(
-                    "Cannot access private static property '"
-                    . $classDefinition->getCompleteName()
-                    . '::'
-                    . $property
-                    . "' out of its declaring context",
-                    $statement
-                );
+                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex(
-            $classEntry,
-            $property,
-            $resolvedExpr,
-            $compilationContext,
-            $statement
-        );
+        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
     }
 
     /**
@@ -139,7 +101,7 @@ public function assignStatic(
      * @param string             $classEntry
      * @param string             $property
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext ,
+     * @param CompilationContext $compilationContext,
      * @param array              $statement
      *
      * @throws Exception
@@ -150,7 +112,7 @@ protected function _assignStaticPropertyArrayMultipleIndex(
         $property,
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
-        array $statement
+        $statement
     ): void {
         $property = $statement['property'];
         $compilationContext->headersManager->add('kernel/object');
@@ -160,35 +122,6 @@ protected function _assignStaticPropertyArrayMultipleIndex(
          */
         $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
 
-        /**
-         * Only string/variable/int.
-         */
-        $offsetExpressions = $this->getExpressions($statement, $compilationContext);
-        $compilationContext->backend->assignStaticPropertyArrayMulti(
-            $classEntry,
-            $variableExpr,
-            $property,
-            $offsetExpressions,
-            $compilationContext
-        );
-
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
-        }
-    }
-
-    /**
-     * @param array              $statement
-     * @param CompilationContext $compilationContext
-     *
-     * @return array
-     * @throws Exception
-     * @throws ReflectionException
-     */
-    protected function getExpressions(
-        array $statement,
-        CompilationContext $compilationContext
-    ): array {
         /**
          * Only string/variable/int.
          */
@@ -207,10 +140,7 @@ protected function getExpressions(
                     break;
                 default:
                     throw new CompilerException(
-                        sprintf(
-                            'Expression: %s cannot be used as index without cast',
-                            $resolvedIndex->getType()
-                        ),
+                        sprintf('Expression: %s cannot be used as index without cast', $resolvedIndex->getType()),
                         $statement['index-expr']
                     );
             }
@@ -218,6 +148,16 @@ protected function getExpressions(
             $offsetExpressions[] = $resolvedIndex;
         }
 
-        return $offsetExpressions;
+        $compilationContext->backend->assignStaticPropertyArrayMulti(
+            $classEntry,
+            $variableExpr,
+            $property,
+            $offsetExpressions,
+            $compilationContext
+        );
+
+        if ($variableExpr->isTemporal()) {
+            $variableExpr->setIdle(true);
+        }
     }
 }
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index f2ebb979a3..c51d0ef6ff 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of the Zephir.
  *
@@ -9,8 +11,6 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-declare(strict_types=1);
-
 namespace Zephir\Statements\Let;
 
 use Zephir\Class\Property;
@@ -20,9 +20,6 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
-use function in_array;
-use function sprintf;
-
 /**
  * StaticPropertyArrayIndexAppend.
  *
@@ -50,7 +47,7 @@ public function assignStatic(
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!in_array($className, ['self', 'static', 'parent'])) {
+        if (!\in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -58,28 +55,18 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException(
-                        "Cannot locate class '" . $className . "'",
-                        $statement
-                    );
+                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
                 }
             }
         } else {
-            if (in_array($className, ['self', 'static'])) {
+            if (\in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass    = $classDefinition->getExtendsClass();
+                    $extendsClass = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException(
-                            'Cannot assign static property "'
-                            . $property
-                            . '" on parent because class '
-                            . $classDefinition->getCompleteName()
-                            . ' does not extend any class',
-                            $statement
-                        );
+                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -88,50 +75,24 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException(
-                "Class '" . $classDefinition->getCompleteName(
-                ) . "' does not have a property called: '"
-                . $property
-                . "'",
-                $statement
-            );
+            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                "Cannot access non-static property '"
-                . $classDefinition->getCompleteName()
-                . '::'
-                . $property
-                . "'",
-                $statement
-            );
+            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException(
-                    "Cannot access private static property '"
-                    . $classDefinition->getCompleteName()
-                    . '::'
-                    . $property
-                    . "' out of its declaring context",
-                    $statement
-                );
+                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex(
-            $classEntry,
-            $property,
-            $resolvedExpr,
-            $compilationContext,
-            $statement
-        );
+        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
     }
 
     /**
@@ -140,7 +101,7 @@ public function assignStatic(
      * @param string             $classEntry
      * @param string             $property
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext ,
+     * @param CompilationContext $compilationContext,
      * @param array              $statement
      *
      * @throws Exception
@@ -178,10 +139,7 @@ protected function _assignStaticPropertyArrayMultipleIndex(
                     break;
                 default:
                     throw new CompilerException(
-                        sprintf(
-                            'Expression: %s cannot be used as index without cast',
-                            $resolvedIndex->getType()
-                        ),
+                        sprintf('Expression: %s cannot be used as index without cast', $resolvedIndex->getType()),
                         $statement['index-expr']
                     );
             }

From 4f10143ae0eab2aab53ff9ca62c1c18009226ed1 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 14:24:37 -0600
Subject: [PATCH 215/375] removed more duplicate code

---
 .../CallUserFuncArrayOptimizer.php            |  66 +---
 .../FunctionCall/CallUserFuncOptimizer.php    |  18 +-
 .../FunctionCall/CamelizeOptimizer.php        |   4 +-
 .../FunctionCall/UncamelizeOptimizer.php      |  63 +---
 src/Statements/Let/StaticPropertyAdd.php      |  50 ++-
 src/Statements/Let/StaticPropertySub.php      | 332 +-----------------
 6 files changed, 66 insertions(+), 467 deletions(-)

diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index aba3da31e0..46da592320 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -26,67 +26,19 @@
  *
  * Optimizer for 'call_user_func_array'
  */
-class CallUserFuncArrayOptimizer extends OptimizerAbstract
+class CallUserFuncArrayOptimizer extends CallUserFuncOptimizer
 {
+    protected string $zephirMethod = 'ZEPHIR_CALL_USER_FUNC_ARRAY';
+
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param string $symbol
+     * @param array  $resolvedParams
      *
-     * @return bool|CompiledExpression|mixed
+     * @return string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getOutput(string $symbol, array $resolvedParams): string
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        } else {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        $context->headersManager->add('kernel/fcall');
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'ZEPHIR_CALL_USER_FUNC_ARRAY(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        );
-        $call->addCallStatusOrJump($context);
-
-        return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
+        return $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');';
     }
 }
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index 27df94855d..d3cb88c8be 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -28,6 +28,8 @@
  */
 class CallUserFuncOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'ZEPHIR_CALL_USER_FUNC';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -82,9 +84,23 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_CALL_USER_FUNC(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->getOutput($symbol, $resolvedParams)
+        );
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
     }
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, array $resolvedParams): string
+    {
+        return $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ');';
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index 38b04e5b72..3cd8fbc6cc 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -28,6 +28,8 @@
  */
 class CamelizeOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_camelize';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -83,7 +85,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 5d67787e51..ca0ce3ce73 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -26,66 +26,7 @@
  *
  * Optimizes calls to 'uncamelize' using internal function
  */
-class UncamelizeOptimizer extends OptimizerAbstract
+class UncamelizeOptimizer extends CamelizeOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
-            throw new CompilerException("'uncamelize' only accepts one or two parameters");
-        }
-
-        $delimiter = 'NULL ';
-        if (2 == count($expression['parameters'])) {
-            if ('null' == $expression['parameters'][1]['parameter']['type']) {
-                unset($expression['parameters'][1]);
-            }
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if (isset($resolvedParams[1])) {
-            $delimiter = $resolvedParams[1];
-        }
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_uncamelize';
 }
diff --git a/src/Statements/Let/StaticPropertyAdd.php b/src/Statements/Let/StaticPropertyAdd.php
index 67a18b2b7c..8f61cacacb 100644
--- a/src/Statements/Let/StaticPropertyAdd.php
+++ b/src/Statements/Let/StaticPropertyAdd.php
@@ -26,6 +26,8 @@
  */
 class StaticPropertyAdd
 {
+    protected string $methodName = 'addStaticProperty';
+
     /**
      * Compiles ClassName::foo = {expr}.
      *
@@ -46,6 +48,7 @@ public function assignStatic(
         array $statement
     ): void {
         $classDefinition = $compilationContext->classLookup($className);
+        $methodName      = $this->methodName;
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
             throw new CompilerException(
@@ -93,7 +96,12 @@ public function assignStatic(
 
         switch ($resolvedExpr->getType()) {
             case 'null':
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, 'null', $compilationContext);
+                $compilationContext->backend->updateStaticProperty(
+                    $classEntry,
+                    $property,
+                    'null',
+                    $compilationContext
+                );
                 break;
 
             case 'int':
@@ -109,7 +117,7 @@ public function assignStatic(
                     $resolvedExpr->getBooleanCode(),
                     $compilationContext
                 );
-                $compilationContext->backend->addStaticProperty(
+                $compilationContext->backend->$methodName(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -132,7 +140,7 @@ public function assignStatic(
                     '\'' . $resolvedExpr->getCode() . '\'',
                     $compilationContext
                 );
-                $compilationContext->backend->addStaticProperty(
+                $compilationContext->backend->$methodName(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -154,7 +162,7 @@ public function assignStatic(
                     $resolvedExpr->getCode(),
                     $compilationContext
                 );
-                $compilationContext->backend->addStaticProperty(
+                $compilationContext->backend->$methodName(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -187,7 +195,7 @@ public function assignStatic(
                     $tempVariable->setIdle(true);
                 }
 
-                $compilationContext->backend->addStaticProperty(
+                $compilationContext->backend->$methodName(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -197,7 +205,7 @@ public function assignStatic(
 
             case 'bool':
                 if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->addStaticProperty(
+                    $compilationContext->backend->$methodName(
                         $classEntry,
                         $property,
                         'true',
@@ -205,7 +213,7 @@ public function assignStatic(
                     );
                 } else {
                     if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->addStaticProperty(
+                        $compilationContext->backend->$methodName(
                             $classEntry,
                             $property,
                             'false',
@@ -214,7 +222,7 @@ public function assignStatic(
                     } else {
                         $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->addStaticProperty(
+                        $compilationContext->backend->$methodName(
                             $classEntry,
                             $property,
                             'true',
@@ -223,7 +231,7 @@ public function assignStatic(
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('} else {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->addStaticProperty(
+                        $compilationContext->backend->$methodName(
                             $classEntry,
                             $property,
                             'false',
@@ -242,7 +250,7 @@ public function assignStatic(
                     true
                 );
                 $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->addStaticProperty(
+                $compilationContext->backend->$methodName(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -254,7 +262,7 @@ public function assignStatic(
                 break;
 
             case 'array':
-                $compilationContext->backend->addStaticProperty(
+                $compilationContext->backend->$methodName(
                     $classEntry,
                     $property,
                     $resolvedExpr,
@@ -282,8 +290,12 @@ public function assignStatic(
                             true
                         );
 
-                        $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->addStaticProperty(
+                        $compilationContext->backend->assignLong(
+                            $tempVariable,
+                            $variableVariable,
+                            $compilationContext
+                        );
+                        $compilationContext->backend->$methodName(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -307,7 +319,7 @@ public function assignStatic(
                             $variableVariable,
                             $compilationContext
                         );
-                        $compilationContext->backend->addStaticProperty(
+                        $compilationContext->backend->$methodName(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -325,8 +337,12 @@ public function assignStatic(
                             $compilationContext,
                             true
                         );
-                        $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->addStaticProperty(
+                        $compilationContext->backend->assignBool(
+                            $tempVariable,
+                            $variableVariable,
+                            $compilationContext
+                        );
+                        $compilationContext->backend->$methodName(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -337,7 +353,7 @@ public function assignStatic(
                         }
                         break;
                     default:
-                        $compilationContext->backend->addStaticProperty(
+                        $compilationContext->backend->$methodName(
                             $classEntry,
                             $property,
                             $variableVariable,
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index afb0b8afaa..4521d97627 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -26,335 +26,7 @@
  *
  * Updates static properties
  */
-class StaticPropertySub
+class StaticPropertySub extends StaticPropertyAdd
 {
-    /**
-     * Compiles ClassName::foo = {expr}.
-     *
-     * @param string             $className
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws CompilerException
-     * @throws IllegalOperationException
-     */
-    public function assignStatic(
-        string $className,
-        string $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        array $statement
-    ): void {
-        $classDefinition = $compilationContext->classLookup($className);
-
-        if (!$propertyDefinition = $classDefinition->getProperty($property)) {
-            throw new CompilerException(
-                sprintf(
-                    "Class '%s' does not have a property called: '%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
-                $statement
-            );
-        }
-
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                sprintf(
-                    "Cannot access non-static property '%s::%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
-                $statement
-            );
-        }
-
-        if ($propertyDefinition->isPrivate()) {
-            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {
-                throw new CompilerException(
-                    sprintf(
-                        "Cannot access private static property '%s::%s out of its declaring context",
-                        $classDefinition->getCompleteName(),
-                        $property
-                    ),
-                    $statement
-                );
-            }
-        }
-
-        $codePrinter = $compilationContext->codePrinter;
-        $compilationContext->headersManager->add('kernel/object');
-
-        try {
-            $classEntry = $classDefinition->getClassEntry($compilationContext);
-        } catch (Exception $e) {
-            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);
-        }
-
-        switch ($resolvedExpr->getType()) {
-            case 'null':
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, 'null', $compilationContext);
-                break;
-
-            case 'int':
-            case 'uint':
-            case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignLong(
-                    $tempVariable,
-                    $resolvedExpr->getBooleanCode(),
-                    $compilationContext
-                );
-                $compilationContext->backend->subStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'char':
-            case 'uchar':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignLong(
-                    $tempVariable,
-                    '\'' . $resolvedExpr->getCode() . '\'',
-                    $compilationContext
-                );
-                $compilationContext->backend->subStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'double':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignDouble(
-                    $tempVariable,
-                    $resolvedExpr->getCode(),
-                    $compilationContext
-                );
-                $compilationContext->backend->subStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $tempVariable->initVariant($compilationContext);
-
-                if ($resolvedExpr->getCode()) {
-                    $compilationContext->backend->assignString(
-                        $tempVariable,
-                        $resolvedExpr->getCode(),
-                        $compilationContext
-                    );
-                } else {
-                    $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
-                }
-
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-
-                $compilationContext->backend->subStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                break;
-
-            case 'bool':
-                if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->subStaticProperty(
-                        $classEntry,
-                        $property,
-                        'true',
-                        $compilationContext
-                    );
-                } else {
-                    if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->subStaticProperty(
-                            $classEntry,
-                            $property,
-                            'false',
-                            $compilationContext
-                        );
-                    } else {
-                        $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
-                        $codePrinter->increaseLevel();
-                        $compilationContext->backend->subStaticProperty(
-                            $classEntry,
-                            $property,
-                            'true',
-                            $compilationContext
-                        );
-                        $codePrinter->decreaseLevel();
-                        $codePrinter->output('} else {');
-                        $codePrinter->increaseLevel();
-                        $compilationContext->backend->subStaticProperty(
-                            $classEntry,
-                            $property,
-                            'false',
-                            $compilationContext
-                        );
-                        $codePrinter->decreaseLevel();
-                        $codePrinter->output('}');
-                    }
-                }
-                break;
-
-            case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->subStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'array':
-                $compilationContext->backend->subStaticProperty(
-                    $classEntry,
-                    $property,
-                    $resolvedExpr,
-                    $compilationContext
-                );
-                break;
-
-            case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
-                    $resolvedExpr->getCode(),
-                    $compilationContext,
-                    $statement
-                );
-
-                switch ($variableVariable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'char':
-                    case 'uchar':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-
-                        $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->subStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-
-                    case 'double':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-
-                        $compilationContext->backend->assignDouble(
-                            $tempVariable,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        $compilationContext->backend->subStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-
-                    case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-                        $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->subStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-                    default:
-                        $compilationContext->backend->subStaticProperty(
-                            $classEntry,
-                            $property,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        if ($variableVariable->isTemporal()) {
-                            $variableVariable->setIdle(true);
-                        }
-                        break;
-                }
-
-                break;
-
-            default:
-                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
-        }
-    }
+    protected string $methodName = 'subStaticProperty';
 }

From 3fe2426afa0f8f8a1fdeaffd58cce45cf1c8e990 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 14:34:04 -0600
Subject: [PATCH 216/375] removing duplications; reverting operand checks

---
 .../Arithmetical/ArithmeticalBaseOperator.php      |  9 +++++++--
 src/Operators/Arithmetical/DivOperator.php         |  9 +++++++--
 src/Operators/Arithmetical/ModOperator.php         |  9 +++++++--
 src/Operators/Bitwise/BitwiseNotOperator.php       |  4 +++-
 src/Operators/Logical/AndOperator.php              | 14 +++++++++-----
 src/Operators/Logical/LogicalBaseOperator.php      |  9 +++++++--
 src/Operators/Logical/OrOperator.php               |  6 ------
 src/Operators/Other/ConcatOperator.php             |  9 +++++++--
 src/Operators/Unary/MinusOperator.php              |  4 +++-
 src/Operators/Unary/NotOperator.php                |  4 +++-
 src/Statements/Let/StaticPropertyAppend.php        | 10 +++++-----
 src/Statements/Let/StaticPropertyArrayIndex.php    | 10 +++++-----
 .../Let/StaticPropertyArrayIndexAppend.php         | 10 +++++-----
 13 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index f0c5e8facf..26f5398db1 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -44,8 +44,13 @@ class ArithmeticalBaseOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression', $expression);
+        }
+
+        if (!isset($expression['right'])) {
+            throw new CompilerException('Missing right part of the expression', $expression);
+        }
 
         // Check for constant folding optimizations
         if ($optimized = $this->optimizeConstantFolding($expression, $compilationContext)) {
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 3c90ca46e6..ca229e1a97 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -36,8 +36,13 @@ class DivOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new Exception('Missing left part of the expression');
+        }
+
+        if (!isset($expression['right'])) {
+            throw new Exception('Missing right part of the expression');
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 287d39ca0e..b9f301e1fb 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -36,8 +36,13 @@ class ModOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new Exception('Missing left part of the expression');
+        }
+
+        if (!isset($expression['right'])) {
+            throw new Exception('Missing right part of the expression');
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Bitwise/BitwiseNotOperator.php b/src/Operators/Bitwise/BitwiseNotOperator.php
index 5f2f85fedf..6395803a65 100644
--- a/src/Operators/Bitwise/BitwiseNotOperator.php
+++ b/src/Operators/Bitwise/BitwiseNotOperator.php
@@ -34,7 +34,9 @@ class BitwiseNotOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeftOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression', $expression);
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index 2d29962d20..3cbcd00b67 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -23,8 +23,6 @@
 use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
-use function delete;
-
 class AndOperator extends LogicalBaseOperator
 {
     protected string $bitOperator = '&&';
@@ -41,8 +39,13 @@ class AndOperator extends LogicalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new Exception('Missing left part of the expression');
+        }
+
+        if (!isset($expression['right'])) {
+            throw new Exception('Missing right part of the expression');
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
@@ -122,7 +125,8 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 'value' => null,
             ],
             default           => throw new CompilerException(
-                $right->getType(), $expression['right']
+                $right->getType(),
+                $expression['right']
             ),
         };
 
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index ebf78f2c2c..f09f25fe29 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -26,8 +26,13 @@ class LogicalBaseOperator extends AbstractOperator
 {
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression', $expression);
+        }
+
+        if (!isset($expression['right'])) {
+            throw new CompilerException('Missing right part of the expression', $expression);
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
index bb2835d217..99b716090e 100644
--- a/src/Operators/Logical/OrOperator.php
+++ b/src/Operators/Logical/OrOperator.php
@@ -13,12 +13,6 @@
 
 namespace Zephir\Operators\Logical;
 
-use Exception;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-use Zephir\Statements\LetStatement;
 use Zephir\Variable\Variable;
 
 class OrOperator extends LogicalBaseOperator
diff --git a/src/Operators/Other/ConcatOperator.php b/src/Operators/Other/ConcatOperator.php
index c3e5d62ea5..94c5d641fe 100644
--- a/src/Operators/Other/ConcatOperator.php
+++ b/src/Operators/Other/ConcatOperator.php
@@ -40,8 +40,13 @@ class ConcatOperator extends AbstractOperator
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression', $expression);
+        }
+
+        if (!isset($expression['right'])) {
+            throw new CompilerException('Missing right part of the expression', $expression);
+        }
 
         $compilationContext->headersManager->add('kernel/concat');
 
diff --git a/src/Operators/Unary/MinusOperator.php b/src/Operators/Unary/MinusOperator.php
index be4e43cb87..7808b6501c 100644
--- a/src/Operators/Unary/MinusOperator.php
+++ b/src/Operators/Unary/MinusOperator.php
@@ -36,7 +36,9 @@ class MinusOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $this->checkLeftOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression');
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Unary/NotOperator.php b/src/Operators/Unary/NotOperator.php
index 7454ab9e0d..7a55b2c13c 100644
--- a/src/Operators/Unary/NotOperator.php
+++ b/src/Operators/Unary/NotOperator.php
@@ -34,7 +34,9 @@ class NotOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $this->checkLeftOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression', $expression);
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 86e6af7204..287cc82ae7 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -54,7 +54,7 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
+                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
                 }
             }
         } else {
@@ -65,7 +65,7 @@ public function assignStatic(
                     $classDefinition = $compilationContext->classDefinition;
                     $extendsClass = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
+                        throw new CompilerException('Cannot assign static property "' . $property . '" on parent because class ' . $classDefinition->getCompleteName() . ' does not extend any class', $statement);
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -74,18 +74,18 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+            throw new CompilerException("Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '" . $property . "'", $statement);
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
+            throw new CompilerException("Cannot access non-static property '" . $classDefinition->getCompleteName() . '::' . $property . "'", $statement);
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
+                throw new CompilerException("Cannot access private static property '" . $classDefinition->getCompleteName() . '::' . $property . "' out of its declaring context", $statement);
             }
         }
 
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 8e9e6e1882..2a4af503fd 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -55,7 +55,7 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
+                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
                 }
             }
         } else {
@@ -66,7 +66,7 @@ public function assignStatic(
                     $classDefinition = $compilationContext->classDefinition;
                     $extendsClass = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
+                        throw new CompilerException('Cannot assign static property "' . $property . '" on parent because class ' . $classDefinition->getCompleteName() . ' does not extend any class', $statement);
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -75,18 +75,18 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+            throw new CompilerException("Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '" . $property . "'", $statement);
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
+            throw new CompilerException("Cannot access non-static property '" . $classDefinition->getCompleteName() . '::' . $property . "'", $statement);
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
+                throw new CompilerException("Cannot access private static property '" . $classDefinition->getCompleteName() . '::' . $property . "' out of its declaring context", $statement);
             }
         }
 
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index c51d0ef6ff..a0593ff21b 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -55,7 +55,7 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '".$className."'", $statement);
+                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
                 }
             }
         } else {
@@ -66,7 +66,7 @@ public function assignStatic(
                     $classDefinition = $compilationContext->classDefinition;
                     $extendsClass = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "'.$property.'" on parent because class '.$classDefinition->getCompleteName().' does not extend any class', $statement);
+                        throw new CompilerException('Cannot assign static property "' . $property . '" on parent because class ' . $classDefinition->getCompleteName() . ' does not extend any class', $statement);
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -75,18 +75,18 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '".$classDefinition->getCompleteName()."' does not have a property called: '".$property."'", $statement);
+            throw new CompilerException("Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '" . $property . "'", $statement);
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '".$classDefinition->getCompleteName().'::'.$property."'", $statement);
+            throw new CompilerException("Cannot access non-static property '" . $classDefinition->getCompleteName() . '::' . $property . "'", $statement);
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '".$classDefinition->getCompleteName().'::'.$property."' out of its declaring context", $statement);
+                throw new CompilerException("Cannot access private static property '" . $classDefinition->getCompleteName() . '::' . $property . "' out of its declaring context", $statement);
             }
         }
 

From 55f35fff72f7ca63b46f4f02985eb60c76e50e86 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 14:37:50 -0600
Subject: [PATCH 217/375] phpcs

---
 src/Statements/Let/StaticPropertyAppend.php           | 4 ++--
 src/Statements/Let/StaticPropertyArrayIndex.php       | 4 ++--
 src/Statements/Let/StaticPropertyArrayIndexAppend.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 287cc82ae7..82cce15ab8 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\Class\Property;
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 2a4af503fd..627532b239 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\Class\Property;
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index a0593ff21b..7d07376207 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of the Zephir.
  *
@@ -11,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Statements\Let;
 
 use Zephir\Class\Property;

From 85fce61041323377f889cef78f24d186db67e91c Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 15:11:32 -0600
Subject: [PATCH 218/375] reverting back to get the tests to run

---
 src/Operators/AbstractOperator.php            |  35 --
 src/Operators/Bitwise/BitwiseBaseOperator.php |   9 +-
 .../Comparison/ComparisonBaseOperator.php     |   9 +-
 src/Operators/Logical/AndOperator.php         | 118 +++----
 src/Operators/Logical/OrOperator.php          | 142 +++++++-
 src/Operators/Other/LikelyOperator.php        |  32 +-
 src/Operators/Other/RequireOnceOperator.php   |  81 ++++-
 src/Operators/Other/RequireOperator.php       |  19 +-
 src/Operators/Other/UnlikelyOperator.php      |  60 +++-
 .../CallUserFuncArrayOptimizer.php            |  66 +++-
 .../FunctionCall/CallUserFuncOptimizer.php    |  18 +-
 .../FunctionCall/CamelizeOptimizer.php        |   4 +-
 .../FunctionCall/EndsWithOptimizer.php        |  59 +++-
 .../FunctionCall/StartsWithOptimizer.php      |  22 +-
 .../FunctionCall/StripcslashesOptimizer.php   |  50 ++-
 .../FunctionCall/StripslashesOptimizer.php    |   6 +-
 .../FunctionCall/StrtolowerOptimizer.php      |  48 ++-
 .../FunctionCall/StrtoupperOptimizer.php      |   6 +-
 .../FunctionCall/UncamelizeOptimizer.php      |  63 +++-
 src/Statements/Let/Decr.php                   |  62 ++--
 src/Statements/Let/Incr.php                   |  81 ++++-
 src/Statements/Let/ObjectPropertyDecr.php     |  37 +-
 src/Statements/Let/ObjectPropertyIncr.php     | 112 +++++-
 src/Statements/Let/StaticPropertyAdd.php      |  50 +--
 src/Statements/Let/StaticPropertyAppend.php   |  49 ++-
 .../Let/StaticPropertyArrayIndex.php          |  57 ++-
 .../Let/StaticPropertyArrayIndexAppend.php    |  64 +++-
 src/Statements/Let/StaticPropertySub.php      | 332 +++++++++++++++++-
 28 files changed, 1327 insertions(+), 364 deletions(-)

diff --git a/src/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
index 02eccf06a7..0e90bc02ce 100644
--- a/src/Operators/AbstractOperator.php
+++ b/src/Operators/AbstractOperator.php
@@ -14,7 +14,6 @@
 namespace Zephir\Operators;
 
 use Zephir\CompilationContext;
-use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 
 use function is_object;
@@ -235,38 +234,4 @@ public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
-
-    /**
-     * @param array $expression
-     *
-     * @return void
-     */
-    protected function checkLeftOperator(array $expression): void
-    {
-        if (!isset($expression['left'])) {
-            throw new CompilerException(
-                'Missing left part of the expression',
-                $expression
-            );
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
-    }
-
-    /**
-     * @param array $expression
-     *
-     * @return void
-     */
-    protected function checkRightOperator(array $expression): void
-    {
-        if (!isset($expression['right'])) {
-            throw new CompilerException(
-                'Missing right part of the expression',
-                $expression
-            );
-        }
-    }
 }
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index e01e2a2da8..65d01a7dc1 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -35,8 +35,13 @@ class BitwiseBaseOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression', $expression);
+        }
+
+        if (!isset($expression['right'])) {
+            throw new CompilerException('Missing right part of the expression', $expression);
+        }
 
         /**
          * Check for constant folding optimizations.
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index b9f41e0ccb..f3e15799d9 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -48,8 +48,13 @@ public function compile(array $expression, CompilationContext $compilationContex
             return $conditions;
         }
 
-        $this->checkLeftOperator($expression);
-        $this->checkRightOperator($expression);
+        if (!isset($expression['left'])) {
+            throw new CompilerException('Missing left part of the expression', $expression);
+        }
+
+        if (!isset($expression['right'])) {
+            throw new CompilerException('Missing right part of the expression', $expression);
+        }
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index 3cbcd00b67..992f644543 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -20,8 +20,6 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Statements\LetStatement;
-use Zephir\Types\Types;
-use Zephir\Variable\Variable;
 
 class AndOperator extends LogicalBaseOperator
 {
@@ -56,29 +54,35 @@ public function compile($expression, CompilationContext $compilationContext): Co
          */
         $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite('bool', $compilationContext);
 
-        $assignExprLeft = match ($left->getType()) {
-            Types::T_INT,
-            Types::T_BOOL,
-            Types::T_CHAR,
-            Types::T_DOUBLE,
-            Types::T_UINT,
-            Types::T_UCHAR    => [
-                'type'  => $left->getType(),
-                'value' => $left->getCode(),
-            ],
-            Types::T_VARIABLE => [
-                'type'  => 'variable',
-                'value' => $left->getCode(),
-            ],
-            Types::T_NULL     => [
-                'type'  => 'null',
-                'value' => null,
-            ],
-            default           => throw new CompilerException(
-                $left->getType(),
-                $expression['left']
-            ),
-        };
+        switch ($left->getType()) {
+            case 'int':
+            case 'bool':
+            case 'char':
+            case 'double':
+            case 'uint':
+            case 'uchar':
+                $assignExprLeft = [
+                    'type'  => $left->getType(),
+                    'value' => $left->getCode(),
+                ];
+                break;
+            case 'variable':
+                $assignExprLeft = [
+                    'type'  => 'variable',
+                    'value' => $left->getCode(),
+                ];
+                break;
+            case 'null':
+                $assignExprLeft = [
+                    'type'  => 'null',
+                    'value' => null,
+                ];
+                break;
+        }
+
+        if (!isset($assignExprLeft)) {
+            throw new CompilerException($left->getType(), $expression['left']);
+        }
 
         /**
          * Create an implicit 'let' operation to update the evaluated left operator.
@@ -99,36 +103,42 @@ public function compile($expression, CompilationContext $compilationContext): Co
         ]);
         $statement->compile($compilationContext);
 
-        $compilationContext->codePrinter->output($this->getOutput($flagVariable));
+        $compilationContext->codePrinter->output('if (' . $flagVariable->getName() . ') {');
         $compilationContext->codePrinter->increaseLevel();
 
         $rightExpr = new Expression($expression['right']);
         $rightExpr->setReadOnly($this->readOnly);
         $right = $rightExpr->compile($compilationContext);
 
-        $assignExprRight = match ($right->getType()) {
-            Types::T_INT,
-            Types::T_BOOL,
-            Types::T_CHAR,
-            Types::T_DOUBLE,
-            Types::T_UINT,
-            Types::T_UCHAR    => [
-                'type'  => $right->getType(),
-                'value' => $right->getCode(),
-            ],
-            Types::T_VARIABLE => [
-                'type'  => 'variable',
-                'value' => $right->getCode(),
-            ],
-            Types::T_NULL     => [
-                'type'  => 'null',
-                'value' => null,
-            ],
-            default           => throw new CompilerException(
-                $right->getType(),
-                $expression['right']
-            ),
-        };
+        switch ($right->getType()) {
+            case 'int':
+            case 'bool':
+            case 'char':
+            case 'double':
+            case 'uint':
+            case 'uchar':
+                $assignExprRight = [
+                    'type'  => $right->getType(),
+                    'value' => $right->getCode(),
+                ];
+                break;
+            case 'variable':
+                $assignExprRight = [
+                    'type'  => 'variable',
+                    'value' => $right->getCode(),
+                ];
+                break;
+            case 'null':
+                $assignExprRight = [
+                    'type'  => 'null',
+                    'value' => null,
+                ];
+                break;
+        }
+
+        if (!isset($assignExprRight)) {
+            throw new CompilerException($right->getType(), $expression['right']);
+        }
 
         /**
          * Create an implicit 'let' operation to update the evaluated right operator.
@@ -154,14 +164,4 @@ public function compile($expression, CompilationContext $compilationContext): Co
 
         return new CompiledExpression('bool', $flagVariable->getName(), $expression);
     }
-
-    /**
-     * @param Variable $variable
-     *
-     * @return string
-     */
-    protected function getOutput(Variable $variable): string
-    {
-        return 'if (!(' . $variable->getName() . ')) {';
-    }
 }
diff --git a/src/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
index 99b716090e..8f2bad3d98 100644
--- a/src/Operators/Logical/OrOperator.php
+++ b/src/Operators/Logical/OrOperator.php
@@ -13,21 +13,145 @@
 
 namespace Zephir\Operators\Logical;
 
-use Zephir\Variable\Variable;
+use Exception;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Expression;
+use Zephir\Statements\LetStatement;
 
 class OrOperator extends LogicalBaseOperator
 {
     protected string $bitOperator = '||';
     protected string $operator    = '||';
 
-
-    /**
-     * @param Variable $variable
-     *
-     * @return string
-     */
-    protected function getOutput(Variable $variable): string
+    public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        return 'if (!(' . $variable->getName() . ')) {';
+        if (!isset($expression['left'])) {
+            throw new Exception('Missing left part of the expression');
+        }
+
+        if (!isset($expression['right'])) {
+            throw new Exception('Missing right part of the expression');
+        }
+
+        $leftExpr = new Expression($expression['left']);
+        $leftExpr->setReadOnly($this->readOnly);
+        $left = $leftExpr->compile($compilationContext);
+
+        /**
+         * This variable is used to check if the compound and expression is evaluated as true or false.
+         */
+        $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite('bool', $compilationContext);
+
+        switch ($left->getType()) {
+            case 'int':
+            case 'bool':
+            case 'char':
+            case 'double':
+            case 'uint':
+            case 'uchar':
+                $assignExprLeft = [
+                    'type'  => $left->getType(),
+                    'value' => $left->getCode(),
+                ];
+                break;
+            case 'variable':
+                $assignExprLeft = [
+                    'type'  => 'variable',
+                    'value' => $left->getCode(),
+                ];
+                break;
+            case 'null':
+                $assignExprLeft = [
+                    'type'  => 'null',
+                    'value' => null,
+                ];
+                break;
+        }
+
+        if (!isset($assignExprLeft)) {
+            throw new CompilerException($left->getType(), $expression['left']);
+        }
+
+        /**
+         * Create an implicit 'let' operation to update the evaluated left operator.
+         */
+        $statement = new LetStatement([
+            'type'        => 'let',
+            'assignments' => [
+                [
+                    'assign-type' => 'variable',
+                    'variable'    => $flagVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $assignExprLeft,
+                    'file'        => $expression['left']['file'],
+                    'line'        => $expression['left']['line'],
+                    'char'        => $expression['left']['char'],
+                ],
+            ],
+        ]);
+        $statement->compile($compilationContext);
+
+        $compilationContext->codePrinter->output('if (!(' . $flagVariable->getName() . ')) {');
+        $compilationContext->codePrinter->increaseLevel();
+
+        $rightExpr = new Expression($expression['right']);
+        $rightExpr->setReadOnly($this->readOnly);
+        $right = $rightExpr->compile($compilationContext);
+
+        switch ($right->getType()) {
+            case 'int':
+            case 'bool':
+            case 'char':
+            case 'double':
+            case 'uint':
+            case 'uchar':
+                $assignExprRight = [
+                    'type'  => $right->getType(),
+                    'value' => $right->getCode(),
+                ];
+                break;
+            case 'variable':
+                $assignExprRight = [
+                    'type'  => 'variable',
+                    'value' => $right->getCode(),
+                ];
+                break;
+            case 'null':
+                $assignExprRight = [
+                    'type'  => 'null',
+                    'value' => null,
+                ];
+                break;
+        }
+
+        if (!isset($assignExprRight)) {
+            throw new CompilerException($right->getType(), $expression['right']);
+        }
+
+        /**
+         * Create an implicit 'let' operation to update the evaluated right operator.
+         */
+        $statement = new LetStatement([
+            'type'        => 'let',
+            'assignments' => [
+                [
+                    'assign-type' => 'variable',
+                    'variable'    => $flagVariable->getName(),
+                    'operator'    => 'assign',
+                    'expr'        => $assignExprRight,
+                    'file'        => $expression['right']['file'],
+                    'line'        => $expression['right']['line'],
+                    'char'        => $expression['right']['char'],
+                ],
+            ],
+        ]);
+        $statement->compile($compilationContext);
+
+        $compilationContext->codePrinter->decreaseLevel();
+        $compilationContext->codePrinter->output('}');
+
+        return new CompiledExpression('bool', $flagVariable->getName(), $expression);
     }
 }
diff --git a/src/Operators/Other/LikelyOperator.php b/src/Operators/Other/LikelyOperator.php
index 9842a49dd9..d3a5b97752 100644
--- a/src/Operators/Other/LikelyOperator.php
+++ b/src/Operators/Other/LikelyOperator.php
@@ -26,9 +26,6 @@
  */
 class LikelyOperator extends AbstractOperator
 {
-    protected string $expressionName = 'EXPECTED';
-    protected string $operatorName   = 'likely';
-
     /**
      * @param array              $expression
      * @param CompilationContext $compilationContext
@@ -41,10 +38,7 @@ class LikelyOperator extends AbstractOperator
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
         if (!isset($expression['left'])) {
-            throw new CompilerException(
-                "Invalid 'left' operand for '" . $this->operatorName . "' expression",
-                $expression['left']
-            );
+            throw new CompilerException("Invalid 'left' operand for 'likely' expression", $expression['left']);
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -52,11 +46,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         $left = $leftExpr->compile($compilationContext);
 
         if ('bool' === $left->getType()) {
-            return new CompiledExpression(
-                'bool',
-                $this->expressionName . '(' . $left->getCode() . ')',
-                $expression
-            );
+            return new CompiledExpression('bool', 'EXPECTED(' . $left->getCode() . ')', $expression);
         }
 
         if ('variable' === $left->getType()) {
@@ -67,30 +57,18 @@ public function compile(array $expression, CompilationContext $compilationContex
             );
             switch ($variable->getType()) {
                 case 'bool':
-                    return new CompiledExpression(
-                        'bool',
-                        $this->expressionName . '(' . $variable->getName() . ')',
-                        $expression
-                    );
+                    return new CompiledExpression('bool', 'EXPECTED(' . $variable->getName() . ')', $expression);
 
                 default:
                     $compilationContext->headersManager->add('kernel/operators');
                     $symbol = $compilationContext->backend->getVariableCode($variable);
 
-                    return new CompiledExpression(
-                        'bool',
-                        $this->expressionName . '(zephir_is_true(' . $symbol . '))',
-                        $expression
-                    );
+                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true(' . $symbol . '))', $expression);
             }
         }
 
         throw new CompilerException(
-            "Cannot use expression type: '"
-            . $left->getType()
-            . "' in '"
-            . $this->operatorName
-            . "' operator",
+            "Cannot use expression type: '" . $left->getType() . "' in 'likely' operator",
             $expression['left']
         );
     }
diff --git a/src/Operators/Other/RequireOnceOperator.php b/src/Operators/Other/RequireOnceOperator.php
index eaee389208..a3122c28d4 100644
--- a/src/Operators/Other/RequireOnceOperator.php
+++ b/src/Operators/Other/RequireOnceOperator.php
@@ -13,13 +13,84 @@
 
 namespace Zephir\Operators\Other;
 
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception;
+use Zephir\Expression;
+use Zephir\Operators\AbstractOperator;
+
 /**
  * Includes once a plain PHP file
  */
-class RequireOnceOperator extends RequireOperator
+class RequireOnceOperator extends AbstractOperator
 {
-    protected string $operatorName = 'require_once';
-    protected string $warningName  = 'non-valid-require-once';
-    protected string $zvalName     = 'zephir_require_once_zval';
-    protected string $zvalNameRet  = 'zephir_require_once_zval_ret';
+    /**
+     * @param array $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression
+     *
+     * @throws Exception
+     */
+    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
+    {
+        $expr = new Expression($expression['left']);
+        $expr->setReadOnly(true);
+        $expr->setExpectReturn(true);
+
+        $exprPath = $expr->compile($compilationContext);
+        if ('variable' === $exprPath->getType()) {
+            $exprVariable = $compilationContext->symbolTable->getVariableForRead(
+                $exprPath->getCode(),
+                $compilationContext,
+                $expression
+            );
+            $exprVar      = $compilationContext->backend->getVariableCode($exprVariable);
+            if ('variable' === $exprVariable->getType()) {
+                if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
+                    $compilationContext->logger->warning(
+                        'Possible attempt to use invalid type as path in "require_once" operator',
+                        ['non-valid-require-once', $expression]
+                    );
+                }
+            }
+        } else {
+            $exprVar = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
+            $compilationContext->backend->assignString($exprVar, $exprPath->getCode(), $compilationContext);
+            $exprVar = $compilationContext->backend->getVariableCode($exprVar);
+        }
+
+        $symbolVariable = false;
+        if ($this->isExpecting()) {
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                'variable',
+                $compilationContext
+            );
+        }
+
+        $compilationContext->headersManager->add('kernel/memory');
+        $compilationContext->headersManager->add('kernel/require');
+
+        $codePrinter = $compilationContext->codePrinter;
+
+        if ($symbolVariable) {
+            $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
+            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+            $codePrinter->output('if (zephir_require_once_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
+        } else {
+            $codePrinter->output('if (zephir_require_once_zval(' . $exprVar . ') == FAILURE) {');
+        }
+        $codePrinter->output("\t" . 'RETURN_MM_NULL();');
+        $codePrinter->output('}');
+
+        if ($symbolVariable) {
+            return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
+        }
+
+        return new CompiledExpression('null', null, $expression);
+    }
 }
diff --git a/src/Operators/Other/RequireOperator.php b/src/Operators/Other/RequireOperator.php
index e0661c77ca..208c46c6f0 100644
--- a/src/Operators/Other/RequireOperator.php
+++ b/src/Operators/Other/RequireOperator.php
@@ -25,11 +25,6 @@
  */
 class RequireOperator extends AbstractOperator
 {
-    protected string $operatorName = 'require';
-    protected string $warningName  = 'non-valid-require';
-    protected string $zvalName     = 'zephir_require_zval';
-    protected string $zvalNameRet  = 'zephir_require_zval_ret';
-
     /**
      * @param array $expression
      * @param CompilationContext $compilationContext
@@ -56,10 +51,8 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ('variable' === $exprVariable->getType()) {
                 if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
                     $compilationContext->logger->warning(
-                        'Possible attempt to use invalid type as path in "'
-                        . $this->operatorName
-                        . '" operator',
-                        [$this->warningName, $expression]
+                        'Possible attempt to use invalid type as path in "require" operator',
+                        ['non-valid-require', $expression]
                     );
                 }
             }
@@ -89,13 +82,9 @@ public function compile(array $expression, CompilationContext $compilationContex
         if ($symbolVariable) {
             $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-            $codePrinter->output(
-                'if (' . $this->zvalNameRet . '(' . $symbol . ', ' . $exprVar . ') == FAILURE) {'
-            );
+            $codePrinter->output('if (zephir_require_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
         } else {
-            $codePrinter->output(
-                'if (' . $this->zvalName . '(' . $exprVar . ') == FAILURE) {'
-            );
+            $codePrinter->output('if (zephir_require_zval(' . $exprVar . ') == FAILURE) {');
         }
         $codePrinter->output("\t" . 'RETURN_MM_NULL();');
         $codePrinter->output('}');
diff --git a/src/Operators/Other/UnlikelyOperator.php b/src/Operators/Other/UnlikelyOperator.php
index 81bd2d390e..38d807e747 100644
--- a/src/Operators/Other/UnlikelyOperator.php
+++ b/src/Operators/Other/UnlikelyOperator.php
@@ -13,11 +13,65 @@
 
 namespace Zephir\Operators\Other;
 
+use ReflectionException;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception;
+use Zephir\Exception\CompilerException;
+use Zephir\Expression;
+use Zephir\Operators\AbstractOperator;
+
 /**
  * Adds a branch prediction hint when evaluating an expression
  */
-class UnlikelyOperator extends LikelyOperator
+class UnlikelyOperator extends AbstractOperator
 {
-    protected string $expressionName = 'UNEXPECTED';
-    protected string $operatorName   = 'unlikely';
+    /**
+     * Compile unlikely operator
+     *
+     * @param                    $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression
+     *
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    public function compile($expression, CompilationContext $compilationContext): CompiledExpression
+    {
+        if (!isset($expression['left'])) {
+            throw new CompilerException("Invalid 'left' operand for 'unlikely' expression", $expression['left']);
+        }
+
+        $leftExpr = new Expression($expression['left']);
+        $leftExpr->setReadOnly(true);
+        $left = $leftExpr->compile($compilationContext);
+
+        if ('bool' === $left->getType()) {
+            return new CompiledExpression('bool', 'UNEXPECTED(' . $left->getCode() . ')', $expression);
+        }
+
+        if ('variable' === $left->getType()) {
+            $variable = $compilationContext->symbolTable->getVariableForRead(
+                $left->getCode(),
+                $compilationContext,
+                $expression['left']
+            );
+            switch ($variable->getType()) {
+                case 'bool':
+                    return new CompiledExpression('bool', 'UNEXPECTED(' . $variable->getName() . ')', $expression);
+
+                default:
+                    $compilationContext->headersManager->add('kernel/operators');
+                    $symbol = $compilationContext->backend->getVariableCode($variable);
+
+                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true(' . $symbol . '))', $expression);
+            }
+        }
+
+        throw new CompilerException(
+            "Cannot use expression type: '" . $left->getType() . "' in 'unlikely' operator",
+            $expression['left']
+        );
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index 46da592320..aba3da31e0 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -26,19 +26,67 @@
  *
  * Optimizer for 'call_user_func_array'
  */
-class CallUserFuncArrayOptimizer extends CallUserFuncOptimizer
+class CallUserFuncArrayOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'ZEPHIR_CALL_USER_FUNC_ARRAY';
-
     /**
-     * @param string $symbol
-     * @param array  $resolvedParams
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
      *
-     * @return string
+     * @return bool|CompiledExpression|mixed
      */
-    protected function getOutput(string $symbol, array $resolvedParams): string
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        return $this->zephirMethod
-            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');';
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (2 != count($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        if ($symbolVariable) {
+            if (!$symbolVariable->isVariable()) {
+                throw new CompilerException(
+                    'Returned values by functions can only be assigned to variant variables',
+                    $expression
+                );
+            }
+        } else {
+            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+            $symbolVariable->initVariant($context);
+        }
+
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        $context->headersManager->add('kernel/fcall');
+
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'ZEPHIR_CALL_USER_FUNC_ARRAY(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
+        $call->addCallStatusOrJump($context);
+
+        return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index d3cb88c8be..27df94855d 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -28,8 +28,6 @@
  */
 class CallUserFuncOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'ZEPHIR_CALL_USER_FUNC';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -84,23 +82,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            $this->getOutput($symbol, $resolvedParams)
-        );
+        $context->codePrinter->output('ZEPHIR_CALL_USER_FUNC(' . $symbol . ', ' . $resolvedParams[0] . ');');
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
     }
-
-    /**
-     * @param string $symbol
-     * @param array  $resolvedParams
-     *
-     * @return string
-     */
-    protected function getOutput(string $symbol, array $resolvedParams): string
-    {
-        return $this->zephirMethod
-            . '(' . $symbol . ', ' . $resolvedParams[0] . ');';
-    }
 }
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index 3cd8fbc6cc..38b04e5b72 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -28,8 +28,6 @@
  */
 class CamelizeOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_camelize';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -85,7 +83,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/EndsWithOptimizer.php b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
index f75f1e7cc5..ba62fd59d1 100644
--- a/src/Optimizers/FunctionCall/EndsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
@@ -13,13 +13,66 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * EndsWithOptimizer.
  *
  * Like 'strpos' but it returns a boolean value
  */
-class EndsWithOptimizer extends StartsWithOptimizer
+class EndsWithOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethodStr = 'zephir_end_with_str';
-    protected string $zephirMethod    = 'zephir_end_with';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (2 != count($expression['parameters']) && 3 != count($expression['parameters'])) {
+            return false;
+        }
+
+        if ('string' == $expression['parameters'][1]['parameter']['type']) {
+            $str = $expression['parameters'][1]['parameter']['value'];
+            unset($expression['parameters'][1]);
+        }
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        if (isset($str)) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_end_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
+                $expression
+            );
+        }
+
+        if (2 == count($expression['parameters'])) {
+            return new CompiledExpression(
+                'bool',
+                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
+                $expression
+            );
+        } else {
+            return new CompiledExpression(
+                'bool',
+                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
+                $expression
+            );
+        }
+    }
 }
diff --git a/src/Optimizers/FunctionCall/StartsWithOptimizer.php b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
index fdf4610f74..78a1d575cf 100644
--- a/src/Optimizers/FunctionCall/StartsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
@@ -27,9 +27,6 @@
  */
 class StartsWithOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethodStr = 'zephir_start_with_str';
-    protected string $zephirMethod    = 'zephir_start_with';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,10 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (
-            2 != count($expression['parameters']) &&
-            3 != count($expression['parameters'])
-        ) {
+        if (2 != count($expression['parameters']) && 3 != count($expression['parameters'])) {
             return false;
         }
 
@@ -55,18 +49,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             unset($expression['parameters'][1]);
         }
 
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         $context->headersManager->add('kernel/string');
 
         if (isset($str)) {
             return new CompiledExpression(
                 'bool',
-                $this->zephirMethodStr . '(' . $resolvedParams[0] . ', SL("' . $str . '"))',
+                'zephir_start_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
                 $expression
             );
         }
@@ -74,15 +64,13 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (2 == count($expression['parameters'])) {
             return new CompiledExpression(
                 'bool',
-                $this->zephirMethod . '(' . $resolvedParams[0] . ', '
-                . $resolvedParams[1] . ', NULL)',
+                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
                 $expression
             );
         } else {
             return new CompiledExpression(
                 'bool',
-                $this->zephirMethod . '(' . $resolvedParams[0] . ', '
-                . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
+                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
                 $expression
             );
         }
diff --git a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
index 6bad3b0868..3c5556b2ce 100644
--- a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -26,7 +26,53 @@
  *
  * Optimizes calls to 'stripcslashes' using internal function
  */
-class StripcslashesOptimizer extends StripslashesOptimizer
+class StripcslashesOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'stripcslashes';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (count($expression['parameters']) > 1) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable();
+        if ($symbolVariable->isNotVariableAndString()) {
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
+        }
+
+        $context->headersManager->add('kernel/string');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output('zephir_stripcslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
index c15b27b2aa..0875ba1ea4 100644
--- a/src/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -28,8 +28,6 @@
  */
 class StripslashesOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'stripslashes';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -72,9 +70,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        );
+        $context->codePrinter->output('zephir_stripslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
index 89564a1400..1437dceee4 100644
--- a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -26,7 +26,51 @@
  *
  * Optimizes calls to 'strtolower' using internal function
  */
-class StrtolowerOptimizer extends StrtoupperOptimizer
+class StrtolowerOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_fast_strtolower';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (1 != count($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        if ($symbolVariable->isNotVariableAndString()) {
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
+        }
+
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output('zephir_fast_strtolower(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index 56a72cd6dc..76c01118fe 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -28,8 +28,6 @@
  */
 class StrtoupperOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_fast_strtoupper';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -71,9 +69,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        );
+        $context->codePrinter->output('zephir_fast_strtoupper(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index ca0ce3ce73..5d67787e51 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -26,7 +26,66 @@
  *
  * Optimizes calls to 'uncamelize' using internal function
  */
-class UncamelizeOptimizer extends CamelizeOptimizer
+class UncamelizeOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_uncamelize';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
+            throw new CompilerException("'uncamelize' only accepts one or two parameters");
+        }
+
+        $delimiter = 'NULL ';
+        if (2 == count($expression['parameters'])) {
+            if ('null' == $expression['parameters'][1]['parameter']['type']) {
+                unset($expression['parameters'][1]);
+            }
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        if ($symbolVariable->isNotVariableAndString()) {
+            throw new CompilerException(
+                'Returned values by functions can only be assigned to variant variables',
+                $expression
+            );
+        }
+
+        $context->headersManager->add('kernel/string');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if (isset($resolvedParams[1])) {
+            $delimiter = $resolvedParams[1];
+        }
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index d042d4c621..96f26e8c99 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -15,7 +15,6 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
-use Zephir\Types\Types;
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
@@ -25,11 +24,6 @@
  */
 class Decr
 {
-    protected string $operator = '--';
-    protected string $verb = 'decrement';
-    protected string $warningName = 'non-valid-decrement';
-    protected string $zephirMethod = 'zephir_decrement';
-
     /**
      * Compiles x--.
      *
@@ -44,25 +38,18 @@ public function assign(
         $variable,
         ZephirVariable $symbolVariable,
         CompilationContext $compilationContext,
-        array $statement
+        $statement
     ): void {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is not initialized",
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
                 $statement
             );
         }
 
         if ($symbolVariable->isReadOnly()) {
-            /*
-             * TODO: implement increment of objects members
-             */
             throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is read only",
+                "Cannot mutate variable '" . $variable . "' because it is read only",
                 $statement
             );
         }
@@ -70,34 +57,31 @@ public function assign(
         $codePrinter = $compilationContext->codePrinter;
 
         switch ($symbolVariable->getType()) {
-            case Types::T_INT:
-            case Types::T_UINT:
-            case Types::T_LONG:
-            case Types::T_ULONG:
-            case Types::T_DOUBLE:
-            case Types::T_CHAR:
-            case Types::T_UCHAR:
-                $codePrinter->output($variable . $this->operator . ';');
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+            case 'double':
+            case 'char':
+            case 'uchar':
+                $codePrinter->output($variable . '--;');
                 break;
 
-            case Types::T_VARIABLE:
-                /**
+            case 'variable':
+                /*
                  * Variable is probably not initialized here
                  */
                 if ($symbolVariable->hasAnyDynamicType('unknown')) {
-                    throw new CompilerException(
-                        'Attempt to decrement uninitialized variable',
-                        $statement
-                    );
+                    throw new CompilerException('Attempt to decrement uninitialized variable', $statement);
                 }
 
-                /**
-                 * Increment/Decrement non-numeric variables could be expensive
+                /*
+                 * Decrement non-numeric variables could be expensive
                  */
                 if (!$symbolVariable->hasAnyDynamicType(['undefined', 'int', 'long', 'double', 'uint'])) {
                     $compilationContext->logger->warning(
-                        'Possible attempt to ' . $this->verb . ' non-numeric dynamic variable',
-                        [$this->warningName, $statement]
+                        'Possible attempt to decrement non-numeric dynamic variable',
+                        ['non-valid-decrement', $statement]
                     );
                 }
 
@@ -106,18 +90,12 @@ public function assign(
                     $symbolVariable->separate($compilationContext);
                 }
                 $codePrinter->output(
-                    $this->zephirMethod
-                    . '(' . $compilationContext->backend->getVariableCode($symbolVariable) . ');'
+                    'zephir_decrement(' . $compilationContext->backend->getVariableCode($symbolVariable) . ');'
                 );
-
                 break;
 
             default:
-                throw new CompilerException(
-                    'Cannot ' . $this->verb . ' variable: '
-                    . $symbolVariable->getType(),
-                    $statement
-                );
+                throw new CompilerException('Cannot decrement variable: ' . $symbolVariable->getType(), $statement);
         }
     }
 }
diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index 56e4e2c227..0616cdc9e0 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -13,15 +13,86 @@
 
 namespace Zephir\Statements\Let;
 
+use Zephir\CompilationContext;
+use Zephir\Exception\CompilerException;
+use Zephir\Variable\Variable as ZephirVariable;
+
 /**
  * Incr.
  *
  * Increments a variable
  */
-class Incr extends Decr
+class Incr
 {
-    protected string $operator = '++';
-    protected string $verb = 'increment';
-    protected string $warningName = 'non-valid-increment';
-    protected string $zephirMethod = 'zephir_increment';
+    /**
+     * Compiles x++.
+     *
+     * @param string             $variable
+     * @param ZephirVariable     $symbolVariable
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     *
+     * @throws CompilerException
+     */
+    public function assign(
+        $variable,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
+        if (!$symbolVariable->isInitialized()) {
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
+        }
+
+        if ($symbolVariable->isReadOnly()) {
+            /*
+             * TODO: implement increment of objects members
+             */
+            throw new CompilerException(
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is read only",
+                $statement
+            );
+        }
+
+        $codePrinter = &$compilationContext->codePrinter;
+
+        switch ($symbolVariable->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+            case 'double':
+            case 'char':
+            case 'uchar':
+                $codePrinter->output($variable . '++;');
+                break;
+
+            case 'variable':
+                /*
+                 * Update non-numeric dynamic variables could be expensive
+                 */
+                if (!$symbolVariable->hasAnyDynamicType(['undefined', 'long', 'double'])) {
+                    $compilationContext->logger->warning(
+                        'Possible attempt to increment non-numeric dynamic variable',
+                        ['non-valid-increment', $statement]
+                    );
+                }
+
+                $compilationContext->headersManager->add('kernel/operators');
+                if (!$symbolVariable->isLocalOnly()) {
+                    $symbolVariable->separate($compilationContext);
+                }
+                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                $codePrinter->output('zephir_increment(' . $symbol . ');');
+                break;
+
+            default:
+                throw new CompilerException('Cannot increment: ' . $symbolVariable->getType(), $statement);
+        }
+    }
 }
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index 5d96bbd04f..bee7126e2b 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -26,8 +26,6 @@
  */
 class ObjectPropertyDecr
 {
-    protected string $zephirMethod = 'zephir_property_decr';
-
     /**
      * Compiles obj->x--.
      *
@@ -46,9 +44,7 @@ public function assign(
     ): void {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is not initialized",
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
                 $statement
             );
         }
@@ -58,18 +54,14 @@ public function assign(
          */
         if ($symbolVariable->isLocalOnly()) {
             throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is local only",
+                "Cannot mutate variable '" . $variable . "' because it is local only",
                 $statement
             );
         }
 
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is not initialized",
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
                 $statement
             );
         }
@@ -79,9 +71,7 @@ public function assign(
          */
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException(
-                "Cannot use variable type: '"
-                . $symbolVariable->getType()
-                . "' as array",
+                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
                 $statement
             );
         }
@@ -110,11 +100,8 @@ public function assign(
             $classDefinition = $compilationContext->classDefinition;
             if (!$classDefinition->hasProperty($property)) {
                 throw new CompilerException(
-                    "Class '"
-                    . $classDefinition->getCompleteName()
-                    . "' does not have a property called: '"
-                    . $property
-                    . "'",
+                    "Class '" . $classDefinition->getCompleteName(
+                    ) . "' does not have a property called: '" . $property . "'",
                     $statement
                 );
             }
@@ -138,11 +125,7 @@ public function assign(
 
                     if (!$classDefinition->hasProperty($property)) {
                         throw new CompilerException(
-                            "Class '"
-                            . $classType
-                            . "' does not have a property called: '"
-                            . $property
-                            . "'",
+                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
                             $statement
                         );
                     }
@@ -152,11 +135,7 @@ public function assign(
 
         $compilationContext->headersManager->add('kernel/object');
         $compilationContext->codePrinter->output(
-            'RETURN_ON_FAILURE(' . $this->zephirMethod . '('
-            . $symbolVariable->getName()
-            . ', SL("'
-            . $property
-            . '")));'
+            'RETURN_ON_FAILURE(zephir_property_decr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
         );
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 2a9e08c0e8..29364111b8 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -24,7 +24,115 @@
  *
  * Increments an object property
  */
-class ObjectPropertyIncr extends ObjectPropertyDecr
+class ObjectPropertyIncr
 {
-    protected string $zephirMethod = 'zephir_property_incr';
+    /**
+     * Compiles obj->x++.
+     *
+     * @param string             $variable
+     * @param string             $property
+     * @param ZephirVariable     $symbolVariable
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     */
+    public function assign(
+        $variable,
+        $property,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext,
+        $statement
+    ): void {
+        if (!$symbolVariable->isInitialized()) {
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
+        }
+
+        /*
+         * Arrays must be stored in the HEAP
+         */
+        if ($symbolVariable->isLocalOnly()) {
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
+        }
+
+        if (!$symbolVariable->isInitialized()) {
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
+        }
+
+        /*
+         * Only dynamic variables can be used as arrays
+         */
+        if (!$symbolVariable->isVariable()) {
+            throw new CompilerException(
+                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+                $statement
+            );
+        }
+
+        if ($symbolVariable->hasAnyDynamicType('unknown')) {
+            throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
+        }
+
+        /*
+         * Trying to use a non-object dynamic variable as object
+         */
+        if ($symbolVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
+            $compilationContext->logger->warning(
+                'Possible attempt to increment non-object dynamic variable',
+                ['non-object-update', $statement]
+            );
+        }
+
+        /*
+         * Check if the variable to update is defined
+         */
+        if ('this' == $symbolVariable->getRealName()) {
+            $classDefinition = $compilationContext->classDefinition;
+            if (!$classDefinition->hasProperty($property)) {
+                throw new CompilerException(
+                    "Class '" . $classDefinition->getCompleteName(
+                    ) . "' does not have a property called: '" . $property . "'",
+                    $statement
+                );
+            }
+        } else {
+            /*
+             * If we know the class related to a variable we could check if the property
+             * is defined on that class
+             */
+            if ($symbolVariable->hasAnyDynamicType('object')) {
+                $classType = current($symbolVariable->getClassTypes());
+                $compiler  = $compilationContext->compiler;
+
+                if ($compiler->isClass($classType)) {
+                    $classDefinition = $compiler->getClassDefinition($classType);
+                    if (!$classDefinition) {
+                        throw new CompilerException(
+                            'Cannot locate class definition for class: ' . $classType,
+                            $statement
+                        );
+                    }
+
+                    if (!$classDefinition->hasProperty($property)) {
+                        throw new CompilerException(
+                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
+                            $statement
+                        );
+                    }
+                }
+            }
+        }
+
+        $compilationContext->headersManager->add('kernel/object');
+        $compilationContext->codePrinter->output(
+            'RETURN_ON_FAILURE(zephir_property_incr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
+        );
+    }
 }
diff --git a/src/Statements/Let/StaticPropertyAdd.php b/src/Statements/Let/StaticPropertyAdd.php
index 8f61cacacb..67a18b2b7c 100644
--- a/src/Statements/Let/StaticPropertyAdd.php
+++ b/src/Statements/Let/StaticPropertyAdd.php
@@ -26,8 +26,6 @@
  */
 class StaticPropertyAdd
 {
-    protected string $methodName = 'addStaticProperty';
-
     /**
      * Compiles ClassName::foo = {expr}.
      *
@@ -48,7 +46,6 @@ public function assignStatic(
         array $statement
     ): void {
         $classDefinition = $compilationContext->classLookup($className);
-        $methodName      = $this->methodName;
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
             throw new CompilerException(
@@ -96,12 +93,7 @@ public function assignStatic(
 
         switch ($resolvedExpr->getType()) {
             case 'null':
-                $compilationContext->backend->updateStaticProperty(
-                    $classEntry,
-                    $property,
-                    'null',
-                    $compilationContext
-                );
+                $compilationContext->backend->updateStaticProperty($classEntry, $property, 'null', $compilationContext);
                 break;
 
             case 'int':
@@ -117,7 +109,7 @@ public function assignStatic(
                     $resolvedExpr->getBooleanCode(),
                     $compilationContext
                 );
-                $compilationContext->backend->$methodName(
+                $compilationContext->backend->addStaticProperty(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -140,7 +132,7 @@ public function assignStatic(
                     '\'' . $resolvedExpr->getCode() . '\'',
                     $compilationContext
                 );
-                $compilationContext->backend->$methodName(
+                $compilationContext->backend->addStaticProperty(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -162,7 +154,7 @@ public function assignStatic(
                     $resolvedExpr->getCode(),
                     $compilationContext
                 );
-                $compilationContext->backend->$methodName(
+                $compilationContext->backend->addStaticProperty(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -195,7 +187,7 @@ public function assignStatic(
                     $tempVariable->setIdle(true);
                 }
 
-                $compilationContext->backend->$methodName(
+                $compilationContext->backend->addStaticProperty(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -205,7 +197,7 @@ public function assignStatic(
 
             case 'bool':
                 if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->$methodName(
+                    $compilationContext->backend->addStaticProperty(
                         $classEntry,
                         $property,
                         'true',
@@ -213,7 +205,7 @@ public function assignStatic(
                     );
                 } else {
                     if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->$methodName(
+                        $compilationContext->backend->addStaticProperty(
                             $classEntry,
                             $property,
                             'false',
@@ -222,7 +214,7 @@ public function assignStatic(
                     } else {
                         $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->$methodName(
+                        $compilationContext->backend->addStaticProperty(
                             $classEntry,
                             $property,
                             'true',
@@ -231,7 +223,7 @@ public function assignStatic(
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('} else {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->$methodName(
+                        $compilationContext->backend->addStaticProperty(
                             $classEntry,
                             $property,
                             'false',
@@ -250,7 +242,7 @@ public function assignStatic(
                     true
                 );
                 $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->$methodName(
+                $compilationContext->backend->addStaticProperty(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -262,7 +254,7 @@ public function assignStatic(
                 break;
 
             case 'array':
-                $compilationContext->backend->$methodName(
+                $compilationContext->backend->addStaticProperty(
                     $classEntry,
                     $property,
                     $resolvedExpr,
@@ -290,12 +282,8 @@ public function assignStatic(
                             true
                         );
 
-                        $compilationContext->backend->assignLong(
-                            $tempVariable,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        $compilationContext->backend->$methodName(
+                        $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -319,7 +307,7 @@ public function assignStatic(
                             $variableVariable,
                             $compilationContext
                         );
-                        $compilationContext->backend->$methodName(
+                        $compilationContext->backend->addStaticProperty(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -337,12 +325,8 @@ public function assignStatic(
                             $compilationContext,
                             true
                         );
-                        $compilationContext->backend->assignBool(
-                            $tempVariable,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        $compilationContext->backend->$methodName(
+                        $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
+                        $compilationContext->backend->addStaticProperty(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -353,7 +337,7 @@ public function assignStatic(
                         }
                         break;
                     default:
-                        $compilationContext->backend->$methodName(
+                        $compilationContext->backend->addStaticProperty(
                             $classEntry,
                             $property,
                             $variableVariable,
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 82cce15ab8..f3a99d81e0 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -19,6 +19,8 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 
+use function in_array;
+
 /**
  * StaticPropertyAppend.
  *
@@ -46,7 +48,7 @@ public function assignStatic(
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -58,14 +60,21 @@ public function assignStatic(
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
+                    $extendsClass    = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "' . $property . '" on parent because class ' . $classDefinition->getCompleteName() . ' does not extend any class', $statement);
+                        throw new CompilerException(
+                            'Cannot assign static property "'
+                            . $property
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $statement
+                        );
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -74,24 +83,48 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '" . $property . "'", $statement);
+            throw new CompilerException(
+                "Class '" . $classDefinition->getCompleteName(
+                ) . "' does not have a property called: '" . $property . "'",
+                $statement
+            );
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '" . $classDefinition->getCompleteName() . '::' . $property . "'", $statement);
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '" . $classDefinition->getCompleteName() . '::' . $property . "' out of its declaring context", $statement);
+                throw new CompilerException(
+                    "Cannot access private static property '"
+                    . $classDefinition->getCompleteName()
+                    . '::'
+                    . $property
+                    . "' out of its declaring context",
+                    $statement
+                );
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
+        $this->_assignStaticPropertyArrayMultipleIndex(
+            $classEntry,
+            $property,
+            $resolvedExpr,
+            $compilationContext,
+            $statement
+        );
     }
 
     /**
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 627532b239..f6fc6fa233 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -20,6 +20,9 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
+use function in_array;
+use function sprintf;
+
 /**
  * Zephir\Statements\Let\StaticPropertyArrayIndex.
  *
@@ -47,7 +50,7 @@ public function assignStatic(
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -59,14 +62,21 @@ public function assignStatic(
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
+                    $extendsClass    = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "' . $property . '" on parent because class ' . $classDefinition->getCompleteName() . ' does not extend any class', $statement);
+                        throw new CompilerException(
+                            'Cannot assign static property "'
+                            . $property
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $statement
+                        );
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -75,24 +85,48 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '" . $property . "'", $statement);
+            throw new CompilerException(
+                "Class '" . $classDefinition->getCompleteName(
+                ) . "' does not have a property called: '" . $property . "'",
+                $statement
+            );
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '" . $classDefinition->getCompleteName() . '::' . $property . "'", $statement);
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '" . $classDefinition->getCompleteName() . '::' . $property . "' out of its declaring context", $statement);
+                throw new CompilerException(
+                    "Cannot access private static property '"
+                    . $classDefinition->getCompleteName()
+                    . '::'
+                    . $property
+                    . "' out of its declaring context",
+                    $statement
+                );
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
+        $this->_assignStaticPropertyArrayMultipleIndex(
+            $classEntry,
+            $property,
+            $resolvedExpr,
+            $compilationContext,
+            $statement
+        );
     }
 
     /**
@@ -101,7 +135,7 @@ public function assignStatic(
      * @param string             $classEntry
      * @param string             $property
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      *
      * @throws Exception
@@ -140,7 +174,10 @@ protected function _assignStaticPropertyArrayMultipleIndex(
                     break;
                 default:
                     throw new CompilerException(
-                        sprintf('Expression: %s cannot be used as index without cast', $resolvedIndex->getType()),
+                        sprintf(
+                            'Expression: %s cannot be used as index without cast',
+                            $resolvedIndex->getType()
+                        ),
                         $statement['index-expr']
                     );
             }
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index 7d07376207..f2ebb979a3 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -20,6 +20,9 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
+use function in_array;
+use function sprintf;
+
 /**
  * StaticPropertyArrayIndexAppend.
  *
@@ -47,7 +50,7 @@ public function assignStatic(
         array $statement
     ): void {
         $compiler = $compilationContext->compiler;
-        if (!\in_array($className, ['self', 'static', 'parent'])) {
+        if (!in_array($className, ['self', 'static', 'parent'])) {
             $className = $compilationContext->getFullName($className);
             if ($compiler->isClass($className)) {
                 $classDefinition = $compiler->getClassDefinition($className);
@@ -55,18 +58,28 @@ public function assignStatic(
                 if ($compiler->isBundledClass($className)) {
                     $classDefinition = $compiler->getInternalClassDefinition($className);
                 } else {
-                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
+                    throw new CompilerException(
+                        "Cannot locate class '" . $className . "'",
+                        $statement
+                    );
                 }
             }
         } else {
-            if (\in_array($className, ['self', 'static'])) {
+            if (in_array($className, ['self', 'static'])) {
                 $classDefinition = $compilationContext->classDefinition;
             } else {
                 if ('parent' == $className) {
                     $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass = $classDefinition->getExtendsClass();
+                    $extendsClass    = $classDefinition->getExtendsClass();
                     if (!$extendsClass) {
-                        throw new CompilerException('Cannot assign static property "' . $property . '" on parent because class ' . $classDefinition->getCompleteName() . ' does not extend any class', $statement);
+                        throw new CompilerException(
+                            'Cannot assign static property "'
+                            . $property
+                            . '" on parent because class '
+                            . $classDefinition->getCompleteName()
+                            . ' does not extend any class',
+                            $statement
+                        );
                     } else {
                         $classDefinition = $classDefinition->getExtendsClassDefinition();
                     }
@@ -75,24 +88,50 @@ public function assignStatic(
         }
 
         if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException("Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '" . $property . "'", $statement);
+            throw new CompilerException(
+                "Class '" . $classDefinition->getCompleteName(
+                ) . "' does not have a property called: '"
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
         if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException("Cannot access non-static property '" . $classDefinition->getCompleteName() . '::' . $property . "'", $statement);
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $statement
+            );
         }
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException("Cannot access private static property '" . $classDefinition->getCompleteName() . '::' . $property . "' out of its declaring context", $statement);
+                throw new CompilerException(
+                    "Cannot access private static property '"
+                    . $classDefinition->getCompleteName()
+                    . '::'
+                    . $property
+                    . "' out of its declaring context",
+                    $statement
+                );
             }
         }
 
         $compilationContext->headersManager->add('kernel/object');
         $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex($classEntry, $property, $resolvedExpr, $compilationContext, $statement);
+        $this->_assignStaticPropertyArrayMultipleIndex(
+            $classEntry,
+            $property,
+            $resolvedExpr,
+            $compilationContext,
+            $statement
+        );
     }
 
     /**
@@ -101,7 +140,7 @@ public function assignStatic(
      * @param string             $classEntry
      * @param string             $property
      * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext,
+     * @param CompilationContext $compilationContext ,
      * @param array              $statement
      *
      * @throws Exception
@@ -139,7 +178,10 @@ protected function _assignStaticPropertyArrayMultipleIndex(
                     break;
                 default:
                     throw new CompilerException(
-                        sprintf('Expression: %s cannot be used as index without cast', $resolvedIndex->getType()),
+                        sprintf(
+                            'Expression: %s cannot be used as index without cast',
+                            $resolvedIndex->getType()
+                        ),
                         $statement['index-expr']
                     );
             }
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index 4521d97627..afb0b8afaa 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -26,7 +26,335 @@
  *
  * Updates static properties
  */
-class StaticPropertySub extends StaticPropertyAdd
+class StaticPropertySub
 {
-    protected string $methodName = 'subStaticProperty';
+    /**
+     * Compiles ClassName::foo = {expr}.
+     *
+     * @param string             $className
+     * @param string             $property
+     * @param CompiledExpression $resolvedExpr
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     *
+     * @throws CompilerException
+     * @throws IllegalOperationException
+     */
+    public function assignStatic(
+        string $className,
+        string $property,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): void {
+        $classDefinition = $compilationContext->classLookup($className);
+
+        if (!$propertyDefinition = $classDefinition->getProperty($property)) {
+            throw new CompilerException(
+                sprintf(
+                    "Class '%s' does not have a property called: '%s",
+                    $classDefinition->getCompleteName(),
+                    $property
+                ),
+                $statement
+            );
+        }
+
+        if (!$propertyDefinition->isStatic()) {
+            throw new CompilerException(
+                sprintf(
+                    "Cannot access non-static property '%s::%s",
+                    $classDefinition->getCompleteName(),
+                    $property
+                ),
+                $statement
+            );
+        }
+
+        if ($propertyDefinition->isPrivate()) {
+            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {
+                throw new CompilerException(
+                    sprintf(
+                        "Cannot access private static property '%s::%s out of its declaring context",
+                        $classDefinition->getCompleteName(),
+                        $property
+                    ),
+                    $statement
+                );
+            }
+        }
+
+        $codePrinter = $compilationContext->codePrinter;
+        $compilationContext->headersManager->add('kernel/object');
+
+        try {
+            $classEntry = $classDefinition->getClassEntry($compilationContext);
+        } catch (Exception $e) {
+            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);
+        }
+
+        switch ($resolvedExpr->getType()) {
+            case 'null':
+                $compilationContext->backend->updateStaticProperty($classEntry, $property, 'null', $compilationContext);
+                break;
+
+            case 'int':
+            case 'uint':
+            case 'long':
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    $resolvedExpr->getBooleanCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
+                if ($tempVariable->isTemporal()) {
+                    $tempVariable->setIdle(true);
+                }
+                break;
+
+            case 'char':
+            case 'uchar':
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignLong(
+                    $tempVariable,
+                    '\'' . $resolvedExpr->getCode() . '\'',
+                    $compilationContext
+                );
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
+                if ($tempVariable->isTemporal()) {
+                    $tempVariable->setIdle(true);
+                }
+                break;
+
+            case 'double':
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->assignDouble(
+                    $tempVariable,
+                    $resolvedExpr->getCode(),
+                    $compilationContext
+                );
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
+                if ($tempVariable->isTemporal()) {
+                    $tempVariable->setIdle(true);
+                }
+                break;
+
+            case 'string':
+                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $tempVariable->initVariant($compilationContext);
+
+                if ($resolvedExpr->getCode()) {
+                    $compilationContext->backend->assignString(
+                        $tempVariable,
+                        $resolvedExpr->getCode(),
+                        $compilationContext
+                    );
+                } else {
+                    $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
+                }
+
+                if ($tempVariable->isTemporal()) {
+                    $tempVariable->setIdle(true);
+                }
+
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
+                break;
+
+            case 'bool':
+                if ('1' == $resolvedExpr->getBooleanCode()) {
+                    $compilationContext->backend->subStaticProperty(
+                        $classEntry,
+                        $property,
+                        'true',
+                        $compilationContext
+                    );
+                } else {
+                    if ('0' == $resolvedExpr->getBooleanCode()) {
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
+                    } else {
+                        $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
+                        $codePrinter->increaseLevel();
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            'true',
+                            $compilationContext
+                        );
+                        $codePrinter->decreaseLevel();
+                        $codePrinter->output('} else {');
+                        $codePrinter->increaseLevel();
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            'false',
+                            $compilationContext
+                        );
+                        $codePrinter->decreaseLevel();
+                        $codePrinter->output('}');
+                    }
+                }
+                break;
+
+            case 'empty-array':
+                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                    'variable',
+                    $compilationContext,
+                    true
+                );
+                $compilationContext->backend->initArray($tempVariable, $compilationContext);
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $tempVariable,
+                    $compilationContext
+                );
+                if ($tempVariable->isTemporal()) {
+                    $tempVariable->setIdle(true);
+                }
+                break;
+
+            case 'array':
+                $compilationContext->backend->subStaticProperty(
+                    $classEntry,
+                    $property,
+                    $resolvedExpr,
+                    $compilationContext
+                );
+                break;
+
+            case 'variable':
+                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $resolvedExpr->getCode(),
+                    $compilationContext,
+                    $statement
+                );
+
+                switch ($variableVariable->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                    case 'char':
+                    case 'uchar':
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
+
+                        $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
+
+                        if ($tempVariable->isTemporal()) {
+                            $tempVariable->setIdle(true);
+                        }
+                        break;
+
+                    case 'double':
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
+
+                        $compilationContext->backend->assignDouble(
+                            $tempVariable,
+                            $variableVariable,
+                            $compilationContext
+                        );
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
+
+                        if ($tempVariable->isTemporal()) {
+                            $tempVariable->setIdle(true);
+                        }
+                        break;
+
+                    case 'bool':
+                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
+                            'variable',
+                            $compilationContext,
+                            true
+                        );
+                        $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $tempVariable,
+                            $compilationContext
+                        );
+                        if ($tempVariable->isTemporal()) {
+                            $tempVariable->setIdle(true);
+                        }
+                        break;
+                    default:
+                        $compilationContext->backend->subStaticProperty(
+                            $classEntry,
+                            $property,
+                            $variableVariable,
+                            $compilationContext
+                        );
+                        if ($variableVariable->isTemporal()) {
+                            $variableVariable->setIdle(true);
+                        }
+                        break;
+                }
+
+                break;
+
+            default:
+                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
+        }
+    }
 }

From b863c4279bf989030eb9dcdb1772246ae7ef3e9f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 16:04:33 -0600
Subject: [PATCH 219/375] removing duplicate code from require and inc/decr

---
 src/Console/Application.php             |   3 +-
 src/Statements/Let/Decr.php             |  67 +++++++----
 src/Statements/Let/Incr.php             | 148 ++++++++++++------------
 src/Statements/RequireOnceStatement.php |  22 +---
 src/Statements/RequireStatement.php     |   7 +-
 5 files changed, 132 insertions(+), 115 deletions(-)

diff --git a/src/Console/Application.php b/src/Console/Application.php
index a0147fd234..f33529b246 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -131,7 +131,8 @@ public function getLongVersion(): string
 
         return trim(
             sprintf(
-                '%s <info>%s</info> by <comment>Andres Gutierrez</comment> and <comment>Serghei Iakovlev</comment> %s',
+                '%s <info>%s</info> by the <comment>Phalcon Team</comment>' . PHP_EOL .
+                'Thanks to the work by: <comment>Andres Gutierrez</comment> and <comment>Serghei Iakovlev</comment> %s',
                 $this->getName(),
                 $version[0],
                 $commit
diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index 96f26e8c99..04e5ae83d9 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -15,6 +15,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
+use Zephir\Types\Types;
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
@@ -24,8 +25,13 @@
  */
 class Decr
 {
+    protected string $operator     = '--';
+    protected string $zephirMethod = 'zephir_decrement';
+    protected string $warningText  = 'decrement';
+    protected string $warningType  = 'non-valid-decrement';
+
     /**
-     * Compiles x--.
+     * Compiles x++/x--.
      *
      * @param string             $variable
      * @param ZephirVariable     $symbolVariable
@@ -38,18 +44,25 @@ public function assign(
         $variable,
         ZephirVariable $symbolVariable,
         CompilationContext $compilationContext,
-        $statement
+        array $statement
     ): void {
         if (!$symbolVariable->isInitialized()) {
             throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is not initialized",
                 $statement
             );
         }
 
         if ($symbolVariable->isReadOnly()) {
+            /*
+             * TODO: implement increment of objects members
+             */
             throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is read only",
+                "Cannot mutate variable '"
+                . $variable
+                . "' because it is read only",
                 $statement
             );
         }
@@ -57,31 +70,39 @@ public function assign(
         $codePrinter = $compilationContext->codePrinter;
 
         switch ($symbolVariable->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-            case 'char':
-            case 'uchar':
-                $codePrinter->output($variable . '--;');
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
+            case Types::T_DOUBLE:
+            case Types::T_CHAR:
+            case Types::T_UCHAR:
+                $codePrinter->output($variable . $this->operator . ';');
                 break;
 
-            case 'variable':
+            case Types::T_VARIABLE:
                 /*
                  * Variable is probably not initialized here
                  */
                 if ($symbolVariable->hasAnyDynamicType('unknown')) {
-                    throw new CompilerException('Attempt to decrement uninitialized variable', $statement);
+                    throw new CompilerException(
+                        'Attempt to '
+                        . $this->warningText
+                        . ' uninitialized variable',
+                        $statement
+                    );
                 }
 
                 /*
                  * Decrement non-numeric variables could be expensive
                  */
+//                if (!$symbolVariable->hasAnyDynamicType(['undefined', 'long', 'double'])) {
                 if (!$symbolVariable->hasAnyDynamicType(['undefined', 'int', 'long', 'double', 'uint'])) {
                     $compilationContext->logger->warning(
-                        'Possible attempt to decrement non-numeric dynamic variable',
-                        ['non-valid-decrement', $statement]
+                        'Possible attempt to '
+                        . $this->warningText
+                        . ' non-numeric dynamic variable',
+                        [$this->warningType, $statement]
                     );
                 }
 
@@ -89,13 +110,19 @@ public function assign(
                 if (!$symbolVariable->isLocalOnly()) {
                     $symbolVariable->separate($compilationContext);
                 }
-                $codePrinter->output(
-                    'zephir_decrement(' . $compilationContext->backend->getVariableCode($symbolVariable) . ');'
-                );
+
+                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+                $codePrinter->output($this->zephirMethod . '(' . $symbol . ');');
                 break;
 
             default:
-                throw new CompilerException('Cannot decrement variable: ' . $symbolVariable->getType(), $statement);
+                throw new CompilerException(
+                    'Cannot '
+                    . $this->warningText
+                    . ' variable: '
+                    . $symbolVariable->getType(),
+                    $statement
+                );
         }
     }
 }
diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index 0616cdc9e0..82c7ccffce 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -22,77 +22,81 @@
  *
  * Increments a variable
  */
-class Incr
+class Incr extends Decr
 {
-    /**
-     * Compiles x++.
-     *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws CompilerException
-     */
-    public function assign(
-        $variable,
-        ZephirVariable $symbolVariable,
-        CompilationContext $compilationContext,
-        $statement
-    ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isReadOnly()) {
-            /*
-             * TODO: implement increment of objects members
-             */
-            throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is read only",
-                $statement
-            );
-        }
-
-        $codePrinter = &$compilationContext->codePrinter;
-
-        switch ($symbolVariable->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-            case 'double':
-            case 'char':
-            case 'uchar':
-                $codePrinter->output($variable . '++;');
-                break;
-
-            case 'variable':
-                /*
-                 * Update non-numeric dynamic variables could be expensive
-                 */
-                if (!$symbolVariable->hasAnyDynamicType(['undefined', 'long', 'double'])) {
-                    $compilationContext->logger->warning(
-                        'Possible attempt to increment non-numeric dynamic variable',
-                        ['non-valid-increment', $statement]
-                    );
-                }
-
-                $compilationContext->headersManager->add('kernel/operators');
-                if (!$symbolVariable->isLocalOnly()) {
-                    $symbolVariable->separate($compilationContext);
-                }
-                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-                $codePrinter->output('zephir_increment(' . $symbol . ');');
-                break;
-
-            default:
-                throw new CompilerException('Cannot increment: ' . $symbolVariable->getType(), $statement);
-        }
-    }
+    protected string $operator = '++';
+    protected string $zephirMethod = 'zephir_increment';
+    protected string $warningText = 'increment';
+    protected string $warningType = 'non-valid-increment';
+//    /**
+//     * Compiles x++.
+//     *
+//     * @param string             $variable
+//     * @param ZephirVariable     $symbolVariable
+//     * @param CompilationContext $compilationContext
+//     * @param array              $statement
+//     *
+//     * @throws CompilerException
+//     */
+//    public function assign(
+//        $variable,
+//        ZephirVariable $symbolVariable,
+//        CompilationContext $compilationContext,
+//        $statement
+//    ): void {
+//        if (!$symbolVariable->isInitialized()) {
+//            throw new CompilerException(
+//                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+//                $statement
+//            );
+//        }
+//
+//        if ($symbolVariable->isReadOnly()) {
+//            /*
+//             * TODO: implement increment of objects members
+//             */
+//            throw new CompilerException(
+//                "Cannot mutate variable '"
+//                . $variable
+//                . "' because it is read only",
+//                $statement
+//            );
+//        }
+//
+//        $codePrinter = &$compilationContext->codePrinter;
+//
+//        switch ($symbolVariable->getType()) {
+//            case 'int':
+//            case 'uint':
+//            case 'long':
+//            case 'ulong':
+//            case 'double':
+//            case 'char':
+//            case 'uchar':
+//                $codePrinter->output($variable . '++;');
+//                break;
+//
+//            case 'variable':
+//                /*
+//                 * Update non-numeric dynamic variables could be expensive
+//                 */
+//                if (!$symbolVariable->hasAnyDynamicType(['undefined', 'long', 'double'])) {
+//                    $compilationContext->logger->warning(
+//                        'Possible attempt to increment non-numeric dynamic variable',
+//                        ['non-valid-increment', $statement]
+//                    );
+//                }
+//
+//                $compilationContext->headersManager->add('kernel/operators');
+//                if (!$symbolVariable->isLocalOnly()) {
+//                    $symbolVariable->separate($compilationContext);
+//                }
+//                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+//                $codePrinter->output('zephir_increment(' . $symbol . ');');
+//                break;
+//
+//            default:
+//                throw new CompilerException('Cannot increment: ' . $symbolVariable->getType(), $statement);
+//        }
+//    }
 }
diff --git a/src/Statements/RequireOnceStatement.php b/src/Statements/RequireOnceStatement.php
index 8241e9f64f..a07f6f1999 100644
--- a/src/Statements/RequireOnceStatement.php
+++ b/src/Statements/RequireOnceStatement.php
@@ -22,25 +22,7 @@
  *
  * Require once statement is used to execute PHP scripts in a given path
  */
-class RequireOnceStatement extends StatementAbstract
+class RequireOnceStatement extends RequireStatement
 {
-    /**
-     * @param CompilationContext $compilationContext
-     *
-     * @throws Exception
-     */
-    public function compile(CompilationContext $compilationContext): void
-    {
-        $expression = [
-            'type' => 'require_once',
-            'left' => $this->statement['expr'],
-            'file' => $this->statement['file'],
-            'line' => $this->statement['line'],
-            'char' => $this->statement['char'],
-        ];
-
-        $expr = new Expression($expression);
-        $expr->setExpectReturn(false, null);
-        $expr->compile($compilationContext);
-    }
+    protected string $methodName = 'require_once';
 }
diff --git a/src/Statements/RequireStatement.php b/src/Statements/RequireStatement.php
index d63ef6cdfe..203fe17d5e 100644
--- a/src/Statements/RequireStatement.php
+++ b/src/Statements/RequireStatement.php
@@ -14,6 +14,7 @@
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
@@ -24,6 +25,8 @@
  */
 class RequireStatement extends StatementAbstract
 {
+    protected string $methodName = 'require';
+
     /**
      * @param CompilationContext $compilationContext
      *
@@ -32,7 +35,7 @@ class RequireStatement extends StatementAbstract
     public function compile(CompilationContext $compilationContext): void
     {
         $expression = [
-            'type' => 'require',
+            'type' => $this->methodName,
             'left' => $this->statement['expr'],
             'file' => $this->statement['file'],
             'line' => $this->statement['line'],
@@ -40,7 +43,7 @@ public function compile(CompilationContext $compilationContext): void
         ];
 
         $expr = new Expression($expression);
-        $expr->setExpectReturn(false, null);
+        $expr->setExpectReturn(false);
         $expr->compile($compilationContext);
     }
 }

From d8aa93c2c6dd2c258dc58f956106881c70ceb86c Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 16:49:31 -0600
Subject: [PATCH 220/375] added variables trait; refactored code for return
 value exception check

---
 src/FunctionCall.php                          | 20 ++----
 src/MethodCall.php                            | 10 ++-
 .../FunctionCall/AddslashesOptimizer.php      |  8 +--
 .../FunctionCall/ArrayKeysOptimizer.php       |  8 +--
 .../FunctionCall/ArrayMergeOptimizer.php      |  8 +--
 .../FunctionCall/BasenameOptimizer.php        |  9 +--
 .../CallUserFuncArrayOptimizer.php            | 65 +------------------
 .../FunctionCall/CallUserFuncOptimizer.php    | 25 +++----
 .../FunctionCall/CamelizeOptimizer.php        |  7 +-
 .../FunctionCall/Crc32Optimizer.php           |  7 +-
 .../FunctionCall/CreateArrayOptimizer.php     |  7 +-
 .../FunctionCall/CreateInstanceOptimizer.php  |  7 +-
 .../CreateInstanceParamsOptimizer.php         |  7 +-
 .../CreateSymbolTableOptimizer.php            |  9 +--
 .../FunctionCall/EndsWithOptimizer.php        | 17 +++--
 src/Optimizers/FunctionCall/EvalOptimizer.php |  7 +-
 .../FunctionCall/ExplodeOptimizer.php         |  7 +-
 .../FunctionCall/FileGetContentsOptimizer.php |  9 +--
 .../FunctionCall/FilePutContentsOptimizer.php |  9 +--
 .../FunctionCall/FilemtimeOptimizer.php       |  9 +--
 .../FunctionCall/FuncGetArgOptimizer.php      |  7 +-
 .../FunctionCall/FuncGetArgsOptimizer.php     |  7 +-
 .../FunctionCall/FwriteOptimizer.php          |  9 +--
 .../FunctionCall/GetCalledClassOptimizer.php  |  7 +-
 .../FunctionCall/GetClassLowerOptimizer.php   |  7 +-
 .../FunctionCall/GetClassNsOptimizer.php      |  7 +-
 .../FunctionCall/GetClassOptimizer.php        |  8 +--
 .../FunctionCall/GetDefinedVarsOptimizer.php  |  7 +-
 .../FunctionCall/GetNsClassOptimizer.php      |  7 +-
 .../FunctionCall/GettypeOptimizer.php         |  7 +-
 .../FunctionCall/HashEqualsOptimizer.php      |  7 +-
 .../FunctionCall/ImplodeOptimizer.php         |  7 +-
 .../FunctionCall/JsonDecodeOptimizer.php      | 10 +--
 .../FunctionCall/JsonEncodeOptimizer.php      |  7 +-
 src/Optimizers/FunctionCall/Md5Optimizer.php  |  7 +-
 .../FunctionCall/MicrotimeOptimizer.php       |  7 +-
 src/Optimizers/FunctionCall/PowOptimizer.php  |  7 +-
 .../FunctionCall/PregMatchOptimizer.php       |  7 +-
 .../PrepareVirtualPathOptimizer.php           |  8 +--
 .../FunctionCall/RoundOptimizer.php           |  7 +-
 .../FunctionCall/StartsWithOptimizer.php      | 52 +--------------
 .../FunctionCall/StrReplaceOptimizer.php      |  7 +-
 .../FunctionCall/StripcslashesOptimizer.php   |  7 +-
 .../FunctionCall/StripslashesOptimizer.php    |  7 +-
 .../FunctionCall/StrposOptimizer.php          |  7 +-
 .../FunctionCall/StrtolowerOptimizer.php      | 48 +-------------
 .../FunctionCall/StrtoupperOptimizer.php      | 19 +++---
 .../FunctionCall/SubstrOptimizer.php          |  7 +-
 src/Optimizers/FunctionCall/TimeOptimizer.php |  7 +-
 src/Optimizers/FunctionCall/TrimOptimizer.php |  8 +--
 .../FunctionCall/UcfirstOptimizer.php         |  7 +-
 .../FunctionCall/UncamelizeOptimizer.php      |  7 +-
 .../FunctionCall/UniqueKeyOptimizer.php       |  7 +-
 .../FunctionCall/UniquePathKeyOptimizer.php   |  7 +-
 .../FunctionCall/VarExportOptimizer.php       |  9 +--
 .../ZephirStringToHexOptimizer.php            |  8 +--
 src/Optimizers/OptimizerAbstract.php          |  3 +
 src/StaticCall.php                            | 11 ++--
 src/Traits/VariablesTrait.php                 | 54 +++++++++++++++
 59 files changed, 168 insertions(+), 516 deletions(-)
 create mode 100644 src/Traits/VariablesTrait.php

diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index ae4e0faf71..dc0dd4e645 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -18,6 +18,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use Zephir\Traits\VariablesTrait;
+
 use function class_exists;
 use function count;
 use function file_exists;
@@ -41,6 +43,8 @@
  */
 class FunctionCall extends Call
 {
+    use VariablesTrait;
+
     /**
      * Function is called using a dynamic variable as method name.
      */
@@ -232,16 +236,11 @@ protected function _callDynamic(array $expression, CompilationContext $compilati
 
         /**
          * At this point the function will be called in the PHP userland.
-         * PHP functions only return zvals so we need to validate the target variable is also a zval.
+         * PHP functions only return zvals, so we need to validate the target variable is also a zval.
          */
         $symbolVariable = $this->getSymbolVariable();
         if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
+            $this->checkNotVariable($symbolVariable, $expression);
 
             /**
              * We don't know the exact dynamic type returned by the method call
@@ -404,12 +403,7 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
          */
         $symbolVariable = $this->getSymbolVariable();
         if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
+            $this->checkNotVariable($symbolVariable, $expression);
 
             /**
              * We don't know the exact dynamic type returned by the method call
diff --git a/src/MethodCall.php b/src/MethodCall.php
index bb8f91668a..c2b777fdda 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -18,6 +18,7 @@
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Types\AbstractType;
 use Zephir\Types\Types;
 use Zephir\Variable\Variable;
@@ -36,6 +37,8 @@
  */
 class MethodCall extends Call
 {
+    use VariablesTrait;
+
     /**
      * Function is called using a dynamic variable as method name.
      */
@@ -174,12 +177,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
          */
         if (!$builtInType) {
             if ($isExpecting) {
-                if (!$symbolVariable->isVariable()) {
-                    throw new CompilerException(
-                        'Returned values by functions can only be assigned to variant variables',
-                        $expression
-                    );
-                }
+                $this->checkNotVariable($symbolVariable, $expression);
 
                 /*
                  * At this point, we don't know the exact dynamic type returned by the method call
diff --git a/src/Optimizers/FunctionCall/AddslashesOptimizer.php b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
index a7a0acad8a..066e37fd0c 100644
--- a/src/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -53,13 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 869d9435a5..6cdf76c2ce 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -53,13 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/array');
 
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index a81bf765ae..081768ab18 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -53,13 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/array');
 
diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index bfeaf68ff0..9b048a2cd6 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -55,14 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable) {
-            if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index aba3da31e0..ac681d6bfc 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -26,67 +26,8 @@
  *
  * Optimizer for 'call_user_func_array'
  */
-class CallUserFuncArrayOptimizer extends OptimizerAbstract
+class CallUserFuncArrayOptimizer extends CallUserFuncOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        } else {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        $context->headersManager->add('kernel/fcall');
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'ZEPHIR_CALL_USER_FUNC_ARRAY(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        );
-        $call->addCallStatusOrJump($context);
-
-        return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
-    }
+    protected int    $parameterCount = 2;
+    protected string $zephirMethod   = 'ZEPHIR_CALL_USER_FUNC_ARRAY';
 }
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index 27df94855d..29d6d1e3e8 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -28,6 +28,9 @@
  */
 class CallUserFuncOptimizer extends OptimizerAbstract
 {
+    protected int    $parameterCount = 1;
+    protected string $zephirMethod   = 'ZEPHIR_CALL_USER_FUNC';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -41,7 +44,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != count($expression['parameters'])) {
+        if ($this->parameterCount != count($expression['parameters'])) {
             return false;
         }
 
@@ -51,14 +54,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        } else {
+        $this->checkNotVariable($symbolVariable, $expression);
+        if (!$symbolVariable) {
             $symbolVariable = $context->symbolTable->addTemp('variable', $context);
             $symbolVariable->initVariant($context);
         }
@@ -68,7 +65,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->addCallStatusFlag($context);
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         $context->headersManager->add('kernel/fcall');
 
@@ -82,7 +83,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('ZEPHIR_CALL_USER_FUNC(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index 38b04e5b72..c5c0a93af9 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -60,12 +60,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index cf0e1c44f3..1582e14ac4 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('long');
diff --git a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
index c6a028aa21..47cc7cda3c 100644
--- a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -51,12 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         /*
          * Add the last call status to the current symbol table
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 59deadb13c..b85529c413 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         /*
          * Add the last call status to the current symbol table
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index 7b34c76be1..af8528e4e3 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -49,12 +49,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         /*
          * Add the last call status to the current symbol table
diff --git a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
index d7c5eca749..546a5e12d0 100644
--- a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -51,14 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/EndsWithOptimizer.php b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
index ba62fd59d1..37e6292d24 100644
--- a/src/Optimizers/FunctionCall/EndsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/EndsWithOptimizer.php
@@ -27,6 +27,9 @@
  */
 class EndsWithOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod    = 'zephir_end_with';
+    protected string $zephirMethodStr = 'zephir_end_with_str';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -49,14 +52,18 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             unset($expression['parameters'][1]);
         }
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         $context->headersManager->add('kernel/string');
 
         if (isset($str)) {
             return new CompiledExpression(
                 'bool',
-                'zephir_end_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
+                $this->zephirMethodStr . '(' . $resolvedParams[0] . ', SL("' . $str . '"))',
                 $expression
             );
         }
@@ -64,13 +71,15 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (2 == count($expression['parameters'])) {
             return new CompiledExpression(
                 'bool',
-                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
+                $this->zephirMethod
+                . '(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
                 $expression
             );
         } else {
             return new CompiledExpression(
                 'bool',
-                'zephir_end_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
+                $this->zephirMethod
+                . '(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
                 $expression
             );
         }
diff --git a/src/Optimizers/FunctionCall/EvalOptimizer.php b/src/Optimizers/FunctionCall/EvalOptimizer.php
index 213ad32974..2f9f8d961a 100644
--- a/src/Optimizers/FunctionCall/EvalOptimizer.php
+++ b/src/Optimizers/FunctionCall/EvalOptimizer.php
@@ -51,12 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/fcall');
 
diff --git a/src/Optimizers/FunctionCall/ExplodeOptimizer.php b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
index 4e935ac09c..e1abf9e04e 100644
--- a/src/Optimizers/FunctionCall/ExplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -51,12 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         /**
          * Process limit.
diff --git a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
index acefbf9a62..b4c1736417 100644
--- a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -55,14 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable) {
-            if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
         if ($call->mustInitSymbolVariable()) {
diff --git a/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php b/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
index d7e808ad3d..209afa9d1d 100644
--- a/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilePutContentsOptimizer.php
@@ -55,14 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable) {
-            if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
         if ($symbolVariable) {
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index bfafa3cd4d..9d44f9e6fc 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -55,14 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable) {
-            if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
         if ($call->mustInitSymbolVariable()) {
diff --git a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
index 47f848390d..1919580f61 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
@@ -57,12 +57,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables.',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index 0ab9734a32..c75cee7fb5 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -43,12 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/FwriteOptimizer.php b/src/Optimizers/FunctionCall/FwriteOptimizer.php
index bc49fe3faa..ef2ff1a310 100644
--- a/src/Optimizers/FunctionCall/FwriteOptimizer.php
+++ b/src/Optimizers/FunctionCall/FwriteOptimizer.php
@@ -55,14 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable) {
-            if ($symbolVariable->isNotVariableAndString()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
         if ($symbolVariable) {
diff --git a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
index 6d0cc30603..7a3a71b4bf 100644
--- a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -52,12 +52,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index 3b75edbb34..d9052a01b9 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -54,12 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/object');
 
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index ad5a71ce73..a848acb414 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -54,12 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/object');
 
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index 9b352d0c5c..8b185d23bb 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -54,12 +54,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
+
         $context->headersManager->add('kernel/object');
 
         $symbolVariable->setDynamicTypes('string');
diff --git a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index 3039d3d2e6..38cbc4d81c 100644
--- a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -37,12 +37,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
     {
         $call->processExpectedReturn($context);
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
index 4c814b3861..be76f295ed 100644
--- a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/object');
         $symbolVariable->setDynamicTypes('string');
diff --git a/src/Optimizers/FunctionCall/GettypeOptimizer.php b/src/Optimizers/FunctionCall/GettypeOptimizer.php
index 0b41b1a8fd..b3274fcb6f 100644
--- a/src/Optimizers/FunctionCall/GettypeOptimizer.php
+++ b/src/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $symbolVariable->setDynamicTypes('string');
 
diff --git a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
index ee62d9240d..24de51ff8d 100644
--- a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
+++ b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
@@ -49,12 +49,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/ImplodeOptimizer.php b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
index f2f9207e18..fecd7a095d 100644
--- a/src/Optimizers/FunctionCall/ImplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -52,12 +52,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         if ('string' == $expression['parameters'][0]['parameter']['type']) {
             $str = Name::addSlashes($expression['parameters'][0]['parameter']['value']);
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index b1257e1bee..139342fbd5 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -47,14 +47,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        } else {
+        $this->checkNotVariable($symbolVariable, $expression);
+        if (!$symbolVariable) {
             $symbolVariable = $context->symbolTable->addTemp('variable', $context);
             $symbolVariable->initVariant($context);
         }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index d1fdbedece..79da0b4933 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -47,12 +47,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index b09a1cc8e7..f35de5c6c1 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('string');
diff --git a/src/Optimizers/FunctionCall/MicrotimeOptimizer.php b/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
index a8bfa1d4d1..5aa2bb8032 100644
--- a/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/MicrotimeOptimizer.php
@@ -50,12 +50,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/time');
 
diff --git a/src/Optimizers/FunctionCall/PowOptimizer.php b/src/Optimizers/FunctionCall/PowOptimizer.php
index c7d4b8bfda..f94f82a065 100644
--- a/src/Optimizers/FunctionCall/PowOptimizer.php
+++ b/src/Optimizers/FunctionCall/PowOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/operators');
         $symbolVariable->setDynamicTypes('variable');
diff --git a/src/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
index 81f6f938c1..9193e7ce59 100644
--- a/src/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -75,12 +75,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         // zephir_preg_match
         $context->headersManager->add('kernel/string');
diff --git a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
index 10c8f41b65..858447e6c4 100644
--- a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
+++ b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
@@ -55,13 +55,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
diff --git a/src/Optimizers/FunctionCall/RoundOptimizer.php b/src/Optimizers/FunctionCall/RoundOptimizer.php
index 3aeb9eb1d7..98a6b6909c 100644
--- a/src/Optimizers/FunctionCall/RoundOptimizer.php
+++ b/src/Optimizers/FunctionCall/RoundOptimizer.php
@@ -54,12 +54,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/math');
         $symbolVariable->setDynamicTypes('double');
diff --git a/src/Optimizers/FunctionCall/StartsWithOptimizer.php b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
index 78a1d575cf..65b45abea3 100644
--- a/src/Optimizers/FunctionCall/StartsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
@@ -25,54 +25,8 @@
  *
  * Checks if a string starts with another
  */
-class StartsWithOptimizer extends OptimizerAbstract
+class StartsWithOptimizer extends EndsWithOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters']) && 3 != count($expression['parameters'])) {
-            return false;
-        }
-
-        if ('string' == $expression['parameters'][1]['parameter']['type']) {
-            $str = $expression['parameters'][1]['parameter']['value'];
-            unset($expression['parameters'][1]);
-        }
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        if (isset($str)) {
-            return new CompiledExpression(
-                'bool',
-                'zephir_start_with_str(' . $resolvedParams[0] . ', SL("' . $str . '"))',
-                $expression
-            );
-        }
-
-        if (2 == count($expression['parameters'])) {
-            return new CompiledExpression(
-                'bool',
-                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', NULL)',
-                $expression
-            );
-        } else {
-            return new CompiledExpression(
-                'bool',
-                'zephir_start_with(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ')',
-                $expression
-            );
-        }
-    }
+    protected string $zephirMethod    = 'zephir_start_with';
+    protected string $zephirMethodStr = 'zephir_start_with_str';
 }
diff --git a/src/Optimizers/FunctionCall/StrReplaceOptimizer.php b/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
index c23fc7d569..c6e1538b00 100644
--- a/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrReplaceOptimizer.php
@@ -56,12 +56,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
index 3c5556b2ce..0109d16b03 100644
--- a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
index 0875ba1ea4..ad9b70ae81 100644
--- a/src/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('string');
diff --git a/src/Optimizers/FunctionCall/StrposOptimizer.php b/src/Optimizers/FunctionCall/StrposOptimizer.php
index e3ada49f40..48b84fc1c9 100644
--- a/src/Optimizers/FunctionCall/StrposOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrposOptimizer.php
@@ -68,12 +68,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('int');
diff --git a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
index 1437dceee4..89564a1400 100644
--- a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -26,51 +26,7 @@
  *
  * Optimizes calls to 'strtolower' using internal function
  */
-class StrtolowerOptimizer extends OptimizerAbstract
+class StrtolowerOptimizer extends StrtoupperOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_strtolower(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_fast_strtolower';
 }
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index 76c01118fe..03bff3f455 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -28,6 +28,8 @@
  */
 class StrtoupperOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_fast_strtoupper';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -53,23 +55,24 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('string');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_fast_strtoupper(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/SubstrOptimizer.php b/src/Optimizers/FunctionCall/SubstrOptimizer.php
index ae5f0b68ec..a82d0afb69 100644
--- a/src/Optimizers/FunctionCall/SubstrOptimizer.php
+++ b/src/Optimizers/FunctionCall/SubstrOptimizer.php
@@ -76,12 +76,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/TimeOptimizer.php b/src/Optimizers/FunctionCall/TimeOptimizer.php
index 97f52af919..7f2dc8cfbe 100644
--- a/src/Optimizers/FunctionCall/TimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/TimeOptimizer.php
@@ -47,12 +47,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/time');
         $symbolVariable->setDynamicTypes('long');
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index efe0bf4033..701419de71 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -58,13 +58,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index 0f6f007699..10085855a3 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('string');
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 5d67787e51..5d10f1f25b 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -60,12 +60,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index 4855dc2108..23ab601c77 100644
--- a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
index 5be14ab699..08786d7cbb 100644
--- a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
@@ -53,12 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 34b982d438..619950d852 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -48,14 +48,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable();
-        if ($symbolVariable) {
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
-        }
+        $this->checkNotVariable($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/variables');
         $resolvedParams = $call->getResolvedParamsAsExpr($expression['parameters'], $context, $expression);
diff --git a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
index fd79b7ad0b..c29288a3c3 100644
--- a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
+++ b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
@@ -53,13 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->processExpectedReturn($context);
 
         $symbolVariable = $call->getSymbolVariable(true, $context);
-
-        if ($symbolVariable->isNotVariableAndString()) {
-            throw new CompilerException(
-                'Returned values by functions can only be assigned to variant variables',
-                $expression
-            );
-        }
+        $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
 
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 2a8ef25745..34000d6f7c 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -15,9 +15,12 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\Traits\VariablesTrait;
 
 abstract class OptimizerAbstract
 {
+    use VariablesTrait;
+
     /**
      * @param array              $expression
      * @param Call               $call
diff --git a/src/StaticCall.php b/src/StaticCall.php
index cbbbcfef09..5535849713 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -18,6 +18,7 @@
 use Zephir\Class\Method\Method;
 use Zephir\Detectors\ReadDetector;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable;
 
 use function count;
@@ -35,6 +36,8 @@
  */
 class StaticCall extends Call
 {
+    use VariablesTrait;
+
     /**
      * Compiles a static method call.
      *
@@ -88,13 +91,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
              * At this point, we don't know the exact dynamic type returned by the static method call
              */
             $symbolVariable->setDynamicTypes('undefined');
-
-            if (!$symbolVariable->isVariable()) {
-                throw new CompilerException(
-                    'Returned values by functions can only be assigned to variant variables',
-                    $expression
-                );
-            }
+            $this->checkNotVariable($symbolVariable, $expression);
         }
 
         /**
diff --git a/src/Traits/VariablesTrait.php b/src/Traits/VariablesTrait.php
new file mode 100644
index 0000000000..3fa5518f9f
--- /dev/null
+++ b/src/Traits/VariablesTrait.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Traits;
+
+use Zephir\Exception\CompilerException;
+use Zephir\Variable\Variable;
+
+use function session_cache_limiter;
+
+trait VariablesTrait
+{
+    protected string $returnValueMessage = 'Returned values by functions can only be assigned to variant variables';
+
+    /**
+     * @param Variable|null $variable
+     * @param array         $expression
+     *
+     * @return void
+     */
+    protected function checkNotVariable(
+        ?Variable $variable,
+        array $expression
+    ): void {
+        if (null !== $variable && $variable->isNotVariable()) {
+            throw new CompilerException($this->returnValueMessage, $expression);
+        }
+    }
+
+    /**
+     * @param Variable|null $variable
+     * @param array         $expression
+     *
+     * @return void
+     */
+    protected function checkNotVariableString(
+        ?Variable $variable,
+        array $expression
+    ): void {
+        if (null !== $variable && $variable->isNotVariableAndString()) {
+            throw new CompilerException($this->returnValueMessage, $expression);
+        }
+    }
+}

From f90689be09bb23163c610cd2452b8a8138c41ad3 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 18:14:24 -0600
Subject: [PATCH 221/375] refactored checks for local, read only and
 initialized vars

---
 src/Backend/Backend.php                       |   8 +-
 src/Backend/StringsManager.php                |   9 +-
 src/Cache/MethodCache.php                     |   3 +-
 src/Class/Definition/Definition.php           |  12 +-
 src/Class/Entry.php                           |   6 +-
 src/Class/Method/Method.php                   |  19 +-
 src/Class/Property.php                        |   2 +-
 src/Compiler.php                              |  20 +-
 src/Documentation/File/Sitemap.php            |   2 +-
 src/Exception/CompilerException.php           |  75 ++++
 src/Expression/PropertyDynamicAccess.php      |   6 +-
 src/FileSystem/HardDisk.php                   |   2 +-
 src/FunctionCall.php                          |   1 -
 .../CallUserFuncArrayOptimizer.php            |   8 -
 .../FunctionCall/CallUserFuncOptimizer.php    |   1 -
 .../FunctionCall/GetDefinedVarsOptimizer.php  |   1 -
 .../FunctionCall/JsonDecodeOptimizer.php      |   1 -
 .../FunctionCall/JsonEncodeOptimizer.php      |   1 -
 .../FunctionCall/StartsWithOptimizer.php      |   7 -
 .../FunctionCall/StrtolowerOptimizer.php      |   8 -
 src/Statements/Let/ArrayIndex.php             |  41 +--
 src/Statements/Let/ArrayIndexAppend.php       |  39 +-
 src/Statements/Let/Decr.php                   |  20 +-
 src/Statements/Let/Incr.php                   |  10 +-
 src/Statements/Let/ObjectDynamicProperty.php  |  15 +-
 .../Let/ObjectDynamicStringProperty.php       |  12 +-
 src/Statements/Let/ObjectProperty.php         |  14 +-
 src/Statements/Let/ObjectPropertyAppend.php   |  10 +-
 .../Let/ObjectPropertyArrayIndexAppend.php    |   7 +-
 src/Statements/Let/ObjectPropertyDecr.php     |  33 +-
 src/Statements/Let/ObjectPropertyIncr.php     |  30 +-
 src/Statements/Let/StaticPropertyAdd.php      | 338 +-----------------
 .../Let/StaticPropertyArrayIndexAppend.php    |   3 +-
 src/Statements/Let/StaticPropertySub.php      |  31 +-
 src/Statements/Let/Variable.php               |  17 +-
 src/Statements/Let/VariableAppend.php         |  26 +-
 src/Statements/RequireOnceStatement.php       |   4 -
 src/Statements/RequireStatement.php           |   1 -
 src/StaticCall.php                            |   3 +-
 src/SymbolTable.php                           |   2 +-
 src/Traits/VariablesTrait.php                 |  69 +++-
 src/Variable/Variable.php                     |  18 +-
 42 files changed, 280 insertions(+), 655 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index c39b053f3b..a9db8649ff 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -170,8 +170,7 @@ public function addArrayEntry(
                 . Compiler::getShortUserPath($statement['file'])
                 . '", '
                 . $statement['line']
-                . ');'
-            ;
+                . ');';
         } else {
             $output = 'add_index_'
                 . $type
@@ -181,8 +180,7 @@ public function addArrayEntry(
                 . $keyStr
                 . ', '
                 . $valueStr
-                . ');'
-            ;
+                . ');';
         }
 
         if ($useCodePrinter) {
@@ -1774,7 +1772,7 @@ public function propertyIsset(Variable $var, $key)
      *
      * @throws CompilerException
      */
-    public function resolveValue($value, CompilationContext $context): Variable|bool|string
+    public function resolveValue($value, CompilationContext $context): Variable | bool | string
     {
         if ($value instanceof GlobalConstant) {
             switch ($value->getName()) {
diff --git a/src/Backend/StringsManager.php b/src/Backend/StringsManager.php
index 1877d7dee9..e02b2a60f1 100644
--- a/src/Backend/StringsManager.php
+++ b/src/Backend/StringsManager.php
@@ -107,8 +107,7 @@ public function genConcatCode(): void
                 . $key
                 . '(result, '
                 . implode(', ', $lparams)
-                . ', 0);'
-            ;
+                . ', 0);';
             $macros[] = '#define ZEPHIR_SCONCAT_'
                 . strtoupper($key)
                 . '(result, '
@@ -120,16 +119,14 @@ public function genConcatCode(): void
                 . $key
                 . '(result, '
                 . implode(', ', $lparams)
-                . ', 1);'
-            ;
+                . ', 1);';
             $macros[] = '';
 
             $proto = 'void zephir_concat_'
                 . $key
                 . '(zval *result, '
                 . implode(', ', $params)
-                . ', int self_var)'
-            ;
+                . ', int self_var)';
 
             $codeh .= $proto . ';' . PHP_EOL;
 
diff --git a/src/Cache/MethodCache.php b/src/Cache/MethodCache.php
index d76ff7097d..ad0f9725cd 100644
--- a/src/Cache/MethodCache.php
+++ b/src/Cache/MethodCache.php
@@ -129,8 +129,7 @@ public function get(CompilationContext $compilationContext, string $methodName,
             if (isset($this->cache[$completeName][$method->getName()])) {
                 return $this->cache[$completeName][$method->getName()]
                     . ', '
-                    . SlotsCache::getExistingMethodSlot($method)
-                ;
+                    . SlotsCache::getExistingMethodSlot($method);
             }
 
             $gatherer = $this->gatherer;
diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 6ff79d7114..077cdf50b0 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -903,12 +903,12 @@ public function getExternalHeader(): string
         $parts = explode('\\', $this->namespace);
 
         return 'ext/' . strtolower(
-            $parts[0] . DIRECTORY_SEPARATOR . str_replace(
-                '\\',
-                DIRECTORY_SEPARATOR,
-                $this->namespace
-            ) . DIRECTORY_SEPARATOR . $this->name
-        ) . '.zep';
+                $parts[0] . DIRECTORY_SEPARATOR . str_replace(
+                    '\\',
+                    DIRECTORY_SEPARATOR,
+                    $this->namespace
+                ) . DIRECTORY_SEPARATOR . $this->name
+            ) . '.zep';
     }
 
     /**
diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index b5cf44b89e..ec53e64f55 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -148,9 +148,9 @@ public function isInternal(): bool
     private function isInternalClass(string $className): bool
     {
         $this->isInternal = preg_match(
-            '/^' . $className . '/',
-            $this->compilationContext->classDefinition->getNamespace()
-        ) === 1;
+                '/^' . $className . '/',
+                $this->compilationContext->classDefinition->getNamespace()
+            ) === 1;
 
         return $this->isInternal;
     }
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index c4660fe619..0bf2dec4b0 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1167,11 +1167,11 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
                 $initCode  .= "\t" . $compilationContext->backend->ifVariableValueUndefined(
-                    $targetVar,
-                    $compilationContext,
-                    false,
-                    false
-                ) . PHP_EOL;
+                        $targetVar,
+                        $compilationContext,
+                        false,
+                        false
+                    ) . PHP_EOL;
 
                 if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
                     $substituteVar = $substituteVars[$parameter['name']];
@@ -1180,8 +1180,7 @@ public function compile(CompilationContext $compilationContext): void
                         . ' = &'
                         . $substituteVar->getName()
                         . ';'
-                        . PHP_EOL
-                    ;
+                        . PHP_EOL;
                 }
                 $initCode .= $this->assignDefaultValue($parameter, $compilationContext);
 
@@ -1218,8 +1217,7 @@ public function compile(CompilationContext $compilationContext): void
                         . ', '
                         . implode(', ', $params)
                         . ');'
-                        . PHP_EOL
-                    ;
+                        . PHP_EOL;
                 } else {
                     $code .= "\t"
                         . 'zephir_fetch_params_without_memory_grow('
@@ -1229,8 +1227,7 @@ public function compile(CompilationContext $compilationContext): void
                         . ', '
                         . implode(', ', $params)
                         . ');'
-                        . PHP_EOL
-                    ;
+                        . PHP_EOL;
                 }
             } else {
                 foreach ($params as $param) {
diff --git a/src/Class/Property.php b/src/Class/Property.php
index b91a28d3f0..66c7ce127a 100644
--- a/src/Class/Property.php
+++ b/src/Class/Property.php
@@ -330,7 +330,7 @@ protected function declareProperty(CompilationContext $compilationContext, $type
         }
     }
 
-    protected function getBooleanCode($value): bool|string
+    protected function getBooleanCode($value): bool | string
     {
         if ('true' == $value || true === $value) {
             return '1';
diff --git a/src/Compiler.php b/src/Compiler.php
index 8baa496163..a60fa72b2e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -625,16 +625,14 @@ public function createProjectFiles(string $project): bool
                     . $classDefinition->getCNamespace()
                     . '_'
                     . $classDefinition->getName()
-                    . ');'
-                ;
+                    . ');';
             } else {
                 $interfaceEntries[$dependencyRank][] = 'zend_class_entry *' . $classDefinition->getClassEntry() . ';';
                 $interfaceInits[$dependencyRank][]   = 'ZEPHIR_INIT('
                     . $classDefinition->getCNamespace()
                     . '_'
                     . $classDefinition->getName()
-                    . ');'
-                ;
+                    . ');';
             }
         }
 
@@ -1057,8 +1055,7 @@ public function generate(bool $fromGenerate = false): bool
                     . $classDefinition->getClassEntry()
                     . '['
                     . implode('|', $methods)
-                    . ']'
-                ;
+                    . ']';
             }
         }
 
@@ -1076,8 +1073,7 @@ public function generate(bool $fromGenerate = false): bool
                     . $method->getName()
                     . ':'
                     . implode('-', $method->getVisibility())
-                    . ']'
-                ;
+                    . ']';
             }
 
             $files[] = $compiledFile;
@@ -1088,8 +1084,7 @@ public function generate(bool $fromGenerate = false): bool
                 . $classDefinition->getClassEntry()
                 . '['
                 . implode('|', $methods)
-                . ']'
-            ;
+                . ']';
         }
 
         $hash                = md5($hash);
@@ -1282,7 +1277,7 @@ public function generatePackageDependenciesM4(string $contentM4): string
     /**
      * Returns class the class definition from a given class name.
      */
-    public function getClassDefinition(string $className): Definition|bool
+    public function getClassDefinition(string $className): Definition | bool
     {
         foreach ($this->definitions as $key => $value) {
             if (!strcasecmp($key, $className)) {
@@ -2137,8 +2132,7 @@ private function processAddSources(array $sources, string $project): array
                 . implode(' ', $files)
                 . '", "'
                 . $project
-                . '");'
-            ;
+                . '");';
         }
 
         return $groups;
diff --git a/src/Documentation/File/Sitemap.php b/src/Documentation/File/Sitemap.php
index 60ceb086a0..64bee4ddad 100644
--- a/src/Documentation/File/Sitemap.php
+++ b/src/Documentation/File/Sitemap.php
@@ -24,7 +24,7 @@ class Sitemap implements FileInterface
     protected $baseUrl;
     protected $classes;
     protected $namespaces;
-    private $baseDir;
+    private   $baseDir;
 
     public function __construct($baseDir, $baseUrl, $classList, $namespaceList)
     {
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 1e750fefbb..a3b47223ed 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -42,6 +42,59 @@ public function __construct(string $message = '', $extra = null, $code = 0, $pre
         parent::__construct($message, $code, $previous);
     }
 
+    /**
+     * Cannot use variable type as array
+     *
+     * @param string                   $type     the variable type
+     * @param array|null               $extra    extra info [optional]
+     * @param int                      $code     the Exception code [optional]
+     * @param Exception|Throwable|null $previous the previous throwable used for the exception chaining [optional]
+     *
+     * @return self
+     */
+    public static function cannotUseAsArray(
+        string $type,
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            "Cannot use variable type: '" . $type . "' as array",
+            $extra,
+            $code,
+            $previous
+        );
+    }
+
+    /**
+     * Cannot use non-initialized variable as an object
+     *
+     * @param array|null               $extra    extra info [optional]
+     * @param int                      $code     the Exception code [optional]
+     * @param Exception|Throwable|null $previous the previous throwable used for the exception chaining [optional]
+     *
+     * @return self
+     */
+    public static function cannotUseNonInitializedVariableAsObject(
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            'Cannot use non-initialized variable as an object',
+            $extra,
+            $code,
+            $previous
+        );
+    }
+
+    /**
+     * @param string $operator
+     * @param string $dataType
+     * @param array  $statement
+     *
+     * @return self
+     */
     public static function illegalOperationTypeOnStaticVariable(
         string $operator,
         string $dataType,
@@ -52,4 +105,26 @@ public static function illegalOperationTypeOnStaticVariable(
             $statement
         );
     }
+
+    /**
+     * Returned Values can only be assigned to variant variables
+     *
+     * @param array|null               $extra    extra info [optional]
+     * @param int                      $code     the Exception code [optional]
+     * @param Exception|Throwable|null $previous the previous throwable used for the exception chaining [optional]
+     *
+     * @return self
+     */
+    public static function returnValuesVariantVars(
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            'Returned values by functions can only be assigned to variant variables',
+            $extra,
+            $code,
+            $previous
+        );
+    }
 }
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index f16633be7d..001581781f 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -25,10 +25,10 @@
  */
 class PropertyDynamicAccess
 {
-    protected bool      $expecting = true;
+    protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
-    protected bool      $noisy     = true;
-    protected bool      $readOnly  = false;
+    protected bool      $noisy             = true;
+    protected bool      $readOnly          = false;
 
     /**
      * Resolves the access to a property in an object.
diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 75a0e51d53..5b07163d9b 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -209,7 +209,7 @@ public function normalizePath(string $path): string
     /**
      * Checks if the content of the file on the disk is the same as the content.
      */
-    public static function persistByHash(string $data, string $path): int|bool
+    public static function persistByHash(string $data, string $path): int | bool
     {
         if (!file_exists($path)) {
             return file_put_contents($path, $data);
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index dc0dd4e645..8d014c14bf 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -17,7 +17,6 @@
 use ReflectionFunction;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
-
 use Zephir\Traits\VariablesTrait;
 
 use function class_exists;
diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index ac681d6bfc..9ec447aaf6 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -13,14 +13,6 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * CallUserFuncArrayOptimizer.
  *
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index 29d6d1e3e8..da4e880e0f 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -16,7 +16,6 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
diff --git a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index 38cbc4d81c..7cee111f6d 100644
--- a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -16,7 +16,6 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 /**
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index 139342fbd5..dc9b194bfd 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -16,7 +16,6 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index 79da0b4933..e344f03578 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -16,7 +16,6 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
diff --git a/src/Optimizers/FunctionCall/StartsWithOptimizer.php b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
index 65b45abea3..5679aa663b 100644
--- a/src/Optimizers/FunctionCall/StartsWithOptimizer.php
+++ b/src/Optimizers/FunctionCall/StartsWithOptimizer.php
@@ -13,13 +13,6 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * StartsWithOptimizer.
  *
diff --git a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
index 89564a1400..8a1eaae824 100644
--- a/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtolowerOptimizer.php
@@ -13,14 +13,6 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * StrtolowerOptimizer.
  *
diff --git a/src/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
index d212a953ef..d64ab6df69 100644
--- a/src/Statements/Let/ArrayIndex.php
+++ b/src/Statements/Let/ArrayIndex.php
@@ -19,6 +19,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\GlobalConstant;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function count;
@@ -31,6 +32,8 @@
  */
 class ArrayIndex
 {
+    use VariablesTrait;
+
     /**
      * Compiles foo[y] = {expr}.
      *
@@ -52,49 +55,23 @@ public function assign(
         /*
          * Arrays must be stored in the HEAP
          */
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
-
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is read only",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
+        $this->checkVariableReadOnly($variable, $symbolVariable, $statement);
+        $this->checkVariableLocalOnly($variable, $symbolVariable, $statement);
 
         /*
          * Only dynamic variables can be used as arrays
          */
         if ($symbolVariable->isNotVariableAndArray()) {
-            throw new CompilerException(
-                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+            throw CompilerException::cannotUseAsArray(
+                $symbolVariable->getType(),
                 $statement
             );
         }
 
         if ('variable' == $symbolVariable->getType()) {
             if ($symbolVariable->hasAnyDynamicType('unknown')) {
-                throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
+                throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
             }
 
             /*
diff --git a/src/Statements/Let/ArrayIndexAppend.php b/src/Statements/Let/ArrayIndexAppend.php
index 7cb5445300..4aca7cbbc6 100644
--- a/src/Statements/Let/ArrayIndexAppend.php
+++ b/src/Statements/Let/ArrayIndexAppend.php
@@ -47,49 +47,22 @@ public function assign(
         /*
          * Arrays must be stored in the HEAP
          */
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
-
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is read only",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
+        $this->checkVariableReadOnly($variable, $symbolVariable, $statement);
+        $this->checkVariableLocalOnly($variable, $symbolVariable, $statement);
 
         /*
          * Only dynamic variables and arrays can be used as arrays
          */
         if ($symbolVariable->isNotVariableAndArray()) {
-            throw new CompilerException(
-                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+            throw CompilerException::cannotUseAsArray(
+                $symbolVariable->getType(),
                 $statement
             );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException(
-                'Cannot use non-initialized variable as an object',
-                $statement
-            );
+            throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
         }
 
         /*
diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index 04e5ae83d9..76191b5d6d 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -15,6 +15,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Types\Types;
 use Zephir\Variable\Variable as ZephirVariable;
 
@@ -25,10 +26,12 @@
  */
 class Decr
 {
+    use VariablesTrait;
+
     protected string $operator     = '--';
-    protected string $zephirMethod = 'zephir_decrement';
     protected string $warningText  = 'decrement';
     protected string $warningType  = 'non-valid-decrement';
+    protected string $zephirMethod = 'zephir_decrement';
 
     /**
      * Compiles x++/x--.
@@ -55,17 +58,10 @@ public function assign(
             );
         }
 
-        if ($symbolVariable->isReadOnly()) {
-            /*
-             * TODO: implement increment of objects members
-             */
-            throw new CompilerException(
-                "Cannot mutate variable '"
-                . $variable
-                . "' because it is read only",
-                $statement
-            );
-        }
+        /*
+         * TODO: implement increment of objects members
+         */
+        $this->checkVariableReadOnly($variable, $symbolVariable, $statement);
 
         $codePrinter = $compilationContext->codePrinter;
 
diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index 82c7ccffce..fb0e7b2738 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -13,10 +13,6 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\CompilationContext;
-use Zephir\Exception\CompilerException;
-use Zephir\Variable\Variable as ZephirVariable;
-
 /**
  * Incr.
  *
@@ -24,10 +20,10 @@
  */
 class Incr extends Decr
 {
-    protected string $operator = '++';
+    protected string $operator     = '++';
+    protected string $warningText  = 'increment';
+    protected string $warningType  = 'non-valid-increment';
     protected string $zephirMethod = 'zephir_increment';
-    protected string $warningText = 'increment';
-    protected string $warningType = 'non-valid-increment';
 //    /**
 //     * Compiles x++.
 //     *
diff --git a/src/Statements/Let/ObjectDynamicProperty.php b/src/Statements/Let/ObjectDynamicProperty.php
index 16b97db57a..6d57a5b0ad 100644
--- a/src/Statements/Let/ObjectDynamicProperty.php
+++ b/src/Statements/Let/ObjectDynamicProperty.php
@@ -17,6 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
@@ -24,6 +25,8 @@
  */
 class ObjectDynamicProperty
 {
+    use VariablesTrait;
+
     /**
      * Compiles foo->{x} = {expr}.
      *
@@ -43,12 +46,7 @@ public function assign(
         CompilationContext $compilationContext,
         array $statement
     ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
 
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException(
@@ -87,10 +85,7 @@ public function assign(
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException(
-                'Cannot use non-initialized variable as an object',
-                $statement
-            );
+            throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
         }
 
         /**
diff --git a/src/Statements/Let/ObjectDynamicStringProperty.php b/src/Statements/Let/ObjectDynamicStringProperty.php
index c77024a1b2..343bb48ad8 100644
--- a/src/Statements/Let/ObjectDynamicStringProperty.php
+++ b/src/Statements/Let/ObjectDynamicStringProperty.php
@@ -17,6 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function gettype;
@@ -27,6 +28,8 @@
  */
 class ObjectDynamicStringProperty
 {
+    use VariablesTrait;
+
     /**
      * Compiles foo->{"x"} = {expr}.
      *
@@ -46,12 +49,7 @@ public function assign(
         CompilationContext $compilationContext,
         array $statement
     ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
 
         if ('variable' !== $symbolVariable->getType()) {
             throw new CompilerException(
@@ -85,7 +83,7 @@ public function assign(
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
+            throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
         }
 
         /**
diff --git a/src/Statements/Let/ObjectProperty.php b/src/Statements/Let/ObjectProperty.php
index 7e2cf258e1..0e8c36eb45 100644
--- a/src/Statements/Let/ObjectProperty.php
+++ b/src/Statements/Let/ObjectProperty.php
@@ -15,6 +15,7 @@
 
 use Zephir\CompilationContext as Context;
 use Zephir\CompiledExpression as Expression;
+use Zephir\Exception\CompilerException;
 use Zephir\Exception\CompilerException as Exception;
 use Zephir\Variable\Variable as ZephirVariable;
 
@@ -28,11 +29,11 @@ class ObjectProperty
     /**
      * Compiles foo->x = {expr}.
      *
-     * @param string         $variable
+     * @param string $variable
      * @param ZephirVariable $symbolVariable
-     * @param Expression     $expression
-     * @param Context        $context
-     * @param array          $statement
+     * @param Expression $expression
+     * @param Context $context
+     * @param array $statement
      *
      * @return void
      */
@@ -79,10 +80,7 @@ public function assign(
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new Exception(
-                'Cannot use non-initialized variable as an object',
-                $statement
-            );
+            throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
         }
 
         /*
diff --git a/src/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
index dabc296fbd..5939e7e912 100644
--- a/src/Statements/Let/ObjectPropertyAppend.php
+++ b/src/Statements/Let/ObjectPropertyAppend.php
@@ -16,6 +16,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function current;
@@ -27,6 +28,8 @@
  */
 class ObjectPropertyAppend
 {
+    use VariablesTrait;
+
     /**
      * Compiles x->y[] = foo.
      *
@@ -45,12 +48,7 @@ public function assign(
         CompilationContext $compilationContext,
         array $statement
     ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
 
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException(
diff --git a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
index 1efea1f7d0..1cb0c06542 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -45,12 +45,7 @@ public function assign(
         CompilationContext $compilationContext,
         $statement
     ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
 
         if (!$symbolVariable->isVariable()) {
             throw new CompilerException(
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index bee7126e2b..a0a2205736 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -15,6 +15,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function current;
@@ -26,6 +27,8 @@
  */
 class ObjectPropertyDecr
 {
+    use VariablesTrait;
+
     /**
      * Compiles obj->x--.
      *
@@ -42,45 +45,25 @@ public function assign(
         CompilationContext $compilationContext,
         $statement
     ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
 
         /*
          * Arrays must be stored in the HEAP
          */
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
-
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableLocalOnly($variable, $symbolVariable, $statement);
 
         /*
          * Only dynamic variables can be used as arrays
          */
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+            throw CompilerException::cannotUseAsArray(
+                $symbolVariable->getType(),
                 $statement
             );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException(
-                'Cannot use non-initialized variable as an object',
-                $statement
-            );
+            throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
         }
 
         /*
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 29364111b8..85bbc0f039 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -15,6 +15,7 @@
 
 use Zephir\CompilationContext;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function current;
@@ -26,6 +27,8 @@
  */
 class ObjectPropertyIncr
 {
+    use VariablesTrait;
+
     /**
      * Compiles obj->x++.
      *
@@ -42,42 +45,25 @@ public function assign(
         CompilationContext $compilationContext,
         $statement
     ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
 
         /*
          * Arrays must be stored in the HEAP
          */
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
-
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
+        $this->checkVariableLocalOnly($variable, $symbolVariable, $statement);
 
         /*
          * Only dynamic variables can be used as arrays
          */
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                "Cannot use variable type: '" . $symbolVariable->getType() . "' as array",
+            throw CompilerException::cannotUseAsArray(
+                $symbolVariable->getType(),
                 $statement
             );
         }
 
         if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw new CompilerException('Cannot use non-initialized variable as an object', $statement);
+            throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
         }
 
         /*
diff --git a/src/Statements/Let/StaticPropertyAdd.php b/src/Statements/Let/StaticPropertyAdd.php
index 67a18b2b7c..a4ac55b291 100644
--- a/src/Statements/Let/StaticPropertyAdd.php
+++ b/src/Statements/Let/StaticPropertyAdd.php
@@ -13,346 +13,12 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception;
-use Zephir\Exception\CompilerException;
-use Zephir\Exception\IllegalOperationException;
-
 /**
  * StaticPropertyAdd.
  *
  * Updates static properties
  */
-class StaticPropertyAdd
+class StaticPropertyAdd extends StaticPropertySub
 {
-    /**
-     * Compiles ClassName::foo = {expr}.
-     *
-     * @param string             $className
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws CompilerException
-     * @throws IllegalOperationException
-     */
-    public function assignStatic(
-        string $className,
-        string $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        array $statement
-    ): void {
-        $classDefinition = $compilationContext->classLookup($className);
-
-        if (!$propertyDefinition = $classDefinition->getProperty($property)) {
-            throw new CompilerException(
-                sprintf(
-                    "Class '%s' does not have a property called: '%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
-                $statement
-            );
-        }
-
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                sprintf(
-                    "Cannot access non-static property '%s::%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
-                $statement
-            );
-        }
-
-        if ($propertyDefinition->isPrivate()) {
-            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {
-                throw new CompilerException(
-                    sprintf(
-                        "Cannot access private static property '%s::%s out of its declaring context",
-                        $classDefinition->getCompleteName(),
-                        $property
-                    ),
-                    $statement
-                );
-            }
-        }
-
-        $codePrinter = $compilationContext->codePrinter;
-        $compilationContext->headersManager->add('kernel/object');
-
-        try {
-            $classEntry = $classDefinition->getClassEntry($compilationContext);
-        } catch (Exception $e) {
-            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);
-        }
-
-        switch ($resolvedExpr->getType()) {
-            case 'null':
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, 'null', $compilationContext);
-                break;
-
-            case 'int':
-            case 'uint':
-            case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignLong(
-                    $tempVariable,
-                    $resolvedExpr->getBooleanCode(),
-                    $compilationContext
-                );
-                $compilationContext->backend->addStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'char':
-            case 'uchar':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignLong(
-                    $tempVariable,
-                    '\'' . $resolvedExpr->getCode() . '\'',
-                    $compilationContext
-                );
-                $compilationContext->backend->addStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'double':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignDouble(
-                    $tempVariable,
-                    $resolvedExpr->getCode(),
-                    $compilationContext
-                );
-                $compilationContext->backend->addStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $tempVariable->initVariant($compilationContext);
-
-                if ($resolvedExpr->getCode()) {
-                    $compilationContext->backend->assignString(
-                        $tempVariable,
-                        $resolvedExpr->getCode(),
-                        $compilationContext
-                    );
-                } else {
-                    $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
-                }
-
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-
-                $compilationContext->backend->addStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                break;
-
-            case 'bool':
-                if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->addStaticProperty(
-                        $classEntry,
-                        $property,
-                        'true',
-                        $compilationContext
-                    );
-                } else {
-                    if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->addStaticProperty(
-                            $classEntry,
-                            $property,
-                            'false',
-                            $compilationContext
-                        );
-                    } else {
-                        $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
-                        $codePrinter->increaseLevel();
-                        $compilationContext->backend->addStaticProperty(
-                            $classEntry,
-                            $property,
-                            'true',
-                            $compilationContext
-                        );
-                        $codePrinter->decreaseLevel();
-                        $codePrinter->output('} else {');
-                        $codePrinter->increaseLevel();
-                        $compilationContext->backend->addStaticProperty(
-                            $classEntry,
-                            $property,
-                            'false',
-                            $compilationContext
-                        );
-                        $codePrinter->decreaseLevel();
-                        $codePrinter->output('}');
-                    }
-                }
-                break;
-
-            case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->addStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'array':
-                $compilationContext->backend->addStaticProperty(
-                    $classEntry,
-                    $property,
-                    $resolvedExpr,
-                    $compilationContext
-                );
-                break;
-
-            case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
-                    $resolvedExpr->getCode(),
-                    $compilationContext,
-                    $statement
-                );
-
-                switch ($variableVariable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'char':
-                    case 'uchar':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-
-                        $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->addStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-
-                    case 'double':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-
-                        $compilationContext->backend->assignDouble(
-                            $tempVariable,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        $compilationContext->backend->addStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-
-                    case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-                        $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->addStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-                    default:
-                        $compilationContext->backend->addStaticProperty(
-                            $classEntry,
-                            $property,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        if ($variableVariable->isTemporal()) {
-                            $variableVariable->setIdle(true);
-                        }
-                        break;
-                }
-
-                break;
-
-            default:
-                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
-        }
-    }
+    protected string $methodName = 'addStaticProperty';
 }
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index f2ebb979a3..999a6f7d80 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -89,8 +89,7 @@ public function assignStatic(
 
         if (!$classDefinition->hasProperty($property)) {
             throw new CompilerException(
-                "Class '" . $classDefinition->getCompleteName(
-                ) . "' does not have a property called: '"
+                "Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '"
                 . $property
                 . "'",
                 $statement
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index afb0b8afaa..9ddb28c55a 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -28,6 +28,8 @@
  */
 class StaticPropertySub
 {
+    protected string $methodName = 'subStaticProperty';
+
     /**
      * Compiles ClassName::foo = {expr}.
      *
@@ -48,6 +50,7 @@ public function assignStatic(
         array $statement
     ): void {
         $classDefinition = $compilationContext->classLookup($className);
+        $method          = $this->methodName;
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
             throw new CompilerException(
@@ -111,7 +114,7 @@ public function assignStatic(
                     $resolvedExpr->getBooleanCode(),
                     $compilationContext
                 );
-                $compilationContext->backend->subStaticProperty(
+                $compilationContext->backend->$method(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -134,7 +137,7 @@ public function assignStatic(
                     '\'' . $resolvedExpr->getCode() . '\'',
                     $compilationContext
                 );
-                $compilationContext->backend->subStaticProperty(
+                $compilationContext->backend->$method(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -156,7 +159,7 @@ public function assignStatic(
                     $resolvedExpr->getCode(),
                     $compilationContext
                 );
-                $compilationContext->backend->subStaticProperty(
+                $compilationContext->backend->$method(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -189,7 +192,7 @@ public function assignStatic(
                     $tempVariable->setIdle(true);
                 }
 
-                $compilationContext->backend->subStaticProperty(
+                $compilationContext->backend->$method(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -199,7 +202,7 @@ public function assignStatic(
 
             case 'bool':
                 if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->subStaticProperty(
+                    $compilationContext->backend->$method(
                         $classEntry,
                         $property,
                         'true',
@@ -207,7 +210,7 @@ public function assignStatic(
                     );
                 } else {
                     if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->subStaticProperty(
+                        $compilationContext->backend->$method(
                             $classEntry,
                             $property,
                             'false',
@@ -216,7 +219,7 @@ public function assignStatic(
                     } else {
                         $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->subStaticProperty(
+                        $compilationContext->backend->$method(
                             $classEntry,
                             $property,
                             'true',
@@ -225,7 +228,7 @@ public function assignStatic(
                         $codePrinter->decreaseLevel();
                         $codePrinter->output('} else {');
                         $codePrinter->increaseLevel();
-                        $compilationContext->backend->subStaticProperty(
+                        $compilationContext->backend->$method(
                             $classEntry,
                             $property,
                             'false',
@@ -244,7 +247,7 @@ public function assignStatic(
                     true
                 );
                 $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->subStaticProperty(
+                $compilationContext->backend->$method(
                     $classEntry,
                     $property,
                     $tempVariable,
@@ -256,7 +259,7 @@ public function assignStatic(
                 break;
 
             case 'array':
-                $compilationContext->backend->subStaticProperty(
+                $compilationContext->backend->$method(
                     $classEntry,
                     $property,
                     $resolvedExpr,
@@ -285,7 +288,7 @@ public function assignStatic(
                         );
 
                         $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->subStaticProperty(
+                        $compilationContext->backend->$method(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -309,7 +312,7 @@ public function assignStatic(
                             $variableVariable,
                             $compilationContext
                         );
-                        $compilationContext->backend->subStaticProperty(
+                        $compilationContext->backend->$method(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -328,7 +331,7 @@ public function assignStatic(
                             true
                         );
                         $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->subStaticProperty(
+                        $compilationContext->backend->$method(
                             $classEntry,
                             $property,
                             $tempVariable,
@@ -339,7 +342,7 @@ public function assignStatic(
                         }
                         break;
                     default:
-                        $compilationContext->backend->subStaticProperty(
+                        $compilationContext->backend->$method(
                             $classEntry,
                             $property,
                             $variableVariable,
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 1276b183de..6caea121e1 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -20,6 +20,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalOperationException;
 use Zephir\Name;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function array_keys;
@@ -31,6 +32,8 @@
  */
 class Variable
 {
+    use VariablesTrait;
+
     /**
      * Compiles foo = {expr}
      * Changes the value of a mutable variable.
@@ -52,12 +55,7 @@ public function assign(
         CompilationContext $compilationContext,
         array $statement
     ): void {
-        if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is read only",
-                $statement
-            );
-        }
+        $this->checkVariableReadOnly($variable, $symbolVariable, $statement);
 
         $codePrinter = $compilationContext->codePrinter;
 
@@ -67,12 +65,7 @@ public function assign(
         if ('assign' == $statement['operator']) {
             $symbolVariable->setIsInitialized(true, $compilationContext);
         } else {
-            if (!$symbolVariable->isInitialized()) {
-                throw new CompilerException(
-                    "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                    $statement
-                );
-            }
+            $this->checkVariableInitialized($variable, $symbolVariable, $statement);
         }
 
         /*
diff --git a/src/Statements/Let/VariableAppend.php b/src/Statements/Let/VariableAppend.php
index 196f126a63..8771fa0e06 100644
--- a/src/Statements/Let/VariableAppend.php
+++ b/src/Statements/Let/VariableAppend.php
@@ -16,6 +16,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
@@ -25,6 +26,8 @@
  */
 class VariableAppend
 {
+    use VariablesTrait;
+
     /**
      * Compiles foo[] = {expr}.
      *
@@ -43,26 +46,9 @@ public function assign(
         CompilationContext $compilationContext,
         $statement
     ): void {
-        if (!$symbolVariable->isInitialized()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isReadOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is read only",
-                $statement
-            );
-        }
-
-        if ($symbolVariable->isLocalOnly()) {
-            throw new CompilerException(
-                "Cannot mutate variable '" . $variable . "' because it is local only",
-                $statement
-            );
-        }
+        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
+        $this->checkVariableReadOnly($variable, $symbolVariable, $statement);
+        $this->checkVariableLocalOnly($variable, $symbolVariable, $statement);
 
         /*
          * Only dynamic variables and arrays can be used as arrays
diff --git a/src/Statements/RequireOnceStatement.php b/src/Statements/RequireOnceStatement.php
index a07f6f1999..35f03b4d58 100644
--- a/src/Statements/RequireOnceStatement.php
+++ b/src/Statements/RequireOnceStatement.php
@@ -13,10 +13,6 @@
 
 namespace Zephir\Statements;
 
-use Zephir\CompilationContext;
-use Zephir\Exception;
-use Zephir\Expression;
-
 /**
  * RequireOnceStatement.
  *
diff --git a/src/Statements/RequireStatement.php b/src/Statements/RequireStatement.php
index 203fe17d5e..84c1036109 100644
--- a/src/Statements/RequireStatement.php
+++ b/src/Statements/RequireStatement.php
@@ -14,7 +14,6 @@
 namespace Zephir\Statements;
 
 use Zephir\CompilationContext;
-use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
diff --git a/src/StaticCall.php b/src/StaticCall.php
index 5535849713..f437d02865 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -211,8 +211,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                             $numberParameters = $classMethod->getNumberOfParameters();
                             if ($callNumberParameters > $numberParameters) {
                                 throw new CompilerException(
-                                    "Method '" . $classDefinition->getCompleteName(
-                                    ) . '::' . $expression['name']
+                                    "Method '" . $classDefinition->getCompleteName() . '::' . $expression['name']
                                     . "' called with a wrong number of parameters, the method has: "
                                     . $expectedNumberParameters
                                     . ', passed: '
diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index 5205f7c6c7..b49ef92a2f 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -58,7 +58,7 @@ class SymbolTable
     /**
      * @var int
      */
-    protected int $tempVarCount   = 0;
+    protected int $tempVarCount = 0;
 
     public function __construct(protected CompilationContext $compilationContext)
     {
diff --git a/src/Traits/VariablesTrait.php b/src/Traits/VariablesTrait.php
index 3fa5518f9f..a66a385590 100644
--- a/src/Traits/VariablesTrait.php
+++ b/src/Traits/VariablesTrait.php
@@ -15,13 +15,10 @@
 
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
-
-use function session_cache_limiter;
+use Zephir\Variable\Variable as ZephirVariable;
 
 trait VariablesTrait
 {
-    protected string $returnValueMessage = 'Returned values by functions can only be assigned to variant variables';
-
     /**
      * @param Variable|null $variable
      * @param array         $expression
@@ -33,7 +30,7 @@ protected function checkNotVariable(
         array $expression
     ): void {
         if (null !== $variable && $variable->isNotVariable()) {
-            throw new CompilerException($this->returnValueMessage, $expression);
+            throw CompilerException::returnValuesVariantVars($expression);
         }
     }
 
@@ -48,7 +45,67 @@ protected function checkNotVariableString(
         array $expression
     ): void {
         if (null !== $variable && $variable->isNotVariableAndString()) {
-            throw new CompilerException($this->returnValueMessage, $expression);
+            throw CompilerException::returnValuesVariantVars($expression);
+        }
+    }
+
+    /**
+     * @param string         $variable
+     * @param ZephirVariable $symbolVariable
+     * @param array          $statement
+     *
+     * @return void
+     */
+    protected function checkVariableInitialized(
+        string $variable,
+        ZephirVariable $symbolVariable,
+        array $statement
+    ): void {
+        if (true !== $symbolVariable->isInitialized()) {
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is not initialized",
+                $statement
+            );
+        }
+    }
+
+    /**
+     * @param string         $variable
+     * @param ZephirVariable $symbolVariable
+     * @param array          $statement
+     *
+     * @return void
+     */
+    protected function checkVariableLocalOnly(
+        string $variable,
+        ZephirVariable $symbolVariable,
+        array $statement
+    ): void {
+        if ($symbolVariable->isLocalOnly()) {
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is local only",
+                $statement
+            );
+        }
+    }
+
+    /**
+     * @param string         $variable
+     * @param ZephirVariable $symbolVariable
+     * @param array          $statement
+     *
+     * @return void
+     */
+    protected function checkVariableReadOnly(
+        string $variable,
+        ZephirVariable $symbolVariable,
+        array $statement
+    ): void {
+        if ($symbolVariable->isReadOnly()) {
+            throw new CompilerException(
+                "Cannot mutate variable '" . $variable . "' because it is read only",
+                $statement
+            );
         }
     }
 }
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index dcc40cecd1..6d858a6f44 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -33,10 +33,10 @@ class Variable implements TypeAwareInterface
     public const BRANCH_MAGIC     = '$$';
     public const VAR_RETURN_VALUE = 'return_value';
     public const VAR_THIS_POINTER = 'this_ptr';
-    protected Definition|ReflectionClass|null $associatedClass  = null;
-    protected array                           $classTypes       = [];
-    protected mixed                           $defaultInitValue = null;
-    protected bool                            $doublePointer    = false;
+    protected Definition | ReflectionClass | null $associatedClass  = null;
+    protected array                               $classTypes       = [];
+    protected mixed                               $defaultInitValue = null;
+    protected bool                                $doublePointer    = false;
     /**
      * Current dynamic type of the variable.
      *
@@ -155,7 +155,7 @@ public function enableDefaultAutoInitValue(): void
     /**
      * Returns the class related to the variable.
      */
-    public function getAssociatedClass(): Definition|ReflectionClass|null
+    public function getAssociatedClass(): Definition | ReflectionClass | null
     {
         return $this->associatedClass;
     }
@@ -337,7 +337,7 @@ public function getVariantInits(): int
      *
      * @return bool
      */
-    public function hasAnyDynamicType(array|string $types): bool
+    public function hasAnyDynamicType(array | string $types): bool
     {
         if (is_string($types)) {
             $types = [$types];
@@ -819,7 +819,7 @@ public function separate(CompilationContext $compilationContext): void
      *
      * @param ReflectionClass|Definition $associatedClass
      */
-    public function setAssociatedClass(ReflectionClass|Definition $associatedClass): void
+    public function setAssociatedClass(ReflectionClass | Definition $associatedClass): void
     {
         $this->associatedClass = $associatedClass;
     }
@@ -829,7 +829,7 @@ public function setAssociatedClass(ReflectionClass|Definition $associatedClass):
      *
      * @param array|string $classTypes
      */
-    public function setClassTypes(array|string $classTypes): void
+    public function setClassTypes(array | string $classTypes): void
     {
         if (is_string($classTypes)) {
             if (!in_array($classTypes, $this->classTypes)) {
@@ -861,7 +861,7 @@ public function setDefaultInitValue(mixed $value): void
      *
      * @param array|string $types
      */
-    public function setDynamicTypes(array|string $types): void
+    public function setDynamicTypes(array | string $types): void
     {
         unset($this->dynamicTypes['unknown']);
 

From e30313a9bcc50cc674e5be4bbba584762cdb25d8 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 18:19:09 -0600
Subject: [PATCH 222/375] correcting call_user_func* optimizers

---
 .../CallUserFuncArrayOptimizer.php            | 13 ++++++++++++
 .../FunctionCall/CallUserFuncOptimizer.php    | 21 +++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index 9ec447aaf6..f38ccad65f 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -22,4 +22,17 @@ class CallUserFuncArrayOptimizer extends CallUserFuncOptimizer
 {
     protected int    $parameterCount = 2;
     protected string $zephirMethod   = 'ZEPHIR_CALL_USER_FUNC_ARRAY';
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, array $resolvedParams): string
+    {
+        return $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        ;
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index da4e880e0f..ca19967323 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -18,6 +18,8 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 
+use Zephir\Variable\Variable;
+
 use function count;
 
 /**
@@ -43,7 +45,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if ($this->parameterCount != count($expression['parameters'])) {
+        if ($this->parameterCount !== count($expression['parameters'])) {
             return false;
         }
 
@@ -82,11 +84,22 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        );
+        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
     }
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, array $resolvedParams): string
+    {
+        return $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        ;
+    }
 }

From a6e8de54e97d418f7917754bcfe1265a69058dc8 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 18:20:38 -0600
Subject: [PATCH 223/375] phpcs

---
 src/Class/Definition/Definition.php                  | 12 ++++++------
 src/Class/Entry.php                                  |  6 +++---
 src/Class/Method/Method.php                          | 10 +++++-----
 src/Documentation/File/Sitemap.php                   |  2 +-
 .../FunctionCall/CallUserFuncOptimizer.php           |  1 -
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 077cdf50b0..6ff79d7114 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -903,12 +903,12 @@ public function getExternalHeader(): string
         $parts = explode('\\', $this->namespace);
 
         return 'ext/' . strtolower(
-                $parts[0] . DIRECTORY_SEPARATOR . str_replace(
-                    '\\',
-                    DIRECTORY_SEPARATOR,
-                    $this->namespace
-                ) . DIRECTORY_SEPARATOR . $this->name
-            ) . '.zep';
+            $parts[0] . DIRECTORY_SEPARATOR . str_replace(
+                '\\',
+                DIRECTORY_SEPARATOR,
+                $this->namespace
+            ) . DIRECTORY_SEPARATOR . $this->name
+        ) . '.zep';
     }
 
     /**
diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index ec53e64f55..b5cf44b89e 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -148,9 +148,9 @@ public function isInternal(): bool
     private function isInternalClass(string $className): bool
     {
         $this->isInternal = preg_match(
-                '/^' . $className . '/',
-                $this->compilationContext->classDefinition->getNamespace()
-            ) === 1;
+            '/^' . $className . '/',
+            $this->compilationContext->classDefinition->getNamespace()
+        ) === 1;
 
         return $this->isInternal;
     }
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 0bf2dec4b0..376541b0f2 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1167,11 +1167,11 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
                 $initCode  .= "\t" . $compilationContext->backend->ifVariableValueUndefined(
-                        $targetVar,
-                        $compilationContext,
-                        false,
-                        false
-                    ) . PHP_EOL;
+                    $targetVar,
+                    $compilationContext,
+                    false,
+                    false
+                ) . PHP_EOL;
 
                 if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
                     $substituteVar = $substituteVars[$parameter['name']];
diff --git a/src/Documentation/File/Sitemap.php b/src/Documentation/File/Sitemap.php
index 64bee4ddad..60ceb086a0 100644
--- a/src/Documentation/File/Sitemap.php
+++ b/src/Documentation/File/Sitemap.php
@@ -24,7 +24,7 @@ class Sitemap implements FileInterface
     protected $baseUrl;
     protected $classes;
     protected $namespaces;
-    private   $baseDir;
+    private $baseDir;
 
     public function __construct($baseDir, $baseUrl, $classList, $namespaceList)
     {
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index ca19967323..e7d0f5493a 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -17,7 +17,6 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
-
 use Zephir\Variable\Variable;
 
 use function count;

From 405c49b119000581ac6191b38422c7541a7b1fd3 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 18:48:34 -0600
Subject: [PATCH 224/375] additional refactoring for checking expression
 elements

---
 src/Operators/AbstractOperator.php            |  3 ++
 .../Arithmetical/ArithmeticalBaseOperator.php |  9 +---
 src/Operators/Arithmetical/DivOperator.php    |  9 +---
 src/Operators/Arithmetical/ModOperator.php    |  9 +---
 src/Operators/Bitwise/BitwiseBaseOperator.php |  9 +---
 src/Operators/Bitwise/BitwiseNotOperator.php  |  4 +-
 .../Comparison/ComparisonBaseOperator.php     |  9 +---
 src/Operators/Logical/AndOperator.php         |  9 +---
 src/Operators/Logical/LogicalBaseOperator.php |  9 +---
 src/Operators/Logical/OrOperator.php          |  9 +---
 src/Operators/Other/ConcatOperator.php        |  9 +---
 src/Operators/Unary/MinusOperator.php         |  4 +-
 src/Operators/Unary/NotOperator.php           |  4 +-
 src/Optimizers/FunctionCall/ACosOptimizer.php |  5 +--
 src/Optimizers/FunctionCall/ASinOptimizer.php |  5 +--
 src/Optimizers/FunctionCall/CosOptimizer.php  |  5 +--
 .../FunctionCall/LdexpOptimizer.php           | 26 ++++++-----
 .../FunctionCall/LtrimOptimizer.php           |  2 +-
 .../FunctionCall/RtrimOptimizer.php           |  2 +-
 src/Optimizers/FunctionCall/SinOptimizer.php  |  5 +--
 src/Optimizers/FunctionCall/SqrtOptimizer.php |  5 +--
 .../FunctionCall/StripcslashesOptimizer.php   | 45 +------------------
 .../FunctionCall/StripslashesOptimizer.php    | 12 ++++-
 src/Optimizers/FunctionCall/TanOptimizer.php  |  5 +--
 src/Optimizers/FunctionCall/TrimOptimizer.php |  7 ++-
 src/Optimizers/MathOptimizer.php              | 22 ++++-----
 src/Traits/VariablesTrait.php                 | 35 +++++++++++++++
 27 files changed, 107 insertions(+), 170 deletions(-)

diff --git a/src/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
index 0e90bc02ce..88778dc4e4 100644
--- a/src/Operators/AbstractOperator.php
+++ b/src/Operators/AbstractOperator.php
@@ -14,12 +14,15 @@
 namespace Zephir\Operators;
 
 use Zephir\CompilationContext;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable;
 
 use function is_object;
 
 abstract class AbstractOperator
 {
+    use VariablesTrait;
+
     protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
     protected bool      $literalOnly       = true;
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 26f5398db1..9259884c0c 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -44,13 +44,8 @@ class ArithmeticalBaseOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeft($expression, CompilerException::class, $expression);
+        $this->checkRight($expression, CompilerException::class, $expression);
 
         // Check for constant folding optimizations
         if ($optimized = $this->optimizeConstantFolding($expression, $compilationContext)) {
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index ca229e1a97..d9ee6339c4 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -36,13 +36,8 @@ class DivOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index b9f301e1fb..0603b901e7 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -36,13 +36,8 @@ class ModOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index 65d01a7dc1..78aca6733e 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -35,13 +35,8 @@ class BitwiseBaseOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeft($expression, CompilerException::class, $expression);
+        $this->checkRight($expression, CompilerException::class, $expression);
 
         /**
          * Check for constant folding optimizations.
diff --git a/src/Operators/Bitwise/BitwiseNotOperator.php b/src/Operators/Bitwise/BitwiseNotOperator.php
index 6395803a65..09341a2a1d 100644
--- a/src/Operators/Bitwise/BitwiseNotOperator.php
+++ b/src/Operators/Bitwise/BitwiseNotOperator.php
@@ -34,9 +34,7 @@ class BitwiseNotOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
+        $this->checkLeft($expression, CompilerException::class, $expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index f3e15799d9..b1fb743703 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -48,13 +48,8 @@ public function compile(array $expression, CompilationContext $compilationContex
             return $conditions;
         }
 
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeft($expression, CompilerException::class, $expression);
+        $this->checkRight($expression, CompilerException::class, $expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly(true);
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index 992f644543..2cf8b5bdea 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -37,13 +37,8 @@ class AndOperator extends LogicalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index f09f25fe29..9c8f971a44 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -26,13 +26,8 @@ class LogicalBaseOperator extends AbstractOperator
 {
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeft($expression, CompilerException::class, $expression);
+        $this->checkRight($expression, CompilerException::class, $expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
index 8f2bad3d98..2e141e6758 100644
--- a/src/Operators/Logical/OrOperator.php
+++ b/src/Operators/Logical/OrOperator.php
@@ -27,13 +27,8 @@ class OrOperator extends LogicalBaseOperator
 
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new Exception('Missing left part of the expression');
-        }
-
-        if (!isset($expression['right'])) {
-            throw new Exception('Missing right part of the expression');
-        }
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Other/ConcatOperator.php b/src/Operators/Other/ConcatOperator.php
index 94c5d641fe..473d6f7fa1 100644
--- a/src/Operators/Other/ConcatOperator.php
+++ b/src/Operators/Other/ConcatOperator.php
@@ -40,13 +40,8 @@ class ConcatOperator extends AbstractOperator
      */
     public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
-
-        if (!isset($expression['right'])) {
-            throw new CompilerException('Missing right part of the expression', $expression);
-        }
+        $this->checkLeft($expression, CompilerException::class, $expression);
+        $this->checkRight($expression, CompilerException::class, $expression);
 
         $compilationContext->headersManager->add('kernel/concat');
 
diff --git a/src/Operators/Unary/MinusOperator.php b/src/Operators/Unary/MinusOperator.php
index 7808b6501c..68706cd469 100644
--- a/src/Operators/Unary/MinusOperator.php
+++ b/src/Operators/Unary/MinusOperator.php
@@ -36,9 +36,7 @@ class MinusOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression');
-        }
+        $this->checkLeft($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Operators/Unary/NotOperator.php b/src/Operators/Unary/NotOperator.php
index 7a55b2c13c..780b3fd256 100644
--- a/src/Operators/Unary/NotOperator.php
+++ b/src/Operators/Unary/NotOperator.php
@@ -34,9 +34,7 @@ class NotOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        if (!isset($expression['left'])) {
-            throw new CompilerException('Missing left part of the expression', $expression);
-        }
+        $this->checkLeft($expression);
 
         $leftExpr = new Expression($expression['left']);
         $leftExpr->setReadOnly($this->readOnly);
diff --git a/src/Optimizers/FunctionCall/ACosOptimizer.php b/src/Optimizers/FunctionCall/ACosOptimizer.php
index c225ec1753..23b7f537d4 100644
--- a/src/Optimizers/FunctionCall/ACosOptimizer.php
+++ b/src/Optimizers/FunctionCall/ACosOptimizer.php
@@ -22,8 +22,5 @@
  */
 class ACosOptimizer extends MathOptimizer
 {
-    public function getFunctionName()
-    {
-        return 'acos';
-    }
+    protected string $zephirMethod = 'acos';
 }
diff --git a/src/Optimizers/FunctionCall/ASinOptimizer.php b/src/Optimizers/FunctionCall/ASinOptimizer.php
index 2b34bcd84d..0fdb16b1f6 100644
--- a/src/Optimizers/FunctionCall/ASinOptimizer.php
+++ b/src/Optimizers/FunctionCall/ASinOptimizer.php
@@ -22,8 +22,5 @@
  */
 class ASinOptimizer extends MathOptimizer
 {
-    public function getFunctionName()
-    {
-        return 'asin';
-    }
+    protected string $zephirMethod = 'asin';
 }
diff --git a/src/Optimizers/FunctionCall/CosOptimizer.php b/src/Optimizers/FunctionCall/CosOptimizer.php
index 4121c7f5ca..0dcd924381 100644
--- a/src/Optimizers/FunctionCall/CosOptimizer.php
+++ b/src/Optimizers/FunctionCall/CosOptimizer.php
@@ -22,8 +22,5 @@
  */
 class CosOptimizer extends MathOptimizer
 {
-    public function getFunctionName()
-    {
-        return 'cos';
-    }
+    protected string $zephirMethod = 'cos';
 }
diff --git a/src/Optimizers/FunctionCall/LdexpOptimizer.php b/src/Optimizers/FunctionCall/LdexpOptimizer.php
index 52e539c9d0..1e542ffb66 100644
--- a/src/Optimizers/FunctionCall/LdexpOptimizer.php
+++ b/src/Optimizers/FunctionCall/LdexpOptimizer.php
@@ -28,15 +28,7 @@
  */
 class LdexpOptimizer extends MathOptimizer
 {
-    /**
-     * {@inheritdoc}
-     *
-     * @return string
-     */
-    public function getFunctionName()
-    {
-        return 'ldexp';
-    }
+    protected string $zephirMethod = 'ldexp';
 
     /**
      * @param array              $expression
@@ -50,16 +42,26 @@ public function getFunctionName()
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
         if (!isset($expression['parameters']) || 2 != count($expression['parameters'])) {
-            throw new CompilerException(sprintf("'%s' requires two parameters", $this->getFunctionName()), $expression);
+            throw new CompilerException(
+                sprintf(
+                    "'%s' requires two parameters",
+                    $this->zephirMethod
+                ),
+                $expression
+            );
         }
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         $context->headersManager->add('kernel/math');
 
         return new CompiledExpression(
             'double',
-            'zephir_' . $this->getFunctionName() . '(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
+            'zephir_' . $this->zephirMethod . '(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
             $expression
         );
     }
diff --git a/src/Optimizers/FunctionCall/LtrimOptimizer.php b/src/Optimizers/FunctionCall/LtrimOptimizer.php
index 3049cdb909..d298d1fbf3 100644
--- a/src/Optimizers/FunctionCall/LtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/LtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class LtrimOptimizer extends TrimOptimizer
 {
-    protected static $TRIM_WHERE = 'ZEPHIR_TRIM_LEFT';
+    protected string $trimWhere = 'ZEPHIR_TRIM_LEFT';
 }
diff --git a/src/Optimizers/FunctionCall/RtrimOptimizer.php b/src/Optimizers/FunctionCall/RtrimOptimizer.php
index a07580f223..5169f883d8 100644
--- a/src/Optimizers/FunctionCall/RtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/RtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class RtrimOptimizer extends TrimOptimizer
 {
-    protected static $TRIM_WHERE = 'ZEPHIR_TRIM_RIGHT';
+    protected string $trimWhere = 'ZEPHIR_TRIM_RIGHT';
 }
diff --git a/src/Optimizers/FunctionCall/SinOptimizer.php b/src/Optimizers/FunctionCall/SinOptimizer.php
index fae801a78b..2db9c3745e 100644
--- a/src/Optimizers/FunctionCall/SinOptimizer.php
+++ b/src/Optimizers/FunctionCall/SinOptimizer.php
@@ -22,8 +22,5 @@
  */
 class SinOptimizer extends MathOptimizer
 {
-    public function getFunctionName()
-    {
-        return 'sin';
-    }
+    protected string $zephirMethod = 'sin';
 }
diff --git a/src/Optimizers/FunctionCall/SqrtOptimizer.php b/src/Optimizers/FunctionCall/SqrtOptimizer.php
index 351d28b00c..bfebca23cd 100644
--- a/src/Optimizers/FunctionCall/SqrtOptimizer.php
+++ b/src/Optimizers/FunctionCall/SqrtOptimizer.php
@@ -22,8 +22,5 @@
  */
 class SqrtOptimizer extends MathOptimizer
 {
-    public function getFunctionName()
-    {
-        return 'sqrt';
-    }
+    protected string $zephirMethod = 'sqrt';
 }
diff --git a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
index 0109d16b03..cda81bdcd5 100644
--- a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -26,48 +26,7 @@
  *
  * Optimizes calls to 'stripcslashes' using internal function
  */
-class StripcslashesOptimizer extends OptimizerAbstract
+class StripcslashesOptimizer extends StripslashesOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (count($expression['parameters']) > 1) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable();
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_stripcslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_stripcslashes';
 }
diff --git a/src/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
index ad9b70ae81..4ec467d1e3 100644
--- a/src/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -28,6 +28,8 @@
  */
 class StripslashesOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_stripslashes';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -58,14 +60,20 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('string');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_stripslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/TanOptimizer.php b/src/Optimizers/FunctionCall/TanOptimizer.php
index e384f3c23b..69cdf18060 100644
--- a/src/Optimizers/FunctionCall/TanOptimizer.php
+++ b/src/Optimizers/FunctionCall/TanOptimizer.php
@@ -22,8 +22,5 @@
  */
 class TanOptimizer extends MathOptimizer
 {
-    public function getFunctionName()
-    {
-        return 'tan';
-    }
+    protected string $zephirMethod = 'tan';
 }
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index 701419de71..38ae5ee408 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -28,7 +28,7 @@
  */
 class TrimOptimizer extends OptimizerAbstract
 {
-    protected static $TRIM_WHERE = 'ZEPHIR_TRIM_BOTH';
+    protected string $trimWhere = 'ZEPHIR_TRIM_BOTH';
 
     /**
      * @param array              $expression
@@ -76,7 +76,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_fast_trim(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $charlist . ', ' . static::$TRIM_WHERE . ');'
+            'zephir_fast_trim(' . $symbol . ', '
+            . $resolvedParams[0] . ', '
+            . $charlist . ', '
+            . $this->trimWhere . ');'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/MathOptimizer.php b/src/Optimizers/MathOptimizer.php
index 12fdcf55a0..af64138a34 100644
--- a/src/Optimizers/MathOptimizer.php
+++ b/src/Optimizers/MathOptimizer.php
@@ -22,12 +22,7 @@
 
 abstract class MathOptimizer extends OptimizerAbstract
 {
-    /**
-     * Gets function name.
-     *
-     * @return string
-     */
-    abstract public function getFunctionName();
+    protected string $zephirMethod = '';
 
     /**
      * @param array              $expression
@@ -55,7 +50,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         /**
          * Get CompiledExpression(s) for resolved var(s).
          */
-        $resolvedParams     = $call->getResolvedParamsAsExpr($expression['parameters'], $context, $expression);
+        $resolvedParams     = $call->getResolvedParamsAsExpr(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
         $compiledExpression = $resolvedParams[0];
 
         switch ($compiledExpression->getType()) {
@@ -85,14 +84,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
                         return new CompiledExpression(
                             'double',
-                            'zephir_' . $this->getFunctionName() . '(' . $context->backend->getVariableCode(
-                                $variable
-                            ) . ')',
+                            'zephir_' . $this->zephirMethod
+                            . '(' . $context->backend->getVariableCode($variable) . ')',
                             $expression
                         );
-                        break;
                 }
-                break;
         }
 
         return false;
@@ -108,7 +104,7 @@ protected function passNativeFCall($compiledExpression, $expression)
     {
         return new CompiledExpression(
             'double',
-            $this->getFunctionName() . '(' . $compiledExpression->getCode() . ')',
+            $this->zephirMethod . '(' . $compiledExpression->getCode() . ')',
             $expression
         );
     }
diff --git a/src/Traits/VariablesTrait.php b/src/Traits/VariablesTrait.php
index a66a385590..37c4d353d9 100644
--- a/src/Traits/VariablesTrait.php
+++ b/src/Traits/VariablesTrait.php
@@ -13,12 +13,47 @@
 
 namespace Zephir\Traits;
 
+use Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 use Zephir\Variable\Variable as ZephirVariable;
 
 trait VariablesTrait
 {
+    /**
+     * @param array      $expression
+     * @param string     $exception
+     * @param array|null $extra
+     *
+     * @return void
+     */
+    protected function checkLeft(
+        array $expression,
+        string $exception = Exception::class,
+        ?array $extra = null
+    ): void {
+        if (!isset($expression['left'])) {
+            throw new $exception('Missing left part of the expression', $extra);
+        }
+    }
+
+    /**
+     * @param array      $expression
+     * @param string     $exception
+     * @param array|null $extra
+     *
+     * @return void
+     */
+    protected function checkRight(
+        array $expression,
+        string $exception = Exception::class,
+        ?array $extra = null
+    ): void {
+        if (!isset($expression['right'])) {
+            throw new $exception('Missing right part of the expression', $extra);
+        }
+    }
+
     /**
      * @param Variable|null $variable
      * @param array         $expression

From 35fa92197d040692b7803a5235250a51bb1438cc Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 19:30:14 -0600
Subject: [PATCH 225/375] removing duplicate code; refactoring

---
 src/Operators/Other/LikelyOperator.php      |  58 +-------
 src/Operators/Other/RequireOnceOperator.php |  81 +----------
 src/Operators/Other/RequireOperator.php     |  17 ++-
 src/Operators/Other/UnlikelyOperator.php    |  26 +++-
 src/Statements/ForStatement.php             | 141 +++++++++-----------
 src/Statements/Let/ObjectPropertyDecr.php   |   8 +-
 src/Statements/Let/ObjectPropertyIncr.php   |  95 +------------
 7 files changed, 109 insertions(+), 317 deletions(-)

diff --git a/src/Operators/Other/LikelyOperator.php b/src/Operators/Other/LikelyOperator.php
index d3a5b97752..0986947f9e 100644
--- a/src/Operators/Other/LikelyOperator.php
+++ b/src/Operators/Other/LikelyOperator.php
@@ -13,63 +13,11 @@
 
 namespace Zephir\Operators\Other;
 
-use ReflectionException;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception;
-use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-use Zephir\Operators\AbstractOperator;
-
 /**
  * Adds a branch prediction hint when evaluating an expression
  */
-class LikelyOperator extends AbstractOperator
+class LikelyOperator extends UnlikelyOperator
 {
-    /**
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     *
-     * @throws Exception
-     * @throws ReflectionException
-     */
-    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
-    {
-        if (!isset($expression['left'])) {
-            throw new CompilerException("Invalid 'left' operand for 'likely' expression", $expression['left']);
-        }
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
-
-        if ('bool' === $left->getType()) {
-            return new CompiledExpression('bool', 'EXPECTED(' . $left->getCode() . ')', $expression);
-        }
-
-        if ('variable' === $left->getType()) {
-            $variable = $compilationContext->symbolTable->getVariableForRead(
-                $left->getCode(),
-                $compilationContext,
-                $expression['left']
-            );
-            switch ($variable->getType()) {
-                case 'bool':
-                    return new CompiledExpression('bool', 'EXPECTED(' . $variable->getName() . ')', $expression);
-
-                default:
-                    $compilationContext->headersManager->add('kernel/operators');
-                    $symbol = $compilationContext->backend->getVariableCode($variable);
-
-                    return new CompiledExpression('bool', 'UNEXPECTED(zephir_is_true(' . $symbol . '))', $expression);
-            }
-        }
-
-        throw new CompilerException(
-            "Cannot use expression type: '" . $left->getType() . "' in 'likely' operator",
-            $expression['left']
-        );
-    }
+    protected string $operator     = 'likely';
+    protected string $zephirMethod = 'EXPECTED';
 }
diff --git a/src/Operators/Other/RequireOnceOperator.php b/src/Operators/Other/RequireOnceOperator.php
index a3122c28d4..c83c1b5d8b 100644
--- a/src/Operators/Other/RequireOnceOperator.php
+++ b/src/Operators/Other/RequireOnceOperator.php
@@ -13,84 +13,13 @@
 
 namespace Zephir\Operators\Other;
 
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception;
-use Zephir\Expression;
-use Zephir\Operators\AbstractOperator;
-
 /**
  * Includes once a plain PHP file
  */
-class RequireOnceOperator extends AbstractOperator
+class RequireOnceOperator extends RequireOperator
 {
-    /**
-     * @param array $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     *
-     * @throws Exception
-     */
-    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression
-    {
-        $expr = new Expression($expression['left']);
-        $expr->setReadOnly(true);
-        $expr->setExpectReturn(true);
-
-        $exprPath = $expr->compile($compilationContext);
-        if ('variable' === $exprPath->getType()) {
-            $exprVariable = $compilationContext->symbolTable->getVariableForRead(
-                $exprPath->getCode(),
-                $compilationContext,
-                $expression
-            );
-            $exprVar      = $compilationContext->backend->getVariableCode($exprVariable);
-            if ('variable' === $exprVariable->getType()) {
-                if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
-                    $compilationContext->logger->warning(
-                        'Possible attempt to use invalid type as path in "require_once" operator',
-                        ['non-valid-require-once', $expression]
-                    );
-                }
-            }
-        } else {
-            $exprVar = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext,
-                $expression
-            );
-            $compilationContext->backend->assignString($exprVar, $exprPath->getCode(), $compilationContext);
-            $exprVar = $compilationContext->backend->getVariableCode($exprVar);
-        }
-
-        $symbolVariable = false;
-        if ($this->isExpecting()) {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
-                'variable',
-                $compilationContext
-            );
-        }
-
-        $compilationContext->headersManager->add('kernel/memory');
-        $compilationContext->headersManager->add('kernel/require');
-
-        $codePrinter = $compilationContext->codePrinter;
-
-        if ($symbolVariable) {
-            $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
-            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-            $codePrinter->output('if (zephir_require_once_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
-        } else {
-            $codePrinter->output('if (zephir_require_once_zval(' . $exprVar . ') == FAILURE) {');
-        }
-        $codePrinter->output("\t" . 'RETURN_MM_NULL();');
-        $codePrinter->output('}');
-
-        if ($symbolVariable) {
-            return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
-        }
-
-        return new CompiledExpression('null', null, $expression);
-    }
+    protected string $operator        = 'require_once';
+    protected string $warningName     = 'non-valid-require-once';
+    protected string $zephirMethod    = 'zephir_require_once_zval';
+    protected string $zephirMethodRet = 'zephir_require_once_zval_ret';
 }
diff --git a/src/Operators/Other/RequireOperator.php b/src/Operators/Other/RequireOperator.php
index 208c46c6f0..e823b14ac4 100644
--- a/src/Operators/Other/RequireOperator.php
+++ b/src/Operators/Other/RequireOperator.php
@@ -25,8 +25,13 @@
  */
 class RequireOperator extends AbstractOperator
 {
+    protected string $operator        = 'require';
+    protected string $warningName     = 'non-valid-require';
+    protected string $zephirMethod    = 'zephir_require_zval';
+    protected string $zephirMethodRet = 'zephir_require_zval_ret';
+
     /**
-     * @param array $expression
+     * @param array              $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
@@ -51,8 +56,8 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ('variable' === $exprVariable->getType()) {
                 if ($exprVariable->hasDifferentDynamicType(['undefined', 'string'])) {
                     $compilationContext->logger->warning(
-                        'Possible attempt to use invalid type as path in "require" operator',
-                        ['non-valid-require', $expression]
+                        'Possible attempt to use invalid type as path in "' . $this->operator . '" operator',
+                        [$this->warningName, $expression]
                     );
                 }
             }
@@ -82,9 +87,11 @@ public function compile(array $expression, CompilationContext $compilationContex
         if ($symbolVariable) {
             $codePrinter->output('ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&' . $symbolVariable->getName() . ');');
             $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-            $codePrinter->output('if (zephir_require_zval_ret(' . $symbol . ', ' . $exprVar . ') == FAILURE) {');
+            $codePrinter->output(
+                'if (' . $this->zephirMethodRet . '(' . $symbol . ', ' . $exprVar . ') == FAILURE) {'
+            );
         } else {
-            $codePrinter->output('if (zephir_require_zval(' . $exprVar . ') == FAILURE) {');
+            $codePrinter->output('if (' . $this->zephirMethod . '(' . $exprVar . ') == FAILURE) {');
         }
         $codePrinter->output("\t" . 'RETURN_MM_NULL();');
         $codePrinter->output('}');
diff --git a/src/Operators/Other/UnlikelyOperator.php b/src/Operators/Other/UnlikelyOperator.php
index 38d807e747..4869a5db11 100644
--- a/src/Operators/Other/UnlikelyOperator.php
+++ b/src/Operators/Other/UnlikelyOperator.php
@@ -26,10 +26,13 @@
  */
 class UnlikelyOperator extends AbstractOperator
 {
+    protected string $operator     = 'unlikely';
+    protected string $zephirMethod = 'UNEXPECTED';
+
     /**
-     * Compile unlikely operator
+     * Compile likely/unlikely operator
      *
-     * @param                    $expression
+     * @param array              $expression
      * @param CompilationContext $compilationContext
      *
      * @return CompiledExpression
@@ -40,7 +43,10 @@ class UnlikelyOperator extends AbstractOperator
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
         if (!isset($expression['left'])) {
-            throw new CompilerException("Invalid 'left' operand for 'unlikely' expression", $expression['left']);
+            throw new CompilerException(
+                "Invalid 'left' operand for '" . $this->operator . "' expression",
+                $expression['left']
+            );
         }
 
         $leftExpr = new Expression($expression['left']);
@@ -48,7 +54,11 @@ public function compile($expression, CompilationContext $compilationContext): Co
         $left = $leftExpr->compile($compilationContext);
 
         if ('bool' === $left->getType()) {
-            return new CompiledExpression('bool', 'UNEXPECTED(' . $left->getCode() . ')', $expression);
+            return new CompiledExpression(
+                'bool',
+                $this->zephirMethod . '(' . $left->getCode() . ')',
+                $expression
+            );
         }
 
         if ('variable' === $left->getType()) {
@@ -59,7 +69,11 @@ public function compile($expression, CompilationContext $compilationContext): Co
             );
             switch ($variable->getType()) {
                 case 'bool':
-                    return new CompiledExpression('bool', 'UNEXPECTED(' . $variable->getName() . ')', $expression);
+                    return new CompiledExpression(
+                        'bool',
+                        $this->zephirMethod . '(' . $variable->getName() . ')',
+                        $expression
+                    );
 
                 default:
                     $compilationContext->headersManager->add('kernel/operators');
@@ -70,7 +84,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
         }
 
         throw new CompilerException(
-            "Cannot use expression type: '" . $left->getType() . "' in 'unlikely' operator",
+            "Cannot use expression type: '" . $left->getType() . "' in '" . $this->operator . "' operator",
             $expression['left']
         );
     }
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 0041d1c942..8180d067a6 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -14,9 +14,11 @@
 namespace Zephir\Statements;
 
 use ReflectionException;
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Detectors\ForValueUseDetector;
+use Zephir\Detectors\WriteDetector;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
@@ -201,7 +203,7 @@ public function compileHashTraverse(
              */
             if (isset($this->statement['key'])) {
                 if (!$keyVariable->isTemporal()) {
-                    $detector->setDetectionFlags(ForValueUseDetector::DETECT_ALL);
+                    $detector->setDetectionFlags(WriteDetector::DETECT_ALL);
                     if ($detector->detect($keyVariable->getName(), $this->statement['statements'])) {
                         $duplicateKey = true;
                     }
@@ -389,22 +391,7 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
         /**
          * Compile statements in the 'for' block
          */
-        if (isset($this->statement['statements'])) {
-            $st = new StatementsBlock($this->statement['statements']);
-            $st->isLoop(true);
-            if (isset($this->statement['key'])) {
-                $st->getMutateGatherer()->increaseMutations($this->statement['key']);
-            }
-            $st->getMutateGatherer()->increaseMutations($this->statement['value']);
-            $st->compile($compilationContext);
-        }
-
-        /**
-         * Restore the cycle counter
-         */
-        --$compilationContext->insideCycle;
-
-        $codePrinter->output('}');
+        $this->compileStatementsForBlock($compilationContext, $codePrinter);
 
         $compilationContext->backend->destroyIterator($iteratorVariable, $compilationContext);
     }
@@ -549,7 +536,6 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
                             ->setLine($this->statement['line'])
                             ->setChar($this->statement['char']),
             ]);
-            $statement = new LetStatement($builderLet->build());
         } else {
             /**
              * Create an implicit 'let' operation for the initialize expression
@@ -567,9 +553,9 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
                             ->setLine($this->statement['line'])
                             ->setChar($this->statement['char']),
             ]);
-            $statement = new LetStatement($builderLet->build());
         }
 
+        $statement = new LetStatement($builderLet->build());
         $statement->compile($compilationContext);
 
         /**
@@ -721,28 +707,7 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
             /**
              * Create an implicit 'let' operation, TODO: use a builder.
              */
-            $statement = new LetStatement([
-                'type'        => 'let',
-                'assignments' => [
-                    [
-                        'assign-type' => 'variable',
-                        'variable'    => $keyVariableName,
-                        'operator'    => 'assign',
-                        'expr'        => [
-                            'type'  => 'variable',
-                            'value' => $keyVariable->getName(),
-                            'file'  => $this->statement['file'],
-                            'line'  => $this->statement['line'],
-                            'char'  => $this->statement['char'],
-                        ],
-                        'file'        => $this->statement['file'],
-                        'line'        => $this->statement['line'],
-                        'char'        => $this->statement['char'],
-                    ],
-                ],
-            ]);
-
-            $statement->compile($compilationContext);
+            $this->getLetStatement($keyVariableName, $keyVariable, $compilationContext);
         }
 
         /**
@@ -761,28 +726,7 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
             /**
              * Create an implicit 'let' operation, TODO: use a builder.
              */
-            $statement = new LetStatement([
-                'type'        => 'let',
-                'assignments' => [
-                    [
-                        'assign-type' => 'variable',
-                        'variable'    => $valueVariable,
-                        'operator'    => 'assign',
-                        'expr'        => [
-                            'type'  => 'variable',
-                            'value' => $tempVariable->getName(),
-                            'file'  => $this->statement['file'],
-                            'line'  => $this->statement['line'],
-                            'char'  => $this->statement['char'],
-                        ],
-                        'file'        => $this->statement['file'],
-                        'line'        => $this->statement['line'],
-                        'char'        => $this->statement['char'],
-                    ],
-                ],
-            ]);
-
-            $statement->compile($compilationContext);
+            $this->getLetStatement($valueVariable, $tempVariable, $compilationContext);
         }
 
         $codePrinter->decreaseLevel();
@@ -790,22 +734,7 @@ public function compileRange(array $exprRaw, CompilationContext $compilationCont
         /**
          * Compile statements in the 'for' block
          */
-        if (isset($this->statement['statements'])) {
-            $st = new StatementsBlock($this->statement['statements']);
-            $st->isLoop(true);
-            if (isset($this->statement['key'])) {
-                $st->getMutateGatherer()->increaseMutations($this->statement['key']);
-            }
-            $st->getMutateGatherer()->increaseMutations($this->statement['value']);
-            $st->compile($compilationContext);
-        }
-
-        /**
-         * Restore the cycle counter
-         */
-        --$compilationContext->insideCycle;
-
-        $codePrinter->output('}');
+        $this->compileStatementsForBlock($compilationContext, $codePrinter);
         $codePrinter->decreaseLevel();
         $codePrinter->output('}');
 
@@ -975,6 +904,21 @@ public function compileStringTraverse(
         /**
          * Compile statements in the 'for' block
          */
+        $this->compileStatementsForBlock($compilationContext, $codePrinter);
+    }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param Printer|null $codePrinter
+     *
+     * @return void
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    private function compileStatementsForBlock(
+        CompilationContext $compilationContext,
+        ?Printer $codePrinter
+    ): void {
         if (isset($this->statement['statements'])) {
             $st = new StatementsBlock($this->statement['statements']);
             $st->isLoop(true);
@@ -985,8 +929,47 @@ public function compileStringTraverse(
             $st->compile($compilationContext);
         }
 
+        /**
+         * Restore the cycle counter
+         */
         --$compilationContext->insideCycle;
 
         $codePrinter->output('}');
     }
+
+    /**
+     * @param mixed              $keyVariableName
+     * @param Variable           $keyVariable
+     * @param CompilationContext $compilationContext
+     *
+     * @return LetStatement
+     */
+    private function getLetStatement(
+        mixed $keyVariableName,
+        Variable $keyVariable,
+        CompilationContext $compilationContext
+    ): void {
+        $statement = new LetStatement([
+            'type'        => 'let',
+            'assignments' => [
+                [
+                    'assign-type' => 'variable',
+                    'variable'    => $keyVariableName,
+                    'operator'    => 'assign',
+                    'expr'        => [
+                        'type'  => 'variable',
+                        'value' => $keyVariable->getName(),
+                        'file'  => $this->statement['file'],
+                        'line'  => $this->statement['line'],
+                        'char'  => $this->statement['char'],
+                    ],
+                    'file'        => $this->statement['file'],
+                    'line'        => $this->statement['line'],
+                    'char'        => $this->statement['char'],
+                ],
+            ],
+        ]);
+
+        $statement->compile($compilationContext);
+    }
 }
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index a0a2205736..22f73309a1 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -28,15 +28,17 @@
 class ObjectPropertyDecr
 {
     use VariablesTrait;
+    
+    protected string $zephirMethod = 'zephir_property_decr';
 
     /**
-     * Compiles obj->x--.
+     * Compiles obj->x++/obj->x--.
      *
      * @param string             $variable
+     * @param string             $property
      * @param ZephirVariable     $symbolVariable
      * @param CompilationContext $compilationContext
      * @param array              $statement
-     * @param mixed              $property
      */
     public function assign(
         $variable,
@@ -118,7 +120,7 @@ public function assign(
 
         $compilationContext->headersManager->add('kernel/object');
         $compilationContext->codePrinter->output(
-            'RETURN_ON_FAILURE(zephir_property_decr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
+            'RETURN_ON_FAILURE(' . $this->zephirMethod . '(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
         );
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 85bbc0f039..87724a82da 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -28,97 +28,6 @@
 class ObjectPropertyIncr
 {
     use VariablesTrait;
-
-    /**
-     * Compiles obj->x++.
-     *
-     * @param string             $variable
-     * @param string             $property
-     * @param ZephirVariable     $symbolVariable
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     */
-    public function assign(
-        $variable,
-        $property,
-        ZephirVariable $symbolVariable,
-        CompilationContext $compilationContext,
-        $statement
-    ): void {
-        $this->checkVariableInitialized($variable, $symbolVariable, $statement);
-
-        /*
-         * Arrays must be stored in the HEAP
-         */
-        $this->checkVariableLocalOnly($variable, $symbolVariable, $statement);
-
-        /*
-         * Only dynamic variables can be used as arrays
-         */
-        if (!$symbolVariable->isVariable()) {
-            throw CompilerException::cannotUseAsArray(
-                $symbolVariable->getType(),
-                $statement
-            );
-        }
-
-        if ($symbolVariable->hasAnyDynamicType('unknown')) {
-            throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
-        }
-
-        /*
-         * Trying to use a non-object dynamic variable as object
-         */
-        if ($symbolVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
-            $compilationContext->logger->warning(
-                'Possible attempt to increment non-object dynamic variable',
-                ['non-object-update', $statement]
-            );
-        }
-
-        /*
-         * Check if the variable to update is defined
-         */
-        if ('this' == $symbolVariable->getRealName()) {
-            $classDefinition = $compilationContext->classDefinition;
-            if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException(
-                    "Class '" . $classDefinition->getCompleteName(
-                    ) . "' does not have a property called: '" . $property . "'",
-                    $statement
-                );
-            }
-        } else {
-            /*
-             * If we know the class related to a variable we could check if the property
-             * is defined on that class
-             */
-            if ($symbolVariable->hasAnyDynamicType('object')) {
-                $classType = current($symbolVariable->getClassTypes());
-                $compiler  = $compilationContext->compiler;
-
-                if ($compiler->isClass($classType)) {
-                    $classDefinition = $compiler->getClassDefinition($classType);
-                    if (!$classDefinition) {
-                        throw new CompilerException(
-                            'Cannot locate class definition for class: ' . $classType,
-                            $statement
-                        );
-                    }
-
-                    if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException(
-                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
-                            $statement
-                        );
-                    }
-                }
-            }
-        }
-
-        $compilationContext->headersManager->add('kernel/object');
-        $compilationContext->codePrinter->output(
-            'RETURN_ON_FAILURE(zephir_property_incr(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
-        );
-    }
+    
+    protected string $zephirMethod = 'zephir_property_incr';
 }

From c95ba81fb52864431dfae3219cb0c80993c10e70 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 19:48:32 -0600
Subject: [PATCH 226/375] correcting import

---
 src/Statements/ForStatement.php           |  2 +-
 src/Statements/Let/ObjectPropertyDecr.php |  5 +++--
 src/Statements/Let/ObjectPropertyIncr.php | 11 +----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 8180d067a6..7454538837 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -909,7 +909,7 @@ public function compileStringTraverse(
 
     /**
      * @param CompilationContext $compilationContext
-     * @param Printer|null $codePrinter
+     * @param Printer|null       $codePrinter
      *
      * @return void
      * @throws Exception
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index 22f73309a1..840ffb27ff 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -28,7 +28,7 @@
 class ObjectPropertyDecr
 {
     use VariablesTrait;
-    
+
     protected string $zephirMethod = 'zephir_property_decr';
 
     /**
@@ -120,7 +120,8 @@ public function assign(
 
         $compilationContext->headersManager->add('kernel/object');
         $compilationContext->codePrinter->output(
-            'RETURN_ON_FAILURE(' . $this->zephirMethod . '(' . $symbolVariable->getName() . ', SL("' . $property . '")));'
+            'RETURN_ON_FAILURE(' . $this->zephirMethod . '(' . $symbolVariable->getName(
+            ) . ', SL("' . $property . '")));'
         );
     }
 }
diff --git a/src/Statements/Let/ObjectPropertyIncr.php b/src/Statements/Let/ObjectPropertyIncr.php
index 87724a82da..94a2623a70 100644
--- a/src/Statements/Let/ObjectPropertyIncr.php
+++ b/src/Statements/Let/ObjectPropertyIncr.php
@@ -13,21 +13,12 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\CompilationContext;
-use Zephir\Exception\CompilerException;
-use Zephir\Traits\VariablesTrait;
-use Zephir\Variable\Variable as ZephirVariable;
-
-use function current;
-
 /**
  * ObjectPropertyIncr.
  *
  * Increments an object property
  */
-class ObjectPropertyIncr
+class ObjectPropertyIncr extends ObjectPropertyDecr
 {
-    use VariablesTrait;
-    
     protected string $zephirMethod = 'zephir_property_incr';
 }

From af7fc4c0350d98567883586bc5ac39c6d142736b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 20:11:25 -0600
Subject: [PATCH 227/375] a lot of code smells and optimizations

---
 src/Backend/Backend.php                       | 80 ++++++----------
 src/Class/Definition/Definition.php           |  6 +-
 src/Class/Method/Parameters.php               | 17 +---
 src/Code/ArgInfoDefinition.php                |  2 +-
 src/Code/Builder/Struct.php                   | 80 +++++++---------
 src/Compiler.php                              |  4 +-
 src/Console/Application.php                   |  4 +-
 src/Documentation/Template.php                |  4 +-
 src/Documentation/Theme.php                   |  7 +-
 src/Expression/PropertyDynamicAccess.php      | 29 +++---
 src/FileSystem/HardDisk.php                   | 13 +--
 src/FunctionCall.php                          | 51 +++++-----
 .../Arithmetical/ArithmeticalBaseOperator.php | 82 +++++-----------
 src/Operators/Arithmetical/DivOperator.php    | 59 +++++-------
 src/Operators/Arithmetical/ModOperator.php    | 54 ++++-------
 src/Operators/Bitwise/BitwiseBaseOperator.php | 84 ++++++-----------
 .../Comparison/ComparisonBaseOperator.php     | 90 +++++-------------
 src/Operators/Logical/LogicalBaseOperator.php | 38 ++++----
 src/Operators/Other/CastOperator.php          | 53 +++++------
 .../FunctionCall/GlobalsSetOptimizer.php      | 48 +++++-----
 .../FunctionCall/PregMatchOptimizer.php       |  2 +-
 .../FunctionCall/VarDumpOptimizer.php         | 12 +--
 .../FunctionCall/VarExportOptimizer.php       | 12 +--
 src/Passes/CallGathererPass.php               |  1 -
 src/Passes/LocalContextPass.php               |  6 +-
 src/Passes/StaticTypeInference.php            | 17 ++--
 src/Statements/Let/StaticPropertySub.php      |  3 +-
 src/Statements/Let/Variable.php               | 10 +-
 src/Statements/LetStatement.php               | 93 ++++++++-----------
 src/Statements/SwitchStatement.php            | 12 +--
 30 files changed, 360 insertions(+), 613 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index a9db8649ff..e791072e76 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -214,26 +214,18 @@ public function arrayFetch(
         $context->headersManager->add('kernel/array');
         $isVariable = $index instanceof Variable;
 
-        switch ($index->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-                $type = 'long';
-                break;
-
-            /* Types which map to the same */
-            case 'variable':
-            case 'mixed':
-            case 'string':
-                $type = $index->getType();
-                break;
-
-            default:
-                throw new CompilerException(
-                    sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
-                    $arrayAccess['right']
-                );
-        }
+        $type = match ($index->getType()) {
+            'int',
+            'uint',
+            'long'   => 'long',
+            'variable',
+            'mixed',
+            'string' => $index->getType(),
+            default  => throw new CompilerException(
+                sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
+                $arrayAccess['right']
+            ),
+        };
         if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
             $output = 'zephir_array_fetch('
                 . $this->getVariableCode($var)
@@ -1395,23 +1387,18 @@ public function getInternalSignature(Method $method, CompilationContext $context
         $parameters          = $method->getParameters();
         if (is_object($parameters)) {
             foreach ($parameters->getParameters() as $parameter) {
-                switch ($parameter['data-type']) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'double':
-                    case 'bool':
-                    case 'char':
-                    case 'uchar':
-                    case 'string':
-                    case 'array':
-                        $signatureParameters[] = 'zval *' . $parameter['name'] . '_param_ext';
-                        break;
-
-                    default:
-                        $signatureParameters[] = 'zval *' . $parameter['name'] . '_ext ';
-                        break;
-                }
+                $signatureParameters[] = match ($parameter['data-type']) {
+                    'int',
+                    'uint',
+                    'long',
+                    'double',
+                    'bool',
+                    'char',
+                    'uchar',
+                    'string',
+                    'array' => 'zval *' . $parameter['name'] . '_param_ext',
+                    default => 'zval *' . $parameter['name'] . '_ext ',
+                };
             }
         }
 
@@ -1775,19 +1762,12 @@ public function propertyIsset(Variable $var, $key)
     public function resolveValue($value, CompilationContext $context): Variable | bool | string
     {
         if ($value instanceof GlobalConstant) {
-            switch ($value->getName()) {
-                case 'ZEPHIR_GLOBAL(global_null)':
-                    $value = 'null';
-                    break;
-                case 'ZEPHIR_GLOBAL(global_true)':
-                    $value = 'true';
-                    break;
-                case 'ZEPHIR_GLOBAL(global_false)':
-                    $value = 'false';
-                    break;
-                default:
-                    throw new CompilerException('Unknown constant ' . $value->getName());
-            }
+            $value = match ($value->getName()) {
+                'ZEPHIR_GLOBAL(global_null)'  => 'null',
+                'ZEPHIR_GLOBAL(global_true)'  => 'true',
+                'ZEPHIR_GLOBAL(global_false)' => 'false',
+                default                       => throw new CompilerException('Unknown constant ' . $value->getName()),
+            };
         }
 
         if ('null' == $value || 'true' == $value || 'false' == $value) {
diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 6ff79d7114..d4ca2234cc 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -1147,10 +1147,8 @@ public function hasConstant(string $name): bool
     public function hasMethod(string $methodName): bool
     {
         $methodNameLower = strtolower($methodName);
-        foreach ($this->methods as $name => $method) {
-            if ($methodNameLower === $name) {
-                return true;
-            }
+        if (array_key_exists($methodNameLower, $this->methods)) {
+            return true;
         }
 
         $extendsClassDefinition = $this->getExtendsClassDefinition();
diff --git a/src/Class/Method/Parameters.php b/src/Class/Method/Parameters.php
index a7feb2a384..6e2e382e76 100644
--- a/src/Class/Method/Parameters.php
+++ b/src/Class/Method/Parameters.php
@@ -82,19 +82,10 @@ public function fetchParameters(bool $isMethodInternal): array
             $name     = $parameter['name'];
             $dataType = $parameter['data-type'] ?? 'variable';
 
-            switch ($dataType) {
-                case 'object':
-                case 'callable':
-                case 'resource':
-                case 'variable':
-                case 'mixed':
-                    $parameters[] = $isMethodInternal ? $name : '&' . $name;
-                    break;
-
-                default:
-                    $parameters[] = ($isMethodInternal ? $name : '&' . $name) . '_param';
-                    break;
-            }
+            $parameters[] = match ($dataType) {
+                'object', 'callable', 'resource', 'variable', 'mixed' => $isMethodInternal ? $name : '&' . $name,
+                default                                               => ($isMethodInternal ? $name : '&' . $name) . '_param',
+            };
 
             if (isset($parameter['default'])) {
                 $this->optionalParameters[] = $parameter;
diff --git a/src/Code/ArgInfoDefinition.php b/src/Code/ArgInfoDefinition.php
index 897ac0d9f6..9c6c9ebc4b 100644
--- a/src/Code/ArgInfoDefinition.php
+++ b/src/Code/ArgInfoDefinition.php
@@ -324,7 +324,7 @@ private function renderPhalconCompatible(): bool
         $compatibilityClasses  = require_once __DIR__ . '/../../config/phalcon-compatibility-headers.php';
         $classDefinition       = $this->functionLike->getClassDefinition();
         $implementedInterfaces = $classDefinition !== null ? $classDefinition->getImplementedInterfaces() : [];
-        $extendsClass          = $classDefinition !== null ? $classDefinition->getExtendsClass() : null;
+        $extendsClass          = $classDefinition?->getExtendsClass();
 
         if (empty($implementedInterfaces) && $extendsClass === null) {
             return false;
diff --git a/src/Code/Builder/Struct.php b/src/Code/Builder/Struct.php
index c20c7d8c05..7c55fe8a27 100644
--- a/src/Code/Builder/Struct.php
+++ b/src/Code/Builder/Struct.php
@@ -88,24 +88,14 @@ public function getCDefault(string $name, array $global, string $namespace): str
             throw new RuntimeException('Field "' . $name . '" does not have a default value');
         }
 
-        switch ($global['type']) {
-            case 'boolean':
-            case 'bool':
-                return '';
-
-            case 'string':
-                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));';
-
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'double':
-            case 'hash':
-                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ' . $global['default'] . ';';
-
-            default:
-                throw new InvalidArgumentException('Unknown global type: ' . $global['type']);
-        }
+        return match ($global['type']) {
+            'boolean', 'bool' => '',
+            'string' => "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));',
+            'int', 'uint', 'long', 'double', 'hash' => "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ' . $global['default'] . ';',
+            default => throw new InvalidArgumentException(
+                'Unknown global type: ' . $global['type']
+            ),
+        };
     }
 
     /**
@@ -126,36 +116,30 @@ public function getInitEntry(string $name, array $global, string $namespace): st
         $iniName    = $iniEntry['name'] ?? $namespace . '.' . $structName;
         $scope      = $iniEntry['scope'] ?? 'PHP_INI_ALL';
 
-        switch ($global['type']) {
-            case 'boolean':
-            case 'bool':
-                return
-                    'STD_PHP_INI_BOOLEAN("' .
-                    $iniName .
-                    '", "' .
-                    (int)(true === $global['default']) .
-                    '", ' .
-                    $scope .
-                    ', OnUpdateBool, ' .
-                    $structName .
-                    ', zend_' .
-                    $namespace .
-                    '_globals, ' .
-                    $namespace . '_globals)';
-
-            case 'string':
-                return sprintf(
-                    'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
-                    '"' . $iniName . '"',
-                    '"' . $global['default'] . '"',
-                    $scope,
-                    $structName,
-                    'zend_' . $namespace . '_globals',
-                    $namespace . '_globals',
-                );
-        }
-
-        return '';
+        return match ($global['type']) {
+            'boolean', 'bool' => 'STD_PHP_INI_BOOLEAN("' .
+                $iniName .
+                '", "' .
+                (int)(true === $global['default']) .
+                '", ' .
+                $scope .
+                ', OnUpdateBool, ' .
+                $structName .
+                ', zend_' .
+                $namespace .
+                '_globals, ' .
+                $namespace . '_globals)',
+            'string'          => sprintf(
+                'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
+                '"' . $iniName . '"',
+                '"' . $global['default'] . '"',
+                $scope,
+                $structName,
+                'zend_' . $namespace . '_globals',
+                $namespace . '_globals',
+            ),
+            default           => '',
+        };
     }
 
     /**
diff --git a/src/Compiler.php b/src/Compiler.php
index a60fa72b2e..65a394fdf7 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -690,7 +690,7 @@ public function createProjectFiles(string $project): bool
          */
         $destructors = $this->config->get('destructors');
         if (is_array($destructors)) {
-            $invokeRequestDestructors = $this->processCodeInjection($destructors, 'request');
+            $invokeRequestDestructors = $this->processCodeInjection($destructors);
             $includes                 .= PHP_EOL . $invokeRequestDestructors[0];
             $reqDestructors           = $invokeRequestDestructors[1];
 
@@ -712,7 +712,7 @@ public function createProjectFiles(string $project): bool
          */
         $initializers = $this->config->get('initializers');
         if (is_array($initializers)) {
-            $invokeRequestInitializers = $this->processCodeInjection($initializers, 'request');
+            $invokeRequestInitializers = $this->processCodeInjection($initializers);
             $includes                  .= PHP_EOL . $invokeRequestInitializers[0];
             $reqInitializers           = $invokeRequestInitializers[1];
 
diff --git a/src/Console/Application.php b/src/Console/Application.php
index f33529b246..4917c3bf3b 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -127,7 +127,7 @@ public function getHelp(): string
     public function getLongVersion(): string
     {
         $version = explode('-', $this->getVersion());
-        $commit  = "({$version[1]})";
+        $commit  = "($version[1])";
 
         return trim(
             sprintf(
@@ -163,7 +163,7 @@ public function getVersion(): string
         $version = explode('-', parent::getVersion());
 
         if (isset($version[1]) && str_starts_with($version[1], '$')) {
-            return "{$version[0]}-source";
+            return "$version[0]-source";
         }
 
         return implode('-', $version);
diff --git a/src/Documentation/Template.php b/src/Documentation/Template.php
index 12803af96c..12dd93e9a7 100644
--- a/src/Documentation/Template.php
+++ b/src/Documentation/Template.php
@@ -74,9 +74,7 @@ public function parse()
         $path = $this->getTemplatePath($this->template);
         ob_start();
         include $path;
-        $content = ob_get_clean();
-
-        return $content;
+        return ob_get_clean();
     }
 
     public function partial(string $fileName, array $data = [])
diff --git a/src/Documentation/Theme.php b/src/Documentation/Theme.php
index bf6760434d..ad4f7d90b3 100644
--- a/src/Documentation/Theme.php
+++ b/src/Documentation/Theme.php
@@ -148,9 +148,7 @@ public function buildStaticDirectory(): void
             mkdir($outputStt, 0777, true);
         }
 
-        if ($this->extendedTheme) {
-            $this->extendedTheme->buildStaticDirectory();
-        }
+        $this->extendedTheme?->buildStaticDirectory();
 
         $themeStt = $this->getThemePath('static');
 
@@ -220,9 +218,8 @@ public function getOutputPath($path)
         $path         = pathinfo($this->outputDir . '/' . $path);
         $pathDirname  = $path['dirname'];
         $pathBasename = $path['basename'];
-        $pathFilename = $pathDirname . '/' . $pathBasename;
 
-        return $pathFilename;
+        return $pathDirname . '/' . $pathBasename;
     }
 
     /**
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index 001581781f..25f3558055 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -69,23 +69,18 @@ public function compile($expression, CompilationContext $compilationContext)
                 );
         }
 
-        switch ($propertyAccess['right']['type']) {
-            case 'variable':
-                $propertyVariable = $compilationContext->symbolTable->getVariableForRead(
-                    $propertyAccess['right']['value'],
-                    $compilationContext,
-                    $expression
-                );
-                break;
-            case 'string':
-                $propertyVariable = null;
-                break;
-            default:
-                throw new CompilerException(
-                    'Variable type: ' . $propertyAccess['right']['type'] . ' cannot be used as object',
-                    $propertyAccess['left']
-                );
-        }
+        $propertyVariable = match ($propertyAccess['right']['type']) {
+            'variable' => $compilationContext->symbolTable->getVariableForRead(
+                $propertyAccess['right']['value'],
+                $compilationContext,
+                $expression
+            ),
+            'string'   => null,
+            default    => throw new CompilerException(
+                'Variable type: ' . $propertyAccess['right']['type'] . ' cannot be used as object',
+                $propertyAccess['left']
+            ),
+        };
 
         /**
          * Resolves the symbol that expects the value
diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 5b07163d9b..50a87a9009 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -264,14 +264,11 @@ public function write(string $path, string $data): void
 
     protected function deleteFileInfoObject(SplFileInfo $file): bool
     {
-        switch ($file->getType()) {
-            case 'dir':
-                return @rmdir((string)$file->getRealPath());
-            case 'link':
-                return @unlink($file->getPathname());
-            default:
-                return @unlink((string)$file->getRealPath());
-        }
+        return match ($file->getType()) {
+            'dir'   => @rmdir((string)$file->getRealPath()),
+            'link'  => @unlink($file->getPathname()),
+            default => @unlink((string)$file->getRealPath()),
+        };
     }
 
     private function listDirectoryRecursively(
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 8d014c14bf..fdcb556bba 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -85,14 +85,11 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         $this->expression = $expr;
         $expression       = $expr->getExpression();
 
-        switch ($expression['call-type']) {
-            case self::CALL_NORMAL:
-                return $this->_callNormal($expression, $compilationContext);
-            case self::CALL_DYNAMIC:
-                return $this->_callDynamic($expression, $compilationContext);
-        }
-
-        return new CompiledExpression('null', null, $expression);
+        return match ($expression['call-type']) {
+            self::CALL_NORMAL  => $this->_callNormal($expression, $compilationContext),
+            self::CALL_DYNAMIC => $this->_callDynamic($expression, $compilationContext),
+            default            => new CompiledExpression('null', null, $expression),
+        };
     }
 
     /**
@@ -167,26 +164,24 @@ public function getReflector($funcName)
      */
     public function isBuiltInFunction(string $functionName)
     {
-        switch ($functionName) {
-            case 'memstr':
-            case 'get_class_ns':
-            case 'get_ns_class':
-            case 'camelize':
-            case 'uncamelize':
-            case 'starts_with':
-            case 'ends_with':
-            case 'prepare_virtual_path':
-            case 'create_instance':
-            case 'create_instance_params':
-            case 'create_symbol_table':
-            case 'globals_get':
-            case 'globals_set':
-            case 'merge_append':
-            case 'get_class_lower':
-                return true;
-        }
-
-        return false;
+        return match ($functionName) {
+            'memstr',
+            'get_class_ns',
+            'get_ns_class',
+            'camelize',
+            'uncamelize',
+            'starts_with',
+            'ends_with',
+            'prepare_virtual_path',
+            'create_instance',
+            'create_instance_params',
+            'create_symbol_table',
+            'globals_get',
+            'globals_set',
+            'merge_append',
+            'get_class_lower' => true,
+            default           => false,
+        };
     }
 
     /**
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 9259884c0c..8fc7bec893 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -100,15 +100,8 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'int':
                             case 'uint':
                             case 'long':
-                            case 'ulong':
-                                return new CompiledExpression(
-                                    'int',
-                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
                             case 'bool':
+                            case 'ulong':
                                 return new CompiledExpression(
                                     'int',
                                     '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
@@ -141,7 +134,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     default:
                         throw new CompilerException(
@@ -149,36 +141,28 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
 
             case 'bool':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'double':
-                        return new CompiledExpression(
-                            'long',
-                            '(' . $left->getBooleanCode() . ' + ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
-                            ) . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'bool' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
-                break;
+                return match ($right->getType()) {
+                    'int',
+                    'uint',
+                    'long',
+                    'ulong',
+                    'double' => new CompiledExpression(
+                        'long',
+                        '(' . $left->getBooleanCode() . ' + ' . $right->getCode() . ')',
+                        $expression
+                    ),
+                    'bool'   => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
+                        $expression
+                    ),
+                    default  => throw new CompilerException(
+                        "Cannot operate 'bool' with '" . $right->getType() . "'",
+                        $expression
+                    ),
+                };
 
             case 'double':
                 switch ($right->getType()) {
@@ -254,7 +238,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     default:
                         throw new CompilerException(
@@ -262,14 +245,9 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
 
             case 'string':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException('Operation is not supported between strings', $expression);
-                }
-                break;
+                throw new CompilerException('Operation is not supported between strings', $expression);
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -342,7 +320,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -350,7 +327,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     case 'char':
                         switch ($right->getType()) {
@@ -403,7 +379,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -411,7 +386,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -481,7 +455,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -489,7 +462,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     case 'double':
                         switch ($right->getType()) {
@@ -571,7 +543,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -579,7 +550,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);
@@ -627,9 +597,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
                         }
-                        break;
 
                     case 'variable':
                         switch ($right->getType()) {
@@ -657,7 +625,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                         $expression
                                     );
                                 }
-                                break;
 
                             /* a(var) + a(x) */
                             case 'variable':
@@ -686,7 +653,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ),
                                             $expression
                                         );
-                                        break;
 
                                     /* a(var) + a(bool) */
                                     case 'bool':
@@ -699,7 +665,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
 
                                     /* a(var) + a(var) */
                                     case 'variable':
@@ -735,7 +700,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -743,12 +707,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     default:
                         throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
-                break;
 
             default:
                 throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index d9ee6339c4..dcf6437d3e 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Arithmetical;
 
-use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -132,32 +131,26 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'bool':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'double':
-                        return new CompiledExpression(
-                            'long',
-                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
-                            ) . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'bool' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
+                return match ($right->getType()) {
+                    'int',
+                    'uint',
+                    'long',
+                    'ulong',
+                    'double' => new CompiledExpression(
+                        'long',
+                        '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
+                        $expression
+                    ),
+                    'bool'   => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
+                        $expression
+                    ),
+                    default  => throw new CompilerException(
+                        "Cannot operate 'bool' with '" . $right->getType() . "'",
+                        $expression
+                    ),
+                };
                 break;
 
             case 'double':
@@ -243,14 +236,10 @@ public function compile($expression, CompilationContext $compilationContext)
 
             case 'string':
             case 'array':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException(
-                            'Operation is not supported between ' . $right->getType(),
-                            $expression
-                        );
-                }
-                break;
+                throw new CompilerException(
+                    'Operation is not supported between ' . $right->getType(),
+                    $expression
+                );
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 0603b901e7..5a431916a2 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -141,32 +141,22 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'bool':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'double':
-                        return new CompiledExpression(
-                            'long',
-                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
-                            ) . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'bool' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
+                return match ($right->getType()) {
+                    'int', 'uint', 'long', 'ulong', 'double' => new CompiledExpression(
+                        'long',
+                        '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
+                        $expression
+                    ),
+                    'bool'                                   => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
+                        $expression
+                    ),
+                    default                                  => throw new CompilerException(
+                        "Cannot operate 'bool' with '" . $right->getType() . "'",
+                        $expression
+                    ),
+                };
                 break;
 
             case 'double':
@@ -261,14 +251,10 @@ public function compile($expression, CompilationContext $compilationContext)
 
             case 'string':
             case 'array':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException(
-                            'Operation is not supported between ' . $right->getType(),
-                            $expression
-                        );
-                }
-                break;
+                throw new CompilerException(
+                    'Operation is not supported between ' . $right->getType(),
+                    $expression
+                );
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index 78aca6733e..b36ab48da8 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -304,11 +304,7 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'string':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException('Operation is not supported between strings', $expression);
-                }
-                break;
+                throw new CompilerException('Operation is not supported between strings', $expression);
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -613,16 +609,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        $compilationContext->headersManager->add('kernel/operators');
-
-                                        return new CompiledExpression(
-                                            'int',
-                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(
-                                            ) . ')',
-                                            $expression
-                                        );
-                                        break;
-
                                     /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
@@ -633,7 +619,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     /* a(var) + a(var) */
                                     case 'variable':
@@ -731,43 +717,33 @@ public function optimizeConstantFolding(
         /*
          * Return value will be always int
          */
-        switch ($this->operator) {
-            case '&':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] & $expression['right']['value'],
-                    $expression
-                );
-
-            case '|':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] | $expression['right']['value'],
-                    $expression
-                );
-
-            case '^':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] ^ $expression['right']['value'],
-                    $expression
-                );
-
-            case '<<':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] << $expression['right']['value'],
-                    $expression
-                );
-
-            case '>>':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] >> $expression['right']['value'],
-                    $expression
-                );
-        }
-
-        return null;
+        return match ($this->operator) {
+            '&'     => new CompiledExpression(
+                'int',
+                $expression['left']['value'] & $expression['right']['value'],
+                $expression
+            ),
+            '|'     => new CompiledExpression(
+                'int',
+                $expression['left']['value'] | $expression['right']['value'],
+                $expression
+            ),
+            '^'     => new CompiledExpression(
+                'int',
+                $expression['left']['value'] ^ $expression['right']['value'],
+                $expression
+            ),
+            '<<'    => new CompiledExpression(
+                'int',
+                $expression['left']['value'] << $expression['right']['value'],
+                $expression
+            ),
+            '>>'    => new CompiledExpression(
+                'int',
+                $expression['left']['value'] >> $expression['right']['value'],
+                $expression
+            ),
+            default => null,
+        };
     }
 }
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index b1fb743703..e9d77f2241 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -316,8 +316,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $compilationContext->backend->assignString(
                     $variableLeft,
                     $left->getCode(),
-                    $compilationContext,
-                    true
+                    $compilationContext
                 );
                 switch ($right->getType()) {
                     case 'null':
@@ -326,7 +325,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $this->zvalNullOperator . '(' . $variableLeftCode . ')',
                             $expression['left']
                         );
-                        break;
 
                     case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
@@ -336,7 +334,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $this->zvalStringOperator . '(' . $variableLeftCode . ', "' . $right->getCode() . '")',
                             $expression['left']
                         );
-                        break;
 
                     case 'variable':
                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
@@ -356,7 +353,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $this->zvalOperator . '(' . $variableLeftCode . ', ' . $variableRight . ')',
                                     $expression
                                 );
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -364,12 +360,10 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression['right']
                                 );
                         }
-                        break;
 
                     default:
                         throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                 }
-                break;
 
             case 'variable':
                 $variable     = $compilationContext->symbolTable->getVariableForRead(
@@ -454,7 +448,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -462,7 +455,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
 
                     case 'double':
                         switch ($right->getType()) {
@@ -531,7 +523,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -539,7 +530,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -606,7 +596,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException(
@@ -614,7 +603,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
 
                     case 'array':
                         switch ($right->getType()) {
@@ -651,12 +639,10 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
-                        break;
 
                     case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
@@ -701,12 +687,10 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
-                        break;
 
                     case 'variable':
                     case 'mixed':
@@ -810,17 +794,14 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
-                        break;
 
                     default:
                         throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
-                break;
 
             default:
                 throw new CompilerException('Unknown type: ' . $left->getType(), $expression);
@@ -885,69 +866,40 @@ public function optimizeTypeOf(array $expr, CompilationContext $compilationConte
 
         switch ($variableVariable->getType()) {
             case 'double':
-                switch ($value) {
-                    case 'double':
-                    case 'float':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'double', 'float' => '1 ' . $operator . ' 1',
+                    default           => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'int':
             case 'integer':
             case 'long':
-                switch ($value) {
-                    case 'int':
-                    case 'integer':
-                    case 'long':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'int', 'integer', 'long' => '1 ' . $operator . ' 1',
+                    default                  => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'bool':
-                switch ($value) {
-                    case 'bool':
-                    case 'boolean':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'bool', 'boolean' => '1 ' . $operator . ' 1',
+                    default           => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'array':
-                switch ($value) {
-                    case 'array':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'array' => '1 ' . $operator . ' 1',
+                    default => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'string':
-                switch ($value) {
-                    case 'string':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'string' => '1 ' . $operator . ' 1',
+                    default  => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'variable':
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index 9c8f971a44..8d801e498d 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -166,28 +166,22 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 }
                 break;
             case 'double':
-                switch ($right->getType()) {
-                    case 'double':
-                    case 'int':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot compare 'double' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
+                return match ($right->getType()) {
+                    'double', 'int' => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                        $expression
+                    ),
+                    'bool'          => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                        $expression
+                    ),
+                    default         => throw new CompilerException(
+                        "Cannot compare 'double' with '" . $right->getType() . "'",
+                        $expression
+                    ),
+                };
                 break;
 
             case 'string':
diff --git a/src/Operators/Other/CastOperator.php b/src/Operators/Other/CastOperator.php
index b812214bf9..afac40511b 100644
--- a/src/Operators/Other/CastOperator.php
+++ b/src/Operators/Other/CastOperator.php
@@ -376,35 +376,30 @@ public function compile(array $expression, CompilationContext $compilationContex
                         if ($symbolVariable->isTemporal()) {
                             $symbolVariable->setIdle(true);
                         }
-                        switch ($symbolVariable->getType()) {
-                            case Types::T_INT:
-                            case Types::T_CHAR:
-                            case Types::T_UCHAR:
-                                return new CompiledExpression(
-                                    'bool',
-                                    sprintf('(zend_bool) %s', $symbolVariable->getName()),
-                                    $expression
-                                );
-
-                            case Types::T_VARIABLE:
-                            case Types::T_MIXED:
-                                return new CompiledExpression(
-                                    'bool',
-                                    sprintf('zephir_get_boolval(%s)', $symbol),
-                                    $expression
-                                );
-
-                            default:
-                                throw new CompilerException(
-                                    sprintf(
-                                        'Cannot cast: %s(%s) to %s',
-                                        $resolved->getType(),
-                                        $symbolVariable->getType(),
-                                        $expression['left']
-                                    ),
-                                    $expression
-                                );
-                        }
+                        return match ($symbolVariable->getType()) {
+                            Types::T_INT,
+                            Types::T_CHAR,
+                            Types::T_UCHAR => new CompiledExpression(
+                                'bool',
+                                sprintf('(zend_bool) %s', $symbolVariable->getName()),
+                                $expression
+                            ),
+                            Types::T_VARIABLE,
+                            Types::T_MIXED => new CompiledExpression(
+                                'bool',
+                                sprintf('zephir_get_boolval(%s)', $symbol),
+                                $expression
+                            ),
+                            default        => throw new CompilerException(
+                                sprintf(
+                                    'Cannot cast: %s(%s) to %s',
+                                    $resolved->getType(),
+                                    $symbolVariable->getType(),
+                                    $expression['left']
+                                ),
+                                $expression
+                            ),
+                        };
                         break;
 
                     default:
diff --git a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
index 52f5f89dd7..190d3e42fe 100644
--- a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
+++ b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
@@ -123,32 +123,26 @@ private function resolveInternalValue(array $definition, array $expression, stri
     {
         $type = $definition['type'];
 
-        switch ($type) {
-            case 'boolean':
-            case 'bool':
-                return strtr('zend_is_true(:v)', [':v' => $value]);
-            case 'int':
-            case 'uint':
-            case 'integer':
-            case 'long':
-            case 'ulong':
-                return strtr('zval_get_long(:v)', [':v' => $value]);
-            case 'string':
-                return strtr('ZSTR_VAL(zval_get_string(:v))', [':v' => $value]);
-            case 'char':
-            case 'uchar':
-                return strtr(
-                    '(Z_TYPE_P(:v) == IS_STRING ? (Z_STRLEN_P(:v) ? Z_STRVAL_P(:v)[0] : NULL) : zval_get_long(:v))',
-                    [':v' => $value]
-                );
-            case 'double':
-            case 'float':
-                return strtr('zval_get_double(:v)', [':v' => $value]);
-            default:
-                throw new CompilerException(
-                    "Unknown type '{$type}' to setting global variable '{$name}'.",
-                    $expression
-                );
-        }
+        return match ($type) {
+            'boolean',
+            'bool'   => strtr('zend_is_true(:v)', [':v' => $value]),
+            'int',
+            'uint',
+            'integer',
+            'long',
+            'ulong'  => strtr('zval_get_long(:v)', [':v' => $value]),
+            'string' => strtr('ZSTR_VAL(zval_get_string(:v))', [':v' => $value]),
+            'char',
+            'uchar'  => strtr(
+                '(Z_TYPE_P(:v) == IS_STRING ? (Z_STRLEN_P(:v) ? Z_STRVAL_P(:v)[0] : NULL) : zval_get_long(:v))',
+                [':v' => $value]
+            ),
+            'double',
+            'float'  => strtr('zval_get_double(:v)', [':v' => $value]),
+            default  => throw new CompilerException(
+                "Unknown type '{$type}' to setting global variable '{$name}'.",
+                $expression
+            ),
+        };
     }
 }
diff --git a/src/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
index 9193e7ce59..651bc4e444 100644
--- a/src/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -148,7 +148,7 @@ private function createMatches(array $expression, CompilationContext $context)
                 );
             }
 
-            if (false == $variable->isInitialized()) {
+            if (!$variable->isInitialized()) {
                 $variable->initVariant($context);
                 $variable->setIsInitialized(true, $context);
             }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index 9a549f5201..4a36311802 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -48,14 +48,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 /*
                  * Complex expressions require a temporary variable
                  */
-                switch ($resolvedParam->getType()) {
-                    case 'array':
-                        $type = 'array';
-                        break;
-                    default:
-                        $type = 'variable';
-                        break;
-                }
+                $type = match ($resolvedParam->getType()) {
+                    'array' => 'array',
+                    default => 'variable',
+                };
 
                 $variable = $context->symbolTable->addTemp($type, $context);
                 $variable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 619950d852..89ee5109cc 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -58,14 +58,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             /*
              * Complex expressions require a temporary variable
              */
-            switch ($resolvedParam->getType()) {
-                case 'array':
-                    $type = 'array';
-                    break;
-                default:
-                    $type = 'variable';
-                    break;
-            }
+            $type = match ($resolvedParam->getType()) {
+                'array' => 'array',
+                default => 'variable',
+            };
 
             $variable = $context->symbolTable->addTemp($type, $context);
             $variable->initVariant($context);
diff --git a/src/Passes/CallGathererPass.php b/src/Passes/CallGathererPass.php
index a8aeed5110..a917f4c998 100644
--- a/src/Passes/CallGathererPass.php
+++ b/src/Passes/CallGathererPass.php
@@ -215,7 +215,6 @@ public function passExpression(array $expression): void
 
             case 'cast':
             case 'type-hint':
-            case 'short-ternary':
             case 'ternary':
             case 'fetch':
                 $this->passExpression($expression['right']);
diff --git a/src/Passes/LocalContextPass.php b/src/Passes/LocalContextPass.php
index b72008ae5f..c50d4b2333 100644
--- a/src/Passes/LocalContextPass.php
+++ b/src/Passes/LocalContextPass.php
@@ -373,10 +373,8 @@ public function passLetStatement(array $statement): void
 
                 case 'variable-append':
                     $this->markVariableNoLocal($assignment['variable']);
-                    switch ($assignment['expr']['type']) {
-                        case 'variable':
-                            $this->markVariableNoLocal($assignment['expr']['value']);
-                            break;
+                    if ($assignment['expr']['type'] == 'variable') {
+                        $this->markVariableNoLocal($assignment['expr']['value']);
                     }
                     break;
             }
diff --git a/src/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
index 681abd3cfc..451c913586 100644
--- a/src/Passes/StaticTypeInference.php
+++ b/src/Passes/StaticTypeInference.php
@@ -225,6 +225,9 @@ public function passExpression(array $expression)
 
             case 'closure':
             case 'closure-arrow':
+            case 'erange':
+            case 'empty-array':
+            case 'require_once':
             case 'static-constant-access':
                 return 'variable';
 
@@ -297,6 +300,7 @@ public function passExpression(array $expression)
                 return 'int';
 
             case 'and':
+            case 'less-equal':
             case 'or':
                 return 'bool';
 
@@ -310,11 +314,9 @@ public function passExpression(array $expression)
             case 'less':
             case 'greater':
             case 'greater-equal':
-            case 'less-equal':
                 return 'bool';
 
             case 'irange':
-            case 'erange':
                 return 'variable';
 
             case 'typeof':
@@ -328,6 +330,7 @@ public function passExpression(array $expression)
                 return 'variable';
 
             case 'not':
+            case 'unlikely':
             case 'bitwise_not':
                 $this->passExpression($expression['left']);
 
@@ -345,9 +348,6 @@ public function passExpression(array $expression)
 
                 return 'variable';
 
-            case 'empty-array':
-                return 'variable';
-
             case 'new':
             case 'new-type':
                 $this->passNew($expression);
@@ -373,7 +373,6 @@ public function passExpression(array $expression)
             case 'empty':
             case 'instanceof':
             case 'likely':
-            case 'unlikely':
                 $this->passExpression($expression['left']);
 
                 return 'bool';
@@ -399,7 +398,6 @@ public function passExpression(array $expression)
 
             case 'clone':
             case 'require':
-            case 'require_once':
                 return 'variable';
 
             case 'ternary':
@@ -434,11 +432,8 @@ public function passLetStatement(array $statement): void
                 case 'array-index':
                 case 'object-property-array-index':
                 case 'object-property-append':
-                case 'static-property-access':
-                    $this->markVariable($assignment['variable'], 'variable');
-                    break;
-
                 case 'variable-append':
+                case 'static-property-access':
                     $this->markVariable($assignment['variable'], 'variable');
                     break;
 
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index 9ddb28c55a..bc666ad6d9 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -173,8 +173,7 @@ public function assignStatic(
             case 'string':
                 $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
                     'variable',
-                    $compilationContext,
-                    true
+                    $compilationContext
                 );
                 $tempVariable->initVariant($compilationContext);
 
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 6caea121e1..5e54cf873d 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -1031,13 +1031,11 @@ private function doVariableAssignment(
     ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $symbolVariable->initVariant($compilationContext);
-                        $symbolVariable->setDynamicTypes('null');
+                if ($statement['operator'] == 'assign') {
+                    $symbolVariable->initVariant($compilationContext);
+                    $symbolVariable->setDynamicTypes('null');
 
-                        $compilationContext->backend->assignNull($symbolVariable, $compilationContext);
-                        break;
+                    $compilationContext->backend->assignNull($symbolVariable, $compilationContext);
                 }
                 break;
 
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index 3beb3d35af..6daa94ecec 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -68,36 +68,28 @@ public function compile(CompilationContext $compilationContext): void
             /*
              * Get the symbol from the symbol table if necessary
              */
-            switch ($assignment['assign-type']) {
-                case 'static-property':
-                case 'static-property-append':
-                case 'static-property-array-index':
-                case 'static-property-array-index-append':
-                case 'dynamic-variable-string':
-                    $symbolVariable = null;
-                    break;
-
-                case 'array-index':
-                case 'variable-append':
-                case 'object-property':
-                case 'array-index-append':
-                case 'string-dynamic-object-property':
-                case 'variable-dynamic-object-property':
-                    $symbolVariable = $compilationContext->symbolTable->getVariableForUpdate(
-                        $variable,
-                        $compilationContext,
-                        $assignment
-                    );
-                    break;
-
-                default:
-                    $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
-                        $variable,
-                        $compilationContext,
-                        $assignment
-                    );
-                    break;
-            }
+            $symbolVariable = match ($assignment['assign-type']) {
+                'static-property',
+                'static-property-append',
+                'static-property-array-index',
+                'static-property-array-index-append',
+                'dynamic-variable-string'          => null,
+                'array-index',
+                'variable-append',
+                'object-property',
+                'array-index-append',
+                'string-dynamic-object-property',
+                'variable-dynamic-object-property' => $compilationContext->symbolTable->getVariableForUpdate(
+                    $variable,
+                    $compilationContext,
+                    $assignment
+                ),
+                default                            => $compilationContext->symbolTable->getVariableForWrite(
+                    $variable,
+                    $compilationContext,
+                    $assignment
+                ),
+            };
 
             /*
              * Incr/Decr assignments don't require an expression
@@ -111,26 +103,24 @@ public function compile(CompilationContext $compilationContext): void
 
                 $expr = new Expression($assignment['expr']);
 
-                switch ($assignment['assign-type']) {
-                    case 'variable':
-                        if (!$readDetector->detect($variable, $assignment['expr'])) {
-                            if (isset($assignment['operator'])) {
-                                if ('assign' == $assignment['operator']) {
-                                    $expr->setExpectReturn(true, $symbolVariable);
-                                }
-                            } else {
+                if ($assignment['assign-type'] == 'variable') {
+                    if (!$readDetector->detect($variable, $assignment['expr'])) {
+                        if (isset($assignment['operator'])) {
+                            if ('assign' == $assignment['operator']) {
                                 $expr->setExpectReturn(true, $symbolVariable);
                             }
                         } else {
-                            if (isset($assignment['operator'])) {
-                                if ('assign' == $assignment['operator']) {
-                                    $expr->setExpectReturn(true);
-                                }
-                            } else {
+                            $expr->setExpectReturn(true, $symbolVariable);
+                        }
+                    } else {
+                        if (isset($assignment['operator'])) {
+                            if ('assign' == $assignment['operator']) {
                                 $expr->setExpectReturn(true);
                             }
+                        } else {
+                            $expr->setExpectReturn(true);
                         }
-                        break;
+                    }
                 }
 
                 switch ($assignment['expr']['type']) {
@@ -194,16 +184,11 @@ public function compile(CompilationContext $compilationContext): void
                 case 'static-property':
                     $let = new LetStaticProperty();
                     if (isset($assignment['operator'])) {
-                        switch ($assignment['operator']) {
-                            case 'add-assign':
-                                $let = new LetStaticPropertyAdd();
-                                break;
-                            case 'sub-assign':
-                                $let = new LetStaticPropertySub();
-                                break;
-                            default:
-                                $let = new LetStaticProperty();
-                        }
+                        $let = match ($assignment['operator']) {
+                            'add-assign' => new LetStaticPropertyAdd(),
+                            'sub-assign' => new LetStaticPropertySub(),
+                            default      => new LetStaticProperty(),
+                        };
                     }
 
                     $let->assignStatic(
diff --git a/src/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
index e3eca50c22..70430b0671 100644
--- a/src/Statements/SwitchStatement.php
+++ b/src/Statements/SwitchStatement.php
@@ -106,20 +106,18 @@ public function compile(CompilationContext $compilationContext): void
             $defaultBlock = null;
             foreach ($clauses as $clause) {
                 if ('case' == $clause['type']) {
-                    $expr = [
+                    $expr        = [
                         'type'  => 'equals',
                         'left'  => $tempLeft,
                         'right' => $clause['expr'],
                     ];
-                    if (!isset($clause['statements'])) {
-                        $exprStack[] = $expr;
-                    } else {
-                        $exprStack[] = $expr;
-                        $blocks[]    = [
+                    $exprStack[] = $expr;
+                    if (isset($clause['statements'])) {
+                        $blocks[]  = [
                             'expr'  => $exprStack,
                             'block' => $clause['statements'],
                         ];
-                        $exprStack   = [];
+                        $exprStack = [];
                     }
                 } else {
                     if ('default' == $clause['type']) {

From 34614d280704872f9ce4ae2f827a1e594de14dfa Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 28 Nov 2023 20:15:21 -0600
Subject: [PATCH 228/375] Revert "a lot of code smells and optimizations"

This reverts commit af7fc4c0350d98567883586bc5ac39c6d142736b.
---
 src/Backend/Backend.php                       | 80 ++++++++++------
 src/Class/Definition/Definition.php           |  6 +-
 src/Class/Method/Parameters.php               | 17 +++-
 src/Code/ArgInfoDefinition.php                |  2 +-
 src/Code/Builder/Struct.php                   | 80 +++++++++-------
 src/Compiler.php                              |  4 +-
 src/Console/Application.php                   |  4 +-
 src/Documentation/Template.php                |  4 +-
 src/Documentation/Theme.php                   |  7 +-
 src/Expression/PropertyDynamicAccess.php      | 29 +++---
 src/FileSystem/HardDisk.php                   | 13 ++-
 src/FunctionCall.php                          | 51 +++++-----
 .../Arithmetical/ArithmeticalBaseOperator.php | 82 +++++++++++-----
 src/Operators/Arithmetical/DivOperator.php    | 59 +++++++-----
 src/Operators/Arithmetical/ModOperator.php    | 54 +++++++----
 src/Operators/Bitwise/BitwiseBaseOperator.php | 84 +++++++++++------
 .../Comparison/ComparisonBaseOperator.php     | 90 +++++++++++++-----
 src/Operators/Logical/LogicalBaseOperator.php | 38 ++++----
 src/Operators/Other/CastOperator.php          | 53 ++++++-----
 .../FunctionCall/GlobalsSetOptimizer.php      | 48 +++++-----
 .../FunctionCall/PregMatchOptimizer.php       |  2 +-
 .../FunctionCall/VarDumpOptimizer.php         | 12 ++-
 .../FunctionCall/VarExportOptimizer.php       | 12 ++-
 src/Passes/CallGathererPass.php               |  1 +
 src/Passes/LocalContextPass.php               |  6 +-
 src/Passes/StaticTypeInference.php            | 17 ++--
 src/Statements/Let/StaticPropertySub.php      |  3 +-
 src/Statements/Let/Variable.php               | 10 +-
 src/Statements/LetStatement.php               | 93 +++++++++++--------
 src/Statements/SwitchStatement.php            | 12 ++-
 30 files changed, 613 insertions(+), 360 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index e791072e76..a9db8649ff 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -214,18 +214,26 @@ public function arrayFetch(
         $context->headersManager->add('kernel/array');
         $isVariable = $index instanceof Variable;
 
-        $type = match ($index->getType()) {
-            'int',
-            'uint',
-            'long'   => 'long',
-            'variable',
-            'mixed',
-            'string' => $index->getType(),
-            default  => throw new CompilerException(
-                sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
-                $arrayAccess['right']
-            ),
-        };
+        switch ($index->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+                $type = 'long';
+                break;
+
+            /* Types which map to the same */
+            case 'variable':
+            case 'mixed':
+            case 'string':
+                $type = $index->getType();
+                break;
+
+            default:
+                throw new CompilerException(
+                    sprintf('Variable type: %s cannot be used as array index without cast', $index->getType()),
+                    $arrayAccess['right']
+                );
+        }
         if ($isVariable && in_array($index->getType(), ['variable', 'string', 'mixed'])) {
             $output = 'zephir_array_fetch('
                 . $this->getVariableCode($var)
@@ -1387,18 +1395,23 @@ public function getInternalSignature(Method $method, CompilationContext $context
         $parameters          = $method->getParameters();
         if (is_object($parameters)) {
             foreach ($parameters->getParameters() as $parameter) {
-                $signatureParameters[] = match ($parameter['data-type']) {
-                    'int',
-                    'uint',
-                    'long',
-                    'double',
-                    'bool',
-                    'char',
-                    'uchar',
-                    'string',
-                    'array' => 'zval *' . $parameter['name'] . '_param_ext',
-                    default => 'zval *' . $parameter['name'] . '_ext ',
-                };
+                switch ($parameter['data-type']) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'double':
+                    case 'bool':
+                    case 'char':
+                    case 'uchar':
+                    case 'string':
+                    case 'array':
+                        $signatureParameters[] = 'zval *' . $parameter['name'] . '_param_ext';
+                        break;
+
+                    default:
+                        $signatureParameters[] = 'zval *' . $parameter['name'] . '_ext ';
+                        break;
+                }
             }
         }
 
@@ -1762,12 +1775,19 @@ public function propertyIsset(Variable $var, $key)
     public function resolveValue($value, CompilationContext $context): Variable | bool | string
     {
         if ($value instanceof GlobalConstant) {
-            $value = match ($value->getName()) {
-                'ZEPHIR_GLOBAL(global_null)'  => 'null',
-                'ZEPHIR_GLOBAL(global_true)'  => 'true',
-                'ZEPHIR_GLOBAL(global_false)' => 'false',
-                default                       => throw new CompilerException('Unknown constant ' . $value->getName()),
-            };
+            switch ($value->getName()) {
+                case 'ZEPHIR_GLOBAL(global_null)':
+                    $value = 'null';
+                    break;
+                case 'ZEPHIR_GLOBAL(global_true)':
+                    $value = 'true';
+                    break;
+                case 'ZEPHIR_GLOBAL(global_false)':
+                    $value = 'false';
+                    break;
+                default:
+                    throw new CompilerException('Unknown constant ' . $value->getName());
+            }
         }
 
         if ('null' == $value || 'true' == $value || 'false' == $value) {
diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index d4ca2234cc..6ff79d7114 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -1147,8 +1147,10 @@ public function hasConstant(string $name): bool
     public function hasMethod(string $methodName): bool
     {
         $methodNameLower = strtolower($methodName);
-        if (array_key_exists($methodNameLower, $this->methods)) {
-            return true;
+        foreach ($this->methods as $name => $method) {
+            if ($methodNameLower === $name) {
+                return true;
+            }
         }
 
         $extendsClassDefinition = $this->getExtendsClassDefinition();
diff --git a/src/Class/Method/Parameters.php b/src/Class/Method/Parameters.php
index 6e2e382e76..a7feb2a384 100644
--- a/src/Class/Method/Parameters.php
+++ b/src/Class/Method/Parameters.php
@@ -82,10 +82,19 @@ public function fetchParameters(bool $isMethodInternal): array
             $name     = $parameter['name'];
             $dataType = $parameter['data-type'] ?? 'variable';
 
-            $parameters[] = match ($dataType) {
-                'object', 'callable', 'resource', 'variable', 'mixed' => $isMethodInternal ? $name : '&' . $name,
-                default                                               => ($isMethodInternal ? $name : '&' . $name) . '_param',
-            };
+            switch ($dataType) {
+                case 'object':
+                case 'callable':
+                case 'resource':
+                case 'variable':
+                case 'mixed':
+                    $parameters[] = $isMethodInternal ? $name : '&' . $name;
+                    break;
+
+                default:
+                    $parameters[] = ($isMethodInternal ? $name : '&' . $name) . '_param';
+                    break;
+            }
 
             if (isset($parameter['default'])) {
                 $this->optionalParameters[] = $parameter;
diff --git a/src/Code/ArgInfoDefinition.php b/src/Code/ArgInfoDefinition.php
index 9c6c9ebc4b..897ac0d9f6 100644
--- a/src/Code/ArgInfoDefinition.php
+++ b/src/Code/ArgInfoDefinition.php
@@ -324,7 +324,7 @@ private function renderPhalconCompatible(): bool
         $compatibilityClasses  = require_once __DIR__ . '/../../config/phalcon-compatibility-headers.php';
         $classDefinition       = $this->functionLike->getClassDefinition();
         $implementedInterfaces = $classDefinition !== null ? $classDefinition->getImplementedInterfaces() : [];
-        $extendsClass          = $classDefinition?->getExtendsClass();
+        $extendsClass          = $classDefinition !== null ? $classDefinition->getExtendsClass() : null;
 
         if (empty($implementedInterfaces) && $extendsClass === null) {
             return false;
diff --git a/src/Code/Builder/Struct.php b/src/Code/Builder/Struct.php
index 7c55fe8a27..c20c7d8c05 100644
--- a/src/Code/Builder/Struct.php
+++ b/src/Code/Builder/Struct.php
@@ -88,14 +88,24 @@ public function getCDefault(string $name, array $global, string $namespace): str
             throw new RuntimeException('Field "' . $name . '" does not have a default value');
         }
 
-        return match ($global['type']) {
-            'boolean', 'bool' => '',
-            'string' => "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));',
-            'int', 'uint', 'long', 'double', 'hash' => "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ' . $global['default'] . ';',
-            default => throw new InvalidArgumentException(
-                'Unknown global type: ' . $global['type']
-            ),
-        };
+        switch ($global['type']) {
+            case 'boolean':
+            case 'bool':
+                return '';
+
+            case 'string':
+                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));';
+
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'double':
+            case 'hash':
+                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ' . $global['default'] . ';';
+
+            default:
+                throw new InvalidArgumentException('Unknown global type: ' . $global['type']);
+        }
     }
 
     /**
@@ -116,30 +126,36 @@ public function getInitEntry(string $name, array $global, string $namespace): st
         $iniName    = $iniEntry['name'] ?? $namespace . '.' . $structName;
         $scope      = $iniEntry['scope'] ?? 'PHP_INI_ALL';
 
-        return match ($global['type']) {
-            'boolean', 'bool' => 'STD_PHP_INI_BOOLEAN("' .
-                $iniName .
-                '", "' .
-                (int)(true === $global['default']) .
-                '", ' .
-                $scope .
-                ', OnUpdateBool, ' .
-                $structName .
-                ', zend_' .
-                $namespace .
-                '_globals, ' .
-                $namespace . '_globals)',
-            'string'          => sprintf(
-                'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
-                '"' . $iniName . '"',
-                '"' . $global['default'] . '"',
-                $scope,
-                $structName,
-                'zend_' . $namespace . '_globals',
-                $namespace . '_globals',
-            ),
-            default           => '',
-        };
+        switch ($global['type']) {
+            case 'boolean':
+            case 'bool':
+                return
+                    'STD_PHP_INI_BOOLEAN("' .
+                    $iniName .
+                    '", "' .
+                    (int)(true === $global['default']) .
+                    '", ' .
+                    $scope .
+                    ', OnUpdateBool, ' .
+                    $structName .
+                    ', zend_' .
+                    $namespace .
+                    '_globals, ' .
+                    $namespace . '_globals)';
+
+            case 'string':
+                return sprintf(
+                    'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
+                    '"' . $iniName . '"',
+                    '"' . $global['default'] . '"',
+                    $scope,
+                    $structName,
+                    'zend_' . $namespace . '_globals',
+                    $namespace . '_globals',
+                );
+        }
+
+        return '';
     }
 
     /**
diff --git a/src/Compiler.php b/src/Compiler.php
index 65a394fdf7..a60fa72b2e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -690,7 +690,7 @@ public function createProjectFiles(string $project): bool
          */
         $destructors = $this->config->get('destructors');
         if (is_array($destructors)) {
-            $invokeRequestDestructors = $this->processCodeInjection($destructors);
+            $invokeRequestDestructors = $this->processCodeInjection($destructors, 'request');
             $includes                 .= PHP_EOL . $invokeRequestDestructors[0];
             $reqDestructors           = $invokeRequestDestructors[1];
 
@@ -712,7 +712,7 @@ public function createProjectFiles(string $project): bool
          */
         $initializers = $this->config->get('initializers');
         if (is_array($initializers)) {
-            $invokeRequestInitializers = $this->processCodeInjection($initializers);
+            $invokeRequestInitializers = $this->processCodeInjection($initializers, 'request');
             $includes                  .= PHP_EOL . $invokeRequestInitializers[0];
             $reqInitializers           = $invokeRequestInitializers[1];
 
diff --git a/src/Console/Application.php b/src/Console/Application.php
index 4917c3bf3b..f33529b246 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -127,7 +127,7 @@ public function getHelp(): string
     public function getLongVersion(): string
     {
         $version = explode('-', $this->getVersion());
-        $commit  = "($version[1])";
+        $commit  = "({$version[1]})";
 
         return trim(
             sprintf(
@@ -163,7 +163,7 @@ public function getVersion(): string
         $version = explode('-', parent::getVersion());
 
         if (isset($version[1]) && str_starts_with($version[1], '$')) {
-            return "$version[0]-source";
+            return "{$version[0]}-source";
         }
 
         return implode('-', $version);
diff --git a/src/Documentation/Template.php b/src/Documentation/Template.php
index 12dd93e9a7..12803af96c 100644
--- a/src/Documentation/Template.php
+++ b/src/Documentation/Template.php
@@ -74,7 +74,9 @@ public function parse()
         $path = $this->getTemplatePath($this->template);
         ob_start();
         include $path;
-        return ob_get_clean();
+        $content = ob_get_clean();
+
+        return $content;
     }
 
     public function partial(string $fileName, array $data = [])
diff --git a/src/Documentation/Theme.php b/src/Documentation/Theme.php
index ad4f7d90b3..bf6760434d 100644
--- a/src/Documentation/Theme.php
+++ b/src/Documentation/Theme.php
@@ -148,7 +148,9 @@ public function buildStaticDirectory(): void
             mkdir($outputStt, 0777, true);
         }
 
-        $this->extendedTheme?->buildStaticDirectory();
+        if ($this->extendedTheme) {
+            $this->extendedTheme->buildStaticDirectory();
+        }
 
         $themeStt = $this->getThemePath('static');
 
@@ -218,8 +220,9 @@ public function getOutputPath($path)
         $path         = pathinfo($this->outputDir . '/' . $path);
         $pathDirname  = $path['dirname'];
         $pathBasename = $path['basename'];
+        $pathFilename = $pathDirname . '/' . $pathBasename;
 
-        return $pathDirname . '/' . $pathBasename;
+        return $pathFilename;
     }
 
     /**
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index 25f3558055..001581781f 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -69,18 +69,23 @@ public function compile($expression, CompilationContext $compilationContext)
                 );
         }
 
-        $propertyVariable = match ($propertyAccess['right']['type']) {
-            'variable' => $compilationContext->symbolTable->getVariableForRead(
-                $propertyAccess['right']['value'],
-                $compilationContext,
-                $expression
-            ),
-            'string'   => null,
-            default    => throw new CompilerException(
-                'Variable type: ' . $propertyAccess['right']['type'] . ' cannot be used as object',
-                $propertyAccess['left']
-            ),
-        };
+        switch ($propertyAccess['right']['type']) {
+            case 'variable':
+                $propertyVariable = $compilationContext->symbolTable->getVariableForRead(
+                    $propertyAccess['right']['value'],
+                    $compilationContext,
+                    $expression
+                );
+                break;
+            case 'string':
+                $propertyVariable = null;
+                break;
+            default:
+                throw new CompilerException(
+                    'Variable type: ' . $propertyAccess['right']['type'] . ' cannot be used as object',
+                    $propertyAccess['left']
+                );
+        }
 
         /**
          * Resolves the symbol that expects the value
diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 50a87a9009..5b07163d9b 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -264,11 +264,14 @@ public function write(string $path, string $data): void
 
     protected function deleteFileInfoObject(SplFileInfo $file): bool
     {
-        return match ($file->getType()) {
-            'dir'   => @rmdir((string)$file->getRealPath()),
-            'link'  => @unlink($file->getPathname()),
-            default => @unlink((string)$file->getRealPath()),
-        };
+        switch ($file->getType()) {
+            case 'dir':
+                return @rmdir((string)$file->getRealPath());
+            case 'link':
+                return @unlink($file->getPathname());
+            default:
+                return @unlink((string)$file->getRealPath());
+        }
     }
 
     private function listDirectoryRecursively(
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index fdcb556bba..8d014c14bf 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -85,11 +85,14 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         $this->expression = $expr;
         $expression       = $expr->getExpression();
 
-        return match ($expression['call-type']) {
-            self::CALL_NORMAL  => $this->_callNormal($expression, $compilationContext),
-            self::CALL_DYNAMIC => $this->_callDynamic($expression, $compilationContext),
-            default            => new CompiledExpression('null', null, $expression),
-        };
+        switch ($expression['call-type']) {
+            case self::CALL_NORMAL:
+                return $this->_callNormal($expression, $compilationContext);
+            case self::CALL_DYNAMIC:
+                return $this->_callDynamic($expression, $compilationContext);
+        }
+
+        return new CompiledExpression('null', null, $expression);
     }
 
     /**
@@ -164,24 +167,26 @@ public function getReflector($funcName)
      */
     public function isBuiltInFunction(string $functionName)
     {
-        return match ($functionName) {
-            'memstr',
-            'get_class_ns',
-            'get_ns_class',
-            'camelize',
-            'uncamelize',
-            'starts_with',
-            'ends_with',
-            'prepare_virtual_path',
-            'create_instance',
-            'create_instance_params',
-            'create_symbol_table',
-            'globals_get',
-            'globals_set',
-            'merge_append',
-            'get_class_lower' => true,
-            default           => false,
-        };
+        switch ($functionName) {
+            case 'memstr':
+            case 'get_class_ns':
+            case 'get_ns_class':
+            case 'camelize':
+            case 'uncamelize':
+            case 'starts_with':
+            case 'ends_with':
+            case 'prepare_virtual_path':
+            case 'create_instance':
+            case 'create_instance_params':
+            case 'create_symbol_table':
+            case 'globals_get':
+            case 'globals_set':
+            case 'merge_append':
+            case 'get_class_lower':
+                return true;
+        }
+
+        return false;
     }
 
     /**
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 8fc7bec893..9259884c0c 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -100,7 +100,6 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'int':
                             case 'uint':
                             case 'long':
-                            case 'bool':
                             case 'ulong':
                                 return new CompiledExpression(
                                     'int',
@@ -109,6 +108,14 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
+                            case 'bool':
+                                return new CompiledExpression(
+                                    'int',
+                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
+
                             case 'double':
                                 return new CompiledExpression(
                                     'double',
@@ -134,6 +141,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
+                        break;
 
                     default:
                         throw new CompilerException(
@@ -141,28 +149,36 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
+                break;
 
             case 'bool':
-                return match ($right->getType()) {
-                    'int',
-                    'uint',
-                    'long',
-                    'ulong',
-                    'double' => new CompiledExpression(
-                        'long',
-                        '(' . $left->getBooleanCode() . ' + ' . $right->getCode() . ')',
-                        $expression
-                    ),
-                    'bool'   => new CompiledExpression(
-                        'bool',
-                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
-                        $expression
-                    ),
-                    default  => throw new CompilerException(
-                        "Cannot operate 'bool' with '" . $right->getType() . "'",
-                        $expression
-                    ),
-                };
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                    case 'double':
+                        return new CompiledExpression(
+                            'long',
+                            '(' . $left->getBooleanCode() . ' + ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'bool':
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot operate 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
+                break;
 
             case 'double':
                 switch ($right->getType()) {
@@ -238,6 +254,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
+                        break;
 
                     default:
                         throw new CompilerException(
@@ -245,9 +262,14 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
+                break;
 
             case 'string':
-                throw new CompilerException('Operation is not supported between strings', $expression);
+                switch ($right->getType()) {
+                    default:
+                        throw new CompilerException('Operation is not supported between strings', $expression);
+                }
+                break;
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -320,6 +342,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -327,6 +350,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
+                        break;
 
                     case 'char':
                         switch ($right->getType()) {
@@ -379,6 +403,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -386,6 +411,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
+                        break;
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -455,6 +481,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -462,6 +489,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
+                        break;
 
                     case 'double':
                         switch ($right->getType()) {
@@ -543,6 +571,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -550,6 +579,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
+                        break;
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);
@@ -597,7 +627,9 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
+                                break;
                         }
+                        break;
 
                     case 'variable':
                         switch ($right->getType()) {
@@ -625,6 +657,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         $expression
                                     );
                                 }
+                                break;
 
                             /* a(var) + a(x) */
                             case 'variable':
@@ -653,6 +686,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ),
                                             $expression
                                         );
+                                        break;
 
                                     /* a(var) + a(bool) */
                                     case 'bool':
@@ -665,6 +699,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
+                                        break;
 
                                     /* a(var) + a(var) */
                                     case 'variable':
@@ -700,6 +735,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -707,10 +743,12 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
+                        break;
 
                     default:
                         throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
+                break;
 
             default:
                 throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index dcf6437d3e..d9ee6339c4 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Operators\Arithmetical;
 
+use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
@@ -131,26 +132,32 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'bool':
-                return match ($right->getType()) {
-                    'int',
-                    'uint',
-                    'long',
-                    'ulong',
-                    'double' => new CompiledExpression(
-                        'long',
-                        '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
-                        $expression
-                    ),
-                    'bool'   => new CompiledExpression(
-                        'bool',
-                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
-                        $expression
-                    ),
-                    default  => throw new CompilerException(
-                        "Cannot operate 'bool' with '" . $right->getType() . "'",
-                        $expression
-                    ),
-                };
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                    case 'double':
+                        return new CompiledExpression(
+                            'long',
+                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'bool':
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot operate 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
                 break;
 
             case 'double':
@@ -236,10 +243,14 @@ public function compile($expression, CompilationContext $compilationContext)
 
             case 'string':
             case 'array':
-                throw new CompilerException(
-                    'Operation is not supported between ' . $right->getType(),
-                    $expression
-                );
+                switch ($right->getType()) {
+                    default:
+                        throw new CompilerException(
+                            'Operation is not supported between ' . $right->getType(),
+                            $expression
+                        );
+                }
+                break;
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 5a431916a2..0603b901e7 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -141,22 +141,32 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'bool':
-                return match ($right->getType()) {
-                    'int', 'uint', 'long', 'ulong', 'double' => new CompiledExpression(
-                        'long',
-                        '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
-                        $expression
-                    ),
-                    'bool'                                   => new CompiledExpression(
-                        'bool',
-                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
-                        $expression
-                    ),
-                    default                                  => throw new CompilerException(
-                        "Cannot operate 'bool' with '" . $right->getType() . "'",
-                        $expression
-                    ),
-                };
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                    case 'double':
+                        return new CompiledExpression(
+                            'long',
+                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'bool':
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
+                            ) . ')',
+                            $expression
+                        );
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot operate 'bool' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
                 break;
 
             case 'double':
@@ -251,10 +261,14 @@ public function compile($expression, CompilationContext $compilationContext)
 
             case 'string':
             case 'array':
-                throw new CompilerException(
-                    'Operation is not supported between ' . $right->getType(),
-                    $expression
-                );
+                switch ($right->getType()) {
+                    default:
+                        throw new CompilerException(
+                            'Operation is not supported between ' . $right->getType(),
+                            $expression
+                        );
+                }
+                break;
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index b36ab48da8..78aca6733e 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -304,7 +304,11 @@ public function compile($expression, CompilationContext $compilationContext)
                 break;
 
             case 'string':
-                throw new CompilerException('Operation is not supported between strings', $expression);
+                switch ($right->getType()) {
+                    default:
+                        throw new CompilerException('Operation is not supported between strings', $expression);
+                }
+                break;
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -609,6 +613,16 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
+                                        $compilationContext->headersManager->add('kernel/operators');
+
+                                        return new CompiledExpression(
+                                            'int',
+                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(
+                                            ) . ')',
+                                            $expression
+                                        );
+                                        break;
+
                                     /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
@@ -619,7 +633,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-
+                                        break;
 
                                     /* a(var) + a(var) */
                                     case 'variable':
@@ -717,33 +731,43 @@ public function optimizeConstantFolding(
         /*
          * Return value will be always int
          */
-        return match ($this->operator) {
-            '&'     => new CompiledExpression(
-                'int',
-                $expression['left']['value'] & $expression['right']['value'],
-                $expression
-            ),
-            '|'     => new CompiledExpression(
-                'int',
-                $expression['left']['value'] | $expression['right']['value'],
-                $expression
-            ),
-            '^'     => new CompiledExpression(
-                'int',
-                $expression['left']['value'] ^ $expression['right']['value'],
-                $expression
-            ),
-            '<<'    => new CompiledExpression(
-                'int',
-                $expression['left']['value'] << $expression['right']['value'],
-                $expression
-            ),
-            '>>'    => new CompiledExpression(
-                'int',
-                $expression['left']['value'] >> $expression['right']['value'],
-                $expression
-            ),
-            default => null,
-        };
+        switch ($this->operator) {
+            case '&':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] & $expression['right']['value'],
+                    $expression
+                );
+
+            case '|':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] | $expression['right']['value'],
+                    $expression
+                );
+
+            case '^':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] ^ $expression['right']['value'],
+                    $expression
+                );
+
+            case '<<':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] << $expression['right']['value'],
+                    $expression
+                );
+
+            case '>>':
+                return new CompiledExpression(
+                    'int',
+                    $expression['left']['value'] >> $expression['right']['value'],
+                    $expression
+                );
+        }
+
+        return null;
     }
 }
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index e9d77f2241..b1fb743703 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -316,7 +316,8 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $compilationContext->backend->assignString(
                     $variableLeft,
                     $left->getCode(),
-                    $compilationContext
+                    $compilationContext,
+                    true
                 );
                 switch ($right->getType()) {
                     case 'null':
@@ -325,6 +326,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $this->zvalNullOperator . '(' . $variableLeftCode . ')',
                             $expression['left']
                         );
+                        break;
 
                     case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
@@ -334,6 +336,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $this->zvalStringOperator . '(' . $variableLeftCode . ', "' . $right->getCode() . '")',
                             $expression['left']
                         );
+                        break;
 
                     case 'variable':
                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
@@ -353,6 +356,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $this->zvalOperator . '(' . $variableLeftCode . ', ' . $variableRight . ')',
                                     $expression
                                 );
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -360,10 +364,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression['right']
                                 );
                         }
+                        break;
 
                     default:
                         throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                 }
+                break;
 
             case 'variable':
                 $variable     = $compilationContext->symbolTable->getVariableForRead(
@@ -448,6 +454,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -455,6 +462,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
+                        break;
 
                     case 'double':
                         switch ($right->getType()) {
@@ -523,6 +531,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -530,6 +539,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
+                        break;
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -596,6 +606,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException(
@@ -603,6 +614,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
+                        break;
 
                     case 'array':
                         switch ($right->getType()) {
@@ -639,10 +651,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
+                        break;
 
                     case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
@@ -687,10 +701,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
+                        break;
 
                     case 'variable':
                     case 'mixed':
@@ -794,14 +810,17 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
+                                break;
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
+                        break;
 
                     default:
                         throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
+                break;
 
             default:
                 throw new CompilerException('Unknown type: ' . $left->getType(), $expression);
@@ -866,40 +885,69 @@ public function optimizeTypeOf(array $expr, CompilationContext $compilationConte
 
         switch ($variableVariable->getType()) {
             case 'double':
-                $condition = match ($value) {
-                    'double', 'float' => '1 ' . $operator . ' 1',
-                    default           => '1 ' . $operator . ' 0',
-                };
+                switch ($value) {
+                    case 'double':
+                    case 'float':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
                 break;
 
             case 'int':
             case 'integer':
             case 'long':
-                $condition = match ($value) {
-                    'int', 'integer', 'long' => '1 ' . $operator . ' 1',
-                    default                  => '1 ' . $operator . ' 0',
-                };
+                switch ($value) {
+                    case 'int':
+                    case 'integer':
+                    case 'long':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
                 break;
 
             case 'bool':
-                $condition = match ($value) {
-                    'bool', 'boolean' => '1 ' . $operator . ' 1',
-                    default           => '1 ' . $operator . ' 0',
-                };
+                switch ($value) {
+                    case 'bool':
+                    case 'boolean':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
                 break;
 
             case 'array':
-                $condition = match ($value) {
-                    'array' => '1 ' . $operator . ' 1',
-                    default => '1 ' . $operator . ' 0',
-                };
+                switch ($value) {
+                    case 'array':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
                 break;
 
             case 'string':
-                $condition = match ($value) {
-                    'string' => '1 ' . $operator . ' 1',
-                    default  => '1 ' . $operator . ' 0',
-                };
+                switch ($value) {
+                    case 'string':
+                        $condition = '1 ' . $operator . ' 1';
+                        break;
+
+                    default:
+                        $condition = '1 ' . $operator . ' 0';
+                        break;
+                }
                 break;
 
             case 'variable':
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index 8d801e498d..9c8f971a44 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -166,22 +166,28 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 }
                 break;
             case 'double':
-                return match ($right->getType()) {
-                    'double', 'int' => new CompiledExpression(
-                        'bool',
-                        '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
-                        $expression
-                    ),
-                    'bool'          => new CompiledExpression(
-                        'bool',
-                        '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
-                        $expression
-                    ),
-                    default         => throw new CompilerException(
-                        "Cannot compare 'double' with '" . $right->getType() . "'",
-                        $expression
-                    ),
-                };
+                switch ($right->getType()) {
+                    case 'double':
+                    case 'int':
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'bool':
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot compare 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
                 break;
 
             case 'string':
diff --git a/src/Operators/Other/CastOperator.php b/src/Operators/Other/CastOperator.php
index afac40511b..b812214bf9 100644
--- a/src/Operators/Other/CastOperator.php
+++ b/src/Operators/Other/CastOperator.php
@@ -376,30 +376,35 @@ public function compile(array $expression, CompilationContext $compilationContex
                         if ($symbolVariable->isTemporal()) {
                             $symbolVariable->setIdle(true);
                         }
-                        return match ($symbolVariable->getType()) {
-                            Types::T_INT,
-                            Types::T_CHAR,
-                            Types::T_UCHAR => new CompiledExpression(
-                                'bool',
-                                sprintf('(zend_bool) %s', $symbolVariable->getName()),
-                                $expression
-                            ),
-                            Types::T_VARIABLE,
-                            Types::T_MIXED => new CompiledExpression(
-                                'bool',
-                                sprintf('zephir_get_boolval(%s)', $symbol),
-                                $expression
-                            ),
-                            default        => throw new CompilerException(
-                                sprintf(
-                                    'Cannot cast: %s(%s) to %s',
-                                    $resolved->getType(),
-                                    $symbolVariable->getType(),
-                                    $expression['left']
-                                ),
-                                $expression
-                            ),
-                        };
+                        switch ($symbolVariable->getType()) {
+                            case Types::T_INT:
+                            case Types::T_CHAR:
+                            case Types::T_UCHAR:
+                                return new CompiledExpression(
+                                    'bool',
+                                    sprintf('(zend_bool) %s', $symbolVariable->getName()),
+                                    $expression
+                                );
+
+                            case Types::T_VARIABLE:
+                            case Types::T_MIXED:
+                                return new CompiledExpression(
+                                    'bool',
+                                    sprintf('zephir_get_boolval(%s)', $symbol),
+                                    $expression
+                                );
+
+                            default:
+                                throw new CompilerException(
+                                    sprintf(
+                                        'Cannot cast: %s(%s) to %s',
+                                        $resolved->getType(),
+                                        $symbolVariable->getType(),
+                                        $expression['left']
+                                    ),
+                                    $expression
+                                );
+                        }
                         break;
 
                     default:
diff --git a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
index 190d3e42fe..52f5f89dd7 100644
--- a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
+++ b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
@@ -123,26 +123,32 @@ private function resolveInternalValue(array $definition, array $expression, stri
     {
         $type = $definition['type'];
 
-        return match ($type) {
-            'boolean',
-            'bool'   => strtr('zend_is_true(:v)', [':v' => $value]),
-            'int',
-            'uint',
-            'integer',
-            'long',
-            'ulong'  => strtr('zval_get_long(:v)', [':v' => $value]),
-            'string' => strtr('ZSTR_VAL(zval_get_string(:v))', [':v' => $value]),
-            'char',
-            'uchar'  => strtr(
-                '(Z_TYPE_P(:v) == IS_STRING ? (Z_STRLEN_P(:v) ? Z_STRVAL_P(:v)[0] : NULL) : zval_get_long(:v))',
-                [':v' => $value]
-            ),
-            'double',
-            'float'  => strtr('zval_get_double(:v)', [':v' => $value]),
-            default  => throw new CompilerException(
-                "Unknown type '{$type}' to setting global variable '{$name}'.",
-                $expression
-            ),
-        };
+        switch ($type) {
+            case 'boolean':
+            case 'bool':
+                return strtr('zend_is_true(:v)', [':v' => $value]);
+            case 'int':
+            case 'uint':
+            case 'integer':
+            case 'long':
+            case 'ulong':
+                return strtr('zval_get_long(:v)', [':v' => $value]);
+            case 'string':
+                return strtr('ZSTR_VAL(zval_get_string(:v))', [':v' => $value]);
+            case 'char':
+            case 'uchar':
+                return strtr(
+                    '(Z_TYPE_P(:v) == IS_STRING ? (Z_STRLEN_P(:v) ? Z_STRVAL_P(:v)[0] : NULL) : zval_get_long(:v))',
+                    [':v' => $value]
+                );
+            case 'double':
+            case 'float':
+                return strtr('zval_get_double(:v)', [':v' => $value]);
+            default:
+                throw new CompilerException(
+                    "Unknown type '{$type}' to setting global variable '{$name}'.",
+                    $expression
+                );
+        }
     }
 }
diff --git a/src/Optimizers/FunctionCall/PregMatchOptimizer.php b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
index 651bc4e444..9193e7ce59 100644
--- a/src/Optimizers/FunctionCall/PregMatchOptimizer.php
+++ b/src/Optimizers/FunctionCall/PregMatchOptimizer.php
@@ -148,7 +148,7 @@ private function createMatches(array $expression, CompilationContext $context)
                 );
             }
 
-            if (!$variable->isInitialized()) {
+            if (false == $variable->isInitialized()) {
                 $variable->initVariant($context);
                 $variable->setIsInitialized(true, $context);
             }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index 4a36311802..9a549f5201 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -48,10 +48,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 /*
                  * Complex expressions require a temporary variable
                  */
-                $type = match ($resolvedParam->getType()) {
-                    'array' => 'array',
-                    default => 'variable',
-                };
+                switch ($resolvedParam->getType()) {
+                    case 'array':
+                        $type = 'array';
+                        break;
+                    default:
+                        $type = 'variable';
+                        break;
+                }
 
                 $variable = $context->symbolTable->addTemp($type, $context);
                 $variable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 89ee5109cc..619950d852 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -58,10 +58,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             /*
              * Complex expressions require a temporary variable
              */
-            $type = match ($resolvedParam->getType()) {
-                'array' => 'array',
-                default => 'variable',
-            };
+            switch ($resolvedParam->getType()) {
+                case 'array':
+                    $type = 'array';
+                    break;
+                default:
+                    $type = 'variable';
+                    break;
+            }
 
             $variable = $context->symbolTable->addTemp($type, $context);
             $variable->initVariant($context);
diff --git a/src/Passes/CallGathererPass.php b/src/Passes/CallGathererPass.php
index a917f4c998..a8aeed5110 100644
--- a/src/Passes/CallGathererPass.php
+++ b/src/Passes/CallGathererPass.php
@@ -215,6 +215,7 @@ public function passExpression(array $expression): void
 
             case 'cast':
             case 'type-hint':
+            case 'short-ternary':
             case 'ternary':
             case 'fetch':
                 $this->passExpression($expression['right']);
diff --git a/src/Passes/LocalContextPass.php b/src/Passes/LocalContextPass.php
index c50d4b2333..b72008ae5f 100644
--- a/src/Passes/LocalContextPass.php
+++ b/src/Passes/LocalContextPass.php
@@ -373,8 +373,10 @@ public function passLetStatement(array $statement): void
 
                 case 'variable-append':
                     $this->markVariableNoLocal($assignment['variable']);
-                    if ($assignment['expr']['type'] == 'variable') {
-                        $this->markVariableNoLocal($assignment['expr']['value']);
+                    switch ($assignment['expr']['type']) {
+                        case 'variable':
+                            $this->markVariableNoLocal($assignment['expr']['value']);
+                            break;
                     }
                     break;
             }
diff --git a/src/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
index 451c913586..681abd3cfc 100644
--- a/src/Passes/StaticTypeInference.php
+++ b/src/Passes/StaticTypeInference.php
@@ -225,9 +225,6 @@ public function passExpression(array $expression)
 
             case 'closure':
             case 'closure-arrow':
-            case 'erange':
-            case 'empty-array':
-            case 'require_once':
             case 'static-constant-access':
                 return 'variable';
 
@@ -300,7 +297,6 @@ public function passExpression(array $expression)
                 return 'int';
 
             case 'and':
-            case 'less-equal':
             case 'or':
                 return 'bool';
 
@@ -314,9 +310,11 @@ public function passExpression(array $expression)
             case 'less':
             case 'greater':
             case 'greater-equal':
+            case 'less-equal':
                 return 'bool';
 
             case 'irange':
+            case 'erange':
                 return 'variable';
 
             case 'typeof':
@@ -330,7 +328,6 @@ public function passExpression(array $expression)
                 return 'variable';
 
             case 'not':
-            case 'unlikely':
             case 'bitwise_not':
                 $this->passExpression($expression['left']);
 
@@ -348,6 +345,9 @@ public function passExpression(array $expression)
 
                 return 'variable';
 
+            case 'empty-array':
+                return 'variable';
+
             case 'new':
             case 'new-type':
                 $this->passNew($expression);
@@ -373,6 +373,7 @@ public function passExpression(array $expression)
             case 'empty':
             case 'instanceof':
             case 'likely':
+            case 'unlikely':
                 $this->passExpression($expression['left']);
 
                 return 'bool';
@@ -398,6 +399,7 @@ public function passExpression(array $expression)
 
             case 'clone':
             case 'require':
+            case 'require_once':
                 return 'variable';
 
             case 'ternary':
@@ -432,11 +434,14 @@ public function passLetStatement(array $statement): void
                 case 'array-index':
                 case 'object-property-array-index':
                 case 'object-property-append':
-                case 'variable-append':
                 case 'static-property-access':
                     $this->markVariable($assignment['variable'], 'variable');
                     break;
 
+                case 'variable-append':
+                    $this->markVariable($assignment['variable'], 'variable');
+                    break;
+
                 default:
                     // echo $assignment['assign-type'];
             }
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index bc666ad6d9..9ddb28c55a 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -173,7 +173,8 @@ public function assignStatic(
             case 'string':
                 $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
                     'variable',
-                    $compilationContext
+                    $compilationContext,
+                    true
                 );
                 $tempVariable->initVariant($compilationContext);
 
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 5e54cf873d..6caea121e1 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -1031,11 +1031,13 @@ private function doVariableAssignment(
     ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
-                if ($statement['operator'] == 'assign') {
-                    $symbolVariable->initVariant($compilationContext);
-                    $symbolVariable->setDynamicTypes('null');
+                switch ($statement['operator']) {
+                    case 'assign':
+                        $symbolVariable->initVariant($compilationContext);
+                        $symbolVariable->setDynamicTypes('null');
 
-                    $compilationContext->backend->assignNull($symbolVariable, $compilationContext);
+                        $compilationContext->backend->assignNull($symbolVariable, $compilationContext);
+                        break;
                 }
                 break;
 
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index 6daa94ecec..3beb3d35af 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -68,28 +68,36 @@ public function compile(CompilationContext $compilationContext): void
             /*
              * Get the symbol from the symbol table if necessary
              */
-            $symbolVariable = match ($assignment['assign-type']) {
-                'static-property',
-                'static-property-append',
-                'static-property-array-index',
-                'static-property-array-index-append',
-                'dynamic-variable-string'          => null,
-                'array-index',
-                'variable-append',
-                'object-property',
-                'array-index-append',
-                'string-dynamic-object-property',
-                'variable-dynamic-object-property' => $compilationContext->symbolTable->getVariableForUpdate(
-                    $variable,
-                    $compilationContext,
-                    $assignment
-                ),
-                default                            => $compilationContext->symbolTable->getVariableForWrite(
-                    $variable,
-                    $compilationContext,
-                    $assignment
-                ),
-            };
+            switch ($assignment['assign-type']) {
+                case 'static-property':
+                case 'static-property-append':
+                case 'static-property-array-index':
+                case 'static-property-array-index-append':
+                case 'dynamic-variable-string':
+                    $symbolVariable = null;
+                    break;
+
+                case 'array-index':
+                case 'variable-append':
+                case 'object-property':
+                case 'array-index-append':
+                case 'string-dynamic-object-property':
+                case 'variable-dynamic-object-property':
+                    $symbolVariable = $compilationContext->symbolTable->getVariableForUpdate(
+                        $variable,
+                        $compilationContext,
+                        $assignment
+                    );
+                    break;
+
+                default:
+                    $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+                        $variable,
+                        $compilationContext,
+                        $assignment
+                    );
+                    break;
+            }
 
             /*
              * Incr/Decr assignments don't require an expression
@@ -103,24 +111,26 @@ public function compile(CompilationContext $compilationContext): void
 
                 $expr = new Expression($assignment['expr']);
 
-                if ($assignment['assign-type'] == 'variable') {
-                    if (!$readDetector->detect($variable, $assignment['expr'])) {
-                        if (isset($assignment['operator'])) {
-                            if ('assign' == $assignment['operator']) {
+                switch ($assignment['assign-type']) {
+                    case 'variable':
+                        if (!$readDetector->detect($variable, $assignment['expr'])) {
+                            if (isset($assignment['operator'])) {
+                                if ('assign' == $assignment['operator']) {
+                                    $expr->setExpectReturn(true, $symbolVariable);
+                                }
+                            } else {
                                 $expr->setExpectReturn(true, $symbolVariable);
                             }
                         } else {
-                            $expr->setExpectReturn(true, $symbolVariable);
-                        }
-                    } else {
-                        if (isset($assignment['operator'])) {
-                            if ('assign' == $assignment['operator']) {
+                            if (isset($assignment['operator'])) {
+                                if ('assign' == $assignment['operator']) {
+                                    $expr->setExpectReturn(true);
+                                }
+                            } else {
                                 $expr->setExpectReturn(true);
                             }
-                        } else {
-                            $expr->setExpectReturn(true);
                         }
-                    }
+                        break;
                 }
 
                 switch ($assignment['expr']['type']) {
@@ -184,11 +194,16 @@ public function compile(CompilationContext $compilationContext): void
                 case 'static-property':
                     $let = new LetStaticProperty();
                     if (isset($assignment['operator'])) {
-                        $let = match ($assignment['operator']) {
-                            'add-assign' => new LetStaticPropertyAdd(),
-                            'sub-assign' => new LetStaticPropertySub(),
-                            default      => new LetStaticProperty(),
-                        };
+                        switch ($assignment['operator']) {
+                            case 'add-assign':
+                                $let = new LetStaticPropertyAdd();
+                                break;
+                            case 'sub-assign':
+                                $let = new LetStaticPropertySub();
+                                break;
+                            default:
+                                $let = new LetStaticProperty();
+                        }
                     }
 
                     $let->assignStatic(
diff --git a/src/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
index 70430b0671..e3eca50c22 100644
--- a/src/Statements/SwitchStatement.php
+++ b/src/Statements/SwitchStatement.php
@@ -106,18 +106,20 @@ public function compile(CompilationContext $compilationContext): void
             $defaultBlock = null;
             foreach ($clauses as $clause) {
                 if ('case' == $clause['type']) {
-                    $expr        = [
+                    $expr = [
                         'type'  => 'equals',
                         'left'  => $tempLeft,
                         'right' => $clause['expr'],
                     ];
-                    $exprStack[] = $expr;
-                    if (isset($clause['statements'])) {
-                        $blocks[]  = [
+                    if (!isset($clause['statements'])) {
+                        $exprStack[] = $expr;
+                    } else {
+                        $exprStack[] = $expr;
+                        $blocks[]    = [
                             'expr'  => $exprStack,
                             'block' => $clause['statements'],
                         ];
-                        $exprStack = [];
+                        $exprStack   = [];
                     }
                 } else {
                     if ('default' == $clause['type']) {

From 14850b83df34e44b0e9cf7dcb296a12f3f2c5a52 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 09:05:54 -0600
Subject: [PATCH 229/375] refactored some exceptions and remove duplicate code

---
 src/Class/Definition/Definition.php           | 12 +--
 src/Class/Entry.php                           |  6 +-
 src/Class/Method/Method.php                   | 10 +--
 src/Documentation/File/Sitemap.php            |  2 +-
 src/Exception/CompilerException.php           | 28 +++++++
 src/Expression/PropertyAccess.php             | 30 ++++---
 src/Expression/StaticPropertyAccess.php       | 34 ++++----
 src/Operators/Arithmetical/DivOperator.php    |  1 -
 src/Operators/Arithmetical/ModOperator.php    |  1 -
 src/Operators/Logical/AndOperator.php         |  4 +-
 src/Operators/Logical/OrOperator.php          |  1 -
 .../CallUserFuncArrayOptimizer.php            |  3 +-
 .../FunctionCall/CallUserFuncOptimizer.php    |  4 +-
 .../FunctionCall/StripcslashesOptimizer.php   |  8 --
 src/Statements/Let/ObjectPropertyAppend.php   | 24 +++---
 .../Let/ObjectPropertyArrayIndex.php          | 27 +++----
 .../Let/ObjectPropertyArrayIndexAppend.php    | 28 +++----
 src/Statements/Let/ObjectPropertyDecr.php     | 24 +++---
 src/Statements/Let/StaticProperty.php         | 28 +++----
 src/Statements/Let/StaticPropertyAppend.php   | 28 +++----
 .../Let/StaticPropertyArrayIndex.php          | 28 +++----
 .../Let/StaticPropertyArrayIndexAppend.php    | 29 +++----
 src/Statements/Let/StaticPropertySub.php      | 28 +++----
 src/Statements/ReturnStatement.php            | 18 ++---
 src/Traits/VariablesTrait.php                 | 78 ++++++++++++++++---
 25 files changed, 250 insertions(+), 234 deletions(-)

diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 6ff79d7114..077cdf50b0 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -903,12 +903,12 @@ public function getExternalHeader(): string
         $parts = explode('\\', $this->namespace);
 
         return 'ext/' . strtolower(
-            $parts[0] . DIRECTORY_SEPARATOR . str_replace(
-                '\\',
-                DIRECTORY_SEPARATOR,
-                $this->namespace
-            ) . DIRECTORY_SEPARATOR . $this->name
-        ) . '.zep';
+                $parts[0] . DIRECTORY_SEPARATOR . str_replace(
+                    '\\',
+                    DIRECTORY_SEPARATOR,
+                    $this->namespace
+                ) . DIRECTORY_SEPARATOR . $this->name
+            ) . '.zep';
     }
 
     /**
diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index b5cf44b89e..ec53e64f55 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -148,9 +148,9 @@ public function isInternal(): bool
     private function isInternalClass(string $className): bool
     {
         $this->isInternal = preg_match(
-            '/^' . $className . '/',
-            $this->compilationContext->classDefinition->getNamespace()
-        ) === 1;
+                '/^' . $className . '/',
+                $this->compilationContext->classDefinition->getNamespace()
+            ) === 1;
 
         return $this->isInternal;
     }
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 376541b0f2..0bf2dec4b0 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1167,11 +1167,11 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
                 $initCode  .= "\t" . $compilationContext->backend->ifVariableValueUndefined(
-                    $targetVar,
-                    $compilationContext,
-                    false,
-                    false
-                ) . PHP_EOL;
+                        $targetVar,
+                        $compilationContext,
+                        false,
+                        false
+                    ) . PHP_EOL;
 
                 if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
                     $substituteVar = $substituteVars[$parameter['name']];
diff --git a/src/Documentation/File/Sitemap.php b/src/Documentation/File/Sitemap.php
index 60ceb086a0..64bee4ddad 100644
--- a/src/Documentation/File/Sitemap.php
+++ b/src/Documentation/File/Sitemap.php
@@ -24,7 +24,7 @@ class Sitemap implements FileInterface
     protected $baseUrl;
     protected $classes;
     protected $namespaces;
-    private $baseDir;
+    private   $baseDir;
 
     public function __construct($baseDir, $baseUrl, $classList, $namespaceList)
     {
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index a3b47223ed..7d31f7f34e 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -88,6 +88,34 @@ public static function cannotUseNonInitializedVariableAsObject(
         );
     }
 
+    /**
+     * Class does not have a property called
+     *
+     * @param string                   $className
+     * @param string                   $property
+     * @param array|null               $extra
+     * @param int                      $code
+     * @param Exception|Throwable|null $previous
+     *
+     * @return self
+     */
+    public static function classDoesNotHaveProperty(
+        string $className,
+        string $property,
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            "Class '"
+            . $className
+            . "' does not have a property called: '" . $property . "'",
+            $extra,
+            $code,
+            $previous
+        );
+    }
+
     /**
      * @param string $operator
      * @param string $dataType
diff --git a/src/Expression/PropertyAccess.php b/src/Expression/PropertyAccess.php
index 9d52903b47..36ff9f62e1 100644
--- a/src/Expression/PropertyAccess.php
+++ b/src/Expression/PropertyAccess.php
@@ -17,6 +17,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable;
 
 use function current;
@@ -26,6 +27,8 @@
  */
 class PropertyAccess
 {
+    use VariablesTrait;
+
     protected bool      $expecting = true;
     protected ?Variable $expectingVariable;
     protected bool      $noisy     = true;
@@ -84,16 +87,11 @@ public function compile($expression, CompilationContext $compilationContext)
          */
         if ('this' == $variableVariable->getRealName()) {
             $classDefinition = $currentClassDefinition;
-            if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException(
-                    "Class '"
-                    . $classDefinition->getCompleteName()
-                    . "' does not have a property called: '"
-                    . $property
-                    . "'",
-                    $expression
-                );
-            }
+            $this->checkClassHasProperty(
+                $classDefinition,
+                $property,
+                $expression
+            );
 
             $propertyDefinition = $classDefinition->getProperty($property);
         } else {
@@ -114,12 +112,12 @@ public function compile($expression, CompilationContext $compilationContext)
                         );
                     }
 
-                    if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException(
-                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
-                            $expression
-                        );
-                    }
+                    $this->checkClassHasProperty(
+                        $classDefinition,
+                        $property,
+                        $expression,
+                        $classType
+                    );
 
                     $propertyDefinition = $classDefinition->getProperty($property);
                 }
diff --git a/src/Expression/StaticPropertyAccess.php b/src/Expression/StaticPropertyAccess.php
index effcb917a5..85b4b2c9ff 100644
--- a/src/Expression/StaticPropertyAccess.php
+++ b/src/Expression/StaticPropertyAccess.php
@@ -19,6 +19,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable;
 
 use function in_array;
@@ -28,6 +29,8 @@
  */
 class StaticPropertyAccess
 {
+    use VariablesTrait;
+
     protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
     protected bool      $readOnly          = false;
@@ -81,29 +84,20 @@ public function compile(array $expression, CompilationContext $compilationContex
             }
         }
 
-        if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException(
-                "Class '"
-                . $classDefinition->getCompleteName()
-                . "' does not have a property called: '"
-                . $property
-                . "'",
-                $expression
-            );
-        }
+        $this->checkClassHasProperty(
+            $classDefinition,
+            $property,
+            $expression
+        );
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                "Cannot access non-static property '"
-                . $classDefinition->getCompleteName()
-                . '::'
-                . $property
-                . "'",
-                $expression
-            );
-        }
+        $this->checkAccessNonStaticProperty(
+            $propertyDefinition,
+            $classDefinition,
+            $property,
+            $expression
+        );
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index d9ee6339c4..ec8230bb9f 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Arithmetical;
 
-use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 0603b901e7..0299836fc7 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Arithmetical;
 
-use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index 2cf8b5bdea..158e6d0e56 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -13,10 +13,10 @@
 
 namespace Zephir\Operators\Logical;
 
-use Exception;
 use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Statements\LetStatement;
@@ -33,7 +33,7 @@ class AndOperator extends LogicalBaseOperator
      * @return CompiledExpression
      *
      * @throws ReflectionException
-     * @throws \Zephir\Exception
+     * @throws Exception
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
diff --git a/src/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
index 2e141e6758..6ea57a1ed1 100644
--- a/src/Operators/Logical/OrOperator.php
+++ b/src/Operators/Logical/OrOperator.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Operators\Logical;
 
-use Exception;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
diff --git a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
index f38ccad65f..9151a9bb1e 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncArrayOptimizer.php
@@ -32,7 +32,6 @@ class CallUserFuncArrayOptimizer extends CallUserFuncOptimizer
     protected function getOutput(string $symbol, array $resolvedParams): string
     {
         return $this->zephirMethod
-            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        ;
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');';
     }
 }
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index e7d0f5493a..eb3fe2c508 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -17,7 +17,6 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
-use Zephir\Variable\Variable;
 
 use function count;
 
@@ -98,7 +97,6 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
     protected function getOutput(string $symbol, array $resolvedParams): string
     {
         return $this->zephirMethod
-            . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        ;
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ');';
     }
 }
diff --git a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
index cda81bdcd5..6669a3e9ef 100644
--- a/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripcslashesOptimizer.php
@@ -13,14 +13,6 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * StripcslashesOptimizer.
  *
diff --git a/src/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
index 5939e7e912..36c7db1d15 100644
--- a/src/Statements/Let/ObjectPropertyAppend.php
+++ b/src/Statements/Let/ObjectPropertyAppend.php
@@ -68,13 +68,11 @@ public function assign(
          */
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
-            if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException(
-                    "Class '" . $classDefinition->getCompleteName(
-                    ) . "' does not have a property called: '" . $property . "'",
-                    $statement
-                );
-            }
+            $this->checkClassHasProperty(
+                $classDefinition,
+                $property,
+                $statement
+            );
         } else {
             /*
              * If we know the class related to a variable we could check if the property
@@ -93,12 +91,12 @@ public function assign(
                         );
                     }
 
-                    if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException(
-                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
-                            $statement
-                        );
-                    }
+                    $this->checkClassHasProperty(
+                        $classDefinition,
+                        $property,
+                        $statement,
+                        $classType
+                    );
                 }
             }
         }
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index a52f41de57..df472bc7d1 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -287,16 +287,11 @@ protected function _assignPropertyArraySingleIndex(
          */
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
-            if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException(
-                    "Class '"
-                    . $classDefinition->getCompleteName()
-                    . "' does not have a property called: '"
-                    . $property
-                    . "'",
-                    $statement
-                );
-            }
+            $this->checkClassHasProperty(
+                $classDefinition,
+                $property,
+                $statement
+            );
         } else {
             /**
              * If we know the class related to a variable we could check if the property
@@ -315,12 +310,12 @@ protected function _assignPropertyArraySingleIndex(
                         );
                     }
 
-                    if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException(
-                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
-                            $statement
-                        );
-                    }
+                    $this->checkClassHasProperty(
+                        $classDefinition,
+                        $property,
+                        $statement,
+                        $classType
+                    );
                 }
             }
         }
diff --git a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
index 1cb0c06542..e0b1fccbe3 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndexAppend.php
@@ -119,13 +119,11 @@ protected function _assignPropertyArrayMultipleIndex(
          */
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
-            if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException(
-                    "Class '" . $classDefinition->getCompleteName(
-                    ) . "' does not have a property called: '" . $property . "'",
-                    $statement
-                );
-            }
+            $this->checkClassHasProperty(
+                $classDefinition,
+                $property,
+                $statement
+            );
         } else {
             /**
              * If we know the class related to a variable we could check if the property
@@ -144,16 +142,12 @@ protected function _assignPropertyArrayMultipleIndex(
                         );
                     }
 
-                    if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException(
-                            "Class '"
-                            . $classType
-                            . "' does not have a property called: '"
-                            . $property
-                            . "'",
-                            $statement
-                        );
-                    }
+                    $this->checkClassHasProperty(
+                        $classDefinition,
+                        $property,
+                        $statement,
+                        $classType
+                    );
                 }
             }
         }
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index 840ffb27ff..cb82b3a843 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -83,13 +83,11 @@ public function assign(
          */
         if ('this' == $symbolVariable->getRealName()) {
             $classDefinition = $compilationContext->classDefinition;
-            if (!$classDefinition->hasProperty($property)) {
-                throw new CompilerException(
-                    "Class '" . $classDefinition->getCompleteName(
-                    ) . "' does not have a property called: '" . $property . "'",
-                    $statement
-                );
-            }
+            $this->checkClassHasProperty(
+                $classDefinition,
+                $property,
+                $statement
+            );
         } else {
             /*
              * If we know the class related to a variable we could check if the property
@@ -108,12 +106,12 @@ public function assign(
                         );
                     }
 
-                    if (!$classDefinition->hasProperty($property)) {
-                        throw new CompilerException(
-                            "Class '" . $classType . "' does not have a property called: '" . $property . "'",
-                            $statement
-                        );
-                    }
+                    $this->checkClassHasProperty(
+                        $classDefinition,
+                        $property,
+                        $statement,
+                        $classType
+                    );
                 }
             }
         }
diff --git a/src/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
index 40f21b166e..478919b295 100644
--- a/src/Statements/Let/StaticProperty.php
+++ b/src/Statements/Let/StaticProperty.php
@@ -19,6 +19,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Traits\VariablesTrait;
 
 use function sprintf;
 
@@ -27,6 +28,8 @@
  */
 class StaticProperty
 {
+    use VariablesTrait;
+
     /**
      * Compiles ClassName::foo = {expr}.
      *
@@ -48,26 +51,19 @@ public function assignStatic(
         $classDefinition = $compilationContext->classLookup($className);
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
-            throw new CompilerException(
-                sprintf(
-                    "Class '%s' does not have a property called: '%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
+            throw CompilerException::classDoesNotHaveProperty(
+                $classDefinition->getCompleteName(),
+                $property,
                 $statement
             );
         }
 
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                sprintf(
-                    "Cannot access non-static property '%s::%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
-                $statement
-            );
-        }
+        $this->checkAccessNonStaticProperty(
+            $propertyDefinition,
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index f3a99d81e0..92e2ed170b 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -82,26 +82,20 @@ public function assignStatic(
             }
         }
 
-        if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException(
-                "Class '" . $classDefinition->getCompleteName(
-                ) . "' does not have a property called: '" . $property . "'",
-                $statement
-            );
-        }
+        $this->checkClassHasProperty(
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                "Cannot access non-static property '"
-                . $classDefinition->getCompleteName()
-                . '::'
-                . $property
-                . "'",
-                $statement
-            );
-        }
+        $this->checkAccessNonStaticProperty(
+            $propertyDefinition,
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index f6fc6fa233..01ef074a48 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -84,26 +84,20 @@ public function assignStatic(
             }
         }
 
-        if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException(
-                "Class '" . $classDefinition->getCompleteName(
-                ) . "' does not have a property called: '" . $property . "'",
-                $statement
-            );
-        }
+        $this->checkClassHasProperty(
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                "Cannot access non-static property '"
-                . $classDefinition->getCompleteName()
-                . '::'
-                . $property
-                . "'",
-                $statement
-            );
-        }
+        $this->checkAccessNonStaticProperty(
+            $propertyDefinition,
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index 999a6f7d80..e0b4260438 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -87,27 +87,20 @@ public function assignStatic(
             }
         }
 
-        if (!$classDefinition->hasProperty($property)) {
-            throw new CompilerException(
-                "Class '" . $classDefinition->getCompleteName() . "' does not have a property called: '"
-                . $property
-                . "'",
-                $statement
-            );
-        }
+        $this->checkClassHasProperty(
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         /** @var Property $propertyDefinition */
         $propertyDefinition = $classDefinition->getProperty($property);
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                "Cannot access non-static property '"
-                . $classDefinition->getCompleteName()
-                . '::'
-                . $property
-                . "'",
-                $statement
-            );
-        }
+        $this->checkAccessNonStaticProperty(
+            $propertyDefinition,
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition != $compilationContext->classDefinition) {
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index 9ddb28c55a..2fbfb9d3b8 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -18,6 +18,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalOperationException;
+use Zephir\Traits\VariablesTrait;
 
 use function sprintf;
 
@@ -28,6 +29,8 @@
  */
 class StaticPropertySub
 {
+    use VariablesTrait;
+
     protected string $methodName = 'subStaticProperty';
 
     /**
@@ -53,26 +56,19 @@ public function assignStatic(
         $method          = $this->methodName;
 
         if (!$propertyDefinition = $classDefinition->getProperty($property)) {
-            throw new CompilerException(
-                sprintf(
-                    "Class '%s' does not have a property called: '%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
+            throw CompilerException::classDoesNotHaveProperty(
+                $classDefinition->getCompleteName(),
+                $property,
                 $statement
             );
         }
 
-        if (!$propertyDefinition->isStatic()) {
-            throw new CompilerException(
-                sprintf(
-                    "Cannot access non-static property '%s::%s",
-                    $classDefinition->getCompleteName(),
-                    $property
-                ),
-                $statement
-            );
-        }
+        $this->checkAccessNonStaticProperty(
+            $propertyDefinition,
+            $classDefinition,
+            $property,
+            $statement
+        );
 
         if ($propertyDefinition->isPrivate()) {
             if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 417cdcd857..6559780ff6 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -20,6 +20,7 @@
 use Zephir\Exception\InvalidTypeException;
 use Zephir\Expression;
 use Zephir\Name;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Types\Types;
 
 use function sprintf;
@@ -29,6 +30,8 @@
  */
 final class ReturnStatement extends StatementAbstract
 {
+    use VariablesTrait;
+
     private const RETURN_RETURN = 'return;';
 
     /**
@@ -69,16 +72,11 @@ public function compile(CompilationContext $compilationContext): void
                              */
                             $property        = $statement['expr']['right']['value'];
                             $classDefinition = $compilationContext->classDefinition;
-                            if (!$classDefinition->hasProperty($property)) {
-                                throw new CompilerException(
-                                    sprintf(
-                                        "Class '%s' does not have a property called: '%s'",
-                                        $classDefinition->getCompleteName(),
-                                        $property
-                                    ),
-                                    $statement['expr']['right']
-                                );
-                            }
+                            $this->checkClassHasProperty(
+                                $classDefinition,
+                                $property,
+                                $statement['expr']['right']
+                            );
 
                             $compilationContext->headersManager->add('kernel/object');
                             $codePrinter->output('RETURN_MM_MEMBER(getThis(), "' . $property . '");');
diff --git a/src/Traits/VariablesTrait.php b/src/Traits/VariablesTrait.php
index 37c4d353d9..a817567b6b 100644
--- a/src/Traits/VariablesTrait.php
+++ b/src/Traits/VariablesTrait.php
@@ -14,6 +14,9 @@
 namespace Zephir\Traits;
 
 use Exception;
+use Zephir\Class\Definition\AbstractDefinition;
+use Zephir\Class\Definition\Definition;
+use Zephir\Class\Property;
 use Zephir\Exception\CompilerException;
 use Zephir\Variable\Variable;
 use Zephir\Variable\Variable as ZephirVariable;
@@ -21,19 +24,53 @@
 trait VariablesTrait
 {
     /**
-     * @param array      $expression
-     * @param string     $exception
-     * @param array|null $extra
+     * Check whether a class has a property
+     *
+     * @param Definition $classDefinition
+     * @param string     $property
+     * @param array      $statement
      *
      * @return void
      */
-    protected function checkLeft(
-        array $expression,
-        string $exception = Exception::class,
-        ?array $extra = null
+    protected function checkAccessNonStaticProperty(
+        Property $propertyDefinition,
+        AbstractDefinition $classDefinition,
+        string $property,
+        array $statement
     ): void {
-        if (!isset($expression['left'])) {
-            throw new $exception('Missing left part of the expression', $extra);
+        if (!$propertyDefinition->isStatic()) {
+            throw new CompilerException(
+                "Cannot access non-static property '"
+                . $classDefinition->getCompleteName()
+                . '::'
+                . $property
+                . "'",
+                $statement
+            );
+        }
+    }
+
+    /**
+     * Check whether a class has a property
+     *
+     * @param Definition $classDefinition
+     * @param string     $property
+     * @param array      $statement
+     *
+     * @return void
+     */
+    protected function checkClassHasProperty(
+        Definition $classDefinition,
+        string $property,
+        array $statement,
+        string $className = ''
+    ): void {
+        if (!$classDefinition->hasProperty($property)) {
+            throw CompilerException::classDoesNotHaveProperty(
+                (empty($className) ? $classDefinition->getCompleteName() : $className),
+                $property,
+                $statement
+            );
         }
     }
 
@@ -44,13 +81,13 @@ protected function checkLeft(
      *
      * @return void
      */
-    protected function checkRight(
+    protected function checkLeft(
         array $expression,
         string $exception = Exception::class,
         ?array $extra = null
     ): void {
-        if (!isset($expression['right'])) {
-            throw new $exception('Missing right part of the expression', $extra);
+        if (!isset($expression['left'])) {
+            throw new $exception('Missing left part of the expression', $extra);
         }
     }
 
@@ -84,6 +121,23 @@ protected function checkNotVariableString(
         }
     }
 
+    /**
+     * @param array      $expression
+     * @param string     $exception
+     * @param array|null $extra
+     *
+     * @return void
+     */
+    protected function checkRight(
+        array $expression,
+        string $exception = Exception::class,
+        ?array $extra = null
+    ): void {
+        if (!isset($expression['right'])) {
+            throw new $exception('Missing right part of the expression', $extra);
+        }
+    }
+
     /**
      * @param string         $variable
      * @param ZephirVariable $symbolVariable

From 2f15332d4136ae134b1a791e9c3b070f0df8a4f1 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 09:33:54 -0600
Subject: [PATCH 230/375] removed duplicate code from and/or operators

---
 src/Class/Definition/Definition.php   |  12 +--
 src/Class/Entry.php                   |   6 +-
 src/Class/Method/Method.php           |  10 +-
 src/Documentation/File/Sitemap.php    |   2 +-
 src/Operators/Logical/AndOperator.php | 106 +++++++++-----------
 src/Operators/Logical/OrOperator.php  | 137 ++------------------------
 6 files changed, 71 insertions(+), 202 deletions(-)

diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 077cdf50b0..6ff79d7114 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -903,12 +903,12 @@ public function getExternalHeader(): string
         $parts = explode('\\', $this->namespace);
 
         return 'ext/' . strtolower(
-                $parts[0] . DIRECTORY_SEPARATOR . str_replace(
-                    '\\',
-                    DIRECTORY_SEPARATOR,
-                    $this->namespace
-                ) . DIRECTORY_SEPARATOR . $this->name
-            ) . '.zep';
+            $parts[0] . DIRECTORY_SEPARATOR . str_replace(
+                '\\',
+                DIRECTORY_SEPARATOR,
+                $this->namespace
+            ) . DIRECTORY_SEPARATOR . $this->name
+        ) . '.zep';
     }
 
     /**
diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index ec53e64f55..b5cf44b89e 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -148,9 +148,9 @@ public function isInternal(): bool
     private function isInternalClass(string $className): bool
     {
         $this->isInternal = preg_match(
-                '/^' . $className . '/',
-                $this->compilationContext->classDefinition->getNamespace()
-            ) === 1;
+            '/^' . $className . '/',
+            $this->compilationContext->classDefinition->getNamespace()
+        ) === 1;
 
         return $this->isInternal;
     }
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 0bf2dec4b0..376541b0f2 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1167,11 +1167,11 @@ public function compile(CompilationContext $compilationContext): void
                  */
                 $targetVar = $compilationContext->symbolTable->getVariableForWrite($name, $compilationContext);
                 $initCode  .= "\t" . $compilationContext->backend->ifVariableValueUndefined(
-                        $targetVar,
-                        $compilationContext,
-                        false,
-                        false
-                    ) . PHP_EOL;
+                    $targetVar,
+                    $compilationContext,
+                    false,
+                    false
+                ) . PHP_EOL;
 
                 if ($targetVar->isDoublePointer() && isset($substituteVars[$parameter['name']])) {
                     $substituteVar = $substituteVars[$parameter['name']];
diff --git a/src/Documentation/File/Sitemap.php b/src/Documentation/File/Sitemap.php
index 64bee4ddad..60ceb086a0 100644
--- a/src/Documentation/File/Sitemap.php
+++ b/src/Documentation/File/Sitemap.php
@@ -24,7 +24,7 @@ class Sitemap implements FileInterface
     protected $baseUrl;
     protected $classes;
     protected $namespaces;
-    private   $baseDir;
+    private $baseDir;
 
     public function __construct($baseDir, $baseUrl, $classList, $namespaceList)
     {
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index 158e6d0e56..b718a20650 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -20,6 +20,8 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Statements\LetStatement;
+use Zephir\Types\Types;
+use Zephir\Variable\Variable;
 
 class AndOperator extends LogicalBaseOperator
 {
@@ -49,35 +51,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
          */
         $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite('bool', $compilationContext);
 
-        switch ($left->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprLeft = [
-                    'type'  => $left->getType(),
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprLeft = [
-                    'type'  => 'variable',
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprLeft = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprLeft)) {
-            throw new CompilerException($left->getType(), $expression['left']);
-        }
+        $assignExprLeft = $this->getAssignmentExpression($left, $expression['left']);
 
         /**
          * Create an implicit 'let' operation to update the evaluated left operator.
@@ -98,42 +72,14 @@ public function compile($expression, CompilationContext $compilationContext): Co
         ]);
         $statement->compile($compilationContext);
 
-        $compilationContext->codePrinter->output('if (' . $flagVariable->getName() . ') {');
+        $compilationContext->codePrinter->output($this->getOutput($flagVariable));
         $compilationContext->codePrinter->increaseLevel();
 
         $rightExpr = new Expression($expression['right']);
         $rightExpr->setReadOnly($this->readOnly);
         $right = $rightExpr->compile($compilationContext);
 
-        switch ($right->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprRight = [
-                    'type'  => $right->getType(),
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprRight = [
-                    'type'  => 'variable',
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprRight = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprRight)) {
-            throw new CompilerException($right->getType(), $expression['right']);
-        }
+        $assignExprRight = $this->getAssignmentExpression($right, $expression['right']);
 
         /**
          * Create an implicit 'let' operation to update the evaluated right operator.
@@ -159,4 +105,46 @@ public function compile($expression, CompilationContext $compilationContext): Co
 
         return new CompiledExpression('bool', $flagVariable->getName(), $expression);
     }
+
+    /**
+     * @param Variable $variable
+     *
+     * @return string
+     */
+    protected function getOutput(Variable $variable): string
+    {
+        return 'if (' . $variable->getName() . ') {';
+    }
+
+    /**
+     * @param CompiledExpression $left
+     * @param array              $expression
+     *
+     * @return array
+     */
+    private function getAssignmentExpression(CompiledExpression $left, array $expression): array
+    {
+        return match ($left->getType()) {
+            Types::T_INT,
+            Types::T_BOOL,
+            Types::T_CHAR,
+            Types::T_DOUBLE,
+            Types::T_UINT,
+            Types::T_UCHAR    => [
+                'type'  => $left->getType(),
+                'value' => $left->getCode(),
+            ],
+            Types::T_VARIABLE => [
+                'type'  => 'variable',
+                'value' => $left->getCode(),
+            ],
+            Types::T_NULL     => [
+                'type'  => 'null',
+                'value' => null,
+            ],
+            default           => throw new CompilerException(
+                $left->getType(), $expression
+            ),
+        };
+    }
 }
diff --git a/src/Operators/Logical/OrOperator.php b/src/Operators/Logical/OrOperator.php
index 6ea57a1ed1..966e1d2225 100644
--- a/src/Operators/Logical/OrOperator.php
+++ b/src/Operators/Logical/OrOperator.php
@@ -13,139 +13,20 @@
 
 namespace Zephir\Operators\Logical;
 
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-use Zephir\Statements\LetStatement;
+use Zephir\Variable\Variable;
 
-class OrOperator extends LogicalBaseOperator
+class OrOperator extends AndOperator
 {
     protected string $bitOperator = '||';
     protected string $operator    = '||';
 
-    public function compile($expression, CompilationContext $compilationContext): CompiledExpression
+    /**
+     * @param Variable $variable
+     *
+     * @return string
+     */
+    protected function getOutput(Variable $variable): string
     {
-        $this->checkLeft($expression);
-        $this->checkRight($expression);
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly($this->readOnly);
-        $left = $leftExpr->compile($compilationContext);
-
-        /**
-         * This variable is used to check if the compound and expression is evaluated as true or false.
-         */
-        $flagVariable = $compilationContext->symbolTable->getTempVariableForWrite('bool', $compilationContext);
-
-        switch ($left->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprLeft = [
-                    'type'  => $left->getType(),
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprLeft = [
-                    'type'  => 'variable',
-                    'value' => $left->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprLeft = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprLeft)) {
-            throw new CompilerException($left->getType(), $expression['left']);
-        }
-
-        /**
-         * Create an implicit 'let' operation to update the evaluated left operator.
-         */
-        $statement = new LetStatement([
-            'type'        => 'let',
-            'assignments' => [
-                [
-                    'assign-type' => 'variable',
-                    'variable'    => $flagVariable->getName(),
-                    'operator'    => 'assign',
-                    'expr'        => $assignExprLeft,
-                    'file'        => $expression['left']['file'],
-                    'line'        => $expression['left']['line'],
-                    'char'        => $expression['left']['char'],
-                ],
-            ],
-        ]);
-        $statement->compile($compilationContext);
-
-        $compilationContext->codePrinter->output('if (!(' . $flagVariable->getName() . ')) {');
-        $compilationContext->codePrinter->increaseLevel();
-
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly($this->readOnly);
-        $right = $rightExpr->compile($compilationContext);
-
-        switch ($right->getType()) {
-            case 'int':
-            case 'bool':
-            case 'char':
-            case 'double':
-            case 'uint':
-            case 'uchar':
-                $assignExprRight = [
-                    'type'  => $right->getType(),
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'variable':
-                $assignExprRight = [
-                    'type'  => 'variable',
-                    'value' => $right->getCode(),
-                ];
-                break;
-            case 'null':
-                $assignExprRight = [
-                    'type'  => 'null',
-                    'value' => null,
-                ];
-                break;
-        }
-
-        if (!isset($assignExprRight)) {
-            throw new CompilerException($right->getType(), $expression['right']);
-        }
-
-        /**
-         * Create an implicit 'let' operation to update the evaluated right operator.
-         */
-        $statement = new LetStatement([
-            'type'        => 'let',
-            'assignments' => [
-                [
-                    'assign-type' => 'variable',
-                    'variable'    => $flagVariable->getName(),
-                    'operator'    => 'assign',
-                    'expr'        => $assignExprRight,
-                    'file'        => $expression['right']['file'],
-                    'line'        => $expression['right']['line'],
-                    'char'        => $expression['right']['char'],
-                ],
-            ],
-        ]);
-        $statement->compile($compilationContext);
-
-        $compilationContext->codePrinter->decreaseLevel();
-        $compilationContext->codePrinter->output('}');
-
-        return new CompiledExpression('bool', $flagVariable->getName(), $expression);
+        return 'if (!(' . $variable->getName() . ')) {';
     }
 }

From 680780a2477e8b6f7d2366ea3d18c2d80e52d0c6 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 19:12:42 -0600
Subject: [PATCH 231/375] adding qodana setup

---
 .github/workflows/main.yml                | 35 +++++++++++++++++++++
 .github/workflows/qodana_code_quality.yml | 17 +++++++++++
 qodana.yaml                               | 37 +++++++++++++++++++++++
 src/Operators/Logical/AndOperator.php     |  3 +-
 4 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/qodana_code_quality.yml
 create mode 100644 qodana.yaml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a63732de5f..bbf0fb868c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -190,6 +190,33 @@ jobs:
         run: |
           make -j$(getconf _NPROCESSORS_ONLN)
 
+  qodana-analysis:
+    permissions:
+      contents: read
+
+    name: "Qodana Analysis"
+    runs-on: "ubuntu-22.04"
+    needs:
+      - "build-and-test"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+        with:
+          fetch-depth: 2
+
+      - name: "Qodana Analysis"
+        run: |
+          docker run \
+            -p 8080:8080 \
+            -v $(pwd):/data/project \
+            -v $(pwd)/res:/data/results/ \
+            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
+            jetbrains/qodana-php:latest \
+            --show-report
+            //--show-report --baseline=qodana.sarif.json
+
+
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v3
         with:
@@ -198,6 +225,14 @@ jobs:
           flags: unittests,${{ runner.os }},php-${{ matrix.php }}
           name: codecov-umbrella
 
+      - name: "Upload to Qodana"
+        run: |
+          docker run \
+            -v $(pwd):/data/project/ \
+            -v ./tests/output/:/data/coverage \
+            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
+            jetbrains/qodana-php
+
       - name: Upload build artifacts after Failure
         if: failure()
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
new file mode 100644
index 0000000000..ff5d3c236f
--- /dev/null
+++ b/.github/workflows/qodana_code_quality.yml
@@ -0,0 +1,17 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2023.3
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
diff --git a/qodana.yaml b/qodana.yaml
new file mode 100644
index 0000000000..94a32c7e9c
--- /dev/null
+++ b/qodana.yaml
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.recommended
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+php:
+  version: 8.0 #(Applied in CI/CD pipeline)
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-php:latest
+exclude:
+  - name: All
+    paths:
+      - vendor
+include:
+  - name: CheckDependencyLicenses
diff --git a/src/Operators/Logical/AndOperator.php b/src/Operators/Logical/AndOperator.php
index b718a20650..fb6fa93624 100644
--- a/src/Operators/Logical/AndOperator.php
+++ b/src/Operators/Logical/AndOperator.php
@@ -143,7 +143,8 @@ private function getAssignmentExpression(CompiledExpression $left, array $expres
                 'value' => null,
             ],
             default           => throw new CompilerException(
-                $left->getType(), $expression
+                $left->getType(),
+                $expression
             ),
         };
     }

From 130981a3e711fb66d464853973a4a94ef56e2c5c Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 19:13:45 -0600
Subject: [PATCH 232/375] correcting qodana action

---
 .github/workflows/qodana_code_quality.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
index ff5d3c236f..c9209ebbc7 100644
--- a/.github/workflows/qodana_code_quality.yml
+++ b/.github/workflows/qodana_code_quality.yml
@@ -12,6 +12,6 @@ jobs:
         with:
           fetch-depth: 0
       - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.3
+        uses: JetBrains/qodana-action@v2023.2
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

From b5bcdabf138c1f1ccefd9b60d7496b0856085b3c Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 19:19:52 -0600
Subject: [PATCH 233/375] adding baseline file

---
 .github/workflows/main.yml |     3 +-
 qodana.sarif.json          | 33904 +++++++++++++++++++++++++++++++++++
 2 files changed, 33905 insertions(+), 2 deletions(-)
 create mode 100644 qodana.sarif.json

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bbf0fb868c..f2cc2a6ac1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -213,8 +213,7 @@ jobs:
             -v $(pwd)/res:/data/results/ \
             -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
             jetbrains/qodana-php:latest \
-            --show-report
-            //--show-report --baseline=qodana.sarif.json
+            --show-report --baseline=qodana.sarif.json
 
 
       - name: Upload Code Coverage Report
diff --git a/qodana.sarif.json b/qodana.sarif.json
new file mode 100644
index 0000000000..cf42d19bc2
--- /dev/null
+++ b/qodana.sarif.json
@@ -0,0 +1,33904 @@
+{
+  "$schema": "https://raw.githubusercontent.com/schemastore/schemastore/master/src/schemas/json/sarif-2.1.0-rtm.5.json",
+  "version": "2.1.0",
+  "runs": [
+    {
+      "tool": {
+        "driver": {
+          "name": "QDPHP",
+          "fullName": "Qodana for PHP",
+          "version": "232.9881.131",
+          "rules": [],
+          "taxa": [
+            {
+              "id": "PHP",
+              "name": "PHP"
+            },
+            {
+              "id": "PHP/Code smell",
+              "name": "Code smell",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/PHPDoc",
+              "name": "PHPDoc",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Code style",
+              "name": "Code style",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Naming conventions",
+              "name": "Naming conventions",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Shell script",
+              "name": "Shell script"
+            },
+            {
+              "id": "PHP/General",
+              "name": "General",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript",
+              "name": "JavaScript and TypeScript"
+            },
+            {
+              "id": "JavaScript and TypeScript/Unit testing",
+              "name": "Unit testing",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Probable bugs",
+              "name": "Probable bugs",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "MySQL",
+              "name": "MySQL"
+            },
+            {
+              "id": "PHP/PHPDoc/Code style",
+              "name": "Code style",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP/PHPDoc",
+                    "index": 2,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Control flow",
+              "name": "Control flow",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Sass/SCSS",
+              "name": "Sass/SCSS"
+            },
+            {
+              "id": "HTML",
+              "name": "HTML"
+            },
+            {
+              "id": "JavaScript and TypeScript/Unused symbols",
+              "name": "Unused symbols",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Cucumber",
+              "name": "Cucumber"
+            },
+            {
+              "id": "JavaScript and TypeScript/Flow type checker",
+              "name": "Flow type checker",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Data flow",
+              "name": "Data flow",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "EditorConfig",
+              "name": "EditorConfig"
+            },
+            {
+              "id": "PHP/PHPUnit",
+              "name": "PHPUnit",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PostCSS",
+              "name": "PostCSS"
+            },
+            {
+              "id": "JavaScript and TypeScript/Bitwise operation issues",
+              "name": "Bitwise operation issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Type compatibility",
+              "name": "Type compatibility",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/General",
+              "name": "General",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/ES2015 migration aids",
+              "name": "ES2015 migration aids",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Undefined symbols",
+              "name": "Undefined symbols",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "General",
+              "name": "General"
+            },
+            {
+              "id": "HTML/Accessibility",
+              "name": "Accessibility",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "HTML",
+                    "index": 14,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/React",
+              "name": "React",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Validity issues",
+              "name": "Validity issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+              "name": "Potentially confusing code constructs",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "CSS",
+              "name": "CSS"
+            },
+            {
+              "id": "CSS/Invalid elements",
+              "name": "Invalid elements",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "CSS",
+                    "index": 32,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "SQL",
+              "name": "SQL"
+            },
+            {
+              "id": "JavaScript and TypeScript/Try statement issues",
+              "name": "Try statement issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "YAML",
+              "name": "YAML"
+            },
+            {
+              "id": "PHP/Unused symbols",
+              "name": "Unused symbols",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Composer",
+              "name": "Composer",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Control flow issues",
+              "name": "Control flow issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "XML",
+              "name": "XML"
+            },
+            {
+              "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+              "name": "Potentially undesirable code constructs",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "CSS/Code style issues",
+              "name": "Code style issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "CSS",
+                    "index": 32,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Less",
+              "name": "Less"
+            },
+            {
+              "id": "JavaScript and TypeScript/Probable bugs",
+              "name": "Probable bugs",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Attributes",
+              "name": "Attributes",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "RegExp",
+              "name": "RegExp"
+            },
+            {
+              "id": "JavaScript and TypeScript/Code style issues",
+              "name": "Code style issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Assignment issues",
+              "name": "Assignment issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Joomla!",
+              "name": "Joomla!"
+            },
+            {
+              "id": "PHP/Refactoring opportunities",
+              "name": "Refactoring opportunities",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "CSS/Probable bugs",
+              "name": "Probable bugs",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "CSS",
+                    "index": 32,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/TypeScript",
+              "name": "TypeScript",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Switch statement issues",
+              "name": "Switch statement issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/DOM issues",
+              "name": "DOM issues",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Async code and promises",
+              "name": "Async code and promises",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Code Coverage",
+              "name": "Code Coverage"
+            },
+            {
+              "id": "Proofreading",
+              "name": "Proofreading"
+            },
+            {
+              "id": "PHP/Behat",
+              "name": "Behat",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Imports and dependencies",
+              "name": "Imports and dependencies",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Ini files",
+              "name": "Ini files"
+            },
+            {
+              "id": "PHP/Code style/PSR-12",
+              "name": "PSR-12",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP/Code style",
+                    "index": 3,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Psalm",
+              "name": "Psalm",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Naming conventions",
+              "name": "Naming conventions",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Taint analysis",
+              "name": "Taint analysis",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Code quality tools",
+              "name": "Code quality tools",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Blade files",
+              "name": "Blade files"
+            },
+            {
+              "id": "PHP/PHP strict standards",
+              "name": "PHP strict standards",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Regular expressions",
+              "name": "Regular expressions",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JavaScript and TypeScript/Function metrics",
+              "name": "Function metrics",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PHP/Quality tools",
+              "name": "Quality tools",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "JSON and JSON5",
+              "name": "JSON and JSON5"
+            },
+            {
+              "id": "PHP/Error handling",
+              "name": "Error handling",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "Oracle",
+              "name": "Oracle"
+            },
+            {
+              "id": "Internationalization",
+              "name": "Internationalization"
+            },
+            {
+              "id": "MongoJS",
+              "name": "MongoJS"
+            },
+            {
+              "id": "Vue",
+              "name": "Vue"
+            },
+            {
+              "id": "Version control",
+              "name": "Version control"
+            },
+            {
+              "id": "Structural search",
+              "name": "Structural search"
+            },
+            {
+              "id": "Dependency analysis",
+              "name": "Dependency analysis"
+            },
+            {
+              "id": "JavaScript and TypeScript/Node.js",
+              "name": "Node.js",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "RELAX NG",
+              "name": "RELAX NG"
+            },
+            {
+              "id": "PHP/Replaceable assignments",
+              "name": "Replaceable assignments",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "PHP",
+                    "index": 0,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "CSS/Code quality tools",
+              "name": "Code quality tools",
+              "relationships": [
+                {
+                  "target": {
+                    "id": "CSS",
+                    "index": 32,
+                    "toolComponent": {
+                      "name": "QDPHP"
+                    }
+                  },
+                  "kinds": [
+                    "superset"
+                  ]
+                }
+              ]
+            },
+            {
+              "id": "PostgreSQL",
+              "name": "PostgreSQL"
+            },
+            {
+              "id": "SQL server",
+              "name": "SQL server"
+            },
+            {
+              "id": "Qodana",
+              "name": "Qodana"
+            }
+          ],
+          "language": "en-US",
+          "contents": [
+            "localizedData",
+            "nonLocalizedData"
+          ],
+          "isComprehensive": false
+        },
+        "extensions": [
+          {
+            "name": "com.jetbrains.php",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "PhpLoopCanBeReplacedWithStrRepeatInspection",
+                "shortDescription": {
+                  "text": "Loop can be replaced with 'str_repeat'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'for' loops that can be safely replaced with 'str_repeat()' calls.",
+                  "markdown": "Reports the `for` loops that can be safely replaced with `str_repeat()` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLoopCanBeReplacedWithStrRepeatInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDocDuplicateTypeInspection",
+                "shortDescription": {
+                  "text": "Type already exists in PHPDoc tag"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate types in PHPDoc comments.",
+                  "markdown": "Reports duplicate types in PHPDoc comments."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDocDuplicateTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryCurlyVarSyntaxInspection",
+                "shortDescription": {
+                  "text": "Unnecessary curly braces syntax for variable"
+                },
+                "fullDescription": {
+                  "text": "Reports unnecessary '{' and '}' used for interpolating variables in string literals. See Variable parsing (php.net) for details.",
+                  "markdown": "Reports unnecessary `{` and `}` used for interpolating variables in string literals.\n\n\nSee [Variable parsing (php.net)](https://www.php.net/manual/en/language.types.string.php#language.types.string.parsing) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFunctionNamingConventionInspection",
+                "shortDescription": {
+                  "text": "Function name is not following coding convention"
+                },
+                "fullDescription": {
+                  "text": "Reports the functions' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for functions. Use the inspection options to specify minimum/maximum length and the regular expression expected for functions' names. To ignore the names' length, specify 0. To learn more about regular expressions, refer to the Quick Start guide (regular-expressions.info).",
+                  "markdown": "Reports the functions' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for functions.\n\n\nUse the inspection options to specify minimum/maximum length and the regular expression expected for functions' names.\nTo ignore the names' length, specify **0**.\n\n\nTo learn more about regular expressions, refer to the [Quick Start guide (regular-expressions.info)](https://www.regular-expressions.info/quickstart.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpFunctionNamingConventionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Naming conventions",
+                      "index": 4,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayFillCanBeConvertedToLoopInspection",
+                "shortDescription": {
+                  "text": "'array_fill' can be converted to loop"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'array_fill()' calls that can be replaced with 'foreach' loops.",
+                  "markdown": "Reports the `array_fill()` calls that can be replaced with `foreach` loops."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayFillCanBeConvertedToLoopInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIssetCanBeReplacedWithCoalesceInspection",
+                "shortDescription": {
+                  "text": "'isset' can be replaced with coalesce"
+                },
+                "fullDescription": {
+                  "text": "Reports the conditions using 'isset' that can be safely replaced with expressions using the '??' null coalesce operator. See Null coalesce operator (php.net) for details.",
+                  "markdown": "Reports the conditions using `isset` that can be safely replaced with expressions using the `??` null coalesce operator.\n\n\nSee [Null coalesce operator (php.net)](https://wiki.php.net/rfc/isset_ternary) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIssetCanBeReplacedWithCoalesceInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNestedTernaryExpressionUsageInspection",
+                "shortDescription": {
+                  "text": "Nested ternary operator usage"
+                },
+                "fullDescription": {
+                  "text": "Reports nested ternary expressions, which are deprecated starting from PHP 7.4.",
+                  "markdown": "Reports nested ternary expressions, which are deprecated starting from PHP 7.4."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpNestedTernaryExpressionUsageInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVoidFunctionResultUsedInspection",
+                "shortDescription": {
+                  "text": "Invalid function result used"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of a 'void' or 'never' function's return value. Since 'void' functions do not have a return value and 'never' functions terminate execution or throw an exception, such usages are most likely a programming mistake.",
+                  "markdown": "Reports the usages of a `void` or `never` function's return value.\n\n\nSince `void` functions do not have a return value and `never` functions terminate execution or throw an exception, such usages are most likely a programming mistake."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpVoidFunctionResultUsedInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConstantNamingConventionInspection",
+                "shortDescription": {
+                  "text": "Constant name is not following coding convention"
+                },
+                "fullDescription": {
+                  "text": "Reports the constants' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for constants. Use the inspection options to specify minimum/maximum length and the regular expression expected for constants' names. To ignore the names' length, specify 0. To learn more about regular expressions, refer to the Quick Start guide (regular-expressions.info).",
+                  "markdown": "Reports the constants' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for constants.\n\n\nUse the inspection options to specify minimum/maximum length and the regular expression expected for constants' names.\nTo ignore the names' length, specify **0**.\n\n\nTo learn more about regular expressions, refer to the [Quick Start guide (regular-expressions.info)](https://www.regular-expressions.info/quickstart.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpConstantNamingConventionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Naming conventions",
+                      "index": 4,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTernaryExpressionCanBeReducedToShortVersionInspection",
+                "shortDescription": {
+                  "text": "Ternary expression can be replaced with short version"
+                },
+                "fullDescription": {
+                  "text": "Reports the '?:' ternary expressions in which the condition and the 'true' statement are matching.",
+                  "markdown": "Reports the `?:` ternary expressions in which the condition and the `true` statement are matching."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTernaryExpressionCanBeReducedToShortVersionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCatchWithInstanceOfCanBeReplacedWithSpecificCatchesInspection",
+                "shortDescription": {
+                  "text": "'instanceof' checks in 'catch' block can be replaced with specific catches"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'instanceof' checks in single 'catch' blocks that could be replaced with multiple 'catch' blocks specific for each exception instance.",
+                  "markdown": "Reports the `instanceof` checks in single `catch` blocks that could be replaced with multiple `catch` blocks specific for each exception instance."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCatchWithInstanceOfCanBeReplacedWithSpecificCatchesInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicateMatchArmBodyInspection",
+                "shortDescription": {
+                  "text": "Duplicate arm in 'match' expression"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate bodies in 'match' arms. See Match expression (php.net) for details.",
+                  "markdown": "Reports duplicate bodies in `match` arms.\n\n\nSee [Match expression (php.net)](https://wiki.php.net/rfc/match_expression_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicateMatchArmBodyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingDocCommentInspection",
+                "shortDescription": {
+                  "text": "Missing PHPDoc comment"
+                },
+                "fullDescription": {
+                  "text": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the '@noinspection' tag. You can use the Enforce PHPDoc Comment inspection to report fully typed elements.",
+                  "markdown": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the `@noinspection` tag.\n\nYou can use the *Enforce PHPDoc Comment* inspection to report fully typed elements."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingDocCommentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc/Code style",
+                      "index": 11,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
+                "shortDescription": {
+                  "text": "Write access to referenced array value without 'unset'"
+                },
+                "fullDescription": {
+                  "text": "Reports the write access expressions on variables that are still referencing the array value previously used in a 'foreach' statement. It is recommended to destroy such references by using 'unset'. See foreach (php.net) and unset (php.net) for details.",
+                  "markdown": "Reports the write access expressions on variables that are still referencing the array value previously used in a `foreach` statement.\n\n\nIt is recommended to destroy such references by using `unset`.\n\n\nSee [foreach (php.net)](https://www.php.net/manual/en/control-structures.foreach.php) and [unset (php.net)](https://www.php.net/manual/en/function.unset.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSameParameterValueInspection",
+                "shortDescription": {
+                  "text": "Parameter's value is always the same"
+                },
+                "fullDescription": {
+                  "text": "Reports the parameters in private methods that have the same value across all method calls.",
+                  "markdown": "Reports the parameters in private methods that have the same value across all method calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpSameParameterValueInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitCoversFunctionWithoutScopeResolutionOperatorInspection",
+                "shortDescription": {
+                  "text": "Covered function reference is provided without ‘::’"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to functions/methods in the '@covers' PHPDoc tags that are not prepended with the scope resolution operator ('::').",
+                  "markdown": "Reports the references to functions/methods in the `@covers` PHPDoc tags that are not prepended with the scope resolution operator (`::`)."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitCoversFunctionWithoutScopeResolutionOperatorInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayAccessOnIllegalTypeInspection",
+                "shortDescription": {
+                  "text": "Array offset access on illegal type"
+                },
+                "fullDescription": {
+                  "text": "Reports the array offset access expressions that are used on illegal types.",
+                  "markdown": "Reports the array offset access expressions that are used on illegal types."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayAccessOnIllegalTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedGotoLabelInspection",
+                "shortDescription": {
+                  "text": "Undefined goto label"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'goto' labels that are not found in the current scope. The target 'goto' label must reside in the same file and context: you cannot jump into or out of a function or method, and cannot jump into a loop or switch structure. See goto (php.net) for details.",
+                  "markdown": "Reports the `goto` labels that are not found in the current scope.\n\n\nThe target `goto` label must reside in the same file and context: you cannot jump into or out of a function or method, and cannot jump into a loop or switch structure.\n\n\nSee [goto (php.net)](https://www.php.net/manual/en/control-structures.goto.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedGotoLabelInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedPartiallySupportedCallableInspection",
+                "shortDescription": {
+                  "text": "Deprecated partially supported callables"
+                },
+                "fullDescription": {
+                  "text": "Reports deprecated usage of callables that are supported by 'call_user_func($callable)', but not by '$callable()'. Starting from PHP 8.2, the following callables are deprecated: '\"self::method\"'\n'\"parent::method\"'\n'\"static::method\"'\n'[\"self\", \"method\"]'\n'[\"parent\", \"method\"]'\n'[\"static\", \"method\"]'\n'[\"Foo\", \"Bar::method\"]'\n'[new Foo, \"Bar::method\"]' See Deprecate partially supported callables (php.net) for details.",
+                  "markdown": "Reports deprecated usage of callables that are supported by `call_user_func($callable)`, but not by `$callable()`.\n\nStarting from PHP 8.2, the following callables are deprecated:\n\n    \"self::method\"\n    \"parent::method\"\n    \"static::method\"\n    [\"self\", \"method\"]\n    [\"parent\", \"method\"]\n    [\"static\", \"method\"]\n    [\"Foo\", \"Bar::method\"]\n    [new Foo, \"Bar::method\"]\n\n\nSee [Deprecate partially supported callables (php.net)](https://wiki.php.net/rfc/deprecate_partially_supported_callables) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedPartiallySupportedCallableInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLoopCanBeConvertedToArrayFillInspection",
+                "shortDescription": {
+                  "text": "Loop can be converted to 'array_fill()' call"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'for' loops that can be replaced with 'array_fill()' calls.",
+                  "markdown": "Reports the `for` loops that can be replaced with `array_fill()` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLoopCanBeConvertedToArrayFillInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayToStringConversionInspection",
+                "shortDescription": {
+                  "text": "Array to string conversion"
+                },
+                "fullDescription": {
+                  "text": "Reports array to string conversions, that is, the arrays that are provided in the contexts where a string is expected. Prior to PHP 8.0, this would lead to a 'E_NOTICE' level error. In PHP 8.0, an 'E-WARNING' is emitted.",
+                  "markdown": "Reports array to string conversions, that is, the arrays that are provided in the contexts where a string is expected.\n\n\nPrior to PHP 8.0, this would lead to a `E_NOTICE` level error. In PHP 8.0, an `E-WARNING` is emitted."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayToStringConversionInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConstantReassignmentInspection",
+                "shortDescription": {
+                  "text": "Constant reassignment"
+                },
+                "fullDescription": {
+                  "text": "Reports reassignments of constants. Since constants cannot be changed, such assignments will have no effect and will emit an 'E_NOTICE' (in PHP 7.4 and earlier) or 'E_WARNING' (in PHP 8.0 and later).",
+                  "markdown": "Reports reassignments of constants.\n\n\nSince constants cannot be changed, such assignments will have no effect and will emit an `E_NOTICE` (in PHP 7.4 and earlier) or `E_WARNING` (in PHP 8.0 and later)."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpConstantReassignmentInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedFieldInspection",
+                "shortDescription": {
+                  "text": "Undefined property"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to class properties that are not declared. The inspection skips the objects of the 'stdClass' or derived types.",
+                  "markdown": "Reports the references to class properties that are not declared.\n\n\nThe inspection skips the objects of the `stdClass` or derived types."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedFieldInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedClassConstantInspection",
+                "shortDescription": {
+                  "text": "Undefined class constant"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to class constants that are not declared.",
+                  "markdown": "Reports the references to class constants that are not declared."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedClassConstantInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPregMatchWithoutEffectiveRegexpInspection",
+                "shortDescription": {
+                  "text": "'preg_match' can be replaced with 'str_contains'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'preg_match()' calls with 'pattern' arguments that don't use any regexp facilities. Such calls can be replaced with 'str_starts_with()', 'str_ends_with()' or 'str_contains()' calls.",
+                  "markdown": "Reports the `preg_match()` calls with `pattern` arguments that don't use any regexp facilities. Such calls can be replaced with `str_starts_with()`, `str_ends_with()` or `str_contains()` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPregMatchWithoutEffectiveRegexpInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpToStringReturnInspection",
+                "shortDescription": {
+                  "text": "Method '__toString' return type"
+                },
+                "fullDescription": {
+                  "text": "Reports the '__toString' methods that do not return 'string'. Prior to PHP 7.4, this would lead to a fatal 'E_RECOVERABLE_ERROR' level error. In PHP 7.4, a fatal non-recoverable 'ERROR' is thrown. In PHP 8.0, the return value follows the standard PHP type semantics and will be coerced into a string if possible and if strict typing is disabled. See __toString (php.net) for details.",
+                  "markdown": "Reports the `__toString` methods that do not return `string`.\n\nPrior to PHP 7.4, this would lead to a fatal `E_RECOVERABLE_ERROR` level error. In PHP 7.4, a fatal non-recoverable `ERROR` is thrown. In PHP 8.0, the return value follows the standard PHP type semantics and will be coerced into a string if possible and if strict typing is disabled.\n\n\nSee [__toString (php.net)](https://www.php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpToStringReturnInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIfCanBeReplacedWithMatchExpressionInspection",
+                "shortDescription": {
+                  "text": "'if' can be replaced with 'match' expression"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'if' statements inside 'if-elseif-else' constructs that use strict comparisons ('===') and could be replaced with 'match' expressions.",
+                  "markdown": "Reports the `if` statements inside `if-elseif-else` constructs that use strict comparisons (`===`) and could be replaced with `match` expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIfCanBeReplacedWithMatchExpressionInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUselessTrailingCommaInspection",
+                "shortDescription": {
+                  "text": "Useless trailing comma"
+                },
+                "fullDescription": {
+                  "text": "Reports the trailing commas in parameters lists and closures' 'use' lists that do not bring any benefit. In a single-line list, a trailing comma is redundant and can be removed. In a multiline list, if no line break is provided after a trailing comma, it becomes impossible to easily add, remove, or move lines.",
+                  "markdown": "Reports the trailing commas in parameters lists and closures' `use` lists that do not bring any benefit.\n\n* In a single-line list, a trailing comma is redundant and can be removed.\n* In a multiline list, if no line break is provided after a trailing comma, it becomes impossible to easily add, remove, or move lines."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUselessTrailingCommaInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpParamsInspection",
+                "shortDescription": {
+                  "text": "Parameter type"
+                },
+                "fullDescription": {
+                  "text": "Reports the parameters passed to a function call, whose types do not match the ones specified in the function definition via type declaration or the PHPDoc '@param' tag. See Type declarations (php.net) and @param (phpdoc.org) for details.",
+                  "markdown": "Reports the parameters passed to a function call, whose types do not match the ones specified in the function definition via type declaration or the PHPDoc `@param` tag.\n\nSee [Type declarations (php.net)](http://php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration) and\n[@param (phpdoc.org)](https://docs.phpdoc.org/guide/references/phpdoc/tags/param.html#param) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpParamsInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClassCanBeReadonlyInspection",
+                "shortDescription": {
+                  "text": "Class can be 'readonly'"
+                },
+                "fullDescription": {
+                  "text": "Reports classes which contain only 'readonly' properties.",
+                  "markdown": "Reports classes which contain only `readonly` properties."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClassCanBeReadonlyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCastIsUnnecessaryInspection",
+                "shortDescription": {
+                  "text": "Type cast is unnecessary"
+                },
+                "fullDescription": {
+                  "text": "Reports the type cast operators used on the values that are already of the corresponding type. Such operators are redundant and can be safely removed. See Type juggling (php.net) for details.",
+                  "markdown": "Reports the type cast operators used on the values that are already of the corresponding type. Such operators are redundant and can be safely removed.\n\n\nSee [Type juggling (php.net)](https://www.php.net/manual/en/language.types.type-juggling.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCastIsUnnecessaryInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDocMissingThrowsInspection",
+                "shortDescription": {
+                  "text": "Missing @throws tag(s)"
+                },
+                "fullDescription": {
+                  "text": "Reports missing PHPDoc '@throws' tags for exceptions thrown by functions or methods. The exception classes added to the Unchecked Exceptions list under Settings | PHP | Analysis are excluded from the inspection scope.",
+                  "markdown": "Reports missing PHPDoc `@throws` tags for exceptions thrown by functions or methods.\n\nThe exception classes added to the **Unchecked Exceptions** list under\n[Settings \\| PHP \\| Analysis](settings://reference.webide.settings.project.settings.php?Unchecked%20Exceptions)\nare excluded from the inspection scope."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDocMissingThrowsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc/Code style",
+                      "index": 11,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedAliasInspection",
+                "shortDescription": {
+                  "text": "Unused import"
+                },
+                "fullDescription": {
+                  "text": "Reports the imports that are never used.",
+                  "markdown": "Reports the imports that are never used."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedAliasInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ComposerJsonFileReferencesInspection",
+                "shortDescription": {
+                  "text": "Unresolved file references"
+                },
+                "fullDescription": {
+                  "text": "Reports unresolved file references in composer.json.",
+                  "markdown": "Reports unresolved file references in composer.json."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ComposerJsonFileReferencesInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Composer",
+                      "index": 38,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIssetCanCheckNestedAccessDirectlyInspection",
+                "shortDescription": {
+                  "text": "'isset' can check nested array access and sub properties directly"
+                },
+                "fullDescription": {
+                  "text": "Reports constructions like 'isset($a['a']) && isset($a['a']['b']) && isset($b) && isset($b->b)' that can be replaced with 'isset($a['a']['b']) && isset($b->b)'.",
+                  "markdown": "Reports constructions like `isset($a['a']) && isset($a['a']['b']) && isset($b) && isset($b->b)` that can be replaced with `isset($a['a']['b']) && isset($b->b)`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIssetCanCheckNestedAccessDirectlyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantDefaultBreakContinueArgumentInspection",
+                "shortDescription": {
+                  "text": "Redundant 'continue/break' argument"
+                },
+                "fullDescription": {
+                  "text": "Reports the redundant '1' argument of 'continue' and 'break' statements. Since this argument is optional and its default value is '1', such usages can be omitted. See continue (php.net) and break (php.net) for details.",
+                  "markdown": "Reports the redundant `1` argument of `continue` and `break` statements. Since this argument is optional and its default value is `1`, such usages can be omitted.\n\n\nSee [continue (php.net)](https://www.php.net/manual/en/control-structures.continue.php) and [break (php.net)](https://www.php.net/manual/en/control-structures.break.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantDefaultBreakContinueArgumentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayUsedOnlyForWriteInspection",
+                "shortDescription": {
+                  "text": "Array used only with write access"
+                },
+                "fullDescription": {
+                  "text": "Reports local arrays that are only updated, but never queried.",
+                  "markdown": "Reports local arrays that are only updated, but never queried."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayUsedOnlyForWriteInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIllegalPsrClassPathInspection",
+                "shortDescription": {
+                  "text": "Class path doesn't match project structure"
+                },
+                "fullDescription": {
+                  "text": "Reports the classes with the filepath not following the PSR-0/PSR-4 project structure. You can configure the project vendor roots under Settings/Preferences | Directories. See PSR-0/PSR-4 standards (php-fig.org) for details.",
+                  "markdown": "Reports the classes with the filepath not following the PSR-0/PSR-4 project structure.\n\n\nYou can configure the project vendor roots under **Settings/Preferences \\| Directories**.\n\n\nSee [PSR-0/PSR-4 standards (php-fig.org)](https://www.php-fig.org/psr/psr-4/) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpIllegalPsrClassPathInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantMethodOverrideInspection",
+                "shortDescription": {
+                  "text": "Redundant method override"
+                },
+                "fullDescription": {
+                  "text": "Reports the overriding methods that only consist of a single call to the parent method.",
+                  "markdown": "Reports the overriding methods that only consist of a single call to the parent method."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantMethodOverrideInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDefineCanBeReplacedWithConstInspection",
+                "shortDescription": {
+                  "text": "Define constant name can be replaced with 'const' syntax"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'define()' calls that can be replaced with 'const' syntax.",
+                  "markdown": "Reports the `define()` calls that can be replaced with `const` syntax."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDefineCanBeReplacedWithConstInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayAppendUsingCountInspection",
+                "shortDescription": {
+                  "text": "Using 'count()' as index for appending value to array"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'count($array)' calls that are used as an array index for appending an element to the array: '$array[count($array)] = 42'. In such cases, it is recommended to use square bracket syntax ('$array[] = 42') instead, which adds no overhead of calling a function.",
+                  "markdown": "Reports the `count($array)` calls that are used as an array index for appending an element to the array: `$array[count($array)] = 42`. In such cases, it is recommended to use square bracket syntax (`$array[] = 42`) instead, which adds no overhead of calling a function."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayAppendUsingCountInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSwitchCanBeReplacedWithMatchExpressionInspection",
+                "shortDescription": {
+                  "text": "'switch' can be replaced with 'match' expression"
+                },
+                "fullDescription": {
+                  "text": "Reports 'switch' statements that could be replaced with 'match' expression",
+                  "markdown": "Reports 'switch' statements that could be replaced with 'match' expression"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpSwitchCanBeReplacedWithMatchExpressionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPowCallCanBeReplacedWithOperatorInspection",
+                "shortDescription": {
+                  "text": "'pow()' call can be replaced with '**' operator"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'pow()' calls that can be replaced with the '**' operator, which adds no overhead of calling a function. See Power operator (php.net) for details.",
+                  "markdown": "Reports the `pow()` calls that can be replaced with the `**` operator, which adds no overhead of calling a function.\n\n\nSee [Power operator (php.net)](https://wiki.php.net/rfc/pow-operator) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPowCallCanBeReplacedWithOperatorInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFormatFunctionParametersMismatchInspection",
+                "shortDescription": {
+                  "text": "Format function parameters mismatch"
+                },
+                "fullDescription": {
+                  "text": "Reports the arguments of a format function (such as 'printf' or 'sprintf') that are not mapped to any parameters or specification conversions. See printf (php.net) and sprintf (php.net) for details.",
+                  "markdown": "Reports the arguments of a format function (such as `printf` or `sprintf`) that are not mapped to any parameters or specification conversions.\n\n\nSee [printf (php.net)](https://www.php.net/manual/en/function.printf.php) and [sprintf (php.net)](https://www.php.net/manual/en/function.sprintf.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpFormatFunctionParametersMismatchInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpForeachVariableOverwritesAlreadyDefinedVariableInspection",
+                "shortDescription": {
+                  "text": "'foreach' variable overwrites already defined variable"
+                },
+                "fullDescription": {
+                  "text": "Reports the keys and values in 'foreach' loops that are assigned a non-primitive value before the 'foreach' loop and are accessed after it. Such usages may unwillingly overwrite an already defined value and cause latent bugs.",
+                  "markdown": "Reports the keys and values in `foreach` loops that are assigned a non-primitive value before the `foreach` loop and are accessed after it. Such usages may unwillingly overwrite an already defined value and cause latent bugs."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpForeachVariableOverwritesAlreadyDefinedVariableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLoopCanBeReplacedWithStdFunctionCallsInspection",
+                "shortDescription": {
+                  "text": "Loop can be replaced with 'in_array()' or 'array_key_exists()' call"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'foreach' loops that can be safely replaced with 'in_array()' or 'array_key_exists()' calls. See in_array (php.net) and array_key_exists (php.net) for details.",
+                  "markdown": "Reports the `foreach` loops that can be safely replaced with `in_array()` or `array_key_exists()` calls.\n\n\nSee [in_array (php.net)](https://www.php.net/manual/en/function.in-array) and [array_key_exists (php.net)](https://www.php.net/manual/en/function.array-key-exists) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLoopCanBeReplacedWithStdFunctionCallsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayKeyDoesNotMatchArrayShapeInspection",
+                "shortDescription": {
+                  "text": "Array key does not match array shape "
+                },
+                "fullDescription": {
+                  "text": "Reports the array keys that do not match the keys specified via the '#[ArrayShape]' attribute.",
+                  "markdown": "Reports the array keys that do not match the keys specified via the `#[ArrayShape]` attribute."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayKeyDoesNotMatchArrayShapeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpComposerExtensionStubsInspection",
+                "shortDescription": {
+                  "text": "Extension is missing in composer.json"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of classes, functions, and constants from the PHP extensions not specified in composer.json. If an extension is listed in the 'require-dev' section of composer.json, the inspection reports the corresponding symbols' usages located outside of the folders marked as test roots.",
+                  "markdown": "Reports the usages of classes, functions, and constants from the PHP extensions not specified in *composer.json* . If an extension is listed in the `require-dev` section of *composer.json*, the inspection reports the corresponding symbols' usages located outside of the folders marked as test roots."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpComposerExtensionStubsInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Composer",
+                      "index": 38,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedParameterInspection",
+                "shortDescription": {
+                  "text": "Unused parameter"
+                },
+                "fullDescription": {
+                  "text": "Reports the parameters that are considered unused in the following cases: The parameter is passed by value, and the value is not used anywhere or is overwritten immediately. The parameter is passed by reference, and the reference is not used anywhere or is overwritten immediately.",
+                  "markdown": "Reports the parameters that are considered unused in the following cases:\n\n* The parameter is passed by value, and the value is not used anywhere or is overwritten immediately.\n* The parameter is passed by reference, and the reference is not used anywhere or is overwritten immediately."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedParameterInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDisabledExtensionStubsInspection",
+                "shortDescription": {
+                  "text": "Disabled extension stubs"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of classes, functions, and constants, for which the stubs for the corresponding PHP interpreter extensions are disabled. You can configure the set of stubs under Settings | PHP | PHP Runtime. See PhpStorm stubs (blog.jetbrains.com/phpstorm) for details.",
+                  "markdown": "Reports the usages of classes, functions, and constants, for which the stubs for the corresponding PHP interpreter extensions are disabled.\n\n\nYou can configure the set of stubs under\n[Settings \\| PHP \\| PHP Runtime](settings://reference.webide.settings.project.settings.php?PHP%20Runtime).\n\n\nSee [PhpStorm stubs (blog.jetbrains.com/phpstorm)](https://blog.jetbrains.com/phpstorm/2018/03/how-to-provide-stubs-for-phpstorm/) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDisabledExtensionStubsInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTernaryExpressionCanBeReplacedWithConditionInspection",
+                "shortDescription": {
+                  "text": "Ternary expression can be replaced with condition"
+                },
+                "fullDescription": {
+                  "text": "Reports the ternary expressions specified as 'condition ? true : false' that can be safely replaced with just 'condition'.",
+                  "markdown": "Reports the ternary expressions specified as `condition ? true : false` that can be safely replaced with just `condition`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTernaryExpressionCanBeReplacedWithConditionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPregMatchReplaceWithComparisonInspection",
+                "shortDescription": {
+                  "text": "'preg_match()' can be replaced with comparison"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'preg_match()' calls that are provided with a string argument starting with '^' (Start of String anchor) and ending with '$' (End of String anchor). Such calls can be replaced with a comparison operation.",
+                  "markdown": "Reports the `preg_match()` calls that are provided with a string argument starting with `^` (Start of String anchor) and ending with `$` (End of String anchor). Such calls can be replaced with a comparison operation."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPregMatchReplaceWithComparisonInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMethodMayBeInaccessibleInLateStaticBindingInspection",
+                "shortDescription": {
+                  "text": "Private method may be inaccessible during late static binding call"
+                },
+                "fullDescription": {
+                  "text": "Reports the late static binding method calls (that is, performed via 'static::') that may be resolved to inaccessible private methods from child classes. See Late Static Bindings (php.net) for details.",
+                  "markdown": "Reports the late static binding method calls (that is, performed via `static::`) that may be resolved to inaccessible private methods from child classes.\n\n\nSee [Late Static Bindings (php.net)](https://www.php.net/manual/en/language.oop5.late-static-bindings.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpMethodMayBeInaccessibleInLateStaticBindingInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClassConstantCanBeFinalInspection",
+                "shortDescription": {
+                  "text": "Class constant can be 'final'"
+                },
+                "fullDescription": {
+                  "text": "Reports the non-'final' class constants that are not redefined in child classes. In PHP 8.1 and later, such constants can be made 'final'. See Final class constants (php.net) for details.",
+                  "markdown": "Reports the non-`final` class constants that are not redefined in child classes. In PHP 8.1 and later, such constants can be made `final`.\n\n\nSee [Final class constants (php.net)](https://wiki.php.net/rfc/final_class_const) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClassConstantCanBeFinalInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClosureCanBeConvertedToFirstClassCallableInspection",
+                "shortDescription": {
+                  "text": "'Closure::fromCallable()' can be converted to the first-class callable syntax"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'callable' creation expressions that use 'Closure::fromCallable' but can be replaced with first-class callable syntax 'f(...)' available since PHP 8.1. See First-class callable syntax (php.net) for details.",
+                  "markdown": "Reports the `callable` creation expressions that use `Closure::fromCallable` but can be replaced with first-class callable syntax `f(...)` available since PHP 8.1.\n\n\nSee [First-class callable syntax (php.net)](https://wiki.php.net/rfc/first_class_callable_syntax) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClosureCanBeConvertedToFirstClassCallableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantArrayCallInForeachIteratedValueInspection",
+                "shortDescription": {
+                  "text": "Redundant 'array_values' call on a value iterated in 'foreach'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'array_values()' calls inside 'foreach' loops in which the iterated value is used without a key. Such calls are redundant and can be safely removed.",
+                  "markdown": "Reports the `array_values()` calls inside `foreach` loops in which the iterated value is used without a key. Such calls are redundant and can be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantArrayCallInForeachIteratedValueInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpExpressionAlwaysNullInspection",
+                "shortDescription": {
+                  "text": "Expression is always 'null'"
+                },
+                "fullDescription": {
+                  "text": "Reports the variables in 'return' statements that are always 'null'.",
+                  "markdown": "Reports the variables in `return` statements that are always `null`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpExpressionAlwaysNullInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDefineConstantNameStartsWithLeadingSlashInspection",
+                "shortDescription": {
+                  "text": "Constant name defined with a leading slash"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'define' constructs in which the constant's FQN starts with a leading slash. Such constants will not be correctly registered by PHP.",
+                  "markdown": "Reports the `define` constructs in which the constant's FQN starts with a leading slash. Such constants will not be correctly registered by PHP."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDefineConstantNameStartsWithLeadingSlashInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertCountInspection",
+                "shortDescription": {
+                  "text": "Usage 'assertCount/assertSameSize' methods instead of assertEquals"
+                },
+                "fullDescription": {
+                  "text": "Reports alternative usage of the 'assertEquals' and 'assertNotEquals' methods with 'count' function as a parameter See Usage of the assertCount for details. See Usage of the assertSameSize for details.",
+                  "markdown": "Reports alternative usage of the `assertEquals` and `assertNotEquals` methods with `count` function as a parameter\n\n\nSee [Usage of the assertCount](https://phpunit.readthedocs.io/en/stable/assertions.html#assertcount) for details.\n\n\nSee [Usage of the assertSameSize](https://hotexamples.com/examples/-/PHPUnit_Framework_Assert/assertSameSize/php-phpunit_framework_assert-assertsamesize-method-examples.html) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertCountInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryParenthesesInspection",
+                "shortDescription": {
+                  "text": "Unnecessary parentheses"
+                },
+                "fullDescription": {
+                  "text": "Reports the expressions containing redundant parenthesis, which can be safely removed.",
+                  "markdown": "Reports the expressions containing redundant parenthesis, which can be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryParenthesesInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIfCanBeMergedWithSequentialConditionInspection",
+                "shortDescription": {
+                  "text": "'if' can be merged with subsequent condition"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'if' statements that are followed by 'elseif' or other 'if' statements having the same bodies. Such statements can be merged together.",
+                  "markdown": "Reports the `if` statements that are followed by `elseif` or other `if` statements having the same bodies. Such statements can be merged together."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIfCanBeMergedWithSequentialConditionInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayModificationWillNotHaveEffectInspection",
+                "shortDescription": {
+                  "text": "Modification of the array returned from function by value won't have any effect"
+                },
+                "fullDescription": {
+                  "text": "Reports call to a function that returns array by value, which makes the assignment operation non-working. Return by reference shall be used instead. For example: '<?php\nclass A {\n    private $values = [];\n    public function getValues() {\n        return $this->values;\n    }\n}\n$config = new A();\n$config->getValues()['a'] = 'a';'",
+                  "markdown": "Reports call to a function that returns array by value, which makes the assignment operation non-working. Return by reference shall be used instead.\n\n**For example:**\n\n\n    <?php\n    class A {\n        private $values = [];\n        public function getValues() {\n            return $this->values;\n        }\n    }\n    $config = new A();\n    $config->getValues()['a'] = 'a';\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayModificationWillNotHaveEffectInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConstructorStyleInspection",
+                "shortDescription": {
+                  "text": "Old style constructor"
+                },
+                "fullDescription": {
+                  "text": "Reports old-style constructor declarations ('ClassName()') and suggests replacing them with new-style constructors ('__construct()'). Prior to PHP 8.0, old-style constructor syntax used in the classes in the global namespace is treated as deprecated and will result in an 'E_DEPRECATED' error. If both a '__construct()' and a 'ClassName()' method are defined, '__construct()' will be called. In namespaced classes, or any classes as of PHP 8.0, a 'ClassName()' method never has any special meaning and will never be called as a constructor. As a result, the inspection does not report such cases if the PHP language level is set to 8.0 or later. See Constructors and destructors (php.net) for details.",
+                  "markdown": "Reports old-style constructor declarations (`ClassName()`) and suggests replacing them with new-style constructors (`__construct()`).\n\n\nPrior to PHP 8.0, old-style constructor syntax used in the classes in the global namespace is treated as deprecated and will result in an `E_DEPRECATED` error. If both a `__construct()` and a `ClassName()` method are defined, `__construct()` will be called.\n\nIn namespaced classes, or any classes as of PHP 8.0, a `ClassName()` method never has any special meaning and will never be called as a constructor. As a result, the inspection does not report such cases if the PHP language level is set to 8.0 or later.\n\n\nSee [Constructors and destructors (php.net)](https://www.php.net/manual/en/language.oop5.decon.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpConstructorStyleInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNonStrictObjectEqualityInspection",
+                "shortDescription": {
+                  "text": "Non-strict object equality"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the comparison operator ('==') for comparing object variables. Object variables are compared as follows: When using the comparison operator ('=='), two object instances are considered equal if they have the same attributes and values (values are compared with '=='), and are instances of the same class. When using the identity operator ('==='), object variables are considered identical if and only if they refer to the same instance of the same class. See Comparing Objects (php.net) for details.",
+                  "markdown": "Reports the usages of the comparison operator (`==`) for comparing object variables.\n\n\nObject variables are compared as follows:\n\n* When using the comparison operator (`==`), two object instances are considered equal if they have the same attributes and values (values are compared with `==`), and are instances of the same class.\n* When using the identity operator (`===`), object variables are considered identical if and only if they refer to the same instance of the same class.\n\n\nSee [Comparing Objects (php.net)](http://www.php.net/manual/en/language.oop5.object-comparison.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNonStrictObjectEqualityInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUsageOfSilenceOperatorInspection",
+                "shortDescription": {
+                  "text": "Usage of a silence operator"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the silence operator ('@'), which is highly discouraged. See Error Control Operators (php.net) for details.",
+                  "markdown": "Reports the usages of the silence operator (`@`), which is highly discouraged.\n\nSee [Error Control Operators (php.net)](https://www.php.net/manual/en/language.operators.errorcontrol.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUsageOfSilenceOperatorInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedVariableInspection",
+                "shortDescription": {
+                  "text": "Undefined variable"
+                },
+                "fullDescription": {
+                  "text": "Produces two types of warnings: Undefined variable: the variable's definition is not found in the project files, configured include paths, or among the PHP predefined variables. Variable might have not been defined: there are one or more paths to reach the line with the variable usage without defining it. Use the options below to customize the inspection: Report that variable is probably undefined: clear the checkbox to disable the Variable might have not been defined warnings. Enable inspection in global space: by default, the inspection is enabled for global space. Clear the checkbox to only report undefined variables from functions' local scope. Search for variable's definition outside the current file: if selected, the IDE reports a global variable as undefined only in case there are no 'include' or 'require' statements in the current file and the variable's definition cannot be found in the project. Note that the IDE does not examine the actual content of included files but only checks the presence of 'include' or 'require' statements. Otherwise, if not selected, the IDE searches for the variable's definition only in the current file and ignores the 'include' or 'require' statements if any.",
+                  "markdown": "Produces two types of warnings:\n\n* *Undefined variable*: the variable's definition is not found in the project files, configured include paths, or among the PHP predefined variables.\n* *Variable might have not been defined*: there are one or more paths to reach the line with the variable usage without defining it.\n\n\nUse the options below to customize the inspection:\n\n* **Report that variable is probably undefined** : clear the checkbox to disable the *Variable might have not been defined* warnings.\n* **Enable inspection in global space**: by default, the inspection is enabled for global space. Clear the checkbox to only report undefined variables from functions' local scope.\n*\n  **Search for variable's definition outside the current file** : if selected, the IDE reports a global variable as undefined only in case there are no `include` or `require` statements in the current file and the variable's definition cannot be found in the project. Note that the IDE does not examine the actual content of included files but only checks the presence of `include` or `require` statements.\n\n\n  Otherwise, if not selected, the IDE searches for the variable's definition only in the current file and ignores the `include` or `require` statements if any."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedVariableInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpShortOpenTagInspection",
+                "shortDescription": {
+                  "text": "Short open tag usage"
+                },
+                "fullDescription": {
+                  "text": "Reports short PHP opening tag '<?' usages. Since short tags can be disabled in the PHP interpreter configuration, using them may lead to code compatibility issues. See PHP tags (php.net) for details.",
+                  "markdown": "Reports short PHP opening tag `<?` usages. Since short tags can be disabled in the PHP interpreter configuration, using them may lead to code compatibility issues.\n\n\nSee [PHP tags (php.net)](https://www.php.net/manual/en/language.basic-syntax.phptags.php#language.basic-syntax.phptags) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpShortOpenTagInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIntRangesMismatchInspection",
+                "shortDescription": {
+                  "text": "Number ranges mismatch"
+                },
+                "fullDescription": {
+                  "text": "Reports the assignments and return statements whose arguments do not match the expected ranges specified via 'int<min, max>' PHPDoc syntax.",
+                  "markdown": "Reports the assignments and return statements whose arguments do not match the expected ranges specified via `int<min, max>` PHPDoc syntax."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpIntRangesMismatchInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpReturnDocTypeMismatchInspection",
+                "shortDescription": {
+                  "text": "Return type in PHPDoc comment does not match the actual return type"
+                },
+                "fullDescription": {
+                  "text": "Reports the return types in PHPDoc comments that do not match the actual return type of a function.",
+                  "markdown": "Reports the return types in PHPDoc comments that do not match the actual return type of a function."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpReturnDocTypeMismatchInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpElementIsNotAvailableInCurrentPhpVersionInspection",
+                "shortDescription": {
+                  "text": "Element is not available in configured PHP version"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of entities which were introduced in PHP version later than configured one.",
+                  "markdown": "Reports the usages of entities which were introduced in PHP version later than configured one."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpElementIsNotAvailableInCurrentPhpVersionInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFieldCanBePromotedInspection",
+                "shortDescription": {
+                  "text": "Property can be promoted"
+                },
+                "fullDescription": {
+                  "text": "Reports the properties that can be replaced with promoted versions. See Constructor Property Promotion (php.net) for details.",
+                  "markdown": "Reports the properties that can be replaced with promoted versions.\n\n\nSee [Constructor Property Promotion (php.net)](https://wiki.php.net/rfc/constructor_promotion) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpFieldCanBePromotedInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPrivateFieldCanBeLocalVariableInspection",
+                "shortDescription": {
+                  "text": "Private property can be local"
+                },
+                "fullDescription": {
+                  "text": "Reports the private properties that are used only in a single method. Such properties can be replaced with local variables.",
+                  "markdown": "Reports the private properties that are used only in a single method. Such properties can be replaced with local variables."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPrivateFieldCanBeLocalVariableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTypedPropertyMightBeUninitializedInspection",
+                "shortDescription": {
+                  "text": "Typed property might be uninitialized"
+                },
+                "fullDescription": {
+                  "text": "Reports the attempts to read from an uninitialized typed property. Such attempts will result in 'TypeError'. Typed properties should be initialized in any of the following ways: by a default value in the constructor by the '__get()' magic getter in-place, at the moment of usage See Uninitialized and Unset Properties (php.net) for details.",
+                  "markdown": "Reports the attempts to read from an uninitialized typed property. Such attempts will result in `TypeError`.\n\n\nTyped properties should be initialized in any of the following ways:\n\n* by a default value\n* in the constructor\n* by the `__get()` magic getter\n* in-place, at the moment of usage\n\n\nSee [Uninitialized and Unset Properties (php.net)](https://wiki.php.net/rfc/typed_properties_v2#uninitialized_and_unset_properties) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpTypedPropertyMightBeUninitializedInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingParamTypeInspection",
+                "shortDescription": {
+                  "text": "Missing parameter's type declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the parameters that have no type declaration specified.",
+                  "markdown": "Reports the parameters that have no type declaration specified."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingParamTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryFullyQualifiedNameInspection",
+                "shortDescription": {
+                  "text": "Unnecessary fully qualified name"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of fully qualified class names, which can be shortened without adding the 'use' statement.",
+                  "markdown": "Reports the usages of fully qualified class names, which can be shortened without adding the `use` statement."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryFullyQualifiedNameInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingParentCallCommonInspection",
+                "shortDescription": {
+                  "text": "Missing parent call for method"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods that do not call their parent method.",
+                  "markdown": "Reports the methods that do not call their parent method."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingParentCallCommonInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMixedReturnTypeCanBeReducedInspection",
+                "shortDescription": {
+                  "text": "'mixed' return type can be narrowed"
+                },
+                "fullDescription": {
+                  "text": "Reports 'mixed' return types that can be narrowed down to more concrete types.",
+                  "markdown": "Reports 'mixed' return types that can be narrowed down to more concrete types."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMixedReturnTypeCanBeReducedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTraditionalSyntaxArrayLiteralInspection",
+                "shortDescription": {
+                  "text": "Traditional syntax array literal detected"
+                },
+                "fullDescription": {
+                  "text": "Reports traditional array syntax ('array()') usages in array literals and suggests replacing them with short array syntax ('[]').",
+                  "markdown": "Reports traditional array syntax (`array()`) usages in array literals and suggests replacing them with short array syntax (`[]`)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTraditionalSyntaxArrayLiteralInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConditionCheckedByNextConditionInspection",
+                "shortDescription": {
+                  "text": "Condition inside logical expression checked by subsequent condition"
+                },
+                "fullDescription": {
+                  "text": "Reports the conditions inside logical binary expressions that are covered by subsequent conditions and are therefore redundant.",
+                  "markdown": "Reports the conditions inside logical binary expressions that are covered by subsequent conditions and are therefore redundant."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpConditionCheckedByNextConditionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInconsistentReturnPointsInspection",
+                "shortDescription": {
+                  "text": "Inconsistent return points"
+                },
+                "fullDescription": {
+                  "text": "Reports inconsistencies in function/method exit points. The following types of inconsistencies are reported: The function/method contains the 'return' statements both with and without arguments. The function/method may return a value or otherwise end its execution without returning anything. Technically these are not errors, but practically they usually indicate a programming mistake.",
+                  "markdown": "Reports inconsistencies in function/method exit points.\n\n\nThe following types of inconsistencies are reported:\n\n* The function/method contains the `return` statements both with and without arguments.\n* The function/method may return a value or otherwise end its execution without returning anything.\n\n\nTechnically these are not errors, but practically they usually indicate a programming mistake."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpInconsistentReturnPointsInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNoReturnAttributeCanBeAddedInspection",
+                "shortDescription": {
+                  "text": "NoReturn attribute can be added"
+                },
+                "fullDescription": {
+                  "text": "Reports function without '#[NoReturn]' that are always halting their execution by calling other exitPoint functions attribute.",
+                  "markdown": "Reports function without `#[NoReturn]` that are always halting their execution by calling other exitPoint functions attribute."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNoReturnAttributeCanBeAddedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConditionCanBeReplacedWithMinMaxCallInspection",
+                "shortDescription": {
+                  "text": "Condition can be replaced with 'min()'/'max()' call"
+                },
+                "fullDescription": {
+                  "text": "Reports the conditions that perform manual min/max calculation instead of calling 'min'/'max' functions.",
+                  "markdown": "Reports the conditions that perform manual min/max calculation instead of calling `min`/`max` functions."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpConditionCanBeReplacedWithMinMaxCallInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInapplicableAttributeTargetDeclarationInspection",
+                "shortDescription": {
+                  "text": "Non-applicable attribute target declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the attributes that do not have the appropriate 'Attribute::TARGET_*' flag in their arguments declaration. See Attributes (php.net) for details.",
+                  "markdown": "Reports the attributes that do not have the appropriate `Attribute::TARGET_*` flag in their arguments declaration.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpInapplicableAttributeTargetDeclarationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingParentCallMagicInspection",
+                "shortDescription": {
+                  "text": "Missing parent call for magic methods"
+                },
+                "fullDescription": {
+                  "text": "Reports the magic methods that do not call their parent magic method.",
+                  "markdown": "Reports the magic methods that do not call their parent magic method."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingParentCallMagicInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpGotoIntoLoopInspection",
+                "shortDescription": {
+                  "text": "Goto into loop statement"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'goto' labels that are located inside loops or 'switch' statements. See goto (php.net) for details.",
+                  "markdown": "Reports the `goto` labels that are located inside loops or `switch` statements.\n\n\nSee [goto (php.net)](https://www.php.net/manual/en/control-structures.goto.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpGotoIntoLoopInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMatchExpressionCanBeReplacedWithTernaryInspection",
+                "shortDescription": {
+                  "text": "'match' expression can be replace with ternary expression"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'match' expressions containing a default arm and a single non-default arm. Such 'match' expressions can be replaced with ternary expressions. See Match expression (php.net) for details.",
+                  "markdown": "Reports the `match` expressions containing a default arm and a single non-default arm. Such `match` expressions can be replaced with ternary expressions.\n\n\nSee [Match expression (php.net)](https://wiki.php.net/rfc/match_expression_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMatchExpressionCanBeReplacedWithTernaryInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedStdLibCallInspection",
+                "shortDescription": {
+                  "text": "Deprecated Standard Library call"
+                },
+                "fullDescription": {
+                  "text": "Reports the calls to Standard PHP Library functions that are deprecated starting from PHP 8.1. The following calls are reported: 'key()', 'current()', 'next()', 'prev()', and 'reset()' calls with objects as arguments. 'mb_check_encoding()' calls without arguments. 'get_class()', 'get_parent_class()' and 'get_called_class()' calls without arguments. 'IntlCalendar::roll()' calls with a Boolean passed as the '$value' argument. 'ctype_*()' calls with non-string arguments. See PHP RFC: Deprecations for PHP 8.1 for details.",
+                  "markdown": "Reports the calls to Standard PHP Library functions that are deprecated starting from PHP 8.1.\n\n\nThe following calls are reported:\n\n* `key()`, `current()`, `next()`, `prev()`, and `reset()` calls with objects as arguments.\n* `mb_check_encoding()` calls without arguments.\n* `get_class()`, `get_parent_class()` and `get_called_class()` calls without arguments.\n* `IntlCalendar::roll()` calls with a Boolean passed as the `$value` argument.\n* `ctype_*()` calls with non-string arguments.\n\n\nSee [PHP RFC: Deprecations for PHP 8.1](https://wiki.php.net/rfc/deprecations_php_8_1) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedStdLibCallInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingBreakStatementInspection",
+                "shortDescription": {
+                  "text": "Missing 'break' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'case' clauses in 'switch' statements that do not end with a 'break' or a 'return' statement. If a 'case' clause does not end with 'break' or 'return', its execution can unintentionally fall through the next case.",
+                  "markdown": "Reports the `case` clauses in `switch` statements that do not end with a `break` or a `return` statement.\n\n\nIf a `case` clause does not end with `break` or `return`, its execution can unintentionally fall through the next case."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingBreakStatementInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMethodMayBeStaticInspection",
+                "shortDescription": {
+                  "text": "Method can be made 'static'"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods that don't use any instance references and thus may be converted to static methods.",
+                  "markdown": "Reports the methods that don't use any instance references and thus may be converted to static methods."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMethodMayBeStaticInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpToStringMayProduceExceptionInspection",
+                "shortDescription": {
+                  "text": "'__toString' may throw an exception"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of '__toString' that may throw an exception, which is not allowed for PHP language level lower than 7.4.",
+                  "markdown": "Reports the usages of `__toString` that may throw an exception, which is not allowed for PHP language level lower than 7.4."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpToStringMayProduceExceptionInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpForeachArrayIsUsedAsValueInspection",
+                "shortDescription": {
+                  "text": "Foreach array is used as value"
+                },
+                "fullDescription": {
+                  "text": "Reports the variables that are used in a 'foreach' loop as both an array expression and an array's key or value (for example, 'foreach ($items as $items) {}'). Commonly, this is the result of a typing error.",
+                  "markdown": "Reports the variables that are used in a `foreach` loop as both an array expression and an array's key or value (for example, `foreach ($items as $items) {}`).\n\n\nCommonly, this is the result of a typing error."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpForeachArrayIsUsedAsValueInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedDollarBraceStringInterpolationInspection",
+                "shortDescription": {
+                  "text": "Deprecated '${' string interpolation"
+                },
+                "fullDescription": {
+                  "text": "Reports '${var}' and '${expr}' interpolations in strings. Such interpolations are deprecated starting from PHP 8.2. See Deprecate ${} string interpolation (php.net) for details.",
+                  "markdown": "Reports `${var}` and `${expr}` interpolations in strings. Such interpolations are deprecated starting from PHP 8.2.\n\n\nSee [Deprecate ${} string interpolation (php.net)](https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedDollarBraceStringInterpolationInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSeparateElseIfInspection",
+                "shortDescription": {
+                  "text": "Else if"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the 'else if' constructs specified in two words. According to PSR-12, the keyword 'elseif' SHOULD be used instead of 'else if' so that all control keywords look like single words. See PSR-12: Extended Coding Style (php-fig.org) for details.",
+                  "markdown": "Reports the usages of the `else if` constructs specified in two words.\n\nAccording to PSR-12, the keyword `elseif` SHOULD be used instead of `else if` so that all control keywords look like single words.\n\n\nSee [PSR-12: Extended Coding Style (php-fig.org)](https://www.php-fig.org/psr/psr-12/#51-if-elseif-else) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpSeparateElseIfInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedFunctionInspection",
+                "shortDescription": {
+                  "text": "Undefined function"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to functions that are not defined in the project files, configured include paths, or among the PHP predefined functions.",
+                  "markdown": "Reports the references to functions that are not defined in the project files, configured include paths, or among the PHP predefined functions."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedFunctionInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicateArrayKeysInspection",
+                "shortDescription": {
+                  "text": "Duplicate array keys"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate keys in array declarations. If multiple elements in the array declaration use the same key, only the last one will be used, and all others will be overwritten.",
+                  "markdown": "Reports duplicate keys in array declarations.\n\nIf multiple elements in the array declaration use the same key, only the last one will be used, and all others will be overwritten."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicateArrayKeysInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitDeprecatedExpectExceptionInspection",
+                "shortDescription": {
+                  "text": "Deprecated expectException usage"
+                },
+                "fullDescription": {
+                  "text": "Reports deprecated usages of 'expectException()'. Support for using the 'expectException()' method with '\\PHPUnit\\Framework\\Error\\Deprecated', '\\PHPUnit\\Framework\\Error\\Error', '\\PHPUnit\\Framework\\Error\\Notice', and '\\PHPUnit\\Framework\\Error\\Warning' is deprecated and will be removed in PHPUnit 10. Instead, the 'expectDeprecation()', 'expectError()', 'expectNotice()', and 'expectWarning()' methods should be used. See Testing PHP Errors, Warnings, and Notices (phpunit.readthedocs.io) for details.",
+                  "markdown": "Reports deprecated usages of `expectException()`.\n\n\nSupport for using the `expectException()` method with\n`\\PHPUnit\\Framework\\Error\\Deprecated`,\n`\\PHPUnit\\Framework\\Error\\Error`,\n`\\PHPUnit\\Framework\\Error\\Notice`, and\n`\\PHPUnit\\Framework\\Error\\Warning` is deprecated and will be removed in PHPUnit 10.\n\n\nInstead, the `expectDeprecation()`, `expectError()`, `expectNotice()`, and\n`expectWarning()` methods should be used.\n\n\nSee [Testing PHP Errors, Warnings, and Notices (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/writing-tests-for-phpunit.html#testing-php-errors-warnings-and-notices) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitDeprecatedExpectExceptionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitTestFailedLineInspection",
+                "shortDescription": {
+                  "text": "Failed line in test"
+                },
+                "fullDescription": {
+                  "text": "Reports failed method calls or assertions in tests. It helps detect the failed line in code faster and start debugging it immediately. Example: 'function test() {\n      $this->assertEquals(1,2); //highlighted\n  }'",
+                  "markdown": "Reports failed method calls or assertions in tests. It helps detect the failed line in code faster and start debugging it immediately.\n\n**Example:**\n\n\n      function test() {\n          $this->assertEquals(1,2); //highlighted\n      }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitTestFailedLineInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMatchCanBeReplacedWithSwitchStatementInspection",
+                "shortDescription": {
+                  "text": "'match' can be replaced with 'switch' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'match' expressions that can be replaced with 'switch' statements. Note that 'match' expressions use strict type comparison, while 'switch' statements rely on loose comparison. As a result, the expression semantics may change after replacement. See match (php.net) and switch (php.net) for details.",
+                  "markdown": "Reports the `match` expressions that can be replaced with `switch` statements.\n\n\nNote that `match` expressions use strict type comparison, while `switch` statements rely on loose comparison. As a\nresult, the expression semantics may change after replacement.\n\n\nSee [match (php.net)](https://www.php.net/manual/en/control-structures.match.php) and [switch (php.net)](https://www.php.net/manual/en/control-structures.switch.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMatchCanBeReplacedWithSwitchStatementInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSecondWriteToReadonlyPropertyInspection",
+                "shortDescription": {
+                  "text": "Second write to 'readonly' property"
+                },
+                "fullDescription": {
+                  "text": "Reports reassignments of 'readonly' properties. Such properties cannot be modified after initialization. See Readonly properties (php.net) for details.",
+                  "markdown": "Reports reassignments of `readonly` properties. Such properties cannot be modified after initialization.\n\n\nSee [Readonly properties (php.net)](https://wiki.php.net/rfc/readonly_properties_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpSecondWriteToReadonlyPropertyInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpEnforceDocCommentInspection",
+                "shortDescription": {
+                  "text": "Enforce PHPDoc comment"
+                },
+                "fullDescription": {
+                  "text": "Reports the elements without a PHPDoc comment or with a PHPDoc comment only containing the '@noinspection' tag. You can use Missing PHPDoc Comment inspection to report only non-fully typed elements.",
+                  "markdown": "Reports the elements without a PHPDoc comment or with a PHPDoc comment only containing the `@noinspection` tag.\n\nYou can use *Missing PHPDoc Comment* inspection to report only non-fully typed elements."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpEnforceDocCommentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc/Code style",
+                      "index": 11,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDocFinalChecksInspection",
+                "shortDescription": {
+                  "text": "Overriding method/extending class marked as '@final'"
+                },
+                "fullDescription": {
+                  "text": "Reports override of method or extending of class with '@final' in the PHPDoc.",
+                  "markdown": "Reports override of method or extending of class with `@final` in the PHPDoc."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDocFinalChecksInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPureAttributeCanBeAddedInspection",
+                "shortDescription": {
+                  "text": "'#[Pure]' attribute can be added"
+                },
+                "fullDescription": {
+                  "text": "Reports the functions that are non-trivially pure. Such functions have other functions calls in their body, but all such calls do not produce any side effects.",
+                  "markdown": "Reports the functions that are non-trivially pure. Such functions have other functions calls in their body, but all such calls do not produce any side effects."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPureAttributeCanBeAddedInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVarTagWithoutVariableNameInspection",
+                "shortDescription": {
+                  "text": "Type tag without variable name"
+                },
+                "fullDescription": {
+                  "text": "Reports the PHPDoc type tags ('@var','@type','@param') that are provided without a specified variable/parameter name. Such tags do not provide any type information for expressions and should be either deleted or expanded to include a concrete variable name for which the type is provided.",
+                  "markdown": "Reports the PHPDoc type tags (`@var`,`@type`,`@param`) that are provided without a specified variable/parameter name. Such tags do not provide any type information for expressions and should be either deleted or expanded to include a concrete variable name for which the type is provided."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpVarTagWithoutVariableNameInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpImmutablePropertyIsWrittenInspection",
+                "shortDescription": {
+                  "text": "Immutable property written in invalid scope"
+                },
+                "fullDescription": {
+                  "text": "Highlights write access references to properties, for which the write access scope declared via '#[Immutable]' is stricter than the reference scope.",
+                  "markdown": "Highlights write access references to properties, for which the write access scope declared via `#[Immutable]` is stricter than the reference scope."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpImmutablePropertyIsWrittenInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedAssertDeclarationInspection",
+                "shortDescription": {
+                  "text": "Deprecated 'assert()' function declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'assert()' function declarations. Declaring the 'assert()' function is global namespace is forbidden. Starting from PHP 7.3, declaring the 'assert()' function in non-global namespace is deprecated. See assert (php.net) for details.",
+                  "markdown": "Reports the `assert()` function declarations.\n\n* Declaring the `assert()` function is global namespace is forbidden.\n* Starting from PHP 7.3, declaring the `assert()` function in non-global namespace is deprecated.\n\n\nSee [assert (php.net)](https://www.php.net/manual/en/function.assert.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedAssertDeclarationInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAutovivificationOnFalseValuesInspection",
+                "shortDescription": {
+                  "text": "Automatic conversion of 'false' to array is deprecated"
+                },
+                "fullDescription": {
+                  "text": "Reports automatic conversions of 'false' values to arrays. Such expressions are deprecated starting from PHP 8.1. See Deprecate autovivification on false for details.",
+                  "markdown": "Reports automatic conversions of `false` values to arrays. Such expressions are deprecated starting from PHP 8.1.\n\n\nSee [Deprecate autovivification on false](https://wiki.php.net/rfc/autovivification_false) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAutovivificationOnFalseValuesInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDocSignatureIsNotCompleteInspection",
+                "shortDescription": {
+                  "text": "PHPDoc comment signature is not complete"
+                },
+                "fullDescription": {
+                  "text": "Reports the PHPDoc comments that contain at least one '@param' or '@return' tag but are missing some of the '@param' or '@return' tags for parameters or return types specified in the function/method declaration.",
+                  "markdown": "Reports the PHPDoc comments that contain at least one `@param` or `@return` tag but are missing some of the `@param` or `@return` tags for parameters or return types specified in the function/method declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDocSignatureIsNotCompleteInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc/Code style",
+                      "index": 11,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSignatureMismatchDuringInheritanceInspection",
+                "shortDescription": {
+                  "text": "Declaration of overridden method should be compatible with parent class"
+                },
+                "fullDescription": {
+                  "text": "Reports the overridden methods declarations that are not compatible with the parent class. The inspection is enabled only for the PHP language level lower than 8.0.",
+                  "markdown": "Reports the overridden methods declarations that are not compatible with the parent class. The inspection is enabled only for the PHP language level lower than 8.0."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpSignatureMismatchDuringInheritanceInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHP strict standards",
+                      "index": 67,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTraitUsageOutsideUseInspection",
+                "shortDescription": {
+                  "text": "Trait usage is not allowed"
+                },
+                "fullDescription": {
+                  "text": "Reports the class references that are resolved to traits but are specified outside 'use' statements. Such usages are most probably the result of a programming mistake, since traits cannot be instantiated and any 'instanceof'-like behaviour is not supported for traits by design. See Traits (php.net) for details.",
+                  "markdown": "Reports the class references that are resolved to traits but are specified outside `use` statements. Such usages are most probably the result of a programming mistake, since traits cannot be instantiated and any `instanceof`-like behaviour is not supported for traits by design.\n\n\nSee [Traits (php.net)](https://www.php.net/manual/en/language.oop5.traits.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTraitUsageOutsideUseInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpStrictTypeCheckingInspection",
+                "shortDescription": {
+                  "text": "Strict type checking rules violation"
+                },
+                "fullDescription": {
+                  "text": "Reports violations of the strict type checking rules. In strict mode, only the variables exactly matching the declaration types are accepted. Strict type-checking mode can be enabled: Per file, if the 'declare(strict_types=1)' directive is specified. The directive must be the first statement in a file, block mode is explicitly disallowed. For all files, if the Enable for all files inspection option is enabled. See Strict typing (php.net) for details.",
+                  "markdown": "Reports violations of the strict type checking rules.\n\n\nIn strict mode, only the variables exactly matching the declaration types are accepted. Strict type-checking mode can be enabled:\n\n* Per file, if the `declare(strict_types=1)` directive is specified. The directive must be the first statement in a file, block mode is explicitly disallowed.\n* For all files, if the **Enable for all files** inspection option is enabled.\n\n\nSee [Strict typing (php.net)](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpStrictTypeCheckingInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIfWithCommonPartsInspection",
+                "shortDescription": {
+                  "text": "'if' with common parts"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'if' statements with duplicated common parts.",
+                  "markdown": "Reports the `if` statements with duplicated common parts."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIfWithCommonPartsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpStaticAsDynamicMethodCallInspection",
+                "shortDescription": {
+                  "text": "Static method called as dynamic"
+                },
+                "fullDescription": {
+                  "text": "Reports dynamic calls to static class methods. If the target has the magic method '__call', a separate inspection severity and highlighting level can be set.",
+                  "markdown": "Reports dynamic calls to static class methods.\n\nIf the target has the magic method `__call`, a separate inspection severity and highlighting level can be set."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpStaticAsDynamicMethodCallInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDangerousArrayInitializationInspection",
+                "shortDescription": {
+                  "text": "Dangerous array initialization"
+                },
+                "fullDescription": {
+                  "text": "Reports dangerous array initializations (such as '$arr[] = value'). This practice is discouraged because if '$arr' already contains some value (for example, a string from a request variable), then this value will stay in place and '[]' may actually stand for string access operator. It is always preferable to initialize a variable by direct assignment. See Creating/modifying with square bracket syntax (php.net) for details.",
+                  "markdown": "Reports dangerous array initializations (such as `$arr[] = value`).\n\n\nThis practice is discouraged because if `$arr` already contains some value (for example, a string from a request variable), then this value will stay in place and `[]` may actually stand for string access operator. It is always preferable to initialize a variable by direct assignment.\n\nSee [Creating/modifying with square bracket syntax (php.net)](https://www.php.net/manual/en/language.types.array.php#language.types.array.syntax.modifying) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDangerousArrayInitializationInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedImplodeUsageInspection",
+                "shortDescription": {
+                  "text": "Deprecated 'implode/join' usage"
+                },
+                "fullDescription": {
+                  "text": "Reports deprecated usage of the 'implode' and 'join' functions. Starting from PHP 7.4, using 'implode' and 'join' with an array as the first argument and a string as the second argument is deprecated. See Deprecations for PHP 7.4 (php.net) for details.",
+                  "markdown": "Reports deprecated usage of the `implode` and `join` functions.\n\nStarting from PHP 7.4, using `implode` and `join` with an array as the first argument and a string as the second argument is deprecated.\n\n\nSee [Deprecations for PHP 7.4 (php.net)](https://wiki.php.net/rfc/deprecations_php_7_4#implode_parameter_order_mix) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedImplodeUsageInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpOverridingMethodVisibilityInspection",
+                "shortDescription": {
+                  "text": "Method visibility should not be overridden"
+                },
+                "fullDescription": {
+                  "text": "Checks that the methods don't override visibility. Overriding a 'protected' method with a 'public' method in a child class makes this method accessible from everywhere. This violates the encapsulation principle and is considered bad practice. See Method Visibility (php.net) for details.",
+                  "markdown": "Checks that the methods don't override visibility.\n\n\nOverriding a `protected` method with a `public` method in a child class makes this method accessible from everywhere.\nThis violates the encapsulation principle and is considered bad practice.\n\n\nSee [Method Visibility (php.net)](https://www.php.net/manual/en/language.oop5.visibility.php#language.oop5.visiblity-methods) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpOverridingMethodVisibilityInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMockeryInvalidMockingMethodInspection",
+                "shortDescription": {
+                  "text": "Invalid Mockery mocking target"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods and classes that are incorrectly mocked in Mockery tests. The following entities are reported: 'private' methods 'protected' methods without appropriate '\\Mockery\\Mock::shouldAllowMockingProtectedMethods' call",
+                  "markdown": "Reports the methods and classes that are incorrectly mocked in Mockery tests.\n\n\nThe following entities are reported:\n\n* `private` methods\n* `protected` methods without appropriate `\\Mockery\\Mock::shouldAllowMockingProtectedMethods` call"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpMockeryInvalidMockingMethodInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpForeachOverSingleElementArrayLiteralInspection",
+                "shortDescription": {
+                  "text": "Foreach over array literal with single element"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'foreach' statements that iterate over an array literal containing a single element.",
+                  "markdown": "Reports the `foreach` statements that iterate over an array literal containing a single element."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpForeachOverSingleElementArrayLiteralInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClassNamingConventionInspection",
+                "shortDescription": {
+                  "text": "Class name is not following coding convention"
+                },
+                "fullDescription": {
+                  "text": "Reports the classes' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for classes. Use the inspection options to specify minimum/maximum length and the regular expression expected for classes' names. To ignore the names' length, specify 0. To learn more about regular expressions, refer to the Quick Start guide (regular-expressions.info).",
+                  "markdown": "Reports the classes' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for classes.\n\n\nUse the inspection options to specify minimum/maximum length and the regular expression expected for classes' names.\nTo ignore the names' length, specify **0**.\n\n\nTo learn more about regular expressions, refer to the [Quick Start guide (regular-expressions.info)](https://www.regular-expressions.info/quickstart.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClassNamingConventionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Naming conventions",
+                      "index": 4,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCoveredCharacterInClassInspection",
+                "shortDescription": {
+                  "text": "Element in class is already covered"
+                },
+                "fullDescription": {
+                  "text": "Reports the elements in regular expression character classes that are already covered by another element in the same class. Such elements are redundant and can be safely removed.",
+                  "markdown": "Reports the elements in regular expression character classes that are already covered by another element in the same class. Such elements are redundant and can be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCoveredCharacterInClassInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Regular expressions",
+                      "index": 68,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVariableIsUsedOnlyInClosureInspection",
+                "shortDescription": {
+                  "text": "Variable is only used inside closure"
+                },
+                "fullDescription": {
+                  "text": "Reports variables in closures' 'use' list that are only used inside closure.",
+                  "markdown": "Reports variables in closures' `use` list that are only used inside closure."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpVariableIsUsedOnlyInClosureInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLongTypeFormInspection",
+                "shortDescription": {
+                  "text": "Short form of type keywords"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of long form type keywords. According to PSR-12, short form of type keywords MUST be used, that is 'bool' instead of 'boolean', 'int' instead of 'integer', and so on. See Keywords and Types (php-fig.org) for details.",
+                  "markdown": "Reports usages of long form type keywords.\n\n\nAccording to PSR-12, short form of type keywords MUST be used, that is `bool` instead of `boolean`, `int` instead of `integer`, and so on.\n\n\nSee [Keywords and Types (php-fig.org)](https://www.php-fig.org/psr/psr-12/#25-keywords-and-types) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLongTypeFormInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnreachableStatementInspection",
+                "shortDescription": {
+                  "text": "Unreachable statement"
+                },
+                "fullDescription": {
+                  "text": "Reports the statements that cannot be reached.",
+                  "markdown": "Reports the statements that cannot be reached."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUnreachableStatementInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCSFixerValidationInspection",
+                "shortDescription": {
+                  "text": "PHP CS Fixer validation"
+                },
+                "fullDescription": {
+                  "text": "Reports coding style problems detected by PHP CS Fixer. The inspection requires PHP CS Fixer to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | PHP CS Fixer. To learn more about installing PHP CS Fixer, see PHP-CS-Fixer installation (GitHub).",
+                  "markdown": "Reports coding style problems detected by PHP CS Fixer.\n\n\nThe inspection requires PHP CS Fixer to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| PHP CS Fixer](settings://settings.php.quality.tools?CS%20Fixer).\n\n\nTo learn more about installing PHP CS Fixer, see [PHP-CS-Fixer installation (GitHub)](https://github.com/FriendsOfPHP/PHP-CS-Fixer#installation)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCSFixerValidationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Quality tools",
+                      "index": 70,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClosureCanBeConvertedToShortArrowFunctionInspection",
+                "shortDescription": {
+                  "text": "Closure can be converted to arrow function"
+                },
+                "fullDescription": {
+                  "text": "Reports the anonymous functions that can be transformed to short arrow functions. Support for short arrow functions is available since PHP 7.4. See PHP RFC: Arrow Functions 2.0 (php.net) for details.",
+                  "markdown": "Reports the anonymous functions that can be transformed to short arrow functions. Support for short arrow functions is available since PHP 7.4.\n\n\nSee [PHP RFC: Arrow Functions 2.0 (php.net)](https://wiki.php.net/rfc/arrow_functions_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClosureCanBeConvertedToShortArrowFunctionInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitDeprecatedCallsIn10VersionInspection",
+                "shortDescription": {
+                  "text": "Method is deprecated in PHPUnit 10"
+                },
+                "fullDescription": {
+                  "text": "Reports the calls to the PHPUnit assertion methods that are removed in PHPUnit 10.",
+                  "markdown": "Reports the calls to the PHPUnit assertion methods that are removed in PHPUnit 10."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitDeprecatedCallsIn10VersionInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnhandledExceptionInspection",
+                "shortDescription": {
+                  "text": "Unhandled exception"
+                },
+                "fullDescription": {
+                  "text": "Reports the exceptions that are neither enclosed in a 'try-catch' block nor documented via the '@throws' tag.",
+                  "markdown": "Reports the exceptions that are neither enclosed in a `try-catch` block nor documented via the `@throws` tag."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnhandledExceptionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Error handling",
+                      "index": 72,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitUndefinedDataProviderInspection",
+                "shortDescription": {
+                  "text": "Undefined PHPUnit data provider"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to functions/methods in the '@dataProvider' PHPDoc tag that are not resolved. Note that when resolving 'dataProvider', PHPUnit doesn't take 'use' statements into account.",
+                  "markdown": "Reports the references to functions/methods in the `@dataProvider` PHPDoc tag that are not resolved.\n\nNote that when resolving `dataProvider`, PHPUnit doesn't take `use` statements into account."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitUndefinedDataProviderInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIncludeInspection",
+                "shortDescription": {
+                  "text": "Unresolved include"
+                },
+                "fullDescription": {
+                  "text": "Reports non-resolved 'include', 'include_once', 'require', and 'require_once' expressions.",
+                  "markdown": "Reports non-resolved `include`, `include_once`, `require`, and `require_once` expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIncludeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFieldAssignmentTypeMismatchInspection",
+                "shortDescription": {
+                  "text": "Type mismatch in property assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports type violations in properties assignments.",
+                  "markdown": "Reports type violations in properties assignments."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpFieldAssignmentTypeMismatchInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingParentConstructorInspection",
+                "shortDescription": {
+                  "text": "Missing parent call for constructor"
+                },
+                "fullDescription": {
+                  "text": "Reports the constructors that do not call their parent constructor.",
+                  "markdown": "Reports the constructors that do not call their parent constructor."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingParentConstructorInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertEqualsCanBeReplacedWithAssertTrueOrFalseInspection",
+                "shortDescription": {
+                  "text": "Assertion can be replaced with 'assertTrue/assertFalse'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'assertEquals()' calls with the 'true'/'false' arguments in PHPUnit tests. Such usages can be replaced with 'assertTrue()'/'assertFalse()' calls.",
+                  "markdown": "Reports the `assertEquals()` calls with the `true`/`false` arguments in PHPUnit tests. Such usages can be replaced with `assertTrue()`/`assertFalse()` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertEqualsCanBeReplacedWithAssertTrueOrFalseInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDynamicAsStaticMethodCallInspection",
+                "shortDescription": {
+                  "text": "Dynamic method called as static"
+                },
+                "fullDescription": {
+                  "text": "Reports static calls to dynamic class methods. For classes having the magic method '__callStatic', a separate inspection severity and highlighting level can be set.",
+                  "markdown": "Reports static calls to dynamic class methods.\n\nFor classes having the magic method `__callStatic`, a separate inspection severity and highlighting level can be set."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDynamicAsStaticMethodCallInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpReadonlyPropertyWrittenOutsideDeclarationScopeInspection",
+                "shortDescription": {
+                  "text": "Write access to 'readonly' property outside of declaration scope"
+                },
+                "fullDescription": {
+                  "text": "Reports the write accesses to 'readonly' properties that are made outside the declaration scope. A declaration scope effectively means non-static methods of the class in which a property is declared. See Readonly properties (php.net) for details.",
+                  "markdown": "Reports the write accesses to `readonly` properties that are made outside the declaration scope. A declaration scope effectively means non-static methods of the class in which a property is declared.\n\n\nSee [Readonly properties (php.net)](https://wiki.php.net/rfc/readonly_properties_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpReadonlyPropertyWrittenOutsideDeclarationScopeInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFormatCallWithSingleArgumentInspection",
+                "shortDescription": {
+                  "text": "Format function call with single argument"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'sprintf()' and 'vsprintf()' calls with a single argument. Such calls produce no effect and can be safely unwrapped, that is, replaced with the argument itself.",
+                  "markdown": "Reports the `sprintf()` and `vsprintf()` calls with a single argument. Such calls produce no effect and can be safely unwrapped, that is, replaced with the argument itself."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpFormatCallWithSingleArgumentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayIsAlwaysEmptyInspection",
+                "shortDescription": {
+                  "text": "Array is always empty at the point of access"
+                },
+                "fullDescription": {
+                  "text": "Reports the iterated/accessed arrays that are known to be empty at the point of access.",
+                  "markdown": "Reports the iterated/accessed arrays that are known to be empty at the point of access."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayIsAlwaysEmptyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIllegalArrayKeyTypeInspection",
+                "shortDescription": {
+                  "text": "Illegal array key type"
+                },
+                "fullDescription": {
+                  "text": "Reports the array keys that are of illegal type, such as objects or arrays. See Arrays (php.net) for details.",
+                  "markdown": "Reports the array keys that are of illegal type, such as objects or arrays.\n\n\nSee [Arrays (php.net)](http://www.php.net/manual/en/language.types.array.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpIllegalArrayKeyTypeInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLoopNeverIteratesInspection",
+                "shortDescription": {
+                  "text": "Loop does not iterate"
+                },
+                "fullDescription": {
+                  "text": "Reports the loop statements whose bodies will execute at most once. The inspection does not report 'foreach' loops with a key or value used inside the loop body. Commonly, such loops are intended to perform an action only on their first iteration (for example, get the first element of an array).",
+                  "markdown": "Reports the loop statements whose bodies will execute at most once.\n\n\nThe inspection does not report `foreach` loops with a key or value used inside the loop body. Commonly, such loops are intended to perform an action only on their first iteration (for example, get the first element of an array)."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLoopNeverIteratesInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRegExpUnsupportedModifierInspection",
+                "shortDescription": {
+                  "text": "Unsupported modifier"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the 'e' modifier in regular expression patterns. In PHP 7.0 and later, such usages are deprecated and will emit an 'E_WARNING'.",
+                  "markdown": "Reports the usages of the `e` modifier in regular expression patterns. In PHP 7.0 and later, such usages are deprecated and will emit an `E_WARNING`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpRegExpUnsupportedModifierInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Regular expressions",
+                      "index": 68,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVariableNamingConventionInspection",
+                "shortDescription": {
+                  "text": "Variable name is not following coding convention"
+                },
+                "fullDescription": {
+                  "text": "Reports the variables' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for variables. Use the inspection options to specify minimum/maximum length and the regular expression expected for variables' names. To ignore the names' length, specify 0. To learn more about regular expressions, refer to the Quick Start guide (regular-expressions.info).",
+                  "markdown": "Reports the variables' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for variables.\n\n\nUse the inspection options to specify minimum/maximum length and the regular expression expected for variables' names.\nTo ignore the names' length, specify **0**.\n\n\nTo learn more about regular expressions, refer to the [Quick Start guide (regular-expressions.info)](https://www.regular-expressions.info/quickstart.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpVariableNamingConventionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Naming conventions",
+                      "index": 4,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPassByRefInspection",
+                "shortDescription": {
+                  "text": "Pass parameter by reference"
+                },
+                "fullDescription": {
+                  "text": "Reports the arguments in a function/method call that cannot be passed by reference. Only variables and references returned from functions can be passed by reference. See Passing by Reference (php.net) for details.",
+                  "markdown": "Reports the arguments in a function/method call that cannot be passed by reference.\n\n\nOnly variables and references returned from functions can be passed by reference. See [Passing by Reference (php.net)](https://www.php.net/manual/en/language.references.pass.php#language.references.pass) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpPassByRefInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpWrongStringConcatenationInspection",
+                "shortDescription": {
+                  "text": "Wrong string concatenation"
+                },
+                "fullDescription": {
+                  "text": "Reports the attempts to concatenate strings by using the '+' operator instead of the dot ('.') concatenation operator. Such attempts are most likely a programming mistake.",
+                  "markdown": "Reports the attempts to concatenate strings by using the `+` operator instead of the dot (`.`) concatenation operator. Such attempts are most likely a programming mistake."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpWrongStringConcatenationInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNonCanonicalElementsOrderInspection",
+                "shortDescription": {
+                  "text": "Non-canonical order of elements"
+                },
+                "fullDescription": {
+                  "text": "Reports the PHPDoc tags that have elements listed in non-canonical order. For example, for such tags as '@property', '@param', or '@var', the inspection will report the usages of '[name] [\"Type\"]' instead of '[\"Type\"] [name]'.",
+                  "markdown": "Reports the PHPDoc tags that have elements listed in non-canonical order.\n\nFor example, for such tags as `@property`, `@param`, or `@var`, the inspection will report the usages of `[name] [\"Type\"]` instead of `[\"Type\"] [name]`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNonCanonicalElementsOrderInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc/Code style",
+                      "index": 11,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryLocalVariableInspection",
+                "shortDescription": {
+                  "text": "Unnecessary local variable"
+                },
+                "fullDescription": {
+                  "text": "Reports the local variables that are used in exit statements, such as 'throw', 'return', or 'yield', immediately after assignment.",
+                  "markdown": "Reports the local variables that are used in exit statements, such as `throw`, `return`, or `yield`, immediately after assignment."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryLocalVariableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAbstractStaticMethodInspection",
+                "shortDescription": {
+                  "text": "Static function should not be abstract"
+                },
+                "fullDescription": {
+                  "text": "Reports the static methods that are declared as abstract.",
+                  "markdown": "Reports the static methods that are declared as abstract."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpAbstractStaticMethodInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHP strict standards",
+                      "index": 67,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTooLongMemberReferenceChainInspection",
+                "shortDescription": {
+                  "text": "Member reference chain is too long to analyze"
+                },
+                "fullDescription": {
+                  "text": "Reports method reference chains that are too long for IDE to analyze.",
+                  "markdown": "Reports method reference chains that are too long for IDE to analyze."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTooLongMemberReferenceChainInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInArrayCanBeReplacedWithComparisonInspection",
+                "shortDescription": {
+                  "text": "'in_array' can be replaced with comparison"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'in_array()' calls that are provided with a single-element array as the '$haystack' argument. Such calls can be replaced with direct comparisons. See in_array (php.net) for details.",
+                  "markdown": "Reports the `in_array()` calls that are provided with a single-element array as the `$haystack` argument. Such calls can be replaced with direct comparisons.\n\n\nSee [in_array (php.net)](https://www.php.net/manual/en/function.in-array.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpInArrayCanBeReplacedWithComparisonInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantTypeInUnionTypeInspection",
+                "shortDescription": {
+                  "text": "Type declaration is redundant and could be simplified"
+                },
+                "fullDescription": {
+                  "text": "Reports union type declarations that contain redundant types, for example, a union type that contains both the class alias and the original class. See Union Types RFC: Duplicate and redundant types (php.net) for details.",
+                  "markdown": "Reports union type declarations that contain redundant types, for example, a union type that contains both the class alias and the original class.\n\n\nSee [Union Types RFC: Duplicate and redundant types (php.net)](https://wiki.php.net/rfc/union_types_v2#duplicate_and_redundant_types) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantTypeInUnionTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIllegalStringOffsetInspection",
+                "shortDescription": {
+                  "text": "Illegal string offset"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of non-'integer' offsets in string access expressions such as '$str[42]'. Starting from PHP 5.4, string offsets have to be either integers or integer-like strings. Since it's considered bad practice to use strings as a string offset, the inspection reports them, as well. See String access and modification by character (php.net) for details.",
+                  "markdown": "Reports the usages of non-`integer` offsets in string access expressions such as `$str[42]`.\n\n\nStarting from PHP 5.4, string offsets have to be either integers or integer-like strings.\nSince it's considered bad practice to use strings as a string offset, the inspection reports them, as well.\n\nSee [String access and modification by character (php.net)](https://www.php.net/manual/en/language.types.string.php#language.types.string.substr) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpIllegalStringOffsetInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpModuloByOneInspection",
+                "shortDescription": {
+                  "text": "Modulo operation with '1' as operand"
+                },
+                "fullDescription": {
+                  "text": "Reports the modulo expressions '%' that always evaluate to '0' or '1'.",
+                  "markdown": "Reports the modulo expressions `%` that always evaluate to `0` or `1`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpModuloByOneInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantAssignmentToPromotedFieldInspection",
+                "shortDescription": {
+                  "text": "Redundant assignment to promoted property"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant assignments to class properties that duplicate automatic assignments performed through promoted constructor parameters. See Constructor Property Promotion (php.net) for details.",
+                  "markdown": "Reports redundant assignments to class properties that duplicate automatic assignments performed through promoted constructor parameters.\n\n\nSee [Constructor Property Promotion (php.net)](https://wiki.php.net/rfc/constructor_promotion) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantAssignmentToPromotedFieldInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayPushWithOneElementInspection",
+                "shortDescription": {
+                  "text": "'array_push()' with single element"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'array_push()' calls that are used to add a single element to an array. In such cases, it is recommended to use '$array[] =' instead, which adds no overhead of calling a function. See array_push (php.net) for details.",
+                  "markdown": "Reports the `array_push()` calls that are used to add a single element to an array. In such cases, it is recommended to use `$array[] =` instead, which adds no overhead of calling a function.\n\n\nSee [array_push (php.net)](https://www.php.net/manual/en/function.array-push.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayPushWithOneElementInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMatchExpressionWithOnlyDefaultArmInspection",
+                "shortDescription": {
+                  "text": "'match' expression has only default arm and should be simplified"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'match' expressions only containing a 'default' arm. Such expressions are redundant and should be simplified. See Match expression (php.net) for details.",
+                  "markdown": "Reports the `match` expressions only containing a `default` arm. Such expressions are redundant and should be simplified.\n\n\nSee [Match expression (php.net)](https://wiki.php.net/rfc/match_expression_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMatchExpressionWithOnlyDefaultArmInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNModifierCanBeReplacedWithNonCapturingGroupInspection",
+                "shortDescription": {
+                  "text": "'n' modifier can be replaced with non-capturing groups"
+                },
+                "fullDescription": {
+                  "text": "Reports 'n' PCRE modifier, that can be replaced with usage of non-capturing groups instead of capturing in regexp pattern.",
+                  "markdown": "Reports `n` PCRE modifier, that can be replaced with usage of non-capturing groups instead of capturing in regexp pattern."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNModifierCanBeReplacedWithNonCapturingGroupInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantOptionalArgumentInspection",
+                "shortDescription": {
+                  "text": "Redundant optional argument"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant arguments that match the corresponding default values for optional parameters.",
+                  "markdown": "Reports redundant arguments that match the corresponding default values for optional parameters."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantOptionalArgumentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantReadonlyModifierInspection",
+                "shortDescription": {
+                  "text": "'readonly' modifier is redundant"
+                },
+                "fullDescription": {
+                  "text": "Reports 'readonly' modifiers applied to properties in read-only classes. Those modifiers are redundant since all properties in read-only classes are implicitly read-only. See Readonly classes RFC (php.net) for details.",
+                  "markdown": "Reports `readonly` modifiers applied to properties in read-only classes. Those modifiers are redundant since all properties in read-only classes are implicitly read-only.\n\n\nSee [Readonly classes RFC (php.net)](https://wiki.php.net/rfc/readonly_classes#proposal) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantReadonlyModifierInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessarySpreadOperatorForFunctionCallArgumentInspection",
+                "shortDescription": {
+                  "text": "Unnecessary spread operator for function call argument"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the spread operator ('...') on array literals in function call arguments that may be safely unwrapped.",
+                  "markdown": "Reports the usages of the spread operator (`...`) on array literals in function call arguments that may be safely unwrapped."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessarySpreadOperatorForFunctionCallArgumentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpStrictComparisonWithOperandsOfDifferentTypesInspection",
+                "shortDescription": {
+                  "text": "Strict comparison of operands with incompatible types"
+                },
+                "fullDescription": {
+                  "text": "Reports the '===' or '!==' strict comparisons used on operands with incompatible types. See PHP type comparison tables (php.net) for details.",
+                  "markdown": "Reports the `===` or `!==` strict comparisons used on operands with incompatible types.\n\n\nSee [PHP type comparison tables (php.net)](https://www.php.net/manual/en/types.comparisons.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpStrictComparisonWithOperandsOfDifferentTypesInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpExpectedValuesShouldBeUsedInspection",
+                "shortDescription": {
+                  "text": "Expected values should be used"
+                },
+                "fullDescription": {
+                  "text": "Reports the values in assignment and comparison expressions that should be replaced with one of the expected values (that is, the values specified via the '#[ExpectedValues]' attribute). See Attributes (php.net) for details.",
+                  "markdown": "Reports the values in assignment and comparison expressions that should be replaced with one of the expected values (that is, the values specified via the `#[ExpectedValues]` attribute).\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpExpectedValuesShouldBeUsedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNonCompoundUseInspection",
+                "shortDescription": {
+                  "text": "Unnecessary statement use"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'use' statements that contain non-fully qualified class names and thus have no effect. The inspection only reports classes imports; functions and constants imports are not considered. See Using namespaces: Aliasing/Importing (php.net) for details.",
+                  "markdown": "Reports the `use` statements that contain non-fully qualified class names and thus have no effect. The inspection only reports classes imports; functions and constants imports are not considered.\n\n\nSee [Using namespaces: Aliasing/Importing (php.net)](http://www.php.net/manual/en/language.namespaces.importing.php#language.namespaces.importing) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpNonCompoundUseInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInvalidInstanceofInspection",
+                "shortDescription": {
+                  "text": "Argument of 'instanceof' should be only objects or strings"
+                },
+                "fullDescription": {
+                  "text": "Reports arguments of 'instanceof' that are not objects or strings",
+                  "markdown": "Reports arguments of 'instanceof' that are not objects or strings"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpInvalidInstanceofInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecationInspection",
+                "shortDescription": {
+                  "text": "Deprecated"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of deprecated entities. In most cases, such usages should be removed or replaced with other constructs.",
+                  "markdown": "Reports the usages of deprecated entities.\n\n\nIn most cases, such usages should be removed or replaced with other constructs."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MessDetectorValidationInspection",
+                "shortDescription": {
+                  "text": "PHP Mess Detector validation"
+                },
+                "fullDescription": {
+                  "text": "Reports coding style problems detected by PHP Mess Detector. The inspection requires PHP Mess Detector to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | Mess Detector. To learn more about installing PHP Mess Detector, see PHP Mess Detector installation (phpmd.org) for details. You can use a predefined set of rules or add your own by specifying valid ruleset.xml files. See the rules index (phpmd.org) and How to create a custom rule set (phpmd.org) for details.",
+                  "markdown": "Reports coding style problems detected by PHP Mess Detector.\n\n\nThe inspection requires PHP Mess Detector to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| Mess Detector](settings://settings.php.quality.tools?Mess%20Detector).\n\n\nTo learn more about installing PHP Mess Detector, see [PHP Mess Detector installation (phpmd.org)](https://phpmd.org/download/index.html) for details.\n\n\nYou can use a predefined set of rules or add your own by specifying valid *ruleset.xml* files. See the [rules index (phpmd.org)](https://phpmd.org/rules/index.html) and [How to create a custom rule set (phpmd.org)](https://phpmd.org/documentation/creating-a-ruleset.html) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "MessDetectorValidationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Quality tools",
+                      "index": 70,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedCastInspection",
+                "shortDescription": {
+                  "text": "Deprecated cast"
+                },
+                "fullDescription": {
+                  "text": "Reports deprecated cast expressions: '(unset)' cast expressions, which are deprecated in PHP 7.2 and later. '(real)' cast expressions, which are deprecated in PHP 7.4 and later. See Deprecated features in PHP 7.2.x (php.net) and Deprecations for PHP 7.4 (php.net) for details.",
+                  "markdown": "Reports deprecated cast expressions:\n\n* `(unset)` cast expressions, which are deprecated in PHP 7.2 and later.\n* `(real)` cast expressions, which are deprecated in PHP 7.4 and later.\n\n\nSee [Deprecated features in PHP 7.2.x (php.net)](https://www.php.net/manual/en/migration72.deprecated.php#migration72.deprecated.unset-cast) and [Deprecations for PHP 7.4 (php.net)](https://wiki.php.net/rfc/deprecations_php_7_4#the_real_type) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedCastInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertEqualsInspection",
+                "shortDescription": {
+                  "text": "Deprecated 'assertEquals/assertNotEquals' usage"
+                },
+                "fullDescription": {
+                  "text": "Reports deprecated usages of the 'assertEquals' and 'assertNotEquals' functions with '$delta', '$maxDepth', '$canonicalize', and '$ignoreCase' parameters. The optional '$delta', '$maxDepth', '$canonicalize', and '$ignoreCase' parameters of the 'assertEquals' and 'assertNotEquals' functions are deprecated and will be removed in PHPUnit 9. See Usage of the assertEquals function (phpunit.readthedocs.io) for details.",
+                  "markdown": "Reports deprecated usages of the `assertEquals` and `assertNotEquals` functions with `$delta`, `$maxDepth`, `$canonicalize`, and `$ignoreCase` parameters.\n\nThe optional `$delta`, `$maxDepth`, `$canonicalize`, and `$ignoreCase` parameters\nof the `assertEquals` and `assertNotEquals` functions are deprecated and will be removed in PHPUnit 9.\n\n\nSee [Usage of the assertEquals function (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html#assertequals) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertEqualsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNestedDirNameCallsCanBeReplacedWithLevelParameterInspection",
+                "shortDescription": {
+                  "text": "Nested 'dirname()' call can be replaced with 'levels' parameter usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the nested 'dirname()' calls that can be omitted by using the 'levels' parameter instead.",
+                  "markdown": "Reports the nested `dirname()` calls that can be omitted by using the `levels` parameter instead."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNestedDirNameCallsCanBeReplacedWithLevelParameterInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFieldImmediatelyRewrittenInspection",
+                "shortDescription": {
+                  "text": "Property is immediately rewritten "
+                },
+                "fullDescription": {
+                  "text": "Reports the write expressions on properties which are immediately overwritten before being accessed.",
+                  "markdown": "Reports the write expressions on properties which are immediately overwritten before being accessed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpFieldImmediatelyRewrittenInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpExpressionWithoutClarifyingParenthesesInspection",
+                "shortDescription": {
+                  "text": "Expression without clarifying parentheses"
+                },
+                "fullDescription": {
+                  "text": "Reports potentially ambiguous expressions and proposes enclosing them in clarifying parentheses.",
+                  "markdown": "Reports potentially ambiguous expressions and proposes enclosing them in clarifying parentheses."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpExpressionWithoutClarifyingParenthesesInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantAttributeParenthesisInspection",
+                "shortDescription": {
+                  "text": "Redundant parentheses in attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports empty arguments lists in attributes. See Attributes (php.net) for details.",
+                  "markdown": "Reports empty arguments lists in attributes.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantAttributeParenthesisInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpParameterNameChangedDuringInheritanceInspection",
+                "shortDescription": {
+                  "text": "Parameter's name changed during inheritance"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods' parameters whose names differ from the same parameters defined in parent methods. Starting with PHP 8.0, such code can cause runtime errors.",
+                  "markdown": "Reports the methods' parameters whose names differ from the same parameters defined in parent methods. Starting with PHP 8.0, such code can cause runtime errors."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpParameterNameChangedDuringInheritanceInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTraitsUseListInspection",
+                "shortDescription": {
+                  "text": "One-per-line trait uses"
+                },
+                "fullDescription": {
+                  "text": "Reports the cases of several traits being imported via a single 'use' statement. According to PSR-12, each individual trait imported into a class MUST be included one-per-line, and each inclusion MUST have its own 'use' import statement. See PSR-12: Extended Coding Style (php-fig.org) for details.",
+                  "markdown": "Reports the cases of several traits being imported via a single `use` statement.\n\n\nAccording to PSR-12, each individual trait imported into a class MUST be included one-per-line, and each inclusion MUST have its own `use` import statement.\n\n\nSee [PSR-12: Extended Coding Style (php-fig.org)](https://www.php-fig.org/psr/psr-12/#42-using-traits) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTraitsUseListInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConcatenationWithEmptyStringCanBeInlinedInspection",
+                "shortDescription": {
+                  "text": "Concatenation to empty string can be merged with assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports the '.=' concatenation assignments performed right after assignment to an empty string literal. Such assignments can be merged together.",
+                  "markdown": "Reports the `.=` concatenation assignments performed right after assignment to an empty string literal. Such assignments can be merged together."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpConcatenationWithEmptyStringCanBeInlinedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDisabledQualityToolComposerInspection",
+                "shortDescription": {
+                  "text": "Quality tool inspection is disabled"
+                },
+                "fullDescription": {
+                  "text": "Highlights the quality tools' entries in composer.json in case the corresponding code inspections are disabled.",
+                  "markdown": "Highlights the quality tools' entries in *composer.json* in case the corresponding code inspections are disabled."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDisabledQualityToolComposerInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Composer",
+                      "index": 38,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayIndexResetIsUnnecessaryInspection",
+                "shortDescription": {
+                  "text": "Array internal pointer reset is unnecessary"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'reset($array)' calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed. See reset (php.net) for details.",
+                  "markdown": "Reports the `reset($array)` calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed.\n\n\nSee [reset (php.net)](https://www.php.net/manual/en/function.reset.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayIndexResetIsUnnecessaryInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedFieldDefaultValueInspection",
+                "shortDescription": {
+                  "text": "Redundant property initializer"
+                },
+                "fullDescription": {
+                  "text": "Reports the fields with default initializers that are always overwritten in the class constructor.",
+                  "markdown": "Reports the fields with default initializers that are always overwritten in the class constructor."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedFieldDefaultValueInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNamedArgumentUsageInspection",
+                "shortDescription": {
+                  "text": "Argument with name identifier"
+                },
+                "fullDescription": {
+                  "text": "Reports arguments with name identifiers.",
+                  "markdown": "Reports arguments with name identifiers."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNamedArgumentUsageInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpApplyingEmptyIndexOperatorOnStringInspection",
+                "shortDescription": {
+                  "text": "Empty index operator not supported for strings"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of empty index operator ('[]') on strings. Starting from PHP 7.1, applying the empty index operator on a string throws a fatal error. See Creating/modifying with square bracket syntax (php.net) for details.",
+                  "markdown": "Reports the usages of empty index operator (`[]`) on strings.\n\n\nStarting from PHP 7.1, applying the empty index operator on a string throws a fatal error.\n\nSee [Creating/modifying with square bracket syntax (php.net)](https://www.php.net/manual/en/language.types.array.php#language.types.array.syntax.modifying) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpApplyingEmptyIndexOperatorOnStringInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTraitUseRuleInsideDifferentClassUseListInspection",
+                "shortDescription": {
+                  "text": "Trait use rule resolved to method with different containing class "
+                },
+                "fullDescription": {
+                  "text": "Reports the trait method 'use' rules that are resolved to methods from a different containing class rather than the one specified in the 'use' declaration.",
+                  "markdown": "Reports the trait method `use` rules that are resolved to methods from a different containing class rather than the one specified in the `use` declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTraitUseRuleInsideDifferentClassUseListInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertArrayHasKeyInspection",
+                "shortDescription": {
+                  "text": "Method 'assertArrayHasKey/assertArrayNotHasKey' can be used instead"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'assertTrue()' and 'assertNotTrue()' methods calls that are provided with an 'array_key_exists()' call as an argument. Such calls can be replaced with calls to the dedicated 'assertArrayHasKey()' method. See assertArrayHasKey (phpunit.readthedocs.io) for details.",
+                  "markdown": "Reports the `assertTrue()` and `assertNotTrue()` methods calls that are provided with an `array_key_exists()` call as an argument. Such calls can be replaced with calls to the dedicated `assertArrayHasKey()` method.\n\n\nSee [assertArrayHasKey (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html#assertarrayhaskey) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertArrayHasKeyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpObjectFieldsAreOnlyWrittenInspection",
+                "shortDescription": {
+                  "text": "Local object is used only for writing properties"
+                },
+                "fullDescription": {
+                  "text": "Reports the variable assignments to new objects that are used only for writing the object's properties without observable side effects.",
+                  "markdown": "Reports the variable assignments to new objects that are used only for writing the object's properties without observable side effects."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpObjectFieldsAreOnlyWrittenInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryStaticReferenceInspection",
+                "shortDescription": {
+                  "text": "Redundant 'static' in final class"
+                },
+                "fullDescription": {
+                  "text": "Reports 'static' usages inside final class",
+                  "markdown": "Reports `static` usages inside final class"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryStaticReferenceInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDynamicFieldDeclarationInspection",
+                "shortDescription": {
+                  "text": "Dynamic property declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to dynamic class properties declarations. Such declaration are deprecated starting from PHP 8.2 The inspection skips the objects of the 'stdClass' or derived types.",
+                  "markdown": "Reports the references to dynamic class properties declarations. Such declaration are deprecated starting from PHP 8.2\n\n\nThe inspection skips the objects of the `stdClass` or derived types."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDynamicFieldDeclarationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDocSignatureInspection",
+                "shortDescription": {
+                  "text": "PHPDoc comment matches function/method signature"
+                },
+                "fullDescription": {
+                  "text": "Reports the parameters' names and types in a PHPDoc comment that do not match the ones in the function/method declaration.",
+                  "markdown": "Reports the parameters' names and types in a PHPDoc comment that do not match the ones in the function/method declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDocSignatureInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMultipleClassesDeclarationsInOneFile",
+                "shortDescription": {
+                  "text": "Multiple classes declarations in one file"
+                },
+                "fullDescription": {
+                  "text": "Reports multiple class declarations in a single file, which violates the PSR-0/PSR-4 standards. See PSR-0/PSR-4 standards (php-fig.org) for details.",
+                  "markdown": "Reports multiple class declarations in a single file, which violates the PSR-0/PSR-4 standards.\n\n\nSee [PSR-0/PSR-4 standards (php-fig.org)](https://www.php-fig.org/psr/psr-4/) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMultipleClassesDeclarationsInOneFile",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayWriteIsNotUsedInspection",
+                "shortDescription": {
+                  "text": "Array write access is not used"
+                },
+                "fullDescription": {
+                  "text": "Reports the array write access expressions that are not used in code afterwards. The most common source of such problems is modifying an array passed via a parameter: if an array is passed by value, the change will not be visible outside the function.",
+                  "markdown": "Reports the array write access expressions that are not used in code afterwards. The most common source of such problems is modifying an array passed via a parameter: if an array is passed by value, the change will not be visible outside the function."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayWriteIsNotUsedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpReturnValueOfMethodIsNeverUsedInspection",
+                "shortDescription": {
+                  "text": "Method's return value is never used"
+                },
+                "fullDescription": {
+                  "text": "Reports the private methods returning the values that are not used.",
+                  "markdown": "Reports the private methods returning the values that are not used."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpReturnValueOfMethodIsNeverUsedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClassCantBeUsedAsAttributeInspection",
+                "shortDescription": {
+                  "text": "Class cannot be used as attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports the attributes that are resolved to a class not annotated with '#[Attribute]'. See Attributes (php.net) for details.",
+                  "markdown": "Reports the attributes that are resolved to a class not annotated with `#[Attribute]`.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClassCantBeUsedAsAttributeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertFileEqualsInspection",
+                "shortDescription": {
+                  "text": "Deprecated 'assertFileEquals/assertStringEqualsFile' usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the deprecated usages of the 'assertFileEquals', 'assertFileNotEquals', 'assertStringEqualsFile', and 'assertStringNotEqualsFile' functions with the '$canonicalize' and '$ignoreCase' parameters. The optional '$canonicalize' and '$ignoreCase' parameters of the 'assertFileEquals' and 'assertFileNotEquals' functions are deprecated and will be removed in PHPUnit 9. See Usage of the assertFileEquals function (phpunit.readthedocs.io) or Usage of the assertFileEquals function (phpunit.readthedocs.io) for details.",
+                  "markdown": "Reports the deprecated usages of the `assertFileEquals`, `assertFileNotEquals`, `assertStringEqualsFile`, and `assertStringNotEqualsFile` functions with the `$canonicalize` and `$ignoreCase` parameters.\n\nThe optional `$canonicalize` and `$ignoreCase` parameters\nof the `assertFileEquals` and `assertFileNotEquals` functions are deprecated and will be removed in PHPUnit 9.\n\n\nSee [Usage of the assertFileEquals function (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html#assertfileequals) or [Usage of the assertFileEquals function (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html#assertstringequalsfile) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertFileEqualsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVariableVariableInspection",
+                "shortDescription": {
+                  "text": "Usage of a variable variable"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of variable variables (dynamic variable names such as '$$a').",
+                  "markdown": "Reports the usages of variable variables (dynamic variable names such as `$$a`)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpVariableVariableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedSerializableUsageInspection",
+                "shortDescription": {
+                  "text": "Deprecated 'Serializable' interface usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of deprecated 'Serializable' interface. Starting from PHP 8.1, classes that are non-abstract, implement 'Serializable', and do not implement '__serialize()' and '__unserialize()' will throw a deprecation warning. See Phasing out Serializable (php.net) for details.",
+                  "markdown": "Reports the usages of deprecated `Serializable` interface.\n\n\nStarting from PHP 8.1, classes that are non-abstract, implement `Serializable`, and do not implement `__serialize()`\nand `__unserialize()` will throw a deprecation warning.\n\n\nSee [Phasing out Serializable (php.net)](https://wiki.php.net/rfc/custom_object_serialization) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedSerializableUsageInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedCallbackInspection",
+                "shortDescription": {
+                  "text": "Undefined callback"
+                },
+                "fullDescription": {
+                  "text": "Reports the functions, methods, properties, or classes that are referenced from a callback but are not found. Use the options below to customize the inspection: Ignore callback from *_exists and is_callable functions: if selected, the inspection will skip callback references from the 'method_exists', 'function_exists', 'property_exists', 'class_exists' and 'is_callable' functions. Don't report in case of ambiguity: if selected, the inspection will skip the parameters with multiple possible types, for example marked as 'callable|string'.",
+                  "markdown": "Reports the functions, methods, properties, or classes that are referenced from a callback but are not found.\n\nUse the options below to customize the inspection:\n\n* **Ignore callback from \\*_exists and is_callable functions** : if selected, the inspection will skip callback references from the `method_exists`, `function_exists`, `property_exists`, `class_exists` and `is_callable` functions.\n* **Don't report in case of ambiguity** : if selected, the inspection will skip the parameters with multiple possible types, for example marked as `callable|string`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedCallbackInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLoopCanBeConvertedToArrayMapInspection",
+                "shortDescription": {
+                  "text": "Loop can be converted to 'array_map()' call"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'foreach' loops that can be replaced with 'array_map()' calls.",
+                  "markdown": "Reports the `foreach` loops that can be replaced with `array_map()` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLoopCanBeConvertedToArrayMapInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpOptionalBeforeRequiredParametersInspection",
+                "shortDescription": {
+                  "text": "Optional before required parameter"
+                },
+                "fullDescription": {
+                  "text": "Reports the optional parameters that appear before the required parameters in a function/method declaration. See Default argument values (php.net) for details.",
+                  "markdown": "Reports the optional parameters that appear before the required parameters in a function/method declaration.\n\n\nSee [Default argument values (php.net)](http://www.php.net/manual/en/functions.arguments.php#functions.arguments.default) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpOptionalBeforeRequiredParametersInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpStrFunctionsInspection",
+                "shortDescription": {
+                  "text": "'str*()' calls can be replaced with PHP 8 'str_*()' calls"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'strpos' and 'substr' functions calls that can be replaced with the 'str_*' functions calls (introduced in PHP 8.0). See str_contains (php.net) and str_starts_with and str_ends_with functions (php.net) for details.",
+                  "markdown": "Reports the `strpos` and `substr` functions calls that can be replaced with the `str_*` functions calls (introduced in PHP 8.0).\n\n\nSee [str_contains (php.net)](https://wiki.php.net/rfc/str_contains) and [str_starts_with and str_ends_with functions (php.net)](https://wiki.php.net/rfc/add_str_starts_with_and_ends_with_functions) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpStrFunctionsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDocRedundantThrowsInspection",
+                "shortDescription": {
+                  "text": "Redundant @throws tag(s)"
+                },
+                "fullDescription": {
+                  "text": "Reports '@throws' tags for exceptions that are not thrown by the function or method. The exception classes added to the Unchecked Exceptions list under Settings | PHP | Analysis are excluded from the inspection scope.",
+                  "markdown": "Reports `@throws` tags for exceptions that are not thrown by the function or method.\n\nThe exception classes added to the **Unchecked Exceptions** list under\n[Settings \\| PHP \\| Analysis](settings://reference.webide.settings.project.settings.php?Unchecked%20Exceptions)\nare excluded from the inspection scope."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDocRedundantThrowsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessarySemicolonInspection",
+                "shortDescription": {
+                  "text": "Unnecessary semicolon"
+                },
+                "fullDescription": {
+                  "text": "Reports unnecessary semicolons.",
+                  "markdown": "Reports unnecessary semicolons."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessarySemicolonInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayMapCanBeConvertedToLoopInspection",
+                "shortDescription": {
+                  "text": "'array_map()' call can be converted to loop"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'array_map()' calls that can be replaced with 'foreach' loops.",
+                  "markdown": "Reports the `array_map()` calls that can be replaced with `foreach` loops."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayMapCanBeConvertedToLoopInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCSValidationInspection",
+                "shortDescription": {
+                  "text": "PHP_CodeSniffer validation"
+                },
+                "fullDescription": {
+                  "text": "Reports coding style problems detected by PHP_CodeSniffer. The inspection requires PHP_CodeSniffer to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | PHP_CodeSniffer. To learn more about installing PHP_CodeSniffer, see PHP_CodeSniffer installation (GitHub).",
+                  "markdown": "Reports coding style problems detected by PHP_CodeSniffer.\n\n\nThe inspection requires PHP_CodeSniffer to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| PHP_CodeSniffer](settings://settings.php.quality.tools?PHP_CodeSniffer).\n\n\nTo learn more about installing PHP_CodeSniffer, see [PHP_CodeSniffer installation (GitHub)](https://github.com/squizlabs/PHP_CodeSniffer#installation)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCSValidationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Quality tools",
+                      "index": 70,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryStringCastInspection",
+                "shortDescription": {
+                  "text": "Redundant cast to string"
+                },
+                "fullDescription": {
+                  "text": "Reports the '(string)' casts and 'strval()' calls that are redundant since casting to string is performed implicitly.",
+                  "markdown": "Reports the `(string)` casts and `strval()` calls that are redundant since casting to string is performed implicitly."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryStringCastInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNullIsNotCompatibleWithParameterInspection",
+                "shortDescription": {
+                  "text": "'null' is not compatible with parameter's declared type"
+                },
+                "fullDescription": {
+                  "text": "Reports the variables that are initialised via passing them by reference to a parameter incompatible with 'null'.",
+                  "markdown": "Reports the variables that are initialised via passing them by reference to a parameter incompatible with `null`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpNullIsNotCompatibleWithParameterInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPregReplaceWithEmptyReplacementInspection",
+                "shortDescription": {
+                  "text": "'preg_replace()' can be replaced with '(l|r)trim' call"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'preg_replace()' calls with empty 'replacement'. Such calls can be replaced with '(l|r)trim' calls.",
+                  "markdown": "Reports the `preg_replace()` calls with empty `replacement`. Such calls can be replaced with `(l|r)trim` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPregReplaceWithEmptyReplacementInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantClosingTagInspection",
+                "shortDescription": {
+                  "text": "Redundant closing tag"
+                },
+                "fullDescription": {
+                  "text": "Reports PHP closing tag '?>' usages, which are redundant in files containing only PHP code.",
+                  "markdown": "Reports PHP closing tag `?>` usages, which are redundant in files containing only PHP code."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantClosingTagInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryStopStatementInspection",
+                "shortDescription": {
+                  "text": "Unnecessary 'return/continue' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports unnecessary 'return' and 'continue' statements that can be safely removed.",
+                  "markdown": "Reports unnecessary `return` and `continue` statements that can be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryStopStatementInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDeprecatedAutoloadDeclarationInspection",
+                "shortDescription": {
+                  "text": "Deprecated '__autoload()' function declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the '__autoload()' function declarations. Starting from PHP 7.4, declaring '__autoload()' functions is deprecated. Starting from PHP 8.0, declaring '__autoload()' functions is forbidden. See __autoload (php.net) for details.",
+                  "markdown": "Reports the `__autoload()` function declarations.\n\n* Starting from PHP 7.4, declaring `__autoload()` functions is deprecated.\n* Starting from PHP 8.0, declaring `__autoload()` functions is forbidden.\n\n\nSee [__autoload (php.net)](https://www.php.net/manual/en/function.autoload.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDeprecatedAutoloadDeclarationInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpExpressionWithSameOperandsInspection",
+                "shortDescription": {
+                  "text": "Logical expression has same operands"
+                },
+                "fullDescription": {
+                  "text": "Reports the expressions that use the same operands, but should rather use different operands (for example, '$var == $var'). These include comparison, logical, null-coalescing, subtraction, and division expressions.",
+                  "markdown": "Reports the expressions that use the same operands, but should rather use different operands (for example, `$var == $var`). These include comparison, logical, null-coalescing, subtraction, and division expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpExpressionWithSameOperandsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArithmeticTypeCheckInspection",
+                "shortDescription": {
+                  "text": "Arithmetic operation with unsupported operands"
+                },
+                "fullDescription": {
+                  "text": "Reports arithmetic and bitwise expressions with unsupported operands. Starting with PHP 8.0, using the arithmetic and bitwise operators '+', '-', '*', '/', '**', '%', '<<', '>>', '&', '|', '^', '~', '++', '--' when one of the operands is an array, resource, or non-overloaded object will result in a 'TypeError'. The only exception is the 'array + array' merge operation, which remains supported. See PHP's internal test source for the complete list of operations.",
+                  "markdown": "Reports arithmetic and bitwise expressions with unsupported operands.\n\n\nStarting with PHP 8.0, using the arithmetic and bitwise operators `+`, `-`, `*`, `/`, `**`, `%`, `<<`, `>>`, `&`, `|`, `^`, `~`, `++`, `--`\nwhen one of the operands is an array, resource, or non-overloaded object will result in a `TypeError`. The only exception is the\n`array + array` merge operation, which remains supported.\n\n\nSee [PHP's internal test source](https://github.com/php/php-src/blob/master/Zend/tests/operator_unsupported_types.phpt) for the complete list of operations."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpArithmeticTypeCheckInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConditionAlreadyCheckedInspection",
+                "shortDescription": {
+                  "text": "Condition always evaluates to 'true/false'"
+                },
+                "fullDescription": {
+                  "text": "Reports the conditions that are already covered by earlier conditions and thus have no effect as well as the variables that are always true (or always false) when reached.",
+                  "markdown": "Reports the conditions that are already covered by earlier conditions and thus have no effect as well as the variables that are always true (or always false) when reached."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpConditionAlreadyCheckedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantVariableDocTypeInspection",
+                "shortDescription": {
+                  "text": "Redundant @var tag"
+                },
+                "fullDescription": {
+                  "text": "Reports the '@var' tags for variables whose type is already inferred from source code.",
+                  "markdown": "Reports the `@var` tags for variables whose type is already inferred from source code."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantVariableDocTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMethodNamingConventionInspection",
+                "shortDescription": {
+                  "text": "Method name is not following coding convention"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for methods. Use the inspection options to specify minimum/maximum length and the regular expression expected for methods' names. To ignore the names' length, specify 0. To learn more about regular expressions, refer to the Quick Start guide (regular-expressions.info).",
+                  "markdown": "Reports the methods' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for methods.\n\n\nUse the inspection options to specify minimum/maximum length and the regular expression expected for methods' names.\nTo ignore the names' length, specify **0**.\n\n\nTo learn more about regular expressions, refer to the [Quick Start guide (regular-expressions.info)](https://www.regular-expressions.info/quickstart.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMethodNamingConventionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Naming conventions",
+                      "index": 4,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpBooleanCanBeSimplifiedInspection",
+                "shortDescription": {
+                  "text": "Boolean expression can be simplified"
+                },
+                "fullDescription": {
+                  "text": "Reports the boolean expressions that contain the 'true' or 'false' literals and can be simplified.",
+                  "markdown": "Reports the boolean expressions that contain the `true` or `false` literals and can be simplified."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpBooleanCanBeSimplifiedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFuncGetArgCanBeReplacedWithParamInspection",
+                "shortDescription": {
+                  "text": "'func_get_arg()' call can be replaced with parameter access"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'func_get_arg()' calls that can be replaced with direct parameter access.",
+                  "markdown": "Reports the `func_get_arg()` calls that can be replaced with direct parameter access."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpFuncGetArgCanBeReplacedWithParamInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitCoversByAccessModifierIsDeprecatedInspection",
+                "shortDescription": {
+                  "text": "Deprecated @covers/@uses by access modifier annotation"
+                },
+                "fullDescription": {
+                  "text": "Reports the '@covers' and '@uses' PHPUnit doc tags that are using 'ClassName::<*>'. Such annotations won't be supported in PHPUnit 10 and later.",
+                  "markdown": "Reports the `@covers` and `@uses` PHPUnit doc tags that are using `ClassName::<*>`. Such annotations won't be supported in PHPUnit 10 and later."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitCoversByAccessModifierIsDeprecatedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedPrivateMethodInspection",
+                "shortDescription": {
+                  "text": "Unused private method"
+                },
+                "fullDescription": {
+                  "text": "Reports the private methods that are never used.",
+                  "markdown": "Reports the private methods that are never used."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedPrivateMethodInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRandArgumentsInReverseOrderInspection",
+                "shortDescription": {
+                  "text": "Misordered 'rand' function arguments"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'rand($min, $max)' family function calls in which the 'max' argument is less than 'min'. For such functions as 'mt_rand' and 'random_int', this will result in a fatal error.",
+                  "markdown": "Reports the `rand($min, $max)` family function calls in which the `max` argument is less than `min`. For such functions as `mt_rand` and `random_int`, this will result in a fatal error."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpRandArgumentsInReverseOrderInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAssignmentReplaceableWithPrefixExpressionInspection",
+                "shortDescription": {
+                  "text": "Assignment can be replaced with increment or decrement"
+                },
+                "fullDescription": {
+                  "text": "Reports the assignments that can be replaced with incrementing ('++') or decrementing ('--') operations.",
+                  "markdown": "Reports the assignments that can be replaced with incrementing (`++`) or decrementing (`--`) operations."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAssignmentReplaceableWithPrefixExpressionInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Replaceable assignments",
+                      "index": 82,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAttributeIsNotRepeatableInspection",
+                "shortDescription": {
+                  "text": "Non-repeatable attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports repeated attributes without the 'Attribute::IS_REPEATABLE' flag in their arguments declaration. See Attributes (php.net) for details.",
+                  "markdown": "Reports repeated attributes without the `Attribute::IS_REPEATABLE` flag in their arguments declaration.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAttributeIsNotRepeatableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpObjectShapeCanBeAddedInspection",
+                "shortDescription": {
+                  "text": "ObjectShape can be added"
+                },
+                "fullDescription": {
+                  "text": "Reports public properties of an object with specified types. Suggests specifying the shape of the returned object via the '#[ObjectShape]' attribute or an object shape in the PHPDoc comment. Example: '$a = new stdClass();\n  $a->name = \"name\";\n  $a->age = 2;' After the quick-fix is applied: '/** @var $a object{name: string, age: int} */\n  $a = new stdClass();\n  $a->name = \"name\";\n  $a->age = 2;'",
+                  "markdown": "Reports public properties of an object with specified types. Suggests specifying the shape of the returned object via the `#[ObjectShape]` attribute or an object shape in the PHPDoc comment.\n\n**Example:**\n\n\n      $a = new stdClass();\n      $a->name = \"name\";\n      $a->age = 2;\n\nAfter the quick-fix is applied:\n\n\n      /** @var $a object{name: string, age: int} */\n      $a = new stdClass();\n      $a->name = \"name\";\n      $a->age = 2;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpObjectShapeCanBeAddedInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInvalidMagicMethodModifiersInspection",
+                "shortDescription": {
+                  "text": "Invalid magic method modifiers"
+                },
+                "fullDescription": {
+                  "text": "Reports the magic methods that are not declared as public or are declared as static.",
+                  "markdown": "Reports the magic methods that are not declared as public or are declared as static."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpInvalidMagicMethodModifiersInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpWrongCatchClausesOrderInspection",
+                "shortDescription": {
+                  "text": "Wrong catch clauses order"
+                },
+                "fullDescription": {
+                  "text": "Reports the exceptions that are already caught by a preceding exception and the exceptions that are caught twice. The 'catch' clauses must be ordered from more specific to more generic ones. Otherwise, some exceptions may not be caught by the most specific handler. See Exceptions (php.net) for details.",
+                  "markdown": "Reports the exceptions that are already caught by a preceding exception and the exceptions that are caught twice.\n\n\nThe `catch` clauses must be ordered from more specific to more generic ones. Otherwise, some exceptions may not be caught by the most specific handler.\n\n\nSee [Exceptions (php.net)](http://www.php.net/manual/en/language.exceptions.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpWrongCatchClausesOrderInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Error handling",
+                      "index": 72,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVarUsageInspection",
+                "shortDescription": {
+                  "text": "Usage of var"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the 'var' keyword for declaring class properties. According to PSR-12, the 'var' keyword MUST NOT be used to declare a property. See PSR-12: Extended Coding Style (php-fig.org) for details.",
+                  "markdown": "Reports the usages of the `var` keyword for declaring class properties.\n\nAccording to PSR-12, the `var` keyword MUST NOT be used to declare a property.\n\n\nSee [PSR-12: Extended Coding Style (php-fig.org)](https://www.php-fig.org/psr/psr-12/#43-properties-and-constants) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpVarUsageInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPregSplitWithoutRegExpInspection",
+                "shortDescription": {
+                  "text": "'preg_split' can be replaced with 'explode'"
+                },
+                "fullDescription": {
+                  "text": "Reports 'preg_split()' calls that can be replaced with 'explode()'.",
+                  "markdown": "Reports `preg_split()` calls that can be replaced with `explode()`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPregSplitWithoutRegExpInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnpackingArraysWithStringKeysInspection",
+                "shortDescription": {
+                  "text": "Unpacking arrays with string keys is forbidden for PHP < 8.1"
+                },
+                "fullDescription": {
+                  "text": "Reports array unpacking with string keys in PHP < 8.1 See Array unpacking with string keys for details.",
+                  "markdown": "Reports array unpacking with string keys in PHP \\< 8.1\n\n\nSee [Array unpacking with string keys](https://wiki.php.net/rfc/array_unpacking_string_keys) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpUnpackingArraysWithStringKeysInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSillyAssignmentInspection",
+                "shortDescription": {
+                  "text": "Redundant assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports the assignment statements, in which both sides are equal. Such assignments have no effect and can be removed.",
+                  "markdown": "Reports the assignment statements, in which both sides are equal. Such assignments have no effect and can be removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpSillyAssignmentInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFullyQualifiedNameUsageInspection",
+                "shortDescription": {
+                  "text": "Fully qualified name usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the fully qualified class names that can be shortened by adding the 'use' statement.",
+                  "markdown": "Reports the fully qualified class names that can be shortened by adding the `use` statement."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpFullyQualifiedNameUsageInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSuspiciousNameCombinationInspection",
+                "shortDescription": {
+                  "text": "Suspicious names combination"
+                },
+                "fullDescription": {
+                  "text": "Reports the assignments and function calls where the name of the variable or parameter probably doesn't match the name of the assigned or passed value. The following sets of names are supported: 'needle', 'haystack' 'x', 'y' 'top', 'bottom', 'left', 'right' 'year', 'month', 'week', 'day', 'hour', 'minute', 'second'",
+                  "markdown": "Reports the assignments and function calls where the name of the variable or parameter probably doesn't match the name of the assigned or passed value.\n\n\nThe following sets of names are supported:\n\n* `needle`, `haystack`\n* `x`, `y`\n* `top`, `bottom`, `left`, `right`\n* `year`, `month`, `week`, `day`, `hour`, `minute`, `second`"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpSuspiciousNameCombinationInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRangesInClassCanBeMergedInspection",
+                "shortDescription": {
+                  "text": "Ranges in class can be merged"
+                },
+                "fullDescription": {
+                  "text": "Reports the alphabetic ranges or characters in regular expression character classes that only adjust the already existing ranges. Such elements can be merged with the adjusted ranges.",
+                  "markdown": "Reports the alphabetic ranges or characters in regular expression character classes that only adjust the already existing ranges. Such elements can be merged with the adjusted ranges."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRangesInClassCanBeMergedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Regular expressions",
+                      "index": 68,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPossiblePolymorphicInvocationInspection",
+                "shortDescription": {
+                  "text": "Possible polymorphic call"
+                },
+                "fullDescription": {
+                  "text": "Reports polymorphic code usages. Such usages are ambiguous and can be potentially inoperable depending on the class instance passed as the argument.",
+                  "markdown": "Reports polymorphic code usages. Such usages are ambiguous and can be potentially inoperable depending on the class instance passed as the argument."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPossiblePolymorphicInvocationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicateMatchConditionInspection",
+                "shortDescription": {
+                  "text": "Duplicate condition"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate conditions in 'match' expressions. See Match expression (php.net) for details.",
+                  "markdown": "Reports duplicate conditions in `match` expressions.\n\n\nSee [Match expression (php.net)](https://wiki.php.net/rfc/match_expression_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicateMatchConditionInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicateSwitchCaseBodyInspection",
+                "shortDescription": {
+                  "text": "Duplicate branch in switch statement"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'switch' statements containing the same code in different branches.",
+                  "markdown": "Reports the `switch` statements containing the same code in different branches."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicateSwitchCaseBodyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpStatementWithoutBracesInspection",
+                "shortDescription": {
+                  "text": "Control statement body without braces"
+                },
+                "fullDescription": {
+                  "text": "Reports the control structures (such as loops or conditionals) whose bodies are not enclosed in braces. See Control structures (php.net) for details.",
+                  "markdown": "Reports the control structures (such as loops or conditionals) whose bodies are not enclosed in braces.\n\n\nSee [Control structures (php.net)](https://www.php.net/manual/en/language.control-structures.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpStatementWithoutBracesInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPregMatchRedundantClosureInspection",
+                "shortDescription": {
+                  "text": "Redundant closure '.*'"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant leading and trailing '.*' in pattern for `preg_match` function.",
+                  "markdown": "Reports redundant leading and trailing '.\\*' in pattern for \\`preg_match\\` function."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPregMatchRedundantClosureInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpShortOpenEchoTagInspection",
+                "shortDescription": {
+                  "text": "Short open 'echo' tag usage"
+                },
+                "fullDescription": {
+                  "text": "Reports short PHP 'echo' tag '<?=' usages.",
+                  "markdown": "Reports short PHP `echo` tag `<?=` usages."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpShortOpenEchoTagInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNewClassMissingParameterListInspection",
+                "shortDescription": {
+                  "text": "Missing parameter list"
+                },
+                "fullDescription": {
+                  "text": "Reports missing parameter lists in a classes' instantiations. According to the PSR-12 specification, when instantiating a new class, parentheses MUST always be present even when there are no arguments passed to the constructor. See PSR-12: Extended Coding Style (php-fig.org) for details.",
+                  "markdown": "Reports missing parameter lists in a classes' instantiations.\n\nAccording to the PSR-12 specification, when instantiating a new class, parentheses MUST always be present even when there are no arguments passed to the constructor.\n\n\nSee [PSR-12: Extended Coding Style (php-fig.org)](https://www.php-fig.org/psr/psr-12/#4-classes-properties-and-methods) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNewClassMissingParameterListInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCombineMultipleIssetCallsIntoOneInspection",
+                "shortDescription": {
+                  "text": "Multiple 'isset' calls can be replaced with one"
+                },
+                "fullDescription": {
+                  "text": "Reports multiple 'isset()' checks that can be replaced with a single one.",
+                  "markdown": "Reports multiple `isset()` checks that can be replaced with a single one."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCombineMultipleIssetCallsIntoOneInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSuperClassIncompatibleWithInterfaceInspection",
+                "shortDescription": {
+                  "text": "Method declaration in parent class is incompatible with implemented interface"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods declarations in parent classes that are incompatible with implemented interfaces.",
+                  "markdown": "Reports the methods declarations in parent classes that are incompatible with implemented interfaces."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpSuperClassIncompatibleWithInterfaceInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAccessingStaticMembersOnTraitInspection",
+                "shortDescription": {
+                  "text": "Accessing static trait members"
+                },
+                "fullDescription": {
+                  "text": "Reports the static member access expressions used on traits. Such direct access is deprecated starting from PHP 8.1. Instead, static members should be accessed on the class that uses the trait. See Deprecations for PHP 8.1: Accessing static members on traits (php.net) for details.",
+                  "markdown": "Reports the static member access expressions used on traits. Such direct access is deprecated starting from PHP 8.1. Instead, static members should be accessed on the class that uses the trait.\n\n\nSee [Deprecations for PHP 8.1: Accessing static members on traits (php.net)](https://wiki.php.net/rfc/deprecations_php_8_1#accessing_static_members_on_traits) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAccessingStaticMembersOnTraitInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingReturnTypeInspection",
+                "shortDescription": {
+                  "text": "Missing return type declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the functions that have no return type declaration specified.",
+                  "markdown": "Reports the functions that have no return type declaration specified."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingReturnTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnused",
+                "shortDescription": {
+                  "text": "Unused declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the classes, methods, functions, constants, or properties that are not used or not reachable from entry points. It also reports all method implementations/overriders. Some unused members might not be reported in the code editor on the fly. Due to performance reasons, a non-private member is checked only when its name rarely occurs in the project. To see all results, run the inspection in batch mode by using Code | Inspect Code... or Code | Run Inspection by Name....",
+                  "markdown": "Reports the classes, methods, functions, constants, or properties that are not used or not reachable from entry points. It also reports all method implementations/overriders.\n\nSome unused members might not be reported in the code editor on the fly. Due to performance reasons, a non-private member is checked only\nwhen its name rarely occurs in the project.\n\nTo see all results, run the inspection in batch mode by using **Code \\| Inspect Code...** or **Code \\| Run Inspection by\nName...**."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnused",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitMisorderedAssertEqualsArgumentsInspection",
+                "shortDescription": {
+                  "text": "Misordered PHPUnit equality assertion method arguments"
+                },
+                "fullDescription": {
+                  "text": "Reports the calls to PHPUnit equality assertion methods (such as 'assertEquals()', 'assertNotEquals()', 'assertSame()', and so on) that have a non-literal as the expected result argument and a literal as the actual result argument. Such calls will behave fine for assertions that pass, but may produce confusing error reports if their expected and actual arguments differ. See assertEquals for details.",
+                  "markdown": "Reports the calls to PHPUnit equality assertion methods (such as `assertEquals()`, `assertNotEquals()`, `assertSame()`, and so on) that have a non-literal as the expected result argument and a literal as the actual result argument. Such calls will behave fine for assertions that pass, but may produce confusing error reports if their expected and actual arguments differ.\n\n\nSee [assertEquals](https://phpunit.readthedocs.io/en/stable/assertions.html#assertequals) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitMisorderedAssertEqualsArgumentsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCastIsEvaluableInspection",
+                "shortDescription": {
+                  "text": "Type cast on a scalar value"
+                },
+                "fullDescription": {
+                  "text": "Reports the type casts that can be evaluated in place and suggests replacing them with actual computed values. See Type juggling (php.net) for details.",
+                  "markdown": "Reports the type casts that can be evaluated in place and suggests replacing them with actual computed values.\n\n\nSee [Type juggling (php.net)](https://www.php.net/manual/en/language.types.type-juggling.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCastIsEvaluableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArraySearchInBooleanContextInspection",
+                "shortDescription": {
+                  "text": "'array_search()' can be replaced with 'in_array()' call"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'array_search()' calls that are only used for checking whether an element exists in array, that is, the expressions like 'if (array_search($a, $b) === false) {}'. Such calls can be safely replaced with 'in_array()' calls.",
+                  "markdown": "Reports the `array_search()` calls that are only used for checking whether an element exists in array, that is, the expressions like `if (array_search($a, $b) === false) {}`. Such calls can be safely replaced with `in_array()` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArraySearchInBooleanContextInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingVisibilityInspection",
+                "shortDescription": {
+                  "text": "Missing visibility"
+                },
+                "fullDescription": {
+                  "text": "Reports the properties, constants, and methods that are declared without visibility definition. According to PSR-12, visibility MUST be defined on: All properties, All constants if your project's PHP minimum version supports constant visibilities (PHP 7.1 or later), All methods. See PSR-12: Extended Coding Style (php-fig.org) for details.",
+                  "markdown": "Reports the properties, constants, and methods that are declared without visibility definition.\n\nAccording to PSR-12, visibility MUST be defined on:\n\n* All properties,\n* All constants if your project's PHP minimum version supports constant visibilities (PHP 7.1 or later),\n* All methods.\n\n\nSee [PSR-12: Extended Coding Style (php-fig.org)](https://www.php-fig.org/psr/psr-12/#43-properties-and-constants) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingVisibilityInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitExpectedExceptionDocTagIsDeprecatedInspection",
+                "shortDescription": {
+                  "text": "Deprecated exception handling via doc tags"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the following deprecated PHPUnit doc tags: '@expectedException' '@expectedExceptionMessage' '@expectedExceptionCode' '@expectedExceptionMessageRegExp'",
+                  "markdown": "Reports the usages of the following deprecated PHPUnit doc tags:\n\n* `@expectedException`\n* `@expectedExceptionMessage`\n* `@expectedExceptionCode`\n* `@expectedExceptionMessageRegExp`"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitExpectedExceptionDocTagIsDeprecatedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNotInstalledPackagesInspection",
+                "shortDescription": {
+                  "text": "Non-installed Composer packages"
+                },
+                "fullDescription": {
+                  "text": "Reports the Composer packages that are required in composer.json but are not installed.",
+                  "markdown": "Reports the Composer packages that are required in *composer.json* but are not installed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNotInstalledPackagesInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Composer",
+                      "index": 38,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNeverTypedFunctionReturnViolationInspection",
+                "shortDescription": {
+                  "text": "'never'-typed function returns a value"
+                },
+                "fullDescription": {
+                  "text": "Reports the functions with the 'never' return type hint that may return some value. Functions with such a return type are not expected to return any value and must prevent the rest of the script execution by either calling 'die()', 'exit()', and so on, or throwing an exception. See noreturn type (php.net) for details.",
+                  "markdown": "Reports the functions with the `never` return type hint that may return some value. Functions with such a return type are not expected to return any value and must prevent the rest of the script execution by either calling `die()`, `exit()`, and so on, or throwing an exception.\n\n\nSee [noreturn type (php.net)](https://wiki.php.net/rfc/noreturn_type) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpNeverTypedFunctionReturnViolationInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicateCaseInspection",
+                "shortDescription": {
+                  "text": "Duplicate case in switch statement"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate 'case' expressions in 'switch' statements. If a 'switch' statement contains multiple duplicate 'case' expressions, only the first one is executed.",
+                  "markdown": "Reports duplicate `case` expressions in `switch` statements.\n\nIf a `switch` statement contains multiple duplicate `case` expressions, only the first one is executed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicateCaseInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpModifierOrderInspection",
+                "shortDescription": {
+                  "text": "Order of modifiers"
+                },
+                "fullDescription": {
+                  "text": "Reports visibility modifiers that are specified in the incorrect order. According to PSR-12, the correct order is as follows: When present, the 'abstract' and 'final' declarations MUST precede the visibility declaration. When present, the 'static' declaration MUST come after the visibility declaration. See PSR-12: Extended Coding Style (php-fig.org) for details.",
+                  "markdown": "Reports visibility modifiers that are specified in the incorrect order.\n\nAccording to PSR-12, the correct order is as follows:\n\n* When present, the `abstract` and `final` declarations MUST precede the visibility declaration.\n* When present, the `static` declaration MUST come after the visibility declaration.\n\n\nSee [PSR-12: Extended Coding Style (php-fig.org)](https://www.php-fig.org/psr/psr-12/#46-abstract-final-and-static) for\ndetails."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpModifierOrderInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantIntersectionTypeInspection",
+                "shortDescription": {
+                  "text": "Redundant intersection type"
+                },
+                "fullDescription": {
+                  "text": "Reports the intersection type declarations that contain redundant types, for example, an intersection type that contains both the parent class and its subclass. See PHP RFC: Pure intersection types (php.net) for details.",
+                  "markdown": "Reports the intersection type declarations that contain redundant types, for example, an intersection type that contains both the parent class and its subclass.\n\n\nSee [PHP RFC: Pure intersection types (php.net)](https://wiki.php.net/rfc/pure-intersection-types) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantIntersectionTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInstanceofIsAlwaysTrueInspection",
+                "shortDescription": {
+                  "text": "Result of 'instanceof' is always 'true'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'instanceof' expressions whose argument is within the hierarchy of the checked variable. Such expressions will always evaluate to 'true'.",
+                  "markdown": "Reports the `instanceof` expressions whose argument is within the hierarchy of the checked variable. Such expressions will always evaluate to `true`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpInstanceofIsAlwaysTrueInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInappropriateInheritDocUsageInspection",
+                "shortDescription": {
+                  "text": "Inappropriate @inheritDoc usage"
+                },
+                "fullDescription": {
+                  "text": "Reports inappropriate '@inheritDoc' usages: On non-class members On class members without any super members having a doc comment.",
+                  "markdown": "Reports inappropriate `@inheritDoc` usages:\n\n* On non-class members\n* On class members without any super members having a doc comment."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpInappropriateInheritDocUsageInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClassConstantAccessedViaChildClassInspection",
+                "shortDescription": {
+                  "text": "Class constant referenced via child class"
+                },
+                "fullDescription": {
+                  "text": "Reports the class constant references that target the constant from the parent class of the referenced class.",
+                  "markdown": "Reports the class constant references that target the constant from the parent class of the referenced class."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClassConstantAccessedViaChildClassInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSwitchStatementWitSingleBranchInspection",
+                "shortDescription": {
+                  "text": "'switch' with single 'case'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'switch' statements that only contain a single 'case' statement. Such 'switch' statements can be converted into 'if' statements.",
+                  "markdown": "Reports the `switch` statements that only contain a single `case` statement. Such `switch` statements can be converted into `if` statements."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpSwitchStatementWitSingleBranchInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpImplicitOctalLiteralUsageInspection",
+                "shortDescription": {
+                  "text": "Implicit octal literal can be replaced with explicit one"
+                },
+                "fullDescription": {
+                  "text": "Reports the implicit octal literals such as '071' that could be replaced with explicit ones such as 0o71. Explicit octal literals using the '0o/0O' prefix are supported in PHP 8.1 and later. See Explicit octal integer literal notation (php.net) for details.",
+                  "markdown": "Reports the implicit octal literals such as `071` that could be replaced with explicit ones such as 0o71.\n\n\nExplicit octal literals using the `0o/0O` prefix are supported in PHP 8.1 and later.\n\n\nSee [Explicit octal integer literal notation (php.net)](https://wiki.php.net/rfc/explicit_octal_notation) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpImplicitOctalLiteralUsageInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayIndexImmediatelyRewrittenInspection",
+                "shortDescription": {
+                  "text": "Array index is immediately rewritten "
+                },
+                "fullDescription": {
+                  "text": "Reports the write expressions on array indexes which are immediately overwritten before being accessed.",
+                  "markdown": "Reports the write expressions on array indexes which are immediately overwritten before being accessed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayIndexImmediatelyRewrittenInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVarExportUsedWithoutReturnArgumentInspection",
+                "shortDescription": {
+                  "text": "'var_export' or 'print_r' call is used without 'return' argument"
+                },
+                "fullDescription": {
+                  "text": "Reports 'var_export()' and 'print_r()' calls without the 'return' argument when their results are explicitly used. Such calls most probably are a mistake, because 'var_export'/'print_r' always returns 'null'/'true' if no 'argument' is specified.",
+                  "markdown": "Reports `var_export()` and `print_r()` calls without the `return` argument when their results are explicitly used. Such calls most probably are a mistake, because `var_export`/`print_r` always returns `null`/`true` if no `argument` is specified."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpVarExportUsedWithoutReturnArgumentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIncorrectMagicMethodSignatureInspection",
+                "shortDescription": {
+                  "text": "Incorrect magic method signature"
+                },
+                "fullDescription": {
+                  "text": "Reports incompatible magic methods signatures. See RFC: Ensure correct signatures of magic methods (php.net) for details.",
+                  "markdown": "Reports incompatible magic methods signatures.\n\n\nSee [RFC: Ensure correct signatures of magic methods (php.net)](https://wiki.php.net/rfc/magic-methods-signature) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpIncorrectMagicMethodSignatureInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitMissingTargetForTestInspection",
+                "shortDescription": {
+                  "text": "Missing target element for PHPUnit test"
+                },
+                "fullDescription": {
+                  "text": "Reports the test classes and methods, for which no corresponding production classes or methods were found.",
+                  "markdown": "Reports the test classes and methods, for which no corresponding production classes or methods were found."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitMissingTargetForTestInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpContinueTargetingSwitchInspection",
+                "shortDescription": {
+                  "text": "'continue' is targeting 'switch' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'continue' statements that are targeting 'switch' statements. In PHP 7.3 and later, such usages are deprecated and will emit an 'E_WARNING', since they are most likely the result of a programming mistake. In PHP, such 'continue' statements are equivalent to 'break', that is, they end the execution of the current 'switch' structure. In other languages, such 'continue' statements behave as 'continue 2' in PHP, that is, they take the execution to a higher level control structure (for example, the next iteration of an outer loop). See continue (php.net), break (php.net), and switch (php.net) for details.",
+                  "markdown": "Reports the `continue` statements that are targeting `switch` statements. In PHP 7.3 and later, such usages are deprecated and will emit an `E_WARNING`, since they are most likely the result of a programming mistake.\n\n* In PHP, such `continue` statements are equivalent to `break`, that is, they end the execution of the current `switch` structure.\n* In other languages, such `continue` statements behave as `continue 2` in PHP, that is, they take the execution to a higher level control structure (for example, the next iteration of an outer loop).\n\n\nSee [continue (php.net)](https://www.php.net/manual/en/control-structures.continue.php), [break (php.net)](https://www.php.net/manual/en/control-structures.break.php), and [switch (php.net)](https://www.php.net/manual/en/control-structures.switch.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpContinueTargetingSwitchInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpGetClassCanBeReplacedWithClassNameLiteralInspection",
+                "shortDescription": {
+                  "text": "'get_class()' call can be replaced with '::class'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'get_class()' calls and suggests replacing them with '::class' when PHP Language level is set to 8.0 or later. See Allow ::class on objects (php.net) for details.",
+                  "markdown": "Reports the `get_class()` calls and suggests replacing them with `::class` when PHP Language level is set to 8.0 or later.\n\n\nSee [Allow ::class on objects (php.net)](https://wiki.php.net/rfc/class_name_literal_on_object) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpGetClassCanBeReplacedWithClassNameLiteralInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicateCatchBodyInspection",
+                "shortDescription": {
+                  "text": "Duplicate branch in 'catch' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports 'catch' statements with duplicated bodies.",
+                  "markdown": "Reports `catch` statements with duplicated bodies."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicateCatchBodyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCurlyBraceAccessSyntaxUsageInspection",
+                "shortDescription": {
+                  "text": "Curly brace access syntax usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of curly brace syntax for accessing array elements and string offsets.",
+                  "markdown": "Reports the usages of curly brace syntax for accessing array elements and string offsets."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpCurlyBraceAccessSyntaxUsageInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRegExpInvalidDelimiterInspection",
+                "shortDescription": {
+                  "text": "Invalid delimiter"
+                },
+                "fullDescription": {
+                  "text": "Reports invalid delimiters in regular expressions in two cases: 1. If a delimiter is an alphanumeric or a backslash. 2. If a delimiter is used in a regular expression pattern.",
+                  "markdown": "Reports invalid delimiters in regular expressions in two cases: 1. If a delimiter is an alphanumeric or a backslash. 2. If a delimiter is used in a regular expression pattern."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpRegExpInvalidDelimiterInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Regular expressions",
+                      "index": 68,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPropertyCanBeReadonlyInspection",
+                "shortDescription": {
+                  "text": "Property can be 'readonly'"
+                },
+                "fullDescription": {
+                  "text": "Reports the private promoted properties that are never written to. In PHP 8.1 and later, such properties can be declared 'readonly'. See Readonly properties (php.net) for details.",
+                  "markdown": "Reports the private promoted properties that are never written to. In PHP 8.1 and later, such properties can be declared `readonly`.\n\n\nSee [Readonly properties (php.net)](https://wiki.php.net/rfc/readonly_properties_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPropertyCanBeReadonlyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedNamespaceInspection",
+                "shortDescription": {
+                  "text": "Undefined namespace"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to a namespace that is not found.",
+                  "markdown": "Reports the references to a namespace that is not found."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedNamespaceInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedMethodInspection",
+                "shortDescription": {
+                  "text": "Undefined method"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to class methods that are not defined.",
+                  "markdown": "Reports the references to class methods that are not defined."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedMethodInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPropertyNamingConventionInspection",
+                "shortDescription": {
+                  "text": "Property name is not following coding convention"
+                },
+                "fullDescription": {
+                  "text": "Reports the properties' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for properties. Use the inspection options to specify minimum/maximum length and the regular expression expected for properties' names. To ignore the names' length, specify 0. To learn more about regular expressions, refer to the Quick Start guide (regular-expressions.info).",
+                  "markdown": "Reports the properties' names that are either too short, too long, or do not follow the specified regular expression pattern. Some coding styles have a special naming convention for properties.\n\n\nUse the inspection options to specify minimum/maximum length and the regular expression expected for properties' names.\nTo ignore the names' length, specify **0**.\n\n\nTo learn more about regular expressions, refer to the [Quick Start guide (regular-expressions.info)](https://www.regular-expressions.info/quickstart.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPropertyNamingConventionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Naming conventions",
+                      "index": 4,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIncompatibleReturnTypeInspection",
+                "shortDescription": {
+                  "text": "Incompatible return type"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'return' statements whose return value type is not compatible with the one declared for a function/method.",
+                  "markdown": "Reports the `return` statements whose return value type is not compatible with the one declared for a function/method."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpIncompatibleReturnTypeInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingStrictTypesDeclarationInspection",
+                "shortDescription": {
+                  "text": "Missing strict types declaration"
+                },
+                "fullDescription": {
+                  "text": "Detects the missing 'declare(strict_types=1)' directive in the file. See Strict typing (php.net) to learn more about why you may need use this directive.",
+                  "markdown": "Detects the missing `declare(strict_types=1)` directive in the file.\n\n\nSee [Strict typing (php.net)](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict) to learn more about why you may need use this directive."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingStrictTypesDeclarationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNamedArgumentMightBeUnresolvedInspection",
+                "shortDescription": {
+                  "text": "Named argument may be unresolved"
+                },
+                "fullDescription": {
+                  "text": "Reports the named arguments in method calls that might be unresolved depending on a specific class instance within the hierarchy.",
+                  "markdown": "Reports the named arguments in method calls that might be unresolved depending on a specific class instance within the hierarchy."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNamedArgumentMightBeUnresolvedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayTraversableCanBeReplacedWithIterableInspection",
+                "shortDescription": {
+                  "text": "Type hint 'array|Traversable' can be replaced with 'iterable'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'array|Traversable' type hints that can be replaced with 'iterable'.",
+                  "markdown": "Reports the `array|Traversable` type hints that can be replaced with `iterable`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayTraversableCanBeReplacedWithIterableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpEchoOpenTagInspection",
+                "shortDescription": {
+                  "text": "Open 'echo' tag usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the '<?php echo' usages that can be replaced with a short tag '<?='.",
+                  "markdown": "Reports the `<?php echo` usages that can be replaced with a short tag `<?=`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpEchoOpenTagInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLanguageLevelInspection",
+                "shortDescription": {
+                  "text": "Language level"
+                },
+                "fullDescription": {
+                  "text": "Reports the language features used in source code that are not supported for the selected language level. For example, union types can be used only in PHP 8.0 and later.",
+                  "markdown": "Reports the language features used in source code that are not supported for the selected language level.\n\nFor example, union types can be used only in PHP 8.0 and later."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpLanguageLevelInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertContainsInspection",
+                "shortDescription": {
+                  "text": "Deprecated 'assertContains/assertNotContains' usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the deprecated 'assertContains()' and 'assertNotContains()' calls with the string '$needle' and '$ignoreCase' arguments. The string '$needle' and optional boolean '$ignoreCase' parameters of the 'assertContains()' and 'assertNotContains()' functions are deprecated and removed in PHPUnit 9. For assertions that operate on strings, the specific 'assertStringContainsString()', 'assertStringContainsStringIgnoringCase()', 'assertStringNotContainsString()', and 'assertStringNotContainsStringIgnoringCase()' methods should be used. See Usage of the assertEquals function (phpunit.readthedocs.io) for details.",
+                  "markdown": "Reports the deprecated `assertContains()` and `assertNotContains()` calls with the string `$needle` and `$ignoreCase` arguments.\n\n\nThe string `$needle` and optional boolean `$ignoreCase` parameters\nof the `assertContains()` and `assertNotContains()` functions are deprecated and removed in PHPUnit 9. For assertions that operate on strings, the specific\n`assertStringContainsString()`, `assertStringContainsStringIgnoringCase()`, `assertStringNotContainsString()`, and\n`assertStringNotContainsStringIgnoringCase()` methods should be used.\n\n\nSee [Usage of the assertEquals function (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertContainsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAssignmentInConditionInspection",
+                "shortDescription": {
+                  "text": "Assignment in condition"
+                },
+                "fullDescription": {
+                  "text": "Reports the assignments that are used in conditional expressions.",
+                  "markdown": "Reports the assignments that are used in conditional expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAssignmentInConditionInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryDoubleQuotesInspection",
+                "shortDescription": {
+                  "text": "Unnecessary double quotes"
+                },
+                "fullDescription": {
+                  "text": "Reports double-quoted string literals that do not contain string interpolation, escape sequences, or single quotes.",
+                  "markdown": "Reports double-quoted string literals that do not contain string interpolation, escape sequences, or single quotes."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryDoubleQuotesInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDivisionByZeroInspection",
+                "shortDescription": {
+                  "text": "Division by zero"
+                },
+                "fullDescription": {
+                  "text": "Reports division by zero or modulo by zero.",
+                  "markdown": "Reports division by zero or modulo by zero."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpDivisionByZeroInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNullSafeOperatorCanBeUsedInspection",
+                "shortDescription": {
+                  "text": "Nullsafe operator '?->' can be used"
+                },
+                "fullDescription": {
+                  "text": "Reports the null-checking conditional expressions that can be safely replaced with the '?->' nullsafe operator.",
+                  "markdown": "Reports the null-checking conditional expressions that can be safely replaced with the `?->` nullsafe operator."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNullSafeOperatorCanBeUsedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCommentCanBeReplacedWithNamedArgumentInspection",
+                "shortDescription": {
+                  "text": "Comment can be replaced with named argument"
+                },
+                "fullDescription": {
+                  "text": "Reports the inline comments before arguments in function calls that only contain the name of the parameter and thus serve as hints. In PHP 8.0 and later, named arguments can be used instead. See Named arguments (php.net) for details.",
+                  "markdown": "Reports the inline comments before arguments in function calls that only contain the name of the parameter and thus serve as hints. In PHP 8.0 and later, named arguments can be used instead.\n\n\nSee [Named arguments (php.net)](https://wiki.php.net/rfc/match_expression_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCommentCanBeReplacedWithNamedArgumentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLineCommentWillBeParsedAsAttributeInspection",
+                "shortDescription": {
+                  "text": "Comment is parsed as attribute in PHP 8.0"
+                },
+                "fullDescription": {
+                  "text": "Reports line comments starting with '#['. In PHP 8.0 and later, such comments are parsed as attributes. See Attributes (php.net) for details.",
+                  "markdown": "Reports line comments starting with `#[`. In PHP 8.0 and later, such comments are parsed as attributes.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpLineCommentWillBeParsedAsAttributeInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayShapeCanBeAddedInspection",
+                "shortDescription": {
+                  "text": "'#[ArrayShape]' attribute can be added"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods and functions that are returning arrays with known non-trivial keys. Suggests specifying the shape of the returned array via the '#[ArrayShape]' attribute or an array shape in the PHPDoc comment.",
+                  "markdown": "Reports the methods and functions that are returning arrays with known non-trivial keys. Suggests specifying the shape of the returned array via the `#[ArrayShape]` attribute or an array shape in the PHPDoc comment."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayShapeCanBeAddedInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantCatchClauseInspection",
+                "shortDescription": {
+                  "text": "Redundant catch clause"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'catch' clauses with exceptions that are never thrown from the corresponding 'try' block.",
+                  "markdown": "Reports the `catch` clauses with exceptions that are never thrown from the corresponding `try` block."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantCatchClauseInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Error handling",
+                      "index": 72,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnpackedArgumentTypeMismatchInspection",
+                "shortDescription": {
+                  "text": "Invalid type of unpacked argument"
+                },
+                "fullDescription": {
+                  "text": "Reports unpacked function arguments and array elements whose type is neither 'array' nor 'Traversable'. Starting with PHP 8.0, such usages will result in 'Fatal error'.",
+                  "markdown": "Reports unpacked function arguments and array elements whose type is neither `array` nor `Traversable`.\n\n\nStarting with PHP 8.0, such usages will result in `Fatal error`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUnpackedArgumentTypeMismatchInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryLeadingBackslashInUseStatementInspection",
+                "shortDescription": {
+                  "text": "Unnecessary leading '\\' in 'use' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'use' statements with an unnecessary leading '\\'. For namespaced names (fully qualified namespace names containing a namespace separator, such as 'Foo\\Bar' as opposed to global names that do not, such as 'FooBar'), the leading backslash is unnecessary and not recommended, as import names must be fully qualified and are not processed relative to the current namespace. See Using namespaces: Aliasing/Importing (php.net) for details.",
+                  "markdown": "Reports the `use` statements with an unnecessary leading `\\`.\n\n\nFor namespaced names (fully qualified namespace names containing a namespace separator, such as `Foo\\Bar` as opposed to global names that do not, such as `FooBar`), the leading backslash is unnecessary and not recommended, as import names must be fully qualified and are not processed relative to the current namespace.\n\n\nSee [Using namespaces: Aliasing/Importing (php.net)](https://www.php.net/manual/en/language.namespaces.importing.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryLeadingBackslashInUseStatementInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertTrueWithIncompatibleTypeArgumentInspection",
+                "shortDescription": {
+                  "text": "'assertTrue()' with incompatible argument type"
+                },
+                "fullDescription": {
+                  "text": "Reports the PHPUnit 'assertTrue()' calls whose arguments are of incompatible types. Since the 'assertTrue()' method relies on strict types comparison with 'true', such assertions will always fail.",
+                  "markdown": "Reports the PHPUnit `assertTrue()` calls whose arguments are of incompatible types. Since the `assertTrue()` method relies on strict types comparison with `true`, such assertions will always fail."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertTrueWithIncompatibleTypeArgumentInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicateOperandInComparisonInspection",
+                "shortDescription": {
+                  "text": "Duplicate operand in comparison"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate operands in binary expressions ('+', '-', '*', '/', '&&', '||', and '.') that are in turn used inside comparison expressions. Such operands do not affect the comparison result and can be safely removed.",
+                  "markdown": "Reports duplicate operands in binary expressions (`+`, `-`, `*`, `/`, `&&`, `||`, and `.`) that are in turn used inside comparison expressions. Such operands do not affect the comparison result and can be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicateOperandInComparisonInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedClassInspection",
+                "shortDescription": {
+                  "text": "Undefined class"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to classes whose declarations are not found in the project files, configured include paths, or among the PHP predefined classes. Use the options below to customize the inspection: Ignore PHPDoc: if selected, the inspection will not report the undefined classes referenced in PHPDoc blocks.",
+                  "markdown": "Reports the references to classes whose declarations are not found in the project files, configured include paths, or among the PHP predefined classes.\n\nUse the options below to customize the inspection:\n\n* **Ignore PHPDoc**: if selected, the inspection will not report the undefined classes referenced in PHPDoc blocks."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedClassInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNestedMinMaxCallInspection",
+                "shortDescription": {
+                  "text": "Nested 'min/max' call"
+                },
+                "fullDescription": {
+                  "text": "Reports nested 'min'/'max' calls. Since the 'min'/'max' functions accept any number of arguments, such nested calls are redundant.",
+                  "markdown": "Reports nested `min`/`max` calls. Since the `min`/`max` functions accept any number of arguments, such nested calls are redundant."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNestedMinMaxCallInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPluralMixedCanBeReplacedWithArrayInspection",
+                "shortDescription": {
+                  "text": "'mixed' type can be replaced with 'array'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'mixed[]' usages in PHPDoc blocks that can be safely replaced with 'array'.",
+                  "markdown": "Reports the `mixed[]` usages in PHPDoc blocks that can be safely replaced with `array`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPluralMixedCanBeReplacedWithArrayInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCompoundNamespaceDepthInspection",
+                "shortDescription": {
+                  "text": "Compound namespace depth is more than 2"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of compound namespaces whose depth exceeds two levels. According to PSR-12, compound namespaces with a depth of more than two MUST NOT be used. See PSR-12: Extended Coding Style (php-fig.org) for details.",
+                  "markdown": "Reports the usages of compound namespaces whose depth exceeds two levels.\n\nAccording to PSR-12, compound namespaces with a depth of more than two MUST NOT be used.\n\n\nSee [PSR-12: Extended Coding Style (php-fig.org)](https://www.php-fig.org/psr/psr-12/#3-declare-statements-namespace-and-import-statements) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpCompoundNamespaceDepthInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style/PSR-12",
+                      "index": 61,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArgumentWithoutNamedIdentifierInspection",
+                "shortDescription": {
+                  "text": "Argument without name identifier"
+                },
+                "fullDescription": {
+                  "text": "Reports arguments without name identifiers.",
+                  "markdown": "Reports arguments without name identifiers."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArgumentWithoutNamedIdentifierInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDuplicatedCharacterInStrFunctionCallInspection",
+                "shortDescription": {
+                  "text": "Duplicate character in function call"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate characters provided in the 'characters' argument of functions like 'ltrim' or 'str_words_counts'. Such duplicates are most probably a mistake and can be safely removed.",
+                  "markdown": "Reports duplicate characters provided in the `characters` argument of functions like `ltrim` or `str_words_counts`. Such duplicates are most probably a mistake and can be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpDuplicatedCharacterInStrFunctionCallInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUndefinedConstantInspection",
+                "shortDescription": {
+                  "text": "Undefined constant"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to constants that are not found in the project files, configured include paths, or among the PHP predefined constants.",
+                  "markdown": "Reports the references to constants that are not found in the project files, configured include paths, or among the PHP predefined constants."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUndefinedConstantInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUncoveredEnumCasesInspection",
+                "shortDescription": {
+                  "text": "Some enum cases are uncovered"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'match' expressions that don't cover all 'enum' cases in 'match' arm conditions.",
+                  "markdown": "Reports the `match` expressions that don't cover all `enum` cases in `match` arm conditions."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUncoveredEnumCasesInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMethodOrClassCallIsNotCaseSensitiveInspection",
+                "shortDescription": {
+                  "text": "Case mismatch in method call or class usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of functions, methods, classes, and namespaces that do not match the case used in their declarations.",
+                  "markdown": "Reports the usages of functions, methods, classes, and namespaces that do not match the case used in their declarations."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMethodOrClassCallIsNotCaseSensitiveInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAccessStaticViaInstanceInspection",
+                "shortDescription": {
+                  "text": "Class static member accessed via instance"
+                },
+                "fullDescription": {
+                  "text": "Reports references to static methods and fields via a class instance rather than the class itself. Even though referring to static members via instance variables is allowed by PHP, this makes the code confusing, as the reader may think that the result of the method depends on the instance. The quick-fix replaces the instance variable with the class name. Example: 'class StaticClass {\n    public static function someStaticFunction(): int\n    {\n        return 3;\n    }\n\n  }\n\n  $var = new StaticClass\n  $var::someStaticFunction();' After the quick-fix is applied: 'StaticClass::someStaticFunction()'",
+                  "markdown": "Reports references to static methods and fields via a class instance rather than the class itself.\n\nEven though referring to static members via instance variables is allowed by PHP,\nthis makes the code confusing, as the reader may think that the result of the method depends on the instance.\n\nThe quick-fix replaces the instance variable with the class name.\n\nExample:\n\n\n      class StaticClass {\n        public static function someStaticFunction(): int\n        {\n            return 3;\n        }\n\n      }\n\n      $var = new StaticClass\n      $var::someStaticFunction();\n\nAfter the quick-fix is applied:\n\n\n      StaticClass::someStaticFunction()\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAccessStaticViaInstanceInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRegExpRedundantModifierInspection",
+                "shortDescription": {
+                  "text": "Redundant modifier"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'i' (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed.",
+                  "markdown": "Reports the `i` (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRegExpRedundantModifierInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Regular expressions",
+                      "index": 68,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
+                "shortDescription": {
+                  "text": "Attribute can be added to overriding member "
+                },
+                "fullDescription": {
+                  "text": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters. See Attributes (php.net) for details.",
+                  "markdown": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedundantDocCommentInspection",
+                "shortDescription": {
+                  "text": "Redundant PHPDoc comment"
+                },
+                "fullDescription": {
+                  "text": "Reports PHPDoc comments or their parts that contain the information already provided in declarations.",
+                  "markdown": "Reports PHPDoc comments or their parts that contain the information already provided in declarations."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpRedundantDocCommentInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedPrivateFieldInspection",
+                "shortDescription": {
+                  "text": "Unused private property"
+                },
+                "fullDescription": {
+                  "text": "Reports the private properties that are never used.",
+                  "markdown": "Reports the private properties that are never used."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedPrivateFieldInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSingleStatementWithBracesInspection",
+                "shortDescription": {
+                  "text": "Single-statement body with braces"
+                },
+                "fullDescription": {
+                  "text": "Reports the control structures (such as loops or conditionals) whose bodies are enclosed in braces but only contain a single child statement. Using braces in such cases is not necessary. See Control structures (php.net) for details.",
+                  "markdown": "Reports the control structures (such as loops or conditionals) whose bodies are enclosed in braces but only contain a single child statement. Using braces in such cases is not necessary.\n\n\nSee [Control structures (php.net)](https://www.php.net/manual/en/language.control-structures.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpSingleStatementWithBracesInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryBoolCastInspection",
+                "shortDescription": {
+                  "text": "Redundant cast to boolean"
+                },
+                "fullDescription": {
+                  "text": "Reports the '(bool)'/'(boolean)' casts and 'boolval()' calls that are redundant since casting to 'bool' is performed implicitly.",
+                  "markdown": "Reports the `(bool)`/`(boolean)` casts and `boolval()` calls that are redundant since casting to `bool` is performed implicitly."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryBoolCastInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnnecessaryElseBranchInspection",
+                "shortDescription": {
+                  "text": "Unnecessary 'else' branch"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'else' branches in 'if' statements whose bodies always execute a terminating statement such as 'return' or 'throw'. Such branches are redundant and can be safely omitted.",
+                  "markdown": "Reports the `else` branches in `if` statements whose bodies always execute a terminating statement such as `return` or `throw`. Such branches are redundant and can be safely omitted."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnnecessaryElseBranchInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedMatchConditionInspection",
+                "shortDescription": {
+                  "text": "Unused 'match' condition"
+                },
+                "fullDescription": {
+                  "text": "Reports the conditions in 'match' expressions that will never be matched. Similarly to PHP Engine behavior, the inspection uses strict comparison ('===') to check the types in 'match' conditions against the 'match' argument type, regardless of the 'strict_types' directive. Since no type coercion occurs, some conditions may be non-matched due to non-matching types. See Match expression (php.net) for details.",
+                  "markdown": "Reports the conditions in `match` expressions that will never be matched.\n\n\nSimilarly to PHP Engine behavior, the inspection uses strict comparison (`===`) to check the types in `match` conditions against the `match` argument type, regardless of the `strict_types` directive. Since no type coercion occurs, some conditions may be non-matched due to non-matching types.\n\n\nSee [Match expression (php.net)](https://wiki.php.net/rfc/match_expression_v2) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedMatchConditionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpComposerDuplicatedRequirementInspection",
+                "shortDescription": {
+                  "text": "Duplicate package entries in composer.json"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate package entries in the 'require' and 'require-dev' sections of composer.json.",
+                  "markdown": "Reports duplicate package entries in the `require` and `require-dev` sections of *composer.json*."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpComposerDuplicatedRequirementInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Composer",
+                      "index": 38,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpExpressionResultUnusedInspection",
+                "shortDescription": {
+                  "text": "Expression result unused"
+                },
+                "fullDescription": {
+                  "text": "Reports the expressions that are calculated, but the calculation result is not used anywhere. Such errors can be caused, for example, by misspelling the '=' operator as '=='.",
+                  "markdown": "Reports the expressions that are calculated, but the calculation result is not used anywhere.\n\nSuch errors can be caused, for example, by misspelling the `=` operator as `==`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpExpressionResultUnusedInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInternalEntityUsedInspection",
+                "shortDescription": {
+                  "text": "Usage of internal entity"
+                },
+                "fullDescription": {
+                  "text": "Reports the usages of the entities that are marked as '@internal' and are located in different source roots. The usages located in the same source root are not reported. In most cases, the reported usages should be removed or replaced with other constructs.",
+                  "markdown": "Reports the usages of the entities that are marked as `@internal` and are located in different source roots. The usages located in the same source root are not reported.\n\n\nIn most cases, the reported usages should be removed or replaced with other constructs."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpInternalEntityUsedInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPointlessBooleanExpressionInConditionInspection",
+                "shortDescription": {
+                  "text": "Pointless boolean expression inside 'if' condition"
+                },
+                "fullDescription": {
+                  "text": "Reports the boolean expressions inside 'if' conditions that contain '$expr == true' or '$expr == false'. Such expressions can be simplified to 'if($expr)' and 'if(!expr)'.",
+                  "markdown": "Reports the boolean expressions inside `if` conditions that contain `$expr == true` or `$expr == false`. Such expressions can be simplified to `if($expr)` and `if(!expr)`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPointlessBooleanExpressionInConditionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpNamedArgumentsWithChangedOrderInspection",
+                "shortDescription": {
+                  "text": "Named arguments order does not match parameters order"
+                },
+                "fullDescription": {
+                  "text": "Reports named argument with order that does not match parameter order",
+                  "markdown": "Reports named argument with order that does not match parameter order"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpNamedArgumentsWithChangedOrderInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCaseWithValueNotFoundInEnumInspection",
+                "shortDescription": {
+                  "text": "Case with specified value not found in enum"
+                },
+                "fullDescription": {
+                  "text": "Reports the arguments of enum's 'from' method calls that are not found in target enum classes. See Enumerations (php.net) for details.",
+                  "markdown": "Reports the arguments of enum's `from` method calls that are not found in target enum classes.\n\n\nSee [Enumerations (php.net)](https://wiki.php.net/rfc/enumerations) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpCaseWithValueNotFoundInEnumInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIdempotentOperationInspection",
+                "shortDescription": {
+                  "text": "Idempotent operation in binary expression"
+                },
+                "fullDescription": {
+                  "text": "Reports the binary expression operands that do not change the expression result (such as '+ 0' or '. \"\"') and are therefore redundant.",
+                  "markdown": "Reports the binary expression operands that do not change the expression result (such as `+ 0` or `. \"\"`) and are therefore redundant."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIdempotentOperationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLoopCanBeReplacedWithImplodeInspection",
+                "shortDescription": {
+                  "text": "Loop can be replaced with 'implode()'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'foreach' loops that can be safely replaced with 'implode()' calls. See implode (php.net) for details.",
+                  "markdown": "Reports the `foreach` loops that can be safely replaced with `implode()` calls.\n\n\nSee [implode (php.net)](https://www.php.net/manual/en/function.implode.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLoopCanBeReplacedWithImplodeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpConcatenationWithArithmeticInspection",
+                "shortDescription": {
+                  "text": "Concatenation with arithmetic usage"
+                },
+                "fullDescription": {
+                  "text": "Reports the string concatenation expressions that are used together with '+', '-', '<<', and '>>' operators. Starting with PHP 8, the concatenation operation has lower precedence and such expressions can thus produce unexpected results. See Concatenation precedence (php.net) for details.",
+                  "markdown": "Reports the string concatenation expressions that are used together with `+`, `-`, `<<`, and `>>` operators. Starting with PHP 8, the concatenation operation has lower precedence and such expressions can thus produce unexpected results.\n\n\nSee [Concatenation precedence (php.net)](https://wiki.php.net/rfc/concatenation_precedence) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpConcatenationWithArithmeticInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpToStringImplementationInspection",
+                "shortDescription": {
+                  "text": "Method '__toString' implementation"
+                },
+                "fullDescription": {
+                  "text": "Reports the attempts to convert the objects having no '__toString' method implementation to 'string'. Prior to PHP 7.4, this would lead to a fatal 'E_RECOVERABLE_ERROR' level error. In PHP 7.4, a fatal non-recoverable 'ERROR' is thrown. In PHP 8.0, the return value follows the standard PHP type semantics and will be coerced into a string if possible and if strict typing is disabled. If the Check __toString exists for each expression type option is enabled, the inspection will check all possible types of the expression and report if at least one of them doesn't contain the '__toString' method implementation. See __toString (php.net) for details.",
+                  "markdown": "Reports the attempts to convert the objects having no `__toString` method implementation to `string`.\n\n\nPrior to PHP 7.4, this would lead to a fatal `E_RECOVERABLE_ERROR` level error. In PHP 7.4, a fatal non-recoverable `ERROR` is thrown. In PHP 8.0, the return value follows the standard PHP type semantics and will be coerced into a string if possible and if strict typing is disabled.\n\n\nIf the **Check __toString exists for each expression type** option is enabled, the inspection will check all possible types of the expression and\nreport if at least one of them doesn't contain the `__toString` method implementation.\n\n\nSee [__toString (php.net)](https://www.php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpToStringImplementationInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayAccessCanBeReplacedWithForeachValueInspection",
+                "shortDescription": {
+                  "text": "Array access can be replaced with 'foreach' value"
+                },
+                "fullDescription": {
+                  "text": "Reports the array access expressions inside 'foreach' loops that can be replaced with a 'foreach' value.",
+                  "markdown": "Reports the array access expressions inside `foreach` loops that can be replaced with a `foreach` value."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayAccessCanBeReplacedWithForeachValueInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertCanBeReplacedWithFailInspection",
+                "shortDescription": {
+                  "text": "Assertion can be replaced with 'fail'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'assertTrue()'/'assertFalse()' calls with the 'false'/'true' arguments in PHPUnit tests. Such usages can be replaced with 'fail()' calls to indicate that a test is expected to fail.",
+                  "markdown": "Reports the `assertTrue()`/`assertFalse()` calls with the `false`/`true` arguments in PHPUnit tests. Such usages can be replaced with `fail()` calls to indicate that a test is expected to fail."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertCanBeReplacedWithFailInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLoopCanBeConvertedToArrayFilterInspection",
+                "shortDescription": {
+                  "text": "Loop can be converted to 'array_filter()' call"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'foreach' loops that can be replaced with 'array_filter()' calls.",
+                  "markdown": "Reports the `foreach` loops that can be replaced with `array_filter()` calls."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLoopCanBeConvertedToArrayFilterInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitAssertCanBeReplacedWithEmptyInspection",
+                "shortDescription": {
+                  "text": "Assertion can be replaced with 'assertEmpty/assertNotEmpty'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'assertTrue'/'assertFalse' usages that can be replaced with 'assertEmpty'/'assertNotEmpty' in PHPUnit tests. See assertEmpty (phpunit.readthedocs.io) for details.",
+                  "markdown": "Reports the `assertTrue`/`assertFalse` usages that can be replaced with `assertEmpty`/`assertNotEmpty` in PHPUnit tests.\n\n\nSee [assertEmpty (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html#assertempty) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitAssertCanBeReplacedWithEmptyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitInvalidMockingEntityInspection",
+                "shortDescription": {
+                  "text": "Invalid PHPUnit mocking target"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods and classes that are incorrectly mocked in PHPUnit tests. The following entities are reported: Enums and 'final' classes 'private', 'static', or 'final' methods Duplicate methods provided in the mocked methods lists via 'addMethods()', 'onlyMethods()', 'setMethods()', and so on.",
+                  "markdown": "Reports the methods and classes that are incorrectly mocked in PHPUnit tests.\n\n\nThe following entities are reported:\n\n* Enums and `final` classes\n* `private`, `static`, or `final` methods\n* Duplicate methods provided in the mocked methods lists via `addMethods()`, `onlyMethods()`, `setMethods()`, and so on."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitInvalidMockingEntityInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedLocalVariableInspection",
+                "shortDescription": {
+                  "text": "Unused local variable"
+                },
+                "fullDescription": {
+                  "text": "Reports the variables that are considered unused in the following cases: The value of the variable is not used anywhere or is overwritten immediately. The reference stored in the variable is not used anywhere or is overwritten immediately.",
+                  "markdown": "Reports the variables that are considered unused in the following cases:\n\n* The value of the variable is not used anywhere or is overwritten immediately.\n* The reference stored in the variable is not used anywhere or is overwritten immediately."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedLocalVariableInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpAssignmentReplaceableWithOperatorAssignmentInspection",
+                "shortDescription": {
+                  "text": "Assignment can be replaced with operator assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports the assignments that can be replaced with combined operator assignments (for example, '+=').",
+                  "markdown": "Reports the assignments that can be replaced with combined operator assignments (for example, `+=`)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpAssignmentReplaceableWithOperatorAssignmentInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Replaceable assignments",
+                      "index": 82,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpIgnoredClassAliasDeclaration",
+                "shortDescription": {
+                  "text": "Ignored class alias declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the class alias declarations that are ignored by the IDE because the actual class declaration with the same FQN exists. The inspection is intended to clarify the IDE’s behavior in the cases when both the class and the class alias declarations are present. When several declarations with the same FQN exist, the IDE usually fails to choose a single one between them. This leads to incorrect code completion, erroneous type inference, and so on. Since the class declaration prevails over the class alias declaration, the latter becomes redundant and therefore ignored by the IDE. Note that ignoring class alias declarations does not affect the behavior of the PHP interpreter.",
+                  "markdown": "Reports the class alias declarations that are ignored by the IDE because the actual class declaration with the same FQN exists.\n\n\nThe inspection is intended to clarify the IDE's behavior in the cases when both the class and the class alias declarations are present.\nWhen several declarations with the same FQN exist, the IDE usually fails to choose a single one between them.\nThis leads to incorrect code completion, erroneous type inference, and so on. Since the class declaration prevails\nover the class alias declaration, the latter becomes redundant and therefore ignored by the IDE.\n\n\nNote that ignoring class alias declarations does not affect the behavior of the PHP interpreter."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpIgnoredClassAliasDeclaration",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpStatementHasEmptyBodyInspection",
+                "shortDescription": {
+                  "text": "Statement has empty body"
+                },
+                "fullDescription": {
+                  "text": "Reports the statements that have empty bodies. While occasionally useful, such statements are often the result of typos and may cause confusion.",
+                  "markdown": "Reports the statements that have empty bodies.\n\nWhile occasionally useful, such statements are often the result of typos and may cause confusion."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpStatementHasEmptyBodyInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPureFunctionMayProduceSideEffectsInspection",
+                "shortDescription": {
+                  "text": "Pure function may produce side effects"
+                },
+                "fullDescription": {
+                  "text": "Reports the '#[Pure]' annotations used on functions that may produce side effects.",
+                  "markdown": "Reports the `#[Pure]` annotations used on functions that may produce side effects."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPureFunctionMayProduceSideEffectsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Attributes",
+                      "index": 45,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpRedeclarationStdlibFunctionInspection",
+                "shortDescription": {
+                  "text": "Redeclaration of standard library function"
+                },
+                "fullDescription": {
+                  "text": "Reports the redeclaration of standard library functions. Functions from the standard library cannot be redeclared in user code.",
+                  "markdown": "Reports the redeclaration of standard library functions. Functions from the standard library cannot be redeclared in user code."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpRedeclarationStdlibFunctionInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpForeachNestedOuterKeyValueVariablesConflictInspection",
+                "shortDescription": {
+                  "text": "Nested vs outer 'foreach' variables conflict"
+                },
+                "fullDescription": {
+                  "text": "Reports the variables that are used as a key or value both by the inner and outer 'foreach' loops. In most cases, this is an error or may result in an error in the future.",
+                  "markdown": "Reports the variables that are used as a key or value both by the inner and outer `foreach` loops. In most cases, this is an error or may result in an error in the future."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpForeachNestedOuterKeyValueVariablesConflictInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSwitchWithCommonPartsInspection",
+                "shortDescription": {
+                  "text": "'switch' with common parts"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'switch' statements with duplicated common parts.",
+                  "markdown": "Reports the 'switch' statements with duplicated common parts."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpSwitchWithCommonPartsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Control flow",
+                      "index": 12,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMethodParametersCountMismatchInspection",
+                "shortDescription": {
+                  "text": "Parameters number mismatch declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the function/method calls that take more parameters than specified in their declaration.",
+                  "markdown": "Reports the function/method calls that take more parameters than specified in their declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMethodParametersCountMismatchInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpSwitchCaseWithoutDefaultBranchInspection",
+                "shortDescription": {
+                  "text": "Switch statement without default branch"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'switch' statements without a default branch.",
+                  "markdown": "Reports the `switch` statements without a default branch."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpSwitchCaseWithoutDefaultBranchInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpParameterByRefIsNotUsedAsReferenceInspection",
+                "shortDescription": {
+                  "text": "Unnecessary pass-by-ref"
+                },
+                "fullDescription": {
+                  "text": "Reports the variables that are passed by reference to a function/method but are not modified in the function/method body. In such cases, the '&' in parameter's declaration can be safely removed. See Passing by Reference (php.net) for details.",
+                  "markdown": "Reports the variables that are passed by reference to a function/method but are not modified in the function/method body. In such cases, the `&` in parameter's declaration can be safely removed.\n\n\nSee [Passing by Reference (php.net)](https://www.php.net/manual/en/language.references.pass.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpParameterByRefIsNotUsedAsReferenceInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpExceptionImmediatelyRethrownInspection",
+                "shortDescription": {
+                  "text": "Exception is immediately rethrown"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'catch' statements that only rethrow a caught exception, which is located in a class hierarchy different from the subsequent exception types.",
+                  "markdown": "Reports the `catch` statements that only rethrow a caught exception, which is located in a class hierarchy different from the subsequent exception types."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpExceptionImmediatelyRethrownInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpHierarchyChecksInspection",
+                "shortDescription": {
+                  "text": "Class hierarchy checks"
+                },
+                "fullDescription": {
+                  "text": "Checks the classes' hierarchy: abstract methods implementation, the compatibility of implementing/overriding methods with their declarations in parent classes, and properties' types redeclarations. All reported violations result in PHP fatal errors. It is not recommended disabling or suppressing this inspection.",
+                  "markdown": "Checks the classes' hierarchy: abstract methods implementation, the compatibility of implementing/overriding methods with their declarations in parent classes, and properties' types redeclarations.\n\nAll reported violations result in PHP fatal errors. It is not recommended disabling or suppressing this inspection."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpHierarchyChecksInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LaravelPintValidationInspection",
+                "shortDescription": {
+                  "text": "Laravel Pint validation"
+                },
+                "fullDescription": {
+                  "text": "Reports coding style problems detected by Laravel Pint. The inspection requires Laravel Pint to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | Laravel Pint. To learn more about Laravel Pint installation, see Laravel Pint.",
+                  "markdown": "Reports coding style problems detected by Laravel Pint.\n\n\nThe inspection requires Laravel Pint to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| Laravel Pint](settings://settings.php.quality.tools?Laravel%20Pint).\n\n\nTo learn more about Laravel Pint installation, see [Laravel Pint](https://laravel.com/docs/10.x/pint#installation)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "LaravelPintValidationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Quality tools",
+                      "index": 70,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPropertyOnlyWrittenInspection",
+                "shortDescription": {
+                  "text": "Property usages have same access"
+                },
+                "fullDescription": {
+                  "text": "Reports the private properties that are: written but never read read but never written",
+                  "markdown": "Reports the private properties that are:\n\n* written but never read\n* read but never written"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpPropertyOnlyWrittenInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMultipleClassDeclarationsInspection",
+                "shortDescription": {
+                  "text": "Multiple class declarations"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to classes that have multiple declarations in project files. Use the options below to customize the inspection: Ignore PHPDoc: if selected, the inspection will not report multiple declarations of classes referenced in PHPDoc blocks.",
+                  "markdown": "Reports the references to classes that have multiple declarations in project files.\n\nUse the options below to customize the inspection:\n\n* **Ignore PHPDoc**: if selected, the inspection will not report multiple declarations of classes referenced in PHPDoc blocks."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMultipleClassDeclarationsInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Undefined symbols",
+                      "index": 26,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMissingFieldTypeInspection",
+                "shortDescription": {
+                  "text": "Missing property's type declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the properties that have no type declaration.",
+                  "markdown": "Reports the properties that have no type declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMissingFieldTypeInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpInvalidStringOffsetUsageInspection",
+                "shortDescription": {
+                  "text": "Invalid string offset usage"
+                },
+                "fullDescription": {
+                  "text": "Reports invalid string offset usages that will result in a runtime error. The following usages are reported: Using string offsets as objects or arrays Unsetting string offsets via 'unset' Passing string offsets by reference Creating references to or from string offsets Incrementing or decrementing string offsets Using combined operator assignments such as '+=' or '.=' on string offsets Assigning string offsets with empty strings or strings with length >1",
+                  "markdown": "Reports invalid string offset usages that will result in a runtime error.\n\n\nThe following usages are reported:\n\n* Using string offsets as objects or arrays\n* Unsetting string offsets via `unset`\n* Passing string offsets by reference\n* Creating references to or from string offsets\n* Incrementing or decrementing string offsets\n* Using combined operator assignments such as `+=` or `.=` on string offsets\n* Assigning string offsets with empty strings or strings with length \\>1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpInvalidStringOffsetUsageInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpWrongForeachArgumentTypeInspection",
+                "shortDescription": {
+                  "text": "Invalid argument supplied for 'foreach()'"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'foreach' constructs used on variables of the 'string', 'float', 'int', or 'boolean' type. See foreach (php.net) for details.",
+                  "markdown": "Reports the `foreach` constructs used on variables of the `string`, `float`, `int`, or `boolean` type.\n\n\nSee [foreach (php.net)](http://www.php.net/manual/en/control-structures.foreach.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpWrongForeachArgumentTypeInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpTooManyParametersInspection",
+                "shortDescription": {
+                  "text": "Too many parameters in function declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the function/method declarations with the number of parameters exceeding the specified limit.",
+                  "markdown": "Reports the function/method declarations with the number of parameters exceeding the specified limit."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpTooManyParametersInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpArrayFilterCanBeConvertedToLoopInspection",
+                "shortDescription": {
+                  "text": "'array_filter()' call can be converted to loop"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'array_filter()' calls that can be replaced with 'foreach' loops.",
+                  "markdown": "Reports the `array_filter()` calls that can be replaced with `foreach` loops."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayFilterCanBeConvertedToLoopInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClassImplementsSolelyTraversableInspection",
+                "shortDescription": {
+                  "text": "Class can't implement Traversable directly"
+                },
+                "fullDescription": {
+                  "text": "Reports the classes that are implementing the 'Traversable' interface alone, not as part of 'Iterator' or 'IteratorAggregate' interfaces. The 'Traversable' interface is an internal engine interface; it cannot be implemented in PHP scripts. See The Traversable interface (php.net) for details.",
+                  "markdown": "Reports the classes that are implementing the `Traversable` interface alone, not as part of `Iterator` or `IteratorAggregate` interfaces.\n\n\nThe `Traversable` interface is an internal engine interface; it cannot be implemented in PHP scripts. See [The Traversable interface (php.net)](https://www.php.net/manual/en/class.traversable.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PhpClassImplementsSolelyTraversableInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnusedSwitchBranchInspection",
+                "shortDescription": {
+                  "text": "Unused 'switch' branch"
+                },
+                "fullDescription": {
+                  "text": "Reports the branches in 'switch' statements that do not belong to the set of enum cases and as a result are never executed. See Enumerations (php.net) for details.",
+                  "markdown": "Reports the branches in `switch` statements that do not belong to the set of enum cases and as a result are never executed.\n\n\nSee [Enumerations (php.net)](https://wiki.php.net/rfc/enumerations) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnusedSwitchBranchInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpPromotedFieldUsageInspection",
+                "shortDescription": {
+                  "text": "Promoted property usage"
+                },
+                "fullDescription": {
+                  "text": "Reports properties declared through promoted constructor parameters. Using promoted properties is only possible since PHP 8.0. In earlier PHP versions, it leads to a parse error. See Constructor Property Promotion (php.net) for details.",
+                  "markdown": "Reports properties declared through promoted constructor parameters.\n\n\nUsing promoted properties is only possible since PHP 8.0. In earlier PHP versions, it leads to a parse error.\n\n\nSee [Constructor Property Promotion (php.net)](https://wiki.php.net/rfc/constructor_promotion) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpPromotedFieldUsageInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/General",
+                      "index": 6,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpDocFieldTypeMismatchInspection",
+                "shortDescription": {
+                  "text": "Type doesn't match property's declared type"
+                },
+                "fullDescription": {
+                  "text": "Reports the properties' types in PHPDoc '@var' tags that do not match the declared type of a property.",
+                  "markdown": "Reports the properties' types in PHPDoc `@var` tags that do not match the declared type of a property."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpDocFieldTypeMismatchInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpUnitDeprecatedDataProviderSignatureInspection",
+                "shortDescription": {
+                  "text": "Deprecated usage of data provider since PHPUnit 10"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to functions/methods in the '@dataProvider' PHPDoc tag that are resolved to non-static or non-public methods. Usage of these methods as PHPUnit data providers is deprecated starting from PHPUnit 10.",
+                  "markdown": "Reports the references to functions/methods in the `@dataProvider` PHPDoc tag that are resolved to non-static or non-public methods. Usage of these methods as PHPUnit data providers is deprecated starting from PHPUnit 10."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitDeprecatedDataProviderSignatureInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.jetbrains.sh",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "ShellCheck",
+                "shortDescription": {
+                  "text": "ShellCheck"
+                },
+                "fullDescription": {
+                  "text": "Reports shell script bugs detected by the integrated ShellCheck static analysis tool.",
+                  "markdown": "Reports shell script bugs detected by the integrated [ShellCheck](https://github.com/koalaman/shellcheck) static analysis tool."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "ShellCheck",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Shell script",
+                      "index": 5,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "Karma",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "KarmaConfigFile",
+                "shortDescription": {
+                  "text": "Invalid Karma configuration file"
+                },
+                "fullDescription": {
+                  "text": "Reports a potential error in a file path ('basePath', 'files') for a Karma configuration file, for example, 'karma.conf.js'.",
+                  "markdown": "Reports a potential error in a file path ('basePath', 'files') for a Karma configuration file, for example, `karma.conf.js`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "KarmaConfigFile",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Unit testing",
+                      "index": 8,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.intellij.database",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "MysqlLoadDataPathInspection",
+                "shortDescription": {
+                  "text": "LOAD statement path"
+                },
+                "fullDescription": {
+                  "text": "Reports paths that start with the tilde character in LOAD statements. Example (MySQL): 'CREATE TABLE table_name (id int);\nLOAD DATA LOCAL INFILE '~/Documents/some_file.txt'\nINTO TABLE table_name FIELDS TERMINATED BY ',' LINES TERMINATED BY '\\n'\nIGNORE 1 LINES;' Instead of the tilde character, use a full path to the file.",
+                  "markdown": "Reports paths that start with the tilde character in LOAD statements.\n\nExample (MySQL):\n\n    CREATE TABLE table_name (id int);\n    LOAD DATA LOCAL INFILE '~/Documents/some_file.txt'\n    INTO TABLE table_name FIELDS TERMINATED BY ',' LINES TERMINATED BY '\\n'\n    IGNORE 1 LINES;\n\nInstead of the tilde character, use a full path to the file."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MysqlLoadDataPath",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MySQL",
+                      "index": 10,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MysqlSpaceAfterFunctionNameInspection",
+                "shortDescription": {
+                  "text": "Whitespace between the function name and the open parenthesis"
+                },
+                "fullDescription": {
+                  "text": "Reports any whitespace in a function call between the function name and the open parenthesis, which is not supported by default. Example (MySQL): 'SELECT MAX (qty) FROM orders;'",
+                  "markdown": "Reports any whitespace in a function call between the function name and the open parenthesis, which is not supported by default.\n\nExample (MySQL):\n\n    SELECT MAX (qty) FROM orders;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "MysqlSpaceAfterFunctionName",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MySQL",
+                      "index": 10,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlMissingReturnInspection",
+                "shortDescription": {
+                  "text": "Missing return statement"
+                },
+                "fullDescription": {
+                  "text": "Reports functions that have no RETURN statements. Example (Oracle): 'CREATE FUNCTION foo RETURN int AS\nBEGIN\nEND;' The 'foo' function must return the integer value but the function body returns nothing. To fix the error, add a RETURN statement (for example, 'return 1;'). 'CREATE FUNCTION foo RETURN int AS\nBEGIN\n RETURN 1;\nEND;'",
+                  "markdown": "Reports functions that have no RETURN statements.\n\nExample (Oracle):\n\n    CREATE FUNCTION foo RETURN int AS\n    BEGIN\n    END;\n\nThe `foo` function must return the integer value but the function body returns nothing. To fix the error,\nadd a RETURN statement (for example, `return 1;`).\n\n    CREATE FUNCTION foo RETURN int AS\n    BEGIN\n     RETURN 1;\n    END;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "SqlMissingReturn",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlCaseVsIfInspection",
+                "shortDescription": {
+                  "text": "Using CASE instead of conditional function and vice versa"
+                },
+                "fullDescription": {
+                  "text": "Reports situations when CASE and IF are interchangeable. Example (MySQL): 'SELECT CASE\nWHEN C1 IS NULL THEN 1\nELSE 0\nEND\nFROM dual;' To keep your code short, you can replace the CASE structure with IF. You can do that by applying the Replace with 'IF' call intention action. The example code will look as follows: 'SELECT IF(C1 IS NULL, 1, 0)\nFROM dual;' To revert IF to CASE, click IF and apply the Replace with CASE expression intention action.",
+                  "markdown": "Reports situations when CASE and IF are interchangeable.\n\nExample (MySQL):\n\n    SELECT CASE\n    WHEN C1 IS NULL THEN 1\n    ELSE 0\n    END\n    FROM dual;\n\nTo keep your code short, you can replace the CASE structure with IF. You can do that by applying the **Replace with 'IF' call**\nintention action. The example code will look as follows:\n\n    SELECT IF(C1 IS NULL, 1, 0)\n    FROM dual;\n\nTo revert IF to CASE, click IF and apply the **Replace with CASE expression** intention action."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlCaseVsIf",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlShouldBeInGroupByInspection",
+                "shortDescription": {
+                  "text": "Column should be in group by clause"
+                },
+                "fullDescription": {
+                  "text": "Reports columns that are not in the GROUP BY clause or inside an aggregate function call. Example (Microsoft SQL Server): 'CREATE TABLE t1 (a INT, b INT);\nSELECT a, b FROM t1 GROUP BY a;' If you run the SELECT query, you will receive an error because Microsoft SQL Server expects the 'b' column in GROUP BY or used inside an aggregate function. The following two examples will fix the error. 'SELECT a, b FROM t1 GROUP BY a, b;\nSELECT a, max(b) max_b FROM t1 GROUP BY a;'",
+                  "markdown": "Reports columns that are not in the GROUP BY clause or inside an aggregate function call.\n\nExample (Microsoft SQL Server):\n\n    CREATE TABLE t1 (a INT, b INT);\n    SELECT a, b FROM t1 GROUP BY a;\n\nIf you run the SELECT query, you will receive an error because Microsoft SQL Server expects the `b` column in GROUP BY or used\ninside an aggregate function. The following two examples will fix the error.\n\n    SELECT a, b FROM t1 GROUP BY a, b;\n    SELECT a, max(b) max_b FROM t1 GROUP BY a;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlShouldBeInGroupBy",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlAutoIncrementDuplicateInspection",
+                "shortDescription": {
+                  "text": "Auto-increment duplicate"
+                },
+                "fullDescription": {
+                  "text": "Reports tables that contain two columns with an automatic increment. In MySQL, Microsoft SQL Server, and Db2 dialects, a table can have only one field with a auto-increment option, and this field must be a key. Example (MySQL): 'CREATE TABLE my_table\n(\n    id INT AUTO_INCREMENT,\n    c2 INT AUTO_INCREMENT,\n);' The AUTO_INCREMENT constraint for 'c2' will be highlighted as 'c1' already has this constraint. To fix the warning, you can make 'id' a primary key and delete AUTO_INCREMENT for 'c2'. 'CREATE TABLE my_table\n(\n    id INT AUTO_INCREMENT PRIMARY KEY,\n    c2 INT,\n);'",
+                  "markdown": "Reports tables that contain two columns with an automatic increment. In MySQL, Microsoft SQL Server, and Db2 dialects, a table can have only one field with a auto-increment option, and this field must be a key.\n\nExample (MySQL):\n\n    CREATE TABLE my_table\n    (\n        id INT AUTO_INCREMENT,\n        c2 INT AUTO_INCREMENT,\n    );\n\nThe AUTO_INCREMENT constraint for `c2` will be highlighted as `c1` already has this constraint. To fix the warning,\nyou can make `id` a primary key and delete AUTO_INCREMENT for `c2`.\n\n    CREATE TABLE my_table\n    (\n        id INT AUTO_INCREMENT PRIMARY KEY,\n        c2 INT,\n    );\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlAutoIncrementDuplicate",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlStringLengthExceededInspection",
+                "shortDescription": {
+                  "text": "Implicit string truncation"
+                },
+                "fullDescription": {
+                  "text": "Reports variables that exceed the defined length in characters. Example (Microsoft SQL Server): 'CREATE PROCEDURE test() AS\nBEGIN\nDECLARE myVarOk VARCHAR(5) = 'abcde';\nDECLARE myVarExceeded VARCHAR(5) = 'abcde12345';\n\nSET myVarOk = 'xyz';\nSET myVarExceeded = '123456789';\nEND;' The 'myVarExceeded' variable is defined as 'VARCHAR(5)' but both assigned values (''abcde12345'' and ''123456789'') exceed this limitation. You can truncate assigned values or increase the defined length. To increase the length, use the Increase type length quick-fix. After the quick-fix is applied: 'CREATE PROCEDURE test() AS\nBEGIN\nDECLARE myVarOk VARCHAR(5) = 'abcde';\nDECLARE myVarExceeded VARCHAR(10) = 'abcde12345';\n\nSET myVarOk = 'xyz';\nSET myVarExceeded = '123456789';\nEND;'",
+                  "markdown": "Reports variables that exceed the defined length in characters.\n\nExample (Microsoft SQL Server):\n\n    CREATE PROCEDURE test() AS\n    BEGIN\n    DECLARE myVarOk VARCHAR(5) = 'abcde';\n    DECLARE myVarExceeded VARCHAR(5) = 'abcde12345';\n\n    SET myVarOk = 'xyz';\n    SET myVarExceeded = '123456789';\n    END;\n\nThe `myVarExceeded` variable is defined as `VARCHAR(5)` but both assigned values (`'abcde12345'` and\n`'123456789'`) exceed this limitation. You can truncate assigned values or increase the defined length.\nTo increase the length, use the **Increase type length** quick-fix.\n\nAfter the quick-fix is applied:\n\n    CREATE PROCEDURE test() AS\n    BEGIN\n    DECLARE myVarOk VARCHAR(5) = 'abcde';\n    DECLARE myVarExceeded VARCHAR(10) = 'abcde12345';\n\n    SET myVarOk = 'xyz';\n    SET myVarExceeded = '123456789';\n    END;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlStringLengthExceeded",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlDtInspection",
+                "shortDescription": {
+                  "text": "Ill-formed date/time literals"
+                },
+                "fullDescription": {
+                  "text": "Reports errors in date and time literals. This inspection is available in MySQL, Oracle, Db2, and H2. Example (MySQL): 'SELECT TIME '10 -12:13:14' FROM dual;\nSELECT TIME ' 12 : 13 : 14 ' FROM dual;\nSELECT TIME '12 13 14' FROM dual;\nSELECT TIME '12-13-14' FROM dual;\nSELECT TIME '12.13.14' FROM dual;\nSELECT TIME '12:13:' FROM dual;\nSELECT TIME '12:13' FROM dual;\nSELECT TIME '12:' FROM dual;' In this example, dates ignore the MySQL standard for date and time literals. Therefore, they will be highlighted. For more information about date and time literals in MySQL, see Date and Time Literals at dev.mysql.com. The following date and type literals are valid for MySQL. 'SELECT TIME '12:13:14' FROM dual;\nSELECT TIME '12:13:14.555' FROM dual;\nSELECT TIME '12:13:14.' FROM dual;\nSELECT TIME '-12:13:14' FROM dual;\nSELECT TIME '10 12:13:14' FROM dual;\nSELECT TIME '-10 12:13:14' FROM dual;'",
+                  "markdown": "Reports errors in date and time literals. This inspection is available in MySQL, Oracle, Db2, and H2.\n\nExample (MySQL):\n\n    SELECT TIME '10 -12:13:14' FROM dual;\n    SELECT TIME ' 12 : 13 : 14 ' FROM dual;\n    SELECT TIME '12 13 14' FROM dual;\n    SELECT TIME '12-13-14' FROM dual;\n    SELECT TIME '12.13.14' FROM dual;\n    SELECT TIME '12:13:' FROM dual;\n    SELECT TIME '12:13' FROM dual;\n    SELECT TIME '12:' FROM dual;\n\nIn this example, dates ignore the MySQL standard for date and time literals. Therefore, they will be highlighted.\nFor more information about date and time literals in MySQL, see [Date and Time Literals at dev.mysql.com](https://dev.mysql.com/doc/refman/8.0/en/date-and-time-literals.html).\n\nThe following date and type literals are valid for MySQL.\n\n    SELECT TIME '12:13:14' FROM dual;\n    SELECT TIME '12:13:14.555' FROM dual;\n    SELECT TIME '12:13:14.' FROM dual;\n    SELECT TIME '-12:13:14' FROM dual;\n    SELECT TIME '10 12:13:14' FROM dual;\n    SELECT TIME '-10 12:13:14' FROM dual;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlDateTime",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlInsertValuesInspection",
+                "shortDescription": {
+                  "text": "VALUES clause cardinality"
+                },
+                "fullDescription": {
+                  "text": "Reports situations when a number of parameters in VALUES does not match a number of columns in a target table. Example (MySQL): 'CREATE TABLE foo(a INT, b INT, c INT);\n\nINSERT INTO foo VALUES (1,2,3,4)' The 'foo' table has three columns but in the INSERT INTO statement we pass four.",
+                  "markdown": "Reports situations when a number of parameters in VALUES does not match a number of columns in a target table.\n\nExample (MySQL):\n\n    CREATE TABLE foo(a INT, b INT, c INT);\n\n    INSERT INTO foo VALUES (1,2,3,4)\n\nThe `foo` table has three columns but in the INSERT INTO statement we pass four."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlInsertValues",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlRedundantElseNullInspection",
+                "shortDescription": {
+                  "text": "Redundant ELSE NULL clause"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant ELSE NULL clauses. Example (MySQL): 'SELECT CASE WHEN 2 > 1 THEN 'OK' ELSE NULL END AS alias FROM foo;' The 'ELSE NULL' part will never be executed and may be omitted.",
+                  "markdown": "Reports redundant ELSE NULL clauses.\n\nExample (MySQL):\n\n    SELECT CASE WHEN 2 > 1 THEN 'OK' ELSE NULL END AS alias FROM foo;\n\nThe `ELSE NULL` part will never be executed and may be omitted."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlRedundantElseNull",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlCallNotationInspection",
+                "shortDescription": {
+                  "text": "Using of named and positional arguments"
+                },
+                "fullDescription": {
+                  "text": "Reports calls in which positional arguments go after the named ones. Works in PostgreSQL, Oracle, and Db2. Example (In PostgreSQL): 'CREATE FUNCTION foo(a int, b int, c int) RETURNS int\n    LANGUAGE plpgsql AS\n$$\nBEGIN\n    RETURN a + b + c;\nEND\n$$;\nSELECT foo(a => 1, b => 2, c => 3);\n  -- `3` goes after the named argument\nSELECT foo(1, b => 2, 3);\n  -- `1` and `3` go after the named argument\nSELECT foo(b => 2, 1, 3);'",
+                  "markdown": "Reports calls in which positional arguments go after the named ones. Works in PostgreSQL, Oracle, and Db2.\n\nExample (In PostgreSQL):\n\n    CREATE FUNCTION foo(a int, b int, c int) RETURNS int\n        LANGUAGE plpgsql AS\n    $$\n    BEGIN\n        RETURN a + b + c;\n    END\n    $$;\n    SELECT foo(a => 1, b => 2, c => 3);\n      -- `3` goes after the named argument\n    SELECT foo(1, b => 2, 3);\n      -- `1` and `3` go after the named argument\n    SELECT foo(b => 2, 1, 3);\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "SqlCallNotation",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MysqlParsingInspection",
+                "shortDescription": {
+                  "text": "Unsupported syntax in pre-8.0 versions"
+                },
+                "fullDescription": {
+                  "text": "Reports invalid usages of UNION in queries. The inspection works in MySQL versions that are earlier than 8.0. Example (MySQL): 'SELECT * FROM (SELECT 1 UNION (SELECT 1 UNION SELECT 2)) a;'",
+                  "markdown": "Reports invalid usages of UNION in queries.\n\nThe inspection works in MySQL versions that are earlier than 8.0.\n\nExample (MySQL):\n\n\n    SELECT * FROM (SELECT 1 UNION (SELECT 1 UNION SELECT 2)) a;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MysqlParsing",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MySQL",
+                      "index": 10,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlShadowingAliasInspection",
+                "shortDescription": {
+                  "text": "Column is shadowed by alias"
+                },
+                "fullDescription": {
+                  "text": "Reports SELECT aliases with names that match column names in the FROM clause. Example (MySQL): 'CREATE TABLE foo (a INT, b INT, c INT);\nSELECT a b, c FROM foo;' The 'a' column uses the 'b' alias but the 'b' name is also used by the column from the 'foo' table.",
+                  "markdown": "Reports SELECT aliases with names that match column names in the FROM clause.\n\nExample (MySQL):\n\n    CREATE TABLE foo (a INT, b INT, c INT);\n    SELECT a b, c FROM foo;\n\nThe `a` column uses the `b` alias but the `b` name is also used by the column from the `foo`\ntable."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlShadowingAlias",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlUnreachableCodeInspection",
+                "shortDescription": {
+                  "text": "Unreachable code"
+                },
+                "fullDescription": {
+                  "text": "Reports unreachable statements inside SQL routines. Example (Microsoft SQL Server): 'CREATE FUNCTION foo() RETURNS INT AS\nBEGIN\n    THROW;\n    RETURN 1;\nEND;' In Microsoft SQL Server, the 'THROW' statement raises an exception and transfers execution to the CATCH block of the TRY...CATCH construct. Therefore, the 'RETURN 1;' part will never be executed.",
+                  "markdown": "Reports unreachable statements inside SQL routines.\n\nExample (Microsoft SQL Server):\n\n    CREATE FUNCTION foo() RETURNS INT AS\n    BEGIN\n        THROW;\n        RETURN 1;\n    END;\n\nIn Microsoft SQL Server, the `THROW` statement raises an exception and transfers execution to the CATCH block of the TRY...CATCH\nconstruct. Therefore, the `RETURN 1;` part will never be executed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlUnreachable",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlNoDataSourceInspection",
+                "shortDescription": {
+                  "text": "No data sources configured"
+                },
+                "fullDescription": {
+                  "text": "Reports the absence of data sources in the Database tool window (View | Tool Windows | Database).",
+                  "markdown": "Reports the absence of data sources in the **Database** tool window (**View \\| Tool Windows \\| Database**)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlNoDataSourceInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlResolveInspection",
+                "shortDescription": {
+                  "text": "Unresolved reference"
+                },
+                "fullDescription": {
+                  "text": "Reports unresolved SQL references. Example (MySQL): 'CREATE TABLE users(id INT, name VARCHAR(40));\nCREATE TABLE admins(id INT, col1 INT);\n\nSELECT users.id, admins.id FROM admins WHERE admins.id > 1;' The 'users.id' column is unresolved because the 'users' table is missing in the FROM clause.",
+                  "markdown": "Reports unresolved SQL references.\n\nExample (MySQL):\n\n    CREATE TABLE users(id INT, name VARCHAR(40));\n    CREATE TABLE admins(id INT, col1 INT);\n\n    SELECT users.id, admins.id FROM admins WHERE admins.id > 1;\n\nThe `users.id` column is unresolved because the `users` table is missing in the FROM clause."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "SqlResolve",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlCurrentSchemaInspection",
+                "shortDescription": {
+                  "text": "Current console schema introspected"
+                },
+                "fullDescription": {
+                  "text": "Reports schemas and databases in the current session that are not introspected. For example, this warning might occur when you try to create a table in the schema that is not introspected. Introspection is a method of inspecting a data source. When you perform introspection, structural information in the data source is inspected to detect tables, columns, functions, and other elements with their attributes.",
+                  "markdown": "Reports schemas and databases in the current session that are not introspected.\n\nFor example, this warning might occur when you try to create a table in the schema that is not introspected.\n\nIntrospection is a method of inspecting a data source. When you perform introspection, structural information in the data source is\ninspected to detect tables, columns, functions, and other elements with their attributes."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlCurrentSchemaInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlMisleadingReferenceInspection",
+                "shortDescription": {
+                  "text": "Misleading references"
+                },
+                "fullDescription": {
+                  "text": "Reports ambiguous references in SQL code. For example, when a name refer to both a table column and a routine parameter. The execution of such code might lead to errors or unexpected results due to counter-intuitive resolution logic. Usually, names with a more local scope have higher priority. Example (PostgreSQL): 'CREATE TABLE foo\n(\n    id   INT,\n    name VARCHAR(5)\n);\nCREATE FUNCTION func(name VARCHAR(5)) RETURNS INT AS\n$$\nDECLARE\n    b INT;\nBEGIN\n      -- `name` is ambiguous as it is used as a column name and a parameter\n    SELECT COUNT(*) INTO b FROM foo t WHERE t.name = name;\n    RETURN b;\nEND;\n$$ LANGUAGE plpgsql;' In PostgreSQL, you can use the '#variable_conflict' directives to explicitly specify a correct reference. For example, use '#variable_conflict use_column' to refer to a column name, or '#variable_conflict use_variable' to refer to a parameter. 'CREATE TABLE foo\n(\n    id   INT,\n    name VARCHAR(5)\n);\nCREATE FUNCTION func(name VARCHAR(5)) RETURNS INT AS\n$$\n    #variable_conflict use_column\nDECLARE\n    b INT;\nBEGIN\n    SELECT COUNT(*) INTO b FROM foo t WHERE t.name = name;\n    RETURN b;\nEND;\n$$ LANGUAGE plpgsql;'",
+                  "markdown": "Reports ambiguous references in SQL code.\n\nFor example, when a name refer to both a table column and a routine parameter. The execution of such code might lead to errors or unexpected\nresults due to counter-intuitive resolution logic. Usually, names with a more local scope have higher priority.\n\nExample (PostgreSQL):\n\n    CREATE TABLE foo\n    (\n        id   INT,\n        name VARCHAR(5)\n    );\n    CREATE FUNCTION func(name VARCHAR(5)) RETURNS INT AS\n    $$\n    DECLARE\n        b INT;\n    BEGIN\n          -- `name` is ambiguous as it is used as a column name and a parameter\n        SELECT COUNT(*) INTO b FROM foo t WHERE t.name = name;\n        RETURN b;\n    END;\n    $$ LANGUAGE plpgsql;\n\nIn PostgreSQL, you can use the `#variable_conflict` directives to explicitly specify a correct reference. For example,\nuse `#variable_conflict use_column` to refer to a column name, or `#variable_conflict use_variable` to refer to a\nparameter.\n\n    CREATE TABLE foo\n    (\n        id   INT,\n        name VARCHAR(5)\n    );\n    CREATE FUNCTION func(name VARCHAR(5)) RETURNS INT AS\n    $$\n        #variable_conflict use_column\n    DECLARE\n        b INT;\n    BEGIN\n        SELECT COUNT(*) INTO b FROM foo t WHERE t.name = name;\n        RETURN b;\n    END;\n    $$ LANGUAGE plpgsql;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlMisleadingReference",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlRedundantLimitInspection",
+                "shortDescription": {
+                  "text": "Redundant row limiting in queries"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant row limiting clauses like FETCH and LIMIT in queries. Example (PostgreSQL): 'CREATE TABLE foo(a INT);\n\nSELECT * FROM foo WHERE EXISTS(SELECT * FROM foo LIMIT 2);\nSELECT * FROM foo WHERE EXISTS(SELECT * FROM foo FETCH FIRST 2 ROWS ONLY);' To fix the warning, you can add OFFSET to limiting clauses. If OFFSET is missing, then LIMIT is redundant because the usage of LIMIT does not influence the operation result of EXISTS. In case with OFFSET, we skip first 'N' rows and this will influence the output. 'SELECT * FROM foo WHERE EXISTS(SELECT * FROM foo OFFSET 1 ROW LIMIT 2);\nSELECT * FROM foo WHERE EXISTS(SELECT * FROM foo OFFSET 1 ROW FETCH FIRST 2 ROWS ONLY);'",
+                  "markdown": "Reports redundant row limiting clauses like FETCH and LIMIT in queries.\n\nExample (PostgreSQL):\n\n    CREATE TABLE foo(a INT);\n\n    SELECT * FROM foo WHERE EXISTS(SELECT * FROM foo LIMIT 2);\n    SELECT * FROM foo WHERE EXISTS(SELECT * FROM foo FETCH FIRST 2 ROWS ONLY);\n\nTo fix the warning, you can add OFFSET to limiting clauses. If OFFSET is missing, then LIMIT is redundant because\nthe usage of LIMIT does not influence the operation result of EXISTS. In case with OFFSET, we skip first `N` rows and this will\ninfluence the output.\n\n    SELECT * FROM foo WHERE EXISTS(SELECT * FROM foo OFFSET 1 ROW LIMIT 2);\n    SELECT * FROM foo WHERE EXISTS(SELECT * FROM foo OFFSET 1 ROW FETCH FIRST 2 ROWS ONLY);\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlRedundantLimit",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlInsertNullIntoNotNullInspection",
+                "shortDescription": {
+                  "text": "Insert NULL into NOT NULL column"
+                },
+                "fullDescription": {
+                  "text": "Reports cases when you insert NULL values into columns that accept only NOT NULL values. Example (Microsoft SQL Server): 'CREATE TABLE br2 (\nid INT NOT NULL,\ncol1 NVARCHAR (20) NOT NULL,\ncol2 NVARCHAR (20) NOT NULL,\n);\n--\nINSERT INTO br2 (id, col1, col2)\nVALUES (1, NULL, NULL);' You cannot insert NULL values in 'col1' and 'col2' because they are defined as NOT NULL. If you run the script as is, you will receive an error. To fix this code, replace NULL in the VALUES part with some values (for example, '42' and ''bird''). INSERT INTO br2 (id, col1, col2)\nVALUES (1, 42, 'bird');",
+                  "markdown": "Reports cases when you insert NULL values into columns that accept only NOT NULL values.\n\nExample (Microsoft SQL Server):\n\n    CREATE TABLE br2 (\n    id INT NOT NULL,\n    col1 NVARCHAR (20) NOT NULL,\n    col2 NVARCHAR (20) NOT NULL,\n    );\n    --\n    INSERT INTO br2 (id, col1, col2)\n    VALUES (1, NULL, NULL);\n\nYou cannot insert NULL values in `col1` and `col2` because they are defined as NOT NULL. If you run the script as\nis,\nyou will receive an error. To fix this code, replace NULL in the VALUES part with some values (for example, `42` and\n`'bird'`).\n\n```\nINSERT INTO br2 (id, col1, col2)\nVALUES (1, 42, 'bird');\n```"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlInsertNullIntoNotNull",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlDerivedTableAliasInspection",
+                "shortDescription": {
+                  "text": "Each derived table should have alias"
+                },
+                "fullDescription": {
+                  "text": "Reports derived tables without aliases. Example (MySQL): 'CREATE TABLE table1 (id INT, name VARCHAR(20), cats FLOAT);\nCREATE TABLE table2 (id INT, age INTEGER);\n\nSELECT id AS ID, name, cats, age\nFROM (SELECT table1.id, name, cats, age\nFROM table1\nJOIN table2 ON table1.id = table2.id);' According to Derived Tables at dev.mysql.com, an alias is mandatory. You can add the alias by using the Introduce alias quick-fix. After the quick-fix is applied: 'SELECT id AS ID, name, cats, age\nFROM (SELECT table1.id, name, cats, age\nFROM table1\nJOIN table2 ON table1.id = table2.id);'",
+                  "markdown": "Reports derived tables without aliases.\n\nExample (MySQL):\n\n    CREATE TABLE table1 (id INT, name VARCHAR(20), cats FLOAT);\n    CREATE TABLE table2 (id INT, age INTEGER);\n\n    SELECT id AS ID, name, cats, age\n    FROM (SELECT table1.id, name, cats, age\n    FROM table1\n    JOIN table2 ON table1.id = table2.id);\n\nAccording to [Derived Tables at dev.mysql.com](https://dev.mysql.com/doc/refman/8.0/en/derived-tables.html), an alias is\nmandatory. You can add the alias by using the **Introduce alias** quick-fix.\n\nAfter the quick-fix is applied:\n\n    SELECT id AS ID, name, cats, age\n    FROM (SELECT table1.id, name, cats, age\n    FROM table1\n    JOIN table2 ON table1.id = table2.id);\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlDerivedTableAlias",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlTriggerTransitionInspection",
+                "shortDescription": {
+                  "text": "Suspicious code in triggers"
+                },
+                "fullDescription": {
+                  "text": "Reports incorrect usages of transition table variables in triggers. Example (HSQLDB): 'CREATE TABLE foo(a INT);\n\nCREATE TRIGGER trg\n AFTER DELETE ON foo\nBEGIN\n   SELECT * FROM NEW;\nEND;\n\nCREATE TRIGGER trig AFTER INSERT ON foo\n   REFERENCING OLD ROW AS newrow\n   FOR EACH ROW WHEN (a > 1)\n   INSERT INTO foo VALUES (1)' In HSQLDB, DELETE triggers may be used only with the OLD state while INSERT triggers may have only the NEW state. So, in the previous example, NEW in 'SELECT * FROM NEW;' will be highlighted as well as OLD in 'REFERENCING OLD ROW AS newrow'.",
+                  "markdown": "Reports incorrect usages of transition table variables in triggers.\n\nExample (HSQLDB):\n\n    CREATE TABLE foo(a INT);\n\n    CREATE TRIGGER trg\n     AFTER DELETE ON foo\n    BEGIN\n       SELECT * FROM NEW;\n    END;\n\n    CREATE TRIGGER trig AFTER INSERT ON foo\n       REFERENCING OLD ROW AS newrow\n       FOR EACH ROW WHEN (a > 1)\n       INSERT INTO foo VALUES (1)\n\nIn HSQLDB, DELETE triggers may be used only with the OLD state while INSERT triggers may have only the NEW state. So, in the previous\nexample, NEW in `SELECT * FROM NEW;` will be highlighted as well as OLD in `REFERENCING OLD ROW AS newrow`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlTriggerTransition",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlNamedArgumentsInspection",
+                "shortDescription": {
+                  "text": "Named arguments should be used"
+                },
+                "fullDescription": {
+                  "text": "Reports arguments that are used without names in routine calls. By default, this inspection is disabled. For more information about the difference between named and unnamed parameters, see Binding Parameters by Name (Named Parameters) at docs.microsoft.com . Example (Microsoft SQL Server): 'CREATE FUNCTION foo(n INT, m INT) RETURNS INT AS\nBEGIN\n    RETURN n + m;\nEND;\n\nCREATE PROCEDURE test AS\nBEGIN\n    foo n = 1, m = 2;\n\n--- The following call misses parameter names and will be highlighted\n    foo 1, 2;\nEND;' Parameters '1, 2' in the 'foo 1, 2;' call are highlighted because they miss names.",
+                  "markdown": "Reports arguments that are used without names in routine calls. By default, this inspection is disabled.\n\nFor more information about the difference between named and unnamed parameters, see [Binding Parameters by Name (Named Parameters) at docs.microsoft.com](https://docs.microsoft.com/en-us/sql/odbc/reference/develop-app/binding-parameters-by-name-named-parameters).\n\nExample (Microsoft SQL Server):\n\n    CREATE FUNCTION foo(n INT, m INT) RETURNS INT AS\n    BEGIN\n        RETURN n + m;\n    END;\n\n    CREATE PROCEDURE test AS\n    BEGIN\n        foo n = 1, m = 2;\n\n    --- The following call misses parameter names and will be highlighted\n        foo 1, 2;\n    END;\n\nParameters `1, 2` in the `foo 1, 2;` call are highlighted because they miss names."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlNamedArguments",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlCaseVsCoalesceInspection",
+                "shortDescription": {
+                  "text": "Using CASE instead of COALESCE function and vice versa"
+                },
+                "fullDescription": {
+                  "text": "Reports situations when CASE and COALESCE calls are interchangeable. This inspection has the following intention actions: Replace with 'COALESCE' call and the opposite one Replace with CASE expression. Example (MySQL): 'SELECT\n  -- this CASE may be replaced by COALESCE\n\tCASE\n\t\tWHEN C1 IS NOT NULL THEN C1\n\t\tELSE 0\n\t\tEND\nFROM dual;' In the example, the CASE statement can be replaced with 'SELECT COALESCE(C1, 0)' that produces the same output. If you prefer using CASE expressions, select the Prefer CASE expressions over COALESCE function option on the inspection page.",
+                  "markdown": "Reports situations when CASE and COALESCE calls are interchangeable. This inspection has the following intention actions: **Replace\nwith 'COALESCE' call** and the opposite one **Replace with CASE expression** .\n\nExample (MySQL):\n\n    SELECT\n      -- this CASE may be replaced by COALESCE\n    \tCASE\n    \t\tWHEN C1 IS NOT NULL THEN C1\n    \t\tELSE 0\n    \t\tEND\n    FROM dual;\n\nIn the example, the CASE statement can be replaced with `SELECT COALESCE(C1, 0)` that produces the same output.\n\nIf you prefer using CASE expressions, select the **Prefer CASE expressions over COALESCE function** option on\nthe inspection page."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlCaseVsCoalesce",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlRedundantAliasInspection",
+                "shortDescription": {
+                  "text": "Redundant alias expressions"
+                },
+                "fullDescription": {
+                  "text": "Reports alias expressions that duplicate names of columns in tables and might be redundant. Example (PostgreSQL): 'CREATE TABLE foo(a INT, b INT);\n\nSELECT * FROM foo foo(a, b);\nSELECT * FROM foo foo(a);\nSELECT * FROM foo foo(x);\nSELECT * FROM foo foo(x, y);' The first two aliases use the same column names as in the 'foo' table. They are considered redundant because they column names are identical.",
+                  "markdown": "Reports alias expressions that duplicate names of columns in tables and might be redundant.\n\nExample (PostgreSQL):\n\n    CREATE TABLE foo(a INT, b INT);\n\n    SELECT * FROM foo foo(a, b);\n    SELECT * FROM foo foo(a);\n    SELECT * FROM foo foo(x);\n    SELECT * FROM foo foo(x, y);\n\nThe first two aliases use the same column names as in the `foo` table. They are considered redundant because they\ncolumn names are identical."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlRedundantAlias",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlTransactionStatementInTriggerInspection",
+                "shortDescription": {
+                  "text": "Use of transaction management statements in triggers"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of transaction management statements like COMMIT or ROLLBACK in trigger bodies. With COMMIT or ROLLBACK statements in a trigger body, the trigger will not compile. The fail happens because triggers start during transactions. When the trigger starts the current transaction is still not complete. As COMMIT terminates a transaction, both statements (COMMIT and ROLLBACK) would lead to an exception. Changes that are executed in a trigger should be committed (or rolled back) by the owning transaction that started the trigger. Example (Oracle): 'CREATE TABLE employee_audit\n(\n    id          INT  NOT NULL,\n    update_date DATE NOT NULL,\n    old_name    VARCHAR2(100),\n    new_name    VARCHAR2(100)\n);\n\nCREATE TABLE employees\n(\n    id   INT           NOT NULL,\n    name VARCHAR2(100) NOT NULL\n);\n\nCREATE OR REPLACE TRIGGER trig_commit\n    AFTER UPDATE OF name\n    ON employees\n    FOR EACH ROW\nBEGIN\n    INSERT INTO employee_audit VALUES (:old.id, SYSDATE, :old.name, :new.name);\n    COMMIT;\nEND;\n\nCREATE OR REPLACE TRIGGER trig_rollback\n    AFTER UPDATE OF name\n    ON employees\n    FOR EACH ROW\nBEGIN\n    INSERT INTO employee_audit VALUES (:old.id, SYSDATE, :old.name, :new.name);\n    ROLLBACK;\nEND;'",
+                  "markdown": "Reports usages of transaction management statements like COMMIT or ROLLBACK in trigger bodies.\n\nWith COMMIT or ROLLBACK statements in a trigger body, the trigger will not compile.\nThe fail happens because triggers start during transactions. When the trigger starts the current transaction is still not complete. As\nCOMMIT\nterminates a transaction, both statements (COMMIT and ROLLBACK) would lead to an exception.\nChanges that are executed in a trigger should be committed (or rolled back) by the owning transaction that started the trigger.\n\nExample (Oracle):\n\n    CREATE TABLE employee_audit\n    (\n        id          INT  NOT NULL,\n        update_date DATE NOT NULL,\n        old_name    VARCHAR2(100),\n        new_name    VARCHAR2(100)\n    );\n\n    CREATE TABLE employees\n    (\n        id   INT           NOT NULL,\n        name VARCHAR2(100) NOT NULL\n    );\n\n    CREATE OR REPLACE TRIGGER trig_commit\n        AFTER UPDATE OF name\n        ON employees\n        FOR EACH ROW\n    BEGIN\n        INSERT INTO employee_audit VALUES (:old.id, SYSDATE, :old.name, :new.name);\n        COMMIT;\n    END;\n\n    CREATE OR REPLACE TRIGGER trig_rollback\n        AFTER UPDATE OF name\n        ON employees\n        FOR EACH ROW\n    BEGIN\n        INSERT INTO employee_audit VALUES (:old.id, SYSDATE, :old.name, :new.name);\n        ROLLBACK;\n    END;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlTransactionStatementInTrigger",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlRedundantCodeInCoalesceInspection",
+                "shortDescription": {
+                  "text": "Redundant code in COALESCE call"
+                },
+                "fullDescription": {
+                  "text": "Reports all the arguments except for the first expression that does not evaluate to NULL in COALESCE functions. Example (MySQL): 'SELECT COALESCE(NULL, NULL, NULL, 42, NULL, 'string') as a;' The first NOT NULL argument is '42', all other arguments will be grayed out.",
+                  "markdown": "Reports all the arguments except for the first expression that does not evaluate to NULL in COALESCE functions.\n\nExample (MySQL):\n\n    SELECT COALESCE(NULL, NULL, NULL, 42, NULL, 'string') as a;\n\nThe first NOT NULL argument is `42`, all other arguments will be grayed out."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlRedundantCodeInCoalesce",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlAggregatesInspection",
+                "shortDescription": {
+                  "text": "Aggregate-related problems"
+                },
+                "fullDescription": {
+                  "text": "Reports invalid usages of SQL aggregate functions. The following situations are considered: Columns that are used in HAVING and ORDER BY clauses but are missed in GROUP BY clauses. 'CREATE TABLE foo(id INT PRIMARY KEY, a INT, b INT);\nSELECT a, MAX(b) FROM foo GROUP BY a HAVING b > 0;\nSELECT * FROM foo GROUP BY a ORDER BY b;' This rule does not apply when grouping is made by the primary key. 'SELECT * FROM foo GROUP BY id ORDER BY b;' Aggregate functions in a wrong context. Usually, you can use aggregate functions in the following contexts: a list of expressions in SELECT; in HAVING and ORDER BY sections; and other dialect-specific cases. The following queries will display an error. 'SELECT a FROM foo WHERE MAX(b) > 0;\nSELECT a FROM foo GROUP BY MAX(a);' Nested calls of aggregate functions. 'SELECT MAX(SUM(a)) FROM foo GROUP BY a;' This rule does not apply to analytic functions. The following query is valid and correct. 'SELECT MAX(SUM(a) OVER ()) FROM foo;' Usages of HAVING without aggregate functions. In this case, consider rewriting your code using the WHERE section. 'SELECT a, MAX(b) FROM foo GROUP BY a HAVING a > 0;'",
+                  "markdown": "Reports invalid usages of SQL aggregate functions.\n\nThe following situations are considered:\n\n* Columns that are used in HAVING and ORDER BY clauses but are missed in GROUP BY clauses.\n\n      CREATE TABLE foo(id INT PRIMARY KEY, a INT, b INT);\n      SELECT a, MAX(b) FROM foo GROUP BY a HAVING b > 0;\n      SELECT * FROM foo GROUP BY a ORDER BY b;\n\n  This rule does not apply when grouping is made by the primary key.\n\n      SELECT * FROM foo GROUP BY id ORDER BY b;\n\n* Aggregate functions in a wrong context. Usually, you can use aggregate functions in the following contexts: a list of expressions in\n  SELECT; in HAVING and ORDER BY sections; and other dialect-specific cases. The following queries will display an error.\n\n      SELECT a FROM foo WHERE MAX(b) > 0;\n      SELECT a FROM foo GROUP BY MAX(a);\n\n* Nested calls of aggregate functions.\n\n      SELECT MAX(SUM(a)) FROM foo GROUP BY a;\n\n  This rule does not apply to analytic functions. The following query is valid and correct.\n\n      SELECT MAX(SUM(a) OVER ()) FROM foo;\n\n* Usages of HAVING without aggregate functions. In this case, consider rewriting your code using the WHERE section.\n\n      SELECT a, MAX(b) FROM foo GROUP BY a HAVING a > 0;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlAggregates",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlConstantExpressionInspection",
+                "shortDescription": {
+                  "text": "Constant expression"
+                },
+                "fullDescription": {
+                  "text": "Reports conditions and expressions that are always true, false or null. Example (MySQL): 'CREATE TABLE t1 (a TEXT, b INT, c BOOLEAN);\nSELECT a FROM t1 WHERE 'Cat' = 'Cat';\nSELECT a FROM t1 WHERE 'Cat' = null;' The ''Cat' = 'Cat'' is always true and will be reported. The ''Cat' = null' is always null and will be reported.",
+                  "markdown": "Reports conditions and expressions that are always true, false or null.\n\nExample (MySQL):\n\n    CREATE TABLE t1 (a TEXT, b INT, c BOOLEAN);\n    SELECT a FROM t1 WHERE 'Cat' = 'Cat';\n    SELECT a FROM t1 WHERE 'Cat' = null;\n\nThe `'Cat' = 'Cat'` is always true and will be reported.\n\nThe `'Cat' = null` is always null and will be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlConstantExpression",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlMissingColumnAliasesInspection",
+                "shortDescription": {
+                  "text": "Missing column aliases"
+                },
+                "fullDescription": {
+                  "text": "Reports queries without explicit aliases in output expressions (for example, in the SELECT statement). Example (PostgreSQL): 'CREATE TABLE foo(a INT, b INT);\n\nSELECT 1, a + 1 AS A2, MAX(b) AS M\nFROM foo;'",
+                  "markdown": "Reports queries without explicit aliases in output expressions (for example, in the SELECT statement).\n\nExample (PostgreSQL):\n\n    CREATE TABLE foo(a INT, b INT);\n\n    SELECT 1, a + 1 AS A2, MAX(b) AS M\n    FROM foo;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlMissingColumnAliases",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlAddNotNullColumnInspection",
+                "shortDescription": {
+                  "text": "Adding not null column without default value"
+                },
+                "fullDescription": {
+                  "text": "Reports attempts to create NOT NULL columns without DEFAULT values. Example (Microsoft SQL Server): 'CREATE TABLE foo (a INT, b  INT)\n\nALTER TABLE foo ADD c INT NOT NULL;' By default, a column holds NULL values. In the example, we use the NOT NULL constraint that enforces a column not to accept NULL values. If we prohibit to use NULL values, we must set the DEFAULT value that SQL can use when we create a new record. 'ALTER TABLE foo ADD c INT NOT NULL DEFAULT 42;' You can quickly add the DEFAULT value by using the Add DEFAULT value quick-fix.",
+                  "markdown": "Reports attempts to create NOT NULL columns without DEFAULT values.\n\nExample (Microsoft SQL Server):\n\n    CREATE TABLE foo (a INT, b  INT)\n\n    ALTER TABLE foo ADD c INT NOT NULL;\n\nBy default, a column holds NULL values. In the example, we use the NOT NULL constraint that enforces a column not to accept NULL values.\nIf we prohibit to use NULL values, we must set the DEFAULT value that SQL can use when we create a new record.\n\n    ALTER TABLE foo ADD c INT NOT NULL DEFAULT 42;\n\nYou can quickly add the DEFAULT value by using the **Add DEFAULT value** quick-fix."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlAddNotNullColumn",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "OraMissingBodyInspection",
+                "shortDescription": {
+                  "text": "Missing body for package/object type specification"
+                },
+                "fullDescription": {
+                  "text": "Reports package and object type specifications that are missing body declarations. Package specifications and object types that declare routines as well as package specifications with cursors must have body declarations where those routines and cursors are implemented. Absence of a body leads to a runtime error when routines or cursors are invoked in program code. Example (Oracle): 'CREATE OR REPLACE PACKAGE ppp IS\n    FUNCTION foo(a INT) RETURN INT;\nEND;'",
+                  "markdown": "Reports package and object type specifications that are missing body declarations.\n\nPackage specifications and object types that declare routines as well as package specifications with cursors must have body\ndeclarations where those routines and cursors are implemented. Absence of a body leads to a runtime error when routines or cursors are\ninvoked in program code.\n\nExample (Oracle):\n\n    CREATE OR REPLACE PACKAGE ppp IS\n        FUNCTION foo(a INT) RETURN INT;\n    END;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlMissingBody",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Oracle",
+                      "index": 73,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "OraUnmatchedForwardDeclarationInspection",
+                "shortDescription": {
+                  "text": "Forward declaration without definition"
+                },
+                "fullDescription": {
+                  "text": "Reports declarations of procedures and functions that are missing their implementation in code. In Oracle, you can declare a procedure or a function without its body, and write the implementation later. The inspection will report names of such procedures or functions that are left without implementation. Example (Oracle): 'DECLARE PROCEDURE foo(a int, b varchar2);\nBEGIN\n    NULL;\nEND;' The 'foo' procedure is declared but is missing implementation. We can add the implementation to get rid of the error. 'DECLARE PROCEDURE foo(a int, b varchar2);\n  PROCEDURE foo(a int, b varchar2) IS\nBEGIN\n    NULL;\nEND;\nBEGIN\n    NULL;\nEND;'",
+                  "markdown": "Reports declarations of procedures and functions that are missing their implementation in code.\n\nIn Oracle, you can declare a procedure or a function without its body, and write the implementation later. The inspection will report names\nof such procedures or functions that are left without implementation.\n\nExample (Oracle):\n\n    DECLARE PROCEDURE foo(a int, b varchar2);\n    BEGIN\n        NULL;\n    END;\n\nThe `foo` procedure is declared but is missing implementation. We can add the implementation to get rid of the error.\n\n    DECLARE PROCEDURE foo(a int, b varchar2);\n      PROCEDURE foo(a int, b varchar2) IS\n    BEGIN\n        NULL;\n    END;\n    BEGIN\n        NULL;\n    END;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "SqlUnmatchedForwardDeclaration",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Oracle",
+                      "index": 73,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MongoJSExtResolveInspection",
+                "shortDescription": {
+                  "text": "Resolution problems"
+                },
+                "fullDescription": {
+                  "text": "Reports unresolved references in MongoDB and JavaScript code.",
+                  "markdown": "Reports unresolved references in MongoDB and JavaScript code."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MongoJSResolve",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MongoJS",
+                      "index": 75,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlWithoutWhereInspection",
+                "shortDescription": {
+                  "text": "Delete or update statement without where clauses"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of DELETE or UPDATE statements without WHERE clauses. Without WHERE clauses, DELETE drops all the data from the table, and UPDATE overwrites values for all the table rows. Example (MySQL): 'CREATE TABLE t1 (a TEXT, b INT, c BOOLEAN);\nupdate t1 set  a = 'Smith';\ndelete from t1;'",
+                  "markdown": "Reports usages of DELETE or UPDATE statements without WHERE clauses.\n\nWithout WHERE clauses, DELETE drops all the data from the table, and UPDATE overwrites values for all the table rows.\n\nExample (MySQL):\n\n    CREATE TABLE t1 (a TEXT, b INT, c BOOLEAN);\n    update t1 set  a = 'Smith';\n    delete from t1;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlWithoutWhere",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlUnusedCteInspection",
+                "shortDescription": {
+                  "text": "Unused common table expression"
+                },
+                "fullDescription": {
+                  "text": "Reports unused common table expressions (CTE) inside the query. Example (PostgreSQL): 'CREATE TABLE foo(a INT);\n\nWITH a AS (SELECT 1 AS x FROM foo)\nSELECT 1 + 2 FROM foo;' By using WITH, we create a temporary named result set with the name 'a', also known as a common table expression (CTE). But we do not use this CTE later in the code. The unused CTE is greyed out.",
+                  "markdown": "Reports unused common table expressions (CTE) inside the query.\n\nExample (PostgreSQL):\n\n    CREATE TABLE foo(a INT);\n\n    WITH a AS (SELECT 1 AS x FROM foo)\n    SELECT 1 + 2 FROM foo;\n\nBy using WITH, we create a temporary named result set with the name `a`, also known as a common table expression (CTE). But\nwe do not use this CTE later in the code. The unused CTE is greyed out."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlUnusedCte",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MongoJSResolveInspection",
+                "shortDescription": {
+                  "text": "Resolution problems"
+                },
+                "fullDescription": {
+                  "text": "Reports unresolved references in MongoDB and JavaScript code. Example: 'db\nuse foo\n  -- a reference to a non-existing collection\ndb.non_existing_collection\ndb['non_existing_collection']\ndb['non_existing_collection'].find().hasNext()' The 'non_existing_collection' collection does not exist in the database and will be reported.",
+                  "markdown": "Reports unresolved references in MongoDB and JavaScript code.\n\nExample:\n\n    db\n    use foo\n      -- a reference to a non-existing collection\n    db.non_existing_collection\n    db['non_existing_collection']\n    db['non_existing_collection'].find().hasNext()\n\nThe `non_existing_collection` collection does not exist in the database and will be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MongoJSResolve",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MongoJS",
+                      "index": 75,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MongoJSSideEffectsInspection",
+                "shortDescription": {
+                  "text": "Statement with side effects"
+                },
+                "fullDescription": {
+                  "text": "Reports statements that can cause side effects while the data source is in read-only mode. For more information about enabling read-only mode, see Enable read-only mode for a connection in the IDE documentation. The Disable read-only mode quick-fix turns off the read-only mode for the respective data source. Example: 'db.my_collection.insertOne()'",
+                  "markdown": "Reports statements that can cause side effects while the data source is in read-only mode.\n\nFor more information about enabling read-only mode, see\n[Enable\nread-only mode for a connection in the IDE documentation](https://www.jetbrains.com/help/datagrip/configuring-database-connections.html#enable-read-only-mode-for-a-connection).\n\nThe **Disable read-only mode** quick-fix turns off the read-only mode for the respective data source.\n\nExample:\n\n\n    db.my_collection.insertOne()\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MongoJSSideEffects",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MongoJS",
+                      "index": 75,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MongoJSExtSideEffectsInspection",
+                "shortDescription": {
+                  "text": "Statement with side effects"
+                },
+                "fullDescription": {
+                  "text": "Reports statements that may cause side effects while the data source is in read-only mode. The quick-fix turns off the read-only mode for the respective data source. Example: 'db.my_collection.insertOne()'",
+                  "markdown": "Reports statements that may cause side effects while the data source is in read-only mode.\n\nThe quick-fix turns off the read-only mode for the respective data source.\n\nExample:\n\n\n    db.my_collection.insertOne()\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MongoJSSideEffects",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MongoJS",
+                      "index": 75,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlUnusedSubqueryItemInspection",
+                "shortDescription": {
+                  "text": "Unused subquery item"
+                },
+                "fullDescription": {
+                  "text": "Reports columns, aliases, and other subquery items that are not referenced in the outer query expression. Example (PostgreSQL): 'CREATE TABLE for_subquery(id INT);\nSELECT a, q FROM (SELECT 1 AS a, 10 AS b, 2 + 3 AS q, id\n      FROM for_subquery) x;' We reference 'a' and 'q' aliases from a subquery. But the 'b' alias and the 'id' column are not referenced in the outer SELECT statement. Therefore, 'b' and 'id' are grayed out.",
+                  "markdown": "Reports columns, aliases, and other subquery items that are not referenced in the outer query expression.\n\nExample (PostgreSQL):\n\n    CREATE TABLE for_subquery(id INT);\n    SELECT a, q FROM (SELECT 1 AS a, 10 AS b, 2 + 3 AS q, id\n          FROM for_subquery) x;\n\nWe reference `a` and `q` aliases from a subquery. But the `b` alias and the `id` column are\nnot referenced in the outer SELECT statement. Therefore, `b` and `id` are grayed out."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlUnused",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlSideEffectsInspection",
+                "shortDescription": {
+                  "text": "Statement with side effects"
+                },
+                "fullDescription": {
+                  "text": "Reports statements that might lead to modification of a database during a read-only connection. To enable read-only mode for a connection, right-click a data source in the Database tool window (View | Tool Windows | Database) and select Properties. In the Data Sources and Drivers dialog, click the Options tab and select the Read-only checkbox. Example (MySQL): 'CREATE TABLE foo(a INT);\nINSERT INTO foo VALUES (1);' As 'CREATE TABLE' and 'INSERT INTO' statements lead to a database modification, these statements will be highlighted in read-only connection mode.",
+                  "markdown": "Reports statements that might lead to modification of a database during a read-only connection.\n\nTo enable read-only mode for a\nconnection,\nright-click a data source in the **Database** tool window (**View \\| Tool Windows \\| Database** ) and select **Properties** .\nIn the **Data Sources and Drivers** dialog, click the **Options** tab and select the **Read-only** checkbox.\n\nExample (MySQL):\n\n    CREATE TABLE foo(a INT);\n    INSERT INTO foo VALUES (1);\n\nAs `CREATE TABLE` and `INSERT INTO` statements lead to a database modification, these statements will be highlighted\nin read-only connection mode."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlSideEffects",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlIllegalCursorStateInspection",
+                "shortDescription": {
+                  "text": "Illegal cursor state"
+                },
+                "fullDescription": {
+                  "text": "Reports illegal cursor states inside SQL routines. A routine has CLOSE or FETCH statements but a cursor might be closed. A routine has the OPEN statement but a cursor might be opened. Example (Microsoft SQL Server): 'CREATE TABLE t(col INT);\n\nCREATE PROCEDURE foo() AS\nBEGIN\nDECLARE my_cursor CURSOR FOR SELECT * FROM t;\nDECLARE a INT;\nFETCH my_cursor INTO a;\nCLOSE my_cursor;\nEND;' According to CLOSE (Transact-SQL) at docs.microsoft.com, CLOSE must be issued on an open cursor, and CLOSE is not allowed on cursors that have only been declared or are already closed. So, we need to open the cursor to fix the warning. 'CREATE PROCEDURE foo() AS\nBEGIN\nDECLARE my_cursor CURSOR FOR SELECT * FROM t;\nDECLARE a INT;\nOPEN my_cursor;\nFETCH my_cursor INTO a;\nCLOSE my_cursor;\nEND;'",
+                  "markdown": "Reports illegal cursor states inside SQL routines.\n\n* A routine has CLOSE or FETCH statements but a cursor might be closed.\n* A routine has the OPEN statement but a cursor might be opened.\n\nExample (Microsoft SQL Server):\n\n    CREATE TABLE t(col INT);\n\n    CREATE PROCEDURE foo() AS\n    BEGIN\n    DECLARE my_cursor CURSOR FOR SELECT * FROM t;\n    DECLARE a INT;\n    FETCH my_cursor INTO a;\n    CLOSE my_cursor;\n    END;\n\nAccording to [CLOSE (Transact-SQL) at\ndocs.microsoft.com](https://docs.microsoft.com/en-us/sql/t-sql/language-elements/close-transact-sql), CLOSE must be issued on an open cursor, and CLOSE is not allowed on cursors that have only been declared or are\nalready closed. So, we need to open the cursor to fix the warning.\n\n    CREATE PROCEDURE foo() AS\n    BEGIN\n    DECLARE my_cursor CURSOR FOR SELECT * FROM t;\n    DECLARE a INT;\n    OPEN my_cursor;\n    FETCH my_cursor INTO a;\n    CLOSE my_cursor;\n    END;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlIllegalCursorState",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlJoinWithoutOnInspection",
+                "shortDescription": {
+                  "text": "Unsafe 'join' clause in 'delete' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports missing conditional checks for statements that might modify the whole database. For example, usages of JOIN clauses inside DELETE statements without ON or WHERE. Without conditional checks on JOIN, DELETE drops contents of the entire table. Example (MySQL): 'CREATE TABLE foo (a INT,b INT,c INT);\nCREATE TABLE bar (a INT,b INT,c INT);\n\nDELETE table1 FROM foo table1  INNER JOIN bar table2;'",
+                  "markdown": "Reports missing conditional checks for statements that might modify the whole database.\n\nFor example, usages of JOIN clauses inside DELETE statements without ON or WHERE. Without conditional checks on JOIN, DELETE drops\ncontents of the entire table.\n\nExample (MySQL):\n\n    CREATE TABLE foo (a INT,b INT,c INT);\n    CREATE TABLE bar (a INT,b INT,c INT);\n\n    DELETE table1 FROM foo table1  INNER JOIN bar table2;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlJoinWithoutOn",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlDropIndexedColumnInspection",
+                "shortDescription": {
+                  "text": "Index is dependent on column"
+                },
+                "fullDescription": {
+                  "text": "Reports cases when you try to drop columns from indexed tables. This inspection is available in Microsoft SQL Server and Sybase ASE. Example (Microsoft SQL Server): 'CREATE TABLE test_index\n(\ncol  INT NOT NULL,\ncol2 INT NOT NULL,\ncol3 INT NOT NULL UNIQUE,\ncol4 VARCHAR(200)\n);\n\nCREATE UNIQUE INDEX aaaa ON test_index (col, col2);\n\nALTER TABLE test_index\nDROP COLUMN col;' You cannot delete the 'col' column because it is in the indexed table. To delete the column, you need to delete the 'aaaa' index first (for example, DROP INDEX aaaa).",
+                  "markdown": "Reports cases when you try to drop columns from indexed tables. This inspection is available in Microsoft SQL Server and Sybase ASE.\n\nExample (Microsoft SQL Server):\n\n    CREATE TABLE test_index\n    (\n    col  INT NOT NULL,\n    col2 INT NOT NULL,\n    col3 INT NOT NULL UNIQUE,\n    col4 VARCHAR(200)\n    );\n\n    CREATE UNIQUE INDEX aaaa ON test_index (col, col2);\n\n    ALTER TABLE test_index\n    DROP COLUMN col;\n\nYou cannot delete the `col` column because it is in the indexed table. To delete the column, you need to delete the\n`aaaa` index first (for example, DROP INDEX aaaa)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlDropIndexedColumn",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlCheckUsingColumnsInspection",
+                "shortDescription": {
+                  "text": "Check using clause columns"
+                },
+                "fullDescription": {
+                  "text": "Reports columns in the USING clause that does not exist in both tables. Example (MySQL): 'CREATE TABLE t1 (i INT, j INT);\nCREATE TABLE t2 (k INT, l INT);\nSELECT * FROM t1 JOIN t2 USING (j);' In USING clauses, a column name must be present in both tables, and the SELECT query will automatically join those tables by using the given column name. As we do not have the 'j' column in 't2', we can rewrite the query using ON. The ON clause can join tables where the column names do not match in both tables. 'SELECT * FROM t1 JOIN t2 ON t1.j = t2.l;'",
+                  "markdown": "Reports columns in the USING clause that does not exist in both tables.\n\nExample (MySQL):\n\n    CREATE TABLE t1 (i INT, j INT);\n    CREATE TABLE t2 (k INT, l INT);\n    SELECT * FROM t1 JOIN t2 USING (j);\n\nIn USING clauses, a column name must be present in both tables, and the SELECT query will automatically join\nthose tables by using the given column name. As we do not have the `j` column in `t2`, we can\nrewrite the query using ON. The ON clause can join tables where the column names do not match in both tables.\n\n    SELECT * FROM t1 JOIN t2 ON t1.j = t2.l;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlCheckUsingColumns",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlConstantConditionInspection",
+                "shortDescription": {
+                  "text": "Constant condition"
+                },
+                "fullDescription": {
+                  "text": "Reports conditions in WHERE or JOIN clauses that are always TRUE or always FALSE. Example (MySQL): 'CREATE TABLE t1 (a TEXT, b INT, c BOOLEAN);\nSELECT a FROM t1 WHERE 'Cat' = 'Cat';' The ''Cat' = 'Cat'' is always true and will be reported.",
+                  "markdown": "Reports conditions in WHERE or JOIN clauses that are always TRUE or always FALSE.\n\nExample (MySQL):\n\n    CREATE TABLE t1 (a TEXT, b INT, c BOOLEAN);\n    SELECT a FROM t1 WHERE 'Cat' = 'Cat';\n\nThe `'Cat' = 'Cat'` is always true and will be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlConstantCondition",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlDialectInspection",
+                "shortDescription": {
+                  "text": "SQL dialect detection"
+                },
+                "fullDescription": {
+                  "text": "Reports situations when a dialect is not assigned to an SQL file. For example, when you open a new SQL file without assigning a dialect to it, you see a notification where the best matching dialect is advised. Click the Use <dialect> link to use the advised dialect. Alternatively, click the Change dialect to link to select the other dialect.",
+                  "markdown": "Reports situations when a dialect is not assigned to an SQL file.\n\nFor example, when you open a new SQL file without assigning a dialect\nto it, you see a notification where the best matching dialect is advised. Click the **Use \\<dialect\\>** link to use the advised\ndialect. Alternatively, click the **Change dialect to** link to select the other dialect."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlDialectInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MongoJSExtDeprecationInspection",
+                "shortDescription": {
+                  "text": "Deprecated element"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of deprecated methods in MongoDB and JavaScript code. The quick-fix replaces deprecated methods with recommended alternatives. Example: 'db.my_collection.insert()' After the quick-fix is applied: 'db.my_collection.insertOne()'",
+                  "markdown": "Reports usages of deprecated methods in MongoDB and JavaScript code.\n\nThe quick-fix replaces deprecated methods with recommended alternatives.\n\nExample:\n\n\n      db.my_collection.insert()\n\nAfter the quick-fix is applied:\n\n\n      db.my_collection.insertOne()\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MongoJSDeprecation",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MongoJS",
+                      "index": 75,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlDuplicateColumnInspection",
+                "shortDescription": {
+                  "text": "Duplicating column name in SELECT"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicated names of column aliases in SELECT lists. Example (Sybase ASE): 'CREATE TABLE t1 (a TEXT, b INT, c INT);\n\nSELECT a AS x, b AS x FROM t1;' The 'x' alias name is used for 'a' and 'b' columns. These assignments are highlighted as errors because you cannot use identical alias names for columns in Sybase ASE.",
+                  "markdown": "Reports duplicated names of column aliases in SELECT lists.\n\nExample (Sybase ASE):\n\n    CREATE TABLE t1 (a TEXT, b INT, c INT);\n\n    SELECT a AS x, b AS x FROM t1;\n\nThe `x` alias name is used for `a` and `b` columns. These assignments are highlighted as errors because\nyou cannot use identical alias names for columns in Sybase ASE."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlDuplicateColumn",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MongoJSDeprecationInspection",
+                "shortDescription": {
+                  "text": "Deprecated element"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of deprecated methods in MongoDB and JavaScript code. The quick-fix replaces deprecated methods with recommended alternatives. Example: 'db.my_collection.insert()' After the quick-fix is applied: 'db.my_collection.insertOne()'",
+                  "markdown": "Reports usages of deprecated methods in MongoDB and JavaScript code.\n\nThe quick-fix replaces deprecated methods with recommended alternatives.\n\nExample:\n\n    db.my_collection.insert()\n\nAfter the quick-fix is applied:\n\n    db.my_collection.insertOne()\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MongoJSDeprecation",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "MongoJS",
+                      "index": 75,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlTypeInspection",
+                "shortDescription": {
+                  "text": "Types compatibility"
+                },
+                "fullDescription": {
+                  "text": "Reports type-related errors.",
+                  "markdown": "Reports type-related errors."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlType",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlUnicodeStringLiteralInspection",
+                "shortDescription": {
+                  "text": "Unicode usage in SQL"
+                },
+                "fullDescription": {
+                  "text": "Reports string literals that use national characters without the 'N' prefix. Without the N prefix, the string is converted to the default code page of the database. This default code page may not recognize certain characters. For more information, see nchar and nvarchar (Transact-SQL) at docs.microsoft.com. Example (Microsoft SQL Server): 'SELECT 'abcde' AS a;\nSELECT N'abcde' AS b;\nSELECT 'абвгд' AS c;\nSELECT N'абвгд' AS d;' The 'SELECT 'абвгд' AS c;' does not have the 'N' prefix, the ''абвгд'' part will be highlighted.",
+                  "markdown": "Reports string literals that use national characters without the `N` prefix.\n\nWithout the N prefix, the string is converted to the default\ncode page of the database. This default code page may not recognize certain characters. For more information, see\n[nchar and nvarchar\n(Transact-SQL)\nat docs.microsoft.com](https://docs.microsoft.com/en-us/sql/t-sql/data-types/nchar-and-nvarchar-transact-sql).\n\nExample (Microsoft SQL Server):\n\n    SELECT 'abcde' AS a;\n    SELECT N'abcde' AS b;\n    SELECT 'абвгд' AS c;\n    SELECT N'абвгд' AS d;\n\nThe `SELECT 'абвгд' AS c;` does not have the `N` prefix, the `'абвгд'` part will be highlighted."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlUnicodeStringLiteral",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlUnusedVariableInspection",
+                "shortDescription": {
+                  "text": "Unused variable"
+                },
+                "fullDescription": {
+                  "text": "Reports unused arguments, variables, or parameters. Example (PostgreSQL): 'CREATE FUNCTION foo(PARAMUSED INT, PARAMUNUSED INT) RETURNS INT AS\n$$\nBEGIN\n    RETURN PARAMUSED;\nEND\n$$ LANGUAGE plpgsql;' The 'PARAMUNUSED' parameter is not used in the function and might be deleted.",
+                  "markdown": "Reports unused arguments, variables, or parameters.\n\nExample (PostgreSQL):\n\n    CREATE FUNCTION foo(PARAMUSED INT, PARAMUNUSED INT) RETURNS INT AS\n    $$\n    BEGIN\n        RETURN PARAMUSED;\n    END\n    $$ LANGUAGE plpgsql;\n\nThe `PARAMUNUSED` parameter is not used in the function and might be deleted."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlUnused",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PgSelectFromProcedureInspection",
+                "shortDescription": {
+                  "text": "Postgres: Select from procedure call"
+                },
+                "fullDescription": {
+                  "text": "Reports situations when you make SELECT from a function or a DBLINK without an alias with a type (for example, 'AS t1(s VARCHAR)'). This requirement does not apply to scalar functions. Example (PostgreSQL): 'CREATE FUNCTION produce_a_table() RETURNS RECORD AS $$\nSELECT 1;\n$$ LANGUAGE sql;\nSELECT * FROM produce_a_table() AS s (c1 INT);\nSELECT * FROM produce_a_table() AS s (c1);\nSELECT * FROM DBLINK('dbname=mydb', 'SELECT proname, prosrc FROM pg_proc') AS t1;' The 'AS s (c1 INT)' has a typed alias, while 'AS s (c1)' and 'AS t1' do not. In this case, the second call of 'produce_a_table()' and 'DBLINK()' will be highlighted.",
+                  "markdown": "Reports situations when you make SELECT from a function or a DBLINK without an alias with a type (for example, `AS t1(s VARCHAR)`).\n\nThis requirement does not apply to scalar functions.\n\nExample (PostgreSQL):\n\n    CREATE FUNCTION produce_a_table() RETURNS RECORD AS $$\n    SELECT 1;\n    $$ LANGUAGE sql;\n    SELECT * FROM produce_a_table() AS s (c1 INT);\n    SELECT * FROM produce_a_table() AS s (c1);\n    SELECT * FROM DBLINK('dbname=mydb', 'SELECT proname, prosrc FROM pg_proc') AS t1;\n\nThe `AS s (c1 INT)` has a typed alias, while `AS s (c1)` and `AS t1` do not.\nIn this case, the second call of `produce_a_table()` and `DBLINK()` will be highlighted."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PgSelectFromProcedure",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PostgreSQL",
+                      "index": 84,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlInsertIntoGeneratedColumnInspection",
+                "shortDescription": {
+                  "text": "Insertion into generated columns"
+                },
+                "fullDescription": {
+                  "text": "Reports INSERT statements that assign values to generated columns. Generated columns can be read, but their values can not be directly written. Example (PostgreSQL): 'CREATE TABLE foo\n(\n   col1 INT,\n   col2 INT GENERATED ALWAYS AS (col1 + 1) STORED\n);\nINSERT INTO foo(col1, col2) VALUES (1, 2);'\n You cannot insert '2' into the 'col2' column because this column is generated. For this script to work, you can change '2' to DEFAULT. 'INSERT INTO foo(col1, col2) VALUES (1, DEFAULT);'",
+                  "markdown": "Reports INSERT statements that assign values to generated columns. Generated columns can be read, but their values can not be directly written.\n\nExample (PostgreSQL):\n\n    CREATE TABLE foo\n    (\n       col1 INT,\n       col2 INT GENERATED ALWAYS AS (col1 + 1) STORED\n    );\n    INSERT INTO foo(col1, col2) VALUES (1, 2);\n\nYou cannot insert `2` into the `col2` column because this column is generated.\nFor this script to work, you can change `2` to DEFAULT.\n`INSERT INTO foo(col1, col2) VALUES (1, DEFAULT);`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlInsertIntoGeneratedColumn",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MsBuiltinInspection",
+                "shortDescription": {
+                  "text": "Builtin functions"
+                },
+                "fullDescription": {
+                  "text": "Reports truncations of string arguments in ISNULL functions. The ISNULL syntax is 'ISNULL(check_expression, replacement_value)'. According to ISNULL at docs.microsoft.com, 'replacement_value' will be truncated if 'replacement_value' is longer than 'check_expression'. Example (Microsoft SQL Server): 'DECLARE @name1 VARCHAR(2) = NULL;\nDECLARE @name2 VARCHAR(10) = 'Example';\nDECLARE @name3 VARCHAR(2) = 'Hi';\n\n  -- `@name2` is VARCHAR(10) and will be truncated\nSELECT ISNULL(@name1, @name2);\n\n  -- `@name3` is VARCHAR(2) as `@name1` and will not be truncated\nSELECT ISNULL(@name1, @name3);'",
+                  "markdown": "Reports truncations of string arguments in ISNULL functions.\n\nThe ISNULL syntax is `ISNULL(check_expression, replacement_value)`.\n\nAccording to [ISNULL at\ndocs.microsoft.com](https://docs.microsoft.com/en-us/sql/t-sql/functions/isnull-transact-sql), `replacement_value` will be truncated if `replacement_value` is longer than\n`check_expression`.\n\nExample (Microsoft SQL Server):\n\n    DECLARE @name1 VARCHAR(2) = NULL;\n    DECLARE @name2 VARCHAR(10) = 'Example';\n    DECLARE @name3 VARCHAR(2) = 'Hi';\n\n      -- `@name2` is VARCHAR(10) and will be truncated\n    SELECT ISNULL(@name1, @name2);\n\n      -- `@name3` is VARCHAR(2) as `@name1` and will not be truncated\n    SELECT ISNULL(@name1, @name3);\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MssqlBuiltin",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL server",
+                      "index": 85,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlMultipleLimitClausesInspection",
+                "shortDescription": {
+                  "text": "Multiple row limiting/offset clauses in queries"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of multiple row limiting clauses in a single query. Example (Microsoft SQL Server): 'create table foo(a int);\nselect top 1 * from foo order by a offset 10 rows fetch next 20 rows only;' The SELECT TOP clause is used to specify that only 1 record must be returned. The FETCH clause specifies the number of rows to return after the OFFSET clause has been processed. But as we already have the SELECT TOP limiting clause, the FETCH clause might be redundant.",
+                  "markdown": "Reports usages of multiple row limiting clauses in a single query.\n\nExample (Microsoft SQL Server):\n\n    create table foo(a int);\n    select top 1 * from foo order by a offset 10 rows fetch next 20 rows only;\n\nThe SELECT TOP clause is used to specify that only 1 record must be\nreturned. The FETCH clause specifies the number of rows to return after the OFFSET\nclause has been processed. But as we already have the SELECT TOP limiting clause, the FETCH clause might be redundant."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlMultipleLimitClauses",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlIdentifierInspection",
+                "shortDescription": {
+                  "text": "Identifier should be quoted"
+                },
+                "fullDescription": {
+                  "text": "Reports situations when you use SQL reserved keywords as identifier names in your query. Example (Microsoft SQL Server): 'CREATE TABLE select (identity INT IDENTITY NOT NULL, order INT NOT NULL);' We use 'select', 'identity', and 'order' as table and column names. But they are also reserved keywords in Microsoft SQL Server. Therefore, in order to use them as object names in the query, you must quote these identifiers. To quote them, you can use the Quote identifier quick-fix. After the quick-fix is applied: 'CREATE TABLE [select] ([identity] INT IDENTITY NOT NULL, [order] INT NOT NULL);'",
+                  "markdown": "Reports situations when you use SQL reserved keywords as identifier names in your query.\n\nExample (Microsoft SQL Server):\n\n    CREATE TABLE select (identity INT IDENTITY NOT NULL, order INT NOT NULL);\n\nWe use `select`, `identity`, and `order` as table and column names.\nBut they are also reserved keywords in Microsoft SQL Server.\nTherefore, in order to use them as object names in the query, you must quote these identifiers. To quote them, you can use the\n**Quote identifier** quick-fix.\n\nAfter the quick-fix is applied:\n\n    CREATE TABLE [select] ([identity] INT IDENTITY NOT NULL, [order] INT NOT NULL);\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlIdentifier",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlStorageInspection",
+                "shortDescription": {
+                  "text": "SQL source modification detection"
+                },
+                "fullDescription": {
+                  "text": "Reports situations when source code of a database object has been changed. The inspection is triggered when you perform database or object introspection. The introspection is run when you open source code of an object, run statements, and perform code refactoring. Also, you can run introspection by right-clicking an object and selecting Refresh. The inspection covers the following situations: Object source code was changed in the database but code in the editor was not updated. Works in PostgreSQL, Microsoft SQL Server, Oracle, and Sybase ASE. You changed the object source code, introspected the database, but source code has been already changed by someone else. The database introspector was updated in the IDE and you need to download new object properties that were missing in the previous introspector version.",
+                  "markdown": "Reports situations when source code of a database object has been changed.\n\nThe inspection is triggered when you perform database or object introspection. The introspection is run when you open source code of an\nobject, run statements, and perform code refactoring.\nAlso, you can run introspection by right-clicking an object and selecting **Refresh**.\n\nThe inspection covers the following situations:\n\n* Object source code was changed in the database but code in the editor was not updated. Works in PostgreSQL, Microsoft SQL Server, Oracle, and Sybase ASE.\n* You changed the object source code, introspected the database, but source code has been already changed by someone else.\n* The database introspector was updated in the IDE and you need to download new object properties that were missing in the previous introspector version."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlStorageInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MsOrderByInspection",
+                "shortDescription": {
+                  "text": "ORDER BY in queries"
+                },
+                "fullDescription": {
+                  "text": "Reports usages when the 'ORDER BY' clause is used without 'TOP', 'OFFSET', or 'FOR XML' in views, inline functions, derived tables, subqueries, and common table expressions. For more information about usages of 'ORDER BY', see SELECT - ORDER BY Clause (Transact-SQL) at docs.microsoft.com. Example (Microsoft SQL server): 'CREATE TABLE foo (a INT NOT NULL, b  INT NOT NULL);\n\nSELECT *\nFROM (SELECT a, b\nFROM foo A\nWHERE a < 89\nORDER BY b) ALIAS;' In a subquery, ORDER BY will be highlighted as an error. You can add TOP, OFFSET, or FOR XML to a subquery. Alternatively, use the Delete element quick-fix to delete the ORDER BY section. After the quick-fix is applied: 'SELECT *\nFROM (SELECT a, b\nFROM foo A\nWHERE a < 89) ALIAS;'",
+                  "markdown": "Reports usages when the `ORDER BY` clause is used without `TOP`, `OFFSET`, or `FOR XML` in views, inline functions, derived tables, subqueries, and common table expressions.\n\nFor more information about usages of `ORDER BY`, see [SELECT - ORDER BY Clause (Transact-SQL) at\ndocs.microsoft.com](https://docs.microsoft.com/en-us/sql/t-sql/queries/select-order-by-clause-transact-sql).\n\nExample (Microsoft SQL server):\n\n    CREATE TABLE foo (a INT NOT NULL, b  INT NOT NULL);\n\n    SELECT *\n    FROM (SELECT a, b\n    FROM foo A\n    WHERE a < 89\n    ORDER BY b) ALIAS;\n\nIn a subquery, ORDER BY will be highlighted as an error. You can add TOP, OFFSET, or FOR XML to a subquery.\nAlternatively, use the **Delete element** quick-fix to delete the ORDER BY section.\n\nAfter the quick-fix is applied:\n\n    SELECT *\n    FROM (SELECT a, b\n    FROM foo A\n    WHERE a < 89) ALIAS;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "MsOrderBy",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL server",
+                      "index": 85,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlSignatureInspection",
+                "shortDescription": {
+                  "text": "Function signature"
+                },
+                "fullDescription": {
+                  "text": "Reports signature issues for built-in functions. The inspection will report a wrong number of arguments, invalid keywords, wrong data types, and other issues. Example (MySQL): 'CREATE TABLE foo (a INT, b INT, c INT)\n\nSELECT IFNULL() FROM foo; -- error\nSELECT IFNULL(a) FROM foo; -- error\nSELECT IFNULL(a, b) FROM foo; -- OK\nSELECT IFNULL(a, b, c) FROM foo; -- error' In MySQL, the 'IFNULL()' function accepts strictly two arguments. So, only the 'SELECT IFNULL(a, b) FROM foo;' query is correct.",
+                  "markdown": "Reports signature issues for built-in functions.\n\nThe inspection will report a wrong number of arguments, invalid keywords, wrong data types, and other issues.\n\nExample (MySQL):\n\n    CREATE TABLE foo (a INT, b INT, c INT)\n\n    SELECT IFNULL() FROM foo; -- error\n    SELECT IFNULL(a) FROM foo; -- error\n    SELECT IFNULL(a, b) FROM foo; -- OK\n    SELECT IFNULL(a, b, c) FROM foo; -- error\n\nIn MySQL, the `IFNULL()` function accepts strictly two arguments. So, only the `SELECT IFNULL(a, b) FROM foo;`\nquery is correct."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlSignature",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlRedundantOrderingDirectionInspection",
+                "shortDescription": {
+                  "text": "Redundant ordering direction"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant ordering directions like ASC and DESC in ORDER BY clauses. Example (MySQL): 'CREATE TABLE foo(a INT, b INT, c INT);\nSELECT * FROM foo ORDER BY a ASC, b DESC, c ASC;' The ORDER BY keyword sorts the records in the ascending order by default. So, the 'ASC' keyword for 'a' and 'c' columns is redundant.",
+                  "markdown": "Reports redundant ordering directions like ASC and DESC in ORDER BY clauses.\n\nExample (MySQL):\n\n    CREATE TABLE foo(a INT, b INT, c INT);\n    SELECT * FROM foo ORDER BY a ASC, b DESC, c ASC;\n\nThe ORDER BY keyword sorts the records in the ascending order by default. So, the `ASC` keyword for `a` and\n`c` columns is redundant."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlRedundantOrderingDirection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlDeprecateTypeInspection",
+                "shortDescription": {
+                  "text": "Deprecated type"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of types that are deprecated and might disappear in future versions of DBMS. Reported types: LONG in Oracle (see Deprecated and Desupported Features at docs.oracle.com). TEXT, NTEXT, and IMAGE in Microsoft SQL Server (see Deprecated Database Engine Features in SQL Server 2016 at docs.microsoft.com). Example (Oracle): 'CREATE TABLE ot.foo(\na NUMBER GENERATED BY DEFAULT AS IDENTITY,\nb LONG NOT NULL\n);'",
+                  "markdown": "Reports usages of types that are deprecated and might disappear in future versions of DBMS.\n\nReported types:\n\n* LONG in Oracle (see [Deprecated\n  and Desupported Features at docs.oracle.com](https://docs.oracle.com/cd/A91202_01/901_doc/server.901/a90120/ch4_dep.htm#6690)).\n* TEXT, NTEXT, and IMAGE in Microsoft SQL Server (see [Deprecated Database Engine Features in SQL Server 2016 at docs.microsoft.com](https://docs.microsoft.com/en-us/sql/database-engine/deprecated-database-engine-features-in-sql-server-2016?view=sql-server-ver15)).\n\nExample (Oracle):\n\n    CREATE TABLE ot.foo(\n    a NUMBER GENERATED BY DEFAULT AS IDENTITY,\n    b LONG NOT NULL\n    );\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlDeprecateType",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "OraOverloadInspection",
+                "shortDescription": {
+                  "text": "Overloading errors"
+                },
+                "fullDescription": {
+                  "text": "Reports invalid cases of subprogram overloading in Oracle. Example (Oracle): 'DECLARE\n    SUBTYPE fff IS BINARY_INTEGER;\n    SUBTYPE ggg IS NATURAL;\n    PROCEDURE foo (a IN ggg) IS BEGIN NULL; END;\n    PROCEDURE foo (a IN fff) IS BEGIN NULL; END;\nBEGIN\n    NULL;\nEND;' You cannot overload subprograms which parameters differ only in subtypes. For example, you cannot overload procedures where one accepts a BINARY INTEGER parameter and the other accepts a NATURAL parameter. For more information about restrictions on procedure overloading, see Restrictions on Overloading at docs.oracle.com.",
+                  "markdown": "Reports invalid cases of subprogram overloading in Oracle.\n\nExample (Oracle):\n\n    DECLARE\n        SUBTYPE fff IS BINARY_INTEGER;\n        SUBTYPE ggg IS NATURAL;\n        PROCEDURE foo (a IN ggg) IS BEGIN NULL; END;\n        PROCEDURE foo (a IN fff) IS BEGIN NULL; END;\n    BEGIN\n        NULL;\n    END;\n\nYou cannot overload subprograms which parameters differ only in subtypes. For example, you cannot overload procedures where one accepts a\nBINARY INTEGER parameter and the other accepts a NATURAL parameter. For more information about restrictions on procedure overloading,\nsee [Restrictions on Overloading at docs.oracle.com](https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/subprograms.htm)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlOverload",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Oracle",
+                      "index": 73,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlGotoInspection",
+                "shortDescription": {
+                  "text": "Usages of GOTO statements"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of backward GOTO statements and GOTO statements used to exit a loop. The extensive use of GOTO statements is generally not recommended. For details, see GOTO statement in SQL procedures at ibm.com. Instead of jumping back to a previous statement using GOTO, consider using a loop. Instead of exiting the WHILE loop with GOTO, consider using other control-of-flow statements (for example, RETURN or BREAK). Example (Oracle): 'CREATE PROCEDURE test(n INT) AS\nDECLARE\n    x INT;\nBEGIN\n    x := 0;\n    GOTO a;\n    <<a>> x := 1;\n    IF (n = 0) THEN\n        GOTO a;\n    END IF;\n    WHILE TRUE\n        LOOP\n            GOTO b;\n        END LOOP;\n    <<b>> x := 3;\nEND;'",
+                  "markdown": "Reports usages of backward GOTO statements and GOTO statements used to exit a loop.\n\nThe extensive use of GOTO statements is generally\nnot recommended. For details, see [GOTO statement in\nSQL\nprocedures at ibm.com](https://www.ibm.com/docs/no/db2/11.5?topic=procedures-goto-statement-in-sql).\n\nInstead of jumping back to a previous statement using GOTO, consider using a loop.\n\nInstead of exiting the WHILE loop with GOTO, consider using other control-of-flow statements (for example, RETURN or BREAK).\n\nExample (Oracle):\n\n    CREATE PROCEDURE test(n INT) AS\n    DECLARE\n        x INT;\n    BEGIN\n        x := 0;\n        GOTO a;\n        <<a>> x := 1;\n        IF (n = 0) THEN\n            GOTO a;\n        END IF;\n        WHILE TRUE\n            LOOP\n                GOTO b;\n            END LOOP;\n        <<b>> x := 3;\n    END;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlGoto",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlAmbiguousColumnInspection",
+                "shortDescription": {
+                  "text": "Ambiguous reference"
+                },
+                "fullDescription": {
+                  "text": "Reports columns that have identical names but belong to different tables. Example (MySQL): 'CREATE TABLE foo(id INT PRIMARY KEY);\nCREATE TABLE bar(id INT PRIMARY KEY);\n\nSELECT foo.id, bar.id FROM foo, bar WHERE id > 0;' The 'id' column appears in 'foo' and 'bar' tables. You need to qualify the column name to make the query correct. 'SELECT foo.id, bar.id FROM foo, bar WHERE foo.id > 0;'",
+                  "markdown": "Reports columns that have identical names but belong to different tables.\n\nExample (MySQL):\n\n    CREATE TABLE foo(id INT PRIMARY KEY);\n    CREATE TABLE bar(id INT PRIMARY KEY);\n\n    SELECT foo.id, bar.id FROM foo, bar WHERE id > 0;\n\nThe `id` column appears in `foo` and `bar` tables. You need to qualify the column name to\nmake the query correct.\n\n    SELECT foo.id, bar.id FROM foo, bar WHERE foo.id > 0;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlAmbiguousColumn",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SqlNullComparisonInspection",
+                "shortDescription": {
+                  "text": "Null comparison"
+                },
+                "fullDescription": {
+                  "text": "Reports comparisons with NULL that can be replaced with IS NULL or IS NOT NULL operators. Example (Microsoft SQL Server): 'CREATE TABLE foo ( id int );\n\nSELECT * FROM foo WHERE NULL = NULL;\nSELECT * FROM foo WHERE NULL != NULL;' The 'NULL = NULL' can be replaced with 'IS NULL', the 'NULL != NULL' comparison with 'IS NOT NULL'. To do this replacement, you can use Use IS NULL operator or Use IS NOT NULL operator quick-fixes. 'SELECT * FROM foo WHERE NULL IS NULL;\nSELECT * FROM foo WHERE NULL IS NOT NULL;'",
+                  "markdown": "Reports comparisons with NULL that can be replaced with IS NULL or IS NOT NULL operators.\n\nExample (Microsoft SQL Server):\n\n    CREATE TABLE foo ( id int );\n\n    SELECT * FROM foo WHERE NULL = NULL;\n    SELECT * FROM foo WHERE NULL != NULL;\n\nThe `NULL = NULL` can be replaced with `IS NULL`, the `NULL != NULL` comparison\nwith `IS NOT NULL`. To do this replacement, you can use **Use IS NULL operator** or **Use IS NOT NULL operator**\nquick-fixes.\n\n    SELECT * FROM foo WHERE NULL IS NULL;\n    SELECT * FROM foo WHERE NULL IS NOT NULL;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SqlNullComparison",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.jetbrains.plugins.sass",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "SassScssResolvedByNameOnly",
+                "shortDescription": {
+                  "text": "Missing import"
+                },
+                "fullDescription": {
+                  "text": "Reports a reference to a variable, mixin, or function that is declared in another file but this file isn't explicitly imported in the current file. Example: '* {\n  margin: $var-in-other-file;\n}'",
+                  "markdown": "Reports a reference to a variable, mixin, or function that is declared in another file but this file isn't explicitly [imported](https://sass-lang.com/documentation/at-rules/import) in the current file.\n\n**Example:**\n\n\n    * {\n      margin: $var-in-other-file;\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "SassScssResolvedByNameOnly",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Sass/SCSS",
+                      "index": 13,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SassScssUnresolvedVariable",
+                "shortDescription": {
+                  "text": "Unresolved variable"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved Sass/SCSS variable reference. Example: '* {\n  margin: $unknown-var;\n}'",
+                  "markdown": "Reports an unresolved [Sass/SCSS variable](https://sass-lang.com/documentation/variables) reference.\n\n**Example:**\n\n\n    * {\n      margin: $unknown-var;\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SassScssUnresolvedVariable",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Sass/SCSS",
+                      "index": 13,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SassScssUnresolvedMixin",
+                "shortDescription": {
+                  "text": "Unresolved mixin"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved Sass/SCSS mixin reference. Example: '* {\n  @include unknown-mixin;\n}'",
+                  "markdown": "Reports an unresolved [Sass/SCSS mixin](https://sass-lang.com/documentation/at-rules/mixin) reference.\n\n**Example:**\n\n\n    * {\n      @include unknown-mixin;\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SassScssUnresolvedMixin",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Sass/SCSS",
+                      "index": 13,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SassScssUnresolvedPlaceholderSelector",
+                "shortDescription": {
+                  "text": "Unresolved placeholder selector"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved Sass/SCSS placeholder selector reference. Example: '* {\n  @extend %unknown-placeholder-selector;\n}'",
+                  "markdown": "Reports an unresolved [Sass/SCSS placeholder selector](https://sass-lang.com/documentation/variables) reference.\n\n**Example:**\n\n\n    * {\n      @extend %unknown-placeholder-selector;\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SassScssUnresolvedPlaceholderSelector",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Sass/SCSS",
+                      "index": 13,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.intellij",
+            "version": "232.9881.131",
+            "rules": [
+              {
+                "id": "HtmlUnknownBooleanAttribute",
+                "shortDescription": {
+                  "text": "Incorrect boolean attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports an HTML non-boolean attribute without a value. Suggests configuring attributes that should not be reported.",
+                  "markdown": "Reports an HTML non-boolean attribute without a value. Suggests configuring attributes that should not be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlUnknownBooleanAttribute",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DuplicatedCode",
+                "shortDescription": {
+                  "text": "Duplicated code fragment"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicated blocks of code from the selected scope: the same file or the entire project. The inspection features quick-fixes that help you to set the size of detected duplicates, navigate to repetitive code fragments, and compare them in a tool window. The inspection options allow you to select the scope of the reported duplicated fragments and set the initial size for the duplicated language constructs.",
+                  "markdown": "Reports duplicated blocks of code from the selected scope: the same file or the entire project.\n\nThe inspection features quick-fixes that help you to set the size of detected duplicates, navigate to repetitive code fragments, and compare them in a tool window.\n\nThe inspection options allow you to select the scope of the reported duplicated fragments and set the initial size for the duplicated language constructs."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "DuplicatedCode",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "InconsistentLineSeparators",
+                "shortDescription": {
+                  "text": "Inconsistent line separators"
+                },
+                "fullDescription": {
+                  "text": "Reports files with line separators different from the ones that are specified in the project's settings. For example, the inspection will be triggered if you set the line separator to '\\n' in Settings | Editor | Code Style | Line separator, while the file you are editing uses '\\r\\n' as a line separator. The inspection also warns you about mixed line separators within a file.",
+                  "markdown": "Reports files with line separators different from the ones that are specified in the project's settings.\n\nFor example, the inspection will be triggered if you set the line separator to `\\n` in\n[Settings \\| Editor \\| Code Style \\| Line separator](settings://preferences.sourceCode?Line%20separator),\nwhile the file you are editing uses `\\r\\n` as a line separator.\n\nThe inspection also warns you about mixed line separators within a file."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "InconsistentLineSeparators",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RedundantSuppression",
+                "shortDescription": {
+                  "text": "Redundant suppression"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of the following elements that can be safely removed because the inspection they affect is no longer applicable in this context: '@SuppressWarning' annotation, or '// noinspection' line comment, or '/** noinspection */' JavaDoc comment Example: 'public class C {\n // symbol is already private,\n // but annotation is still around\n  @SuppressWarnings({\"WeakerAccess\"})\n  private boolean CONST = true;\n  void f() {\n    CONST = false;\n  }\n}'",
+                  "markdown": "Reports usages of the following elements that can be safely removed because the inspection they affect is no longer applicable in this context:\n\n* `@SuppressWarning` annotation, or\n* `// noinspection` line comment, or\n* `/** noinspection */` JavaDoc comment\n\nExample:\n\n\n    public class C {\n     // symbol is already private,\n     // but annotation is still around\n      @SuppressWarnings({\"WeakerAccess\"})\n      private boolean CONST = true;\n      void f() {\n        CONST = false;\n      }\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RedundantSuppression",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ProblematicWhitespace",
+                "shortDescription": {
+                  "text": "Problematic whitespace"
+                },
+                "fullDescription": {
+                  "text": "Reports the following problems: Tabs used for indentation when the code style is configured to use only spaces. Spaces used for indentation when the code style is configured to use only tabs. Spaces used for indentation and tabs used for alignment when the code style is configured to use smart tabs.",
+                  "markdown": "Reports the following problems:\n\n* Tabs used for indentation when the code style is configured to use only spaces.\n* Spaces used for indentation when the code style is configured to use only tabs.\n* Spaces used for indentation and tabs used for alignment when the code style is configured to use smart tabs."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ProblematicWhitespace",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlUnknownTarget",
+                "shortDescription": {
+                  "text": "Unresolved file in a link"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved file in a link.",
+                  "markdown": "Reports an unresolved file in a link."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlUnknownTarget",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LongLine",
+                "shortDescription": {
+                  "text": "Line is longer than allowed by code style"
+                },
+                "fullDescription": {
+                  "text": "Reports lines that are longer than the Hard wrap at parameter specified in Settings | Editor | Code Style | General.",
+                  "markdown": "Reports lines that are longer than the **Hard wrap at** parameter specified in [Settings \\| Editor \\| Code Style \\| General](settings://preferences.sourceCode?Hard%20wrap%20at)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LongLine",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlWrongRootElement",
+                "shortDescription": {
+                  "text": "Wrong root element"
+                },
+                "fullDescription": {
+                  "text": "Reports a root tag name different from the name specified in the '<doctype>' tag.",
+                  "markdown": "Reports a root tag name different from the name specified in the `<doctype>` tag."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "XmlWrongRootElement",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlUnknownAttribute",
+                "shortDescription": {
+                  "text": "Unknown attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports an unknown HTML attribute. Suggests configuring attributes that should not be reported.",
+                  "markdown": "Reports an unknown HTML attribute. Suggests configuring attributes that should not be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlUnknownAttribute",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpRedundantEscape",
+                "shortDescription": {
+                  "text": "Redundant character escape"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant character escape sequences that can be replaced with unescaped characters preserving the meaning. Many escape sequences that are necessary outside of a character class are redundant inside square brackets '[]' of a character class. Although unescaped opening curly braces '{' outside of character classes are allowed in some dialects (JavaScript, Python, and so on), it can cause confusion and make the pattern less portable, because there are dialects that require escaping curly braces as characters. For this reason the inspection does not report escaped opening curly braces. Example: '\\-\\;[\\.]' After the quick-fix is applied: '-;[.]' The Ignore escaped closing brackets '}' and ']' option specifies whether to report '\\}' and '\\]' outside of a character class when they are allowed to be unescaped by the RegExp dialect. New in 2017.3",
+                  "markdown": "Reports redundant character escape sequences that can be replaced with unescaped characters preserving the meaning. Many escape sequences that are necessary outside of a character class are redundant inside square brackets `[]` of a character class.\n\n\nAlthough unescaped opening curly braces `{` outside of character classes are allowed in some dialects (JavaScript, Python, and so on),\nit can cause confusion and make the pattern less portable, because there are dialects that require escaping curly braces as characters.\nFor this reason the inspection does not report escaped opening curly braces.\n\n**Example:**\n\n\n      \\-\\;[\\.]\n\nAfter the quick-fix is applied:\n\n\n      -;[.]\n\n\nThe **Ignore escaped closing brackets '}' and '\\]'** option specifies whether to report `\\}` and `\\]` outside of a character class\nwhen they are allowed to be unescaped by the RegExp dialect.\n\nNew in 2017.3"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpRedundantEscape",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CustomRegExpInspection",
+                "shortDescription": {
+                  "text": "Custom RegExp inspection"
+                },
+                "fullDescription": {
+                  "text": "Custom Regex Inspection",
+                  "markdown": "Custom Regex Inspection"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CustomRegExpInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "IncorrectFormatting",
+                "shortDescription": {
+                  "text": "Incorrect formatting"
+                },
+                "fullDescription": {
+                  "text": "Reports formatting issues that appear if your code doesn't follow your project's code style settings. This inspection is not compatible with languages that require third-party formatters for code formatting, for example, Go or C with CLangFormat enabled.",
+                  "markdown": "Reports formatting issues that appear if your code doesn't\nfollow your project's code style settings.\n\n\nThis inspection is not compatible with languages that require\nthird-party formatters for code formatting, for example, Go or\nC with CLangFormat enabled."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "IncorrectFormatting",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlExtraClosingTag",
+                "shortDescription": {
+                  "text": "Redundant closing tag"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant closing tags on empty elements, for example, 'img' or 'br'. Example: '<html>\n    <body>\n      <br></br>\n    </body>\n  </html>' After the quick-fix is applied: '<html>\n    <body>\n      <br>\n    </body>\n  </html>'",
+                  "markdown": "Reports redundant closing tags on empty elements, for example, `img` or `br`.\n\n**Example:**\n\n\n      <html>\n        <body>\n          <br></br>\n        </body>\n      </html>\n\nAfter the quick-fix is applied:\n\n\n      <html>\n        <body>\n          <br>\n        </body>\n      </html>\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlExtraClosingTag",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpUnexpectedAnchor",
+                "shortDescription": {
+                  "text": "Begin or end anchor in unexpected position"
+                },
+                "fullDescription": {
+                  "text": "Reports '^' or '\\A' anchors not at the beginning of the pattern and '$', '\\Z' or '\\z' anchors not at the end of the pattern. In the wrong position these RegExp anchors prevent the pattern from matching anything. In case of the '^' and '$' anchors, most likely the literal character was meant and the escape forgotten. Example: '(Price $10)' New in 2018.1",
+                  "markdown": "Reports `^` or `\\A` anchors not at the beginning of the pattern and `$`, `\\Z` or `\\z` anchors not at the end of the pattern. In the wrong position these RegExp anchors prevent the pattern from matching anything. In case of the `^` and `$` anchors, most likely the literal character was meant and the escape forgotten.\n\n**Example:**\n\n\n      (Price $10)\n\n\nNew in 2018.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpUnexpectedAnchor",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SpellCheckingInspection",
+                "shortDescription": {
+                  "text": "Typo"
+                },
+                "fullDescription": {
+                  "text": "Reports typos and misspellings in your code, comments, and literals and fixes them with one click.",
+                  "markdown": "Reports typos and misspellings in your code, comments, and literals and fixes them with one click."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "SpellCheckingInspection",
+                    "ideaSeverity": "TYPO",
+                    "qodanaSeverity": "Low"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Proofreading",
+                      "index": 57,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckXmlFileWithXercesValidator",
+                "shortDescription": {
+                  "text": "Failed external validation"
+                },
+                "fullDescription": {
+                  "text": "Reports a discrepancy in an XML file with the specified DTD or schema detected by the Xerces validator.",
+                  "markdown": "Reports a discrepancy in an XML file with the specified DTD or schema detected by the Xerces validator."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CheckXmlFileWithXercesValidator",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlUnknownTag",
+                "shortDescription": {
+                  "text": "Unknown tag"
+                },
+                "fullDescription": {
+                  "text": "Reports an unknown HTML tag. Suggests configuring tags that should not be reported.",
+                  "markdown": "Reports an unknown HTML tag. Suggests configuring tags that should not be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlUnknownTag",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpEscapedMetaCharacter",
+                "shortDescription": {
+                  "text": "Escaped meta character"
+                },
+                "fullDescription": {
+                  "text": "Reports escaped meta characters. Some RegExp coding styles specify that meta characters should be placed inside a character class, to make the regular expression easier to understand. This inspection does not warn about the meta character '[', ']' and '^', because those would need additional escaping inside a character class. Example: '\\d+\\.\\d+' After the quick-fix is applied: '\\d+[.]\\d+' New in 2017.1",
+                  "markdown": "Reports escaped meta characters. Some RegExp coding styles specify that meta characters should be placed inside a character class, to make the regular expression easier to understand. This inspection does not warn about the meta character `[`, `]` and `^`, because those would need additional escaping inside a character class.\n\n**Example:**\n\n\n      \\d+\\.\\d+\n\nAfter the quick-fix is applied:\n\n\n      \\d+[.]\\d+\n\nNew in 2017.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "RegExpEscapedMetaCharacter",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlHighlighting",
+                "shortDescription": {
+                  "text": "XML highlighting"
+                },
+                "fullDescription": {
+                  "text": "Reports XML validation problems in the results of a batch code inspection.",
+                  "markdown": "Reports XML validation problems in the results of a batch code inspection."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "XmlHighlighting",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlDuplicatedId",
+                "shortDescription": {
+                  "text": "Duplicate 'id' attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports a duplicate 'id' attribute in XML.",
+                  "markdown": "Reports a duplicate `id` attribute in XML."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "XmlDuplicatedId",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpDuplicateCharacterInClass",
+                "shortDescription": {
+                  "text": "Duplicate character in character class"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate characters inside a RegExp character class. Duplicate characters are unnecessary and can be removed without changing the semantics of the regex. Example: '[aabc]' After the quick-fix is applied: '[abc]'",
+                  "markdown": "Reports duplicate characters inside a RegExp character class. Duplicate characters are unnecessary and can be removed without changing the semantics of the regex.\n\n**Example:**\n\n\n      [aabc]\n\nAfter the quick-fix is applied:\n\n\n      [abc]\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpDuplicateCharacterInClass",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlUnboundNsPrefix",
+                "shortDescription": {
+                  "text": "Unbound namespace prefix"
+                },
+                "fullDescription": {
+                  "text": "Reports an unbound namespace prefix in XML.",
+                  "markdown": "Reports an unbound namespace prefix in XML."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "XmlUnboundNsPrefix",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RequiredAttributes",
+                "shortDescription": {
+                  "text": "Missing required attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports a missing mandatory attribute in an XML/HTML tag. Suggests configuring attributes that should not be reported.",
+                  "markdown": "Reports a missing mandatory attribute in an XML/HTML tag. Suggests configuring attributes that should not be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RequiredAttributes",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlUnusedNamespaceDeclaration",
+                "shortDescription": {
+                  "text": "Unused schema declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports an unused namespace declaration or location hint in XML.",
+                  "markdown": "Reports an unused namespace declaration or location hint in XML."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "XmlUnusedNamespaceDeclaration",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpRedundantClassElement",
+                "shortDescription": {
+                  "text": "Redundant '\\d', '[:digit:]', or '\\D' class elements"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant '\\d' or '[:digit:]' that are used in one class with '\\w' or '[:word:]' ('\\D' with '\\W') and can be removed. Example: '[\\w\\d]' After the quick-fix is applied: '[\\w]' New in 2022.2",
+                  "markdown": "Reports redundant `\\d` or `[:digit:]` that are used in one class with `\\w` or `[:word:]` (`\\D` with `\\W`) and can be removed.\n\n**Example:**\n\n\n      [\\w\\d]\n\nAfter the quick-fix is applied:\n\n\n      [\\w]\n\nNew in 2022.2"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "RegExpRedundantClassElement",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpSimplifiable",
+                "shortDescription": {
+                  "text": "Regular expression can be simplified"
+                },
+                "fullDescription": {
+                  "text": "Reports regular expressions that can be simplified. Example: '[a] xx* [ah-hz]' After the quick-fix is applied: 'a x+ [ahz]' New in 2022.1",
+                  "markdown": "Reports regular expressions that can be simplified.\n\n**Example:**\n\n\n      [a] xx* [ah-hz]\n\nAfter the quick-fix is applied:\n\n\n      a x+ [ahz]\n\nNew in 2022.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "RegExpSimplifiable",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpEmptyAlternationBranch",
+                "shortDescription": {
+                  "text": "Empty branch in alternation"
+                },
+                "fullDescription": {
+                  "text": "Reports empty branches in a RegExp alternation. An empty branch will only match the empty string, and in most cases that is not what is desired. This inspection will not report a single empty branch at the start or the end of an alternation. Example: '(alpha||bravo)' After the quick-fix is applied: '(alpha|bravo)' New in 2017.2",
+                  "markdown": "Reports empty branches in a RegExp alternation. An empty branch will only match the empty string, and in most cases that is not what is desired. This inspection will not report a single empty branch at the start or the end of an alternation.\n\n**Example:**\n\n\n      (alpha||bravo)\n\nAfter the quick-fix is applied:\n\n\n      (alpha|bravo)\n\nNew in 2017.2"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpEmptyAlternationBranch",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlPathReference",
+                "shortDescription": {
+                  "text": "Unresolved file reference"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved file reference in XML.",
+                  "markdown": "Reports an unresolved file reference in XML."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "XmlPathReference",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpUnnecessaryNonCapturingGroup",
+                "shortDescription": {
+                  "text": "Unnecessary non-capturing group"
+                },
+                "fullDescription": {
+                  "text": "Reports unnecessary non-capturing groups, which have no influence on the match result. Example: 'Everybody be cool, (?:this) is a robbery!' After the quick-fix is applied: 'Everybody be cool, this is a robbery!' New in 2021.1",
+                  "markdown": "Reports unnecessary non-capturing groups, which have no influence on the match result.\n\n**Example:**\n\n\n      Everybody be cool, (?:this) is a robbery!\n\nAfter the quick-fix is applied:\n\n\n      Everybody be cool, this is a robbery!\n\nNew in 2021.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpUnnecessaryNonCapturingGroup",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TodoComment",
+                "shortDescription": {
+                  "text": "TODO comment"
+                },
+                "fullDescription": {
+                  "text": "Reports TODO comments in your code. You can configure the format for TODO comments in Settings | Editor | TODO. Enable the Only warn on TODO comments without any details option to only warn on empty TODO comments, that don't provide any description on the task that should be done. Disable to report all TODO comments.",
+                  "markdown": "Reports **TODO** comments in your code.\n\nYou can configure the format for **TODO** comments in [Settings \\| Editor \\| TODO](settings://preferences.toDoOptions).\n\nEnable the **Only warn on TODO comments without any details** option to only warn on empty TODO comments, that\ndon't provide any description on the task that should be done. Disable to report all TODO comments."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TodoComment",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "Json5StandardCompliance",
+                "shortDescription": {
+                  "text": "Compliance with JSON5 standard"
+                },
+                "fullDescription": {
+                  "text": "Reports inconsistency with the language specification in a JSON5 file.",
+                  "markdown": "Reports inconsistency with [the language specification](http://json5.org) in a JSON5 file."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "Json5StandardCompliance",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JSON and JSON5",
+                      "index": 71,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlWrongAttributeValue",
+                "shortDescription": {
+                  "text": "Wrong attribute value"
+                },
+                "fullDescription": {
+                  "text": "Reports an incorrect HTML attribute value.",
+                  "markdown": "Reports an incorrect HTML attribute value."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlWrongAttributeValue",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlDefaultAttributeValue",
+                "shortDescription": {
+                  "text": "Redundant attribute with default value"
+                },
+                "fullDescription": {
+                  "text": "Reports a redundant assignment of the default value to an XML attribute.",
+                  "markdown": "Reports a redundant assignment of the default value to an XML attribute."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "XmlDefaultAttributeValue",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JsonSchemaCompliance",
+                "shortDescription": {
+                  "text": "Compliance with JSON schema"
+                },
+                "fullDescription": {
+                  "text": "Reports inconsistence between a JSON file and the JSON schema that is assigned to it.",
+                  "markdown": "Reports inconsistence between a JSON file and the [JSON schema](https://json-schema.org) that is assigned to it.  "
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JsonSchemaCompliance",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JSON and JSON5",
+                      "index": 71,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EmptyDirectory",
+                "shortDescription": {
+                  "text": "Empty directory"
+                },
+                "fullDescription": {
+                  "text": "Reports empty directories. Available only from Code | Inspect Code or Code | Analyze Code | Run Inspection by Name and isn't reported in the editor. Use the Only report empty directories located under a source folder option to have only directories under source roots reported.",
+                  "markdown": "Reports empty directories.\n\nAvailable only from **Code \\| Inspect Code** or\n**Code \\| Analyze Code \\| Run Inspection by Name** and isn't reported in the editor.\n\nUse the **Only report empty directories located under a source folder** option to have only directories under source\nroots reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EmptyDirectory",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckDtdRefs",
+                "shortDescription": {
+                  "text": "Unresolved DTD reference"
+                },
+                "fullDescription": {
+                  "text": "Reports inconsistency in a DTD-specific reference, for example, in a reference to an XML entity or to a DTD element declaration. Works in DTD an XML files.",
+                  "markdown": "Reports inconsistency in a DTD-specific reference, for example, in a reference to an XML entity or to a DTD element declaration. Works in DTD an XML files."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CheckDtdRefs",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NonAsciiCharacters",
+                "shortDescription": {
+                  "text": "Non-ASCII characters"
+                },
+                "fullDescription": {
+                  "text": "Reports code elements that use non-ASCII symbols in an unusual context. Example: Non-ASCII characters used in identifiers, strings, or comments. Identifiers written in different languages, such as 'myСollection' with the letter 'C' written in Cyrillic. Comments or strings containing Unicode symbols, such as long dashes and arrows.",
+                  "markdown": "Reports code elements that use non-ASCII symbols in an unusual context.\n\nExample:\n\n* Non-ASCII characters used in identifiers, strings, or comments.\n* Identifiers written in different languages, such as `my`**С**`ollection` with the letter **C** written in Cyrillic.\n* Comments or strings containing Unicode symbols, such as long dashes and arrows."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NonAsciiCharacters",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Internationalization",
+                      "index": 74,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LossyEncoding",
+                "shortDescription": {
+                  "text": "Lossy encoding"
+                },
+                "fullDescription": {
+                  "text": "Reports characters that cannot be displayed because of the current document encoding. Examples: If you type international characters in a document with the US-ASCII charset, some characters will be lost on save. If you load a UTF-8-encoded file using the ISO-8859-1 one-byte charset, some characters will be displayed incorrectly. You can fix this by changing the file encoding either by specifying the encoding directly in the file, e.g. by editing 'encoding=' attribute in the XML prolog of XML file, or by changing the corresponding options in Settings | Editor | File Encodings.",
+                  "markdown": "Reports characters that cannot be displayed because of the current document encoding.\n\nExamples:\n\n* If you type international characters in a document with the **US-ASCII** charset, some characters will be lost on save.\n* If you load a **UTF-8** -encoded file using the **ISO-8859-1** one-byte charset, some characters will be displayed incorrectly.\n\nYou can fix this by changing the file encoding\neither by specifying the encoding directly in the file, e.g. by editing `encoding=` attribute in the XML prolog of XML file,\nor by changing the corresponding options in **Settings \\| Editor \\| File Encodings**."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LossyEncoding",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Internationalization",
+                      "index": 74,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "IgnoreFileDuplicateEntry",
+                "shortDescription": {
+                  "text": "Ignore file duplicates"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate entries (patterns) in the ignore file (e.g. .gitignore, .hgignore). Duplicate entries in these files are redundant and can be removed. Example: '# Output directories\n    /out/\n    /target/\n    /out/'",
+                  "markdown": "Reports duplicate entries (patterns) in the ignore file (e.g. .gitignore, .hgignore). Duplicate entries in these files are redundant and can be removed.\n\nExample:\n\n\n        # Output directories\n        /out/\n        /target/\n        /out/\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "IgnoreFileDuplicateEntry",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Version control",
+                      "index": 77,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JsonStandardCompliance",
+                "shortDescription": {
+                  "text": "Compliance with JSON standard"
+                },
+                "fullDescription": {
+                  "text": "Reports the following discrepancies of a JSON file with the language specification: A line or block comment (configurable). Multiple top-level values (expect for JSON Lines files, configurable for others). A trailing comma in an object or array (configurable). A single quoted string. A property key is a not a double quoted strings. A NaN or Infinity/-Infinity numeric value as a floating point literal (configurable).",
+                  "markdown": "Reports the following discrepancies of a JSON file with [the language specification](https://tools.ietf.org/html/rfc7159):\n\n* A line or block comment (configurable).\n* Multiple top-level values (expect for JSON Lines files, configurable for others).\n* A trailing comma in an object or array (configurable).\n* A single quoted string.\n* A property key is a not a double quoted strings.\n* A NaN or Infinity/-Infinity numeric value as a floating point literal (configurable)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "JsonStandardCompliance",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JSON and JSON5",
+                      "index": 71,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JsonSchemaDeprecation",
+                "shortDescription": {
+                  "text": "Deprecated JSON property"
+                },
+                "fullDescription": {
+                  "text": "Reports a deprecated property in a JSON file. Note that deprecation mechanism is not defined in the JSON Schema specification yet, and this inspection uses a non-standard extension 'deprecationMessage'.",
+                  "markdown": "Reports a deprecated property in a JSON file.  \nNote that deprecation mechanism is not defined in the JSON Schema specification yet, and this inspection uses a non-standard extension 'deprecationMessage'."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JsonSchemaDeprecation",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JSON and JSON5",
+                      "index": 71,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JsonSchemaRefReference",
+                "shortDescription": {
+                  "text": "Unresolved '$ref' and '$schema' references"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved '$ref' or '$schema' path in a JSON schema.",
+                  "markdown": "Reports an unresolved `$ref` or `$schema` path in a JSON schema.  "
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JsonSchemaRefReference",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JSON and JSON5",
+                      "index": 71,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SSBasedInspection",
+                "shortDescription": {
+                  "text": "Structural search inspection"
+                },
+                "fullDescription": {
+                  "text": "Allows configuring Structural Search/Structural Replace templates that you can apply to the file you are editing. All matches will be highlighted and marked with the template name that you have configured. If you configure the Structural Replace pattern as well, the corresponding replace option will be available as a quick-fix.",
+                  "markdown": "Allows configuring **Structural Search/Structural Replace** templates that you can apply to the file you are editing.\n\nAll matches will be highlighted and marked with the template name that you have configured.\nIf you configure the **Structural Replace** pattern as well, the corresponding replace option will be available as a quick-fix."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SSBasedInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Structural search",
+                      "index": 78,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckValidXmlInScriptTagBody",
+                "shortDescription": {
+                  "text": "Malformed content of 'script' tag"
+                },
+                "fullDescription": {
+                  "text": "Reports contents of 'script' tags that are invalid XML. Example: '<script type=\"text/javascript\">\n    console.log('<');\n  </script>' After the quick-fix is applied: '<script type=\"text/javascript\">\n    console.log('&lt;');\n  </script>'",
+                  "markdown": "Reports contents of `script` tags that are invalid XML.  \n\n**Example:**\n\n\n      <script type=\"text/javascript\">\n        console.log('<');\n      </script>\n\nAfter the quick-fix is applied:\n\n\n      <script type=\"text/javascript\">\n        console.log('&lt;');\n      </script>\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CheckValidXmlInScriptTagBody",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpSuspiciousBackref",
+                "shortDescription": {
+                  "text": "Suspicious back reference"
+                },
+                "fullDescription": {
+                  "text": "Reports back references that will not be resolvable at runtime. This means that the back reference can never match anything. A back reference will not be resolvable when the group is defined after the back reference, or if the group is defined in a different branch of an alternation. Example of a group defined after its back reference: '\\1(abc)' Example of a group and a back reference in different branches: 'a(b)c|(xy)\\1z' New in 2022.1",
+                  "markdown": "Reports back references that will not be resolvable at runtime. This means that the back reference can never match anything. A back reference will not be resolvable when the group is defined after the back reference, or if the group is defined in a different branch of an alternation.\n\n**Example of a group defined after its back reference:**\n\n\n      \\1(abc)\n\n**Example of a group and a back reference in different branches:**\n\n\n      a(b)c|(xy)\\1z\n\nNew in 2022.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpSuspiciousBackref",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpSingleCharAlternation",
+                "shortDescription": {
+                  "text": "Single character alternation"
+                },
+                "fullDescription": {
+                  "text": "Reports single char alternation in a RegExp. It is simpler to use a character class instead. This may also provide better matching performance. Example: 'a|b|c|d' After the quick-fix is applied: '[abcd]' New in 2017.1",
+                  "markdown": "Reports single char alternation in a RegExp. It is simpler to use a character class instead. This may also provide better matching performance.\n\n**Example:**\n\n\n      a|b|c|d\n\nAfter the quick-fix is applied:\n\n\n      [abcd]\n\n\nNew in 2017.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpSingleCharAlternation",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckTagEmptyBody",
+                "shortDescription": {
+                  "text": "Empty element content"
+                },
+                "fullDescription": {
+                  "text": "Reports XML elements without contents. Example: '<user>\n    <name></name>\n  </user>' After the quick-fix is applied: '<user>\n    <name/>\n  </user>'",
+                  "markdown": "Reports XML elements without contents.\n\n**Example:**\n\n\n      <user>\n        <name></name>\n      </user>\n\nAfter the quick-fix is applied:\n\n\n      <user>\n        <name/>\n      </user>\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CheckTagEmptyBody",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnresolvedReference",
+                "shortDescription": {
+                  "text": "Unresolved reference"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved reference to a named pattern ('define') in RELAX-NG files that use XML syntax. Suggests creating the referenced 'define' element.",
+                  "markdown": "Reports an unresolved reference to a named pattern (`define`) in RELAX-NG files that use XML syntax. Suggests creating the referenced `define` element."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "UnresolvedReference",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RELAX NG",
+                      "index": 81,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlMissingClosingTag",
+                "shortDescription": {
+                  "text": "Missing closing tag"
+                },
+                "fullDescription": {
+                  "text": "Reports an HTML element without a closing tag. Some coding styles require that HTML elements have closing tags even where this is optional. Example: '<html>\n    <body>\n      <p>Behold!\n    </body>\n  </html>' After the quick-fix is applied: '<html>\n    <body>\n      <p>Behold!</p>\n    </body>\n  </html>'",
+                  "markdown": "Reports an HTML element without a closing tag. Some coding styles require that HTML elements have closing tags even where this is optional.\n\n**Example:**\n\n\n      <html>\n        <body>\n          <p>Behold!\n        </body>\n      </html>\n\nAfter the quick-fix is applied:\n\n\n      <html>\n        <body>\n          <p>Behold!</p>\n        </body>\n      </html>\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "HtmlMissingClosingTag",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlUnknownAnchorTarget",
+                "shortDescription": {
+                  "text": "Unresolved fragment in a link"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved last part of an URL after the '#' sign.",
+                  "markdown": "Reports an unresolved last part of an URL after the `#` sign."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlUnknownAnchorTarget",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlInvalidId",
+                "shortDescription": {
+                  "text": "Unresolved 'id' reference"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved 'id' reference in XML.",
+                  "markdown": "Reports an unresolved `id` reference in XML."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "XmlInvalidId",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ReassignedToPlainText",
+                "shortDescription": {
+                  "text": "Reassigned to plain text"
+                },
+                "fullDescription": {
+                  "text": "Reports files that were explicitly re-assigned to Plain Text File Type. This association is unnecessary because the platform auto-detects text files by content automatically. You can dismiss this warning by removing the file type association in Settings | Editor | File Types | Text.",
+                  "markdown": "Reports files that were explicitly re-assigned to Plain Text File Type. This association is unnecessary because the platform auto-detects text files by content automatically.\n\nYou can dismiss this warning by removing the file type association\nin **Settings \\| Editor \\| File Types \\| Text**."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ReassignedToPlainText",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "Annotator",
+                "shortDescription": {
+                  "text": "Annotator"
+                },
+                "fullDescription": {
+                  "text": "Reports issues essential to this file (e.g., syntax errors) in the result of a batch code inspection run. These issues are usually always highlighted in the editor and can't be configured, unlike inspections. These options control the scope of checks performed by this inspection: Option \"Report syntax errors\": report parser-related issues. Option \"Report issues from language-specific annotators\": report issues found by annotators configured for the relevant language. See Custom Language Support: Annotators for details. Option \"Report other highlighting problems\": report issues specific to the language of the current file (e.g., type mismatches or unreported exceptions). See Custom Language Support: Highlighting for details.",
+                  "markdown": "Reports issues essential to this file (e.g., syntax errors) in the result of a batch code inspection run. These issues are usually always highlighted in the editor and can't be configured, unlike inspections. These options control the scope of checks performed by this inspection:\n\n* Option \"**Report syntax errors**\": report parser-related issues.\n* Option \"**Report issues from language-specific annotators** \": report issues found by annotators configured for the relevant language. See [Custom Language Support: Annotators](https://plugins.jetbrains.com/docs/intellij/annotator.html) for details.\n* Option \"**Report other highlighting problems** \": report issues specific to the language of the current file (e.g., type mismatches or unreported exceptions). See [Custom Language Support: Highlighting](https://plugins.jetbrains.com/docs/intellij/syntax-highlighting-and-error-highlighting.html#semantic-highlighting) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "Annotator",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JsonDuplicatePropertyKeys",
+                "shortDescription": {
+                  "text": "Duplicate keys in object literals"
+                },
+                "fullDescription": {
+                  "text": "Reports a duplicate key in an object literal.",
+                  "markdown": "Reports a duplicate key in an object literal."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JsonDuplicatePropertyKeys",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JSON and JSON5",
+                      "index": 71,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XmlDeprecatedElement",
+                "shortDescription": {
+                  "text": "Deprecated symbol"
+                },
+                "fullDescription": {
+                  "text": "Reports a deprecated XML element or attribute. Symbols can be marked by XML comment or documentation tag with text 'deprecated'.",
+                  "markdown": "Reports a deprecated XML element or attribute.\n\nSymbols can be marked by XML comment or documentation tag with text 'deprecated'."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "XmlDeprecatedElement",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "XML",
+                      "index": 40,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpRedundantNestedCharacterClass",
+                "shortDescription": {
+                  "text": "Redundant nested character class"
+                },
+                "fullDescription": {
+                  "text": "Reports unnecessary nested character classes. Example: '[a-c[x-z]]' After the quick-fix is applied: '[a-cx-z]' New in 2020.2",
+                  "markdown": "Reports unnecessary nested character classes.\n\n**Example:**\n\n\n      [a-c[x-z]]\n\nAfter the quick-fix is applied:\n\n\n      [a-cx-z]\n\nNew in 2020.2"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpRedundantNestedCharacterClass",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpOctalEscape",
+                "shortDescription": {
+                  "text": "Octal escape"
+                },
+                "fullDescription": {
+                  "text": "Reports octal escapes, which are easily confused with back references. Use hexadecimal escapes to avoid confusion. Example: '\\07' After the quick-fix is applied: '\\x07' New in 2017.1",
+                  "markdown": "Reports octal escapes, which are easily confused with back references. Use hexadecimal escapes to avoid confusion.\n\n**Example:**\n\n\n      \\07\n\nAfter the quick-fix is applied:\n\n\n      \\x07\n\nNew in 2017.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "RegExpOctalEscape",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnusedDefine",
+                "shortDescription": {
+                  "text": "Unused define"
+                },
+                "fullDescription": {
+                  "text": "Reports an unused named pattern ('define') in a RELAX-NG file (XML or Compact Syntax). 'define' elements that are used through an include in another file are ignored.",
+                  "markdown": "Reports an unused named pattern (`define`) in a RELAX-NG file (XML or Compact Syntax). `define` elements that are used through an include in another file are ignored."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnusedDefine",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RELAX NG",
+                      "index": 81,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpAnonymousGroup",
+                "shortDescription": {
+                  "text": "Anonymous capturing group or numeric back reference"
+                },
+                "fullDescription": {
+                  "text": "Reports anonymous capturing groups and numeric back references in a RegExp. These are only reported when the RegExp dialect supports named group and named group references. Named groups and named back references improve code readability and are recommended to use instead. When a capture is not needed, matching can be more performant and use less memory by using a non-capturing group, i.e. '(?:xxx)' instead of '(xxx)'. Example: '(\\d\\d\\d\\d)\\1' A better regex pattern could look like this: '(?<quad>\\d\\d\\d\\d)\\k<quad>' New in 2017.2",
+                  "markdown": "Reports anonymous capturing groups and numeric back references in a RegExp. These are only reported when the RegExp dialect supports named group and named group references. Named groups and named back references improve code readability and are recommended to use instead. When a capture is not needed, matching can be more performant and use less memory by using a non-capturing group, i.e. `(?:xxx)` instead of `(xxx)`.\n\n**Example:**\n\n\n      (\\d\\d\\d\\d)\\1\n\nA better regex pattern could look like this:\n\n\n      (?<quad>\\d\\d\\d\\d)\\k<quad>\n\nNew in 2017.2"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpAnonymousGroup",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpRepeatedSpace",
+                "shortDescription": {
+                  "text": "Consecutive spaces"
+                },
+                "fullDescription": {
+                  "text": "Reports multiple consecutive spaces in a RegExp. Because spaces are not visible by default, it can be hard to see how many spaces are required. The RegExp can be made more clear by replacing the consecutive spaces with a single space and a counted quantifier. Example: '(     )' After the quick-fix is applied: '( {5})' New in 2017.1",
+                  "markdown": "Reports multiple consecutive spaces in a RegExp. Because spaces are not visible by default, it can be hard to see how many spaces are required. The RegExp can be made more clear by replacing the consecutive spaces with a single space and a counted quantifier.\n\n**Example:**\n\n\n      (     )\n\nAfter the quick-fix is applied:\n\n\n      ( {5})\n\n\nNew in 2017.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpRepeatedSpace",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "RegExpDuplicateAlternationBranch",
+                "shortDescription": {
+                  "text": "Duplicate branch in alternation"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate branches in a RegExp alternation. Duplicate branches slow down matching and obscure the intent of the expression. Example: '(alpha|bravo|charlie|alpha)' After the quick-fix is applied: '(alpha|bravo|charlie)' New in 2017.1",
+                  "markdown": "Reports duplicate branches in a RegExp alternation. Duplicate branches slow down matching and obscure the intent of the expression.\n\n**Example:**\n\n\n      (alpha|bravo|charlie|alpha)\n\nAfter the quick-fix is applied:\n\n\n      (alpha|bravo|charlie)\n\nNew in 2017.1"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RegExpDuplicateAlternationBranch",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "RegExp",
+                      "index": 46,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckEmptyScriptTag",
+                "shortDescription": {
+                  "text": "Empty tag"
+                },
+                "fullDescription": {
+                  "text": "Reports empty tags that do not work in some browsers. Example: '<html>\n    <script/>\n  </html>' After the quick-fix is applied: '<html>\n    <script></script>\n  </html>'",
+                  "markdown": "Reports empty tags that do not work in some browsers.\n\n**Example:**\n\n\n      <html>\n        <script/>\n      </html>\n\nAfter the quick-fix is applied:\n\n\n      <html>\n        <script></script>\n      </html>\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CheckEmptyScriptTag",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "JavaScript",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "JSUnusedAssignment",
+                "shortDescription": {
+                  "text": "Unused assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports a variable whose value is never used after assignment. Suggests removing the unused variable to shorten the code and to avoid redundant allocations. The following cases are reported: A variable is never read after assignment. The value of a variable is always overwritten with another assignment before the variable is read next time. The initializer of a variable is redundant (for one of the above-mentioned reasons).",
+                  "markdown": "Reports a variable whose value is never used after assignment.  \nSuggests removing the unused variable to shorten the code and to avoid redundant allocations.\n\nThe following cases are reported:\n\n* A variable is never read after assignment.\n* The value of a variable is always overwritten with another assignment before the variable is read next time.\n* The initializer of a variable is redundant (for one of the above-mentioned reasons)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnusedAssignment",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Unused symbols",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FlowJSError",
+                "shortDescription": {
+                  "text": "Flow type checker"
+                },
+                "fullDescription": {
+                  "text": "Reports errors from Flow.",
+                  "markdown": "Reports errors from [Flow](https://flowtype.org/)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "FlowJSError",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Flow type checker",
+                      "index": 17,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ReuseOfLocalVariableJS",
+                "shortDescription": {
+                  "text": "Reuse of local variable"
+                },
+                "fullDescription": {
+                  "text": "Reports reusing a local variable and overwriting its value with a new value that is not related to the original variable usage. Reusing a local variable in this way may be confusing because the intended semantics of the local variable may vary with each usage. It may also cause bugs, if code changes result in values that were expected to be overwritten while they are actually live. It is good practices to keep variable lifetimes as short as possible, and not reuse local variables for the sake of brevity.",
+                  "markdown": "Reports reusing a local variable and overwriting its value with a new value that is not related to the original variable usage. Reusing a local variable in this way may be confusing because the intended semantics of the local variable may vary with each usage. It may also cause bugs, if code changes result in values that were expected to be overwritten while they are actually live. It is good practices to keep variable lifetimes as short as possible, and not reuse local variables for the sake of brevity."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ReuseOfLocalVariableJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Data flow",
+                      "index": 18,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ShiftOutOfRangeJS",
+                "shortDescription": {
+                  "text": "Shift operation by possibly wrong constant"
+                },
+                "fullDescription": {
+                  "text": "Reports a shift operation where the second operand is a constant outside the reasonable range, for example, an integer shift operation outside the range '0..31', shifting by negative or overly large values.",
+                  "markdown": "Reports a shift operation where the second operand is a constant outside the reasonable range, for example, an integer shift operation outside the range `0..31`, shifting by negative or overly large values."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ShiftOutOfRangeJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Bitwise operation issues",
+                      "index": 22,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSClosureCompilerSyntax",
+                "shortDescription": {
+                  "text": "Incorrect usage of JSDoc tags"
+                },
+                "fullDescription": {
+                  "text": "Reports warnings implied by Google Closure Compiler annotations including correct use of '@abstract', '@interface', and '@implements' tags.",
+                  "markdown": "Reports warnings implied by *Google Closure Compiler* annotations including correct use of `@abstract`, `@interface`, and `@implements` tags."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSClosureCompilerSyntax",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ConvertLetToConst",
+                "shortDescription": {
+                  "text": "'let' is used instead of 'const'"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'let' declaration that can be made 'const'.",
+                  "markdown": "Reports a `let` declaration that can be made `const`.  "
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6ConvertLetToConst",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSXDomNesting",
+                "shortDescription": {
+                  "text": "Invalid DOM element nesting"
+                },
+                "fullDescription": {
+                  "text": "Detects HTML elements in JSX files which are not nested properly according to the DOM specification. React reports runtime warnings on incorrectly nested elements.",
+                  "markdown": "Detects HTML elements in JSX files which are not nested properly according to the DOM specification. React reports runtime warnings on incorrectly nested elements."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSXDomNesting",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/React",
+                      "index": 29,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "BadExpressionStatementJS",
+                "shortDescription": {
+                  "text": "Expression statement which is not assignment or call"
+                },
+                "fullDescription": {
+                  "text": "Reports an expression statement that is neither an assignment nor a call. Such statements usually indicate an error.",
+                  "markdown": "Reports an expression statement that is neither an assignment nor a call. Such statements usually indicate an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "BadExpressionStatementJS",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Validity issues",
+                      "index": 30,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ConfusingFloatingPointLiteralJS",
+                "shortDescription": {
+                  "text": "Confusing floating point literal"
+                },
+                "fullDescription": {
+                  "text": "Reports any floating point number that does not have a decimal point, or any numbers before the decimal point, or and numbers after the decimal point. Such literals may be confusing, and violate several coding standards.",
+                  "markdown": "Reports any floating point number that does not have a decimal point, or any numbers before the decimal point, or and numbers after the decimal point. Such literals may be confusing, and violate several coding standards."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ConfusingFloatingPointLiteralJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ContinueOrBreakFromFinallyBlockJS",
+                "shortDescription": {
+                  "text": "'continue' or 'break' inside 'finally' block"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'break' or 'continue' statement inside a 'finally' block. Such statements are very confusing, may hide exceptions, and complicate debugging.",
+                  "markdown": "Reports a `break` or `continue` statement inside a `finally` block. Such statements are very confusing, may hide exceptions, and complicate debugging."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ContinueOrBreakFromFinallyBlockJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnnecessaryLocalVariableJS",
+                "shortDescription": {
+                  "text": "Redundant local variable"
+                },
+                "fullDescription": {
+                  "text": "Reports an unnecessary local variable that does not make a function more comprehensible: a local variable that is immediately returned a local variable that is immediately assigned to another variable and is not used anymore a local variable that always has the same value as another local variable or parameter. Use the checkbox below to have this inspection ignore variables that are immediately returned or thrown. Some coding styles suggest using such variables for clarity and ease of debugging.",
+                  "markdown": "Reports an unnecessary local variable that does not make a function more comprehensible:\n\n* a local variable that is immediately returned\n* a local variable that is immediately assigned to another variable and is not used anymore\n* a local variable that always has the same value as another local variable or parameter.\n\n\nUse the checkbox below to have this inspection ignore variables that are immediately\nreturned or thrown. Some coding styles suggest using such variables for clarity and\nease of debugging."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnnecessaryLocalVariableJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Data flow",
+                      "index": 18,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSMethodCanBeStatic",
+                "shortDescription": {
+                  "text": "Method can be made 'static'"
+                },
+                "fullDescription": {
+                  "text": "Reports a class method that can be safely made 'static'. A method can be 'static' if it does not reference any of its class' non-static methods and non-static fields and is not overridden in a subclass. Use the first checkbox below to inspect only 'private' methods.",
+                  "markdown": "Reports a class method that can be safely made `static`. A method can be `static` if it does not reference any of its class' non-static methods and non-static fields and is not overridden in a subclass.\n\n\nUse the first checkbox below to inspect only `private` methods."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSMethodCanBeStatic",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSXUnresolvedComponent",
+                "shortDescription": {
+                  "text": "Unresolved JSX component"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved reference to a JSX component. Suggests adding a missing import statement if the referenced component is defined in the project or its dependencies or creating a new component with this name. The template for a new component can be modified in Editor | File and Code Templates.",
+                  "markdown": "Reports an unresolved reference to a JSX component. Suggests adding a missing import statement if the referenced component is defined in the project or its dependencies or creating a new component with this name.\n\nThe template for a new component can be modified in Editor \\| File and Code Templates."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSXUnresolvedComponent",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnnecessaryLabelOnBreakStatementJS",
+                "shortDescription": {
+                  "text": "Unnecessary label on 'break' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a labeled 'break' statement whose labels may be removed without changing the flow of control.",
+                  "markdown": "Reports a labeled `break` statement whose labels may be removed without changing the flow of control."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnnecessaryLabelOnBreakStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ContinueStatementJS",
+                "shortDescription": {
+                  "text": "'continue' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'continue' statement.",
+                  "markdown": "Reports a `continue` statement."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ContinueStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUndeclaredVariable",
+                "shortDescription": {
+                  "text": "Implicitly declared global JavaScript variable"
+                },
+                "fullDescription": {
+                  "text": "Reports an implicit declaration of a global variable. Example: 'var aaa = 1; // good\n  bbb = 2; // bad, if bbb is not declared with 'var' somewhere'",
+                  "markdown": "Reports an implicit declaration of a global variable.\n\nExample:\n\n\n      var aaa = 1; // good\n      bbb = 2; // bad, if bbb is not declared with 'var' somewhere\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSUndeclaredVariable",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DivideByZeroJS",
+                "shortDescription": {
+                  "text": "Division by zero"
+                },
+                "fullDescription": {
+                  "text": "Reports division by zero or a remainder by zero.",
+                  "markdown": "Reports division by zero or a remainder by zero."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DivideByZeroJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSReferencingMutableVariableFromClosure",
+                "shortDescription": {
+                  "text": "Referencing mutable variable from closure"
+                },
+                "fullDescription": {
+                  "text": "Reports access to outer mutable variables from functions. Example: 'for (var i = 1; i <= 3; i++) {\n    setTimeout(function() {\n        console.log(i); // bad\n    }, 0);\n  }'",
+                  "markdown": "Reports access to outer mutable variables from functions.\n\nExample:\n\n\n      for (var i = 1; i <= 3; i++) {\n        setTimeout(function() {\n            console.log(i); // bad\n        }, 0);\n      }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSReferencingMutableVariableFromClosure",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ChainedEqualityJS",
+                "shortDescription": {
+                  "text": "Chained equality"
+                },
+                "fullDescription": {
+                  "text": "Reports a chained equality comparison (i.e. 'a==b==c'). Such comparisons are confusing.",
+                  "markdown": "Reports a chained equality comparison (i.e. `a==b==c`). Such comparisons are confusing."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ChainedEqualityComparisonsJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SillyAssignmentJS",
+                "shortDescription": {
+                  "text": "Variable is assigned to itself"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment in the form 'x = x'.",
+                  "markdown": "Reports an assignment in the form `x = x`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SillyAssignmentJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Assignment issues",
+                      "index": 48,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ConvertRequireIntoImport",
+                "shortDescription": {
+                  "text": "'require()' is used instead of 'import'"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'require()' statement. Suggests converting it to a 'require()' call with an 'import' statement. Enable 'Convert require() inside inner scopes with Fix all action' to convert all 'require()' calls inside the nested functions and statements when using the 'Fix all' action. Please note that converting 'require()' statements inside inner scopes to 'import' statements may cause changes in the semantics of the code. Import statements are static module dependencies and are hoisted, which means that they are moved to the top of the current module. 'require()' calls load modules dynamically. They can be executed conditionally, and their scope is defined by the expression in which they are used. Clear the 'Convert require() inside inner scopes with Fix all action' checkbox to prevent any changes in these complex cases when using the 'Fix all' action.",
+                  "markdown": "Reports a `require()` statement. Suggests converting it to a `require()` call with an `import` statement.   \n\nEnable 'Convert require() inside inner scopes with Fix all action' to convert all `require()` calls inside the nested functions and statements when using the 'Fix all' action.   \n\nPlease note that converting `require()` statements inside inner scopes to `import` statements may cause changes in the semantics of the code. Import statements are static module dependencies and are hoisted, which means that they are moved to the top of the current module. `require()` calls load modules dynamically. They can be executed conditionally, and their scope is defined by the expression in which they are used.   \nClear the 'Convert require() inside inner scopes with Fix all action' checkbox to prevent any changes in these complex cases when using the 'Fix all' action."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6ConvertRequireIntoImport",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptCheckImport",
+                "shortDescription": {
+                  "text": "Unresolved imported name"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved name or binding in an 'import' declaration in TypeScript code.",
+                  "markdown": "Reports an unresolved name or binding in an `import` declaration in TypeScript code."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptCheckImport",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSXSyntaxUsed",
+                "shortDescription": {
+                  "text": "JSX syntax used"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a JSX tag in JavaScript code.",
+                  "markdown": "Reports a usage of a JSX tag in JavaScript code."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "JSXSyntaxUsed",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSJoinVariableDeclarationAndAssignment",
+                "shortDescription": {
+                  "text": "Variable declaration can be merged with the first assignment to the variable"
+                },
+                "fullDescription": {
+                  "text": "Reports a variable that is declared without an initializer and is used much further in the code or in a single nested scope. Suggests moving the variable closer to its usages and joining it with the initializer expression.",
+                  "markdown": "Reports a variable that is declared without an initializer and is used much further in the code or in a single nested scope. Suggests moving the variable closer to its usages and joining it with the initializer expression."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSJoinVariableDeclarationAndAssignment",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSRedundantSwitchStatement",
+                "shortDescription": {
+                  "text": "'switch' statement is redundant and can be replaced"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'switch' statement with an empty body, or with only one 'case' branch, or with a 'default' branch only.",
+                  "markdown": "Reports a `switch` statement with an empty body, or with only one `case` branch, or with a `default` branch only."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSRedundantSwitchStatement",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnusedGlobalSymbols",
+                "shortDescription": {
+                  "text": "Unused global symbol"
+                },
+                "fullDescription": {
+                  "text": "Reports an unused globally accessible public function, variable, class, or property.",
+                  "markdown": "Reports an unused globally accessible public function, variable, class, or property."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnusedGlobalSymbols",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Unused symbols",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ConvertModuleExportToExport",
+                "shortDescription": {
+                  "text": "'module.exports' is used instead of 'export'"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'module.export' statement. Suggests replacing it with an 'export' or 'export default' statement. Please note that the quick-fix for converting 'module.export' into 'export' is not available for 'module.export' inside functions or statements because 'export' statements can only be at the top level of a module.",
+                  "markdown": "Reports a `module.export` statement. Suggests replacing it with an `export` or `export default` statement.   \n\nPlease note that the quick-fix for converting `module.export` into `export` is not available for `module.export` inside functions or statements because `export` statements can only be at the top level of a module."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6ConvertModuleExportToExport",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DocumentWriteJS",
+                "shortDescription": {
+                  "text": "Call to 'document.write()'"
+                },
+                "fullDescription": {
+                  "text": "Reports a method call to 'document.write()' or 'document.writeln()'. Most usages of such calls are performed better with explicit DOM calls, such as 'getElementByID()' and 'createElement()'. Additionally, the 'write()' and 'writeln()' calls will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can result in difficulty to point out bugs.",
+                  "markdown": "Reports a method call to `document.write()` or `document.writeln()`. Most usages of such calls are performed better with explicit DOM calls, such as `getElementByID()` and `createElement()`. Additionally, the `write()` and `writeln()` calls will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can result in difficulty to point out bugs."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DocumentWriteJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/DOM issues",
+                      "index": 54,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "BlockStatementJS",
+                "shortDescription": {
+                  "text": "Unnecessary block statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a block statement that is not used as the body of 'if', 'for', 'while', 'do', 'with', or 'try' statements, or as the body of a function declaration. Starting from ECMAScript 6, JavaScript blocks introduce new scopes for 'let' and 'const' variables, but still free-standing block statements may be confusing and result in subtle bugs when used with 'var' variables.",
+                  "markdown": "Reports a block statement that is not used as the body of `if`, `for`, `while`, `do`, `with`, or `try` statements, or as the body of a function declaration. Starting from ECMAScript 6, JavaScript blocks introduce new scopes for `let` and `const` variables, but still free-standing block statements may be confusing and result in subtle bugs when used with `var` variables."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "BlockStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "InfiniteRecursionJS",
+                "shortDescription": {
+                  "text": "Infinite recursion"
+                },
+                "fullDescription": {
+                  "text": "Reports a function which must either recurse infinitely or throw an exception. Such functions may not return normally.",
+                  "markdown": "Reports a function which must either recurse infinitely or throw an exception. Such functions may not return normally."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "InfiniteRecursionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NestedConditionalExpressionJS",
+                "shortDescription": {
+                  "text": "Nested conditional expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a ternary conditional expression within another ternary condition. Such nested conditionals may be extremely confusing, and best replaced by more explicit conditional logic.",
+                  "markdown": "Reports a ternary conditional expression within another ternary condition. Such nested conditionals may be extremely confusing, and best replaced by more explicit conditional logic."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NestedConditionalExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "IncompatibleMaskJS",
+                "shortDescription": {
+                  "text": "Incompatible bitwise mask operation"
+                },
+                "fullDescription": {
+                  "text": "Reports a bitwise mask expression which for sure evaluates to 'true' or 'false'. Expressions are of the form '(var & constant1) == constant2' or '(var | constant1) == constant2', where 'constant1' and 'constant2' are incompatible bitmask constants. Example: '// Incompatible mask: as the last byte in mask is zero,\n// something like 0x1200 would be possible, but not 0x1234\nif ((mask & 0xFF00) == 0x1234) {...}'",
+                  "markdown": "Reports a bitwise mask expression which for sure evaluates to `true` or `false`. Expressions are of the form `(var & constant1) == constant2` or `(var | constant1) == constant2`, where `constant1` and `constant2` are incompatible bitmask constants.\n\nExample:\n\n\n    // Incompatible mask: as the last byte in mask is zero,\n    // something like 0x1200 would be possible, but not 0x1234\n    if ((mask & 0xFF00) == 0x1234) {...}\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "IncompatibleBitwiseMaskOperation",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Bitwise operation issues",
+                      "index": 22,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TextLabelInSwitchStatementJS",
+                "shortDescription": {
+                  "text": "Text label in 'switch' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a labeled statement inside a 'switch' statement, which often results from a typo. Example: 'switch(x)\n    {\n        case 1:\n        case2:   //typo!\n        case 3:\n            break;\n    }'",
+                  "markdown": "Reports a labeled statement inside a `switch` statement, which often results from a typo.\n\nExample:\n\n\n        switch(x)\n        {\n            case 1:\n            case2:   //typo!\n            case 3:\n                break;\n        }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TextLabelInSwitchStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6PossiblyAsyncFunction",
+                "shortDescription": {
+                  "text": "'await' in non-async function"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of 'await' in a function that was possibly intended to be async but is actually missing the 'async' modifier. Although 'await' can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made 'async'.",
+                  "markdown": "Reports a usage of `await` in a function that was possibly intended to be async but is actually missing the `async` modifier. Although `await` can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made `async`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6PossiblyAsyncFunction",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Async code and promises",
+                      "index": 55,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FlowJSFlagCommentPlacement",
+                "shortDescription": {
+                  "text": "Misplaced @flow flag"
+                },
+                "fullDescription": {
+                  "text": "Reports a '@flow' flag comment that is not located at the top of a file.",
+                  "markdown": "Reports a `@flow` flag comment that is not located at the top of a file."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FlowJSFlagCommentPlacement",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Flow type checker",
+                      "index": 17,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSDuplicatedDeclaration",
+                "shortDescription": {
+                  "text": "Duplicate declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports multiple declarations in a scope.",
+                  "markdown": "Reports multiple declarations in a scope."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSDuplicatedDeclaration",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSOctalInteger",
+                "shortDescription": {
+                  "text": "Octal integer"
+                },
+                "fullDescription": {
+                  "text": "Reports a deprecated octal integer literal prefixed with '0' instead of '0o'. Such literals are not allowed in modern ECMAScript code, and using them in the strict mode is an error. To force this inspection for ES5 and ES3 language levels, select the 'Warn about obsolete octal literals in ES5- code' checkbox below.",
+                  "markdown": "Reports a deprecated octal integer literal prefixed with `0` instead of `0o`.  \nSuch literals are not allowed in modern ECMAScript code, and using them in the strict mode is an error.  \nTo force this inspection for ES5 and ES3 language levels, select the 'Warn about obsolete octal literals in ES5- code' checkbox below."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "JSOctalInteger",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Validity issues",
+                      "index": 30,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptValidateGenericTypes",
+                "shortDescription": {
+                  "text": "Incorrect generic type argument"
+                },
+                "fullDescription": {
+                  "text": "Reports an invalid type argument in a function, interface, or class declaration.",
+                  "markdown": "Reports an invalid type argument in a function, interface, or class declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptValidateGenericTypes",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSMismatchedCollectionQueryUpdate",
+                "shortDescription": {
+                  "text": "Mismatched query and update of collection"
+                },
+                "fullDescription": {
+                  "text": "Reports a collection of fields or variables whose contents are either queried and not updated or updated and not queried. Such mismatched queries and updates are pointless and may indicate either dead code or a typographical error. Query methods are automatically detected, based on whether they return something, or a callback is passed to them. Use the table below to specify which methods are update methods.",
+                  "markdown": "Reports a collection of fields or variables whose contents are either queried and not updated or updated and not queried. Such mismatched queries and updates are pointless and may indicate either dead code or a typographical error.\n\n\nQuery methods are automatically detected, based on whether they return something, or a callback is passed to them.\nUse the table below to specify which methods are update methods."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSMismatchedCollectionQueryUpdate",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSMissingSwitchDefault",
+                "shortDescription": {
+                  "text": "'switch' statement has no 'default' branch"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'switch' statement without a 'default' clause when some possible values are not enumerated.",
+                  "markdown": "Reports a `switch` statement without a `default` clause when some possible values are not enumerated."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSMissingSwitchDefault",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSXNamespaceValidation",
+                "shortDescription": {
+                  "text": "Missing JSX namespace"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a JSX construction without importing namespace. Having the namespace in the file scope ensures proper code compilation.",
+                  "markdown": "Reports a usage of a JSX construction without importing namespace. Having the namespace in the file scope ensures proper code compilation."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSXNamespaceValidation",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6PreferShortImport",
+                "shortDescription": {
+                  "text": "Import can be shortened"
+                },
+                "fullDescription": {
+                  "text": "Reports an ES6 import whose 'from' part can be shortened. Suggests importing the parent directory.",
+                  "markdown": "Reports an ES6 import whose `from` part can be shortened. Suggests importing the parent directory."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ES6PreferShortImport",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PointlessBitwiseExpressionJS",
+                "shortDescription": {
+                  "text": "Bitwise expression can be simplified"
+                },
+                "fullDescription": {
+                  "text": "Reports an expression that includes 'and' with zero, 'or' by zero, or shifting by zero. Such expressions may result from not fully completed automated refactorings.",
+                  "markdown": "Reports an expression that includes `and` with zero, `or` by zero, or shifting by zero. Such expressions may result from not fully completed automated refactorings."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PointlessBitwiseExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Bitwise operation issues",
+                      "index": 22,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSStringConcatenationToES6Template",
+                "shortDescription": {
+                  "text": "String concatenation is used instead of template literal"
+                },
+                "fullDescription": {
+                  "text": "Reports a string concatenation. Suggests replacing it with a template literal Example '\"result: \" + a + \".\"' After applying the quick-fix the code looks as follows: '`result: ${a}.`'",
+                  "markdown": "Reports a string concatenation. Suggests replacing it with a [template literal](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals)\n\nExample\n\n     \"result: \" + a + \".\" \n\nAfter applying the quick-fix the code looks as follows:\n\n     `result: ${a}.` \n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSStringConcatenationToES6Template",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ReplaceAssignmentWithOperatorAssignmentJS",
+                "shortDescription": {
+                  "text": "Assignment could be replaced with operator assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment operation that can be replaced by an operator assignment to make your code shorter and probably clearer. Example: 'x = x + 3;'\n  'x = x / 3;'\n After the quick fix is applied the result looks like:   'x += 3;'\n  'x /= 3;'",
+                  "markdown": "Reports an assignment operation that can be replaced by an operator assignment to make your code shorter and probably clearer.\n\n\nExample:\n\n      x = x + 3;\n      x = x / 3;\n\nAfter the quick fix is applied the result looks like:\n\n      x += 3;\n      x /= 3;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "AssignmentReplaceableWithOperatorAssignmentJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Assignment issues",
+                      "index": 48,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSFileReferences",
+                "shortDescription": {
+                  "text": "Unresolved file reference"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved file reference in a JavaScript file, including CommonJS and AMD modules references.",
+                  "markdown": "Reports an unresolved file reference in a JavaScript file, including CommonJS and AMD modules references."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSFileReferences",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FunctionWithInconsistentReturnsJS",
+                "shortDescription": {
+                  "text": "Function with inconsistent returns"
+                },
+                "fullDescription": {
+                  "text": "Reports a function that returns a value in some cases while in other cases no value is returned. This usually indicates an error. Example: 'function foo() {\n  if (true)\n    return 3;\n  return;\n}'",
+                  "markdown": "Reports a function that returns a value in some cases while in other cases no value is returned. This usually indicates an error.\n\nExample:\n\n\n    function foo() {\n      if (true)\n        return 3;\n      return;\n    }\n\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FunctionWithInconsistentReturnsJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Validity issues",
+                      "index": 30,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EmptyTryBlockJS",
+                "shortDescription": {
+                  "text": "Empty 'try' block"
+                },
+                "fullDescription": {
+                  "text": "Reports an empty 'try' block, which usually indicates an error.",
+                  "markdown": "Reports an empty `try` block, which usually indicates an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EmptyTryBlockJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ClassMemberInitializationOrder",
+                "shortDescription": {
+                  "text": "Use of possibly unassigned property in a static initializer"
+                },
+                "fullDescription": {
+                  "text": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet. Initialization of class members happens consequently for fields, so a field cannot reference another field that is declared later.",
+                  "markdown": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet.   \n\nInitialization of class members happens consequently for fields, so a field cannot reference another field that is declared later."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ES6ClassMemberInitializationOrder",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ReservedWordUsedAsNameJS",
+                "shortDescription": {
+                  "text": "Reserved word used as name"
+                },
+                "fullDescription": {
+                  "text": "Reports a JavaScript reserved word used as a name. The JavaScript specification reserves a number of words which are currently not used as keywords. Using those words as identifiers may result in broken code if later versions of JavaScript start using them as keywords.",
+                  "markdown": "Reports a JavaScript reserved word used as a name. The JavaScript specification reserves a number of words which are currently not used as keywords. Using those words as identifiers may result in broken code if later versions of JavaScript start using them as keywords."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ReservedWordAsName",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Validity issues",
+                      "index": 30,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NestedFunctionJS",
+                "shortDescription": {
+                  "text": "Nested function"
+                },
+                "fullDescription": {
+                  "text": "Reports a function nested inside another function. Although JavaScript allows functions to be nested, such constructs may be confusing. Use the checkbox below to ignore anonymous nested functions.",
+                  "markdown": "Reports a function nested inside another function. Although JavaScript allows functions to be nested, such constructs may be confusing.\n\n\nUse the checkbox below to ignore anonymous nested functions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NestedFunctionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "IncrementDecrementResultUsedJS",
+                "shortDescription": {
+                  "text": "Result of increment or decrement used"
+                },
+                "fullDescription": {
+                  "text": "Reports an increment ('++') or decrement ('--') expression where the result of the assignment is used in a containing expression. Such assignments can result in confusion due to the order of operations, as evaluation of the assignment may affect the outer expression in unexpected ways. Example: 'var a = b++'",
+                  "markdown": "Reports an increment (`++`) or decrement (`--`) expression where the result of the assignment is used in a containing expression. Such assignments can result in confusion due to the order of operations, as evaluation of the assignment may affect the outer expression in unexpected ways. Example: `var a = b++`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "IncrementDecrementResultUsedJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "SuspiciousTypeOfGuard",
+                "shortDescription": {
+                  "text": "Unsound type guard check"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'typeof' or 'instanceof' unsound type guard check. The 'typeof x' type guard can be unsound in one of the following two cases: 'typeof x' never corresponds to the specified value (for example, 'typeof x === 'number'' when 'x' is of the type 'string | boolean') 'typeof x' always corresponds to the specified value (for example, 'typeof x === 'string'' when 'x' is of the type 'string') The 'x instanceof A' type guard can be unsound in one of the following two cases: The type of 'x' is not related to 'A' The type of 'x' is 'A' or a subtype of 'A'",
+                  "markdown": "Reports a `typeof` or `instanceof` unsound type guard check. The `typeof x` type guard can be unsound in one of the following two cases:\n\n* `typeof x` never corresponds to the specified value (for example, `typeof x === 'number'` when `x` is of the type 'string \\| boolean')\n* `typeof x` always corresponds to the specified value (for example, `typeof x === 'string'` when `x` is of the type 'string')\n\n<br />\n\nThe `x instanceof A` type guard can be unsound in one of the following two cases:\n\n* The type of `x` is not related to `A`\n* The type of `x` is `A` or a subtype of `A`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "SuspiciousTypeOfGuard",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6DestructuringVariablesMerge",
+                "shortDescription": {
+                  "text": "Destructuring properties with the same key"
+                },
+                "fullDescription": {
+                  "text": "Reports multiple destructuring properties with identical keys. Suggests merging the properties.",
+                  "markdown": "Reports multiple destructuring properties with identical keys. Suggests merging the properties."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6DestructuringVariablesMerge",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LoopStatementThatDoesntLoopJS",
+                "shortDescription": {
+                  "text": "Loop statement that doesn't loop"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'for', 'while', or 'do' statement whose bodies are guaranteed to execute at most once. Normally, this indicates an error.",
+                  "markdown": "Reports a `for`, `while`, or `do` statement whose bodies are guaranteed to execute at most once. Normally, this indicates an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LoopStatementThatDoesntLoopJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSNonASCIINames",
+                "shortDescription": {
+                  "text": "Identifiers with non-ASCII symbols"
+                },
+                "fullDescription": {
+                  "text": "Reports a non-ASCII symbol in a name. If the 'Allow only ASCII names' option is selected, reports all names that contain non-ASCII symbols. Otherwise reports all names that contain both ASCII and non-ASCII symbols.",
+                  "markdown": "Reports a non-ASCII symbol in a name.  \n\nIf the 'Allow only ASCII names' option is selected, reports all names that contain non-ASCII symbols.  \nOtherwise reports all names that contain both ASCII and non-ASCII symbols."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSNonASCIINames",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Naming conventions",
+                      "index": 63,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptRedundantGenericType",
+                "shortDescription": {
+                  "text": "Redundant type arguments"
+                },
+                "fullDescription": {
+                  "text": "Reports a type argument that is equal to the default one and can be removed. Example: 'type Foo<T=number> = T;\nlet z: Foo<number>;'",
+                  "markdown": "Reports a type argument that is equal to the default one and can be removed.\n\n\nExample:\n\n\n    type Foo<T=number> = T;\n    let z: Foo<number>;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptRedundantGenericType",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptUMDGlobal",
+                "shortDescription": {
+                  "text": "Referenced UMD global variable"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a Universal Module Definition (UMD) global variable if the current file is a module (ECMAScript or CommonJS). Referencing UMD variables without explicit imports can lead to a runtime error if the library isn't included implicitly.",
+                  "markdown": "Reports a usage of a Universal Module Definition (UMD) global variable if the current file is a module (ECMAScript or CommonJS). Referencing UMD variables without explicit imports can lead to a runtime error if the library isn't included implicitly."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptUMDGlobal",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnnecessaryReturnJS",
+                "shortDescription": {
+                  "text": "Unnecessary 'return' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports an unnecessary 'return' statement, that is, a 'return' statement that returns no value and occurs just before the function would have \"fallen through\" the bottom. These statements may be safely removed.",
+                  "markdown": "Reports an unnecessary `return` statement, that is, a `return` statement that returns no value and occurs just before the function would have \"fallen through\" the bottom. These statements may be safely removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnnecessaryReturnStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSLastCommaInObjectLiteral",
+                "shortDescription": {
+                  "text": "Unneeded last comma in object literal"
+                },
+                "fullDescription": {
+                  "text": "Reports usages of a trailing comma in object literals. The warning is reported only when the JavaScript language version is set to ECMAScript 5.1. Trailing commas in object literals are allowed by the specification, however, some browsers might throw an error when a trailing comma is used. You can configure formatting options for trailing commas in Code Style | JavaScript or TypeScript | Punctuation.",
+                  "markdown": "Reports usages of a trailing comma in object literals.\n\nThe warning is reported only when the JavaScript language version is set to ECMAScript 5.1.\n\nTrailing commas in object literals are allowed by the specification, however, some browsers might throw an error when a trailing comma is used.\n\nYou can configure formatting options for trailing commas in **Code Style** \\| **JavaScript** or **TypeScript** \\| **Punctuation**."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSLastCommaInObjectLiteral",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6MissingAwait",
+                "shortDescription": {
+                  "text": "Missing await for an async function call"
+                },
+                "fullDescription": {
+                  "text": "Reports an 'async' function call without an expected 'await' prefix inside an 'async' function. Such call returns a 'Promise' and control flow is continued immediately. Example: 'async function bar() { /* ... */ }\nasync function foo() {\n    bar(); // bad\n}' After the quick-fix is applied, the 'await' prefix is added: 'async function bar() { /* ... */ }\nasync function foo() {\n    await bar(); // good\n}' When the 'Report for promises in return statements' checkbox is selected, also suggests adding 'await' in return statements. While this is generally not necessary, it gives two main benefits. You won't forget to add 'await' when surrounding your code with 'try-catch'. An explicit 'await' helps V8 runtime to provide async stack traces.",
+                  "markdown": "Reports an `async` function call without an expected `await` prefix inside an `async` function. Such call returns a `Promise` and control flow is continued immediately.\n\nExample:\n\n\n    async function bar() { /* ... */ }\n    async function foo() {\n        bar(); // bad\n    }\n\n\nAfter the quick-fix is applied, the `await` prefix is added:\n\n\n    async function bar() { /* ... */ }\n    async function foo() {\n        await bar(); // good\n    }\n\n<br />\n\nWhen the 'Report for promises in return statements' checkbox is selected, also suggests adding `await` in return statements.  \nWhile this is generally not necessary, it gives two main benefits.  \n\n* You won't forget to add `await` when surrounding your code with `try-catch`.\n* An explicit `await` helps V8 runtime to provide [async stack traces](https://bit.ly/v8-zero-cost-async-stack-traces)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6MissingAwait",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Async code and promises",
+                      "index": 55,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TailRecursionJS",
+                "shortDescription": {
+                  "text": "Tail recursion"
+                },
+                "fullDescription": {
+                  "text": "Reports a tail recursion, that is, when a function calls itself as its last action before returning. A tail recursion can always be replaced by looping, which will be considerably faster. Some JavaScript engines perform this optimization, while others do not. Thus, tail recursive solutions may have considerably different performance characteristics in different environments.",
+                  "markdown": "Reports a tail recursion, that is, when a function calls itself as its last action before returning. A tail recursion can always be replaced by looping, which will be considerably faster. Some JavaScript engines perform this optimization, while others do not. Thus, tail recursive solutions may have considerably different performance characteristics in different environments."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TailRecursionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FlowJSCoverage",
+                "shortDescription": {
+                  "text": "Code is not covered by Flow"
+                },
+                "fullDescription": {
+                  "text": "Reports JavaScript code fragments that are not covered by the Flow type checker. To use this inspection, configure the Flow executable in Settings | Languages & Frameworks | JavaScript.",
+                  "markdown": "Reports JavaScript code fragments that are not covered by the Flow type checker. To use this inspection, configure the Flow executable in [Settings \\| Languages \\& Frameworks \\| JavaScript](settings://Settings.JavaScript)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "FlowJSCoverage",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Flow type checker",
+                      "index": 17,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "StandardJS",
+                "shortDescription": {
+                  "text": "Standard code style"
+                },
+                "fullDescription": {
+                  "text": "Reports a discrepancy detected by the JavaScript Standard Style linter. The highlighting severity in the editor is based on the severity level the linter reports.",
+                  "markdown": "Reports a discrepancy detected by the [JavaScript Standard Style](https://standardjs.com/) linter.   \n\nThe highlighting severity in the editor is based on the severity level the linter reports."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "StandardJS",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code quality tools",
+                      "index": 65,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NestedAssignmentJS",
+                "shortDescription": {
+                  "text": "Nested assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment expression nested inside another expression, for example, 'a = b = 1'. Such expressions may be confusing and violate the general design principle that a given construct should do precisely one thing.",
+                  "markdown": "Reports an assignment expression nested inside another expression, for example, `a = b = 1`. Such expressions may be confusing and violate the general design principle that a given construct should do precisely one thing."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NestedAssignmentJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Assignment issues",
+                      "index": 48,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DefaultNotLastCaseInSwitchJS",
+                "shortDescription": {
+                  "text": "'default' not last case in 'switch'"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'switch' statement where the 'default' case comes before another case instead of being the very last case, which may cause confusion.",
+                  "markdown": "Reports a `switch` statement where the `default` case comes before another case instead of being the very last case, which may cause confusion."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DefaultNotLastCaseInSwitchJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ConfusingPlusesOrMinusesJS",
+                "shortDescription": {
+                  "text": "Confusing sequence of '+' or '-'"
+                },
+                "fullDescription": {
+                  "text": "Reports a suspicious combination of '+' or '-' characters in JavaScript code (for example, 'a+++b'. Such sequences are confusing, and their semantics may change through changes in the whitespace.",
+                  "markdown": "Reports a suspicious combination of `+` or `-` characters in JavaScript code (for example, `a+++b`. Such sequences are confusing, and their semantics may change through changes in the whitespace."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ConfusingPlusesOrMinusesJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EmptyFinallyBlockJS",
+                "shortDescription": {
+                  "text": "Empty 'finally' block"
+                },
+                "fullDescription": {
+                  "text": "Reports an empty 'finally' block, which usually indicates an error.",
+                  "markdown": "Reports an empty `finally` block, which usually indicates an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EmptyFinallyBlockJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSCommentMatchesSignature",
+                "shortDescription": {
+                  "text": "Mismatched JSDoc and function signature"
+                },
+                "fullDescription": {
+                  "text": "Reports mismatch between the names and the number of parameters within a JSDoc comment and the actual parameters of a function. Suggests updating parameters in JSDoc comment. Example: '/**\n * @param height Height in pixels\n */\nfunction sq(height, width) {} // width is not documented' After the quick-fix is applied: '/**\n * @param height Height in pixels\n * @param width\n */\nfunction sq(height, width) {}'",
+                  "markdown": "Reports mismatch between the names and the number of parameters within a JSDoc comment and the actual parameters of a function. Suggests updating parameters in JSDoc comment.\n\n**Example:**\n\n\n    /**\n     * @param height Height in pixels\n     */\n    function sq(height, width) {} // width is not documented\n\nAfter the quick-fix is applied:\n\n\n    /**\n     * @param height Height in pixels\n     * @param width\n     */\n    function sq(height, width) {}\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSCommentMatchesSignature",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptConfig",
+                "shortDescription": {
+                  "text": "Inconsistent tsconfig.json properties"
+                },
+                "fullDescription": {
+                  "text": "Reports inconsistency of a 'paths', 'checkJs', or 'extends' property in a tsconfig.json file. The 'checkJs' property requires 'allowJs'. The 'extends' property should be a valid file reference.",
+                  "markdown": "Reports inconsistency of a `paths`, `checkJs`, or `extends` property in a tsconfig.json file.   \nThe `checkJs` property requires `allowJs`.   \nThe `extends` property should be a valid file reference."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptConfig",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ForLoopThatDoesntUseLoopVariableJS",
+                "shortDescription": {
+                  "text": "'for' loop where update or condition does not use loop variable"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'for' loop where the condition or update does not use the 'for' loop variable.",
+                  "markdown": "Reports a `for` loop where the condition or update does not use the `for` loop variable."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ForLoopThatDoesntUseLoopVariableJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptAbstractClassConstructorCanBeMadeProtected",
+                "shortDescription": {
+                  "text": "Abstract class constructor can be made protected"
+                },
+                "fullDescription": {
+                  "text": "Reports a public constructor of an abstract class and suggests making it protected (because it is useless to have it public).",
+                  "markdown": "Reports a public constructor of an abstract class and suggests making it protected (because it is useless to have it public)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptAbstractClassConstructorCanBeMadeProtected",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FunctionWithMultipleReturnPointsJS",
+                "shortDescription": {
+                  "text": "Function with multiple return points"
+                },
+                "fullDescription": {
+                  "text": "Reports a function with multiple return points. Such functions are hard to understand and maintain.",
+                  "markdown": "Reports a function with multiple return points. Such functions are hard to understand and maintain."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FunctionWithMultipleReturnPointsJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Function metrics",
+                      "index": 69,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSIgnoredPromiseFromCall",
+                "shortDescription": {
+                  "text": "Result of method call returning a promise is ignored"
+                },
+                "fullDescription": {
+                  "text": "Reports a function call that returns a 'Promise' that is not used later. Such calls are usually unintended and indicate an error.",
+                  "markdown": "Reports a function call that returns a `Promise` that is not used later. Such calls are usually unintended and indicate an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSIgnoredPromiseFromCall",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Async code and promises",
+                      "index": 55,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ThreeNegationsPerFunctionJS",
+                "shortDescription": {
+                  "text": "Function with more than three negations"
+                },
+                "fullDescription": {
+                  "text": "Reports a function with three or more negation operations ('!' or '!='). Such functions may be unnecessarily confusing.",
+                  "markdown": "Reports a function with three or more negation operations (`!` or `!=`). Such functions may be unnecessarily confusing."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FunctionWithMoreThanThreeNegationsJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Function metrics",
+                      "index": 69,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSRemoveUnnecessaryParentheses",
+                "shortDescription": {
+                  "text": "Unnecessary parentheses"
+                },
+                "fullDescription": {
+                  "text": "Reports redundant parentheses. In expressions: 'var x = ((1) + 2) + 3' In arrow function argument lists: 'var incrementer = (x) => x + 1' In TypeScript and Flow type declarations: 'type Card = (Suit & Rank) | (Suit & Number)'",
+                  "markdown": "Reports redundant parentheses.\n\nIn expressions:\n\n    var x = ((1) + 2) + 3\n\nIn arrow function argument lists:\n\n    var incrementer = (x) => x + 1\n\nIn TypeScript and Flow type declarations:\n\n    type Card = (Suit & Rank) | (Suit & Number)\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSRemoveUnnecessaryParentheses",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "OverlyComplexBooleanExpressionJS",
+                "shortDescription": {
+                  "text": "Overly complex boolean expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a boolean expression with too many terms. Such expressions may be confusing and bug-prone. Use the field below to specify the maximum number of terms allowed in an arithmetic expression.",
+                  "markdown": "Reports a boolean expression with too many terms. Such expressions may be confusing and bug-prone.\n\n\nUse the field below to specify the maximum number of terms allowed in an arithmetic expression."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "OverlyComplexBooleanExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "OverlyComplexArithmeticExpressionJS",
+                "shortDescription": {
+                  "text": "Overly complex arithmetic expression"
+                },
+                "fullDescription": {
+                  "text": "Reports an arithmetic expression with too many terms. Such expressions may be confusing and bug-prone. Use the field below to specify the maximum number of terms allowed in an arithmetic expression.",
+                  "markdown": "Reports an arithmetic expression with too many terms. Such expressions may be confusing and bug-prone.\n\n\nUse the field below to specify the maximum number of terms allowed in an arithmetic expression."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "OverlyComplexArithmeticExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "StringLiteralBreaksHTMLJS",
+                "shortDescription": {
+                  "text": "String literal which breaks HTML parsing"
+                },
+                "fullDescription": {
+                  "text": "Reports a string literal that contains a '</' sequence. Such strings may result in incorrect parsing of any HTML in which the JavaScript code is embedded.",
+                  "markdown": "Reports a string literal that contains a `</` sequence. Such strings may result in incorrect parsing of any HTML in which the JavaScript code is embedded."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "StringLiteralBreaksHTMLJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Validity issues",
+                      "index": 30,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DuplicateConditionJS",
+                "shortDescription": {
+                  "text": "Duplicate condition in 'if' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate conditions in different branches of an 'if' statement. Duplicate conditions usually represent programmer oversight. Example: 'if (a) {\n    ...\n  } else if (a) {\n    ...\n  }'",
+                  "markdown": "Reports duplicate conditions in different branches of an `if` statement. Duplicate conditions usually represent programmer oversight.\n\nExample:\n\n\n      if (a) {\n        ...\n      } else if (a) {\n        ...\n      }\n\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DuplicateConditionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TrivialIfJS",
+                "shortDescription": {
+                  "text": "Redundant 'if' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports an 'if' statement that can be simplified to a single assignment or a 'return' statement. Example: 'if(foo())\n {\n  return true;\n }\n else\n {\n   return false;\n }' After applying the quick-fix the code looks as follows:  'return foo();'",
+                  "markdown": "Reports an `if` statement that can be simplified to a single assignment or a `return` statement.\n\nExample:\n\n\n    if(foo())\n     {\n      return true;\n     }\n     else\n     {\n       return false;\n     }\n\nAfter applying the quick-fix the code looks as follows:\n\n     return foo();\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RedundantIfStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CommaExpressionJS",
+                "shortDescription": {
+                  "text": "Comma expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a comma expression. Such expressions are often a sign of overly clever code, and may lead to subtle bugs. Comma expressions in the initializer or in the update section of 'for' loops are ignored.",
+                  "markdown": "Reports a comma expression. Such expressions are often a sign of overly clever code, and may lead to subtle bugs. Comma expressions in the initializer or in the update section of `for` loops are ignored."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CommaExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6BindWithArrowFunction",
+                "shortDescription": {
+                  "text": "Suspicious usage of 'bind' with arrow function"
+                },
+                "fullDescription": {
+                  "text": "Reports 'bind' used together with an arrow function. Because arrow functions use lexical 'this', a 'bind' call will have no effect on them. See here for details.",
+                  "markdown": "Reports `bind` used together with an arrow function.  \nBecause arrow functions use lexical `this`, a `bind` call will have no effect on them.  \nSee [here](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Functions/Arrow_functions#Lexical_this) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ES6BindWithArrowFunction",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSComparisonWithNaN",
+                "shortDescription": {
+                  "text": "Comparison with NaN"
+                },
+                "fullDescription": {
+                  "text": "Reports a comparison with NaN. Comparisons like 'expr == NaN' or 'expr === NaN' are always evaluated to 'false'.",
+                  "markdown": "Reports a comparison with NaN. Comparisons like `expr == NaN` or `expr === NaN` are always evaluated to `false`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSComparisonWithNaN",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSConstructorReturnsPrimitive",
+                "shortDescription": {
+                  "text": "Constructor returns primitive value"
+                },
+                "fullDescription": {
+                  "text": "Reports a constructor function that returns a primitive value. When called with 'new', this value will be lost and an object will be returned instead. To avoid warnings, use the '@return' tag to specify the return of the function.",
+                  "markdown": "Reports a constructor function that returns a primitive value. When called with `new`, this value will be lost and an object will be returned instead. To avoid warnings, use the `@return` tag to specify the return of the function."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSConstructorReturnsPrimitive",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnnecessaryLabelJS",
+                "shortDescription": {
+                  "text": "Unnecessary label"
+                },
+                "fullDescription": {
+                  "text": "Reports an unused label.",
+                  "markdown": "Reports an unused label."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnnecessaryLabelJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSBitwiseOperatorUsage",
+                "shortDescription": {
+                  "text": "Bitwise operator usage"
+                },
+                "fullDescription": {
+                  "text": "Reports a suspicious usage of a bitwise AND (\"'&'\") or OR (\"'|'\") operator. Usually it is a typo and the result of applying boolean operations AND (\"'&&'\") and OR (\"'||'\") is expected.",
+                  "markdown": "Reports a suspicious usage of a bitwise AND (\"`&`\") or OR (\"`|`\") operator. Usually it is a typo and the result of applying boolean operations AND (\"`&&`\") and OR (\"`||`\") is expected."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSBitwiseOperatorUsage",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Bitwise operation issues",
+                      "index": 22,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnresolvedReference",
+                "shortDescription": {
+                  "text": "Unresolved reference"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved reference in JavaScript code. In TypeScript code, a problem is reported if the part of the reference before the dot is of the type 'any'.",
+                  "markdown": "Reports an unresolved reference in JavaScript code. In TypeScript code, a problem is reported if the part of the reference before the dot is of the type `any`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSUnresolvedReference",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnterminatedStatementJS",
+                "shortDescription": {
+                  "text": "Unterminated statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a statement without a semicolon or a newline at the end. Select the 'Terminate statements with semicolons' option in Editor | Code Style | JavaScript or TypeScript - Punctuation to report any statement that doesn't end with a semicolon, even if a newline is used. According to some coding styles, semicolons are preferred to line-breaks for consistency with the other languages.",
+                  "markdown": "Reports a statement without a semicolon or a newline at the end.\n\nSelect the 'Terminate statements with semicolons' option in *Editor \\| Code Style \\| JavaScript or TypeScript - Punctuation* to report any statement that doesn't end with a semicolon, even if a newline is used.\nAccording to some coding styles, semicolons are preferred to line-breaks for consistency with the other languages."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnterminatedStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PlatformDetectionJS",
+                "shortDescription": {
+                  "text": "Inaccurate platform detection"
+                },
+                "fullDescription": {
+                  "text": "Reports a common JavaScript pattern for detecting the browser or operating system in which the script is run. In addition to pointing out non-portable constructs, these platform detection patterns are often incomplete and easily fooled. For most cases, detection of individual environment features is preferable to attempting to detect the entire platform. Patterns detected include: 'document.all' 'document.layers' 'navigator.userAgent' 'navigator.oscpu' 'navigator.appName' 'navigator.appCodeName' 'navigator.platform'",
+                  "markdown": "Reports a common JavaScript pattern for detecting the browser or operating system in which the script is run. In addition to pointing out non-portable constructs, these platform detection patterns are often incomplete and easily fooled. For most cases, detection of individual environment features is preferable to attempting to detect the entire platform.\n\nPatterns detected include:\n\n* `document.all`\n* `document.layers`\n* `navigator.userAgent`\n* `navigator.oscpu`\n* `navigator.appName`\n* `navigator.appCodeName`\n* `navigator.platform`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PlatformDetectionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/DOM issues",
+                      "index": 54,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "IfStatementWithIdenticalBranchesJS",
+                "shortDescription": {
+                  "text": "'if' statement with identical branches"
+                },
+                "fullDescription": {
+                  "text": "Reports an 'if' statement with identical 'then' and 'else' branches. Such statements are almost certainly an error.",
+                  "markdown": "Reports an `if` statement with identical `then` and `else` branches. Such statements are almost certainly an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "IfStatementWithIdenticalBranchesJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSConsecutiveCommasInArrayLiteral",
+                "shortDescription": {
+                  "text": "Consecutive commas in array literal"
+                },
+                "fullDescription": {
+                  "text": "Reports a consecutive comma in an array literal. The skipped element accepts the 'undefined' value, but it could be done unintentionally, for example, when commas are at the end of one line and at the beginning of the next one.",
+                  "markdown": "Reports a consecutive comma in an array literal. The skipped element accepts the `undefined` value, but it could be done unintentionally, for example, when commas are at the end of one line and at the beginning of the next one."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSConsecutiveCommasInArrayLiteral",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnreachableSwitchBranches",
+                "shortDescription": {
+                  "text": "Unreachable 'case' branch of a 'switch' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports an unreachable 'case' branch of a 'switch' statement. Example: '/**\n * @param {('foo' | 'bar')} p\n */\nfunction foo(p) {\n    switch (p) {\n        case 'foo': break;\n        case 'bar': break;\n        case 'baz': break; // unreachable\n    }\n}'",
+                  "markdown": "Reports an unreachable `case` branch of a `switch` statement.\n\nExample:\n\n\n    /**\n     * @param {('foo' | 'bar')} p\n     */\n    function foo(p) {\n        switch (p) {\n            case 'foo': break;\n            case 'bar': break;\n            case 'baz': break; // unreachable\n        }\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnreachableSwitchBranches",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptDuplicateUnionOrIntersectionType",
+                "shortDescription": {
+                  "text": "Duplicate union or intersection type component"
+                },
+                "fullDescription": {
+                  "text": "Reports a duplicate type inside a union or intersection.",
+                  "markdown": "Reports a duplicate type inside a union or intersection."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptDuplicateUnionOrIntersectionType",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TrivialConditionalJS",
+                "shortDescription": {
+                  "text": "Redundant conditional expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a conditional expression of the form 'condition ? true : false\ncondition ? false : true' These expressions may be safely converted to 'condition\n!condition'",
+                  "markdown": "Reports a conditional expression of the form\n\n\n    condition ? true : false\n    condition ? false : true\n\n\nThese expressions may be safely converted to\n\n\n    condition\n    !condition\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "RedundantConditionalExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6UnusedImports",
+                "shortDescription": {
+                  "text": "Unused import"
+                },
+                "fullDescription": {
+                  "text": "Reports a redundant 'import' statement. This is usually the case if the imported symbols are not used in the source file. To avoid side-effects, consider using bare import 'import 'packageName'' instead of the regular one.",
+                  "markdown": "Reports a redundant `import` statement. This is usually the case if the imported symbols are not used in the source file. To avoid side-effects, consider using bare import `import 'packageName'` instead of the regular one."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ES6UnusedImports",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "InnerHTMLJS",
+                "shortDescription": {
+                  "text": "Use of 'innerHTML' property"
+                },
+                "fullDescription": {
+                  "text": "Reports a JavaScript access to DOM nodes as text using the 'innerHTML' property. Most usages of 'innerHTML' are performed better with explicit DOM calls, such as 'getElementByID()' and 'createElement()'. Additionally, 'innerHTML' will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can lead to difficulties in diagnosing bugs.",
+                  "markdown": "Reports a JavaScript access to DOM nodes as text using the `innerHTML` property. Most usages of `innerHTML` are performed better with explicit DOM calls, such as `getElementByID()` and `createElement()`. Additionally, `innerHTML` will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can lead to difficulties in diagnosing bugs."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "InnerHTMLJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/DOM issues",
+                      "index": 54,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "VoidExpressionJS",
+                "shortDescription": {
+                  "text": "'void' expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'void' expression.",
+                  "markdown": "Reports a `void` expression."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "VoidExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSAssignmentUsedAsCondition",
+                "shortDescription": {
+                  "text": "Assignment used as condition"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment that is used as the condition of an 'if', 'while', 'for', or 'do' statement. Although occasionally intended, this usage is confusing, and often indicates a typo (for example, '=' instead of '==').",
+                  "markdown": "Reports an assignment that is used as the condition of an `if`, `while`, `for`, or `do` statement. Although occasionally intended, this usage is confusing, and often indicates a typo (for example, `=` instead of `==`)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSAssignmentUsedAsCondition",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Assignment issues",
+                      "index": 48,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ForLoopReplaceableByWhileJS",
+                "shortDescription": {
+                  "text": "'for' loop may be replaced by 'while' loop"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'for' loop that contains neither initialization nor an update component. Suggests replacing the loop with a simpler 'while' statement. Example: 'for(; exitCondition(); ) {\n    process();\n  }' After the quick-fix is applied the result looks like: 'while(exitCondition()) {\n    process();\n  }' Use the checkbox below if you wish this inspection to ignore for loops with trivial or non-existent conditions.",
+                  "markdown": "Reports a `for` loop that contains neither initialization nor an update component. Suggests replacing the loop with a simpler `while` statement.\n\nExample:\n\n\n      for(; exitCondition(); ) {\n        process();\n      }\n\nAfter the quick-fix is applied the result looks like:\n\n\n      while(exitCondition()) {\n        process();\n      }\n\nUse the checkbox below if you wish this inspection to ignore **for** loops with trivial or non-existent conditions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ForLoopReplaceableByWhile",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSVoidFunctionReturnValueUsed",
+                "shortDescription": {
+                  "text": "Void function return value used"
+                },
+                "fullDescription": {
+                  "text": "Reports a return value of a function that doesn't return anything. Calling of such functions always produces an 'undefined' value and such assignment may indicate an error. Example: 'let a = console.log('foo');' The following usages are ignored: Inside a return statement In some binary operations For overridden non-void functions",
+                  "markdown": "Reports a return value of a function that doesn't return anything. Calling of such functions always produces an `undefined` value and such assignment may indicate an error.\n\nExample:\n\n\n    let a = console.log('foo');\n\n<br />\n\nThe following usages are ignored:\n\n* Inside a return statement\n* In some binary operations\n* For overridden non-void functions"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSVoidFunctionReturnValueUsed",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ReturnFromFinallyBlockJS",
+                "shortDescription": {
+                  "text": "'return' inside 'finally' block"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'return' statement inside a 'finally' block. Such 'return' statements may mask exceptions thrown, and complicate debugging.",
+                  "markdown": "Reports a `return` statement inside a `finally` block. Such `return` statements may mask exceptions thrown, and complicate debugging."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ReturnInsideFinallyBlockJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSValidateTypes",
+                "shortDescription": {
+                  "text": "Type mismatch"
+                },
+                "fullDescription": {
+                  "text": "Reports incorrect type of: a parameter in a function call a return value an assigned expression TypeScript code is ignored.",
+                  "markdown": "Reports incorrect type of:\n\n* a parameter in a function call\n* a return value\n* an assigned expression\n\nTypeScript code is ignored."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSValidateTypes",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ConstantConditionalExpressionJS",
+                "shortDescription": {
+                  "text": "Constant conditional expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a conditional expression in the format 'true? result1: result2' or 'false? result1: result2. Suggests simplifying the expression.'",
+                  "markdown": "Reports a conditional expression in the format `true? result1: result2` or `false? result1: result2``.\nSuggests simplifying the expression.\n`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ConstantConditionalExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSTestFailedLine",
+                "shortDescription": {
+                  "text": "Highlight failure line in test code"
+                },
+                "fullDescription": {
+                  "text": "Reports a failed method call or an assertion in a test.",
+                  "markdown": "Reports a failed method call or an assertion in a test."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSTestFailedLine",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Unit testing",
+                      "index": 8,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NonBlockStatementBodyJS",
+                "shortDescription": {
+                  "text": "Statement body without braces"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'if', 'while', 'for', or 'with' statements whose body is not a block statement. Using code block in statement bodies is usually safer for downstream maintenance.",
+                  "markdown": "Reports a `if`, `while`, `for`, or `with` statements whose body is not a block statement. Using code block in statement bodies is usually safer for downstream maintenance."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NonBlockStatementBodyJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "IfStatementWithTooManyBranchesJS",
+                "shortDescription": {
+                  "text": "'if' statement with too many branches"
+                },
+                "fullDescription": {
+                  "text": "Reports an 'if' statement with too many branches. Such statements may be confusing, and often indicate inadequate levels of design abstraction. Use the field below to specify the maximum number of branches expected.",
+                  "markdown": "Reports an `if` statement with too many branches. Such statements may be confusing, and often indicate inadequate levels of design abstraction.\n\n\nUse the field below to specify the maximum number of branches expected."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "IfStatementWithTooManyBranchesJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSValidateJSDoc",
+                "shortDescription": {
+                  "text": "Syntax errors and unresolved references in JSDoc"
+                },
+                "fullDescription": {
+                  "text": "Reports a syntax discrepancy in a documentation comment.",
+                  "markdown": "Reports a syntax discrepancy in a documentation comment."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSValidateJSDoc",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "BreakStatementJS",
+                "shortDescription": {
+                  "text": "'break' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'break' statements. Ignores 'break' statements that end case blocks.",
+                  "markdown": "Reports a `break` statements. Ignores `break` statements that end case blocks."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "BreakStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FlowJSConfig",
+                "shortDescription": {
+                  "text": "Missing .flowconfig"
+                },
+                "fullDescription": {
+                  "text": "Reports a JavaScript file with a '@flow' flag that doesn't have an associated '.flowconfig' file in the project.",
+                  "markdown": "Reports a JavaScript file with a `@flow` flag that doesn't have an associated `.flowconfig` file in the project."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FlowJSConfig",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Flow type checker",
+                      "index": 17,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSPotentiallyInvalidUsageOfClassThis",
+                "shortDescription": {
+                  "text": "Potentially invalid reference to 'this' of a class from closure"
+                },
+                "fullDescription": {
+                  "text": "Reports an attempt to reference a member of an ECMAScript class via the 'this.' qualifier in a nested function that is not a lambda. 'this' in a nested function that is not a lambda is the function's own 'this' and doesn't relate to the outer class.",
+                  "markdown": "Reports an attempt to reference a member of an ECMAScript class via the `this.` qualifier in a nested function that is not a lambda.  \n`this` in a nested function that is not a lambda is the function's own `this` and doesn't relate to the outer class."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSPotentiallyInvalidUsageOfClassThis",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DebuggerStatementJS",
+                "shortDescription": {
+                  "text": "'debugger' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'debugger' statement used for interaction with the Javascript debuggers. Such statements should not appear in production code.",
+                  "markdown": "Reports a `debugger` statement used for interaction with the Javascript debuggers. Such statements should not appear in production code."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DebuggerStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnnecessaryContinueJS",
+                "shortDescription": {
+                  "text": "Unnecessary 'continue' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports an unnecessary 'continue' statement at the end of a loop. Suggests removing such statements.",
+                  "markdown": "Reports an unnecessary `continue` statement at the end of a loop. Suggests removing such statements."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnnecessaryContinueJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptValidateTypes",
+                "shortDescription": {
+                  "text": "Type mismatch"
+                },
+                "fullDescription": {
+                  "text": "Reports a parameter, return value, or assigned expression of incorrect type.",
+                  "markdown": "Reports a parameter, return value, or assigned expression of incorrect type."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptValidateTypes",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "BreakStatementWithLabelJS",
+                "shortDescription": {
+                  "text": "'break' statement with label"
+                },
+                "fullDescription": {
+                  "text": "Reports a labeled 'break' statement.",
+                  "markdown": "Reports a labeled `break` statement."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "BreakStatementWithLabelJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "StatementsPerFunctionJS",
+                "shortDescription": {
+                  "text": "Overly long function"
+                },
+                "fullDescription": {
+                  "text": "Reports an overly long function. Function length is calculated by counting up the number of non-empty statements in the function. Functions that are too long are error-prone and difficult to test. Use the field below to specify the maximum acceptable number of statements in a function.",
+                  "markdown": "Reports an overly long function. Function length is calculated by counting up the number of non-empty statements in the function. Functions that are too long are error-prone and difficult to test.\n\n\nUse the field below to specify the maximum acceptable number of statements in a function."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FunctionTooLongJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Function metrics",
+                      "index": 69,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSDeclarationsAtScopeStart",
+                "shortDescription": {
+                  "text": "'var' declared not at the beginning of a function"
+                },
+                "fullDescription": {
+                  "text": "Checks that declarations of local variables declared with var are at the top of a function scope. By default, variable declarations are always moved (\"hoisted\") invisibly to the top of their containing scope when the code is executed. Therefore, declaring them at the top of the scope helps represent this behavior in the code.",
+                  "markdown": "Checks that declarations of local variables declared with **var** are at the top of a function scope.   \n\nBy default, variable declarations are always moved (\"hoisted\") invisibly to the top of their containing scope when the code is executed. Therefore, declaring them at the top of the scope helps represent this behavior in the code."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSDeclarationsAtScopeStart",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ContinueStatementWithLabelJS",
+                "shortDescription": {
+                  "text": "'continue' statement with label"
+                },
+                "fullDescription": {
+                  "text": "Reports a labeled 'continue' statement.",
+                  "markdown": "Reports a labeled `continue` statement."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ContinueStatementWithLabelJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptMissingConfigOption",
+                "shortDescription": {
+                  "text": "Missing tsconfig.json option "
+                },
+                "fullDescription": {
+                  "text": "Reports a usage that requires an explicit option in 'tsconfig.json'. For example, to use JSX in '.tsx' files, 'tsconfig.json' must contain '\"jsx\"' property.",
+                  "markdown": "Reports a usage that requires an explicit option in `tsconfig.json`. For example, to use JSX in `.tsx` files, `tsconfig.json` must contain `\"jsx\"` property."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptMissingConfigOption",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSObjectNullOrUndefined",
+                "shortDescription": {
+                  "text": "Object is 'null' or 'undefined'"
+                },
+                "fullDescription": {
+                  "text": "Reports an error caused by invoking a method, accessing a property, or calling a function on an object that is 'undefined' or 'null'.",
+                  "markdown": "Reports an error caused by invoking a method, accessing a property, or calling a function on an object that is `undefined` or `null`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSObjectNullOrUndefined",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ShorthandObjectProperty",
+                "shortDescription": {
+                  "text": "Property can be replaced with shorthand"
+                },
+                "fullDescription": {
+                  "text": "Reports an object property that can be converted to ES6 shorthand style and provides a quick-fix to do it. Example: 'var obj = {foo:foo}' After applying the quick-fix the code looks as follows: 'var obj = {foo}'",
+                  "markdown": "Reports an object property that can be converted to ES6 shorthand style and provides a quick-fix to do it.\n\nExample:\n\n\n    var obj = {foo:foo}\n\nAfter applying the quick-fix the code looks as follows:\n\n\n    var obj = {foo}\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6ShorthandObjectProperty",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "AssignmentToForLoopParameterJS",
+                "shortDescription": {
+                  "text": "Assignment to 'for' loop parameter"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment to a variable declared as a 'for' loop parameter. Although occasionally intended, this construct can be extremely confusing, and is often a result of an error.",
+                  "markdown": "Reports an assignment to a variable declared as a `for` loop parameter. Although occasionally intended, this construct can be extremely confusing, and is often a result of an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "AssignmentToForLoopParameterJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Assignment issues",
+                      "index": 48,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSPotentiallyInvalidConstructorUsage",
+                "shortDescription": {
+                  "text": "Potentially invalid constructor usage"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a potentially invalid constructor function, for example: a function that is not a constructor after 'new', using a constructor's prototype or calling a constructor without 'new'. A constructor function is assumed to have an upper case name (optional) or have an explicit JSDoc '@constructor' tag.",
+                  "markdown": "Reports a usage of a potentially invalid constructor function, for example: a function that is not a constructor after `new`, using a constructor's prototype or calling a constructor without `new`. A constructor function is assumed to have an upper case name (optional) or have an explicit JSDoc `@constructor` tag."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSPotentiallyInvalidConstructorUsage",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PointlessArithmeticExpressionJS",
+                "shortDescription": {
+                  "text": "Pointless arithmetic expression"
+                },
+                "fullDescription": {
+                  "text": "Reports an arithmetic expression that include adding or subtracting zero, multiplying by zero or one, division by one, and shift by zero. Such expressions may result from not fully completed automated refactoring.",
+                  "markdown": "Reports an arithmetic expression that include adding or subtracting zero, multiplying by zero or one, division by one, and shift by zero. Such expressions may result from not fully completed automated refactoring."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PointlessArithmeticExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NodeCoreCodingAssistance",
+                "shortDescription": {
+                  "text": "Unresolved Node.js APIs"
+                },
+                "fullDescription": {
+                  "text": "Suggests configuring coding assistance for Node.js, for example, 'require' and/or core modules ('path', 'http', 'fs', etc.). See https://nodejs.org/api/ for the complete list.",
+                  "markdown": "Suggests configuring coding assistance for Node.js, for example, `require` and/or core modules ('path', 'http', 'fs', etc.).\n\n\nSee <https://nodejs.org/api/> for the complete list."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NodeCoreCodingAssistance",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Node.js",
+                      "index": 80,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSPrimitiveTypeWrapperUsage",
+                "shortDescription": {
+                  "text": "Primitive type object wrapper used"
+                },
+                "fullDescription": {
+                  "text": "Reports an improper usage of a wrapper for primitive types or a property of a primitive type being modified, as in the latter case the assigned value will be lost.",
+                  "markdown": "Reports an improper usage of a wrapper for primitive types or a property of a primitive type being modified, as in the latter case the assigned value will be lost."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSPrimitiveTypeWrapperUsage",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptSmartCast",
+                "shortDescription": {
+                  "text": "Narrowed type"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a variable where the variable type is narrowed by a type guard. Note that severity level doesn't affect this inspection.",
+                  "markdown": "Reports a usage of a variable where the variable type is narrowed by a type guard. Note that severity level doesn't affect this inspection."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptSmartCast",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ConvertIndexedForToForOf",
+                "shortDescription": {
+                  "text": "Indexed 'for' is used instead of 'for..of'"
+                },
+                "fullDescription": {
+                  "text": "Reports an indexed 'for' loop used on an array. Suggests replacing it with a 'for..of' loop. 'for..of' loops are introduced in ECMAScript 6 and iterate over 'iterable' objects.",
+                  "markdown": "Reports an indexed [for](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for) loop used on an array. Suggests replacing it with a [for..of](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...of) loop.   \n`for..of` loops are introduced in ECMAScript 6 and iterate over `iterable` objects."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6ConvertIndexedForToForOf",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSLastCommaInArrayLiteral",
+                "shortDescription": {
+                  "text": "Unneeded last comma in array literal"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a trailing comma in an array literal. The warning is reported only when the JavaScript language version is set to ECMAScript 5.1. Although trailing commas in arrays are allowed by the specification, some browsers may throw an error when a trailing comma is used. You can configure formatting options for trailing commas in Code Style | JavaScript or TypeScript | Punctuation.",
+                  "markdown": "Reports a usage of a trailing comma in an array literal.\n\nThe warning is reported only when the JavaScript language version is set to ECMAScript 5.1.\n\nAlthough trailing commas in arrays are allowed by the specification, some browsers may throw an error when a trailing comma is used.\n\nYou can configure formatting options for trailing commas in **Code Style** \\| **JavaScript** or **TypeScript** \\| **Punctuation**."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSLastCommaInArrayLiteral",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ConditionalExpressionJS",
+                "shortDescription": {
+                  "text": "Conditional expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a ternary conditional expression. Some coding standards prohibit such expressions in favor of explicit 'if' statements.",
+                  "markdown": "Reports a ternary conditional expression. Some coding standards prohibit such expressions in favor of explicit `if` statements."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ConditionalExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ConvertVarToLetConst",
+                "shortDescription": {
+                  "text": "'var' is used instead of 'let' or 'const'"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'var' declaration that is used instead of 'let' or 'const'. Both 'let' and 'const' are block-scoped and behave more strictly. Suggests replacing all 'var' declarations with 'let' or 'const' declarations, depending on the semantics of a particular value. The declarations may be moved to the top of the function or placed before the first usage of the variable to avoid Reference errors. Select the 'Conservatively convert var with Fix all action' option to prevent any changes in these complex cases when using the 'Fix all' action.",
+                  "markdown": "Reports a `var` declaration that is used instead of `let` or `const`.  \nBoth `let` and `const` are block-scoped and behave more strictly.   \n\nSuggests replacing all `var` declarations with `let` or `const` declarations, depending on the semantics of a particular value. The declarations may be moved to the top of the function or placed before the first usage of the variable to avoid Reference errors.   \nSelect the 'Conservatively convert var with Fix all action' option to prevent any changes in these complex cases when using the 'Fix all' action."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6ConvertVarToLetConst",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PointlessBooleanExpressionJS",
+                "shortDescription": {
+                  "text": "Pointless statement or boolean expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a pointless or pointlessly complicated boolean expression or statement. Example: 'let a = !(false && x);\n  let b = false || x;' After the quick fix is applied the result looks like: 'let a = true;\n  let b = x;'",
+                  "markdown": "Reports a pointless or pointlessly complicated boolean expression or statement.\n\nExample:\n\n\n      let a = !(false && x);\n      let b = false || x;\n\nAfter the quick fix is applied the result looks like:\n\n\n      let a = true;\n      let b = x;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PointlessBooleanExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DynamicallyGeneratedCodeJS",
+                "shortDescription": {
+                  "text": "Execution of dynamically generated code"
+                },
+                "fullDescription": {
+                  "text": "Reports a call of the 'eval()', 'setTimeout()', or 'setInterval()' function or an allocation of a 'Function' object. These functions are used to execute arbitrary strings of JavaScript text, which often dynamically generated. This can be very confusing, and may be a security risk. Ignores the cases when a callback function is provided to these methods statically, without code generation.",
+                  "markdown": "Reports a call of the `eval()`, `setTimeout()`, or `setInterval()` function or an allocation of a `Function` object. These functions are used to execute arbitrary strings of JavaScript text, which often dynamically generated. This can be very confusing, and may be a security risk.   \n\nIgnores the cases when a callback function is provided to these methods statically, without code generation."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DynamicallyGeneratedCodeJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NegatedConditionalExpressionJS",
+                "shortDescription": {
+                  "text": "Negated conditional expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a conditional expression whose condition is negated. Suggests flipping the order of branches in the conditional expression to increase the clarity of the statement. Example: '!condition ? 2 : 1'",
+                  "markdown": "Reports a conditional expression whose condition is negated. Suggests flipping the order of branches in the conditional expression to increase the clarity of the statement. Example: `!condition ? 2 : 1`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NegatedConditionalExpressionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUrlImportUsage",
+                "shortDescription": {
+                  "text": "URL import is used"
+                },
+                "fullDescription": {
+                  "text": "Checks used URL imports in the JavaScript language. Suggests downloading the module for the specified remote URL. Such association enables the IDE to provide proper code completion and navigation. URLs in import specifiers are supported only for ECMAScript modules in the JavaScript language.",
+                  "markdown": "Checks used URL imports in the JavaScript language. Suggests downloading the module for the specified remote URL. Such association enables the IDE to provide proper code completion and navigation.   \n\nURLs in import specifiers are supported only for ECMAScript modules in the JavaScript language."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSUrlImportUsage",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnnecessaryLabelOnContinueStatementJS",
+                "shortDescription": {
+                  "text": "Unnecessary label on 'continue' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a labeled 'continue' statement whose labels may be removed without changing the flow of control.",
+                  "markdown": "Reports a labeled `continue` statement whose labels may be removed without changing the flow of control."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnnecessaryLabelOnContinueStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSPotentiallyInvalidTargetOfIndexedPropertyAccess",
+                "shortDescription": {
+                  "text": "Possibly incorrect target of indexed property access"
+                },
+                "fullDescription": {
+                  "text": "Reports a potentially invalid indexed property access, for example, 'Array[1]'.",
+                  "markdown": "Reports a potentially invalid indexed property access, for example, `Array[1]`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSPotentiallyInvalidTargetOfIndexedPropertyAccess",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSAccessibilityCheck",
+                "shortDescription": {
+                  "text": "Inaccessible @private and @protected members referenced"
+                },
+                "fullDescription": {
+                  "text": "Reports a reference to a JavaScript member that is marked with a '@private' or '@protected' tag but does not comply with visibility rules that these tags imply.",
+                  "markdown": "Reports a reference to a JavaScript member that is marked with a `@private` or `@protected` tag but does not comply with visibility rules that these tags imply."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSAccessibilityCheck",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FunctionWithMultipleLoopsJS",
+                "shortDescription": {
+                  "text": "Function with multiple loops"
+                },
+                "fullDescription": {
+                  "text": "Reports a function with multiple loop statements.",
+                  "markdown": "Reports a function with multiple loop statements."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FunctionWithMultipleLoopsJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Function metrics",
+                      "index": 69,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LabeledStatementJS",
+                "shortDescription": {
+                  "text": "Labeled statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a labeled statement.",
+                  "markdown": "Reports a labeled statement."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LabeledStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnusedCatchParameterJS",
+                "shortDescription": {
+                  "text": "Unused 'catch' parameter"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'catch' parameter that is not used in the corresponding block. The 'catch' parameters named 'ignore' or 'ignored' are ignored. Use the checkbox below to disable this inspection for 'catch' blocks with comments.",
+                  "markdown": "Reports a `catch` parameter that is not used in the corresponding block. The `catch` parameters named `ignore` or `ignored` are ignored.\n\n\nUse the checkbox below to disable this inspection for `catch`\nblocks with comments."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnusedCatchParameterJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NpmUsedModulesInstalled",
+                "shortDescription": {
+                  "text": "Missing module dependency"
+                },
+                "fullDescription": {
+                  "text": "Reports a module from a 'require()' call or an 'import' statement that is not installed or is not listed in package.json dependencies. Suggests installing the module and/or including it into package.json. For 'require()' calls, works only in the files from the scope of Node.js Core JavaScript library.",
+                  "markdown": "Reports a module from a `require()` call or an `import` statement that is not installed or is not listed in package.json dependencies.\n\nSuggests installing the module and/or including it into package.json.\n\nFor `require()` calls, works only in the files from the scope of *Node.js Core* JavaScript library."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "NpmUsedModulesInstalled",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "WithStatementJS",
+                "shortDescription": {
+                  "text": "'with' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'with' statements. Such statements result in potentially confusing implicit bindings, and may behave strangely in setting new variables.",
+                  "markdown": "Reports a `with` statements. Such statements result in potentially confusing implicit bindings, and may behave strangely in setting new variables."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "WithStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSConstantReassignment",
+                "shortDescription": {
+                  "text": "Attempt to assign to const or readonly variable"
+                },
+                "fullDescription": {
+                  "text": "Reports reassigning a value to a constant or a readonly variable.",
+                  "markdown": "Reports reassigning a value to a constant or a readonly variable."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "JSConstantReassignment",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Validity issues",
+                      "index": 30,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MagicNumberJS",
+                "shortDescription": {
+                  "text": "Magic number"
+                },
+                "fullDescription": {
+                  "text": "Reports a \"magic number\" that is a numeric literal used without being named by a constant declaration. Magic numbers can result in code whose intention is unclear, and may result in errors if a magic number is changed in one code location but remains unchanged in another. The numbers 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100, 1000, 0.0 and 1.0 are ignored.",
+                  "markdown": "Reports a \"magic number\" that is a numeric literal used without being named by a constant declaration. Magic numbers can result in code whose intention is unclear, and may result in errors if a magic number is changed in one code location but remains unchanged in another. The numbers 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100, 1000, 0.0 and 1.0 are ignored."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "MagicNumberJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FunctionNamingConventionJS",
+                "shortDescription": {
+                  "text": "Function naming convention"
+                },
+                "fullDescription": {
+                  "text": "Reports a function whose name is too short, too long, or does not follow the specified regular expression pattern. Use the fields provided below to specify minimum length, maximum length, and a regular expression for function names. Use the standard 'java.util.regex' format for regular expressions.",
+                  "markdown": "Reports a function whose name is too short, too long, or does not follow the specified regular expression pattern.\n\n\nUse the fields provided below to specify minimum length, maximum length, and a regular expression\nfor function names. Use the standard `java.util.regex` format for regular expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FunctionNamingConventionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Naming conventions",
+                      "index": 63,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptLibrary",
+                "shortDescription": {
+                  "text": "Missing global library"
+                },
+                "fullDescription": {
+                  "text": "Reports a TypeScript library file that is required for a symbol but is not listed under the 'lib' compiler option in 'tsconfig.json'.",
+                  "markdown": "Reports a TypeScript library file that is required for a symbol but is not listed under the `lib` compiler option in `tsconfig.json`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptLibrary",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptMissingAugmentationImport",
+                "shortDescription": {
+                  "text": "Missing augmentation import"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage from augmentation module without an explicit import.",
+                  "markdown": "Reports a usage from [augmentation module](https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation) without an explicit import."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptMissingAugmentationImport",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "AnonymousFunctionJS",
+                "shortDescription": {
+                  "text": "Anonymous function"
+                },
+                "fullDescription": {
+                  "text": "Reports an anonymous function. An explicit name of a function expression may be helpful for debugging. Ignores function expressions without names if they have a 'name' property specified in the ECMAScript 6 standard. For example, 'var bar = function() {};' is not reported.",
+                  "markdown": "Reports an anonymous function. An explicit name of a function expression may be helpful for debugging. Ignores function expressions without names if they have a `name` property specified in the ECMAScript 6 standard. For example, `var bar = function() {};` is not reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "AnonymousFunctionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
+                      "index": 41,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ObjectAllocationIgnoredJS",
+                "shortDescription": {
+                  "text": "Result of object allocation ignored"
+                },
+                "fullDescription": {
+                  "text": "Reports object allocation where the result of the allocated object is ignored, for example, 'new Error();' as a statement, without any assignment. Such allocation expressions may indicate an odd object initialization strategy.",
+                  "markdown": "Reports object allocation where the result of the allocated object is ignored, for example, `new Error();` as a statement, without any assignment. Such allocation expressions may indicate an odd object initialization strategy."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ObjectAllocationIgnored",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSTypeOfValues",
+                "shortDescription": {
+                  "text": "'typeof' comparison with non-standard value"
+                },
+                "fullDescription": {
+                  "text": "Reports a comparison of a 'typeof' expression with a literal string which is not one of the standard types: 'undefined', 'object', 'boolean', 'number', 'string', 'function', or 'symbol'. Such comparisons always return 'false'.",
+                  "markdown": "Reports a comparison of a `typeof` expression with a literal string which is not one of the standard types: `undefined`, `object`, `boolean`, `number`, `string`, `function`, or `symbol`. Such comparisons always return `false`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSTypeOfValues",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EmptyCatchBlockJS",
+                "shortDescription": {
+                  "text": "Empty 'catch' block"
+                },
+                "fullDescription": {
+                  "text": "Reports an empty 'catch' block. This indicates that errors are simply ignored instead of handling them. Any comment in a 'catch' block mutes the inspection.",
+                  "markdown": "Reports an empty `catch` block. This indicates that errors are simply ignored instead of handling them.   \n\nAny comment in a `catch` block mutes the inspection."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EmptyCatchBlockJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSHint",
+                "shortDescription": {
+                  "text": "JSHint"
+                },
+                "fullDescription": {
+                  "text": "Reports a problem detected by the JSHint linter.",
+                  "markdown": "Reports a problem detected by the [JSHint](https://jshint.com/) linter."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "JSHint",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code quality tools",
+                      "index": 65,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "Eslint",
+                "shortDescription": {
+                  "text": "ESLint"
+                },
+                "fullDescription": {
+                  "text": "Reports a discrepancy detected by the ESLint linter. The highlighting is based on the rule severity specified in the ESLint configuration file for each individual rule. Clear the 'Use rule severity from the configuration file' checkbox to use the severity configured in this inspection for all ESLint rules.",
+                  "markdown": "Reports a discrepancy detected by the [ESLint](https://eslint.org) linter.   \n\nThe highlighting is based on the rule severity specified in the [ESLint configuration file](https://eslint.org/docs/user-guide/configuring) for each individual rule.   \n\nClear the 'Use rule severity from the configuration file' checkbox to use the severity configured in this inspection for all ESLint rules."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "Eslint",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code quality tools",
+                      "index": 65,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSEqualityComparisonWithCoercion.TS",
+                "shortDescription": {
+                  "text": "Equality operator may cause type coercion"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of equality operators may cause unexpected type coercions. Suggests replacing '==' or '!=' equality operators with type-safe '===' or '!==' operators. Depending on the option selected, one of the following cases will be reported: All usages of '==' and '!=' operators. All usages except comparison with null. Some code styles allow using 'x == null' as a replacement for 'x === null || x === undefined'. Only suspicious expressions, such as: '==' or '!=' comparisons with '0', '''', 'null', 'true', 'false', or 'undefined'.",
+                  "markdown": "Reports a usage of equality operators may cause unexpected type coercions. Suggests replacing `==` or `!=` equality operators with type-safe `===` or `!==` operators.\n\nDepending on the option selected, one of the following cases will be reported:\n\n* All usages of `==` and `!=` operators.\n* All usages except comparison with null. Some code styles allow using `x == null` as a replacement for `x === null || x === undefined`.\n* Only suspicious expressions, such as: `==` or `!=` comparisons with `0`, `''`, `null`, `true`, `false`, or `undefined`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EqualityComparisonWithCoercionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ExceptionCaughtLocallyJS",
+                "shortDescription": {
+                  "text": "Exception used for local control-flow"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'throw' statement whose exceptions are always caught by the containing 'try' statement. Using 'throw' statements as a 'goto' to change the local flow of control is confusing.",
+                  "markdown": "Reports a `throw` statement whose exceptions are always caught by the containing `try` statement. Using `throw` statements as a `goto` to change the local flow of control is confusing."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ExceptionCaughtLocallyJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ThrowFromFinallyBlockJS",
+                "shortDescription": {
+                  "text": "'throw' inside 'finally' block"
+                },
+                "fullDescription": {
+                  "text": "Reports s 'throw' statement inside a 'finally' block. Such 'throw' statements may mask exceptions thrown, and complicate debugging.",
+                  "markdown": "Reports s `throw` statement inside a `finally` block. Such `throw` statements may mask exceptions thrown, and complicate debugging."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ThrowInsideFinallyBlockJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CyclomaticComplexityJS",
+                "shortDescription": {
+                  "text": "Overly complex function"
+                },
+                "fullDescription": {
+                  "text": "Reports a function with too many branching points in a function (too high cyclomatic complexity). Such functions may be confusing and hard to test. Use the field provided below to specify the maximum acceptable cyclomatic complexity for a function.",
+                  "markdown": "Reports a function with too many branching points in a function (too high cyclomatic complexity). Such functions may be confusing and hard to test.\n\n\nUse the field provided below to specify the maximum acceptable cyclomatic complexity for a function."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "OverlyComplexFunctionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Function metrics",
+                      "index": 69,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PackageJsonMismatchedDependency",
+                "shortDescription": {
+                  "text": "Mismatched dependencies in package.json"
+                },
+                "fullDescription": {
+                  "text": "Reports a dependency from package.json that is not installed or doesn't match the specified version range.",
+                  "markdown": "Reports a dependency from package.json that is not installed or doesn't match the specified [version range](https://docs.npmjs.com/about-semantic-versioning)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PackageJsonMismatchedDependency",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSPotentiallyInvalidUsageOfThis",
+                "shortDescription": {
+                  "text": "Potentially invalid reference to 'this' from closure"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'this' in closure that is used for referencing properties of outer context. Example: 'function Outer() {\n  this.outerProp = 1;\n  function inner() {\n    // bad, because 'outerProp' of Outer\n    // won't be updated here\n    // on calling 'new Outer()' as may be expected\n    this.outerProp = 2;\n  }\n  inner();\n}'",
+                  "markdown": "Reports a `this` in closure that is used for referencing properties of outer context.\n\nExample:\n\n\n    function Outer() {\n      this.outerProp = 1;\n      function inner() {\n        // bad, because 'outerProp' of Outer\n        // won't be updated here\n        // on calling 'new Outer()' as may be expected\n        this.outerProp = 2;\n      }\n      inner();\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSPotentiallyInvalidUsageOfThis",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnresolvedLibraryURL",
+                "shortDescription": {
+                  "text": "Missed locally stored library for HTTP link"
+                },
+                "fullDescription": {
+                  "text": "Reports a URL of an external JavaScript library that is not associated with any locally stored file. Suggests downloading the library. Such association enables the IDE to provide proper code completion and navigation.",
+                  "markdown": "Reports a URL of an external JavaScript library that is not associated with any locally stored file. Suggests downloading the library. Such association enables the IDE to provide proper code completion and navigation."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnresolvedLibraryURL",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "InfiniteLoopJS",
+                "shortDescription": {
+                  "text": "Infinite loop statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'for', 'while', or 'do' statement which can only exit by throwing an exception. Such statements often indicate coding errors.",
+                  "markdown": "Reports a `for`, `while`, or `do` statement which can only exit by throwing an exception. Such statements often indicate coding errors."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "InfiniteLoopJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSArrowFunctionBracesCanBeRemoved",
+                "shortDescription": {
+                  "text": "Redundant braces around arrow function body"
+                },
+                "fullDescription": {
+                  "text": "Reports an arrow function whose body only consists of braces and exactly one statement. Suggests converting to concise syntax without braces. 'let incrementer = (x) => {return x + 1};' After the quick-fix is applied, the code fragment looks as follows: 'let incrementer = (x) => x + 1;'",
+                  "markdown": "Reports an arrow function whose body only consists of braces and exactly one statement. Suggests converting to concise syntax without braces.\n\n\n        let incrementer = (x) => {return x + 1};\n\nAfter the quick-fix is applied, the code fragment looks as follows:\n\n\n        let incrementer = (x) => x + 1;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSArrowFunctionBracesCanBeRemoved",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "Stylelint",
+                "shortDescription": {
+                  "text": "Stylelint"
+                },
+                "fullDescription": {
+                  "text": "Reports a discrepancy detected by the Stylelint linter. The highlighting is based on the rule severity specified in the Stylelint configuration file for each individual rule.",
+                  "markdown": "Reports a discrepancy detected by the [Stylelint](http://stylelint.io) linter.   \n\nThe highlighting is based on the rule severity specified in the [Stylelint configuration file](https://stylelint.io/user-guide/configure) for each individual rule."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "Stylelint",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Code quality tools",
+                      "index": 83,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSClassNamingConvention",
+                "shortDescription": {
+                  "text": "Class naming convention"
+                },
+                "fullDescription": {
+                  "text": "Reports a class or a function that is annotated with a JSDoc '@constructor' or '@class' tag whose names are too short, too long, or do not follow the specified regular expression pattern. Use the fields provided below to specify minimum length, maximum length, and a regular expression expected for classes names. Use the standard 'java.util.regex' format for regular expressions.",
+                  "markdown": "Reports a class or a function that is annotated with a JSDoc `@constructor` or `@class` tag whose names are too short, too long, or do not follow the specified regular expression pattern.\n\n\nUse the fields provided below to specify minimum length, maximum length, and a regular expression\nexpected for classes names. Use the standard `java.util.regex` format for regular expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSClassNamingConvention",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Naming conventions",
+                      "index": 63,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptValidateJSTypes",
+                "shortDescription": {
+                  "text": "Type mismatch in 'any' type"
+                },
+                "fullDescription": {
+                  "text": "Reports a function call with a parameter, return value, or assigned expression or incorrect type, if the context symbol can be implicitly resolved to the 'any' type. declare var test: any;\ntest.hasOwnProperty(true); //reports 'true'",
+                  "markdown": "Reports a function call with a parameter, return value, or assigned expression or incorrect type, if the context symbol can be implicitly resolved to the `any` type.\n\n```\ndeclare var test: any;\ntest.hasOwnProperty(true); //reports 'true'\n```"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptValidateJSTypes",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "XHTMLIncompatabilitiesJS",
+                "shortDescription": {
+                  "text": "Incompatible XHTML usages"
+                },
+                "fullDescription": {
+                  "text": "Reports common JavaScript DOM patterns which may present problems with XHTML documents. In particular, the patterns detected will behave completely differently depending on whether the document is loaded as XML or HTML. This can result in subtle bugs where script behaviour is dependent on the MIME-type of the document, rather than its content. Patterns detected include document.body, document.images, document.applets, document.links, document.forms, and document.anchors.",
+                  "markdown": "Reports common JavaScript DOM patterns which may present problems with XHTML documents. In particular, the patterns detected will behave completely differently depending on whether the document is loaded as XML or HTML. This can result in subtle bugs where script behaviour is dependent on the MIME-type of the document, rather than its content. Patterns detected include **document.body** , **document.images** , **document.applets** , **document.links** , **document.forms** , and **document.anchors**."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "XHTMLIncompatabilitiesJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/DOM issues",
+                      "index": 54,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptJSXUnresolvedComponent",
+                "shortDescription": {
+                  "text": "Unresolved JSX component"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved reference to a JSX component. Suggests adding an import statement if the referenced component is defined in the project or its dependencies or creating a new component with the specified name. The template for a new component can be modified in Editor | File and Code Templates.",
+                  "markdown": "Reports an unresolved reference to a JSX component. Suggests adding an import statement if the referenced component is defined in the project or its dependencies or creating a new component with the specified name.\n\nThe template for a new component can be modified in Editor \\| File and Code Templates."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptJSXUnresolvedComponent",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptFieldCanBeMadeReadonly",
+                "shortDescription": {
+                  "text": "Field can be readonly"
+                },
+                "fullDescription": {
+                  "text": "Reports a private field that can be made readonly (for example, if the field is assigned only in the constructor).",
+                  "markdown": "Reports a private field that can be made readonly (for example, if the field is assigned only in the constructor)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptFieldCanBeMadeReadonly",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NegatedIfStatementJS",
+                "shortDescription": {
+                  "text": "Negated 'if' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports if statements which have an else branch and a negated condition. Flipping the order of the if and else branches will usually increase the clarity of such statements.",
+                  "markdown": "Reports **if** statements which have an **else** branch and a negated condition. Flipping the order of the **if** and **else** branches will usually increase the clarity of such statements."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NegatedIfStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ConditionalExpressionWithIdenticalBranchesJS",
+                "shortDescription": {
+                  "text": "Conditional expression with identical branches"
+                },
+                "fullDescription": {
+                  "text": "Reports a ternary conditional expression with identical 'then' and 'else' branches.",
+                  "markdown": "Reports a ternary conditional expression with identical `then` and `else` branches."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ConditionalExpressionWithIdenticalBranchesJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnfilteredForInLoop",
+                "shortDescription": {
+                  "text": "Unfiltered for..in loop"
+                },
+                "fullDescription": {
+                  "text": "Reports unfiltered 'for-in' loops. The use of this construct results in processing not only own properties of an object but properties from its prototype as well. It may be unexpected in some specific cases, for example, in utility methods that copy or modify all properties or when 'Object''s prototype may be incorrectly modified. For example, the following code will print 42 and myMethod: 'Object.prototype.myMethod = function myMethod() {};\nlet a = { foo: 42 };\nfor (let i in a) {\n  console.log(a[i]);\n}' Suggests replacing the whole loop with a 'Object.keys()' method or adding a 'hasOwnProperty()' check. After applying the quick-fix the code looks as follows: 'for (let i in a) {\n  if (a.hasOwnProperty(i)) {\n    console.log(a[i]);\n  }\n}'",
+                  "markdown": "Reports unfiltered `for-in` loops.   \n\nThe use of this construct results in processing not only own properties of an object but properties from its prototype as well. It may be unexpected in some specific cases, for example, in utility methods that copy or modify all properties or when `Object`'s prototype may be incorrectly modified. For example, the following code will print **42** and **myMethod** :   \n\n\n    Object.prototype.myMethod = function myMethod() {};\n    let a = { foo: 42 };\n    for (let i in a) {\n      console.log(a[i]);\n    }\n\nSuggests replacing the whole loop with a `Object.keys()` method or adding a `hasOwnProperty()` check. After applying the quick-fix the code looks as follows:\n\n\n    for (let i in a) {\n      if (a.hasOwnProperty(i)) {\n        console.log(a[i]);\n      }\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnfilteredForInLoop",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSAnnotator",
+                "shortDescription": {
+                  "text": "ECMAScript specification is not followed"
+                },
+                "fullDescription": {
+                  "text": "Reports basic syntax issues and inconsistencies with language specification, such as invalid usages of keywords, usages of incompatible numeric format, or multiple parameters to getters/setters. Generally, such errors must always be reported and shouldn't be disabled. But in some cases, such as issues due to the dynamic nature of JavaScript, the use of not yet supported language features, or bugs in IDE's checker, it may be handy to disable reporting these very basic errors.",
+                  "markdown": "Reports basic syntax issues and inconsistencies with language specification, such as invalid usages of keywords, usages of incompatible numeric format, or multiple parameters to getters/setters.   \nGenerally, such errors must always be reported and shouldn't be disabled. But in some cases, such as issues due to the dynamic nature of JavaScript, the use of not yet supported language features, or bugs in IDE's checker, it may be handy to disable reporting these very basic errors."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "JSAnnotator",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSIncompatibleTypesComparison",
+                "shortDescription": {
+                  "text": "Comparison of expressions having incompatible types"
+                },
+                "fullDescription": {
+                  "text": "Reports a comparison with operands of incompatible types or an operand with a type without possible common values.",
+                  "markdown": "Reports a comparison with operands of incompatible types or an operand with a type without possible common values."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSIncompatibleTypesComparison",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSFunctionExpressionToArrowFunction",
+                "shortDescription": {
+                  "text": "Function expression is used instead of arrow function"
+                },
+                "fullDescription": {
+                  "text": "Reports a function expression. Suggests converting it to an arrow function. Example: 'arr.map(function(el) {return el + 1})' After applying the quick-fix the code looks as follows: 'arr.map(el => el + 1)'",
+                  "markdown": "Reports a [function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/function) expression. Suggests converting it to an [arrow function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions).\n\nExample:\n\n    arr.map(function(el) {return el + 1})\n\nAfter applying the quick-fix the code looks as follows:\n\n    arr.map(el => el + 1)\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSFunctionExpressionToArrowFunction",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6TopLevelAwaitExpression",
+                "shortDescription": {
+                  "text": "Top-level 'await' expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a top-level 'await' expression. While the new 'top-level async' proposal is on its way, using 'await' outside async functions is not allowed.",
+                  "markdown": "Reports a usage of a top-level `await` expression. While the new 'top-level async' proposal is on its way, using `await` outside async functions is not allowed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "ES6TopLevelAwaitExpression",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Async code and promises",
+                      "index": 55,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6ConvertToForOf",
+                "shortDescription": {
+                  "text": "'for..in' is used instead of 'for..of'"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a 'for..in' loop on an array. Suggests replacing it with a 'for..of' loop. 'for..of' loops, which are introduced in ECMAScript 6, iterate over 'iterable' objects. For arrays, this structure is preferable to 'for..in', because it works only with array values but not with array object's properties.",
+                  "markdown": "Reports a usage of a [for..in](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...in) loop on an array. Suggests replacing it with a [for..of](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...of) loop.   \n`for..of` loops, which are introduced in ECMAScript 6, iterate over `iterable` objects. For arrays, this structure is preferable to `for..in`, because it works only with array values but not with array object's properties."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6ConvertToForOf",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/ES2015 migration aids",
+                      "index": 25,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ParameterNamingConventionJS",
+                "shortDescription": {
+                  "text": "Function parameter naming convention"
+                },
+                "fullDescription": {
+                  "text": "Reports a function parameter whose name is too short, too long, or doesn't follow the specified regular expression pattern. Use the fields provided below to specify minimum length, maximum length and regular expression expected for local variables names. Use the standard 'java.util.regex' format regular expressions.",
+                  "markdown": "Reports a function parameter whose name is too short, too long, or doesn't follow the specified regular expression pattern.\n\n\nUse the fields provided below to specify minimum length, maximum length and regular expression\nexpected for local variables names. Use the standard `java.util.regex` format regular expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ParameterNamingConventionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Naming conventions",
+                      "index": 63,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUndefinedPropertyAssignment",
+                "shortDescription": {
+                  "text": "Undefined property assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment to a property that is not defined in the type of a variable. Example: '/**\n * @type {{ property1: string, property2: number }}\n */\nlet myVariable = create();\n\nmyVariable.newProperty = 3; // bad'",
+                  "markdown": "Reports an assignment to a property that is not defined in the type of a variable.\n\nExample:\n\n\n    /**\n     * @type {{ property1: string, property2: number }}\n     */\n    let myVariable = create();\n\n    myVariable.newProperty = 3; // bad\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSUndefinedPropertyAssignment",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ParametersPerFunctionJS",
+                "shortDescription": {
+                  "text": "Function with too many parameters"
+                },
+                "fullDescription": {
+                  "text": "Reports a function with too many parameters. Such functions often indicate problems with design. Use the field below to specify the maximum acceptable number of parameters for a function.",
+                  "markdown": "Reports a function with too many parameters. Such functions often indicate problems with design.\n\n\nUse the field below to specify the maximum acceptable number of parameters for a function."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "OverlyComplexFunctionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Function metrics",
+                      "index": 69,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ThisExpressionReferencesGlobalObjectJS",
+                "shortDescription": {
+                  "text": "'this' expression which references the global object"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'this' expression outside an object literal or a constructor body. Such 'this' expressions reference the top-level \"global\" JavaScript object, but are mostly useless.",
+                  "markdown": "Reports a `this` expression outside an object literal or a constructor body. Such `this` expressions reference the top-level \"global\" JavaScript object, but are mostly useless."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ThisExpressionReferencesGlobalObjectJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Validity issues",
+                      "index": 30,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSDeprecatedSymbols",
+                "shortDescription": {
+                  "text": "Deprecated symbol used"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of a deprecated function variable.",
+                  "markdown": "Reports a usage of a deprecated function variable."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSDeprecatedSymbols",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LocalVariableNamingConventionJS",
+                "shortDescription": {
+                  "text": "Local variable naming convention"
+                },
+                "fullDescription": {
+                  "text": "Reports a local variable whose name is too short, too long, or doesn't follow the specified regular expression pattern. Use the fields provided below to specify minimum length, maximum length, and a regular expression expected for local variables names. Use the standard 'java.util.regex' format regular expressions.",
+                  "markdown": "Reports a local variable whose name is too short, too long, or doesn't follow the specified regular expression pattern.\n\n\nUse the fields provided below to specify minimum length, maximum length, and a regular expression\nexpected for local variables names. Use the standard `java.util.regex` format regular expressions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LocalVariableNamingConventionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Naming conventions",
+                      "index": 63,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UpdateDependencyToLatestVersion",
+                "shortDescription": {
+                  "text": "Update package.json dependencies to latest versions"
+                },
+                "fullDescription": {
+                  "text": "Suggests to upgrade your package.json dependencies to the latest versions, ignoring specified versions.",
+                  "markdown": "Suggests to upgrade your package.json dependencies to the latest versions, ignoring specified versions."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "UpdateDependencyToLatestVersion",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSSuspiciousNameCombination",
+                "shortDescription": {
+                  "text": "Suspicious variable/parameter name combination"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment or a function call where the name of the target variable or the function parameter does not match the name of the value assigned to it. Example: 'var x = 0;\n  var y = x;' or 'var x = 0, y = 0;\n  var rc = new Rectangle(y, x, 20, 20);' Here the inspection guesses that 'x' and 'y' are mixed up. Specify the names that should not be used together. An error is reported if a parameter name or an assignment target name contains words from one group while the name of the assigned or passed variable contains words from another group.",
+                  "markdown": "Reports an assignment or a function call where the name of the target variable or the function parameter does not match the name of the value assigned to it.\n\nExample:\n\n\n      var x = 0;\n      var y = x;\n\nor\n\n\n      var x = 0, y = 0;\n      var rc = new Rectangle(y, x, 20, 20);\n\nHere the inspection guesses that `x` and `y` are mixed up.\n\nSpecify the names that should not be used together. An error is reported\nif a parameter name or an assignment target name contains words from one group while the name of the assigned or passed\nvariable contains words from another group."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSSuspiciousNameCombination",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnresolvedExtXType",
+                "shortDescription": {
+                  "text": "Unresolved Ext JS xtype"
+                },
+                "fullDescription": {
+                  "text": "Reports an Ext JS 'xtype' reference that doesn't have a corresponding class.",
+                  "markdown": "Reports an Ext JS `xtype` reference that doesn't have a corresponding class."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnresolvedExtXType",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6RedundantNestingInTemplateLiteral",
+                "shortDescription": {
+                  "text": "Redundant nesting in template literal"
+                },
+                "fullDescription": {
+                  "text": "Reports nested instances of a string or a template literal. Suggests inlining the nested instances into the containing template string. Example: 'let a = `Hello, ${`Brave ${\"New\"}`} ${\"World\"}!`' After applying the quick-fix the code looks as follows: 'let a = `Hello, Brave New World!`'",
+                  "markdown": "Reports nested instances of a string or a template literal. Suggests inlining the nested instances into the containing template string.\n\nExample:\n\n\n    let a = `Hello, ${`Brave ${\"New\"}`} ${\"World\"}!`\n\nAfter applying the quick-fix the code looks as follows:\n\n\n    let a = `Hello, Brave New World!`\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6RedundantNestingInTemplateLiteral",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NestingDepthJS",
+                "shortDescription": {
+                  "text": "Overly nested function"
+                },
+                "fullDescription": {
+                  "text": "Reports a function whose body contains statements that are too deeply nested within other statements. Such functions may be confusing and indicate that refactoring may be necessary. Use the field provided below to specify the maximum acceptable nesting depth allowed in a function.",
+                  "markdown": "Reports a function whose body contains statements that are too deeply nested within other statements. Such functions may be confusing and indicate that refactoring may be necessary.\n\n\nUse the field provided below to specify the maximum acceptable nesting depth allowed in a function."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "OverlyNestedFunctionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Function metrics",
+                      "index": 69,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptSuspiciousConstructorParameterAssignment",
+                "shortDescription": {
+                  "text": "Assigned constructor field parameter"
+                },
+                "fullDescription": {
+                  "text": "Reports a common mistake in TypeScript code, when a class field is declared as a constructor parameter, and then this parameter is assigned. In this case, the corresponding field won't be assigned, only the local parameter value is modified. 'class Foo {\n  constructor(private p: number) {\n    p = 1; //must be this.p = 1;\n  }\n}'",
+                  "markdown": "Reports a common mistake in TypeScript code, when a class field is declared as a constructor parameter, and then this parameter is assigned.  \nIn this case, the corresponding field *won't* be assigned, only the local parameter value is modified.\n\n\n    class Foo {\n      constructor(private p: number) {\n        p = 1; //must be this.p = 1;\n      }\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptSuspiciousConstructorParameterAssignment",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ChainedFunctionCallJS",
+                "shortDescription": {
+                  "text": "Chained function call"
+                },
+                "fullDescription": {
+                  "text": "Reports a function call whose target is another function call, for example, 'foo().bar()'",
+                  "markdown": "Reports a function call whose target is another function call, for example, `foo().bar()`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ChainedFunctionCallJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NestedFunctionCallJS",
+                "shortDescription": {
+                  "text": "Nested function call"
+                },
+                "fullDescription": {
+                  "text": "Reports a function call that is used as an argument in another function call, for example, 'foo(bar())'",
+                  "markdown": "Reports a function call that is used as an argument in another function call, for example, `foo(bar())`"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NestedFunctionCallJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSEqualityComparisonWithCoercion",
+                "shortDescription": {
+                  "text": "Equality operator may cause type coercion"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of an equality operator that may cause unexpected type coercions. Suggests replacing '==' and '!=' with type-safe equality operators '===' and '!=='. Depending on the option selected, one of the following cases will be reported: All usages of '==' and '!=' operators. All usages except comparison with null. Some code styles allow using 'x == null' as a replacement for 'x === null || x === undefined'. Only suspicious expressions, such as: '==' or '!=' comparisons with '0', '''', 'null', 'true', 'false', or 'undefined'.",
+                  "markdown": "Reports a usage of an equality operator that may cause unexpected type coercions. Suggests replacing `==` and `!=` with type-safe equality operators `===` and `!==`.\n\nDepending on the option selected, one of the following cases will be reported:\n\n* All usages of `==` and `!=` operators.\n* All usages except comparison with null. Some code styles allow using `x == null` as a replacement for `x === null || x === undefined`.\n* Only suspicious expressions, such as: `==` or `!=` comparisons with `0`, `''`, `null`, `true`, `false`, or `undefined`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EqualityComparisonWithCoercionJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSCheckFunctionSignatures",
+                "shortDescription": {
+                  "text": "Signature mismatch"
+                },
+                "fullDescription": {
+                  "text": "Reports a JavaScript call expression where the arguments do not match the signature of the referenced function, including the types of arguments and their number. Also, reports if the overloading function doesn't match the overloaded one in terms of parameters and return types. TypeScript code is ignored.",
+                  "markdown": "Reports a JavaScript call expression where the arguments do not match the signature of the referenced function, including the types of arguments and their number. Also, reports if the overloading function doesn't match the overloaded one in terms of parameters and return types.\n\nTypeScript code is ignored."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSCheckFunctionSignatures",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ConstantOnLHSOfComparisonJS",
+                "shortDescription": {
+                  "text": "Constant on left side of comparison"
+                },
+                "fullDescription": {
+                  "text": "Reports a comparison operation with a constant value in the left-hand side. According to coding conventions, constants should be in the right-hand side of comparisons.",
+                  "markdown": "Reports a comparison operation with a constant value in the left-hand side. According to coding conventions, constants should be in the right-hand side of comparisons."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ConstantOnLefSideOfComparisonJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "AssignmentResultUsedJS",
+                "shortDescription": {
+                  "text": "Result of assignment used"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment expression where the result of the assignment is used in the containing expression. Such assignments often indicate coding errors, for example, '=' instead of '=='. Moreover, they can result in confusion due to the order of operations, as evaluation of the assignment may affect the outer expression in unexpected ways. Expressions in parentheses are ignored.",
+                  "markdown": "Reports an assignment expression where the result of the assignment is used in the containing expression. Such assignments often indicate coding errors, for example, `=` instead of `==`. Moreover, they can result in confusion due to the order of operations, as evaluation of the assignment may affect the outer expression in unexpected ways.\n\nExpressions in parentheses are ignored."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "AssignmentResultUsedJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Assignment issues",
+                      "index": 48,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ConstantOnRHSOfComparisonJS",
+                "shortDescription": {
+                  "text": "Constant on right side of comparison"
+                },
+                "fullDescription": {
+                  "text": "Reports a comparison operation with a constant in the right-hand side. According to coding conventions, constants should only be in the left-hand side of comparisons.",
+                  "markdown": "Reports a comparison operation with a constant in the right-hand side. According to coding conventions, constants should only be in the left-hand side of comparisons."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "ConstantOnRightSideOfComparisonJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnnecessarySemicolon",
+                "shortDescription": {
+                  "text": "Unnecessary semicolon"
+                },
+                "fullDescription": {
+                  "text": "Reports an unneeded semicolon.",
+                  "markdown": "Reports an unneeded semicolon."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnnecessarySemicolon",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptUnresolvedReference",
+                "shortDescription": {
+                  "text": "Unresolved TypeScript reference"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved reference in TypeScript code.",
+                  "markdown": "Reports an unresolved reference in TypeScript code."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptUnresolvedReference",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSNonStrictModeUsed",
+                "shortDescription": {
+                  "text": "Non-strict mode used"
+                },
+                "fullDescription": {
+                  "text": "Reports a JavaScript file that is not in the 'strict' mode.",
+                  "markdown": "Reports a JavaScript file that is not in the `strict` mode."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSNonStrictModeUsed",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "ES6RedundantAwait",
+                "shortDescription": {
+                  "text": "Redundant 'await' expression"
+                },
+                "fullDescription": {
+                  "text": "Reports a redundant usage of 'await', such as 'await await', or awaiting a non-promise result. When the 'Report for promises' option is selected, suggests removing 'await' before promises when applicable (in 'return' statements, and with 'Promise.resolve/reject'). Removing 'await' in such contexts causes two problems. Surrounding your code with 'try-catch' and forgetting to add 'await' will change code semantics while you may fail to notice that. Having an explicit 'await' may prevent the V8 runtime from providing async stack traces.",
+                  "markdown": "Reports a redundant usage of `await`, such as `await await`, or awaiting a non-promise result.\n\n\nWhen the 'Report for promises' option is selected, suggests removing `await` before promises when applicable\n(in `return` statements, and with `Promise.resolve/reject`).\n\nRemoving `await` in such contexts causes two problems.\n\n* Surrounding your code with `try-catch` and forgetting to add `await` will change code semantics while you may fail to notice that.\n* Having an explicit `await` may prevent the V8 runtime from providing [async stack traces](http://bit.ly/v8-zero-cost-async-stack-traces)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "ES6RedundantAwait",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Async code and promises",
+                      "index": 55,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "NestedSwitchStatementJS",
+                "shortDescription": {
+                  "text": "Nested 'switch' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'switch' statement that is nested in another 'switch' statement. Nested 'switch' statements may be very confusing, particularly if indenting is inconsistent.",
+                  "markdown": "Reports a `switch` statement that is nested in another `switch` statement. Nested `switch` statements may be very confusing, particularly if indenting is inconsistent."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "NestedSwitchStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "AssignmentToFunctionParameterJS",
+                "shortDescription": {
+                  "text": "Assignment to function parameter"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment to a function parameter, including increment and decrement operations. Although occasionally intended, this construct can be extremely confusing, and is often a result of an error.",
+                  "markdown": "Reports an assignment to a function parameter, including increment and decrement operations. Although occasionally intended, this construct can be extremely confusing, and is often a result of an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "AssignmentToFunctionParameterJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Assignment issues",
+                      "index": 48,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "FallThroughInSwitchStatementJS",
+                "shortDescription": {
+                  "text": "Fallthrough in 'switch' statement"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'switch' statement where control can proceed from a branch to the next one. Such \"fall-through\" often indicates an error, for example, a missing 'break' or 'return'.",
+                  "markdown": "Reports a `switch` statement where control can proceed from a branch to the next one. Such \"fall-through\" often indicates an error, for example, a missing `break` or `return`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "FallThroughInSwitchStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CallerJS",
+                "shortDescription": {
+                  "text": "Use of 'caller' property"
+                },
+                "fullDescription": {
+                  "text": "Reports a usage of the 'caller' property in a JavaScript function. Using this property to access the stack frame of the calling method can be extremely confusing and result in subtle bugs.",
+                  "markdown": "Reports a usage of the `caller` property in a JavaScript function. Using this property to access the stack frame of the calling method can be extremely confusing and result in subtle bugs."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CallerJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "TypeScriptExplicitMemberType",
+                "shortDescription": {
+                  "text": "Explicit types"
+                },
+                "fullDescription": {
+                  "text": "Reports a type annotation that doesn't match the current code style for explicit types. Type declarations are not necessary when the type that is inferred from the context exactly matches the type annotation, for example: 'var pi: number = 3.14' In some cases it is preferable to always have explicit types - this prevents accidental type changes and makes code more explicit.",
+                  "markdown": "Reports a type annotation that doesn't match the current code style for explicit types.\n\n\nType declarations are not necessary when the type that is inferred from the context exactly matches the type annotation, for example:\n\n\n        var pi: number = 3.14\n\nIn some cases it is preferable to always have explicit types - this prevents accidental type changes and makes code more explicit."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "TypeScriptExplicitMemberType",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 52,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSDuplicateCaseLabel",
+                "shortDescription": {
+                  "text": "Duplicate 'case' label"
+                },
+                "fullDescription": {
+                  "text": "Reports a duplicated 'case' label on a 'switch' statement, which normally indicates an error.",
+                  "markdown": "Reports a duplicated `case` label on a `switch` statement, which normally indicates an error."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSDuplicateCaseLabel",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSMissingSwitchBranches",
+                "shortDescription": {
+                  "text": "'switch' statement has missing branches"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'switch' statement on a variable of the type 'enum' or 'union' when the statement doesn't cover some value options from the type.",
+                  "markdown": "Reports a `switch` statement on a variable of the type `enum` or `union` when the statement doesn't cover some value options from the type."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "JSMissingSwitchBranches",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSSwitchVariableDeclarationIssue",
+                "shortDescription": {
+                  "text": "Variable is declared and being used in different 'case' clauses"
+                },
+                "fullDescription": {
+                  "text": "Reports a variable that is declared in one 'case' clause of a 'switch' statement but is used in another 'case' clause of the same statement. For block-scoped variables, this results in throwing a 'ReferenceError'. For 'var' variables, it indicates a potential error. Disable the inspection for 'var' variables if this pattern is used intentionally.",
+                  "markdown": "Reports a variable that is declared in one `case` clause of a `switch` statement but is used in another `case` clause of the same statement. For block-scoped variables, this results in throwing a `ReferenceError`. For `var` variables, it indicates a potential error.\n\nDisable the inspection for `var` variables if this pattern is used intentionally."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSSwitchVariableDeclarationIssue",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSJQueryEfficiency",
+                "shortDescription": {
+                  "text": "JQuery selector can be optimized"
+                },
+                "fullDescription": {
+                  "text": "Reports a duplicated jQuery selector that can be cached or a usage of an attribute or a pseudo-selector (optional).",
+                  "markdown": "Reports a duplicated jQuery selector that can be cached or a usage of an attribute or a pseudo-selector (optional)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSJQueryEfficiency",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "UnreachableCodeJS",
+                "shortDescription": {
+                  "text": "Unreachable code"
+                },
+                "fullDescription": {
+                  "text": "Reports code that can never be executed, which almost certainly indicates an error",
+                  "markdown": "Reports code that can never be executed, which almost certainly indicates an error"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "UnreachableCodeJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSSuspiciousEqPlus",
+                "shortDescription": {
+                  "text": "Suspicious '=+' assignment"
+                },
+                "fullDescription": {
+                  "text": "Reports an assignment in the form 'a =+ b'. Suggests replacing with 'a += b'.",
+                  "markdown": "Reports an assignment in the form `a =+ b`. Suggests replacing with `a += b`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSSuspiciousEqPlus",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EmptyStatementBodyJS",
+                "shortDescription": {
+                  "text": "Statement with empty body"
+                },
+                "fullDescription": {
+                  "text": "Reports an 'if', 'while', 'for', or 'with' statement with an empty body. Such statements often result from typos, and may cause confusion. Use the checkbox below to specify whether the statements with empty block statements as bodies should be reported.",
+                  "markdown": "Reports an `if`, `while`, `for`, or `with` statement with an empty body. Such statements often result from typos, and may cause confusion.\n\n\nUse the checkbox below to specify whether the statements with empty block statements as bodies\nshould be reported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "StatementWithEmptyBodyJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Potentially confusing code constructs",
+                      "index": 31,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "JSUnusedLocalSymbols",
+                "shortDescription": {
+                  "text": "Unused local symbol"
+                },
+                "fullDescription": {
+                  "text": "Reports an unused locally accessible parameter, local variable, function, class, or private member declaration.",
+                  "markdown": "Reports an unused locally accessible parameter, local variable, function, class, or private member declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JSUnusedLocalSymbols",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/Unused symbols",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "gherkin",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "GherkinScenarioToScenarioOutline",
+                "shortDescription": {
+                  "text": "Scenario with Examples section"
+                },
+                "fullDescription": {
+                  "text": "Reports Gherkin scenarios that contain an 'Examples' section. Use the quick-fix to convert 'Scenario' to 'Scenario Outline'.",
+                  "markdown": "Reports Gherkin scenarios that contain an `Examples` section.\n\nUse the quick-fix to convert `Scenario` to `Scenario Outline`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinScenarioToScenarioOutline",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberTableInspection",
+                "shortDescription": {
+                  "text": "Unused or missing columns in Cucumber tables"
+                },
+                "fullDescription": {
+                  "text": "Reports tables in 'Examples' sections in Cucumber .feature files with unused or missing columns.",
+                  "markdown": "Reports tables in `Examples` sections in Cucumber .feature files with unused or missing columns."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CucumberTableInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "GherkinBrokenTableInspection",
+                "shortDescription": {
+                  "text": "Gherkin table is broken"
+                },
+                "fullDescription": {
+                  "text": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header.",
+                  "markdown": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinBrokenTableInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "GherkinMisplacedBackground",
+                "shortDescription": {
+                  "text": "Misplaced background section"
+                },
+                "fullDescription": {
+                  "text": "Reports 'Background' sections that are located incorrectly. The 'Background' section must be located before the 'Scenario' section.",
+                  "markdown": "Reports `Background` sections that are located incorrectly. The `Background` section must be located before the `Scenario` section."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinMisplacedBackground",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberMissedExamples",
+                "shortDescription": {
+                  "text": "Missing examples section"
+                },
+                "fullDescription": {
+                  "text": "Reports scenario outlines in Cucumber .feature files that do not have the 'Examples' section. Use the quick-fix to automatically create the 'Examples' section with a pre-filled table header.",
+                  "markdown": "Reports scenario outlines in Cucumber .feature files that do not have the `Examples` section.\n\nUse the quick-fix to automatically create the `Examples` section with a pre-filled table header."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CucumberMissedExamples",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberUndefinedStep",
+                "shortDescription": {
+                  "text": "Undefined step"
+                },
+                "fullDescription": {
+                  "text": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions. Use the quick-fix to automatically create a new step definition.",
+                  "markdown": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions.\n\nUse the quick-fix to automatically create a new step definition."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CucumberUndefinedStep",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberExamplesColon",
+                "shortDescription": {
+                  "text": "Missing ':' after examples keyword"
+                },
+                "fullDescription": {
+                  "text": "Reports 'Examples' sections in Cucumber .feature files if they do not have ':' after the 'Examples' keyword.",
+                  "markdown": "Reports `Examples` sections in Cucumber .feature files if they do not have ':' after the `Examples` keyword."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CucumberExamplesColon",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.editorconfig.editorconfigjetbrains",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "EditorConfigRootDeclarationUniqueness",
+                "shortDescription": {
+                  "text": "Extra top-level declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports multiple top-level declarations. There can be only one optional “root=true” top-level declaration in the EditorConfig file. Using multiple top-level declarations is not allowed.",
+                  "markdown": "Reports multiple top-level declarations. There can be only one optional \"root=true\" top-level declaration in the EditorConfig file. Using multiple top-level declarations is not allowed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigRootDeclarationUniqueness",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigNumerousWildcards",
+                "shortDescription": {
+                  "text": "Too many wildcards"
+                },
+                "fullDescription": {
+                  "text": "Reports sections that contain too many wildcards. Using a lot of wildcards may lead to performance issues.",
+                  "markdown": "Reports sections that contain too many wildcards. Using a lot of wildcards may lead to performance issues."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigNumerousWildcards",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigKeyCorrectness",
+                "shortDescription": {
+                  "text": "Unknown property"
+                },
+                "fullDescription": {
+                  "text": "Reports properties that are not supported by the IDE. Note: some “ij” domain properties may require specific language plugins.",
+                  "markdown": "Reports properties that are not supported by the IDE. Note: some \"ij\" domain properties may require specific language plugins."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigKeyCorrectness",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigEncoding",
+                "shortDescription": {
+                  "text": "File encoding doesn't match EditorConfig charset"
+                },
+                "fullDescription": {
+                  "text": "Checks that current file encoding matches the encoding defined in \"charset\" property of .editorconfig file.",
+                  "markdown": "Checks that current file encoding matches the encoding defined in \"charset\" property of .editorconfig file."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigEncoding",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigRootDeclarationCorrectness",
+                "shortDescription": {
+                  "text": "Unexpected top-level declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports unexpected top-level declarations. Top-level declarations other than “root=true” are not allowed in the EditorConfig file.",
+                  "markdown": "Reports unexpected top-level declarations. Top-level declarations other than \"root=true\" are not allowed in the EditorConfig file."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigRootDeclarationCorrectness",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigPatternRedundancy",
+                "shortDescription": {
+                  "text": "Duplicate or redundant pattern"
+                },
+                "fullDescription": {
+                  "text": "Reports file patterns that are redundant as there already are other patterns that define the same scope of files or even a broader one. For example, in '[{*.java,*}]' the first '*.java' pattern defines a narrower scope compared to '*'. That is why it is redundant and can be removed.",
+                  "markdown": "Reports file patterns that are redundant as there already are other patterns that define the same scope of files or even a broader one. For example, in `[{*.java,*}]` the first `*.java` pattern defines a narrower scope compared to `*`. That is why it is redundant and can be removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigPatternRedundancy",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigDeprecatedDescriptor",
+                "shortDescription": {
+                  "text": "Deprecated property"
+                },
+                "fullDescription": {
+                  "text": "Reports EditorConfig properties that are no longer supported.",
+                  "markdown": "Reports EditorConfig properties that are no longer supported."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigDeprecatedDescriptor",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigShadowedOption",
+                "shortDescription": {
+                  "text": "Overridden property"
+                },
+                "fullDescription": {
+                  "text": "Reports properties that are already defined in other sections. For example: '[*.java]\nindent_size=4\n[{*.java,*.js}]\nindent_size=2' The second section includes all '*.java' files too but it also redefines indent_size. As a result the value 2 will be used for files matching '*.java'.",
+                  "markdown": "Reports properties that are already defined in other sections.\n\nFor example:\n\n\n    [*.java]\n    indent_size=4\n    [{*.java,*.js}]\n    indent_size=2\n\nThe second section includes all `*.java` files too but it also redefines indent_size. As a result the value 2 will be used for files matching `*.java`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigShadowedOption",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigEmptyHeader",
+                "shortDescription": {
+                  "text": "Empty header"
+                },
+                "fullDescription": {
+                  "text": "Reports sections with an empty header. Section header must contain file path globs in the format similar to one supported by 'gitignore'.",
+                  "markdown": "Reports sections with an empty header. Section header must contain file path globs in the format similar to one supported by `gitignore`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigEmptyHeader",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigValueUniqueness",
+                "shortDescription": {
+                  "text": "Non-unique list value"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicates in lists of values.",
+                  "markdown": "Reports duplicates in lists of values."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigValueUniqueness",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigMissingRequiredDeclaration",
+                "shortDescription": {
+                  "text": "Required declarations are missing"
+                },
+                "fullDescription": {
+                  "text": "Reports properties that miss the required declarations. Refer to the documentation for more information.",
+                  "markdown": "Reports properties that miss the required declarations. Refer to the documentation for more information."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigMissingRequiredDeclaration",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigSpaceInHeader",
+                "shortDescription": {
+                  "text": "Space in file pattern"
+                },
+                "fullDescription": {
+                  "text": "Reports space characters in wildcard patterns that affect pattern matching. If these characters are not intentional, they should be removed.",
+                  "markdown": "Reports space characters in wildcard patterns that affect pattern matching. If these characters are not intentional, they should be removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigSpaceInHeader",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigOptionRedundancy",
+                "shortDescription": {
+                  "text": "Redundant property"
+                },
+                "fullDescription": {
+                  "text": "Reports properties that are redundant when another applicable section already contains the same property and value. For example: '[*]\nindent_size=4\n[*.java]\nindent_size=4' are both applicable to '*.java' files and define the same 'indent_size' value.",
+                  "markdown": "Reports properties that are redundant when another applicable section already contains the same property and value.\n\n\nFor example:\n\n\n    [*]\n    indent_size=4\n    [*.java]\n    indent_size=4\n\nare both applicable to `*.java` files and define the same `indent_size` value."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigOptionRedundancy",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigUnexpectedComma",
+                "shortDescription": {
+                  "text": "Unexpected comma"
+                },
+                "fullDescription": {
+                  "text": "Reports commas that cannot be used in the current context. Commas are allowed only as separators for values in lists.",
+                  "markdown": "Reports commas that cannot be used in the current context. Commas are allowed only as separators for values in lists."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigUnexpectedComma",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigCharClassRedundancy",
+                "shortDescription": {
+                  "text": "Unnecessary character class"
+                },
+                "fullDescription": {
+                  "text": "Reports character classes that consist of a single character. Such classes can be simplified to a character, for example '[a]'→'a'.",
+                  "markdown": "Reports character classes that consist of a single character. Such classes can be simplified to a character, for example `[a]`→`a`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigCharClassRedundancy",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigPartialOverride",
+                "shortDescription": {
+                  "text": "Overlapping sections"
+                },
+                "fullDescription": {
+                  "text": "Reports subsets of files specified in the current section that overlap with other subsets in other sections. For example: '[{foo,bar}]' and '[{foo,bas}]' both contain “foo”.",
+                  "markdown": "Reports subsets of files specified in the current section that overlap with other subsets in other sections. For example: `[{foo,bar}]` and `[{foo,bas}]` both contain \"foo\"."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigPartialOverride",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigEmptySection",
+                "shortDescription": {
+                  "text": "Empty section"
+                },
+                "fullDescription": {
+                  "text": "Reports sections that do not contain any EditorConfig properties.",
+                  "markdown": "Reports sections that do not contain any EditorConfig properties."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigEmptySection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigShadowingOption",
+                "shortDescription": {
+                  "text": "Overriding property"
+                },
+                "fullDescription": {
+                  "text": "Reports properties that override the same properties defined earlier in the file. For example: '[*.java]\nindent_size=4\n[{*.java,*.js}]\nindent_size=2' The second section includes the same files as '[*.java]' but also sets indent_size to value 2. Thus the first declaration 'indent_size=4'will be ignored.",
+                  "markdown": "Reports properties that override the same properties defined earlier in the file.\n\nFor example:\n\n\n    [*.java]\n    indent_size=4\n    [{*.java,*.js}]\n    indent_size=2\n\nThe second section includes the same files as `[*.java]` but also sets indent_size to value 2. Thus the first declaration `indent_size=4`will be ignored."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigShadowingOption",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigListAcceptability",
+                "shortDescription": {
+                  "text": "Unexpected value list"
+                },
+                "fullDescription": {
+                  "text": "Reports lists of values that are used in properties in which lists are not supported. In this case, only a single value can be specified.",
+                  "markdown": "Reports lists of values that are used in properties in which lists are not supported. In this case, only a single value can be specified."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigListAcceptability",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigPatternEnumerationRedundancy",
+                "shortDescription": {
+                  "text": "Unnecessary braces"
+                },
+                "fullDescription": {
+                  "text": "Reports pattern lists that are either empty '{}' or contain just one pattern, for example '{foo}' in contrast to a list containing multiple patterns, for example '{foo,bar}'. In this case braces are handled as a part of the name. For example, the pattern '*.{a}' will match the file 'my.{a}' but not 'my.a'.",
+                  "markdown": "Reports pattern lists that are either empty `{}` or contain just one pattern, for example `{foo}` in contrast to a list containing multiple patterns, for example `{foo,bar}`. In this case braces are handled as a part of the name. For example, the pattern `*.{a}` will match the file `my.{a}` but not `my.a`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigPatternEnumerationRedundancy",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigReferenceCorrectness",
+                "shortDescription": {
+                  "text": "Invalid reference"
+                },
+                "fullDescription": {
+                  "text": "Reports identifiers that are either unknown or have a wrong type.",
+                  "markdown": "Reports identifiers that are either unknown or have a wrong type."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigReferenceCorrectness",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigPairAcceptability",
+                "shortDescription": {
+                  "text": "Unexpected key-value pair"
+                },
+                "fullDescription": {
+                  "text": "Reports key-value pairs that are not allowed in the current context.",
+                  "markdown": "Reports key-value pairs that are not allowed in the current context."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigPairAcceptability",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigNoMatchingFiles",
+                "shortDescription": {
+                  "text": "No matching files"
+                },
+                "fullDescription": {
+                  "text": "Reports sections with wildcard patterns that do not match any files under the directory in which the '.editorconfig' file is located.",
+                  "markdown": "Reports sections with wildcard patterns that do not match any files under the directory in which the `.editorconfig` file is located."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigNoMatchingFiles",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigWildcardRedundancy",
+                "shortDescription": {
+                  "text": "Redundant wildcard"
+                },
+                "fullDescription": {
+                  "text": "Reports wildcards that become redundant when the “**” wildcard is used in the same section. The “**” wildcard defines a broader set of files than any other wildcard. That is why, any other wildcard used in the same section has no affect and can be removed.",
+                  "markdown": "Reports wildcards that become redundant when the \"\\*\\*\" wildcard is used in the same section.\n\n\nThe \"\\*\\*\" wildcard defines a broader set of files than any other wildcard.\nThat is why, any other wildcard used in the same section has no affect and can be removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigWildcardRedundancy",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigHeaderUniqueness",
+                "shortDescription": {
+                  "text": "EditorConfig section is not unique"
+                },
+                "fullDescription": {
+                  "text": "Reports sections that define the same file pattern as other sections.",
+                  "markdown": "Reports sections that define the same file pattern as other sections."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigHeaderUniqueness",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigValueCorrectness",
+                "shortDescription": {
+                  "text": "Invalid property value"
+                },
+                "fullDescription": {
+                  "text": "Reports property values that do not meet value restrictions. For example, some properties may be only “true” or “false”, others contain only integer numbers etc. If a value has a limited set of variants, use code completion to see all of them.",
+                  "markdown": "Reports property values that do not meet value restrictions. For example, some properties may be only \"true\" or \"false\", others contain only integer numbers etc. If a value has a limited set of variants, use code completion to see all of them."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigValueCorrectness",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigVerifyByCore",
+                "shortDescription": {
+                  "text": "Invalid .editorconfig file"
+                },
+                "fullDescription": {
+                  "text": "Verifies the whole file using the backing EditorConfig core library and reports any failures. Any such failure would prevent EditorConfig properties from being correctly applied.",
+                  "markdown": "Verifies the whole file using the backing EditorConfig core library and reports any failures. Any such failure would prevent EditorConfig properties from being correctly applied."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigVerifyByCore",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigCharClassLetterRedundancy",
+                "shortDescription": {
+                  "text": "Duplicate character class letter"
+                },
+                "fullDescription": {
+                  "text": "Reports wildcard patterns in the EditorConfig section that contain a duplicate character in the character class, for example '[aa]'.",
+                  "markdown": "Reports wildcard patterns in the EditorConfig section that contain a duplicate character in the character class, for example `[aa]`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigCharClassLetterRedundancy",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "EditorConfigUnusedDeclaration",
+                "shortDescription": {
+                  "text": "Unused declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports unused declarations. Such declarations can be removed.",
+                  "markdown": "Reports unused declarations. Such declarations can be removed."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "EditorConfigUnusedDeclaration",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "EditorConfig",
+                      "index": 19,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.intellij.plugins.postcss",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "PostCssUnresolvedModuleValueReference",
+                "shortDescription": {
+                  "text": "Unresolved CSS module value"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved reference to a CSS Module Value ('@value' declaration). Example: '@value foo from unknown;'",
+                  "markdown": "Reports an unresolved reference to a [CSS Module Value](https://github.com/css-modules/postcss-modules-values) (`@value` declaration).\n\nExample:\n\n\n    @value foo from unknown;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PostCssUnresolvedModuleValueReference",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PostCSS",
+                      "index": 21,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PostCssNesting",
+                "shortDescription": {
+                  "text": "Invalid nested rule"
+                },
+                "fullDescription": {
+                  "text": "Reports a nested style rule whose syntax doesn't comply with the PostCSS Nested or the PostCSS Nesting specification. Example: '.phone {\n  &_title {}\n}'",
+                  "markdown": "Reports a nested style rule whose syntax doesn't comply with the [PostCSS Nested](https://github.com/postcss/postcss-nested) or the [PostCSS Nesting](https://github.com/csstools/postcss-nesting) specification.\n\nExample:\n\n\n    .phone {\n      &_title {}\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PostCssNesting",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PostCSS",
+                      "index": 21,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PostCssCustomMedia",
+                "shortDescription": {
+                  "text": "Invalid custom media"
+                },
+                "fullDescription": {
+                  "text": "Reports a syntax error in a PostCSS Custom Media query. Example: '@custom-media --small-viewport (max-width: 30em);'",
+                  "markdown": "Reports a syntax error in a [PostCSS Custom Media](https://github.com/postcss/postcss-custom-media) query.\n\nExample:\n\n\n    @custom-media --small-viewport (max-width: 30em);\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PostCssCustomMedia",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PostCSS",
+                      "index": 21,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PostCssCustomSelector",
+                "shortDescription": {
+                  "text": "Invalid custom selector"
+                },
+                "fullDescription": {
+                  "text": "Reports a syntax error in PostCSS Custom Selector. Example: '@custom-selector :--heading h1, h2, h3;'",
+                  "markdown": "Reports a syntax error in [PostCSS Custom Selector](https://github.com/postcss/postcss-custom-selectors).\n\nExample:\n\n\n    @custom-selector :--heading h1, h2, h3;\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PostCssCustomSelector",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PostCSS",
+                      "index": 21,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PostCssMediaRange",
+                "shortDescription": {
+                  "text": "Invalid media query range"
+                },
+                "fullDescription": {
+                  "text": "Checks range context syntax, which may alternatively be used for media features with a 'range' type. Example: '@media screen and (500px <= width <= 1200px) {}'",
+                  "markdown": "Checks [range context](https://github.com/postcss/postcss-media-minmax) syntax, which may alternatively be used for media features with a 'range' type.\n\nExample:\n\n\n    @media screen and (500px <= width <= 1200px) {}\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "PostCssMediaRange",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PostCSS",
+                      "index": 21,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "HtmlTools",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "HtmlRequiredAltAttribute",
+                "shortDescription": {
+                  "text": "Missing required 'alt' attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports a missing 'alt' attribute in a 'img' or 'applet' tag or in a 'area' element of an image map. Suggests adding a required attribute with a text alternative for the contents of the tag. Based on WCAG 2.0: H24, H35, H36, H37.",
+                  "markdown": "Reports a missing `alt` attribute in a `img` or `applet` tag or in a `area` element of an image map. Suggests adding a required attribute with a text alternative for the contents of the tag. Based on WCAG 2.0: [H24](https://www.w3.org/TR/WCAG20-TECHS/H24.html), [H35](https://www.w3.org/TR/WCAG20-TECHS/H35.html), [H36](https://www.w3.org/TR/WCAG20-TECHS/H36.html), [H37](https://www.w3.org/TR/WCAG20-TECHS/H37.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlRequiredAltAttribute",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML/Accessibility",
+                      "index": 28,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlDeprecatedTag",
+                "shortDescription": {
+                  "text": "Obsolete tag"
+                },
+                "fullDescription": {
+                  "text": "Reports an obsolete HTML5 tag. Suggests replacing the obsolete tag with a CSS or another tag.",
+                  "markdown": "Reports an obsolete HTML5 tag. Suggests replacing the obsolete tag with a CSS or another tag."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlDeprecatedTag",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckImageSize",
+                "shortDescription": {
+                  "text": "Mismatched image size"
+                },
+                "fullDescription": {
+                  "text": "Reports a 'width' and 'height' attribute value of a 'img' tag that is different from the actual width and height of the referenced image.",
+                  "markdown": "Reports a `width` and `height` attribute value of a `img` tag that is different from the actual width and height of the referenced image."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CheckImageSize",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlRequiredSummaryAttribute",
+                "shortDescription": {
+                  "text": "Missing required 'summary' attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports a missing 'summary' attribute in a 'table' tag. Suggests adding a'summary' attribute. Based on WCAG 2.0: H73.",
+                  "markdown": "Reports a missing `summary` attribute in a `table` tag. Suggests adding a`summary` attribute. Based on WCAG 2.0: [H73](https://www.w3.org/TR/WCAG20-TECHS/H73.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "HtmlRequiredSummaryAttribute",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML/Accessibility",
+                      "index": 28,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlNonExistentInternetResource",
+                "shortDescription": {
+                  "text": "Unresolved web link"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved web link. Works by making network requests in the background.",
+                  "markdown": "Reports an unresolved web link. Works by making network requests in the background."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlNonExistentInternetResource",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlFormInputWithoutLabel",
+                "shortDescription": {
+                  "text": "Missing associated label"
+                },
+                "fullDescription": {
+                  "text": "Reports a form element ('input', 'textarea', or 'select') without an associated label. Suggests creating a new label. Based on WCAG 2.0: H44.",
+                  "markdown": "Reports a form element (`input`, `textarea`, or `select`) without an associated label. Suggests creating a new label. Based on WCAG 2.0: [H44](https://www.w3.org/TR/WCAG20-TECHS/H44.html).  "
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlFormInputWithoutLabel",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML/Accessibility",
+                      "index": 28,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlRequiredTitleAttribute",
+                "shortDescription": {
+                  "text": "Missing required 'title' attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports a missing title attribute 'frame', 'iframe', 'dl', and 'a' tags. Suggests adding a title attribute. Based on WCAG 2.0: H33, H40, and H64.",
+                  "markdown": "Reports a missing title attribute `frame`, `iframe`, `dl`, and `a` tags. Suggests adding a title attribute. Based on WCAG 2.0: [H33](https://www.w3.org/TR/WCAG20-TECHS/H33.html), [H40](https://www.w3.org/TR/WCAG20-TECHS/H40.html), and [H64](https://www.w3.org/TR/WCAG20-TECHS/H64.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "HtmlRequiredTitleAttribute",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML/Accessibility",
+                      "index": 28,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlRequiredLangAttribute",
+                "shortDescription": {
+                  "text": "Missing required 'lang' attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports a missing 'lang' (or 'xml:lang') attribute in a 'html' tag. Suggests adding a required attribute to state the default language of the document. Based on WCAG 2.0: H57.",
+                  "markdown": "Reports a missing `lang` (or `xml:lang`) attribute in a `html` tag. Suggests adding a required attribute to state the default language of the document. Based on WCAG 2.0: [H57](https://www.w3.org/TR/WCAG20-TECHS/H57.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlRequiredLangAttribute",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML/Accessibility",
+                      "index": 28,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlRequiredTitleElement",
+                "shortDescription": {
+                  "text": "Missing required 'title' element"
+                },
+                "fullDescription": {
+                  "text": "Reports a missing 'title' element inside a 'head' section. Suggests adding a 'title' element. The title should describe the document. Based on WCAG 2.0: H25.",
+                  "markdown": "Reports a missing `title` element inside a `head` section. Suggests adding a `title` element. The title should describe the document. Based on WCAG 2.0: [H25](https://www.w3.org/TR/WCAG20-TECHS/H25.html)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlRequiredTitleElement",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML/Accessibility",
+                      "index": 28,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlDeprecatedAttribute",
+                "shortDescription": {
+                  "text": "Obsolete attribute"
+                },
+                "fullDescription": {
+                  "text": "Reports an obsolete HTML5 attribute.",
+                  "markdown": "Reports an obsolete HTML5 attribute."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "HtmlDeprecatedAttribute",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "HtmlPresentationalElement",
+                "shortDescription": {
+                  "text": "Presentational tag"
+                },
+                "fullDescription": {
+                  "text": "Reports a presentational HTML tag. Suggests replacing the presentational tag with a CSS or another tag.",
+                  "markdown": "Reports a presentational HTML tag. Suggests replacing the presentational tag with a CSS or another tag."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "HtmlPresentationalElement",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "HTML",
+                      "index": 14,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.intellij.css",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "CssInvalidHtmlTagReference",
+                "shortDescription": {
+                  "text": "Invalid type selector"
+                },
+                "fullDescription": {
+                  "text": "Reports a CSS type selector that matches an unknown HTML element.",
+                  "markdown": "Reports a CSS [type selector](https://developer.mozilla.org/en-US/docs/Web/CSS/Type_selectors) that matches an unknown HTML element."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidHtmlTagReference",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidFunction",
+                "shortDescription": {
+                  "text": "Invalid function"
+                },
+                "fullDescription": {
+                  "text": "Reports an unknown CSS function or an incorrect function parameter.",
+                  "markdown": "Reports an unknown [CSS function](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Functions) or an incorrect function parameter."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidFunction",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssMissingSemicolon",
+                "shortDescription": {
+                  "text": "Missing semicolon"
+                },
+                "fullDescription": {
+                  "text": "Reports a missing semicolon at the end of a declaration.",
+                  "markdown": "Reports a missing semicolon at the end of a declaration."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssMissingSemicolon",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Code style issues",
+                      "index": 42,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssMissingComma",
+                "shortDescription": {
+                  "text": "Missing comma in selector list"
+                },
+                "fullDescription": {
+                  "text": "Reports a multi-line selector. Most likely this means that several single-line selectors are actually intended but a comma is missing at the end of one or several lines. Example: 'input /* comma has probably been forgotten */\n.button {\n  margin: 1px;\n}'",
+                  "markdown": "Reports a multi-line selector. Most likely this means that several single-line selectors are actually intended but a comma is missing at the end of one or several lines.\n\n**Example:**\n\n\n    input /* comma has probably been forgotten */\n    .button {\n      margin: 1px;\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssMissingComma",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Probable bugs",
+                      "index": 51,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssConvertColorToHexInspection",
+                "shortDescription": {
+                  "text": "Color could be replaced with #-hex"
+                },
+                "fullDescription": {
+                  "text": "Reports an 'rgb()', 'hsl()', or other color function. Suggests replacing a color function with an equivalent hexadecimal notation. Example: 'rgb(12, 15, 255)' After the quick-fix is applied: '#0c0fff'.",
+                  "markdown": "Reports an `rgb()`, `hsl()`, or other color function.\n\nSuggests replacing a color function with an equivalent hexadecimal notation.\n\n**Example:**\n\n    rgb(12, 15, 255)\n\nAfter the quick-fix is applied:\n\n    #0c0fff.\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssConvertColorToHexInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssConvertColorToRgbInspection",
+                "shortDescription": {
+                  "text": "Color could be replaced with rgb()"
+                },
+                "fullDescription": {
+                  "text": "Reports an 'hsl()' or 'hwb()' color function or a hexadecimal color notation. Suggests replacing such color value with an equivalent 'rgb()' or 'rgba()' color function. Example: '#0c0fff' After the quick-fix is applied: 'rgb(12, 15, 255)'.",
+                  "markdown": "Reports an `hsl()` or `hwb()` color function or a hexadecimal color notation.\n\nSuggests replacing such color value with an equivalent `rgb()` or `rgba()` color function.\n\n**Example:**\n\n    #0c0fff\n\nAfter the quick-fix is applied:\n\n    rgb(12, 15, 255).\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssConvertColorToRgbInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssUnusedSymbol",
+                "shortDescription": {
+                  "text": "Unused selector"
+                },
+                "fullDescription": {
+                  "text": "Reports a CSS class or an element IDs that appears in selectors but is not used in HTML. Note that complete inspection results are available only when running it via Code | Inspect Code or Code | Analyze Code | Run Inspection by Name. Due to performance reasons, style sheet files are not inspected on the fly.",
+                  "markdown": "Reports a CSS class or an element IDs that appears in selectors but is not used in HTML.\n\n\nNote that complete inspection results are available only when running it via **Code \\| Inspect Code** or\n**Code \\| Analyze Code \\| Run Inspection by Name**.\nDue to performance reasons, style sheet files are not inspected on the fly."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssUnusedSymbol",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidAtRule",
+                "shortDescription": {
+                  "text": "Unknown at-rule"
+                },
+                "fullDescription": {
+                  "text": "Reports an unknown CSS at-rule.",
+                  "markdown": "Reports an unknown [CSS at-rule](https://developer.mozilla.org/en-US/docs/Web/CSS/At-rule)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidAtRule",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssUnknownTarget",
+                "shortDescription": {
+                  "text": "Unresolved file reference"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved file reference, for example, an incorrect path in an '@import' statement.",
+                  "markdown": "Reports an unresolved file reference, for example, an incorrect path in an `@import` statement."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssUnknownTarget",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssNegativeValue",
+                "shortDescription": {
+                  "text": "Negative property value"
+                },
+                "fullDescription": {
+                  "text": "Reports a negative value of a CSS property that is not expected to be less than zero, for example, object width or height.",
+                  "markdown": "Reports a negative value of a CSS property that is not expected to be less than zero, for example, object width or height."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssNegativeValue",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssNoGenericFontName",
+                "shortDescription": {
+                  "text": "Missing generic font family name"
+                },
+                "fullDescription": {
+                  "text": "Verifies that the 'font-family' property contains a generic font family name as a fallback alternative. Generic font family names are: 'serif', 'sans-serif', 'cursive', 'fantasy', and 'monospace'.",
+                  "markdown": "Verifies that the [font-family](https://developer.mozilla.org/en-US/docs/Web/CSS/font-family) property contains a generic font family name as a fallback alternative.\n\n\nGeneric font family names are: `serif`, `sans-serif`, `cursive`, `fantasy`,\nand `monospace`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssNoGenericFontName",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Probable bugs",
+                      "index": 51,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidCharsetRule",
+                "shortDescription": {
+                  "text": "Misplaced or incorrect @charset"
+                },
+                "fullDescription": {
+                  "text": "Reports a misplaced '@charset' at-rule or an incorrect charset value.",
+                  "markdown": "Reports a misplaced `@charset` at-rule or an incorrect charset value."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidCharsetRule",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidPseudoSelector",
+                "shortDescription": {
+                  "text": "Invalid pseudo-selector"
+                },
+                "fullDescription": {
+                  "text": "Reports an incorrect CSS pseudo-class pseudo-element.",
+                  "markdown": "Reports an incorrect CSS [pseudo-class](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes) [pseudo-element](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidPseudoSelector",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssRedundantUnit",
+                "shortDescription": {
+                  "text": "Redundant measure unit"
+                },
+                "fullDescription": {
+                  "text": "Reports a measure unit of a zero value where units are not required by the specification. Example: 'width: 0px'",
+                  "markdown": "Reports a measure unit of a zero value where units are not required by the specification.\n\n**Example:**\n\n    width: 0px\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssRedundantUnit",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Code style issues",
+                      "index": 42,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidPropertyValue",
+                "shortDescription": {
+                  "text": "Invalid property value"
+                },
+                "fullDescription": {
+                  "text": "Reports an incorrect CSS property value.",
+                  "markdown": "Reports an incorrect CSS property value."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidPropertyValue",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssBrowserCompatibilityForProperties",
+                "shortDescription": {
+                  "text": "Property is incompatible with selected browsers"
+                },
+                "fullDescription": {
+                  "text": "Reports a CSS property that is not supported by the specified browsers. Based on the MDN Compatibility Data.",
+                  "markdown": "Reports a CSS property that is not supported by the specified browsers. Based on the [MDN Compatibility Data](https://github.com/mdn/browser-compat-data)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssBrowserCompatibilityForProperties",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssReplaceWithShorthandUnsafely",
+                "shortDescription": {
+                  "text": "Properties may probably be replaced with a shorthand"
+                },
+                "fullDescription": {
+                  "text": "Reports a set of longhand CSS properties and suggests replacing an incomplete set of longhand CSS properties with a shorthand form, which is however not 100% equivalent in this case. For example, 2 properties: 'outline-color' and 'outline-style' may be replaced with a single 'outline'. Such replacement is not 100% equivalent because shorthands reset all omitted sub-values to their initial states. In this example, switching to the 'outline' shorthand means that 'outline-width' is also set to its initial value, which is 'medium'. This inspection doesn't handle full sets of longhand properties (when switching to shorthand is 100% safe). For such cases see the 'Properties may be safely replaced with a shorthand' inspection instead.",
+                  "markdown": "Reports a set of longhand CSS properties and suggests replacing an incomplete set of longhand CSS properties with a shorthand form, which is however not 100% equivalent in this case.\n\n\nFor example, 2 properties: `outline-color` and `outline-style` may be replaced with a single `outline`.\nSuch replacement is not 100% equivalent because shorthands reset all omitted sub-values to their initial states.\nIn this example, switching to the `outline` shorthand means that `outline-width` is also set to its initial value,\nwhich is `medium`.\n\n\nThis inspection doesn't handle full sets of longhand properties (when switching to shorthand is 100% safe).\nFor such cases see the 'Properties may be safely replaced with a shorthand' inspection instead."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "CssReplaceWithShorthandUnsafely",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssUnknownUnit",
+                "shortDescription": {
+                  "text": "Unknown unit"
+                },
+                "fullDescription": {
+                  "text": "Reports an unknown unit",
+                  "markdown": "Reports an unknown unit"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssUnknownUnit",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidMediaFeature",
+                "shortDescription": {
+                  "text": "Invalid media feature"
+                },
+                "fullDescription": {
+                  "text": "Reports an unknown CSS media feature or an incorrect media feature value.",
+                  "markdown": "Reports an unknown [CSS media feature](https://developer.mozilla.org/en-US/docs/Web/CSS/Media_Queries/Using_media_queries) or an incorrect media feature value."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidMediaFeature",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssDeprecatedValue",
+                "shortDescription": {
+                  "text": "Deprecated value"
+                },
+                "fullDescription": {
+                  "text": "Reports a deprecated CSS value. Suggests replacing the deprecated value with valid equivalent.",
+                  "markdown": "Reports a deprecated CSS value. Suggests replacing the deprecated value with valid equivalent."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssDeprecatedValue",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssNonIntegerLengthInPixels",
+                "shortDescription": {
+                  "text": "Non-integer length in pixels"
+                },
+                "fullDescription": {
+                  "text": "Reports a non-integer length in pixels. Example: 'width: 3.14px'",
+                  "markdown": "Reports a non-integer length in pixels.\n\n**Example:**\n\n     width: 3.14px\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "CssNonIntegerLengthInPixels",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Probable bugs",
+                      "index": 51,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidImport",
+                "shortDescription": {
+                  "text": "Misplaced @import"
+                },
+                "fullDescription": {
+                  "text": "Reports a misplaced '@import' statement. According to the specification, '@import' rules must precede all other types of rules, except '@charset' rules.",
+                  "markdown": "Reports a misplaced `@import` statement.\n\n\nAccording to the [specification](https://developer.mozilla.org/en-US/docs/Web/CSS/@import),\n`@import` rules must precede all other types of rules, except `@charset` rules."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidImport",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssUnresolvedCustomProperty",
+                "shortDescription": {
+                  "text": "Unresolved custom property"
+                },
+                "fullDescription": {
+                  "text": "Reports an unresolved reference to a custom property among the arguments of the 'var()' function.",
+                  "markdown": "Reports an unresolved reference to a [custom property](https://developer.mozilla.org/en-US/docs/Web/CSS/--*) among the arguments of the `var()` function."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssUnresolvedCustomProperty",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssOverwrittenProperties",
+                "shortDescription": {
+                  "text": "Overwritten property"
+                },
+                "fullDescription": {
+                  "text": "Reports a duplicated CSS property within a ruleset. Respects shorthand properties. Example: '.foo {\n  margin-bottom: 1px;\n  margin-bottom: 1px; /* duplicates margin-bottom */\n  margin: 0; /* overrides margin-bottom */\n}'",
+                  "markdown": "Reports a duplicated CSS property within a ruleset. Respects shorthand properties.\n\n**Example:**\n\n\n    .foo {\n      margin-bottom: 1px;\n      margin-bottom: 1px; /* duplicates margin-bottom */\n      margin: 0; /* overrides margin-bottom */\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssOverwrittenProperties",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssUnresolvedClassInComposesRule",
+                "shortDescription": {
+                  "text": "Unresolved class in 'composes' rule"
+                },
+                "fullDescription": {
+                  "text": "Reports a CSS class reference in the 'composes' rule that cannot be resolved to any valid target. Example: '.className {/* ... */}\n\n  .otherClassName {\n    composes: className;\n  }'",
+                  "markdown": "Reports a CSS class reference in the ['composes'](https://github.com/css-modules/css-modules#composition) rule that cannot be resolved to any valid target.\n\n**Example:**\n\n\n      .className {/* ... */}\n\n      .otherClassName {\n        composes: className;\n      }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CssUnresolvedClassInComposesRule",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssReplaceWithShorthandSafely",
+                "shortDescription": {
+                  "text": "Properties may be safely replaced with a shorthand"
+                },
+                "fullDescription": {
+                  "text": "Reports a set of longhand properties. Suggests replacing a complete set of longhand CSS properties with an equivalent shorthand form. For example, 4 properties: 'padding-top', 'padding-right', 'padding-bottom', and 'padding-left' can be safely replaced with a single 'padding' property. Note that this inspection doesn't show up if the set of longhand properties is incomplete (e.g. only 3 'padding-xxx' properties in a ruleset) because switching to a shorthand may change the result. For such cases consider the 'Properties may probably be replaced with a shorthand' inspection.",
+                  "markdown": "Reports a set of longhand properties. Suggests replacing a complete set of longhand CSS properties with an equivalent shorthand form.\n\n\nFor example, 4 properties: `padding-top`, `padding-right`, `padding-bottom`, and\n`padding-left`\ncan be safely replaced with a single `padding` property.\n\n\nNote that this inspection doesn't show up if the set of longhand properties is incomplete\n(e.g. only 3 `padding-xxx` properties in a ruleset)\nbecause switching to a shorthand may change the result.\nFor such cases consider the 'Properties may probably be replaced with a shorthand'\ninspection."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "CssReplaceWithShorthandSafely",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS",
+                      "index": 32,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssUnknownProperty",
+                "shortDescription": {
+                  "text": "Unknown property"
+                },
+                "fullDescription": {
+                  "text": "Reports an unknown CSS property or a property used in a wrong context. Add the unknown property to the 'Custom CSS properties' list to skip validation.",
+                  "markdown": "Reports an unknown CSS property or a property used in a wrong context.\n\nAdd the unknown property to the 'Custom CSS properties' list to skip validation."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssUnknownProperty",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CssInvalidNestedSelector",
+                "shortDescription": {
+                  "text": "Invalid nested selector"
+                },
+                "fullDescription": {
+                  "text": "Reports a nested selector starting with an identifier or a functional notation.",
+                  "markdown": "Reports a nested selector starting with an identifier or a functional notation."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CssInvalidNestedSelector",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "CSS/Invalid elements",
+                      "index": 33,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.jetbrains.plugins.yaml",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "YAMLSchemaValidation",
+                "shortDescription": {
+                  "text": "Validation by JSON Schema"
+                },
+                "fullDescription": {
+                  "text": "Reports inconsistencies between a YAML file and a JSON Schema if the schema is specified. Scheme example: '{\n    \"properties\": {\n      \"SomeNumberProperty\": {\n        \"type\": \"number\"\n      }\n    }\n  }' The following is an example with the corresponding warning: 'SomeNumberProperty: hello world'",
+                  "markdown": "Reports inconsistencies between a YAML file and a JSON Schema if the schema is specified.\n\n**Scheme example:**\n\n\n      {\n        \"properties\": {\n          \"SomeNumberProperty\": {\n            \"type\": \"number\"\n          }\n        }\n      }\n\n**The following is an example with the corresponding warning:**\n\n\n      SomeNumberProperty: hello world\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "YAMLSchemaValidation",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "YAML",
+                      "index": 36,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "YAMLUnresolvedAlias",
+                "shortDescription": {
+                  "text": "Unresolved alias"
+                },
+                "fullDescription": {
+                  "text": "Reports unresolved aliases in YAML files. Example: 'some_key: *unknown_alias'",
+                  "markdown": "Reports unresolved aliases in YAML files.\n\n**Example:**\n\n\n      some_key: *unknown_alias\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "YAMLUnresolvedAlias",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "YAML",
+                      "index": 36,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "YAMLSchemaDeprecation",
+                "shortDescription": {
+                  "text": "Deprecated YAML key"
+                },
+                "fullDescription": {
+                  "text": "Reports deprecated keys in YAML files. Deprecation is checked only if there exists a JSON schema associated with the corresponding YAML file. Note that the deprecation mechanism is not defined in the JSON Schema specification yet, and this inspection uses a non-standard 'deprecationMessage' extension. Scheme deprecation example: '{\n    \"properties\": {\n      \"SomeDeprecatedProperty\": {\n        \"deprecationMessage\": \"Baz\",\n        \"description\": \"Foo bar\"\n      }\n    }\n  }' The following is an example with the corresponding warning: 'SomeDeprecatedProperty: some value'",
+                  "markdown": "Reports deprecated keys in YAML files.\n\nDeprecation is checked only if there exists a JSON schema associated with the corresponding YAML file.\n\nNote that the deprecation mechanism is not defined in the JSON Schema specification yet,\nand this inspection uses a non-standard `deprecationMessage` extension.\n\n**Scheme deprecation example:**\n\n\n      {\n        \"properties\": {\n          \"SomeDeprecatedProperty\": {\n            \"deprecationMessage\": \"Baz\",\n            \"description\": \"Foo bar\"\n          }\n        }\n      }\n\n**The following is an example with the corresponding warning:**\n\n\n      SomeDeprecatedProperty: some value\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "YAMLSchemaDeprecation",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "YAML",
+                      "index": 36,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "YAMLIncompatibleTypes",
+                "shortDescription": {
+                  "text": "Suspicious type mismatch"
+                },
+                "fullDescription": {
+                  "text": "Reports a mismatch between a scalar value type in YAML file and types of the values in the similar positions. Example: 'myElements:\n  - value1\n  - value2\n  - false # <- reported, because it is a boolean value, while other values are strings'",
+                  "markdown": "Reports a mismatch between a scalar value type in YAML file and types of the values in the similar positions.\n\n**Example:**\n\n\n    myElements:\n      - value1\n      - value2\n      - false # <- reported, because it is a boolean value, while other values are strings\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "YAMLIncompatibleTypes",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "YAML",
+                      "index": 36,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "YAMLRecursiveAlias",
+                "shortDescription": {
+                  "text": "Recursive alias"
+                },
+                "fullDescription": {
+                  "text": "Reports recursion in YAML aliases. Alias can't be recursive and be used inside the data referenced by a corresponding anchor. Example: 'some_key: &some_anchor\n    sub_key1: value1\n    sub_key2: *some_anchor'",
+                  "markdown": "Reports recursion in YAML aliases.\n\nAlias can't be recursive and be used inside the data referenced by a corresponding anchor.\n\n**Example:**\n\n\n      some_key: &some_anchor\n        sub_key1: value1\n        sub_key2: *some_anchor\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "YAMLRecursiveAlias",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "YAML",
+                      "index": 36,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "YAMLDuplicatedKeys",
+                "shortDescription": {
+                  "text": "Duplicated YAML keys"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicated keys in YAML files. Example: 'same_key: some value\n  same_key: another value'",
+                  "markdown": "Reports duplicated keys in YAML files.\n\n**Example:**\n\n\n      same_key: some value\n      same_key: another value\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "YAMLDuplicatedKeys",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "YAML",
+                      "index": 36,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "YAMLUnusedAnchor",
+                "shortDescription": {
+                  "text": "Unused anchor"
+                },
+                "fullDescription": {
+                  "text": "Reports unused anchors. Example: 'some_key: &some_anchor\n    key1: value1'",
+                  "markdown": "Reports unused anchors.\n\n**Example:**\n\n\n      some_key: &some_anchor\n        key1: value1\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "YAMLUnusedAnchor",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "YAML",
+                      "index": 36,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.jetbrains.plugins.less",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "LessUnresolvedVariable",
+                "shortDescription": {
+                  "text": "Unresolved variable"
+                },
+                "fullDescription": {
+                  "text": "Reports a reference to a Less variable that is not resolved. Example: '* {\n  margin: @unknown-var;\n}'",
+                  "markdown": "Reports a reference to a [Less variable](http://lesscss.org/features/#variables-feature) that is not resolved.\n\n**Example:**\n\n\n    * {\n      margin: @unknown-var;\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LessUnresolvedVariable",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Less",
+                      "index": 43,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LessResolvedByNameOnly",
+                "shortDescription": {
+                  "text": "Missing import"
+                },
+                "fullDescription": {
+                  "text": "Reports a reference to a variable or mixin that is declared in another file, which is not explicitly imported in the current file. Example: '* {\n  margin: @var-in-other-file;\n}'",
+                  "markdown": "Reports a reference to a variable or mixin that is declared in another file, which is not explicitly [imported](http://lesscss.org/features/#import-atrules-feature) in the current file.\n\n**Example:**\n\n\n    * {\n      margin: @var-in-other-file;\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "LessResolvedByNameOnly",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Less",
+                      "index": 43,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "LessUnresolvedMixin",
+                "shortDescription": {
+                  "text": "Unresolved mixin"
+                },
+                "fullDescription": {
+                  "text": "Reports a reference to a Less mixin that is not resolved. Example: '* {\n  .unknown-mixin();\n}'",
+                  "markdown": "Reports a reference to a [Less mixin](http://lesscss.org/features/#mixins-feature) that is not resolved.\n\n**Example:**\n\n\n    * {\n      .unknown-mixin();\n    }\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LessUnresolvedMixin",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Less",
+                      "index": 43,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.jetbrains.php.joomla",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "FileHeaderInspection",
+                "shortDescription": {
+                  "text": "Missing @copyright/@license tags"
+                },
+                "fullDescription": {
+                  "text": "Reports the file header DocBlocks that do not contain the '@copyright' and '@license' tags required by the Joomla! DocBlocks standard. See Joomla! Coding Standards (developer.joomla.org) for details.",
+                  "markdown": "Reports the file header DocBlocks that do not contain the `@copyright` and `@license` tags required by the Joomla! DocBlocks standard.\n\n\nSee [Joomla! Coding Standards (developer.joomla.org)](https://developer.joomla.org/coding-standards/docblocks.html) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "FileHeaderInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Joomla!",
+                      "index": 49,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "MissingSinceTagDocInspection",
+                "shortDescription": {
+                  "text": "Missing @since tag"
+                },
+                "fullDescription": {
+                  "text": "Reports the class, class property, and class method DocBlocks that do not contain the '@since' tag required by the Joomla! DocBlocks standard. See Joomla! Coding Standards (developer.joomla.org) for details.",
+                  "markdown": "Reports the class, class property, and class method DocBlocks that do not contain the `@since` tag required by the Joomla! DocBlocks standard.\n\nSee [Joomla! Coding Standards (developer.joomla.org)](https://developer.joomla.org/coding-standards/docblocks.html) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "MissingSinceTagDocInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Joomla!",
+                      "index": 49,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.jetbrains.php.architecture",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "PhpComplexClassInspection",
+                "shortDescription": {
+                  "text": "Complex class should be refactored"
+                },
+                "fullDescription": {
+                  "text": "Reports the classes that are too complex. Class complexity is evaluated based on three metrics: TCC (Tight class cohesion) — the measure of class cohesiveness (more is better). WMC (Weighted Method count) — the sum of cyclomatic complexities for all methods in a class (less is better). ATFD (Access to foreign data) — the number of properties from another class that are accessed in the current class (less is better).",
+                  "markdown": "Reports the classes that are too complex.\n\nClass complexity is evaluated based on three metrics:\n\n* TCC (Tight class cohesion) --- the measure of class cohesiveness (more is better).\n* WMC (Weighted Method count) --- the sum of cyclomatic complexities for all methods in a class (less is better).\n* ATFD (Access to foreign data) --- the number of properties from another class that are accessed in the current class (less is better)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpComplexClassInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpMemberCanBePulledUpInspection",
+                "shortDescription": {
+                  "text": "Member can be pulled up"
+                },
+                "fullDescription": {
+                  "text": "Reports the class methods and properties that should be pulled up to the parent class or interface.",
+                  "markdown": "Reports the class methods and properties that should be pulled up to the parent class or interface."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpMemberCanBePulledUpInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFeatureEnvyLocalInspection",
+                "shortDescription": {
+                  "text": "Method has Feature Envy on another class"
+                },
+                "fullDescription": {
+                  "text": "Reports the \"Feature Envy\" code smell. Feature envy is defined as occurring when a method calls methods on another class more times than on the source class. It often indicates that the intended functionality is located in the wrong class. Calls to library classes, parent classes, and contained or containing classes are not counted by this inspection.",
+                  "markdown": "Reports the \"Feature Envy\" code smell. Feature envy is defined as occurring when a method calls methods on another class more times than on the source class. It often indicates that the intended functionality is located in the wrong class.\n\n\nCalls to library classes, parent classes, and contained or containing classes are not counted by this inspection."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpFeatureEnvyLocalInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpClassHasTooManyDeclaredMembersInspection",
+                "shortDescription": {
+                  "text": "Class has too many declared members"
+                },
+                "fullDescription": {
+                  "text": "Reports the classes that have too many properties or methods.",
+                  "markdown": "Reports the classes that have too many properties or methods."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpClassHasTooManyDeclaredMembersInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpFunctionCyclomaticComplexityInspection",
+                "shortDescription": {
+                  "text": "Function has too high cyclomatic complexity"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods that have high cyclomatic complexity and can probably be simplified. See Cyclomatic complexity (wikipedia.org) for details.",
+                  "markdown": "Reports the methods that have high cyclomatic complexity and can probably be simplified.\n\n\nSee [Cyclomatic complexity (wikipedia.org)](https://en.wikipedia.org/wiki/Cyclomatic_complexity) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpFunctionCyclomaticComplexityInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpHalsteadMetricInspection",
+                "shortDescription": {
+                  "text": "Halstead metric"
+                },
+                "fullDescription": {
+                  "text": "Reports the methods with high Halstead Complexity metric. See Halstead measure (wikipedia.org) for details.",
+                  "markdown": "Reports the methods with high Halstead Complexity metric.\n\n\nSee [Halstead measure (wikipedia.org)](https://en.wikipedia.org/wiki/Halstead_complexity_measures) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpHalsteadMetricInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpComplexFunctionInspection",
+                "shortDescription": {
+                  "text": "Complex function should be refactored"
+                },
+                "fullDescription": {
+                  "text": "Reports the functions or methods that are too complex. Complexity is evaluated based on four metrics: Lines of code — the number of code lines in a function/method (less is better) Maximum Nesting depth — the maximum number of nested statements in a function/method body (less is better) Cyclomatic complexity — the function/method cyclomatic complexity (less is better) Number of variables — the number of variables used in function/method body",
+                  "markdown": "Reports the functions or methods that are too complex.\n\nComplexity is evaluated based on four metrics:\n\n* Lines of code --- the number of code lines in a function/method (less is better)\n* Maximum Nesting depth --- the maximum number of nested statements in a function/method body (less is better)\n* Cyclomatic complexity --- the function/method cyclomatic complexity (less is better)\n* Number of variables --- the number of variables used in function/method body"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpComplexFunctionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpLackOfCohesionInspection",
+                "shortDescription": {
+                  "text": "LCOM metric"
+                },
+                "fullDescription": {
+                  "text": "Reports the classes that have high Lack of Cohesion metric value, which represents the degree of cohesiveness of a class. It uses class dependency graph components for class cohesiveness measure (M. Hitz and B. Montazeri definition of LCOM metric)",
+                  "markdown": "Reports the classes that have high Lack of Cohesion metric value, which represents the degree of cohesiveness of a class.\n\n\nIt uses class dependency graph components for class cohesiveness measure (M. Hitz and B. Montazeri definition of LCOM metric)"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpLackOfCohesionInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Refactoring opportunities",
+                      "index": 50,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.intellij.qodana",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "JsCoverageInspection",
+                "shortDescription": {
+                  "text": "Check JavaScript and TypeScript source code coverage"
+                },
+                "fullDescription": {
+                  "text": "Reports methods, classes and files whose coverage is below a certain threshold.",
+                  "markdown": "Reports methods, classes and files whose coverage is below a certain threshold."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "JsCoverageInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Code Coverage",
+                      "index": 56,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpCoverageInspection",
+                "shortDescription": {
+                  "text": "Check the PHP source code coverage"
+                },
+                "fullDescription": {
+                  "text": "Reports methods, classes and files whose coverage is below a certain threshold.",
+                  "markdown": "Reports methods, classes and files whose coverage is below a certain threshold."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpCoverageInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Code Coverage",
+                      "index": 56,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "QodanaSanity",
+                "shortDescription": {
+                  "text": "Sanity"
+                },
+                "fullDescription": {
+                  "text": "Reports issues essential to this file like syntax errors, unresolved methods and variables, etc...",
+                  "markdown": "Reports issues essential to this file like syntax errors, unresolved methods and variables, etc..."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "QodanaSanity",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Qodana",
+                      "index": 86,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.jetbrains.php.behat",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "BehatDocStepCanBeConvertedToAttributeInspection",
+                "shortDescription": {
+                  "text": "Behat doc step can be converted to attribute version"
+                },
+                "fullDescription": {
+                  "text": "Reports Behat doc tags that can be replaced with attribute version",
+                  "markdown": "Reports Behat doc tags that can be replaced with attribute version"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "BehatDocStepCanBeConvertedToAttributeInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Behat",
+                      "index": 58,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.jetbrains.plugins.ini4idea",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "DuplicateSectionInFile",
+                "shortDescription": {
+                  "text": "Duplicate section in file"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate sections in the 'ini' file.",
+                  "markdown": "Reports duplicate sections in the `ini` file."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DuplicateSectionInFile",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Ini files",
+                      "index": 60,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "DuplicateKeyInSection",
+                "shortDescription": {
+                  "text": "Duplicate directive in section"
+                },
+                "fullDescription": {
+                  "text": "Reports duplicate properties in the 'ini' file section.",
+                  "markdown": "Reports duplicate properties in the `ini` file section."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "DuplicateKeyInSection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Ini files",
+                      "index": 60,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.intellij.php.psalm",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "PsalmAdvanceCallableParamsInspection",
+                "shortDescription": {
+                  "text": "Function call is not compatible with 'callable' declaration"
+                },
+                "fullDescription": {
+                  "text": "Reports the parameters in function calls whose types are not compatible with the ones defined via 'Closure'.",
+                  "markdown": "Reports the parameters in function calls whose types are not compatible with the ones defined via `Closure`."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PsalmAdvanceCallableParamsInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Psalm",
+                      "index": 62,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PsalmGlobal",
+                "shortDescription": {
+                  "text": "Psalm validation"
+                },
+                "fullDescription": {
+                  "text": "Runs Psalm to find code problems. The inspection requires Psalm to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | Psalm. To learn more about installing Psalm, see: https://psalm.dev/docs/running_psalm/installation/",
+                  "markdown": "Runs Psalm to find code problems.   \n\nThe inspection requires Psalm to be properly installed and set up in the IDE under [Settings \\| PHP \\| Quality Tools \\| Psalm](settings://settings.php.quality.tools?Psalm).\n\nTo learn more about installing Psalm, see:\n<https://psalm.dev/docs/running_psalm/installation/>"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PsalmGlobal",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Quality tools",
+                      "index": 70,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.intellij.taintAnalysis",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "PhpTaintFunctionInspection",
+                "shortDescription": {
+                  "text": "Vulnerabilities scanner"
+                },
+                "fullDescription": {
+                  "text": "Call of this function may be unsafe.",
+                  "markdown": "Call of this function may be unsafe."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpTaintFunctionInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Taint analysis",
+                      "index": 64,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "PhpVulnerablePathsInspection",
+                "shortDescription": {
+                  "text": "Vulnerable paths scanner"
+                },
+                "fullDescription": {
+                  "text": "Global taint analysis inspection.",
+                  "markdown": "Global taint analysis inspection."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpVulnerablePathsInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Taint analysis",
+                      "index": 64,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.jetbrains.php.blade",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "BladeUnpairedParenthesesInStringLiteral",
+                "shortDescription": {
+                  "text": "Parse error due to unpaired parentheses in string literals"
+                },
+                "fullDescription": {
+                  "text": "Reports the unpaired parentheses in string literals that produce blade parser errors. See laravel issue (github.com) for details.",
+                  "markdown": "Reports the unpaired parentheses in string literals that produce blade parser errors.\n\n\nSee [laravel issue (github.com)](https://github.com/laravel/framework/issues/18317) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "BladeUnpairedParenthesesInStringLiteral",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Blade files",
+                      "index": 66,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "BladeControlDirectives",
+                "shortDescription": {
+                  "text": "Control directive missing"
+                },
+                "fullDescription": {
+                  "text": "Reports the Blade control directives that are not closed with the corresponding '@end...' directives. See Blade directives (laravel.com) for details.",
+                  "markdown": "Reports the Blade control directives that are not closed with the corresponding `@end...` directives.\n\n\nSee [Blade directives (laravel.com)](https://laravel.com/docs/blade#blade-directives) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "BladeControlDirectives",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Blade files",
+                      "index": 66,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "tanvd.grazi",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "LanguageDetectionInspection",
+                "shortDescription": {
+                  "text": "Natural language detection"
+                },
+                "fullDescription": {
+                  "text": "Detects natural languages and suggests enabling corresponding grammar and spelling checks.",
+                  "markdown": "Detects natural languages and suggests enabling corresponding grammar and spelling checks."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "LanguageDetectionInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Proofreading",
+                      "index": 57,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "GrazieInspection",
+                "shortDescription": {
+                  "text": "Grammar"
+                },
+                "fullDescription": {
+                  "text": "Reports grammar mistakes in your text. You can configure the inspection in Settings | Editor | Natural Languages | Grammar.",
+                  "markdown": "Reports grammar mistakes in your text. You can configure the inspection in [Settings \\| Editor \\| Natural Languages \\| Grammar](settings://reference.settingsdialog.project.grazie)."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "GrazieInspection",
+                    "ideaSeverity": "GRAMMAR_ERROR",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Proofreading",
+                      "index": 57,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.jetbrains.plugins.vue",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "VueMissingComponentImportInspection",
+                "shortDescription": {
+                  "text": "Missing component import"
+                },
+                "fullDescription": {
+                  "text": "Reports Vue components, which require to be imported in Vue templates. It provides a quick fix to add the missing import.",
+                  "markdown": "Reports Vue components, which require to be imported in Vue templates. It provides a quick fix to add the missing import."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "VueMissingComponentImportInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Vue",
+                      "index": 76,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "VueUnrecognizedDirective",
+                "shortDescription": {
+                  "text": "Unrecognized directive"
+                },
+                "fullDescription": {
+                  "text": "Reports an unrecognized Vue directive.",
+                  "markdown": "Reports an unrecognized Vue directive."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "VueUnrecognizedDirective",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Vue",
+                      "index": 76,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "VueDuplicateTag",
+                "shortDescription": {
+                  "text": "Duplicate template/script tag"
+                },
+                "fullDescription": {
+                  "text": "Reports multiple usages of the 'template' or 'script' tag in a Vue file. Vue Component specification indicates that each '*.vue' file can contain at most one 'template' or 'script' block at a time.",
+                  "markdown": "Reports multiple usages of the `template` or `script` tag in a Vue file.\n\n[Vue Component specification](https://vue-loader.vuejs.org/spec.html) indicates that each `*.vue` file can contain at most one `template` or `script` block at a time."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "VueDuplicateTag",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Vue",
+                      "index": 76,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "VueDeprecatedSymbol",
+                "shortDescription": {
+                  "text": "Deprecated symbol"
+                },
+                "fullDescription": {
+                  "text": "Reports a deprecated Vue symbol.",
+                  "markdown": "Reports a deprecated Vue symbol."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "VueDeprecatedSymbol",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Vue",
+                      "index": 76,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "VueDataFunction",
+                "shortDescription": {
+                  "text": "Data function"
+                },
+                "fullDescription": {
+                  "text": "Reports a Vue component data property that is not a function. Suggests wrapping an object literal with a function. When defining a component, 'data' must be declared as a function that returns the initial data object, because the same definition will be used for creating numerous instances. If a plain object is still used for 'data', that very object will be shared by reference across all instances created! With a 'data' function, every time a new instance is created we can simply call it to return a fresh copy of the initial data.",
+                  "markdown": "Reports a Vue component [data](https://vuejs.org/v2/api/#data) property that is not a function. Suggests wrapping an object literal with a function.\n\nWhen defining a component, `data` must be declared as a function that returns the initial data object, because the same definition will be used for creating numerous instances. If a plain object is still used for `data`, that very object will be shared by reference across all instances created! With a `data` function, every time a new instance is created we can simply call it to return a fresh copy of the initial data."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "VueDataFunction",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Vue",
+                      "index": 76,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "VueUnrecognizedSlot",
+                "shortDescription": {
+                  "text": "Unrecognized slot"
+                },
+                "fullDescription": {
+                  "text": "Reports an unrecognized Vue slot.",
+                  "markdown": "Reports an unrecognized Vue slot."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "VueUnrecognizedSlot",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Vue",
+                      "index": 76,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.intellij.plugins.dependencyAnalysis",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "CheckThirdPartySoftwareList",
+                "shortDescription": {
+                  "text": "Check third party software list"
+                },
+                "fullDescription": {
+                  "text": "Check project for possible problems: user's third party software list does not match the collected project metadata",
+                  "markdown": "Check project for possible problems: user's third party software list does not match the collected project metadata"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CheckThirdPartySoftwareList",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Dependency analysis",
+                      "index": 79,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckDependencyLicenses",
+                "shortDescription": {
+                  "text": "Check dependency licenses"
+                },
+                "fullDescription": {
+                  "text": "Check dependencies licenses for possible problems: missing or prohibited licenses, or other compliance issues",
+                  "markdown": "Check dependencies licenses for possible problems: missing or prohibited licenses, or other compliance issues"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CheckDependencyLicenses",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Dependency analysis",
+                      "index": 79,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CheckModuleLicenses",
+                "shortDescription": {
+                  "text": "Check module licenses"
+                },
+                "fullDescription": {
+                  "text": "Check module licenses for possible problems: missing licenses or other compliance issues",
+                  "markdown": "Check module licenses for possible problems: missing licenses or other compliance issues"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CheckModuleLicenses",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Dependency analysis",
+                      "index": 79,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "org.intellij.intelliLang",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "InjectedReferences",
+                "shortDescription": {
+                  "text": "Injected references"
+                },
+                "fullDescription": {
+                  "text": "Reports unresolved references injected by Language Injections. Example: '@Language(\"file-reference\")\n    String fileName = \"/home/user/nonexistent.file\"; // highlighted if file doesn't exist'",
+                  "markdown": "Reports unresolved references injected by [Language Injections](https://www.jetbrains.com/help/idea/using-language-injections.html).\n\nExample:\n\n\n        @Language(\"file-reference\")\n        String fileName = \"/home/user/nonexistent.file\"; // highlighted if file doesn't exist\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "InjectedReferences",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "General",
+                      "index": 27,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "com.intellij.php.tools.quality.phpstan",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "PhpStanGlobal",
+                "shortDescription": {
+                  "text": "PHPStan validation"
+                },
+                "fullDescription": {
+                  "text": "Runs PHPStan to find code problems. The inspection requires PHPStan to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | PHPStan. To learn more about installing PHPStan, see: https://phpstan.org/user-guide/getting-started",
+                  "markdown": "Runs PHPStan to find code problems.   \n\nThe inspection requires PHPStan to be properly installed and set up in the IDE under [Settings \\| PHP \\| Quality Tools \\| PHPStan](settings://settings.php.quality.tools?PHPStan).\n\nTo learn more about installing PHPStan, see:\n<https://phpstan.org/user-guide/getting-started>"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpStanGlobal",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Quality tools",
+                      "index": 70,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "intellij.webpack",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "WebpackConfigHighlighting",
+                "shortDescription": {
+                  "text": "Webpack config compliance with JSON Schema"
+                },
+                "fullDescription": {
+                  "text": "Validates options in webpack config files (which name should start with `webpack`, e.g. `webpack.config.js`) against webpack options schema. Disable this inspection to turn off validation and code completion inside the configuration object.",
+                  "markdown": "Validates options in webpack config files (which name should start with \\`webpack\\`, e.g. \\`webpack.config.js\\`) against [webpack options schema](https://github.com/webpack/webpack/blob/master/schemas/WebpackOptions.json).   \n\nDisable this inspection to turn off validation and code completion inside the configuration object."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "WebpackConfigHighlighting",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          }
+        ]
+      },
+      "invocations": [
+        {
+          "exitCode": 0,
+          "toolExecutionNotifications": [
+            {
+              "message": {
+                "text": "Reporting from [] 'sanity' inspections was suspended due to high problems count."
+              },
+              "level": "error"
+            }
+          ],
+          "executionSuccessful": true
+        }
+      ],
+      "language": "en-US",
+      "versionControlProvenance": [
+        {
+          "repositoryUri": "https://github.com/zephir-lang/zephir.git",
+          "revisionId": "a3bc02de3a207fdc7795714bd81c50ce8014d859",
+          "branch": "phpcs-changes",
+          "properties": {
+            "repoUrl": "https://github.com/zephir-lang/zephir.git",
+            "lastAuthorName": "Anton Vasiliev",
+            "vcsType": "Git",
+            "lastAuthorEmail": "1695147@gmail.com"
+          }
+        }
+      ],
+      "results": [
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ExportSymbol.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 9,
+                  "charOffset": 1077,
+                  "charLength": 1195,
+                  "snippet": {
+                    "text": "$codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol   = $compilationContext->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1069,
+                  "charLength": 1203,
+                  "snippet": {
+                    "text": "        $codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol   = $compilationContext->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ExportSymbolString.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 9,
+                  "charOffset": 1119,
+                  "charLength": 1187,
+                  "snippet": {
+                    "text": "$codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol = $compilationContext->backend->getVariableCode($variable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1111,
+                  "charLength": 1195,
+                  "snippet": {
+                    "text": "        $codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol = $compilationContext->backend->getVariableCode($variable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "007fa875708218660836ace1924fc922751392efd8537e891680598c5cf15c3f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ShortTernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 9,
+                  "charOffset": 1250,
+                  "charLength": 643,
+                  "snippet": {
+                    "text": "$this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1242,
+                  "charLength": 651,
+                  "snippet": {
+                    "text": "        $this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/TernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 9,
+                  "charOffset": 1070,
+                  "charLength": 643,
+                  "snippet": {
+                    "text": "$this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 1062,
+                  "charLength": 651,
+                  "snippet": {
+                    "text": "        $this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "08f2f448026d85d619648c5cd79b372a3ceffd6ff784cac4e438ae722c1acf96"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/BasenameOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 958,
+                  "charLength": 778,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 950,
+                  "charLength": 786,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FilemtimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 961,
+                  "charLength": 777,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 953,
+                  "charLength": 785,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0ae41db8f8c0bef77b8d675ee99d6a3523098f4cff89c1d9c1245f8318af02cd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateInstanceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 9,
+                  "charOffset": 1378,
+                  "charLength": 838,
+                  "snippet": {
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1370,
+                  "charLength": 846,
+                  "snippet": {
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 9,
+                  "charOffset": 1334,
+                  "charLength": 837,
+                  "snippet": {
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1326,
+                  "charLength": 845,
+                  "snippet": {
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0d67bca7fae6d45ad7bf2511bf847317eb7e7514c7087f3ae8354745a3be6e50"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 9,
+                  "charOffset": 955,
+                  "charLength": 452,
+                  "snippet": {
+                    "text": "$this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 947,
+                  "charLength": 460,
+                  "snippet": {
+                    "text": "        $this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 9,
+                  "charOffset": 954,
+                  "charLength": 452,
+                  "snippet": {
+                    "text": "$this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 946,
+                  "charLength": 460,
+                  "snippet": {
+                    "text": "        $this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "12396187edc198e27c96f5755ad98754d322bac119bd2b300b2ebfb8ec29e475"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 600,
+                  "startColumn": 41,
+                  "charOffset": 28421,
+                  "charLength": 1312,
+                  "snippet": {
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 600,
+                  "startColumn": 1,
+                  "charOffset": 28381,
+                  "charLength": 1352,
+                  "snippet": {
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 707,
+                  "startColumn": 41,
+                  "charOffset": 34365,
+                  "charLength": 1312,
+                  "snippet": {
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 707,
+                  "startColumn": 1,
+                  "charOffset": 34325,
+                  "charLength": 1352,
+                  "snippet": {
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "44d3147872714da7dd7925d66f77cc75018a72ec1e8c22628bd251c55f358eea"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 184,
+                  "startColumn": 9,
+                  "charOffset": 4992,
+                  "charLength": 571,
+                  "snippet": {
+                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 184,
+                  "startColumn": 1,
+                  "charOffset": 4984,
+                  "charLength": 579,
+                  "snippet": {
+                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 244,
+                  "startColumn": 9,
+                  "charOffset": 7132,
+                  "charLength": 571,
+                  "snippet": {
+                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 244,
+                  "startColumn": 1,
+                  "charOffset": 7124,
+                  "charLength": 579,
+                  "snippet": {
+                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b5cee72bcbbadce4fc761c12530223b00f00b3b7e5c2faa3973277df457d6c6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/BasenameOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 958,
+                  "charLength": 706,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 950,
+                  "charLength": 714,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileGetContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 981,
+                  "charLength": 705,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 973,
+                  "charLength": 713,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FilemtimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 961,
+                  "charLength": 705,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 953,
+                  "charLength": 713,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b94f01d2137a3c924a6e906729935c1a01d5f8d05150b8e7780cfa9e6d51377"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 176,
+                  "startColumn": 17,
+                  "charOffset": 5402,
+                  "charLength": 768,
+                  "snippet": {
+                    "text": "if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 176,
+                  "startColumn": 1,
+                  "charOffset": 5386,
+                  "charLength": 784,
+                  "snippet": {
+                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 189,
+                  "startColumn": 17,
+                  "charOffset": 6802,
+                  "charLength": 768,
+                  "snippet": {
+                    "text": "if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 189,
+                  "startColumn": 1,
+                  "charOffset": 6786,
+                  "charLength": 784,
+                  "snippet": {
+                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4c84af03a538a10ccbd7475768837a6f57838da11904651cdd871fb94359d988"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/Crc32Optimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 949,
+                  "charLength": 487,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 941,
+                  "charLength": 495,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/Md5Optimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 943,
+                  "charLength": 487,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 935,
+                  "charLength": 495,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 9,
+                  "charOffset": 1028,
+                  "charLength": 487,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1020,
+                  "charLength": 495,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UcfirstOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 955,
+                  "charLength": 487,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 947,
+                  "charLength": 495,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4d36d56beb9e89409bd76c2f6ecb22e953444d6fdf1fd7e4049e2d6bf5a9afbd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Closure.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 116,
+                  "startColumn": 9,
+                  "charOffset": 3043,
+                  "charLength": 900,
+                  "snippet": {
+                    "text": "$classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 116,
+                  "startColumn": 1,
+                  "charOffset": 3035,
+                  "charLength": 908,
+                  "snippet": {
+                    "text": "        $classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/ClosureArrow.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 90,
+                  "startColumn": 9,
+                  "charOffset": 2716,
+                  "charLength": 900,
+                  "snippet": {
+                    "text": "$classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 90,
+                  "startColumn": 1,
+                  "charOffset": 2708,
+                  "charLength": 908,
+                  "snippet": {
+                    "text": "        $classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "599df81d41f5be810b08fb69c471bc5bca897579db4c7866fbcbf605b38c241f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 69,
+                  "startColumn": 9,
+                  "charOffset": 1736,
+                  "charLength": 1308,
+                  "snippet": {
+                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 69,
+                  "startColumn": 1,
+                  "charOffset": 1728,
+                  "charLength": 1316,
+                  "snippet": {
+                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 120,
+                  "startColumn": 9,
+                  "charOffset": 3582,
+                  "charLength": 1309,
+                  "snippet": {
+                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /**\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 120,
+                  "startColumn": 1,
+                  "charOffset": 3574,
+                  "charLength": 1317,
+                  "snippet": {
+                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /**\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyDecr.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 84,
+                  "startColumn": 9,
+                  "charOffset": 2257,
+                  "charLength": 1308,
+                  "snippet": {
+                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 84,
+                  "startColumn": 1,
+                  "charOffset": 2249,
+                  "charLength": 1316,
+                  "snippet": {
+                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5d53dd48ab9c75067d8b728476c9f845850bb812b1cb8753fcd37c8cbbed9fb2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 770,
+                  "startColumn": 17,
+                  "charOffset": 35532,
+                  "charLength": 1122,
+                  "snippet": {
+                    "text": "if ($isExpecting) {\n                    if ('return_value' == $symbolVariable->getName()) {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                        );\n                    } else {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(\n                            ) . $paramsStr . ');'\n                        );\n                    }\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 770,
+                  "startColumn": 1,
+                  "charOffset": 35516,
+                  "charLength": 1138,
+                  "snippet": {
+                    "text": "                if ($isExpecting) {\n                    if ('return_value' == $symbolVariable->getName()) {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                        );\n                    } else {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(\n                            ) . $paramsStr . ');'\n                        );\n                    }\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 439,
+                  "startColumn": 13,
+                  "charOffset": 16949,
+                  "charLength": 904,
+                  "snippet": {
+                    "text": "if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 439,
+                  "startColumn": 1,
+                  "charOffset": 16937,
+                  "charLength": 916,
+                  "snippet": {
+                    "text": "            if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 536,
+                  "startColumn": 13,
+                  "charOffset": 20778,
+                  "charLength": 904,
+                  "snippet": {
+                    "text": "if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 536,
+                  "startColumn": 1,
+                  "charOffset": 20766,
+                  "charLength": 916,
+                  "snippet": {
+                    "text": "            if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "63fb053eb03a3eeb273a001ccc30905905075bfbff24662ac374dd80b3e9654e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/Md5Optimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 943,
+                  "charLength": 831,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 935,
+                  "charLength": 839,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 9,
+                  "charOffset": 1028,
+                  "charLength": 877,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,\n            $expression\n        );\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1020,
+                  "charLength": 885,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,\n            $expression\n        );\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UcfirstOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 955,
+                  "charLength": 830,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 947,
+                  "charLength": 838,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "68c15a0339486870360e7eb97b3bce1d6c56a259032f453b3b503df6ee1874df"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 160,
+                  "startColumn": 17,
+                  "charOffset": 4766,
+                  "charLength": 1210,
+                  "snippet": {
+                    "text": "switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 160,
+                  "startColumn": 1,
+                  "charOffset": 4750,
+                  "charLength": 1226,
+                  "snippet": {
+                    "text": "                switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1306,
+                  "startColumn": 17,
+                  "charOffset": 56371,
+                  "charLength": 1210,
+                  "snippet": {
+                    "text": "switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1306,
+                  "startColumn": 1,
+                  "charOffset": 56355,
+                  "charLength": 1226,
+                  "snippet": {
+                    "text": "                switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1434,
+                  "startColumn": 25,
+                  "charOffset": 63052,
+                  "charLength": 1512,
+                  "snippet": {
+                    "text": "switch ($statement['operator']) {\n                            case 'assign':\n                                if ($variable != $resolvedExpr->getCode()) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes('array');\n                                    $symbolVariable->increaseVariantIfNull();\n                                    $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                                    $codePrinter->output(\n                                        'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                            $resolvedExpr,\n                                            $compilationContext\n                                        ) . ');'\n                                    );\n                                }\n                                break;\n\n                            default:\n                                throw new IllegalOperationException(\n                                    $statement,\n                                    $resolvedExpr,\n                                    $resolvedExpr->getOriginal()\n                                );\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1434,
+                  "startColumn": 1,
+                  "charOffset": 63028,
+                  "charLength": 1536,
+                  "snippet": {
+                    "text": "                        switch ($statement['operator']) {\n                            case 'assign':\n                                if ($variable != $resolvedExpr->getCode()) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes('array');\n                                    $symbolVariable->increaseVariantIfNull();\n                                    $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                                    $codePrinter->output(\n                                        'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                            $resolvedExpr,\n                                            $compilationContext\n                                        ) . ');'\n                                    );\n                                }\n                                break;\n\n                            default:\n                                throw new IllegalOperationException(\n                                    $statement,\n                                    $resolvedExpr,\n                                    $resolvedExpr->getOriginal()\n                                );\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "73a249f2c92c2bbff062013d2f3003dcb64dd1142e1672fcd73e3c521720ac87"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 495,
+                  "startColumn": 25,
+                  "charOffset": 18936,
+                  "charLength": 1366,
+                  "snippet": {
+                    "text": "$exprVariableCode = $compilationContext->backend->getVariableCode($itemVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 495,
+                  "startColumn": 1,
+                  "charOffset": 18912,
+                  "charLength": 1390,
+                  "snippet": {
+                    "text": "                        $exprVariableCode = $compilationContext->backend->getVariableCode($itemVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 736,
+                  "startColumn": 25,
+                  "charOffset": 29251,
+                  "charLength": 1370,
+                  "snippet": {
+                    "text": "$exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 736,
+                  "startColumn": 1,
+                  "charOffset": 29227,
+                  "charLength": 1394,
+                  "snippet": {
+                    "text": "                        $exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "857b788110f540572ff1a22318763c12c0283e4a57e2497a866234856acd6a82"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 981,
+                  "charLength": 582,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 973,
+                  "charLength": 590,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 952,
+                  "charLength": 582,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 944,
+                  "charLength": 590,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "85c329c4716072967778fb33b25cf012514ce0ed7d1994738b7a6d4e5857125c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1112,
+                  "startColumn": 25,
+                  "charOffset": 46462,
+                  "charLength": 1243,
+                  "snippet": {
+                    "text": "$symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1112,
+                  "startColumn": 1,
+                  "charOffset": 46438,
+                  "charLength": 1267,
+                  "snippet": {
+                    "text": "                        $symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1212,
+                  "startColumn": 25,
+                  "charOffset": 51345,
+                  "charLength": 1243,
+                  "snippet": {
+                    "text": "$symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1212,
+                  "startColumn": 1,
+                  "charOffset": 51321,
+                  "charLength": 1267,
+                  "snippet": {
+                    "text": "                        $symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8a3bd0f30a4d5226b63462648dc8491ef5daa237aa4867268be782b6cc8b1b54"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 311,
+                  "startColumn": 41,
+                  "charOffset": 13127,
+                  "charLength": 1363,
+                  "snippet": {
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 311,
+                  "startColumn": 1,
+                  "charOffset": 13087,
+                  "charLength": 1403,
+                  "snippet": {
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 405,
+                  "startColumn": 41,
+                  "charOffset": 18298,
+                  "charLength": 1363,
+                  "snippet": {
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 405,
+                  "startColumn": 1,
+                  "charOffset": 18258,
+                  "charLength": 1403,
+                  "snippet": {
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8fa7d657bb1c0f7c05c9876141421a5b43d8ee26e980f5d92d23516208d44150"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 13,
+                  "charOffset": 1290,
+                  "charLength": 1935,
+                  "snippet": {
+                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 13,
+                  "charOffset": 1290,
+                  "charLength": 1935,
+                  "snippet": {
+                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 9,
+                  "charOffset": 1516,
+                  "charLength": 1790,
+                  "snippet": {
+                    "text": "if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1508,
+                  "charLength": 1798,
+                  "snippet": {
+                    "text": "        if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9c667466bb2f3e596e8dc820bfd85552e107e589217e244f70d57b9be4e7fc54"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 595,
+                  "startColumn": 41,
+                  "charOffset": 28534,
+                  "charLength": 1044,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 595,
+                  "startColumn": 1,
+                  "charOffset": 28494,
+                  "charLength": 1084,
+                  "snippet": {
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 630,
+                  "startColumn": 41,
+                  "charOffset": 30297,
+                  "charLength": 1204,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 630,
+                  "startColumn": 1,
+                  "charOffset": 30257,
+                  "charLength": 1244,
+                  "snippet": {
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 642,
+                  "startColumn": 41,
+                  "charOffset": 30877,
+                  "charLength": 1050,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 642,
+                  "startColumn": 1,
+                  "charOffset": 30837,
+                  "charLength": 1090,
+                  "snippet": {
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9ca54e68a3caa7b98880634a9404b885939c1fbe4d17af0129629eef2770f078"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 595,
+                  "startColumn": 41,
+                  "charOffset": 28534,
+                  "charLength": 540,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 595,
+                  "startColumn": 1,
+                  "charOffset": 28494,
+                  "charLength": 580,
+                  "snippet": {
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 630,
+                  "startColumn": 41,
+                  "charOffset": 30297,
+                  "charLength": 526,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 630,
+                  "startColumn": 1,
+                  "charOffset": 30257,
+                  "charLength": 566,
+                  "snippet": {
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 745,
+                  "startColumn": 49,
+                  "charOffset": 36616,
+                  "charLength": 566,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 745,
+                  "startColumn": 1,
+                  "charOffset": 36568,
+                  "charLength": 614,
+                  "snippet": {
+                    "text": "                                                $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 642,
+                  "startColumn": 41,
+                  "charOffset": 30877,
+                  "charLength": 546,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 642,
+                  "startColumn": 1,
+                  "charOffset": 30837,
+                  "charLength": 586,
+                  "snippet": {
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9cb52081a37ee97f431a9a31ff429b11d9e13096e945235a0344b97b9d8df208"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CamelizeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 9,
+                  "charOffset": 1237,
+                  "charLength": 494,
+                  "snippet": {
+                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1229,
+                  "charLength": 502,
+                  "snippet": {
+                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/TrimOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 9,
+                  "charOffset": 1087,
+                  "charLength": 493,
+                  "snippet": {
+                    "text": "$charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 1079,
+                  "charLength": 501,
+                  "snippet": {
+                    "text": "        $charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UncamelizeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 9,
+                  "charOffset": 1245,
+                  "charLength": 494,
+                  "snippet": {
+                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1237,
+                  "charLength": 502,
+                  "snippet": {
+                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9cc60933b60115369adb7ae20f2fad84bcadcda683e07663d606855d40f8d9bc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 9,
+                  "charOffset": 1332,
+                  "charLength": 454,
+                  "snippet": {
+                    "text": "$this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1324,
+                  "charLength": 462,
+                  "snippet": {
+                    "text": "        $this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayMergeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 9,
+                  "charOffset": 1335,
+                  "charLength": 454,
+                  "snippet": {
+                    "text": "$this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1327,
+                  "charLength": 462,
+                  "snippet": {
+                    "text": "        $this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a2db45685cf7e89e0b892e3f49ab2536a98f512729f5bc953c503ea69172a94e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 402,
+                  "startColumn": 9,
+                  "charOffset": 12863,
+                  "charLength": 381,
+                  "snippet": {
+                    "text": "$path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 402,
+                  "startColumn": 1,
+                  "charOffset": 12855,
+                  "charLength": 389,
+                  "snippet": {
+                    "text": "        $path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 117,
+                  "startColumn": 9,
+                  "charOffset": 3408,
+                  "charLength": 381,
+                  "snippet": {
+                    "text": "$path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 117,
+                  "startColumn": 1,
+                  "charOffset": 3400,
+                  "charLength": 389,
+                  "snippet": {
+                    "text": "        $path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a520debf0252582235eface5631c62fea290e447afb6e745f53d01fcba26ee87"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1466,
+                  "startColumn": 33,
+                  "charOffset": 64736,
+                  "charLength": 1147,
+                  "snippet": {
+                    "text": "if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1466,
+                  "startColumn": 1,
+                  "charOffset": 64704,
+                  "charLength": 1179,
+                  "snippet": {
+                    "text": "                                if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1524,
+                  "startColumn": 33,
+                  "charOffset": 67967,
+                  "charLength": 1146,
+                  "snippet": {
+                    "text": "if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1524,
+                  "startColumn": 1,
+                  "charOffset": 67935,
+                  "charLength": 1178,
+                  "snippet": {
+                    "text": "                                if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a6513ede383af31711fea0aea621d5c1ea4a4fea5bc605bcff58b2b3d6a4be8c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 747,
+                  "startColumn": 9,
+                  "charOffset": 26366,
+                  "charLength": 1054,
+                  "snippet": {
+                    "text": "if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 747,
+                  "startColumn": 1,
+                  "charOffset": 26358,
+                  "charLength": 1062,
+                  "snippet": {
+                    "text": "        if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 800,
+                  "startColumn": 9,
+                  "charOffset": 28313,
+                  "charLength": 1054,
+                  "snippet": {
+                    "text": "if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 800,
+                  "startColumn": 1,
+                  "charOffset": 28305,
+                  "charLength": 1062,
+                  "snippet": {
+                    "text": "        if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b552b9808f9cf70b1ecefa055b86445de001d35dad47517e9435eca0f8a97632"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 9,
+                  "charOffset": 1278,
+                  "charLength": 959,
+                  "snippet": {
+                    "text": "switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1270,
+                  "charLength": 967,
+                  "snippet": {
+                    "text": "        switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 9,
+                  "charOffset": 1261,
+                  "charLength": 957,
+                  "snippet": {
+                    "text": "switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 1253,
+                  "charLength": 965,
+                  "snippet": {
+                    "text": "        switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b86f2c8f01924e92a9b683c40d0371fd72e37cdd8bc53ace61830c749bcb2f8a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 134,
+                  "startColumn": 17,
+                  "charOffset": 5064,
+                  "charLength": 1069,
+                  "snippet": {
+                    "text": "switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 5048,
+                  "charLength": 1085,
+                  "snippet": {
+                    "text": "                switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 143,
+                  "startColumn": 17,
+                  "charOffset": 5577,
+                  "charLength": 1069,
+                  "snippet": {
+                    "text": "switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 143,
+                  "startColumn": 1,
+                  "charOffset": 5561,
+                  "charLength": 1085,
+                  "snippet": {
+                    "text": "                switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba49be6454237722094770ba33c98775c21913ca28a248521970ce2cb6005048"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 145,
+                  "startColumn": 9,
+                  "charOffset": 4750,
+                  "charLength": 1230,
+                  "snippet": {
+                    "text": "$property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 145,
+                  "startColumn": 1,
+                  "charOffset": 4742,
+                  "charLength": 1238,
+                  "snippet": {
+                    "text": "        $property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 147,
+                  "startColumn": 9,
+                  "charOffset": 4778,
+                  "charLength": 1230,
+                  "snippet": {
+                    "text": "$property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 147,
+                  "startColumn": 1,
+                  "charOffset": 4770,
+                  "charLength": 1238,
+                  "snippet": {
+                    "text": "        $property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c297ffead8a798d3eb526d472b3c5f063c68e46328f4bd67f2159b53db037e0c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetClassLowerOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 9,
+                  "charOffset": 1352,
+                  "charLength": 579,
+                  "snippet": {
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 1344,
+                  "charLength": 587,
+                  "snippet": {
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetClassNsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 9,
+                  "charOffset": 1373,
+                  "charLength": 579,
+                  "snippet": {
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 1365,
+                  "charLength": 587,
+                  "snippet": {
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 9,
+                  "charOffset": 1363,
+                  "charLength": 579,
+                  "snippet": {
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 1355,
+                  "charLength": 587,
+                  "snippet": {
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetNsClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 9,
+                  "charOffset": 1279,
+                  "charLength": 578,
+                  "snippet": {
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1271,
+                  "charLength": 586,
+                  "snippet": {
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "daceb7645de2ce66ffc3380fd5e91089998f247f3c6a0bf1f6021c7b53ab00cb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 164,
+                  "startColumn": 9,
+                  "charOffset": 4112,
+                  "charLength": 518,
+                  "snippet": {
+                    "text": "$separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 164,
+                  "startColumn": 1,
+                  "charOffset": 4104,
+                  "charLength": 526,
+                  "snippet": {
+                    "text": "        $separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 228,
+                  "startColumn": 9,
+                  "charOffset": 6413,
+                  "charLength": 518,
+                  "snippet": {
+                    "text": "$separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 228,
+                  "startColumn": 1,
+                  "charOffset": 6405,
+                  "charLength": 526,
+                  "snippet": {
+                    "text": "        $separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "df506eed38ba50eda828a4a252b9c78b9430fb05d68dcc90ac65ce12ab5eb980"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 9,
+                  "charOffset": 904,
+                  "charLength": 392,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 896,
+                  "charLength": 400,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 9,
+                  "charOffset": 879,
+                  "charLength": 392,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 871,
+                  "charLength": 400,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e1dc5f4694fcbd691dc96a462008cbdf13f317264d1ba5f846c6407a43296598"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 9,
+                  "charOffset": 1166,
+                  "charLength": 2877,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 9,
+                  "charOffset": 1166,
+                  "charLength": 2877,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 9,
+                  "charOffset": 1242,
+                  "charLength": 2877,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 9,
+                  "charOffset": 1242,
+                  "charLength": 2877,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 9,
+                  "charOffset": 1231,
+                  "charLength": 2947,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 9,
+                  "charOffset": 1231,
+                  "charLength": 2947,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e6388c9a408c11b6121122837c3a96fa31789243a4f2e1d0ce1a771dceab2000"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/TrimOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 9,
+                  "charOffset": 1087,
+                  "charLength": 992,
+                  "snippet": {
+                    "text": "$charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 1079,
+                  "charLength": 1000,
+                  "snippet": {
+                    "text": "        $charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UncamelizeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 9,
+                  "charOffset": 1245,
+                  "charLength": 994,
+                  "snippet": {
+                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1237,
+                  "charLength": 1002,
+                  "snippet": {
+                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ecfe95d185fb897b5b506b22c4bc611675bb9e573263e7a804a9836d4c0361df"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 140,
+                  "startColumn": 17,
+                  "charOffset": 5368,
+                  "charLength": 1460,
+                  "snippet": {
+                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 140,
+                  "startColumn": 1,
+                  "charOffset": 5352,
+                  "charLength": 1476,
+                  "snippet": {
+                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 184,
+                  "startColumn": 17,
+                  "charOffset": 7464,
+                  "charLength": 1464,
+                  "snippet": {
+                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 184,
+                  "startColumn": 1,
+                  "charOffset": 7448,
+                  "charLength": 1480,
+                  "snippet": {
+                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "edc9f919d3799cf3465125a8c04b68cb45ad7a525d2034a589f8394246cef8a7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 395,
+                  "startColumn": 9,
+                  "charOffset": 15082,
+                  "charLength": 685,
+                  "snippet": {
+                    "text": "$compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 395,
+                  "startColumn": 1,
+                  "charOffset": 15074,
+                  "charLength": 693,
+                  "snippet": {
+                    "text": "        $compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 773,
+                  "startColumn": 9,
+                  "charOffset": 30753,
+                  "charLength": 685,
+                  "snippet": {
+                    "text": "$compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 773,
+                  "startColumn": 1,
+                  "charOffset": 30745,
+                  "charLength": 693,
+                  "snippet": {
+                    "text": "        $compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ee5ac15645dac240d3a11ee68eec3b9879e016f7240275fdae3339b21c23f4ad"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/AddslashesOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 964,
+                  "charLength": 832,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 956,
+                  "charLength": 840,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 964,
+                  "charLength": 832,
+                  "snippet": {
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 956,
+                  "charLength": 840,
+                  "snippet": {
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "efce78143face75554db6a523489645a5fdfbb257132f7a7c6c8996224bd232a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 9,
+                  "charOffset": 1238,
+                  "charLength": 1315,
+                  "snippet": {
+                    "text": "if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1230,
+                  "charLength": 1323,
+                  "snippet": {
+                    "text": "        if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertySub.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 9,
+                  "charOffset": 1408,
+                  "charLength": 1315,
+                  "snippet": {
+                    "text": "if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1400,
+                  "charLength": 1323,
+                  "snippet": {
+                    "text": "        if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f5100c21fdcabe67b5c986419306ee8c1d0c9ff4dab52fc23e74c7e3b6221c83"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpComposerExtensionStubsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'ext-gmp' is specified in 'require-dev' section but used outside of tests",
+            "markdown": "'ext-gmp' is specified in 'require-dev' section but used outside of tests"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArray.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 14,
+                  "charOffset": 577,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "gmp_nextprime"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 514,
+                  "charLength": 103,
+                  "snippet": {
+                    "text": "use function count;\nuse function function_exists;\nuse function gmp_nextprime;\nuse function gmp_strval;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "86fd4e479dea5e9ac17025dfc059677c3dafd655750281e2e553e9147df86e1e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpComposerExtensionStubsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'ext-gmp' is specified in 'require-dev' section but used outside of tests",
+            "markdown": "'ext-gmp' is specified in 'require-dev' section but used outside of tests"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArray.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 28,
+                  "startColumn": 14,
+                  "charOffset": 605,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "gmp_strval"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 26,
+                  "startColumn": 1,
+                  "charOffset": 534,
+                  "charLength": 87,
+                  "snippet": {
+                    "text": "use function function_exists;\nuse function gmp_nextprime;\nuse function gmp_strval;\n\n/**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fd614b6d75285018cff55a963992918f4171f55ce3b155009f405c717c22e968"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '1 != count($expression['parameters'])' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because '1 != count($expression\\['parameters'\\])' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtokOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 13,
+                  "charOffset": 1138,
+                  "charLength": 37,
+                  "snippet": {
+                    "text": "1 == count($expression['parameters'])"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 1115,
+                  "charLength": 146,
+                  "snippet": {
+                    "text": "        }\n\n        if (1 == count($expression['parameters'])) {\n            return new CompiledExpression('bool', 'false', $expression);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0f24f8a2cb526e35900b262beaba75e0332358debfb0bfcee5f6c4d87d933131"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '$interfaces' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$interfaces' is evaluated at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Definition/Definition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 507,
+                  "startColumn": 13,
+                  "charOffset": 15428,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "is_array($interfaces)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 505,
+                  "startColumn": 1,
+                  "charOffset": 15362,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "        $compiler   = $compilationContext->compiler;\n\n        if (is_array($interfaces)) {\n            $codePrinter->outputBlankLine(true);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "388429471940f618787be53d9cfebb607abe02909473f435a943948b11b4bf8e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'in_array($className, ['self', 'static'])' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because 'in_array($className, \\['self', 'static'\\])' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 71,
+                  "startColumn": 21,
+                  "charOffset": 2135,
+                  "charLength": 22,
+                  "snippet": {
+                    "text": "'parent' == $className"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 69,
+                  "startColumn": 1,
+                  "charOffset": 2021,
+                  "charLength": 292,
+                  "snippet": {
+                    "text": "                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6837f21a2020d4c1cddc38a3505af4f347ae13b03cebfb1451515fc67138fb1b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '$optimized' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$optimized' is evaluated at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 13,
+                  "charOffset": 1374,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "is_array($optimized)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1252,
+                  "charLength": 262,
+                  "snippet": {
+                    "text": "         */\n        $optimized = $this->_getOptimizedConcat($expression, $compilationContext, $isFullString);\n        if (is_array($optimized)) {\n            if (!$isFullString) {\n                $expected = $this->getExpectedComplexLiteral($compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "77863d2ddf259e8d9d2050e9476c36cd5863c97703b9e573c1326f9f568c9d5b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'in_array($className, ['self', 'static'])' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because 'in_array($className, \\['self', 'static'\\])' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 66,
+                  "startColumn": 21,
+                  "charOffset": 2000,
+                  "charLength": 22,
+                  "snippet": {
+                    "text": "'parent' == $className"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 64,
+                  "startColumn": 1,
+                  "charOffset": 1886,
+                  "charLength": 292,
+                  "snippet": {
+                    "text": "                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7f5de0870ec898b1680e5cbb4867c23f27372c9a67e3b0c0e52697531ce92690"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'string $url' is evaluated at this point",
+            "markdown": "Condition is always 'true' because 'string $url' is evaluated at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 133,
+                  "startColumn": 13,
+                  "charOffset": 3168,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "is_string($url)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 131,
+                  "startColumn": 1,
+                  "charOffset": 3105,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "    public function url(string $url): string\n    {\n        if (is_string($url)) {\n            if ('/' == $url[0]) {\n                return $this->getPathToRoot() . ltrim($url, '/');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a30521646e25186b820c1c400e05b20589e14a2b4336f4e4f44b8ae2be54c276"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'in_array($className, ['self', 'static'])' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because 'in_array($className, \\['self', 'static'\\])' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 21,
+                  "charOffset": 2076,
+                  "charLength": 22,
+                  "snippet": {
+                    "text": "'parent' == $className"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1962,
+                  "charLength": 292,
+                  "snippet": {
+                    "text": "                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b5c352b560807d2a81a76c4accd132f5224c98a579b2340b413bd225439582ac"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'is_string($url)' is already 'true' at this point",
+            "markdown": "Condition is always 'true' because 'is_string($url)' is already 'true' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 136,
+                  "startColumn": 23,
+                  "charOffset": 3309,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "is_string($url)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 3187,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "            if ('/' == $url[0]) {\n                return $this->getPathToRoot() . ltrim($url, '/');\n            } elseif (is_string($url)) {\n                return $url;\n            }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c86cfd8ad97a38eaa1bcf974efc06d210d0f2262cac82c820632261a03ba22a5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionCheckedByNextConditionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is unnecessary because it is checked by '$expr instanceof self'",
+            "markdown": "Condition is unnecessary because it is checked by '$expr instanceof self'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 160,
+                  "startColumn": 13,
+                  "charOffset": 2965,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "is_object($expr)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 158,
+                  "startColumn": 1,
+                  "charOffset": 2942,
+                  "charLength": 112,
+                  "snippet": {
+                    "text": "        }\n\n        if (is_object($expr) && $expr instanceof self) {\n            return $expr->build();\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "40d0b747a1f8e7c33d39dd31021acb642bcd03ec2203fdc91eb625ec985aab8c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'removeMemoryStackReferences' is deprecated",
+            "markdown": "Method 'removeMemoryStackReferences' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Method/Method.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1458,
+                  "startColumn": 24,
+                  "charOffset": 57039,
+                  "charLength": 27,
+                  "snippet": {
+                    "text": "removeMemoryStackReferences"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1456,
+                  "startColumn": 1,
+                  "charOffset": 56919,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "         * Remove macros that grow/restore the memory frame stack if it wasn't used.\n         */\n        $code = $this->removeMemoryStackReferences($symbolTable, $codePrinter->getOutput());\n\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7396fe10dd43e57c19745f441a70348431044417934c9e2c2151a535531e8094"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocFieldTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Property type does not match",
+            "markdown": "Property type does not match"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 8,
+                  "charOffset": 925,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "@var LocalContextPass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 909,
+                  "charLength": 99,
+                  "snippet": {
+                    "text": "\n    /**\n     * @var LocalContextPass\n     */\n    protected ?LocalContextPass $localContext = null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "34b9c7787e54cca9109c76146fb5dd81a54415ad7706a10cb41622fca0a7df72"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 114,
+                  "startColumn": 8,
+                  "charOffset": 3341,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 112,
+                  "startColumn": 1,
+                  "charOffset": 3294,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     *\n     * @throws CompilerException\n     * @throws Exception\n     */\n    protected function _assignArrayIndexMultiple("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "639491302fec5cd8545ca8fc36cadce5bbfc5cf33d5a758494c16553f9b4ad4a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Argument type does not match the declared",
+            "markdown": "Argument type does not match the declared"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ExportSymbolString.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 8,
+                  "charOffset": 773,
+                  "charLength": 47,
+                  "snippet": {
+                    "text": "@param CompilationContext $compilationContext ,"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 670,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "     * @param ZephirVariable     $symbolVariable\n     * @param CompiledExpression $resolvedExpr\n     * @param CompilationContext $compilationContext ,\n     * @param array              $statement\n     */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "96692b641ca56badc02ece320184e765c799b340be00e9246379d1e953134fcc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type does not match the declared",
+            "markdown": "Return type does not match the declared"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 945,
+                  "startColumn": 8,
+                  "charOffset": 34022,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "@return LetStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 943,
+                  "startColumn": 1,
+                  "charOffset": 33955,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     *\n     * @return LetStatement\n     */\n    private function getLetStatement("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d7f3248a0b3d8e6fac793009a2ce7c8c955a70462594b98a6f2efeee5033d860"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 5,
+                  "charOffset": 1294,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1283,
+                  "charLength": 65,
+                  "snippet": {
+                    "text": "    }\n\n    /**\n     * Check whether a class has a property\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cdba39ccc70934f7041973f3dd2bb5c52517ca73c9369bfb4582e2eb0b94e648"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 6,
+                  "charOffset": 756,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 724,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "     *\n     * @return void\n     */\n    protected function checkAccessNonStaticProperty(\n        Property $propertyDefinition,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d6b49f0574e9f7a971dac1029ca72eac46b5a1a68b35009c1c5a1be048f1de5d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 5,
+                  "charOffset": 556,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 529,
+                  "charLength": 81,
+                  "snippet": {
+                    "text": "trait VariablesTrait\n{\n    /**\n     * Check whether a class has a property\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d8fc7944b03e4b505cc9baa64309ba1ac7687557faafee3dc3fb0e38b3c927ad"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 6,
+                  "charOffset": 1494,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1462,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "     *\n     * @return void\n     */\n    protected function checkClassHasProperty(\n        Definition $classDefinition,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f06a836071c2c373655cfc8f599e556d5abfa79a68b93948001f4ab6594599b6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDuplicateSwitchCaseBodyInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch",
+            "markdown": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 111,
+                  "startColumn": 29,
+                  "charOffset": 3853,
+                  "charLength": 362,
+                  "snippet": {
+                    "text": "case 'bool':\n                                return new CompiledExpression(\n                                    'int',\n                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(\n                                    ) . ')',\n                                    $expression\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 109,
+                  "startColumn": 1,
+                  "charOffset": 3789,
+                  "charLength": 470,
+                  "snippet": {
+                    "text": "                                );\n\n                            case 'bool':\n                                return new CompiledExpression(\n                                    'int',\n                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(\n                                    ) . ')',\n                                    $expression\n                                );\n\n                            case 'double':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8ac7868a4ca09e6833fb99c7383b0b551295344932723aa0db062870f062b6f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDuplicateSwitchCaseBodyInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch",
+            "markdown": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 627,
+                  "startColumn": 37,
+                  "charOffset": 29985,
+                  "charLength": 581,
+                  "snippet": {
+                    "text": "case 'bool':\n                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        return new CompiledExpression(\n                                            'int',\n                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(\n                                            ) . ')',\n                                            $expression\n                                        );\n                                        break;"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 625,
+                  "startColumn": 1,
+                  "charOffset": 29889,
+                  "charLength": 736,
+                  "snippet": {
+                    "text": "\n                                    /* a(var) + a(bool) */\n                                    case 'bool':\n                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        return new CompiledExpression(\n                                            'int',\n                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(\n                                            ) . ')',\n                                            $expression\n                                        );\n                                        break;\n\n                                    /* a(var) + a(var) */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e31bf6a428dd07f2c70396763a9a47f3df7d9af9a82fa83825065b75bfdba5df"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpElementIsNotAvailableInCurrentPhpVersionInspection",
+          "kind": "fail",
+          "level": "error",
+          "message": {
+            "text": "'ReturnTypeWillChange' is available starting with 8.1 PHP version",
+            "markdown": "'ReturnTypeWillChange' is available starting with 8.1 PHP version"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 5,
+                  "charOffset": 316,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "ReturnTypeWillChange"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 273,
+                  "charLength": 96,
+                  "snippet": {
+                    "text": "use ArrayAccess;\nuse JsonSerializable;\nuse ReturnTypeWillChange;\n\nuse function array_key_exists;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4784c30899df298a1c80ac8a4013c87998109e10a00d21af559493908eda78c1"
+          },
+          "properties": {
+            "ideaSeverity": "ERROR",
+            "qodanaSeverity": "Critical",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpFieldAssignmentTypeMismatchInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Incompatible types: Expected property of type 'null|\\Psr\\Log\\LoggerInterface', '\\Psr\\Log\\NullLogger' provided",
+            "markdown": "Incompatible types: Expected property of type 'null\\|\\\\Psr\\\\Log\\\\LoggerInterface', '\\\\Psr\\\\Log\\\\NullLogger' provided"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 95,
+                  "startColumn": 9,
+                  "charOffset": 2689,
+                  "charLength": 51,
+                  "snippet": {
+                    "text": "$compilationContext->logger         = $this->logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 93,
+                  "startColumn": 1,
+                  "charOffset": 2563,
+                  "charLength": 307,
+                  "snippet": {
+                    "text": "        $compilationContext->compiler       = $compiler;\n        $compilationContext->config         = $this->config;\n        $compilationContext->logger         = $this->logger;\n        $compilationContext->stringsManager = $stringsManager;\n        $compilationContext->backend        = $compiler->backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "52956a1b95edf8732f4d3feffd38ef990ce10eeeb23954de17701ccd4cef5d01"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpFieldAssignmentTypeMismatchInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Incompatible types: Expected property of type 'null|\\Psr\\Log\\LoggerInterface', '\\Psr\\Log\\NullLogger' provided",
+            "markdown": "Incompatible types: Expected property of type 'null\\|\\\\Psr\\\\Log\\\\LoggerInterface', '\\\\Psr\\\\Log\\\\NullLogger' provided"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 600,
+                  "startColumn": 9,
+                  "charOffset": 19008,
+                  "charLength": 49,
+                  "snippet": {
+                    "text": "$compilationContext->logger       = $this->logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 598,
+                  "startColumn": 1,
+                  "charOffset": 18886,
+                  "charLength": 301,
+                  "snippet": {
+                    "text": "        $compilationContext->compiler     = $compiler;\n        $compilationContext->config       = $this->config;\n        $compilationContext->logger       = $this->logger;\n        $compilationContext->aliasManager = $this->aliasManager;\n        $compilationContext->backend      = $compiler->backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9f2530558094bcf672efc0cabe088629aafab7dfdb85a1b264ae2ebcc4c19e35"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/UnlikelyOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 29,
+                  "charOffset": 1020,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 949,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "     * @throws ReflectionException\n     */\n    public function compile($expression, CompilationContext $compilationContext): CompiledExpression\n    {\n        if (!isset($expression['left'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6c608f3473df452e0d9efe5ac036eca02df35cb9c9fd4c14ed6abdde62609454"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpVarTagWithoutVariableNameInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Doc tag without variable name doesn't provide type information for any expression",
+            "markdown": "Doc tag without variable name doesn't provide type information for any expression"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 91,
+                  "startColumn": 32,
+                  "charOffset": 2649,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@var AbstractType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 89,
+                  "startColumn": 1,
+                  "charOffset": 2523,
+                  "charLength": 243,
+                  "snippet": {
+                    "text": "                        if (class_exists($builtInTypeClass)) {\n                            /**\n                             * @var AbstractType\n                             */\n                            $builtInType = new $builtInTypeClass();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7a9b26a98853332953d1eb416c2b687a02a7b6f4a9c2477ef14b4c6257d2662f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        }
+      ],
+      "automationDetails": {
+        "id": "project/qodana/2023-11-30",
+        "guid": "c4ce784a-cd17-4286-8d04-e840979a85ad",
+        "properties": {
+          "jobUrl": "https://github.com/zephir-lang/zephir/actions/runs/7040653342"
+        }
+      },
+      "newlineSequences": [
+        "\r\n",
+        "\n"
+      ],
+      "properties": {
+        "configProfile": "recommended",
+        "deviceId": "200820300000000-a3da-3f01-d610-dbadfc66b7f7"
+      }
+    }
+  ]
+}
\ No newline at end of file

From 116b5ef331392197adea4e836ca3d435470fdab7 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 20:31:07 -0600
Subject: [PATCH 234/375] removed duplicate code

---
 src/Statements/Let/Variable.php | 437 +++++++++++++++++---------------
 1 file changed, 234 insertions(+), 203 deletions(-)

diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 6caea121e1..fe414470cb 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -157,29 +157,14 @@ private function doArrayAssignment(
         switch ($resolvedExpr->getType()) {
             case 'variable':
             case 'array':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        if ($variable != $resolvedExpr->getCode()) {
-                            $symbolVariable->setMustInitNull(true);
-                            $compilationContext->symbolTable->mustGrownStack(true);
-
-                            /* Inherit the dynamic type data from the assigned value */
-                            $symbolVariable->setDynamicTypes('array');
-                            $symbolVariable->increaseVariantIfNull();
-                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-
-                            $codePrinter->output(
-                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(
-                                    $resolvedExpr,
-                                    $compilationContext
-                                ) . ');'
-                            );
-                        }
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());
-                }
+                $this->doArrayAssignmentProcess(
+                    $statement,
+                    $resolvedExpr,
+                    $variable,
+                    $symbolVariable,
+                    $compilationContext,
+                    $codePrinter
+                );
                 break;
 
             default:
@@ -190,6 +175,49 @@ private function doArrayAssignment(
         }
     }
 
+    /**
+     * @param array              $statement
+     * @param CompiledExpression $resolvedExpr
+     * @param string             $variable
+     * @param ZephirVariable     $symbolVariable
+     * @param CompilationContext $compilationContext
+     * @param Printer            $codePrinter
+     *
+     * @return void
+     */
+    private function doArrayAssignmentProcess(
+        array $statement,
+        CompiledExpression $resolvedExpr,
+        string $variable,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext,
+        Printer $codePrinter
+    ): void {
+        switch ($statement['operator']) {
+            case 'assign':
+                if ($variable != $resolvedExpr->getCode()) {
+                    $symbolVariable->setMustInitNull(true);
+                    $compilationContext->symbolTable->mustGrownStack(true);
+
+                    /* Inherit the dynamic type data from the assigned value */
+                    $symbolVariable->setDynamicTypes('array');
+                    $symbolVariable->increaseVariantIfNull();
+                    $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
+
+                    $codePrinter->output(
+                        'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(
+                            $resolvedExpr,
+                            $compilationContext
+                        ) . ');'
+                    );
+                }
+                break;
+
+            default:
+                throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());
+        }
+    }
+
     /**
      * Performs boolean assignment.
      *
@@ -492,29 +520,14 @@ private function doDoubleAssignment(
                     case 'variable':
                     case 'mixed':
                         $compilationContext->headersManager->add('kernel/operators');
-                        $exprVariableCode = $compilationContext->backend->getVariableCode($itemVariable);
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');
-                                break;
-                            case 'add-assign':
-                                $codePrinter->output(
-                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'
-                                );
-                                break;
-                            case 'sub-assign':
-                                $codePrinter->output(
-                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'
-                                );
-                                break;
-                            case 'mul-assign':
-                                $codePrinter->output(
-                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'
-                                );
-                                break;
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
+                        $this->processDoNumericAssignmentMixed(
+                            $compilationContext,
+                            $itemVariable,
+                            $statement,
+                            $codePrinter,
+                            $variable,
+                            $itemVariable
+                        );
                         break;
 
                     default:
@@ -729,37 +742,18 @@ private function doNumericAssignment(
                     case 'variable':
                     case 'mixed':
                         $compilationContext->headersManager->add('kernel/operators');
-                        $exprVariable     = $compilationContext->symbolTable->getVariableForWrite(
+                        $exprVariable = $compilationContext->symbolTable->getVariableForWrite(
                             $resolvedExpr->resolve(null, $compilationContext),
                             $compilationContext
                         );
-                        $exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');
-                                break;
-
-                            case 'add-assign':
-                                $codePrinter->output(
-                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'
-                                );
-                                break;
-
-                            case 'sub-assign':
-                                $codePrinter->output(
-                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'
-                                );
-                                break;
-
-                            case 'mul-assign':
-                                $codePrinter->output(
-                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'
-                                );
-                                break;
-
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
+                        $this->processDoNumericAssignmentMixed(
+                            $compilationContext,
+                            $exprVariable,
+                            $statement,
+                            $codePrinter,
+                            $variable,
+                            $itemVariable
+                        );
                         break;
 
                     default:
@@ -1109,27 +1103,14 @@ private function doVariableAssignment(
                         break;
 
                     case 'div-assign':
-                        $symbolVariable->setDynamicTypes('double');
-                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
-                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                                'double',
-                                $compilationContext
-                            );
-                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');
-                            $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble(
-                                $symbolVariable,
-                                $tempVariable,
-                                $compilationContext
-                            );
-                        } else {
-                            $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble(
-                                $symbolVariable,
-                                $resolvedExpr->getCode(),
-                                $compilationContext
-                            );
-                        }
+                        $this->processDoVariableAssignmentAssign(
+                            $symbolVariable,
+                            $readDetector,
+                            $variable,
+                            $resolvedExpr,
+                            $compilationContext,
+                            $codePrinter
+                        );
                         break;
 
                     default:
@@ -1209,27 +1190,14 @@ private function doVariableAssignment(
                         break;
 
                     case 'assign':
-                        $symbolVariable->setDynamicTypes('double');
-                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
-                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                                'double',
-                                $compilationContext
-                            );
-                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');
-                            $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble(
-                                $symbolVariable,
-                                $tempVariable,
-                                $compilationContext
-                            );
-                        } else {
-                            $symbolVariable->initVariant($compilationContext);
-                            $compilationContext->backend->assignDouble(
-                                $symbolVariable,
-                                $resolvedExpr->getCode(),
-                                $compilationContext
-                            );
-                        }
+                        $this->processDoVariableAssignmentAssign(
+                            $symbolVariable,
+                            $readDetector,
+                            $variable,
+                            $resolvedExpr,
+                            $compilationContext,
+                            $codePrinter
+                        );
                         break;
                     default:
                         throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());
@@ -1303,29 +1271,14 @@ private function doVariableAssignment(
                 break;
 
             case 'array':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        if ($variable != $resolvedExpr->getCode()) {
-                            $symbolVariable->setMustInitNull(true);
-                            $compilationContext->symbolTable->mustGrownStack(true);
-
-                            /* Inherit the dynamic type data from the assigned value */
-                            $symbolVariable->setDynamicTypes('array');
-                            $symbolVariable->increaseVariantIfNull();
-                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-
-                            $codePrinter->output(
-                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(
-                                    $resolvedExpr,
-                                    $compilationContext
-                                ) . ');'
-                            );
-                        }
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());
-                }
+                $this->doArrayAssignmentProcess(
+                    $statement,
+                    $resolvedExpr,
+                    $variable,
+                    $symbolVariable,
+                    $compilationContext,
+                    $codePrinter
+                );
                 break;
 
             case 'variable':
@@ -1431,57 +1384,25 @@ private function doVariableAssignment(
                         break;
 
                     case 'array':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                if ($variable != $resolvedExpr->getCode()) {
-                                    $symbolVariable->setMustInitNull(true);
-                                    $compilationContext->symbolTable->mustGrownStack(true);
-
-                                    /* Inherit the dynamic type data from the assigned value */
-                                    $symbolVariable->setDynamicTypes('array');
-                                    $symbolVariable->increaseVariantIfNull();
-                                    $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-
-                                    $codePrinter->output(
-                                        'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(
-                                            $resolvedExpr,
-                                            $compilationContext
-                                        ) . ');'
-                                    );
-                                }
-                                break;
-
-                            default:
-                                throw new IllegalOperationException(
-                                    $statement,
-                                    $resolvedExpr,
-                                    $resolvedExpr->getOriginal()
-                                );
-                        }
+                        $this->doArrayAssignmentProcess(
+                            $statement,
+                            $resolvedExpr,
+                            $variable,
+                            $symbolVariable,
+                            $compilationContext,
+                            $codePrinter
+                        );
                         break;
 
                     case 'variable':
                         switch ($statement['operator']) {
                             case 'assign':
-                                if ($itemVariable->getName() != $variable) {
-                                    $symbolVariable->setMustInitNull(true);
-                                    $compilationContext->symbolTable->mustGrownStack(true);
-
-                                    /* Inherit the dynamic type data from the assigned value */
-                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));
-
-                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());
-                                    $symbolVariable->increaseVariantIfNull();
-
-                                    $compilationContext->backend->copyOnWrite(
-                                        $symbolVariable,
-                                        $itemVariable,
-                                        $compilationContext
-                                    );
-                                    if ($itemVariable->isTemporal()) {
-                                        $itemVariable->setIdle(true);
-                                    }
-                                }
+                                $this->processDoVariableAssignmentVariableString(
+                                    $itemVariable,
+                                    $variable,
+                                    $symbolVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             case 'concat-assign':
@@ -1521,24 +1442,12 @@ private function doVariableAssignment(
                     case 'string':
                         switch ($statement['operator']) {
                             case 'assign':
-                                if ($itemVariable->getName() != $variable) {
-                                    $symbolVariable->setMustInitNull(true);
-                                    $compilationContext->symbolTable->mustGrownStack(true);
-
-                                    /* Inherit the dynamic type data from the assigned value */
-                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));
-                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());
-                                    $symbolVariable->increaseVariantIfNull();
-
-                                    $compilationContext->backend->copyOnWrite(
-                                        $symbolVariable,
-                                        $itemVariable,
-                                        $compilationContext
-                                    );
-                                    if ($itemVariable->isTemporal()) {
-                                        $itemVariable->setIdle(true);
-                                    }
-                                }
+                                $this->processDoVariableAssignmentVariableString(
+                                    $itemVariable,
+                                    $variable,
+                                    $symbolVariable,
+                                    $compilationContext
+                                );
                                 break;
 
                             case 'concat-assign':
@@ -1567,4 +1476,126 @@ private function doVariableAssignment(
                 throw new CompilerException('Unknown type: ' . $resolvedExpr->getType(), $resolvedExpr->getOriginal());
         }
     }
+
+    /**
+     * @param CompilationContext  $compilationContext
+     * @param ZephirVariable|bool $exprVariable
+     * @param array               $statement
+     * @param Printer             $codePrinter
+     * @param string              $variable
+     * @param ZephirVariable|bool $itemVariable
+     *
+     * @return void
+     */
+    private function processDoNumericAssignmentMixed(
+        CompilationContext $compilationContext,
+        ZephirVariable | bool $exprVariable,
+        array $statement,
+        Printer $codePrinter,
+        string $variable,
+        ZephirVariable | bool $itemVariable
+    ): void {
+        $exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);
+        switch ($statement['operator']) {
+            case 'assign':
+                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');
+                break;
+
+            case 'add-assign':
+                $codePrinter->output(
+                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'
+                );
+                break;
+
+            case 'sub-assign':
+                $codePrinter->output(
+                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'
+                );
+                break;
+
+            case 'mul-assign':
+                $codePrinter->output(
+                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'
+                );
+                break;
+
+            default:
+                throw new IllegalOperationException($statement, $itemVariable);
+        }
+    }
+
+    /**
+     * @param ZephirVariable     $symbolVariable
+     * @param ReadDetector       $readDetector
+     * @param string             $variable
+     * @param CompiledExpression $resolvedExpr
+     * @param CompilationContext $compilationContext
+     * @param Printer            $codePrinter
+     *
+     * @return void
+     */
+    private function processDoVariableAssignmentAssign(
+        ZephirVariable $symbolVariable,
+        ReadDetector $readDetector,
+        string $variable,
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        Printer $codePrinter
+    ): void {
+        $symbolVariable->setDynamicTypes('double');
+        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {
+            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'double',
+                $compilationContext
+            );
+            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');
+            $symbolVariable->initVariant($compilationContext);
+            $compilationContext->backend->assignDouble(
+                $symbolVariable,
+                $tempVariable,
+                $compilationContext
+            );
+        } else {
+            $symbolVariable->initVariant($compilationContext);
+            $compilationContext->backend->assignDouble(
+                $symbolVariable,
+                $resolvedExpr->getCode(),
+                $compilationContext
+            );
+        }
+    }
+
+    /**
+     * @param ZephirVariable|bool $itemVariable
+     * @param string              $variable
+     * @param ZephirVariable      $symbolVariable
+     * @param CompilationContext  $compilationContext
+     *
+     * @return void
+     */
+    private function processDoVariableAssignmentVariableString(
+        ZephirVariable | bool $itemVariable,
+        string $variable,
+        ZephirVariable $symbolVariable,
+        CompilationContext $compilationContext
+    ): void {
+        if ($itemVariable->getName() != $variable) {
+            $symbolVariable->setMustInitNull(true);
+            $compilationContext->symbolTable->mustGrownStack(true);
+
+            /* Inherit the dynamic type data from the assigned value */
+            $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));
+            $symbolVariable->setClassTypes($itemVariable->getClassTypes());
+            $symbolVariable->increaseVariantIfNull();
+
+            $compilationContext->backend->copyOnWrite(
+                $symbolVariable,
+                $itemVariable,
+                $compilationContext
+            );
+            if ($itemVariable->isTemporal()) {
+                $itemVariable->setIdle(true);
+            }
+        }
+    }
 }

From a69f5e4b15afe74988ae9858e1cfe7fafe7124c3 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 20:34:26 -0600
Subject: [PATCH 235/375] excluding various folders

---
 qodana.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qodana.yaml b/qodana.yaml
index 94a32c7e9c..f7db5fcc95 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -32,6 +32,11 @@ linter: jetbrains/qodana-php:latest
 exclude:
   - name: All
     paths:
+      - config
+      - kernel
+      - prototypes
+      - stub
+      - templates
       - vendor
 include:
   - name: CheckDependencyLicenses

From 0968d2db069d3ce0b6701fa5e7afc86d98f6a4cb Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:00:29 -0600
Subject: [PATCH 236/375] removing unreachable statements

---
 src/Config.php                                |  24 ++--
 src/Exception/CompilerException.php           |   8 +-
 src/Exception/ExceptionInterface.php          |   6 +-
 src/Exception/ParseException.php              |   8 +-
 src/Operators/AbstractOperator.php            |   2 +-
 .../Arithmetical/ArithmeticalBaseOperator.php |  40 +++---
 src/Operators/Arithmetical/DivOperator.php    |  42 +++----
 src/Operators/Arithmetical/ModOperator.php    |  56 ++++-----
 src/Operators/Bitwise/BitwiseBaseOperator.php |  51 ++++----
 src/Operators/Bitwise/BitwiseNotOperator.php  |   1 -
 .../Comparison/ComparisonBaseOperator.php     | 119 +++++++-----------
 src/Operators/Logical/LogicalBaseOperator.php |  34 ++---
 src/Operators/Other/CastOperator.php          |  77 ++++++------
 src/Operators/Other/FetchOperator.php         |   1 -
 src/Operators/Other/IssetOperator.php         |   9 +-
 src/Operators/Unary/MinusOperator.php         |   1 -
 src/Operators/Unary/NotOperator.php           |   1 -
 17 files changed, 221 insertions(+), 259 deletions(-)

diff --git a/src/Config.php b/src/Config.php
index c133ca5e6a..8d19efaf17 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -254,13 +254,13 @@ public function jsonSerialize(): array
     /**
      * Allows to check whether a $key is defined.
      *
-     * @param mixed $key
+     * @param mixed $offset
      *
      * @return bool
      */
-    public function offsetExists($key): bool
+    public function offsetExists($offset): bool
     {
-        return isset($this->container[$key]) || array_key_exists($key, $this->container);
+        return isset($this->container[$offset]) || array_key_exists($offset, $this->container);
     }
 
     /**
@@ -294,40 +294,40 @@ public function offsetGet($offset)
     /**
      * Sets a configuration value.
      *
-     * @param mixed $key
+     * @param mixed $offset
      * @param mixed $value
      */
     #[ReturnTypeWillChange]
-    public function offsetSet($key, $value): void
+    public function offsetSet($offset, $value): void
     {
-        if (!is_array($key)) {
+        if (!is_array($offset)) {
             $this->container[$key] = $value;
 
             return;
         }
 
-        $namespace = key($key);
-        $key       = current($key);
+        $namespace = key($offset);
+        $offset    = current($offset);
 
         if (!array_key_exists($namespace, $this->container)) {
             $this->container[$namespace] = [];
         }
 
-        $this->container[$namespace][$key] = $value;
+        $this->container[$namespace][$offset] = $value;
     }
 
     /**
      * Unsets a $key from internal container.
      *
-     * @param mixed $key
+     * @param mixed $offset
      *
      * @deprecated
      *
      */
     #[ReturnTypeWillChange]
-    public function offsetUnset($key): void
+    public function offsetUnset($offset): void
     {
-        unset($this->container[$key]);
+        unset($this->container[$offset]);
     }
 
     /**
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 7d31f7f34e..716b891713 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -31,7 +31,11 @@ class CompilerException extends RuntimeException
      * @param int                 $code     the Exception code [optional]
      * @param Exception|Throwable $previous the previous throwable used for the exception chaining [optional]
      */
-    public function __construct(string $message = '', $extra = null, $code = 0, $previous = null)
+    public function __construct(
+        string $message = '',
+        ?array $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null)
     {
         if (is_array($extra) && isset($extra['file'])) {
             $message .= ' in ' . $extra['file'] . ' on line ' . $extra['line'];
@@ -129,7 +133,7 @@ public static function illegalOperationTypeOnStaticVariable(
         array $statement
     ): self {
         return new self(
-            "Operator '{$operator}' isn't supported for static variables and {$dataType} typed expressions",
+            "Operator '$operator' isn't supported for static variables and $dataType typed expressions",
             $statement
         );
     }
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index ed87b9dd61..9861299cb6 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -23,12 +23,12 @@ interface ExceptionInterface
      *
      * @return string
      */
-    public function getErrorRegion();
+    public function getErrorRegion(): string;
 
     /**
      * Gets extra info.
      *
-     * @return array
+     * @return array|null
      */
-    public function getExtra();
+    public function getExtra(): array | null;
 }
diff --git a/src/Exception/ParseException.php b/src/Exception/ParseException.php
index a35a32396d..ae99a38584 100644
--- a/src/Exception/ParseException.php
+++ b/src/Exception/ParseException.php
@@ -31,8 +31,12 @@ class ParseException extends RuntimeException
      * @param int                 $code     the Exception code [optional]
      * @param Exception|Throwable $previous the previous throwable used for the exception chaining [optional]
      */
-    public function __construct($message = '', $extra = null, $code = 0, $previous = null)
-    {
+    public function __construct(
+        string $message = '',
+        ?array $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ) {
         if (is_array($extra) && isset($extra['file'])) {
             $message .= ' in ' . $extra['file'] . ' on line ' . $extra['line'];
         }
diff --git a/src/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
index 88778dc4e4..eba8bf31c8 100644
--- a/src/Operators/AbstractOperator.php
+++ b/src/Operators/AbstractOperator.php
@@ -106,7 +106,7 @@ public function getExpected(CompilationContext $compilationContext, array $expre
      * @param CompilationContext $compilationContext
      * @param string             $type
      *
-     * @return Variable
+     * @return Variable|null
      */
     public function getExpectedComplexLiteral(
         CompilationContext $compilationContext,
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 9259884c0c..11f33e5bb8 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -141,7 +141,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
 
                     default:
                         throw new CompilerException(
@@ -149,7 +148,6 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
 
             case 'bool':
                 switch ($right->getType()) {
@@ -178,7 +176,6 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
 
             case 'double':
                 switch ($right->getType()) {
@@ -254,7 +251,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -262,14 +259,14 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'string':
                 switch ($right->getType()) {
                     default:
                         throw new CompilerException('Operation is not supported between strings', $expression);
                 }
-                break;
+
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -342,7 +339,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -350,7 +347,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'char':
                         switch ($right->getType()) {
@@ -403,7 +400,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -411,7 +408,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -481,7 +478,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -489,7 +486,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'double':
                         switch ($right->getType()) {
@@ -571,7 +568,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -579,7 +576,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);
@@ -627,9 +624,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
                         }
-                        break;
+
 
                     case 'variable':
                         switch ($right->getType()) {
@@ -657,7 +653,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         $expression
                                     );
                                 }
-                                break;
+
 
                             /* a(var) + a(x) */
                             case 'variable':
@@ -686,7 +682,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ),
                                             $expression
                                         );
-                                        break;
+
 
                                     /* a(var) + a(bool) */
                                     case 'bool':
@@ -699,7 +695,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     /* a(var) + a(var) */
                                     case 'variable':
@@ -735,7 +731,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -743,12 +739,12 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
-                break;
+
 
             default:
                 throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index ec8230bb9f..8d0f83f4af 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -120,7 +120,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -128,7 +128,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'bool':
                 switch ($right->getType()) {
@@ -157,7 +157,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'double':
                 switch ($right->getType()) {
@@ -221,7 +221,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
                                     $expression
                                 );
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -230,7 +230,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -238,7 +238,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'string':
             case 'array':
@@ -249,7 +249,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -328,7 +328,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                 $expression
                                             );
                                         }
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -337,7 +337,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -345,7 +345,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -422,7 +422,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                 $expression
                                             );
                                         }
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -431,7 +431,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -439,7 +439,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'double':
                         switch ($right->getType()) {
@@ -514,7 +514,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -522,7 +522,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);
@@ -616,7 +616,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -624,7 +624,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
@@ -731,7 +731,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
                                         }
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -740,7 +740,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -748,12 +748,12 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
-                break;
+
 
             default:
                 throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 0299836fc7..014a1c31cb 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -121,7 +121,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         $expression
                                     );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -129,7 +129,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -137,7 +137,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'bool':
                 switch ($right->getType()) {
@@ -166,7 +166,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'double':
                 switch ($right->getType()) {
@@ -238,7 +238,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         $expression
                                     );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -248,7 +248,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -256,7 +256,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'string':
             case 'array':
@@ -267,7 +267,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -341,7 +341,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                 $expression
                                             );
                                         }
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -351,7 +351,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -359,7 +359,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -449,7 +449,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                 $expression
                                             );
                                         }
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -459,7 +459,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -467,7 +467,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'double':
                         switch ($right->getType()) {
@@ -541,7 +541,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                 $expression
                                             );
                                         }
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -550,7 +550,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -558,7 +558,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'string':
                     case 'array':
@@ -581,7 +581,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     'zephir_safe_mod_zval_long(' . $op1 . ', ' . $op2 . ')',
                                     $expression
                                 );
-                                break;
+
 
                             case 'double':
                                 $op2 = $right->getCode();
@@ -591,7 +591,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     'zephir_safe_mod_zval_double(' . $op1 . ', ' . $op2 . ')',
                                     $expression
                                 );
-                                break;
+
 
                             /* a(var) + a(x) */
                             case 'variable':
@@ -612,7 +612,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     /* a(var) + a(bool) */
                                     case 'bool':
@@ -622,7 +622,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     /* a(var) + a(var) */
                                     case 'variable':
@@ -655,7 +655,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -663,7 +663,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
@@ -709,7 +709,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     case 'variable':
                                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
@@ -763,7 +763,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
                                         }
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -772,7 +772,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -780,7 +780,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -788,7 +788,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             default:
                 throw new CompilerException(
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index 78aca6733e..753492c09d 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -125,7 +125,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     ) . ' ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
                                     $expression
                                 );
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -133,14 +133,14 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
                     default:
                         throw new CompilerException(
                             "Cannot operate 'int' with '" . $right->getType() . "'",
                             $expression
                         );
                 }
-                break;
+
 
             case 'bool':
                 switch ($right->getType()) {
@@ -201,7 +201,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     ) . ') ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
                                     $expression
                                 );
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -209,7 +209,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -217,7 +217,7 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'double':
                 switch ($right->getType()) {
@@ -284,7 +284,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     ) . ') ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
                                     $expression
                                 );
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -293,7 +293,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -301,14 +301,14 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
                 }
-                break;
+
 
             case 'string':
                 switch ($right->getType()) {
                     default:
                         throw new CompilerException('Operation is not supported between strings', $expression);
                 }
-                break;
+
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -376,7 +376,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ' ' . $this->operator . ' (int) (zephir_get_numberval(' . $symbol . ')))',
                                             $expression
                                         );
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -385,7 +385,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -393,7 +393,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -459,7 +459,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ' ' . $this->operator . ' zephir_get_numberval(' . $symbol . '))',
                                             $expression
                                         );
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -468,7 +468,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -476,7 +476,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'double':
                         switch ($right->getType()) {
@@ -551,7 +551,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                        break;
 
                                     default:
                                         throw new CompilerException(
@@ -560,7 +559,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -568,7 +567,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);
@@ -597,7 +596,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         $expression
                                     );
                                 }
-                                break;
+
 
                             /* a(var) + a(x) */
                             case 'variable':
@@ -621,7 +620,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     /* a(var) + a(bool) */
                                     case 'bool':
@@ -633,7 +632,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             ) . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     /* a(var) + a(var) */
                                     case 'variable':
@@ -663,7 +662,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -671,12 +670,12 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
-                break;
+
 
             default:
                 throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
@@ -712,7 +711,6 @@ public function optimizeConstantFolding(
                 break;
             default:
                 return null;
-                break;
         }
 
         switch ($expression['right']['type']) {
@@ -725,7 +723,6 @@ public function optimizeConstantFolding(
                 break;
             default:
                 return null;
-                break;
         }
 
         /*
diff --git a/src/Operators/Bitwise/BitwiseNotOperator.php b/src/Operators/Bitwise/BitwiseNotOperator.php
index 09341a2a1d..4dc3cbe46a 100644
--- a/src/Operators/Bitwise/BitwiseNotOperator.php
+++ b/src/Operators/Bitwise/BitwiseNotOperator.php
@@ -74,7 +74,6 @@ public function compile($expression, CompilationContext $compilationContext)
                     default:
                         throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
-                break;
 
             default:
                 throw new CompilerException('Unknown type: ' . $left->getType(), $expression);
diff --git a/src/Operators/Comparison/ComparisonBaseOperator.php b/src/Operators/Comparison/ComparisonBaseOperator.php
index b1fb743703..8a6cdf3095 100644
--- a/src/Operators/Comparison/ComparisonBaseOperator.php
+++ b/src/Operators/Comparison/ComparisonBaseOperator.php
@@ -128,12 +128,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression['right']
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException('Unknown type: ' . $right->getType(), $expression);
                 }
-                break;
+
 
             case 'int':
             case 'uint':
@@ -208,7 +208,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression['right']
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -216,7 +216,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case 'bool':
                 switch ($right->getType()) {
@@ -297,7 +297,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression['right']
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -305,7 +305,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case 'string':
                 $variableLeft     = $compilationContext->symbolTable->getTempLocalVariableForWrite(
@@ -326,7 +326,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $this->zvalNullOperator . '(' . $variableLeftCode . ')',
                             $expression['left']
                         );
-                        break;
+
 
                     case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
@@ -336,7 +336,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $this->zvalStringOperator . '(' . $variableLeftCode . ', "' . $right->getCode() . '")',
                             $expression['left']
                         );
-                        break;
+
 
                     case 'variable':
                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
@@ -356,7 +356,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $this->zvalOperator . '(' . $variableLeftCode . ', ' . $variableRight . ')',
                                     $expression
                                 );
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -364,12 +364,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression['right']
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                 }
-                break;
+
 
             case 'variable':
                 $variable     = $compilationContext->symbolTable->getVariableForRead(
@@ -446,7 +446,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $this->zvalLongNegOperator . '(' . $variableRightCode . ', ' . $variableCode . ')',
                                             $expression
                                         );
-                                        break;
+
 
                                     default:
                                         throw new CompilerException(
@@ -454,7 +454,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -462,7 +462,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'double':
                         switch ($right->getType()) {
@@ -531,7 +531,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -539,7 +539,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -606,7 +606,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -614,7 +614,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'array':
                         switch ($right->getType()) {
@@ -651,12 +651,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
-                        break;
+
 
                     case 'string':
                         $compilationContext->headersManager->add('kernel/operators');
@@ -701,12 +701,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
-                        break;
+
 
                     case 'variable':
                     case 'mixed':
@@ -810,17 +810,17 @@ public function compile(array $expression, CompilationContext $compilationContex
                                             $expression['right']
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException('Unknown type: ' . $right->getType(), $expression['left']);
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
-                break;
+
 
             default:
                 throw new CompilerException('Unknown type: ' . $left->getType(), $expression);
@@ -885,69 +885,40 @@ public function optimizeTypeOf(array $expr, CompilationContext $compilationConte
 
         switch ($variableVariable->getType()) {
             case 'double':
-                switch ($value) {
-                    case 'double':
-                    case 'float':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'double', 'float' => '1 ' . $operator . ' 1',
+                    default           => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'int':
             case 'integer':
             case 'long':
-                switch ($value) {
-                    case 'int':
-                    case 'integer':
-                    case 'long':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'int', 'integer', 'long' => '1 ' . $operator . ' 1',
+                    default                  => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'bool':
-                switch ($value) {
-                    case 'bool':
-                    case 'boolean':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'bool', 'boolean' => '1 ' . $operator . ' 1',
+                    default           => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'array':
-                switch ($value) {
-                    case 'array':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'array' => '1 ' . $operator . ' 1',
+                    default => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'string':
-                switch ($value) {
-                    case 'string':
-                        $condition = '1 ' . $operator . ' 1';
-                        break;
-
-                    default:
-                        $condition = '1 ' . $operator . ' 0';
-                        break;
-                }
+                $condition = match ($value) {
+                    'string' => '1 ' . $operator . ' 1',
+                    default  => '1 ' . $operator . ' 0',
+                };
                 break;
 
             case 'variable':
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index 9c8f971a44..72fe54b1a2 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -95,7 +95,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -103,7 +103,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                             $expression
                         );
                 }
-                break;
+
 
             case 'bool':
                 switch ($right->getType()) {
@@ -156,7 +156,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -164,7 +164,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                             $expression
                         );
                 }
-                break;
+
             case 'double':
                 switch ($right->getType()) {
                     case 'double':
@@ -188,11 +188,11 @@ public function compile($expression, CompilationContext $compilationContext): Co
                             $expression
                         );
                 }
-                break;
+
 
             case 'string':
                 throw new CompilerException('Operation is not supported between strings', $expression);
-                break;
+
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -246,7 +246,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -254,7 +254,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'bool':
                         switch ($right->getType()) {
@@ -313,7 +313,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -321,7 +321,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'double':
                         switch ($right->getType()) {
@@ -388,7 +388,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -396,7 +396,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'string':
                         switch ($right->getType()) {
@@ -475,7 +475,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -483,7 +483,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     $expression
                                 );
                         }
-                        break;
+
 
                     case 'variable':
                         $variableLeftCode = $compilationContext->backend->getVariableCode($variableLeft);
@@ -553,7 +553,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                             $expression
                                         );
                                 }
-                                break;
+
 
                             default:
                                 throw new CompilerException(
@@ -561,12 +561,12 @@ public function compile($expression, CompilationContext $compilationContext): Co
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
-                break;
+
 
             default:
                 throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
diff --git a/src/Operators/Other/CastOperator.php b/src/Operators/Other/CastOperator.php
index b812214bf9..b0f6dc5542 100644
--- a/src/Operators/Other/CastOperator.php
+++ b/src/Operators/Other/CastOperator.php
@@ -156,7 +156,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -164,7 +164,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case Types::T_LONG:
                 switch ($resolved->getType()) {
@@ -240,7 +240,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -248,7 +248,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case Types::T_DOUBLE:
                 switch ($resolved->getType()) {
@@ -334,7 +334,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     $expression
                                 );
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException(
@@ -342,7 +342,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case Types::T_BOOL:
                 switch ($resolved->getType()) {
@@ -376,36 +376,31 @@ public function compile(array $expression, CompilationContext $compilationContex
                         if ($symbolVariable->isTemporal()) {
                             $symbolVariable->setIdle(true);
                         }
-                        switch ($symbolVariable->getType()) {
-                            case Types::T_INT:
-                            case Types::T_CHAR:
-                            case Types::T_UCHAR:
-                                return new CompiledExpression(
-                                    'bool',
-                                    sprintf('(zend_bool) %s', $symbolVariable->getName()),
-                                    $expression
-                                );
-
-                            case Types::T_VARIABLE:
-                            case Types::T_MIXED:
-                                return new CompiledExpression(
-                                    'bool',
-                                    sprintf('zephir_get_boolval(%s)', $symbol),
-                                    $expression
-                                );
+                        return match ($symbolVariable->getType()) {
+                            Types::T_INT,
+                            Types::T_CHAR,
+                            Types::T_UCHAR => new CompiledExpression(
+                                'bool',
+                                sprintf('(zend_bool) %s', $symbolVariable->getName()),
+                                $expression
+                            ),
+                            Types::T_VARIABLE,
+                            Types::T_MIXED => new CompiledExpression(
+                                'bool',
+                                sprintf('zephir_get_boolval(%s)', $symbol),
+                                $expression
+                            ),
+                            default        => throw new CompilerException(
+                                sprintf(
+                                    'Cannot cast: %s(%s) to %s',
+                                    $resolved->getType(),
+                                    $symbolVariable->getType(),
+                                    $expression['left']
+                                ),
+                                $expression
+                            ),
+                        };
 
-                            default:
-                                throw new CompilerException(
-                                    sprintf(
-                                        'Cannot cast: %s(%s) to %s',
-                                        $resolved->getType(),
-                                        $symbolVariable->getType(),
-                                        $expression['left']
-                                    ),
-                                    $expression
-                                );
-                        }
-                        break;
 
                     default:
                         throw new CompilerException(
@@ -413,7 +408,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case Types::T_CHAR:
                 switch ($resolved->getType()) {
@@ -462,7 +457,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case Types::T_STRING:
                 switch ($resolved->getType()) {
@@ -530,14 +525,14 @@ public function compile(array $expression, CompilationContext $compilationContex
                                 );
                         }
 
-                        break;
+
                     default:
                         throw new CompilerException(
                             sprintf('Cannot cast: %s to %s', $resolved->getType(), $expression['left']),
                             $expression
                         );
                 }
-                break;
+
 
             case Types::T_ARRAY:
                 switch ($resolved->getType()) {
@@ -577,7 +572,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             case Types::T_OBJECT:
                 switch ($resolved->getType()) {
@@ -638,7 +633,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                 }
-                break;
+
 
             default:
                 throw new CompilerException(
diff --git a/src/Operators/Other/FetchOperator.php b/src/Operators/Other/FetchOperator.php
index a22b55a748..eb4e11896b 100644
--- a/src/Operators/Other/FetchOperator.php
+++ b/src/Operators/Other/FetchOperator.php
@@ -134,7 +134,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                     $expression,
                     $compilationContext
                 );
-                break;
 
             case 'property-access':
                 $exprVariable = new Expression($expression['right']['left']);
diff --git a/src/Operators/Other/IssetOperator.php b/src/Operators/Other/IssetOperator.php
index 43a31afd69..4c96265ba4 100644
--- a/src/Operators/Other/IssetOperator.php
+++ b/src/Operators/Other/IssetOperator.php
@@ -72,7 +72,6 @@ public function compile(array $expression, CompilationContext $compilationContex
                             'Variable type: ' . $variable->getType() . ' cannot be used as array',
                             $left['left']
                         );
-                        break;
                 }
 
                 if ('variable' === $variable->getType()) {
@@ -114,12 +113,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $left['right'],
                             $compilationContext
                         );
-                        break;
+
 
                     default:
                         throw new CompilerException('[' . $left['right']['type'] . ']', $expression);
                 }
-                break;
+
 
             case 'property-access':
             case 'property-dynamic-access':
@@ -187,12 +186,12 @@ public function compile(array $expression, CompilationContext $compilationContex
                             default:
                                 throw new CompilerException('[' . $indexVariable->getType() . ']', $expression);
                         }
-                        break;
+
 
                     default:
                         throw new CompilerException('[' . $expression['left']['right']['type'] . ']', $expression);
                 }
-                break;
+
 
             case 'property-string-access':
             case 'static-property-access':
diff --git a/src/Operators/Unary/MinusOperator.php b/src/Operators/Unary/MinusOperator.php
index 68706cd469..1de04b35a7 100644
--- a/src/Operators/Unary/MinusOperator.php
+++ b/src/Operators/Unary/MinusOperator.php
@@ -73,7 +73,6 @@ public function compile($expression, CompilationContext $compilationContext): Co
                             "Cannot operate minus with variable of '" . $left->getType() . "' type"
                         );
                 }
-                break;
 
             default:
                 throw new CompilerException("Cannot operate minus with '" . $left->getType() . "' type");
diff --git a/src/Operators/Unary/NotOperator.php b/src/Operators/Unary/NotOperator.php
index 780b3fd256..2d40787140 100644
--- a/src/Operators/Unary/NotOperator.php
+++ b/src/Operators/Unary/NotOperator.php
@@ -71,7 +71,6 @@ public function compile($expression, CompilationContext $compilationContext): Co
                     default:
                         throw new CompilerException('Unknown type: ' . $variable->getType(), $expression);
                 }
-                break;
 
             default:
                 throw new CompilerException('Unknown type: ' . $left->getType(), $expression);

From fe2a7125eb6ebe77e7cbac760ff00485d9135d48 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:02:22 -0600
Subject: [PATCH 237/375] minor correction

---
 .github/workflows/main.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f2cc2a6ac1..d169189858 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -210,12 +210,11 @@ jobs:
           docker run \
             -p 8080:8080 \
             -v $(pwd):/data/project \
-            -v $(pwd)/res:/data/results/ \
+            -v $(pwd)/tests/output/:/data/results/ \
             -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
             jetbrains/qodana-php:latest \
             --show-report --baseline=qodana.sarif.json
 
-
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v3
         with:

From a50fb0f9c1db7b8ad6fcce9317948a7bdeea1cf1 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:11:07 -0600
Subject: [PATCH 238/375] correcting typo

---
 src/Config.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Config.php b/src/Config.php
index 8d19efaf17..bef1a9f75e 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -301,7 +301,7 @@ public function offsetGet($offset)
     public function offsetSet($offset, $value): void
     {
         if (!is_array($offset)) {
-            $this->container[$key] = $value;
+            $this->container[$offset] = $value;
 
             return;
         }
@@ -364,19 +364,19 @@ protected function populate(): void
 
                 return;
             case JSON_ERROR_DEPTH:
-                $message = "{$message}: Maximum stack depth exceeded";
+                $message = "$message: Maximum stack depth exceeded";
                 break;
             case JSON_ERROR_STATE_MISMATCH:
-                $message = "{$message}: Underflow or the modes mismatch";
+                $message = "$message: Underflow or the modes mismatch";
                 break;
             case JSON_ERROR_CTRL_CHAR:
-                $message = "{$message}: Unexpected control character found";
+                $message = "$message: Unexpected control character found";
                 break;
             case JSON_ERROR_SYNTAX:
-                $message = "{$message}: Syntax error, malformed JSON";
+                $message = "$message: Syntax error, malformed JSON";
                 break;
             case JSON_ERROR_UTF8:
-                $message = "{$message}: Malformed UTF-8 characters, possibly incorrectly encoded";
+                $message = "$message: Malformed UTF-8 characters, possibly incorrectly encoded";
                 break;
             default:
                 break;

From add6ae6b4d27dce44c983bf15a81c67a611f6f2f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:16:49 -0600
Subject: [PATCH 239/375] phpcs

---
 src/Exception/CompilerException.php                     | 4 ++--
 src/Operators/Arithmetical/ArithmeticalBaseOperator.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 716b891713..6015223b75 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -35,8 +35,8 @@ public function __construct(
         string $message = '',
         ?array $extra = null,
         int $code = 0,
-        Exception | Throwable $previous = null)
-    {
+        Exception | Throwable $previous = null
+    ) {
         if (is_array($extra) && isset($extra['file'])) {
             $message .= ' in ' . $extra['file'] . ' on line ' . $extra['line'];
         }
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 11f33e5bb8..91bd8ba68d 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -266,7 +266,7 @@ public function compile($expression, CompilationContext $compilationContext)
                     default:
                         throw new CompilerException('Operation is not supported between strings', $expression);
                 }
-
+                // no break
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -576,7 +576,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-
+                        // no break
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);

From 7f46f5e52f9ace35d3f18dd3243c2a24b2a98a71 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:19:18 -0600
Subject: [PATCH 240/375] more phpcs

---
 src/Operators/Arithmetical/ArithmeticalBaseOperator.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 91bd8ba68d..1f6591a868 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -339,7 +339,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-
+                                // no break
 
                             default:
                                 throw new CompilerException(
@@ -347,7 +347,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-
+                        // no break
 
                     case 'char':
                         switch ($right->getType()) {
@@ -580,6 +580,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);
+                        // no break
                     case 'array':
                         switch ($right->getType()) {
                             /* a(var) + a(x) */

From 68a9b2b6a4c96249503b5409f40272b4738a563b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:23:40 -0600
Subject: [PATCH 241/375] removing psr2 reference

---
 phpcs.xml.dist | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index fd2566c53f..8af9b748a7 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -26,10 +26,9 @@
     <!-- Show progress of the run -->
     <arg value="p"/>
 
-    <rule ref="PSR2">
+    <rule ref="PSR12">
         <exclude name="Generic.Files.LineLength.TooLong"/>
-        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
-        <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/>
+        <exclude name="PSR12.Methods.MethodDeclaration.Underscore"/>
     </rule>
 
     <!--

From cf3ab03e8f1923787643ad37cb8abc158332c284 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:28:31 -0600
Subject: [PATCH 242/375] fixing phpcs

---
 phpcs.xml.dist                                        |  3 ++-
 .../Arithmetical/ArithmeticalBaseOperator.php         | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 8af9b748a7..6bbcfd8ed9 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -28,7 +28,8 @@
 
     <rule ref="PSR12">
         <exclude name="Generic.Files.LineLength.TooLong"/>
-        <exclude name="PSR12.Methods.MethodDeclaration.Underscore"/>
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+        <exclude name="PSR2.Classes.PropertyDeclaration.SpacingAfterType"/>
     </rule>
 
     <!--
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 1f6591a868..adb596afe4 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -266,7 +266,6 @@ public function compile($expression, CompilationContext $compilationContext)
                     default:
                         throw new CompilerException('Operation is not supported between strings', $expression);
                 }
-                // no break
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -339,7 +338,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
                                 }
-                                // no break
 
                             default:
                                 throw new CompilerException(
@@ -347,7 +345,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        // no break
 
                     case 'char':
                         switch ($right->getType()) {
@@ -576,11 +573,11 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
                         }
-                        // no break
+
 
                     case 'string':
                         throw new CompilerException("Cannot operate string variables'", $expression);
-                        // no break
+
                     case 'array':
                         switch ($right->getType()) {
                             /* a(var) + a(x) */
@@ -626,7 +623,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
                                 }
                         }
-
+                        // no break
 
                     case 'variable':
                         switch ($right->getType()) {
@@ -745,7 +742,7 @@ public function compile($expression, CompilationContext $compilationContext)
                     default:
                         throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
                 }
-
+            // no break
 
             default:
                 throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);

From 0a5d3784040c91daf90dd938f123b9bba39df92d Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:53:25 -0600
Subject: [PATCH 243/375] correcting workflow; removing duplication

---
 .github/workflows/main.yml                   |  1 -
 .github/workflows/qodana_code_quality.yml    | 17 ----------
 src/Operators/AbstractOperator.php           | 34 ++++++++++++++++++++
 src/Operators/Other/ShortTernaryOperator.php | 19 +----------
 src/Operators/Other/TernaryOperator.php      | 19 +----------
 5 files changed, 36 insertions(+), 54 deletions(-)
 delete mode 100644 .github/workflows/qodana_code_quality.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d169189858..d9afff9562 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -208,7 +208,6 @@ jobs:
       - name: "Qodana Analysis"
         run: |
           docker run \
-            -p 8080:8080 \
             -v $(pwd):/data/project \
             -v $(pwd)/tests/output/:/data/results/ \
             -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
deleted file mode 100644
index c9209ebbc7..0000000000
--- a/.github/workflows/qodana_code_quality.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Qodana
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.2
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
diff --git a/src/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
index eba8bf31c8..8239bce04d 100644
--- a/src/Operators/AbstractOperator.php
+++ b/src/Operators/AbstractOperator.php
@@ -237,4 +237,38 @@ public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param array              $expression
+     *
+     * @return Variable|null
+     */
+    protected function processTenary(
+        CompilationContext $compilationContext,
+        array $expression
+    ): ?Variable {
+        /**
+         * This variable is used to check if the compound and expression is
+         * evaluated as true or false:
+         *
+         * Ensure that newly allocated variables are local-only (setReadOnly)
+         */
+        $this->setReadOnly(false);
+        $returnVariable = $this->processTenary($compilationContext, $expression, false);
+        /* Make sure that passed variables (passed symbol variables) are promoted */
+        $returnVariable->setLocalOnly(false);
+
+        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
+            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext
+            );
+            if ($returnVariable->isTemporal()) {
+                $returnVariable->skipInitVariant(2);
+            }
+        }
+
+        return $returnVariable;
+    }
 }
diff --git a/src/Operators/Other/ShortTernaryOperator.php b/src/Operators/Other/ShortTernaryOperator.php
index 09a3213362..8f23f59e15 100644
--- a/src/Operators/Other/ShortTernaryOperator.php
+++ b/src/Operators/Other/ShortTernaryOperator.php
@@ -39,24 +39,7 @@ class ShortTernaryOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        /**
-         * This variable is used to check if the compound and expression is evaluated as true or false:
-         * Ensure that newly allocated variables are local-only (setReadOnly)
-         */
-        $this->setReadOnly(false);
-        $returnVariable = $this->getExpected($compilationContext, $expression, false);
-        /* Make sure that passed variables (passed symbol variables) are promoted */
-        $returnVariable->setLocalOnly(false);
-
-        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
-            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext
-            );
-            if ($returnVariable->isTemporal()) {
-                $returnVariable->skipInitVariant(2);
-            }
-        }
+        $returnVariable = $this->processTenary($compilationContext, $expression);
 
         $ifBuilder = new IfStatementBuilder(
             new UnaryOperatorBuilder(
diff --git a/src/Operators/Other/TernaryOperator.php b/src/Operators/Other/TernaryOperator.php
index 37a28e5412..b6f3a1997c 100644
--- a/src/Operators/Other/TernaryOperator.php
+++ b/src/Operators/Other/TernaryOperator.php
@@ -34,24 +34,7 @@ class TernaryOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        /**
-         * This variable is used to check if the compound and expression is evaluated as true or false:
-         * Ensure that newly allocated variables are local-only (setReadOnly)
-         */
-        $this->setReadOnly(false);
-        $returnVariable = $this->getExpected($compilationContext, $expression, false);
-        /* Make sure that passed variables (passed symbol variables) are promoted */
-        $returnVariable->setLocalOnly(false);
-
-        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
-            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext
-            );
-            if ($returnVariable->isTemporal()) {
-                $returnVariable->skipInitVariant(2);
-            }
-        }
+        $returnVariable = $this->processTenary($compilationContext, $expression);
 
         $expr      = new EvalExpression();
         $condition = $expr->optimize($expression['left'], $compilationContext);

From b9a5bdec5e41c7adb791f64938ad7ee2fa910e75 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:56:37 -0600
Subject: [PATCH 244/375] reverting

---
 src/Operators/AbstractOperator.php           | 34 --------------------
 src/Operators/Other/ShortTernaryOperator.php | 19 ++++++++++-
 src/Operators/Other/TernaryOperator.php      | 19 ++++++++++-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/Operators/AbstractOperator.php b/src/Operators/AbstractOperator.php
index 8239bce04d..eba8bf31c8 100644
--- a/src/Operators/AbstractOperator.php
+++ b/src/Operators/AbstractOperator.php
@@ -237,38 +237,4 @@ public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
-
-    /**
-     * @param CompilationContext $compilationContext
-     * @param array              $expression
-     *
-     * @return Variable|null
-     */
-    protected function processTenary(
-        CompilationContext $compilationContext,
-        array $expression
-    ): ?Variable {
-        /**
-         * This variable is used to check if the compound and expression is
-         * evaluated as true or false:
-         *
-         * Ensure that newly allocated variables are local-only (setReadOnly)
-         */
-        $this->setReadOnly(false);
-        $returnVariable = $this->processTenary($compilationContext, $expression, false);
-        /* Make sure that passed variables (passed symbol variables) are promoted */
-        $returnVariable->setLocalOnly(false);
-
-        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
-            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext
-            );
-            if ($returnVariable->isTemporal()) {
-                $returnVariable->skipInitVariant(2);
-            }
-        }
-
-        return $returnVariable;
-    }
 }
diff --git a/src/Operators/Other/ShortTernaryOperator.php b/src/Operators/Other/ShortTernaryOperator.php
index 8f23f59e15..09a3213362 100644
--- a/src/Operators/Other/ShortTernaryOperator.php
+++ b/src/Operators/Other/ShortTernaryOperator.php
@@ -39,7 +39,24 @@ class ShortTernaryOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $returnVariable = $this->processTenary($compilationContext, $expression);
+        /**
+         * This variable is used to check if the compound and expression is evaluated as true or false:
+         * Ensure that newly allocated variables are local-only (setReadOnly)
+         */
+        $this->setReadOnly(false);
+        $returnVariable = $this->getExpected($compilationContext, $expression, false);
+        /* Make sure that passed variables (passed symbol variables) are promoted */
+        $returnVariable->setLocalOnly(false);
+
+        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
+            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext
+            );
+            if ($returnVariable->isTemporal()) {
+                $returnVariable->skipInitVariant(2);
+            }
+        }
 
         $ifBuilder = new IfStatementBuilder(
             new UnaryOperatorBuilder(
diff --git a/src/Operators/Other/TernaryOperator.php b/src/Operators/Other/TernaryOperator.php
index b6f3a1997c..37a28e5412 100644
--- a/src/Operators/Other/TernaryOperator.php
+++ b/src/Operators/Other/TernaryOperator.php
@@ -34,7 +34,24 @@ class TernaryOperator extends AbstractOperator
      */
     public function compile($expression, CompilationContext $compilationContext): CompiledExpression
     {
-        $returnVariable = $this->processTenary($compilationContext, $expression);
+        /**
+         * This variable is used to check if the compound and expression is evaluated as true or false:
+         * Ensure that newly allocated variables are local-only (setReadOnly)
+         */
+        $this->setReadOnly(false);
+        $returnVariable = $this->getExpected($compilationContext, $expression, false);
+        /* Make sure that passed variables (passed symbol variables) are promoted */
+        $returnVariable->setLocalOnly(false);
+
+        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {
+            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext
+            );
+            if ($returnVariable->isTemporal()) {
+                $returnVariable->skipInitVariant(2);
+            }
+        }
 
         $expr      = new EvalExpression();
         $condition = $expr->optimize($expression['left'], $compilationContext);

From 0c0a4d65bfd3c7e6d14f3147521d8e2f6f0595b8 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 21:57:29 -0600
Subject: [PATCH 245/375] updating baseline file

---
 qodana.sarif.json | 3294 +++++++++++++++++++--------------------------
 1 file changed, 1365 insertions(+), 1929 deletions(-)

diff --git a/qodana.sarif.json b/qodana.sarif.json
index cf42d19bc2..02265a9e05 100644
--- a/qodana.sarif.json
+++ b/qodana.sarif.json
@@ -153,13 +153,13 @@
               "name": "MySQL"
             },
             {
-              "id": "PHP/PHPDoc/Code style",
-              "name": "Code style",
+              "id": "PHP/Control flow",
+              "name": "Control flow",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP/PHPDoc",
-                    "index": 2,
+                    "id": "PHP",
+                    "index": 0,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -171,13 +171,13 @@
               ]
             },
             {
-              "id": "PHP/Control flow",
-              "name": "Control flow",
+              "id": "PHP/PHPDoc/Code style",
+              "name": "Code style",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP",
-                    "index": 0,
+                    "id": "PHP/PHPDoc",
+                    "index": 2,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -196,6 +196,10 @@
               "id": "HTML",
               "name": "HTML"
             },
+            {
+              "id": "Cucumber",
+              "name": "Cucumber"
+            },
             {
               "id": "JavaScript and TypeScript/Unused symbols",
               "name": "Unused symbols",
@@ -214,10 +218,6 @@
                 }
               ]
             },
-            {
-              "id": "Cucumber",
-              "name": "Cucumber"
-            },
             {
               "id": "JavaScript and TypeScript/Flow type checker",
               "name": "Flow type checker",
@@ -335,13 +335,13 @@
               ]
             },
             {
-              "id": "JavaScript and TypeScript/ES2015 migration aids",
-              "name": "ES2015 migration aids",
+              "id": "PHP/Undefined symbols",
+              "name": "Undefined symbols",
               "relationships": [
                 {
                   "target": {
-                    "id": "JavaScript and TypeScript",
-                    "index": 7,
+                    "id": "PHP",
+                    "index": 0,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -353,13 +353,13 @@
               ]
             },
             {
-              "id": "PHP/Undefined symbols",
-              "name": "Undefined symbols",
+              "id": "JavaScript and TypeScript/ES2015 migration aids",
+              "name": "ES2015 migration aids",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP",
-                    "index": 0,
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -530,6 +530,10 @@
                 }
               ]
             },
+            {
+              "id": "XML",
+              "name": "XML"
+            },
             {
               "id": "JavaScript and TypeScript/Control flow issues",
               "name": "Control flow issues",
@@ -548,10 +552,6 @@
                 }
               ]
             },
-            {
-              "id": "XML",
-              "name": "XML"
-            },
             {
               "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
               "name": "Potentially undesirable code constructs",
@@ -691,13 +691,13 @@
               ]
             },
             {
-              "id": "CSS/Probable bugs",
-              "name": "Probable bugs",
+              "id": "JavaScript and TypeScript/TypeScript",
+              "name": "TypeScript",
               "relationships": [
                 {
                   "target": {
-                    "id": "CSS",
-                    "index": 32,
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -709,13 +709,13 @@
               ]
             },
             {
-              "id": "JavaScript and TypeScript/TypeScript",
-              "name": "TypeScript",
+              "id": "CSS/Probable bugs",
+              "name": "Probable bugs",
               "relationships": [
                 {
                   "target": {
-                    "id": "JavaScript and TypeScript",
-                    "index": 7,
+                    "id": "CSS",
+                    "index": 32,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -959,13 +959,13 @@
               ]
             },
             {
-              "id": "JavaScript and TypeScript/Function metrics",
-              "name": "Function metrics",
+              "id": "PHP/Quality tools",
+              "name": "Quality tools",
               "relationships": [
                 {
                   "target": {
-                    "id": "JavaScript and TypeScript",
-                    "index": 7,
+                    "id": "PHP",
+                    "index": 0,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -977,13 +977,13 @@
               ]
             },
             {
-              "id": "PHP/Quality tools",
-              "name": "Quality tools",
+              "id": "JavaScript and TypeScript/Function metrics",
+              "name": "Function metrics",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP",
-                    "index": 0,
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -1524,27 +1524,27 @@
                 ]
               },
               {
-                "id": "PhpMissingDocCommentInspection",
+                "id": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
                 "shortDescription": {
-                  "text": "Missing PHPDoc comment"
+                  "text": "Write access to referenced array value without 'unset'"
                 },
                 "fullDescription": {
-                  "text": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the '@noinspection' tag. You can use the Enforce PHPDoc Comment inspection to report fully typed elements.",
-                  "markdown": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the `@noinspection` tag.\n\nYou can use the *Enforce PHPDoc Comment* inspection to report fully typed elements."
+                  "text": "Reports the write access expressions on variables that are still referencing the array value previously used in a 'foreach' statement. It is recommended to destroy such references by using 'unset'. See foreach (php.net) and unset (php.net) for details.",
+                  "markdown": "Reports the write access expressions on variables that are still referencing the array value previously used in a `foreach` statement.\n\n\nIt is recommended to destroy such references by using `unset`.\n\n\nSee [foreach (php.net)](https://www.php.net/manual/en/control-structures.foreach.php) and [unset (php.net)](https://www.php.net/manual/en/function.unset.php) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "note",
+                  "enabled": true,
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "PhpMissingDocCommentInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/PHPDoc/Code style",
+                      "id": "PHP/Control flow",
                       "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
@@ -1557,27 +1557,27 @@
                 ]
               },
               {
-                "id": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
+                "id": "PhpMissingDocCommentInspection",
                 "shortDescription": {
-                  "text": "Write access to referenced array value without 'unset'"
+                  "text": "Missing PHPDoc comment"
                 },
                 "fullDescription": {
-                  "text": "Reports the write access expressions on variables that are still referencing the array value previously used in a 'foreach' statement. It is recommended to destroy such references by using 'unset'. See foreach (php.net) and unset (php.net) for details.",
-                  "markdown": "Reports the write access expressions on variables that are still referencing the array value previously used in a `foreach` statement.\n\n\nIt is recommended to destroy such references by using `unset`.\n\n\nSee [foreach (php.net)](https://www.php.net/manual/en/control-structures.foreach.php) and [unset (php.net)](https://www.php.net/manual/en/function.unset.php) for details."
+                  "text": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the '@noinspection' tag. You can use the Enforce PHPDoc Comment inspection to report fully typed elements.",
+                  "markdown": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the `@noinspection` tag.\n\nYou can use the *Enforce PHPDoc Comment* inspection to report fully typed elements."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "warning",
+                  "enabled": false,
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "PhpMissingDocCommentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Control flow",
+                      "id": "PHP/PHPDoc/Code style",
                       "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
@@ -1710,7 +1710,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -1875,7 +1875,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -1908,7 +1908,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -2172,7 +2172,7 @@
                   {
                     "target": {
                       "id": "PHP/PHPDoc/Code style",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -2601,7 +2601,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -2997,7 +2997,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3240,28 +3240,28 @@
                 ]
               },
               {
-                "id": "PhpUsageOfSilenceOperatorInspection",
+                "id": "PhpUndefinedVariableInspection",
                 "shortDescription": {
-                  "text": "Usage of a silence operator"
+                  "text": "Undefined variable"
                 },
                 "fullDescription": {
-                  "text": "Reports the usages of the silence operator ('@'), which is highly discouraged. See Error Control Operators (php.net) for details.",
-                  "markdown": "Reports the usages of the silence operator (`@`), which is highly discouraged.\n\nSee [Error Control Operators (php.net)](https://www.php.net/manual/en/language.operators.errorcontrol.php) for details."
+                  "text": "Produces two types of warnings: Undefined variable: the variable's definition is not found in the project files, configured include paths, or among the PHP predefined variables. Variable might have not been defined: there are one or more paths to reach the line with the variable usage without defining it. Use the options below to customize the inspection: Report that variable is probably undefined: clear the checkbox to disable the Variable might have not been defined warnings. Enable inspection in global space: by default, the inspection is enabled for global space. Clear the checkbox to only report undefined variables from functions' local scope. Search for variable's definition outside the current file: if selected, the IDE reports a global variable as undefined only in case there are no 'include' or 'require' statements in the current file and the variable's definition cannot be found in the project. Note that the IDE does not examine the actual content of included files but only checks the presence of 'include' or 'require' statements. Otherwise, if not selected, the IDE searches for the variable's definition only in the current file and ignores the 'include' or 'require' statements if any.",
+                  "markdown": "Produces two types of warnings:\n\n* *Undefined variable*: the variable's definition is not found in the project files, configured include paths, or among the PHP predefined variables.\n* *Variable might have not been defined*: there are one or more paths to reach the line with the variable usage without defining it.\n\n\nUse the options below to customize the inspection:\n\n* **Report that variable is probably undefined** : clear the checkbox to disable the *Variable might have not been defined* warnings.\n* **Enable inspection in global space**: by default, the inspection is enabled for global space. Clear the checkbox to only report undefined variables from functions' local scope.\n*\n  **Search for variable's definition outside the current file** : if selected, the IDE reports a global variable as undefined only in case there are no `include` or `require` statements in the current file and the variable's definition cannot be found in the project. Note that the IDE does not examine the actual content of included files but only checks the presence of `include` or `require` statements.\n\n\n  Otherwise, if not selected, the IDE searches for the variable's definition only in the current file and ignores the `include` or `require` statements if any."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "note",
+                  "enabled": true,
+                  "level": "error",
                   "parameters": {
-                    "suppressToolId": "PhpUsageOfSilenceOperatorInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "PhpUndefinedVariableInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code smell",
-                      "index": 1,
+                      "id": "PHP/Undefined symbols",
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3273,28 +3273,28 @@
                 ]
               },
               {
-                "id": "PhpUndefinedVariableInspection",
+                "id": "PhpUsageOfSilenceOperatorInspection",
                 "shortDescription": {
-                  "text": "Undefined variable"
+                  "text": "Usage of a silence operator"
                 },
                 "fullDescription": {
-                  "text": "Produces two types of warnings: Undefined variable: the variable's definition is not found in the project files, configured include paths, or among the PHP predefined variables. Variable might have not been defined: there are one or more paths to reach the line with the variable usage without defining it. Use the options below to customize the inspection: Report that variable is probably undefined: clear the checkbox to disable the Variable might have not been defined warnings. Enable inspection in global space: by default, the inspection is enabled for global space. Clear the checkbox to only report undefined variables from functions' local scope. Search for variable's definition outside the current file: if selected, the IDE reports a global variable as undefined only in case there are no 'include' or 'require' statements in the current file and the variable's definition cannot be found in the project. Note that the IDE does not examine the actual content of included files but only checks the presence of 'include' or 'require' statements. Otherwise, if not selected, the IDE searches for the variable's definition only in the current file and ignores the 'include' or 'require' statements if any.",
-                  "markdown": "Produces two types of warnings:\n\n* *Undefined variable*: the variable's definition is not found in the project files, configured include paths, or among the PHP predefined variables.\n* *Variable might have not been defined*: there are one or more paths to reach the line with the variable usage without defining it.\n\n\nUse the options below to customize the inspection:\n\n* **Report that variable is probably undefined** : clear the checkbox to disable the *Variable might have not been defined* warnings.\n* **Enable inspection in global space**: by default, the inspection is enabled for global space. Clear the checkbox to only report undefined variables from functions' local scope.\n*\n  **Search for variable's definition outside the current file** : if selected, the IDE reports a global variable as undefined only in case there are no `include` or `require` statements in the current file and the variable's definition cannot be found in the project. Note that the IDE does not examine the actual content of included files but only checks the presence of `include` or `require` statements.\n\n\n  Otherwise, if not selected, the IDE searches for the variable's definition only in the current file and ignores the `include` or `require` statements if any."
+                  "text": "Reports the usages of the silence operator ('@'), which is highly discouraged. See Error Control Operators (php.net) for details.",
+                  "markdown": "Reports the usages of the silence operator (`@`), which is highly discouraged.\n\nSee [Error Control Operators (php.net)](https://www.php.net/manual/en/language.operators.errorcontrol.php) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "error",
+                  "enabled": false,
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpUndefinedVariableInspection",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "PhpUsageOfSilenceOperatorInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "id": "PHP/Code smell",
+                      "index": 1,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3525,7 +3525,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3723,7 +3723,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4218,7 +4218,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4416,7 +4416,7 @@
                   {
                     "target": {
                       "id": "PHP/PHPDoc/Code style",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4593,19 +4593,19 @@
                 ]
               },
               {
-                "id": "PhpAutovivificationOnFalseValuesInspection",
+                "id": "PhpDocSignatureIsNotCompleteInspection",
                 "shortDescription": {
-                  "text": "Automatic conversion of 'false' to array is deprecated"
+                  "text": "PHPDoc comment signature is not complete"
                 },
                 "fullDescription": {
-                  "text": "Reports automatic conversions of 'false' values to arrays. Such expressions are deprecated starting from PHP 8.1. See Deprecate autovivification on false for details.",
-                  "markdown": "Reports automatic conversions of `false` values to arrays. Such expressions are deprecated starting from PHP 8.1.\n\n\nSee [Deprecate autovivification on false](https://wiki.php.net/rfc/autovivification_false) for details."
+                  "text": "Reports the PHPDoc comments that contain at least one '@param' or '@return' tag but are missing some of the '@param' or '@return' tags for parameters or return types specified in the function/method declaration.",
+                  "markdown": "Reports the PHPDoc comments that contain at least one `@param` or `@return` tag but are missing some of the `@param` or `@return` tags for parameters or return types specified in the function/method declaration."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpAutovivificationOnFalseValuesInspection",
+                    "suppressToolId": "PhpDocSignatureIsNotCompleteInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -4613,8 +4613,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code style",
-                      "index": 3,
+                      "id": "PHP/PHPDoc/Code style",
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4626,19 +4626,19 @@
                 ]
               },
               {
-                "id": "PhpDocSignatureIsNotCompleteInspection",
+                "id": "PhpAutovivificationOnFalseValuesInspection",
                 "shortDescription": {
-                  "text": "PHPDoc comment signature is not complete"
+                  "text": "Automatic conversion of 'false' to array is deprecated"
                 },
                 "fullDescription": {
-                  "text": "Reports the PHPDoc comments that contain at least one '@param' or '@return' tag but are missing some of the '@param' or '@return' tags for parameters or return types specified in the function/method declaration.",
-                  "markdown": "Reports the PHPDoc comments that contain at least one `@param` or `@return` tag but are missing some of the `@param` or `@return` tags for parameters or return types specified in the function/method declaration."
+                  "text": "Reports automatic conversions of 'false' values to arrays. Such expressions are deprecated starting from PHP 8.1. See Deprecate autovivification on false for details.",
+                  "markdown": "Reports automatic conversions of `false` values to arrays. Such expressions are deprecated starting from PHP 8.1.\n\n\nSee [Deprecate autovivification on false](https://wiki.php.net/rfc/autovivification_false) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpDocSignatureIsNotCompleteInspection",
+                    "suppressToolId": "PhpAutovivificationOnFalseValuesInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -4646,8 +4646,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/PHPDoc/Code style",
-                      "index": 11,
+                      "id": "PHP/Code style",
+                      "index": 3,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4779,7 +4779,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5142,7 +5142,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5154,28 +5154,28 @@
                 ]
               },
               {
-                "id": "PhpCSFixerValidationInspection",
+                "id": "PhpClosureCanBeConvertedToShortArrowFunctionInspection",
                 "shortDescription": {
-                  "text": "PHP CS Fixer validation"
+                  "text": "Closure can be converted to arrow function"
                 },
                 "fullDescription": {
-                  "text": "Reports coding style problems detected by PHP CS Fixer. The inspection requires PHP CS Fixer to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | PHP CS Fixer. To learn more about installing PHP CS Fixer, see PHP-CS-Fixer installation (GitHub).",
-                  "markdown": "Reports coding style problems detected by PHP CS Fixer.\n\n\nThe inspection requires PHP CS Fixer to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| PHP CS Fixer](settings://settings.php.quality.tools?CS%20Fixer).\n\n\nTo learn more about installing PHP CS Fixer, see [PHP-CS-Fixer installation (GitHub)](https://github.com/FriendsOfPHP/PHP-CS-Fixer#installation)."
+                  "text": "Reports the anonymous functions that can be transformed to short arrow functions. Support for short arrow functions is available since PHP 7.4. See PHP RFC: Arrow Functions 2.0 (php.net) for details.",
+                  "markdown": "Reports the anonymous functions that can be transformed to short arrow functions. Support for short arrow functions is available since PHP 7.4.\n\n\nSee [PHP RFC: Arrow Functions 2.0 (php.net)](https://wiki.php.net/rfc/arrow_functions_v2) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpCSFixerValidationInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "PhpClosureCanBeConvertedToShortArrowFunctionInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Quality tools",
-                      "index": 70,
+                      "id": "PHP/Code style",
+                      "index": 3,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5187,28 +5187,28 @@
                 ]
               },
               {
-                "id": "PhpClosureCanBeConvertedToShortArrowFunctionInspection",
+                "id": "PhpCSFixerValidationInspection",
                 "shortDescription": {
-                  "text": "Closure can be converted to arrow function"
+                  "text": "PHP CS Fixer validation"
                 },
                 "fullDescription": {
-                  "text": "Reports the anonymous functions that can be transformed to short arrow functions. Support for short arrow functions is available since PHP 7.4. See PHP RFC: Arrow Functions 2.0 (php.net) for details.",
-                  "markdown": "Reports the anonymous functions that can be transformed to short arrow functions. Support for short arrow functions is available since PHP 7.4.\n\n\nSee [PHP RFC: Arrow Functions 2.0 (php.net)](https://wiki.php.net/rfc/arrow_functions_v2) for details."
+                  "text": "Reports coding style problems detected by PHP CS Fixer. The inspection requires PHP CS Fixer to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | PHP CS Fixer. To learn more about installing PHP CS Fixer, see PHP-CS-Fixer installation (GitHub).",
+                  "markdown": "Reports coding style problems detected by PHP CS Fixer.\n\n\nThe inspection requires PHP CS Fixer to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| PHP CS Fixer](settings://settings.php.quality.tools?CS%20Fixer).\n\n\nTo learn more about installing PHP CS Fixer, see [PHP-CS-Fixer installation (GitHub)](https://github.com/FriendsOfPHP/PHP-CS-Fixer#installation)."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpClosureCanBeConvertedToShortArrowFunctionInspection",
-                    "ideaSeverity": "INFORMATION",
-                    "qodanaSeverity": "Info"
+                    "suppressToolId": "PhpCSFixerValidationInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code style",
-                      "index": 3,
+                      "id": "PHP/Quality tools",
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5285,39 +5285,6 @@
                   }
                 ]
               },
-              {
-                "id": "PhpUnitUndefinedDataProviderInspection",
-                "shortDescription": {
-                  "text": "Undefined PHPUnit data provider"
-                },
-                "fullDescription": {
-                  "text": "Reports the references to functions/methods in the '@dataProvider' PHPDoc tag that are not resolved. Note that when resolving 'dataProvider', PHPUnit doesn't take 'use' statements into account.",
-                  "markdown": "Reports the references to functions/methods in the `@dataProvider` PHPDoc tag that are not resolved.\n\nNote that when resolving `dataProvider`, PHPUnit doesn't take `use` statements into account."
-                },
-                "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "warning",
-                  "parameters": {
-                    "suppressToolId": "PhpUnitUndefinedDataProviderInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "PHP/PHPUnit",
-                      "index": 20,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
               {
                 "id": "PhpIncludeInspection",
                 "shortDescription": {
@@ -5351,6 +5318,39 @@
                   }
                 ]
               },
+              {
+                "id": "PhpUnitUndefinedDataProviderInspection",
+                "shortDescription": {
+                  "text": "Undefined PHPUnit data provider"
+                },
+                "fullDescription": {
+                  "text": "Reports the references to functions/methods in the '@dataProvider' PHPDoc tag that are not resolved. Note that when resolving 'dataProvider', PHPUnit doesn't take 'use' statements into account.",
+                  "markdown": "Reports the references to functions/methods in the `@dataProvider` PHPDoc tag that are not resolved.\n\nNote that when resolving `dataProvider`, PHPUnit doesn't take `use` statements into account."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "PhpUnitUndefinedDataProviderInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
               {
                 "id": "PhpFieldAssignmentTypeMismatchInspection",
                 "shortDescription": {
@@ -5637,7 +5637,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5802,7 +5802,7 @@
                   {
                     "target": {
                       "id": "PHP/PHPDoc/Code style",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -6408,19 +6408,19 @@
                 ]
               },
               {
-                "id": "PhpDeprecationInspection",
+                "id": "MessDetectorValidationInspection",
                 "shortDescription": {
-                  "text": "Deprecated"
+                  "text": "PHP Mess Detector validation"
                 },
                 "fullDescription": {
-                  "text": "Reports the usages of deprecated entities. In most cases, such usages should be removed or replaced with other constructs.",
-                  "markdown": "Reports the usages of deprecated entities.\n\n\nIn most cases, such usages should be removed or replaced with other constructs."
+                  "text": "Reports coding style problems detected by PHP Mess Detector. The inspection requires PHP Mess Detector to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | Mess Detector. To learn more about installing PHP Mess Detector, see PHP Mess Detector installation (phpmd.org) for details. You can use a predefined set of rules or add your own by specifying valid ruleset.xml files. See the rules index (phpmd.org) and How to create a custom rule set (phpmd.org) for details.",
+                  "markdown": "Reports coding style problems detected by PHP Mess Detector.\n\n\nThe inspection requires PHP Mess Detector to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| Mess Detector](settings://settings.php.quality.tools?Mess%20Detector).\n\n\nTo learn more about installing PHP Mess Detector, see [PHP Mess Detector installation (phpmd.org)](https://phpmd.org/download/index.html) for details.\n\n\nYou can use a predefined set of rules or add your own by specifying valid *ruleset.xml* files. See the [rules index (phpmd.org)](https://phpmd.org/rules/index.html) and [How to create a custom rule set (phpmd.org)](https://phpmd.org/documentation/creating-a-ruleset.html) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
+                  "enabled": false,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpDeprecationInspection",
+                    "suppressToolId": "MessDetectorValidationInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -6428,8 +6428,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/General",
-                      "index": 6,
+                      "id": "PHP/Quality tools",
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -6441,19 +6441,19 @@
                 ]
               },
               {
-                "id": "MessDetectorValidationInspection",
+                "id": "PhpDeprecationInspection",
                 "shortDescription": {
-                  "text": "PHP Mess Detector validation"
+                  "text": "Deprecated"
                 },
                 "fullDescription": {
-                  "text": "Reports coding style problems detected by PHP Mess Detector. The inspection requires PHP Mess Detector to be properly installed and set up in the IDE under Settings | PHP | Quality Tools | Mess Detector. To learn more about installing PHP Mess Detector, see PHP Mess Detector installation (phpmd.org) for details. You can use a predefined set of rules or add your own by specifying valid ruleset.xml files. See the rules index (phpmd.org) and How to create a custom rule set (phpmd.org) for details.",
-                  "markdown": "Reports coding style problems detected by PHP Mess Detector.\n\n\nThe inspection requires PHP Mess Detector to be properly installed and set up in the IDE under\n[Settings \\| PHP \\| Quality Tools \\| Mess Detector](settings://settings.php.quality.tools?Mess%20Detector).\n\n\nTo learn more about installing PHP Mess Detector, see [PHP Mess Detector installation (phpmd.org)](https://phpmd.org/download/index.html) for details.\n\n\nYou can use a predefined set of rules or add your own by specifying valid *ruleset.xml* files. See the [rules index (phpmd.org)](https://phpmd.org/rules/index.html) and [How to create a custom rule set (phpmd.org)](https://phpmd.org/documentation/creating-a-ruleset.html) for details."
+                  "text": "Reports the usages of deprecated entities. In most cases, such usages should be removed or replaced with other constructs.",
+                  "markdown": "Reports the usages of deprecated entities.\n\n\nIn most cases, such usages should be removed or replaced with other constructs."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
+                  "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "MessDetectorValidationInspection",
+                    "suppressToolId": "PhpDeprecationInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -6461,8 +6461,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Quality tools",
-                      "index": 70,
+                      "id": "PHP/General",
+                      "index": 6,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -6737,39 +6737,6 @@
                   }
                 ]
               },
-              {
-                "id": "PhpConcatenationWithEmptyStringCanBeInlinedInspection",
-                "shortDescription": {
-                  "text": "Concatenation to empty string can be merged with assignment"
-                },
-                "fullDescription": {
-                  "text": "Reports the '.=' concatenation assignments performed right after assignment to an empty string literal. Such assignments can be merged together.",
-                  "markdown": "Reports the `.=` concatenation assignments performed right after assignment to an empty string literal. Such assignments can be merged together."
-                },
-                "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "note",
-                  "parameters": {
-                    "suppressToolId": "PhpConcatenationWithEmptyStringCanBeInlinedInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "PHP/Code smell",
-                      "index": 1,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
               {
                 "id": "PhpDisabledQualityToolComposerInspection",
                 "shortDescription": {
@@ -6804,19 +6771,19 @@
                 ]
               },
               {
-                "id": "PhpArrayIndexResetIsUnnecessaryInspection",
+                "id": "PhpConcatenationWithEmptyStringCanBeInlinedInspection",
                 "shortDescription": {
-                  "text": "Array internal pointer reset is unnecessary"
+                  "text": "Concatenation to empty string can be merged with assignment"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'reset($array)' calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed. See reset (php.net) for details.",
-                  "markdown": "Reports the `reset($array)` calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed.\n\n\nSee [reset (php.net)](https://www.php.net/manual/en/function.reset.php) for details."
+                  "text": "Reports the '.=' concatenation assignments performed right after assignment to an empty string literal. Such assignments can be merged together.",
+                  "markdown": "Reports the `.=` concatenation assignments performed right after assignment to an empty string literal. Such assignments can be merged together."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpArrayIndexResetIsUnnecessaryInspection",
+                    "suppressToolId": "PhpConcatenationWithEmptyStringCanBeInlinedInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -6902,6 +6869,39 @@
                   }
                 ]
               },
+              {
+                "id": "PhpArrayIndexResetIsUnnecessaryInspection",
+                "shortDescription": {
+                  "text": "Array internal pointer reset is unnecessary"
+                },
+                "fullDescription": {
+                  "text": "Reports the 'reset($array)' calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed. See reset (php.net) for details.",
+                  "markdown": "Reports the `reset($array)` calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed.\n\n\nSee [reset (php.net)](https://www.php.net/manual/en/function.reset.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayIndexResetIsUnnecessaryInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
               {
                 "id": "PhpApplyingEmptyIndexOperatorOnStringInspection",
                 "shortDescription": {
@@ -7089,7 +7089,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7188,7 +7188,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7386,7 +7386,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7464,19 +7464,19 @@
                 ]
               },
               {
-                "id": "PhpStrFunctionsInspection",
+                "id": "PhpDocRedundantThrowsInspection",
                 "shortDescription": {
-                  "text": "'str*()' calls can be replaced with PHP 8 'str_*()' calls"
+                  "text": "Redundant @throws tag(s)"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'strpos' and 'substr' functions calls that can be replaced with the 'str_*' functions calls (introduced in PHP 8.0). See str_contains (php.net) and str_starts_with and str_ends_with functions (php.net) for details.",
-                  "markdown": "Reports the `strpos` and `substr` functions calls that can be replaced with the `str_*` functions calls (introduced in PHP 8.0).\n\n\nSee [str_contains (php.net)](https://wiki.php.net/rfc/str_contains) and [str_starts_with and str_ends_with functions (php.net)](https://wiki.php.net/rfc/add_str_starts_with_and_ends_with_functions) for details."
+                  "text": "Reports '@throws' tags for exceptions that are not thrown by the function or method. The exception classes added to the Unchecked Exceptions list under Settings | PHP | Analysis are excluded from the inspection scope.",
+                  "markdown": "Reports `@throws` tags for exceptions that are not thrown by the function or method.\n\nThe exception classes added to the **Unchecked Exceptions** list under\n[Settings \\| PHP \\| Analysis](settings://reference.webide.settings.project.settings.php?Unchecked%20Exceptions)\nare excluded from the inspection scope."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpStrFunctionsInspection",
+                    "suppressToolId": "PhpDocRedundantThrowsInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -7484,8 +7484,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code style",
-                      "index": 3,
+                      "id": "PHP/PHPDoc",
+                      "index": 2,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7497,19 +7497,19 @@
                 ]
               },
               {
-                "id": "PhpDocRedundantThrowsInspection",
+                "id": "PhpStrFunctionsInspection",
                 "shortDescription": {
-                  "text": "Redundant @throws tag(s)"
+                  "text": "'str*()' calls can be replaced with PHP 8 'str_*()' calls"
                 },
                 "fullDescription": {
-                  "text": "Reports '@throws' tags for exceptions that are not thrown by the function or method. The exception classes added to the Unchecked Exceptions list under Settings | PHP | Analysis are excluded from the inspection scope.",
-                  "markdown": "Reports `@throws` tags for exceptions that are not thrown by the function or method.\n\nThe exception classes added to the **Unchecked Exceptions** list under\n[Settings \\| PHP \\| Analysis](settings://reference.webide.settings.project.settings.php?Unchecked%20Exceptions)\nare excluded from the inspection scope."
+                  "text": "Reports the 'strpos' and 'substr' functions calls that can be replaced with the 'str_*' functions calls (introduced in PHP 8.0). See str_contains (php.net) and str_starts_with and str_ends_with functions (php.net) for details.",
+                  "markdown": "Reports the `strpos` and `substr` functions calls that can be replaced with the `str_*` functions calls (introduced in PHP 8.0).\n\n\nSee [str_contains (php.net)](https://wiki.php.net/rfc/str_contains) and [str_starts_with and str_ends_with functions (php.net)](https://wiki.php.net/rfc/add_str_starts_with_and_ends_with_functions) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpDocRedundantThrowsInspection",
+                    "suppressToolId": "PhpStrFunctionsInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -7517,8 +7517,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/PHPDoc",
-                      "index": 2,
+                      "id": "PHP/Code style",
+                      "index": 3,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7617,7 +7617,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7914,7 +7914,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -8124,28 +8124,28 @@
                 ]
               },
               {
-                "id": "PhpRandArgumentsInReverseOrderInspection",
+                "id": "PhpAssignmentReplaceableWithPrefixExpressionInspection",
                 "shortDescription": {
-                  "text": "Misordered 'rand' function arguments"
+                  "text": "Assignment can be replaced with increment or decrement"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'rand($min, $max)' family function calls in which the 'max' argument is less than 'min'. For such functions as 'mt_rand' and 'random_int', this will result in a fatal error.",
-                  "markdown": "Reports the `rand($min, $max)` family function calls in which the `max` argument is less than `min`. For such functions as `mt_rand` and `random_int`, this will result in a fatal error."
+                  "text": "Reports the assignments that can be replaced with incrementing ('++') or decrementing ('--') operations.",
+                  "markdown": "Reports the assignments that can be replaced with incrementing (`++`) or decrementing (`--`) operations."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "error",
+                  "enabled": false,
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpRandArgumentsInReverseOrderInspection",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "PhpAssignmentReplaceableWithPrefixExpressionInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Probable bugs",
-                      "index": 9,
+                      "id": "PHP/Replaceable assignments",
+                      "index": 82,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -8157,28 +8157,28 @@
                 ]
               },
               {
-                "id": "PhpAssignmentReplaceableWithPrefixExpressionInspection",
+                "id": "PhpRandArgumentsInReverseOrderInspection",
                 "shortDescription": {
-                  "text": "Assignment can be replaced with increment or decrement"
+                  "text": "Misordered 'rand' function arguments"
                 },
                 "fullDescription": {
-                  "text": "Reports the assignments that can be replaced with incrementing ('++') or decrementing ('--') operations.",
-                  "markdown": "Reports the assignments that can be replaced with incrementing (`++`) or decrementing (`--`) operations."
+                  "text": "Reports the 'rand($min, $max)' family function calls in which the 'max' argument is less than 'min'. For such functions as 'mt_rand' and 'random_int', this will result in a fatal error.",
+                  "markdown": "Reports the `rand($min, $max)` family function calls in which the `max` argument is less than `min`. For such functions as `mt_rand` and `random_int`, this will result in a fatal error."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "note",
+                  "enabled": true,
+                  "level": "error",
                   "parameters": {
-                    "suppressToolId": "PhpAssignmentReplaceableWithPrefixExpressionInspection",
-                    "ideaSeverity": "INFORMATION",
-                    "qodanaSeverity": "Info"
+                    "suppressToolId": "PhpRandArgumentsInReverseOrderInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Replaceable assignments",
-                      "index": 82,
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -8574,7 +8574,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -8651,39 +8651,6 @@
                   }
                 ]
               },
-              {
-                "id": "PhpStatementWithoutBracesInspection",
-                "shortDescription": {
-                  "text": "Control statement body without braces"
-                },
-                "fullDescription": {
-                  "text": "Reports the control structures (such as loops or conditionals) whose bodies are not enclosed in braces. See Control structures (php.net) for details.",
-                  "markdown": "Reports the control structures (such as loops or conditionals) whose bodies are not enclosed in braces.\n\n\nSee [Control structures (php.net)](https://www.php.net/manual/en/language.control-structures.php) for details."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "note",
-                  "parameters": {
-                    "suppressToolId": "PhpStatementWithoutBracesInspection",
-                    "ideaSeverity": "INFORMATION",
-                    "qodanaSeverity": "Info"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "PHP/Code style",
-                      "index": 3,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
               {
                 "id": "PhpPregMatchRedundantClosureInspection",
                 "shortDescription": {
@@ -8717,6 +8684,39 @@
                   }
                 ]
               },
+              {
+                "id": "PhpStatementWithoutBracesInspection",
+                "shortDescription": {
+                  "text": "Control statement body without braces"
+                },
+                "fullDescription": {
+                  "text": "Reports the control structures (such as loops or conditionals) whose bodies are not enclosed in braces. See Control structures (php.net) for details.",
+                  "markdown": "Reports the control structures (such as loops or conditionals) whose bodies are not enclosed in braces.\n\n\nSee [Control structures (php.net)](https://www.php.net/manual/en/language.control-structures.php) for details."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpStatementWithoutBracesInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code style",
+                      "index": 3,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
               {
                 "id": "PhpShortOpenEchoTagInspection",
                 "shortDescription": {
@@ -9168,7 +9168,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9300,7 +9300,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9510,28 +9510,28 @@
                 ]
               },
               {
-                "id": "PhpIncorrectMagicMethodSignatureInspection",
+                "id": "PhpUnitMissingTargetForTestInspection",
                 "shortDescription": {
-                  "text": "Incorrect magic method signature"
+                  "text": "Missing target element for PHPUnit test"
                 },
                 "fullDescription": {
-                  "text": "Reports incompatible magic methods signatures. See RFC: Ensure correct signatures of magic methods (php.net) for details.",
-                  "markdown": "Reports incompatible magic methods signatures.\n\n\nSee [RFC: Ensure correct signatures of magic methods (php.net)](https://wiki.php.net/rfc/magic-methods-signature) for details."
+                  "text": "Reports the test classes and methods, for which no corresponding production classes or methods were found.",
+                  "markdown": "Reports the test classes and methods, for which no corresponding production classes or methods were found."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "error",
+                  "enabled": false,
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpIncorrectMagicMethodSignatureInspection",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "PhpUnitMissingTargetForTestInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/General",
-                      "index": 6,
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9543,28 +9543,28 @@
                 ]
               },
               {
-                "id": "PhpUnitMissingTargetForTestInspection",
+                "id": "PhpIncorrectMagicMethodSignatureInspection",
                 "shortDescription": {
-                  "text": "Missing target element for PHPUnit test"
+                  "text": "Incorrect magic method signature"
                 },
                 "fullDescription": {
-                  "text": "Reports the test classes and methods, for which no corresponding production classes or methods were found.",
-                  "markdown": "Reports the test classes and methods, for which no corresponding production classes or methods were found."
+                  "text": "Reports incompatible magic methods signatures. See RFC: Ensure correct signatures of magic methods (php.net) for details.",
+                  "markdown": "Reports incompatible magic methods signatures.\n\n\nSee [RFC: Ensure correct signatures of magic methods (php.net)](https://wiki.php.net/rfc/magic-methods-signature) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "note",
+                  "enabled": true,
+                  "level": "error",
                   "parameters": {
-                    "suppressToolId": "PhpUnitMissingTargetForTestInspection",
-                    "ideaSeverity": "INFORMATION",
-                    "qodanaSeverity": "Info"
+                    "suppressToolId": "PhpIncorrectMagicMethodSignatureInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/PHPUnit",
-                      "index": 20,
+                      "id": "PHP/General",
+                      "index": 6,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9795,7 +9795,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9828,7 +9828,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10521,7 +10521,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10719,7 +10719,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10830,19 +10830,19 @@
                 ]
               },
               {
-                "id": "PhpRegExpRedundantModifierInspection",
+                "id": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
                 "shortDescription": {
-                  "text": "Redundant modifier"
+                  "text": "Attribute can be added to overriding member "
                 },
                 "fullDescription": {
-                  "text": "Reports the 'i' (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed.",
-                  "markdown": "Reports the `i` (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed."
+                  "text": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters. See Attributes (php.net) for details.",
+                  "markdown": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpRegExpRedundantModifierInspection",
+                    "suppressToolId": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -10850,8 +10850,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Regular expressions",
-                      "index": 68,
+                      "id": "PHP/Attributes",
+                      "index": 45,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10863,19 +10863,19 @@
                 ]
               },
               {
-                "id": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
+                "id": "PhpRegExpRedundantModifierInspection",
                 "shortDescription": {
-                  "text": "Attribute can be added to overriding member "
+                  "text": "Redundant modifier"
                 },
                 "fullDescription": {
-                  "text": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters. See Attributes (php.net) for details.",
-                  "markdown": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                  "text": "Reports the 'i' (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed.",
+                  "markdown": "Reports the `i` (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
+                    "suppressToolId": "PhpRegExpRedundantModifierInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -10883,8 +10883,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Attributes",
-                      "index": 45,
+                      "id": "PHP/Regular expressions",
+                      "index": 68,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -11049,7 +11049,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -11841,7 +11841,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -12039,7 +12039,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -12105,7 +12105,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15168,7 +15168,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15432,7 +15432,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15531,7 +15531,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15564,7 +15564,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15630,7 +15630,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15696,7 +15696,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15828,7 +15828,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15993,7 +15993,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16092,7 +16092,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16455,7 +16455,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16587,7 +16587,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16719,7 +16719,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16863,19 +16863,19 @@
                 ]
               },
               {
-                "id": "RegExpRepeatedSpace",
+                "id": "RegExpDuplicateAlternationBranch",
                 "shortDescription": {
-                  "text": "Consecutive spaces"
+                  "text": "Duplicate branch in alternation"
                 },
                 "fullDescription": {
-                  "text": "Reports multiple consecutive spaces in a RegExp. Because spaces are not visible by default, it can be hard to see how many spaces are required. The RegExp can be made more clear by replacing the consecutive spaces with a single space and a counted quantifier. Example: '(     )' After the quick-fix is applied: '( {5})' New in 2017.1",
-                  "markdown": "Reports multiple consecutive spaces in a RegExp. Because spaces are not visible by default, it can be hard to see how many spaces are required. The RegExp can be made more clear by replacing the consecutive spaces with a single space and a counted quantifier.\n\n**Example:**\n\n\n      (     )\n\nAfter the quick-fix is applied:\n\n\n      ( {5})\n\n\nNew in 2017.1"
+                  "text": "Reports duplicate branches in a RegExp alternation. Duplicate branches slow down matching and obscure the intent of the expression. Example: '(alpha|bravo|charlie|alpha)' After the quick-fix is applied: '(alpha|bravo|charlie)' New in 2017.1",
+                  "markdown": "Reports duplicate branches in a RegExp alternation. Duplicate branches slow down matching and obscure the intent of the expression.\n\n**Example:**\n\n\n      (alpha|bravo|charlie|alpha)\n\nAfter the quick-fix is applied:\n\n\n      (alpha|bravo|charlie)\n\nNew in 2017.1"
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "RegExpRepeatedSpace",
+                    "suppressToolId": "RegExpDuplicateAlternationBranch",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -16896,19 +16896,19 @@
                 ]
               },
               {
-                "id": "RegExpDuplicateAlternationBranch",
+                "id": "RegExpRepeatedSpace",
                 "shortDescription": {
-                  "text": "Duplicate branch in alternation"
+                  "text": "Consecutive spaces"
                 },
                 "fullDescription": {
-                  "text": "Reports duplicate branches in a RegExp alternation. Duplicate branches slow down matching and obscure the intent of the expression. Example: '(alpha|bravo|charlie|alpha)' After the quick-fix is applied: '(alpha|bravo|charlie)' New in 2017.1",
-                  "markdown": "Reports duplicate branches in a RegExp alternation. Duplicate branches slow down matching and obscure the intent of the expression.\n\n**Example:**\n\n\n      (alpha|bravo|charlie|alpha)\n\nAfter the quick-fix is applied:\n\n\n      (alpha|bravo|charlie)\n\nNew in 2017.1"
+                  "text": "Reports multiple consecutive spaces in a RegExp. Because spaces are not visible by default, it can be hard to see how many spaces are required. The RegExp can be made more clear by replacing the consecutive spaces with a single space and a counted quantifier. Example: '(     )' After the quick-fix is applied: '( {5})' New in 2017.1",
+                  "markdown": "Reports multiple consecutive spaces in a RegExp. Because spaces are not visible by default, it can be hard to see how many spaces are required. The RegExp can be made more clear by replacing the consecutive spaces with a single space and a counted quantifier.\n\n**Example:**\n\n\n      (     )\n\nAfter the quick-fix is applied:\n\n\n      ( {5})\n\n\nNew in 2017.1"
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "RegExpDuplicateAlternationBranch",
+                    "suppressToolId": "RegExpRepeatedSpace",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -16969,6 +16969,249 @@
             ],
             "isComprehensive": false
           },
+          {
+            "name": "gherkin",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "GherkinScenarioToScenarioOutline",
+                "shortDescription": {
+                  "text": "Scenario with Examples section"
+                },
+                "fullDescription": {
+                  "text": "Reports Gherkin scenarios that contain an 'Examples' section. Use the quick-fix to convert 'Scenario' to 'Scenario Outline'.",
+                  "markdown": "Reports Gherkin scenarios that contain an `Examples` section.\n\nUse the quick-fix to convert `Scenario` to `Scenario Outline`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinScenarioToScenarioOutline",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberTableInspection",
+                "shortDescription": {
+                  "text": "Unused or missing columns in Cucumber tables"
+                },
+                "fullDescription": {
+                  "text": "Reports tables in 'Examples' sections in Cucumber .feature files with unused or missing columns.",
+                  "markdown": "Reports tables in `Examples` sections in Cucumber .feature files with unused or missing columns."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CucumberTableInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "GherkinBrokenTableInspection",
+                "shortDescription": {
+                  "text": "Gherkin table is broken"
+                },
+                "fullDescription": {
+                  "text": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header.",
+                  "markdown": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinBrokenTableInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "GherkinMisplacedBackground",
+                "shortDescription": {
+                  "text": "Misplaced background section"
+                },
+                "fullDescription": {
+                  "text": "Reports 'Background' sections that are located incorrectly. The 'Background' section must be located before the 'Scenario' section.",
+                  "markdown": "Reports `Background` sections that are located incorrectly. The `Background` section must be located before the `Scenario` section."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinMisplacedBackground",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberMissedExamples",
+                "shortDescription": {
+                  "text": "Missing examples section"
+                },
+                "fullDescription": {
+                  "text": "Reports scenario outlines in Cucumber .feature files that do not have the 'Examples' section. Use the quick-fix to automatically create the 'Examples' section with a pre-filled table header.",
+                  "markdown": "Reports scenario outlines in Cucumber .feature files that do not have the `Examples` section.\n\nUse the quick-fix to automatically create the `Examples` section with a pre-filled table header."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CucumberMissedExamples",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberUndefinedStep",
+                "shortDescription": {
+                  "text": "Undefined step"
+                },
+                "fullDescription": {
+                  "text": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions. Use the quick-fix to automatically create a new step definition.",
+                  "markdown": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions.\n\nUse the quick-fix to automatically create a new step definition."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CucumberUndefinedStep",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberExamplesColon",
+                "shortDescription": {
+                  "text": "Missing ':' after examples keyword"
+                },
+                "fullDescription": {
+                  "text": "Reports 'Examples' sections in Cucumber .feature files if they do not have ':' after the 'Examples' keyword.",
+                  "markdown": "Reports `Examples` sections in Cucumber .feature files if they do not have ':' after the `Examples` keyword."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CucumberExamplesColon",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
           {
             "name": "JavaScript",
             "version": "232.9881",
@@ -16995,7 +17238,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Unused symbols",
-                      "index": 15,
+                      "index": 16,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17160,7 +17403,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17424,7 +17667,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17655,7 +17898,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17688,7 +17931,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17820,7 +18063,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Unused symbols",
-                      "index": 15,
+                      "index": 16,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17853,7 +18096,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18030,28 +18273,28 @@
                 ]
               },
               {
-                "id": "TextLabelInSwitchStatementJS",
+                "id": "ES6PossiblyAsyncFunction",
                 "shortDescription": {
-                  "text": "Text label in 'switch' statement"
+                  "text": "'await' in non-async function"
                 },
                 "fullDescription": {
-                  "text": "Reports a labeled statement inside a 'switch' statement, which often results from a typo. Example: 'switch(x)\n    {\n        case 1:\n        case2:   //typo!\n        case 3:\n            break;\n    }'",
-                  "markdown": "Reports a labeled statement inside a `switch` statement, which often results from a typo.\n\nExample:\n\n\n        switch(x)\n        {\n            case 1:\n            case2:   //typo!\n            case 3:\n                break;\n        }\n"
+                  "text": "Reports a usage of 'await' in a function that was possibly intended to be async but is actually missing the 'async' modifier. Although 'await' can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made 'async'.",
+                  "markdown": "Reports a usage of `await` in a function that was possibly intended to be async but is actually missing the `async` modifier. Although `await` can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made `async`."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "TextLabelInSwitchStatementJS",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "ES6PossiblyAsyncFunction",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Switch statement issues",
-                      "index": 53,
+                      "id": "JavaScript and TypeScript/Async code and promises",
+                      "index": 55,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18063,28 +18306,28 @@
                 ]
               },
               {
-                "id": "ES6PossiblyAsyncFunction",
+                "id": "TextLabelInSwitchStatementJS",
                 "shortDescription": {
-                  "text": "'await' in non-async function"
+                  "text": "Text label in 'switch' statement"
                 },
                 "fullDescription": {
-                  "text": "Reports a usage of 'await' in a function that was possibly intended to be async but is actually missing the 'async' modifier. Although 'await' can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made 'async'.",
-                  "markdown": "Reports a usage of `await` in a function that was possibly intended to be async but is actually missing the `async` modifier. Although `await` can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made `async`."
+                  "text": "Reports a labeled statement inside a 'switch' statement, which often results from a typo. Example: 'switch(x)\n    {\n        case 1:\n        case2:   //typo!\n        case 3:\n            break;\n    }'",
+                  "markdown": "Reports a labeled statement inside a `switch` statement, which often results from a typo.\n\nExample:\n\n\n        switch(x)\n        {\n            case 1:\n            case2:   //typo!\n            case 3:\n                break;\n        }\n"
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "ES6PossiblyAsyncFunction",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "TextLabelInSwitchStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Async code and promises",
-                      "index": 55,
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18216,7 +18459,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18414,7 +18657,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18525,19 +18768,19 @@
                 ]
               },
               {
-                "id": "EmptyTryBlockJS",
+                "id": "ES6ClassMemberInitializationOrder",
                 "shortDescription": {
-                  "text": "Empty 'try' block"
+                  "text": "Use of possibly unassigned property in a static initializer"
                 },
                 "fullDescription": {
-                  "text": "Reports an empty 'try' block, which usually indicates an error.",
-                  "markdown": "Reports an empty `try` block, which usually indicates an error."
+                  "text": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet. Initialization of class members happens consequently for fields, so a field cannot reference another field that is declared later.",
+                  "markdown": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet.   \n\nInitialization of class members happens consequently for fields, so a field cannot reference another field that is declared later."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "EmptyTryBlockJS",
+                    "suppressToolId": "ES6ClassMemberInitializationOrder",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -18545,8 +18788,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Try statement issues",
-                      "index": 35,
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18558,19 +18801,19 @@
                 ]
               },
               {
-                "id": "ES6ClassMemberInitializationOrder",
+                "id": "EmptyTryBlockJS",
                 "shortDescription": {
-                  "text": "Use of possibly unassigned property in a static initializer"
+                  "text": "Empty 'try' block"
                 },
                 "fullDescription": {
-                  "text": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet. Initialization of class members happens consequently for fields, so a field cannot reference another field that is declared later.",
-                  "markdown": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet.   \n\nInitialization of class members happens consequently for fields, so a field cannot reference another field that is declared later."
+                  "text": "Reports an empty 'try' block, which usually indicates an error.",
+                  "markdown": "Reports an empty `try` block, which usually indicates an error."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "ES6ClassMemberInitializationOrder",
+                    "suppressToolId": "EmptyTryBlockJS",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -18578,8 +18821,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/General",
-                      "index": 24,
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18711,7 +18954,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18777,7 +19020,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18843,7 +19086,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18876,7 +19119,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18909,7 +19152,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19008,7 +19251,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19272,7 +19515,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19338,7 +19581,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19371,7 +19614,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19437,7 +19680,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19602,7 +19845,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19635,7 +19878,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19800,7 +20043,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19965,7 +20208,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20043,19 +20286,19 @@
                 ]
               },
               {
-                "id": "TypeScriptDuplicateUnionOrIntersectionType",
+                "id": "TrivialConditionalJS",
                 "shortDescription": {
-                  "text": "Duplicate union or intersection type component"
+                  "text": "Redundant conditional expression"
                 },
                 "fullDescription": {
-                  "text": "Reports a duplicate type inside a union or intersection.",
-                  "markdown": "Reports a duplicate type inside a union or intersection."
+                  "text": "Reports a conditional expression of the form 'condition ? true : false\ncondition ? false : true' These expressions may be safely converted to 'condition\n!condition'",
+                  "markdown": "Reports a conditional expression of the form\n\n\n    condition ? true : false\n    condition ? false : true\n\n\nThese expressions may be safely converted to\n\n\n    condition\n    !condition\n"
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "TypeScriptDuplicateUnionOrIntersectionType",
+                    "suppressToolId": "RedundantConditionalExpressionJS",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20063,8 +20306,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20076,19 +20319,19 @@
                 ]
               },
               {
-                "id": "TrivialConditionalJS",
+                "id": "TypeScriptDuplicateUnionOrIntersectionType",
                 "shortDescription": {
-                  "text": "Redundant conditional expression"
+                  "text": "Duplicate union or intersection type component"
                 },
                 "fullDescription": {
-                  "text": "Reports a conditional expression of the form 'condition ? true : false\ncondition ? false : true' These expressions may be safely converted to 'condition\n!condition'",
-                  "markdown": "Reports a conditional expression of the form\n\n\n    condition ? true : false\n    condition ? false : true\n\n\nThese expressions may be safely converted to\n\n\n    condition\n    !condition\n"
+                  "text": "Reports a duplicate type inside a union or intersection.",
+                  "markdown": "Reports a duplicate type inside a union or intersection."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "RedundantConditionalExpressionJS",
+                    "suppressToolId": "TypeScriptDuplicateUnionOrIntersectionType",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20096,8 +20339,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20262,7 +20505,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20394,7 +20637,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20439,19 +20682,19 @@
                 ]
               },
               {
-                "id": "NonBlockStatementBodyJS",
+                "id": "JSValidateJSDoc",
                 "shortDescription": {
-                  "text": "Statement body without braces"
+                  "text": "Syntax errors and unresolved references in JSDoc"
                 },
                 "fullDescription": {
-                  "text": "Reports a 'if', 'while', 'for', or 'with' statements whose body is not a block statement. Using code block in statement bodies is usually safer for downstream maintenance.",
-                  "markdown": "Reports a `if`, `while`, `for`, or `with` statements whose body is not a block statement. Using code block in statement bodies is usually safer for downstream maintenance."
+                  "text": "Reports a syntax discrepancy in a documentation comment.",
+                  "markdown": "Reports a syntax discrepancy in a documentation comment."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "NonBlockStatementBodyJS",
+                    "suppressToolId": "JSValidateJSDoc",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20459,8 +20702,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Code style issues",
-                      "index": 47,
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20493,7 +20736,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20505,19 +20748,19 @@
                 ]
               },
               {
-                "id": "JSValidateJSDoc",
+                "id": "NonBlockStatementBodyJS",
                 "shortDescription": {
-                  "text": "Syntax errors and unresolved references in JSDoc"
+                  "text": "Statement body without braces"
                 },
                 "fullDescription": {
-                  "text": "Reports a syntax discrepancy in a documentation comment.",
-                  "markdown": "Reports a syntax discrepancy in a documentation comment."
+                  "text": "Reports a 'if', 'while', 'for', or 'with' statements whose body is not a block statement. Using code block in statement bodies is usually safer for downstream maintenance.",
+                  "markdown": "Reports a `if`, `while`, `for`, or `with` statements whose body is not a block statement. Using code block in statement bodies is usually safer for downstream maintenance."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "JSValidateJSDoc",
+                    "suppressToolId": "NonBlockStatementBodyJS",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20525,8 +20768,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/General",
-                      "index": 24,
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20691,7 +20934,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20724,7 +20967,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20790,7 +21033,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20889,7 +21132,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20922,7 +21165,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21153,7 +21396,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21186,7 +21429,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21285,7 +21528,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21318,7 +21561,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21450,7 +21693,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21549,7 +21792,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21594,28 +21837,28 @@
                 ]
               },
               {
-                "id": "UnusedCatchParameterJS",
+                "id": "NpmUsedModulesInstalled",
                 "shortDescription": {
-                  "text": "Unused 'catch' parameter"
+                  "text": "Missing module dependency"
                 },
                 "fullDescription": {
-                  "text": "Reports a 'catch' parameter that is not used in the corresponding block. The 'catch' parameters named 'ignore' or 'ignored' are ignored. Use the checkbox below to disable this inspection for 'catch' blocks with comments.",
-                  "markdown": "Reports a `catch` parameter that is not used in the corresponding block. The `catch` parameters named `ignore` or `ignored` are ignored.\n\n\nUse the checkbox below to disable this inspection for `catch`\nblocks with comments."
+                  "text": "Reports a module from a 'require()' call or an 'import' statement that is not installed or is not listed in package.json dependencies. Suggests installing the module and/or including it into package.json. For 'require()' calls, works only in the files from the scope of Node.js Core JavaScript library.",
+                  "markdown": "Reports a module from a `require()` call or an `import` statement that is not installed or is not listed in package.json dependencies.\n\nSuggests installing the module and/or including it into package.json.\n\nFor `require()` calls, works only in the files from the scope of *Node.js Core* JavaScript library."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "UnusedCatchParameterJS",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "NpmUsedModulesInstalled",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Try statement issues",
-                      "index": 35,
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21627,28 +21870,28 @@
                 ]
               },
               {
-                "id": "NpmUsedModulesInstalled",
+                "id": "UnusedCatchParameterJS",
                 "shortDescription": {
-                  "text": "Missing module dependency"
+                  "text": "Unused 'catch' parameter"
                 },
                 "fullDescription": {
-                  "text": "Reports a module from a 'require()' call or an 'import' statement that is not installed or is not listed in package.json dependencies. Suggests installing the module and/or including it into package.json. For 'require()' calls, works only in the files from the scope of Node.js Core JavaScript library.",
-                  "markdown": "Reports a module from a `require()` call or an `import` statement that is not installed or is not listed in package.json dependencies.\n\nSuggests installing the module and/or including it into package.json.\n\nFor `require()` calls, works only in the files from the scope of *Node.js Core* JavaScript library."
+                  "text": "Reports a 'catch' parameter that is not used in the corresponding block. The 'catch' parameters named 'ignore' or 'ignored' are ignored. Use the checkbox below to disable this inspection for 'catch' blocks with comments.",
+                  "markdown": "Reports a `catch` parameter that is not used in the corresponding block. The `catch` parameters named `ignore` or `ignored` are ignored.\n\n\nUse the checkbox below to disable this inspection for `catch`\nblocks with comments."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "NpmUsedModulesInstalled",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "UnusedCatchParameterJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Imports and dependencies",
-                      "index": 59,
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21813,7 +22056,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21846,7 +22089,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22077,7 +22320,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22176,7 +22419,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22440,7 +22683,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22506,7 +22749,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22539,7 +22782,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22605,7 +22848,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22617,28 +22860,28 @@
                 ]
               },
               {
-                "id": "JSUnfilteredForInLoop",
+                "id": "JSIncompatibleTypesComparison",
                 "shortDescription": {
-                  "text": "Unfiltered for..in loop"
+                  "text": "Comparison of expressions having incompatible types"
                 },
                 "fullDescription": {
-                  "text": "Reports unfiltered 'for-in' loops. The use of this construct results in processing not only own properties of an object but properties from its prototype as well. It may be unexpected in some specific cases, for example, in utility methods that copy or modify all properties or when 'Object''s prototype may be incorrectly modified. For example, the following code will print 42 and myMethod: 'Object.prototype.myMethod = function myMethod() {};\nlet a = { foo: 42 };\nfor (let i in a) {\n  console.log(a[i]);\n}' Suggests replacing the whole loop with a 'Object.keys()' method or adding a 'hasOwnProperty()' check. After applying the quick-fix the code looks as follows: 'for (let i in a) {\n  if (a.hasOwnProperty(i)) {\n    console.log(a[i]);\n  }\n}'",
-                  "markdown": "Reports unfiltered `for-in` loops.   \n\nThe use of this construct results in processing not only own properties of an object but properties from its prototype as well. It may be unexpected in some specific cases, for example, in utility methods that copy or modify all properties or when `Object`'s prototype may be incorrectly modified. For example, the following code will print **42** and **myMethod** :   \n\n\n    Object.prototype.myMethod = function myMethod() {};\n    let a = { foo: 42 };\n    for (let i in a) {\n      console.log(a[i]);\n    }\n\nSuggests replacing the whole loop with a `Object.keys()` method or adding a `hasOwnProperty()` check. After applying the quick-fix the code looks as follows:\n\n\n    for (let i in a) {\n      if (a.hasOwnProperty(i)) {\n        console.log(a[i]);\n      }\n    }\n"
+                  "text": "Reports a comparison with operands of incompatible types or an operand with a type without possible common values.",
+                  "markdown": "Reports a comparison with operands of incompatible types or an operand with a type without possible common values."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "JSUnfilteredForInLoop",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "JSIncompatibleTypesComparison",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/General",
-                      "index": 24,
+                      "id": "JavaScript and TypeScript/Probable bugs",
+                      "index": 44,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22683,28 +22926,28 @@
                 ]
               },
               {
-                "id": "JSIncompatibleTypesComparison",
+                "id": "JSUnfilteredForInLoop",
                 "shortDescription": {
-                  "text": "Comparison of expressions having incompatible types"
+                  "text": "Unfiltered for..in loop"
                 },
                 "fullDescription": {
-                  "text": "Reports a comparison with operands of incompatible types or an operand with a type without possible common values.",
-                  "markdown": "Reports a comparison with operands of incompatible types or an operand with a type without possible common values."
+                  "text": "Reports unfiltered 'for-in' loops. The use of this construct results in processing not only own properties of an object but properties from its prototype as well. It may be unexpected in some specific cases, for example, in utility methods that copy or modify all properties or when 'Object''s prototype may be incorrectly modified. For example, the following code will print 42 and myMethod: 'Object.prototype.myMethod = function myMethod() {};\nlet a = { foo: 42 };\nfor (let i in a) {\n  console.log(a[i]);\n}' Suggests replacing the whole loop with a 'Object.keys()' method or adding a 'hasOwnProperty()' check. After applying the quick-fix the code looks as follows: 'for (let i in a) {\n  if (a.hasOwnProperty(i)) {\n    console.log(a[i]);\n  }\n}'",
+                  "markdown": "Reports unfiltered `for-in` loops.   \n\nThe use of this construct results in processing not only own properties of an object but properties from its prototype as well. It may be unexpected in some specific cases, for example, in utility methods that copy or modify all properties or when `Object`'s prototype may be incorrectly modified. For example, the following code will print **42** and **myMethod** :   \n\n\n    Object.prototype.myMethod = function myMethod() {};\n    let a = { foo: 42 };\n    for (let i in a) {\n      console.log(a[i]);\n    }\n\nSuggests replacing the whole loop with a `Object.keys()` method or adding a `hasOwnProperty()` check. After applying the quick-fix the code looks as follows:\n\n\n    for (let i in a) {\n      if (a.hasOwnProperty(i)) {\n        console.log(a[i]);\n      }\n    }\n"
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "JSIncompatibleTypesComparison",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "JSUnfilteredForInLoop",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Probable bugs",
-                      "index": 44,
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22737,7 +22980,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22803,7 +23046,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22902,7 +23145,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23166,7 +23409,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23199,7 +23442,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23310,28 +23553,28 @@
                 ]
               },
               {
-                "id": "JSCheckFunctionSignatures",
+                "id": "ConstantOnLHSOfComparisonJS",
                 "shortDescription": {
-                  "text": "Signature mismatch"
+                  "text": "Constant on left side of comparison"
                 },
                 "fullDescription": {
-                  "text": "Reports a JavaScript call expression where the arguments do not match the signature of the referenced function, including the types of arguments and their number. Also, reports if the overloading function doesn't match the overloaded one in terms of parameters and return types. TypeScript code is ignored.",
-                  "markdown": "Reports a JavaScript call expression where the arguments do not match the signature of the referenced function, including the types of arguments and their number. Also, reports if the overloading function doesn't match the overloaded one in terms of parameters and return types.\n\nTypeScript code is ignored."
+                  "text": "Reports a comparison operation with a constant value in the left-hand side. According to coding conventions, constants should be in the right-hand side of comparisons.",
+                  "markdown": "Reports a comparison operation with a constant value in the left-hand side. According to coding conventions, constants should be in the right-hand side of comparisons."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "JSCheckFunctionSignatures",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "ConstantOnLefSideOfComparisonJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/General",
-                      "index": 24,
+                      "id": "JavaScript and TypeScript/Code style issues",
+                      "index": 47,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23343,28 +23586,28 @@
                 ]
               },
               {
-                "id": "ConstantOnLHSOfComparisonJS",
+                "id": "JSCheckFunctionSignatures",
                 "shortDescription": {
-                  "text": "Constant on left side of comparison"
+                  "text": "Signature mismatch"
                 },
                 "fullDescription": {
-                  "text": "Reports a comparison operation with a constant value in the left-hand side. According to coding conventions, constants should be in the right-hand side of comparisons.",
-                  "markdown": "Reports a comparison operation with a constant value in the left-hand side. According to coding conventions, constants should be in the right-hand side of comparisons."
+                  "text": "Reports a JavaScript call expression where the arguments do not match the signature of the referenced function, including the types of arguments and their number. Also, reports if the overloading function doesn't match the overloaded one in terms of parameters and return types. TypeScript code is ignored.",
+                  "markdown": "Reports a JavaScript call expression where the arguments do not match the signature of the referenced function, including the types of arguments and their number. Also, reports if the overloading function doesn't match the overloaded one in terms of parameters and return types.\n\nTypeScript code is ignored."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "ConstantOnLefSideOfComparisonJS",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "JSCheckFunctionSignatures",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Code style issues",
-                      "index": 47,
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23496,7 +23739,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23727,7 +23970,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 52,
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23892,7 +24135,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23991,7 +24234,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Unused symbols",
-                      "index": 15,
+                      "index": 16,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24011,23 +24254,23 @@
             "isComprehensive": false
           },
           {
-            "name": "gherkin",
+            "name": "org.editorconfig.editorconfigjetbrains",
             "version": "232.9881",
             "rules": [
               {
-                "id": "GherkinScenarioToScenarioOutline",
+                "id": "EditorConfigRootDeclarationUniqueness",
                 "shortDescription": {
-                  "text": "Scenario with Examples section"
+                  "text": "Extra top-level declaration"
                 },
                 "fullDescription": {
-                  "text": "Reports Gherkin scenarios that contain an 'Examples' section. Use the quick-fix to convert 'Scenario' to 'Scenario Outline'.",
-                  "markdown": "Reports Gherkin scenarios that contain an `Examples` section.\n\nUse the quick-fix to convert `Scenario` to `Scenario Outline`."
+                  "text": "Reports multiple top-level declarations. There can be only one optional “root=true” top-level declaration in the EditorConfig file. Using multiple top-level declarations is not allowed.",
+                  "markdown": "Reports multiple top-level declarations. There can be only one optional \"root=true\" top-level declaration in the EditorConfig file. Using multiple top-level declarations is not allowed."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "error",
                   "parameters": {
-                    "suppressToolId": "GherkinScenarioToScenarioOutline",
+                    "suppressToolId": "EditorConfigRootDeclarationUniqueness",
                     "ideaSeverity": "ERROR",
                     "qodanaSeverity": "Critical"
                   }
@@ -24035,8 +24278,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "Cucumber",
-                      "index": 16,
+                      "id": "EditorConfig",
+                      "index": 19,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24048,28 +24291,28 @@
                 ]
               },
               {
-                "id": "CucumberTableInspection",
+                "id": "EditorConfigNumerousWildcards",
                 "shortDescription": {
-                  "text": "Unused or missing columns in Cucumber tables"
+                  "text": "Too many wildcards"
                 },
                 "fullDescription": {
-                  "text": "Reports tables in 'Examples' sections in Cucumber .feature files with unused or missing columns.",
-                  "markdown": "Reports tables in `Examples` sections in Cucumber .feature files with unused or missing columns."
+                  "text": "Reports sections that contain too many wildcards. Using a lot of wildcards may lead to performance issues.",
+                  "markdown": "Reports sections that contain too many wildcards. Using a lot of wildcards may lead to performance issues."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "CucumberTableInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "EditorConfigNumerousWildcards",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "Cucumber",
-                      "index": 16,
+                      "id": "EditorConfig",
+                      "index": 19,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24081,28 +24324,28 @@
                 ]
               },
               {
-                "id": "GherkinBrokenTableInspection",
+                "id": "EditorConfigKeyCorrectness",
                 "shortDescription": {
-                  "text": "Gherkin table is broken"
+                  "text": "Unknown property"
                 },
                 "fullDescription": {
-                  "text": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header.",
-                  "markdown": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header."
+                  "text": "Reports properties that are not supported by the IDE. Note: some “ij” domain properties may require specific language plugins.",
+                  "markdown": "Reports properties that are not supported by the IDE. Note: some \"ij\" domain properties may require specific language plugins."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "error",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "GherkinBrokenTableInspection",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "EditorConfigKeyCorrectness",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "Cucumber",
-                      "index": 16,
+                      "id": "EditorConfig",
+                      "index": 19,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24114,28 +24357,28 @@
                 ]
               },
               {
-                "id": "GherkinMisplacedBackground",
+                "id": "EditorConfigEncoding",
                 "shortDescription": {
-                  "text": "Misplaced background section"
+                  "text": "File encoding doesn't match EditorConfig charset"
                 },
                 "fullDescription": {
-                  "text": "Reports 'Background' sections that are located incorrectly. The 'Background' section must be located before the 'Scenario' section.",
-                  "markdown": "Reports `Background` sections that are located incorrectly. The `Background` section must be located before the `Scenario` section."
+                  "text": "Checks that current file encoding matches the encoding defined in \"charset\" property of .editorconfig file.",
+                  "markdown": "Checks that current file encoding matches the encoding defined in \"charset\" property of .editorconfig file."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "error",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "GherkinMisplacedBackground",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "EditorConfigEncoding",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "Cucumber",
-                      "index": 16,
+                      "id": "EditorConfig",
+                      "index": 19,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24147,19 +24390,19 @@
                 ]
               },
               {
-                "id": "CucumberMissedExamples",
+                "id": "EditorConfigRootDeclarationCorrectness",
                 "shortDescription": {
-                  "text": "Missing examples section"
+                  "text": "Unexpected top-level declaration"
                 },
                 "fullDescription": {
-                  "text": "Reports scenario outlines in Cucumber .feature files that do not have the 'Examples' section. Use the quick-fix to automatically create the 'Examples' section with a pre-filled table header.",
-                  "markdown": "Reports scenario outlines in Cucumber .feature files that do not have the `Examples` section.\n\nUse the quick-fix to automatically create the `Examples` section with a pre-filled table header."
+                  "text": "Reports unexpected top-level declarations. Top-level declarations other than “root=true” are not allowed in the EditorConfig file.",
+                  "markdown": "Reports unexpected top-level declarations. Top-level declarations other than \"root=true\" are not allowed in the EditorConfig file."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "error",
                   "parameters": {
-                    "suppressToolId": "CucumberMissedExamples",
+                    "suppressToolId": "EditorConfigRootDeclarationCorrectness",
                     "ideaSeverity": "ERROR",
                     "qodanaSeverity": "Critical"
                   }
@@ -24167,8 +24410,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "Cucumber",
-                      "index": 16,
+                      "id": "EditorConfig",
+                      "index": 19,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24180,19 +24423,19 @@
                 ]
               },
               {
-                "id": "CucumberUndefinedStep",
+                "id": "EditorConfigPatternRedundancy",
                 "shortDescription": {
-                  "text": "Undefined step"
+                  "text": "Duplicate or redundant pattern"
                 },
                 "fullDescription": {
-                  "text": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions. Use the quick-fix to automatically create a new step definition.",
-                  "markdown": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions.\n\nUse the quick-fix to automatically create a new step definition."
+                  "text": "Reports file patterns that are redundant as there already are other patterns that define the same scope of files or even a broader one. For example, in '[{*.java,*}]' the first '*.java' pattern defines a narrower scope compared to '*'. That is why it is redundant and can be removed.",
+                  "markdown": "Reports file patterns that are redundant as there already are other patterns that define the same scope of files or even a broader one. For example, in `[{*.java,*}]` the first `*.java` pattern defines a narrower scope compared to `*`. That is why it is redundant and can be removed."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "CucumberUndefinedStep",
+                    "suppressToolId": "EditorConfigPatternRedundancy",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -24200,8 +24443,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "Cucumber",
-                      "index": 16,
+                      "id": "EditorConfig",
+                      "index": 19,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24213,66 +24456,21 @@
                 ]
               },
               {
-                "id": "CucumberExamplesColon",
-                "shortDescription": {
-                  "text": "Missing ':' after examples keyword"
-                },
-                "fullDescription": {
-                  "text": "Reports 'Examples' sections in Cucumber .feature files if they do not have ':' after the 'Examples' keyword.",
-                  "markdown": "Reports `Examples` sections in Cucumber .feature files if they do not have ':' after the `Examples` keyword."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "CucumberExamplesColon",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 16,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              }
-            ],
-            "language": "en-US",
-            "contents": [
-              "localizedData",
-              "nonLocalizedData"
-            ],
-            "isComprehensive": false
-          },
-          {
-            "name": "org.editorconfig.editorconfigjetbrains",
-            "version": "232.9881",
-            "rules": [
-              {
-                "id": "EditorConfigRootDeclarationUniqueness",
+                "id": "EditorConfigDeprecatedDescriptor",
                 "shortDescription": {
-                  "text": "Extra top-level declaration"
+                  "text": "Deprecated property"
                 },
                 "fullDescription": {
-                  "text": "Reports multiple top-level declarations. There can be only one optional “root=true” top-level declaration in the EditorConfig file. Using multiple top-level declarations is not allowed.",
-                  "markdown": "Reports multiple top-level declarations. There can be only one optional \"root=true\" top-level declaration in the EditorConfig file. Using multiple top-level declarations is not allowed."
+                  "text": "Reports EditorConfig properties that are no longer supported.",
+                  "markdown": "Reports EditorConfig properties that are no longer supported."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "error",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "EditorConfigRootDeclarationUniqueness",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "EditorConfigDeprecatedDescriptor",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
@@ -24291,21 +24489,21 @@
                 ]
               },
               {
-                "id": "EditorConfigNumerousWildcards",
+                "id": "EditorConfigShadowedOption",
                 "shortDescription": {
-                  "text": "Too many wildcards"
+                  "text": "Overridden property"
                 },
                 "fullDescription": {
-                  "text": "Reports sections that contain too many wildcards. Using a lot of wildcards may lead to performance issues.",
-                  "markdown": "Reports sections that contain too many wildcards. Using a lot of wildcards may lead to performance issues."
+                  "text": "Reports properties that are already defined in other sections. For example: '[*.java]\nindent_size=4\n[{*.java,*.js}]\nindent_size=2' The second section includes all '*.java' files too but it also redefines indent_size. As a result the value 2 will be used for files matching '*.java'.",
+                  "markdown": "Reports properties that are already defined in other sections.\n\nFor example:\n\n\n    [*.java]\n    indent_size=4\n    [{*.java,*.js}]\n    indent_size=2\n\nThe second section includes all `*.java` files too but it also redefines indent_size. As a result the value 2 will be used for files matching `*.java`."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "EditorConfigNumerousWildcards",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "EditorConfigShadowedOption",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
@@ -24324,21 +24522,21 @@
                 ]
               },
               {
-                "id": "EditorConfigKeyCorrectness",
+                "id": "EditorConfigEmptyHeader",
                 "shortDescription": {
-                  "text": "Unknown property"
+                  "text": "Empty header"
                 },
                 "fullDescription": {
-                  "text": "Reports properties that are not supported by the IDE. Note: some “ij” domain properties may require specific language plugins.",
-                  "markdown": "Reports properties that are not supported by the IDE. Note: some \"ij\" domain properties may require specific language plugins."
+                  "text": "Reports sections with an empty header. Section header must contain file path globs in the format similar to one supported by 'gitignore'.",
+                  "markdown": "Reports sections with an empty header. Section header must contain file path globs in the format similar to one supported by `gitignore`."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "error",
                   "parameters": {
-                    "suppressToolId": "EditorConfigKeyCorrectness",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "EditorConfigEmptyHeader",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
                   }
                 },
                 "relationships": [
@@ -24357,21 +24555,21 @@
                 ]
               },
               {
-                "id": "EditorConfigEncoding",
+                "id": "EditorConfigValueUniqueness",
                 "shortDescription": {
-                  "text": "File encoding doesn't match EditorConfig charset"
+                  "text": "Non-unique list value"
                 },
                 "fullDescription": {
-                  "text": "Checks that current file encoding matches the encoding defined in \"charset\" property of .editorconfig file.",
-                  "markdown": "Checks that current file encoding matches the encoding defined in \"charset\" property of .editorconfig file."
+                  "text": "Reports duplicates in lists of values.",
+                  "markdown": "Reports duplicates in lists of values."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "error",
                   "parameters": {
-                    "suppressToolId": "EditorConfigEncoding",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "EditorConfigValueUniqueness",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
                   }
                 },
                 "relationships": [
@@ -24390,217 +24588,19 @@
                 ]
               },
               {
-                "id": "EditorConfigRootDeclarationCorrectness",
+                "id": "EditorConfigMissingRequiredDeclaration",
                 "shortDescription": {
-                  "text": "Unexpected top-level declaration"
+                  "text": "Required declarations are missing"
                 },
                 "fullDescription": {
-                  "text": "Reports unexpected top-level declarations. Top-level declarations other than “root=true” are not allowed in the EditorConfig file.",
-                  "markdown": "Reports unexpected top-level declarations. Top-level declarations other than \"root=true\" are not allowed in the EditorConfig file."
+                  "text": "Reports properties that miss the required declarations. Refer to the documentation for more information.",
+                  "markdown": "Reports properties that miss the required declarations. Refer to the documentation for more information."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "error",
                   "parameters": {
-                    "suppressToolId": "EditorConfigRootDeclarationCorrectness",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "EditorConfig",
-                      "index": 19,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "EditorConfigPatternRedundancy",
-                "shortDescription": {
-                  "text": "Duplicate or redundant pattern"
-                },
-                "fullDescription": {
-                  "text": "Reports file patterns that are redundant as there already are other patterns that define the same scope of files or even a broader one. For example, in '[{*.java,*}]' the first '*.java' pattern defines a narrower scope compared to '*'. That is why it is redundant and can be removed.",
-                  "markdown": "Reports file patterns that are redundant as there already are other patterns that define the same scope of files or even a broader one. For example, in `[{*.java,*}]` the first `*.java` pattern defines a narrower scope compared to `*`. That is why it is redundant and can be removed."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "warning",
-                  "parameters": {
-                    "suppressToolId": "EditorConfigPatternRedundancy",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "EditorConfig",
-                      "index": 19,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "EditorConfigDeprecatedDescriptor",
-                "shortDescription": {
-                  "text": "Deprecated property"
-                },
-                "fullDescription": {
-                  "text": "Reports EditorConfig properties that are no longer supported.",
-                  "markdown": "Reports EditorConfig properties that are no longer supported."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "warning",
-                  "parameters": {
-                    "suppressToolId": "EditorConfigDeprecatedDescriptor",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "EditorConfig",
-                      "index": 19,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "EditorConfigShadowedOption",
-                "shortDescription": {
-                  "text": "Overridden property"
-                },
-                "fullDescription": {
-                  "text": "Reports properties that are already defined in other sections. For example: '[*.java]\nindent_size=4\n[{*.java,*.js}]\nindent_size=2' The second section includes all '*.java' files too but it also redefines indent_size. As a result the value 2 will be used for files matching '*.java'.",
-                  "markdown": "Reports properties that are already defined in other sections.\n\nFor example:\n\n\n    [*.java]\n    indent_size=4\n    [{*.java,*.js}]\n    indent_size=2\n\nThe second section includes all `*.java` files too but it also redefines indent_size. As a result the value 2 will be used for files matching `*.java`."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "warning",
-                  "parameters": {
-                    "suppressToolId": "EditorConfigShadowedOption",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "EditorConfig",
-                      "index": 19,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "EditorConfigEmptyHeader",
-                "shortDescription": {
-                  "text": "Empty header"
-                },
-                "fullDescription": {
-                  "text": "Reports sections with an empty header. Section header must contain file path globs in the format similar to one supported by 'gitignore'.",
-                  "markdown": "Reports sections with an empty header. Section header must contain file path globs in the format similar to one supported by `gitignore`."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "EditorConfigEmptyHeader",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "EditorConfig",
-                      "index": 19,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "EditorConfigValueUniqueness",
-                "shortDescription": {
-                  "text": "Non-unique list value"
-                },
-                "fullDescription": {
-                  "text": "Reports duplicates in lists of values.",
-                  "markdown": "Reports duplicates in lists of values."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "EditorConfigValueUniqueness",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "EditorConfig",
-                      "index": 19,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "EditorConfigMissingRequiredDeclaration",
-                "shortDescription": {
-                  "text": "Required declarations are missing"
-                },
-                "fullDescription": {
-                  "text": "Reports properties that miss the required declarations. Refer to the documentation for more information.",
-                  "markdown": "Reports properties that miss the required declarations. Refer to the documentation for more information."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "EditorConfigMissingRequiredDeclaration",
+                    "suppressToolId": "EditorConfigMissingRequiredDeclaration",
                     "ideaSeverity": "ERROR",
                     "qodanaSeverity": "Critical"
                   }
@@ -25899,7 +25899,7 @@
                   {
                     "target": {
                       "id": "CSS/Probable bugs",
-                      "index": 51,
+                      "index": 52,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -26130,7 +26130,7 @@
                   {
                     "target": {
                       "id": "CSS/Probable bugs",
-                      "index": 51,
+                      "index": 52,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -26460,7 +26460,7 @@
                   {
                     "target": {
                       "id": "CSS/Probable bugs",
-                      "index": 51,
+                      "index": 52,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -27711,7 +27711,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -28356,7 +28356,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -28439,14 +28439,14 @@
       "language": "en-US",
       "versionControlProvenance": [
         {
-          "repositoryUri": "https://github.com/zephir-lang/zephir.git",
-          "revisionId": "a3bc02de3a207fdc7795714bd81c50ce8014d859",
+          "repositoryUri": "https://github.com/zephir-lang/zephir",
+          "revisionId": "cf3ab03e8f1923787643ad37cb8abc158332c284",
           "branch": "phpcs-changes",
           "properties": {
-            "repoUrl": "https://github.com/zephir-lang/zephir.git",
-            "lastAuthorName": "Anton Vasiliev",
+            "repoUrl": "https://github.com/zephir-lang/zephir",
+            "lastAuthorName": "Nikolaos Dimopoulos",
             "vcsType": "Git",
-            "lastAuthorEmail": "1695147@gmail.com"
+            "lastAuthorEmail": "nikos@niden.net"
           }
         }
       ],
@@ -28532,6 +28532,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "007fa875708218660836ace1924fc922751392efd8537e891680598c5cf15c3f"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28621,6 +28622,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "08f2f448026d85d619648c5cd79b372a3ceffd6ff784cac4e438ae722c1acf96"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28710,6 +28712,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "0ae41db8f8c0bef77b8d675ee99d6a3523098f4cff89c1d9c1245f8318af02cd"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28799,6 +28802,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "0d67bca7fae6d45ad7bf2511bf847317eb7e7514c7087f3ae8354745a3be6e50"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28888,6 +28892,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "12396187edc198e27c96f5755ad98754d322bac119bd2b300b2ebfb8ec29e475"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28908,26 +28913,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uri": "src/Operators/Other/FetchOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 600,
-                  "startColumn": 41,
-                  "charOffset": 28421,
-                  "charLength": 1312,
+                  "startLine": 139,
+                  "startColumn": 17,
+                  "charOffset": 5345,
+                  "charLength": 1460,
                   "snippet": {
-                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 600,
+                  "startLine": 139,
                   "startColumn": 1,
-                  "charOffset": 28381,
-                  "charLength": 1352,
+                  "charOffset": 5329,
+                  "charLength": 1476,
                   "snippet": {
-                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28942,26 +28947,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uri": "src/Operators/Other/FetchOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 707,
-                  "startColumn": 41,
-                  "charOffset": 34365,
-                  "charLength": 1312,
+                  "startLine": 183,
+                  "startColumn": 17,
+                  "charOffset": 7441,
+                  "charLength": 1464,
                   "snippet": {
-                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 707,
+                  "startLine": 183,
                   "startColumn": 1,
-                  "charOffset": 34325,
-                  "charLength": 1352,
+                  "charOffset": 7425,
+                  "charLength": 1480,
                   "snippet": {
-                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28975,8 +28980,9 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "44d3147872714da7dd7925d66f77cc75018a72ec1e8c22628bd251c55f358eea"
+            "equalIndicator/v1": "24f08abd3bb01f9d7345fa1ca459533dab83e08a1e2216c322b5acbb63cde9b6"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28997,26 +29003,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFile.php",
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 184,
-                  "startColumn": 9,
-                  "charOffset": 4992,
-                  "charLength": 571,
+                  "startLine": 595,
+                  "startColumn": 41,
+                  "charOffset": 28052,
+                  "charLength": 1044,
                   "snippet": {
-                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 184,
+                  "startLine": 595,
                   "startColumn": 1,
-                  "charOffset": 4984,
-                  "charLength": 579,
+                  "charOffset": 28012,
+                  "charLength": 1084,
                   "snippet": {
-                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29031,26 +29037,60 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFileAnonymous.php",
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 244,
-                  "startColumn": 9,
-                  "charOffset": 7132,
-                  "charLength": 571,
+                  "startLine": 630,
+                  "startColumn": 41,
+                  "charOffset": 29563,
+                  "charLength": 1204,
                   "snippet": {
-                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 244,
+                  "startLine": 630,
                   "startColumn": 1,
-                  "charOffset": 7124,
-                  "charLength": 579,
+                  "charOffset": 29523,
+                  "charLength": 1244,
                   "snippet": {
-                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 641,
+                  "startColumn": 41,
+                  "charOffset": 30112,
+                  "charLength": 1050,
+                  "snippet": {
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 641,
+                  "startColumn": 1,
+                  "charOffset": 30072,
+                  "charLength": 1090,
+                  "snippet": {
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29064,8 +29104,99 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "4b5cee72bcbbadce4fc761c12530223b00f00b3b7e5c2faa3973277df457d6c6"
+            "equalIndicator/v1": "3f69053074a524ab597f3415079b660a6b7d8373ef878c83f84ce1ea942336eb"
           },
+          "baselineState": "unchanged",
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 184,
+                  "startColumn": 9,
+                  "charOffset": 4992,
+                  "charLength": 571,
+                  "snippet": {
+                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 184,
+                  "startColumn": 1,
+                  "charOffset": 4984,
+                  "charLength": 579,
+                  "snippet": {
+                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 244,
+                  "startColumn": 9,
+                  "charOffset": 7132,
+                  "charLength": 571,
+                  "snippet": {
+                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 244,
+                  "startColumn": 1,
+                  "charOffset": 7124,
+                  "charLength": 579,
+                  "snippet": {
+                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b5cee72bcbbadce4fc761c12530223b00f00b3b7e5c2faa3973277df457d6c6"
+          },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29189,6 +29320,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "4b94f01d2137a3c924a6e906729935c1a01d5f8d05150b8e7780cfa9e6d51377"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29278,6 +29410,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "4c84af03a538a10ccbd7475768837a6f57838da11904651cdd871fb94359d988"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29435,6 +29568,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "4d36d56beb9e89409bd76c2f6ecb22e953444d6fdf1fd7e4049e2d6bf5a9afbd"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29524,6 +29658,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "599df81d41f5be810b08fb69c471bc5bca897579db4c7866fbcbf605b38c241f"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29647,6 +29782,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "5d53dd48ab9c75067d8b728476c9f845850bb812b1cb8753fcd37c8cbbed9fb2"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29770,6 +29906,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "63fb053eb03a3eeb273a001ccc30905905075bfbff24662ac374dd80b3e9654e"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29893,6 +30030,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "68c15a0339486870360e7eb97b3bce1d6c56a259032f453b3b503df6ee1874df"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29910,430 +30048,6 @@
             "markdown": "Duplicated code"
           },
           "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 160,
-                  "startColumn": 17,
-                  "charOffset": 4766,
-                  "charLength": 1210,
-                  "snippet": {
-                    "text": "switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 160,
-                  "startColumn": 1,
-                  "charOffset": 4750,
-                  "charLength": 1226,
-                  "snippet": {
-                    "text": "                switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 1306,
-                  "startColumn": 17,
-                  "charOffset": 56371,
-                  "charLength": 1210,
-                  "snippet": {
-                    "text": "switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 1306,
-                  "startColumn": 1,
-                  "charOffset": 56355,
-                  "charLength": 1226,
-                  "snippet": {
-                    "text": "                switch ($statement['operator']) {\n                    case 'assign':\n                        if ($variable != $resolvedExpr->getCode()) {\n                            $symbolVariable->setMustInitNull(true);\n                            $compilationContext->symbolTable->mustGrownStack(true);\n\n                            /* Inherit the dynamic type data from the assigned value */\n                            $symbolVariable->setDynamicTypes('array');\n                            $symbolVariable->increaseVariantIfNull();\n                            $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                            $codePrinter->output(\n                                'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                    $resolvedExpr,\n                                    $compilationContext\n                                ) . ');'\n                            );\n                        }\n                        break;\n\n                    default:\n                        throw new IllegalOperationException($statement, $resolvedExpr, $resolvedExpr->getOriginal());\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 1434,
-                  "startColumn": 25,
-                  "charOffset": 63052,
-                  "charLength": 1512,
-                  "snippet": {
-                    "text": "switch ($statement['operator']) {\n                            case 'assign':\n                                if ($variable != $resolvedExpr->getCode()) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes('array');\n                                    $symbolVariable->increaseVariantIfNull();\n                                    $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                                    $codePrinter->output(\n                                        'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                            $resolvedExpr,\n                                            $compilationContext\n                                        ) . ');'\n                                    );\n                                }\n                                break;\n\n                            default:\n                                throw new IllegalOperationException(\n                                    $statement,\n                                    $resolvedExpr,\n                                    $resolvedExpr->getOriginal()\n                                );\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 1434,
-                  "startColumn": 1,
-                  "charOffset": 63028,
-                  "charLength": 1536,
-                  "snippet": {
-                    "text": "                        switch ($statement['operator']) {\n                            case 'assign':\n                                if ($variable != $resolvedExpr->getCode()) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes('array');\n                                    $symbolVariable->increaseVariantIfNull();\n                                    $symbol = $compilationContext->backend->getVariableCode($symbolVariable);\n\n                                    $codePrinter->output(\n                                        'ZEPHIR_CPY_WRT(' . $symbol . ', ' . $compilationContext->backend->resolveValue(\n                                            $resolvedExpr,\n                                            $compilationContext\n                                        ) . ');'\n                                    );\n                                }\n                                break;\n\n                            default:\n                                throw new IllegalOperationException(\n                                    $statement,\n                                    $resolvedExpr,\n                                    $resolvedExpr->getOriginal()\n                                );\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "73a249f2c92c2bbff062013d2f3003dcb64dd1142e1672fcd73e3c521720ac87"
-          },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 495,
-                  "startColumn": 25,
-                  "charOffset": 18936,
-                  "charLength": 1366,
-                  "snippet": {
-                    "text": "$exprVariableCode = $compilationContext->backend->getVariableCode($itemVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 495,
-                  "startColumn": 1,
-                  "charOffset": 18912,
-                  "charLength": 1390,
-                  "snippet": {
-                    "text": "                        $exprVariableCode = $compilationContext->backend->getVariableCode($itemVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 736,
-                  "startColumn": 25,
-                  "charOffset": 29251,
-                  "charLength": 1370,
-                  "snippet": {
-                    "text": "$exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 736,
-                  "startColumn": 1,
-                  "charOffset": 29227,
-                  "charLength": 1394,
-                  "snippet": {
-                    "text": "                        $exprVariableCode = $compilationContext->backend->getVariableCode($exprVariable);\n                        switch ($statement['operator']) {\n                            case 'assign':\n                                $codePrinter->output($variable . ' = zephir_get_numberval(' . $exprVariableCode . ');');\n                                break;\n\n                            case 'add-assign':\n                                $codePrinter->output(\n                                    $variable . ' += zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'sub-assign':\n                                $codePrinter->output(\n                                    $variable . ' -= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            case 'mul-assign':\n                                $codePrinter->output(\n                                    $variable . ' *= zephir_get_numberval(' . $exprVariableCode . ');'\n                                );\n                                break;\n\n                            default:\n                                throw new IllegalOperationException($statement, $itemVariable);\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "857b788110f540572ff1a22318763c12c0283e4a57e2497a866234856acd6a82"
-          },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 981,
-                  "charLength": 582,
-                  "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 42,
-                  "startColumn": 1,
-                  "charOffset": 973,
-                  "charLength": 590,
-                  "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 952,
-                  "charLength": 582,
-                  "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 42,
-                  "startColumn": 1,
-                  "charOffset": 944,
-                  "charLength": 590,
-                  "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "85c329c4716072967778fb33b25cf012514ce0ed7d1994738b7a6d4e5857125c"
-          },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 1112,
-                  "startColumn": 25,
-                  "charOffset": 46462,
-                  "charLength": 1243,
-                  "snippet": {
-                    "text": "$symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 1112,
-                  "startColumn": 1,
-                  "charOffset": 46438,
-                  "charLength": 1267,
-                  "snippet": {
-                    "text": "                        $symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 1212,
-                  "startColumn": 25,
-                  "charOffset": 51345,
-                  "charLength": 1243,
-                  "snippet": {
-                    "text": "$symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 1212,
-                  "startColumn": 1,
-                  "charOffset": 51321,
-                  "charLength": 1267,
-                  "snippet": {
-                    "text": "                        $symbolVariable->setDynamicTypes('double');\n                        if ($readDetector->detect($variable, $resolvedExpr->getOriginal())) {\n                            $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                                'double',\n                                $compilationContext\n                            );\n                            $codePrinter->output($tempVariable->getName() . ' = ' . $resolvedExpr->getCode() . ';');\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $tempVariable,\n                                $compilationContext\n                            );\n                        } else {\n                            $symbolVariable->initVariant($compilationContext);\n                            $compilationContext->backend->assignDouble(\n                                $symbolVariable,\n                                $resolvedExpr->getCode(),\n                                $compilationContext\n                            );\n                        }\n                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "8a3bd0f30a4d5226b63462648dc8491ef5daa237aa4867268be782b6cc8b1b54"
-          },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/DivOperator.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 311,
-                  "startColumn": 41,
-                  "charOffset": 13127,
-                  "charLength": 1363,
-                  "snippet": {
-                    "text": "$compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 311,
-                  "startColumn": 1,
-                  "charOffset": 13087,
-                  "charLength": 1403,
-                  "snippet": {
-                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
             {
               "physicalLocation": {
                 "artifactLocation": {
@@ -30341,77 +30055,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 405,
+                  "startLine": 595,
                   "startColumn": 41,
-                  "charOffset": 18298,
-                  "charLength": 1363,
+                  "charOffset": 28052,
+                  "charLength": 540,
                   "snippet": {
-                    "text": "$compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 405,
+                  "startLine": 595,
                   "startColumn": 1,
-                  "charOffset": 18258,
-                  "charLength": 1403,
-                  "snippet": {
-                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n                                        if ($variableRight->isLocalOnly()) {\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', &' . $variableRight->getName() . ')',\n                                                $expression\n                                            );\n                                        } else {\n                                            $variableRightCode = $compilationContext->backend->getVariableCode(\n                                                $variableRight\n                                            );\n\n                                            return new CompiledExpression(\n                                                'double',\n                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(\n                                                ) . ', ' . $variableRightCode . ')',\n                                                $expression\n                                            );\n                                        }\n                                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "8fa7d657bb1c0f7c05c9876141421a5b43d8ee26e980f5d92d23516208d44150"
-          },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 47,
-                  "startColumn": 13,
-                  "charOffset": 1290,
-                  "charLength": 1935,
-                  "snippet": {
-                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 47,
-                  "startColumn": 13,
-                  "charOffset": 1290,
-                  "charLength": 1935,
+                  "charOffset": 28012,
+                  "charLength": 580,
                   "snippet": {
-                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30426,81 +30085,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 57,
-                  "startColumn": 9,
-                  "charOffset": 1516,
-                  "charLength": 1790,
-                  "snippet": {
-                    "text": "if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 57,
-                  "startColumn": 1,
-                  "charOffset": 1508,
-                  "charLength": 1798,
-                  "snippet": {
-                    "text": "        if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "9c667466bb2f3e596e8dc820bfd85552e107e589217e244f70d57b9be4e7fc54"
-          },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 595,
+                  "startLine": 630,
                   "startColumn": 41,
-                  "charOffset": 28534,
-                  "charLength": 1044,
+                  "charOffset": 29563,
+                  "charLength": 526,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 595,
+                  "startLine": 630,
                   "startColumn": 1,
-                  "charOffset": 28494,
-                  "charLength": 1084,
+                  "charOffset": 29523,
+                  "charLength": 566,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30519,22 +30123,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 630,
-                  "startColumn": 41,
-                  "charOffset": 30297,
-                  "charLength": 1204,
+                  "startLine": 745,
+                  "startColumn": 49,
+                  "charOffset": 35768,
+                  "charLength": 566,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 630,
+                  "startLine": 745,
                   "startColumn": 1,
-                  "charOffset": 30257,
-                  "charLength": 1244,
+                  "charOffset": 35720,
+                  "charLength": 614,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
+                    "text": "                                                $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30553,22 +30157,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 642,
+                  "startLine": 641,
                   "startColumn": 41,
-                  "charOffset": 30877,
-                  "charLength": 1050,
+                  "charOffset": 30112,
+                  "charLength": 546,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 642,
+                  "startLine": 641,
                   "startColumn": 1,
-                  "charOffset": 30837,
-                  "charLength": 1090,
+                  "charOffset": 30072,
+                  "charLength": 586,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30582,8 +30186,9 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "9ca54e68a3caa7b98880634a9404b885939c1fbe4d17af0129629eef2770f078"
+            "equalIndicator/v1": "6d36e4ef6709e868286eaa84de3db359e148aee2d9ea1c2b24fc6a6c90c45642"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30604,26 +30209,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 595,
-                  "startColumn": 41,
-                  "charOffset": 28534,
-                  "charLength": 540,
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 981,
+                  "charLength": 582,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 595,
+                  "startLine": 42,
                   "startColumn": 1,
-                  "charOffset": 28494,
-                  "charLength": 580,
+                  "charOffset": 973,
+                  "charLength": 590,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30638,26 +30243,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 630,
-                  "startColumn": 41,
-                  "charOffset": 30297,
-                  "charLength": 526,
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 952,
+                  "charLength": 582,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 630,
+                  "startLine": 42,
                   "startColumn": 1,
-                  "charOffset": 30257,
-                  "charLength": 566,
+                  "charOffset": 944,
+                  "charLength": 590,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30668,30 +30273,52 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "85c329c4716072967778fb33b25cf012514ce0ed7d1994738b7a6d4e5857125c"
+          },
+          "baselineState": "unchanged",
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 745,
-                  "startColumn": 49,
-                  "charOffset": 36616,
-                  "charLength": 566,
+                  "startLine": 47,
+                  "startColumn": 13,
+                  "charOffset": 1290,
+                  "charLength": 1935,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
+                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 745,
-                  "startColumn": 1,
-                  "charOffset": 36568,
-                  "charLength": 614,
+                  "startLine": 47,
+                  "startColumn": 13,
+                  "charOffset": 1290,
+                  "charLength": 1935,
                   "snippet": {
-                    "text": "                                                $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
+                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30706,26 +30333,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 642,
-                  "startColumn": 41,
-                  "charOffset": 30877,
-                  "charLength": 546,
+                  "startLine": 57,
+                  "startColumn": 9,
+                  "charOffset": 1516,
+                  "charLength": 1790,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 642,
+                  "startLine": 57,
                   "startColumn": 1,
-                  "charOffset": 30837,
-                  "charLength": 586,
+                  "charOffset": 1508,
+                  "charLength": 1798,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "        if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30739,8 +30366,9 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "9cb52081a37ee97f431a9a31ff429b11d9e13096e945235a0344b97b9d8df208"
+            "equalIndicator/v1": "9c667466bb2f3e596e8dc820bfd85552e107e589217e244f70d57b9be4e7fc54"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30864,6 +30492,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "9cc60933b60115369adb7ae20f2fad84bcadcda683e07663d606855d40f8d9bc"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30953,6 +30582,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "a2db45685cf7e89e0b892e3f49ab2536a98f512729f5bc953c503ea69172a94e"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31042,95 +30672,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "a520debf0252582235eface5631c62fea290e447afb6e745f53d01fcba26ee87"
           },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 1466,
-                  "startColumn": 33,
-                  "charOffset": 64736,
-                  "charLength": 1147,
-                  "snippet": {
-                    "text": "if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 1466,
-                  "startColumn": 1,
-                  "charOffset": 64704,
-                  "charLength": 1179,
-                  "snippet": {
-                    "text": "                                if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/Variable.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 1524,
-                  "startColumn": 33,
-                  "charOffset": 67967,
-                  "charLength": 1146,
-                  "snippet": {
-                    "text": "if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 1524,
-                  "startColumn": 1,
-                  "charOffset": 67935,
-                  "charLength": 1178,
-                  "snippet": {
-                    "text": "                                if ($itemVariable->getName() != $variable) {\n                                    $symbolVariable->setMustInitNull(true);\n                                    $compilationContext->symbolTable->mustGrownStack(true);\n\n                                    /* Inherit the dynamic type data from the assigned value */\n                                    $symbolVariable->setDynamicTypes(array_keys($itemVariable->getDynamicTypes()));\n                                    $symbolVariable->setClassTypes($itemVariable->getClassTypes());\n                                    $symbolVariable->increaseVariantIfNull();\n\n                                    $compilationContext->backend->copyOnWrite(\n                                        $symbolVariable,\n                                        $itemVariable,\n                                        $compilationContext\n                                    );\n                                    if ($itemVariable->isTemporal()) {\n                                        $itemVariable->setIdle(true);\n                                    }\n                                }\n                                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "a6513ede383af31711fea0aea621d5c1ea4a4fea5bc605bcff58b2b3d6a4be8c"
-          },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31220,6 +30762,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "b552b9808f9cf70b1ecefa055b86445de001d35dad47517e9435eca0f8a97632"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31309,95 +30852,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "b86f2c8f01924e92a9b683c40d0371fd72e37cdd8bc53ace61830c749bcb2f8a"
           },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/DivOperator.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 134,
-                  "startColumn": 17,
-                  "charOffset": 5064,
-                  "charLength": 1069,
-                  "snippet": {
-                    "text": "switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 134,
-                  "startColumn": 1,
-                  "charOffset": 5048,
-                  "charLength": 1085,
-                  "snippet": {
-                    "text": "                switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ModOperator.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 143,
-                  "startColumn": 17,
-                  "charOffset": 5577,
-                  "charLength": 1069,
-                  "snippet": {
-                    "text": "switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 143,
-                  "startColumn": 1,
-                  "charOffset": 5561,
-                  "charLength": 1085,
-                  "snippet": {
-                    "text": "                switch ($right->getType()) {\n                    case 'int':\n                    case 'uint':\n                    case 'long':\n                    case 'ulong':\n                    case 'double':\n                        return new CompiledExpression(\n                            'long',\n                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',\n                            $expression\n                        );\n\n                    case 'bool':\n                        return new CompiledExpression(\n                            'bool',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression\n                        );\n\n                    default:\n                        throw new CompilerException(\n                            \"Cannot operate 'bool' with '\" . $right->getType() . \"'\",\n                            $expression\n                        );\n                }\n                break;"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "ba49be6454237722094770ba33c98775c21913ca28a248521970ce2cb6005048"
-          },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31487,6 +30942,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "c297ffead8a798d3eb526d472b3c5f063c68e46328f4bd67f2159b53db037e0c"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31644,6 +31100,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "daceb7645de2ce66ffc3380fd5e91089998f247f3c6a0bf1f6021c7b53ab00cb"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31733,6 +31190,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "df506eed38ba50eda828a4a252b9c78b9430fb05d68dcc90ac65ce12ab5eb980"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31753,115 +31211,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 41,
-                  "startColumn": 9,
-                  "charOffset": 904,
-                  "charLength": 392,
-                  "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 41,
-                  "startColumn": 1,
-                  "charOffset": 896,
-                  "charLength": 400,
-                  "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 38,
-                  "startColumn": 9,
-                  "charOffset": 879,
-                  "charLength": 392,
-                  "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 38,
-                  "startColumn": 1,
-                  "charOffset": 871,
-                  "charLength": 400,
-                  "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "e1dc5f4694fcbd691dc96a462008cbdf13f317264d1ba5f846c6407a43296598"
-          },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 50,
+                  "startLine": 41,
                   "startColumn": 9,
-                  "charOffset": 1166,
-                  "charLength": 2877,
+                  "charOffset": 904,
+                  "charLength": 392,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 50,
-                  "startColumn": 9,
-                  "charOffset": 1166,
-                  "charLength": 2877,
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 896,
+                  "charLength": 400,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31876,26 +31245,82 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 52,
+                  "startLine": 38,
                   "startColumn": 9,
-                  "charOffset": 1242,
-                  "charLength": 2877,
+                  "charOffset": 879,
+                  "charLength": 392,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 52,
-                  "startColumn": 9,
-                  "charOffset": 1242,
-                  "charLength": 2877,
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 871,
+                  "charLength": 400,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e1dc5f4694fcbd691dc96a462008cbdf13f317264d1ba5f846c6407a43296598"
+          },
+          "baselineState": "unchanged",
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 595,
+                  "startColumn": 41,
+                  "charOffset": 27996,
+                  "charLength": 1312,
+                  "snippet": {
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 595,
+                  "startColumn": 1,
+                  "charOffset": 27956,
+                  "charLength": 1352,
+                  "snippet": {
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31910,26 +31335,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 52,
-                  "startColumn": 9,
-                  "charOffset": 1231,
-                  "charLength": 2947,
+                  "startLine": 701,
+                  "startColumn": 41,
+                  "charOffset": 33776,
+                  "charLength": 1312,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 52,
-                  "startColumn": 9,
-                  "charOffset": 1231,
-                  "charLength": 2947,
+                  "startLine": 701,
+                  "startColumn": 1,
+                  "charOffset": 33736,
+                  "charLength": 1352,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31943,8 +31368,9 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "e6388c9a408c11b6121122837c3a96fa31789243a4f2e1d0ce1a771dceab2000"
+            "equalIndicator/v1": "e2ab5b6f5941508f0ba058657d169f316fe00dd42f7b672ac1f6eccef2d0ec30"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31965,26 +31391,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/TrimOptimizer.php",
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 48,
+                  "startLine": 50,
                   "startColumn": 9,
-                  "charOffset": 1087,
-                  "charLength": 992,
+                  "charOffset": 1166,
+                  "charLength": 2877,
                   "snippet": {
-                    "text": "$charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 48,
-                  "startColumn": 1,
-                  "charOffset": 1079,
-                  "charLength": 1000,
+                  "startLine": 50,
+                  "startColumn": 9,
+                  "charOffset": 1166,
+                  "charLength": 2877,
                   "snippet": {
-                    "text": "        $charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31999,26 +31425,60 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/UncamelizeOptimizer.php",
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 50,
+                  "startLine": 52,
                   "startColumn": 9,
-                  "charOffset": 1245,
-                  "charLength": 994,
+                  "charOffset": 1242,
+                  "charLength": 2877,
                   "snippet": {
-                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 50,
-                  "startColumn": 1,
-                  "charOffset": 1237,
-                  "charLength": 1002,
+                  "startLine": 52,
+                  "startColumn": 9,
+                  "charOffset": 1242,
+                  "charLength": 2877,
                   "snippet": {
-                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            },
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 9,
+                  "charOffset": 1231,
+                  "charLength": 2947,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 9,
+                  "charOffset": 1231,
+                  "charLength": 2947,
+                  "snippet": {
+                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32032,8 +31492,9 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "ecfe95d185fb897b5b506b22c4bc611675bb9e573263e7a804a9836d4c0361df"
+            "equalIndicator/v1": "e6388c9a408c11b6121122837c3a96fa31789243a4f2e1d0ce1a771dceab2000"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32054,26 +31515,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uri": "src/Optimizers/FunctionCall/TrimOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 140,
-                  "startColumn": 17,
-                  "charOffset": 5368,
-                  "charLength": 1460,
+                  "startLine": 48,
+                  "startColumn": 9,
+                  "charOffset": 1087,
+                  "charLength": 992,
                   "snippet": {
-                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "$charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 140,
+                  "startLine": 48,
                   "startColumn": 1,
-                  "charOffset": 5352,
-                  "charLength": 1476,
+                  "charOffset": 1079,
+                  "charLength": 1000,
                   "snippet": {
-                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "        $charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32088,26 +31549,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uri": "src/Optimizers/FunctionCall/UncamelizeOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 184,
-                  "startColumn": 17,
-                  "charOffset": 7464,
-                  "charLength": 1464,
+                  "startLine": 50,
+                  "startColumn": 9,
+                  "charOffset": 1245,
+                  "charLength": 994,
                   "snippet": {
-                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 184,
+                  "startLine": 50,
                   "startColumn": 1,
-                  "charOffset": 7448,
-                  "charLength": 1480,
+                  "charOffset": 1237,
+                  "charLength": 1002,
                   "snippet": {
-                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32121,8 +31582,9 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "edc9f919d3799cf3465125a8c04b68cb45ad7a525d2034a589f8394246cef8a7"
+            "equalIndicator/v1": "ecfe95d185fb897b5b506b22c4bc611675bb9e573263e7a804a9836d4c0361df"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32212,6 +31674,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "ee5ac15645dac240d3a11ee68eec3b9879e016f7240275fdae3339b21c23f4ad"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32301,6 +31764,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "efce78143face75554db6a523489645a5fdfbb257132f7a7c6c8996224bd232a"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32390,6 +31854,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "f5100c21fdcabe67b5c986419306ee8c1d0c9ff4dab52fc23e74c7e3b6221c83"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32445,6 +31910,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "86fd4e479dea5e9ac17025dfc059677c3dafd655750281e2e553e9147df86e1e"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32500,6 +31966,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "fd614b6d75285018cff55a963992918f4171f55ce3b155009f405c717c22e968"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32555,6 +32022,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "0f24f8a2cb526e35900b262beaba75e0332358debfb0bfcee5f6c4d87d933131"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32610,6 +32078,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "388429471940f618787be53d9cfebb607abe02909473f435a943948b11b4bf8e"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32665,6 +32134,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "6837f21a2020d4c1cddc38a3505af4f347ae13b03cebfb1451515fc67138fb1b"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32720,6 +32190,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "77863d2ddf259e8d9d2050e9476c36cd5863c97703b9e573c1326f9f568c9d5b"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32775,6 +32246,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "7f5de0870ec898b1680e5cbb4867c23f27372c9a67e3b0c0e52697531ce92690"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32830,6 +32302,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "a30521646e25186b820c1c400e05b20589e14a2b4336f4e4f44b8ae2be54c276"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32885,6 +32358,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "b5c352b560807d2a81a76c4accd132f5224c98a579b2340b413bd225439582ac"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32940,6 +32414,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "c86cfd8ad97a38eaa1bcf974efc06d210d0f2262cac82c820632261a03ba22a5"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32995,6 +32470,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "40d0b747a1f8e7c33d39dd31021acb642bcd03ec2203fdc91eb625ec985aab8c"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33050,6 +32526,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "7396fe10dd43e57c19745f441a70348431044417934c9e2c2151a535531e8094"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33105,6 +32582,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "34b9c7787e54cca9109c76146fb5dd81a54415ad7706a10cb41622fca0a7df72"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33160,6 +32638,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "639491302fec5cd8545ca8fc36cadce5bbfc5cf33d5a758494c16553f9b4ad4a"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33215,6 +32694,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "96692b641ca56badc02ece320184e765c799b340be00e9246379d1e953134fcc"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33270,6 +32750,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "d7f3248a0b3d8e6fac793009a2ce7c8c955a70462594b98a6f2efeee5033d860"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33325,6 +32806,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "cdba39ccc70934f7041973f3dd2bb5c52517ca73c9369bfb4582e2eb0b94e648"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33380,6 +32862,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "d6b49f0574e9f7a971dac1029ca72eac46b5a1a68b35009c1c5a1be048f1de5d"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33435,6 +32918,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "d8fc7944b03e4b505cc9baa64309ba1ac7687557faafee3dc3fb0e38b3c927ad"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33490,6 +32974,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "f06a836071c2c373655cfc8f599e556d5abfa79a68b93948001f4ab6594599b6"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33545,61 +33030,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "8ac7868a4ca09e6833fb99c7383b0b551295344932723aa0db062870f062b6f8"
           },
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "PhpDuplicateSwitchCaseBodyInspection",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch",
-            "markdown": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 627,
-                  "startColumn": 37,
-                  "charOffset": 29985,
-                  "charLength": 581,
-                  "snippet": {
-                    "text": "case 'bool':\n                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        return new CompiledExpression(\n                                            'int',\n                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(\n                                            ) . ')',\n                                            $expression\n                                        );\n                                        break;"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 625,
-                  "startColumn": 1,
-                  "charOffset": 29889,
-                  "charLength": 736,
-                  "snippet": {
-                    "text": "\n                                    /* a(var) + a(bool) */\n                                    case 'bool':\n                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        return new CompiledExpression(\n                                            'int',\n                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(\n                                            ) . ')',\n                                            $expression\n                                        );\n                                        break;\n\n                                    /* a(var) + a(var) */"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "e31bf6a428dd07f2c70396763a9a47f3df7d9af9a82fa83825065b75bfdba5df"
-          },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33655,6 +33086,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "4784c30899df298a1c80ac8a4013c87998109e10a00d21af559493908eda78c1"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "ERROR",
             "qodanaSeverity": "Critical",
@@ -33710,6 +33142,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "52956a1b95edf8732f4d3feffd38ef990ce10eeeb23954de17701ccd4cef5d01"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WARNING",
             "qodanaSeverity": "High",
@@ -33765,6 +33198,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "9f2530558094bcf672efc0cabe088629aafab7dfdb85a1b264ae2ebcc4c19e35"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WARNING",
             "qodanaSeverity": "High",
@@ -33820,6 +33254,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "6c608f3473df452e0d9efe5ac036eca02df35cb9c9fd4c14ed6abdde62609454"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33875,6 +33310,7 @@
           "partialFingerprints": {
             "equalIndicator/v1": "7a9b26a98853332953d1eb416c2b687a02a7b6f4a9c2477ef14b4c6257d2662f"
           },
+          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33886,9 +33322,9 @@
       ],
       "automationDetails": {
         "id": "project/qodana/2023-11-30",
-        "guid": "c4ce784a-cd17-4286-8d04-e840979a85ad",
+        "guid": "d4cffa2a-172c-40fb-940d-4831b7efc77b",
         "properties": {
-          "jobUrl": "https://github.com/zephir-lang/zephir/actions/runs/7040653342"
+          "jobUrl": ""
         }
       },
       "newlineSequences": [
@@ -33897,7 +33333,7 @@
       ],
       "properties": {
         "configProfile": "recommended",
-        "deviceId": "200820300000000-a3da-3f01-d610-dbadfc66b7f7"
+        "deviceId": "200820300000000-7ae6-504a-cf1a-901f5dd50b66"
       }
     }
   ]

From dabafe10615173dd7cba68f6a455e21326603ae3 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 29 Nov 2023 22:19:04 -0600
Subject: [PATCH 246/375] trying a different config for qodana

---
 .github/workflows/main.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d9afff9562..a3d1574eec 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -203,16 +203,15 @@ jobs:
       - name: "Checkout"
         uses: "actions/checkout@v3"
         with:
-          fetch-depth: 2
+          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
+          fetch-depth: 0  # a full history is required for pull request analysis
 
-      - name: "Qodana Analysis"
-        run: |
-          docker run \
-            -v $(pwd):/data/project \
-            -v $(pwd)/tests/output/:/data/results/ \
-            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
-            jetbrains/qodana-php:latest \
-            --show-report --baseline=qodana.sarif.json
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2023.2
+        with:
+          args: --baseline,qodana.sarif.json
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
 
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v3

From 1ccda613838907593df155fef47d20efa81f3715 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 08:16:50 -0600
Subject: [PATCH 247/375] trying a different workflow for qodana

---
 .github/workflows/main.yml   |  31 ---------
 .github/workflows/qodana.yml | 119 +++++++++++++++++++++++++++++++++++
 2 files changed, 119 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/qodana.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a3d1574eec..a63732de5f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -190,29 +190,6 @@ jobs:
         run: |
           make -j$(getconf _NPROCESSORS_ONLN)
 
-  qodana-analysis:
-    permissions:
-      contents: read
-
-    name: "Qodana Analysis"
-    runs-on: "ubuntu-22.04"
-    needs:
-      - "build-and-test"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v3"
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}  # to check out the actual pull request commit, not the merge commit
-          fetch-depth: 0  # a full history is required for pull request analysis
-
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.2
-        with:
-          args: --baseline,qodana.sarif.json
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v3
         with:
@@ -221,14 +198,6 @@ jobs:
           flags: unittests,${{ runner.os }},php-${{ matrix.php }}
           name: codecov-umbrella
 
-      - name: "Upload to Qodana"
-        run: |
-          docker run \
-            -v $(pwd):/data/project/ \
-            -v ./tests/output/:/data/coverage \
-            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
-            jetbrains/qodana-php
-
       - name: Upload build artifacts after Failure
         if: failure()
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
new file mode 100644
index 0000000000..7e38b43df5
--- /dev/null
+++ b/.github/workflows/qodana.yml
@@ -0,0 +1,119 @@
+name: Zephir CI
+
+on:
+  schedule:
+  push:
+    paths-ignore:
+      - '**.md'
+      - '**.txt'
+      - '**/nightly.yml'
+      - '**/release.yml'
+      - '**/FUNDING.yml'
+
+env:
+  RE2C_VERSION: 2.2
+  ZEPHIR_PARSER_VERSION: 1.6.0
+  PSR_VERSION: 1.2.0
+  CACHE_DIR: .cache
+
+jobs:
+
+  qodana-analysis:
+    name: "Qodana analysis"
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 5
+
+      - name: Install PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@develop
+        with:
+          php-version: '8.0'
+          extensions: mbstring, fileinfo, gmp, sqlite, pdo_sqlite, psr-${{ env.PSR_VERSION }}, zip, mysqli, zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}
+          tools: phpize, php-config
+          coverage: xdebug
+          # variables_order: https://github.com/zephir-lang/zephir/pull/1537
+          # enable_dl:       https://github.com/zephir-lang/zephir/pull/1654
+          # allow_url_fopen: https://github.com/zephir-lang/zephir/issues/1713
+          # error_reporting: https://github.com/zendframework/zend-code/issues/160
+          ini-values: >-
+            variables_order=EGPCS,
+            enable_dl=On,
+            allow_url_fopen=On,
+            error_reporting=-1,
+            memory_limit=1G,
+            date.timezone=UTC,
+            xdebug.max_nesting_level=256
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+#      - name: Get composer cache directory
+#        id: composer-cache
+#        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+#      - name: Set Up Composer Cache
+#        uses: actions/cache@v3
+#        with:
+#          path: ${{ steps.composer-cache.outputs.dir }}
+#          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+#          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install Project Dependencies
+        run: |
+          echo "::group::Install composer dependencies"
+          composer install --prefer-dist --no-interaction --no-ansi --no-progress
+          echo "::endgroup::"
+
+      - name: Fast Commands Test
+        run: php zephir --help
+
+      - name: Build Test Extension (Linux)
+        uses: ./.github/workflows/build-linux-ext
+        with:
+          compiler: 'gcc'
+          cflags: '-O2 -Wall -fvisibility=hidden -flto -DZEPHIR_RELEASE=1'
+          ldflags: '--coverage'
+
+      - name: Stub Extension Info
+        shell: pwsh
+        run: |
+          php --ini
+          php --ri stub
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Unit Tests (Stub Extension)
+        shell: pwsh
+        run: |
+          php vendor/bin/phpunit -c phpunit.ext.xml --coverage-php ./tests/output/ext-clover.xml
+
+      - name: Unit Tests (Zephir)
+        if: always()
+        run: php vendor/bin/phpunit --testsuite Zephir --coverage-php ./tests/output/clover.xml
+        env:
+          XDEBUG_MODE: coverage
+
+      - name: Black-box Testing
+        if: always() && runner.os != 'Windows'
+        shell: bash
+        working-directory: tests/sharness
+        run: |
+          make -j$(getconf _NPROCESSORS_ONLN)
+
+
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2023.2
+        with:
+          args: --baseline,qodana.sarif.json
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+
+      - name: "Upload to Qodana"
+        run: |
+          docker run \
+            -v $(pwd):/data/project/ \
+            -v ./tests/output/:/data/coverage \
+            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
+            jetbrains/qodana-php

From b5a2e00d9b7c2d5a463250622a008d62cf78d288 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 08:29:57 -0600
Subject: [PATCH 248/375] correcting yml file

---
 .github/workflows/qodana.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index 7e38b43df5..892b7cfd1e 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -1,7 +1,6 @@
-name: Zephir CI
+name: Qodana Analysis
 
 on:
-  schedule:
   push:
     paths-ignore:
       - '**.md'

From 7d054775682d70a53a0e5647430421121696a985 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 20:47:15 -0600
Subject: [PATCH 249/375] minor change

---
 .github/workflows/qodana.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index 892b7cfd1e..c668508cdc 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -101,7 +101,6 @@ jobs:
         run: |
           make -j$(getconf _NPROCESSORS_ONLN)
 
-
       - name: 'Qodana Scan'
         uses: JetBrains/qodana-action@v2023.2
         with:

From e76ef086f0b6c5f698183424d7f436812f46d977 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 21:06:47 -0600
Subject: [PATCH 250/375] trying to fix qodana

---
 .github/workflows/qodana.yml | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index c668508cdc..0c477d88fc 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -20,22 +20,19 @@ jobs:
   qodana-analysis:
     name: "Qodana analysis"
     runs-on: ubuntu-22.04
+
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 5
 
-      - name: Install PHP ${{ matrix.php }}
+      - name: Install PHP 8.0
         uses: shivammathur/setup-php@develop
         with:
           php-version: '8.0'
           extensions: mbstring, fileinfo, gmp, sqlite, pdo_sqlite, psr-${{ env.PSR_VERSION }}, zip, mysqli, zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}
           tools: phpize, php-config
           coverage: xdebug
-          # variables_order: https://github.com/zephir-lang/zephir/pull/1537
-          # enable_dl:       https://github.com/zephir-lang/zephir/pull/1654
-          # allow_url_fopen: https://github.com/zephir-lang/zephir/issues/1713
-          # error_reporting: https://github.com/zendframework/zend-code/issues/160
           ini-values: >-
             variables_order=EGPCS,
             enable_dl=On,
@@ -45,19 +42,9 @@ jobs:
             date.timezone=UTC,
             xdebug.max_nesting_level=256
         env:
+          phpts: 'ts'
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-#      - name: Get composer cache directory
-#        id: composer-cache
-#        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-#      - name: Set Up Composer Cache
-#        uses: actions/cache@v3
-#        with:
-#          path: ${{ steps.composer-cache.outputs.dir }}
-#          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-#          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Project Dependencies
         run: |
           echo "::group::Install composer dependencies"

From ab6fa2e3bf06abb3eeaa99f7edee336a0f0a0b68 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 21:11:28 -0600
Subject: [PATCH 251/375] changing qodana to php 8.1

---
 .github/workflows/qodana.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
index 0c477d88fc..0fd80e2f8f 100644
--- a/.github/workflows/qodana.yml
+++ b/.github/workflows/qodana.yml
@@ -26,10 +26,10 @@ jobs:
         with:
           fetch-depth: 5
 
-      - name: Install PHP 8.0
+      - name: Install PHP 8.1
         uses: shivammathur/setup-php@develop
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           extensions: mbstring, fileinfo, gmp, sqlite, pdo_sqlite, psr-${{ env.PSR_VERSION }}, zip, mysqli, zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}
           tools: phpize, php-config
           coverage: xdebug

From 558458e912c655a5c98d65777ebb49d757f82f3b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 21:20:33 -0600
Subject: [PATCH 252/375] different ci structure

---
 .github/workflows/main.yml   |  57 +++++++++++++++++--
 .github/workflows/qodana.yml | 104 -----------------------------------
 2 files changed, 51 insertions(+), 110 deletions(-)
 delete mode 100644 .github/workflows/qodana.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a63732de5f..09c9e3c47a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -175,14 +175,22 @@ jobs:
       - name: Unit Tests (Stub Extension)
         shell: pwsh
         run: |
-          php vendor/bin/phpunit -c phpunit.ext.xml
+          php vendor/bin/phpunit -c phpunit.ext.xml --coverage-php ./tests/output/ext-clover.xml
+        env:
+          XDEBUG_MODE: coverage
 
       - name: Unit Tests (Zephir)
         if: always()
-        run: php vendor/bin/phpunit --testsuite Zephir
+        run: php vendor/bin/phpunit --testsuite Zephir --coverage-php ./tests/output/clover.xml
         env:
           XDEBUG_MODE: coverage
 
+      - name: "Upload coverage file artifact"
+        uses: "actions/upload-artifact@v3"
+        with:
+          name: "unit-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}.coverage"
+          path: "tests/output/*.xml"
+
       - name: Black-box Testing
         if: always() && runner.os != 'Windows'
         shell: bash
@@ -190,14 +198,51 @@ jobs:
         run: |
           make -j$(getconf _NPROCESSORS_ONLN)
 
-      - name: Upload Code Coverage Report
-        uses: codecov/codecov-action@v3
+  upload-coverage:
+    permissions:
+      contents: read
+
+    name: "Upload coverage"
+    runs-on: "ubuntu-22.04"
+    needs:
+      - "build-and-test"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+        with:
+          fetch-depth: 2
+
+      - name: "Display structure of downloaded files"
+        run: |
+          mkdir -p reports
+
+      - name: "Download coverage files"
+        uses: "actions/download-artifact@v3"
+        with:
+          path: "reports"
+
+      - name: "Display structure of downloaded files"
+        run: ls -R
+        working-directory: reports
+
+      - name: "Upload to Codecov"
+        uses: "codecov/codecov-action@v3"
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./tests/output/clover.xml
-          flags: unittests,${{ runner.os }},php-${{ matrix.php }}
+          directory: reports
+          fail_ci_if_error: true
+          verbose: true
           name: codecov-umbrella
 
+      - name: "Upload to Qodana"
+        run: |
+          docker run \
+            -v $(pwd):/data/project/ \
+            -v ./reports/:/data/coverage \
+            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
+            jetbrains/qodana-php
+
       - name: Upload build artifacts after Failure
         if: failure()
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
deleted file mode 100644
index 0fd80e2f8f..0000000000
--- a/.github/workflows/qodana.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-name: Qodana Analysis
-
-on:
-  push:
-    paths-ignore:
-      - '**.md'
-      - '**.txt'
-      - '**/nightly.yml'
-      - '**/release.yml'
-      - '**/FUNDING.yml'
-
-env:
-  RE2C_VERSION: 2.2
-  ZEPHIR_PARSER_VERSION: 1.6.0
-  PSR_VERSION: 1.2.0
-  CACHE_DIR: .cache
-
-jobs:
-
-  qodana-analysis:
-    name: "Qodana analysis"
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 5
-
-      - name: Install PHP 8.1
-        uses: shivammathur/setup-php@develop
-        with:
-          php-version: '8.1'
-          extensions: mbstring, fileinfo, gmp, sqlite, pdo_sqlite, psr-${{ env.PSR_VERSION }}, zip, mysqli, zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}
-          tools: phpize, php-config
-          coverage: xdebug
-          ini-values: >-
-            variables_order=EGPCS,
-            enable_dl=On,
-            allow_url_fopen=On,
-            error_reporting=-1,
-            memory_limit=1G,
-            date.timezone=UTC,
-            xdebug.max_nesting_level=256
-        env:
-          phpts: 'ts'
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Install Project Dependencies
-        run: |
-          echo "::group::Install composer dependencies"
-          composer install --prefer-dist --no-interaction --no-ansi --no-progress
-          echo "::endgroup::"
-
-      - name: Fast Commands Test
-        run: php zephir --help
-
-      - name: Build Test Extension (Linux)
-        uses: ./.github/workflows/build-linux-ext
-        with:
-          compiler: 'gcc'
-          cflags: '-O2 -Wall -fvisibility=hidden -flto -DZEPHIR_RELEASE=1'
-          ldflags: '--coverage'
-
-      - name: Stub Extension Info
-        shell: pwsh
-        run: |
-          php --ini
-          php --ri stub
-
-      - name: Setup problem matchers for PHPUnit
-        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-      - name: Unit Tests (Stub Extension)
-        shell: pwsh
-        run: |
-          php vendor/bin/phpunit -c phpunit.ext.xml --coverage-php ./tests/output/ext-clover.xml
-
-      - name: Unit Tests (Zephir)
-        if: always()
-        run: php vendor/bin/phpunit --testsuite Zephir --coverage-php ./tests/output/clover.xml
-        env:
-          XDEBUG_MODE: coverage
-
-      - name: Black-box Testing
-        if: always() && runner.os != 'Windows'
-        shell: bash
-        working-directory: tests/sharness
-        run: |
-          make -j$(getconf _NPROCESSORS_ONLN)
-
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.2
-        with:
-          args: --baseline,qodana.sarif.json
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-
-      - name: "Upload to Qodana"
-        run: |
-          docker run \
-            -v $(pwd):/data/project/ \
-            -v ./tests/output/:/data/coverage \
-            -e QODANA_TOKEN="${{ secrets.QODANA_TOKEN }}" \
-            jetbrains/qodana-php

From 1ea0cc90a6e2b5c57f995b1e81c2c2db8fcc3e3b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 21:38:11 -0600
Subject: [PATCH 253/375] trying to get the coverage working

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 09c9e3c47a..1dbbde337d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -175,7 +175,7 @@ jobs:
       - name: Unit Tests (Stub Extension)
         shell: pwsh
         run: |
-          php vendor/bin/phpunit -c phpunit.ext.xml --coverage-php ./tests/output/ext-clover.xml
+          php vendor/bin/phpunit -c phpunit.ext.xml
         env:
           XDEBUG_MODE: coverage
 
@@ -189,7 +189,7 @@ jobs:
         uses: "actions/upload-artifact@v3"
         with:
           name: "unit-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}.coverage"
-          path: "tests/output/*.xml"
+          path: "tests/output/clover.xml"
 
       - name: Black-box Testing
         if: always() && runner.os != 'Windows'

From 3937a65d3a822427f6faa879f7440161b8df7c2f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 23:00:14 -0600
Subject: [PATCH 254/375] removed duplicates; corrected docblocks

---
 src/Backend/Backend.php                       |  2 +-
 src/Class/Method/Parameters.php               | 23 ++---
 src/Code/ArgInfoDefinition.php                |  2 +-
 src/Code/Builder/Struct.php                   | 83 +++++++---------
 src/Console/Command/RemoveOptionsTrait.php    |  1 -
 src/Documentation.php                         |  4 +-
 src/Documentation/Theme.php                   |  4 +-
 src/Exception/CompilerException.php           |  8 +-
 src/Exception/ParseException.php              |  8 +-
 .../Statements/CallFunctionStatement.php      |  2 +-
 .../Builder/Statements/IfStatement.php        |  2 +-
 src/Expression/PropertyDynamicAccess.php      | 34 +++----
 src/FileSystem/HardDisk.php                   | 13 +--
 src/FunctionCall.php                          | 61 ++++++------
 src/MethodCall.php                            |  4 +-
 .../Arithmetical/ArithmeticalBaseOperator.php | 98 ++++++++++++-------
 src/Operators/Arithmetical/DivOperator.php    | 41 ++------
 src/Operators/Arithmetical/ModOperator.php    | 42 ++------
 src/Operators/Bitwise/BitwiseBaseOperator.php | 87 +++++++---------
 src/Operators/Logical/LogicalBaseOperator.php | 40 ++++----
 src/Operators/Other/CastOperator.php          |  2 +-
 .../FunctionCall/GlobalsSetOptimizer.php      | 49 +++++-----
 .../FunctionCall/VarDumpOptimizer.php         | 13 +--
 .../FunctionCall/VarExportOptimizer.php       | 13 +--
 src/Passes/StaticTypeInference.php            | 40 +++-----
 src/Statements/ForStatement.php               |  2 +-
 src/Statements/Let/ExportSymbolString.php     | 10 +-
 src/Statements/LetStatement.php               | 69 ++++++-------
 src/Statements/SwitchStatement.php            | 10 +-
 src/StaticCall.php                            |  6 +-
 src/SymbolTable.php                           | 21 ++--
 src/Types/Types.php                           |  6 +-
 32 files changed, 341 insertions(+), 459 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index a9db8649ff..c07625b3b1 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -938,7 +938,7 @@ public function declareVariables($method, $typeToVariables)
             $groupVariables = [];
 
             /**
-             * @var Variable[]
+             * @var Variable[] $variable
              */
             foreach ($variables as $variable) {
                 $nextCode = $this->generateInitCode($groupVariables, $type, $pointer, $variable);
diff --git a/src/Class/Method/Parameters.php b/src/Class/Method/Parameters.php
index a7feb2a384..073b79c5ef 100644
--- a/src/Class/Method/Parameters.php
+++ b/src/Class/Method/Parameters.php
@@ -18,6 +18,8 @@
 use Iterator;
 use Zephir\Exception\CompilerException;
 
+use Zephir\Types\Types;
+
 use function count;
 
 /**
@@ -82,19 +84,14 @@ public function fetchParameters(bool $isMethodInternal): array
             $name     = $parameter['name'];
             $dataType = $parameter['data-type'] ?? 'variable';
 
-            switch ($dataType) {
-                case 'object':
-                case 'callable':
-                case 'resource':
-                case 'variable':
-                case 'mixed':
-                    $parameters[] = $isMethodInternal ? $name : '&' . $name;
-                    break;
-
-                default:
-                    $parameters[] = ($isMethodInternal ? $name : '&' . $name) . '_param';
-                    break;
-            }
+            $parameters[] = match ($dataType) {
+                Types::T_OBJECT,
+                Types::T_CALLABLE,
+                Types::T_RESOURCE,
+                Types::T_VARIABLE,
+                Types::T_MIXED => $isMethodInternal ? $name : '&' . $name,
+                default        => ($isMethodInternal ? $name : '&' . $name) . '_param',
+            };
 
             if (isset($parameter['default'])) {
                 $this->optionalParameters[] = $parameter;
diff --git a/src/Code/ArgInfoDefinition.php b/src/Code/ArgInfoDefinition.php
index 897ac0d9f6..9c6c9ebc4b 100644
--- a/src/Code/ArgInfoDefinition.php
+++ b/src/Code/ArgInfoDefinition.php
@@ -324,7 +324,7 @@ private function renderPhalconCompatible(): bool
         $compatibilityClasses  = require_once __DIR__ . '/../../config/phalcon-compatibility-headers.php';
         $classDefinition       = $this->functionLike->getClassDefinition();
         $implementedInterfaces = $classDefinition !== null ? $classDefinition->getImplementedInterfaces() : [];
-        $extendsClass          = $classDefinition !== null ? $classDefinition->getExtendsClass() : null;
+        $extendsClass          = $classDefinition?->getExtendsClass();
 
         if (empty($implementedInterfaces) && $extendsClass === null) {
             return false;
diff --git a/src/Code/Builder/Struct.php b/src/Code/Builder/Struct.php
index c20c7d8c05..7128eb4e53 100644
--- a/src/Code/Builder/Struct.php
+++ b/src/Code/Builder/Struct.php
@@ -15,6 +15,7 @@
 
 use Zephir\Exception\InvalidArgumentException;
 use Zephir\Exception\RuntimeException;
+use Zephir\Types\Types;
 
 use function sprintf;
 use function substr;
@@ -88,24 +89,23 @@ public function getCDefault(string $name, array $global, string $namespace): str
             throw new RuntimeException('Field "' . $name . '" does not have a default value');
         }
 
-        switch ($global['type']) {
-            case 'boolean':
-            case 'bool':
-                return '';
-
-            case 'string':
-                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));';
-
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'double':
-            case 'hash':
-                return "\t" . $namespace . '_globals->' . $this->simpleName . '.' . $name . ' = ' . $global['default'] . ';';
-
-            default:
-                throw new InvalidArgumentException('Unknown global type: ' . $global['type']);
-        }
+        return match ($global['type']) {
+            Types::T_BOOL,
+            Types::T_BOOLEAN => '',
+            Types::T_STRING  => "\t" . $namespace
+                . '_globals->' . $this->simpleName . '.' . $name
+                . ' = ZSTR_VAL(zend_string_init(ZEND_STRL("' . $global['default'] . '"), 0));',
+            Types::T_INT,
+            Types::T_UINT,
+            Types::T_LONG,
+            Types::T_DOUBLE,
+            Types::T_HASH    => "\t" . $namespace
+                . '_globals->' . $this->simpleName . '.' . $name
+                . ' = ' . $global['default'] . ';',
+            default          => throw new InvalidArgumentException(
+                'Unknown global type: ' . $global['type']
+            ),
+        };
     }
 
     /**
@@ -126,36 +126,23 @@ public function getInitEntry(string $name, array $global, string $namespace): st
         $iniName    = $iniEntry['name'] ?? $namespace . '.' . $structName;
         $scope      = $iniEntry['scope'] ?? 'PHP_INI_ALL';
 
-        switch ($global['type']) {
-            case 'boolean':
-            case 'bool':
-                return
-                    'STD_PHP_INI_BOOLEAN("' .
-                    $iniName .
-                    '", "' .
-                    (int)(true === $global['default']) .
-                    '", ' .
-                    $scope .
-                    ', OnUpdateBool, ' .
-                    $structName .
-                    ', zend_' .
-                    $namespace .
-                    '_globals, ' .
-                    $namespace . '_globals)';
-
-            case 'string':
-                return sprintf(
-                    'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
-                    '"' . $iniName . '"',
-                    '"' . $global['default'] . '"',
-                    $scope,
-                    $structName,
-                    'zend_' . $namespace . '_globals',
-                    $namespace . '_globals',
-                );
-        }
-
-        return '';
+        return match ($global['type']) {
+            Types::T_BOOLEAN,
+            Types::T_BOOL   => 'STD_PHP_INI_BOOLEAN("' . $iniName . '", "'
+                . (int)(true === $global['default']) . '", ' . $scope
+                . ', OnUpdateBool, ' . $structName . ', zend_' . $namespace
+                . '_globals, ' . $namespace . '_globals)',
+            Types::T_STRING => sprintf(
+                'STD_PHP_INI_ENTRY(%s, %s, %s, NULL, %s, %s, %s)',
+                '"' . $iniName . '"',
+                '"' . $global['default'] . '"',
+                $scope,
+                $structName,
+                'zend_' . $namespace . '_globals',
+                $namespace . '_globals',
+            ),
+            default         => '',
+        };
     }
 
     /**
diff --git a/src/Console/Command/RemoveOptionsTrait.php b/src/Console/Command/RemoveOptionsTrait.php
index 62987b8475..99636d39e0 100644
--- a/src/Console/Command/RemoveOptionsTrait.php
+++ b/src/Console/Command/RemoveOptionsTrait.php
@@ -23,7 +23,6 @@ trait RemoveOptionsTrait
 {
     protected function removeOptions(array $names): void
     {
-        /** @var InputDefinition $definition */
         $definition = $this->getDefinition();
 
         $filtered = array_filter(
diff --git a/src/Documentation.php b/src/Documentation.php
index d54810e998..eb25c7685f 100644
--- a/src/Documentation.php
+++ b/src/Documentation.php
@@ -151,7 +151,7 @@ public static function classUrl($c)
     /**
      * Search a theme by its name.
      *
-     * Return the path to it if it exists. Otherwise NULL.
+     * Return the path to it if it exists, otherwise NULL.
      *
      * @param string $name
      *
@@ -247,7 +247,7 @@ protected function initialize(): void
      *
      * output directory is checked in this order :
      *  => check if the command line argument --output-directory was given
-     *  => if not ; check if config config[api][path] was given
+     *  => if not ; check if config[api][path] was given
      *
      * @param string $outputDir
      *
diff --git a/src/Documentation/Theme.php b/src/Documentation/Theme.php
index bf6760434d..f70307c42c 100644
--- a/src/Documentation/Theme.php
+++ b/src/Documentation/Theme.php
@@ -148,9 +148,7 @@ public function buildStaticDirectory(): void
             mkdir($outputStt, 0777, true);
         }
 
-        if ($this->extendedTheme) {
-            $this->extendedTheme->buildStaticDirectory();
-        }
+        $this->extendedTheme?->buildStaticDirectory();
 
         $themeStt = $this->getThemePath('static');
 
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 6015223b75..728f0ddf04 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -26,10 +26,10 @@ class CompilerException extends RuntimeException
     /**
      * CompilerException constructor.
      *
-     * @param string              $message  the Exception message to throw [optional]
-     * @param array|null          $extra    extra info [optional]
-     * @param int                 $code     the Exception code [optional]
-     * @param Exception|Throwable $previous the previous throwable used for the exception chaining [optional]
+     * @param string                   $message  the Exception message to throw [optional]
+     * @param array|null               $extra    extra info [optional]
+     * @param int                      $code     the Exception code [optional]
+     * @param Exception|Throwable|null $previous the previous throwable used for the exception chaining [optional]
      */
     public function __construct(
         string $message = '',
diff --git a/src/Exception/ParseException.php b/src/Exception/ParseException.php
index ae99a38584..8b20a1e401 100644
--- a/src/Exception/ParseException.php
+++ b/src/Exception/ParseException.php
@@ -26,10 +26,10 @@ class ParseException extends RuntimeException
     /**
      * ParseException constructor.
      *
-     * @param string              $message  the Exception message to throw [optional]
-     * @param array|null          $extra    extra info [optional]
-     * @param int                 $code     the Exception code [optional]
-     * @param Exception|Throwable $previous the previous throwable used for the exception chaining [optional]
+     * @param string                   $message  the Exception message to throw [optional]
+     * @param array|null               $extra    extra info [optional]
+     * @param int                      $code     the Exception code [optional]
+     * @param Exception|Throwable|null $previous the previous throwable used for the exception chaining [optional]
      */
     public function __construct(
         string $message = '',
diff --git a/src/Expression/Builder/Statements/CallFunctionStatement.php b/src/Expression/Builder/Statements/CallFunctionStatement.php
index c83539c430..44cc80a440 100644
--- a/src/Expression/Builder/Statements/CallFunctionStatement.php
+++ b/src/Expression/Builder/Statements/CallFunctionStatement.php
@@ -97,7 +97,7 @@ public function getTypeCall()
     }
 
     /**
-     * @param array $arguments
+     * @param array|null $arguments
      *
      * @return $this
      */
diff --git a/src/Expression/Builder/Statements/IfStatement.php b/src/Expression/Builder/Statements/IfStatement.php
index e62697c189..185b8abfe3 100644
--- a/src/Expression/Builder/Statements/IfStatement.php
+++ b/src/Expression/Builder/Statements/IfStatement.php
@@ -81,7 +81,7 @@ public function getStatements()
     }
 
     /**
-     * @param $condition
+     * @param AbstractOperator $condition
      *
      * @return $this
      */
diff --git a/src/Expression/PropertyDynamicAccess.php b/src/Expression/PropertyDynamicAccess.php
index 001581781f..7c2d08a0b7 100644
--- a/src/Expression/PropertyDynamicAccess.php
+++ b/src/Expression/PropertyDynamicAccess.php
@@ -18,6 +18,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Name;
+use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
 /**
@@ -69,23 +70,18 @@ public function compile($expression, CompilationContext $compilationContext)
                 );
         }
 
-        switch ($propertyAccess['right']['type']) {
-            case 'variable':
-                $propertyVariable = $compilationContext->symbolTable->getVariableForRead(
-                    $propertyAccess['right']['value'],
-                    $compilationContext,
-                    $expression
-                );
-                break;
-            case 'string':
-                $propertyVariable = null;
-                break;
-            default:
-                throw new CompilerException(
-                    'Variable type: ' . $propertyAccess['right']['type'] . ' cannot be used as object',
-                    $propertyAccess['left']
-                );
-        }
+        $propertyVariable = match ($propertyAccess['right']['type']) {
+            Types::T_VARIABLE => $compilationContext->symbolTable->getVariableForRead(
+                $propertyAccess['right']['value'],
+                $compilationContext,
+                $expression
+            ),
+            Types::T_STRING   => null,
+            default           => throw new CompilerException(
+                'Variable type: ' . $propertyAccess['right']['type'] . ' cannot be used as object',
+                $propertyAccess['left']
+            ),
+        };
 
         /**
          * Resolves the symbol that expects the value
@@ -144,8 +140,8 @@ public function compile($expression, CompilationContext $compilationContext)
      * Sets if the variable must be resolved into a direct variable symbol
      * create a temporary value or ignore the return value.
      *
-     * @param bool     $expecting
-     * @param Variable $expectingVariable
+     * @param bool          $expecting
+     * @param Variable|null $expectingVariable
      */
     public function setExpectReturn($expecting, Variable $expectingVariable = null): void
     {
diff --git a/src/FileSystem/HardDisk.php b/src/FileSystem/HardDisk.php
index 5b07163d9b..50a87a9009 100644
--- a/src/FileSystem/HardDisk.php
+++ b/src/FileSystem/HardDisk.php
@@ -264,14 +264,11 @@ public function write(string $path, string $data): void
 
     protected function deleteFileInfoObject(SplFileInfo $file): bool
     {
-        switch ($file->getType()) {
-            case 'dir':
-                return @rmdir((string)$file->getRealPath());
-            case 'link':
-                return @unlink($file->getPathname());
-            default:
-                return @unlink((string)$file->getRealPath());
-        }
+        return match ($file->getType()) {
+            'dir'   => @rmdir((string)$file->getRealPath()),
+            'link'  => @unlink($file->getPathname()),
+            default => @unlink((string)$file->getRealPath()),
+        };
     }
 
     private function listDirectoryRecursively(
diff --git a/src/FunctionCall.php b/src/FunctionCall.php
index 8d014c14bf..000d6d0b4b 100644
--- a/src/FunctionCall.php
+++ b/src/FunctionCall.php
@@ -85,14 +85,11 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         $this->expression = $expr;
         $expression       = $expr->getExpression();
 
-        switch ($expression['call-type']) {
-            case self::CALL_NORMAL:
-                return $this->_callNormal($expression, $compilationContext);
-            case self::CALL_DYNAMIC:
-                return $this->_callDynamic($expression, $compilationContext);
-        }
-
-        return new CompiledExpression('null', null, $expression);
+        return match ($expression['call-type']) {
+            self::CALL_NORMAL  => $this->_callNormal($expression, $compilationContext),
+            self::CALL_DYNAMIC => $this->_callDynamic($expression, $compilationContext),
+            default            => new CompiledExpression('null', null, $expression),
+        };
     }
 
     /**
@@ -167,26 +164,24 @@ public function getReflector($funcName)
      */
     public function isBuiltInFunction(string $functionName)
     {
-        switch ($functionName) {
-            case 'memstr':
-            case 'get_class_ns':
-            case 'get_ns_class':
-            case 'camelize':
-            case 'uncamelize':
-            case 'starts_with':
-            case 'ends_with':
-            case 'prepare_virtual_path':
-            case 'create_instance':
-            case 'create_instance_params':
-            case 'create_symbol_table':
-            case 'globals_get':
-            case 'globals_set':
-            case 'merge_append':
-            case 'get_class_lower':
-                return true;
-        }
-
-        return false;
+        return match ($functionName) {
+            'memstr',
+            'get_class_ns',
+            'get_ns_class',
+            'camelize',
+            'uncamelize',
+            'starts_with',
+            'ends_with',
+            'prepare_virtual_path',
+            'create_instance',
+            'create_instance_params',
+            'create_symbol_table',
+            'globals_get',
+            'globals_set',
+            'merge_append',
+            'get_class_lower' => true,
+            default           => false,
+        };
     }
 
     /**
@@ -258,7 +253,7 @@ protected function _callDynamic(array $expression, CompilationContext $compilati
         $this->addCallStatusFlag($compilationContext);
 
         /**
-         * Call functions must grown the stack
+         * Call functions must grow the stack
          */
         $compilationContext->symbolTable->mustGrownStack(true);
 
@@ -398,7 +393,7 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
 
         /**
          * At this point the function will be called in the PHP userland.
-         * PHP functions only return zvals so we need to validate the target variable is also a zval.
+         * PHP functions only return zvals, so we need to validate the target variable is also a zval.
          */
         $symbolVariable = $this->getSymbolVariable();
         if ($symbolVariable) {
@@ -417,7 +412,7 @@ protected function _callNormal(array $expression, CompilationContext $compilatio
         $compilationContext->headersManager->add('kernel/fcall');
 
         /**
-         * Call functions must grown the stack
+         * Call functions must grow the stack
          */
         $compilationContext->symbolTable->mustGrownStack(true);
 
@@ -537,7 +532,7 @@ protected function isReadOnly($funcName, array $expression)
         }
 
         /*
-         * These functions are supposed to be read-only but they change parameters ref-count
+         * These functions are supposed to be read-only, but they change parameters ref-count
          */
         switch ($funcName) {
             case 'min':
@@ -652,7 +647,7 @@ protected function markReferences(
     }
 
     /**
-     * Tries to find specific an specialized optimizer for function calls.
+     * Tries to find specific a specialized optimizer for function calls.
      *
      * @param string             $funcName
      * @param array              $expression
diff --git a/src/MethodCall.php b/src/MethodCall.php
index c2b777fdda..e3a5f1d2b9 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -88,7 +88,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                         $builtInTypeClass = 'Zephir\Types\\' . ucfirst($variableVariable->getType()) . 'Type';
                         if (class_exists($builtInTypeClass)) {
                             /**
-                             * @var AbstractType
+                             * @var AbstractType $builtInType
                              */
                             $builtInType = new $builtInTypeClass();
                             $caller      = $exprCompiledVariable;
@@ -173,7 +173,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
         }
 
         /*
-         * Method calls only return zvals so we need to validate the target variable is also a zval
+         * Method calls only return zvals, so we need to validate the target variable is also a zval
          */
         if (!$builtInType) {
             if ($isExpecting) {
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index adb596afe4..f3ffe047f2 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -19,6 +19,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
+use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
 use function sprintf;
@@ -101,13 +102,6 @@ public function compile($expression, CompilationContext $compilationContext)
                             case 'uint':
                             case 'long':
                             case 'ulong':
-                                return new CompiledExpression(
-                                    'int',
-                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
                             case 'bool':
                                 return new CompiledExpression(
                                     'int',
@@ -150,32 +144,26 @@ public function compile($expression, CompilationContext $compilationContext)
                 }
 
             case 'bool':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'double':
-                        return new CompiledExpression(
-                            'long',
-                            '(' . $left->getBooleanCode() . ' + ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
-                            ) . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'bool' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
+                return match ($right->getType()) {
+                    Types::T_INT,
+                    Types::T_UINT,
+                    Types::T_LONG,
+                    Types::T_ULONG,
+                    Types::T_DOUBLE => new CompiledExpression(
+                        'long',
+                        '(' . $left->getBooleanCode() . ' + ' . $right->getCode() . ')',
+                        $expression
+                    ),
+                    Types::T_BOOL   => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
+                        $expression
+                    ),
+                    default         => throw new CompilerException(
+                        "Cannot operate 'bool' with '" . $right->getType() . "'",
+                        $expression
+                    ),
+                };
 
             case 'double':
                 switch ($right->getType()) {
@@ -262,10 +250,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
             case 'string':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException('Operation is not supported between strings', $expression);
-                }
+                throw match ($right->getType()) {
+                    default => new CompilerException(
+                        'Operation is not supported between strings',
+                        $expression
+                    ),
+                };
 
             case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -853,4 +843,38 @@ private function getDynamicTypes(Variable $left, Variable $right): string
 
         return 'double';
     }
+
+    /**
+     * @param CompiledExpression $right
+     * @param CompiledExpression $left
+     * @param array              $expression
+     *
+     * @return CompiledExpression
+     */
+    protected function processLeftBoolean(
+        CompiledExpression $right,
+        CompiledExpression $left,
+        array $expression
+    ): CompiledExpression {
+        return match ($right->getType()) {
+            Types::T_INT,
+            Types::T_UINT,
+            Types::T_LONG,
+            Types::T_ULONG,
+            Types::T_DOUBLE => new CompiledExpression(
+                'long',
+                '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
+                $expression
+            ),
+            Types::T_BOOL   => new CompiledExpression(
+                'bool',
+                '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',
+                $expression
+            ),
+            default         => throw new CompilerException(
+                "Cannot operate 'bool' with '" . $right->getType() . "'",
+                $expression
+            ),
+        };
+    }
 }
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 8d0f83f4af..7fcdc409b0 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -17,6 +17,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Types\Types;
 
 /**
  * Generates an arithmetical operation according to the operands
@@ -131,32 +132,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
             case 'bool':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'double':
-                        return new CompiledExpression(
-                            'long',
-                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
-                            ) . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'bool' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
+                return $this->processLeftBoolean($right, $left, $expression);
 
 
             case 'double':
@@ -242,13 +218,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
             case 'string':
             case 'array':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException(
-                            'Operation is not supported between ' . $right->getType(),
-                            $expression
-                        );
-                }
+                throw match ($right->getType()) {
+                    default => new CompilerException(
+                        'Operation is not supported between ' . $right->getType(),
+                        $expression
+                    ),
+                };
 
 
             case 'variable':
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 014a1c31cb..230d2ed613 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -17,6 +17,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
+use Zephir\Types\Types;
 
 /**
  * Generates an arithmetical operation according to the operands
@@ -140,33 +141,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
             case 'bool':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'double':
-                        return new CompiledExpression(
-                            'long',
-                            '(' . $left->getBooleanCode() . ' - ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
-                            ) . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'bool' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
-
+                return $this->processLeftBoolean($left, $right, $expression);
 
             case 'double':
                 switch ($right->getType()) {
@@ -260,13 +235,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
             case 'string':
             case 'array':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException(
-                            'Operation is not supported between ' . $right->getType(),
-                            $expression
-                        );
-                }
+                throw match ($right->getType()) {
+                    default => new CompilerException(
+                        'Operation is not supported between ' . $right->getType(),
+                        $expression
+                    ),
+                };
 
 
             case 'variable':
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index 753492c09d..a56400625c 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -304,10 +304,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
             case 'string':
-                switch ($right->getType()) {
-                    default:
-                        throw new CompilerException('Operation is not supported between strings', $expression);
-                }
+                throw match ($right->getType()) {
+                    default => new CompilerException(
+                        'Operation is not supported between strings',
+                        $expression
+                    ),
+                };
 
 
             case 'variable':
@@ -612,16 +614,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                        $compilationContext->headersManager->add('kernel/operators');
-
-                                        return new CompiledExpression(
-                                            'int',
-                                            '((int) (zephir_get_numberval(' . $symbol . ')) ' . $this->operator . ' ' . $variableRight->getName(
-                                            ) . ')',
-                                            $expression
-                                        );
-
-
                                     /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
@@ -633,7 +625,6 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-
                                     /* a(var) + a(var) */
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
@@ -728,43 +719,33 @@ public function optimizeConstantFolding(
         /*
          * Return value will be always int
          */
-        switch ($this->operator) {
-            case '&':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] & $expression['right']['value'],
-                    $expression
-                );
-
-            case '|':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] | $expression['right']['value'],
-                    $expression
-                );
-
-            case '^':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] ^ $expression['right']['value'],
-                    $expression
-                );
-
-            case '<<':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] << $expression['right']['value'],
-                    $expression
-                );
-
-            case '>>':
-                return new CompiledExpression(
-                    'int',
-                    $expression['left']['value'] >> $expression['right']['value'],
-                    $expression
-                );
-        }
-
-        return null;
+        return match ($this->operator) {
+            '&'     => new CompiledExpression(
+                'int',
+                $expression['left']['value'] & $expression['right']['value'],
+                $expression
+            ),
+            '|'     => new CompiledExpression(
+                'int',
+                $expression['left']['value'] | $expression['right']['value'],
+                $expression
+            ),
+            '^'     => new CompiledExpression(
+                'int',
+                $expression['left']['value'] ^ $expression['right']['value'],
+                $expression
+            ),
+            '<<'    => new CompiledExpression(
+                'int',
+                $expression['left']['value'] << $expression['right']['value'],
+                $expression
+            ),
+            '>>'    => new CompiledExpression(
+                'int',
+                $expression['left']['value'] >> $expression['right']['value'],
+                $expression
+            ),
+            default => null,
+        };
     }
 }
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index 72fe54b1a2..9b5a30d35e 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -18,6 +18,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
+use Zephir\Types\Types;
 
 /**
  * This is the base operator for logical operators
@@ -166,28 +167,23 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 }
 
             case 'double':
-                switch ($right->getType()) {
-                    case 'double':
-                    case 'int':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
-                            $expression
-                        );
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot compare 'double' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
+                return match ($right->getType()) {
+                    Types::T_DOUBLE,
+                    Types::T_INT  => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getCode() . ')',
+                        $expression
+                    ),
+                    Types::T_BOOL => new CompiledExpression(
+                        'bool',
+                        '(' . $left->getCode() . ' ' . $this->operator . ' ' . $right->getBooleanCode() . ')',
+                        $expression
+                    ),
+                    default       => throw new CompilerException(
+                        "Cannot compare 'double' with '" . $right->getType() . "'",
+                        $expression
+                    ),
+                };
 
 
             case 'string':
diff --git a/src/Operators/Other/CastOperator.php b/src/Operators/Other/CastOperator.php
index b0f6dc5542..8ed0312f62 100644
--- a/src/Operators/Other/CastOperator.php
+++ b/src/Operators/Other/CastOperator.php
@@ -592,7 +592,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
                         /**
                          * zephir_convert_to_object use zval variable
-                         * before use with it we create a new variable and assign value of literal.
+                         * before use it we create a new variable and assign value of literal.
                          */
                         $let                  = new LetVariable();
                         $original             = $resolved->getOriginal();
diff --git a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
index 52f5f89dd7..89d3fd4f6e 100644
--- a/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
+++ b/src/Optimizers/FunctionCall/GlobalsSetOptimizer.php
@@ -19,6 +19,7 @@
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Types\Types;
 
 use function count;
 use function is_string;
@@ -123,32 +124,26 @@ private function resolveInternalValue(array $definition, array $expression, stri
     {
         $type = $definition['type'];
 
-        switch ($type) {
-            case 'boolean':
-            case 'bool':
-                return strtr('zend_is_true(:v)', [':v' => $value]);
-            case 'int':
-            case 'uint':
-            case 'integer':
-            case 'long':
-            case 'ulong':
-                return strtr('zval_get_long(:v)', [':v' => $value]);
-            case 'string':
-                return strtr('ZSTR_VAL(zval_get_string(:v))', [':v' => $value]);
-            case 'char':
-            case 'uchar':
-                return strtr(
-                    '(Z_TYPE_P(:v) == IS_STRING ? (Z_STRLEN_P(:v) ? Z_STRVAL_P(:v)[0] : NULL) : zval_get_long(:v))',
-                    [':v' => $value]
-                );
-            case 'double':
-            case 'float':
-                return strtr('zval_get_double(:v)', [':v' => $value]);
-            default:
-                throw new CompilerException(
-                    "Unknown type '{$type}' to setting global variable '{$name}'.",
-                    $expression
-                );
-        }
+        return match ($type) {
+            Types::T_BOOLEAN,
+            Types::T_BOOL   => strtr('zend_is_true(:v)', [':v' => $value]),
+            Types::T_INT,
+            Types::T_UINT,
+            Types::T_INTEGER,
+            Types::T_LONG,
+            Types::T_ULONG  => strtr('zval_get_long(:v)', [':v' => $value]),
+            Types::T_STRING => strtr('ZSTR_VAL(zval_get_string(:v))', [':v' => $value]),
+            Types::T_CHAR,
+            Types::T_UCHAR  => strtr(
+                '(Z_TYPE_P(:v) == IS_STRING ? (Z_STRLEN_P(:v) ? Z_STRVAL_P(:v)[0] : NULL) : zval_get_long(:v))',
+                [':v' => $value]
+            ),
+            Types::T_DOUBLE,
+            Types::T_FLOAT  => strtr('zval_get_double(:v)', [':v' => $value]),
+            default         => throw new CompilerException(
+                "Unknown type '$type' to setting global variable '$name'.",
+                $expression
+            ),
+        };
     }
 }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index 9a549f5201..0b38116151 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -18,6 +18,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
 use Zephir\Statements\LetStatement;
+use Zephir\Types\Types;
 
 /**
  * VarDumpOptimizer.
@@ -48,14 +49,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                 /*
                  * Complex expressions require a temporary variable
                  */
-                switch ($resolvedParam->getType()) {
-                    case 'array':
-                        $type = 'array';
-                        break;
-                    default:
-                        $type = 'variable';
-                        break;
-                }
+                $type = match ($resolvedParam->getType()) {
+                    Types::T_ARRAY => 'array',
+                    default => 'variable',
+                };
 
                 $variable = $context->symbolTable->addTemp($type, $context);
                 $variable->initVariant($context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 619950d852..9eea35e60e 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -19,6 +19,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 use Zephir\Statements\LetStatement;
+use Zephir\Types\Types;
 
 /**
  * VarExportOptimizer.
@@ -58,14 +59,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             /*
              * Complex expressions require a temporary variable
              */
-            switch ($resolvedParam->getType()) {
-                case 'array':
-                    $type = 'array';
-                    break;
-                default:
-                    $type = 'variable';
-                    break;
-            }
+            $type = match ($resolvedParam->getType()) {
+                Types::T_ARRAY => 'array',
+                default => 'variable',
+            };
 
             $variable = $context->symbolTable->addTemp($type, $context);
             $variable->initVariant($context);
diff --git a/src/Passes/StaticTypeInference.php b/src/Passes/StaticTypeInference.php
index 681abd3cfc..e2285ece39 100644
--- a/src/Passes/StaticTypeInference.php
+++ b/src/Passes/StaticTypeInference.php
@@ -226,6 +226,12 @@ public function passExpression(array $expression)
             case 'closure':
             case 'closure-arrow':
             case 'static-constant-access':
+            case 'irange':
+            case 'erange':
+            case 'empty-array':
+            case 'clone':
+            case 'require':
+            case 'require_once':
                 return 'variable';
 
             case 'reference':
@@ -296,13 +302,12 @@ public function passExpression(array $expression)
 
                 return 'int';
 
-            case 'and':
-            case 'or':
-                return 'bool';
 
             case 'concat':
                 return 'string';
 
+            case 'and':
+            case 'or':
             case 'equals':
             case 'identical':
             case 'not-identical':
@@ -313,10 +318,6 @@ public function passExpression(array $expression)
             case 'less-equal':
                 return 'bool';
 
-            case 'irange':
-            case 'erange':
-                return 'variable';
-
             case 'typeof':
                 $this->passExpression($expression['left']);
 
@@ -329,6 +330,11 @@ public function passExpression(array $expression)
 
             case 'not':
             case 'bitwise_not':
+            case 'isset':
+            case 'empty':
+            case 'instanceof':
+            case 'likely':
+            case 'unlikely':
                 $this->passExpression($expression['left']);
 
                 return 'bool';
@@ -345,9 +351,6 @@ public function passExpression(array $expression)
 
                 return 'variable';
 
-            case 'empty-array':
-                return 'variable';
-
             case 'new':
             case 'new-type':
                 $this->passNew($expression);
@@ -369,15 +372,6 @@ public function passExpression(array $expression)
 
                 return 'bool';
 
-            case 'isset':
-            case 'empty':
-            case 'instanceof':
-            case 'likely':
-            case 'unlikely':
-                $this->passExpression($expression['left']);
-
-                return 'bool';
-
             case 'list':
                 return $this->passExpression($expression['left']);
 
@@ -397,11 +391,6 @@ public function passExpression(array $expression)
             case 'constant':
                 return null;
 
-            case 'clone':
-            case 'require':
-            case 'require_once':
-                return 'variable';
-
             case 'ternary':
             case 'short-ternary':
                 // $right = $this->passExpression($expression['right']);
@@ -435,9 +424,6 @@ public function passLetStatement(array $statement): void
                 case 'object-property-array-index':
                 case 'object-property-append':
                 case 'static-property-access':
-                    $this->markVariable($assignment['variable'], 'variable');
-                    break;
-
                 case 'variable-append':
                     $this->markVariable($assignment['variable'], 'variable');
                     break;
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 7454538837..dc3a3e4f31 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -942,7 +942,7 @@ private function compileStatementsForBlock(
      * @param Variable           $keyVariable
      * @param CompilationContext $compilationContext
      *
-     * @return LetStatement
+     * @return void
      */
     private function getLetStatement(
         mixed $keyVariableName,
diff --git a/src/Statements/Let/ExportSymbolString.php b/src/Statements/Let/ExportSymbolString.php
index 66cf1708c3..43546620c5 100644
--- a/src/Statements/Let/ExportSymbolString.php
+++ b/src/Statements/Let/ExportSymbolString.php
@@ -28,11 +28,11 @@ class ExportSymbolString
     /**
      * Compiles {"var"} = {expr}.
      *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext ,
-     * @param array              $statement
+     * @param string                  $variable
+     * @param ZephirVariable|null     $symbolVariable
+     * @param CompiledExpression|null $resolvedExpr
+     * @param CompilationContext|null $compilationContext ,
+     * @param array|null              $statement
      */
     public function assign(
         $variable,
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index 3beb3d35af..ed4dcd3561 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -68,36 +68,28 @@ public function compile(CompilationContext $compilationContext): void
             /*
              * Get the symbol from the symbol table if necessary
              */
-            switch ($assignment['assign-type']) {
-                case 'static-property':
-                case 'static-property-append':
-                case 'static-property-array-index':
-                case 'static-property-array-index-append':
-                case 'dynamic-variable-string':
-                    $symbolVariable = null;
-                    break;
-
-                case 'array-index':
-                case 'variable-append':
-                case 'object-property':
-                case 'array-index-append':
-                case 'string-dynamic-object-property':
-                case 'variable-dynamic-object-property':
-                    $symbolVariable = $compilationContext->symbolTable->getVariableForUpdate(
-                        $variable,
-                        $compilationContext,
-                        $assignment
-                    );
-                    break;
-
-                default:
-                    $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
-                        $variable,
-                        $compilationContext,
-                        $assignment
-                    );
-                    break;
-            }
+            $symbolVariable = match ($assignment['assign-type']) {
+                'static-property',
+                'static-property-append',
+                'static-property-array-index',
+                'static-property-array-index-append',
+                'dynamic-variable-string'     => null,
+                'array-index',
+                'variable-append',
+                'object-property',
+                'array-index-append',
+                'string-dynamic-object-property',
+                'variable-dynamic-object-property' => $compilationContext->symbolTable->getVariableForUpdate(
+                    $variable,
+                    $compilationContext,
+                    $assignment
+                ),
+                default                                                                                                                                         => $compilationContext->symbolTable->getVariableForWrite(
+                    $variable,
+                    $compilationContext,
+                    $assignment
+                ),
+            };
 
             /*
              * Incr/Decr assignments don't require an expression
@@ -144,7 +136,7 @@ public function compile(CompilationContext $compilationContext): void
                 $resolvedExpr = $expr->compile($compilationContext);
 
                 /*
-                 * Bad implemented operators could return values different than objects
+                 * Bad implemented operators could return values different from objects
                  */
                 if (!is_object($resolvedExpr)) {
                     throw new CompilerException('Resolved expression is not valid', $assignment['expr']);
@@ -194,16 +186,11 @@ public function compile(CompilationContext $compilationContext): void
                 case 'static-property':
                     $let = new LetStaticProperty();
                     if (isset($assignment['operator'])) {
-                        switch ($assignment['operator']) {
-                            case 'add-assign':
-                                $let = new LetStaticPropertyAdd();
-                                break;
-                            case 'sub-assign':
-                                $let = new LetStaticPropertySub();
-                                break;
-                            default:
-                                $let = new LetStaticProperty();
-                        }
+                        $let = match ($assignment['operator']) {
+                            'add-assign' => new LetStaticPropertyAdd(),
+                            'sub-assign' => new LetStaticPropertySub(),
+                            default      => new LetStaticProperty(),
+                        };
                     }
 
                     $let->assignStatic(
diff --git a/src/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
index e3eca50c22..6cf8e67600 100644
--- a/src/Statements/SwitchStatement.php
+++ b/src/Statements/SwitchStatement.php
@@ -111,15 +111,13 @@ public function compile(CompilationContext $compilationContext): void
                         'left'  => $tempLeft,
                         'right' => $clause['expr'],
                     ];
-                    if (!isset($clause['statements'])) {
-                        $exprStack[] = $expr;
-                    } else {
-                        $exprStack[] = $expr;
-                        $blocks[]    = [
+                    $exprStack[] = $expr;
+                    if (isset($clause['statements'])) {
+                        $blocks[]  = [
                             'expr'  => $exprStack,
                             'block' => $clause['statements'],
                         ];
-                        $exprStack   = [];
+                        $exprStack = [];
                     }
                 } else {
                     if ('default' == $clause['type']) {
diff --git a/src/StaticCall.php b/src/StaticCall.php
index f437d02865..1fc4943439 100644
--- a/src/StaticCall.php
+++ b/src/StaticCall.php
@@ -390,7 +390,7 @@ protected function call(
         $codePrinter = $compilationContext->codePrinter;
 
         /**
-         * Call static methods must grown the stack
+         * Call static methods must grow the stack
          */
         $compilationContext->symbolTable->mustGrownStack(true);
 
@@ -502,7 +502,7 @@ protected function callFromClass(
         }
 
         /**
-         * Call static methods must grown the stack
+         * Call static methods must grow the stack
          */
         $compilationContext->symbolTable->mustGrownStack(true);
 
@@ -768,7 +768,7 @@ protected function callParent(
         $classCe     = $classDefinition->getClassEntry($compilationContext);
 
         /**
-         * Call static methods must grown the stack
+         * Call static methods must grow the stack
          */
         $compilationContext->symbolTable->mustGrownStack(true);
 
diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index b49ef92a2f..a9ead77536 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -46,7 +46,7 @@ class SymbolTable
     protected Globals $globalsManager;
 
     /**
-     * @var LocalContextPass
+     * @var LocalContextPass|null
      */
     protected ?LocalContextPass $localContext = null;
 
@@ -539,9 +539,9 @@ public function getVariable($name, CompilationContext $compilationContext = null
     /**
      * Return a variable in the symbol table, it will be used for a read operation.
      *
-     * @param string             $name
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
+     * @param string                  $name
+     * @param CompilationContext|null $compilationContext
+     * @param array|null              $statement
      *
      * @return Variable
      *
@@ -616,8 +616,7 @@ public function getVariableForRead($name, CompilationContext $compilationContext
                     $initBranches = $variable->getInitBranches();
 
                     $currentBranch = $compilationContext->branchManager->getCurrentBranch();
-                    /** @var Branch[] $branches */
-                    $branches = array_reverse($initBranches);
+                    $branches      = array_reverse($initBranches);
 
                     if (1 == count($branches)) {
                         if (Branch::TYPE_CONDITIONAL_TRUE == $branches[0]->getType()) {
@@ -786,7 +785,7 @@ public function getVariableForUpdate(string $name, CompilationContext $compilati
      *
      * @param string             $name
      * @param CompilationContext $compilationContext
-     * @param array              $statement
+     * @param array|null         $statement
      *
      * @return bool|Variable
      *
@@ -946,10 +945,10 @@ public function setLocalContext(LocalContextPass $localContext): void
     /**
      * Register a variable as temporal.
      *
-     * @param string             $type
-     * @param string             $location
-     * @param Variable           $variable
-     * @param CompilationContext $compilationContext
+     * @param string                  $type
+     * @param string                  $location
+     * @param Variable                $variable
+     * @param CompilationContext|null $compilationContext
      */
     protected function registerTempVariable(
         $type,
diff --git a/src/Types/Types.php b/src/Types/Types.php
index a408e31e2a..44e530dc69 100644
--- a/src/Types/Types.php
+++ b/src/Types/Types.php
@@ -23,12 +23,15 @@ final class Types
 {
     public const T_ARRAY     = 'array';
     public const T_BOOL      = 'bool';
+    public const T_BOOLEAN   = 'boolean';
     public const T_CALLABLE  = 'callable';
     public const T_CHAR      = 'char';
     public const T_DOUBLE    = 'double';
     public const T_FALSE     = 'false';
     public const T_FLOAT     = 'float';
+    public const T_HASH      = 'hash';
     public const T_INT       = 'int';
+    public const T_INTEGER   = 'integer';
     public const T_ISTRING   = 'istring';
     public const T_ITERABLE  = 'iterable';
     public const T_LONG      = 'long';
@@ -157,7 +160,7 @@ private function areReturnTypesArrayCompatible(array $types): bool
      */
     private function areReturnTypesBoolCompatible(array $types): bool
     {
-        return $this->areReturnTypesCompatible($types, [self::T_BOOL]);
+        return $this->areReturnTypesCompatible($types, [self::T_BOOL, self::T_BOOLEAN]);
     }
 
     /**
@@ -234,6 +237,7 @@ private function areReturnTypesIntegerCompatible(array $types): bool
             $types,
             [
                 self::T_INT,
+                self::T_INTEGER,
                 self::T_UINT,
                 self::T_CHAR,
                 self::T_UCHAR,

From 4d9ddf8dc637c120e6a9735b03e8839e17a46b0a Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 23:01:39 -0600
Subject: [PATCH 255/375] phpcs

---
 src/Class/Method/Parameters.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Class/Method/Parameters.php b/src/Class/Method/Parameters.php
index 073b79c5ef..1ce1913743 100644
--- a/src/Class/Method/Parameters.php
+++ b/src/Class/Method/Parameters.php
@@ -17,7 +17,6 @@
 use Countable;
 use Iterator;
 use Zephir\Exception\CompilerException;
-
 use Zephir\Types\Types;
 
 use function count;

From 446f47b68d698146ccedb464a1bd639e4a2b3e57 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 30 Nov 2023 23:20:30 -0600
Subject: [PATCH 256/375] adding a scan step

---
 .github/workflows/main.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1dbbde337d..7bef1f9d1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -213,7 +213,14 @@ jobs:
         with:
           fetch-depth: 2
 
-      - name: "Display structure of downloaded files"
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2023.2
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+        with:
+          args: --baseline,qodana.sarif.json
+
+      - name: "Create download folder"
         run: |
           mkdir -p reports
 

From b8280192b7023f179bd8664db0e1726261b72987 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:20:18 -0600
Subject: [PATCH 257/375] removed duplications

---
 src/CompilerFile.php                          |  46 +-------
 src/CompilerFileAnonymous.php                 |  47 +-------
 src/Expression/Closure.php                    |  74 ++++++++----
 src/Expression/ClosureArrow.php               |  30 ++---
 .../Arithmetical/ArithmeticalBaseOperator.php |  29 +++++
 src/Operators/Arithmetical/DivOperator.php    |  13 +--
 src/Operators/Arithmetical/ModOperator.php    |  13 +--
 .../FunctionCall/AddslashesOptimizer.php      |  30 ++---
 .../FunctionCall/ArrayKeyExistsOptimizer.php  |   7 +-
 .../FunctionCall/ArrayKeysOptimizer.php       |  27 ++++-
 .../FunctionCall/ArrayMergeOptimizer.php      |  64 +++-------
 .../FunctionCall/BasenameOptimizer.php        |  11 +-
 .../FunctionCall/CamelizeOptimizer.php        |  70 +++++++++--
 .../FunctionCall/Crc32Optimizer.php           |  51 +-------
 .../FunctionCall/CreateInstanceOptimizer.php  |  27 ++++-
 .../CreateInstanceParamsOptimizer.php         |  61 ++--------
 .../FunctionCall/FilemtimeOptimizer.php       |  51 +-------
 .../FunctionCall/GetClassLowerOptimizer.php   |  48 ++------
 .../FunctionCall/GetClassNsOptimizer.php      |  53 ++-------
 .../FunctionCall/GetClassOptimizer.php        |  27 ++++-
 .../FunctionCall/JsonDecodeOptimizer.php      |  28 ++++-
 .../FunctionCall/JsonEncodeOptimizer.php      |  62 +++-------
 src/Optimizers/FunctionCall/Md5Optimizer.php  |  21 +---
 .../FunctionCall/StrtoupperOptimizer.php      |   3 +-
 src/Optimizers/FunctionCall/TrimOptimizer.php |  67 ++---------
 .../FunctionCall/UcfirstOptimizer.php         |  27 ++---
 .../FunctionCall/UncamelizeOptimizer.php      |  77 +++++-------
 .../FunctionCall/VarDumpOptimizer.php         |   2 +-
 .../FunctionCall/VarExportOptimizer.php       |   2 +-
 src/Optimizers/OptimizerAbstract.php          |  34 ++++++
 src/Traits/CompilerTrait.php                  | 110 ++++++++++++++++++
 31 files changed, 526 insertions(+), 686 deletions(-)
 create mode 100644 src/Traits/CompilerTrait.php

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index ccac3008e3..1efbc53d8e 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -29,6 +29,7 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function array_map;
 use function count;
@@ -47,7 +48,6 @@
 use function preg_match;
 use function realpath;
 use function sprintf;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -64,6 +64,7 @@
  */
 final class CompilerFile implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     /**
@@ -161,18 +162,7 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
@@ -181,24 +171,8 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
         } else {
             $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         }
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
 
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 
     /**
@@ -399,17 +373,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index c5ab3cf487..59d0551722 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -19,10 +19,10 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function count;
 use function dirname;
-use function explode;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
@@ -30,7 +30,6 @@
 use function is_dir;
 use function md5;
 use function mkdir;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -44,6 +43,7 @@
  */
 final class CompilerFileAnonymous implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     protected Definition          $classDefinition;
@@ -114,17 +114,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
@@ -225,39 +215,12 @@ private function compileClass(CompilationContext $compilationContext): void
          */
         $classDefinition->compile($compilationContext);
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
 
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
-
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 }
diff --git a/src/Expression/Closure.php b/src/Expression/Closure.php
index bd0117e67a..25e4585fda 100644
--- a/src/Expression/Closure.php
+++ b/src/Expression/Closure.php
@@ -113,30 +113,14 @@ public function compile(array $expression, CompilationContext $compilationContex
             $expression,
             $staticVariables
         );
-        $classDefinition->addMethod($classMethod, $block);
-
-        $compilationContext->headersManager->add('kernel/object');
-
-        if ($this->expecting) {
-            if ($this->expectingVariable) {
-                $symbolVariable = $this->expectingVariable;
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext,
-                    $expression
-                );
-            }
-        } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext,
-                $expression
-            );
-        }
 
-        $symbolVariable->initVariant($compilationContext);
-        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
+        $symbolVariable = $this->generateClosure(
+            $classDefinition,
+            $classMethod,
+            $block,
+            $compilationContext,
+            $expression
+        );
         $compilationContext->headersManager->add('kernel/object');
 
         foreach ($staticVariables as $var) {
@@ -213,4 +197,48 @@ public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
+
+    /**
+     * @param Definition $classDefinition
+     * @param Method $classMethod
+     * @param mixed $block
+     * @param CompilationContext $compilationContext
+     * @param array $expression
+     *
+     * @return Variable|null
+     */
+    protected function generateClosure(
+        Definition $classDefinition,
+        Method $classMethod,
+        mixed $block,
+        CompilationContext $compilationContext,
+        array $expression
+    ): ?Variable {
+        $classDefinition->addMethod($classMethod, $block);
+
+        $compilationContext->headersManager->add('kernel/object');
+
+        if ($this->expecting) {
+            if ($this->expectingVariable) {
+                $symbolVariable = $this->expectingVariable;
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
+            }
+        } else {
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
+        }
+
+        $symbolVariable->initVariant($compilationContext);
+        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
+
+        return $symbolVariable;
+    }
 }
diff --git a/src/Expression/ClosureArrow.php b/src/Expression/ClosureArrow.php
index a3b940ce81..7a7467f875 100644
--- a/src/Expression/ClosureArrow.php
+++ b/src/Expression/ClosureArrow.php
@@ -87,30 +87,14 @@ public function compile(array $expression, CompilationContext $compilationContex
             null,
             $expression
         );
-        $classDefinition->addMethod($classMethod, $block);
 
-        $compilationContext->headersManager->add('kernel/object');
-
-        if ($this->expecting) {
-            if ($this->expectingVariable) {
-                $symbolVariable = $this->expectingVariable;
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext,
-                    $expression
-                );
-            }
-        } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext,
-                $expression
-            );
-        }
-
-        $symbolVariable->initVariant($compilationContext);
-        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
+        $symbolVariable = $this->generateClosure(
+            $classDefinition,
+            $classMethod,
+            $block,
+            $compilationContext,
+            $expression
+        );
 
         ++self::$id;
 
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index f3ffe047f2..c37cd45af1 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -13,9 +13,11 @@
 
 namespace Zephir\Operators\Arithmetical;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
+use Zephir\Exception as ZephirException;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
@@ -877,4 +879,31 @@ protected function processLeftBoolean(
             ),
         };
     }
+
+    /**
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return array
+     * @throws ReflectionException
+     * @throws ZephirException
+     */
+    protected function preCompileChecks(
+        array $expression,
+        CompilationContext $compilationContext
+    ): array {
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
+
+        $leftExpr = new Expression($expression['left']);
+        $leftExpr->setReadOnly(true);
+        $left = $leftExpr->compile($compilationContext);
+
+        $rightExpr = new Expression($expression['right']);
+        $rightExpr->setReadOnly(true);
+        $right = $rightExpr->compile($compilationContext);
+
+        $compilationContext->headersManager->add('kernel/operators');
+        return [$left, $right];
+    }
 }
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 7fcdc409b0..acbc1194f4 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -36,18 +36,7 @@ class DivOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeft($expression);
-        $this->checkRight($expression);
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
-
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly(true);
-        $right = $rightExpr->compile($compilationContext);
-
-        $compilationContext->headersManager->add('kernel/operators');
+        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
             case 'int':
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 230d2ed613..49aa132758 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -36,18 +36,7 @@ class ModOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeft($expression);
-        $this->checkRight($expression);
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
-
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly(true);
-        $right = $rightExpr->compile($compilationContext);
-
-        $compilationContext->headersManager->add('kernel/operators');
+        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
             case 'int':
diff --git a/src/Optimizers/FunctionCall/AddslashesOptimizer.php b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
index 066e37fd0c..9ff2a92193 100644
--- a/src/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,9 +33,8 @@ class AddslashesOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -47,25 +46,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
+            $call,
+            $context,
+            $expression
+        );
 
-        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_addslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index a05e5d9beb..1d8a5f42e5 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,9 +33,8 @@ class ArrayKeyExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 6cdf76c2ce..971a8bb51f 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,6 +28,8 @@
  */
 class ArrayKeysOptimizer extends OptimizerAbstract
 {
+    protected int $parameterCount = 1;
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -35,7 +37,8 @@ class ArrayKeysOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -43,7 +46,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != count($expression['parameters'])) {
+        if ($this->parameterCount !== count($expression['parameters'])) {
             return false;
         }
 
@@ -65,8 +68,24 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_array_keys(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, $resolvedParams): string
+    {
+        return sprintf(
+            'zephir_array_keys(%s, %s);',
+            $symbol,
+            $resolvedParams[0]
+        );
+    }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index 081768ab18..d357cd2ad0 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -13,68 +13,30 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use function sprintf;
 
 /**
  * ArrayMergeOptimizer.
  *
  * Optimizes calls to 'array_merge' using internal function
  */
-class ArrayMergeOptimizer extends OptimizerAbstract
+class ArrayMergeOptimizer extends ArrayKeysOptimizer
 {
+    protected int $parameterCount = 2;
+
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
+     * @param string $symbol
+     * @param array  $resolvedParams
      *
-     * @throws CompilerException
+     * @return string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getOutput(string $symbol, $resolvedParams): string
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/array');
-
-        $symbolVariable->setDynamicTypes('array');
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output(
-            sprintf(
-                'zephir_fast_array_merge(%s, %s, %s);',
-                $symbol,
-                $resolvedParams[0],
-                $resolvedParams[1]
-            )
+        return sprintf(
+            'zephir_fast_array_merge(%s, %s, %s);',
+            $symbol,
+            $resolvedParams[0],
+            $resolvedParams[1]
         );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index 9b048a2cd6..4f79f9f986 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,6 +28,8 @@
  */
 class BasenameOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_basename';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -35,7 +37,8 @@ class BasenameOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -64,7 +67,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_basename(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index c5c0a93af9..b8db0fe505 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -18,6 +18,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -28,6 +29,10 @@
  */
 class CamelizeOptimizer extends OptimizerAbstract
 {
+    protected string $trimWhere    = '';
+    protected string $warningName  = 'camelize';
+    protected string $zephirMethod = 'zephir_camelize';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,11 +48,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
-            throw new CompilerException("'camelize' only accepts one or two parameters");
-        }
+        $this->checkParameters($expression['parameters']);
 
-        $delimiter = 'NULL ';
+        $charlist = 'NULL ';
         if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
@@ -62,9 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->symbolVariablePre($call, $symbolVariable, $context);
 
         $context->headersManager->add('kernel/string');
 
@@ -73,14 +74,65 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         if (isset($resolvedParams[1])) {
-            $delimiter = $resolvedParams[1];
+            $charlist = $resolvedParams[1];
         }
 
+        $this->symbolVariablePost($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+            'zephir_fast_trim(' . $symbol . ', '
+            . $resolvedParams[0] . ', '
+            . $charlist . ', '
+            . $this->trimWhere . ');'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param $parameters
+     *
+     * @return void
+     */
+    protected function checkParameters($parameters): void
+    {
+        if (count($parameters) < 1 || count($parameters) > 2) {
+            throw new CompilerException(
+                "'" . $this->warningName . "' only accepts one or two parameters"
+            );
+        }
+    }
+
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePost(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        // empty
+    }
+
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePre(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+    }
 }
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index 1582e14ac4..e69712d152 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -13,58 +13,13 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * Crc32Optimizer.
  *
  * Optimizes calls to 'crc32' using internal function
  */
-class Crc32Optimizer extends OptimizerAbstract
+class Crc32Optimizer extends StrtoupperOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('long');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_crc32(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $type         = 'long';
+    protected string $zephirMethod = 'zephir_crc32';
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index b85529c413..2ae69dd5be 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -28,6 +28,10 @@
  */
 class CreateInstanceOptimizer extends OptimizerAbstract
 {
+    protected string $exceptionMessage = 'This function only accepts one parameter';
+    protected int    $parameterCount   = 1;
+    protected string $zephirMethod     = 'zephir_create_instance';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,8 +47,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (1 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires one parameter', $expression);
+        if ($this->parameterCount !== count($expression['parameters'])) {
+            throw new CompilerException(
+                $this->exceptionMessage,
+                $expression
+            );
         }
 
         /*
@@ -77,12 +84,24 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
+            'ZEPHIR_LAST_CALL_STATUS = '
+            . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $call->checkTempParameters($context);
+        $this->getTempParameters($call, $context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function getTempParameters(Call $call, CompilationContext $context): void
+    {
+        $call->checkTempParameters($context);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index af8528e4e3..b6092c2803 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -15,68 +15,27 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
 
 /**
  * CreateInstanceParamsOptimizer.
  *
  * Built-in function that creates new instances of objects from its class name passing parameters as an array
  */
-class CreateInstanceParamsOptimizer extends OptimizerAbstract
+class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
 {
+    protected string $exceptionMessage = 'This function requires only two parameters';
+    protected int    $parameterCount   = 2;
+    protected string $zephirMethod     = 'zephir_create_instance_params';
+
+
     /**
-     * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
+     *
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getTempParameters(Call $call, CompilationContext $context): void
     {
-        if (!isset($expression['parameters'])) {
-            throw new CompilerException('This function requires parameters', $expression);
-        }
-
-        if (2 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires two parameter', $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('object');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        );
-
-        $call->addCallStatusOrJump($context);
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        // Not needed here
     }
 }
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index 9d44f9e6fc..db5205b200 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -13,59 +13,12 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * FilemtimeOptimizer.
  *
  * Optimizes calls to 'filemtime' using internal function
  */
-class FilemtimeOptimizer extends OptimizerAbstract
+class FilemtimeOptimizer extends BasenameOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        $context->headersManager->add('kernel/file');
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output('zephir_filemtime(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_filemtime';
 }
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index d9052a01b9..6d4b5759fe 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -13,11 +13,7 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -26,49 +22,21 @@
  *
  * Optimizes calls to 'get_class_lower' using internal function
  */
-class GetClassLowerOptimizer extends OptimizerAbstract
+class GetClassLowerOptimizer extends GetClassOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param array $expression
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters(array $expression): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters) {
-            throw new CompilerException("'get_class_lower' only accepts one parameters", $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
+            throw new CompilerException(
+                "'get_class_lower' only accepts one parameters",
+                $expression
+            );
         }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 1);');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index a848acb414..db8bf1fca9 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -13,11 +13,7 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -26,54 +22,23 @@
  *
  * Optimizes calls to 'get_class_ns' using internal function
  */
-class GetClassNsOptimizer extends OptimizerAbstract
+class GetClassNsOptimizer extends GetClassOptimizer
 {
+    protected string $zephirMethod = 'zephir_get_class_ns';
+
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
+     * @param array $expression
      *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters(array $expression): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException("'get_class_ns' only accepts one or two parameters", $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        if (!isset($resolvedParams[1])) {
-            $context->codePrinter->output('zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
-        } else {
-            $context->codePrinter->output(
-                'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            throw new CompilerException(
+                "'get_class_ns' only accepts one or two parameters",
+                $expression
             );
         }
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index 8b185d23bb..b689068e78 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -28,6 +28,8 @@
  */
 class GetClassOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_get_class';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,10 +45,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $numberParameters = count($expression['parameters']);
-        if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException("'get_class' only accepts one or two parameters", $expression);
-        }
+        $this->checkParameters($expression);
 
         /*
          * Process the expected symbol to be returned
@@ -67,8 +66,26 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ', 0);'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param array $expression
+     *
+     * @return void
+     */
+    protected function checkParameters(array $expression): void
+    {
+        $numberParameters = count($expression['parameters']);
+        if (1 != $numberParameters && 2 != $numberParameters) {
+            throw new CompilerException(
+                "'get_class' only accepts one or two parameters",
+                $expression
+            );
+        }
+    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index dc9b194bfd..50c0d4ce8a 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -17,6 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -27,6 +28,11 @@
  */
 class JsonDecodeOptimizer extends OptimizerAbstract
 {
+    /**
+     * @var string
+     */
+    protected string $zephirMethod = 'zephir_json_decode';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -47,10 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable();
         $this->checkNotVariable($symbolVariable, $expression);
-        if (!$symbolVariable) {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
+        $symbolVariable = $this->checkSymbolVariable($symbolVariable, $context);
 
         $context->headersManager->add('kernel/string');
 
@@ -77,4 +80,21 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return Variable|null
+     */
+    protected function checkSymbolVariable(
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): ?Variable {
+        if (!$symbolVariable) {
+            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+            $symbolVariable->initVariant($context);
+        }
+        return $symbolVariable;
+    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index e344f03578..67aa01db6f 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -13,64 +13,32 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use Zephir\Variable\Variable;
 
 /**
  * JsonEncodeOptimizer.
  *
  * Optimizes calls to 'json_encode' using internal function
  */
-class JsonEncodeOptimizer extends OptimizerAbstract
+class JsonEncodeOptimizer extends JsonDecodeOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
+     * @var string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+    protected string $zephirMethod = 'zephir_json_encode';
 
-        /*
-         * Process encode options
-         */
-        if (count($resolvedParams) >= 2) {
-            $context->headersManager->add('kernel/operators');
-            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
-        } else {
-            $options = '0 ';
-        }
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_json_encode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    /**
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return Variable|null
+     */
+    protected function checkSymbolVariable(
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): ?Variable {
+        return $symbolVariable;
     }
 }
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index f35de5c6c1..e0c8a53659 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -47,23 +47,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
+        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
+            $call,
+            $context,
+            $expression
+        );
 
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_md5(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index 03bff3f455..bb0401a39a 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -28,6 +28,7 @@
  */
 class StrtoupperOptimizer extends OptimizerAbstract
 {
+    protected string $type         = 'string';
     protected string $zephirMethod = 'zephir_fast_strtoupper';
 
     /**
@@ -58,7 +59,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
+        $symbolVariable->setDynamicTypes($this->type);
 
         $resolvedParams = $call->getReadOnlyResolvedParams(
             $expression['parameters'],
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index 38ae5ee408..2c4381fcb1 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -13,75 +13,24 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * TrimOptimizer.
  *
  * Optimizes calls to 'trim' using internal function
  */
-class TrimOptimizer extends OptimizerAbstract
+class TrimOptimizer extends UncamelizeOptimizer
 {
-    protected string $trimWhere = 'ZEPHIR_TRIM_BOTH';
+    protected string $trimWhere    = 'ZEPHIR_TRIM_BOTH';
+    protected string $warningName  = '';
+    protected string $zephirMethod = 'zephir_fast_trim';
 
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param $parameters
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters($parameters): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        $charlist = 'NULL ';
-        if (2 == count($expression['parameters'])) {
-            if ('null' == $expression['parameters'][1]['parameter']['type']) {
-                unset($expression['parameters'][1]);
-            }
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if (isset($resolvedParams[1])) {
-            $charlist = $resolvedParams[1];
-        }
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_fast_trim(' . $symbol . ', '
-            . $resolvedParams[0] . ', '
-            . $charlist . ', '
-            . $this->trimWhere . ');'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        // empty
     }
 }
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index 10085855a3..ed3b2f1885 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,9 +33,8 @@ class UcfirstOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -47,22 +46,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
+        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
+            $call,
+            $context,
+            $expression
+        );
 
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_ucfirst(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 5d10f1f25b..9417c42a38 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -15,72 +15,47 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use Zephir\Variable\Variable;
 
 /**
  * UncamelizeOptimizer.
  *
  * Optimizes calls to 'uncamelize' using internal function
  */
-class UncamelizeOptimizer extends OptimizerAbstract
+class UncamelizeOptimizer extends CamelizeOptimizer
 {
+    protected string $warningName  = 'uncamelize';
+    protected string $zephirMethod = 'zephir_uncamelize';
+
     /**
-     * @param array              $expression
      * @param Call               $call
+     * @param Variable|null      $symbolVariable
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
-            throw new CompilerException("'uncamelize' only accepts one or two parameters");
-        }
-
-        $delimiter = 'NULL ';
-        if (2 == count($expression['parameters'])) {
-            if ('null' == $expression['parameters'][1]['parameter']['type']) {
-                unset($expression['parameters'][1]);
-            }
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if (isset($resolvedParams[1])) {
-            $delimiter = $resolvedParams[1];
-        }
-
+    protected function symbolVariablePost(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
+    }
 
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePre(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        // empty
     }
 }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index 0b38116151..d59fc4db4b 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -51,7 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                  */
                 $type = match ($resolvedParam->getType()) {
                     Types::T_ARRAY => 'array',
-                    default => 'variable',
+                    default        => 'variable',
                 };
 
                 $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 9eea35e60e..520e281862 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             $type = match ($resolvedParam->getType()) {
                 Types::T_ARRAY => 'array',
-                default => 'variable',
+                default        => 'variable',
             };
 
             $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 34000d6f7c..c6c4d13bcc 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -15,6 +15,7 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Traits\VariablesTrait;
 
 abstract class OptimizerAbstract
@@ -29,4 +30,37 @@ abstract class OptimizerAbstract
      * @return mixed
      */
     abstract public function optimize(array $expression, Call $call, CompilationContext $context);
+
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     * @param array              $expression
+     *
+     * @return array
+     * @throws Exception
+     */
+    protected function processStringOptimizer(Call $call, CompilationContext $context, array $expression): array
+    {
+        /**
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
+
+        $this->symbolVariablePre($call, $symbolVariable, $context);
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        return [$symbolVariable, $resolvedParams, $symbol];
+    }
 }
diff --git a/src/Traits/CompilerTrait.php b/src/Traits/CompilerTrait.php
new file mode 100644
index 0000000000..b85a2fdb77
--- /dev/null
+++ b/src/Traits/CompilerTrait.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Traits;
+
+use Zephir\Class\Definition\Definition;
+use Zephir\CompilationContext;
+
+use function dirname;
+use function explode;
+use function implode;
+use function is_dir;
+use function mkdir;
+use function str_repeat;
+use function str_replace;
+use function strpos;
+use function strtolower;
+
+use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
+
+trait CompilerTrait
+{
+    /**
+     * @param string $completeName
+     *
+     * @return array
+     */
+    protected function calculatePaths(string $completeName): array
+    {
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
+
+        return [$path, $filePath, $filePathHeader];
+    }
+
+    /**
+     * @param string             $code
+     * @param Definition|null    $classDefinition
+     * @param CompilationContext $compilationContext
+     *
+     * @return void
+     */
+    protected function generateClassHeadersPost(
+        string $code,
+        ?Definition $classDefinition,
+        CompilationContext $compilationContext
+    ): void {
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
+    }
+
+    /**
+     * @param Definition|null $classDefinition
+     *
+     * @return string
+     */
+    protected function generateCodeHeadersPre(?Definition $classDefinition): string
+    {
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        return $code;
+    }
+}

From 063de9a1fe5d0bb22af421e7503a2416f7624a26 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:28:14 -0600
Subject: [PATCH 258/375] correcting symbol call

---
 src/Optimizers/OptimizerAbstract.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index c6c4d13bcc..53c73cb67a 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -58,7 +58,10 @@ protected function processStringOptimizer(Call $call, CompilationContext $contex
             $expression
         );
 
-        $this->symbolVariablePre($call, $symbolVariable, $context);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
         return [$symbolVariable, $resolvedParams, $symbol];

From abd0cdb8ef8b984fb7df59f135c9d4570d4a7436 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:37:23 -0600
Subject: [PATCH 259/375] removed more duplications

---
 .../FunctionCall/ArrayKeyExistsOptimizer.php  | 20 +++++++++-
 .../FunctionCall/InArrayOptimizer.php         | 40 ++++---------------
 src/Optimizers/FunctionCall/Md5Optimizer.php  | 40 +------------------
 .../FunctionCall/UcfirstOptimizer.php         |  7 +++-
 4 files changed, 33 insertions(+), 74 deletions(-)

diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index 1d8a5f42e5..83e4e28d67 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -48,13 +48,29 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         // Note: the first parameter is key in php array_key_exists
         return new CompiledExpression(
             'bool',
-            'zephir_array_key_exists(' . $resolvedParams[1] . ', ' . $resolvedParams[0] . ')',
+            $this->getCode($resolvedParams),
             $expression
         );
     }
+
+    /**
+     * @param array $resolvedParams
+     *
+     * @return string
+     */
+    protected function getCode(array $resolvedParams): string
+    {
+        return 'zephir_array_key_exists('
+            . $resolvedParams[1] . ', '
+            . $resolvedParams[0] . ')';
+    }
 }
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index b6717aa1a1..ab675298de 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -13,48 +13,22 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * InArrayOptimizer.
  *
  * Optimizes calls to 'in_array' using internal function
  */
-class InArrayOptimizer extends OptimizerAbstract
+class InArrayOptimizer extends ArrayKeyExistsOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param array $resolvedParams
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getCode(array $resolvedParams): string
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        $context->headersManager->add('kernel/array');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        return new CompiledExpression(
-            'bool',
-            'zephir_fast_in_array(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
-            $expression
-        );
+        return 'zephir_fast_in_array('
+            . $resolvedParams[0] . ', '
+            . $resolvedParams[1] . ')';
     }
 }
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index e0c8a53659..66858ca2cf 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -13,48 +13,12 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * MD5Optimizer.
  *
  * Optimizes calls to 'md5' using internal function
  */
-class Md5Optimizer extends OptimizerAbstract
+class Md5Optimizer extends UcfirstOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
-            $call,
-            $context,
-            $expression
-        );
-
-        $context->codePrinter->output('zephir_md5(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_md5';
 }
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index ed3b2f1885..5d1817a80f 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -28,6 +28,8 @@
  */
 class UcfirstOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_ucfirst';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -52,7 +54,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $expression
         );
 
-        $context->codePrinter->output('zephir_ucfirst(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

From 428731c8918c03a5bcf7d28ab866e33a0ab12397 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:41:04 -0600
Subject: [PATCH 260/375] Revert "removed more duplications"

This reverts commit abd0cdb8ef8b984fb7df59f135c9d4570d4a7436.
---
 .../FunctionCall/ArrayKeyExistsOptimizer.php  | 20 +---------
 .../FunctionCall/InArrayOptimizer.php         | 40 +++++++++++++++----
 src/Optimizers/FunctionCall/Md5Optimizer.php  | 40 ++++++++++++++++++-
 .../FunctionCall/UcfirstOptimizer.php         |  7 +---
 4 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index 83e4e28d67..1d8a5f42e5 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -48,29 +48,13 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         // Note: the first parameter is key in php array_key_exists
         return new CompiledExpression(
             'bool',
-            $this->getCode($resolvedParams),
+            'zephir_array_key_exists(' . $resolvedParams[1] . ', ' . $resolvedParams[0] . ')',
             $expression
         );
     }
-
-    /**
-     * @param array $resolvedParams
-     *
-     * @return string
-     */
-    protected function getCode(array $resolvedParams): string
-    {
-        return 'zephir_array_key_exists('
-            . $resolvedParams[1] . ', '
-            . $resolvedParams[0] . ')';
-    }
 }
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index ab675298de..b6717aa1a1 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -13,22 +13,48 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * InArrayOptimizer.
  *
  * Optimizes calls to 'in_array' using internal function
  */
-class InArrayOptimizer extends ArrayKeyExistsOptimizer
+class InArrayOptimizer extends OptimizerAbstract
 {
     /**
-     * @param array $resolvedParams
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
      *
-     * @return string
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function getCode(array $resolvedParams): string
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        return 'zephir_fast_in_array('
-            . $resolvedParams[0] . ', '
-            . $resolvedParams[1] . ')';
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (2 != count($expression['parameters'])) {
+            return false;
+        }
+
+        $context->headersManager->add('kernel/array');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        return new CompiledExpression(
+            'bool',
+            'zephir_fast_in_array(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
+            $expression
+        );
     }
 }
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index 66858ca2cf..e0c8a53659 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -13,12 +13,48 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * MD5Optimizer.
  *
  * Optimizes calls to 'md5' using internal function
  */
-class Md5Optimizer extends UcfirstOptimizer
+class Md5Optimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_md5';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (1 != count($expression['parameters'])) {
+            return false;
+        }
+
+        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
+            $call,
+            $context,
+            $expression
+        );
+
+        $context->codePrinter->output('zephir_md5(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index 5d1817a80f..ed3b2f1885 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -28,8 +28,6 @@
  */
 class UcfirstOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_ucfirst';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -54,10 +52,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $expression
         );
 
-        $context->codePrinter->output(
-            $this->zephirMethod
-            . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        );
+        $context->codePrinter->output('zephir_ucfirst(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }

From 062952bb9e5c8b18255c60e6b532e51658a492e0 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:41:16 -0600
Subject: [PATCH 261/375] Revert "correcting symbol call"

This reverts commit 063de9a1fe5d0bb22af421e7503a2416f7624a26.
---
 src/Optimizers/OptimizerAbstract.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 53c73cb67a..c6c4d13bcc 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -58,10 +58,7 @@ protected function processStringOptimizer(Call $call, CompilationContext $contex
             $expression
         );
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
+        $this->symbolVariablePre($call, $symbolVariable, $context);
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
         return [$symbolVariable, $resolvedParams, $symbol];

From 06ff5448fc8aef2e280f95ce591f834f5f20c325 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:41:48 -0600
Subject: [PATCH 262/375] Revert "removed duplications"

This reverts commit b8280192b7023f179bd8664db0e1726261b72987.
---
 src/CompilerFile.php                          |  46 +++++++-
 src/CompilerFileAnonymous.php                 |  47 +++++++-
 src/Expression/Closure.php                    |  74 ++++--------
 src/Expression/ClosureArrow.php               |  30 +++--
 .../Arithmetical/ArithmeticalBaseOperator.php |  29 -----
 src/Operators/Arithmetical/DivOperator.php    |  13 ++-
 src/Operators/Arithmetical/ModOperator.php    |  13 ++-
 .../FunctionCall/AddslashesOptimizer.php      |  30 +++--
 .../FunctionCall/ArrayKeyExistsOptimizer.php  |   7 +-
 .../FunctionCall/ArrayKeysOptimizer.php       |  27 +----
 .../FunctionCall/ArrayMergeOptimizer.php      |  64 +++++++---
 .../FunctionCall/BasenameOptimizer.php        |  11 +-
 .../FunctionCall/CamelizeOptimizer.php        |  70 ++---------
 .../FunctionCall/Crc32Optimizer.php           |  51 +++++++-
 .../FunctionCall/CreateInstanceOptimizer.php  |  27 +----
 .../CreateInstanceParamsOptimizer.php         |  61 ++++++++--
 .../FunctionCall/FilemtimeOptimizer.php       |  51 +++++++-
 .../FunctionCall/GetClassLowerOptimizer.php   |  48 ++++++--
 .../FunctionCall/GetClassNsOptimizer.php      |  53 +++++++--
 .../FunctionCall/GetClassOptimizer.php        |  27 +----
 .../FunctionCall/JsonDecodeOptimizer.php      |  28 +----
 .../FunctionCall/JsonEncodeOptimizer.php      |  62 +++++++---
 src/Optimizers/FunctionCall/Md5Optimizer.php  |  21 +++-
 .../FunctionCall/StrtoupperOptimizer.php      |   3 +-
 src/Optimizers/FunctionCall/TrimOptimizer.php |  67 +++++++++--
 .../FunctionCall/UcfirstOptimizer.php         |  27 +++--
 .../FunctionCall/UncamelizeOptimizer.php      |  77 +++++++-----
 .../FunctionCall/VarDumpOptimizer.php         |   2 +-
 .../FunctionCall/VarExportOptimizer.php       |   2 +-
 src/Optimizers/OptimizerAbstract.php          |  34 ------
 src/Traits/CompilerTrait.php                  | 110 ------------------
 31 files changed, 686 insertions(+), 526 deletions(-)
 delete mode 100644 src/Traits/CompilerTrait.php

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index 1efbc53d8e..ccac3008e3 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -29,7 +29,6 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
-use Zephir\Traits\CompilerTrait;
 
 use function array_map;
 use function count;
@@ -48,6 +47,7 @@
 use function preg_match;
 use function realpath;
 use function sprintf;
+use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -64,7 +64,6 @@
  */
 final class CompilerFile implements FileInterface
 {
-    use CompilerTrait;
     use LoggerAwareTrait;
 
     /**
@@ -162,7 +161,18 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
-        $code = $this->generateCodeHeadersPre($classDefinition);
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
@@ -171,8 +181,24 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
         } else {
             $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         }
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
 
-        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
     }
 
     /**
@@ -373,7 +399,17 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $classDefinition->getCompleteName();
 
-        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
 
         /**
          * If the file does not exist we create it for the first time
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index 59d0551722..c5ab3cf487 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -19,10 +19,10 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
-use Zephir\Traits\CompilerTrait;
 
 use function count;
 use function dirname;
+use function explode;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
@@ -30,6 +30,7 @@
 use function is_dir;
 use function md5;
 use function mkdir;
+use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -43,7 +44,6 @@
  */
 final class CompilerFileAnonymous implements FileInterface
 {
-    use CompilerTrait;
     use LoggerAwareTrait;
 
     protected Definition          $classDefinition;
@@ -114,7 +114,17 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
 
         /**
          * If the file does not exist we create it for the first time
@@ -215,12 +225,39 @@ private function compileClass(CompilationContext $compilationContext): void
          */
         $classDefinition->compile($compilationContext);
 
-        $code = $this->generateCodeHeadersPre($classDefinition);
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
 
-        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
     }
 }
diff --git a/src/Expression/Closure.php b/src/Expression/Closure.php
index 25e4585fda..bd0117e67a 100644
--- a/src/Expression/Closure.php
+++ b/src/Expression/Closure.php
@@ -113,14 +113,30 @@ public function compile(array $expression, CompilationContext $compilationContex
             $expression,
             $staticVariables
         );
+        $classDefinition->addMethod($classMethod, $block);
 
-        $symbolVariable = $this->generateClosure(
-            $classDefinition,
-            $classMethod,
-            $block,
-            $compilationContext,
-            $expression
-        );
+        $compilationContext->headersManager->add('kernel/object');
+
+        if ($this->expecting) {
+            if ($this->expectingVariable) {
+                $symbolVariable = $this->expectingVariable;
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
+            }
+        } else {
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
+        }
+
+        $symbolVariable->initVariant($compilationContext);
+        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
         $compilationContext->headersManager->add('kernel/object');
 
         foreach ($staticVariables as $var) {
@@ -197,48 +213,4 @@ public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
-
-    /**
-     * @param Definition $classDefinition
-     * @param Method $classMethod
-     * @param mixed $block
-     * @param CompilationContext $compilationContext
-     * @param array $expression
-     *
-     * @return Variable|null
-     */
-    protected function generateClosure(
-        Definition $classDefinition,
-        Method $classMethod,
-        mixed $block,
-        CompilationContext $compilationContext,
-        array $expression
-    ): ?Variable {
-        $classDefinition->addMethod($classMethod, $block);
-
-        $compilationContext->headersManager->add('kernel/object');
-
-        if ($this->expecting) {
-            if ($this->expectingVariable) {
-                $symbolVariable = $this->expectingVariable;
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext,
-                    $expression
-                );
-            }
-        } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext,
-                $expression
-            );
-        }
-
-        $symbolVariable->initVariant($compilationContext);
-        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
-
-        return $symbolVariable;
-    }
 }
diff --git a/src/Expression/ClosureArrow.php b/src/Expression/ClosureArrow.php
index 7a7467f875..a3b940ce81 100644
--- a/src/Expression/ClosureArrow.php
+++ b/src/Expression/ClosureArrow.php
@@ -87,14 +87,30 @@ public function compile(array $expression, CompilationContext $compilationContex
             null,
             $expression
         );
+        $classDefinition->addMethod($classMethod, $block);
 
-        $symbolVariable = $this->generateClosure(
-            $classDefinition,
-            $classMethod,
-            $block,
-            $compilationContext,
-            $expression
-        );
+        $compilationContext->headersManager->add('kernel/object');
+
+        if ($this->expecting) {
+            if ($this->expectingVariable) {
+                $symbolVariable = $this->expectingVariable;
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
+            }
+        } else {
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
+        }
+
+        $symbolVariable->initVariant($compilationContext);
+        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
 
         ++self::$id;
 
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index c37cd45af1..f3ffe047f2 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -13,11 +13,9 @@
 
 namespace Zephir\Operators\Arithmetical;
 
-use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
-use Zephir\Exception as ZephirException;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
@@ -879,31 +877,4 @@ protected function processLeftBoolean(
             ),
         };
     }
-
-    /**
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return array
-     * @throws ReflectionException
-     * @throws ZephirException
-     */
-    protected function preCompileChecks(
-        array $expression,
-        CompilationContext $compilationContext
-    ): array {
-        $this->checkLeft($expression);
-        $this->checkRight($expression);
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
-
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly(true);
-        $right = $rightExpr->compile($compilationContext);
-
-        $compilationContext->headersManager->add('kernel/operators');
-        return [$left, $right];
-    }
 }
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index acbc1194f4..7fcdc409b0 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -36,7 +36,18 @@ class DivOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
+
+        $leftExpr = new Expression($expression['left']);
+        $leftExpr->setReadOnly(true);
+        $left = $leftExpr->compile($compilationContext);
+
+        $rightExpr = new Expression($expression['right']);
+        $rightExpr->setReadOnly(true);
+        $right = $rightExpr->compile($compilationContext);
+
+        $compilationContext->headersManager->add('kernel/operators');
 
         switch ($left->getType()) {
             case 'int':
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 49aa132758..230d2ed613 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -36,7 +36,18 @@ class ModOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
+
+        $leftExpr = new Expression($expression['left']);
+        $leftExpr->setReadOnly(true);
+        $left = $leftExpr->compile($compilationContext);
+
+        $rightExpr = new Expression($expression['right']);
+        $rightExpr->setReadOnly(true);
+        $right = $rightExpr->compile($compilationContext);
+
+        $compilationContext->headersManager->add('kernel/operators');
 
         switch ($left->getType()) {
             case 'int':
diff --git a/src/Optimizers/FunctionCall/AddslashesOptimizer.php b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
index 9ff2a92193..066e37fd0c 100644
--- a/src/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,8 +33,9 @@ class AddslashesOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -46,12 +47,25 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
-            $call,
-            $context,
-            $expression
-        );
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
 
+        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_addslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index 1d8a5f42e5..a05e5d9beb 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,8 +33,9 @@ class ArrayKeyExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 971a8bb51f..6cdf76c2ce 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,8 +28,6 @@
  */
 class ArrayKeysOptimizer extends OptimizerAbstract
 {
-    protected int $parameterCount = 1;
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -37,8 +35,7 @@ class ArrayKeysOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -46,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if ($this->parameterCount !== count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -68,24 +65,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
+        $context->codePrinter->output('zephir_array_keys(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param string $symbol
-     * @param array  $resolvedParams
-     *
-     * @return string
-     */
-    protected function getOutput(string $symbol, $resolvedParams): string
-    {
-        return sprintf(
-            'zephir_array_keys(%s, %s);',
-            $symbol,
-            $resolvedParams[0]
-        );
-    }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index d357cd2ad0..081768ab18 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -13,30 +13,68 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use function sprintf;
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * ArrayMergeOptimizer.
  *
  * Optimizes calls to 'array_merge' using internal function
  */
-class ArrayMergeOptimizer extends ArrayKeysOptimizer
+class ArrayMergeOptimizer extends OptimizerAbstract
 {
-    protected int $parameterCount = 2;
-
     /**
-     * @param string $symbol
-     * @param array  $resolvedParams
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
      *
-     * @return string
+     * @throws CompilerException
      */
-    protected function getOutput(string $symbol, $resolvedParams): string
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        return sprintf(
-            'zephir_fast_array_merge(%s, %s, %s);',
-            $symbol,
-            $resolvedParams[0],
-            $resolvedParams[1]
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (2 != count($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariable($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/array');
+
+        $symbolVariable->setDynamicTypes('array');
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        $context->codePrinter->output(
+            sprintf(
+                'zephir_fast_array_merge(%s, %s, %s);',
+                $symbol,
+                $resolvedParams[0],
+                $resolvedParams[1]
+            )
         );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index 4f79f9f986..9b048a2cd6 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,8 +28,6 @@
  */
 class BasenameOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_basename';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -37,8 +35,7 @@ class BasenameOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -67,9 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        );
+        $context->codePrinter->output('zephir_basename(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index b8db0fe505..c5c0a93af9 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -18,7 +18,6 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
-use Zephir\Variable\Variable;
 
 use function count;
 
@@ -29,10 +28,6 @@
  */
 class CamelizeOptimizer extends OptimizerAbstract
 {
-    protected string $trimWhere    = '';
-    protected string $warningName  = 'camelize';
-    protected string $zephirMethod = 'zephir_camelize';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -48,9 +43,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $this->checkParameters($expression['parameters']);
+        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
+            throw new CompilerException("'camelize' only accepts one or two parameters");
+        }
 
-        $charlist = 'NULL ';
+        $delimiter = 'NULL ';
         if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
@@ -65,7 +62,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        $this->symbolVariablePre($call, $symbolVariable, $context);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
 
         $context->headersManager->add('kernel/string');
 
@@ -74,65 +73,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         if (isset($resolvedParams[1])) {
-            $charlist = $resolvedParams[1];
+            $delimiter = $resolvedParams[1];
         }
 
-        $this->symbolVariablePost($call, $symbolVariable, $context);
-
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_fast_trim(' . $symbol . ', '
-            . $resolvedParams[0] . ', '
-            . $charlist . ', '
-            . $this->trimWhere . ');'
+            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param $parameters
-     *
-     * @return void
-     */
-    protected function checkParameters($parameters): void
-    {
-        if (count($parameters) < 1 || count($parameters) > 2) {
-            throw new CompilerException(
-                "'" . $this->warningName . "' only accepts one or two parameters"
-            );
-        }
-    }
-
-    /**
-     * @param Call               $call
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function symbolVariablePost(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
-        // empty
-    }
-
-    /**
-     * @param Call               $call
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function symbolVariablePre(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-    }
 }
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index e69712d152..1582e14ac4 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -13,13 +13,58 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * Crc32Optimizer.
  *
  * Optimizes calls to 'crc32' using internal function
  */
-class Crc32Optimizer extends StrtoupperOptimizer
+class Crc32Optimizer extends OptimizerAbstract
 {
-    protected string $type         = 'long';
-    protected string $zephirMethod = 'zephir_crc32';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (1 != count($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('long');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output('zephir_crc32(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 2ae69dd5be..b85529c413 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -28,10 +28,6 @@
  */
 class CreateInstanceOptimizer extends OptimizerAbstract
 {
-    protected string $exceptionMessage = 'This function only accepts one parameter';
-    protected int    $parameterCount   = 1;
-    protected string $zephirMethod     = 'zephir_create_instance';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -47,11 +43,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if ($this->parameterCount !== count($expression['parameters'])) {
-            throw new CompilerException(
-                $this->exceptionMessage,
-                $expression
-            );
+        if (1 != count($expression['parameters'])) {
+            throw new CompilerException('This function only requires one parameter', $expression);
         }
 
         /*
@@ -84,24 +77,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = '
-            . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $this->getTempParameters($call, $context);
+        $call->checkTempParameters($context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function getTempParameters(Call $call, CompilationContext $context): void
-    {
-        $call->checkTempParameters($context);
-    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index b6092c2803..af8528e4e3 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -15,27 +15,68 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * CreateInstanceParamsOptimizer.
  *
  * Built-in function that creates new instances of objects from its class name passing parameters as an array
  */
-class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
+class CreateInstanceParamsOptimizer extends OptimizerAbstract
 {
-    protected string $exceptionMessage = 'This function requires only two parameters';
-    protected int    $parameterCount   = 2;
-    protected string $zephirMethod     = 'zephir_create_instance_params';
-
-
     /**
+     * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
-     *
-     * @return void
      */
-    protected function getTempParameters(Call $call, CompilationContext $context): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        // Not needed here
+        if (!isset($expression['parameters'])) {
+            throw new CompilerException('This function requires parameters', $expression);
+        }
+
+        if (2 != count($expression['parameters'])) {
+            throw new CompilerException('This function only requires two parameter', $expression);
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariable($symbolVariable, $expression);
+
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        $context->headersManager->add('kernel/object');
+
+        $symbolVariable->setDynamicTypes('object');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
+
+        $call->addCallStatusOrJump($context);
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index db5205b200..9d44f9e6fc 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -13,12 +13,59 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * FilemtimeOptimizer.
  *
  * Optimizes calls to 'filemtime' using internal function
  */
-class FilemtimeOptimizer extends BasenameOptimizer
+class FilemtimeOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_filemtime';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (1 != count($expression['parameters'])) {
+            return false;
+        }
+
+        $context->headersManager->add('kernel/file');
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        $context->codePrinter->output('zephir_filemtime(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index 6d4b5759fe..d9052a01b9 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -13,7 +13,11 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -22,21 +26,49 @@
  *
  * Optimizes calls to 'get_class_lower' using internal function
  */
-class GetClassLowerOptimizer extends GetClassOptimizer
+class GetClassLowerOptimizer extends OptimizerAbstract
 {
     /**
-     * @param array $expression
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
      *
-     * @return void
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function checkParameters(array $expression): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters) {
-            throw new CompilerException(
-                "'get_class_lower' only accepts one parameters",
-                $expression
-            );
+            throw new CompilerException("'get_class_lower' only accepts one parameters", $expression);
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/object');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
         }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 1);');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index db8bf1fca9..a848acb414 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -13,7 +13,11 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -22,23 +26,54 @@
  *
  * Optimizes calls to 'get_class_ns' using internal function
  */
-class GetClassNsOptimizer extends GetClassOptimizer
+class GetClassNsOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_get_class_ns';
-
     /**
-     * @param array $expression
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
      *
-     * @return void
+     * @throws CompilerException
      */
-    protected function checkParameters(array $expression): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException(
-                "'get_class_ns' only accepts one or two parameters",
-                $expression
+            throw new CompilerException("'get_class_ns' only accepts one or two parameters", $expression);
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/object');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        if (!isset($resolvedParams[1])) {
+            $context->codePrinter->output('zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
+        } else {
+            $context->codePrinter->output(
+                'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
             );
         }
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index b689068e78..8b185d23bb 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -28,8 +28,6 @@
  */
 class GetClassOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_get_class';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -45,7 +43,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $this->checkParameters($expression);
+        $numberParameters = count($expression['parameters']);
+        if (1 != $numberParameters && 2 != $numberParameters) {
+            throw new CompilerException("'get_class' only accepts one or two parameters", $expression);
+        }
 
         /*
          * Process the expected symbol to be returned
@@ -66,26 +67,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ', 0);'
-        );
+        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param array $expression
-     *
-     * @return void
-     */
-    protected function checkParameters(array $expression): void
-    {
-        $numberParameters = count($expression['parameters']);
-        if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException(
-                "'get_class' only accepts one or two parameters",
-                $expression
-            );
-        }
-    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index 50c0d4ce8a..dc9b194bfd 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -17,7 +17,6 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
-use Zephir\Variable\Variable;
 
 use function count;
 
@@ -28,11 +27,6 @@
  */
 class JsonDecodeOptimizer extends OptimizerAbstract
 {
-    /**
-     * @var string
-     */
-    protected string $zephirMethod = 'zephir_json_decode';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -53,7 +47,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable();
         $this->checkNotVariable($symbolVariable, $expression);
-        $symbolVariable = $this->checkSymbolVariable($symbolVariable, $context);
+        if (!$symbolVariable) {
+            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+            $symbolVariable->initVariant($context);
+        }
 
         $context->headersManager->add('kernel/string');
 
@@ -80,21 +77,4 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return Variable|null
-     */
-    protected function checkSymbolVariable(
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): ?Variable {
-        if (!$symbolVariable) {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
-        return $symbolVariable;
-    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index 67aa01db6f..e344f03578 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -13,32 +13,64 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\Variable\Variable;
+use Zephir\CompiledExpression;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * JsonEncodeOptimizer.
  *
  * Optimizes calls to 'json_encode' using internal function
  */
-class JsonEncodeOptimizer extends JsonDecodeOptimizer
+class JsonEncodeOptimizer extends OptimizerAbstract
 {
     /**
-     * @var string
-     */
-    protected string $zephirMethod = 'zephir_json_encode';
-
-
-    /**
-     * @param Variable|null      $symbolVariable
+     * @param array              $expression
+     * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return Variable|null
+     * @return bool|CompiledExpression|mixed
      */
-    protected function checkSymbolVariable(
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): ?Variable {
-        return $symbolVariable;
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariable($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        /*
+         * Process encode options
+         */
+        if (count($resolvedParams) >= 2) {
+            $context->headersManager->add('kernel/operators');
+            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
+        } else {
+            $options = '0 ';
+        }
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_json_encode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index e0c8a53659..f35de5c6c1 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -47,12 +47,23 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
-            $call,
-            $context,
-            $expression
-        );
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
 
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_md5(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index bb0401a39a..03bff3f455 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -28,7 +28,6 @@
  */
 class StrtoupperOptimizer extends OptimizerAbstract
 {
-    protected string $type         = 'string';
     protected string $zephirMethod = 'zephir_fast_strtoupper';
 
     /**
@@ -59,7 +58,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes($this->type);
+        $symbolVariable->setDynamicTypes('string');
 
         $resolvedParams = $call->getReadOnlyResolvedParams(
             $expression['parameters'],
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index 2c4381fcb1..38ae5ee408 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -13,24 +13,75 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * TrimOptimizer.
  *
  * Optimizes calls to 'trim' using internal function
  */
-class TrimOptimizer extends UncamelizeOptimizer
+class TrimOptimizer extends OptimizerAbstract
 {
-    protected string $trimWhere    = 'ZEPHIR_TRIM_BOTH';
-    protected string $warningName  = '';
-    protected string $zephirMethod = 'zephir_fast_trim';
+    protected string $trimWhere = 'ZEPHIR_TRIM_BOTH';
 
     /**
-     * @param $parameters
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
      *
-     * @return void
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function checkParameters($parameters): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        // empty
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        $charlist = 'NULL ';
+        if (2 == count($expression['parameters'])) {
+            if ('null' == $expression['parameters'][1]['parameter']['type']) {
+                unset($expression['parameters'][1]);
+            }
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if (isset($resolvedParams[1])) {
+            $charlist = $resolvedParams[1];
+        }
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_fast_trim(' . $symbol . ', '
+            . $resolvedParams[0] . ', '
+            . $charlist . ', '
+            . $this->trimWhere . ');'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index ed3b2f1885..10085855a3 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,8 +33,9 @@ class UcfirstOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -46,12 +47,22 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
-            $call,
-            $context,
-            $expression
-        );
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
 
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_ucfirst(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 9417c42a38..5d10f1f25b 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -15,47 +15,72 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\Variable\Variable;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * UncamelizeOptimizer.
  *
  * Optimizes calls to 'uncamelize' using internal function
  */
-class UncamelizeOptimizer extends CamelizeOptimizer
+class UncamelizeOptimizer extends OptimizerAbstract
 {
-    protected string $warningName  = 'uncamelize';
-    protected string $zephirMethod = 'zephir_uncamelize';
-
     /**
+     * @param array              $expression
      * @param Call               $call
-     * @param Variable|null      $symbolVariable
      * @param CompilationContext $context
      *
-     * @return void
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function symbolVariablePost(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
+            throw new CompilerException("'uncamelize' only accepts one or two parameters");
+        }
+
+        $delimiter = 'NULL ';
+        if (2 == count($expression['parameters'])) {
+            if ('null' == $expression['parameters'][1]['parameter']['type']) {
+                unset($expression['parameters'][1]);
+            }
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if (isset($resolvedParams[1])) {
+            $delimiter = $resolvedParams[1];
+        }
+
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
-    }
 
-    /**
-     * @param Call               $call
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function symbolVariablePre(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
-        // empty
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index d59fc4db4b..0b38116151 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -51,7 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                  */
                 $type = match ($resolvedParam->getType()) {
                     Types::T_ARRAY => 'array',
-                    default        => 'variable',
+                    default => 'variable',
                 };
 
                 $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 520e281862..9eea35e60e 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             $type = match ($resolvedParam->getType()) {
                 Types::T_ARRAY => 'array',
-                default        => 'variable',
+                default => 'variable',
             };
 
             $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index c6c4d13bcc..34000d6f7c 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -15,7 +15,6 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\Exception;
 use Zephir\Traits\VariablesTrait;
 
 abstract class OptimizerAbstract
@@ -30,37 +29,4 @@ abstract class OptimizerAbstract
      * @return mixed
      */
     abstract public function optimize(array $expression, Call $call, CompilationContext $context);
-
-    /**
-     * @param Call               $call
-     * @param CompilationContext $context
-     * @param array              $expression
-     *
-     * @return array
-     * @throws Exception
-     */
-    protected function processStringOptimizer(Call $call, CompilationContext $context, array $expression): array
-    {
-        /**
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
-
-        $this->symbolVariablePre($call, $symbolVariable, $context);
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        return [$symbolVariable, $resolvedParams, $symbol];
-    }
 }
diff --git a/src/Traits/CompilerTrait.php b/src/Traits/CompilerTrait.php
deleted file mode 100644
index b85a2fdb77..0000000000
--- a/src/Traits/CompilerTrait.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir\Traits;
-
-use Zephir\Class\Definition\Definition;
-use Zephir\CompilationContext;
-
-use function dirname;
-use function explode;
-use function implode;
-use function is_dir;
-use function mkdir;
-use function str_repeat;
-use function str_replace;
-use function strpos;
-use function strtolower;
-
-use const DIRECTORY_SEPARATOR;
-use const PHP_EOL;
-
-trait CompilerTrait
-{
-    /**
-     * @param string $completeName
-     *
-     * @return array
-     */
-    protected function calculatePaths(string $completeName): array
-    {
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
-
-        return [$path, $filePath, $filePathHeader];
-    }
-
-    /**
-     * @param string             $code
-     * @param Definition|null    $classDefinition
-     * @param CompilationContext $compilationContext
-     *
-     * @return void
-     */
-    protected function generateClassHeadersPost(
-        string $code,
-        ?Definition $classDefinition,
-        CompilationContext $compilationContext
-    ): void {
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
-
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
-    }
-
-    /**
-     * @param Definition|null $classDefinition
-     *
-     * @return string
-     */
-    protected function generateCodeHeadersPre(?Definition $classDefinition): string
-    {
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        return $code;
-    }
-}

From c66488395d59431b80cb4d23149501204de03e80 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:51:46 -0600
Subject: [PATCH 263/375] removing duplications

---
 src/Expression/Closure.php                    | 74 +++++++++++++------
 src/Expression/ClosureArrow.php               | 30 ++------
 .../Arithmetical/ArithmeticalBaseOperator.php | 29 ++++++++
 src/Operators/Arithmetical/DivOperator.php    | 13 +---
 src/Operators/Arithmetical/ModOperator.php    | 13 +---
 5 files changed, 89 insertions(+), 70 deletions(-)

diff --git a/src/Expression/Closure.php b/src/Expression/Closure.php
index bd0117e67a..25e4585fda 100644
--- a/src/Expression/Closure.php
+++ b/src/Expression/Closure.php
@@ -113,30 +113,14 @@ public function compile(array $expression, CompilationContext $compilationContex
             $expression,
             $staticVariables
         );
-        $classDefinition->addMethod($classMethod, $block);
-
-        $compilationContext->headersManager->add('kernel/object');
-
-        if ($this->expecting) {
-            if ($this->expectingVariable) {
-                $symbolVariable = $this->expectingVariable;
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext,
-                    $expression
-                );
-            }
-        } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext,
-                $expression
-            );
-        }
 
-        $symbolVariable->initVariant($compilationContext);
-        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
+        $symbolVariable = $this->generateClosure(
+            $classDefinition,
+            $classMethod,
+            $block,
+            $compilationContext,
+            $expression
+        );
         $compilationContext->headersManager->add('kernel/object');
 
         foreach ($staticVariables as $var) {
@@ -213,4 +197,48 @@ public function setReadOnly(bool $readOnly): void
     {
         $this->readOnly = $readOnly;
     }
+
+    /**
+     * @param Definition $classDefinition
+     * @param Method $classMethod
+     * @param mixed $block
+     * @param CompilationContext $compilationContext
+     * @param array $expression
+     *
+     * @return Variable|null
+     */
+    protected function generateClosure(
+        Definition $classDefinition,
+        Method $classMethod,
+        mixed $block,
+        CompilationContext $compilationContext,
+        array $expression
+    ): ?Variable {
+        $classDefinition->addMethod($classMethod, $block);
+
+        $compilationContext->headersManager->add('kernel/object');
+
+        if ($this->expecting) {
+            if ($this->expectingVariable) {
+                $symbolVariable = $this->expectingVariable;
+            } else {
+                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext,
+                    $expression
+                );
+            }
+        } else {
+            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                'variable',
+                $compilationContext,
+                $expression
+            );
+        }
+
+        $symbolVariable->initVariant($compilationContext);
+        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
+
+        return $symbolVariable;
+    }
 }
diff --git a/src/Expression/ClosureArrow.php b/src/Expression/ClosureArrow.php
index a3b940ce81..7a7467f875 100644
--- a/src/Expression/ClosureArrow.php
+++ b/src/Expression/ClosureArrow.php
@@ -87,30 +87,14 @@ public function compile(array $expression, CompilationContext $compilationContex
             null,
             $expression
         );
-        $classDefinition->addMethod($classMethod, $block);
 
-        $compilationContext->headersManager->add('kernel/object');
-
-        if ($this->expecting) {
-            if ($this->expectingVariable) {
-                $symbolVariable = $this->expectingVariable;
-            } else {
-                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext,
-                    $expression
-                );
-            }
-        } else {
-            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                'variable',
-                $compilationContext,
-                $expression
-            );
-        }
-
-        $symbolVariable->initVariant($compilationContext);
-        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);
+        $symbolVariable = $this->generateClosure(
+            $classDefinition,
+            $classMethod,
+            $block,
+            $compilationContext,
+            $expression
+        );
 
         ++self::$id;
 
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index f3ffe047f2..c37cd45af1 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -13,9 +13,11 @@
 
 namespace Zephir\Operators\Arithmetical;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception;
+use Zephir\Exception as ZephirException;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Operators\AbstractOperator;
@@ -877,4 +879,31 @@ protected function processLeftBoolean(
             ),
         };
     }
+
+    /**
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return array
+     * @throws ReflectionException
+     * @throws ZephirException
+     */
+    protected function preCompileChecks(
+        array $expression,
+        CompilationContext $compilationContext
+    ): array {
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
+
+        $leftExpr = new Expression($expression['left']);
+        $leftExpr->setReadOnly(true);
+        $left = $leftExpr->compile($compilationContext);
+
+        $rightExpr = new Expression($expression['right']);
+        $rightExpr->setReadOnly(true);
+        $right = $rightExpr->compile($compilationContext);
+
+        $compilationContext->headersManager->add('kernel/operators');
+        return [$left, $right];
+    }
 }
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 7fcdc409b0..acbc1194f4 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -36,18 +36,7 @@ class DivOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeft($expression);
-        $this->checkRight($expression);
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
-
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly(true);
-        $right = $rightExpr->compile($compilationContext);
-
-        $compilationContext->headersManager->add('kernel/operators');
+        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
             case 'int':
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 230d2ed613..49aa132758 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -36,18 +36,7 @@ class ModOperator extends ArithmeticalBaseOperator
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
-        $this->checkLeft($expression);
-        $this->checkRight($expression);
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
-
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly(true);
-        $right = $rightExpr->compile($compilationContext);
-
-        $compilationContext->headersManager->add('kernel/operators');
+        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
             case 'int':

From c447b11615447a12db89fa504d973712733c9979 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:56:49 -0600
Subject: [PATCH 264/375] removing more duplications

---
 .../FunctionCall/BasenameOptimizer.php        |  11 +-
 .../FunctionCall/CreateInstanceOptimizer.php  |  27 ++++-
 .../CreateInstanceParamsOptimizer.php         |  61 ++--------
 .../FunctionCall/FilemtimeOptimizer.php       |  51 +-------
 src/Traits/CompilerTrait.php                  | 110 ++++++++++++++++++
 5 files changed, 153 insertions(+), 107 deletions(-)
 create mode 100644 src/Traits/CompilerTrait.php

diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index 9b048a2cd6..4f79f9f986 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,6 +28,8 @@
  */
 class BasenameOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_basename';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -35,7 +37,8 @@ class BasenameOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -64,7 +67,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_basename(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index b85529c413..2ae69dd5be 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -28,6 +28,10 @@
  */
 class CreateInstanceOptimizer extends OptimizerAbstract
 {
+    protected string $exceptionMessage = 'This function only accepts one parameter';
+    protected int    $parameterCount   = 1;
+    protected string $zephirMethod     = 'zephir_create_instance';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,8 +47,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (1 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires one parameter', $expression);
+        if ($this->parameterCount !== count($expression['parameters'])) {
+            throw new CompilerException(
+                $this->exceptionMessage,
+                $expression
+            );
         }
 
         /*
@@ -77,12 +84,24 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
+            'ZEPHIR_LAST_CALL_STATUS = '
+            . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $call->checkTempParameters($context);
+        $this->getTempParameters($call, $context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function getTempParameters(Call $call, CompilationContext $context): void
+    {
+        $call->checkTempParameters($context);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index af8528e4e3..b6092c2803 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -15,68 +15,27 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
 
 /**
  * CreateInstanceParamsOptimizer.
  *
  * Built-in function that creates new instances of objects from its class name passing parameters as an array
  */
-class CreateInstanceParamsOptimizer extends OptimizerAbstract
+class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
 {
+    protected string $exceptionMessage = 'This function requires only two parameters';
+    protected int    $parameterCount   = 2;
+    protected string $zephirMethod     = 'zephir_create_instance_params';
+
+
     /**
-     * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
+     *
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getTempParameters(Call $call, CompilationContext $context): void
     {
-        if (!isset($expression['parameters'])) {
-            throw new CompilerException('This function requires parameters', $expression);
-        }
-
-        if (2 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires two parameter', $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('object');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        );
-
-        $call->addCallStatusOrJump($context);
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        // Not needed here
     }
 }
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index 9d44f9e6fc..db5205b200 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -13,59 +13,12 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * FilemtimeOptimizer.
  *
  * Optimizes calls to 'filemtime' using internal function
  */
-class FilemtimeOptimizer extends OptimizerAbstract
+class FilemtimeOptimizer extends BasenameOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        $context->headersManager->add('kernel/file');
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output('zephir_filemtime(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_filemtime';
 }
diff --git a/src/Traits/CompilerTrait.php b/src/Traits/CompilerTrait.php
new file mode 100644
index 0000000000..b85a2fdb77
--- /dev/null
+++ b/src/Traits/CompilerTrait.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Traits;
+
+use Zephir\Class\Definition\Definition;
+use Zephir\CompilationContext;
+
+use function dirname;
+use function explode;
+use function implode;
+use function is_dir;
+use function mkdir;
+use function str_repeat;
+use function str_replace;
+use function strpos;
+use function strtolower;
+
+use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
+
+trait CompilerTrait
+{
+    /**
+     * @param string $completeName
+     *
+     * @return array
+     */
+    protected function calculatePaths(string $completeName): array
+    {
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
+
+        return [$path, $filePath, $filePathHeader];
+    }
+
+    /**
+     * @param string             $code
+     * @param Definition|null    $classDefinition
+     * @param CompilationContext $compilationContext
+     *
+     * @return void
+     */
+    protected function generateClassHeadersPost(
+        string $code,
+        ?Definition $classDefinition,
+        CompilationContext $compilationContext
+    ): void {
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
+    }
+
+    /**
+     * @param Definition|null $classDefinition
+     *
+     * @return string
+     */
+    protected function generateCodeHeadersPre(?Definition $classDefinition): string
+    {
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        return $code;
+    }
+}

From db5c74238675900a3ced42ca875fa00e84a2e8bf Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:59:07 -0600
Subject: [PATCH 265/375] removing duplications from compiler files

---
 src/CompilerFile.php          | 46 ++++------------------------------
 src/CompilerFileAnonymous.php | 47 ++++-------------------------------
 2 files changed, 10 insertions(+), 83 deletions(-)

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index ccac3008e3..1efbc53d8e 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -29,6 +29,7 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function array_map;
 use function count;
@@ -47,7 +48,6 @@
 use function preg_match;
 use function realpath;
 use function sprintf;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -64,6 +64,7 @@
  */
 final class CompilerFile implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     /**
@@ -161,18 +162,7 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
@@ -181,24 +171,8 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
         } else {
             $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         }
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
 
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 
     /**
@@ -399,17 +373,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index c5ab3cf487..59d0551722 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -19,10 +19,10 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function count;
 use function dirname;
-use function explode;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
@@ -30,7 +30,6 @@
 use function is_dir;
 use function md5;
 use function mkdir;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -44,6 +43,7 @@
  */
 final class CompilerFileAnonymous implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     protected Definition          $classDefinition;
@@ -114,17 +114,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
@@ -225,39 +215,12 @@ private function compileClass(CompilationContext $compilationContext): void
          */
         $classDefinition->compile($compilationContext);
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
 
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
-
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 }

From 1ab880c1fa177c017d81fb449e5d92a59647c780 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:59:48 -0600
Subject: [PATCH 266/375] Revert "removing duplications from compiler files"

This reverts commit db5c74238675900a3ced42ca875fa00e84a2e8bf.
---
 src/CompilerFile.php          | 46 ++++++++++++++++++++++++++++++----
 src/CompilerFileAnonymous.php | 47 +++++++++++++++++++++++++++++++----
 2 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index 1efbc53d8e..ccac3008e3 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -29,7 +29,6 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
-use Zephir\Traits\CompilerTrait;
 
 use function array_map;
 use function count;
@@ -48,6 +47,7 @@
 use function preg_match;
 use function realpath;
 use function sprintf;
+use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -64,7 +64,6 @@
  */
 final class CompilerFile implements FileInterface
 {
-    use CompilerTrait;
     use LoggerAwareTrait;
 
     /**
@@ -162,7 +161,18 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
-        $code = $this->generateCodeHeadersPre($classDefinition);
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
@@ -171,8 +181,24 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
         } else {
             $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         }
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
 
-        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
     }
 
     /**
@@ -373,7 +399,17 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $classDefinition->getCompleteName();
 
-        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
 
         /**
          * If the file does not exist we create it for the first time
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index 59d0551722..c5ab3cf487 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -19,10 +19,10 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
-use Zephir\Traits\CompilerTrait;
 
 use function count;
 use function dirname;
+use function explode;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
@@ -30,6 +30,7 @@
 use function is_dir;
 use function md5;
 use function mkdir;
+use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -43,7 +44,6 @@
  */
 final class CompilerFileAnonymous implements FileInterface
 {
-    use CompilerTrait;
     use LoggerAwareTrait;
 
     protected Definition          $classDefinition;
@@ -114,7 +114,17 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
 
         /**
          * If the file does not exist we create it for the first time
@@ -215,12 +225,39 @@ private function compileClass(CompilationContext $compilationContext): void
          */
         $classDefinition->compile($compilationContext);
 
-        $code = $this->generateCodeHeadersPre($classDefinition);
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
 
-        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
     }
 }

From 72c3c8bb3328cd41a6e329f8a4fa911efbd2c64f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 16:59:58 -0600
Subject: [PATCH 267/375] Revert "removing more duplications"

This reverts commit c447b11615447a12db89fa504d973712733c9979.
---
 .../FunctionCall/BasenameOptimizer.php        |  11 +-
 .../FunctionCall/CreateInstanceOptimizer.php  |  27 +----
 .../CreateInstanceParamsOptimizer.php         |  61 ++++++++--
 .../FunctionCall/FilemtimeOptimizer.php       |  51 +++++++-
 src/Traits/CompilerTrait.php                  | 110 ------------------
 5 files changed, 107 insertions(+), 153 deletions(-)
 delete mode 100644 src/Traits/CompilerTrait.php

diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index 4f79f9f986..9b048a2cd6 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,8 +28,6 @@
  */
 class BasenameOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_basename';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -37,8 +35,7 @@ class BasenameOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -67,9 +64,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        );
+        $context->codePrinter->output('zephir_basename(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 2ae69dd5be..b85529c413 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -28,10 +28,6 @@
  */
 class CreateInstanceOptimizer extends OptimizerAbstract
 {
-    protected string $exceptionMessage = 'This function only accepts one parameter';
-    protected int    $parameterCount   = 1;
-    protected string $zephirMethod     = 'zephir_create_instance';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -47,11 +43,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if ($this->parameterCount !== count($expression['parameters'])) {
-            throw new CompilerException(
-                $this->exceptionMessage,
-                $expression
-            );
+        if (1 != count($expression['parameters'])) {
+            throw new CompilerException('This function only requires one parameter', $expression);
         }
 
         /*
@@ -84,24 +77,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = '
-            . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $this->getTempParameters($call, $context);
+        $call->checkTempParameters($context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function getTempParameters(Call $call, CompilationContext $context): void
-    {
-        $call->checkTempParameters($context);
-    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index b6092c2803..af8528e4e3 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -15,27 +15,68 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * CreateInstanceParamsOptimizer.
  *
  * Built-in function that creates new instances of objects from its class name passing parameters as an array
  */
-class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
+class CreateInstanceParamsOptimizer extends OptimizerAbstract
 {
-    protected string $exceptionMessage = 'This function requires only two parameters';
-    protected int    $parameterCount   = 2;
-    protected string $zephirMethod     = 'zephir_create_instance_params';
-
-
     /**
+     * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
-     *
-     * @return void
      */
-    protected function getTempParameters(Call $call, CompilationContext $context): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        // Not needed here
+        if (!isset($expression['parameters'])) {
+            throw new CompilerException('This function requires parameters', $expression);
+        }
+
+        if (2 != count($expression['parameters'])) {
+            throw new CompilerException('This function only requires two parameter', $expression);
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariable($symbolVariable, $expression);
+
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        $context->headersManager->add('kernel/object');
+
+        $symbolVariable->setDynamicTypes('object');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
+
+        $call->addCallStatusOrJump($context);
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index db5205b200..9d44f9e6fc 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -13,12 +13,59 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * FilemtimeOptimizer.
  *
  * Optimizes calls to 'filemtime' using internal function
  */
-class FilemtimeOptimizer extends BasenameOptimizer
+class FilemtimeOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_filemtime';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (1 != count($expression['parameters'])) {
+            return false;
+        }
+
+        $context->headersManager->add('kernel/file');
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        $context->codePrinter->output('zephir_filemtime(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Traits/CompilerTrait.php b/src/Traits/CompilerTrait.php
deleted file mode 100644
index b85a2fdb77..0000000000
--- a/src/Traits/CompilerTrait.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir\Traits;
-
-use Zephir\Class\Definition\Definition;
-use Zephir\CompilationContext;
-
-use function dirname;
-use function explode;
-use function implode;
-use function is_dir;
-use function mkdir;
-use function str_repeat;
-use function str_replace;
-use function strpos;
-use function strtolower;
-
-use const DIRECTORY_SEPARATOR;
-use const PHP_EOL;
-
-trait CompilerTrait
-{
-    /**
-     * @param string $completeName
-     *
-     * @return array
-     */
-    protected function calculatePaths(string $completeName): array
-    {
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
-
-        return [$path, $filePath, $filePathHeader];
-    }
-
-    /**
-     * @param string             $code
-     * @param Definition|null    $classDefinition
-     * @param CompilationContext $compilationContext
-     *
-     * @return void
-     */
-    protected function generateClassHeadersPost(
-        string $code,
-        ?Definition $classDefinition,
-        CompilationContext $compilationContext
-    ): void {
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
-
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
-    }
-
-    /**
-     * @param Definition|null $classDefinition
-     *
-     * @return string
-     */
-    protected function generateCodeHeadersPre(?Definition $classDefinition): string
-    {
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        return $code;
-    }
-}

From 888a4281c7ba031fcbd4ae460defca5dad119d76 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 17:05:59 -0600
Subject: [PATCH 268/375] removing more duplications

---
 src/CompilerFile.php                          |  46 +-------
 src/CompilerFileAnonymous.php                 |  47 +-------
 .../FunctionCall/JsonDecodeOptimizer.php      |  28 ++++-
 .../FunctionCall/JsonEncodeOptimizer.php      |  62 +++-------
 .../FunctionCall/VarDumpOptimizer.php         |   2 +-
 .../FunctionCall/VarExportOptimizer.php       |   2 +-
 src/Optimizers/OptimizerAbstract.php          |  37 ++++++
 src/Traits/CompilerTrait.php                  | 110 ++++++++++++++++++
 8 files changed, 198 insertions(+), 136 deletions(-)
 create mode 100644 src/Traits/CompilerTrait.php

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index ccac3008e3..1efbc53d8e 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -29,6 +29,7 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function array_map;
 use function count;
@@ -47,7 +48,6 @@
 use function preg_match;
 use function realpath;
 use function sprintf;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -64,6 +64,7 @@
  */
 final class CompilerFile implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     /**
@@ -161,18 +162,7 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
@@ -181,24 +171,8 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
         } else {
             $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         }
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
 
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 
     /**
@@ -399,17 +373,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index c5ab3cf487..59d0551722 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -19,10 +19,10 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function count;
 use function dirname;
-use function explode;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
@@ -30,7 +30,6 @@
 use function is_dir;
 use function md5;
 use function mkdir;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -44,6 +43,7 @@
  */
 final class CompilerFileAnonymous implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     protected Definition          $classDefinition;
@@ -114,17 +114,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
@@ -225,39 +215,12 @@ private function compileClass(CompilationContext $compilationContext): void
          */
         $classDefinition->compile($compilationContext);
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
 
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
-
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 }
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index dc9b194bfd..50c0d4ce8a 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -17,6 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -27,6 +28,11 @@
  */
 class JsonDecodeOptimizer extends OptimizerAbstract
 {
+    /**
+     * @var string
+     */
+    protected string $zephirMethod = 'zephir_json_decode';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -47,10 +53,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable();
         $this->checkNotVariable($symbolVariable, $expression);
-        if (!$symbolVariable) {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
+        $symbolVariable = $this->checkSymbolVariable($symbolVariable, $context);
 
         $context->headersManager->add('kernel/string');
 
@@ -77,4 +80,21 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return Variable|null
+     */
+    protected function checkSymbolVariable(
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): ?Variable {
+        if (!$symbolVariable) {
+            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+            $symbolVariable->initVariant($context);
+        }
+        return $symbolVariable;
+    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index e344f03578..67aa01db6f 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -13,64 +13,32 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use Zephir\Variable\Variable;
 
 /**
  * JsonEncodeOptimizer.
  *
  * Optimizes calls to 'json_encode' using internal function
  */
-class JsonEncodeOptimizer extends OptimizerAbstract
+class JsonEncodeOptimizer extends JsonDecodeOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
+     * @var string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+    protected string $zephirMethod = 'zephir_json_encode';
 
-        /*
-         * Process encode options
-         */
-        if (count($resolvedParams) >= 2) {
-            $context->headersManager->add('kernel/operators');
-            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
-        } else {
-            $options = '0 ';
-        }
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_json_encode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    /**
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return Variable|null
+     */
+    protected function checkSymbolVariable(
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): ?Variable {
+        return $symbolVariable;
     }
 }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index 0b38116151..d59fc4db4b 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -51,7 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                  */
                 $type = match ($resolvedParam->getType()) {
                     Types::T_ARRAY => 'array',
-                    default => 'variable',
+                    default        => 'variable',
                 };
 
                 $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 9eea35e60e..520e281862 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             $type = match ($resolvedParam->getType()) {
                 Types::T_ARRAY => 'array',
-                default => 'variable',
+                default        => 'variable',
             };
 
             $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 34000d6f7c..53c73cb67a 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -15,6 +15,7 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Traits\VariablesTrait;
 
 abstract class OptimizerAbstract
@@ -29,4 +30,40 @@ abstract class OptimizerAbstract
      * @return mixed
      */
     abstract public function optimize(array $expression, Call $call, CompilationContext $context);
+
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     * @param array              $expression
+     *
+     * @return array
+     * @throws Exception
+     */
+    protected function processStringOptimizer(Call $call, CompilationContext $context, array $expression): array
+    {
+        /**
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        return [$symbolVariable, $resolvedParams, $symbol];
+    }
 }
diff --git a/src/Traits/CompilerTrait.php b/src/Traits/CompilerTrait.php
new file mode 100644
index 0000000000..b85a2fdb77
--- /dev/null
+++ b/src/Traits/CompilerTrait.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Traits;
+
+use Zephir\Class\Definition\Definition;
+use Zephir\CompilationContext;
+
+use function dirname;
+use function explode;
+use function implode;
+use function is_dir;
+use function mkdir;
+use function str_repeat;
+use function str_replace;
+use function strpos;
+use function strtolower;
+
+use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
+
+trait CompilerTrait
+{
+    /**
+     * @param string $completeName
+     *
+     * @return array
+     */
+    protected function calculatePaths(string $completeName): array
+    {
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
+
+        return [$path, $filePath, $filePathHeader];
+    }
+
+    /**
+     * @param string             $code
+     * @param Definition|null    $classDefinition
+     * @param CompilationContext $compilationContext
+     *
+     * @return void
+     */
+    protected function generateClassHeadersPost(
+        string $code,
+        ?Definition $classDefinition,
+        CompilationContext $compilationContext
+    ): void {
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
+    }
+
+    /**
+     * @param Definition|null $classDefinition
+     *
+     * @return string
+     */
+    protected function generateCodeHeadersPre(?Definition $classDefinition): string
+    {
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        return $code;
+    }
+}

From 8ac5c54fcc3faabe08d608beaddfcc0bece21d0d Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 17:22:33 -0600
Subject: [PATCH 269/375] Revert "removing more duplications"

This reverts commit 888a4281c7ba031fcbd4ae460defca5dad119d76.
---
 src/CompilerFile.php                          |  46 +++++++-
 src/CompilerFileAnonymous.php                 |  47 +++++++-
 .../FunctionCall/JsonDecodeOptimizer.php      |  28 +----
 .../FunctionCall/JsonEncodeOptimizer.php      |  62 +++++++---
 .../FunctionCall/VarDumpOptimizer.php         |   2 +-
 .../FunctionCall/VarExportOptimizer.php       |   2 +-
 src/Optimizers/OptimizerAbstract.php          |  37 ------
 src/Traits/CompilerTrait.php                  | 110 ------------------
 8 files changed, 136 insertions(+), 198 deletions(-)
 delete mode 100644 src/Traits/CompilerTrait.php

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index 1efbc53d8e..ccac3008e3 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -29,7 +29,6 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
-use Zephir\Traits\CompilerTrait;
 
 use function array_map;
 use function count;
@@ -48,6 +47,7 @@
 use function preg_match;
 use function realpath;
 use function sprintf;
+use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -64,7 +64,6 @@
  */
 final class CompilerFile implements FileInterface
 {
-    use CompilerTrait;
     use LoggerAwareTrait;
 
     /**
@@ -162,7 +161,18 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
-        $code = $this->generateCodeHeadersPre($classDefinition);
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
@@ -171,8 +181,24 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
         } else {
             $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         }
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
 
-        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
     }
 
     /**
@@ -373,7 +399,17 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $classDefinition->getCompleteName();
 
-        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
 
         /**
          * If the file does not exist we create it for the first time
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index 59d0551722..c5ab3cf487 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -19,10 +19,10 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
-use Zephir\Traits\CompilerTrait;
 
 use function count;
 use function dirname;
+use function explode;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
@@ -30,6 +30,7 @@
 use function is_dir;
 use function md5;
 use function mkdir;
+use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -43,7 +44,6 @@
  */
 final class CompilerFileAnonymous implements FileInterface
 {
-    use CompilerTrait;
     use LoggerAwareTrait;
 
     protected Definition          $classDefinition;
@@ -114,7 +114,17 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
 
         /**
          * If the file does not exist we create it for the first time
@@ -215,12 +225,39 @@ private function compileClass(CompilationContext $compilationContext): void
          */
         $classDefinition->compile($compilationContext);
 
-        $code = $this->generateCodeHeadersPre($classDefinition);
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
 
         $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
 
-        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
     }
 }
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index 50c0d4ce8a..dc9b194bfd 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -17,7 +17,6 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
-use Zephir\Variable\Variable;
 
 use function count;
 
@@ -28,11 +27,6 @@
  */
 class JsonDecodeOptimizer extends OptimizerAbstract
 {
-    /**
-     * @var string
-     */
-    protected string $zephirMethod = 'zephir_json_decode';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -53,7 +47,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable = $call->getSymbolVariable();
         $this->checkNotVariable($symbolVariable, $expression);
-        $symbolVariable = $this->checkSymbolVariable($symbolVariable, $context);
+        if (!$symbolVariable) {
+            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+            $symbolVariable->initVariant($context);
+        }
 
         $context->headersManager->add('kernel/string');
 
@@ -80,21 +77,4 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return Variable|null
-     */
-    protected function checkSymbolVariable(
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): ?Variable {
-        if (!$symbolVariable) {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
-        return $symbolVariable;
-    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index 67aa01db6f..e344f03578 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -13,32 +13,64 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\Variable\Variable;
+use Zephir\CompiledExpression;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * JsonEncodeOptimizer.
  *
  * Optimizes calls to 'json_encode' using internal function
  */
-class JsonEncodeOptimizer extends JsonDecodeOptimizer
+class JsonEncodeOptimizer extends OptimizerAbstract
 {
     /**
-     * @var string
-     */
-    protected string $zephirMethod = 'zephir_json_encode';
-
-
-    /**
-     * @param Variable|null      $symbolVariable
+     * @param array              $expression
+     * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return Variable|null
+     * @return bool|CompiledExpression|mixed
      */
-    protected function checkSymbolVariable(
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): ?Variable {
-        return $symbolVariable;
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariable($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        /*
+         * Process encode options
+         */
+        if (count($resolvedParams) >= 2) {
+            $context->headersManager->add('kernel/operators');
+            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
+        } else {
+            $options = '0 ';
+        }
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_json_encode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index d59fc4db4b..0b38116151 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -51,7 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                  */
                 $type = match ($resolvedParam->getType()) {
                     Types::T_ARRAY => 'array',
-                    default        => 'variable',
+                    default => 'variable',
                 };
 
                 $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 520e281862..9eea35e60e 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             $type = match ($resolvedParam->getType()) {
                 Types::T_ARRAY => 'array',
-                default        => 'variable',
+                default => 'variable',
             };
 
             $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 53c73cb67a..34000d6f7c 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -15,7 +15,6 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\Exception;
 use Zephir\Traits\VariablesTrait;
 
 abstract class OptimizerAbstract
@@ -30,40 +29,4 @@ abstract class OptimizerAbstract
      * @return mixed
      */
     abstract public function optimize(array $expression, Call $call, CompilationContext $context);
-
-    /**
-     * @param Call               $call
-     * @param CompilationContext $context
-     * @param array              $expression
-     *
-     * @return array
-     * @throws Exception
-     */
-    protected function processStringOptimizer(Call $call, CompilationContext $context, array $expression): array
-    {
-        /**
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        return [$symbolVariable, $resolvedParams, $symbol];
-    }
 }
diff --git a/src/Traits/CompilerTrait.php b/src/Traits/CompilerTrait.php
deleted file mode 100644
index b85a2fdb77..0000000000
--- a/src/Traits/CompilerTrait.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * This file is part of the Zephir.
- *
- * (c) Phalcon Team <team@zephir-lang.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Zephir\Traits;
-
-use Zephir\Class\Definition\Definition;
-use Zephir\CompilationContext;
-
-use function dirname;
-use function explode;
-use function implode;
-use function is_dir;
-use function mkdir;
-use function str_repeat;
-use function str_replace;
-use function strpos;
-use function strtolower;
-
-use const DIRECTORY_SEPARATOR;
-use const PHP_EOL;
-
-trait CompilerTrait
-{
-    /**
-     * @param string $completeName
-     *
-     * @return array
-     */
-    protected function calculatePaths(string $completeName): array
-    {
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
-
-        return [$path, $filePath, $filePathHeader];
-    }
-
-    /**
-     * @param string             $code
-     * @param Definition|null    $classDefinition
-     * @param CompilationContext $compilationContext
-     *
-     * @return void
-     */
-    protected function generateClassHeadersPost(
-        string $code,
-        ?Definition $classDefinition,
-        CompilationContext $compilationContext
-    ): void {
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
-
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
-    }
-
-    /**
-     * @param Definition|null $classDefinition
-     *
-     * @return string
-     */
-    protected function generateCodeHeadersPre(?Definition $classDefinition): string
-    {
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        return $code;
-    }
-}

From 1bb179f310325ba25446b3b96f6db4697b4d99c6 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 17:25:48 -0600
Subject: [PATCH 270/375] remove duplications from compiler

---
 src/CompilerFile.php                 |  46 ++---------
 src/CompilerFileAnonymous.php        |  47 ++----------
 src/Optimizers/OptimizerAbstract.php |  37 +++++++++
 src/Traits/CompilerTrait.php         | 110 +++++++++++++++++++++++++++
 4 files changed, 157 insertions(+), 83 deletions(-)
 create mode 100644 src/Traits/CompilerTrait.php

diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index ccac3008e3..1efbc53d8e 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -29,6 +29,7 @@
 use Zephir\Exception\IllegalStateException;
 use Zephir\Exception\ParseException;
 use Zephir\FileSystem\FileSystemInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function array_map;
 use function count;
@@ -47,7 +48,6 @@
 use function preg_match;
 use function realpath;
 use function sprintf;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -64,6 +64,7 @@
  */
 final class CompilerFile implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     /**
@@ -161,18 +162,7 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
     {
         $classDefinition = $this->classDefinition;
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         if ('class' == $classDefinition->getType()) {
             $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
@@ -181,24 +171,8 @@ public function applyClassHeaders(CompilationContext $compilationContext): void
         } else {
             $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         }
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
-
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
 
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 
     /**
@@ -399,17 +373,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index c5ab3cf487..59d0551722 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -19,10 +19,10 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Code\Printer;
 use Zephir\Compiler\FileInterface;
+use Zephir\Traits\CompilerTrait;
 
 use function count;
 use function dirname;
-use function explode;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
@@ -30,7 +30,6 @@
 use function is_dir;
 use function md5;
 use function mkdir;
-use function str_repeat;
 use function str_replace;
 use function strpos;
 use function strtolower;
@@ -44,6 +43,7 @@
  */
 final class CompilerFileAnonymous implements FileInterface
 {
+    use CompilerTrait;
     use LoggerAwareTrait;
 
     protected Definition          $classDefinition;
@@ -114,17 +114,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
 
         $completeName = $this->classDefinition->getCompleteName();
 
-        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
-
-        $filePath       = 'ext/' . $path . '.zep.c';
-        $filePathHeader = 'ext/' . $path . '.zep.h';
-
-        if (strpos($path, DIRECTORY_SEPARATOR)) {
-            $dirname = dirname($filePath);
-            if (!is_dir($dirname)) {
-                mkdir($dirname, 0755, true);
-            }
-        }
+        [$path, $filePath, $filePathHeader] = $this->calculatePaths($completeName);
 
         /**
          * If the file does not exist we create it for the first time
@@ -225,39 +215,12 @@ private function compileClass(CompilationContext $compilationContext): void
          */
         $classDefinition->compile($compilationContext);
 
-        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
-
-        $code = PHP_EOL;
-        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
-        $code .= '#endif' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include <php.h>' . PHP_EOL;
-        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
-        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
-        $code .= PHP_EOL;
+        $code = $this->generateCodeHeadersPre($classDefinition);
 
         $code .= '#include <Zend/zend_operators.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_exceptions.h>' . PHP_EOL;
         $code .= '#include <Zend/zend_interfaces.h>' . PHP_EOL;
-        $code .= PHP_EOL;
-
-        $code .= '#include "kernel/main.h"' . PHP_EOL;
 
-        if ('class' == $classDefinition->getType()) {
-            foreach ($compilationContext->headersManager->get() as $header => $one) {
-                $code .= '#include "' . $header . '.h"' . PHP_EOL;
-            }
-        }
-
-        if (count($this->headerCBlocks) > 0) {
-            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
-        }
-
-        /**
-         * Prepend the required files to the header
-         */
-        $compilationContext->codePrinter->preOutput($code);
+        $this->generateClassHeadersPost($code, $classDefinition, $compilationContext);
     }
 }
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 34000d6f7c..53c73cb67a 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -15,6 +15,7 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\Exception;
 use Zephir\Traits\VariablesTrait;
 
 abstract class OptimizerAbstract
@@ -29,4 +30,40 @@ abstract class OptimizerAbstract
      * @return mixed
      */
     abstract public function optimize(array $expression, Call $call, CompilationContext $context);
+
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     * @param array              $expression
+     *
+     * @return array
+     * @throws Exception
+     */
+    protected function processStringOptimizer(Call $call, CompilationContext $context, array $expression): array
+    {
+        /**
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        return [$symbolVariable, $resolvedParams, $symbol];
+    }
 }
diff --git a/src/Traits/CompilerTrait.php b/src/Traits/CompilerTrait.php
new file mode 100644
index 0000000000..b85a2fdb77
--- /dev/null
+++ b/src/Traits/CompilerTrait.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Zephir\Traits;
+
+use Zephir\Class\Definition\Definition;
+use Zephir\CompilationContext;
+
+use function dirname;
+use function explode;
+use function implode;
+use function is_dir;
+use function mkdir;
+use function str_repeat;
+use function str_replace;
+use function strpos;
+use function strtolower;
+
+use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
+
+trait CompilerTrait
+{
+    /**
+     * @param string $completeName
+     *
+     * @return array
+     */
+    protected function calculatePaths(string $completeName): array
+    {
+        $path = str_replace('\\', DIRECTORY_SEPARATOR, strtolower($completeName));
+
+        $filePath       = 'ext/' . $path . '.zep.c';
+        $filePathHeader = 'ext/' . $path . '.zep.h';
+
+        if (strpos($path, DIRECTORY_SEPARATOR)) {
+            $dirname = dirname($filePath);
+            if (!is_dir($dirname)) {
+                mkdir($dirname, 0755, true);
+            }
+        }
+
+        return [$path, $filePath, $filePathHeader];
+    }
+
+    /**
+     * @param string             $code
+     * @param Definition|null    $classDefinition
+     * @param CompilationContext $compilationContext
+     *
+     * @return void
+     */
+    protected function generateClassHeadersPost(
+        string $code,
+        ?Definition $classDefinition,
+        CompilationContext $compilationContext
+    ): void {
+        $code .= PHP_EOL;
+
+        $code .= '#include "kernel/main.h"' . PHP_EOL;
+
+        if ('class' == $classDefinition->getType()) {
+            foreach ($compilationContext->headersManager->get() as $header => $one) {
+                $code .= '#include "' . $header . '.h"' . PHP_EOL;
+            }
+        }
+
+        if (count($this->headerCBlocks) > 0) {
+            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;
+        }
+
+        /**
+         * Prepend the required files to the header
+         */
+        $compilationContext->codePrinter->preOutput($code);
+    }
+
+    /**
+     * @param Definition|null $classDefinition
+     *
+     * @return string
+     */
+    protected function generateCodeHeadersPre(?Definition $classDefinition): string
+    {
+        $separators = str_repeat('../', count(explode('\\', $classDefinition->getCompleteName())) - 1);
+
+        $code = PHP_EOL;
+        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext_config.h"' . PHP_EOL;
+        $code .= '#endif' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        $code .= '#include <php.h>' . PHP_EOL;
+        $code .= '#include "' . $separators . 'php_ext.h"' . PHP_EOL;
+        $code .= '#include "' . $separators . 'ext.h"' . PHP_EOL;
+        $code .= PHP_EOL;
+
+        return $code;
+    }
+}

From ddf5a04587afff55307b7aeed598de932109a102 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 17:41:25 -0600
Subject: [PATCH 271/375] removing duplications from string optimizers

---
 .../FunctionCall/AddslashesOptimizer.php      | 30 +++--------
 .../FunctionCall/BasenameOptimizer.php        | 11 ++--
 .../FunctionCall/FilemtimeOptimizer.php       | 51 +------------------
 src/Optimizers/FunctionCall/Md5Optimizer.php  | 51 +------------------
 .../FunctionCall/StrtoupperOptimizer.php      |  3 +-
 .../FunctionCall/UcfirstOptimizer.php         | 34 +++++--------
 .../FunctionCall/VarDumpOptimizer.php         |  2 +-
 .../FunctionCall/VarExportOptimizer.php       |  2 +-
 8 files changed, 38 insertions(+), 146 deletions(-)

diff --git a/src/Optimizers/FunctionCall/AddslashesOptimizer.php b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
index 066e37fd0c..9ff2a92193 100644
--- a/src/Optimizers/FunctionCall/AddslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/AddslashesOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,9 +33,8 @@ class AddslashesOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -47,25 +46,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
+            $call,
+            $context,
+            $expression
+        );
 
-        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_addslashes(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index 9b048a2cd6..4f79f9f986 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,6 +28,8 @@
  */
 class BasenameOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_basename';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -35,7 +37,8 @@ class BasenameOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -64,7 +67,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_basename(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
index 9d44f9e6fc..db5205b200 100644
--- a/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/FilemtimeOptimizer.php
@@ -13,59 +13,12 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * FilemtimeOptimizer.
  *
  * Optimizes calls to 'filemtime' using internal function
  */
-class FilemtimeOptimizer extends OptimizerAbstract
+class FilemtimeOptimizer extends BasenameOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        $context->headersManager->add('kernel/file');
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output('zephir_filemtime(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_filemtime';
 }
diff --git a/src/Optimizers/FunctionCall/Md5Optimizer.php b/src/Optimizers/FunctionCall/Md5Optimizer.php
index f35de5c6c1..66858ca2cf 100644
--- a/src/Optimizers/FunctionCall/Md5Optimizer.php
+++ b/src/Optimizers/FunctionCall/Md5Optimizer.php
@@ -13,59 +13,12 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * MD5Optimizer.
  *
  * Optimizes calls to 'md5' using internal function
  */
-class Md5Optimizer extends OptimizerAbstract
+class Md5Optimizer extends UcfirstOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_md5(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $zephirMethod = 'zephir_md5';
 }
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index 03bff3f455..bb0401a39a 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -28,6 +28,7 @@
  */
 class StrtoupperOptimizer extends OptimizerAbstract
 {
+    protected string $type         = 'string';
     protected string $zephirMethod = 'zephir_fast_strtoupper';
 
     /**
@@ -58,7 +59,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $this->checkNotVariableString($symbolVariable, $expression);
 
         $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
+        $symbolVariable->setDynamicTypes($this->type);
 
         $resolvedParams = $call->getReadOnlyResolvedParams(
             $expression['parameters'],
diff --git a/src/Optimizers/FunctionCall/UcfirstOptimizer.php b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
index 10085855a3..5d1817a80f 100644
--- a/src/Optimizers/FunctionCall/UcfirstOptimizer.php
+++ b/src/Optimizers/FunctionCall/UcfirstOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,14 +28,15 @@
  */
 class UcfirstOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_ucfirst';
+
     /**
      * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -47,23 +48,16 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
+        [$symbolVariable, $resolvedParams, $symbol] = $this->processStringOptimizer(
+            $call,
+            $context,
+            $expression
+        );
 
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_ucfirst(' . $symbol . ', ' . $resolvedParams[0] . ');');
+        $context->codePrinter->output(
+            $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
diff --git a/src/Optimizers/FunctionCall/VarDumpOptimizer.php b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
index 0b38116151..d59fc4db4b 100644
--- a/src/Optimizers/FunctionCall/VarDumpOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarDumpOptimizer.php
@@ -51,7 +51,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
                  */
                 $type = match ($resolvedParam->getType()) {
                     Types::T_ARRAY => 'array',
-                    default => 'variable',
+                    default        => 'variable',
                 };
 
                 $variable = $context->symbolTable->addTemp($type, $context);
diff --git a/src/Optimizers/FunctionCall/VarExportOptimizer.php b/src/Optimizers/FunctionCall/VarExportOptimizer.php
index 9eea35e60e..520e281862 100644
--- a/src/Optimizers/FunctionCall/VarExportOptimizer.php
+++ b/src/Optimizers/FunctionCall/VarExportOptimizer.php
@@ -61,7 +61,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
              */
             $type = match ($resolvedParam->getType()) {
                 Types::T_ARRAY => 'array',
-                default => 'variable',
+                default        => 'variable',
             };
 
             $variable = $context->symbolTable->addTemp($type, $context);

From d4bc89a650b9d049bd2aedc50f4802f8c9b9e034 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 17:58:19 -0600
Subject: [PATCH 272/375] array, getclass - removing duplications

---
 .../FunctionCall/ArrayKeyExistsOptimizer.php  | 27 ++++++--
 .../FunctionCall/ArrayKeysOptimizer.php       | 27 ++++++--
 .../FunctionCall/ArrayMergeOptimizer.php      | 64 ++++---------------
 .../FunctionCall/CreateInstanceOptimizer.php  | 26 ++++++--
 .../CreateInstanceParamsOptimizer.php         | 61 +++---------------
 .../FunctionCall/GetClassLowerOptimizer.php   | 48 +++-----------
 .../FunctionCall/GetClassNsOptimizer.php      | 53 +++------------
 .../FunctionCall/GetClassOptimizer.php        | 27 ++++++--
 .../FunctionCall/InArrayOptimizer.php         | 40 ++----------
 9 files changed, 135 insertions(+), 238 deletions(-)

diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index a05e5d9beb..83e4e28d67 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,9 +33,8 @@ class ArrayKeyExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -49,13 +48,29 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         // Note: the first parameter is key in php array_key_exists
         return new CompiledExpression(
             'bool',
-            'zephir_array_key_exists(' . $resolvedParams[1] . ', ' . $resolvedParams[0] . ')',
+            $this->getCode($resolvedParams),
             $expression
         );
     }
+
+    /**
+     * @param array $resolvedParams
+     *
+     * @return string
+     */
+    protected function getCode(array $resolvedParams): string
+    {
+        return 'zephir_array_key_exists('
+            . $resolvedParams[1] . ', '
+            . $resolvedParams[0] . ')';
+    }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 6cdf76c2ce..971a8bb51f 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,6 +28,8 @@
  */
 class ArrayKeysOptimizer extends OptimizerAbstract
 {
+    protected int $parameterCount = 1;
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -35,7 +37,8 @@ class ArrayKeysOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -43,7 +46,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != count($expression['parameters'])) {
+        if ($this->parameterCount !== count($expression['parameters'])) {
             return false;
         }
 
@@ -65,8 +68,24 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_array_keys(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, $resolvedParams): string
+    {
+        return sprintf(
+            'zephir_array_keys(%s, %s);',
+            $symbol,
+            $resolvedParams[0]
+        );
+    }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index 081768ab18..d357cd2ad0 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -13,68 +13,30 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use function sprintf;
 
 /**
  * ArrayMergeOptimizer.
  *
  * Optimizes calls to 'array_merge' using internal function
  */
-class ArrayMergeOptimizer extends OptimizerAbstract
+class ArrayMergeOptimizer extends ArrayKeysOptimizer
 {
+    protected int $parameterCount = 2;
+
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
+     * @param string $symbol
+     * @param array  $resolvedParams
      *
-     * @throws CompilerException
+     * @return string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getOutput(string $symbol, $resolvedParams): string
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/array');
-
-        $symbolVariable->setDynamicTypes('array');
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output(
-            sprintf(
-                'zephir_fast_array_merge(%s, %s, %s);',
-                $symbol,
-                $resolvedParams[0],
-                $resolvedParams[1]
-            )
+        return sprintf(
+            'zephir_fast_array_merge(%s, %s, %s);',
+            $symbol,
+            $resolvedParams[0],
+            $resolvedParams[1]
         );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index b85529c413..fcf4381041 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -28,6 +28,10 @@
  */
 class CreateInstanceOptimizer extends OptimizerAbstract
 {
+    protected string $exceptionMessage = 'This function only accepts one parameter';
+    protected int    $parameterCount   = 1;
+    protected string $zephirMethod     = 'zephir_create_instance';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,8 +47,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (1 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires one parameter', $expression);
+        if ($this->parameterCount !== count($expression['parameters'])) {
+            throw new CompilerException(
+                $this->exceptionMessage,
+                $expression
+            );
         }
 
         /*
@@ -77,12 +84,23 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
+            'ZEPHIR_LAST_CALL_STATUS = '
+            . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $call->checkTempParameters($context);
+        $this->getTempParameters($context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function getTempParameters(CompilationContext $context): void
+    {
+        $call->checkTempParameters($context);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index af8528e4e3..b6092c2803 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -15,68 +15,27 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
 
 /**
  * CreateInstanceParamsOptimizer.
  *
  * Built-in function that creates new instances of objects from its class name passing parameters as an array
  */
-class CreateInstanceParamsOptimizer extends OptimizerAbstract
+class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
 {
+    protected string $exceptionMessage = 'This function requires only two parameters';
+    protected int    $parameterCount   = 2;
+    protected string $zephirMethod     = 'zephir_create_instance_params';
+
+
     /**
-     * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
+     *
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getTempParameters(Call $call, CompilationContext $context): void
     {
-        if (!isset($expression['parameters'])) {
-            throw new CompilerException('This function requires parameters', $expression);
-        }
-
-        if (2 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires two parameter', $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('object');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        );
-
-        $call->addCallStatusOrJump($context);
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        // Not needed here
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index d9052a01b9..6d4b5759fe 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -13,11 +13,7 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -26,49 +22,21 @@
  *
  * Optimizes calls to 'get_class_lower' using internal function
  */
-class GetClassLowerOptimizer extends OptimizerAbstract
+class GetClassLowerOptimizer extends GetClassOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param array $expression
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters(array $expression): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters) {
-            throw new CompilerException("'get_class_lower' only accepts one parameters", $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
+            throw new CompilerException(
+                "'get_class_lower' only accepts one parameters",
+                $expression
+            );
         }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 1);');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index a848acb414..db8bf1fca9 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -13,11 +13,7 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -26,54 +22,23 @@
  *
  * Optimizes calls to 'get_class_ns' using internal function
  */
-class GetClassNsOptimizer extends OptimizerAbstract
+class GetClassNsOptimizer extends GetClassOptimizer
 {
+    protected string $zephirMethod = 'zephir_get_class_ns';
+
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
+     * @param array $expression
      *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters(array $expression): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException("'get_class_ns' only accepts one or two parameters", $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        if (!isset($resolvedParams[1])) {
-            $context->codePrinter->output('zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
-        } else {
-            $context->codePrinter->output(
-                'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            throw new CompilerException(
+                "'get_class_ns' only accepts one or two parameters",
+                $expression
             );
         }
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index 8b185d23bb..b689068e78 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -28,6 +28,8 @@
  */
 class GetClassOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_get_class';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,10 +45,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $numberParameters = count($expression['parameters']);
-        if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException("'get_class' only accepts one or two parameters", $expression);
-        }
+        $this->checkParameters($expression);
 
         /*
          * Process the expected symbol to be returned
@@ -67,8 +66,26 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
+        $context->codePrinter->output(
+            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ', 0);'
+        );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param array $expression
+     *
+     * @return void
+     */
+    protected function checkParameters(array $expression): void
+    {
+        $numberParameters = count($expression['parameters']);
+        if (1 != $numberParameters && 2 != $numberParameters) {
+            throw new CompilerException(
+                "'get_class' only accepts one or two parameters",
+                $expression
+            );
+        }
+    }
 }
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index b6717aa1a1..ab675298de 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -13,48 +13,22 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * InArrayOptimizer.
  *
  * Optimizes calls to 'in_array' using internal function
  */
-class InArrayOptimizer extends OptimizerAbstract
+class InArrayOptimizer extends ArrayKeyExistsOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param array $resolvedParams
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getCode(array $resolvedParams): string
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        $context->headersManager->add('kernel/array');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        return new CompiledExpression(
-            'bool',
-            'zephir_fast_in_array(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
-            $expression
-        );
+        return 'zephir_fast_in_array('
+            . $resolvedParams[0] . ', '
+            . $resolvedParams[1] . ')';
     }
 }

From 391392283f38fb3ed7f1ab9791053d61268d495f Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 18:05:41 -0600
Subject: [PATCH 273/375] trim, camelize and crc32 optimizers - removing
 duplicates

---
 .../FunctionCall/CamelizeOptimizer.php        | 69 ++++++++++++++---
 .../FunctionCall/Crc32Optimizer.php           | 51 +-----------
 .../FunctionCall/CreateInstanceOptimizer.php  |  5 +-
 .../FunctionCall/LtrimOptimizer.php           |  2 +-
 .../FunctionCall/RtrimOptimizer.php           |  2 +-
 src/Optimizers/FunctionCall/TrimOptimizer.php | 67 ++--------------
 .../FunctionCall/UncamelizeOptimizer.php      | 77 +++++++------------
 7 files changed, 102 insertions(+), 171 deletions(-)

diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index c5c0a93af9..f39bd5b54b 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -18,6 +18,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -28,6 +29,10 @@
  */
 class CamelizeOptimizer extends OptimizerAbstract
 {
+    protected string $trimWhere    = '';
+    protected string $warningName  = 'camelize';
+    protected string $zephirMethod = 'zephir_camelize';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,11 +48,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
-            throw new CompilerException("'camelize' only accepts one or two parameters");
-        }
+        $this->checkParameters($expression['parameters']);
 
-        $delimiter = 'NULL ';
+        $charlist = 'NULL ';
         if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
@@ -62,9 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->symbolVariablePre($call, $symbolVariable, $context);
 
         $context->headersManager->add('kernel/string');
 
@@ -73,14 +74,64 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         if (isset($resolvedParams[1])) {
-            $delimiter = $resolvedParams[1];
+            $charlist = $resolvedParams[1];
         }
 
+        $this->symbolVariablePost($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+            $this->zephirMethod
+            . 'zephir_fast_trim(' . $symbol . ', '
+            . $resolvedParams[0] . ', ' . $charlist . $this->trimWhere . ');'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param $parameters
+     *
+     * @return void
+     */
+    protected function checkParameters($parameters): void
+    {
+        if (count($parameters) < 1 || count($parameters) > 2) {
+            throw new CompilerException(
+                "'" . $this->warningName . "' only accepts one or two parameters"
+            );
+        }
+    }
+
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePost(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        // empty
+    }
+
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePre(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+    }
 }
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index 1582e14ac4..e69712d152 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -13,58 +13,13 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * Crc32Optimizer.
  *
  * Optimizes calls to 'crc32' using internal function
  */
-class Crc32Optimizer extends OptimizerAbstract
+class Crc32Optimizer extends StrtoupperOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('long');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_crc32(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $type         = 'long';
+    protected string $zephirMethod = 'zephir_crc32';
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index fcf4381041..2ae69dd5be 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -88,18 +88,19 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $this->getTempParameters($context);
+        $this->getTempParameters($call, $context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 
     /**
+     * @param Call               $call
      * @param CompilationContext $context
      *
      * @return void
      */
-    protected function getTempParameters(CompilationContext $context): void
+    protected function getTempParameters(Call $call, CompilationContext $context): void
     {
         $call->checkTempParameters($context);
     }
diff --git a/src/Optimizers/FunctionCall/LtrimOptimizer.php b/src/Optimizers/FunctionCall/LtrimOptimizer.php
index d298d1fbf3..c1d89c0d80 100644
--- a/src/Optimizers/FunctionCall/LtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/LtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class LtrimOptimizer extends TrimOptimizer
 {
-    protected string $trimWhere = 'ZEPHIR_TRIM_LEFT';
+    protected string $trimWhere = ', ZEPHIR_TRIM_LEFT';
 }
diff --git a/src/Optimizers/FunctionCall/RtrimOptimizer.php b/src/Optimizers/FunctionCall/RtrimOptimizer.php
index 5169f883d8..e562c37a91 100644
--- a/src/Optimizers/FunctionCall/RtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/RtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class RtrimOptimizer extends TrimOptimizer
 {
-    protected string $trimWhere = 'ZEPHIR_TRIM_RIGHT';
+    protected string $trimWhere = ', ZEPHIR_TRIM_RIGHT';
 }
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index 38ae5ee408..564cf40506 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -13,75 +13,24 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * TrimOptimizer.
  *
  * Optimizes calls to 'trim' using internal function
  */
-class TrimOptimizer extends OptimizerAbstract
+class TrimOptimizer extends UncamelizeOptimizer
 {
-    protected string $trimWhere = 'ZEPHIR_TRIM_BOTH';
+    protected string $trimWhere = ', ZEPHIR_TRIM_BOTH';
+    protected string $warningName  = '';
+    protected string $zephirMethod = 'zephir_fast_trim';
 
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param $parameters
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters($parameters): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        $charlist = 'NULL ';
-        if (2 == count($expression['parameters'])) {
-            if ('null' == $expression['parameters'][1]['parameter']['type']) {
-                unset($expression['parameters'][1]);
-            }
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if (isset($resolvedParams[1])) {
-            $charlist = $resolvedParams[1];
-        }
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_fast_trim(' . $symbol . ', '
-            . $resolvedParams[0] . ', '
-            . $charlist . ', '
-            . $this->trimWhere . ');'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        // empty
     }
 }
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 5d10f1f25b..9417c42a38 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -15,72 +15,47 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use Zephir\Variable\Variable;
 
 /**
  * UncamelizeOptimizer.
  *
  * Optimizes calls to 'uncamelize' using internal function
  */
-class UncamelizeOptimizer extends OptimizerAbstract
+class UncamelizeOptimizer extends CamelizeOptimizer
 {
+    protected string $warningName  = 'uncamelize';
+    protected string $zephirMethod = 'zephir_uncamelize';
+
     /**
-     * @param array              $expression
      * @param Call               $call
+     * @param Variable|null      $symbolVariable
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
-            throw new CompilerException("'uncamelize' only accepts one or two parameters");
-        }
-
-        $delimiter = 'NULL ';
-        if (2 == count($expression['parameters'])) {
-            if ('null' == $expression['parameters'][1]['parameter']['type']) {
-                unset($expression['parameters'][1]);
-            }
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if (isset($resolvedParams[1])) {
-            $delimiter = $resolvedParams[1];
-        }
-
+    protected function symbolVariablePost(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
+    }
 
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePre(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        // empty
     }
 }

From 7f9172209c9a874d8ff5aa67cf688dc05dca552b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 18:09:06 -0600
Subject: [PATCH 274/375] Revert "trim, camelize and crc32 optimizers -
 removing duplicates"

This reverts commit 391392283f38fb3ed7f1ab9791053d61268d495f.
---
 .../FunctionCall/CamelizeOptimizer.php        | 69 +++--------------
 .../FunctionCall/Crc32Optimizer.php           | 51 +++++++++++-
 .../FunctionCall/CreateInstanceOptimizer.php  |  5 +-
 .../FunctionCall/LtrimOptimizer.php           |  2 +-
 .../FunctionCall/RtrimOptimizer.php           |  2 +-
 src/Optimizers/FunctionCall/TrimOptimizer.php | 67 ++++++++++++++--
 .../FunctionCall/UncamelizeOptimizer.php      | 77 ++++++++++++-------
 7 files changed, 171 insertions(+), 102 deletions(-)

diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index f39bd5b54b..c5c0a93af9 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -18,7 +18,6 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
-use Zephir\Variable\Variable;
 
 use function count;
 
@@ -29,10 +28,6 @@
  */
 class CamelizeOptimizer extends OptimizerAbstract
 {
-    protected string $trimWhere    = '';
-    protected string $warningName  = 'camelize';
-    protected string $zephirMethod = 'zephir_camelize';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -48,9 +43,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $this->checkParameters($expression['parameters']);
+        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
+            throw new CompilerException("'camelize' only accepts one or two parameters");
+        }
 
-        $charlist = 'NULL ';
+        $delimiter = 'NULL ';
         if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
@@ -65,7 +62,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        $this->symbolVariablePre($call, $symbolVariable, $context);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
 
         $context->headersManager->add('kernel/string');
 
@@ -74,64 +73,14 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         if (isset($resolvedParams[1])) {
-            $charlist = $resolvedParams[1];
+            $delimiter = $resolvedParams[1];
         }
 
-        $this->symbolVariablePost($call, $symbolVariable, $context);
-
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            $this->zephirMethod
-            . 'zephir_fast_trim(' . $symbol . ', '
-            . $resolvedParams[0] . ', ' . $charlist . $this->trimWhere . ');'
+            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param $parameters
-     *
-     * @return void
-     */
-    protected function checkParameters($parameters): void
-    {
-        if (count($parameters) < 1 || count($parameters) > 2) {
-            throw new CompilerException(
-                "'" . $this->warningName . "' only accepts one or two parameters"
-            );
-        }
-    }
-
-    /**
-     * @param Call               $call
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function symbolVariablePost(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
-        // empty
-    }
-
-    /**
-     * @param Call               $call
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function symbolVariablePre(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-    }
 }
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index e69712d152..1582e14ac4 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -13,13 +13,58 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * Crc32Optimizer.
  *
  * Optimizes calls to 'crc32' using internal function
  */
-class Crc32Optimizer extends StrtoupperOptimizer
+class Crc32Optimizer extends OptimizerAbstract
 {
-    protected string $type         = 'long';
-    protected string $zephirMethod = 'zephir_crc32';
+    /**
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
+     */
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (1 != count($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('long');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output('zephir_crc32(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 2ae69dd5be..fcf4381041 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -88,19 +88,18 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $this->getTempParameters($call, $context);
+        $this->getTempParameters($context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 
     /**
-     * @param Call               $call
      * @param CompilationContext $context
      *
      * @return void
      */
-    protected function getTempParameters(Call $call, CompilationContext $context): void
+    protected function getTempParameters(CompilationContext $context): void
     {
         $call->checkTempParameters($context);
     }
diff --git a/src/Optimizers/FunctionCall/LtrimOptimizer.php b/src/Optimizers/FunctionCall/LtrimOptimizer.php
index c1d89c0d80..d298d1fbf3 100644
--- a/src/Optimizers/FunctionCall/LtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/LtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class LtrimOptimizer extends TrimOptimizer
 {
-    protected string $trimWhere = ', ZEPHIR_TRIM_LEFT';
+    protected string $trimWhere = 'ZEPHIR_TRIM_LEFT';
 }
diff --git a/src/Optimizers/FunctionCall/RtrimOptimizer.php b/src/Optimizers/FunctionCall/RtrimOptimizer.php
index e562c37a91..5169f883d8 100644
--- a/src/Optimizers/FunctionCall/RtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/RtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class RtrimOptimizer extends TrimOptimizer
 {
-    protected string $trimWhere = ', ZEPHIR_TRIM_RIGHT';
+    protected string $trimWhere = 'ZEPHIR_TRIM_RIGHT';
 }
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index 564cf40506..38ae5ee408 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -13,24 +13,75 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * TrimOptimizer.
  *
  * Optimizes calls to 'trim' using internal function
  */
-class TrimOptimizer extends UncamelizeOptimizer
+class TrimOptimizer extends OptimizerAbstract
 {
-    protected string $trimWhere = ', ZEPHIR_TRIM_BOTH';
-    protected string $warningName  = '';
-    protected string $zephirMethod = 'zephir_fast_trim';
+    protected string $trimWhere = 'ZEPHIR_TRIM_BOTH';
 
     /**
-     * @param $parameters
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
      *
-     * @return void
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function checkParameters($parameters): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        // empty
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        $charlist = 'NULL ';
+        if (2 == count($expression['parameters'])) {
+            if ('null' == $expression['parameters'][1]['parameter']['type']) {
+                unset($expression['parameters'][1]);
+            }
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if (isset($resolvedParams[1])) {
+            $charlist = $resolvedParams[1];
+        }
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_fast_trim(' . $symbol . ', '
+            . $resolvedParams[0] . ', '
+            . $charlist . ', '
+            . $this->trimWhere . ');'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 9417c42a38..5d10f1f25b 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -15,47 +15,72 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\Variable\Variable;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * UncamelizeOptimizer.
  *
  * Optimizes calls to 'uncamelize' using internal function
  */
-class UncamelizeOptimizer extends CamelizeOptimizer
+class UncamelizeOptimizer extends OptimizerAbstract
 {
-    protected string $warningName  = 'uncamelize';
-    protected string $zephirMethod = 'zephir_uncamelize';
-
     /**
+     * @param array              $expression
      * @param Call               $call
-     * @param Variable|null      $symbolVariable
      * @param CompilationContext $context
      *
-     * @return void
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function symbolVariablePost(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
+            throw new CompilerException("'uncamelize' only accepts one or two parameters");
+        }
+
+        $delimiter = 'NULL ';
+        if (2 == count($expression['parameters'])) {
+            if ('null' == $expression['parameters'][1]['parameter']['type']) {
+                unset($expression['parameters'][1]);
+            }
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/string');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if (isset($resolvedParams[1])) {
+            $delimiter = $resolvedParams[1];
+        }
+
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
-    }
 
-    /**
-     * @param Call               $call
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function symbolVariablePre(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
-        // empty
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }

From 177db8fcc970da9d119ce7bea8496b8dfe6ae52b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 18:09:17 -0600
Subject: [PATCH 275/375] Revert "array, getclass - removing duplications"

This reverts commit d4bc89a650b9d049bd2aedc50f4802f8c9b9e034.
---
 .../FunctionCall/ArrayKeyExistsOptimizer.php  | 27 ++------
 .../FunctionCall/ArrayKeysOptimizer.php       | 27 ++------
 .../FunctionCall/ArrayMergeOptimizer.php      | 64 +++++++++++++++----
 .../FunctionCall/CreateInstanceOptimizer.php  | 26 ++------
 .../CreateInstanceParamsOptimizer.php         | 61 +++++++++++++++---
 .../FunctionCall/GetClassLowerOptimizer.php   | 48 +++++++++++---
 .../FunctionCall/GetClassNsOptimizer.php      | 53 ++++++++++++---
 .../FunctionCall/GetClassOptimizer.php        | 27 ++------
 .../FunctionCall/InArrayOptimizer.php         | 40 ++++++++++--
 9 files changed, 238 insertions(+), 135 deletions(-)

diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index 83e4e28d67..a05e5d9beb 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,8 +33,9 @@ class ArrayKeyExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -48,29 +49,13 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         // Note: the first parameter is key in php array_key_exists
         return new CompiledExpression(
             'bool',
-            $this->getCode($resolvedParams),
+            'zephir_array_key_exists(' . $resolvedParams[1] . ', ' . $resolvedParams[0] . ')',
             $expression
         );
     }
-
-    /**
-     * @param array $resolvedParams
-     *
-     * @return string
-     */
-    protected function getCode(array $resolvedParams): string
-    {
-        return 'zephir_array_key_exists('
-            . $resolvedParams[1] . ', '
-            . $resolvedParams[0] . ')';
-    }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 971a8bb51f..6cdf76c2ce 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception;
+use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -28,8 +28,6 @@
  */
 class ArrayKeysOptimizer extends OptimizerAbstract
 {
-    protected int $parameterCount = 1;
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -37,8 +35,7 @@ class ArrayKeysOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @return false|CompiledExpression
-     * @throws Exception
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -46,7 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if ($this->parameterCount !== count($expression['parameters'])) {
+        if (1 != count($expression['parameters'])) {
             return false;
         }
 
@@ -68,24 +65,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
+        $context->codePrinter->output('zephir_array_keys(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param string $symbol
-     * @param array  $resolvedParams
-     *
-     * @return string
-     */
-    protected function getOutput(string $symbol, $resolvedParams): string
-    {
-        return sprintf(
-            'zephir_array_keys(%s, %s);',
-            $symbol,
-            $resolvedParams[0]
-        );
-    }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index d357cd2ad0..081768ab18 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -13,30 +13,68 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use function sprintf;
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * ArrayMergeOptimizer.
  *
  * Optimizes calls to 'array_merge' using internal function
  */
-class ArrayMergeOptimizer extends ArrayKeysOptimizer
+class ArrayMergeOptimizer extends OptimizerAbstract
 {
-    protected int $parameterCount = 2;
-
     /**
-     * @param string $symbol
-     * @param array  $resolvedParams
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
      *
-     * @return string
+     * @throws CompilerException
      */
-    protected function getOutput(string $symbol, $resolvedParams): string
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        return sprintf(
-            'zephir_fast_array_merge(%s, %s, %s);',
-            $symbol,
-            $resolvedParams[0],
-            $resolvedParams[1]
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (2 != count($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariable($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/array');
+
+        $symbolVariable->setDynamicTypes('array');
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        $context->codePrinter->output(
+            sprintf(
+                'zephir_fast_array_merge(%s, %s, %s);',
+                $symbol,
+                $resolvedParams[0],
+                $resolvedParams[1]
+            )
         );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index fcf4381041..b85529c413 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -28,10 +28,6 @@
  */
 class CreateInstanceOptimizer extends OptimizerAbstract
 {
-    protected string $exceptionMessage = 'This function only accepts one parameter';
-    protected int    $parameterCount   = 1;
-    protected string $zephirMethod     = 'zephir_create_instance';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -47,11 +43,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if ($this->parameterCount !== count($expression['parameters'])) {
-            throw new CompilerException(
-                $this->exceptionMessage,
-                $expression
-            );
+        if (1 != count($expression['parameters'])) {
+            throw new CompilerException('This function only requires one parameter', $expression);
         }
 
         /*
@@ -84,23 +77,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = '
-            . $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
-        $this->getTempParameters($context);
+        $call->checkTempParameters($context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function getTempParameters(CompilationContext $context): void
-    {
-        $call->checkTempParameters($context);
-    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index b6092c2803..af8528e4e3 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -15,27 +15,68 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * CreateInstanceParamsOptimizer.
  *
  * Built-in function that creates new instances of objects from its class name passing parameters as an array
  */
-class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
+class CreateInstanceParamsOptimizer extends OptimizerAbstract
 {
-    protected string $exceptionMessage = 'This function requires only two parameters';
-    protected int    $parameterCount   = 2;
-    protected string $zephirMethod     = 'zephir_create_instance_params';
-
-
     /**
+     * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
-     *
-     * @return void
      */
-    protected function getTempParameters(Call $call, CompilationContext $context): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        // Not needed here
+        if (!isset($expression['parameters'])) {
+            throw new CompilerException('This function requires parameters', $expression);
+        }
+
+        if (2 != count($expression['parameters'])) {
+            throw new CompilerException('This function only requires two parameter', $expression);
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariable($symbolVariable, $expression);
+
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        $context->headersManager->add('kernel/object');
+
+        $symbolVariable->setDynamicTypes('object');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+        /*
+         * Add the last call status to the current symbol table
+         */
+        $call->addCallStatusFlag($context);
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        );
+
+        $call->addCallStatusOrJump($context);
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index 6d4b5759fe..d9052a01b9 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -13,7 +13,11 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -22,21 +26,49 @@
  *
  * Optimizes calls to 'get_class_lower' using internal function
  */
-class GetClassLowerOptimizer extends GetClassOptimizer
+class GetClassLowerOptimizer extends OptimizerAbstract
 {
     /**
-     * @param array $expression
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
      *
-     * @return void
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function checkParameters(array $expression): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters) {
-            throw new CompilerException(
-                "'get_class_lower' only accepts one parameters",
-                $expression
-            );
+            throw new CompilerException("'get_class_lower' only accepts one parameters", $expression);
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/object');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
         }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+
+        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 1);');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index db8bf1fca9..a848acb414 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -13,7 +13,11 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -22,23 +26,54 @@
  *
  * Optimizes calls to 'get_class_ns' using internal function
  */
-class GetClassNsOptimizer extends GetClassOptimizer
+class GetClassNsOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_get_class_ns';
-
     /**
-     * @param array $expression
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return bool|CompiledExpression|mixed
      *
-     * @return void
+     * @throws CompilerException
      */
-    protected function checkParameters(array $expression): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException(
-                "'get_class_ns' only accepts one or two parameters",
-                $expression
+            throw new CompilerException("'get_class_ns' only accepts one or two parameters", $expression);
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $context->headersManager->add('kernel/object');
+
+        $symbolVariable->setDynamicTypes('string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        if (!isset($resolvedParams[1])) {
+            $context->codePrinter->output('zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
+        } else {
+            $context->codePrinter->output(
+                'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
             );
         }
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index b689068e78..8b185d23bb 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -28,8 +28,6 @@
  */
 class GetClassOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_get_class';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -45,7 +43,10 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $this->checkParameters($expression);
+        $numberParameters = count($expression['parameters']);
+        if (1 != $numberParameters && 2 != $numberParameters) {
+            throw new CompilerException("'get_class' only accepts one or two parameters", $expression);
+        }
 
         /*
          * Process the expected symbol to be returned
@@ -66,26 +67,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output(
-            $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ', 0);'
-        );
+        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param array $expression
-     *
-     * @return void
-     */
-    protected function checkParameters(array $expression): void
-    {
-        $numberParameters = count($expression['parameters']);
-        if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException(
-                "'get_class' only accepts one or two parameters",
-                $expression
-            );
-        }
-    }
 }
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index ab675298de..b6717aa1a1 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -13,22 +13,48 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
+use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Exception\CompilerException;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
+
 /**
  * InArrayOptimizer.
  *
  * Optimizes calls to 'in_array' using internal function
  */
-class InArrayOptimizer extends ArrayKeyExistsOptimizer
+class InArrayOptimizer extends OptimizerAbstract
 {
     /**
-     * @param array $resolvedParams
+     * @param array              $expression
+     * @param Call               $call
+     * @param CompilationContext $context
      *
-     * @return string
+     * @return bool|CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
-    protected function getCode(array $resolvedParams): string
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
-        return 'zephir_fast_in_array('
-            . $resolvedParams[0] . ', '
-            . $resolvedParams[1] . ')';
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        if (2 != count($expression['parameters'])) {
+            return false;
+        }
+
+        $context->headersManager->add('kernel/array');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        return new CompiledExpression(
+            'bool',
+            'zephir_fast_in_array(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
+            $expression
+        );
     }
 }

From 2b06db7078f9d3a66ce784e4cedaaa9df3eafd82 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 1 Dec 2023 18:55:22 -0600
Subject: [PATCH 276/375] camelize/trim/crc32 duplication

---
 .../FunctionCall/CamelizeOptimizer.php        | 69 ++++++++++++++---
 .../FunctionCall/Crc32Optimizer.php           | 51 +-----------
 .../FunctionCall/LtrimOptimizer.php           |  2 +-
 .../FunctionCall/RtrimOptimizer.php           |  2 +-
 src/Optimizers/FunctionCall/TrimOptimizer.php | 67 ++--------------
 .../FunctionCall/UncamelizeOptimizer.php      | 77 +++++++------------
 6 files changed, 99 insertions(+), 169 deletions(-)

diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index c5c0a93af9..7087b293b2 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -18,6 +18,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -28,6 +29,10 @@
  */
 class CamelizeOptimizer extends OptimizerAbstract
 {
+    protected string $trimWhere    = '';
+    protected string $warningName  = 'camelize';
+    protected string $zephirMethod = 'zephir_camelize';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,11 +48,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
-            throw new CompilerException("'camelize' only accepts one or two parameters");
-        }
+        $this->checkParameters($expression['parameters']);
 
-        $delimiter = 'NULL ';
+        $charlist = 'NULL ';
         if (2 == count($expression['parameters'])) {
             if ('null' == $expression['parameters'][1]['parameter']['type']) {
                 unset($expression['parameters'][1]);
@@ -62,9 +65,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->symbolVariablePre($call, $symbolVariable, $context);
 
         $context->headersManager->add('kernel/string');
 
@@ -73,14 +74,64 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
         if (isset($resolvedParams[1])) {
-            $delimiter = $resolvedParams[1];
+            $charlist = $resolvedParams[1];
         }
 
+        $this->symbolVariablePost($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_camelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
+            $this->zephirMethod . '(' . $symbol . ', '
+            . $resolvedParams[0] . ', '
+            . $charlist . $this->trimWhere . ');'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param $parameters
+     *
+     * @return void
+     */
+    protected function checkParameters($parameters): void
+    {
+        if (count($parameters) < 1 || count($parameters) > 2) {
+            throw new CompilerException(
+                "'" . $this->warningName . "' only accepts one or two parameters"
+            );
+        }
+    }
+
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePost(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        // empty
+    }
+
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePre(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+    }
 }
diff --git a/src/Optimizers/FunctionCall/Crc32Optimizer.php b/src/Optimizers/FunctionCall/Crc32Optimizer.php
index 1582e14ac4..e69712d152 100644
--- a/src/Optimizers/FunctionCall/Crc32Optimizer.php
+++ b/src/Optimizers/FunctionCall/Crc32Optimizer.php
@@ -13,58 +13,13 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * Crc32Optimizer.
  *
  * Optimizes calls to 'crc32' using internal function
  */
-class Crc32Optimizer extends OptimizerAbstract
+class Crc32Optimizer extends StrtoupperOptimizer
 {
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (1 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('long');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_crc32(' . $symbol . ', ' . $resolvedParams[0] . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
+    protected string $type         = 'long';
+    protected string $zephirMethod = 'zephir_crc32';
 }
diff --git a/src/Optimizers/FunctionCall/LtrimOptimizer.php b/src/Optimizers/FunctionCall/LtrimOptimizer.php
index d298d1fbf3..c1d89c0d80 100644
--- a/src/Optimizers/FunctionCall/LtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/LtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class LtrimOptimizer extends TrimOptimizer
 {
-    protected string $trimWhere = 'ZEPHIR_TRIM_LEFT';
+    protected string $trimWhere = ', ZEPHIR_TRIM_LEFT';
 }
diff --git a/src/Optimizers/FunctionCall/RtrimOptimizer.php b/src/Optimizers/FunctionCall/RtrimOptimizer.php
index 5169f883d8..e562c37a91 100644
--- a/src/Optimizers/FunctionCall/RtrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/RtrimOptimizer.php
@@ -20,5 +20,5 @@
  */
 class RtrimOptimizer extends TrimOptimizer
 {
-    protected string $trimWhere = 'ZEPHIR_TRIM_RIGHT';
+    protected string $trimWhere = ', ZEPHIR_TRIM_RIGHT';
 }
diff --git a/src/Optimizers/FunctionCall/TrimOptimizer.php b/src/Optimizers/FunctionCall/TrimOptimizer.php
index 38ae5ee408..5083c5fe68 100644
--- a/src/Optimizers/FunctionCall/TrimOptimizer.php
+++ b/src/Optimizers/FunctionCall/TrimOptimizer.php
@@ -13,75 +13,24 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * TrimOptimizer.
  *
  * Optimizes calls to 'trim' using internal function
  */
-class TrimOptimizer extends OptimizerAbstract
+class TrimOptimizer extends UncamelizeOptimizer
 {
-    protected string $trimWhere = 'ZEPHIR_TRIM_BOTH';
+    protected string $trimWhere    = ', ZEPHIR_TRIM_BOTH';
+    protected string $warningName  = '';
+    protected string $zephirMethod = 'zephir_fast_trim';
 
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param $parameters
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters($parameters): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        $charlist = 'NULL ';
-        if (2 == count($expression['parameters'])) {
-            if ('null' == $expression['parameters'][1]['parameter']['type']) {
-                unset($expression['parameters'][1]);
-            }
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if (isset($resolvedParams[1])) {
-            $charlist = $resolvedParams[1];
-        }
-
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_fast_trim(' . $symbol . ', '
-            . $resolvedParams[0] . ', '
-            . $charlist . ', '
-            . $this->trimWhere . ');'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        // empty
     }
 }
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 5d10f1f25b..9417c42a38 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -15,72 +15,47 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use Zephir\Variable\Variable;
 
 /**
  * UncamelizeOptimizer.
  *
  * Optimizes calls to 'uncamelize' using internal function
  */
-class UncamelizeOptimizer extends OptimizerAbstract
+class UncamelizeOptimizer extends CamelizeOptimizer
 {
+    protected string $warningName  = 'uncamelize';
+    protected string $zephirMethod = 'zephir_uncamelize';
+
     /**
-     * @param array              $expression
      * @param Call               $call
+     * @param Variable|null      $symbolVariable
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (count($expression['parameters']) < 1 || count($expression['parameters']) > 2) {
-            throw new CompilerException("'uncamelize' only accepts one or two parameters");
-        }
-
-        $delimiter = 'NULL ';
-        if (2 == count($expression['parameters'])) {
-            if ('null' == $expression['parameters'][1]['parameter']['type']) {
-                unset($expression['parameters'][1]);
-            }
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        if (isset($resolvedParams[1])) {
-            $delimiter = $resolvedParams[1];
-        }
-
+    protected function symbolVariablePost(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
         if ($call->mustInitSymbolVariable()) {
             $symbolVariable->initVariant($context);
         }
+    }
 
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_uncamelize(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $delimiter . ' );'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function symbolVariablePre(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        // empty
     }
 }

From af59b786f523bdcfb3e1b350059c184b240bfa40 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 13:10:27 -0600
Subject: [PATCH 277/375] removing dupes from inarray

---
 .../FunctionCall/ArrayKeyExistsOptimizer.php  | 27 ++++++++++---
 .../FunctionCall/InArrayOptimizer.php         | 39 +++----------------
 2 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
index a05e5d9beb..83e4e28d67 100644
--- a/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php
@@ -16,7 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
+use Zephir\Exception;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
@@ -33,9 +33,8 @@ class ArrayKeyExistsOptimizer extends OptimizerAbstract
      * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -49,13 +48,29 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+        $resolvedParams = $call->getReadOnlyResolvedParams(
+            $expression['parameters'],
+            $context,
+            $expression
+        );
 
         // Note: the first parameter is key in php array_key_exists
         return new CompiledExpression(
             'bool',
-            'zephir_array_key_exists(' . $resolvedParams[1] . ', ' . $resolvedParams[0] . ')',
+            $this->getCode($resolvedParams),
             $expression
         );
     }
+
+    /**
+     * @param array $resolvedParams
+     *
+     * @return string
+     */
+    protected function getCode(array $resolvedParams): string
+    {
+        return 'zephir_array_key_exists('
+            . $resolvedParams[1] . ', '
+            . $resolvedParams[0] . ')';
+    }
 }
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index b6717aa1a1..01b0036d69 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -13,48 +13,21 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
-
 /**
  * InArrayOptimizer.
  *
  * Optimizes calls to 'in_array' using internal function
  */
-class InArrayOptimizer extends OptimizerAbstract
+class InArrayOptimizer extends ArrayKeyExistsOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param array $resolvedParams
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getCode(array $resolvedParams): string
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        $context->headersManager->add('kernel/array');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        return new CompiledExpression(
-            'bool',
-            'zephir_fast_in_array(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')',
-            $expression
-        );
+        return 'zephir_fast_in_array('
+            . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')';
     }
 }

From 470adf7e82ecef5d67b7b94953d741fe5324506d Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 14:33:04 -0600
Subject: [PATCH 278/375] more optimizations; removing duplicate code

---
 .../FunctionCall/ArrayKeysOptimizer.php       |  4 +-
 .../FunctionCall/ArrayMergeOptimizer.php      |  5 +-
 .../FunctionCall/BasenameOptimizer.php        |  5 +-
 .../FunctionCall/CallUserFuncOptimizer.php    |  5 +-
 .../FunctionCall/CamelizeOptimizer.php        |  4 +-
 .../FunctionCall/CreateArrayOptimizer.php     |  5 +-
 .../FunctionCall/CreateInstanceOptimizer.php  | 44 ++++++++++---
 .../CreateInstanceParamsOptimizer.php         | 47 +++++++++++---
 .../CreateSymbolTableOptimizer.php            |  5 +-
 src/Optimizers/FunctionCall/EvalOptimizer.php |  5 +-
 .../FunctionCall/ExplodeOptimizer.php         |  5 +-
 .../FunctionCall/FileGetContentsOptimizer.php |  5 +-
 .../FunctionCall/FuncGetArgOptimizer.php      |  5 +-
 .../FunctionCall/FuncGetArgsOptimizer.php     |  5 +-
 .../FunctionCall/GetCalledClassOptimizer.php  |  5 +-
 .../FunctionCall/GetClassLowerOptimizer.php   | 48 +++-----------
 .../FunctionCall/GetClassNsOptimizer.php      | 63 ++++++++-----------
 .../FunctionCall/GetClassOptimizer.php        | 45 ++++++++++---
 .../FunctionCall/GetDefinedVarsOptimizer.php  |  5 +-
 .../FunctionCall/GetNsClassOptimizer.php      |  5 +-
 .../FunctionCall/GettypeOptimizer.php         |  5 +-
 .../FunctionCall/HashEqualsOptimizer.php      |  5 +-
 .../FunctionCall/ImplodeOptimizer.php         |  5 +-
 .../FunctionCall/InArrayOptimizer.php         |  3 +-
 .../FunctionCall/JsonDecodeOptimizer.php      |  5 +-
 .../FunctionCall/JsonEncodeOptimizer.php      |  5 +-
 src/Optimizers/FunctionCall/PowOptimizer.php  |  5 +-
 .../PrepareVirtualPathOptimizer.php           |  5 +-
 .../FunctionCall/RoundOptimizer.php           |  5 +-
 .../FunctionCall/StripslashesOptimizer.php    |  5 +-
 .../FunctionCall/StrposOptimizer.php          |  5 +-
 .../FunctionCall/StrtoupperOptimizer.php      |  5 +-
 .../FunctionCall/SubstrOptimizer.php          |  5 +-
 src/Optimizers/FunctionCall/TimeOptimizer.php |  5 +-
 .../FunctionCall/UncamelizeOptimizer.php      |  4 +-
 .../FunctionCall/UniqueKeyOptimizer.php       |  5 +-
 .../FunctionCall/UniquePathKeyOptimizer.php   |  5 +-
 .../ZephirStringToHexOptimizer.php            |  5 +-
 src/Optimizers/OptimizerAbstract.php          | 22 ++++++-
 39 files changed, 226 insertions(+), 203 deletions(-)

diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 6cdf76c2ce..6c8225dd9b 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -60,9 +60,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('array');
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_array_keys(' . $symbol . ', ' . $resolvedParams[0] . ');');
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index 081768ab18..2a4c98562c 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -60,9 +60,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('array');
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
diff --git a/src/Optimizers/FunctionCall/BasenameOptimizer.php b/src/Optimizers/FunctionCall/BasenameOptimizer.php
index 4f79f9f986..e27c91cbdf 100644
--- a/src/Optimizers/FunctionCall/BasenameOptimizer.php
+++ b/src/Optimizers/FunctionCall/BasenameOptimizer.php
@@ -62,9 +62,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
diff --git a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
index eb3fe2c508..007f35b9ff 100644
--- a/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
+++ b/src/Optimizers/FunctionCall/CallUserFuncOptimizer.php
@@ -77,9 +77,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $call->addCallStatusFlag($context);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
diff --git a/src/Optimizers/FunctionCall/CamelizeOptimizer.php b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
index 7087b293b2..13f2543670 100644
--- a/src/Optimizers/FunctionCall/CamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/CamelizeOptimizer.php
@@ -130,8 +130,6 @@ protected function symbolVariablePre(
         ?Variable $symbolVariable,
         CompilationContext $context
     ): void {
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
     }
 }
diff --git a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
index 47cc7cda3c..7940e8cd67 100644
--- a/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateArrayOptimizer.php
@@ -68,9 +68,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $resolvedParams = null;
         }
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if ($resolvedParams) {
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index b85529c413..8482c4c318 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -28,6 +28,9 @@
  */
 class CreateInstanceOptimizer extends OptimizerAbstract
 {
+    protected string $exceptionMessage = 'This function only accepts one parameter';
+    protected int    $parameterCount   = 1;
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,8 +46,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (1 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires one parameter', $expression);
+        if ($this->parameterCount !== count($expression['parameters'])) {
+            throw new CompilerException(
+                $this->exceptionMessage,
+                $expression
+            );
         }
 
         /*
@@ -66,9 +72,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         /*
          * Add the last call status to the current symbol table
@@ -76,13 +81,34 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        );
+        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
 
-        $call->checkTempParameters($context);
+        $this->getTempParameters($call, $context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, array $resolvedParams): string
+    {
+        return 'ZEPHIR_LAST_CALL_STATUS = '
+            . 'zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
+        ;
+    }
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function getTempParameters(Call $call, CompilationContext $context): void
+    {
+        $call->checkTempParameters($context);
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index af8528e4e3..8a3b4edeff 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -28,10 +28,17 @@
  */
 class CreateInstanceParamsOptimizer extends OptimizerAbstract
 {
+    protected string $exceptionMessage = 'This function only requires two parameter';
+    protected int    $parameterCount   = 2;
+
     /**
      * @param array              $expression
      * @param Call               $call
      * @param CompilationContext $context
+     *
+     * @return CompiledExpression|mixed
+     *
+     * @throws CompilerException
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -39,8 +46,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             throw new CompilerException('This function requires parameters', $expression);
         }
 
-        if (2 != count($expression['parameters'])) {
-            throw new CompilerException('This function only requires two parameter', $expression);
+        if ($this->parameterCount !== count($expression['parameters'])) {
+            throw new CompilerException(
+                $this->exceptionMessage,
+                $expression
+            );
         }
 
         /*
@@ -62,21 +72,42 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         /*
          * Add the last call status to the current symbol table
          */
         $call->addCallStatusFlag($context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        );
+        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
 
+        $this->getTempParameters($call, $context);
         $call->addCallStatusOrJump($context);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, array $resolvedParams): string
+    {
+        return 'ZEPHIR_LAST_CALL_STATUS = '
+            . 'zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+        ;
+    }
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function getTempParameters(Call $call, CompilationContext $context): void
+    {
+        // Not needed here
+    }
 }
diff --git a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
index 546a5e12d0..5d53e22df0 100644
--- a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -53,9 +53,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariable($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         // TODO: Still needed?
         $context->symbolTable->mustGrownStack(true);
diff --git a/src/Optimizers/FunctionCall/EvalOptimizer.php b/src/Optimizers/FunctionCall/EvalOptimizer.php
index 2f9f8d961a..b87771373c 100644
--- a/src/Optimizers/FunctionCall/EvalOptimizer.php
+++ b/src/Optimizers/FunctionCall/EvalOptimizer.php
@@ -57,9 +57,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $evalContext = str_replace(
             [getcwd() . '\\', getcwd() . '/'],
diff --git a/src/Optimizers/FunctionCall/ExplodeOptimizer.php b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
index e1abf9e04e..b5d2853237 100644
--- a/src/Optimizers/FunctionCall/ExplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExplodeOptimizer.php
@@ -80,9 +80,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('array');
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
diff --git a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
index b4c1736417..4d391100d3 100644
--- a/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FileGetContentsOptimizer.php
@@ -58,9 +58,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $this->checkNotVariableString($symbolVariable, $expression);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         if ($symbolVariable) {
             $symbol = $context->backend->getVariableCode($symbolVariable);
             $context->codePrinter->output('zephir_file_get_contents(' . $symbol . ', ' . $resolvedParams[0] . ');');
diff --git a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
index 1919580f61..8099bedf24 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgOptimizer.php
@@ -59,9 +59,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
diff --git a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index c75cee7fb5..2ad1da012a 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -45,9 +45,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->headersManager->add('kernel/main');
         $context->codePrinter->output('zephir_get_args(' . $symbol . ');');
diff --git a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
index 7a3a71b4bf..d944f354ab 100644
--- a/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetCalledClassOptimizer.php
@@ -54,9 +54,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $context->headersManager->add('kernel/object');
 
diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index d9052a01b9..3c3b6a368a 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -13,11 +13,7 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -26,49 +22,21 @@
  *
  * Optimizes calls to 'get_class_lower' using internal function
  */
-class GetClassLowerOptimizer extends OptimizerAbstract
+class GetClassLowerOptimizer extends GetClassOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param array $expression
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters(array $expression): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters) {
-            throw new CompilerException("'get_class_lower' only accepts one parameters", $expression);
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
+            throw new CompilerException(
+                "'get_class_lower' only accepts one parameter",
+                $expression
+            );
         }
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 1);');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index a848acb414..03a54016e2 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -13,11 +13,8 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
@@ -26,54 +23,44 @@
  *
  * Optimizes calls to 'get_class_ns' using internal function
  */
-class GetClassNsOptimizer extends OptimizerAbstract
+class GetClassNsOptimizer extends GetClassOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
+     * @param array $expression
      *
-     * @throws CompilerException
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function checkParameters(array $expression): void
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
         $numberParameters = count($expression['parameters']);
         if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException("'get_class_ns' only accepts one or two parameters", $expression);
+            throw new CompilerException(
+                "'get_class_ns' only accepts one or two parameters",
+                $expression
+            );
         }
+    }
 
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+    /**
+     * @param CompilationContext $context
+     * @param string             $symbol
+     * @param array              $resolvedParams
+     *
+     * @return void
+     */
+    protected function getOutput(
+        CompilationContext $context,
+        string $symbol,
+        array $resolvedParams
+    ): void {
+        $output = 'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0];
 
-        $symbol = $context->backend->getVariableCode($symbolVariable);
         if (!isset($resolvedParams[1])) {
-            $context->codePrinter->output('zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
+            $output .=  ', 0);';
         } else {
-            $context->codePrinter->output(
-                'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-            );
+            $output .=  ', ' . $resolvedParams[1] . ');';
         }
 
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        $context->codePrinter->output($output);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index 8b185d23bb..55aa04be6c 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -43,10 +43,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        $numberParameters = count($expression['parameters']);
-        if (1 != $numberParameters && 2 != $numberParameters) {
-            throw new CompilerException("'get_class' only accepts one or two parameters", $expression);
-        }
+        $this->checkParameters($expression);
 
         /*
          * Process the expected symbol to be returned
@@ -61,14 +58,46 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('string');
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
-        $context->codePrinter->output('zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
+        $this->getOutput($context, $symbol, $resolvedParams);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param array $expression
+     *
+     * @return void
+     */
+    protected function checkParameters(array $expression): void
+    {
+        $numberParameters = count($expression['parameters']);
+        if (1 != $numberParameters && 2 != $numberParameters) {
+            throw new CompilerException(
+                "'get_class' only accepts one or two parameters",
+                $expression
+            );
+        }
+    }
+
+    /**
+     * @param CompilationContext $context
+     * @param string             $symbol
+     * @param array              $resolvedParams
+     *
+     * @return void
+     */
+    protected function getOutput(
+        CompilationContext $context,
+        string $symbol,
+        array $resolvedParams
+    ): void {
+        $context->codePrinter->output(
+            'zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);'
+        );
+    }
 }
diff --git a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index 7cee111f6d..b97b50d3b1 100644
--- a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -38,9 +38,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->headersManager->add('kernel/variables');
diff --git a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
index be76f295ed..da498a828e 100644
--- a/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetNsClassOptimizer.php
@@ -60,9 +60,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_get_ns_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);');
 
diff --git a/src/Optimizers/FunctionCall/GettypeOptimizer.php b/src/Optimizers/FunctionCall/GettypeOptimizer.php
index b3274fcb6f..0b5c5b1bea 100644
--- a/src/Optimizers/FunctionCall/GettypeOptimizer.php
+++ b/src/Optimizers/FunctionCall/GettypeOptimizer.php
@@ -59,9 +59,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_gettype(' . $symbol . ', ' . $resolvedParams[0] . ');');
 
diff --git a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
index 24de51ff8d..7d88a43785 100644
--- a/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
+++ b/src/Optimizers/FunctionCall/HashEqualsOptimizer.php
@@ -58,9 +58,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
          */
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         return new CompiledExpression(
             'bool',
diff --git a/src/Optimizers/FunctionCall/ImplodeOptimizer.php b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
index fecd7a095d..4a512dbd99 100644
--- a/src/Optimizers/FunctionCall/ImplodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ImplodeOptimizer.php
@@ -64,9 +64,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('string');
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         if (isset($str)) {
diff --git a/src/Optimizers/FunctionCall/InArrayOptimizer.php b/src/Optimizers/FunctionCall/InArrayOptimizer.php
index 01b0036d69..ab675298de 100644
--- a/src/Optimizers/FunctionCall/InArrayOptimizer.php
+++ b/src/Optimizers/FunctionCall/InArrayOptimizer.php
@@ -28,6 +28,7 @@ class InArrayOptimizer extends ArrayKeyExistsOptimizer
     protected function getCode(array $resolvedParams): string
     {
         return 'zephir_fast_in_array('
-            . $resolvedParams[0] . ', ' . $resolvedParams[1] . ')';
+            . $resolvedParams[0] . ', '
+            . $resolvedParams[1] . ')';
     }
 }
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index dc9b194bfd..4cda227d2b 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -66,9 +66,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $options = '0 ';
         }
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index e344f03578..5dfb974a88 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -62,9 +62,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $options = '0 ';
         }
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
diff --git a/src/Optimizers/FunctionCall/PowOptimizer.php b/src/Optimizers/FunctionCall/PowOptimizer.php
index f94f82a065..971868e2b5 100644
--- a/src/Optimizers/FunctionCall/PowOptimizer.php
+++ b/src/Optimizers/FunctionCall/PowOptimizer.php
@@ -59,9 +59,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('variable');
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
             'zephir_pow_function(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
diff --git a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
index 858447e6c4..a56b9a3475 100644
--- a/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
+++ b/src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php
@@ -59,9 +59,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
diff --git a/src/Optimizers/FunctionCall/RoundOptimizer.php b/src/Optimizers/FunctionCall/RoundOptimizer.php
index 98a6b6909c..9b407d6ff2 100644
--- a/src/Optimizers/FunctionCall/RoundOptimizer.php
+++ b/src/Optimizers/FunctionCall/RoundOptimizer.php
@@ -60,9 +60,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('double');
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         /* Todo: move var return type -> double as with round, floor */
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
diff --git a/src/Optimizers/FunctionCall/StripslashesOptimizer.php b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
index 4ec467d1e3..b5a40e3582 100644
--- a/src/Optimizers/FunctionCall/StripslashesOptimizer.php
+++ b/src/Optimizers/FunctionCall/StripslashesOptimizer.php
@@ -66,9 +66,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $expression
         );
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
diff --git a/src/Optimizers/FunctionCall/StrposOptimizer.php b/src/Optimizers/FunctionCall/StrposOptimizer.php
index 48b84fc1c9..1f06a95ac2 100644
--- a/src/Optimizers/FunctionCall/StrposOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrposOptimizer.php
@@ -73,9 +73,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/string');
         $symbolVariable->setDynamicTypes('int');
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
             'zephir_fast_strpos(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $offset . ');'
diff --git a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
index bb0401a39a..60e05930ed 100644
--- a/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
+++ b/src/Optimizers/FunctionCall/StrtoupperOptimizer.php
@@ -67,9 +67,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             $expression
         );
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
             $this->zephirMethod . '(' . $symbol . ', ' . $resolvedParams[0] . ');'
diff --git a/src/Optimizers/FunctionCall/SubstrOptimizer.php b/src/Optimizers/FunctionCall/SubstrOptimizer.php
index a82d0afb69..30e46f37a6 100644
--- a/src/Optimizers/FunctionCall/SubstrOptimizer.php
+++ b/src/Optimizers/FunctionCall/SubstrOptimizer.php
@@ -82,9 +82,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbolVariable->setDynamicTypes('string');
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
             'zephir_substr(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $params[0] . ', ' . $params[1] . ', ' . $flags . ');'
diff --git a/src/Optimizers/FunctionCall/TimeOptimizer.php b/src/Optimizers/FunctionCall/TimeOptimizer.php
index 7f2dc8cfbe..a1e96921db 100644
--- a/src/Optimizers/FunctionCall/TimeOptimizer.php
+++ b/src/Optimizers/FunctionCall/TimeOptimizer.php
@@ -52,9 +52,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $context->headersManager->add('kernel/time');
         $symbolVariable->setDynamicTypes('long');
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_time(' . $symbol . ');');
 
diff --git a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
index 9417c42a38..1696c66180 100644
--- a/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
+++ b/src/Optimizers/FunctionCall/UncamelizeOptimizer.php
@@ -39,9 +39,7 @@ protected function symbolVariablePost(
         ?Variable $symbolVariable,
         CompilationContext $context
     ): void {
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
     }
 
     /**
diff --git a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index 23ab601c77..f1d01b9830 100644
--- a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -60,9 +60,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable->setDynamicTypes('string');
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
diff --git a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
index 08786d7cbb..e8d3987537 100644
--- a/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php
@@ -55,9 +55,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $context->headersManager->add('kernel/file');
 
diff --git a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
index c29288a3c3..4389904656 100644
--- a/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
+++ b/src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php
@@ -61,9 +61,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output('zephir_string_to_hex(' . $symbol . ', ' . $resolvedParams[0] . ');');
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 53c73cb67a..06e0bc8698 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -17,6 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\Exception;
 use Zephir\Traits\VariablesTrait;
+use Zephir\Variable\Variable;
 
 abstract class OptimizerAbstract
 {
@@ -58,12 +59,27 @@ protected function processStringOptimizer(Call $call, CompilationContext $contex
             $expression
         );
 
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
         return [$symbolVariable, $resolvedParams, $symbol];
     }
+
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function checkInitSymbolVariable(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+    }
 }

From 54f9cb04096b217159176d6c94abebef2116e0e7 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 15:00:00 -0600
Subject: [PATCH 279/375] duplicates from array* optimizers

---
 .../FunctionCall/ArrayKeysOptimizer.php       | 25 +++++++-
 .../FunctionCall/ArrayMergeOptimizer.php      | 63 ++++---------------
 2 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 6c8225dd9b..8f2a59f74d 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -28,6 +28,8 @@
  */
 class ArrayKeysOptimizer extends OptimizerAbstract
 {
+    protected int $parameterCount = 1;
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -35,7 +37,8 @@ class ArrayKeysOptimizer extends OptimizerAbstract
      *
      * @return bool|CompiledExpression|mixed
      *
-     * @throws CompilerException
+     * @return false|CompiledExpression
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -43,7 +46,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        if (1 != count($expression['parameters'])) {
+        if ($this->parameterCount !== count($expression['parameters'])) {
             return false;
         }
 
@@ -63,8 +66,24 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $this->checkInitSymbolVariable($call, $symbolVariable, $context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output('zephir_array_keys(' . $symbol . ', ' . $resolvedParams[0] . ');');
+
+        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param string $symbol
+     * @param array  $resolvedParams
+     *
+     * @return string
+     */
+    protected function getOutput(string $symbol, $resolvedParams): string
+    {
+        return sprintf(
+            'zephir_array_keys(%s, %s);',
+            $symbol,
+            $resolvedParams[0]
+        );
+    }
 }
diff --git a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
index 2a4c98562c..d357cd2ad0 100644
--- a/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayMergeOptimizer.php
@@ -13,67 +13,30 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
-use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use function sprintf;
 
 /**
  * ArrayMergeOptimizer.
  *
  * Optimizes calls to 'array_merge' using internal function
  */
-class ArrayMergeOptimizer extends OptimizerAbstract
+class ArrayMergeOptimizer extends ArrayKeysOptimizer
 {
+    protected int $parameterCount = 2;
+
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
+     * @param string $symbol
+     * @param array  $resolvedParams
      *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @return string
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function getOutput(string $symbol, $resolvedParams): string
     {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        if (2 != count($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        $context->headersManager->add('kernel/array');
-
-        $symbolVariable->setDynamicTypes('array');
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
-
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-
-        $context->codePrinter->output(
-            sprintf(
-                'zephir_fast_array_merge(%s, %s, %s);',
-                $symbol,
-                $resolvedParams[0],
-                $resolvedParams[1]
-            )
+        return sprintf(
+            'zephir_fast_array_merge(%s, %s, %s);',
+            $symbol,
+            $resolvedParams[0],
+            $resolvedParams[1]
         );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }

From c02f09435e20d2aaa0e7f5a5f59a2cf33a9a8c4b Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 15:19:53 -0600
Subject: [PATCH 280/375] static property - let - duplicate code

---
 src/Statements/Let/StaticPropertyAppend.php   |  24 ++-
 .../Let/StaticPropertyArrayIndex.php          | 142 +-------------
 .../Let/StaticPropertyArrayIndexAppend.php    | 173 ++----------------
 3 files changed, 44 insertions(+), 295 deletions(-)

diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 92e2ed170b..7e686b2bc7 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements\Let;
 
+use ReflectionException;
 use Zephir\Class\Property;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
@@ -132,7 +133,7 @@ public function assignStatic(
      */
     protected function _assignStaticPropertyArrayMultipleIndex(
         $classEntry,
-        $property,
+        string $property,
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,
         array $statement
@@ -143,9 +144,9 @@ protected function _assignStaticPropertyArrayMultipleIndex(
         /**
          * Create a temporal zval (if needed).
          */
-        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
+        $variableExpr      = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
+        $offsetExpressions = $this->getOffsetExpressions($statement, $compilationContext);
 
-        $offsetExpressions[] = 'a';
         $compilationContext->backend->assignStaticPropertyArrayMulti(
             $classEntry,
             $variableExpr,
@@ -158,4 +159,21 @@ protected function _assignStaticPropertyArrayMultipleIndex(
             $variableExpr->setIdle(true);
         }
     }
+
+    /**
+     * @param array              $statement
+     * @param CompilationContext $compilationContext
+     *
+     * @return array
+     * @throws ReflectionException
+     * @throws Exception
+     */
+    protected function getOffsetExpressions(
+        array $statement,
+        CompilationContext $compilationContext
+    ): array {
+        $offsetExpressions[] = 'a';
+
+        return $offsetExpressions;
+    }
 }
diff --git a/src/Statements/Let/StaticPropertyArrayIndex.php b/src/Statements/Let/StaticPropertyArrayIndex.php
index 01ef074a48..7215dc0e28 100644
--- a/src/Statements/Let/StaticPropertyArrayIndex.php
+++ b/src/Statements/Let/StaticPropertyArrayIndex.php
@@ -13,143 +13,31 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\Class\Property;
+use ReflectionException;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 
-use function in_array;
-use function sprintf;
-
 /**
  * Zephir\Statements\Let\StaticPropertyArrayIndex.
  *
  * Updates object properties dynamically.
  */
-class StaticPropertyArrayIndex extends ArrayIndex
+class StaticPropertyArrayIndex extends StaticPropertyAppend
 {
     /**
-     * Compiles ClassName::foo[index] = {expr}.
-     *
-     * @param string             $className
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws Exception
-     * @throws CompilerException
-     */
-    public function assignStatic(
-        $className,
-        $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        array $statement
-    ): void {
-        $compiler = $compilationContext->compiler;
-        if (!in_array($className, ['self', 'static', 'parent'])) {
-            $className = $compilationContext->getFullName($className);
-            if ($compiler->isClass($className)) {
-                $classDefinition = $compiler->getClassDefinition($className);
-            } else {
-                if ($compiler->isBundledClass($className)) {
-                    $classDefinition = $compiler->getInternalClassDefinition($className);
-                } else {
-                    throw new CompilerException("Cannot locate class '" . $className . "'", $statement);
-                }
-            }
-        } else {
-            if (in_array($className, ['self', 'static'])) {
-                $classDefinition = $compilationContext->classDefinition;
-            } else {
-                if ('parent' == $className) {
-                    $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass    = $classDefinition->getExtendsClass();
-                    if (!$extendsClass) {
-                        throw new CompilerException(
-                            'Cannot assign static property "'
-                            . $property
-                            . '" on parent because class '
-                            . $classDefinition->getCompleteName()
-                            . ' does not extend any class',
-                            $statement
-                        );
-                    } else {
-                        $classDefinition = $classDefinition->getExtendsClassDefinition();
-                    }
-                }
-            }
-        }
-
-        $this->checkClassHasProperty(
-            $classDefinition,
-            $property,
-            $statement
-        );
-
-        /** @var Property $propertyDefinition */
-        $propertyDefinition = $classDefinition->getProperty($property);
-        $this->checkAccessNonStaticProperty(
-            $propertyDefinition,
-            $classDefinition,
-            $property,
-            $statement
-        );
-
-        if ($propertyDefinition->isPrivate()) {
-            if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException(
-                    "Cannot access private static property '"
-                    . $classDefinition->getCompleteName()
-                    . '::'
-                    . $property
-                    . "' out of its declaring context",
-                    $statement
-                );
-            }
-        }
-
-        $compilationContext->headersManager->add('kernel/object');
-        $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex(
-            $classEntry,
-            $property,
-            $resolvedExpr,
-            $compilationContext,
-            $statement
-        );
-    }
-
-    /**
-     * Compiles x::y[a][b] = {expr} (multiple offset assignment).
-     *
-     * @param string             $classEntry
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext ,
      * @param array              $statement
+     * @param CompilationContext $compilationContext
      *
+     * @return array
+     * @throws ReflectionException
      * @throws Exception
-     * @throws CompilerException
      */
-    protected function _assignStaticPropertyArrayMultipleIndex(
-        $classEntry,
-        $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        $statement
-    ): void {
-        $property = $statement['property'];
-        $compilationContext->headersManager->add('kernel/object');
-
-        /**
-         * Create a temporal zval (if needed).
-         */
-        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
-
+    protected function getOffsetExpressions(
+        array $statement,
+        CompilationContext $compilationContext
+    ): array {
         /**
          * Only string/variable/int.
          */
@@ -179,16 +67,6 @@ protected function _assignStaticPropertyArrayMultipleIndex(
             $offsetExpressions[] = $resolvedIndex;
         }
 
-        $compilationContext->backend->assignStaticPropertyArrayMulti(
-            $classEntry,
-            $variableExpr,
-            $property,
-            $offsetExpressions,
-            $compilationContext
-        );
-
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
-        }
+        return $offsetExpressions;
     }
 }
diff --git a/src/Statements/Let/StaticPropertyArrayIndexAppend.php b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
index e0b4260438..3553faf069 100644
--- a/src/Statements/Let/StaticPropertyArrayIndexAppend.php
+++ b/src/Statements/Let/StaticPropertyArrayIndexAppend.php
@@ -13,185 +13,38 @@
 
 namespace Zephir\Statements\Let;
 
-use Zephir\Class\Property;
+use ReflectionException;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
 use Zephir\Exception;
-use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-
-use function in_array;
-use function sprintf;
 
 /**
  * StaticPropertyArrayIndexAppend.
  *
  * Updates object properties dynamically
  */
-class StaticPropertyArrayIndexAppend extends ArrayIndex
+class StaticPropertyArrayIndexAppend extends StaticPropertyArrayIndex
 {
     /**
-     * Compiles ClassName::foo[index] = {expr}.
-     *
-     * @param string             $className
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
-     * @throws Exception
-     * @throws CompilerException
-     */
-    public function assignStatic(
-        $className,
-        $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        array $statement
-    ): void {
-        $compiler = $compilationContext->compiler;
-        if (!in_array($className, ['self', 'static', 'parent'])) {
-            $className = $compilationContext->getFullName($className);
-            if ($compiler->isClass($className)) {
-                $classDefinition = $compiler->getClassDefinition($className);
-            } else {
-                if ($compiler->isBundledClass($className)) {
-                    $classDefinition = $compiler->getInternalClassDefinition($className);
-                } else {
-                    throw new CompilerException(
-                        "Cannot locate class '" . $className . "'",
-                        $statement
-                    );
-                }
-            }
-        } else {
-            if (in_array($className, ['self', 'static'])) {
-                $classDefinition = $compilationContext->classDefinition;
-            } else {
-                if ('parent' == $className) {
-                    $classDefinition = $compilationContext->classDefinition;
-                    $extendsClass    = $classDefinition->getExtendsClass();
-                    if (!$extendsClass) {
-                        throw new CompilerException(
-                            'Cannot assign static property "'
-                            . $property
-                            . '" on parent because class '
-                            . $classDefinition->getCompleteName()
-                            . ' does not extend any class',
-                            $statement
-                        );
-                    } else {
-                        $classDefinition = $classDefinition->getExtendsClassDefinition();
-                    }
-                }
-            }
-        }
-
-        $this->checkClassHasProperty(
-            $classDefinition,
-            $property,
-            $statement
-        );
-
-        /** @var Property $propertyDefinition */
-        $propertyDefinition = $classDefinition->getProperty($property);
-        $this->checkAccessNonStaticProperty(
-            $propertyDefinition,
-            $classDefinition,
-            $property,
-            $statement
-        );
-
-        if ($propertyDefinition->isPrivate()) {
-            if ($classDefinition != $compilationContext->classDefinition) {
-                throw new CompilerException(
-                    "Cannot access private static property '"
-                    . $classDefinition->getCompleteName()
-                    . '::'
-                    . $property
-                    . "' out of its declaring context",
-                    $statement
-                );
-            }
-        }
-
-        $compilationContext->headersManager->add('kernel/object');
-        $classEntry = $classDefinition->getClassEntry($compilationContext);
-        $this->_assignStaticPropertyArrayMultipleIndex(
-            $classEntry,
-            $property,
-            $resolvedExpr,
-            $compilationContext,
-            $statement
-        );
-    }
-
-    /**
-     * Compiles x::y[a][b][] = {expr} (multiple offset assignment).
-     *
-     * @param string             $classEntry
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext ,
      * @param array              $statement
+     * @param CompilationContext $compilationContext
      *
+     * @return array
      * @throws Exception
+     * @throws ReflectionException
      */
-    protected function _assignStaticPropertyArrayMultipleIndex(
-        $classEntry,
-        $property,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        $statement
-    ): void {
-        $property = $statement['property'];
-        $compilationContext->headersManager->add('kernel/object');
-
-        /**
-         * Create a temporal zval (if needed).
-         */
-        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);
-
+    protected function getOffsetExpressions(
+        array $statement,
+        CompilationContext $compilationContext
+    ): array {
         /**
          * Only string/variable/int.
          */
-        $offsetExpressions = [];
-        foreach ($statement['index-expr'] as $indexExpr) {
-            $indexExpression = new Expression($indexExpr);
-
-            $resolvedIndex = $indexExpression->compile($compilationContext);
-            switch ($resolvedIndex->getType()) {
-                case 'string':
-                case 'int':
-                case 'uint':
-                case 'ulong':
-                case 'long':
-                case 'variable':
-                    break;
-                default:
-                    throw new CompilerException(
-                        sprintf(
-                            'Expression: %s cannot be used as index without cast',
-                            $resolvedIndex->getType()
-                        ),
-                        $statement['index-expr']
-                    );
-            }
-
-            $offsetExpressions[] = $resolvedIndex;
-        }
-
-        $offsetExpressions[] = 'a';
-        $compilationContext->backend->assignStaticPropertyArrayMulti(
-            $classEntry,
-            $variableExpr,
-            $property,
-            $offsetExpressions,
+        $offsetExpressions   = parent::getOffsetExpressions(
+            $statement,
             $compilationContext
         );
+        $offsetExpressions[] = 'a';
 
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
-        }
+        return $offsetExpressions;
     }
 }

From 8a35d4ab31af0f5da09cbf8b1d1855386b991fe4 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 17:46:48 -0600
Subject: [PATCH 281/375] removed duplicate block

---
 .../CreateInstanceParamsOptimizer.php         | 65 +------------------
 1 file changed, 2 insertions(+), 63 deletions(-)

diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index 8a3b4edeff..0e4fca5c84 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -15,79 +15,17 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
 
 /**
  * CreateInstanceParamsOptimizer.
  *
  * Built-in function that creates new instances of objects from its class name passing parameters as an array
  */
-class CreateInstanceParamsOptimizer extends OptimizerAbstract
+class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
 {
     protected string $exceptionMessage = 'This function only requires two parameter';
     protected int    $parameterCount   = 2;
 
-    /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return CompiledExpression|mixed
-     *
-     * @throws CompilerException
-     */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            throw new CompilerException('This function requires parameters', $expression);
-        }
-
-        if ($this->parameterCount !== count($expression['parameters'])) {
-            throw new CompilerException(
-                $this->exceptionMessage,
-                $expression
-            );
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariable($symbolVariable, $expression);
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $context->headersManager->add('kernel/object');
-
-        $symbolVariable->setDynamicTypes('object');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
-
-        /*
-         * Add the last call status to the current symbol table
-         */
-        $call->addCallStatusFlag($context);
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output($this->getOutput($symbol, $resolvedParams));
-
-        $this->getTempParameters($call, $context);
-        $call->addCallStatusOrJump($context);
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
-
     /**
      * @param string $symbol
      * @param array  $resolvedParams
@@ -100,6 +38,7 @@ protected function getOutput(string $symbol, array $resolvedParams): string
             . 'zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
         ;
     }
+
     /**
      * @param Call               $call
      * @param CompilationContext $context

From e5d88ea4ce06a8eb61db81b033b8305b8ef9d919 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 18:15:32 -0600
Subject: [PATCH 282/375] reformatting on exception

---
 src/Call.php                                  | 20 +++++---
 src/Exception/CompilerException.php           | 50 +++++++++++++++++++
 src/Expression/NativeArray.php                | 14 +++---
 src/Expression/Reference.php                  |  7 ++-
 src/MethodCall.php                            | 11 ++--
 src/Operators/Other/FetchOperator.php         |  5 +-
 src/Statements/Let/ObjectDynamicProperty.php  |  5 +-
 .../Let/ObjectDynamicStringProperty.php       |  5 +-
 src/Statements/UnsetStatement.php             |  5 +-
 9 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/src/Call.php b/src/Call.php
index 1ea89d39f7..9919fbdb18 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -336,16 +336,18 @@ public function getReadOnlyResolvedParams(
                             break;
 
                         default:
-                            throw new CompilerException(
-                                'Cannot use variable type: ' . $parameterVariable->getType() . ' as parameter',
+                            throw CompilerException::cannotUseVariableTypeAs(
+                                $parameterVariable,
+                                'as parameter',
                                 $expression
                             );
                     }
                     break;
 
                 default:
-                    throw new CompilerException(
-                        'Cannot use value type: ' . $compiledExpression->getType() . ' as parameter',
+                    throw CompilerException::cannotUseValueTypeAs(
+                        $compiledExpression,
+                        'parameter',
                         $expression
                     );
             }
@@ -576,16 +578,18 @@ public function getResolvedParams(
                             break;
 
                         default:
-                            throw new CompilerException(
-                                'Cannot use variable type: ' . $parameterVariable->getType() . ' as parameter',
+                            throw CompilerException::cannotUseVariableTypeAs(
+                                $parameterVariable,
+                                'as parameter',
                                 $expression
                             );
                     }
                     break;
 
                 default:
-                    throw new CompilerException(
-                        'Cannot use value type: ' . $compiledExpression->getType() . ' as parameter',
+                    throw CompilerException::cannotUseValueTypeAs(
+                        $compiledExpression,
+                        'parameter',
                         $expression
                     );
             }
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 728f0ddf04..eddc5cd650 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -16,6 +16,8 @@
 use Exception;
 use Throwable;
 
+use Zephir\Variable\Variable;
+
 use function is_array;
 
 /**
@@ -92,6 +94,54 @@ public static function cannotUseNonInitializedVariableAsObject(
         );
     }
 
+    /**
+     * Cannot use non-initialized variable as an object
+     *
+     * @param array|null               $extra    extra info [optional]
+     * @param int                      $code     the Exception code [optional]
+     * @param Exception|Throwable|null $previous the previous throwable used for the exception chaining [optional]
+     *
+     * @return self
+     */
+    public static function cannotUseVariableTypeAs(
+        Variable $variable,
+        string $asType,
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            'Cannot use variable type: ' . $variable->getType() . ' ' . $asType,
+            $extra,
+            $code,
+            $previous
+        );
+    }
+
+    /**
+     * Cannot use non-initialized variable as an object
+     *
+     * @param array|null               $extra    extra info [optional]
+     * @param int                      $code     the Exception code [optional]
+     * @param Exception|Throwable|null $previous the previous throwable used for the exception chaining [optional]
+     *
+     * @return self
+     */
+    public static function cannotUseValueTypeAs(
+        Variable $variable,
+        string $asType,
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            'Cannot use value type: ' . $variable->getType() . ' as ' . $asType,
+            $extra,
+            $code,
+            $previous
+        );
+    }
+
     /**
      * Class does not have a property called
      *
diff --git a/src/Expression/NativeArray.php b/src/Expression/NativeArray.php
index bb0e309e3c..de6e891b8f 100644
--- a/src/Expression/NativeArray.php
+++ b/src/Expression/NativeArray.php
@@ -56,10 +56,9 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
                 if ('variable' != $symbolVariable->getType() && 'array' != $symbolVariable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable type: '
-                        . $symbolVariable->getType()
-                        . ' as an array',
+                    throw CompilerException::cannotUseVariableTypeAs(
+                        $symbolVariable,
+                        'as an array',
                         $expression
                     );
                 }
@@ -445,9 +444,10 @@ public function compile(array $expression, CompilationContext $compilationContex
                             break;
 
                         default:
-                            throw new CompilerException(
-                                'Cannot use variable type: ' . $variableVariable->getType() . ' as array index',
-                                $item['key']
+                            throw CompilerException::cannotUseVariableTypeAs(
+                                $variableVariable,
+                                'as an array index',
+                                $expression
                             );
                     }
                     break;
diff --git a/src/Expression/Reference.php b/src/Expression/Reference.php
index 34182bacef..a77ef8dd7e 100644
--- a/src/Expression/Reference.php
+++ b/src/Expression/Reference.php
@@ -65,10 +65,9 @@ public function compile(array $expression, CompilationContext $compilationContex
             if ($this->expectingVariable) {
                 $symbolVariable = $this->expectingVariable;
                 if ('variable' !== $symbolVariable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable type: '
-                        . $symbolVariable->getType()
-                        . ' to store a reference',
+                    throw CompilerException::cannotUseVariableTypeAs(
+                        $symbolVariable,
+                        'to store a reference',
                         $expression
                     );
                 }
diff --git a/src/MethodCall.php b/src/MethodCall.php
index e3a5f1d2b9..770f396635 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -138,8 +138,9 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             }
 
             if ($variableMethod->isNotVariableAndString()) {
-                throw new CompilerException(
-                    'Cannot use variable type: ' . $variableMethod->getType() . ' as dynamic method name',
+                throw CompilerException::cannotUseVariableTypeAs(
+                    $variableMethod,
+                    'as a dynamic method name',
                     $expression
                 );
             }
@@ -794,8 +795,10 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                     case 'variable':
                         break;
                     default:
-                        throw new Exception(
-                            sprintf('Cannot use variable type: %s as method caller', $variableMethod->getType())
+                        throw CompilerException::cannotUseVariableTypeAs(
+                            $variableMethod,
+                            'as a method caller',
+                            $expression
                         );
                 }
 
diff --git a/src/Operators/Other/FetchOperator.php b/src/Operators/Other/FetchOperator.php
index eb4e11896b..b78e96eb2c 100644
--- a/src/Operators/Other/FetchOperator.php
+++ b/src/Operators/Other/FetchOperator.php
@@ -44,8 +44,9 @@ public function compile(array $expression, CompilationContext $compilationContex
             $expression['left']
         );
         if ('variable' != $variable->getType()) {
-            throw new CompilerException(
-                'Cannot use variable type: ' . $variable->gettype() . ' in "fetch" operator',
+            throw CompilerException::cannotUseVariableTypeAs(
+                $variable,
+                'in "fetch" operator',
                 $expression
             );
         }
diff --git a/src/Statements/Let/ObjectDynamicProperty.php b/src/Statements/Let/ObjectDynamicProperty.php
index 6d57a5b0ad..7e9dcb229d 100644
--- a/src/Statements/Let/ObjectDynamicProperty.php
+++ b/src/Statements/Let/ObjectDynamicProperty.php
@@ -78,8 +78,9 @@ public function assign(
         }
 
         if (!$symbolVariable->isVariable()) {
-            throw new CompilerException(
-                'Cannot use variable type: ' . $symbolVariable->getType() . ' as an object',
+            throw CompilerException::cannotUseVariableTypeAs(
+                $symbolVariable,
+                'as an object',
                 $statement
             );
         }
diff --git a/src/Statements/Let/ObjectDynamicStringProperty.php b/src/Statements/Let/ObjectDynamicStringProperty.php
index 343bb48ad8..7e74aaa4b9 100644
--- a/src/Statements/Let/ObjectDynamicStringProperty.php
+++ b/src/Statements/Let/ObjectDynamicStringProperty.php
@@ -76,8 +76,9 @@ public function assign(
         }
 
         if ('variable' != $symbolVariable->getType()) {
-            throw new CompilerException(
-                'Cannot use variable type: ' . $symbolVariable->getType() . ' as an object',
+            throw CompilerException::cannotUseVariableTypeAs(
+                $symbolVariable,
+                'as an object',
                 $statement
             );
         }
diff --git a/src/Statements/UnsetStatement.php b/src/Statements/UnsetStatement.php
index b917773e91..7acb07cfc5 100644
--- a/src/Statements/UnsetStatement.php
+++ b/src/Statements/UnsetStatement.php
@@ -93,8 +93,9 @@ public function compile(CompilationContext $compilationContext): void
         }
 
         if (!in_array($variable->getType(), ['variable', 'array'])) {
-            throw new CompilerException(
-                'Cannot use variable type: ' . $variable->gettype() . ' in "unset"',
+            throw CompilerException::cannotUseVariableTypeAs(
+                $variable,
+                'in "unset"',
                 $expression['left']
             );
         }

From df3d9e914186ba77a3b2f931f3b14cec73626214 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 21:08:50 -0600
Subject: [PATCH 283/375] phpcs

---
 src/Exception/CompilerException.php |   1 -
 src/Statements/ForStatement.php     | 216 +++++++++++-----------------
 2 files changed, 87 insertions(+), 130 deletions(-)

diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index eddc5cd650..72ade68ca8 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -15,7 +15,6 @@
 
 use Exception;
 use Throwable;
-
 use Zephir\Variable\Variable;
 
 use function is_array;
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index dc3a3e4f31..36dde3cf10 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -113,67 +113,8 @@ public function compileHashTraverse(
         CompilationContext $compilationContext,
         Variable $exprVariable
     ): void {
-        /**
-         * Initialize 'key' variable
-         */
-        if (isset($this->statement['key'])) {
-            if ('_' != $this->statement['key']) {
-                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
-                    $this->statement['key'],
-                    $compilationContext,
-                    $this->statement['expr']
-                );
-                if ('variable' != $keyVariable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable: '
-                        . $this->statement['key']
-                        . ' type: '
-                        . $keyVariable->getType()
-                        . ' as key in hash traversal',
-                        $this->statement['expr']
-                    );
-                }
-            } else {
-                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext
-                );
-            }
-
-            $keyVariable->setMustInitNull(true);
-            $keyVariable->setIsInitialized(true, $compilationContext);
-            $keyVariable->setDynamicTypes('undefined');
-        }
-
-        /**
-         * Initialize 'value' variable
-         */
-        if (isset($this->statement['value'])) {
-            if ('_' != $this->statement['value']) {
-                $variable = $compilationContext->symbolTable->getVariableForWrite(
-                    $this->statement['value'],
-                    $compilationContext,
-                    $this->statement['expr']
-                );
-                if ('variable' != $variable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable: '
-                        . $this->statement['value']
-                        . ' type: '
-                        . $variable->getType()
-                        . ' as value in hash traversal',
-                        $this->statement['expr']
-                    );
-                }
-            } else {
-                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-            }
-
-            $variable->setMustInitNull(true);
-            $variable->setIsInitialized(true, $compilationContext);
-            $variable->increaseVariantIfNull();
-            $variable->setDynamicTypes('undefined');
-        }
+        $keyVariable = $this->initializeKeyVariable($compilationContext);
+        $variable    = $this->initializeValueVariable($compilationContext);
 
         /**
          * Variables are initialized in a different way inside cycle
@@ -265,74 +206,8 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
             $this->statement['expr']
         );
 
-        /**
-         * Initialize 'key' variable
-         */
-        if (isset($this->statement['key'])) {
-            if ('_' != $this->statement['key']) {
-                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
-                    $this->statement['key'],
-                    $compilationContext,
-                    $this->statement['expr']
-                );
-                if ('variable' != $keyVariable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable: '
-                        . $this->statement['key']
-                        . ' type: '
-                        . $keyVariable->getType()
-                        . ' as key in hash traversal',
-                        $this->statement['expr']
-                    );
-                }
-            } else {
-                /**
-                 * Anonymous key variable.
-                 */
-                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext
-                );
-                $keyVariable->increaseUses();
-            }
-
-            $keyVariable->setMustInitNull(true);
-            $keyVariable->setIsInitialized(true, $compilationContext);
-            $keyVariable->setDynamicTypes('undefined');
-        }
-
-        /**
-         * Initialize 'value' variable
-         */
-        if (isset($this->statement['value'])) {
-            if ('_' != $this->statement['value']) {
-                $variable = $compilationContext->symbolTable->getVariableForWrite(
-                    $this->statement['value'],
-                    $compilationContext,
-                    $this->statement['expr']
-                );
-                if ('variable' != $variable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable: '
-                        . $this->statement['value']
-                        . ' type: '
-                        . $variable->getType()
-                        . ' as value in hash traversal',
-                        $this->statement['expr']
-                    );
-                }
-            } else {
-                /**
-                 * Anonymous value variable.
-                 */
-                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $variable->increaseUses();
-            }
-
-            $variable->setMustInitNull(true);
-            $variable->setIsInitialized(true, $compilationContext);
-            $variable->setDynamicTypes('undefined');
-        }
+        $keyVariable = $this->initializeKeyVariable($compilationContext);
+        $variable    = $this->initializeValueVariable($compilationContext);
 
         /**
          * Variables are initialized in a different way inside cycle
@@ -937,6 +812,89 @@ private function compileStatementsForBlock(
         $codePrinter->output('}');
     }
 
+    /**
+     * @param CompilationContext $compilationContext
+     *
+     * @return bool|Variable
+     */
+    private function initializeValueVariable(CompilationContext $compilationContext): bool | Variable
+    {
+        /**
+         * Initialize 'value' variable
+         */
+        if (isset($this->statement['value'])) {
+            if ('_' != $this->statement['value']) {
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['value'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $variable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['value']
+                        . ' type: '
+                        . $variable->getType()
+                        . ' as value in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                /**
+                 * Anonymous value variable.
+                 */
+                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $variable->increaseUses();
+            }
+
+            $variable->setMustInitNull(true);
+            $variable->setIsInitialized(true, $compilationContext);
+            $variable->setDynamicTypes('undefined');
+        }
+        return $variable;
+    }
+
+    /**
+     * @param CompilationContext $compilationContext
+     *
+     * @return bool|Variable
+     */
+    private function initializeKeyVariable(CompilationContext $compilationContext): bool | Variable
+    {
+        /**
+         * Initialize 'key' variable
+         */
+        if (isset($this->statement['key'])) {
+            if ('_' != $this->statement['key']) {
+                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['key'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $keyVariable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['key']
+                        . ' type: '
+                        . $keyVariable->getType()
+                        . ' as key in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+            }
+
+            $keyVariable->setMustInitNull(true);
+            $keyVariable->setIsInitialized(true, $compilationContext);
+            $keyVariable->setDynamicTypes('undefined');
+        }
+        return $keyVariable;
+    }
+
     /**
      * @param mixed              $keyVariableName
      * @param Variable           $keyVariable

From 94e9506502c053b73e41fb9fd7d4bc8a4e6c7029 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 21:33:09 -0600
Subject: [PATCH 284/375] removing duplicates json/functions

---
 .../FunctionCall/FuncGetArgsOptimizer.php     | 15 +++++-
 .../FunctionCall/GetDefinedVarsOptimizer.php  | 22 ++------
 .../FunctionCall/JsonDecodeOptimizer.php      | 37 ++++++++++---
 .../FunctionCall/JsonEncodeOptimizer.php      | 53 +++++--------------
 4 files changed, 58 insertions(+), 69 deletions(-)

diff --git a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index 2ad1da012a..32b3c223fa 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -48,9 +48,20 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $this->checkInitSymbolVariable($call, $symbolVariable, $context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->headersManager->add('kernel/main');
-        $context->codePrinter->output('zephir_get_args(' . $symbol . ');');
+        $this->printOutput($context, $symbol);
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param CompilationContext $context
+     * @param string             $symbol
+     *
+     * @return void
+     */
+    protected function printOutput(CompilationContext $context, string $symbol): void
+    {
+        $context->headersManager->add('kernel/main');
+        $context->codePrinter->output('zephir_get_args(' . $symbol . ');');
+    }
 }
diff --git a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index b97b50d3b1..af0d7cc6e2 100644
--- a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -13,38 +13,24 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Optimizers\OptimizerAbstract;
 
 /**
  * GetDefinedVars.
  *
  * Optimizes calls to 'get_defined_vars' using internal function
  */
-class GetDefinedVarsOptimizer extends OptimizerAbstract
+class GetDefinedVarsOptimizer extends FuncGetArgsOptimizer
 {
     /**
-     * @param array              $expression
-     * @param Call               $call
      * @param CompilationContext $context
+     * @param string             $symbol
      *
-     * @return bool|CompiledExpression|mixed
+     * @return void
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
+    protected function printOutput(CompilationContext $context, string $symbol): void
     {
-        $call->processExpectedReturn($context);
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
-        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
-
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->headersManager->add('kernel/variables');
         $context->codePrinter->output('zephir_get_defined_vars(' . $symbol . ');');
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index 4cda227d2b..f25f709546 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -17,6 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -27,6 +28,8 @@
  */
 class JsonDecodeOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_json_decode';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -40,17 +43,12 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        /*
+        /**
          * Process the expected symbol to be returned
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $call->getSymbolVariable();
-        $this->checkNotVariable($symbolVariable, $expression);
-        if (!$symbolVariable) {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
+        $symbolVariable = $this->processSymbolVariable($call, $expression, $context);
 
         $context->headersManager->add('kernel/string');
 
@@ -71,9 +69,32 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_json_decode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
+            $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param Call               $call
+     * @param array              $expression
+     * @param CompilationContext $context
+     *
+     * @return Variable|null
+     */
+    private function processSymbolVariable(
+        Call $call,
+        array $expression,
+        CompilationContext $context
+    ): ?Variable {
+        $symbolVariable = $call->getSymbolVariable();
+        $this->checkNotVariable($symbolVariable, $expression);
+        if (!$symbolVariable) {
+            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+            $symbolVariable->initVariant($context);
+        }
+
+        return $symbolVariable;
+    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index 5dfb974a88..4397186fec 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -15,61 +15,32 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Optimizers\OptimizerAbstract;
-
-use function count;
+use Zephir\Variable\Variable;
 
 /**
  * JsonEncodeOptimizer.
  *
  * Optimizes calls to 'json_encode' using internal function
  */
-class JsonEncodeOptimizer extends OptimizerAbstract
+class JsonEncodeOptimizer extends JsonDecodeOptimizer
 {
+    protected string $zephirMethod = 'zephir_json_encode';
+
     /**
-     * @param array              $expression
      * @param Call               $call
+     * @param array              $expression
      * @param CompilationContext $context
      *
-     * @return bool|CompiledExpression|mixed
+     * @return Variable|null
      */
-    public function optimize(array $expression, Call $call, CompilationContext $context)
-    {
-        if (!isset($expression['parameters'])) {
-            return false;
-        }
-
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
+    private function processSymbolVariable(
+        Call $call,
+        array $expression,
+        CompilationContext $context
+    ): ?Variable {
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariable($symbolVariable, $expression);
 
-        $context->headersManager->add('kernel/string');
-
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        /*
-         * Process encode options
-         */
-        if (count($resolvedParams) >= 2) {
-            $context->headersManager->add('kernel/operators');
-            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
-        } else {
-            $options = '0 ';
-        }
-
-        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
-
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_json_encode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
+        return $symbolVariable;
     }
 }

From 6a81b9cdc9a903716be92fe8635e304590331d8a Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 21:38:45 -0600
Subject: [PATCH 285/375] Revert "removing duplicates json/functions"

This reverts commit 94e9506502c053b73e41fb9fd7d4bc8a4e6c7029.
---
 .../FunctionCall/FuncGetArgsOptimizer.php     | 15 +-----
 .../FunctionCall/GetDefinedVarsOptimizer.php  | 22 ++++++--
 .../FunctionCall/JsonDecodeOptimizer.php      | 37 +++----------
 .../FunctionCall/JsonEncodeOptimizer.php      | 53 ++++++++++++++-----
 4 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
index 32b3c223fa..2ad1da012a 100644
--- a/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
+++ b/src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php
@@ -48,20 +48,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $this->checkInitSymbolVariable($call, $symbolVariable, $context);
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-        $this->printOutput($context, $symbol);
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
-    }
-
-    /**
-     * @param CompilationContext $context
-     * @param string             $symbol
-     *
-     * @return void
-     */
-    protected function printOutput(CompilationContext $context, string $symbol): void
-    {
         $context->headersManager->add('kernel/main');
         $context->codePrinter->output('zephir_get_args(' . $symbol . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
index af0d7cc6e2..b97b50d3b1 100644
--- a/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php
@@ -13,24 +13,38 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
+use Zephir\Call;
 use Zephir\CompilationContext;
+use Zephir\CompiledExpression;
+use Zephir\Optimizers\OptimizerAbstract;
 
 /**
  * GetDefinedVars.
  *
  * Optimizes calls to 'get_defined_vars' using internal function
  */
-class GetDefinedVarsOptimizer extends FuncGetArgsOptimizer
+class GetDefinedVarsOptimizer extends OptimizerAbstract
 {
     /**
+     * @param array              $expression
+     * @param Call               $call
      * @param CompilationContext $context
-     * @param string             $symbol
      *
-     * @return void
+     * @return bool|CompiledExpression|mixed
      */
-    protected function printOutput(CompilationContext $context, string $symbol): void
+    public function optimize(array $expression, Call $call, CompilationContext $context)
     {
+        $call->processExpectedReturn($context);
+        $symbolVariable = $call->getSymbolVariable(true, $context);
+        $this->checkNotVariableString($symbolVariable, $expression);
+
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->headersManager->add('kernel/variables');
         $context->codePrinter->output('zephir_get_defined_vars(' . $symbol . ');');
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
index f25f709546..4cda227d2b 100644
--- a/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonDecodeOptimizer.php
@@ -17,7 +17,6 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Optimizers\OptimizerAbstract;
-use Zephir\Variable\Variable;
 
 use function count;
 
@@ -28,8 +27,6 @@
  */
 class JsonDecodeOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_json_decode';
-
     /**
      * @param array              $expression
      * @param Call               $call
@@ -43,12 +40,17 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             return false;
         }
 
-        /**
+        /*
          * Process the expected symbol to be returned
          */
         $call->processExpectedReturn($context);
 
-        $symbolVariable = $this->processSymbolVariable($call, $expression, $context);
+        $symbolVariable = $call->getSymbolVariable();
+        $this->checkNotVariable($symbolVariable, $expression);
+        if (!$symbolVariable) {
+            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
+            $symbolVariable->initVariant($context);
+        }
 
         $context->headersManager->add('kernel/string');
 
@@ -69,32 +71,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            $this->zephirMethod
-            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
+            'zephir_json_decode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
-
-    /**
-     * @param Call               $call
-     * @param array              $expression
-     * @param CompilationContext $context
-     *
-     * @return Variable|null
-     */
-    private function processSymbolVariable(
-        Call $call,
-        array $expression,
-        CompilationContext $context
-    ): ?Variable {
-        $symbolVariable = $call->getSymbolVariable();
-        $this->checkNotVariable($symbolVariable, $expression);
-        if (!$symbolVariable) {
-            $symbolVariable = $context->symbolTable->addTemp('variable', $context);
-            $symbolVariable->initVariant($context);
-        }
-
-        return $symbolVariable;
-    }
 }
diff --git a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
index 4397186fec..5dfb974a88 100644
--- a/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
+++ b/src/Optimizers/FunctionCall/JsonEncodeOptimizer.php
@@ -15,32 +15,61 @@
 
 use Zephir\Call;
 use Zephir\CompilationContext;
-use Zephir\Variable\Variable;
+use Zephir\CompiledExpression;
+use Zephir\Optimizers\OptimizerAbstract;
+
+use function count;
 
 /**
  * JsonEncodeOptimizer.
  *
  * Optimizes calls to 'json_encode' using internal function
  */
-class JsonEncodeOptimizer extends JsonDecodeOptimizer
+class JsonEncodeOptimizer extends OptimizerAbstract
 {
-    protected string $zephirMethod = 'zephir_json_encode';
-
     /**
-     * @param Call               $call
      * @param array              $expression
+     * @param Call               $call
      * @param CompilationContext $context
      *
-     * @return Variable|null
+     * @return bool|CompiledExpression|mixed
      */
-    private function processSymbolVariable(
-        Call $call,
-        array $expression,
-        CompilationContext $context
-    ): ?Variable {
+    public function optimize(array $expression, Call $call, CompilationContext $context)
+    {
+        if (!isset($expression['parameters'])) {
+            return false;
+        }
+
+        /*
+         * Process the expected symbol to be returned
+         */
+        $call->processExpectedReturn($context);
+
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariable($symbolVariable, $expression);
 
-        return $symbolVariable;
+        $context->headersManager->add('kernel/string');
+
+        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+
+        /*
+         * Process encode options
+         */
+        if (count($resolvedParams) >= 2) {
+            $context->headersManager->add('kernel/operators');
+            $options = 'zephir_get_intval(' . $resolvedParams[1] . ') ';
+        } else {
+            $options = '0 ';
+        }
+
+        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
+
+
+        $symbol = $context->backend->getVariableCode($symbolVariable);
+        $context->codePrinter->output(
+            'zephir_json_encode(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $options . ');'
+        );
+
+        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }

From 8c2ed6e0fbeff2f1d76fd1643ac78e704559ef45 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 21:39:07 -0600
Subject: [PATCH 286/375] Revert "phpcs"

This reverts commit df3d9e914186ba77a3b2f931f3b14cec73626214.
---
 src/Exception/CompilerException.php |   1 +
 src/Statements/ForStatement.php     | 216 +++++++++++++++++-----------
 2 files changed, 130 insertions(+), 87 deletions(-)

diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 72ade68ca8..eddc5cd650 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -15,6 +15,7 @@
 
 use Exception;
 use Throwable;
+
 use Zephir\Variable\Variable;
 
 use function is_array;
diff --git a/src/Statements/ForStatement.php b/src/Statements/ForStatement.php
index 36dde3cf10..dc3a3e4f31 100644
--- a/src/Statements/ForStatement.php
+++ b/src/Statements/ForStatement.php
@@ -113,8 +113,67 @@ public function compileHashTraverse(
         CompilationContext $compilationContext,
         Variable $exprVariable
     ): void {
-        $keyVariable = $this->initializeKeyVariable($compilationContext);
-        $variable    = $this->initializeValueVariable($compilationContext);
+        /**
+         * Initialize 'key' variable
+         */
+        if (isset($this->statement['key'])) {
+            if ('_' != $this->statement['key']) {
+                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['key'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $keyVariable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['key']
+                        . ' type: '
+                        . $keyVariable->getType()
+                        . ' as key in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+            }
+
+            $keyVariable->setMustInitNull(true);
+            $keyVariable->setIsInitialized(true, $compilationContext);
+            $keyVariable->setDynamicTypes('undefined');
+        }
+
+        /**
+         * Initialize 'value' variable
+         */
+        if (isset($this->statement['value'])) {
+            if ('_' != $this->statement['value']) {
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['value'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $variable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['value']
+                        . ' type: '
+                        . $variable->getType()
+                        . ' as value in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+            }
+
+            $variable->setMustInitNull(true);
+            $variable->setIsInitialized(true, $compilationContext);
+            $variable->increaseVariantIfNull();
+            $variable->setDynamicTypes('undefined');
+        }
 
         /**
          * Variables are initialized in a different way inside cycle
@@ -206,8 +265,74 @@ public function compileIterator(array $exprRaw, CompilationContext $compilationC
             $this->statement['expr']
         );
 
-        $keyVariable = $this->initializeKeyVariable($compilationContext);
-        $variable    = $this->initializeValueVariable($compilationContext);
+        /**
+         * Initialize 'key' variable
+         */
+        if (isset($this->statement['key'])) {
+            if ('_' != $this->statement['key']) {
+                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['key'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $keyVariable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['key']
+                        . ' type: '
+                        . $keyVariable->getType()
+                        . ' as key in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                /**
+                 * Anonymous key variable.
+                 */
+                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
+                    'variable',
+                    $compilationContext
+                );
+                $keyVariable->increaseUses();
+            }
+
+            $keyVariable->setMustInitNull(true);
+            $keyVariable->setIsInitialized(true, $compilationContext);
+            $keyVariable->setDynamicTypes('undefined');
+        }
+
+        /**
+         * Initialize 'value' variable
+         */
+        if (isset($this->statement['value'])) {
+            if ('_' != $this->statement['value']) {
+                $variable = $compilationContext->symbolTable->getVariableForWrite(
+                    $this->statement['value'],
+                    $compilationContext,
+                    $this->statement['expr']
+                );
+                if ('variable' != $variable->getType()) {
+                    throw new CompilerException(
+                        'Cannot use variable: '
+                        . $this->statement['value']
+                        . ' type: '
+                        . $variable->getType()
+                        . ' as value in hash traversal',
+                        $this->statement['expr']
+                    );
+                }
+            } else {
+                /**
+                 * Anonymous value variable.
+                 */
+                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
+                $variable->increaseUses();
+            }
+
+            $variable->setMustInitNull(true);
+            $variable->setIsInitialized(true, $compilationContext);
+            $variable->setDynamicTypes('undefined');
+        }
 
         /**
          * Variables are initialized in a different way inside cycle
@@ -812,89 +937,6 @@ private function compileStatementsForBlock(
         $codePrinter->output('}');
     }
 
-    /**
-     * @param CompilationContext $compilationContext
-     *
-     * @return bool|Variable
-     */
-    private function initializeValueVariable(CompilationContext $compilationContext): bool | Variable
-    {
-        /**
-         * Initialize 'value' variable
-         */
-        if (isset($this->statement['value'])) {
-            if ('_' != $this->statement['value']) {
-                $variable = $compilationContext->symbolTable->getVariableForWrite(
-                    $this->statement['value'],
-                    $compilationContext,
-                    $this->statement['expr']
-                );
-                if ('variable' != $variable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable: '
-                        . $this->statement['value']
-                        . ' type: '
-                        . $variable->getType()
-                        . ' as value in hash traversal',
-                        $this->statement['expr']
-                    );
-                }
-            } else {
-                /**
-                 * Anonymous value variable.
-                 */
-                $variable = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
-                $variable->increaseUses();
-            }
-
-            $variable->setMustInitNull(true);
-            $variable->setIsInitialized(true, $compilationContext);
-            $variable->setDynamicTypes('undefined');
-        }
-        return $variable;
-    }
-
-    /**
-     * @param CompilationContext $compilationContext
-     *
-     * @return bool|Variable
-     */
-    private function initializeKeyVariable(CompilationContext $compilationContext): bool | Variable
-    {
-        /**
-         * Initialize 'key' variable
-         */
-        if (isset($this->statement['key'])) {
-            if ('_' != $this->statement['key']) {
-                $keyVariable = $compilationContext->symbolTable->getVariableForWrite(
-                    $this->statement['key'],
-                    $compilationContext,
-                    $this->statement['expr']
-                );
-                if ('variable' != $keyVariable->getType()) {
-                    throw new CompilerException(
-                        'Cannot use variable: '
-                        . $this->statement['key']
-                        . ' type: '
-                        . $keyVariable->getType()
-                        . ' as key in hash traversal',
-                        $this->statement['expr']
-                    );
-                }
-            } else {
-                $keyVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
-                    $compilationContext
-                );
-            }
-
-            $keyVariable->setMustInitNull(true);
-            $keyVariable->setIsInitialized(true, $compilationContext);
-            $keyVariable->setDynamicTypes('undefined');
-        }
-        return $keyVariable;
-    }
-
     /**
      * @param mixed              $keyVariableName
      * @param Variable           $keyVariable

From d82d33e29fcc2e05bb145ed647d98f7be36835ff Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Sat, 2 Dec 2023 21:39:31 -0600
Subject: [PATCH 287/375] phpcs again

---
 src/Exception/CompilerException.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index eddc5cd650..72ade68ca8 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -15,7 +15,6 @@
 
 use Exception;
 use Throwable;
-
 use Zephir\Variable\Variable;
 
 use function is_array;

From 06384731627eabce00e7e81b594811c1c1403f9f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Dec 2023 13:20:23 +0000
Subject: [PATCH 288/375] Disable extraction of boolval

---
 src/Class/Method/Method.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index f0ccf328a6..e2038e2bdb 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1237,7 +1237,8 @@ public function assignZvalValue(array $parameter, CompilationContext $compilatio
                 return "\t".$parameter['name'].' = zephir_get_charval('.$parameterCode.');'.PHP_EOL;
 
             case 'bool':
-                return "\t".$parameter['name'].' = zephir_get_boolval('.$parameterCode.');'.PHP_EOL;
+                //return "\t".$parameter['name'].' = zephir_get_boolval('.$parameterCode.');'.PHP_EOL;
+                return '';
 
             case 'double':
                 return "\t".$parameter['name'].' = zephir_get_doubleval('.$parameterCode.');'.PHP_EOL;

From e7e2c0f53c3aa87ede1ac95f5e7e13bcbfbe5e6d Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Dec 2023 13:24:38 +0000
Subject: [PATCH 289/375] Change image to `php:8.3-fpm`

---
 .docker/8.3/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
index 743d3b7f70..f7b7d456a4 100644
--- a/.docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -1,5 +1,5 @@
 FROM composer:latest AS composer
-FROM php:8.3.0RC6-fpm
+FROM php:8.3-fpm
 
 RUN CPU_CORES="$(getconf _NPROCESSORS_ONLN)";
 ENV MAKEFLAGS="-j${CPU_CORES}"

From 847c634ff2ac700d794537b2f16d9f7423d60c95 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Dec 2023 13:26:10 +0000
Subject: [PATCH 290/375] Update composer.lock

---
 composer.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/composer.lock b/composer.lock
index a42e55c631..00358f7afb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -263,16 +263,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.31",
+            "version": "v5.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a"
+                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/11ac5f154e0e5c4c77af83ad11ead9165280b92a",
-                "reference": "11ac5f154e0e5c4c77af83ad11ead9165280b92a",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
+                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
                 "shasum": ""
             },
             "require": {
@@ -342,7 +342,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.31"
+                "source": "https://github.com/symfony/console/tree/v5.4.32"
             },
             "funding": [
                 {
@@ -358,7 +358,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-31T07:58:33+00:00"
+            "time": "2023-11-18T18:23:04+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -2935,16 +2935,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
                 "shasum": ""
             },
             "require": {
@@ -2973,7 +2973,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
             },
             "funding": [
                 {
@@ -2981,7 +2981,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2023-11-20T00:12:19+00:00"
         }
     ],
     "aliases": [],

From dc77208431212221217f07f9e33a60dcd16ebd82 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Dec 2023 13:30:26 +0000
Subject: [PATCH 291/375] Regenerate ext/ directory

---
 ext/kernel/exception.c                        |   3 +-
 ext/kernel/main.h                             |   7 +-
 ext/kernel/memory.c                           |  43 ----
 ext/kernel/memory.h                           |  38 +--
 ext/kernel/object.c                           |   6 +-
 ext/kernel/operators.h                        |   6 +-
 ext/stub/13__closure.zep.c                    |   3 +-
 ext/stub/arithmetic.zep.c                     |  45 ++--
 ext/stub/arrayaccessarr.zep.c                 |   6 +-
 ext/stub/arrayaccessobj.zep.c                 |  15 +-
 ext/stub/arrayaccesstest.zep.c                |  51 ++--
 ext/stub/arrayiterator.zep.c                  |  10 +-
 ext/stub/arrayiteratortest.zep.c              |   3 +-
 ext/stub/arraymanipulation.zep.c              |  13 +-
 ext/stub/arraysearch.zep.c                    |   6 +-
 ext/stub/assign.zep.c                         | 211 ++++++++++-------
 ext/stub/bench/foo.zep.c                      |  52 ++--
 ext/stub/bitwise.zep.c                        |  21 +-
 ext/stub/builtin/arraymethods.zep.c           |   9 +-
 ext/stub/builtin/charmethods.zep.c            |   6 +-
 ext/stub/builtin/intmethods.zep.c             |  33 ++-
 ext/stub/builtin/stringmethods.zep.c          |  90 ++++---
 ext/stub/cast.zep.c                           | 129 ++++++----
 ext/stub/closures.zep.c                       |  13 +-
 ext/stub/compare.zep.c                        |   3 +-
 ext/stub/concat.zep.c                         |  18 +-
 ext/stub/constants.zep.c                      |   9 +-
 ext/stub/constructors/issue1803.zep.c         |   3 +-
 ext/stub/declaretest.zep.c                    |  15 +-
 ext/stub/emptytest.zep.c                      |  15 +-
 ext/stub/evaltest.zep.c                       |   3 +-
 ext/stub/exception.zep.c                      |   3 +-
 ext/stub/exceptions.zep.c                     |  33 ++-
 ext/stub/factorial.zep.c                      |   3 +-
 ext/stub/fannkuch.zep.c                       |   3 +-
 ext/stub/fasta.zep.c                          |  12 +-
 ext/stub/fcall.zep.c                          |  51 ++--
 ext/stub/fetchtest.zep.c                      |  66 +++---
 ext/stub/fetchtest.zep.h                      |   4 +-
 ext/stub/fibonnaci.zep.c                      |  12 +-
 ext/stub/flow.zep.c                           | 119 ++++++----
 ext/stub/flow/switchflow.zep.c                |   6 +-
 ext/stub/fortytwo.zep.c                       |   3 +-
 ext/stub/functional.zep.c                     |   6 +-
 ext/stub/functionexists.zep.c                 |   6 +-
 ext/stub/functions.zep.c                      |   6 +-
 ext/stub/geometry.zep.c                       |   6 +-
 ext/stub/globals.zep.c                        |   6 +-
 ext/stub/globals/env.zep.c                    |   3 +-
 ext/stub/globals/post.zep.c                   |   3 +-
 ext/stub/globals/server.zep.c                 |   3 +-
 ext/stub/globals/serverrequestfactory.zep.c   |   6 +-
 ext/stub/globals/session/base.zep.c           |  15 +-
 ext/stub/globals/session/child.zep.c          |   3 +-
 ext/stub/instance.zep.c                       |   6 +-
 ext/stub/instanceoff.zep.c                    |  18 +-
 ext/stub/interfaces/implementint.zep.c        |   4 +-
 ext/stub/interfaces/implementinterface.zep.c  |   3 +-
 ext/stub/internalclasses.zep.c                |   3 +-
 ext/stub/invoke.zep.c                         |   6 +-
 ext/stub/invokes/abstractinvoker.zep.c        |   3 +-
 ext/stub/invokes/abstractinvokercomplex.zep.c |   3 +-
 ext/stub/invokes/abstractprotected.zep.c      |  12 +-
 ext/stub/invokes/invokeprotected.zep.c        |   3 +-
 ext/stub/invokes/invokeprotectedcomplex.zep.c |   3 +-
 ext/stub/issettest.zep.c                      |  12 +-
 ext/stub/issue1134.zep.c                      |   6 +-
 ext/stub/issue1521.zep.c                      |   3 +-
 ext/stub/issue2165/issue.zep.c                |  25 +-
 ext/stub/issue663.zep.c                       |   9 +-
 ext/stub/issue820.zep.c                       |  72 ------
 ext/stub/issue820.zep.h                       |  15 --
 ext/stub/issue887.zep.c                       |   6 +-
 ext/stub/issue914.zep.c                       |   3 +-
 ext/stub/issues.zep.c                         |   3 +-
 ext/stub/json.zep.c                           |  18 +-
 ext/stub/mcall.zep.c                          |  90 ++++---
 ext/stub/mcall/caller.zep.c                   |   3 +-
 ext/stub/mcallchained.zep.c                   |  12 +-
 ext/stub/mcalldynamic.zep.c                   |   9 +-
 ext/stub/mcallinternal.zep.c                  |  21 +-
 ext/stub/methodabstract.zep.c                 |   3 +-
 ext/stub/methodargs.zep.c                     |   6 +-
 ext/stub/nativearray.zep.c                    | 222 ++++++++++++------
 ext/stub/oo.zep.c                             |  39 ++-
 ext/stub/oo/concretestatic.zep.c              |   6 +-
 ext/stub/oo/deprecatedmethods.zep.c           |   3 +-
 ext/stub/oo/dynamicprop.zep.c                 |  42 ++--
 ext/stub/oo/extendpdoclass.zep.c              |   3 +-
 ext/stub/oo/oodestruct.zep.c                  |  18 +-
 ext/stub/oo/oodynamica.zep.c                  |   9 +-
 ext/stub/oo/oonativeimplements.zep.c          |   6 +-
 ext/stub/oo/ooparams.zep.c                    |  27 ++-
 ext/stub/oo/propertyaccess.zep.c              |   3 +-
 ext/stub/oo/scopes/abstractclass.zep.c        |   3 +-
 ext/stub/oo/scopes/abstractclassmagic.zep.c   |   8 +-
 ext/stub/oo/scopes/hasprivatemethod.zep.c     |   3 +-
 ext/stub/oo/scopes/privatescopetester.zep.c   |  15 +-
 ext/stub/operator.zep.c                       |   9 +-
 ext/stub/optimizers/acos.zep.c                |  15 +-
 ext/stub/optimizers/arraymerge.zep.c          |   3 +-
 ext/stub/optimizers/asin.zep.c                |  15 +-
 ext/stub/optimizers/isscalar.zep.c            |   6 +-
 ext/stub/optimizers/strreplace.zep.c          |  12 +-
 ext/stub/pregmatch.zep.c                      |  27 ++-
 ext/stub/properties/app.zep.c                 |   3 +-
 .../properties/extendspublicproperties.zep.c  |   3 +-
 ext/stub/properties/getobjectvars.zep.c       |   3 +-
 ext/stub/properties/propertyarray.zep.c       |  12 +-
 ext/stub/properties/propertyupdate.zep.c      |   5 +-
 ext/stub/properties/protectedproperties.zep.c |   6 +-
 ext/stub/properties/publicproperties.zep.c    |   6 +-
 .../properties/staticprivateproperties.zep.c  |   3 +-
 ext/stub/properties/staticpropertyarray.zep.c |   3 +-
 .../staticprotectedproperties.zep.c           |   3 +-
 .../properties/staticpublicproperties.zep.c   |  18 +-
 ext/stub/quantum.zep.c                        |   3 +-
 ext/stub/range.zep.c                          |   6 +-
 ext/stub/reflection.zep.c                     |   6 +-
 ext/stub/regexdna.zep.c                       |   3 +-
 ext/stub/requires.zep.c                       |  12 +-
 ext/stub/requires/external3.zep.c             |   3 +-
 ext/stub/resourcetest.zep.c                   |  18 +-
 ext/stub/returns.zep.c                        |   3 +-
 ext/stub/router.zep.c                         |  45 ++--
 ext/stub/router/route.zep.c                   |  15 +-
 ext/stub/scall.zep.c                          |  57 +++--
 ext/stub/scallexternal.zep.c                  |   6 +-
 ext/stub/scalllateconstruct.zep.c             |   6 +-
 ext/stub/scallparent.zep.c                    |   3 +-
 ext/stub/scope.zep.c                          |  12 +-
 ext/stub/sort.zep.c                           |   3 +-
 ext/stub/spectralnorm.zep.c                   |  15 +-
 ext/stub/spl.zep.c                            |   3 +-
 ext/stub/spropertyaccess.zep.c                |  24 +-
 ext/stub/statements.zep.c                     |   9 +-
 ext/stub/strings.zep.c                        |  51 ++--
 ext/stub/stubs.zep.c                          |   3 +-
 ext/stub/ternary.zep.c                        |  27 ++-
 ext/stub/trytest.zep.c                        |  33 ++-
 ext/stub/typeinstances.zep.c                  |   9 +-
 ext/stub/typeoff.zep.c                        |  21 +-
 ext/stub/types/mixedtype.zep.c                |  18 +-
 ext/stub/unsettest.zep.c                      |  16 +-
 ext/stub/usetest.zep.c                        |   9 +-
 ext/stub/vars.zep.c                           |  33 ++-
 146 files changed, 1640 insertions(+), 1034 deletions(-)
 delete mode 100644 ext/stub/issue820.zep.c
 delete mode 100644 ext/stub/issue820.zep.h

diff --git a/ext/kernel/exception.c b/ext/kernel/exception.c
index 2d81541f32..404162af8d 100644
--- a/ext/kernel/exception.c
+++ b/ext/kernel/exception.c
@@ -38,7 +38,8 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 
 	ZVAL_UNDEF(&curline);
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	if (Z_TYPE_P(object) != IS_OBJECT) {
 		ZVAL_COPY_VALUE(&object_copy, object);
diff --git a/ext/kernel/main.h b/ext/kernel/main.h
index 72278a569f..7d28f37757 100644
--- a/ext/kernel/main.h
+++ b/ext/kernel/main.h
@@ -36,11 +36,6 @@ extern zend_string* i_self;
 #define PH_COPY 1024
 #define PH_CTOR 4096
 
-/* Deprecated */
-#ifndef zend_uint
- #define zend_uint uint32_t
-#endif
-
 #ifndef ZEND_ACC_FINAL_CLASS
  #define ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
 #endif
@@ -289,7 +284,7 @@ int zephir_fetch_parameters(int num_args, int required_args, int optional_args,
 	    zval _null; \
 		ZVAL_NULL(&_null); \
 		ZVAL_COPY(return_value, &_null); \
-		zephir_ptr_dtor(&_null); \
+		zval_ptr_dtor(&_null); \
 	} else { \
 	    ZVAL_COPY(return_value, _constant_ptr); \
 	} \
diff --git a/ext/kernel/memory.c b/ext/kernel/memory.c
index 4fb7271bb2..f0bf4326f3 100644
--- a/ext/kernel/memory.c
+++ b/ext/kernel/memory.c
@@ -274,49 +274,6 @@ int zephir_set_symbol(zval *key_name, zval *value)
 	return SUCCESS;
 }
 
-/**
- * Exports a string symbol to the active symbol table
- */
-int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value)
-{
-	zend_array *symbol_table = zend_rebuild_symbol_table();
-
-	if (!symbol_table) {
-		php_error_docref(NULL, E_WARNING, "Cannot find a valid symbol_table");
-		return FAILURE;
-	}
-
-	Z_TRY_ADDREF_P(value);
-	zend_hash_str_update(symbol_table, key_name, key_length, value);
-
-	return SUCCESS;
-}
-
-/**
- * Cleans the function/method cache up
- */
-int zephir_cleanup_fcache(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
-{
-	zephir_fcall_cache_entry **entry = (zephir_fcall_cache_entry**) pDest;
-	zend_class_entry *scope;
-	size_t len = ZSTR_LEN(hash_key->key);
-
-	assert(hash_key->key != NULL);
-	assert(len > 2 * sizeof(zend_class_entry**));
-
-	memcpy(&scope, &ZSTR_VAL(hash_key->key)[(len -1) - 2 * sizeof(zend_class_entry**)], sizeof(zend_class_entry*));
-
-	if ((*entry)->type != ZEND_INTERNAL_FUNCTION || (scope && scope->type != ZEND_INTERNAL_CLASS)) {
-		return ZEND_HASH_APPLY_REMOVE;
-	}
-
-	if (scope && scope->type == ZEND_INTERNAL_CLASS && scope->info.internal.module->type != MODULE_PERSISTENT) {
-		return ZEND_HASH_APPLY_REMOVE;
-	}
-
-	return ZEND_HASH_APPLY_KEEP;
-}
-
 void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g)
 {
 	zephir_memory_entry *frame = g->active_memory;
diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
index 762be8a03c..7da4ec47e2 100644
--- a/ext/kernel/memory.h
+++ b/ext/kernel/memory.h
@@ -17,12 +17,6 @@
 #include "php_ext.h"
 #include "kernel/globals.h"
 
-#if defined(__x86_64__) || defined(__LP64__) || defined(_LP64) || defined(_WIN64)
-	#define ZEPHIR_ENABLE_64BITS 1
-#endif
-
-#define ZEPHIR_NUM_PREALLOCATED_FRAMES 25
-
 /** Memory frame */
 typedef struct _zephir_memory_entry {
 	size_t pointer;
@@ -53,21 +47,14 @@ typedef struct _zephir_method_globals {
 void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func);
 void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
 
-#define ZEPHIR_MM_GROW()  \
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0); \
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 #define ZEPHIR_MM_RESTORE() \
 	zephir_memory_restore_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); \
 	pefree(ZEPHIR_METHOD_GLOBALS_PTR, 0); \
 	ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
-int zephir_cleanup_fcache(void *pDest, int num_args, va_list args, zend_hash_key *hash_key);
 void zephir_deinitialize_memory();
 
-#define zephir_ptr_dtor(x) zval_ptr_dtor(x)
-
 void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
 #define zephir_memory_observe(var) zephir_do_memory_observe(var, ZEPHIR_METHOD_GLOBALS_PTR);
 
@@ -78,14 +65,11 @@ void zephir_create_symbol_table(zephir_method_globals *g);
 #define ZEPHIR_CREATE_SYMBOL_TABLE() zephir_create_symbol_table(ZEPHIR_METHOD_GLOBALS_PTR);
 
 int zephir_set_symbol(zval *key_name, zval *value);
-int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 
 #define ZEPHIR_INIT_VAR(z) \
 	zephir_memory_observe(z); \
 	ZVAL_NULL(z);
 
-#define ZEPHIR_INIT_ZVAL_NREF(z) ZVAL_UNDEF(&z);
-
 #define ZEPHIR_INIT_NVAR(z) \
 	do { \
 		if (Z_TYPE_P(z) == IS_UNDEF) { \
@@ -100,14 +84,11 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		ZVAL_NULL(z); \
 	} while (0)
 
-/* only removes the value body of the zval */
-#define ZEPHIR_INIT_LNVAR(z) ZEPHIR_INIT_NVAR(&z)
-
 #define ZEPHIR_CPY_WRT(d, v) \
 	Z_TRY_ADDREF_P(v); \
 	if (Z_TYPE_P(d) > IS_UNDEF) { \
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
-			zephir_ptr_dtor(d); \
+			zval_ptr_dtor(d); \
 		} \
 	} else { \
 		zephir_memory_observe(d); \
@@ -117,18 +98,15 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 #define ZEPHIR_CPY_WRT_CTOR(d, v) \
 	if (d) { \
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
-			zephir_ptr_dtor(d); \
+			zval_ptr_dtor(d); \
 		} \
 	} \
 	ZVAL_DUP(d, v);
 
-#define ZEPHIR_OBS_VAR_ONCE(z) \
+#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
 	if (Z_TYPE_P(z) == IS_UNDEF) { \
 		zephir_memory_observe(z); \
-	}
-
-#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
-	ZEPHIR_OBS_VAR_ONCE(z); \
+	} \
 	ZVAL_COPY(z, v);
 
 #define ZEPHIR_HASH_COPY(z, v) \
@@ -141,7 +119,7 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		if (Z_REFCOUNTED_P(z) && Z_REFCOUNT_P(z) > 1) { \
 			Z_DELREF_P(z); \
 		} else {\
-			zephir_ptr_dtor(z); \
+			zval_ptr_dtor(z); \
 			ZVAL_NULL(z); \
 		} \
 	} else { \
@@ -156,7 +134,7 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		zval *tmp_ = (ppzv); \
 		if (tmp_ != NULL) { \
 			if (Z_TYPE_P(tmp_) != IS_UNDEF) { \
-				zephir_ptr_dtor(tmp_); \
+				zval_ptr_dtor(tmp_); \
 			} else { \
 				zephir_memory_observe(tmp_); \
 			} \
@@ -164,12 +142,10 @@ int zephir_set_symbol_str(char *key_name, unsigned int key_length, zval *value);
 		} \
 	} while (0)
 
-#define ZEPHIR_SEPARATE(z) SEPARATE_ZVAL(z)
-
 #define ZEPHIR_SEPARATE_PARAM(z) \
 	do { \
 		zval *orig_ptr = z; \
-		ZEPHIR_SEPARATE(orig_ptr); \
+		SEPARATE_ZVAL(orig_ptr); \
 	} while (0)
 
 #endif
diff --git a/ext/kernel/object.c b/ext/kernel/object.c
index 62b03d79c7..12f703ef27 100644
--- a/ext/kernel/object.c
+++ b/ext/kernel/object.c
@@ -740,7 +740,7 @@ int zephir_update_property_array(zval *object, const char *property, uint32_t pr
 
 	if (separated) {
 		zephir_update_property_zval(object, property, property_length, &tmp);
-		zephir_ptr_dtor(&tmp);
+		zval_ptr_dtor(&tmp);
 	}
 
 	return SUCCESS;
@@ -828,7 +828,7 @@ int zephir_update_property_array_append(zval *object, char *property, unsigned i
 
 	if (separated) {
 		zephir_update_property_zval(object, property, property_length, &tmp);
-		zephir_ptr_dtor(&tmp);
+		zval_ptr_dtor(&tmp);
 	}
 
 	return SUCCESS;
@@ -890,7 +890,7 @@ int zephir_update_property_array_multi(zval *object, const char *property, uint3
 
 		if (separated) {
 			zephir_update_property_zval(object, property, property_length, &tmp_arr);
-			zephir_ptr_dtor(&tmp_arr);
+			zval_ptr_dtor(&tmp_arr);
 		}
 	}
 
diff --git a/ext/kernel/operators.h b/ext/kernel/operators.h
index f481d7c3ea..44351f897a 100644
--- a/ext/kernel/operators.h
+++ b/ext/kernel/operators.h
@@ -159,7 +159,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define ZEPHIR_ADD_ASSIGN(z, v)  \
 	{  \
 		zval tmp;  \
-		ZEPHIR_SEPARATE(z);  \
+		SEPARATE_ZVAL(z);  \
 		add_function(&tmp, z, v);  \
 		if (Z_TYPE(tmp) == IS_LONG) {  \
 			Z_LVAL_P(z) = Z_LVAL(tmp);  \
@@ -173,7 +173,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define ZEPHIR_SUB_ASSIGN(z, v)  \
 	{  \
 		zval tmp;  \
-		ZEPHIR_SEPARATE(z);  \
+		SEPARATE_ZVAL(z);  \
 		sub_function(&tmp, z, v);  \
 		if (Z_TYPE(tmp) == IS_LONG) {  \
 			Z_LVAL_P(z) = Z_LVAL(tmp);  \
@@ -187,7 +187,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 #define ZEPHIR_MUL_ASSIGN(z, v)  \
 	{  \
 		zval tmp;  \
-		ZEPHIR_SEPARATE(z);  \
+		SEPARATE_ZVAL(z);  \
 		mul_function(&tmp, z, v);  \
 		if (Z_TYPE(tmp) == IS_LONG) {  \
 			Z_LVAL_P(z) = Z_LVAL(tmp);  \
diff --git a/ext/stub/13__closure.zep.c b/ext/stub/13__closure.zep.c
index ea84c015da..6229650900 100644
--- a/ext/stub/13__closure.zep.c
+++ b/ext/stub/13__closure.zep.c
@@ -32,7 +32,8 @@ PHP_METHOD(stub_13__closure, __invoke)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_mcall_caller_ce, "perform", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/arithmetic.zep.c b/ext/stub/arithmetic.zep.c
index 94f34bc11c..49468abfe2 100644
--- a/ext/stub/arithmetic.zep.c
+++ b/ext/stub/arithmetic.zep.c
@@ -134,7 +134,8 @@ PHP_METHOD(Stub_Arithmetic, boolSumExpression)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	ZVAL_LONG(&_0, 0);
@@ -206,7 +207,8 @@ PHP_METHOD(Stub_Arithmetic, doubleSumExpression)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
@@ -226,7 +228,8 @@ PHP_METHOD(Stub_Arithmetic, doubleSumVarExpression)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1.0;
 	ZVAL_LONG(&_0, 0);
@@ -355,7 +358,8 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCastSum)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -377,7 +381,8 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sum)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -431,7 +436,8 @@ PHP_METHOD(Stub_Arithmetic, complex4Sum)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_DOUBLE(&c, (1.0 + 1));
@@ -1058,7 +1064,8 @@ PHP_METHOD(Stub_Arithmetic, addSum22)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_DOUBLE(&a, 0.0);
@@ -1095,7 +1102,8 @@ PHP_METHOD(Stub_Arithmetic, addSum24)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
 
@@ -1397,7 +1405,8 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCastSub)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -1419,7 +1428,8 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sub)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -1473,7 +1483,8 @@ PHP_METHOD(Stub_Arithmetic, complex4Sub)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_DOUBLE(&c, (1.0 - 1));
@@ -2100,7 +2111,8 @@ PHP_METHOD(Stub_Arithmetic, sub22)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_DOUBLE(&a, 0.0);
@@ -2137,7 +2149,8 @@ PHP_METHOD(Stub_Arithmetic, sub24)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
 
@@ -2175,7 +2188,8 @@ PHP_METHOD(Stub_Arithmetic, mul2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
 
@@ -2380,7 +2394,8 @@ PHP_METHOD(Stub_Arithmetic, letStatementVarMinus)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b);
 
 
diff --git a/ext/stub/arrayaccessarr.zep.c b/ext/stub/arrayaccessarr.zep.c
index 9e7a20078f..d5c089988f 100644
--- a/ext/stub/arrayaccessarr.zep.c
+++ b/ext/stub/arrayaccessarr.zep.c
@@ -35,7 +35,8 @@ PHP_METHOD(Stub_ArrayAccessArr, __construct)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
@@ -127,7 +128,8 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetGet)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
 
 
diff --git a/ext/stub/arrayaccessobj.zep.c b/ext/stub/arrayaccessobj.zep.c
index 923a9ab603..d174db5022 100644
--- a/ext/stub/arrayaccessobj.zep.c
+++ b/ext/stub/arrayaccessobj.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_ArrayAccessObj, __construct)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&obj);
 	object_init(&obj);
@@ -71,7 +72,8 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetSet)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &offset, &value);
 
 
@@ -98,7 +100,8 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
 
 
@@ -123,7 +126,8 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetUnset)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
 
 
@@ -153,7 +157,8 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetGet)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
 
 
diff --git a/ext/stub/arrayaccesstest.zep.c b/ext/stub/arrayaccesstest.zep.c
index 087897b422..f488ce9c47 100644
--- a/ext/stub/arrayaccesstest.zep.c
+++ b/ext/stub/arrayaccesstest.zep.c
@@ -43,7 +43,8 @@ PHP_METHOD(Stub_ArrayAccessTest, exits)
 	ZVAL_UNDEF(&arr);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&arr);
 	object_init_ex(&arr, stub_arrayaccessarr_ce);
@@ -63,7 +64,8 @@ PHP_METHOD(Stub_ArrayAccessTest, get)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&arr);
 	object_init_ex(&arr, stub_arrayaccessarr_ce);
@@ -89,7 +91,8 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &key_param, &data_param);
 	if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string"));
@@ -124,7 +127,8 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &key_param, &dataFromProperty_param);
 	if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string"));
@@ -158,7 +162,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue645)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -183,7 +188,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1155)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&arr);
 	zephir_create_array(&arr, 3, 0);
@@ -217,7 +223,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
 		ZEPHIR_INIT_VAR(&items);
@@ -245,7 +252,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
 		ZEPHIR_INIT_VAR(&items);
@@ -274,7 +282,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
 		ZEPHIR_INIT_VAR(&items);
@@ -304,7 +313,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086Strict)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &params_param);
 	ZEPHIR_OBS_COPY_OR_DUP(&params, params_param);
 
@@ -330,7 +340,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithStr
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&params);
 	array_init(&params);
@@ -359,7 +370,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086NotStrictParams)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &params_param);
 	zephir_get_arrval(&params, params_param);
 
@@ -385,7 +397,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithout
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&params);
 	array_init(&params);
@@ -410,7 +423,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetKeyFromArrayInternalVariable)
 	ZVAL_UNDEF(&unsetData);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
@@ -441,7 +455,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetStringKeyFromArrayProperty)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
@@ -471,7 +486,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetLongKeyFromArrayProperty)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
@@ -496,7 +512,8 @@ zend_object *zephir_init_properties_Stub_ArrayAccessTest(zend_class_entry *class
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/arrayiterator.zep.c b/ext/stub/arrayiterator.zep.c
index 17987551a2..6137537996 100644
--- a/ext/stub/arrayiterator.zep.c
+++ b/ext/stub/arrayiterator.zep.c
@@ -39,7 +39,8 @@ PHP_METHOD(Stub_ArrayIterator, __construct)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
@@ -53,7 +54,7 @@ PHP_METHOD(Stub_ArrayIterator, __construct)
 	ZVAL_STRING(&_1, "three");
 	zephir_array_fast_append(&_0, &_1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_2);
+	ZVAL_UNDEF(&_2);
 	ZVAL_LONG(&_2, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("position"), &_2);
 	ZEPHIR_MM_RESTORE();
@@ -68,7 +69,7 @@ PHP_METHOD(Stub_ArrayIterator, rewind)
 
 
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("position"), &_0);
 }
@@ -84,7 +85,8 @@ PHP_METHOD(Stub_ArrayIterator, current)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	zephir_memory_observe(&_2);
diff --git a/ext/stub/arrayiteratortest.zep.c b/ext/stub/arrayiteratortest.zep.c
index d6ebbb1101..da472fb56a 100644
--- a/ext/stub/arrayiteratortest.zep.c
+++ b/ext/stub/arrayiteratortest.zep.c
@@ -40,7 +40,8 @@ PHP_METHOD(Stub_ArrayIteratorTest, test)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&arr);
 	object_init_ex(&arr, stub_arrayiterator_ce);
diff --git a/ext/stub/arraymanipulation.zep.c b/ext/stub/arraymanipulation.zep.c
index ec9179bfdf..17ac725536 100644
--- a/ext/stub/arraymanipulation.zep.c
+++ b/ext/stub/arraymanipulation.zep.c
@@ -44,7 +44,8 @@ PHP_METHOD(Stub_ArrayManipulation, arrayFillMany)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 1000000);
@@ -71,14 +72,15 @@ PHP_METHOD(Stub_ArrayManipulation, issue774)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&obj);
 	object_init(&obj);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(&obj, ZEND_STRL("prop0"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(&obj, ZEND_STRL("prop1"), &_0);
 	zephir_get_arrval(&_1, &obj);
@@ -94,7 +96,8 @@ zend_object *zephir_init_properties_Stub_ArrayManipulation(zend_class_entry *cla
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/arraysearch.zep.c b/ext/stub/arraysearch.zep.c
index 091e2a7ecb..84c800a2ec 100644
--- a/ext/stub/arraysearch.zep.c
+++ b/ext/stub/arraysearch.zep.c
@@ -47,7 +47,8 @@ PHP_METHOD(Stub_ArraySearch, simpleSearch)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 1, &needle, &haystack_param, &strict_param);
 	zephir_get_arrval(&haystack, haystack_param);
 	if (!strict_param) {
@@ -77,7 +78,8 @@ PHP_METHOD(Stub_ArraySearch, searchUsingArrayInsideZephir)
 	ZVAL_UNDEF(&pos);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&itoA64);
 	zephir_create_array(&itoA64, 9, 0);
diff --git a/ext/stub/assign.zep.c b/ext/stub/assign.zep.c
index 768a96c410..c8f12c58cb 100644
--- a/ext/stub/assign.zep.c
+++ b/ext/stub/assign.zep.c
@@ -287,7 +287,8 @@ PHP_METHOD(Stub_Assign, testAssign20)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
@@ -528,7 +529,8 @@ PHP_METHOD(Stub_Assign, testAssign37)
 	ZVAL_UNDEF(&_4);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "abc");
@@ -581,7 +583,8 @@ PHP_METHOD(Stub_Assign, testAssign38)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -604,7 +607,8 @@ PHP_METHOD(Stub_Assign, testAssign39)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
@@ -629,7 +633,8 @@ PHP_METHOD(Stub_Assign, testAssign40)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	object_init(&b);
@@ -742,12 +747,13 @@ PHP_METHOD(Stub_Assign, testPropertyAssign1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_DOUBLE(&_0, 1.5);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &__$null);
@@ -761,7 +767,7 @@ PHP_METHOD(Stub_Assign, testPropertyAssign1)
 	} else {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &__$false);
 	}
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 'A');
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -792,7 +798,8 @@ PHP_METHOD(Stub_Assign, testPropertyAssign2)
 	ZVAL_UNDEF(&f);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	b = 1.5;
@@ -802,10 +809,10 @@ PHP_METHOD(Stub_Assign, testPropertyAssign2)
 	e = 'A';
 	ZEPHIR_INIT_VAR(&f);
 	array_init(&f);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_DOUBLE(&_0, b);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &c);
@@ -814,7 +821,7 @@ PHP_METHOD(Stub_Assign, testPropertyAssign2)
 	} else {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &__$false);
 	}
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, e);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &f);
@@ -830,7 +837,7 @@ PHP_METHOD(Stub_Assign, testPropertyIncr1)
 
 
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("testVar")));
@@ -847,9 +854,10 @@ PHP_METHOD(Stub_Assign, testPropertyAddAssign1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -870,9 +878,10 @@ PHP_METHOD(Stub_Assign, testPropertyAddAssign2)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -893,11 +902,11 @@ PHP_METHOD(Stub_Assign, testPropertyAssignValuePlus1)
 
 
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, (zephir_get_numberval(&_0) + 1));
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_1);
 	RETURN_MEMBER(getThis(), "testVar");
@@ -912,7 +921,7 @@ PHP_METHOD(Stub_Assign, testPropertyDecr)
 
 
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 2);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("testVar")));
@@ -929,9 +938,10 @@ PHP_METHOD(Stub_Assign, testPropertySubAssign1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -952,9 +962,10 @@ PHP_METHOD(Stub_Assign, testPropertySubAssign2)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -975,9 +986,10 @@ PHP_METHOD(Stub_Assign, testPropertyMulAssign1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -998,9 +1010,10 @@ PHP_METHOD(Stub_Assign, testPropertyMulAssign2)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -1020,7 +1033,8 @@ PHP_METHOD(Stub_Assign, testPropertyAssignStringConcat)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1045,15 +1059,16 @@ PHP_METHOD(Stub_Assign, testPropertyArray1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_DOUBLE(&_1, 1.5);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &__$null);
@@ -1067,10 +1082,10 @@ PHP_METHOD(Stub_Assign, testPropertyArray1)
 	} else {
 		zephir_update_property_array_append(this_ptr, SL("myArray"), &__$false);
 	}
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, 'A');
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "hello");
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
@@ -1097,7 +1112,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray2)
 	ZVAL_UNDEF(&f);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	b = 1.5;
@@ -1110,17 +1126,17 @@ PHP_METHOD(Stub_Assign, testPropertyArray2)
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, a);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_DOUBLE(&_1, b);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &c);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_BOOL(&_1, d);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, e);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &f);
@@ -1150,7 +1166,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray3)
 	ZVAL_UNDEF(&_11);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -1207,7 +1224,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray4)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -1253,7 +1271,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
 
@@ -1292,7 +1311,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray6)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -1331,7 +1351,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray7)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -1374,7 +1395,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray8)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -1419,7 +1441,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray9)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	index = zephir_get_intval(index_param);
 
@@ -1466,7 +1489,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray10)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
 
@@ -1515,7 +1539,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray11)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -1565,7 +1590,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray12)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -1623,7 +1649,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray13)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -1673,7 +1700,8 @@ PHP_METHOD(Stub_Assign, testPropertyArray14)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "abc");
@@ -1727,21 +1755,22 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_DOUBLE(&_0, 1.5);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &__$null);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &__$false);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &__$true);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 'A');
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
@@ -1780,7 +1809,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign2)
 	ZVAL_UNDEF(&f);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	b = 1.5;
@@ -1790,17 +1820,17 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign2)
 	e = 'A';
 	ZEPHIR_INIT_VAR(&f);
 	array_init(&f);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_DOUBLE(&_0, b);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &c);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_BOOL(&_0, d);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, e);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &f);
@@ -1822,7 +1852,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -1863,7 +1894,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray2)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -1908,7 +1940,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -1949,7 +1982,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -1985,7 +2019,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -2026,7 +2061,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli2)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -2071,7 +2107,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli3)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
 
 
@@ -2115,7 +2152,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMulti4)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "abc");
@@ -2164,7 +2202,8 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -2206,7 +2245,8 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
 
 
@@ -2231,7 +2271,8 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
 
 
@@ -2256,7 +2297,8 @@ PHP_METHOD(Stub_Assign, testArrayProperty)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
 
 
@@ -2302,7 +2344,8 @@ PHP_METHOD(Stub_Assign, testConstantKeyAssign)
 	ZVAL_UNDEF(&elements);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&elements);
 	zephir_create_array(&elements, 3, 0);
@@ -2330,7 +2373,8 @@ PHP_METHOD(Stub_Assign, testArrayBoolExpressionAssign)
 	ZVAL_UNDEF(&_4);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&str);
 	ZVAL_STRING(&str, "abc");
@@ -2370,7 +2414,8 @@ PHP_METHOD(Stub_Assign, testAssignBitwiseX)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a_param, &b_param);
 	a = zephir_get_intval(a_param);
 	b = zephir_get_intval(b_param);
@@ -2510,7 +2555,8 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobals)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 
 	ZEPHIR_INIT_VAR(&v);
@@ -2546,7 +2592,8 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobalsSERVER)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
 	ZEPHIR_INIT_VAR(&_0);
@@ -2574,7 +2621,8 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobalsGET)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 
 	ZEPHIR_INIT_VAR(&_0);
@@ -2599,7 +2647,8 @@ PHP_METHOD(Stub_Assign, issue597)
 	ZVAL_UNDEF(&_0$$4);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 	zephir_get_global(&_POST, SL("_POST"));
 
diff --git a/ext/stub/bench/foo.zep.c b/ext/stub/bench/foo.zep.c
index ae53455d0f..cbe89421b3 100644
--- a/ext/stub/bench/foo.zep.c
+++ b/ext/stub/bench/foo.zep.c
@@ -45,7 +45,8 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -86,7 +87,8 @@ PHP_METHOD(Stub_Bench_Foo, readStatic)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -129,7 +131,8 @@ PHP_METHOD(Stub_Bench_Foo, writeStatic)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -148,7 +151,7 @@ PHP_METHOD(Stub_Bench_Foo, writeStatic)
 			}
 			ZEPHIR_INIT_NVAR(&i);
 			ZVAL_LONG(&i, _1);
-			ZEPHIR_INIT_ZVAL_NREF(_3$$3);
+			ZVAL_UNDEF(&_3$$3);
 			ZVAL_LONG(&_3$$3, 0);
 			zephir_update_static_property_ce(stub_bench_foo_ce, ZEND_STRL("a"), &_3$$3);
 		}
@@ -172,7 +175,8 @@ PHP_METHOD(Stub_Bench_Foo, issetStatic)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -214,7 +218,8 @@ PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -258,7 +263,8 @@ PHP_METHOD(Stub_Bench_Foo, readProp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -300,7 +306,8 @@ PHP_METHOD(Stub_Bench_Foo, writeProp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -319,7 +326,7 @@ PHP_METHOD(Stub_Bench_Foo, writeProp)
 			}
 			ZEPHIR_INIT_NVAR(&i);
 			ZVAL_LONG(&i, _1);
-			ZEPHIR_INIT_ZVAL_NREF(_3$$3);
+			ZVAL_UNDEF(&_3$$3);
 			ZVAL_LONG(&_3$$3, 0);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_3$$3);
 		}
@@ -345,7 +352,8 @@ PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -406,7 +414,8 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -447,7 +456,8 @@ PHP_METHOD(Stub_Bench_Foo, postDecProp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -488,7 +498,8 @@ PHP_METHOD(Stub_Bench_Foo, issetProp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -530,7 +541,8 @@ PHP_METHOD(Stub_Bench_Foo, emptyProp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -582,7 +594,8 @@ PHP_METHOD(Stub_Bench_Foo, call)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -642,7 +655,8 @@ PHP_METHOD(Stub_Bench_Foo, scall)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -685,7 +699,8 @@ PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
@@ -728,7 +743,8 @@ PHP_METHOD(Stub_Bench_Foo, readConst)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
diff --git a/ext/stub/bitwise.zep.c b/ext/stub/bitwise.zep.c
index 52e268ff2d..03f5c2dcbb 100644
--- a/ext/stub/bitwise.zep.c
+++ b/ext/stub/bitwise.zep.c
@@ -291,7 +291,8 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCastAnd)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -313,7 +314,8 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2And)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -367,7 +369,8 @@ PHP_METHOD(Stub_Bitwise, complex4And)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_LONG(&c, ((int) (1.0) & 1));
@@ -943,7 +946,8 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCastOr)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -965,7 +969,8 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2Or)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -1019,7 +1024,8 @@ PHP_METHOD(Stub_Bitwise, complex4Or)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	ZVAL_LONG(&c, ((int) (1.0) | 1));
@@ -1469,7 +1475,8 @@ PHP_METHOD(Stub_Bitwise, testbitwiseXor)
 	ZVAL_UNDEF(&j);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 123);
 	ZEPHIR_CALL_METHOD(&i, this_ptr, "getint", NULL, 0, &_0);
diff --git a/ext/stub/builtin/arraymethods.zep.c b/ext/stub/builtin/arraymethods.zep.c
index 1da502c2cf..e4409b29c9 100644
--- a/ext/stub/builtin/arraymethods.zep.c
+++ b/ext/stub/builtin/arraymethods.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getJoin1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
@@ -68,7 +69,8 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getReversed1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
@@ -99,7 +101,8 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getMap1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
diff --git a/ext/stub/builtin/charmethods.zep.c b/ext/stub/builtin/charmethods.zep.c
index 0b9f2f6e64..e09bb34311 100644
--- a/ext/stub/builtin/charmethods.zep.c
+++ b/ext/stub/builtin/charmethods.zep.c
@@ -35,7 +35,8 @@ PHP_METHOD(Stub_BuiltIn_CharMethods, getHex)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -63,7 +64,8 @@ PHP_METHOD(Stub_BuiltIn_CharMethods, getHexForString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
diff --git a/ext/stub/builtin/intmethods.zep.c b/ext/stub/builtin/intmethods.zep.c
index 5e6aa78394..65b61b1d59 100644
--- a/ext/stub/builtin/intmethods.zep.c
+++ b/ext/stub/builtin/intmethods.zep.c
@@ -40,7 +40,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -62,7 +63,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, -5);
 	ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 9, &_0);
@@ -84,7 +86,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getBinary)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -109,7 +112,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getHex)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -134,7 +138,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getOctal)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -161,7 +166,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getPow)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &num_param, &exp_param);
 	num = zephir_get_intval(num_param);
 	exp = zephir_get_intval(exp_param);
@@ -208,7 +214,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getExp)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -293,7 +300,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -318,7 +326,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -343,7 +352,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
@@ -373,7 +383,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &num_param, &base_param);
 	num = zephir_get_intval(num_param);
 	if (!base_param) {
diff --git a/ext/stub/builtin/stringmethods.zep.c b/ext/stub/builtin/stringmethods.zep.c
index ab365190ef..5987ba6bd5 100644
--- a/ext/stub/builtin/stringmethods.zep.c
+++ b/ext/stub/builtin/stringmethods.zep.c
@@ -46,7 +46,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, camelize)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
@@ -79,7 +80,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, uncamelize)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
@@ -102,7 +104,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
@@ -118,7 +121,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength2)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
@@ -134,7 +138,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength3)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "hello", "hello");
@@ -154,7 +159,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength4)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
 
@@ -176,7 +182,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
 
@@ -202,7 +209,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndex)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &needle_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&needle, needle_param);
@@ -232,7 +240,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &str_param, &needle_param, &position_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&needle, needle_param);
@@ -255,7 +264,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -278,7 +288,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -302,7 +313,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLeftTrimmed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -326,7 +338,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRightTrimmed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -350,7 +363,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLower)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -374,7 +388,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getUpper)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -399,7 +414,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -423,7 +439,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getUpperFirst)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -449,7 +466,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -475,7 +493,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getMd5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -500,7 +519,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -525,7 +545,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -550,7 +571,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -578,7 +600,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &assoc_param);
 	zephir_get_strval(&str, str_param);
 	if (!assoc_param) {
@@ -611,7 +634,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &count_param);
 	zephir_get_strval(&str, str_param);
 	count = zephir_get_intval(count_param);
@@ -638,7 +662,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -665,7 +690,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &del_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&del, del_param);
@@ -693,7 +719,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
@@ -721,7 +748,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
@@ -747,7 +775,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
@@ -772,7 +801,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getHtmlSpecialChars)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 
diff --git a/ext/stub/cast.zep.c b/ext/stub/cast.zep.c
index 2c9b52b18f..b4eb6d1930 100644
--- a/ext/stub/cast.zep.c
+++ b/ext/stub/cast.zep.c
@@ -81,7 +81,8 @@ PHP_METHOD(Stub_Cast, testStringCastVariableChar)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 'X';
 	ZEPHIR_INIT_VAR(&_0);
@@ -103,7 +104,8 @@ PHP_METHOD(Stub_Cast, testStringCastFromNull)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
@@ -210,7 +212,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableNull)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
@@ -226,7 +229,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromStringValue)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -243,7 +247,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableString)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "test");
@@ -263,7 +268,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromParameterString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
 
@@ -289,7 +295,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableEmptyArray)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -305,7 +312,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromEmptyArray)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -322,7 +330,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableArray)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
@@ -352,7 +361,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromArray)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
@@ -384,7 +394,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromStdClass)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	object_init(&_0);
@@ -404,7 +415,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableStdClass)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
@@ -510,7 +522,8 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableNull)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
@@ -535,7 +548,8 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableEmptyArray)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -551,7 +565,8 @@ PHP_METHOD(Stub_Cast, testFloatCastFromEmptyArray)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -568,7 +583,8 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableArray)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
@@ -598,7 +614,8 @@ PHP_METHOD(Stub_Cast, testFloatCastFromArray)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
@@ -630,7 +647,8 @@ PHP_METHOD(Stub_Cast, testFloatCastFromStdClass)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	object_init(&_0);
@@ -650,7 +668,8 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableStdClass)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
@@ -720,7 +739,8 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromObject)
 	ZVAL_UNDEF(&simpleObject);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&simpleObject);
 	object_init(&simpleObject);
@@ -736,7 +756,8 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromEmptyArray)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -753,7 +774,8 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromArray)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
@@ -781,7 +803,8 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromNull)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
@@ -824,7 +847,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromInt)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 5);
@@ -841,7 +865,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromFloat)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, 5.0);
@@ -858,7 +883,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromFalse)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, 0);
@@ -875,7 +901,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromTrue)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, 1);
@@ -892,7 +919,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromNull)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_NULL(&_0);
@@ -910,7 +938,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromEmptyArray)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -931,7 +960,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromArray)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
@@ -961,7 +991,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromEmptyString)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "");
@@ -978,7 +1009,8 @@ PHP_METHOD(Stub_Cast, testObjectCastFromString)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "test string");
@@ -995,7 +1027,8 @@ PHP_METHOD(Stub_Cast, testCastStdinToInteger)
 	ZVAL_UNDEF(&handle);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&handle);
 	ZEPHIR_GET_CONSTANT(&handle, "STDIN");
@@ -1011,7 +1044,8 @@ PHP_METHOD(Stub_Cast, testCastStdoutToInteger)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "STDOUT");
@@ -1049,7 +1083,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableArray)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	zephir_create_array(&uids, 3, 0);
@@ -1078,7 +1113,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableTrue)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_BOOL(&uids, 1);
@@ -1098,7 +1134,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableFalse)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_BOOL(&uids, 0);
@@ -1118,7 +1155,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableNull)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_NULL(&uids);
@@ -1138,7 +1176,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableInteger)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_LONG(&uids, 1);
@@ -1158,7 +1197,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableFloat)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_DOUBLE(&uids, 1.1);
@@ -1178,7 +1218,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableString)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_STRING(&uids, "aaa");
@@ -1199,7 +1240,8 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableStdClass)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&uids);
 	object_init(&uids);
@@ -1230,7 +1272,8 @@ PHP_METHOD(Stub_Cast, testIssue828)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
diff --git a/ext/stub/closures.zep.c b/ext/stub/closures.zep.c
index 452096a1ef..b5864b7361 100644
--- a/ext/stub/closures.zep.c
+++ b/ext/stub/closures.zep.c
@@ -13,9 +13,9 @@
 
 #include "kernel/main.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/exception.h"
+#include "kernel/memory.h"
 #include "kernel/array.h"
 #include "kernel/fcall.h"
 
@@ -111,7 +111,7 @@ PHP_METHOD(Stub_Closures, testUseCommand)
 
 	abc = 1;
 	zephir_create_closure_ex(return_value, NULL, stub_8__closure_ce, SL("__invoke"));
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, abc);
 	zephir_update_static_property_ce(stub_8__closure_ce, ZEND_STRL("abc"), &_0);
 	return;
@@ -130,7 +130,8 @@ PHP_METHOD(Stub_Closures, issue1860)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &abc_param);
 	ZEPHIR_OBS_COPY_OR_DUP(&abc, abc_param);
 
@@ -156,7 +157,8 @@ PHP_METHOD(Stub_Closures, issue642)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&obj);
 	object_init(&obj);
@@ -218,7 +220,8 @@ PHP_METHOD(Stub_Closures, issue1036Call)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_function"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("_argument"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/stub/compare.zep.c b/ext/stub/compare.zep.c
index ad4adeab83..dc84464035 100644
--- a/ext/stub/compare.zep.c
+++ b/ext/stub/compare.zep.c
@@ -140,7 +140,8 @@ PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	if (UNEXPECTED(Z_TYPE_P(str_param) != IS_STRING && Z_TYPE_P(str_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'str' must be of the type string"));
diff --git a/ext/stub/concat.zep.c b/ext/stub/concat.zep.c
index d2e9997af9..1460c7ffce 100644
--- a/ext/stub/concat.zep.c
+++ b/ext/stub/concat.zep.c
@@ -53,7 +53,8 @@ PHP_METHOD(Stub_Concat, testConcatBySelfProperty)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &title_param);
 	zephir_get_strval(&title, title_param);
 
@@ -76,7 +77,8 @@ PHP_METHOD(Stub_Concat, testConcat1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&url);
 	ZVAL_STRING(&url, "test");
@@ -98,7 +100,8 @@ PHP_METHOD(Stub_Concat, testConcat2)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&url);
 	ZVAL_STRING(&url, "test");
@@ -127,7 +130,8 @@ PHP_METHOD(Stub_Concat, testConcat3)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
@@ -159,7 +163,8 @@ PHP_METHOD(Stub_Concat, testConcat4)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
 
 
@@ -198,7 +203,8 @@ PHP_METHOD(Stub_Concat, testConcat5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &number_param);
 	number = zephir_get_doubleval(number_param);
 
diff --git a/ext/stub/constants.zep.c b/ext/stub/constants.zep.c
index c4f07a1086..c9b858ea09 100644
--- a/ext/stub/constants.zep.c
+++ b/ext/stub/constants.zep.c
@@ -261,7 +261,8 @@ PHP_METHOD(Stub_Constants, testPHPVersionEnvConstantInExpValue)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "PHP_VERSION");
@@ -282,7 +283,8 @@ PHP_METHOD(Stub_Constants, testStringDelimiterConstantDoubleQuoted)
 	ZVAL_UNDEF(&delimiter);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&delimiter);
 	ZVAL_STRING(&delimiter, ".");
@@ -298,7 +300,8 @@ PHP_METHOD(Stub_Constants, testStringConstantWithVars)
 	ZVAL_UNDEF(&property);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&property);
 	ZVAL_STRING(&property, "$SOME/CSRF/KEY$");
diff --git a/ext/stub/constructors/issue1803.zep.c b/ext/stub/constructors/issue1803.zep.c
index b16eecc55e..49c572a523 100644
--- a/ext/stub/constructors/issue1803.zep.c
+++ b/ext/stub/constructors/issue1803.zep.c
@@ -36,7 +36,8 @@ PHP_METHOD(Stub_Constructors_Issue1803, Issue1803)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/declaretest.zep.c b/ext/stub/declaretest.zep.c
index 3c54615cea..4227ba3dd8 100644
--- a/ext/stub/declaretest.zep.c
+++ b/ext/stub/declaretest.zep.c
@@ -36,7 +36,8 @@ PHP_METHOD(Stub_DeclareTest, testStringDeclare1)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "/@(\\w+)(?:\\s*(?:\\(\\s*)?(.*?)(?:\\s*\\))?)??\\s*(?:\n|\\*\\/)/");
@@ -52,7 +53,8 @@ PHP_METHOD(Stub_DeclareTest, testStringDeclare2)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "/(\\w+)\\s*=\\s*(\\[[^\\]]*\\]|\"[^\"]*\"|[^,)]*)\\s*(?:,|$)/");
@@ -224,7 +226,8 @@ PHP_METHOD(Stub_DeclareTest, testDeclare14)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
@@ -240,7 +243,8 @@ PHP_METHOD(Stub_DeclareTest, testDeclare15)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
@@ -257,7 +261,8 @@ PHP_METHOD(Stub_DeclareTest, testDeclareMcallExpression)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(&a, this_ptr, "testdeclare14", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/emptytest.zep.c b/ext/stub/emptytest.zep.c
index 1cd3b7f5ef..2cdc225dc6 100644
--- a/ext/stub/emptytest.zep.c
+++ b/ext/stub/emptytest.zep.c
@@ -40,7 +40,8 @@ PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayEmpty)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -57,7 +58,8 @@ PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayNotEmpty)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
@@ -85,7 +87,8 @@ PHP_METHOD(Stub_EmptyTest, testEmptyString)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "");
@@ -101,7 +104,8 @@ PHP_METHOD(Stub_EmptyTest, testNotEmptyString)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "test string");
@@ -121,7 +125,8 @@ PHP_METHOD(Stub_EmptyTest, testString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
 
diff --git a/ext/stub/evaltest.zep.c b/ext/stub/evaltest.zep.c
index 0633393b5a..e836da966f 100644
--- a/ext/stub/evaltest.zep.c
+++ b/ext/stub/evaltest.zep.c
@@ -38,7 +38,8 @@ PHP_METHOD(Stub_EvalTest, evalCode)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &code_param);
 	zephir_get_strval(&code, code_param);
 
diff --git a/ext/stub/exception.zep.c b/ext/stub/exception.zep.c
index fceeb455ea..705967611b 100644
--- a/ext/stub/exception.zep.c
+++ b/ext/stub/exception.zep.c
@@ -45,7 +45,8 @@ PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &message_param);
 	if (UNEXPECTED(Z_TYPE_P(message_param) != IS_STRING && Z_TYPE_P(message_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'message' must be of the type string"));
diff --git a/ext/stub/exceptions.zep.c b/ext/stub/exceptions.zep.c
index aad0530965..5b66f879d2 100644
--- a/ext/stub/exceptions.zep.c
+++ b/ext/stub/exceptions.zep.c
@@ -60,7 +60,8 @@ PHP_METHOD(Stub_Exceptions, testException2)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&msg);
 	ZVAL_STRING(&msg, "hello2");
@@ -84,7 +85,8 @@ PHP_METHOD(Stub_Exceptions, testException3)
 	ZVAL_UNDEF(&msg);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&msg);
 	ZVAL_STRING(&msg, "hello3");
@@ -107,7 +109,8 @@ PHP_METHOD(Stub_Exceptions, getException)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	object_init_ex(return_value, stub_exception_ce);
 	ZEPHIR_INIT_VAR(&_0);
@@ -127,7 +130,8 @@ PHP_METHOD(Stub_Exceptions, testException4)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getexception", NULL, 0);
 	zephir_check_call_status();
@@ -147,7 +151,8 @@ PHP_METHOD(Stub_Exceptions, testException5)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&exception);
 	object_init_ex(&exception, stub_exception_ce);
@@ -173,7 +178,8 @@ PHP_METHOD(Stub_Exceptions, testExceptionLiteral)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &type_param);
 	zephir_get_strval(&type, type_param);
 
@@ -216,7 +222,8 @@ PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
 
@@ -246,7 +253,8 @@ PHP_METHOD(Stub_Exceptions, testExceptionConcat)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &framework_param, &language_param);
 	zephir_get_strval(&framework, framework_param);
 	zephir_get_strval(&language, language_param);
@@ -270,7 +278,8 @@ PHP_METHOD(Stub_Exceptions, testExceptionRethrow)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
@@ -320,7 +329,8 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &returnValue, &exception);
 
 
@@ -425,7 +435,8 @@ PHP_METHOD(Stub_Exceptions, issue1325)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
diff --git a/ext/stub/factorial.zep.c b/ext/stub/factorial.zep.c
index 204218a8bd..07d9ee68d8 100644
--- a/ext/stub/factorial.zep.c
+++ b/ext/stub/factorial.zep.c
@@ -79,7 +79,8 @@ PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	num = zephir_get_intval(num_param);
 
diff --git a/ext/stub/fannkuch.zep.c b/ext/stub/fannkuch.zep.c
index ec6527207d..e841eab040 100644
--- a/ext/stub/fannkuch.zep.c
+++ b/ext/stub/fannkuch.zep.c
@@ -61,7 +61,8 @@ PHP_METHOD(Stub_Fannkuch, process)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	n = zephir_get_intval(n_param);
 
diff --git a/ext/stub/fasta.zep.c b/ext/stub/fasta.zep.c
index eacbc4b304..855678d958 100644
--- a/ext/stub/fasta.zep.c
+++ b/ext/stub/fasta.zep.c
@@ -69,7 +69,8 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &n, &seq_param);
 	zephir_get_strval(&seq, seq_param);
 
@@ -96,7 +97,7 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 		if (ZEPHIR_LE_LONG(&j, -1)) {
 			break;
 		}
-		ZEPHIR_SEPARATE(&j);
+		SEPARATE_ZVAL(&j);
 		zephir_decrement(&j);
 		ZVAL_LONG(&_6$$3, (60 * zephir_get_numberval(&j)));
 		ZVAL_LONG(&_7$$3, 60);
@@ -119,7 +120,7 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 			break;
 		}
 		zend_print_zval(&block, 0);
-		ZEPHIR_SEPARATE(&j);
+		SEPARATE_ZVAL(&j);
 		zephir_increment(&j);
 	}
 	ZEPHIR_INIT_NVAR(&j);
@@ -132,7 +133,7 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 		}
 		zephir_array_fetch(&_11$$6, &lines, &j, PH_NOISY | PH_READONLY, "stub/fasta.zep", 38);
 		zend_print_zval(&_11$$6, 0);
-		ZEPHIR_SEPARATE(&j);
+		SEPARATE_ZVAL(&j);
 		zephir_increment(&j);
 	}
 	if (zephir_safe_mod_zval_long(n, 60) > 0) {
@@ -173,7 +174,8 @@ PHP_METHOD(Stub_Fasta, main)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 
 
diff --git a/ext/stub/fcall.zep.c b/ext/stub/fcall.zep.c
index 6db9d1705e..c5bb93b079 100644
--- a/ext/stub/fcall.zep.c
+++ b/ext/stub/fcall.zep.c
@@ -47,7 +47,8 @@ PHP_METHOD(Stub_Fcall, testCall1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
@@ -69,7 +70,8 @@ PHP_METHOD(Stub_Fcall, testCall2)
 	ZVAL_UNDEF(&_1$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	while (1) {
 		ZVAL_LONG(&_0$$3, 0);
@@ -96,7 +98,8 @@ PHP_METHOD(Stub_Fcall, testCall3)
 	ZVAL_UNDEF(&_3$$4);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "inputfile.txt");
@@ -142,7 +145,8 @@ PHP_METHOD(Stub_Fcall, testCall4)
 	ZVAL_UNDEF(&_3$$4);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "r");
@@ -187,7 +191,8 @@ PHP_METHOD(Stub_Fcall, testCall5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -204,7 +209,8 @@ PHP_METHOD(Stub_Fcall, testCall6)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 36);
 	zephir_check_call_status();
@@ -219,7 +225,8 @@ PHP_METHOD(Stub_Fcall, testCall7)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 37);
 	zephir_check_call_status();
@@ -244,7 +251,8 @@ PHP_METHOD(Stub_Fcall, zvalFcallWith1Parameter)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &callback, &param1);
 	if (!param1) {
 		param1 = &param1_sub;
@@ -273,7 +281,8 @@ PHP_METHOD(Stub_Fcall, testCall8)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -294,7 +303,8 @@ PHP_METHOD(Stub_Fcall, testCall1FromVar)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&funcName);
 	ZVAL_STRING(&funcName, "strpos");
@@ -330,7 +340,8 @@ PHP_METHOD(Stub_Fcall, testStrtokVarBySlash)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
 
 
@@ -398,7 +409,8 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &param1, &param2);
 
 
@@ -425,7 +437,8 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArgAllExtra)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_create_array(return_value, 2, 0);
 	ZEPHIR_INIT_VAR(&_0);
@@ -450,7 +463,8 @@ PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgAllExtra)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_create_array(return_value, 2, 0);
 	ZEPHIR_INIT_VAR(&_0);
@@ -479,7 +493,8 @@ PHP_METHOD(Stub_Fcall, testArrayFill)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 5);
@@ -510,7 +525,8 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str);
 
 
@@ -553,7 +569,8 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str);
 
 
diff --git a/ext/stub/fetchtest.zep.c b/ext/stub/fetchtest.zep.c
index 4da7da6073..6f7ea34b93 100644
--- a/ext/stub/fetchtest.zep.c
+++ b/ext/stub/fetchtest.zep.c
@@ -71,7 +71,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -93,7 +94,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_SEPARATE_PARAM(a);
 
@@ -117,7 +119,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray3)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	b = zephir_get_intval(b_param);
 
@@ -140,7 +143,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray4)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	ZEPHIR_SEPARATE_PARAM(a);
 	b = zephir_get_intval(b_param);
@@ -166,7 +170,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	zephir_get_strval(&b, b_param);
 
@@ -190,7 +195,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray6)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	ZEPHIR_SEPARATE_PARAM(a);
 	zephir_get_strval(&b, b_param);
@@ -215,7 +221,8 @@ PHP_METHOD(Stub_FetchTest, testFetchObject1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -237,7 +244,8 @@ PHP_METHOD(Stub_FetchTest, testFetchObject2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_SEPARATE_PARAM(a);
 
@@ -260,7 +268,8 @@ PHP_METHOD(Stub_FetchTest, testFetchPost)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &b);
 
@@ -274,63 +283,58 @@ PHP_METHOD(Stub_FetchTest, testFetchPost)
 
 PHP_METHOD(Stub_FetchTest, hasValue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *name_param = NULL, _POST, _0$$4;
-	zval name;
+	zval *name, name_sub, _POST, _0$$4;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&name);
+	ZVAL_UNDEF(&name_sub);
 	ZVAL_UNDEF(&_POST);
 	ZVAL_UNDEF(&_0$$4);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(name)
+		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
 	zephir_get_global(&_POST, SL("_POST"));
-	zephir_fetch_params(1, 1, 0, &name_param);
-	zephir_get_strval(&name, name_param);
+	zephir_fetch_params_without_memory_grow(1, 0, &name);
 
 
-	if (zephir_array_isset(&_POST, &name)) {
-		RETURN_MM_BOOL(1);
+	if (zephir_array_isset(&_POST, name)) {
+		RETURN_BOOL(1);
 	} else {
 		zephir_read_property(&_0$$4, this_ptr, ZEND_STRL("values"), PH_NOISY_CC | PH_READONLY);
-		if (zephir_array_isset(&_0$$4, &name)) {
-			RETURN_MM_BOOL(1);
+		if (zephir_array_isset(&_0$$4, name)) {
+			RETURN_BOOL(1);
 		}
 	}
-	RETURN_MM_BOOL(0);
+	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_FetchTest, getValue)
 {
 	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *name_param = NULL, _POST, value, _0$$3;
-	zval name;
+	zval *name, name_sub, _POST, value, _0$$3;
 	zval *this_ptr = getThis();
 
-	ZVAL_UNDEF(&name);
+	ZVAL_UNDEF(&name_sub);
 	ZVAL_UNDEF(&_POST);
 	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&_0$$3);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(name)
+		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
-	zephir_fetch_params(1, 1, 0, &name_param);
-	zephir_get_strval(&name, name_param);
+	zephir_fetch_params(1, 1, 0, &name);
 
 
 	zephir_memory_observe(&value);
-	if (!(zephir_array_isset_fetch(&value, &_POST, &name, 0))) {
+	if (!(zephir_array_isset_fetch(&value, &_POST, name, 0))) {
 		ZEPHIR_OBS_NVAR(&value);
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("values"), PH_NOISY_CC | PH_READONLY);
-		if (!(zephir_array_isset_fetch(&value, &_0$$3, &name, 0))) {
+		if (!(zephir_array_isset_fetch(&value, &_0$$3, name, 0))) {
 			RETURN_MM_NULL();
 		}
 	}
diff --git a/ext/stub/fetchtest.zep.h b/ext/stub/fetchtest.zep.h
index 16e8467105..9d3cc5cd8d 100644
--- a/ext/stub/fetchtest.zep.h
+++ b/ext/stub/fetchtest.zep.h
@@ -69,11 +69,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_fetchtest_testfetchpost, 0, 0, 1)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_fetchtest_hasvalue, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_fetchtest_getvalue, 0, 0, 1)
-	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
+	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
 ZEPHIR_INIT_FUNCS(stub_fetchtest_method_entry) {
diff --git a/ext/stub/fibonnaci.zep.c b/ext/stub/fibonnaci.zep.c
index f6734b5d1c..ee86c4b892 100644
--- a/ext/stub/fibonnaci.zep.c
+++ b/ext/stub/fibonnaci.zep.c
@@ -86,7 +86,8 @@ PHP_METHOD(Stub_Fibonnaci, fibArray)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&fib);
 	zephir_create_array(&fib, 2, 0);
@@ -130,7 +131,8 @@ PHP_METHOD(Stub_Fibonnaci, fibArray2)
 	ZVAL_UNDEF(&_3$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&fib);
 	zephir_create_array(&fib, 2, 0);
@@ -172,7 +174,8 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	n = zephir_get_intval(n_param);
 
@@ -211,7 +214,8 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	n = zephir_get_intval(n_param);
 
diff --git a/ext/stub/flow.zep.c b/ext/stub/flow.zep.c
index c1edb10997..8b13641e07 100644
--- a/ext/stub/flow.zep.c
+++ b/ext/stub/flow.zep.c
@@ -607,7 +607,8 @@ PHP_METHOD(Stub_Flow, testWhile10)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
 
@@ -624,7 +625,7 @@ PHP_METHOD(Stub_Flow, testWhile10)
 			}
 			b--;
 		}
-		ZEPHIR_SEPARATE(a);
+		SEPARATE_ZVAL(a);
 		zephir_decrement(a);
 	}
 	c = (double) ((zephir_get_numberval(a) + b));
@@ -647,7 +648,8 @@ PHP_METHOD(Stub_Flow, testWhile11)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &d);
 	ZEPHIR_SEPARATE_PARAM(a);
 
@@ -664,7 +666,7 @@ PHP_METHOD(Stub_Flow, testWhile11)
 			}
 			b--;
 		}
-		ZEPHIR_SEPARATE(a);
+		SEPARATE_ZVAL(a);
 		zephir_decrement(a);
 	}
 	c = (double) ((zephir_get_numberval(a) + b));
@@ -682,7 +684,8 @@ PHP_METHOD(Stub_Flow, testWhile12)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "+", "10");
@@ -691,7 +694,7 @@ PHP_METHOD(Stub_Flow, testWhile12)
 		if (!(ZEPHIR_GT_LONG(&b, 5))) {
 			break;
 		}
-		ZEPHIR_SEPARATE(&b);
+		SEPARATE_ZVAL(&b);
 		zephir_decrement(&b);
 	}
 	RETURN_CCTOR(&b);
@@ -709,7 +712,8 @@ PHP_METHOD(Stub_Flow, testWhile13)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 5;
 	ZEPHIR_INIT_VAR(&_0);
@@ -719,7 +723,7 @@ PHP_METHOD(Stub_Flow, testWhile13)
 		if (!(ZEPHIR_GT_LONG(&b, a))) {
 			break;
 		}
-		ZEPHIR_SEPARATE(&b);
+		SEPARATE_ZVAL(&b);
 		zephir_decrement(&b);
 	}
 	RETURN_CCTOR(&b);
@@ -752,7 +756,8 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &variable);
 
 
@@ -790,7 +795,8 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &variable);
 
 
@@ -821,7 +827,8 @@ PHP_METHOD(Stub_Flow, testFor1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	c = 0;
 	ZEPHIR_INIT_VAR(&b);
@@ -883,7 +890,8 @@ PHP_METHOD(Stub_Flow, testFor2)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	c = (double) (0);
 	ZEPHIR_INIT_VAR(&b);
@@ -951,7 +959,8 @@ PHP_METHOD(Stub_Flow, testFor3)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
@@ -1009,7 +1018,8 @@ PHP_METHOD(Stub_Flow, testFor4)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -1076,7 +1086,8 @@ PHP_METHOD(Stub_Flow, testFor6)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -1207,7 +1218,8 @@ PHP_METHOD(Stub_Flow, testFor10)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -1245,7 +1257,8 @@ PHP_METHOD(Stub_Flow, testFor11)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	_2 = 'z';
@@ -1279,7 +1292,8 @@ PHP_METHOD(Stub_Flow, testFor12)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	_2 = 'z';
@@ -1313,7 +1327,8 @@ PHP_METHOD(Stub_Flow, testFor13)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	_2 = '9';
@@ -1347,7 +1362,8 @@ PHP_METHOD(Stub_Flow, testFor14)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	_2 = '9';
@@ -1423,7 +1439,8 @@ PHP_METHOD(Stub_Flow, testFor16)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
@@ -1466,7 +1483,8 @@ PHP_METHOD(Stub_Flow, testFor17)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
@@ -1508,7 +1526,8 @@ PHP_METHOD(Stub_Flow, testFor18)
 	ZVAL_UNDEF(&_4$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
@@ -1549,7 +1568,8 @@ PHP_METHOD(Stub_Flow, testFor19)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -1586,7 +1606,8 @@ PHP_METHOD(Stub_Flow, testFor20)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -1623,7 +1644,8 @@ PHP_METHOD(Stub_Flow, testFor21)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -1660,7 +1682,8 @@ PHP_METHOD(Stub_Flow, testFor22)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -1698,7 +1721,8 @@ PHP_METHOD(Stub_Flow, testFor23)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	_2 = 'z';
@@ -1739,7 +1763,8 @@ PHP_METHOD(Stub_Flow, testFor24)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZEPHIR_INIT_VAR(&_0);
@@ -1798,7 +1823,8 @@ PHP_METHOD(Stub_Flow, testFor30)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1827,7 +1853,8 @@ PHP_METHOD(Stub_Flow, testFor31)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1859,7 +1886,8 @@ PHP_METHOD(Stub_Flow, testFor32)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &e);
 
 
@@ -1907,7 +1935,8 @@ PHP_METHOD(Stub_Flow, testFor33)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &e);
 
 
@@ -1943,7 +1972,8 @@ PHP_METHOD(Stub_Flow, testFor34)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &e);
 	if (!e) {
 		e = &e_sub;
@@ -1998,7 +2028,8 @@ PHP_METHOD(Stub_Flow, testFor35)
 	ZVAL_UNDEF(&_3$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	_2 = 100;
 	_1 = 1;
@@ -2056,7 +2087,8 @@ PHP_METHOD(Stub_Flow, testFor36)
 	ZVAL_UNDEF(&_3$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	_2 = 100;
 	_1 = 1;
@@ -2124,7 +2156,8 @@ PHP_METHOD(Stub_Flow, testFor38)
 	ZVAL_UNDEF(&v);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	i = 0;
 	_3 = 10;
@@ -2163,7 +2196,8 @@ PHP_METHOD(Stub_Flow, testFor39)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	i = 0;
 	ZEPHIR_INIT_VAR(&_2);
@@ -2188,7 +2222,8 @@ PHP_METHOD(Stub_Flow, testFor40)
 	ZVAL_UNDEF(&_3$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
@@ -2228,7 +2263,8 @@ PHP_METHOD(Stub_Flow, testUnrechable1)
 	ZVAL_UNDEF(&d);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 0;
 	b = 0.0;
@@ -2267,7 +2303,8 @@ PHP_METHOD(Stub_Flow, testUnrechable2)
 	ZVAL_UNDEF(&d);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	b = 1.0;
diff --git a/ext/stub/flow/switchflow.zep.c b/ext/stub/flow/switchflow.zep.c
index c8dc85e636..72e40a410c 100644
--- a/ext/stub/flow/switchflow.zep.c
+++ b/ext/stub/flow/switchflow.zep.c
@@ -279,7 +279,8 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_intval(a_param);
 
@@ -313,7 +314,8 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch14)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &result_type);
 	if (!result_type) {
 		result_type = &result_type_sub;
diff --git a/ext/stub/fortytwo.zep.c b/ext/stub/fortytwo.zep.c
index 748b36e859..acf5fade5c 100644
--- a/ext/stub/fortytwo.zep.c
+++ b/ext/stub/fortytwo.zep.c
@@ -48,7 +48,8 @@ PHP_METHOD(Stub_FortyTwo, proof)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&box);
 	zephir_create_array(&box, 15, 0);
diff --git a/ext/stub/functional.zep.c b/ext/stub/functional.zep.c
index 3de668d004..a69c6f44f9 100644
--- a/ext/stub/functional.zep.c
+++ b/ext/stub/functional.zep.c
@@ -41,7 +41,8 @@ PHP_METHOD(Stub_Functional, map1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_arrval(&a, a_param);
 
@@ -71,7 +72,8 @@ PHP_METHOD(Stub_Functional, map2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a_param, &b);
 	zephir_get_arrval(&a, a_param);
 
diff --git a/ext/stub/functionexists.zep.c b/ext/stub/functionexists.zep.c
index fcbe1039b2..77217baf7d 100644
--- a/ext/stub/functionexists.zep.c
+++ b/ext/stub/functionexists.zep.c
@@ -39,7 +39,8 @@ PHP_METHOD(Stub_FunctionExists, testWithPassedName)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &func_param);
 	zephir_get_strval(&func, func_param);
 
@@ -64,7 +65,8 @@ PHP_METHOD(Stub_FunctionExists, testBuiltInFunctions)
 	ZVAL_UNDEF(&functions);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&result);
 	array_init(&result);
diff --git a/ext/stub/functions.zep.c b/ext/stub/functions.zep.c
index e51740dbb8..75643678e2 100644
--- a/ext/stub/functions.zep.c
+++ b/ext/stub/functions.zep.c
@@ -41,7 +41,8 @@ PHP_METHOD(Stub_Functions, filterVar1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "0");
@@ -68,7 +69,8 @@ PHP_METHOD(Stub_Functions, filterVar2)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "0");
diff --git a/ext/stub/geometry.zep.c b/ext/stub/geometry.zep.c
index f338f42cc3..a105a27c7f 100644
--- a/ext/stub/geometry.zep.c
+++ b/ext/stub/geometry.zep.c
@@ -51,7 +51,8 @@ PHP_METHOD(Stub_Geometry, run)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &list_param, &count_param);
 	zephir_get_arrval(&list, list_param);
 	count = zephir_get_intval(count_param);
@@ -98,7 +99,8 @@ PHP_METHOD(Stub_Geometry, runOptimize)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &list_param, &count_param);
 	zephir_get_arrval(&list, list_param);
 	count = zephir_get_intval(count_param);
diff --git a/ext/stub/globals.zep.c b/ext/stub/globals.zep.c
index 27e6c99a1f..27598f17ac 100644
--- a/ext/stub/globals.zep.c
+++ b/ext/stub/globals.zep.c
@@ -88,7 +88,8 @@ PHP_METHOD(Stub_Globals, setStringValue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
 
@@ -144,7 +145,8 @@ PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCachePrefix)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
 
diff --git a/ext/stub/globals/env.zep.c b/ext/stub/globals/env.zep.c
index 94171cb5be..11873ea1aa 100644
--- a/ext/stub/globals/env.zep.c
+++ b/ext/stub/globals/env.zep.c
@@ -40,7 +40,8 @@ PHP_METHOD(Stub_Globals_Env, read)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_ENV, SL("_ENV"));
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
diff --git a/ext/stub/globals/post.zep.c b/ext/stub/globals/post.zep.c
index 4b4906f924..e0bd855057 100644
--- a/ext/stub/globals/post.zep.c
+++ b/ext/stub/globals/post.zep.c
@@ -44,7 +44,8 @@ PHP_METHOD(Stub_Globals_Post, hasValue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
diff --git a/ext/stub/globals/server.zep.c b/ext/stub/globals/server.zep.c
index 3d7e2a603d..24b8a9c196 100644
--- a/ext/stub/globals/server.zep.c
+++ b/ext/stub/globals/server.zep.c
@@ -40,7 +40,8 @@ PHP_METHOD(Stub_Globals_Server, f1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
 	zephir_array_fetch_string(&_0, &_SERVER, SL("PHP_SELF"), PH_NOISY | PH_READONLY, "stub/globals/server.zep", 10);
diff --git a/ext/stub/globals/serverrequestfactory.zep.c b/ext/stub/globals/serverrequestfactory.zep.c
index 81557c09bb..f5fe6d140d 100644
--- a/ext/stub/globals/serverrequestfactory.zep.c
+++ b/ext/stub/globals/serverrequestfactory.zep.c
@@ -69,7 +69,8 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_get_global(&_GET, SL("_GET"));
@@ -171,7 +172,8 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, checkNullArray)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &source, &super_param);
 	zephir_get_arrval(&super, super_param);
 
diff --git a/ext/stub/globals/session/base.zep.c b/ext/stub/globals/session/base.zep.c
index 8a5751b79c..ad976aec99 100644
--- a/ext/stub/globals/session/base.zep.c
+++ b/ext/stub/globals/session/base.zep.c
@@ -42,7 +42,8 @@ PHP_METHOD(Stub_Globals_Session_Base, set)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 	zephir_fetch_params(1, 2, 0, &index_param, &value);
 	zephir_get_strval(&index, index_param);
@@ -67,7 +68,8 @@ PHP_METHOD(Stub_Globals_Session_Base, remove)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
@@ -93,7 +95,8 @@ PHP_METHOD(Stub_Globals_Session_Base, __set)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index_param, &value);
 	zephir_get_strval(&index, index_param);
 
@@ -117,7 +120,8 @@ PHP_METHOD(Stub_Globals_Session_Base, __unset)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
 
@@ -142,7 +146,8 @@ PHP_METHOD(Stub_Globals_Session_Base, removeSessionData)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 
 	ZEPHIR_INIT_VAR(&_0);
diff --git a/ext/stub/globals/session/child.zep.c b/ext/stub/globals/session/child.zep.c
index 68414871a2..20780fafc7 100644
--- a/ext/stub/globals/session/child.zep.c
+++ b/ext/stub/globals/session/child.zep.c
@@ -32,7 +32,8 @@ PHP_METHOD(Stub_Globals_Session_Child, destroy)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "removesessiondata", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/instance.zep.c b/ext/stub/instance.zep.c
index 8129713d1c..47b2d3e1bb 100644
--- a/ext/stub/instance.zep.c
+++ b/ext/stub/instance.zep.c
@@ -76,7 +76,8 @@ PHP_METHOD(Stub_Instance, testIssue1339)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&parameters);
 	zephir_create_array(&parameters, 11, 0);
@@ -186,7 +187,8 @@ PHP_METHOD(Stub_Instance, testInstanceCreate)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className_param);
 	zephir_get_strval(&className, className_param);
 
diff --git a/ext/stub/instanceoff.zep.c b/ext/stub/instanceoff.zep.c
index 5d4c2660aa..db280e01d2 100644
--- a/ext/stub/instanceoff.zep.c
+++ b/ext/stub/instanceoff.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf1)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
@@ -54,7 +55,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf2)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
@@ -75,7 +77,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf3)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
@@ -132,7 +135,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf6)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
@@ -176,7 +180,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf8)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &test_param);
 	zephir_get_strval(&test, test_param);
 
@@ -206,7 +211,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf9)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &test_param);
 	zephir_get_strval(&test, test_param);
 
diff --git a/ext/stub/interfaces/implementint.zep.c b/ext/stub/interfaces/implementint.zep.c
index f5f3b87e33..1e17ece1d2 100644
--- a/ext/stub/interfaces/implementint.zep.c
+++ b/ext/stub/interfaces/implementint.zep.c
@@ -13,8 +13,8 @@
 
 #include "kernel/main.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Interfaces_ImplementInt)
@@ -42,7 +42,7 @@ PHP_METHOD(Stub_Interfaces_ImplementInt, set)
 	val = zephir_get_intval(val_param);
 
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, val);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("val"), &_0);
 }
diff --git a/ext/stub/interfaces/implementinterface.zep.c b/ext/stub/interfaces/implementinterface.zep.c
index ab8face8bf..bf5dd259a3 100644
--- a/ext/stub/interfaces/implementinterface.zep.c
+++ b/ext/stub/interfaces/implementinterface.zep.c
@@ -39,7 +39,8 @@ PHP_METHOD(Stub_Interfaces_ImplementInterface, get)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &obj);
 
 
diff --git a/ext/stub/internalclasses.zep.c b/ext/stub/internalclasses.zep.c
index 27bf835df0..1832f5e797 100644
--- a/ext/stub/internalclasses.zep.c
+++ b/ext/stub/internalclasses.zep.c
@@ -33,7 +33,8 @@ PHP_METHOD(Stub_InternalClasses, testStaticCall)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	_0 = zephir_fetch_class_str_ex(SL("Phalcon\\Di"), ZEND_FETCH_CLASS_AUTO);
 	ZEPHIR_RETURN_CALL_CE_STATIC(_0, "getdefault", NULL, 0);
diff --git a/ext/stub/invoke.zep.c b/ext/stub/invoke.zep.c
index 3d833cb285..7642a9f641 100644
--- a/ext/stub/invoke.zep.c
+++ b/ext/stub/invoke.zep.c
@@ -34,7 +34,8 @@ PHP_METHOD(Stub_Invoke, __construct)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -67,7 +68,8 @@ PHP_METHOD(Stub_Invoke, test)
 	ZVAL_UNDEF(&func);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&func);
 	object_init_ex(&func, stub_invoke_ce);
diff --git a/ext/stub/invokes/abstractinvoker.zep.c b/ext/stub/invokes/abstractinvoker.zep.c
index 0b3515f6e3..d798d669bb 100644
--- a/ext/stub/invokes/abstractinvoker.zep.c
+++ b/ext/stub/invokes/abstractinvoker.zep.c
@@ -34,7 +34,8 @@ PHP_METHOD(Stub_Invokes_AbstractInvoker, __toString)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("text"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "renderarrayelements", NULL, 0, &_0);
diff --git a/ext/stub/invokes/abstractinvokercomplex.zep.c b/ext/stub/invokes/abstractinvokercomplex.zep.c
index bc6b0df5f2..d657b641bf 100644
--- a/ext/stub/invokes/abstractinvokercomplex.zep.c
+++ b/ext/stub/invokes/abstractinvokercomplex.zep.c
@@ -34,7 +34,8 @@ PHP_METHOD(Stub_Invokes_AbstractInvokerComplex, __toString)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("text"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "renderarrayelementscomplex", NULL, 0, &_0);
diff --git a/ext/stub/invokes/abstractprotected.zep.c b/ext/stub/invokes/abstractprotected.zep.c
index 018fe442b2..d090e129b5 100644
--- a/ext/stub/invokes/abstractprotected.zep.c
+++ b/ext/stub/invokes/abstractprotected.zep.c
@@ -43,7 +43,8 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 
@@ -69,7 +70,8 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 
@@ -98,7 +100,8 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElements)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 
@@ -147,7 +150,8 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElementsComplex)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 
diff --git a/ext/stub/invokes/invokeprotected.zep.c b/ext/stub/invokes/invokeprotected.zep.c
index a09d0c3248..f26d116e9e 100644
--- a/ext/stub/invokes/invokeprotected.zep.c
+++ b/ext/stub/invokes/invokeprotected.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_Invokes_InvokeProtected, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 
diff --git a/ext/stub/invokes/invokeprotectedcomplex.zep.c b/ext/stub/invokes/invokeprotectedcomplex.zep.c
index 2bf9f7c9d2..0f6a992329 100644
--- a/ext/stub/invokes/invokeprotectedcomplex.zep.c
+++ b/ext/stub/invokes/invokeprotectedcomplex.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_Invokes_InvokeProtectedComplex, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 
diff --git a/ext/stub/issettest.zep.c b/ext/stub/issettest.zep.c
index d82c575852..ab8f33dafe 100644
--- a/ext/stub/issettest.zep.c
+++ b/ext/stub/issettest.zep.c
@@ -85,7 +85,8 @@ PHP_METHOD(Stub_IssetTest, testIssetArray3)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	zephir_get_strval(&b, b_param);
 
@@ -189,7 +190,8 @@ PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty1)
 	ZVAL_UNDEF(&g);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_memory_observe(&g);
 	zephir_read_property(&g, this_ptr, ZEND_STRL("s"), PH_NOISY_CC);
@@ -212,7 +214,8 @@ PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &inp);
 
 
@@ -233,7 +236,8 @@ zend_object *zephir_init_properties_Stub_IssetTest(zend_class_entry *class_type)
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/issue1134.zep.c b/ext/stub/issue1134.zep.c
index 1adf340111..71d13a6501 100644
--- a/ext/stub/issue1134.zep.c
+++ b/ext/stub/issue1134.zep.c
@@ -42,7 +42,8 @@ PHP_METHOD(Stub_Issue1134, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &config_param);
 	if (!config_param) {
 		ZEPHIR_INIT_VAR(&config);
@@ -70,7 +71,8 @@ PHP_METHOD(Stub_Issue1134, arrayWithFilledDefaultValue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &someDefaultData_param);
 	if (!someDefaultData_param) {
 		ZEPHIR_INIT_VAR(&someDefaultData);
diff --git a/ext/stub/issue1521.zep.c b/ext/stub/issue1521.zep.c
index a3b03301c0..f0eb15723d 100644
--- a/ext/stub/issue1521.zep.c
+++ b/ext/stub/issue1521.zep.c
@@ -34,7 +34,8 @@ PHP_METHOD(Stub_Issue1521, test)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
diff --git a/ext/stub/issue2165/issue.zep.c b/ext/stub/issue2165/issue.zep.c
index 5cea899e4b..5799b2574e 100644
--- a/ext/stub/issue2165/issue.zep.c
+++ b/ext/stub/issue2165/issue.zep.c
@@ -51,7 +51,8 @@ PHP_METHOD(Stub_Issue2165_Issue, build)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &a_param);
 	if (!a_param) {
 		ZEPHIR_INIT_VAR(&a);
@@ -125,7 +126,8 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &a_param, &validate_param);
 	zephir_get_arrval(&a, a_param);
 	if (!validate_param) {
@@ -337,10 +339,10 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 		ZEPHIR_INIT_NVAR(&i);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), &a);
-	ZEPHIR_INIT_ZVAL_NREF(_46);
+	ZVAL_UNDEF(&_46);
 	ZVAL_LONG(&_46, m);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("m"), &_46);
-	ZEPHIR_INIT_ZVAL_NREF(_46);
+	ZVAL_UNDEF(&_46);
 	ZVAL_LONG(&_46, n);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("n"), &_46);
 	ZEPHIR_MM_RESTORE();
@@ -362,7 +364,8 @@ PHP_METHOD(Stub_Issue2165_Issue, quick)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &a_param);
 	if (!a_param) {
 		ZEPHIR_INIT_VAR(&a);
@@ -395,7 +398,8 @@ PHP_METHOD(Stub_Issue2165_Issue, ones)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &m_param, &n_param);
 	m = zephir_get_intval(m_param);
 	n = zephir_get_intval(n_param);
@@ -442,7 +446,8 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &value, &m_param, &n_param);
 	m = zephir_get_intval(m_param);
 	n = zephir_get_intval(n_param);
@@ -520,7 +525,8 @@ PHP_METHOD(Stub_Issue2165_Issue, reciprocal)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("m"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("n"), PH_NOISY_CC | PH_READONLY);
@@ -546,7 +552,8 @@ PHP_METHOD(Stub_Issue2165_Issue, divideMatrix)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b);
 
 
diff --git a/ext/stub/issue663.zep.c b/ext/stub/issue663.zep.c
index 7be142cff6..b8336a9eb9 100644
--- a/ext/stub/issue663.zep.c
+++ b/ext/stub/issue663.zep.c
@@ -41,7 +41,8 @@ PHP_METHOD(Stub_Issue663, is_array_assoc)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr);
 
 
@@ -72,7 +73,8 @@ PHP_METHOD(Stub_Issue663, is_array_assoc_internal)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr_param);
 	zephir_get_arrval(&arr, arr_param);
 
@@ -116,7 +118,8 @@ PHP_METHOD(Stub_Issue663, is_array_indexed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr);
 
 
diff --git a/ext/stub/issue820.zep.c b/ext/stub/issue820.zep.c
deleted file mode 100644
index 473d97dafd..0000000000
--- a/ext/stub/issue820.zep.c
+++ /dev/null
@@ -1,72 +0,0 @@
-
-#ifdef HAVE_CONFIG_H
-#include "../ext_config.h"
-#endif
-
-#include <php.h>
-#include "../php_ext.h"
-#include "../ext.h"
-
-#include <Zend/zend_operators.h>
-#include <Zend/zend_exceptions.h>
-#include <Zend/zend_interfaces.h>
-
-#include "kernel/main.h"
-#include "kernel/memory.h"
-#include "kernel/iterator.h"
-#include "kernel/array.h"
-#include "kernel/object.h"
-
-
-ZEPHIR_INIT_CLASS(Stub_Issue820) {
-
-	ZEPHIR_REGISTER_CLASS(Stub, Issue820, stub, issue820, stub_issue820_method_entry, 0);
-
-	return SUCCESS;
-
-}
-
-/**
- * @issue https://github.com/zephir-lang/zephir/issues/820
- */
-PHP_METHOD(Stub_Issue820, iterate) {
-
-	zend_object_iterator *_0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *obj, obj_sub, k, v, arr;
-	zval *this_ptr = getThis();
-
-	ZVAL_UNDEF(&obj_sub);
-	ZVAL_UNDEF(&k);
-	ZVAL_UNDEF(&v);
-	ZVAL_UNDEF(&arr);
-#if PHP_VERSION_ID >= 80000
-	bool is_null_true = 1;
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ZVAL(obj)
-	ZEND_PARSE_PARAMETERS_END();
-
-#endif
-
-
-	ZEPHIR_MM_GROW();
-	zephir_fetch_params(1, 1, 0, &obj);
-
-
-
-	ZEPHIR_INIT_VAR(&arr);
-	array_init(&arr);
-	_0 = zephir_get_iterator(obj);
-	_0->funcs->rewind(_0);
-	for (;_0->funcs->valid(_0) == SUCCESS && !EG(exception); _0->funcs->move_forward(_0)) {
-		ZEPHIR_GET_IMKEY(k, _0);
-		{
-			ZEPHIR_ITERATOR_COPY(&v, _0);
-		}
-		zephir_array_update_zval(&arr, &k, &v, PH_COPY | PH_SEPARATE);
-	}
-	zend_iterator_dtor(_0);
-	RETURN_CCTOR(&arr);
-
-}
-
diff --git a/ext/stub/issue820.zep.h b/ext/stub/issue820.zep.h
deleted file mode 100644
index 9fa0cbd93d..0000000000
--- a/ext/stub/issue820.zep.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-extern zend_class_entry *stub_issue820_ce;
-
-ZEPHIR_INIT_CLASS(Stub_Issue820);
-
-PHP_METHOD(Stub_Issue820, iterate);
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_issue820_iterate, 0, 0, 1)
-	ZEND_ARG_INFO(0, obj)
-ZEND_END_ARG_INFO()
-
-ZEPHIR_INIT_FUNCS(stub_issue820_method_entry) {
-	PHP_ME(Stub_Issue820, iterate, arginfo_stub_issue820_iterate, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-	PHP_FE_END
-};
diff --git a/ext/stub/issue887.zep.c b/ext/stub/issue887.zep.c
index d1504bbd5f..dd71f225c7 100644
--- a/ext/stub/issue887.zep.c
+++ b/ext/stub/issue887.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_Issue887, __construct)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -82,7 +83,8 @@ PHP_METHOD(Stub_Issue887, fetch_object)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC);
diff --git a/ext/stub/issue914.zep.c b/ext/stub/issue914.zep.c
index 8dc74b582e..1d19e09059 100644
--- a/ext/stub/issue914.zep.c
+++ b/ext/stub/issue914.zep.c
@@ -32,7 +32,8 @@ PHP_METHOD(Stub_Issue914, __construct)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_PARENT(NULL, stub_issue914_ce, getThis(), "__construct", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/issues.zep.c b/ext/stub/issues.zep.c
index d3c2405578..ceaad90189 100644
--- a/ext/stub/issues.zep.c
+++ b/ext/stub/issues.zep.c
@@ -56,7 +56,8 @@ PHP_METHOD(Stub_Issues, someMethod)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &methodName);
 
 
diff --git a/ext/stub/json.zep.c b/ext/stub/json.zep.c
index 61f5139b87..d8a3100b55 100644
--- a/ext/stub/json.zep.c
+++ b/ext/stub/json.zep.c
@@ -35,7 +35,8 @@ PHP_METHOD(Stub_Json, testEncodeObject)
 	ZVAL_UNDEF(&obj);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&obj);
 	zephir_create_array(&obj, 3, 0);
@@ -56,7 +57,8 @@ PHP_METHOD(Stub_Json, testEncodeArray)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&arr);
 	zephir_create_array(&arr, 3, 0);
@@ -84,7 +86,8 @@ PHP_METHOD(Stub_Json, testEncodeOptions)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&arr);
 	zephir_create_array(&arr, 4, 0);
@@ -114,7 +117,8 @@ PHP_METHOD(Stub_Json, testDecodeObject)
 	ZVAL_UNDEF(&obj);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&obj);
 	ZVAL_STRING(&obj, "{\"a\":\"hello\",\"b\":\"world\",\"c\":128}");
@@ -132,7 +136,8 @@ PHP_METHOD(Stub_Json, testDecodeObject2)
 	ZVAL_UNDEF(&obj);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&obj);
 	ZVAL_STRING(&obj, "{\"a\":\"hello\",\"b\":\"world\",\"c\":128}");
@@ -149,7 +154,8 @@ PHP_METHOD(Stub_Json, testDecodeArray)
 	ZVAL_UNDEF(&arr);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&arr);
 	ZVAL_STRING(&arr, "[1,2,3]");
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
index dd976354d2..e75059b0e4 100644
--- a/ext/stub/mcall.zep.c
+++ b/ext/stub/mcall.zep.c
@@ -136,7 +136,8 @@ PHP_METHOD(Stub_Mcall, testCall1)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -151,7 +152,8 @@ PHP_METHOD(Stub_Mcall, testCall2)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod2", NULL, 0);
 	zephir_check_call_status();
@@ -166,7 +168,8 @@ PHP_METHOD(Stub_Mcall, testCall3)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 55);
 	zephir_check_call_status();
@@ -188,7 +191,8 @@ PHP_METHOD(Stub_Mcall, testCall4)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -212,7 +216,8 @@ PHP_METHOD(Stub_Mcall, testCall5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -236,7 +241,8 @@ PHP_METHOD(Stub_Mcall, testCall6)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -263,7 +269,8 @@ PHP_METHOD(Stub_Mcall, testCall7)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -293,7 +300,8 @@ PHP_METHOD(Stub_Mcall, testCall8)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -322,7 +330,8 @@ PHP_METHOD(Stub_Mcall, testCall9)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -342,7 +351,8 @@ PHP_METHOD(Stub_Mcall, testCall10)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -357,7 +367,8 @@ PHP_METHOD(Stub_Mcall, testCall11)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod2", NULL, 0);
 	zephir_check_call_status();
@@ -372,7 +383,8 @@ PHP_METHOD(Stub_Mcall, testCall12)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 55);
 	zephir_check_call_status();
@@ -394,7 +406,8 @@ PHP_METHOD(Stub_Mcall, testCall13)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -418,7 +431,8 @@ PHP_METHOD(Stub_Mcall, testCall14)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -442,7 +456,8 @@ PHP_METHOD(Stub_Mcall, testCall15)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -466,7 +481,8 @@ PHP_METHOD(Stub_Mcall, testCall16)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &c, &d);
 
 
@@ -490,7 +506,8 @@ PHP_METHOD(Stub_Mcall, testCall17)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &c, &d);
 
 
@@ -507,7 +524,8 @@ PHP_METHOD(Stub_Mcall, testCall18)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 57);
 	zephir_check_call_status();
@@ -552,7 +570,8 @@ PHP_METHOD(Stub_Mcall, testCall20)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	k = zephir_get_intval(k_param);
 
@@ -618,7 +637,8 @@ PHP_METHOD(Stub_Mcall, testCall22)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	k = zephir_get_intval(k_param);
 
@@ -659,7 +679,8 @@ PHP_METHOD(Stub_Mcall, optionalRequereString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &param_param);
 	if (UNEXPECTED(Z_TYPE_P(param_param) != IS_STRING && Z_TYPE_P(param_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param' must be of the type string"));
@@ -689,7 +710,8 @@ PHP_METHOD(Stub_Mcall, optionalParameterString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &param_param);
 	if (!param_param) {
 		ZEPHIR_INIT_VAR(&param);
@@ -717,7 +739,8 @@ PHP_METHOD(Stub_Mcall, optionalParameterStringNull)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &param_param);
 	if (!param_param) {
 		ZEPHIR_INIT_VAR(&param);
@@ -895,7 +918,8 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultEmptyArray)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &driverOptions_param);
 	if (!driverOptions_param) {
 		ZEPHIR_INIT_VAR(&driverOptions);
@@ -923,7 +947,8 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultNullValue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &driverOptions_param);
 	if (!driverOptions_param) {
 		ZEPHIR_INIT_VAR(&driverOptions);
@@ -948,7 +973,8 @@ PHP_METHOD(Stub_Mcall, testArrayParam)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &driverOptions_param);
 	zephir_get_arrval(&driverOptions, driverOptions_param);
 
@@ -1012,7 +1038,8 @@ PHP_METHOD(Stub_Mcall, testCallablePass)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_oo_ooparams_ce);
@@ -1042,7 +1069,8 @@ PHP_METHOD(Stub_Mcall, testCallableArrayThisMethodPass)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_oo_ooparams_ce);
@@ -1072,7 +1100,8 @@ PHP_METHOD(Stub_Mcall, aa)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_mcall_ce);
@@ -1103,7 +1132,8 @@ PHP_METHOD(Stub_Mcall, issue1136)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "PHP_VERSION");
diff --git a/ext/stub/mcall/caller.zep.c b/ext/stub/mcall/caller.zep.c
index 875093db51..002f56ec13 100644
--- a/ext/stub/mcall/caller.zep.c
+++ b/ext/stub/mcall/caller.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_Mcall_Caller, start)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &f);
 
 
diff --git a/ext/stub/mcallchained.zep.c b/ext/stub/mcallchained.zep.c
index 8a8abfa4a1..785ce3a1ed 100644
--- a/ext/stub/mcallchained.zep.c
+++ b/ext/stub/mcallchained.zep.c
@@ -65,7 +65,8 @@ PHP_METHOD(Stub_McallChained, testChained1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -85,7 +86,8 @@ PHP_METHOD(Stub_McallChained, testChained2)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -107,7 +109,8 @@ PHP_METHOD(Stub_McallChained, testChained3)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 63);
 	zephir_check_call_status();
@@ -129,7 +132,8 @@ PHP_METHOD(Stub_McallChained, testChained4)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_update_property_zval(this_ptr, ZEND_STRL("temp"), this_ptr);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("temp"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/stub/mcalldynamic.zep.c b/ext/stub/mcalldynamic.zep.c
index 784b32899d..8cbe4db320 100644
--- a/ext/stub/mcalldynamic.zep.c
+++ b/ext/stub/mcalldynamic.zep.c
@@ -49,7 +49,8 @@ PHP_METHOD(Stub_McallDynamic, testMagicCall1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "method1", NULL, 0);
 	zephir_check_call_status();
@@ -75,7 +76,8 @@ PHP_METHOD(Stub_McallDynamic, __call)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &method, &arguments);
 
 
@@ -100,7 +102,8 @@ PHP_METHOD(Stub_McallDynamic, testCallAnonymousFunctionWithContext)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/mcallinternal.zep.c b/ext/stub/mcallinternal.zep.c
index cc832af566..cf687c2f6a 100644
--- a/ext/stub/mcallinternal.zep.c
+++ b/ext/stub/mcallinternal.zep.c
@@ -36,7 +36,8 @@ void zep_Stub_McallInternal_a(int ht, zend_execute_data *execute_data, zval *ret
 		ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
@@ -92,7 +93,8 @@ PHP_METHOD(Stub_McallInternal, e)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
@@ -110,7 +112,8 @@ PHP_METHOD(Stub_McallInternal, d)
 	ZVAL_UNDEF(&_3$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 0;
 	_2 = 1000000;
@@ -147,7 +150,8 @@ PHP_METHOD(Stub_McallInternal, f)
 	ZVAL_UNDEF(&_3$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 0;
 	_2 = 1000000;
@@ -186,7 +190,8 @@ PHP_METHOD(Stub_McallInternal, g)
 	ZVAL_UNDEF(&_5$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 0;
 	_2 = 1000;
@@ -249,7 +254,8 @@ PHP_METHOD(Stub_McallInternal, callFibonacci)
 	ZVAL_UNDEF(&_5$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	p = (double) (0);
 	i = 0;
@@ -293,7 +299,8 @@ PHP_METHOD(Stub_McallInternal, issue1956)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_INTERNAL_METHOD_P0(this_ptr, zep_Stub_McallInternal_test1956);
 	zephir_check_call_status();
diff --git a/ext/stub/methodabstract.zep.c b/ext/stub/methodabstract.zep.c
index 6521fc92c8..2d8fcc8d4a 100644
--- a/ext/stub/methodabstract.zep.c
+++ b/ext/stub/methodabstract.zep.c
@@ -33,7 +33,8 @@ PHP_METHOD(Stub_MethodAbstract, testInterfaceMetho)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "testmethod", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/methodargs.zep.c b/ext/stub/methodargs.zep.c
index 09af308245..6a80262f64 100644
--- a/ext/stub/methodargs.zep.c
+++ b/ext/stub/methodargs.zep.c
@@ -148,7 +148,8 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalValueWithDefaultStaticConstantAccess)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &method);
 	if (!method) {
 		method = &method_sub;
@@ -179,7 +180,8 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalStringValueWithDefaultStaticConstantAc
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &parameter_param);
 	if (!parameter_param) {
 		ZEPHIR_INIT_VAR(&parameter);
diff --git a/ext/stub/nativearray.zep.c b/ext/stub/nativearray.zep.c
index 0b6bf9723b..957e17641e 100644
--- a/ext/stub/nativearray.zep.c
+++ b/ext/stub/nativearray.zep.c
@@ -39,7 +39,8 @@ PHP_METHOD(Stub_NativeArray, testArray1)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -56,7 +57,8 @@ PHP_METHOD(Stub_NativeArray, testArray2)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -82,7 +84,8 @@ PHP_METHOD(Stub_NativeArray, testArray3)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -109,7 +112,8 @@ PHP_METHOD(Stub_NativeArray, testArray4)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -129,7 +133,8 @@ PHP_METHOD(Stub_NativeArray, testArray5)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -149,7 +154,8 @@ PHP_METHOD(Stub_NativeArray, testArray6)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -176,7 +182,8 @@ PHP_METHOD(Stub_NativeArray, testArray7)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	b = 2;
@@ -206,7 +213,8 @@ PHP_METHOD(Stub_NativeArray, testArray8)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = (double) (1);
 	b = (double) (2);
@@ -236,7 +244,8 @@ PHP_METHOD(Stub_NativeArray, testArray9)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	b = 0;
@@ -268,7 +277,8 @@ PHP_METHOD(Stub_NativeArray, testArray10)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello1");
@@ -296,7 +306,8 @@ PHP_METHOD(Stub_NativeArray, testArray11)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -339,7 +350,8 @@ PHP_METHOD(Stub_NativeArray, testArray12)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -370,7 +382,8 @@ PHP_METHOD(Stub_NativeArray, testArray13)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -389,7 +402,8 @@ PHP_METHOD(Stub_NativeArray, testArray14)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -410,7 +424,8 @@ PHP_METHOD(Stub_NativeArray, testArray15)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -429,7 +444,8 @@ PHP_METHOD(Stub_NativeArray, testArray16)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -449,7 +465,8 @@ PHP_METHOD(Stub_NativeArray, testArray17)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -468,7 +485,8 @@ PHP_METHOD(Stub_NativeArray, testArray18)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -489,7 +507,8 @@ PHP_METHOD(Stub_NativeArray, testArray19)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -508,7 +527,8 @@ PHP_METHOD(Stub_NativeArray, testArray20)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -528,7 +548,8 @@ PHP_METHOD(Stub_NativeArray, testArray21)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -547,7 +568,8 @@ PHP_METHOD(Stub_NativeArray, testArray22)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -568,7 +590,8 @@ PHP_METHOD(Stub_NativeArray, testArray23)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	b = 0;
 	ZEPHIR_INIT_VAR(&a);
@@ -596,7 +619,8 @@ PHP_METHOD(Stub_NativeArray, testArray24)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	b = 0.0;
 	ZEPHIR_INIT_VAR(&a);
@@ -624,7 +648,8 @@ PHP_METHOD(Stub_NativeArray, testArray25)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	b = 0;
 	ZEPHIR_INIT_VAR(&a);
@@ -651,7 +676,8 @@ PHP_METHOD(Stub_NativeArray, testArray26)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_NULL(&b);
@@ -674,7 +700,8 @@ PHP_METHOD(Stub_NativeArray, testArray27)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
@@ -697,7 +724,8 @@ PHP_METHOD(Stub_NativeArray, testArray28)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
@@ -719,7 +747,8 @@ PHP_METHOD(Stub_NativeArray, testArray29)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	b = 1;
 	ZEPHIR_INIT_VAR(&a);
@@ -739,7 +768,8 @@ PHP_METHOD(Stub_NativeArray, testArray30)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
@@ -760,7 +790,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -788,7 +819,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess2)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -812,7 +844,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess3)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -843,7 +876,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess4)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -868,7 +902,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess5)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -894,7 +929,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess6)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -921,7 +957,8 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
@@ -950,7 +987,8 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
@@ -985,7 +1023,8 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
@@ -1024,7 +1063,8 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
@@ -1062,7 +1102,8 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
@@ -1091,7 +1132,8 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -1121,7 +1163,8 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate2)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -1153,7 +1196,8 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate3)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -1187,7 +1231,8 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate4)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -1214,7 +1259,8 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
@@ -1279,7 +1325,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend1)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1328,7 +1375,8 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend2)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
@@ -1375,7 +1423,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate1)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1393,7 +1442,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate2)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1411,7 +1461,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate3)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1429,7 +1480,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate4)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1447,7 +1499,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate5)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1465,7 +1518,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate6)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1484,7 +1538,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate7)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1505,7 +1560,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate8)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1527,7 +1583,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate9)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1549,7 +1606,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate10)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1571,7 +1629,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate11)
 	ZVAL_UNDEF(&c);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "y");
@@ -1596,7 +1655,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate12)
 	ZVAL_UNDEF(&d);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "y");
@@ -1626,7 +1686,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate13)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&d);
 	zephir_create_array(&d, 3, 0);
@@ -1663,7 +1724,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend1)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1686,7 +1748,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend2)
 	ZVAL_UNDEF(&x);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1714,7 +1777,8 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend3)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
@@ -1774,7 +1838,8 @@ PHP_METHOD(Stub_NativeArray, testImplodeArray)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &param);
 
 
@@ -1797,7 +1862,8 @@ PHP_METHOD(Stub_NativeArray, issue110)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&byteUnits);
 	zephir_create_array(&byteUnits, 9, 0);
@@ -1829,7 +1895,8 @@ PHP_METHOD(Stub_NativeArray, issue264)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &tokens_param);
 	zephir_get_arrval(&tokens, tokens_param);
 
@@ -1851,7 +1918,8 @@ PHP_METHOD(Stub_NativeArray, issue743a)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current743a_param);
 	zephir_get_arrval(&current743a, current743a_param);
 
@@ -1876,7 +1944,8 @@ PHP_METHOD(Stub_NativeArray, issue743b)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current_param);
 	zephir_get_arrval(&current, current_param);
 
@@ -1902,7 +1971,8 @@ PHP_METHOD(Stub_NativeArray, issue743c)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current_param);
 	zephir_get_arrval(&current, current_param);
 
@@ -1934,7 +2004,8 @@ PHP_METHOD(Stub_NativeArray, issue709)
 	ZVAL_UNDEF(&_5$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	works = 1;
 	_2 = 50;
@@ -1996,7 +2067,8 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &prefix_param, &baseDir_param);
 	zephir_get_strval(&prefix, prefix_param);
 	zephir_get_strval(&baseDir, baseDir_param);
@@ -2027,7 +2099,8 @@ PHP_METHOD(Stub_NativeArray, Issue1159)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&myvar);
 	ZVAL_LONG(&myvar, 1);
@@ -2046,7 +2119,8 @@ zend_object *zephir_init_properties_Stub_NativeArray(zend_class_entry *class_typ
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/oo.zep.c b/ext/stub/oo.zep.c
index 3fbb1f81b5..e627b722ca 100644
--- a/ext/stub/oo.zep.c
+++ b/ext/stub/oo.zep.c
@@ -38,7 +38,8 @@ PHP_METHOD(Stub_Oo, testInstance1)
 	ZVAL_UNDEF(&o);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init(&o);
@@ -55,7 +56,8 @@ PHP_METHOD(Stub_Oo, testInstance2)
 	ZVAL_UNDEF(&o);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstruct_ce);
@@ -74,7 +76,8 @@ PHP_METHOD(Stub_Oo, testInstance3)
 	ZVAL_UNDEF(&o);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_oonoconstruct_ce);
@@ -98,7 +101,8 @@ PHP_METHOD(Stub_Oo, testInstance4)
 	ZVAL_UNDEF(&b);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "a");
@@ -123,7 +127,8 @@ PHP_METHOD(Stub_Oo, testInstance5)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
@@ -148,7 +153,8 @@ PHP_METHOD(Stub_Oo, testInstance6)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
@@ -171,7 +177,8 @@ PHP_METHOD(Stub_Oo, testInstance7)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
@@ -194,7 +201,8 @@ PHP_METHOD(Stub_Oo, testInstance8)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
@@ -215,7 +223,8 @@ PHP_METHOD(Stub_Oo, testInstance9)
 	ZVAL_UNDEF(&o);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
@@ -232,7 +241,8 @@ PHP_METHOD(Stub_Oo, testInstance10)
 	ZVAL_UNDEF(&o);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamicb_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
@@ -251,7 +261,8 @@ PHP_METHOD(Stub_Oo, testInstance11)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
@@ -272,7 +283,8 @@ PHP_METHOD(Stub_Oo, testInstance12)
 	ZVAL_UNDEF(&o);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "call1", NULL, 0);
 	zephir_check_call_status();
@@ -303,7 +315,8 @@ PHP_METHOD(Stub_Oo, createInstancesInLoop)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&result);
 	array_init(&result);
diff --git a/ext/stub/oo/concretestatic.zep.c b/ext/stub/oo/concretestatic.zep.c
index 4186d2923c..6748c43968 100644
--- a/ext/stub/oo/concretestatic.zep.c
+++ b/ext/stub/oo/concretestatic.zep.c
@@ -41,7 +41,8 @@ PHP_METHOD(Stub_Oo_ConcreteStatic, childFunction)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("parentfunction", NULL, 0);
 	zephir_check_call_status();
@@ -56,7 +57,8 @@ PHP_METHOD(Stub_Oo_ConcreteStatic, callParentFunction)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_PARENT(stub_oo_concretestatic_ce, getThis(), "getcalledclass", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/oo/deprecatedmethods.zep.c b/ext/stub/oo/deprecatedmethods.zep.c
index 93189cf5ef..d1f202e4b0 100644
--- a/ext/stub/oo/deprecatedmethods.zep.c
+++ b/ext/stub/oo/deprecatedmethods.zep.c
@@ -41,7 +41,8 @@ PHP_METHOD(Stub_Oo_DeprecatedMethods, normalMethod)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 68);
 	zephir_check_call_status();
diff --git a/ext/stub/oo/dynamicprop.zep.c b/ext/stub/oo/dynamicprop.zep.c
index a8fdfc728b..d42ed1ed50 100644
--- a/ext/stub/oo/dynamicprop.zep.c
+++ b/ext/stub/oo/dynamicprop.zep.c
@@ -44,7 +44,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -77,7 +78,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -108,7 +110,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -139,7 +142,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -173,7 +177,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -208,7 +213,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -242,7 +248,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -274,7 +281,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -308,7 +316,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -342,7 +351,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -377,7 +387,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -406,7 +417,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringProperty)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "works");
@@ -427,7 +439,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	if (UNEXPECTED(Z_TYPE_P(value_param) != IS_STRING && Z_TYPE_P(value_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'value' must be of the type string"));
@@ -453,7 +466,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setNonExistingStringProperty)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "works");
diff --git a/ext/stub/oo/extendpdoclass.zep.c b/ext/stub/oo/extendpdoclass.zep.c
index f1789c9add..ab0a9f9738 100644
--- a/ext/stub/oo/extendpdoclass.zep.c
+++ b/ext/stub/oo/extendpdoclass.zep.c
@@ -52,7 +52,8 @@ PHP_METHOD(Stub_Oo_ExtendPdoClass, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 3, &dsn_param, &username_param, &password_param, &attrs);
 	zephir_get_strval(&dsn, dsn_param);
 	if (!username_param) {
diff --git a/ext/stub/oo/oodestruct.zep.c b/ext/stub/oo/oodestruct.zep.c
index fa330e94fb..de9b954f2e 100644
--- a/ext/stub/oo/oodestruct.zep.c
+++ b/ext/stub/oo/oodestruct.zep.c
@@ -193,7 +193,8 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &file_param, &width_param, &height_param);
 	if (UNEXPECTED(Z_TYPE_P(file_param) != IS_STRING && Z_TYPE_P(file_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'file' must be of the type string"));
@@ -355,13 +356,13 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		zephir_check_call_status();
 		zephir_read_property(&_38$$13, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_38$$13);
-		ZEPHIR_INIT_ZVAL_NREF(_39$$13);
+		ZVAL_UNDEF(&_39$$13);
 		ZVAL_LONG(&_39$$13, width);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("width"), &_39$$13);
-		ZEPHIR_INIT_ZVAL_NREF(_39$$13);
+		ZVAL_UNDEF(&_39$$13);
 		ZVAL_LONG(&_39$$13, height);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("height"), &_39$$13);
-		ZEPHIR_INIT_ZVAL_NREF(_39$$13);
+		ZVAL_UNDEF(&_39$$13);
 		ZVAL_LONG(&_39$$13, 3);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_39$$13);
 		ZEPHIR_INIT_VAR(&_40$$13);
@@ -383,7 +384,8 @@ PHP_METHOD(Stub_Oo_OoDestruct, __destruct)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&image, &_0);
@@ -415,7 +417,8 @@ PHP_METHOD(Stub_Oo_OoDestruct, check)
 	ZVAL_UNDEF(&_9$$5);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_static_property_ce(&_0, stub_oo_oodestruct_ce, SL("checked"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_is_true(&_0)) {
@@ -489,7 +492,8 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 	ZVAL_UNDEF(&_8$$5);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	if (UNEXPECTED(!((zephir_function_exists_ex(ZEND_STRL("gd_info")) == SUCCESS)))) {
 		ZEPHIR_INIT_VAR(&_0$$3);
diff --git a/ext/stub/oo/oodynamica.zep.c b/ext/stub/oo/oodynamica.zep.c
index 79eb86f615..3521406278 100644
--- a/ext/stub/oo/oodynamica.zep.c
+++ b/ext/stub/oo/oodynamica.zep.c
@@ -41,7 +41,8 @@ PHP_METHOD(Stub_Oo_OoDynamicA, getNew)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&className);
 	zephir_get_called_class(&className);
@@ -69,7 +70,8 @@ PHP_METHOD(Stub_Oo_OoDynamicA, call2)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("getnew", NULL, 0);
 	zephir_check_call_status();
@@ -84,7 +86,8 @@ PHP_METHOD(Stub_Oo_OoDynamicA, call1)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("call2", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/oo/oonativeimplements.zep.c b/ext/stub/oo/oonativeimplements.zep.c
index 86a903fa08..7c5cdbacef 100644
--- a/ext/stub/oo/oonativeimplements.zep.c
+++ b/ext/stub/oo/oonativeimplements.zep.c
@@ -218,7 +218,8 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, unserialize)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &serialized_param);
 	zephir_get_strval(&serialized, serialized_param);
 
@@ -248,7 +249,8 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, __unserialize)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &data_param);
 	zephir_get_arrval(&data, data_param);
 
diff --git a/ext/stub/oo/ooparams.zep.c b/ext/stub/oo/ooparams.zep.c
index 73c17eac43..9c4c1c43eb 100644
--- a/ext/stub/oo/ooparams.zep.c
+++ b/ext/stub/oo/ooparams.zep.c
@@ -38,7 +38,8 @@ PHP_METHOD(Stub_Oo_OoParams, createThisClassWithoutWriteCurrentNamespace)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	object_init_ex(return_value, stub_oo_ooparams_ce);
 	if (zephir_has_constructor(return_value)) {
@@ -57,7 +58,8 @@ PHP_METHOD(Stub_Oo_OoParams, createOtherClassWithoutWriteCurrentNamespace)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	object_init_ex(return_value, stub_oo_oodynamica_ce);
 	if (zephir_has_constructor(return_value)) {
@@ -117,7 +119,8 @@ PHP_METHOD(Stub_Oo_OoParams, setName)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
 
@@ -156,7 +159,8 @@ PHP_METHOD(Stub_Oo_OoParams, setList)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someList_param);
 	zephir_get_arrval(&someList, someList_param);
 
@@ -218,7 +222,8 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictNameFromZephirLand)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 12345);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "setstrictname", NULL, 0, &_0);
@@ -239,7 +244,8 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictName)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string"));
@@ -286,7 +292,8 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictList)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someList_param);
 	ZEPHIR_OBS_COPY_OR_DUP(&someList, someList_param);
 
@@ -354,7 +361,8 @@ PHP_METHOD(Stub_Oo_OoParams, setNameDefault)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &name_param);
 	if (!name_param) {
 		ZEPHIR_INIT_VAR(&name);
@@ -404,7 +412,8 @@ PHP_METHOD(Stub_Oo_OoParams, setListDefault)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &someList_param);
 	if (!someList_param) {
 		ZEPHIR_INIT_VAR(&someList);
diff --git a/ext/stub/oo/propertyaccess.zep.c b/ext/stub/oo/propertyaccess.zep.c
index 038d7f52ba..7498e9435d 100644
--- a/ext/stub/oo/propertyaccess.zep.c
+++ b/ext/stub/oo/propertyaccess.zep.c
@@ -49,7 +49,8 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	ZVAL_UNDEF(&_6);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&test);
 	object_init(&test);
diff --git a/ext/stub/oo/scopes/abstractclass.zep.c b/ext/stub/oo/scopes/abstractclass.zep.c
index e6ea292ccc..26f9e0d6a2 100644
--- a/ext/stub/oo/scopes/abstractclass.zep.c
+++ b/ext/stub/oo/scopes/abstractclass.zep.c
@@ -41,7 +41,8 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClass, setProperty)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &name_param, &value);
 	zephir_get_strval(&name, name_param);
 
diff --git a/ext/stub/oo/scopes/abstractclassmagic.zep.c b/ext/stub/oo/scopes/abstractclassmagic.zep.c
index 92a8c7162e..024f924647 100644
--- a/ext/stub/oo/scopes/abstractclassmagic.zep.c
+++ b/ext/stub/oo/scopes/abstractclassmagic.zep.c
@@ -45,14 +45,15 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __set)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &name_param, &value);
 	zephir_get_strval(&name, name_param);
 
 
 	zephir_update_property_zval_zval(this_ptr, &name, value);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("setCount"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_ZVAL_NREF(_1);
+	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, (zephir_get_numberval(&_0) + 1));
 	zephir_update_property_zval(this_ptr, ZEND_STRL("setCount"), &_1);
 	ZEPHIR_MM_RESTORE();
@@ -72,7 +73,8 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __get)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
 
diff --git a/ext/stub/oo/scopes/hasprivatemethod.zep.c b/ext/stub/oo/scopes/hasprivatemethod.zep.c
index 66f1ba723c..e144e69558 100644
--- a/ext/stub/oo/scopes/hasprivatemethod.zep.c
+++ b/ext/stub/oo/scopes/hasprivatemethod.zep.c
@@ -32,7 +32,8 @@ PHP_METHOD(Stub_Oo_Scopes_HasPrivateMethod, callPrivateMethod)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "isprivate", NULL, 1);
 	zephir_check_call_status();
diff --git a/ext/stub/oo/scopes/privatescopetester.zep.c b/ext/stub/oo/scopes/privatescopetester.zep.c
index ffabb986d0..a996c088f8 100644
--- a/ext/stub/oo/scopes/privatescopetester.zep.c
+++ b/ext/stub/oo/scopes/privatescopetester.zep.c
@@ -34,7 +34,8 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, run)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "callprivatemethod", NULL, 0);
 	zephir_check_call_status();
@@ -62,7 +63,8 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &obj, &property_param, &value);
 	ZEPHIR_SEPARATE_PARAM(obj);
 	zephir_get_strval(&property, property_param);
@@ -96,7 +98,8 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &className_param, &property_param, &value);
 	zephir_get_strval(&className, className_param);
 	zephir_get_strval(&property, property_param);
@@ -125,7 +128,8 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &obj);
 
 
@@ -152,7 +156,8 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getNewVars)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className_param);
 	zephir_get_strval(&className, className_param);
 
diff --git a/ext/stub/operator.zep.c b/ext/stub/operator.zep.c
index 26b9f54495..8a32ef6789 100644
--- a/ext/stub/operator.zep.c
+++ b/ext/stub/operator.zep.c
@@ -60,7 +60,8 @@ PHP_METHOD(Stub_Operator, testIdenticalIfComplex)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &input);
 
 
@@ -125,7 +126,8 @@ PHP_METHOD(Stub_Operator, testBoolComparison)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &varTrue, &varFalse);
 
 
@@ -174,7 +176,8 @@ PHP_METHOD(Stub_Operator, testNewInstanceOperator)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className);
 
 
diff --git a/ext/stub/optimizers/acos.zep.c b/ext/stub/optimizers/acos.zep.c
index 92ba9fe706..d2b40befc1 100644
--- a/ext/stub/optimizers/acos.zep.c
+++ b/ext/stub/optimizers/acos.zep.c
@@ -35,7 +35,8 @@ PHP_METHOD(Stub_Optimizers_ACos, testInt)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
@@ -54,7 +55,8 @@ PHP_METHOD(Stub_Optimizers_ACos, testVar)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
@@ -73,7 +75,8 @@ PHP_METHOD(Stub_Optimizers_ACos, testIntValue1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
@@ -94,7 +97,8 @@ PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_intval(a_param);
 
@@ -118,7 +122,8 @@ PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 
 
diff --git a/ext/stub/optimizers/arraymerge.zep.c b/ext/stub/optimizers/arraymerge.zep.c
index ce62150606..3390f44da7 100644
--- a/ext/stub/optimizers/arraymerge.zep.c
+++ b/ext/stub/optimizers/arraymerge.zep.c
@@ -40,7 +40,8 @@ PHP_METHOD(Stub_Optimizers_ArrayMerge, mergeTwoRequiredArrays)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arr1_param, &arr2_param);
 	zephir_get_arrval(&arr1, arr1_param);
 	zephir_get_arrval(&arr2, arr2_param);
diff --git a/ext/stub/optimizers/asin.zep.c b/ext/stub/optimizers/asin.zep.c
index 786ebb6218..dd2d143cfc 100644
--- a/ext/stub/optimizers/asin.zep.c
+++ b/ext/stub/optimizers/asin.zep.c
@@ -35,7 +35,8 @@ PHP_METHOD(Stub_Optimizers_ASin, testInt)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
@@ -54,7 +55,8 @@ PHP_METHOD(Stub_Optimizers_ASin, testVar)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	ZVAL_LONG(&_0, a);
@@ -73,7 +75,8 @@ PHP_METHOD(Stub_Optimizers_ASin, testIntValue1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
@@ -94,7 +97,8 @@ PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_intval(a_param);
 
@@ -118,7 +122,8 @@ PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 
 
diff --git a/ext/stub/optimizers/isscalar.zep.c b/ext/stub/optimizers/isscalar.zep.c
index bec2ddcf17..3bef89ba3c 100644
--- a/ext/stub/optimizers/isscalar.zep.c
+++ b/ext/stub/optimizers/isscalar.zep.c
@@ -77,7 +77,8 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testStringVar)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "test string");
@@ -93,7 +94,8 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testEmptyArrayVar)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
diff --git a/ext/stub/optimizers/strreplace.zep.c b/ext/stub/optimizers/strreplace.zep.c
index 9ba0ee494a..7a2e014c15 100644
--- a/ext/stub/optimizers/strreplace.zep.c
+++ b/ext/stub/optimizers/strreplace.zep.c
@@ -42,7 +42,8 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1055)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
@@ -73,7 +74,8 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1087)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&filtered);
 	ZVAL_STRING(&filtered, "test_test");
@@ -125,7 +127,8 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732A)
 	ZVAL_UNDEF(&subject);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&search);
 	zephir_create_array(&search, 5, 0);
@@ -183,7 +186,8 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	ZVAL_UNDEF(&subject);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&patterns);
 	zephir_create_array(&patterns, 3, 0);
diff --git a/ext/stub/pregmatch.zep.c b/ext/stub/pregmatch.zep.c
index 4ce8f97469..b0d89a7f1c 100644
--- a/ext/stub/pregmatch.zep.c
+++ b/ext/stub/pregmatch.zep.c
@@ -40,7 +40,8 @@ PHP_METHOD(Stub_Pregmatch, testWithoutReturnAndMatches)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
@@ -66,7 +67,8 @@ PHP_METHOD(Stub_Pregmatch, testWithoutReturns)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
@@ -91,7 +93,8 @@ PHP_METHOD(Stub_Pregmatch, testWithoutMatches)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
@@ -114,7 +117,8 @@ PHP_METHOD(Stub_Pregmatch, testPregMatchAll)
 	ZVAL_UNDEF(&results);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
@@ -137,7 +141,8 @@ PHP_METHOD(Stub_Pregmatch, testPregMatchFallback)
 	ZVAL_UNDEF(&matches);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
@@ -166,7 +171,8 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch2Params)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &pattern, &subject);
 
 
@@ -267,7 +273,8 @@ PHP_METHOD(Stub_Pregmatch, testPregMatchSaveMatches)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &pattern_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&pattern, pattern_param);
@@ -297,7 +304,8 @@ PHP_METHOD(Stub_Pregmatch, testMatchAll)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &flags);
 
 
@@ -327,7 +335,8 @@ PHP_METHOD(Stub_Pregmatch, testMatchAllInZep)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 1);
 	ZEPHIR_CALL_METHOD(&m1, this_ptr, "testmatchall", &_1, 0, &_0);
diff --git a/ext/stub/properties/app.zep.c b/ext/stub/properties/app.zep.c
index 9dc0f6e264..6a261ddd51 100644
--- a/ext/stub/properties/app.zep.c
+++ b/ext/stub/properties/app.zep.c
@@ -47,7 +47,8 @@ PHP_METHOD(Stub_Properties_App, __construct)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_CE_STATIC(&_0, stub_properties_staticprivateproperties_ce, "getinstance", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/properties/extendspublicproperties.zep.c b/ext/stub/properties/extendspublicproperties.zep.c
index a8c4ca6d47..4335b268ab 100644
--- a/ext/stub/properties/extendspublicproperties.zep.c
+++ b/ext/stub/properties/extendspublicproperties.zep.c
@@ -49,7 +49,8 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 	ZVAL_UNDEF(&_11$$7);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/properties/getobjectvars.zep.c b/ext/stub/properties/getobjectvars.zep.c
index 42fff779d9..d1d39a6fe8 100644
--- a/ext/stub/properties/getobjectvars.zep.c
+++ b/ext/stub/properties/getobjectvars.zep.c
@@ -38,7 +38,8 @@ PHP_METHOD(Stub_Properties_GetObjectVars, issue1245)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 74, this_ptr);
 	zephir_check_call_status();
diff --git a/ext/stub/properties/propertyarray.zep.c b/ext/stub/properties/propertyarray.zep.c
index d20e6b7260..f1d50aaa64 100644
--- a/ext/stub/properties/propertyarray.zep.c
+++ b/ext/stub/properties/propertyarray.zep.c
@@ -54,7 +54,8 @@ PHP_METHOD(Stub_Properties_PropertyArray, __construct)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
@@ -79,7 +80,8 @@ PHP_METHOD(Stub_Properties_PropertyArray, appendSome)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
 
 
@@ -130,7 +132,8 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 	ZVAL_UNDEF(&_5$$5);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&headers);
 	array_init(&headers);
@@ -176,7 +179,8 @@ zend_object *zephir_init_properties_Stub_Properties_PropertyArray(zend_class_ent
 	ZVAL_UNDEF(&_3$$4);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/properties/propertyupdate.zep.c b/ext/stub/properties/propertyupdate.zep.c
index 3678955799..815eb3714b 100644
--- a/ext/stub/properties/propertyupdate.zep.c
+++ b/ext/stub/properties/propertyupdate.zep.c
@@ -33,9 +33,10 @@ PHP_METHOD(Stub_Properties_PropertyUpdate, update1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "aaa");
 	zephir_update_property_array_append(this_ptr, SL("p1"), &_0);
diff --git a/ext/stub/properties/protectedproperties.zep.c b/ext/stub/properties/protectedproperties.zep.c
index 37d630c30e..d5419d990e 100644
--- a/ext/stub/properties/protectedproperties.zep.c
+++ b/ext/stub/properties/protectedproperties.zep.c
@@ -113,7 +113,8 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeArrayVar)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someArrayVar_param);
 	zephir_get_arrval(&someArrayVar, someArrayVar_param);
 
@@ -246,7 +247,8 @@ zend_object *zephir_init_properties_Stub_Properties_ProtectedProperties(zend_cla
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/properties/publicproperties.zep.c b/ext/stub/properties/publicproperties.zep.c
index bcc66f5f9b..7185dcb884 100644
--- a/ext/stub/properties/publicproperties.zep.c
+++ b/ext/stub/properties/publicproperties.zep.c
@@ -113,7 +113,8 @@ PHP_METHOD(Stub_Properties_PublicProperties, test394Issue)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("someTrue"), PH_NOISY_CC);
@@ -139,7 +140,8 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 	ZVAL_UNDEF(&_8$$6);
 	
 
-		ZEPHIR_MM_GROW();
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
diff --git a/ext/stub/properties/staticprivateproperties.zep.c b/ext/stub/properties/staticprivateproperties.zep.c
index 36f9d6eafd..2db018e701 100644
--- a/ext/stub/properties/staticprivateproperties.zep.c
+++ b/ext/stub/properties/staticprivateproperties.zep.c
@@ -36,7 +36,8 @@ PHP_METHOD(Stub_Properties_StaticPrivateProperties, getInstance)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_memory_observe(&localInstance);
 	zephir_read_static_property_ce(&localInstance, stub_properties_staticprivateproperties_ce, SL("instance"), PH_NOISY_CC);
diff --git a/ext/stub/properties/staticpropertyarray.zep.c b/ext/stub/properties/staticpropertyarray.zep.c
index fa67a27f60..2d1f4eb42b 100644
--- a/ext/stub/properties/staticpropertyarray.zep.c
+++ b/ext/stub/properties/staticpropertyarray.zep.c
@@ -45,7 +45,8 @@ void zephir_init_static_properties_Stub_Properties_StaticPropertyArray()
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
diff --git a/ext/stub/properties/staticprotectedproperties.zep.c b/ext/stub/properties/staticprotectedproperties.zep.c
index 35c243347d..fafcb661c6 100644
--- a/ext/stub/properties/staticprotectedproperties.zep.c
+++ b/ext/stub/properties/staticprotectedproperties.zep.c
@@ -201,7 +201,8 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, compareStaticNull)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_memory_observe(&_0);
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someNull"), PH_NOISY_CC);
diff --git a/ext/stub/properties/staticpublicproperties.zep.c b/ext/stub/properties/staticpublicproperties.zep.c
index 2dc1b7e57d..5261820fb1 100644
--- a/ext/stub/properties/staticpublicproperties.zep.c
+++ b/ext/stub/properties/staticpublicproperties.zep.c
@@ -79,10 +79,10 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub)
 
 
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_sub_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someSub"), &_0);
 }
@@ -96,7 +96,8 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub2)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -118,10 +119,10 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub3)
 
 
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_DOUBLE(&_0, 1.0);
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_DOUBLE(&_0, 1.0);
 	zephir_sub_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someSub"), &_0);
 }
@@ -137,10 +138,10 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub4)
 
 
 	v = 1;
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, v);
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &_0);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, v);
 	zephir_sub_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someSub"), &_0);
 }
@@ -154,7 +155,8 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub5)
 	ZVAL_UNDEF(&v);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "1");
diff --git a/ext/stub/quantum.zep.c b/ext/stub/quantum.zep.c
index 2dfb6c04db..b05f9d0cb6 100644
--- a/ext/stub/quantum.zep.c
+++ b/ext/stub/quantum.zep.c
@@ -102,7 +102,8 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &x_param);
 	x = zephir_get_doubleval(x_param);
 
diff --git a/ext/stub/range.zep.c b/ext/stub/range.zep.c
index 989859e46c..aa13c5d2dc 100644
--- a/ext/stub/range.zep.c
+++ b/ext/stub/range.zep.c
@@ -42,7 +42,8 @@ PHP_METHOD(Stub_Range, inclusive1)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
@@ -66,7 +67,8 @@ PHP_METHOD(Stub_Range, exclusive1)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
diff --git a/ext/stub/reflection.zep.c b/ext/stub/reflection.zep.c
index a81dac18f3..3d290d8d16 100644
--- a/ext/stub/reflection.zep.c
+++ b/ext/stub/reflection.zep.c
@@ -35,7 +35,8 @@ PHP_METHOD(Stub_Reflection, getReflectionClass)
 	ZVAL_UNDEF(&r);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionclass")));
@@ -55,7 +56,8 @@ PHP_METHOD(Stub_Reflection, getReflectionFunction)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionfunction")));
diff --git a/ext/stub/regexdna.zep.c b/ext/stub/regexdna.zep.c
index 8eaa81fff5..030cf09af1 100644
--- a/ext/stub/regexdna.zep.c
+++ b/ext/stub/regexdna.zep.c
@@ -64,7 +64,8 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
 
 
diff --git a/ext/stub/requires.zep.c b/ext/stub/requires.zep.c
index 443751c6a4..4c54a50ff8 100644
--- a/ext/stub/requires.zep.c
+++ b/ext/stub/requires.zep.c
@@ -42,7 +42,8 @@ PHP_METHOD(Stub_Requires, requireExternal1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
 
 
@@ -88,7 +89,8 @@ PHP_METHOD(Stub_Requires, requireExternal3)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
 
 
@@ -149,7 +151,8 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &templatePath_param, &params);
 	if (UNEXPECTED(Z_TYPE_P(templatePath_param) != IS_STRING && Z_TYPE_P(templatePath_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'templatePath' must be of the type string"));
@@ -228,7 +231,8 @@ PHP_METHOD(Stub_Requires, requireOnce)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path_param);
 	zephir_get_strval(&path, path_param);
 
diff --git a/ext/stub/requires/external3.zep.c b/ext/stub/requires/external3.zep.c
index fc7a17189f..d0439bbcea 100644
--- a/ext/stub/requires/external3.zep.c
+++ b/ext/stub/requires/external3.zep.c
@@ -45,7 +45,8 @@ PHP_METHOD(Stub_Requires_External3, req)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &path, &requires);
 
 
diff --git a/ext/stub/resourcetest.zep.c b/ext/stub/resourcetest.zep.c
index 1f935fca59..6034d0c999 100644
--- a/ext/stub/resourcetest.zep.c
+++ b/ext/stub/resourcetest.zep.c
@@ -33,7 +33,8 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDIN)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
@@ -49,7 +50,8 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDOUT)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDOUT");
@@ -65,7 +67,8 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDERR)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDERR");
@@ -82,7 +85,8 @@ PHP_METHOD(Stub_ResourceTest, testTypeOffResource)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
@@ -100,7 +104,8 @@ PHP_METHOD(Stub_ResourceTest, testIsResource)
 	ZVAL_UNDEF(&a);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
@@ -118,7 +123,8 @@ PHP_METHOD(Stub_ResourceTest, testFunctionsForSTDIN)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
diff --git a/ext/stub/returns.zep.c b/ext/stub/returns.zep.c
index abe36d8911..63e9e6f8fa 100644
--- a/ext/stub/returns.zep.c
+++ b/ext/stub/returns.zep.c
@@ -77,7 +77,8 @@ PHP_METHOD(Stub_Returns, returnWithParameter)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &parameter_param);
 	zephir_get_strval(&parameter, parameter_param);
 
diff --git a/ext/stub/router.zep.c b/ext/stub/router.zep.c
index 6a750782a8..cbdac3c2fb 100644
--- a/ext/stub/router.zep.c
+++ b/ext/stub/router.zep.c
@@ -105,7 +105,8 @@ PHP_METHOD(Stub_Router, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &defaultRoutes_param);
 	if (!defaultRoutes_param) {
 		defaultRoutes = 1;
@@ -202,7 +203,8 @@ PHP_METHOD(Stub_Router, getRewriteUri)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 	zephir_get_global(&_GET, SL("_GET"));
 
@@ -539,7 +541,8 @@ PHP_METHOD(Stub_Router, handle)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &uri);
 	if (!uri) {
 		uri = &uri_sub;
@@ -1035,7 +1038,8 @@ PHP_METHOD(Stub_Router, add)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &pattern, &paths, &httpMethods);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1081,7 +1085,8 @@ PHP_METHOD(Stub_Router, addGet)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1122,7 +1127,8 @@ PHP_METHOD(Stub_Router, addPost)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1163,7 +1169,8 @@ PHP_METHOD(Stub_Router, addPut)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1204,7 +1211,8 @@ PHP_METHOD(Stub_Router, addPatch)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1245,7 +1253,8 @@ PHP_METHOD(Stub_Router, addDelete)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1286,7 +1295,8 @@ PHP_METHOD(Stub_Router, addOptions)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1327,7 +1337,8 @@ PHP_METHOD(Stub_Router, addHead)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1369,7 +1380,8 @@ PHP_METHOD(Stub_Router, mount)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &group);
 
 
@@ -1499,7 +1511,8 @@ PHP_METHOD(Stub_Router, clear)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
@@ -1657,7 +1670,8 @@ PHP_METHOD(Stub_Router, getRouteById)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &id);
 
 
@@ -1722,7 +1736,8 @@ PHP_METHOD(Stub_Router, getRouteByName)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name);
 
 
diff --git a/ext/stub/router/route.zep.c b/ext/stub/router/route.zep.c
index 179006356e..17846378b9 100644
--- a/ext/stub/router/route.zep.c
+++ b/ext/stub/router/route.zep.c
@@ -70,7 +70,8 @@ PHP_METHOD(Stub_Router_Route, __construct)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &pattern, &paths, &httpMethods);
 	if (!paths) {
 		paths = &paths_sub;
@@ -121,7 +122,8 @@ PHP_METHOD(Stub_Router_Route, compilePattern)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &pattern);
 	ZEPHIR_SEPARATE_PARAM(pattern);
 
@@ -258,7 +260,8 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &pattern_param);
 	zephir_get_strval(&pattern, pattern_param);
 
@@ -490,7 +493,8 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -757,7 +761,8 @@ PHP_METHOD(Stub_Router_Route, getReversedPaths)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&reversed);
 	array_init(&reversed);
diff --git a/ext/stub/scall.zep.c b/ext/stub/scall.zep.c
index 4104dd602c..e891a931ef 100644
--- a/ext/stub/scall.zep.c
+++ b/ext/stub/scall.zep.c
@@ -133,7 +133,8 @@ PHP_METHOD(Stub_Scall, testCall1)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -148,7 +149,8 @@ PHP_METHOD(Stub_Scall, testCall2)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("testmethod2", NULL, 0);
 	zephir_check_call_status();
@@ -164,7 +166,8 @@ PHP_METHOD(Stub_Scall, testCall3)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 88);
 	zephir_check_call_status();
@@ -186,7 +189,8 @@ PHP_METHOD(Stub_Scall, testCall4)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -210,7 +214,8 @@ PHP_METHOD(Stub_Scall, testCall5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -235,7 +240,8 @@ PHP_METHOD(Stub_Scall, testCall6)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -252,7 +258,8 @@ PHP_METHOD(Stub_Scall, testCall7)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -267,7 +274,8 @@ PHP_METHOD(Stub_Scall, testCall8)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("testmethod2", NULL, 0);
 	zephir_check_call_status();
@@ -283,7 +291,8 @@ PHP_METHOD(Stub_Scall, testCall9)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 88);
 	zephir_check_call_status();
@@ -305,7 +314,8 @@ PHP_METHOD(Stub_Scall, testCall10)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -329,7 +339,8 @@ PHP_METHOD(Stub_Scall, testCall11)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -354,7 +365,8 @@ PHP_METHOD(Stub_Scall, testCall12)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
@@ -371,7 +383,8 @@ PHP_METHOD(Stub_Scall, testCall13)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -386,7 +399,8 @@ PHP_METHOD(Stub_Scall, testCall14)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod2", NULL, 0);
 	zephir_check_call_status();
@@ -401,7 +415,8 @@ PHP_METHOD(Stub_Scall, testCall15)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_SELF("testmethod7", NULL, 0);
 	zephir_check_call_status();
@@ -446,7 +461,8 @@ PHP_METHOD(Stub_Scall, testCall17)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	k = zephir_get_intval(k_param);
 
@@ -492,7 +508,8 @@ PHP_METHOD(Stub_Scall, testCall18)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	k = zephir_get_intval(k_param);
 
@@ -541,7 +558,8 @@ PHP_METHOD(Stub_Scall, interpolatedStaticReturn)
 	ZVAL_UNDEF(&methodName);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&className);
 	ZVAL_STRING(&className, "Stub\\Scall");
@@ -567,7 +585,8 @@ PHP_METHOD(Stub_Scall, interpolatedStaticEcho)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&className);
 	ZVAL_STRING(&className, "Stub\\Scall");
diff --git a/ext/stub/scallexternal.zep.c b/ext/stub/scallexternal.zep.c
index c69d4d9a17..3194760922 100644
--- a/ext/stub/scallexternal.zep.c
+++ b/ext/stub/scallexternal.zep.c
@@ -37,7 +37,8 @@ PHP_METHOD(Stub_ScallExternal, testCall1)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod1", NULL, 0);
 	zephir_check_call_status();
@@ -59,7 +60,8 @@ PHP_METHOD(Stub_ScallExternal, testCall2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 
 
diff --git a/ext/stub/scalllateconstruct.zep.c b/ext/stub/scalllateconstruct.zep.c
index 1d9862e771..5d997a89a6 100644
--- a/ext/stub/scalllateconstruct.zep.c
+++ b/ext/stub/scalllateconstruct.zep.c
@@ -36,7 +36,8 @@ PHP_METHOD(Stub_ScallLateConstruct, __construct)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "testpublicinit", NULL, 0);
 	zephir_check_call_status();
@@ -62,7 +63,8 @@ PHP_METHOD(Stub_ScallLateConstruct, testPublicInit)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_CALL_SELF(&_0, "teststaticinit", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/scallparent.zep.c b/ext/stub/scallparent.zep.c
index 7c8cbe9faa..91e1a96937 100644
--- a/ext/stub/scallparent.zep.c
+++ b/ext/stub/scallparent.zep.c
@@ -53,7 +53,8 @@ PHP_METHOD(Stub_ScallParent, testCallStatic)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_RETURN_CALL_STATIC("testmethodstatic", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/scope.zep.c b/ext/stub/scope.zep.c
index 0cfc2c2b47..70f62d07cb 100644
--- a/ext/stub/scope.zep.c
+++ b/ext/stub/scope.zep.c
@@ -49,7 +49,8 @@ PHP_METHOD(Stub_Scope, getDyStr)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &g_param);
 	g = zephir_get_intval(g_param);
 
@@ -73,7 +74,8 @@ PHP_METHOD(Stub_Scope, test1)
 	ZVAL_UNDEF(&k$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "");
@@ -104,7 +106,8 @@ PHP_METHOD(Stub_Scope, test2)
 	ZVAL_UNDEF(&_4$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	p = 15;
 	ZEPHIR_INIT_VAR(&k);
@@ -154,7 +157,8 @@ PHP_METHOD(Stub_Scope, test3)
 	ZVAL_UNDEF(&str$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&k);
 	ZVAL_STRING(&k, "");
diff --git a/ext/stub/sort.zep.c b/ext/stub/sort.zep.c
index 9669c4d1dc..6b4d0d536b 100644
--- a/ext/stub/sort.zep.c
+++ b/ext/stub/sort.zep.c
@@ -52,7 +52,8 @@ PHP_METHOD(Stub_Sort, quick)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr_param);
 	zephir_get_arrval(&arr, arr_param);
 
diff --git a/ext/stub/spectralnorm.zep.c b/ext/stub/spectralnorm.zep.c
index ddf74f5e5f..63de1a33ed 100644
--- a/ext/stub/spectralnorm.zep.c
+++ b/ext/stub/spectralnorm.zep.c
@@ -48,7 +48,8 @@ PHP_METHOD(Stub_SpectralNorm, Ax)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &i, &j);
 
 
@@ -84,7 +85,8 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &n_param, &u, &v);
 	n = zephir_get_intval(n_param);
 
@@ -164,7 +166,8 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &n_param, &u, &v);
 	n = zephir_get_intval(n_param);
 
@@ -238,7 +241,8 @@ PHP_METHOD(Stub_SpectralNorm, AtAu)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 4, 0, &n, &u, &v, &w);
 
 
@@ -275,7 +279,8 @@ PHP_METHOD(Stub_SpectralNorm, process)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	n = zephir_get_intval(n_param);
 
diff --git a/ext/stub/spl.zep.c b/ext/stub/spl.zep.c
index 0e3b625130..93a4d0ffdf 100644
--- a/ext/stub/spl.zep.c
+++ b/ext/stub/spl.zep.c
@@ -43,7 +43,8 @@ PHP_METHOD(Stub_Spl, issue1212)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &file_param);
 	zephir_get_strval(&file, file_param);
 
diff --git a/ext/stub/spropertyaccess.zep.c b/ext/stub/spropertyaccess.zep.c
index 688ad6c17d..6244466ea3 100644
--- a/ext/stub/spropertyaccess.zep.c
+++ b/ext/stub/spropertyaccess.zep.c
@@ -51,9 +51,10 @@ PHP_METHOD(Stub_SPropertyAccess, __construct)
 	ZVAL_UNDEF(&_4);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "abc");
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("a"), &_0);
@@ -87,7 +88,8 @@ PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &delimiter);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
@@ -121,7 +123,8 @@ PHP_METHOD(Stub_SPropertyAccess, testArgument)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &delimiter);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
@@ -154,7 +157,8 @@ PHP_METHOD(Stub_SPropertyAccess, mutateStringVarInsideCycle)
 	ZVAL_UNDEF(&_4$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	_2 = 3;
 	_1 = 0;
@@ -213,7 +217,7 @@ PHP_METHOD(Stub_SPropertyAccess, mutateIntVarInsideCycle)
 			}
 			_1 = _1;
 			i = 42;
-			ZEPHIR_INIT_ZVAL_NREF(_3$$3);
+			ZVAL_UNDEF(&_3$$3);
 			ZVAL_LONG(&_3$$3, i);
 			zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("intVar"), &_3$$3);
 		}
@@ -253,7 +257,7 @@ PHP_METHOD(Stub_SPropertyAccess, mutateDoubleVarInsideCycle)
 			}
 			_1 = _1;
 			i = 3.14;
-			ZEPHIR_INIT_ZVAL_NREF(_3$$3);
+			ZVAL_UNDEF(&_3$$3);
 			ZVAL_DOUBLE(&_3$$3, i);
 			zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("doubleVar"), &_3$$3);
 		}
@@ -277,7 +281,8 @@ PHP_METHOD(Stub_SPropertyAccess, mutateArrayVarInsideCycle)
 	ZVAL_UNDEF(&_4$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	_2 = 3;
 	_1 = 0;
@@ -314,7 +319,8 @@ void zephir_init_static_properties_Stub_SPropertyAccess()
 		ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
diff --git a/ext/stub/statements.zep.c b/ext/stub/statements.zep.c
index a8593f1824..acc613a2bb 100644
--- a/ext/stub/statements.zep.c
+++ b/ext/stub/statements.zep.c
@@ -59,7 +59,8 @@ PHP_METHOD(Stub_Statements, testPropertyAcccessAvoidTmpReuse)
 	ZVAL_UNDEF(&_7);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
@@ -185,7 +186,8 @@ PHP_METHOD(Stub_Statements, test544Issue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &step_param);
 	if (UNEXPECTED(Z_TYPE_P(step_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'step' must be of the type int"));
@@ -254,7 +256,8 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &step_param);
 	if (UNEXPECTED(Z_TYPE_P(step_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'step' must be of the type int"));
diff --git a/ext/stub/strings.zep.c b/ext/stub/strings.zep.c
index afb11bb6d6..108195c5ee 100644
--- a/ext/stub/strings.zep.c
+++ b/ext/stub/strings.zep.c
@@ -48,7 +48,8 @@ PHP_METHOD(Stub_Strings, camelize)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
@@ -79,7 +80,8 @@ PHP_METHOD(Stub_Strings, uncamelize)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
@@ -524,7 +526,8 @@ PHP_METHOD(Stub_Strings, testTrimMultilineString)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "\n            Hello world\n        ");
@@ -541,7 +544,8 @@ PHP_METHOD(Stub_Strings, testWellEscapedMultilineString)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "\n            \\\"\\}\\$hello\\$\\\"\'\n        ");
@@ -568,7 +572,8 @@ PHP_METHOD(Stub_Strings, testInternedString2)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_VAR(&_1);
@@ -598,7 +603,8 @@ PHP_METHOD(Stub_Strings, strToHex)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
 
@@ -645,7 +651,8 @@ PHP_METHOD(Stub_Strings, issue1267)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
 	ZEPHIR_SEPARATE_PARAM(value);
 
@@ -699,7 +706,8 @@ PHP_METHOD(Stub_Strings, issue2186)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -726,7 +734,8 @@ PHP_METHOD(Stub_Strings, issue2186SegFault)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -757,7 +766,8 @@ PHP_METHOD(Stub_Strings, issue2186SegFaultCall)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -787,7 +797,8 @@ PHP_METHOD(Stub_Strings, issue2186Child1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -818,7 +829,8 @@ PHP_METHOD(Stub_Strings, issue2186Child2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -855,7 +867,8 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -894,7 +907,8 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -934,7 +948,8 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -972,7 +987,8 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
 		ZEPHIR_INIT_VAR(&val);
@@ -1013,7 +1029,8 @@ PHP_METHOD(Stub_Strings, issue2299NullableStringCondition)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &roleName_param);
 	if (!roleName_param) {
 		ZEPHIR_INIT_VAR(&roleName);
diff --git a/ext/stub/stubs.zep.c b/ext/stub/stubs.zep.c
index 6d82866832..06120e86e6 100644
--- a/ext/stub/stubs.zep.c
+++ b/ext/stub/stubs.zep.c
@@ -152,7 +152,8 @@ PHP_METHOD(Stub_Stubs, testVariableLength)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&data);
 	array_init(&data);
diff --git a/ext/stub/ternary.zep.c b/ext/stub/ternary.zep.c
index 70c3a4b0fe..6423890521 100644
--- a/ext/stub/ternary.zep.c
+++ b/ext/stub/ternary.zep.c
@@ -39,7 +39,8 @@ PHP_METHOD(Stub_Ternary, testTernary1)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	if (100) {
@@ -63,7 +64,8 @@ PHP_METHOD(Stub_Ternary, testTernary2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b_param);
 	b = zephir_get_boolval(b_param);
 
@@ -94,7 +96,8 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &y);
 
 
@@ -132,7 +135,8 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &y);
 
 
@@ -167,7 +171,8 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 
 
@@ -198,7 +203,8 @@ PHP_METHOD(Stub_Ternary, testTernaryWithPromotedTemporaryVariable)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&var2);
 	zephir_create_array(&var2, 2, 0);
@@ -233,7 +239,8 @@ PHP_METHOD(Stub_Ternary, testTernaryAfterLetVariable)
 	ZVAL_UNDEF(&s);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&s);
 	ZVAL_LONG(&s, 23);
@@ -260,7 +267,8 @@ PHP_METHOD(Stub_Ternary, testShortTernary)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 
 
@@ -288,7 +296,8 @@ PHP_METHOD(Stub_Ternary, testShortTernaryComplex)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left, &value);
 
 
diff --git a/ext/stub/trytest.zep.c b/ext/stub/trytest.zep.c
index 8192ec19a4..fb79b2bd31 100644
--- a/ext/stub/trytest.zep.c
+++ b/ext/stub/trytest.zep.c
@@ -48,7 +48,8 @@ PHP_METHOD(Stub_TryTest, testThrow2)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&message);
 	ZVAL_STRING(&message, "error");
@@ -87,7 +88,8 @@ PHP_METHOD(Stub_TryTest, testTry2)
 	ZVAL_UNDEF(&_1$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
@@ -120,7 +122,8 @@ PHP_METHOD(Stub_TryTest, testTry3)
 	ZVAL_UNDEF(&_3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
@@ -171,7 +174,8 @@ PHP_METHOD(Stub_TryTest, testTry4)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_boolval(a_param);
 
@@ -243,7 +247,8 @@ PHP_METHOD(Stub_TryTest, testTry5)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_boolval(a_param);
 
@@ -314,7 +319,8 @@ PHP_METHOD(Stub_TryTest, testTry6)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_boolval(a_param);
 
@@ -384,7 +390,8 @@ PHP_METHOD(Stub_TryTest, testTry7)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	a = zephir_get_boolval(a_param);
 
@@ -445,7 +452,8 @@ PHP_METHOD(Stub_TryTest, testTry8)
 	ZVAL_UNDEF(&_1$$3);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
@@ -498,7 +506,8 @@ PHP_METHOD(Stub_TryTest, testTry9)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
@@ -533,7 +542,8 @@ PHP_METHOD(Stub_TryTest, testTry10)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
@@ -567,7 +577,8 @@ PHP_METHOD(Stub_TryTest, testTry11)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 
 	/* try_start_1: */
diff --git a/ext/stub/typeinstances.zep.c b/ext/stub/typeinstances.zep.c
index 927cc858b2..b7d681057d 100644
--- a/ext/stub/typeinstances.zep.c
+++ b/ext/stub/typeinstances.zep.c
@@ -42,7 +42,8 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString1)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 24);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
@@ -64,7 +65,8 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString2)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, -24);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
@@ -86,7 +88,8 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString3)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
diff --git a/ext/stub/typeoff.zep.c b/ext/stub/typeoff.zep.c
index db31da9fb1..b22d199a4f 100644
--- a/ext/stub/typeoff.zep.c
+++ b/ext/stub/typeoff.zep.c
@@ -36,7 +36,8 @@ PHP_METHOD(Stub_Typeoff, testNativeStringFalse)
 	ZVAL_UNDEF(&testVar);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&testVar);
 	ZVAL_STRING(&testVar, "sdfsdf");
@@ -52,7 +53,8 @@ PHP_METHOD(Stub_Typeoff, testNativeStringTrue)
 	ZVAL_UNDEF(&testVar);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&testVar);
 	ZVAL_STRING(&testVar, "sdfsdf");
@@ -116,7 +118,8 @@ PHP_METHOD(Stub_Typeoff, testNotBoolTrue)
 	ZVAL_UNDEF(&testVar);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&testVar);
 	ZVAL_STRING(&testVar, "");
@@ -146,7 +149,8 @@ PHP_METHOD(Stub_Typeoff, testArrayFalse)
 	ZVAL_UNDEF(&testVar);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&testVar);
 	array_init(&testVar);
@@ -162,7 +166,8 @@ PHP_METHOD(Stub_Typeoff, testArrayTrue)
 	ZVAL_UNDEF(&testVar);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&testVar);
 	array_init(&testVar);
@@ -179,7 +184,8 @@ PHP_METHOD(Stub_Typeoff, testClassPropertyAccess)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -203,7 +209,8 @@ PHP_METHOD(Stub_Typeoff, testUnknownTypeOf)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &u);
 
 
diff --git a/ext/stub/types/mixedtype.zep.c b/ext/stub/types/mixedtype.zep.c
index 7f07f48400..9049ee89f3 100644
--- a/ext/stub/types/mixedtype.zep.c
+++ b/ext/stub/types/mixedtype.zep.c
@@ -193,7 +193,8 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedWithMulti)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &intVal_param, &stringVal_param, &mixedVal);
 	intVal = zephir_get_intval(intVal_param);
 	zephir_get_strval(&stringVal, stringVal_param);
@@ -245,7 +246,8 @@ PHP_METHOD(Stub_Types_MixedType, castToStringMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 
 
@@ -268,7 +270,8 @@ PHP_METHOD(Stub_Types_MixedType, castToStringInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 
 
@@ -310,7 +313,8 @@ PHP_METHOD(Stub_Types_MixedType, castToIntInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 
 
@@ -353,7 +357,8 @@ PHP_METHOD(Stub_Types_MixedType, castToBoolInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 
 
@@ -396,7 +401,8 @@ PHP_METHOD(Stub_Types_MixedType, castToFloatInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 
 
diff --git a/ext/stub/unsettest.zep.c b/ext/stub/unsettest.zep.c
index 802cafd62c..3a1df8e6fa 100644
--- a/ext/stub/unsettest.zep.c
+++ b/ext/stub/unsettest.zep.c
@@ -108,7 +108,8 @@ PHP_METHOD(Stub_Unsettest, testUnsetFromArray)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arrayParameter);
 	ZEPHIR_SEPARATE_PARAM(arrayParameter);
 
@@ -132,7 +133,8 @@ PHP_METHOD(Stub_Unsettest, testUnsetFromArrayByIndexVar)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arrayParameter, &index);
 	ZEPHIR_SEPARATE_PARAM(arrayParameter);
 
@@ -163,18 +165,19 @@ PHP_METHOD(Stub_Unsettest, testStdClassUnset)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&simpleObject);
 	object_init(&simpleObject);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 12345);
 	zephir_update_property_zval(&simpleObject, ZEND_STRL("property1"), &_0);
 	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "test");
 	zephir_update_property_zval(&simpleObject, ZEND_STRL("property2"), &_1);
-	ZEPHIR_INIT_ZVAL_NREF(_0);
+	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 12345);
 	zephir_update_property_zval(&simpleObject, ZEND_STRL("property3"), &_0);
 	zephir_unset_property(&simpleObject, "property2");
@@ -197,7 +200,8 @@ PHP_METHOD(Stub_Unsettest, testUnsetTypedArray)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arr_param, &key_param);
 	zephir_get_arrval(&arr, arr_param);
 	zephir_get_strval(&key, key_param);
diff --git a/ext/stub/usetest.zep.c b/ext/stub/usetest.zep.c
index 880dd6aedc..534555afe0 100644
--- a/ext/stub/usetest.zep.c
+++ b/ext/stub/usetest.zep.c
@@ -53,7 +53,8 @@ PHP_METHOD(Stub_UseTest, testUseClass1)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Oo\\OoConstruct"), ZEND_FETCH_CLASS_AUTO);
@@ -76,7 +77,8 @@ PHP_METHOD(Stub_UseTest, testUseClass2)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Strings"), ZEND_FETCH_CLASS_AUTO);
@@ -99,7 +101,8 @@ PHP_METHOD(Stub_UseTest, testUseNamespaceAlias)
 
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Oo\\OoConstruct"), ZEND_FETCH_CLASS_AUTO);
diff --git a/ext/stub/vars.zep.c b/ext/stub/vars.zep.c
index 4b3631336a..39694c976e 100644
--- a/ext/stub/vars.zep.c
+++ b/ext/stub/vars.zep.c
@@ -52,7 +52,8 @@ PHP_METHOD(Stub_Vars, testParam)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &config_param);
 	ZEPHIR_OBS_COPY_OR_DUP(&config, config_param);
 
@@ -111,7 +112,8 @@ PHP_METHOD(Stub_Vars, testVarDump)
 	ZVAL_UNDEF(&_0);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
@@ -142,7 +144,8 @@ PHP_METHOD(Stub_Vars, testVarDump2)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &ret);
 
 
@@ -168,7 +171,8 @@ PHP_METHOD(Stub_Vars, testVarExport)
 	ZVAL_UNDEF(&_2);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
@@ -215,7 +219,8 @@ PHP_METHOD(Stub_Vars, test88Issue)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &param1_param, &param2_param);
 	if (UNEXPECTED(Z_TYPE_P(param1_param) != IS_STRING && Z_TYPE_P(param1_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param1' must be of the type string"));
@@ -265,7 +270,8 @@ PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &param1_param, &param2_param);
 	if (UNEXPECTED(Z_TYPE_P(param1_param) != IS_STRING && Z_TYPE_P(param1_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param1' must be of the type string"));
@@ -347,7 +353,8 @@ PHP_METHOD(Stub_Vars, testCountOptimizerVarDumpAndExport)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &testVar);
 
 
@@ -378,7 +385,8 @@ PHP_METHOD(Stub_Vars, testArrayTypeVarDumpAndExport)
 	ZEND_PARSE_PARAMETERS_END();
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &testVar_param);
 	if (!testVar_param) {
 		ZEPHIR_INIT_VAR(&testVar);
@@ -411,7 +419,8 @@ PHP_METHOD(Stub_Vars, testIntVarDump)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	ZEPHIR_INIT_VAR(&_0);
@@ -436,7 +445,8 @@ PHP_METHOD(Stub_Vars, testDoubleVarDump)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = (double) (1);
 	ZEPHIR_INIT_VAR(&_0);
@@ -461,7 +471,8 @@ PHP_METHOD(Stub_Vars, testBoolVarDump)
 	ZVAL_UNDEF(&_1);
 
 
-	ZEPHIR_MM_GROW();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
 	a = 1;
 	ZEPHIR_INIT_VAR(&_0);

From a5eab0f3c1361c737e983f3bf0b467e886b31db2 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Dec 2023 22:41:14 +0000
Subject: [PATCH 292/375] Add tests for openssl functions

---
 stub/openssl.zep                | 21 +++++++++++++
 tests/Extension/OpensslTest.php | 55 +++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 stub/openssl.zep
 create mode 100644 tests/Extension/OpensslTest.php

diff --git a/stub/openssl.zep b/stub/openssl.zep
new file mode 100644
index 0000000000..0c0c88b88a
--- /dev/null
+++ b/stub/openssl.zep
@@ -0,0 +1,21 @@
+
+namespace Stub;
+
+class Openssl
+{
+    public function randomPseudoBytes(int length) -> string
+    {
+        return openssl_random_pseudo_bytes(length);
+    }
+
+	public function randomPseudoBytesLoop() -> string
+	{
+	    var arr, i = 0;
+	    let arr = [];
+	    for i in range(1, 10) {
+	        let arr[] = openssl_random_pseudo_bytes(10);
+        }
+
+        return arr;
+	}
+}
diff --git a/tests/Extension/OpensslTest.php b/tests/Extension/OpensslTest.php
new file mode 100644
index 0000000000..d5fbd859cd
--- /dev/null
+++ b/tests/Extension/OpensslTest.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * This file is part of the Zephir.
+ *
+ * (c) Phalcon Team <team@zephir-lang.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Extension;
+
+use PHPUnit\Framework\TestCase;
+use Stub\Openssl;
+
+final class OpensslTest extends TestCase
+{
+    private Openssl $test;
+
+    protected function setUp(): void
+    {
+        $this->test = new Openssl();
+    }
+
+    /**
+     * @dataProvider providerLength
+     */
+    public function testRandomPseudoBytes(int $length): void
+    {
+        for ($i = 0; $i < 20; $i++) {
+            $this->assertSame($length, strlen($this->test->randomPseudoBytes($length)));
+        }
+    }
+
+    public function testRandomPseudoBytesLoop(): void
+    {
+        $this->assertSame(10, count($this->test->randomPseudoBytesLoop()));
+    }
+
+    public function providerLength(): array
+    {
+        return [
+            [1],
+            [2],
+            [5],
+            [10],
+            [30],
+            [50],
+            [100],
+        ];
+    }
+}

From 18a260a3884569a2925fe5123e617e7d5bf6ee98 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 3 Dec 2023 23:27:35 +0000
Subject: [PATCH 293/375] Add tests for openssl functions

---
 stub/openssl.zep                | 5 +++++
 tests/Extension/OpensslTest.php | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/stub/openssl.zep b/stub/openssl.zep
index 0c0c88b88a..01aceb4d2d 100644
--- a/stub/openssl.zep
+++ b/stub/openssl.zep
@@ -18,4 +18,9 @@ class Openssl
 
         return arr;
 	}
+
+	public function opensslEncrypt(string data)
+	{
+	    return openssl_encrypt(data, "AES-256-CBC", "passphrase", OPENSSL_RAW_DATA, "1234567890123456");
+	}
 }
diff --git a/tests/Extension/OpensslTest.php b/tests/Extension/OpensslTest.php
index d5fbd859cd..a064c24cc9 100644
--- a/tests/Extension/OpensslTest.php
+++ b/tests/Extension/OpensslTest.php
@@ -40,6 +40,13 @@ public function testRandomPseudoBytesLoop(): void
         $this->assertSame(10, count($this->test->randomPseudoBytesLoop()));
     }
 
+    public function testOpensslEncrypt(): void
+    {
+        for ($i = 0; $i < 20; $i++) {
+            $this->assertNotFalse($this->test->opensslEncrypt((string)$i));
+        }
+    }
+
     public function providerLength(): array
     {
         return [

From 7e91f3b5591c60b6c68727953ded7d55b20c1e0a Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 4 Dec 2023 09:13:01 -0600
Subject: [PATCH 294/375] removing more duplicated code

---
 src/Statements/Let/Incr.php     |  71 -------
 src/Statements/Let/Variable.php | 358 ++++++++++++++++++--------------
 2 files changed, 205 insertions(+), 224 deletions(-)

diff --git a/src/Statements/Let/Incr.php b/src/Statements/Let/Incr.php
index fb0e7b2738..801c3fc307 100644
--- a/src/Statements/Let/Incr.php
+++ b/src/Statements/Let/Incr.php
@@ -24,75 +24,4 @@ class Incr extends Decr
     protected string $warningText  = 'increment';
     protected string $warningType  = 'non-valid-increment';
     protected string $zephirMethod = 'zephir_increment';
-//    /**
-//     * Compiles x++.
-//     *
-//     * @param string             $variable
-//     * @param ZephirVariable     $symbolVariable
-//     * @param CompilationContext $compilationContext
-//     * @param array              $statement
-//     *
-//     * @throws CompilerException
-//     */
-//    public function assign(
-//        $variable,
-//        ZephirVariable $symbolVariable,
-//        CompilationContext $compilationContext,
-//        $statement
-//    ): void {
-//        if (!$symbolVariable->isInitialized()) {
-//            throw new CompilerException(
-//                "Cannot mutate variable '" . $variable . "' because it is not initialized",
-//                $statement
-//            );
-//        }
-//
-//        if ($symbolVariable->isReadOnly()) {
-//            /*
-//             * TODO: implement increment of objects members
-//             */
-//            throw new CompilerException(
-//                "Cannot mutate variable '"
-//                . $variable
-//                . "' because it is read only",
-//                $statement
-//            );
-//        }
-//
-//        $codePrinter = &$compilationContext->codePrinter;
-//
-//        switch ($symbolVariable->getType()) {
-//            case 'int':
-//            case 'uint':
-//            case 'long':
-//            case 'ulong':
-//            case 'double':
-//            case 'char':
-//            case 'uchar':
-//                $codePrinter->output($variable . '++;');
-//                break;
-//
-//            case 'variable':
-//                /*
-//                 * Update non-numeric dynamic variables could be expensive
-//                 */
-//                if (!$symbolVariable->hasAnyDynamicType(['undefined', 'long', 'double'])) {
-//                    $compilationContext->logger->warning(
-//                        'Possible attempt to increment non-numeric dynamic variable',
-//                        ['non-valid-increment', $statement]
-//                    );
-//                }
-//
-//                $compilationContext->headersManager->add('kernel/operators');
-//                if (!$symbolVariable->isLocalOnly()) {
-//                    $symbolVariable->separate($compilationContext);
-//                }
-//                $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-//                $codePrinter->output('zephir_increment(' . $symbol . ');');
-//                break;
-//
-//            default:
-//                throw new CompilerException('Cannot increment: ' . $symbolVariable->getType(), $statement);
-//        }
-//    }
 }
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index fe414470cb..f98eeadf58 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -82,11 +82,23 @@ public function assign(
             case 'ulong':
             case 'char':
             case 'uchar':
-                $this->doNumericAssignment($codePrinter, $resolvedExpr, $variable, $statement, $compilationContext);
+                $this->doNumericAssignment(
+                    $codePrinter,
+                    $resolvedExpr,
+                    $variable,
+                    $statement,
+                    $compilationContext
+                );
                 break;
 
             case 'double':
-                $this->doDoubleAssignment($codePrinter, $resolvedExpr, $variable, $statement, $compilationContext);
+                $this->doDoubleAssignment(
+                    $codePrinter,
+                    $resolvedExpr,
+                    $variable,
+                    $statement,
+                    $compilationContext
+                );
                 break;
 
             case 'array':
@@ -112,7 +124,13 @@ public function assign(
                 break;
 
             case 'bool':
-                $this->doBoolAssignment($codePrinter, $resolvedExpr, $variable, $statement, $compilationContext);
+                $this->doBoolAssignment(
+                    $codePrinter,
+                    $resolvedExpr,
+                    $variable,
+                    $statement,
+                    $compilationContext
+                );
                 break;
 
             case 'variable':
@@ -378,71 +396,35 @@ private function doDoubleAssignment(
     ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = 0.0;');
-                        break;
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += 0.0;');
-                        break;
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= 0.0;');
-                        break;
-                    case 'mul-assign':
-                        $codePrinter->output($variable . ' *= 0.0;');
-                        break;
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $this->doNumberAssignmentNull(
+                    $statement,
+                    $codePrinter,
+                    $variable,
+                    $resolvedExpr,
+                    '0.0'
+                );
                 break;
 
             case 'int':
             case 'uint':
             case 'long':
             case 'ulong':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = (double) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += (double) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= (double) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    case 'mul-assign':
-                        $codePrinter->output($variable . ' *= (double) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $this->doNumericAssignmentLong(
+                    $statement,
+                    $codePrinter,
+                    $variable,
+                    $resolvedExpr,
+                    '(double)'
+                );
                 break;
 
             case 'double':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'mul-assign':
-                        $codePrinter->output($variable . ' *= ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $this->doNumericAssignmentLong(
+                    $statement,
+                    $codePrinter,
+                    $variable,
+                    $resolvedExpr
+                );
                 break;
 
             case 'bool':
@@ -480,41 +462,22 @@ private function doDoubleAssignment(
                     case 'long':
                     case 'ulong':
                     case 'bool':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable . ' = (double) ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'add-assign':
-                                $codePrinter->output($variable . ' += (double) ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'sub-assign':
-                                $codePrinter->output($variable . ' -= (double) ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'mul-assign':
-                                $codePrinter->output($variable . ' *= (double) ' . $itemVariable->getName() . ';');
-                                break;
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
+                        $this->doNumericAssignmentVar(
+                            $statement,
+                            $codePrinter,
+                            $variable,
+                            $itemVariable,
+                            '(double)'
+                        );
                         break;
 
                     case 'double':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable . ' = ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'add-assign':
-                                $codePrinter->output($variable . ' += ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'sub-assign':
-                                $codePrinter->output($variable . ' -= ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'mul-assign':
-                                $codePrinter->output($variable . ' *= ' . $itemVariable->getName() . ';');
-                                break;
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
+                        $this->doNumericAssignmentVar(
+                            $statement,
+                            $codePrinter,
+                            $variable,
+                            $itemVariable
+                        );
                         break;
 
                     case 'variable':
@@ -554,26 +517,13 @@ private function doNumericAssignment(
     ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = 0;');
-                        break;
-
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += 0;');
-                        break;
-
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= 0;');
-                        break;
-
-                    case 'mul-assign':
-                        $codePrinter->output($variable . ' *= 0;');
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $this->doNumberAssignmentNull(
+                    $statement,
+                    $codePrinter,
+                    $variable,
+                    $resolvedExpr,
+                    '0'
+                );
                 break;
 
             case 'int':
@@ -635,26 +585,13 @@ private function doNumericAssignment(
                 break;
 
             case 'double':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = (long) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += (long) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= (long) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    case 'mul-assign':
-                        $codePrinter->output($variable . ' *= (long) (' . $resolvedExpr->getCode() . ');');
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $this->doNumericAssignmentLong(
+                    $statement,
+                    $codePrinter,
+                    $variable,
+                    $resolvedExpr,
+                    '(long)'
+                );
                 break;
 
             case 'bool':
@@ -721,22 +658,13 @@ private function doNumericAssignment(
                         break;
 
                     case 'double':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable . ' = (long) ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'add-assign':
-                                $codePrinter->output($variable . ' += (long) ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'sub-assign':
-                                $codePrinter->output($variable . ' -= (long) ' . $itemVariable->getName() . ';');
-                                break;
-                            case 'mul-assign':
-                                $codePrinter->output($variable . ' *= (long) ' . $itemVariable->getName() . ';');
-                                break;
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
+                        $this->doNumericAssignmentVar(
+                            $statement,
+                            $codePrinter,
+                            $variable,
+                            $itemVariable,
+                            '(long)'
+                        );
                         break;
 
                     case 'variable':
@@ -1025,13 +953,11 @@ private function doVariableAssignment(
     ): void {
         switch ($resolvedExpr->getType()) {
             case 'null':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $symbolVariable->initVariant($compilationContext);
-                        $symbolVariable->setDynamicTypes('null');
+                if ($statement['operator'] == 'assign') {
+                    $symbolVariable->initVariant($compilationContext);
+                    $symbolVariable->setDynamicTypes('null');
 
-                        $compilationContext->backend->assignNull($symbolVariable, $compilationContext);
-                        break;
+                    $compilationContext->backend->assignNull($symbolVariable, $compilationContext);
                 }
                 break;
 
@@ -1477,6 +1403,132 @@ private function doVariableAssignment(
         }
     }
 
+    /**
+     * @param array              $statement
+     * @param Printer            $codePrinter
+     * @param string             $variable
+     * @param CompiledExpression $resolvedExpr
+     * @param string             $value
+     *
+     * @return void
+     */
+    private function doNumberAssignmentNull(
+        array $statement,
+        Printer $codePrinter,
+        string $variable,
+        CompiledExpression $resolvedExpr,
+        string $value
+    ): void {
+        switch ($statement['operator']) {
+            case 'assign':
+                $codePrinter->output($variable . ' = ' . $value . ';');
+                break;
+            case 'add-assign':
+                $codePrinter->output($variable . ' += ' . $value . ';');
+                break;
+            case 'sub-assign':
+                $codePrinter->output($variable . ' -= ' . $value . ';');
+                break;
+            case 'mul-assign':
+                $codePrinter->output($variable . ' *= ' . $value . ';');
+                break;
+            default:
+                throw new IllegalOperationException($statement, $resolvedExpr);
+        }
+    }
+
+    /**
+     * @param array               $statement
+     * @param Printer             $codePrinter
+     * @param string              $variable
+     * @param ZephirVariable|bool $itemVariable
+     * @param string              $cast
+     *
+     * @return void
+     */
+    private function doNumericAssignmentVar(
+        array $statement,
+        Printer $codePrinter,
+        string $variable,
+        ZephirVariable | bool $itemVariable,
+        string $cast = ''
+    ): void {
+        switch ($statement['operator']) {
+            case 'assign':
+                $codePrinter->output(
+                    $variable . ' = ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            case 'add-assign':
+                $codePrinter->output(
+                    $variable . ' += ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            case 'sub-assign':
+                $codePrinter->output(
+                    $variable . ' -= ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            case 'mul-assign':
+                $codePrinter->output(
+                    $variable . ' *= ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            default:
+                throw new IllegalOperationException($statement, $itemVariable);
+        }
+    }
+
+    /**
+     * @param array              $statement
+     * @param Printer            $codePrinter
+     * @param string             $variable
+     * @param CompiledExpression $resolvedExpr
+     * @param string             $cast
+     *
+     * @return void
+     */
+    private function doNumericAssignmentLong(
+        array $statement,
+        Printer $codePrinter,
+        string $variable,
+        CompiledExpression $resolvedExpr,
+        string $cast = ''
+    ): void {
+        switch ($statement['operator']) {
+            case 'assign':
+                $codePrinter->output(
+                    $variable . ' = ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            case 'add-assign':
+                $codePrinter->output(
+                    $variable . ' += ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            case 'sub-assign':
+                $codePrinter->output(
+                    $variable . ' -= ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            case 'mul-assign':
+                $codePrinter->output(
+                    $variable . ' *= ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            default:
+                throw new IllegalOperationException($statement, $resolvedExpr);
+        }
+    }
+
     /**
      * @param CompilationContext  $compilationContext
      * @param ZephirVariable|bool $exprVariable

From 8e6d330759985923dff94af4fefbd7051b39cf5e Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 4 Dec 2023 15:27:35 -0600
Subject: [PATCH 295/375] more duplications

---
 src/Optimizers/FunctionCall/PowOptimizer.php  |  33 ++---
 .../FunctionCall/UniqueKeyOptimizer.php       |  37 ++++-
 src/Passes/CallGathererPass.php               |  34 +++--
 src/Passes/MutateGathererPass.php             |   8 +-
 src/Statements/Let/ExportSymbol.php           |  49 +++++--
 src/Statements/Let/ExportSymbolString.php     |  56 +++-----
 src/Statements/Let/Variable.php               | 131 ++++++------------
 7 files changed, 165 insertions(+), 183 deletions(-)

diff --git a/src/Optimizers/FunctionCall/PowOptimizer.php b/src/Optimizers/FunctionCall/PowOptimizer.php
index 971868e2b5..471dc819ad 100644
--- a/src/Optimizers/FunctionCall/PowOptimizer.php
+++ b/src/Optimizers/FunctionCall/PowOptimizer.php
@@ -17,7 +17,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -26,8 +26,10 @@
  *
  * Optimizes calls to 'pow' using internal function
  */
-class PowOptimizer extends OptimizerAbstract
+class PowOptimizer extends UniqueKeyOptimizer
 {
+    protected string $zephirMethod = 'zephir_pow_function';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -46,26 +48,17 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (2 != count($expression['parameters'])) {
             return false;
         }
+    }
 
-        /*
-         * Process the expected symbol to be returned
-         */
-        $call->processExpectedReturn($context);
-
-        $symbolVariable = $call->getSymbolVariable(true, $context);
-        $this->checkNotVariableString($symbolVariable, $expression);
-
+    /**
+     * @param CompilationContext             $context
+     * @param Variable|null $symbolVariable
+     *
+     * @return void
+     */
+    protected function setHeaders(CompilationContext $context, ?Variable $symbolVariable): void
+    {
         $context->headersManager->add('kernel/operators');
         $symbolVariable->setDynamicTypes('variable');
-        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
-
-        $this->checkInitSymbolVariable($call, $symbolVariable, $context);
-
-        $symbol = $context->backend->getVariableCode($symbolVariable);
-        $context->codePrinter->output(
-            'zephir_pow_function(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        );
-
-        return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
 }
diff --git a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index f1d01b9830..d667a5f1e3 100644
--- a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -18,6 +18,7 @@
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
+use Zephir\Variable\Variable;
 
 use function count;
 
@@ -28,6 +29,8 @@
  */
 class UniqueKeyOptimizer extends OptimizerAbstract
 {
+    protected string $zephirMethod = 'zephir_unique_key';
+
     /**
      * @param array              $expression
      * @param Call               $call
@@ -46,8 +49,32 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         if (2 != count($expression['parameters'])) {
             throw new CompilerException("'unique_key' only accepts two parameter", $expression);
         }
+        return $this->processOptimizer($call, $context, $expression);
+    }
 
-        /*
+    /**
+     * @param CompilationContext             $context
+     * @param Variable|null $symbolVariable
+     *
+     * @return void
+     */
+    protected function setHeaders(CompilationContext $context, ?Variable $symbolVariable): void
+    {
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+    }
+
+    /**
+     * @param Call               $call
+     * @param CompilationContext $context
+     * @param array              $expression
+     *
+     * @return CompiledExpression
+     * @throws \Zephir\Exception
+     */
+    protected function processOptimizer(Call $call, CompilationContext $context, array $expression): CompiledExpression
+    {
+        /**
          * Process the expected symbol to be returned
          */
         $call->processExpectedReturn($context);
@@ -55,17 +82,15 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbolVariable = $call->getSymbolVariable(true, $context);
         $this->checkNotVariableString($symbolVariable, $expression);
 
-        $context->headersManager->add('kernel/string');
-
-        $symbolVariable->setDynamicTypes('string');
+        $this->setHeaders($context, $symbolVariable);
 
         $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
         $this->checkInitSymbolVariable($call, $symbolVariable, $context);
 
-
         $symbol = $context->backend->getVariableCode($symbolVariable);
         $context->codePrinter->output(
-            'zephir_unique_key(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
+            $this->zephirMethod
+            . '(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
         );
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
diff --git a/src/Passes/CallGathererPass.php b/src/Passes/CallGathererPass.php
index a8aeed5110..886926f69a 100644
--- a/src/Passes/CallGathererPass.php
+++ b/src/Passes/CallGathererPass.php
@@ -107,34 +107,29 @@ public function passExpression(array $expression): void
             case 'uint':
             case 'long':
             case 'ulong':
+            case 'string':
+            case 'istring':
             case 'null':
             case 'char':
             case 'uchar':
-            case 'string':
-            case 'istring':
-            case 'static-constant-access':
+            case 'empty-array':
             case 'variable':
             case 'constant':
-            case 'empty-array':
+            case 'static-constant-access':
             case 'closure':
             case 'closure-arrow':
             case 'reference':
             case 'short-ternary':
                 break;
 
-            case 'div':
-            case 'mod':
             case 'sub':
             case 'add':
+            case 'div':
             case 'mul':
-            case 'bitwise_and':
-            case 'bitwise_or':
-            case 'bitwise_xor':
-            case 'bitwise_shiftleft':
-            case 'bitwise_shiftright':
-            case 'concat':
+            case 'mod':
             case 'and':
             case 'or':
+            case 'concat':
             case 'equals':
             case 'identical':
             case 'not-identical':
@@ -143,6 +138,11 @@ public function passExpression(array $expression): void
             case 'greater':
             case 'greater-equal':
             case 'less-equal':
+            case 'bitwise_and':
+            case 'bitwise_or':
+            case 'bitwise_xor':
+            case 'bitwise_shiftleft':
+            case 'bitwise_shiftright':
             case 'irange':
             case 'erange':
                 $this->passExpression($expression['left']);
@@ -227,6 +227,11 @@ public function passExpression(array $expression): void
         }
     }
 
+    /**
+     * Pass let statements.
+     *
+     * @param array $statement
+     */
     public function passLetStatement(array $statement): void
     {
         foreach ($statement['assignments'] as $assignment) {
@@ -236,6 +241,11 @@ public function passLetStatement(array $statement): void
         }
     }
 
+    /**
+     * Pass "new" expressions.
+     *
+     * @param array $expression
+     */
     public function passNew(array $expression): void
     {
         if (!$expression['dynamic']) {
diff --git a/src/Passes/MutateGathererPass.php b/src/Passes/MutateGathererPass.php
index eb1a066180..b15eccfc75 100644
--- a/src/Passes/MutateGathererPass.php
+++ b/src/Passes/MutateGathererPass.php
@@ -162,15 +162,15 @@ public function passExpression(array $expression): void
                 $this->passExpression($expression['right']);
                 break;
 
-            case 'typeof':
             case 'minus':
-            case 'list':
-            case 'array-access':
+            case 'not':
             case 'static-property-access':
+            case 'array-access':
             case 'property-string-access':
             case 'property-dynamic-access':
             case 'property-access':
-            case 'not':
+            case 'list':
+            case 'typeof':
                 $this->passExpression($expression['left']);
                 break;
 
diff --git a/src/Statements/Let/ExportSymbol.php b/src/Statements/Let/ExportSymbol.php
index dd2f1a6619..ab20986e7c 100644
--- a/src/Statements/Let/ExportSymbol.php
+++ b/src/Statements/Let/ExportSymbol.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements\Let;
 
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Statements\LetStatement;
@@ -28,22 +29,25 @@ class ExportSymbol
     /**
      * Compiles {var} = {expr}.
      *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
-     * @param CompiledExpression $resolvedExpr
-     * @param CompilationContext $compilationContext ,
-     * @param array              $statement
+     * @param string                  $variable
+     * @param ZephirVariable|null     $symbolVariable
+     * @param CompiledExpression|null $resolvedExpr
+     * @param CompilationContext|null $compilationContext ,
+     * @param array|null              $statement
      */
     public function assign(
         $variable,
-        ZephirVariable $symbolVariable,
-        CompiledExpression $resolvedExpr,
-        CompilationContext $compilationContext,
-        $statement
+        ZephirVariable $symbolVariable = null,
+        CompiledExpression $resolvedExpr = null,
+        CompilationContext $compilationContext = null,
+        $statement = null
     ): void {
         $codePrinter = $compilationContext->codePrinter;
 
-        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);
+        $variable = $compilationContext->symbolTable->getTempVariable(
+            'variable',
+            $compilationContext
+        );
         $variable->setMustInitNull(true);
 
         $letStatement = new LetStatement([
@@ -68,6 +72,31 @@ public function assign(
         ]);
         $letStatement->compile($compilationContext);
 
+        $this->getOutput(
+            $compilationContext,
+            $symbolVariable,
+            $variable,
+            $codePrinter,
+            $statement
+        );
+    }
+
+    /**
+     * @param CompilationContext|null   $compilationContext
+     * @param ZephirVariable|null       $symbolVariable
+     * @param ZephirVariable            $variable
+     * @param Printer|null              $codePrinter
+     * @param array|null                $statement
+     *
+     * @return void
+     */
+    protected function getOutput(
+        ?CompilationContext $compilationContext,
+        ?ZephirVariable $symbolVariable,
+        ZephirVariable $variable,
+        ?Printer $codePrinter,
+        ?array $statement
+    ): void {
         $symbol   = $compilationContext->backend->getVariableCode($symbolVariable);
         $variable = $compilationContext->backend->getVariableCode($variable);
 
diff --git a/src/Statements/Let/ExportSymbolString.php b/src/Statements/Let/ExportSymbolString.php
index 43546620c5..437df98e0d 100644
--- a/src/Statements/Let/ExportSymbolString.php
+++ b/src/Statements/Let/ExportSymbolString.php
@@ -13,6 +13,7 @@
 
 namespace Zephir\Statements\Let;
 
+use Zephir\Code\Printer;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Statements\LetStatement;
@@ -23,51 +24,28 @@
  *
  * Exports a symbol to the current PHP symbol table using a variable as parameter
  */
-class ExportSymbolString
+class ExportSymbolString extends ExportSymbol
 {
     /**
      * Compiles {"var"} = {expr}.
+     */
+
+    /**
+     * @param CompilationContext|null   $compilationContext
+     * @param ZephirVariable|null       $symbolVariable
+     * @param ZephirVariable            $variable
+     * @param Printer|null              $codePrinter
+     * @param array|null                $statement
      *
-     * @param string                  $variable
-     * @param ZephirVariable|null     $symbolVariable
-     * @param CompiledExpression|null $resolvedExpr
-     * @param CompilationContext|null $compilationContext ,
-     * @param array|null              $statement
+     * @return void
      */
-    public function assign(
-        $variable,
-        ZephirVariable $symbolVariable = null,
-        CompiledExpression $resolvedExpr = null,
-        CompilationContext $compilationContext = null,
-        $statement = null
+    protected function getOutput(
+        ?CompilationContext $compilationContext,
+        ?ZephirVariable $symbolVariable,
+        ZephirVariable $variable,
+        ?Printer $codePrinter,
+        ?array $statement
     ): void {
-        $codePrinter = $compilationContext->codePrinter;
-
-        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);
-        $variable->setMustInitNull(true);
-
-        $letStatement = new LetStatement([
-            'type'        => 'let',
-            'assignments' => [
-                [
-                    'assign-type' => 'variable',
-                    'variable'    => $variable->getName(),
-                    'operator'    => 'assign',
-                    'expr'        => [
-                        'type'  => $resolvedExpr->getType(),
-                        'value' => $resolvedExpr->getCode(),
-                        'file'  => $statement['file'],
-                        'line'  => $statement['line'],
-                        'char'  => $statement['char'],
-                    ],
-                    'file'        => $statement['file'],
-                    'line'        => $statement['line'],
-                    'char'        => $statement['char'],
-                ],
-            ],
-        ]);
-        $letStatement->compile($compilationContext);
-
         $symbol = $compilationContext->backend->getVariableCode($variable);
         $codePrinter->output(
             'if (zephir_set_symbol_str(SS("' . $statement['variable'] . '"), ' . $symbol . ') == FAILURE) {'
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index f98eeadf58..1211cfe260 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -530,58 +530,30 @@ private function doNumericAssignment(
             case 'uint':
             case 'long':
             case 'ulong':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'mul-assign':
-                        $codePrinter->output($variable . ' *= ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'div-assign':
-                        $codePrinter->output($variable . ' /= ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    case 'mod-assign':
-                        $codePrinter->output($variable . ' %= ' . $resolvedExpr->getCode() . ';');
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $operator = match ($statement['operator']) {
+                    'assign'     => ' = ',
+                    'add-assign' => ' += ',
+                    'sub-assign' => ' -= ',
+                    'mul-assign' => ' *= ',
+                    'div-assign' => ' /= ',
+                    'mod-assign' => ' %= ',
+                    default => throw new IllegalOperationException($statement, $resolvedExpr)
+                };
+
+                $codePrinter->output($variable . $operator . $resolvedExpr->getCode() . ';');
                 break;
 
             case 'char':
             case 'uchar':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = \'' . $resolvedExpr->getCode() . '\';');
-                        break;
-
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += \'' . $resolvedExpr->getCode() . '\';');
-                        break;
-
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= \'' . $resolvedExpr->getCode() . '\';');
-                        break;
-
-                    case 'mul-assign':
-                        $codePrinter->output($variable . ' *= \'' . $resolvedExpr->getCode() . '\';');
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $operator = match ($statement['operator']) {
+                    'assign'     => ' = ',
+                    'add-assign' => ' += ',
+                    'sub-assign' => ' -= ',
+                    'mul-assign' => ' *= ',
+                    default => throw new IllegalOperationException($statement, $resolvedExpr)
+                };
+
+                $codePrinter->output($variable . $operator . '\'' . $resolvedExpr->getCode() . '\';');
                 break;
 
             case 'double':
@@ -595,22 +567,14 @@ private function doNumericAssignment(
                 break;
 
             case 'bool':
-                switch ($statement['operator']) {
-                    case 'assign':
-                        $codePrinter->output($variable . ' = ' . $resolvedExpr->getBooleanCode() . ';');
-                        break;
-
-                    case 'add-assign':
-                        $codePrinter->output($variable . ' += ' . $resolvedExpr->getBooleanCode() . ';');
-                        break;
-
-                    case 'sub-assign':
-                        $codePrinter->output($variable . ' -= ' . $resolvedExpr->getBooleanCode() . ';');
-                        break;
-
-                    default:
-                        throw new IllegalOperationException($statement, $resolvedExpr);
-                }
+                $operator = match ($statement['operator']) {
+                    'assign'     => ' = ',
+                    'add-assign' => ' += ',
+                    'sub-assign' => ' -= ',
+                    default      => throw new IllegalOperationException($statement, $resolvedExpr)
+                };
+
+                $codePrinter->output($variable . $operator . $resolvedExpr->getBooleanCode() . ';');
                 break;
 
             case 'variable':
@@ -627,34 +591,17 @@ private function doNumericAssignment(
                     case 'bool':
                     case 'char':
                     case 'uchar':
-                        switch ($statement['operator']) {
-                            case 'assign':
-                                $codePrinter->output($variable . ' = ' . $itemVariable->getName() . ';');
-                                break;
-
-                            case 'add-assign':
-                                $codePrinter->output($variable . ' += ' . $itemVariable->getName() . ';');
-                                break;
-
-                            case 'sub-assign':
-                                $codePrinter->output($variable . ' -= ' . $itemVariable->getName() . ';');
-                                break;
-
-                            case 'mul-assign':
-                                $codePrinter->output($variable . ' *= ' . $itemVariable->getName() . ';');
-                                break;
-
-                            case 'div-assign':
-                                $codePrinter->output($variable . ' /= ' . $itemVariable->getName() . ';');
-                                break;
-
-                            case 'mod-assign':
-                                $codePrinter->output($variable . ' %= ' . $itemVariable->getName() . ';');
-                                break;
-
-                            default:
-                                throw new IllegalOperationException($statement, $itemVariable);
-                        }
+                        $operator = match ($statement['operator']) {
+                            'assign' => ' = ',
+                            'add-assign' => ' += ',
+                            'sub-assign' => ' -= ',
+                            'mul-assign' => ' *= ',
+                            'div-assign' => ' /= ',
+                            'mod-assign' => ' %= ',
+                            default => throw new IllegalOperationException($statement, $itemVariable)
+                        };
+
+                        $codePrinter->output($variable . $operator . $itemVariable->getName() . ';');
                         break;
 
                     case 'double':

From 9d2ffe215768b532052ec0343edeb472f50a291f Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Dec 2023 23:09:20 +0000
Subject: [PATCH 296/375] Update Dockerfile for PHP8.3

---
 .docker/8.3/Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.docker/8.3/Dockerfile b/.docker/8.3/Dockerfile
index ab09eb0f53..9ac24b1927 100644
--- a/.docker/8.3/Dockerfile
+++ b/.docker/8.3/Dockerfile
@@ -13,12 +13,10 @@ RUN apt update -y && apt install -y \
     libicu-dev \
     libgmp-dev \
     libzip-dev && \
-    pecl install psr zephir_parser
-#    pecl install psr zephir_parser xdebug
+    pecl install psr zephir_parser xdebug
 
 RUN docker-php-ext-install zip gmp intl mysqli && \
-    docker-php-ext-enable psr zephir_parser
-#    docker-php-ext-enable psr zephir_parser xdebug
+    docker-php-ext-enable psr zephir_parser xdebug
 
 COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases

From 9568e5ba9bf7a75c758e2c3025bbd8a9ae0d2e20 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 4 Dec 2023 23:09:34 +0000
Subject: [PATCH 297/375] Update composer.lock

---
 composer.lock | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 00358f7afb..950d4095f3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "12ba06c84bf00534e75ea0d79e22a65b",
+    "content-hash": "b2471ed2d66bc4e86d3c83993063d763",
     "packages": [
         {
             "name": "monolog/monolog",
@@ -2933,6 +2933,63 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2023-02-22T23:07:41+00:00"
+        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.2",

From 8eb4ea3880a290c24e7ea537a200cf02a3bb0c61 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 6 Dec 2023 22:37:11 +0000
Subject: [PATCH 298/375] Remove unused argument

---
 src/Statements/Let/ArrayIndex.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
index d64ab6df69..ae7c2b298b 100644
--- a/src/Statements/Let/ArrayIndex.php
+++ b/src/Statements/Let/ArrayIndex.php
@@ -89,7 +89,7 @@ public function assign(
          * Choose one-offset or multiple-offset functions
          */
         if (1 == count($statement['index-expr'])) {
-            $this->_assignArrayIndexSingle($variable, $symbolVariable, $resolvedExpr, $compilationContext, $statement);
+            $this->_assignArrayIndexSingle($symbolVariable, $resolvedExpr, $compilationContext, $statement);
         } else {
             $this->_assignArrayIndexMultiple(
                 $variable,
@@ -175,8 +175,7 @@ protected function _assignArrayIndexMultiple(
 
     /**
      * Compiles foo[y] = {expr} (one offset).
-     *
-     * @param string             $variable
+
      * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
@@ -185,7 +184,6 @@ protected function _assignArrayIndexMultiple(
      * @throws CompilerException
      */
     protected function _assignArrayIndexSingle(
-        $variable,
         ZephirVariable $symbolVariable,
         CompiledExpression $resolvedExpr,
         CompilationContext $compilationContext,

From ce63e12c9a3d96611754cd9f1cd96379e54d726b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 6 Dec 2023 22:51:18 +0000
Subject: [PATCH 299/375] Remove dead code

---
 src/Statements/Let/Decr.php         | 22 ++++++--------------
 src/Statements/Let/ExportSymbol.php |  2 --
 src/SymbolTable.php                 | 32 +----------------------------
 3 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/src/Statements/Let/Decr.php b/src/Statements/Let/Decr.php
index 76191b5d6d..1eae8fc457 100644
--- a/src/Statements/Let/Decr.php
+++ b/src/Statements/Let/Decr.php
@@ -20,8 +20,6 @@
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
- * Decr.
- *
  * Decrements a variable
  */
 class Decr
@@ -36,15 +34,10 @@ class Decr
     /**
      * Compiles x++/x--.
      *
-     * @param string             $variable
-     * @param ZephirVariable     $symbolVariable
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
-     *
      * @throws CompilerException
      */
     public function assign(
-        $variable,
+        string $variable,
         ZephirVariable $symbolVariable,
         CompilationContext $compilationContext,
         array $statement
@@ -58,13 +51,11 @@ public function assign(
             );
         }
 
-        /*
+        /**
          * TODO: implement increment of objects members
          */
         $this->checkVariableReadOnly($variable, $symbolVariable, $statement);
 
-        $codePrinter = $compilationContext->codePrinter;
-
         switch ($symbolVariable->getType()) {
             case Types::T_INT:
             case Types::T_UINT:
@@ -73,11 +64,11 @@ public function assign(
             case Types::T_DOUBLE:
             case Types::T_CHAR:
             case Types::T_UCHAR:
-                $codePrinter->output($variable . $this->operator . ';');
+                $compilationContext->codePrinter->output($variable . $this->operator . ';');
                 break;
 
             case Types::T_VARIABLE:
-                /*
+                /**
                  * Variable is probably not initialized here
                  */
                 if ($symbolVariable->hasAnyDynamicType('unknown')) {
@@ -89,10 +80,9 @@ public function assign(
                     );
                 }
 
-                /*
+                /**
                  * Decrement non-numeric variables could be expensive
                  */
-//                if (!$symbolVariable->hasAnyDynamicType(['undefined', 'long', 'double'])) {
                 if (!$symbolVariable->hasAnyDynamicType(['undefined', 'int', 'long', 'double', 'uint'])) {
                     $compilationContext->logger->warning(
                         'Possible attempt to '
@@ -108,7 +98,7 @@ public function assign(
                 }
 
                 $symbol = $compilationContext->backend->getVariableCode($symbolVariable);
-                $codePrinter->output($this->zephirMethod . '(' . $symbol . ');');
+                $compilationContext->codePrinter->output($this->zephirMethod . '(' . $symbol . ');');
                 break;
 
             default:
diff --git a/src/Statements/Let/ExportSymbol.php b/src/Statements/Let/ExportSymbol.php
index ab20986e7c..afbeaac01d 100644
--- a/src/Statements/Let/ExportSymbol.php
+++ b/src/Statements/Let/ExportSymbol.php
@@ -20,8 +20,6 @@
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
- * ExportSymbol.
- *
  * Exports a symbol to the current PHP symbol table using a variable as parameter
  */
 class ExportSymbol
diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index a9ead77536..ddbc4fbb36 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -30,34 +30,16 @@
  */
 class SymbolTable
 {
-    /**
-     * @var array
-     */
     protected array $branchTempVariables = [];
 
-    /**
-     * @var array
-     */
     protected array $branchVariables = [];
 
-    /**
-     * @var Globals
-     */
     protected Globals $globalsManager;
 
-    /**
-     * @var LocalContextPass|null
-     */
     protected ?LocalContextPass $localContext = null;
 
-    /**
-     * @var bool
-     */
     protected bool $mustGrownStack = false;
 
-    /**
-     * @var int
-     */
     protected int $tempVarCount = 0;
 
     public function __construct(protected CompilationContext $compilationContext)
@@ -65,7 +47,6 @@ public function __construct(protected CompilationContext $compilationContext)
         $this->globalsManager = new Globals();
 
         /* The variables are registered in branch 1, which is the external branch */
-        $this->compilationContext = $compilationContext;
         $this->branchVariables[1] = [];
         /* this_ptr */
         $thisVar = new Variable('variable', 'this', $compilationContext->branchManager->getCurrentBranch());
@@ -110,13 +91,8 @@ public function addRawVariable(Variable $variable): Variable
 
     /**
      * Creates a temporary variable.
-     *
-     * @param string             $type
-     * @param CompilationContext $context
-     *
-     * @return Variable
      */
-    public function addTemp($type, CompilationContext $context)
+    public function addTemp(string $type, CompilationContext $context): Variable
     {
         $tempVar  = $this->getNextTempVar();
         $variable = $this->addVariable($type, '_' . $tempVar, $context);
@@ -130,12 +106,6 @@ public function addTemp($type, CompilationContext $context)
 
     /**
      * Adds a variable to the symbol table.
-     *
-     * @param string             $type
-     * @param string             $name
-     * @param CompilationContext $compilationContext
-     *
-     * @return Variable
      */
     public function addVariable(
         string $type,

From e6d1baa7ce97017ea968abc9e9b72a70f7c5e8ac Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 6 Dec 2023 22:52:05 +0000
Subject: [PATCH 300/375] Remove unused `T_UNDEFINED` constant

---
 src/Types/Types.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Types/Types.php b/src/Types/Types.php
index 44e530dc69..6357b3fba2 100644
--- a/src/Types/Types.php
+++ b/src/Types/Types.php
@@ -44,7 +44,6 @@ final class Types
     public const T_UCHAR     = 'uchar';
     public const T_UINT      = 'uint';
     public const T_ULONG     = 'ulong';
-    public const T_UNDEFINED = 'undefined';
     public const T_VARIABLE  = 'variable';
     public const T_VOID      = 'void';
 

From 2015e89a3fc18211d1476712b9d43ef93295960e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 6 Dec 2023 22:52:12 +0000
Subject: [PATCH 301/375] Reformat code

---
 src/Statements/LetStatement.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index ed4dcd3561..c6f7679a51 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -73,7 +73,7 @@ public function compile(CompilationContext $compilationContext): void
                 'static-property-append',
                 'static-property-array-index',
                 'static-property-array-index-append',
-                'dynamic-variable-string'     => null,
+                'dynamic-variable-string' => null,
                 'array-index',
                 'variable-append',
                 'object-property',
@@ -84,14 +84,14 @@ public function compile(CompilationContext $compilationContext): void
                     $compilationContext,
                     $assignment
                 ),
-                default                                                                                                                                         => $compilationContext->symbolTable->getVariableForWrite(
+                default => $compilationContext->symbolTable->getVariableForWrite(
                     $variable,
                     $compilationContext,
                     $assignment
                 ),
             };
 
-            /*
+            /**
              * Incr/Decr assignments don't require an expression
              */
             if (isset($assignment['expr'])) {
@@ -135,7 +135,7 @@ public function compile(CompilationContext $compilationContext): void
 
                 $resolvedExpr = $expr->compile($compilationContext);
 
-                /*
+                /**
                  * Bad implemented operators could return values different from objects
                  */
                 if (!is_object($resolvedExpr)) {
@@ -337,9 +337,7 @@ protected function replaceAssignBitwiseOnDirect(array $assignment): array
         }
 
         $builderExpr = BuilderFactory::getInstance();
-
         $leftExpression = $builderExpr->variable($assignment['variable']);
-
         $assignment['expr'] = $builderExpr->operators()
                                           ->binary($operator, $leftExpression, $builderExpr->raw($assignment['expr']))
                                           ->build()

From f835ea80d3b1eb29d437dc4628962c8a40b29979 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 5 Dec 2023 12:07:28 -0600
Subject: [PATCH 302/375] additional duplication removals

---
 qodana.yaml                                   |   2 +-
 src/Class/Method/Method.php                   | 109 ++--
 src/Exception/CompilerException.php           |  57 +-
 .../Arithmetical/ArithmeticalBaseOperator.php |   4 +-
 src/Operators/Arithmetical/DivOperator.php    |  65 ++-
 src/Operators/Arithmetical/ModOperator.php    |  17 +-
 src/Operators/Bitwise/BitwiseBaseOperator.php |   4 +-
 src/Operators/Logical/LogicalBaseOperator.php |   4 +-
 src/Statements/Let/StaticProperty.php         | 502 +++++-------------
 src/Statements/Let/StaticPropertySub.php      | 101 +++-
 10 files changed, 390 insertions(+), 475 deletions(-)

diff --git a/qodana.yaml b/qodana.yaml
index f7db5fcc95..1f56304035 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -18,7 +18,7 @@ profile:
 #      - <path/where/not/run/inspection>
 
 php:
-  version: 8.0 #(Applied in CI/CD pipeline)
+  version: '8.0' #(Applied in CI/CD pipeline)
 
 #Execute shell command before Qodana execution (Applied in CI/CD pipeline)
 #bootstrap: sh ./prepare-qodana.sh
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index ba347e8d91..486d0690f8 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -334,35 +334,12 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
             case 'double':
                 switch ($parameter['default']['type']) {
                     case 'static-constant-access':
-                        /**
-                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
-                         *
-                         * TODO: Rewrite all to codePrinter
-                         */
-                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
-                            $parameter['name'],
+                        return $this->processStaticConstantAccess(
                             $compilationContext,
-                            $parameter['default']
+                            $parameter,
+                            $oldCodePrinter,
+                            'double'
                         );
-                        $expression     = new Expression($parameter['default']);
-                        $expression->setExpectReturn(true, $symbolVariable);
-                        $compiledExpression = $expression->compile($compilationContext);
-
-                        if ('double' != $compiledExpression->getType()) {
-                            throw new CompilerException(
-                                'Default parameter value type: '
-                                . $compiledExpression->getType()
-                                . ' cannot be assigned to variable(double)',
-                                $parameter
-                            );
-                        }
-
-                        $parameter['default']['type']  = $compiledExpression->getType();
-                        $parameter['default']['value'] = $compiledExpression->getCode();
-
-                        $compilationContext->codePrinter = $oldCodePrinter;
-
-                        return $this->assignDefaultValue($parameter, $compilationContext);
 
                     case 'null':
                         $codePrinter->output($parameter['name'] . ' = 0;');
@@ -449,35 +426,12 @@ public function assignDefaultValue(array $parameter, CompilationContext $compila
 
                 switch ($parameter['default']['type']) {
                     case 'static-constant-access':
-                        /**
-                         * Now I can write code for easy use on Expression because code in this method don't write with codePrinter ;(.
-                         *
-                         * TODO: Rewrite all to codePrinter
-                         */
-                        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
-                            $parameter['name'],
+                        return $this->processStaticConstantAccess(
                             $compilationContext,
-                            $parameter['default']
+                            $parameter,
+                            $oldCodePrinter,
+                            'string'
                         );
-                        $expression     = new Expression($parameter['default']);
-                        $expression->setExpectReturn(true, $symbolVariable);
-                        $compiledExpression = $expression->compile($compilationContext);
-
-                        if ('string' != $compiledExpression->getType()) {
-                            throw new CompilerException(
-                                'Default parameter value type: '
-                                . $compiledExpression->getType()
-                                . ' cannot be assigned to variable(string)',
-                                $parameter
-                            );
-                        }
-
-                        $parameter['default']['type']  = $compiledExpression->getType();
-                        $parameter['default']['value'] = $compiledExpression->getCode();
-
-                        $compilationContext->codePrinter = $oldCodePrinter;
-
-                        return $this->assignDefaultValue($parameter, $compilationContext);
 
                     case 'null':
                         $compilationContext->backend->initVar($paramVariable, $compilationContext);
@@ -2384,4 +2338,51 @@ private function getParamDataType(array $parameter): string
     {
         return $parameter['data-type'] ?? 'variable';
     }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param array              $parameter
+     * @param Printer            $oldCodePrinter
+     *
+     * @return string
+     * @throws Exception
+     * @throws ReflectionException
+     */
+    private function processStaticConstantAccess(
+        CompilationContext $compilationContext,
+        array $parameter,
+        Printer $oldCodePrinter,
+        string $type
+    ): string {
+        /**
+         * Now I can write code for easy use on Expression because
+         * code in this method don't write with codePrinter ;(.
+         *
+         * TODO: Rewrite all to codePrinter
+         */
+        $symbolVariable = $compilationContext->symbolTable->getVariableForWrite(
+            $parameter['name'],
+            $compilationContext,
+            $parameter['default']
+        );
+        $expression     = new Expression($parameter['default']);
+        $expression->setExpectReturn(true, $symbolVariable);
+        $compiledExpression = $expression->compile($compilationContext);
+
+        if ($type !== $compiledExpression->getType()) {
+            throw new CompilerException(
+                'Default parameter value type: '
+                . $compiledExpression->getType()
+                . ' cannot be assigned to variable(' . $type . ')',
+                $parameter
+            );
+        }
+
+        $parameter['default']['type']  = $compiledExpression->getType();
+        $parameter['default']['value'] = $compiledExpression->getCode();
+
+        $compilationContext->codePrinter = $oldCodePrinter;
+
+        return $this->assignDefaultValue($parameter, $compilationContext);
+    }
 }
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 72ade68ca8..6c4f063460 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -15,6 +15,7 @@
 
 use Exception;
 use Throwable;
+use Zephir\CompiledExpression;
 use Zephir\Variable\Variable;
 
 use function is_array;
@@ -102,7 +103,7 @@ public static function cannotUseNonInitializedVariableAsObject(
      *
      * @return self
      */
-    public static function cannotUseVariableTypeAs(
+    public static function cannotUseValueTypeAs(
         Variable $variable,
         string $asType,
         array | null $extra = null,
@@ -110,7 +111,7 @@ public static function cannotUseVariableTypeAs(
         Exception | Throwable $previous = null
     ): self {
         return new self(
-            'Cannot use variable type: ' . $variable->getType() . ' ' . $asType,
+            'Cannot use value type: ' . $variable->getType() . ' as ' . $asType,
             $extra,
             $code,
             $previous
@@ -126,7 +127,7 @@ public static function cannotUseVariableTypeAs(
      *
      * @return self
      */
-    public static function cannotUseValueTypeAs(
+    public static function cannotUseVariableTypeAs(
         Variable $variable,
         string $asType,
         array | null $extra = null,
@@ -134,7 +135,7 @@ public static function cannotUseValueTypeAs(
         Exception | Throwable $previous = null
     ): self {
         return new self(
-            'Cannot use value type: ' . $variable->getType() . ' as ' . $asType,
+            'Cannot use variable type: ' . $variable->getType() . ' ' . $asType,
             $extra,
             $code,
             $previous
@@ -208,4 +209,52 @@ public static function returnValuesVariantVars(
             $previous
         );
     }
+
+    /**
+     * Unknown variable type
+     *
+     * @param CompiledExpression       $expression
+     * @param array|null               $extra
+     * @param int                      $code
+     * @param Exception|Throwable|null $previous
+     *
+     * @return self
+     */
+    public static function unknownType(
+        Variable $variable,
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            "Unknown '" . $variable->getType() . "'",
+            $extra,
+            $code,
+            $previous
+        );
+    }
+
+    /**
+     * Unsupported Type
+     *
+     * @param CompiledExpression       $expression
+     * @param array|null               $extra
+     * @param int                      $code
+     * @param Exception|Throwable|null $previous
+     *
+     * @return self
+     */
+    public static function unsupportedType(
+        CompiledExpression $expression,
+        array | null $extra = null,
+        int $code = 0,
+        Exception | Throwable $previous = null
+    ): self {
+        return new self(
+            'Unsupported type: ' . $expression->getType(),
+            $extra,
+            $code,
+            $previous
+        );
+    }
 }
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index c37cd45af1..1240124721 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -732,12 +732,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                     default:
-                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
+                        throw CompilerException::unknownType($variableLeft, $expression);
                 }
             // no break
 
             default:
-                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
+                throw CompilerException::unsupportedType($left, $expression);
         }
     }
 
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index acbc1194f4..065a181b20 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -344,24 +344,35 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'ulong':
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_div_long_long(' . $variableLeft->getName(
-                                            ) . ', ' . $variableRight->getName() . ')',
+                                            'zephir_safe_div_long_long('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $variableRight->getName()
+                                            . ')',
                                             $expression
                                         );
 
                                     case 'double':
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_div_long_double(' . $variableLeft->getName(
-                                            ) . ', ' . $variableRight->getName() . ')',
+                                            'zephir_safe_div_long_double('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $variableRight->getName()
+                                            . ')',
                                             $expression
                                         );
 
                                     case 'bool':
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_div_long_long(' . $variableLeft->getName(
-                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',
+                                            'zephir_safe_div_long_long('
+                                            . $variableLeft->getName()
+                                            . ' '
+                                            . $this->bitOperator
+                                            . ' '
+                                            . $variableRight->getName()
+                                            . ')',
                                             $expression
                                         );
 
@@ -370,8 +381,11 @@ public function compile($expression, CompilationContext $compilationContext)
                                         if ($variableRight->isLocalOnly()) {
                                             return new CompiledExpression(
                                                 'double',
-                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
-                                                ) . ', &' . $variableRight->getName() . ')',
+                                                'zephir_safe_div_long_zval('
+                                                . $variableLeft->getName()
+                                                . ', &'
+                                                . $variableRight->getName()
+                                                . ')',
                                                 $expression
                                             );
                                         } else {
@@ -381,8 +395,11 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                             return new CompiledExpression(
                                                 'double',
-                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
-                                                ) . ', ' . $variableRightCode . ')',
+                                                'zephir_safe_div_long_zval('
+                                                . $variableLeft->getName()
+                                                . ', '
+                                                . variableRightCode
+                                                . ')',
                                                 $expression
                                             );
                                         }
@@ -390,8 +407,9 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     default:
                                         throw new CompilerException(
-                                            "Cannot operate variable('int') with variable('" . $variableRight->getType(
-                                            ) . "')",
+                                            "Cannot operate variable('int') with variable('"
+                                            . $variableRight->getType()
+                                            . "')",
                                             $expression
                                         );
                                 }
@@ -466,8 +484,11 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_div_double_zval(' . $variableLeft->getName(
-                                            ) . ', ' . $symbolRight . ')',
+                                            'zephir_safe_div_double_zval('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $symbolRight
+                                            . ')',
                                             $expression
                                         );
 
@@ -489,9 +510,11 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                     case 'string':
-                        throw new CompilerException("Cannot operate string variables'", $expression);
                     case 'array':
-                        throw new CompilerException("Cannot operate array variables'", $expression);
+                        throw new CompilerException(
+                            'Cannot operate ' . $variableLeft->getType() . " variables'",
+                            $expression
+                        );
                     case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
@@ -571,7 +594,11 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $variableRight->setIdle(true);
                                         }
 
-                                        return new CompiledExpression('variable', $expected->getName(), $expression);
+                                        return new CompiledExpression(
+                                            'variable',
+                                            $expected->getName(),
+                                            $expression
+                                        );
 
                                     default:
                                         throw new CompilerException(
@@ -715,12 +742,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                     default:
-                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
+                        throw CompilerException::unknownType($variableLeft, $expression);
                 }
 
 
             default:
-                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
+                throw CompilerException::unsupportedType($left, $expression);
         }
     }
 }
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 49aa132758..b1bf01e706 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -499,8 +499,11 @@ public function compile($expression, CompilationContext $compilationContext)
                                         } else {
                                             return new CompiledExpression(
                                                 'double',
-                                                'zephir_safe_mod_double_zval(' . $variableLeft->getName(
-                                                ) . ', ' . $variableRight->getName() . ')',
+                                                'zephir_safe_mod_double_zval('
+                                                . $variableLeft->getName()
+                                                . ', '
+                                                . $variableRight->getName()
+                                                . ')',
                                                 $expression
                                             );
                                         }
@@ -746,18 +749,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                     default:
-                        throw new CompilerException(
-                            "Unknown '" . $variableLeft->getType() . "'",
-                            $expression
-                        );
+                        throw CompilerException::unknownType($variableLeft, $expression);
                 }
 
 
             default:
-                throw new CompilerException(
-                    'Unsupported type: ' . $left->getType(),
-                    $expression
-                );
+                throw CompilerException::unsupportedType($left, $expression);
         }
     }
 }
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index a56400625c..35fe90151c 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -664,12 +664,12 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                     default:
-                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
+                        throw CompilerException::unknownType($variableLeft, $expression);
                 }
 
 
             default:
-                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
+                throw CompilerException::unsupportedType($left, $expression);
         }
     }
 
diff --git a/src/Operators/Logical/LogicalBaseOperator.php b/src/Operators/Logical/LogicalBaseOperator.php
index 9b5a30d35e..62e3d67285 100644
--- a/src/Operators/Logical/LogicalBaseOperator.php
+++ b/src/Operators/Logical/LogicalBaseOperator.php
@@ -560,12 +560,12 @@ public function compile($expression, CompilationContext $compilationContext): Co
 
 
                     default:
-                        throw new CompilerException("Unknown '" . $variableLeft->getType() . "'", $expression);
+                        throw CompilerException::unknownType($variableLeft, $expression);
                 }
 
 
             default:
-                throw new CompilerException('Unsupported type: ' . $left->getType(), $expression);
+                throw CompilerException::unsupportedType($left, $expression);
         }
     }
 }
diff --git a/src/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
index 478919b295..95ba9fa4ce 100644
--- a/src/Statements/Let/StaticProperty.php
+++ b/src/Statements/Let/StaticProperty.php
@@ -20,421 +20,179 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\Traits\VariablesTrait;
+use Zephir\Variable\Variable;
 
 use function sprintf;
 
 /**
  * Updates static properties
  */
-class StaticProperty
+class StaticProperty extends StaticPropertySub
 {
     use VariablesTrait;
 
+    protected string $methodName = 'updateStaticProperty';
+
     /**
-     * Compiles ClassName::foo = {expr}.
-     *
-     * @param string             $className
-     * @param string             $property
-     * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
      * @param array              $statement
+     * @param string             $classEntry
+     * @param string             $property
+     * @param Variable           $variableVariable
      *
+     * @return void
      * @throws ReflectionException
      */
-    public function assignStatic(
-        string $className,
-        string $property,
-        CompiledExpression $resolvedExpr,
+    protected function processDefaultType(
         CompilationContext $compilationContext,
-        array $statement
+        array $statement,
+        string $classEntry,
+        string $property,
+        Variable $variableVariable
     ): void {
-        $classDefinition = $compilationContext->classLookup($className);
-
-        if (!$propertyDefinition = $classDefinition->getProperty($property)) {
-            throw CompilerException::classDoesNotHaveProperty(
-                $classDefinition->getCompleteName(),
-                $property,
-                $statement
-            );
-        }
-
-        $this->checkAccessNonStaticProperty(
-            $propertyDefinition,
-            $classDefinition,
-            $property,
-            $statement
-        );
-
-        if ($propertyDefinition->isPrivate()) {
-            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {
-                throw new CompilerException(
-                    sprintf(
-                        "Cannot access private static property '%s::%s out of its declaring context",
-                        $classDefinition->getCompleteName(),
-                        $property
-                    ),
-                    $statement
-                );
-            }
-        }
-
-        $codePrinter = $compilationContext->codePrinter;
-        $compilationContext->headersManager->add('kernel/object');
-
-        try {
-            $classEntry = $classDefinition->getClassEntry($compilationContext);
-        } catch (Exception $e) {
-            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);
-        }
-
-        switch ($resolvedExpr->getType()) {
-            case 'null':
-                $compilationContext->backend->updateStaticProperty($classEntry, $property, 'null', $compilationContext);
-                break;
-
-            case 'int':
-            case 'uint':
-            case 'long':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignLong(
-                    $tempVariable,
-                    $resolvedExpr->getBooleanCode(),
-                    $compilationContext
-                );
-                $compilationContext->backend->updateStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'char':
-            case 'uchar':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignLong(
-                    $tempVariable,
-                    '\'' . $resolvedExpr->getCode() . '\'',
-                    $compilationContext
-                );
-                $compilationContext->backend->updateStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
-            case 'double':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->assignDouble(
-                    $tempVariable,
-                    $resolvedExpr->getCode(),
-                    $compilationContext
-                );
-                $compilationContext->backend->updateStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-                break;
-
+        switch ($variableVariable->getType()) {
             case 'string':
-                // TODO: add-assign
-                if ('assign' !== $statement['operator']) {
-                    throw CompilerException::illegalOperationTypeOnStaticVariable(
-                        $statement['operator'],
-                        $resolvedExpr->getType(),
-                        $statement
-                    );
-                }
-
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $tempVariable->initVariant($compilationContext);
-
-                if ($resolvedExpr->getCode()) {
-                    $compilationContext->backend->assignString(
-                        $tempVariable,
-                        $resolvedExpr->getCode(),
-                        $compilationContext
-                    );
-                } else {
-                    $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
-                }
-
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
-
-                $compilationContext->backend->updateStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                break;
-
-            case 'bool':
-                if ('1' == $resolvedExpr->getBooleanCode()) {
-                    $compilationContext->backend->updateStaticProperty(
-                        $classEntry,
-                        $property,
-                        'true',
-                        $compilationContext
-                    );
-                } else {
-                    if ('0' == $resolvedExpr->getBooleanCode()) {
-                        $compilationContext->backend->updateStaticProperty(
-                            $classEntry,
-                            $property,
-                            'false',
+                switch ($statement['operator']) {
+                    /* @noinspection PhpMissingBreakStatementInspection */
+                    case 'concat-assign':
+                        $tempVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
+                            'variable',
                             $compilationContext
                         );
-                    } else {
-                        $codePrinter->output('if (' . $resolvedExpr->getBooleanCode() . ') {');
-                        $codePrinter->increaseLevel();
-                        $compilationContext->backend->updateStaticProperty(
-                            $classEntry,
-                            $property,
-                            'true',
-                            $compilationContext
+                        $expression   = new Expression([
+                            'type'  => 'static-property-access',
+                            'left'  => [
+                                'value' => $statement['variable'],
+                            ],
+                            'right' => [
+                                'value' => $statement['property'],
+                            ],
+                        ]);
+                        $expression->setExpectReturn(true, $tempVariable);
+
+                        try {
+                            $expression->compile($compilationContext);
+                        } catch (Exception $e) {
+                            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);
+                        }
+
+                        $variableVariableCode = $compilationContext->backend->getVariableCode(
+                            $variableVariable
+                        );
+                        $tempVariableCode     = $compilationContext->backend->getVariableCode($tempVariable);
+                        $compilationContext->codePrinter->output(
+                            'SEPARATE_ZVAL(' . $variableVariableCode . ');'
+                        );
+                        $compilationContext->codePrinter->output(
+                            'zephir_concat_function(' . $variableVariableCode . ', ' . $tempVariableCode . ', ' . $variableVariableCode . ');'
                         );
-                        $codePrinter->decreaseLevel();
-                        $codePrinter->output('} else {');
-                        $codePrinter->increaseLevel();
+                    // no break
+                    case 'assign':
                         $compilationContext->backend->updateStaticProperty(
                             $classEntry,
                             $property,
-                            'false',
+                            $variableVariable,
                             $compilationContext
                         );
-                        $codePrinter->decreaseLevel();
-                        $codePrinter->output('}');
-                    }
-                }
-                break;
-
-            case 'empty-array':
-                $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                    'variable',
-                    $compilationContext,
-                    true
-                );
-                $compilationContext->backend->initArray($tempVariable, $compilationContext);
-                $compilationContext->backend->updateStaticProperty(
-                    $classEntry,
-                    $property,
-                    $tempVariable,
-                    $compilationContext
-                );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
+                        if ($variableVariable->isTemporal()) {
+                            $variableVariable->setIdle(true);
+                        }
+                        break;
+                    default:
+                        throw CompilerException::illegalOperationTypeOnStaticVariable(
+                            $statement['operator'],
+                            $variableVariable->getType(),
+                            $statement
+                        );
                 }
                 break;
-
+            case 'variable':
             case 'array':
                 $compilationContext->backend->updateStaticProperty(
                     $classEntry,
                     $property,
-                    $resolvedExpr,
+                    $variableVariable,
                     $compilationContext
                 );
+                if ($variableVariable->isTemporal()) {
+                    $variableVariable->setIdle(true);
+                }
                 break;
 
-            case 'variable':
-                $variableVariable = $compilationContext->symbolTable->getVariableForRead(
-                    $resolvedExpr->getCode(),
-                    $compilationContext,
+            default:
+                throw new CompilerException(
+                    'Unknown type ' . $variableVariable->getType(),
                     $statement
                 );
+        }
+    }
 
-                switch ($variableVariable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                    case 'char':
-                    case 'uchar':
-                        // TODO: mul-assign, div-assign, sub-assign, add-assign
-                        if ('assign' !== $statement['operator']) {
-                            throw CompilerException::illegalOperationTypeOnStaticVariable(
-                                $statement['operator'],
-                                $variableVariable->getType(),
-                                $statement
-                            );
-                        }
-
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-
-                        $compilationContext->backend->assignLong($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-
-                    case 'double':
-                        // TODO: mul-assign, div-assign, sub-assign, add-assign
-                        if ('assign' !== $statement['operator']) {
-                            throw CompilerException::illegalOperationTypeOnStaticVariable(
-                                $statement['operator'],
-                                $variableVariable->getType(),
-                                $statement
-                            );
-                        }
-
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-
-                        $compilationContext->backend->assignDouble(
-                            $tempVariable,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        $compilationContext->backend->updateStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-
-                    case 'bool':
-                        $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
-                            'variable',
-                            $compilationContext,
-                            true
-                        );
-                        $compilationContext->backend->assignBool($tempVariable, $variableVariable, $compilationContext);
-                        $compilationContext->backend->updateStaticProperty(
-                            $classEntry,
-                            $property,
-                            $tempVariable,
-                            $compilationContext
-                        );
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
-                        break;
-
-                    case 'string':
-                        switch ($statement['operator']) {
-                            /* @noinspection PhpMissingBreakStatementInspection */
-                            case 'concat-assign':
-                                $tempVariable = $compilationContext->symbolTable->getTempVariableForObserveOrNullify(
-                                    'variable',
-                                    $compilationContext
-                                );
-                                $expression   = new Expression([
-                                    'type'  => 'static-property-access',
-                                    'left'  => [
-                                        'value' => $statement['variable'],
-                                    ],
-                                    'right' => [
-                                        'value' => $statement['property'],
-                                    ],
-                                ]);
-                                $expression->setExpectReturn(true, $tempVariable);
 
-                                try {
-                                    $expression->compile($compilationContext);
-                                } catch (Exception $e) {
-                                    throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);
-                                }
+    /**
+     * @param CompiledExpression $resolvedExpr
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     *
+     * @return Variable
+     */
+    protected function processStringType(
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): Variable {
+        // TODO: add-assign
+        if ('assign' !== $statement['operator']) {
+            throw CompilerException::illegalOperationTypeOnStaticVariable(
+                $statement['operator'],
+                $resolvedExpr->getType(),
+                $statement
+            );
+        }
 
-                                $variableVariableCode = $compilationContext->backend->getVariableCode(
-                                    $variableVariable
-                                );
-                                $tempVariableCode     = $compilationContext->backend->getVariableCode($tempVariable);
-                                $compilationContext->codePrinter->output(
-                                    'SEPARATE_ZVAL(' . $variableVariableCode . ');'
-                                );
-                                $compilationContext->codePrinter->output(
-                                    'zephir_concat_function(' . $variableVariableCode . ', ' . $tempVariableCode . ', ' . $variableVariableCode . ');'
-                                );
-                            // no break
-                            case 'assign':
-                                $compilationContext->backend->updateStaticProperty(
-                                    $classEntry,
-                                    $property,
-                                    $variableVariable,
-                                    $compilationContext
-                                );
-                                if ($variableVariable->isTemporal()) {
-                                    $variableVariable->setIdle(true);
-                                }
-                                break;
-                            default:
-                                throw CompilerException::illegalOperationTypeOnStaticVariable(
-                                    $statement['operator'],
-                                    $variableVariable->getType(),
-                                    $statement
-                                );
-                        }
-                        break;
-                    case 'variable':
-                    case 'array':
-                        $compilationContext->backend->updateStaticProperty(
-                            $classEntry,
-                            $property,
-                            $variableVariable,
-                            $compilationContext
-                        );
-                        if ($variableVariable->isTemporal()) {
-                            $variableVariable->setIdle(true);
-                        }
-                        break;
+        return $compilationContext->symbolTable->getTempNonTrackedVariable(
+            'variable',
+            $compilationContext,
+            true
+        );
+    }
 
-                    default:
-                        throw new CompilerException('Unknown type ' . $variableVariable->getType(), $statement);
-                }
-                break;
+    /**
+     * @param array    $statement
+     * @param Variable $variableVariable
+     *
+     * @return void
+     */
+    protected function processVariableDoubleType(
+        array $statement,
+        Variable $variableVariable
+    ): void {
+        // TODO: mul-assign, div-assign, sub-assign, add-assign
+        if ('assign' !== $statement['operator']) {
+            throw CompilerException::illegalOperationTypeOnStaticVariable(
+                $statement['operator'],
+                $variableVariable->getType(),
+                $statement
+            );
+        }
+    }
 
-            default:
-                throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
+    /**
+     * @param array    $statement
+     * @param Variable $variableVariable
+     *
+     * @return void
+     */
+    protected function processVariableIntType(
+        array $statement,
+        Variable $variableVariable
+    ): void {
+        // TODO: mul-assign, div-assign, sub-assign, add-assign
+        if ('assign' !== $statement['operator']) {
+            throw CompilerException::illegalOperationTypeOnStaticVariable(
+                $statement['operator'],
+                $variableVariable->getType(),
+                $statement
+            );
         }
     }
 }
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index 2fbfb9d3b8..a7e93d9c2a 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -19,6 +19,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\IllegalOperationException;
 use Zephir\Traits\VariablesTrait;
+use Zephir\Variable\Variable;
 
 use function sprintf;
 
@@ -167,10 +168,10 @@ public function assignStatic(
                 break;
 
             case 'string':
-                $tempVariable = $compilationContext->symbolTable->getTempVariableForWrite(
-                    'variable',
+                $tempVariable = $this->processStringType(
+                    $resolvedExpr,
                     $compilationContext,
-                    true
+                    $statement
                 );
                 $tempVariable->initVariant($compilationContext);
 
@@ -277,6 +278,11 @@ public function assignStatic(
                     case 'ulong':
                     case 'char':
                     case 'uchar':
+                        $this->processVariableIntType(
+                            $statement,
+                            $variableVariable
+                        );
+
                         $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
                             'variable',
                             $compilationContext,
@@ -297,6 +303,11 @@ public function assignStatic(
                         break;
 
                     case 'double':
+                        $this->processVariableDoubleType(
+                            $statement,
+                            $variableVariable
+                        );
+
                         $tempVariable = $compilationContext->symbolTable->getTempNonTrackedVariable(
                             'variable',
                             $compilationContext,
@@ -338,15 +349,13 @@ public function assignStatic(
                         }
                         break;
                     default:
-                        $compilationContext->backend->$method(
+                        $this->processDefaultType(
+                            $compilationContext,
+                            $statement,
                             $classEntry,
                             $property,
-                            $variableVariable,
-                            $compilationContext
+                            $variableVariable
                         );
-                        if ($variableVariable->isTemporal()) {
-                            $variableVariable->setIdle(true);
-                        }
                         break;
                 }
 
@@ -356,4 +365,78 @@ public function assignStatic(
                 throw new CompilerException('Unknown type ' . $resolvedExpr->getType(), $statement);
         }
     }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     * @param string             $classEntry
+     * @param string             $property
+     * @param Variable           $variableVariable
+     *
+     * @return void
+     */
+    protected function processDefaultType(
+        CompilationContext $compilationContext,
+        array $statement,
+        string $classEntry,
+        string $property,
+        Variable $variableVariable
+    ): void {
+        $method = $this->methodName;
+        $compilationContext->backend->$method(
+            $classEntry,
+            $property,
+            $variableVariable,
+            $compilationContext
+        );
+        if ($variableVariable->isTemporal()) {
+            $variableVariable->setIdle(true);
+        }
+    }
+
+
+    /**
+     * @param array    $statement
+     * @param Variable $variableVariable
+     *
+     * @return void
+     */
+    protected function processVariableDoubleType(
+        array $statement,
+        Variable $variableVariable
+    ): void {
+        // Nothing
+    }
+
+    /**
+     * @param CompiledExpression $resolvedExpr
+     * @param CompilationContext $compilationContext
+     * @param array              $statement
+     *
+     * @return Variable
+     */
+    protected function processStringType(
+        CompiledExpression $resolvedExpr,
+        CompilationContext $compilationContext,
+        array $statement
+    ): Variable {
+        return $compilationContext->symbolTable->getTempVariableForWrite(
+            'variable',
+            $compilationContext
+        );
+    }
+
+
+    /**
+     * @param array    $statement
+     * @param Variable $variableVariable
+     *
+     * @return void
+     */
+    protected function processVariableIntType(
+        array $statement,
+        Variable $variableVariable
+    ): void {
+        // Nothing
+    }
 }

From d7b5e1f11863219cf5a3d8ba6a7e8cb644f3f2db Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 5 Dec 2023 15:17:38 -0600
Subject: [PATCH 303/375] phpcs

---
 src/Class/Method/Method.php                   |   1 +
 src/CompilerFile.php                          |   5 -
 src/CompilerFileAnonymous.php                 |   9 -
 src/Console/Command/RemoveOptionsTrait.php    |   1 -
 src/Exception/CompilerException.php           |   1 -
 src/Expression/Closure.php                    |   8 +-
 .../Arithmetical/ArithmeticalBaseOperator.php |  92 +++----
 src/Operators/Arithmetical/DivOperator.php    |   4 +-
 src/Operators/Arithmetical/ModOperator.php    |   2 -
 src/Operators/Bitwise/BitwiseBaseOperator.php |   2 +-
 .../FunctionCall/ArrayKeysOptimizer.php       |   1 -
 .../FunctionCall/CreateInstanceOptimizer.php  |   4 +-
 .../CreateInstanceParamsOptimizer.php         |   3 +-
 .../FunctionCall/GetClassNsOptimizer.php      |   4 +-
 src/Optimizers/FunctionCall/PowOptimizer.php  |   4 +-
 .../FunctionCall/UniqueKeyOptimizer.php       |  27 +-
 src/Optimizers/OptimizerAbstract.php          |  34 +--
 src/Statements/Let/ExportSymbol.php           |  10 +-
 src/Statements/Let/ExportSymbolString.php     |  12 +-
 src/Statements/Let/StaticProperty.php         |   2 -
 src/Statements/Let/StaticPropertySub.php      |  26 +-
 src/Statements/Let/Variable.php               | 260 +++++++++---------
 src/Statements/LetStatement.php               |   4 +-
 src/Statements/SwitchStatement.php            |   2 +-
 24 files changed, 246 insertions(+), 272 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 486d0690f8..019b71454a 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -2343,6 +2343,7 @@ private function getParamDataType(array $parameter): string
      * @param CompilationContext $compilationContext
      * @param array              $parameter
      * @param Printer            $oldCodePrinter
+     * @param string             $type
      *
      * @return string
      * @throws Exception
diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index 1efbc53d8e..0c730fcb44 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -33,23 +33,18 @@
 
 use function array_map;
 use function count;
-use function dirname;
 use function explode;
 use function file_exists;
 use function file_put_contents;
 use function filemtime;
-use function implode;
 use function is_array;
-use function is_dir;
 use function json_decode;
 use function json_encode;
 use function md5;
-use function mkdir;
 use function preg_match;
 use function realpath;
 use function sprintf;
 use function str_replace;
-use function strpos;
 use function strtolower;
 use function substr;
 use function trim;
diff --git a/src/CompilerFileAnonymous.php b/src/CompilerFileAnonymous.php
index 59d0551722..d818991448 100644
--- a/src/CompilerFileAnonymous.php
+++ b/src/CompilerFileAnonymous.php
@@ -21,20 +21,11 @@
 use Zephir\Compiler\FileInterface;
 use Zephir\Traits\CompilerTrait;
 
-use function count;
-use function dirname;
 use function file_exists;
 use function file_put_contents;
 use function hash_file;
-use function implode;
-use function is_dir;
 use function md5;
-use function mkdir;
-use function str_replace;
-use function strpos;
-use function strtolower;
 
-use const DIRECTORY_SEPARATOR;
 use const PHP_EOL;
 
 /**
diff --git a/src/Console/Command/RemoveOptionsTrait.php b/src/Console/Command/RemoveOptionsTrait.php
index 99636d39e0..b55398cd3d 100644
--- a/src/Console/Command/RemoveOptionsTrait.php
+++ b/src/Console/Command/RemoveOptionsTrait.php
@@ -13,7 +13,6 @@
 
 namespace Zephir\Console\Command;
 
-use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
 
 use function array_filter;
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 6c4f063460..b5a66919bc 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -213,7 +213,6 @@ public static function returnValuesVariantVars(
     /**
      * Unknown variable type
      *
-     * @param CompiledExpression       $expression
      * @param array|null               $extra
      * @param int                      $code
      * @param Exception|Throwable|null $previous
diff --git a/src/Expression/Closure.php b/src/Expression/Closure.php
index 25e4585fda..e9fc8e221d 100644
--- a/src/Expression/Closure.php
+++ b/src/Expression/Closure.php
@@ -199,11 +199,11 @@ public function setReadOnly(bool $readOnly): void
     }
 
     /**
-     * @param Definition $classDefinition
-     * @param Method $classMethod
-     * @param mixed $block
+     * @param Definition         $classDefinition
+     * @param Method             $classMethod
+     * @param mixed              $block
      * @param CompilationContext $compilationContext
-     * @param array $expression
+     * @param array              $expression
      *
      * @return Variable|null
      */
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 1240124721..2cfde5152c 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -615,7 +615,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
                                 }
                         }
-                        // no break
+                    // no break
 
                     case 'variable':
                         switch ($right->getType()) {
@@ -815,35 +815,30 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
     }
 
     /**
-     * Returns proper dynamic types.
-     *
-     * @param Variable $left
-     * @param Variable $right
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
      *
-     * @return string
+     * @return array
+     * @throws ReflectionException
+     * @throws ZephirException
      */
-    private function getDynamicTypes(Variable $left, Variable $right): string
-    {
-        if ('/' === $this->operator) {
-            return 'double';
-        }
+    protected function preCompileChecks(
+        array $expression,
+        CompilationContext $compilationContext
+    ): array {
+        $this->checkLeft($expression);
+        $this->checkRight($expression);
 
-        switch ($left->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        return 'int';
-                }
-                break;
-        }
+        $leftExpr = new Expression($expression['left']);
+        $leftExpr->setReadOnly(true);
+        $left = $leftExpr->compile($compilationContext);
 
-        return 'double';
+        $rightExpr = new Expression($expression['right']);
+        $rightExpr->setReadOnly(true);
+        $right = $rightExpr->compile($compilationContext);
+
+        $compilationContext->headersManager->add('kernel/operators');
+        return [$left, $right];
     }
 
     /**
@@ -881,29 +876,34 @@ protected function processLeftBoolean(
     }
 
     /**
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
+     * Returns proper dynamic types.
      *
-     * @return array
-     * @throws ReflectionException
-     * @throws ZephirException
+     * @param Variable $left
+     * @param Variable $right
+     *
+     * @return string
      */
-    protected function preCompileChecks(
-        array $expression,
-        CompilationContext $compilationContext
-    ): array {
-        $this->checkLeft($expression);
-        $this->checkRight($expression);
-
-        $leftExpr = new Expression($expression['left']);
-        $leftExpr->setReadOnly(true);
-        $left = $leftExpr->compile($compilationContext);
+    private function getDynamicTypes(Variable $left, Variable $right): string
+    {
+        if ('/' === $this->operator) {
+            return 'double';
+        }
 
-        $rightExpr = new Expression($expression['right']);
-        $rightExpr->setReadOnly(true);
-        $right = $rightExpr->compile($compilationContext);
+        switch ($left->getType()) {
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        return 'int';
+                }
+                break;
+        }
 
-        $compilationContext->headersManager->add('kernel/operators');
-        return [$left, $right];
+        return 'double';
     }
 }
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 065a181b20..bea87e8093 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -16,8 +16,6 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-use Zephir\Types\Types;
 
 /**
  * Generates an arithmetical operation according to the operands
@@ -398,7 +396,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                 'zephir_safe_div_long_zval('
                                                 . $variableLeft->getName()
                                                 . ', '
-                                                . variableRightCode
+                                                . $variableRightCode
                                                 . ')',
                                                 $expression
                                             );
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index b1bf01e706..0a1860663e 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -16,8 +16,6 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Expression;
-use Zephir\Types\Types;
 
 /**
  * Generates an arithmetical operation according to the operands
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index 35fe90151c..0b9feefee1 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -614,7 +614,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     case 'uint':
                                     case 'long':
                                     case 'ulong':
-                                    /* a(var) + a(bool) */
+                                        /* a(var) + a(bool) */
                                     case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
 
diff --git a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
index 8f2a59f74d..07474bd162 100644
--- a/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
+++ b/src/Optimizers/FunctionCall/ArrayKeysOptimizer.php
@@ -16,7 +16,6 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
-use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
diff --git a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
index 8482c4c318..2dfd042b92 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceOptimizer.php
@@ -98,9 +98,9 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
     protected function getOutput(string $symbol, array $resolvedParams): string
     {
         return 'ZEPHIR_LAST_CALL_STATUS = '
-            . 'zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');'
-        ;
+            . 'zephir_create_instance(' . $symbol . ', ' . $resolvedParams[0] . ');';
     }
+
     /**
      * @param Call               $call
      * @param CompilationContext $context
diff --git a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
index 0e4fca5c84..9c99c296af 100644
--- a/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php
@@ -35,8 +35,7 @@ class CreateInstanceParamsOptimizer extends CreateInstanceOptimizer
     protected function getOutput(string $symbol, array $resolvedParams): string
     {
         return 'ZEPHIR_LAST_CALL_STATUS = '
-            . 'zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
-        ;
+            . 'zephir_create_instance_params(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');';
     }
 
     /**
diff --git a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
index 03a54016e2..949c1844b2 100644
--- a/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassNsOptimizer.php
@@ -56,9 +56,9 @@ protected function getOutput(
         $output = 'zephir_get_class_ns(' . $symbol . ', ' . $resolvedParams[0];
 
         if (!isset($resolvedParams[1])) {
-            $output .=  ', 0);';
+            $output .= ', 0);';
         } else {
-            $output .=  ', ' . $resolvedParams[1] . ');';
+            $output .= ', ' . $resolvedParams[1] . ');';
         }
 
         $context->codePrinter->output($output);
diff --git a/src/Optimizers/FunctionCall/PowOptimizer.php b/src/Optimizers/FunctionCall/PowOptimizer.php
index 471dc819ad..09b652f959 100644
--- a/src/Optimizers/FunctionCall/PowOptimizer.php
+++ b/src/Optimizers/FunctionCall/PowOptimizer.php
@@ -51,8 +51,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
     }
 
     /**
-     * @param CompilationContext             $context
-     * @param Variable|null $symbolVariable
+     * @param CompilationContext $context
+     * @param Variable|null      $symbolVariable
      *
      * @return void
      */
diff --git a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
index d667a5f1e3..3f683cadb6 100644
--- a/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
+++ b/src/Optimizers/FunctionCall/UniqueKeyOptimizer.php
@@ -16,6 +16,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 use Zephir\Variable\Variable;
@@ -52,25 +53,13 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         return $this->processOptimizer($call, $context, $expression);
     }
 
-    /**
-     * @param CompilationContext             $context
-     * @param Variable|null $symbolVariable
-     *
-     * @return void
-     */
-    protected function setHeaders(CompilationContext $context, ?Variable $symbolVariable): void
-    {
-        $context->headersManager->add('kernel/string');
-        $symbolVariable->setDynamicTypes('string');
-    }
-
     /**
      * @param Call               $call
      * @param CompilationContext $context
      * @param array              $expression
      *
      * @return CompiledExpression
-     * @throws \Zephir\Exception
+     * @throws Exception
      */
     protected function processOptimizer(Call $call, CompilationContext $context, array $expression): CompiledExpression
     {
@@ -95,4 +84,16 @@ protected function processOptimizer(Call $call, CompilationContext $context, arr
 
         return new CompiledExpression('variable', $symbolVariable->getRealName(), $expression);
     }
+
+    /**
+     * @param CompilationContext $context
+     * @param Variable|null      $symbolVariable
+     *
+     * @return void
+     */
+    protected function setHeaders(CompilationContext $context, ?Variable $symbolVariable): void
+    {
+        $context->headersManager->add('kernel/string');
+        $symbolVariable->setDynamicTypes('string');
+    }
 }
diff --git a/src/Optimizers/OptimizerAbstract.php b/src/Optimizers/OptimizerAbstract.php
index 06e0bc8698..414fbc4cf7 100644
--- a/src/Optimizers/OptimizerAbstract.php
+++ b/src/Optimizers/OptimizerAbstract.php
@@ -32,6 +32,23 @@ abstract class OptimizerAbstract
      */
     abstract public function optimize(array $expression, Call $call, CompilationContext $context);
 
+    /**
+     * @param Call               $call
+     * @param Variable|null      $symbolVariable
+     * @param CompilationContext $context
+     *
+     * @return void
+     */
+    protected function checkInitSymbolVariable(
+        Call $call,
+        ?Variable $symbolVariable,
+        CompilationContext $context
+    ): void {
+        if ($call->mustInitSymbolVariable()) {
+            $symbolVariable->initVariant($context);
+        }
+    }
+
     /**
      * @param Call               $call
      * @param CompilationContext $context
@@ -65,21 +82,4 @@ protected function processStringOptimizer(Call $call, CompilationContext $contex
 
         return [$symbolVariable, $resolvedParams, $symbol];
     }
-
-    /**
-     * @param Call               $call
-     * @param Variable|null      $symbolVariable
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
-    protected function checkInitSymbolVariable(
-        Call $call,
-        ?Variable $symbolVariable,
-        CompilationContext $context
-    ): void {
-        if ($call->mustInitSymbolVariable()) {
-            $symbolVariable->initVariant($context);
-        }
-    }
 }
diff --git a/src/Statements/Let/ExportSymbol.php b/src/Statements/Let/ExportSymbol.php
index afbeaac01d..dc93f8cc18 100644
--- a/src/Statements/Let/ExportSymbol.php
+++ b/src/Statements/Let/ExportSymbol.php
@@ -80,11 +80,11 @@ public function assign(
     }
 
     /**
-     * @param CompilationContext|null   $compilationContext
-     * @param ZephirVariable|null       $symbolVariable
-     * @param ZephirVariable            $variable
-     * @param Printer|null              $codePrinter
-     * @param array|null                $statement
+     * @param CompilationContext|null $compilationContext
+     * @param ZephirVariable|null     $symbolVariable
+     * @param ZephirVariable          $variable
+     * @param Printer|null            $codePrinter
+     * @param array|null              $statement
      *
      * @return void
      */
diff --git a/src/Statements/Let/ExportSymbolString.php b/src/Statements/Let/ExportSymbolString.php
index 437df98e0d..2d7cbb28c0 100644
--- a/src/Statements/Let/ExportSymbolString.php
+++ b/src/Statements/Let/ExportSymbolString.php
@@ -15,8 +15,6 @@
 
 use Zephir\Code\Printer;
 use Zephir\CompilationContext;
-use Zephir\CompiledExpression;
-use Zephir\Statements\LetStatement;
 use Zephir\Variable\Variable as ZephirVariable;
 
 /**
@@ -31,11 +29,11 @@ class ExportSymbolString extends ExportSymbol
      */
 
     /**
-     * @param CompilationContext|null   $compilationContext
-     * @param ZephirVariable|null       $symbolVariable
-     * @param ZephirVariable            $variable
-     * @param Printer|null              $codePrinter
-     * @param array|null                $statement
+     * @param CompilationContext|null $compilationContext
+     * @param ZephirVariable|null     $symbolVariable
+     * @param ZephirVariable          $variable
+     * @param Printer|null            $codePrinter
+     * @param array|null              $statement
      *
      * @return void
      */
diff --git a/src/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
index 95ba9fa4ce..2d89bfda65 100644
--- a/src/Statements/Let/StaticProperty.php
+++ b/src/Statements/Let/StaticProperty.php
@@ -22,8 +22,6 @@
 use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable;
 
-use function sprintf;
-
 /**
  * Updates static properties
  */
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index a7e93d9c2a..d85a049eeb 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -394,20 +394,6 @@ protected function processDefaultType(
         }
     }
 
-
-    /**
-     * @param array    $statement
-     * @param Variable $variableVariable
-     *
-     * @return void
-     */
-    protected function processVariableDoubleType(
-        array $statement,
-        Variable $variableVariable
-    ): void {
-        // Nothing
-    }
-
     /**
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
@@ -426,6 +412,18 @@ protected function processStringType(
         );
     }
 
+    /**
+     * @param array    $statement
+     * @param Variable $variableVariable
+     *
+     * @return void
+     */
+    protected function processVariableDoubleType(
+        array $statement,
+        Variable $variableVariable
+    ): void {
+        // Nothing
+    }
 
     /**
      * @param array    $statement
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 1211cfe260..38ad92ff09 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -502,6 +502,40 @@ private function doDoubleAssignment(
         }
     }
 
+    /**
+     * @param array              $statement
+     * @param Printer            $codePrinter
+     * @param string             $variable
+     * @param CompiledExpression $resolvedExpr
+     * @param string             $value
+     *
+     * @return void
+     */
+    private function doNumberAssignmentNull(
+        array $statement,
+        Printer $codePrinter,
+        string $variable,
+        CompiledExpression $resolvedExpr,
+        string $value
+    ): void {
+        switch ($statement['operator']) {
+            case 'assign':
+                $codePrinter->output($variable . ' = ' . $value . ';');
+                break;
+            case 'add-assign':
+                $codePrinter->output($variable . ' += ' . $value . ';');
+                break;
+            case 'sub-assign':
+                $codePrinter->output($variable . ' -= ' . $value . ';');
+                break;
+            case 'mul-assign':
+                $codePrinter->output($variable . ' *= ' . $value . ';');
+                break;
+            default:
+                throw new IllegalOperationException($statement, $resolvedExpr);
+        }
+    }
+
     /**
      * Performs numeric assignment.
      *
@@ -537,7 +571,7 @@ private function doNumericAssignment(
                     'mul-assign' => ' *= ',
                     'div-assign' => ' /= ',
                     'mod-assign' => ' %= ',
-                    default => throw new IllegalOperationException($statement, $resolvedExpr)
+                    default      => throw new IllegalOperationException($statement, $resolvedExpr)
                 };
 
                 $codePrinter->output($variable . $operator . $resolvedExpr->getCode() . ';');
@@ -550,7 +584,7 @@ private function doNumericAssignment(
                     'add-assign' => ' += ',
                     'sub-assign' => ' -= ',
                     'mul-assign' => ' *= ',
-                    default => throw new IllegalOperationException($statement, $resolvedExpr)
+                    default      => throw new IllegalOperationException($statement, $resolvedExpr)
                 };
 
                 $codePrinter->output($variable . $operator . '\'' . $resolvedExpr->getCode() . '\';');
@@ -592,13 +626,13 @@ private function doNumericAssignment(
                     case 'char':
                     case 'uchar':
                         $operator = match ($statement['operator']) {
-                            'assign' => ' = ',
+                            'assign'     => ' = ',
                             'add-assign' => ' += ',
                             'sub-assign' => ' -= ',
                             'mul-assign' => ' *= ',
                             'div-assign' => ' /= ',
                             'mod-assign' => ' %= ',
-                            default => throw new IllegalOperationException($statement, $itemVariable)
+                            default      => throw new IllegalOperationException($statement, $itemVariable)
                         };
 
                         $codePrinter->output($variable . $operator . $itemVariable->getName() . ';');
@@ -643,6 +677,98 @@ private function doNumericAssignment(
         }
     }
 
+    /**
+     * @param array              $statement
+     * @param Printer            $codePrinter
+     * @param string             $variable
+     * @param CompiledExpression $resolvedExpr
+     * @param string             $cast
+     *
+     * @return void
+     */
+    private function doNumericAssignmentLong(
+        array $statement,
+        Printer $codePrinter,
+        string $variable,
+        CompiledExpression $resolvedExpr,
+        string $cast = ''
+    ): void {
+        switch ($statement['operator']) {
+            case 'assign':
+                $codePrinter->output(
+                    $variable . ' = ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            case 'add-assign':
+                $codePrinter->output(
+                    $variable . ' += ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            case 'sub-assign':
+                $codePrinter->output(
+                    $variable . ' -= ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            case 'mul-assign':
+                $codePrinter->output(
+                    $variable . ' *= ' . $cast
+                    . ' (' . $resolvedExpr->getCode() . ');'
+                );
+                break;
+
+            default:
+                throw new IllegalOperationException($statement, $resolvedExpr);
+        }
+    }
+
+    /**
+     * @param array               $statement
+     * @param Printer             $codePrinter
+     * @param string              $variable
+     * @param ZephirVariable|bool $itemVariable
+     * @param string              $cast
+     *
+     * @return void
+     */
+    private function doNumericAssignmentVar(
+        array $statement,
+        Printer $codePrinter,
+        string $variable,
+        ZephirVariable | bool $itemVariable,
+        string $cast = ''
+    ): void {
+        switch ($statement['operator']) {
+            case 'assign':
+                $codePrinter->output(
+                    $variable . ' = ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            case 'add-assign':
+                $codePrinter->output(
+                    $variable . ' += ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            case 'sub-assign':
+                $codePrinter->output(
+                    $variable . ' -= ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            case 'mul-assign':
+                $codePrinter->output(
+                    $variable . ' *= ' . $cast . ' ' . $itemVariable->getName() . ';'
+                );
+                break;
+            default:
+                throw new IllegalOperationException($statement, $itemVariable);
+        }
+    }
+
     /**
      * Performs string assignment.
      *
@@ -1350,132 +1476,6 @@ private function doVariableAssignment(
         }
     }
 
-    /**
-     * @param array              $statement
-     * @param Printer            $codePrinter
-     * @param string             $variable
-     * @param CompiledExpression $resolvedExpr
-     * @param string             $value
-     *
-     * @return void
-     */
-    private function doNumberAssignmentNull(
-        array $statement,
-        Printer $codePrinter,
-        string $variable,
-        CompiledExpression $resolvedExpr,
-        string $value
-    ): void {
-        switch ($statement['operator']) {
-            case 'assign':
-                $codePrinter->output($variable . ' = ' . $value . ';');
-                break;
-            case 'add-assign':
-                $codePrinter->output($variable . ' += ' . $value . ';');
-                break;
-            case 'sub-assign':
-                $codePrinter->output($variable . ' -= ' . $value . ';');
-                break;
-            case 'mul-assign':
-                $codePrinter->output($variable . ' *= ' . $value . ';');
-                break;
-            default:
-                throw new IllegalOperationException($statement, $resolvedExpr);
-        }
-    }
-
-    /**
-     * @param array               $statement
-     * @param Printer             $codePrinter
-     * @param string              $variable
-     * @param ZephirVariable|bool $itemVariable
-     * @param string              $cast
-     *
-     * @return void
-     */
-    private function doNumericAssignmentVar(
-        array $statement,
-        Printer $codePrinter,
-        string $variable,
-        ZephirVariable | bool $itemVariable,
-        string $cast = ''
-    ): void {
-        switch ($statement['operator']) {
-            case 'assign':
-                $codePrinter->output(
-                    $variable . ' = ' . $cast . ' ' . $itemVariable->getName() . ';'
-                );
-                break;
-            case 'add-assign':
-                $codePrinter->output(
-                    $variable . ' += ' . $cast . ' ' . $itemVariable->getName() . ';'
-                );
-                break;
-            case 'sub-assign':
-                $codePrinter->output(
-                    $variable . ' -= ' . $cast . ' ' . $itemVariable->getName() . ';'
-                );
-                break;
-            case 'mul-assign':
-                $codePrinter->output(
-                    $variable . ' *= ' . $cast . ' ' . $itemVariable->getName() . ';'
-                );
-                break;
-            default:
-                throw new IllegalOperationException($statement, $itemVariable);
-        }
-    }
-
-    /**
-     * @param array              $statement
-     * @param Printer            $codePrinter
-     * @param string             $variable
-     * @param CompiledExpression $resolvedExpr
-     * @param string             $cast
-     *
-     * @return void
-     */
-    private function doNumericAssignmentLong(
-        array $statement,
-        Printer $codePrinter,
-        string $variable,
-        CompiledExpression $resolvedExpr,
-        string $cast = ''
-    ): void {
-        switch ($statement['operator']) {
-            case 'assign':
-                $codePrinter->output(
-                    $variable . ' = ' . $cast
-                    . ' (' . $resolvedExpr->getCode() . ');'
-                );
-                break;
-
-            case 'add-assign':
-                $codePrinter->output(
-                    $variable . ' += ' . $cast
-                    . ' (' . $resolvedExpr->getCode() . ');'
-                );
-                break;
-
-            case 'sub-assign':
-                $codePrinter->output(
-                    $variable . ' -= ' . $cast
-                    . ' (' . $resolvedExpr->getCode() . ');'
-                );
-                break;
-
-            case 'mul-assign':
-                $codePrinter->output(
-                    $variable . ' *= ' . $cast
-                    . ' (' . $resolvedExpr->getCode() . ');'
-                );
-                break;
-
-            default:
-                throw new IllegalOperationException($statement, $resolvedExpr);
-        }
-    }
-
     /**
      * @param CompilationContext  $compilationContext
      * @param ZephirVariable|bool $exprVariable
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index c6f7679a51..fe6635c9a9 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -73,7 +73,7 @@ public function compile(CompilationContext $compilationContext): void
                 'static-property-append',
                 'static-property-array-index',
                 'static-property-array-index-append',
-                'dynamic-variable-string' => null,
+                'dynamic-variable-string'          => null,
                 'array-index',
                 'variable-append',
                 'object-property',
@@ -84,7 +84,7 @@ public function compile(CompilationContext $compilationContext): void
                     $compilationContext,
                     $assignment
                 ),
-                default => $compilationContext->symbolTable->getVariableForWrite(
+                default                                                                                                                                         => $compilationContext->symbolTable->getVariableForWrite(
                     $variable,
                     $compilationContext,
                     $assignment
diff --git a/src/Statements/SwitchStatement.php b/src/Statements/SwitchStatement.php
index 6cf8e67600..70430b0671 100644
--- a/src/Statements/SwitchStatement.php
+++ b/src/Statements/SwitchStatement.php
@@ -106,7 +106,7 @@ public function compile(CompilationContext $compilationContext): void
             $defaultBlock = null;
             foreach ($clauses as $clause) {
                 if ('case' == $clause['type']) {
-                    $expr = [
+                    $expr        = [
                         'type'  => 'equals',
                         'left'  => $tempLeft,
                         'right' => $clause['expr'],

From e70778622c6acee0fb400b118392b395826d45fa Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 5 Dec 2023 18:49:03 -0600
Subject: [PATCH 304/375] optimizations and removing duplicate code

---
 src/Operators/Arithmetical/DivOperator.php | 409 +++++------
 src/Operators/Arithmetical/ModOperator.php | 781 +++++++++++----------
 2 files changed, 577 insertions(+), 613 deletions(-)

diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index bea87e8093..7db9350f5f 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -16,15 +16,21 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Types\Types;
+use Zephir\Variable\Variable;
 
 /**
  * Generates an arithmetical operation according to the operands
  */
-class DivOperator extends ArithmeticalBaseOperator
+class DivOperator extends ModOperator
 {
     protected string $bitOperator  = '-';
     protected string $operator     = '/';
-    protected string $zvalOperator = 'div_function';
+    protected string $zephirDoubleDouble = 'zephir_safe_div_double_double';
+    protected string $zephirDoubleLong   = 'zephir_safe_div_double_long';
+    protected string $zephirLongDouble   = 'zephir_safe_div_long_double';
+    protected string $zephirLongLong     = 'zephir_safe_div_long_long';
+    protected string $zvalOperator       = 'div_function';
 
     /**
      * Compiles the arithmetical division operation.
@@ -37,212 +43,65 @@ public function compile($expression, CompilationContext $compilationContext)
         [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'double':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_div_long_double((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
-                            $expression
-                        );
-
-                    case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                            $right->getCode(),
-                            $compilationContext,
-                            $expression
-                        );
-                        switch ($variableRight->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'bool':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
-
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
-                                    $expression
-                                );
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
-                                    $expression
-                                );
-                        }
-
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'int' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
-
-
-            case 'bool':
-                return $this->processLeftBoolean($right, $left, $expression);
-
-
-            case 'double':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_div_double_long(' . $left->getCode() . ', (double) (' . $right->getCode(
-                            ) . '))',
-                            $expression
-                        );
-
-                    case 'double':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
-                            $expression
-                        );
-
-                    case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                            $right->getCode(),
-                            $compilationContext,
-                            $expression
-                        );
-                        switch ($variableRight->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'bool':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_double_double(' . $left->getCode(
-                                    ) . ', ' . $variableRight->getName() . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
-
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
-                                    $expression
-                                );
-
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
-                                    ) . "')",
-                                    $expression
-                                );
-                        }
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
+                return $this->processLeftInt(
+                    $right,
+                    $left,
+                    $expression,
+                    $compilationContext
+                );
 
+            case Types::T_BOOL:
+                return $this->processLeftBoolean($left, $right, $expression);
 
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'double' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
-
+            case Types::T_DOUBLE:
+                return $this->processLeftDouble(
+                    $right,
+                    $left,
+                    $expression,
+                    $compilationContext
+                );
 
-            case 'string':
-            case 'array':
-                throw match ($right->getType()) {
-                    default => new CompilerException(
-                        'Operation is not supported between ' . $right->getType(),
-                        $expression
-                    ),
-                };
 
+            case Types::T_STRING:
+            case Types::T_ARRAY:
+                $this->processLeftStringArray($right, $expression);
+                // no break
 
-            case 'variable':
+            case Types::T_VARIABLE:
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
                     $left->resolve(null, $compilationContext),
                     $compilationContext,
                     $expression
                 );
+
                 switch ($variableLeft->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
+                    case Types::T_INT:
+                    case Types::T_UINT:
+                    case Types::T_LONG:
+                    case Types::T_ULONG:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 return new CompiledExpression(
                                     'double',
-                                    'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $this->zephirLongLong . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'double':
+                            case Types::T_DOUBLE:
                                 return new CompiledExpression(
                                     'double',
-                                    'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $this->zephirLongDouble . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
@@ -309,19 +168,19 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'bool':
+                    case Types::T_BOOL:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'bool':
+                            case Types::T_BOOL:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -329,17 +188,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_long_long('
@@ -361,7 +220,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_long_long('
@@ -374,7 +233,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
                                         if ($variableRight->isLocalOnly()) {
                                             return new CompiledExpression(
@@ -421,20 +280,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'double':
+                    case Types::T_DOUBLE:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'double':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
+                            case Types::T_DOUBLE:
                                 return new CompiledExpression(
                                     'double',
                                     'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'bool':
+                            case Types::T_BOOL:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -442,17 +301,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_double_long(' . $variableLeft->getName(
@@ -460,7 +319,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'double':
+                                    case Types::T_DOUBLE:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_double_long(' . $variableLeft->getName(
@@ -468,7 +327,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'bool',
                                             '(' . $variableLeft->getName(
@@ -476,7 +335,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
 
@@ -507,20 +366,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'string':
-                    case 'array':
+                    case Types::T_STRING:
+                    case Types::T_ARRAY:
                         throw new CompilerException(
                             'Cannot operate ' . $variableLeft->getType() . " variables'",
                             $expression
                         );
-                    case 'variable':
+                    case Types::T_VARIABLE:
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
                             /* a + 1 */
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -529,7 +388,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'double':
+
+                            case Types::T_DOUBLE:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -539,7 +399,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
 
                             /* a(var) + a(x) */
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
@@ -547,10 +407,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -567,7 +427,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
 
                                     /* a(var) + a(bool) */
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'int',
                                             'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -576,7 +436,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
 
                                     /* a(var) + a(var) */
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
                                         $expected     = $this->getExpected($compilationContext, $expression);
@@ -615,13 +475,13 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'variable':
+                    case Types::T_VARIABLE:
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -630,7 +490,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'double':
+                            case Types::T_DOUBLE:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -639,18 +499,18 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
                                     $expression
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
-                                    case 'bool':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -666,7 +526,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                             $variableRight->getCode(),
                                             $compilationContext,
@@ -674,7 +534,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
                                         $op2           = $compilationContext->backend->getVariableCode($variableRight);
                                         switch ($variableRight->getType()) {
-                                            case 'int':
+                                            case Types::T_INT:
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_div_zval_long(' . $variableLeft->getName(
@@ -682,7 +542,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case 'double':
+                                            case Types::T_DOUBLE:
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_div_zval_double(' . $variableLeft->getName(
@@ -690,7 +550,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case 'bool':
+                                            case Types::T_BOOL:
                                                 return new CompiledExpression(
                                                     'bool',
                                                     $variableLeft->getName(
@@ -698,7 +558,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case 'variable':
+                                            case Types::T_VARIABLE:
                                                 $expected     = $this->getExpected($compilationContext, $expression);
                                                 $expectedCode = $compilationContext->backend->getVariableCode(
                                                     $expected
@@ -715,8 +575,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                             default:
                                                 throw new CompilerException(
-                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
-                                                    ) . "')",
+                                                    "Cannot operate variable('double') with variable('"
+                                                    . $variableRight->getType() . "')",
                                                     $expression
                                                 );
                                         }
@@ -724,8 +584,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     default:
                                         throw new CompilerException(
-                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
-                                            ) . "')",
+                                            "Cannot operate 'variable' with variable ('"
+                                            . $variableRight->getType() . "')",
                                             $expression
                                         );
                                 }
@@ -733,7 +593,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                             default:
                                 throw new CompilerException(
-                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    "Cannot operate 'variable' with '"
+                                    . $right->getType() . "'",
                                     $expression
                                 );
                         }
@@ -748,4 +609,50 @@ public function compile($expression, CompilationContext $compilationContext)
                 throw CompilerException::unsupportedType($left, $expression);
         }
     }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param Variable|bool $variableRight
+     * @param mixed $left
+     * @param array $expression
+     *
+     * @return CompiledExpression
+     */
+    protected function processIntVarVar(
+        CompilationContext $compilationContext,
+        Variable | bool $variableRight,
+        mixed $left,
+        array $expression
+    ): CompiledExpression {
+        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
+
+        return new CompiledExpression(
+            'double',
+            'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
+            $expression
+        );
+    }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param Variable|bool      $variableRight
+     * @param mixed              $left
+     * @param array              $expression
+     *
+     * @return CompiledExpression
+     */
+    protected function processDoubleVarVar(
+        CompilationContext $compilationContext,
+        Variable | bool $variableRight,
+        mixed $left,
+        array $expression
+    ): CompiledExpression {
+        $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
+
+        return new CompiledExpression(
+            'double',
+            'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
+            $expression
+        );
+    }
 }
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 0a1860663e..bfea750752 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -16,15 +16,21 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Types\Types;
+use Zephir\Variable\Variable;
 
 /**
  * Generates an arithmetical operation according to the operands
  */
 class ModOperator extends ArithmeticalBaseOperator
 {
-    protected string $bitOperator  = '-';
-    protected string $operator     = '%';
-    protected string $zvalOperator = 'mod_function';
+    protected string $bitOperator        = '-';
+    protected string $operator           = '%';
+    protected string $zephirDoubleDouble = 'zephir_safe_mod_double_double';
+    protected string $zephirDoubleLong   = 'zephir_safe_mod_double_long';
+    protected string $zephirLongDouble   = 'zephir_safe_mod_long_double';
+    protected string $zephirLongLong     = 'zephir_safe_mod_long_long';
+    protected string $zvalOperator       = 'mod_function';
 
     /**
      * Compiles the arithmetical modulus operation.
@@ -37,282 +43,104 @@ public function compile($expression, CompilationContext $compilationContext)
         [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'double':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_mod_long_double((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'bool',
-                            '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
-                            $expression
-                        );
-
-                    case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                            $right->getCode(),
-                            $compilationContext,
-                            $expression
-                        );
-                        switch ($variableRight->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'bool':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                if ($variableRight->isLocalOnly()) {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_long_zval(' . $left->getCode(
-                                        ) . ', &' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                } else {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_long_zval(' . $left->getCode(
-                                        ) . ', ' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                }
-
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
-                                    $expression
-                                );
-                        }
-
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'int' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
-
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
+                return $this->processLeftInt(
+                    $right,
+                    $left,
+                    $expression,
+                    $compilationContext
+                );
 
-            case 'bool':
+            case Types::T_BOOL:
                 return $this->processLeftBoolean($left, $right, $expression);
 
-            case 'double':
-                switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_mod_double_long(' . $left->getCode() . ', (double) (' . $right->getCode(
-                            ) . '))',
-                            $expression
-                        );
-
-                    case 'double':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
-                            $expression
-                        );
-
-                    case 'bool':
-                        return new CompiledExpression(
-                            'double',
-                            'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
-                            $expression
-                        );
-
-                    case 'variable':
-                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                            $right->getCode(),
-                            $compilationContext,
-                            $expression
-                        );
-                        switch ($variableRight->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'bool':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_double_double(' . $left->getCode(
-                                    ) . ', ' . $variableRight->getName() . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                if ($variableRight->isLocalOnly()) {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_double_zval(' . $left->getCode(
-                                        ) . ', &' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                } else {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_double_zval(' . $left->getCode(
-                                        ) . ', ' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                }
-
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate variable('double') with variable('"
-                                    . $variableRight->getType()
-                                    . "')",
-                                    $expression
-                                );
-                        }
-
-
-                    default:
-                        throw new CompilerException(
-                            "Cannot operate 'double' with '" . $right->getType() . "'",
-                            $expression
-                        );
-                }
-
+            case Types::T_DOUBLE:
+                return $this->processLeftDouble(
+                    $right,
+                    $left,
+                    $expression,
+                    $compilationContext
+                );
 
-            case 'string':
-            case 'array':
-                throw match ($right->getType()) {
-                    default => new CompilerException(
-                        'Operation is not supported between ' . $right->getType(),
-                        $expression
-                    ),
-                };
 
+            case Types::T_STRING:
+            case Types::T_ARRAY:
+                $this->processLeftStringArray($right, $expression);
+                // no break
 
-            case 'variable':
+            case Types::T_VARIABLE:
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
                     $left->resolve(null, $compilationContext),
                     $compilationContext,
                     $expression
                 );
+
                 switch ($variableLeft->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
+                    case Types::T_INT:
+                    case Types::T_UINT:
+                    case Types::T_LONG:
+                    case Types::T_ULONG:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 return new CompiledExpression(
                                     'double',
-                                    'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $this->zephirLongLong . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'double':
+                            case Types::T_DOUBLE:
                                 return new CompiledExpression(
                                     'double',
-                                    'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $this->zephirLongDouble . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
-                                switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
-                                    case 'bool':
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_mod_long_long(' . $variableLeft->getName(
-                                            ) . ', ' . $variableRight->getName() . ')',
-                                            $expression
-                                        );
-
-                                    case 'double':
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_mod_long_double(' . $variableLeft->getName(
-                                            ) . ', ' . $variableRight->getName() . ')',
-                                            $expression
-                                        );
-
-                                    case 'variable':
-                                        if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
-                                                ) . ', &' . $variableRight->getName() . ')',
-                                                $expression
-                                            );
-                                        } else {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
-                                                ) . ', ' . $variableRight->getName() . ')',
-                                                $expression
-                                            );
-                                        }
-
-
-                                    default:
-                                        throw new CompilerException(
-                                            "Cannot operate variable('int') with variable('"
-                                            . $variableRight->getType()
-                                            . "')",
-                                            $expression
-                                        );
-                                }
 
+                                return match ($variableRight->getType()) {
+                                    Types::T_INT,
+                                    Types::T_UINT,
+                                    Types::T_LONG,
+                                    Types::T_ULONG,
+                                    Types::T_BOOL     => new CompiledExpression(
+                                        'double',
+                                        $this->zephirLongLong . '(' . $variableLeft->getName(
+                                        ) . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    ),
+                                    Types::T_DOUBLE   => new CompiledExpression(
+                                        'double',
+                                        $this->zephirLongDouble . '(' . $variableLeft->getName(
+                                        ) . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    ),
+                                    Types::T_VARIABLE => new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_zval('
+                                        . $variableLeft->getName()
+                                        . ', '
+                                        . $this->getIsLocal($variableRight)
+                                        . $variableRight->getName() . ')',
+                                        $expression
+                                    ),
+                                    default           => throw new CompilerException(
+                                        "Cannot operate variable('int') with variable('"
+                                        . $variableRight->getType()
+                                        . "')",
+                                        $expression
+                                    ),
+                                };
 
                             default:
                                 throw new CompilerException(
@@ -322,19 +150,19 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'bool':
+                    case Types::T_BOOL:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'bool':
+                            case Types::T_BOOL:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -342,20 +170,20 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_mod_long_long('
+                                            $this->zephirLongLong . '('
                                             . $variableLeft->getName()
                                             . ', '
                                             . $variableRight->getName()
@@ -363,10 +191,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'double':
+                                    case Types::T_DOUBLE:
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_mod_long_double('
+                                            $this->zephirLongDouble . '('
                                             . $variableLeft->getName()
                                             . ', '
                                             . $variableRight->getName()
@@ -374,10 +202,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_mod_long_long('
+                                            $this->zephirLongLong . '('
                                             . $variableLeft->getName()
                                             . ' '
                                             . $this->bitOperator
@@ -387,30 +215,19 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval('
-                                                . $variableLeft->getName()
-                                                . ', &'
-                                                . $variableRight->getName()
-                                                . ')',
-                                                $expression
-                                            );
-                                        } else {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval('
-                                                . $variableLeft->getName()
-                                                . ', '
-                                                . $variableRight->getName()
-                                                . ')',
-                                                $expression
-                                            );
-                                        }
 
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_zval('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $this->getIsLocal($variableRight)
+                                            . $variableRight->getName()
+                                            . ')',
+                                            $expression
+                                        );
 
                                     default:
                                         throw new CompilerException(
@@ -430,20 +247,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'double':
+                    case Types::T_DOUBLE:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'double':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
+                            case Types::T_DOUBLE:
                                 return new CompiledExpression(
                                     'double',
-                                    'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    $this->zephirDoubleLong . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'bool':
+                            case Types::T_BOOL:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -451,33 +268,33 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_mod_double_long(' . $variableLeft->getName(
+                                            $this->zephirDoubleLong . '(' . $variableLeft->getName(
                                             ) . ',  (double) ' . $variableRight->getName() . ')',
                                             $expression
                                         );
 
-                                    case 'double':
+                                    case Types::T_DOUBLE:
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_mod_double_long(' . $variableLeft->getName(
+                                            $this->zephirDoubleLong . '(' . $variableLeft->getName(
                                             ) . ', ' . $variableRight->getName() . ')',
                                             $expression
                                         );
 
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'bool',
                                             '(' . $variableLeft->getName(
@@ -485,27 +302,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_double_zval(' . $variableLeft->getName(
-                                                ) . ', &' . $variableRight->getName() . ')',
-                                                $expression
-                                            );
-                                        } else {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_double_zval('
-                                                . $variableLeft->getName()
-                                                . ', '
-                                                . $variableRight->getName()
-                                                . ')',
-                                                $expression
-                                            );
-                                        }
-
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_double_zval('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $this->getIsLocal($variableRight)
+                                            . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     default:
                                         throw new CompilerException(
@@ -524,20 +331,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'string':
-                    case 'array':
+                    case Types::T_STRING:
+                    case Types::T_ARRAY:
                         throw new CompilerException(
                             'Cannot operate ' . $variableLeft->getType() . " variables'",
                             $expression
                         );
-                    case 'variable':
+                    case Types::T_VARIABLE:
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
                             /* a + 1 */
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -547,7 +354,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
 
 
-                            case 'double':
+                            case Types::T_DOUBLE:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -558,7 +365,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                             /* a(var) + a(x) */
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
@@ -566,10 +373,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -579,7 +386,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                                     /* a(var) + a(bool) */
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'int',
                                             'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -589,7 +396,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                                     /* a(var) + a(var) */
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
@@ -629,13 +436,13 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'variable':
+                    case Types::T_VARIABLE:
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -644,7 +451,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'double':
+                            case Types::T_DOUBLE:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -653,18 +460,18 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
                                     $expression
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
-                                    case 'bool':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
+                                    case Types::T_BOOL:
                                         $compilationContext->headersManager->add('kernel/operators');
 
                                         return new CompiledExpression(
@@ -675,14 +482,14 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
 
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                             $variableRight->getCode(),
                                             $compilationContext,
                                             $expression
                                         );
                                         switch ($variableRight->getType()) {
-                                            case 'int':
+                                            case Types::T_INT:
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -690,7 +497,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case 'double':
+                                            case Types::T_DOUBLE:
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_mod_zval_double(' . $op1 . ', ' . $variableRight->getName(
@@ -698,14 +505,14 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case 'bool':
+                                            case Types::T_BOOL:
                                                 return new CompiledExpression(
                                                     'bool',
                                                     $op1 . ' ' . $this->bitOperator . ' ' . $variableRight->getName(),
                                                     $expression
                                                 );
 
-                                            case 'variable':
+                                            case Types::T_VARIABLE:
                                                 $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
                                                 $expected = $this->getExpected($compilationContext, $expression);
@@ -722,8 +529,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                             default:
                                                 throw new CompilerException(
-                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
-                                                    ) . "')",
+                                                    "Cannot operate variable('double') with variable('"
+                                                    . $variableRight->getType() . "')",
                                                     $expression
                                                 );
                                         }
@@ -731,8 +538,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     default:
                                         throw new CompilerException(
-                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
-                                            ) . "')",
+                                            "Cannot operate 'variable' with variable ('"
+                                            . $variableRight->getType() . "')",
                                             $expression
                                         );
                                 }
@@ -740,7 +547,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                             default:
                                 throw new CompilerException(
-                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    "Cannot operate 'variable' with '"
+                                    . $right->getType() . "'",
                                     $expression
                                 );
                         }
@@ -755,4 +563,253 @@ public function compile($expression, CompilationContext $compilationContext)
                 throw CompilerException::unsupportedType($left, $expression);
         }
     }
+
+    /**
+     * @param Variable $variable
+     *
+     * @return string
+     */
+    protected function getIsLocal(Variable $variable): string
+    {
+        return $variable->isLocalOnly() ? '&' : '';
+    }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param Variable|bool      $variableRight
+     * @param mixed              $left
+     * @param array              $expression
+     *
+     * @return CompiledExpression
+     */
+    protected function processDoubleVarVar(
+        CompilationContext $compilationContext,
+        Variable | bool $variableRight,
+        mixed $left,
+        array $expression
+    ): CompiledExpression {
+        return new CompiledExpression(
+            'double',
+            'zephir_safe_mod_double_zval('
+            . $left->getCode()
+            . ', '
+            . $this->getIsLocal($variableRight)
+            . $variableRight->getName() . ')',
+            $expression
+        );
+    }
+
+    /**
+     * @param CompilationContext $compilationContext
+     * @param Variable|bool      $variableRight
+     * @param mixed              $left
+     * @param array              $expression
+     *
+     * @return CompiledExpression
+     */
+    protected function processIntVarVar(
+        CompilationContext $compilationContext,
+        Variable | bool $variableRight,
+        mixed $left,
+        array $expression
+    ): CompiledExpression {
+        return new CompiledExpression(
+            'double',
+            'zephir_safe_mod_long_zval('
+            . $left->getCode()
+            . ', '
+            . $this->getIsLocal($variableRight)
+            . $variableRight->getName() . ')',
+            $expression
+        );
+    }
+
+    /**
+     * @param mixed              $right
+     * @param mixed              $left
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression
+     */
+    protected function processLeftDouble(
+        mixed $right,
+        mixed $left,
+        array $expression,
+        CompilationContext $compilationContext
+    ): CompiledExpression {
+        switch ($right->getType()) {
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
+                return new CompiledExpression(
+                    'double',
+                    $this->zephirDoubleLong
+                    . '(' . $left->getCode() . ', (double) (' . $right->getCode() . '))',
+                    $expression
+                );
+
+            case Types::T_DOUBLE:
+                return new CompiledExpression(
+                    'double',
+                    $this->zephirDoubleLong
+                    . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                    $expression
+                );
+
+            case Types::T_BOOL:
+                return new CompiledExpression(
+                    'double',
+                    $this->zephirDoubleLong
+                    . '(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
+                    $expression
+                );
+
+            case Types::T_VARIABLE:
+                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                    $right->getCode(),
+                    $compilationContext,
+                    $expression
+                );
+                return match ($variableRight->getType()) {
+                    Types::T_INT,
+                    Types::T_UINT,
+                    Types::T_LONG,
+                    Types::T_ULONG,
+                    Types::T_BOOL     => new CompiledExpression(
+                        'double',
+                        $this->zephirDoubleLong
+                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                        $expression
+                    ),
+                    Types::T_DOUBLE   => new CompiledExpression(
+                        'double',
+                        $this->zephirDoubleDouble
+                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                        $expression
+                    ),
+                    Types::T_VARIABLE => $this->processDoubleVarVar(
+                        $compilationContext,
+                        $variableRight,
+                        $left,
+                        $expression
+                    ),
+                    default           => throw new CompilerException(
+                        "Cannot operate variable('double') with variable('"
+                        . $variableRight->getType()
+                        . "')",
+                        $expression
+                    ),
+                };
+
+            default:
+                throw new CompilerException(
+                    "Cannot operate 'double' with '" . $right->getType() . "'",
+                    $expression
+                );
+        }
+    }
+
+    /**
+     * @param mixed              $right
+     * @param mixed              $left
+     * @param array              $expression
+     * @param CompilationContext $compilationContext
+     *
+     * @return CompiledExpression
+     */
+    protected function processLeftInt(
+        mixed $right,
+        mixed $left,
+        array $expression,
+        CompilationContext $compilationContext
+    ): CompiledExpression {
+        switch ($right->getType()) {
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
+                return new CompiledExpression(
+                    'double',
+                    $this->zephirLongLong
+                    . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                    $expression
+                );
+
+            case Types::T_DOUBLE:
+                return new CompiledExpression(
+                    'double',
+                    $this->zephirLongDouble
+                    . '((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
+                    $expression
+                );
+
+            case Types::T_BOOL:
+                return new CompiledExpression(
+                    'bool',
+                    '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
+                    $expression
+                );
+
+            case Types::T_VARIABLE:
+                $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                    $right->getCode(),
+                    $compilationContext,
+                    $expression
+                );
+
+                return match ($variableRight->getType()) {
+                    Types::T_INT,
+                    Types::T_UINT,
+                    Types::T_LONG,
+                    Types::T_ULONG,
+                    Types::T_BOOL     => new CompiledExpression(
+                        'double',
+                        $this->zephirLongLong
+                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                        $expression
+                    ),
+                    Types::T_DOUBLE   => new CompiledExpression(
+                        'double',
+                        $this->zephirLongDouble
+                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                        $expression
+                    ),
+                    Types::T_VARIABLE => $this->processIntVarVar(
+                        $compilationContext,
+                        $left,
+                        $variableRight,
+                        $expression
+                    ),
+                    default           => throw new CompilerException(
+                        "Cannot operate variable('int') with variable('"
+                        . $variableRight->getType() . "')",
+                        $expression
+                    ),
+                };
+
+            default:
+                throw new CompilerException(
+                    "Cannot operate 'int' with '" . $right->getType() . "'",
+                    $expression
+                );
+        }
+    }
+
+    /**
+     * @param mixed $right
+     * @param array $expression
+     *
+     * @return mixed
+     */
+    protected function processLeftStringArray(mixed $right, array $expression)
+    {
+        throw match ($right->getType()) {
+            default => new CompilerException(
+                'Operation is not supported between ' . $right->getType(),
+                $expression
+            ),
+        };
+    }
 }

From 61d2a1356c8785b703915b39084c7e5df415c0d6 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Tue, 5 Dec 2023 21:15:29 -0600
Subject: [PATCH 305/375] corrections

---
 src/Operators/Arithmetical/DivOperator.php | 28 +++++++++++-----------
 src/Operators/Arithmetical/ModOperator.php |  6 ++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 7db9350f5f..78cf45fe74 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -24,8 +24,8 @@
  */
 class DivOperator extends ModOperator
 {
-    protected string $bitOperator  = '-';
-    protected string $operator     = '/';
+    protected string $bitOperator        = '-';
+    protected string $operator           = '/';
     protected string $zephirDoubleDouble = 'zephir_safe_div_double_double';
     protected string $zephirDoubleLong   = 'zephir_safe_div_double_long';
     protected string $zephirLongDouble   = 'zephir_safe_div_long_double';
@@ -69,7 +69,7 @@ public function compile($expression, CompilationContext $compilationContext)
             case Types::T_STRING:
             case Types::T_ARRAY:
                 $this->processLeftStringArray($right, $expression);
-                // no break
+            // no break
 
             case Types::T_VARIABLE:
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -612,23 +612,23 @@ public function compile($expression, CompilationContext $compilationContext)
 
     /**
      * @param CompilationContext $compilationContext
-     * @param Variable|bool $variableRight
-     * @param mixed $left
-     * @param array $expression
+     * @param Variable|bool      $variableRight
+     * @param mixed              $left
+     * @param array              $expression
      *
      * @return CompiledExpression
      */
-    protected function processIntVarVar(
+    protected function processDoubleVarVar(
         CompilationContext $compilationContext,
-        Variable | bool $variableRight,
+        mixed $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {
-        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
+        $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
 
         return new CompiledExpression(
             'double',
-            'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
+            'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
             $expression
         );
     }
@@ -641,17 +641,17 @@ protected function processIntVarVar(
      *
      * @return CompiledExpression
      */
-    protected function processDoubleVarVar(
+    protected function processIntVarVar(
         CompilationContext $compilationContext,
-        Variable | bool $variableRight,
+        mixed $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {
-        $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
+        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
 
         return new CompiledExpression(
             'double',
-            'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
+            'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
             $expression
         );
     }
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index bfea750752..a3c35b5440 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -69,7 +69,7 @@ public function compile($expression, CompilationContext $compilationContext)
             case Types::T_STRING:
             case Types::T_ARRAY:
                 $this->processLeftStringArray($right, $expression);
-                // no break
+            // no break
 
             case Types::T_VARIABLE:
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -584,7 +584,7 @@ protected function getIsLocal(Variable $variable): string
      */
     protected function processDoubleVarVar(
         CompilationContext $compilationContext,
-        Variable | bool $variableRight,
+        mixed $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {
@@ -609,7 +609,7 @@ protected function processDoubleVarVar(
      */
     protected function processIntVarVar(
         CompilationContext $compilationContext,
-        Variable | bool $variableRight,
+        mixed $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {

From 123bc185c87ea4c268429f1bad1cc212ee0e709c Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 6 Dec 2023 12:42:24 -0600
Subject: [PATCH 306/375] Revert "corrections"

This reverts commit e280c3cb3be02d12544c0956fa6955a3c90cceb4.
---
 src/Operators/Arithmetical/DivOperator.php | 28 +++++++++++-----------
 src/Operators/Arithmetical/ModOperator.php |  6 ++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 78cf45fe74..7db9350f5f 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -24,8 +24,8 @@
  */
 class DivOperator extends ModOperator
 {
-    protected string $bitOperator        = '-';
-    protected string $operator           = '/';
+    protected string $bitOperator  = '-';
+    protected string $operator     = '/';
     protected string $zephirDoubleDouble = 'zephir_safe_div_double_double';
     protected string $zephirDoubleLong   = 'zephir_safe_div_double_long';
     protected string $zephirLongDouble   = 'zephir_safe_div_long_double';
@@ -69,7 +69,7 @@ public function compile($expression, CompilationContext $compilationContext)
             case Types::T_STRING:
             case Types::T_ARRAY:
                 $this->processLeftStringArray($right, $expression);
-            // no break
+                // no break
 
             case Types::T_VARIABLE:
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -612,23 +612,23 @@ public function compile($expression, CompilationContext $compilationContext)
 
     /**
      * @param CompilationContext $compilationContext
-     * @param Variable|bool      $variableRight
-     * @param mixed              $left
-     * @param array              $expression
+     * @param Variable|bool $variableRight
+     * @param mixed $left
+     * @param array $expression
      *
      * @return CompiledExpression
      */
-    protected function processDoubleVarVar(
+    protected function processIntVarVar(
         CompilationContext $compilationContext,
-        mixed $variableRight,
+        Variable | bool $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {
-        $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
+        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
 
         return new CompiledExpression(
             'double',
-            'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
+            'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
             $expression
         );
     }
@@ -641,17 +641,17 @@ protected function processDoubleVarVar(
      *
      * @return CompiledExpression
      */
-    protected function processIntVarVar(
+    protected function processDoubleVarVar(
         CompilationContext $compilationContext,
-        mixed $variableRight,
+        Variable | bool $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {
-        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
+        $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
 
         return new CompiledExpression(
             'double',
-            'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
+            'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
             $expression
         );
     }
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index a3c35b5440..bfea750752 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -69,7 +69,7 @@ public function compile($expression, CompilationContext $compilationContext)
             case Types::T_STRING:
             case Types::T_ARRAY:
                 $this->processLeftStringArray($right, $expression);
-            // no break
+                // no break
 
             case Types::T_VARIABLE:
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
@@ -584,7 +584,7 @@ protected function getIsLocal(Variable $variable): string
      */
     protected function processDoubleVarVar(
         CompilationContext $compilationContext,
-        mixed $variableRight,
+        Variable | bool $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {
@@ -609,7 +609,7 @@ protected function processDoubleVarVar(
      */
     protected function processIntVarVar(
         CompilationContext $compilationContext,
-        mixed $variableRight,
+        Variable | bool $variableRight,
         mixed $left,
         array $expression
     ): CompiledExpression {

From 96ce4b570c1174e2bdb80c99badaa6efc3c20f79 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Wed, 6 Dec 2023 12:42:45 -0600
Subject: [PATCH 307/375] Revert "optimizations and removing duplicate code"

This reverts commit 759f72ee871116a3b9d40dcade9fd92600d42e49.
---
 src/Operators/Arithmetical/DivOperator.php | 409 ++++++-----
 src/Operators/Arithmetical/ModOperator.php | 781 ++++++++++-----------
 2 files changed, 613 insertions(+), 577 deletions(-)

diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 7db9350f5f..bea87e8093 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -16,21 +16,15 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Types\Types;
-use Zephir\Variable\Variable;
 
 /**
  * Generates an arithmetical operation according to the operands
  */
-class DivOperator extends ModOperator
+class DivOperator extends ArithmeticalBaseOperator
 {
     protected string $bitOperator  = '-';
     protected string $operator     = '/';
-    protected string $zephirDoubleDouble = 'zephir_safe_div_double_double';
-    protected string $zephirDoubleLong   = 'zephir_safe_div_double_long';
-    protected string $zephirLongDouble   = 'zephir_safe_div_long_double';
-    protected string $zephirLongLong     = 'zephir_safe_div_long_long';
-    protected string $zvalOperator       = 'div_function';
+    protected string $zvalOperator = 'div_function';
 
     /**
      * Compiles the arithmetical division operation.
@@ -43,65 +37,212 @@ public function compile($expression, CompilationContext $compilationContext)
         [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
-            case Types::T_INT:
-            case Types::T_UINT:
-            case Types::T_LONG:
-            case Types::T_ULONG:
-                return $this->processLeftInt(
-                    $right,
-                    $left,
-                    $expression,
-                    $compilationContext
-                );
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
-            case Types::T_BOOL:
-                return $this->processLeftBoolean($left, $right, $expression);
+                    case 'double':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_long_double((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
 
-            case Types::T_DOUBLE:
-                return $this->processLeftDouble(
-                    $right,
-                    $left,
-                    $expression,
-                    $compilationContext
-                );
+                    case 'bool':
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
+
+                    case 'variable':
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
+                        switch ($variableRight->getType()) {
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
+                            case 'bool':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
+
+                            case 'double':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
+
+                            case 'variable':
+                                $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
+
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
+                                    $expression
+                                );
+
+                            default:
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
+                        }
+
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot operate 'int' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
+
+
+            case 'bool':
+                return $this->processLeftBoolean($right, $left, $expression);
+
+
+            case 'double':
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_double_long(' . $left->getCode() . ', (double) (' . $right->getCode(
+                            ) . '))',
+                            $expression
+                        );
+
+                    case 'double':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'bool':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
+
+                    case 'variable':
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
+                        switch ($variableRight->getType()) {
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
+                            case 'bool':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
+
+                            case 'double':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_double_double(' . $left->getCode(
+                                    ) . ', ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
 
+                            case 'variable':
+                                $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
 
-            case Types::T_STRING:
-            case Types::T_ARRAY:
-                $this->processLeftStringArray($right, $expression);
-                // no break
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
+                                    $expression
+                                );
 
-            case Types::T_VARIABLE:
+
+                            default:
+                                throw new CompilerException(
+                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                    ) . "')",
+                                    $expression
+                                );
+                        }
+
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot operate 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
+
+
+            case 'string':
+            case 'array':
+                throw match ($right->getType()) {
+                    default => new CompilerException(
+                        'Operation is not supported between ' . $right->getType(),
+                        $expression
+                    ),
+                };
+
+
+            case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
                     $left->resolve(null, $compilationContext),
                     $compilationContext,
                     $expression
                 );
-
                 switch ($variableLeft->getType()) {
-                    case Types::T_INT:
-                    case Types::T_UINT:
-                    case Types::T_LONG:
-                    case Types::T_ULONG:
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 return new CompiledExpression(
                                     'double',
-                                    $this->zephirLongLong . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    'zephir_safe_div_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_DOUBLE:
+                            case 'double':
                                 return new CompiledExpression(
                                     'double',
-                                    $this->zephirLongDouble . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    'zephir_safe_div_long_double(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
@@ -168,19 +309,19 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_BOOL:
+                    case 'bool':
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_BOOL:
+                            case 'bool':
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -188,17 +329,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_long_long('
@@ -220,7 +361,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_BOOL:
+                                    case 'bool':
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_long_long('
@@ -233,7 +374,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         if ($variableRight->isLocalOnly()) {
                                             return new CompiledExpression(
@@ -280,20 +421,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_DOUBLE:
+                    case 'double':
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
-                            case Types::T_DOUBLE:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
+                            case 'double':
                                 return new CompiledExpression(
                                     'double',
                                     'zephir_safe_div_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_BOOL:
+                            case 'bool':
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -301,17 +442,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_double_long(' . $variableLeft->getName(
@@ -319,7 +460,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_DOUBLE:
+                                    case 'double':
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_double_long(' . $variableLeft->getName(
@@ -327,7 +468,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_BOOL:
+                                    case 'bool':
                                         return new CompiledExpression(
                                             'bool',
                                             '(' . $variableLeft->getName(
@@ -335,7 +476,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
 
@@ -366,20 +507,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_STRING:
-                    case Types::T_ARRAY:
+                    case 'string':
+                    case 'array':
                         throw new CompilerException(
                             'Cannot operate ' . $variableLeft->getType() . " variables'",
                             $expression
                         );
-                    case Types::T_VARIABLE:
+                    case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
                             /* a + 1 */
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -388,8 +529,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-
-                            case Types::T_DOUBLE:
+                            case 'double':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -399,7 +539,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
 
                             /* a(var) + a(x) */
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
@@ -407,10 +547,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -427,7 +567,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
 
                                     /* a(var) + a(bool) */
-                                    case Types::T_BOOL:
+                                    case 'bool':
                                         return new CompiledExpression(
                                             'int',
                                             'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -436,7 +576,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
 
                                     /* a(var) + a(var) */
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
                                         $expected     = $this->getExpected($compilationContext, $expression);
@@ -475,13 +615,13 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_VARIABLE:
+                    case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -490,7 +630,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_DOUBLE:
+                            case 'double':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -499,18 +639,18 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
                                     $expression
                                 );
                                 switch ($variableRight->getType()) {
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
-                                    case Types::T_BOOL:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
+                                    case 'bool':
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -526,7 +666,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                             $variableRight->getCode(),
                                             $compilationContext,
@@ -534,7 +674,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
                                         $op2           = $compilationContext->backend->getVariableCode($variableRight);
                                         switch ($variableRight->getType()) {
-                                            case Types::T_INT:
+                                            case 'int':
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_div_zval_long(' . $variableLeft->getName(
@@ -542,7 +682,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case Types::T_DOUBLE:
+                                            case 'double':
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_div_zval_double(' . $variableLeft->getName(
@@ -550,7 +690,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case Types::T_BOOL:
+                                            case 'bool':
                                                 return new CompiledExpression(
                                                     'bool',
                                                     $variableLeft->getName(
@@ -558,7 +698,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case Types::T_VARIABLE:
+                                            case 'variable':
                                                 $expected     = $this->getExpected($compilationContext, $expression);
                                                 $expectedCode = $compilationContext->backend->getVariableCode(
                                                     $expected
@@ -575,8 +715,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                             default:
                                                 throw new CompilerException(
-                                                    "Cannot operate variable('double') with variable('"
-                                                    . $variableRight->getType() . "')",
+                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                                    ) . "')",
                                                     $expression
                                                 );
                                         }
@@ -584,8 +724,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     default:
                                         throw new CompilerException(
-                                            "Cannot operate 'variable' with variable ('"
-                                            . $variableRight->getType() . "')",
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
                                             $expression
                                         );
                                 }
@@ -593,8 +733,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
                             default:
                                 throw new CompilerException(
-                                    "Cannot operate 'variable' with '"
-                                    . $right->getType() . "'",
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
                                     $expression
                                 );
                         }
@@ -609,50 +748,4 @@ public function compile($expression, CompilationContext $compilationContext)
                 throw CompilerException::unsupportedType($left, $expression);
         }
     }
-
-    /**
-     * @param CompilationContext $compilationContext
-     * @param Variable|bool $variableRight
-     * @param mixed $left
-     * @param array $expression
-     *
-     * @return CompiledExpression
-     */
-    protected function processIntVarVar(
-        CompilationContext $compilationContext,
-        Variable | bool $variableRight,
-        mixed $left,
-        array $expression
-    ): CompiledExpression {
-        $variableRightCode = $compilationContext->backend->getVariableCode($variableRight);
-
-        return new CompiledExpression(
-            'double',
-            'zephir_safe_div_long_zval(' . $left->getCode() . ', ' . $variableRightCode . ')',
-            $expression
-        );
-    }
-
-    /**
-     * @param CompilationContext $compilationContext
-     * @param Variable|bool      $variableRight
-     * @param mixed              $left
-     * @param array              $expression
-     *
-     * @return CompiledExpression
-     */
-    protected function processDoubleVarVar(
-        CompilationContext $compilationContext,
-        Variable | bool $variableRight,
-        mixed $left,
-        array $expression
-    ): CompiledExpression {
-        $symbolRight = $compilationContext->backend->getVariableCode($variableRight);
-
-        return new CompiledExpression(
-            'double',
-            'zephir_safe_div_double_zval(' . $left->getCode() . ', ' . $symbolRight . ')',
-            $expression
-        );
-    }
 }
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index bfea750752..0a1860663e 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -16,21 +16,15 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
-use Zephir\Types\Types;
-use Zephir\Variable\Variable;
 
 /**
  * Generates an arithmetical operation according to the operands
  */
 class ModOperator extends ArithmeticalBaseOperator
 {
-    protected string $bitOperator        = '-';
-    protected string $operator           = '%';
-    protected string $zephirDoubleDouble = 'zephir_safe_mod_double_double';
-    protected string $zephirDoubleLong   = 'zephir_safe_mod_double_long';
-    protected string $zephirLongDouble   = 'zephir_safe_mod_long_double';
-    protected string $zephirLongLong     = 'zephir_safe_mod_long_long';
-    protected string $zvalOperator       = 'mod_function';
+    protected string $bitOperator  = '-';
+    protected string $operator     = '%';
+    protected string $zvalOperator = 'mod_function';
 
     /**
      * Compiles the arithmetical modulus operation.
@@ -43,104 +37,282 @@ public function compile($expression, CompilationContext $compilationContext)
         [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
-            case Types::T_INT:
-            case Types::T_UINT:
-            case Types::T_LONG:
-            case Types::T_ULONG:
-                return $this->processLeftInt(
-                    $right,
-                    $left,
-                    $expression,
-                    $compilationContext
-                );
+            case 'int':
+            case 'uint':
+            case 'long':
+            case 'ulong':
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'double':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_long_double((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'bool':
+                        return new CompiledExpression(
+                            'bool',
+                            '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
+
+                    case 'variable':
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
+                        switch ($variableRight->getType()) {
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
+                            case 'bool':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
+
+                            case 'double':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
+
+                            case 'variable':
+                                if ($variableRight->isLocalOnly()) {
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_zval(' . $left->getCode(
+                                        ) . ', &' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
+                                } else {
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_zval(' . $left->getCode(
+                                        ) . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
+                                }
 
-            case Types::T_BOOL:
+
+                            default:
+                                throw new CompilerException(
+                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
+                                    $expression
+                                );
+                        }
+
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot operate 'int' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
+
+
+            case 'bool':
                 return $this->processLeftBoolean($left, $right, $expression);
 
-            case Types::T_DOUBLE:
-                return $this->processLeftDouble(
-                    $right,
-                    $left,
-                    $expression,
-                    $compilationContext
-                );
+            case 'double':
+                switch ($right->getType()) {
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_double_long(' . $left->getCode() . ', (double) (' . $right->getCode(
+                            ) . '))',
+                            $expression
+                        );
+
+                    case 'double':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                            $expression
+                        );
+
+                    case 'bool':
+                        return new CompiledExpression(
+                            'double',
+                            'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
+                            $expression
+                        );
+
+                    case 'variable':
+                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
+                            $right->getCode(),
+                            $compilationContext,
+                            $expression
+                        );
+                        switch ($variableRight->getType()) {
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
+                            case 'bool':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $variableRight->getName(
+                                    ) . ')',
+                                    $expression
+                                );
+
+                            case 'double':
+                                return new CompiledExpression(
+                                    'double',
+                                    'zephir_safe_mod_double_double(' . $left->getCode(
+                                    ) . ', ' . $variableRight->getName() . ')',
+                                    $expression
+                                );
+
+                            case 'variable':
+                                if ($variableRight->isLocalOnly()) {
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_double_zval(' . $left->getCode(
+                                        ) . ', &' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
+                                } else {
+                                    return new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_double_zval(' . $left->getCode(
+                                        ) . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    );
+                                }
+
 
+                            default:
+                                throw new CompilerException(
+                                    "Cannot operate variable('double') with variable('"
+                                    . $variableRight->getType()
+                                    . "')",
+                                    $expression
+                                );
+                        }
+
+
+                    default:
+                        throw new CompilerException(
+                            "Cannot operate 'double' with '" . $right->getType() . "'",
+                            $expression
+                        );
+                }
+
+
+            case 'string':
+            case 'array':
+                throw match ($right->getType()) {
+                    default => new CompilerException(
+                        'Operation is not supported between ' . $right->getType(),
+                        $expression
+                    ),
+                };
 
-            case Types::T_STRING:
-            case Types::T_ARRAY:
-                $this->processLeftStringArray($right, $expression);
-                // no break
 
-            case Types::T_VARIABLE:
+            case 'variable':
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
                     $left->resolve(null, $compilationContext),
                     $compilationContext,
                     $expression
                 );
-
                 switch ($variableLeft->getType()) {
-                    case Types::T_INT:
-                    case Types::T_UINT:
-                    case Types::T_LONG:
-                    case Types::T_ULONG:
+                    case 'int':
+                    case 'uint':
+                    case 'long':
+                    case 'ulong':
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 return new CompiledExpression(
                                     'double',
-                                    $this->zephirLongLong . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_DOUBLE:
+                            case 'double':
                                 return new CompiledExpression(
                                     'double',
-                                    $this->zephirLongDouble . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
+                                switch ($variableRight->getType()) {
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
+                                    case 'bool':
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_long(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
+
+                                    case 'double':
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_double(' . $variableLeft->getName(
+                                            ) . ', ' . $variableRight->getName() . ')',
+                                            $expression
+                                        );
+
+                                    case 'variable':
+                                        if ($variableRight->isLocalOnly()) {
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
+                                                ) . ', &' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
+                                        } else {
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
+                                                ) . ', ' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
+                                        }
+
+
+                                    default:
+                                        throw new CompilerException(
+                                            "Cannot operate variable('int') with variable('"
+                                            . $variableRight->getType()
+                                            . "')",
+                                            $expression
+                                        );
+                                }
 
-                                return match ($variableRight->getType()) {
-                                    Types::T_INT,
-                                    Types::T_UINT,
-                                    Types::T_LONG,
-                                    Types::T_ULONG,
-                                    Types::T_BOOL     => new CompiledExpression(
-                                        'double',
-                                        $this->zephirLongLong . '(' . $variableLeft->getName(
-                                        ) . ', ' . $variableRight->getName() . ')',
-                                        $expression
-                                    ),
-                                    Types::T_DOUBLE   => new CompiledExpression(
-                                        'double',
-                                        $this->zephirLongDouble . '(' . $variableLeft->getName(
-                                        ) . ', ' . $variableRight->getName() . ')',
-                                        $expression
-                                    ),
-                                    Types::T_VARIABLE => new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_long_zval('
-                                        . $variableLeft->getName()
-                                        . ', '
-                                        . $this->getIsLocal($variableRight)
-                                        . $variableRight->getName() . ')',
-                                        $expression
-                                    ),
-                                    default           => throw new CompilerException(
-                                        "Cannot operate variable('int') with variable('"
-                                        . $variableRight->getType()
-                                        . "')",
-                                        $expression
-                                    ),
-                                };
 
                             default:
                                 throw new CompilerException(
@@ -150,19 +322,19 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_BOOL:
+                    case 'bool':
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_BOOL:
+                            case 'bool':
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -170,20 +342,20 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
                                         return new CompiledExpression(
                                             'double',
-                                            $this->zephirLongLong . '('
+                                            'zephir_safe_mod_long_long('
                                             . $variableLeft->getName()
                                             . ', '
                                             . $variableRight->getName()
@@ -191,10 +363,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_DOUBLE:
+                                    case 'double':
                                         return new CompiledExpression(
                                             'double',
-                                            $this->zephirLongDouble . '('
+                                            'zephir_safe_mod_long_double('
                                             . $variableLeft->getName()
                                             . ', '
                                             . $variableRight->getName()
@@ -202,10 +374,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_BOOL:
+                                    case 'bool':
                                         return new CompiledExpression(
                                             'double',
-                                            $this->zephirLongLong . '('
+                                            'zephir_safe_mod_long_long('
                                             . $variableLeft->getName()
                                             . ' '
                                             . $this->bitOperator
@@ -215,19 +387,30 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
+                                        if ($variableRight->isLocalOnly()) {
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval('
+                                                . $variableLeft->getName()
+                                                . ', &'
+                                                . $variableRight->getName()
+                                                . ')',
+                                                $expression
+                                            );
+                                        } else {
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_long_zval('
+                                                . $variableLeft->getName()
+                                                . ', '
+                                                . $variableRight->getName()
+                                                . ')',
+                                                $expression
+                                            );
+                                        }
 
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_mod_long_zval('
-                                            . $variableLeft->getName()
-                                            . ', '
-                                            . $this->getIsLocal($variableRight)
-                                            . $variableRight->getName()
-                                            . ')',
-                                            $expression
-                                        );
 
                                     default:
                                         throw new CompilerException(
@@ -247,20 +430,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_DOUBLE:
+                    case 'double':
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
-                            case Types::T_DOUBLE:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
+                            case 'double':
                                 return new CompiledExpression(
                                     'double',
-                                    $this->zephirDoubleLong . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
+                                    'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case Types::T_BOOL:
+                            case 'bool':
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -268,33 +451,33 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
                                         return new CompiledExpression(
                                             'double',
-                                            $this->zephirDoubleLong . '(' . $variableLeft->getName(
+                                            'zephir_safe_mod_double_long(' . $variableLeft->getName(
                                             ) . ',  (double) ' . $variableRight->getName() . ')',
                                             $expression
                                         );
 
-                                    case Types::T_DOUBLE:
+                                    case 'double':
                                         return new CompiledExpression(
                                             'double',
-                                            $this->zephirDoubleLong . '(' . $variableLeft->getName(
+                                            'zephir_safe_mod_double_long(' . $variableLeft->getName(
                                             ) . ', ' . $variableRight->getName() . ')',
                                             $expression
                                         );
 
-                                    case Types::T_BOOL:
+                                    case 'bool':
                                         return new CompiledExpression(
                                             'bool',
                                             '(' . $variableLeft->getName(
@@ -302,17 +485,27 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_mod_double_zval('
-                                            . $variableLeft->getName()
-                                            . ', '
-                                            . $this->getIsLocal($variableRight)
-                                            . $variableRight->getName() . ')',
-                                            $expression
-                                        );
+                                        if ($variableRight->isLocalOnly()) {
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_double_zval(' . $variableLeft->getName(
+                                                ) . ', &' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
+                                        } else {
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_mod_double_zval('
+                                                . $variableLeft->getName()
+                                                . ', '
+                                                . $variableRight->getName()
+                                                . ')',
+                                                $expression
+                                            );
+                                        }
+
 
                                     default:
                                         throw new CompilerException(
@@ -331,20 +524,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_STRING:
-                    case Types::T_ARRAY:
+                    case 'string':
+                    case 'array':
                         throw new CompilerException(
                             'Cannot operate ' . $variableLeft->getType() . " variables'",
                             $expression
                         );
-                    case Types::T_VARIABLE:
+                    case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
                             /* a + 1 */
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -354,7 +547,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
 
 
-                            case Types::T_DOUBLE:
+                            case 'double':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -365,7 +558,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                             /* a(var) + a(x) */
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
@@ -373,10 +566,10 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -386,7 +579,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                                     /* a(var) + a(bool) */
-                                    case Types::T_BOOL:
+                                    case 'bool':
                                         return new CompiledExpression(
                                             'int',
                                             'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -396,7 +589,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                                     /* a(var) + a(var) */
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
@@ -436,13 +629,13 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case Types::T_VARIABLE:
+                    case 'variable':
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
-                            case Types::T_INT:
-                            case Types::T_UINT:
-                            case Types::T_LONG:
-                            case Types::T_ULONG:
+                            case 'int':
+                            case 'uint':
+                            case 'long':
+                            case 'ulong':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -451,7 +644,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_DOUBLE:
+                            case 'double':
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -460,18 +653,18 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case Types::T_VARIABLE:
+                            case 'variable':
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
                                     $expression
                                 );
                                 switch ($variableRight->getType()) {
-                                    case Types::T_INT:
-                                    case Types::T_UINT:
-                                    case Types::T_LONG:
-                                    case Types::T_ULONG:
-                                    case Types::T_BOOL:
+                                    case 'int':
+                                    case 'uint':
+                                    case 'long':
+                                    case 'ulong':
+                                    case 'bool':
                                         $compilationContext->headersManager->add('kernel/operators');
 
                                         return new CompiledExpression(
@@ -482,14 +675,14 @@ public function compile($expression, CompilationContext $compilationContext)
                                         );
 
 
-                                    case Types::T_VARIABLE:
+                                    case 'variable':
                                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                             $variableRight->getCode(),
                                             $compilationContext,
                                             $expression
                                         );
                                         switch ($variableRight->getType()) {
-                                            case Types::T_INT:
+                                            case 'int':
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
@@ -497,7 +690,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case Types::T_DOUBLE:
+                                            case 'double':
                                                 return new CompiledExpression(
                                                     'double',
                                                     'zephir_safe_mod_zval_double(' . $op1 . ', ' . $variableRight->getName(
@@ -505,14 +698,14 @@ public function compile($expression, CompilationContext $compilationContext)
                                                     $expression
                                                 );
 
-                                            case Types::T_BOOL:
+                                            case 'bool':
                                                 return new CompiledExpression(
                                                     'bool',
                                                     $op1 . ' ' . $this->bitOperator . ' ' . $variableRight->getName(),
                                                     $expression
                                                 );
 
-                                            case Types::T_VARIABLE:
+                                            case 'variable':
                                                 $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
                                                 $expected = $this->getExpected($compilationContext, $expression);
@@ -529,8 +722,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                             default:
                                                 throw new CompilerException(
-                                                    "Cannot operate variable('double') with variable('"
-                                                    . $variableRight->getType() . "')",
+                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
+                                                    ) . "')",
                                                     $expression
                                                 );
                                         }
@@ -538,8 +731,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     default:
                                         throw new CompilerException(
-                                            "Cannot operate 'variable' with variable ('"
-                                            . $variableRight->getType() . "')",
+                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
+                                            ) . "')",
                                             $expression
                                         );
                                 }
@@ -547,8 +740,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
                             default:
                                 throw new CompilerException(
-                                    "Cannot operate 'variable' with '"
-                                    . $right->getType() . "'",
+                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
                                     $expression
                                 );
                         }
@@ -563,253 +755,4 @@ public function compile($expression, CompilationContext $compilationContext)
                 throw CompilerException::unsupportedType($left, $expression);
         }
     }
-
-    /**
-     * @param Variable $variable
-     *
-     * @return string
-     */
-    protected function getIsLocal(Variable $variable): string
-    {
-        return $variable->isLocalOnly() ? '&' : '';
-    }
-
-    /**
-     * @param CompilationContext $compilationContext
-     * @param Variable|bool      $variableRight
-     * @param mixed              $left
-     * @param array              $expression
-     *
-     * @return CompiledExpression
-     */
-    protected function processDoubleVarVar(
-        CompilationContext $compilationContext,
-        Variable | bool $variableRight,
-        mixed $left,
-        array $expression
-    ): CompiledExpression {
-        return new CompiledExpression(
-            'double',
-            'zephir_safe_mod_double_zval('
-            . $left->getCode()
-            . ', '
-            . $this->getIsLocal($variableRight)
-            . $variableRight->getName() . ')',
-            $expression
-        );
-    }
-
-    /**
-     * @param CompilationContext $compilationContext
-     * @param Variable|bool      $variableRight
-     * @param mixed              $left
-     * @param array              $expression
-     *
-     * @return CompiledExpression
-     */
-    protected function processIntVarVar(
-        CompilationContext $compilationContext,
-        Variable | bool $variableRight,
-        mixed $left,
-        array $expression
-    ): CompiledExpression {
-        return new CompiledExpression(
-            'double',
-            'zephir_safe_mod_long_zval('
-            . $left->getCode()
-            . ', '
-            . $this->getIsLocal($variableRight)
-            . $variableRight->getName() . ')',
-            $expression
-        );
-    }
-
-    /**
-     * @param mixed              $right
-     * @param mixed              $left
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     */
-    protected function processLeftDouble(
-        mixed $right,
-        mixed $left,
-        array $expression,
-        CompilationContext $compilationContext
-    ): CompiledExpression {
-        switch ($right->getType()) {
-            case Types::T_INT:
-            case Types::T_UINT:
-            case Types::T_LONG:
-            case Types::T_ULONG:
-                return new CompiledExpression(
-                    'double',
-                    $this->zephirDoubleLong
-                    . '(' . $left->getCode() . ', (double) (' . $right->getCode() . '))',
-                    $expression
-                );
-
-            case Types::T_DOUBLE:
-                return new CompiledExpression(
-                    'double',
-                    $this->zephirDoubleLong
-                    . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
-                    $expression
-                );
-
-            case Types::T_BOOL:
-                return new CompiledExpression(
-                    'double',
-                    $this->zephirDoubleLong
-                    . '(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
-                    $expression
-                );
-
-            case Types::T_VARIABLE:
-                $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                    $right->getCode(),
-                    $compilationContext,
-                    $expression
-                );
-                return match ($variableRight->getType()) {
-                    Types::T_INT,
-                    Types::T_UINT,
-                    Types::T_LONG,
-                    Types::T_ULONG,
-                    Types::T_BOOL     => new CompiledExpression(
-                        'double',
-                        $this->zephirDoubleLong
-                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
-                        $expression
-                    ),
-                    Types::T_DOUBLE   => new CompiledExpression(
-                        'double',
-                        $this->zephirDoubleDouble
-                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
-                        $expression
-                    ),
-                    Types::T_VARIABLE => $this->processDoubleVarVar(
-                        $compilationContext,
-                        $variableRight,
-                        $left,
-                        $expression
-                    ),
-                    default           => throw new CompilerException(
-                        "Cannot operate variable('double') with variable('"
-                        . $variableRight->getType()
-                        . "')",
-                        $expression
-                    ),
-                };
-
-            default:
-                throw new CompilerException(
-                    "Cannot operate 'double' with '" . $right->getType() . "'",
-                    $expression
-                );
-        }
-    }
-
-    /**
-     * @param mixed              $right
-     * @param mixed              $left
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
-     *
-     * @return CompiledExpression
-     */
-    protected function processLeftInt(
-        mixed $right,
-        mixed $left,
-        array $expression,
-        CompilationContext $compilationContext
-    ): CompiledExpression {
-        switch ($right->getType()) {
-            case Types::T_INT:
-            case Types::T_UINT:
-            case Types::T_LONG:
-            case Types::T_ULONG:
-                return new CompiledExpression(
-                    'double',
-                    $this->zephirLongLong
-                    . '(' . $left->getCode() . ', ' . $right->getCode() . ')',
-                    $expression
-                );
-
-            case Types::T_DOUBLE:
-                return new CompiledExpression(
-                    'double',
-                    $this->zephirLongDouble
-                    . '((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
-                    $expression
-                );
-
-            case Types::T_BOOL:
-                return new CompiledExpression(
-                    'bool',
-                    '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
-                    $expression
-                );
-
-            case Types::T_VARIABLE:
-                $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                    $right->getCode(),
-                    $compilationContext,
-                    $expression
-                );
-
-                return match ($variableRight->getType()) {
-                    Types::T_INT,
-                    Types::T_UINT,
-                    Types::T_LONG,
-                    Types::T_ULONG,
-                    Types::T_BOOL     => new CompiledExpression(
-                        'double',
-                        $this->zephirLongLong
-                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
-                        $expression
-                    ),
-                    Types::T_DOUBLE   => new CompiledExpression(
-                        'double',
-                        $this->zephirLongDouble
-                        . '(' . $left->getCode() . ', ' . $variableRight->getName() . ')',
-                        $expression
-                    ),
-                    Types::T_VARIABLE => $this->processIntVarVar(
-                        $compilationContext,
-                        $left,
-                        $variableRight,
-                        $expression
-                    ),
-                    default           => throw new CompilerException(
-                        "Cannot operate variable('int') with variable('"
-                        . $variableRight->getType() . "')",
-                        $expression
-                    ),
-                };
-
-            default:
-                throw new CompilerException(
-                    "Cannot operate 'int' with '" . $right->getType() . "'",
-                    $expression
-                );
-        }
-    }
-
-    /**
-     * @param mixed $right
-     * @param array $expression
-     *
-     * @return mixed
-     */
-    protected function processLeftStringArray(mixed $right, array $expression)
-    {
-        throw match ($right->getType()) {
-            default => new CompilerException(
-                'Operation is not supported between ' . $right->getType(),
-                $expression
-            ),
-        };
-    }
 }

From cafccba5669cd1bce27e80c70a0c9a9c3710ac2d Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 7 Dec 2023 09:59:43 -0600
Subject: [PATCH 308/375] refactored temporal calls; removed duplicate code

---
 src/Expression/NativeArray.php                |  27 +-
 .../Arithmetical/ArithmeticalBaseOperator.php |  48 +-
 src/Operators/Arithmetical/DivOperator.php    | 166 +----
 src/Operators/Arithmetical/ModOperator.php    | 603 ++++++------------
 src/Operators/Bitwise/BitwiseBaseOperator.php |   8 +-
 src/Operators/Other/CastOperator.php          |  17 +-
 src/Operators/Other/ShortTernaryOperator.php  |   4 +-
 src/Operators/Other/TernaryOperator.php       |   4 +-
 src/Statements/IfStatement.php                |   4 +-
 src/Statements/Let/ArrayIndex.php             |   6 +-
 src/Statements/Let/ObjectDynamicProperty.php  |   5 +-
 .../Let/ObjectDynamicStringProperty.php       |   4 +-
 src/Statements/Let/ObjectProperty.php         |   7 +-
 src/Statements/Let/ObjectPropertyAppend.php   |  32 +-
 .../Let/ObjectPropertyArrayIndex.php          |   8 +-
 src/Statements/Let/StaticProperty.php         |   8 +-
 src/Statements/Let/StaticPropertyAppend.php   |   4 +-
 src/Statements/Let/StaticPropertySub.php      |  36 +-
 src/Statements/Let/Variable.php               |   4 +-
 src/Statements/LetStatement.php               |   6 +-
 src/Statements/ReturnStatement.php            |   5 +-
 src/Statements/StatementAbstract.php          |   3 +
 src/Statements/ThrowStatement.php             |   4 +-
 src/Traits/VariablesTrait.php                 |  12 +
 src/Types/Types.php                           |  50 +-
 25 files changed, 344 insertions(+), 731 deletions(-)

diff --git a/src/Expression/NativeArray.php b/src/Expression/NativeArray.php
index de6e891b8f..c3178358c9 100644
--- a/src/Expression/NativeArray.php
+++ b/src/Expression/NativeArray.php
@@ -20,6 +20,7 @@
 use Zephir\Exception\CompilerException;
 use Zephir\Expression;
 use Zephir\GlobalConstant;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable;
 
 use function count;
@@ -32,6 +33,8 @@
  */
 class NativeArray
 {
+    use VariablesTrait;
+
     protected bool      $expecting         = true;
     protected ?Variable $expectingVariable = null;
     protected bool      $readOnly          = false;
@@ -134,9 +137,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                 $symbol       = $compilationContext->backend->getVariableCode($symbolVariable);
                 $item         = $compilationContext->backend->resolveValue($itemVariable, $compilationContext);
                 $codePrinter->output('zephir_array_fast_append(' . $symbol . ', ' . $item . ');');
-                if ($itemVariable->isTemporal()) {
-                    $itemVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($itemVariable);
 
                 continue;
             }
@@ -204,9 +205,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                 $compilationContext,
                                 'PH_COPY | PH_SEPARATE'
                             );
-                            if ($valueVariable->isTemporal()) {
-                                $valueVariable->setIdle(true);
-                            }
+                            $this->checkVariableTemporal($valueVariable);
                             break;
 
                         default:
@@ -278,9 +277,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                 $compilationContext,
                                 'PH_COPY'
                             );
-                            if ($valueVariable->isTemporal()) {
-                                $valueVariable->setIdle(true);
-                            }
+                            $this->checkVariableTemporal($valueVariable);
                             break;
 
                         default:
@@ -330,9 +327,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                         $compilationContext,
                                         'PH_COPY'
                                     );
-                                    if ($valueVariable->isTemporal()) {
-                                        $valueVariable->setIdle(true);
-                                    }
+                                    $this->checkVariableTemporal($valueVariable);
                                     break;
 
                                 default:
@@ -402,9 +397,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                         $resolvedExpr,
                                         $compilationContext
                                     );
-                                    if ($valueVariable->isTemporal()) {
-                                        $valueVariable->setIdle(true);
-                                    }
+                                    $this->checkVariableTemporal($valueVariable);
                                     break;
 
                                 default:
@@ -430,9 +423,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                         $compilationContext
                                     );
 
-                                    if ($valueVariable->isTemporal()) {
-                                        $valueVariable->setIdle(true);
-                                    }
+                                    $this->checkVariableTemporal($valueVariable);
                                     break;
 
                                 default:
diff --git a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
index 2cfde5152c..1787b41dab 100644
--- a/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
+++ b/src/Operators/Arithmetical/ArithmeticalBaseOperator.php
@@ -595,12 +595,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $compilationContext
                                         );
 
-                                        if ($variableLeft->isTemporal()) {
-                                            $variableLeft->setIdle(true);
-                                        }
-                                        if ($variableRight->isTemporal()) {
-                                            $variableRight->setIdle(true);
-                                        }
+                                        $this->checkVariableTemporal($variableLeft);
+                                        $this->checkVariableTemporal($variableRight);
 
                                         $expected->setDynamicTypes(
                                             $this->getDynamicTypes($variableLeft, $variableRight)
@@ -701,12 +697,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $compilationContext
                                         );
 
-                                        if ($variableLeft->isTemporal()) {
-                                            $variableLeft->setIdle(true);
-                                        }
-                                        if ($variableRight->isTemporal()) {
-                                            $variableRight->setIdle(true);
-                                        }
+                                        $this->checkVariableTemporal($variableLeft);
+                                        $this->checkVariableTemporal($variableRight);
 
                                         $expected->setDynamicTypes(
                                             $this->getDynamicTypes($variableLeft, $variableRight)
@@ -814,6 +806,16 @@ public function optimizeConstantFolding(array $expression, CompilationContext $c
         return false;
     }
 
+    /**
+     * @param Variable $variable
+     *
+     * @return string
+     */
+    protected function getIsLocal(Variable $variable): string
+    {
+        return $variable->isLocalOnly() ? '&' : '';
+    }
+
     /**
      * @param array              $expression
      * @param CompilationContext $compilationContext
@@ -886,24 +888,24 @@ protected function processLeftBoolean(
     private function getDynamicTypes(Variable $left, Variable $right): string
     {
         if ('/' === $this->operator) {
-            return 'double';
+            return Types::T_DOUBLE;
         }
 
         switch ($left->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
                 switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
-                        return 'int';
+                    case Types::T_INT:
+                    case Types::T_UINT:
+                    case Types::T_LONG:
+                    case Types::T_ULONG:
+                        return Types::T_INT;
                 }
                 break;
         }
 
-        return 'double';
+        return Types::T_DOUBLE;
     }
 }
diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index bea87e8093..1b77c4185f 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -271,26 +271,15 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
-                                                ) . ', &' . $variableRight->getName() . ')',
-                                                $expression
-                                            );
-                                        } else {
-                                            $variableRightCode = $compilationContext->backend->getVariableCode(
-                                                $variableRight
-                                            );
-
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
-                                                ) . ', ' . $variableRightCode . ')',
-                                                $expression
-                                            );
-                                        }
-
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_div_long_zval('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $this->getIsLocal($variableRight)
+                                            . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     default:
                                         throw new CompilerException(
@@ -585,12 +574,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'
                                         );
 
-                                        if ($variableLeft->isTemporal()) {
-                                            $variableLeft->setIdle(true);
-                                        }
-                                        if ($variableRight->isTemporal()) {
-                                            $variableRight->setIdle(true);
-                                        }
+                                        $this->checkVariableTemporal($variableLeft);
+                                        $this->checkVariableTemporal($variableRight);
 
                                         return new CompiledExpression(
                                             'variable',
@@ -609,141 +594,16 @@ public function compile($expression, CompilationContext $compilationContext)
 
                             default:
                                 throw new CompilerException(
-                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    "Cannot operate 'variable' with '"
+                                    . $right->getType() . "'",
                                     $expression
                                 );
                         }
 
-
-                    case 'variable':
-                        $op1 = $compilationContext->backend->getVariableCode($variableLeft);
-                        switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                                $op2 = $right->getCode();
-
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_zval_long(' . $op1 . ', ' . $op2 . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                $op2 = $right->getCode();
-
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_div_zval_double(' . $op1 . ', ' . $op2 . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                                    $right->resolve(null, $compilationContext),
-                                    $compilationContext,
-                                    $expression
-                                );
-                                switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
-                                    case 'bool':
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_div_zval_long(' . $op1 . ', ' . $variableRight->getName(
-                                            ) . ')',
-                                            $expression
-                                        );
-
-                                    case 'double':
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_div_zval_double(' . $op1 . ', ' . $variableRight->getName(
-                                            ) . ')',
-                                            $expression
-                                        );
-
-                                    case 'variable':
-                                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                                            $variableRight->getCode(),
-                                            $compilationContext,
-                                            $expression
-                                        );
-                                        $op2           = $compilationContext->backend->getVariableCode($variableRight);
-                                        switch ($variableRight->getType()) {
-                                            case 'int':
-                                                return new CompiledExpression(
-                                                    'double',
-                                                    'zephir_safe_div_zval_long(' . $variableLeft->getName(
-                                                    ) . ', ' . $variableRight->getName() . ')',
-                                                    $expression
-                                                );
-
-                                            case 'double':
-                                                return new CompiledExpression(
-                                                    'double',
-                                                    'zephir_safe_div_zval_double(' . $variableLeft->getName(
-                                                    ) . ', ' . $variableRight->getName() . ')',
-                                                    $expression
-                                                );
-
-                                            case 'bool':
-                                                return new CompiledExpression(
-                                                    'bool',
-                                                    $variableLeft->getName(
-                                                    ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName(),
-                                                    $expression
-                                                );
-
-                                            case 'variable':
-                                                $expected     = $this->getExpected($compilationContext, $expression);
-                                                $expectedCode = $compilationContext->backend->getVariableCode(
-                                                    $expected
-                                                );
-                                                $compilationContext->codePrinter->output(
-                                                    $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'
-                                                );
-
-                                                return new CompiledExpression(
-                                                    'variable',
-                                                    $expected->getName(),
-                                                    $expression
-                                                );
-
-                                            default:
-                                                throw new CompilerException(
-                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
-                                                    ) . "')",
-                                                    $expression
-                                                );
-                                        }
-
-
-                                    default:
-                                        throw new CompilerException(
-                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
-                                            ) . "')",
-                                            $expression
-                                        );
-                                }
-
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
-                                    $expression
-                                );
-                        }
-
-
                     default:
                         throw CompilerException::unknownType($variableLeft, $expression);
                 }
 
-
             default:
                 throw CompilerException::unsupportedType($left, $expression);
         }
diff --git a/src/Operators/Arithmetical/ModOperator.php b/src/Operators/Arithmetical/ModOperator.php
index 0a1860663e..000dbdf013 100644
--- a/src/Operators/Arithmetical/ModOperator.php
+++ b/src/Operators/Arithmetical/ModOperator.php
@@ -16,6 +16,7 @@
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
 use Zephir\Exception\CompilerException;
+use Zephir\Types\Types;
 
 /**
  * Generates an arithmetical operation according to the operands
@@ -37,86 +38,73 @@ public function compile($expression, CompilationContext $compilationContext)
         [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 
         switch ($left->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
-            case 'ulong':
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
+            case Types::T_ULONG:
                 switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
+                    case Types::T_INT:
+                    case Types::T_UINT:
+                    case Types::T_LONG:
+                    case Types::T_ULONG:
                         return new CompiledExpression(
                             'double',
                             'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                             $expression
                         );
 
-                    case 'double':
+                    case Types::T_DOUBLE:
                         return new CompiledExpression(
                             'double',
                             'zephir_safe_mod_long_double((double) ' . $left->getCode() . ', ' . $right->getCode() . ')',
                             $expression
                         );
 
-                    case 'bool':
+                    case Types::T_BOOL:
                         return new CompiledExpression(
                             'bool',
                             '(' . $left->getCode() . ' - ' . $right->getBooleanCode() . ')',
                             $expression
                         );
 
-                    case 'variable':
+                    case Types::T_VARIABLE:
                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
                             $right->getCode(),
                             $compilationContext,
                             $expression
                         );
-                        switch ($variableRight->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'bool':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                if ($variableRight->isLocalOnly()) {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_long_zval(' . $left->getCode(
-                                        ) . ', &' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                } else {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_long_zval(' . $left->getCode(
-                                        ) . ', ' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                }
-
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate variable('int') with variable('" . $variableRight->getType() . "')",
-                                    $expression
-                                );
-                        }
+                        return match ($variableRight->getType()) {
+                            Types::T_INT,
+                            Types::T_UINT,
+                            Types::T_LONG,
+                            Types::T_ULONG,
+                            Types::T_BOOL     => new CompiledExpression(
+                                'double',
+                                'zephir_safe_mod_long_long('
+                                . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                                $expression
+                            ),
+                            Types::T_DOUBLE   => new CompiledExpression(
+                                'double',
+                                'zephir_safe_mod_long_double('
+                                . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                                $expression
+                            ),
+                            Types::T_VARIABLE => new CompiledExpression(
+                                'double',
+                                'zephir_safe_mod_long_zval('
+                                . $left->getCode()
+                                . ', '
+                                . $this->getIsLocal($variableRight)
+                                . $variableRight->getName() . ')',
+                                $expression
+                            ),
+                            default           => throw new CompilerException(
+                                "Cannot operate variable('int') with variable('"
+                                . $variableRight->getType() . "')",
+                                $expression
+                            ),
+                        };
 
 
                     default:
@@ -127,15 +115,15 @@ public function compile($expression, CompilationContext $compilationContext)
                 }
 
 
-            case 'bool':
+            case Types::T_BOOL:
                 return $this->processLeftBoolean($left, $right, $expression);
 
-            case 'double':
+            case Types::T_DOUBLE:
                 switch ($right->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
+                    case Types::T_INT:
+                    case Types::T_UINT:
+                    case Types::T_LONG:
+                    case Types::T_ULONG:
                         return new CompiledExpression(
                             'double',
                             'zephir_safe_mod_double_long(' . $left->getCode() . ', (double) (' . $right->getCode(
@@ -143,73 +131,60 @@ public function compile($expression, CompilationContext $compilationContext)
                             $expression
                         );
 
-                    case 'double':
+                    case Types::T_DOUBLE:
                         return new CompiledExpression(
                             'double',
                             'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                             $expression
                         );
 
-                    case 'bool':
+                    case Types::T_BOOL:
                         return new CompiledExpression(
                             'double',
                             'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getBooleanCode() . ')',
                             $expression
                         );
 
-                    case 'variable':
+                    case Types::T_VARIABLE:
                         $variableRight = $compilationContext->symbolTable->getVariableForRead(
                             $right->getCode(),
                             $compilationContext,
                             $expression
                         );
-                        switch ($variableRight->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'bool':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $variableRight->getName(
-                                    ) . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_double_double(' . $left->getCode(
-                                    ) . ', ' . $variableRight->getName() . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                if ($variableRight->isLocalOnly()) {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_double_zval(' . $left->getCode(
-                                        ) . ', &' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                } else {
-                                    return new CompiledExpression(
-                                        'double',
-                                        'zephir_safe_mod_double_zval(' . $left->getCode(
-                                        ) . ', ' . $variableRight->getName() . ')',
-                                        $expression
-                                    );
-                                }
 
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate variable('double') with variable('"
-                                    . $variableRight->getType()
-                                    . "')",
-                                    $expression
-                                );
-                        }
+                        return match ($variableRight->getType()) {
+                            Types::T_INT,
+                            Types::T_UINT,
+                            Types::T_LONG,
+                            Types::T_ULONG,
+                            Types::T_BOOL     => new CompiledExpression(
+                                'double',
+                                'zephir_safe_mod_double_long('
+                                . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                                $expression
+                            ),
+                            Types::T_DOUBLE   => new CompiledExpression(
+                                'double',
+                                'zephir_safe_mod_double_double('
+                                . $left->getCode() . ', ' . $variableRight->getName() . ')',
+                                $expression
+                            ),
+                            Types::T_VARIABLE => new CompiledExpression(
+                                'double',
+                                'zephir_safe_mod_double_zval('
+                                . $left->getCode()
+                                . ', '
+                                . $this->getIsLocal($variableRight)
+                                . $variableRight->getName() . ')',
+                                $expression
+                            ),
+                            default           => throw new CompilerException(
+                                "Cannot operate variable('double') with variable('"
+                                . $variableRight->getType()
+                                . "')",
+                                $expression
+                            ),
+                        };
 
 
                     default:
@@ -220,98 +195,82 @@ public function compile($expression, CompilationContext $compilationContext)
                 }
 
 
-            case 'string':
-            case 'array':
-                throw match ($right->getType()) {
-                    default => new CompilerException(
-                        'Operation is not supported between ' . $right->getType(),
-                        $expression
-                    ),
-                };
-
+            case Types::T_STRING:
+            case Types::T_ARRAY:
+                throw new CompilerException(
+                    'Operation is not supported between ' . $right->getType(),
+                    $expression
+                );
 
-            case 'variable':
+            case Types::T_VARIABLE:
                 $variableLeft = $compilationContext->symbolTable->getVariableForRead(
                     $left->resolve(null, $compilationContext),
                     $compilationContext,
                     $expression
                 );
                 switch ($variableLeft->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
+                    case Types::T_INT:
+                    case Types::T_UINT:
+                    case Types::T_LONG:
+                    case Types::T_ULONG:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 return new CompiledExpression(
                                     'double',
                                     'zephir_safe_mod_long_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'double':
+                            case Types::T_DOUBLE:
                                 return new CompiledExpression(
                                     'double',
                                     'zephir_safe_mod_long_double(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
-                                switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
-                                    case 'bool':
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_mod_long_long(' . $variableLeft->getName(
-                                            ) . ', ' . $variableRight->getName() . ')',
-                                            $expression
-                                        );
 
-                                    case 'double':
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_mod_long_double(' . $variableLeft->getName(
-                                            ) . ', ' . $variableRight->getName() . ')',
-                                            $expression
-                                        );
-
-                                    case 'variable':
-                                        if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
-                                                ) . ', &' . $variableRight->getName() . ')',
-                                                $expression
-                                            );
-                                        } else {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval(' . $variableLeft->getName(
-                                                ) . ', ' . $variableRight->getName() . ')',
-                                                $expression
-                                            );
-                                        }
-
-
-                                    default:
-                                        throw new CompilerException(
-                                            "Cannot operate variable('int') with variable('"
-                                            . $variableRight->getType()
-                                            . "')",
-                                            $expression
-                                        );
-                                }
+                                return match ($variableRight->getType()) {
+                                    Types::T_INT,
+                                    Types::T_UINT,
+                                    Types::T_LONG,
+                                    Types::T_ULONG,
+                                    Types::T_BOOL     => new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_long('
+                                        . $variableLeft->getName() . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    ),
+                                    Types::T_DOUBLE   => new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_double('
+                                        . $variableLeft->getName() . ', ' . $variableRight->getName() . ')',
+                                        $expression
+                                    ),
+                                    Types::T_VARIABLE => new CompiledExpression(
+                                        'double',
+                                        'zephir_safe_mod_long_zval('
+                                        . $variableLeft->getName()
+                                        . ', '
+                                        . $this->getIsLocal($variableRight)
+                                        . $variableRight->getName() . ')',
+                                        $expression
+                                    ),
+                                    default           => throw new CompilerException(
+                                        "Cannot operate variable('int') with variable('"
+                                        . $variableRight->getType()
+                                        . "')",
+                                        $expression
+                                    ),
+                                };
 
 
                             default:
@@ -322,19 +281,19 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'bool':
+                    case Types::T_BOOL:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'bool':
+                            case Types::T_BOOL:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -342,17 +301,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_mod_long_long('
@@ -363,7 +322,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'double':
+                                    case Types::T_DOUBLE:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_mod_long_double('
@@ -374,7 +333,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_mod_long_long('
@@ -387,30 +346,18 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval('
-                                                . $variableLeft->getName()
-                                                . ', &'
-                                                . $variableRight->getName()
-                                                . ')',
-                                                $expression
-                                            );
-                                        } else {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_long_zval('
-                                                . $variableLeft->getName()
-                                                . ', '
-                                                . $variableRight->getName()
-                                                . ')',
-                                                $expression
-                                            );
-                                        }
-
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_long_zval('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $this->getIsLocal($variableRight)
+                                            . $variableRight->getName()
+                                            . ')',
+                                            $expression
+                                        );
 
                                     default:
                                         throw new CompilerException(
@@ -430,20 +377,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'double':
+                    case Types::T_DOUBLE:
                         switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                            case 'double':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
+                            case Types::T_DOUBLE:
                                 return new CompiledExpression(
                                     'double',
                                     'zephir_safe_mod_double_long(' . $left->getCode() . ', ' . $right->getCode() . ')',
                                     $expression
                                 );
 
-                            case 'bool':
+                            case Types::T_BOOL:
                                 return new CompiledExpression(
                                     'bool',
                                     '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(
@@ -451,17 +398,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                     $expression
                                 );
 
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->getCode(),
                                     $compilationContext,
                                     $expression['right']
                                 );
                                 switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_mod_double_long(' . $variableLeft->getName(
@@ -469,7 +416,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'double':
+                                    case Types::T_DOUBLE:
                                         return new CompiledExpression(
                                             'double',
                                             'zephir_safe_mod_double_long(' . $variableLeft->getName(
@@ -477,7 +424,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'bool',
                                             '(' . $variableLeft->getName(
@@ -485,27 +432,17 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $expression
                                         );
 
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        if ($variableRight->isLocalOnly()) {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_double_zval(' . $variableLeft->getName(
-                                                ) . ', &' . $variableRight->getName() . ')',
-                                                $expression
-                                            );
-                                        } else {
-                                            return new CompiledExpression(
-                                                'double',
-                                                'zephir_safe_mod_double_zval('
-                                                . $variableLeft->getName()
-                                                . ', '
-                                                . $variableRight->getName()
-                                                . ')',
-                                                $expression
-                                            );
-                                        }
-
+                                        return new CompiledExpression(
+                                            'double',
+                                            'zephir_safe_mod_double_zval('
+                                            . $variableLeft->getName()
+                                            . ', '
+                                            . $this->getIsLocal($variableRight)
+                                            . $variableRight->getName() . ')',
+                                            $expression
+                                        );
 
                                     default:
                                         throw new CompilerException(
@@ -524,20 +461,20 @@ public function compile($expression, CompilationContext $compilationContext)
                         }
 
 
-                    case 'string':
-                    case 'array':
+                    case Types::T_STRING:
+                    case Types::T_ARRAY:
                         throw new CompilerException(
                             'Cannot operate ' . $variableLeft->getType() . " variables'",
                             $expression
                         );
-                    case 'variable':
+                    case Types::T_VARIABLE:
                         $op1 = $compilationContext->backend->getVariableCode($variableLeft);
                         switch ($right->getType()) {
                             /* a + 1 */
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
+                            case Types::T_INT:
+                            case Types::T_UINT:
+                            case Types::T_LONG:
+                            case Types::T_ULONG:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -547,7 +484,7 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
 
 
-                            case 'double':
+                            case Types::T_DOUBLE:
                                 $op2 = $right->getCode();
 
                                 return new CompiledExpression(
@@ -558,7 +495,7 @@ public function compile($expression, CompilationContext $compilationContext)
 
 
                             /* a(var) + a(x) */
-                            case 'variable':
+                            case Types::T_VARIABLE:
                                 $variableRight = $compilationContext->symbolTable->getVariableForRead(
                                     $right->resolve(null, $compilationContext),
                                     $compilationContext,
@@ -566,30 +503,30 @@ public function compile($expression, CompilationContext $compilationContext)
                                 );
                                 switch ($variableRight->getType()) {
                                     /* a(var) + a(int) */
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
+                                    case Types::T_INT:
+                                    case Types::T_UINT:
+                                    case Types::T_LONG:
+                                    case Types::T_ULONG:
                                         return new CompiledExpression(
                                             'double',
-                                            'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
-                                            ) . ')',
+                                            'zephir_safe_mod_zval_long('
+                                            . $op1 . ', ' . $variableRight->getName() . ')',
                                             $expression
                                         );
 
 
                                     /* a(var) + a(bool) */
-                                    case 'bool':
+                                    case Types::T_BOOL:
                                         return new CompiledExpression(
                                             'int',
-                                            'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
-                                            ) . ')',
+                                            'zephir_safe_mod_zval_long('
+                                            . $op1 . ', ' . $variableRight->getName() . ')',
                                             $expression
                                         );
 
 
                                     /* a(var) + a(var) */
-                                    case 'variable':
+                                    case Types::T_VARIABLE:
                                         $compilationContext->headersManager->add('kernel/operators');
                                         $op2 = $compilationContext->backend->getVariableCode($variableRight);
 
@@ -599,12 +536,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'
                                         );
 
-                                        if ($variableLeft->isTemporal()) {
-                                            $variableLeft->setIdle(true);
-                                        }
-                                        if ($variableRight->isTemporal()) {
-                                            $variableRight->setIdle(true);
-                                        }
+                                        $this->checkVariableTemporal($variableLeft);
+                                        $this->checkVariableTemporal($variableRight);
 
                                         return new CompiledExpression(
                                             'variable',
@@ -614,125 +547,8 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     default:
                                         throw new CompilerException(
-                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
-                                            ) . "')",
-                                            $expression
-                                        );
-                                }
-
-
-                            default:
-                                throw new CompilerException(
-                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
-                                    $expression
-                                );
-                        }
-
-
-                    case 'variable':
-                        $op1 = $compilationContext->backend->getVariableCode($variableLeft);
-                        switch ($right->getType()) {
-                            case 'int':
-                            case 'uint':
-                            case 'long':
-                            case 'ulong':
-                                $op2 = $right->getCode();
-
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_zval_long(' . $op1 . ', ' . $op2 . ')',
-                                    $expression
-                                );
-
-                            case 'double':
-                                $op2 = $right->getCode();
-
-                                return new CompiledExpression(
-                                    'double',
-                                    'zephir_safe_mod_zval_double(' . $op1 . ', ' . $op2 . ')',
-                                    $expression
-                                );
-
-                            case 'variable':
-                                $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                                    $right->resolve(null, $compilationContext),
-                                    $compilationContext,
-                                    $expression
-                                );
-                                switch ($variableRight->getType()) {
-                                    case 'int':
-                                    case 'uint':
-                                    case 'long':
-                                    case 'ulong':
-                                    case 'bool':
-                                        $compilationContext->headersManager->add('kernel/operators');
-
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
-                                            ) . ')',
-                                            $expression
-                                        );
-
-
-                                    case 'variable':
-                                        $variableRight = $compilationContext->symbolTable->getVariableForRead(
-                                            $variableRight->getCode(),
-                                            $compilationContext,
-                                            $expression
-                                        );
-                                        switch ($variableRight->getType()) {
-                                            case 'int':
-                                                return new CompiledExpression(
-                                                    'double',
-                                                    'zephir_safe_mod_zval_long(' . $op1 . ', ' . $variableRight->getName(
-                                                    ) . ')',
-                                                    $expression
-                                                );
-
-                                            case 'double':
-                                                return new CompiledExpression(
-                                                    'double',
-                                                    'zephir_safe_mod_zval_double(' . $op1 . ', ' . $variableRight->getName(
-                                                    ) . ')',
-                                                    $expression
-                                                );
-
-                                            case 'bool':
-                                                return new CompiledExpression(
-                                                    'bool',
-                                                    $op1 . ' ' . $this->bitOperator . ' ' . $variableRight->getName(),
-                                                    $expression
-                                                );
-
-                                            case 'variable':
-                                                $op2 = $compilationContext->backend->getVariableCode($variableRight);
-
-                                                $expected = $this->getExpected($compilationContext, $expression);
-                                                $symbol   = $compilationContext->backend->getVariableCode($expected);
-                                                $compilationContext->codePrinter->output(
-                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'
-                                                );
-
-                                                return new CompiledExpression(
-                                                    'variable',
-                                                    $expected->getName(),
-                                                    $expression
-                                                );
-
-                                            default:
-                                                throw new CompilerException(
-                                                    "Cannot operate variable('double') with variable('" . $variableRight->getType(
-                                                    ) . "')",
-                                                    $expression
-                                                );
-                                        }
-
-
-                                    default:
-                                        throw new CompilerException(
-                                            "Cannot operate 'variable' with variable ('" . $variableRight->getType(
-                                            ) . "')",
+                                            "Cannot operate 'variable' with variable ('"
+                                            . $variableRight->getType() . "')",
                                             $expression
                                         );
                                 }
@@ -740,17 +556,16 @@ public function compile($expression, CompilationContext $compilationContext)
 
                             default:
                                 throw new CompilerException(
-                                    "Cannot operate 'variable' with '" . $right->getType() . "'",
+                                    "Cannot operate 'variable' with '"
+                                    . $right->getType() . "'",
                                     $expression
                                 );
                         }
 
-
                     default:
                         throw CompilerException::unknownType($variableLeft, $expression);
                 }
 
-
             default:
                 throw CompilerException::unsupportedType($left, $expression);
         }
diff --git a/src/Operators/Bitwise/BitwiseBaseOperator.php b/src/Operators/Bitwise/BitwiseBaseOperator.php
index 0b9feefee1..67495b3a92 100644
--- a/src/Operators/Bitwise/BitwiseBaseOperator.php
+++ b/src/Operators/Bitwise/BitwiseBaseOperator.php
@@ -637,12 +637,8 @@ public function compile($expression, CompilationContext $compilationContext)
                                             $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'
                                         );
 
-                                        if ($variableLeft->isTemporal()) {
-                                            $variableLeft->setIdle(true);
-                                        }
-                                        if ($variableRight->isTemporal()) {
-                                            $variableRight->setIdle(true);
-                                        }
+                                        $this->checkVariableTemporal($variableLeft);
+                                        $this->checkVariableTemporal($variableRight);
 
                                         return new CompiledExpression('variable', $expected->getName(), $expression);
 
diff --git a/src/Operators/Other/CastOperator.php b/src/Operators/Other/CastOperator.php
index 8ed0312f62..b8811a6660 100644
--- a/src/Operators/Other/CastOperator.php
+++ b/src/Operators/Other/CastOperator.php
@@ -373,9 +373,8 @@ public function compile(array $expression, CompilationContext $compilationContex
                         );
                         $symbol         = $compilationContext->backend->getVariableCode($symbolVariable);
 
-                        if ($symbolVariable->isTemporal()) {
-                            $symbolVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($symbolVariable);
+
                         return match ($symbolVariable->getType()) {
                             Types::T_INT,
                             Types::T_CHAR,
@@ -514,9 +513,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     sprintf('zephir_cast_to_string(%s, %s);', $symbol, $resolvedCode)
                                 );
 
-                                if ($symbolVariable->isTemporal()) {
-                                    $symbolVariable->setIdle(true);
-                                }
+                                $this->checkVariableTemporal($symbolVariable);
 
                                 return new CompiledExpression(
                                     'variable',
@@ -560,9 +557,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             sprintf('zephir_get_arrval(%s, %s);', $symbol, $resolvedCode)
                         );
 
-                        if ($symbolVariable->isTemporal()) {
-                            $symbolVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($symbolVariable);
 
                         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
 
@@ -619,9 +614,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             $expression
                         );
                         $symbol         = $compilationContext->backend->getVariableCode($symbolVariable);
-                        if ($symbolVariable->isTemporal()) {
-                            $symbolVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($symbolVariable);
 
                         $compilationContext->codePrinter->output('zephir_convert_to_object(' . $symbol . ');');
 
diff --git a/src/Operators/Other/ShortTernaryOperator.php b/src/Operators/Other/ShortTernaryOperator.php
index 09a3213362..56dcb075d1 100644
--- a/src/Operators/Other/ShortTernaryOperator.php
+++ b/src/Operators/Other/ShortTernaryOperator.php
@@ -53,9 +53,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 'variable',
                 $compilationContext
             );
-            if ($returnVariable->isTemporal()) {
-                $returnVariable->skipInitVariant(2);
-            }
+            $this->checkVariableTemporal($returnVariable);
         }
 
         $ifBuilder = new IfStatementBuilder(
diff --git a/src/Operators/Other/TernaryOperator.php b/src/Operators/Other/TernaryOperator.php
index 37a28e5412..0797e4ad89 100644
--- a/src/Operators/Other/TernaryOperator.php
+++ b/src/Operators/Other/TernaryOperator.php
@@ -48,9 +48,7 @@ public function compile($expression, CompilationContext $compilationContext): Co
                 'variable',
                 $compilationContext
             );
-            if ($returnVariable->isTemporal()) {
-                $returnVariable->skipInitVariant(2);
-            }
+            $this->checkVariableTemporal($returnVariable);
         }
 
         $expr      = new EvalExpression();
diff --git a/src/Statements/IfStatement.php b/src/Statements/IfStatement.php
index 734106df63..3e65748486 100644
--- a/src/Statements/IfStatement.php
+++ b/src/Statements/IfStatement.php
@@ -100,9 +100,7 @@ public function compile(CompilationContext $compilationContext): void
          */
         $evalVariable = $expr->getEvalVariable();
         if (is_object($evalVariable)) {
-            if ($evalVariable->isTemporal()) {
-                $evalVariable->setIdle(true);
-            }
+            $this->checkVariableTemporal($evalVariable);
         }
 
         /**
diff --git a/src/Statements/Let/ArrayIndex.php b/src/Statements/Let/ArrayIndex.php
index ae7c2b298b..0aa4c4eb12 100644
--- a/src/Statements/Let/ArrayIndex.php
+++ b/src/Statements/Let/ArrayIndex.php
@@ -168,14 +168,12 @@ protected function _assignArrayIndexMultiple(
             $compilationContext
         );
 
-        if ($symbolVariable->isTemporal()) {
-            $symbolVariable->setIdle(true);
-        }
+        $this->checkVariableTemporal($symbolVariable);
     }
 
     /**
      * Compiles foo[y] = {expr} (one offset).
-
+     *
      * @param ZephirVariable     $symbolVariable
      * @param CompiledExpression $resolvedExpr
      * @param CompilationContext $compilationContext
diff --git a/src/Statements/Let/ObjectDynamicProperty.php b/src/Statements/Let/ObjectDynamicProperty.php
index 7e9dcb229d..798727b70d 100644
--- a/src/Statements/Let/ObjectDynamicProperty.php
+++ b/src/Statements/Let/ObjectDynamicProperty.php
@@ -242,9 +242,8 @@ public function assign(
                             $resolvedExpr,
                             $compilationContext
                         );
-                        if ($symbolVariable->isTemporal()) {
-                            $symbolVariable->setIdle(true);
-                        }
+
+                        $this->checkVariableTemporal($symbolVariable);
                         break;
 
                     default:
diff --git a/src/Statements/Let/ObjectDynamicStringProperty.php b/src/Statements/Let/ObjectDynamicStringProperty.php
index 7e74aaa4b9..4ec9aff495 100644
--- a/src/Statements/Let/ObjectDynamicStringProperty.php
+++ b/src/Statements/Let/ObjectDynamicStringProperty.php
@@ -235,9 +235,7 @@ public function assign(
                             $resolvedExpr,
                             $compilationContext
                         );
-                        if ($symbolVariable->isTemporal()) {
-                            $symbolVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($symbolVariable);
                         break;
 
                     default:
diff --git a/src/Statements/Let/ObjectProperty.php b/src/Statements/Let/ObjectProperty.php
index 0e8c36eb45..482e21b131 100644
--- a/src/Statements/Let/ObjectProperty.php
+++ b/src/Statements/Let/ObjectProperty.php
@@ -17,6 +17,7 @@
 use Zephir\CompiledExpression as Expression;
 use Zephir\Exception\CompilerException;
 use Zephir\Exception\CompilerException as Exception;
+use Zephir\Traits\VariablesTrait;
 use Zephir\Variable\Variable as ZephirVariable;
 
 use function sprintf;
@@ -26,6 +27,8 @@
  */
 class ObjectProperty
 {
+    use VariablesTrait;
+
     /**
      * Compiles foo->x = {expr}.
      *
@@ -342,9 +345,7 @@ public function assign(
                     case 'variable':
                     case 'mixed':
                         $context->backend->updateProperty($symbolVariable, $propertyName, $variableVariable, $context);
-                        if ($symbolVariable->isTemporal()) {
-                            $symbolVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($symbolVariable);
                         break;
 
                     default:
diff --git a/src/Statements/Let/ObjectPropertyAppend.php b/src/Statements/Let/ObjectPropertyAppend.php
index 36c7db1d15..b63edad376 100644
--- a/src/Statements/Let/ObjectPropertyAppend.php
+++ b/src/Statements/Let/ObjectPropertyAppend.php
@@ -154,9 +154,7 @@ public function assign(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'int':
@@ -175,9 +173,7 @@ public function assign(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'double':
@@ -198,9 +194,7 @@ public function assign(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'string':
@@ -222,9 +216,7 @@ public function assign(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'array':
@@ -266,9 +258,7 @@ public function assign(
                             $tempVariable,
                             $compilationContext
                         );
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($tempVariable);
                         break;
 
                     case 'double':
@@ -285,9 +275,7 @@ public function assign(
                             $tempVariable,
                             $compilationContext
                         );
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($tempVariable);
                         break;
 
                     case 'bool':
@@ -304,9 +292,7 @@ public function assign(
                             $tempVariable,
                             $compilationContext
                         );
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($tempVariable);
                         break;
 
                     case 'variable':
@@ -322,9 +308,7 @@ public function assign(
                             $variableExpr,
                             $compilationContext
                         );
-                        if ($variableExpr->isTemporal()) {
-                            $variableExpr->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($variableExpr);
                         break;
 
                     default:
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index df472bc7d1..9b0c4955ea 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -149,9 +149,7 @@ protected function _assignPropertyArrayMultipleIndex(
             $compilationContext
         );
 
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
-        }
+        $this->checkVariableTemporal($variableExpr);
     }
 
     /**
@@ -519,9 +517,7 @@ protected function _assignPropertyArraySingleIndex(
                                     $variableExpr,
                                     $compilationContext
                                 );
-                                if ($variableExpr->isTemporal()) {
-                                    $variableExpr->setIdle(true);
-                                }
+                                $this->checkVariableTemporal($variableExpr);
                                 break;
 
                             default:
diff --git a/src/Statements/Let/StaticProperty.php b/src/Statements/Let/StaticProperty.php
index 2d89bfda65..20f2300684 100644
--- a/src/Statements/Let/StaticProperty.php
+++ b/src/Statements/Let/StaticProperty.php
@@ -92,9 +92,7 @@ protected function processDefaultType(
                             $variableVariable,
                             $compilationContext
                         );
-                        if ($variableVariable->isTemporal()) {
-                            $variableVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($variableVariable);
                         break;
                     default:
                         throw CompilerException::illegalOperationTypeOnStaticVariable(
@@ -112,9 +110,7 @@ protected function processDefaultType(
                     $variableVariable,
                     $compilationContext
                 );
-                if ($variableVariable->isTemporal()) {
-                    $variableVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($variableVariable);
                 break;
 
             default:
diff --git a/src/Statements/Let/StaticPropertyAppend.php b/src/Statements/Let/StaticPropertyAppend.php
index 7e686b2bc7..9db9e8eb29 100644
--- a/src/Statements/Let/StaticPropertyAppend.php
+++ b/src/Statements/Let/StaticPropertyAppend.php
@@ -155,9 +155,7 @@ protected function _assignStaticPropertyArrayMultipleIndex(
             $compilationContext
         );
 
-        if ($variableExpr->isTemporal()) {
-            $variableExpr->setIdle(true);
-        }
+        $this->checkVariableTemporal($variableExpr);
     }
 
     /**
diff --git a/src/Statements/Let/StaticPropertySub.php b/src/Statements/Let/StaticPropertySub.php
index d85a049eeb..d3aeda75cc 100644
--- a/src/Statements/Let/StaticPropertySub.php
+++ b/src/Statements/Let/StaticPropertySub.php
@@ -117,9 +117,7 @@ public function assignStatic(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'char':
@@ -140,9 +138,7 @@ public function assignStatic(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'double':
@@ -162,9 +158,7 @@ public function assignStatic(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'string':
@@ -185,9 +179,7 @@ public function assignStatic(
                     $codePrinter->output('ZVAL_EMPTY_STRING(' . $tempVariable->getName() . ');');
                 }
 
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
 
                 $compilationContext->backend->$method(
                     $classEntry,
@@ -250,9 +242,7 @@ public function assignStatic(
                     $tempVariable,
                     $compilationContext
                 );
-                if ($tempVariable->isTemporal()) {
-                    $tempVariable->setIdle(true);
-                }
+                $this->checkVariableTemporal($tempVariable);
                 break;
 
             case 'array':
@@ -297,9 +287,7 @@ public function assignStatic(
                             $compilationContext
                         );
 
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($tempVariable);
                         break;
 
                     case 'double':
@@ -326,9 +314,7 @@ public function assignStatic(
                             $compilationContext
                         );
 
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($tempVariable);
                         break;
 
                     case 'bool':
@@ -344,9 +330,7 @@ public function assignStatic(
                             $tempVariable,
                             $compilationContext
                         );
-                        if ($tempVariable->isTemporal()) {
-                            $tempVariable->setIdle(true);
-                        }
+                        $this->checkVariableTemporal($tempVariable);
                         break;
                     default:
                         $this->processDefaultType(
@@ -389,9 +373,7 @@ protected function processDefaultType(
             $variableVariable,
             $compilationContext
         );
-        if ($variableVariable->isTemporal()) {
-            $variableVariable->setIdle(true);
-        }
+        $this->checkVariableTemporal($variableVariable);
     }
 
     /**
diff --git a/src/Statements/Let/Variable.php b/src/Statements/Let/Variable.php
index 38ad92ff09..3dbc8e49bd 100644
--- a/src/Statements/Let/Variable.php
+++ b/src/Statements/Let/Variable.php
@@ -1592,9 +1592,7 @@ private function processDoVariableAssignmentVariableString(
                 $itemVariable,
                 $compilationContext
             );
-            if ($itemVariable->isTemporal()) {
-                $itemVariable->setIdle(true);
-            }
+            $this->checkVariableTemporal($itemVariable);
         }
     }
 }
diff --git a/src/Statements/LetStatement.php b/src/Statements/LetStatement.php
index fe6635c9a9..90aef5957b 100644
--- a/src/Statements/LetStatement.php
+++ b/src/Statements/LetStatement.php
@@ -84,7 +84,7 @@ public function compile(CompilationContext $compilationContext): void
                     $compilationContext,
                     $assignment
                 ),
-                default                                                                                                                                         => $compilationContext->symbolTable->getVariableForWrite(
+                default                            => $compilationContext->symbolTable->getVariableForWrite(
                     $variable,
                     $compilationContext,
                     $assignment
@@ -336,8 +336,8 @@ protected function replaceAssignBitwiseOnDirect(array $assignment): array
             );
         }
 
-        $builderExpr = BuilderFactory::getInstance();
-        $leftExpression = $builderExpr->variable($assignment['variable']);
+        $builderExpr        = BuilderFactory::getInstance();
+        $leftExpression     = $builderExpr->variable($assignment['variable']);
         $assignment['expr'] = $builderExpr->operators()
                                           ->binary($operator, $leftExpression, $builderExpr->raw($assignment['expr']))
                                           ->build()
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 6559780ff6..16ec625205 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -313,9 +313,8 @@ public function compile(CompilationContext $compilationContext): void
                                     $codePrinter->output(self::RETURN_RETURN);
                                 }
                             }
-                            if ($symbolVariable->isTemporal()) {
-                                $symbolVariable->setIdle(true);
-                            }
+
+                            $this->checkVariableTemporal($symbolVariable);
                             break;
 
                         default:
diff --git a/src/Statements/StatementAbstract.php b/src/Statements/StatementAbstract.php
index 6ccf421a60..f2bcf57299 100644
--- a/src/Statements/StatementAbstract.php
+++ b/src/Statements/StatementAbstract.php
@@ -15,9 +15,12 @@
 
 use Zephir\CompilationContext;
 use Zephir\Optimizers\EvalExpression;
+use Zephir\Traits\VariablesTrait;
 
 abstract class StatementAbstract
 {
+    use VariablesTrait;
+
     protected ?EvalExpression $evalExpression;
 
     public function __construct(protected array $statement)
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index ed20f116cd..86186c7a44 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -135,9 +135,7 @@ public function compile(CompilationContext $compilationContext): void
             $codePrinter->outputBlankLine();
         }
 
-        if ($variableVariable->isTemporal()) {
-            $variableVariable->setIdle(true);
-        }
+        $this->checkVariableTemporal($variableVariable);
     }
 
     /**
diff --git a/src/Traits/VariablesTrait.php b/src/Traits/VariablesTrait.php
index a817567b6b..323ff3ffb4 100644
--- a/src/Traits/VariablesTrait.php
+++ b/src/Traits/VariablesTrait.php
@@ -197,4 +197,16 @@ protected function checkVariableReadOnly(
             );
         }
     }
+
+    /**
+     * @param string $variable
+     *
+     * @return void
+     */
+    protected function checkVariableTemporal(Variable $variable): void
+    {
+        if ($variable->isTemporal()) {
+            $variable->setIdle(true);
+        }
+    }
 }
diff --git a/src/Types/Types.php b/src/Types/Types.php
index 6357b3fba2..73c30bdb34 100644
--- a/src/Types/Types.php
+++ b/src/Types/Types.php
@@ -21,31 +21,31 @@
 
 final class Types
 {
-    public const T_ARRAY     = 'array';
-    public const T_BOOL      = 'bool';
-    public const T_BOOLEAN   = 'boolean';
-    public const T_CALLABLE  = 'callable';
-    public const T_CHAR      = 'char';
-    public const T_DOUBLE    = 'double';
-    public const T_FALSE     = 'false';
-    public const T_FLOAT     = 'float';
-    public const T_HASH      = 'hash';
-    public const T_INT       = 'int';
-    public const T_INTEGER   = 'integer';
-    public const T_ISTRING   = 'istring';
-    public const T_ITERABLE  = 'iterable';
-    public const T_LONG      = 'long';
-    public const T_MIXED     = 'mixed';
-    public const T_NULL      = 'null';
-    public const T_NUMBER    = 'number';
-    public const T_OBJECT    = 'object';
-    public const T_RESOURCE  = 'resource';
-    public const T_STRING    = 'string';
-    public const T_UCHAR     = 'uchar';
-    public const T_UINT      = 'uint';
-    public const T_ULONG     = 'ulong';
-    public const T_VARIABLE  = 'variable';
-    public const T_VOID      = 'void';
+    public const T_ARRAY    = 'array';
+    public const T_BOOL     = 'bool';
+    public const T_BOOLEAN  = 'boolean';
+    public const T_CALLABLE = 'callable';
+    public const T_CHAR     = 'char';
+    public const T_DOUBLE   = 'double';
+    public const T_FALSE    = 'false';
+    public const T_FLOAT    = 'float';
+    public const T_HASH     = 'hash';
+    public const T_INT      = 'int';
+    public const T_INTEGER  = 'integer';
+    public const T_ISTRING  = 'istring';
+    public const T_ITERABLE = 'iterable';
+    public const T_LONG     = 'long';
+    public const T_MIXED    = 'mixed';
+    public const T_NULL     = 'null';
+    public const T_NUMBER   = 'number';
+    public const T_OBJECT   = 'object';
+    public const T_RESOURCE = 'resource';
+    public const T_STRING   = 'string';
+    public const T_UCHAR    = 'uchar';
+    public const T_UINT     = 'uint';
+    public const T_ULONG    = 'ulong';
+    public const T_VARIABLE = 'variable';
+    public const T_VOID     = 'void';
 
     /**
      * Gets PHP compatible return type from class method.

From 0d8cc7037a528ed4800179fbd5f6788a316f17cf Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 7 Dec 2023 10:08:32 -0600
Subject: [PATCH 309/375] correcting variable type

---
 src/Traits/VariablesTrait.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Traits/VariablesTrait.php b/src/Traits/VariablesTrait.php
index 323ff3ffb4..dab4c5b314 100644
--- a/src/Traits/VariablesTrait.php
+++ b/src/Traits/VariablesTrait.php
@@ -18,6 +18,7 @@
 use Zephir\Class\Definition\Definition;
 use Zephir\Class\Property;
 use Zephir\Exception\CompilerException;
+use Zephir\GlobalConstant;
 use Zephir\Variable\Variable;
 use Zephir\Variable\Variable as ZephirVariable;
 
@@ -199,11 +200,11 @@ protected function checkVariableReadOnly(
     }
 
     /**
-     * @param string $variable
+     * @param GlobalConstant|ZephirVariable $variable
      *
      * @return void
      */
-    protected function checkVariableTemporal(Variable $variable): void
+    protected function checkVariableTemporal(GlobalConstant|Variable $variable): void
     {
         if ($variable->isTemporal()) {
             $variable->setIdle(true);

From d7068c6f98b66ab87a2c1107fafa5f5c3cb93a5e Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 7 Dec 2023 11:45:47 -0600
Subject: [PATCH 310/375] adjustments to qodana

---
 .github/workflows/main.yml     |   9 ++
 qodana.yaml                    |   2 +
 src/Expression/NativeArray.php | 164 +++++++++++++++++----------------
 3 files changed, 96 insertions(+), 79 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7bef1f9d1d..dcba20b3ba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -220,6 +220,15 @@ jobs:
         with:
           args: --baseline,qodana.sarif.json
 
+      - name: 'Qodana Scan'
+        run: |
+          docker run \
+            -v $(pwd):/data/project/ \
+            -v $(pwd):/data/base/ \
+            -e QODANA_TOKEN="${{ secrets.CODECOV_TOKEN }}" \
+            jetbrains/qodana-php \
+            --baseline /data/base/qodana.sarif.json
+
       - name: "Create download folder"
         run: |
           mkdir -p reports
diff --git a/qodana.yaml b/qodana.yaml
index 1f56304035..160c0077ca 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -40,3 +40,5 @@ exclude:
       - vendor
 include:
   - name: CheckDependencyLicenses
+  - name: PhpVulnerablePathsInspection
+  - name: VulnerableLibrariesGlobal
diff --git a/src/Expression/NativeArray.php b/src/Expression/NativeArray.php
index c3178358c9..02deb9fc38 100644
--- a/src/Expression/NativeArray.php
+++ b/src/Expression/NativeArray.php
@@ -21,6 +21,7 @@
 use Zephir\Expression;
 use Zephir\GlobalConstant;
 use Zephir\Traits\VariablesTrait;
+use Zephir\Types\Types;
 use Zephir\Variable\Variable;
 
 use function count;
@@ -146,16 +147,16 @@ public function compile(array $expression, CompilationContext $compilationContex
             $resolvedExprKey = $exprKey->compile($compilationContext);
 
             switch ($resolvedExprKey->getType()) {
-                case 'string':
+                case Types::T_STRING:
                     $expr         = new Expression($item['value']);
                     $resolvedExpr = $expr->compile($compilationContext);
                     switch ($resolvedExpr->getType()) {
-                        case 'int':
-                        case 'uint':
-                        case 'long':
-                        case 'ulong':
-                        case 'string':
-                        case 'double':
+                        case Types::T_INT:
+                        case Types::T_UINT:
+                        case Types::T_LONG:
+                        case Types::T_ULONG:
+                        case Types::T_DOUBLE:
+                        case Types::T_STRING:
                             $compilationContext->backend->addArrayEntry(
                                 $symbolVariable,
                                 $resolvedExprKey,
@@ -164,7 +165,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             );
                             break;
 
-                        case 'bool':
+                        case Types::T_BOOL:
                             $compilationContext->headersManager->add('kernel/array');
                             if ('true' == $resolvedExpr->getCode()) {
                                 $compilationContext->backend->updateArray(
@@ -185,7 +186,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             }
                             break;
 
-                        case 'null':
+                        case Types::T_NULL:
                             $compilationContext->backend->updateArray(
                                 $symbolVariable,
                                 $resolvedExprKey,
@@ -195,8 +196,8 @@ public function compile(array $expression, CompilationContext $compilationContex
                             );
                             break;
 
-                        case 'array':
-                        case 'variable':
+                        case Types::T_ARRAY:
+                        case Types::T_VARIABLE:
                             $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
                             $compilationContext->backend->updateArray(
                                 $symbolVariable,
@@ -216,19 +217,19 @@ public function compile(array $expression, CompilationContext $compilationContex
                     }
                     break;
 
-                case 'int':
-                case 'uint':
-                case 'long':
-                case 'ulong':
+                case Types::T_INT:
+                case Types::T_UINT:
+                case Types::T_LONG:
+                case Types::T_ULONG:
                     $expr         = new Expression($item['value']);
                     $resolvedExpr = $expr->compile($compilationContext);
                     switch ($resolvedExpr->getType()) {
-                        case 'int':
-                        case 'uint':
-                        case 'long':
-                        case 'ulong':
-                        case 'double':
-                        case 'string':
+                        case Types::T_INT:
+                        case Types::T_UINT:
+                        case Types::T_LONG:
+                        case Types::T_ULONG:
+                        case Types::T_DOUBLE:
+                        case Types::T_STRING:
                             $compilationContext->backend->addArrayEntry(
                                 $symbolVariable,
                                 $resolvedExprKey,
@@ -237,7 +238,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             );
                             break;
 
-                        case 'bool':
+                        case Types::T_BOOL:
                             if ('true' == $resolvedExpr->getCode()) {
                                 $compilationContext->backend->updateArray(
                                     $symbolVariable,
@@ -257,7 +258,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                             }
                             break;
 
-                        case 'null':
+                        case Types::T_NULL:
                             $compilationContext->backend->updateArray(
                                 $symbolVariable,
                                 $resolvedExprKey,
@@ -267,8 +268,8 @@ public function compile(array $expression, CompilationContext $compilationContex
                             );
                             break;
 
-                        case 'array':
-                        case 'variable':
+                        case Types::T_ARRAY:
+                        case Types::T_VARIABLE:
                             $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
                             $compilationContext->backend->updateArray(
                                 $symbolVariable,
@@ -288,28 +289,28 @@ public function compile(array $expression, CompilationContext $compilationContex
                     }
                     break;
 
-                case 'variable':
+                case Types::T_VARIABLE:
                     $variableVariable = $compilationContext->symbolTable->getVariableForRead(
                         $resolvedExprKey->getCode(),
                         $compilationContext,
                         $item['key']
                     );
                     switch ($variableVariable->getType()) {
-                        case 'int':
-                        case 'uint':
-                        case 'long':
-                        case 'ulong':
+                        case Types::T_INT:
+                        case Types::T_UINT:
+                        case Types::T_LONG:
+                        case Types::T_ULONG:
                             $expr         = new Expression($item['value']);
                             $resolvedExpr = $expr->compile($compilationContext);
                             switch ($resolvedExpr->getType()) {
-                                case 'int':
-                                case 'uint':
-                                case 'long':
-                                case 'ulong':
-                                case 'bool':
-                                case 'double':
-                                case 'null':
-                                case 'string':
+                                case Types::T_INT:
+                                case Types::T_UINT:
+                                case Types::T_LONG:
+                                case Types::T_ULONG:
+                                case Types::T_BOOL:
+                                case Types::T_DOUBLE:
+                                case Types::T_NULL:
+                                case Types::T_STRING:
                                     $compilationContext->backend->addArrayEntry(
                                         $symbolVariable,
                                         $resolvedExprKey,
@@ -318,7 +319,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     );
                                     break;
 
-                                case 'variable':
+                                case Types::T_VARIABLE:
                                     $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
                                     $compilationContext->backend->updateArray(
                                         $symbolVariable,
@@ -338,14 +339,14 @@ public function compile(array $expression, CompilationContext $compilationContex
                             }
                             break;
 
-                        case 'string':
+                        case Types::T_STRING:
                             $expr         = new Expression($item['value']);
                             $resolvedExpr = $expr->compile($compilationContext);
                             switch ($resolvedExpr->getType()) {
-                                case 'int':
-                                case 'uint':
-                                case 'long':
-                                case 'ulong':
+                                case Types::T_INT:
+                                case Types::T_UINT:
+                                case Types::T_LONG:
+                                case Types::T_ULONG:
                                     $codePrinter->output(
                                         'add_assoc_long_ex(' . $symbolVariable->getName(
                                         ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
@@ -354,7 +355,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     );
                                     break;
 
-                                case 'double':
+                                case Types::T_DOUBLE:
                                     $codePrinter->output(
                                         'add_assoc_double_ex(' . $symbolVariable->getName(
                                         ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
@@ -363,7 +364,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     );
                                     break;
 
-                                case 'bool':
+                                case Types::T_BOOL:
                                     $codePrinter->output(
                                         'add_assoc_bool_ex(' . $symbolVariable->getName(
                                         ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
@@ -372,7 +373,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     );
                                     break;
 
-                                case 'string':
+                                case Types::T_STRING:
                                     $compilationContext->backend->addArrayEntry(
                                         $symbolVariable,
                                         $resolvedExprKey,
@@ -381,7 +382,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     );
                                     break;
 
-                                case 'null':
+                                case Types::T_NULL:
                                     $codePrinter->output(
                                         'add_assoc_null_ex(' . $symbolVariable->getName(
                                         ) . ', Z_STRVAL_P(' . $resolvedExprKey->getCode(
@@ -389,7 +390,7 @@ public function compile(array $expression, CompilationContext $compilationContex
                                     );
                                     break;
 
-                                case 'variable':
+                                case Types::T_VARIABLE:
                                     $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
                                     $compilationContext->backend->updateArray(
                                         $symbolVariable,
@@ -408,13 +409,13 @@ public function compile(array $expression, CompilationContext $compilationContex
                             }
                             break;
 
-                        case 'variable':
+                        case Types::T_VARIABLE:
                             $expr         = new Expression($item['value']);
                             $resolvedExpr = $expr->compile($compilationContext);
                             switch ($resolvedExpr->getType()) {
-                                case 'null':
-                                case 'variable':
-                                case 'bool':
+                                case Types::T_NULL:
+                                case Types::T_VARIABLE:
+                                case Types::T_BOOL:
                                     $valueVariable = $this->getArrayValue($resolvedExpr, $compilationContext);
                                     $compilationContext->backend->updateArray(
                                         $symbolVariable,
@@ -444,7 +445,10 @@ public function compile(array $expression, CompilationContext $compilationContex
                     break;
 
                 default:
-                    throw new CompilerException('Invalid key type: ' . $resolvedExprKey->getType(), $item['key']);
+                    throw new CompilerException(
+                        'Invalid key type: '
+                        . $resolvedExprKey->getType(), $item['key']
+                    );
             }
         }
 
@@ -457,21 +461,23 @@ public function compile(array $expression, CompilationContext $compilationContex
      * @param CompiledExpression $exprCompiled
      * @param CompilationContext $compilationContext
      *
-     * @return Variable
+     * @return GlobalConstant|Variable
      */
-    public function getArrayValue(CompiledExpression $exprCompiled, CompilationContext $compilationContext)
-    {
+    public function getArrayValue(
+        CompiledExpression $exprCompiled,
+        CompilationContext $compilationContext
+    ) {
         switch ($exprCompiled->getType()) {
-            case 'int':
-            case 'uint':
-            case 'long':
+            case Types::T_INT:
+            case Types::T_UINT:
+            case Types::T_LONG:
                 $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
                 $compilationContext->backend->assignLong($tempVar, $exprCompiled->getCode(), $compilationContext);
 
                 return $tempVar;
 
-            case 'char':
-            case 'uchar':
+            case Types::T_CHAR:
+            case Types::T_UCHAR:
                 $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
                 $compilationContext->backend->assignLong(
                     $tempVar,
@@ -481,13 +487,13 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
 
                 return $tempVar;
 
-            case 'double':
+            case Types::T_DOUBLE:
                 $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
                 $compilationContext->backend->assignDouble($tempVar, $exprCompiled->getCode(), $compilationContext);
 
                 return $tempVar;
 
-            case 'bool':
+            case Types::T_BOOL:
                 if ('true' === $exprCompiled->getCode()) {
                     return new GlobalConstant('ZEPHIR_GLOBAL(global_true)');
                 }
@@ -501,34 +507,34 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
 
                 return $tempVar;
 
-            case 'null':
+            case Types::T_NULL:
                 return new GlobalConstant('ZEPHIR_GLOBAL(global_null)');
 
-            case 'string':
-            case 'ulong':
+            case Types::T_STRING:
+            case Types::T_ULONG:
                 $tempVar = $compilationContext->symbolTable->getTempVariableForWrite('variable', $compilationContext);
                 $compilationContext->backend->assignString($tempVar, $exprCompiled->getCode(), $compilationContext);
 
                 return $tempVar;
 
-            case 'array':
+            case Types::T_ARRAY:
                 return $compilationContext->symbolTable->getVariableForRead(
                     $exprCompiled->getCode(),
                     $compilationContext,
                     $exprCompiled->getOriginal()
                 );
 
-            case 'variable':
+            case Types::T_VARIABLE:
                 $itemVariable = $compilationContext->symbolTable->getVariableForRead(
                     $exprCompiled->getCode(),
                     $compilationContext,
                     $exprCompiled->getOriginal()
                 );
                 switch ($itemVariable->getType()) {
-                    case 'int':
-                    case 'uint':
-                    case 'long':
-                    case 'ulong':
+                    case Types::T_INT:
+                    case Types::T_UINT:
+                    case Types::T_LONG:
+                    case Types::T_ULONG:
                         $tempVar = $compilationContext->symbolTable->getTempVariableForWrite(
                             'variable',
                             $compilationContext
@@ -537,7 +543,7 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
 
                         return $tempVar;
 
-                    case 'double':
+                    case Types::T_DOUBLE:
                         $tempVar = $compilationContext->symbolTable->getTempVariableForWrite(
                             'variable',
                             $compilationContext
@@ -546,7 +552,7 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
 
                         return $tempVar;
 
-                    case 'bool':
+                    case Types::T_BOOL:
                         $tempVar = $compilationContext->symbolTable->getTempVariableForWrite(
                             'variable',
                             $compilationContext
@@ -555,10 +561,10 @@ public function getArrayValue(CompiledExpression $exprCompiled, CompilationConte
 
                         return $tempVar;
 
-                    case 'string':
-                    case 'variable':
-                    case 'array':
-                    case 'mixed':
+                    case Types::T_STRING:
+                    case Types::T_VARIABLE:
+                    case Types::T_ARRAY:
+                    case Types::T_MIXED:
                         return $itemVariable;
 
                     default:

From 7719eff7a21682c9ab3c699315ebc051267d42f2 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 7 Dec 2023 11:46:46 -0600
Subject: [PATCH 311/375] phpcs

---
 src/Expression/NativeArray.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Expression/NativeArray.php b/src/Expression/NativeArray.php
index 02deb9fc38..8462476d36 100644
--- a/src/Expression/NativeArray.php
+++ b/src/Expression/NativeArray.php
@@ -447,7 +447,8 @@ public function compile(array $expression, CompilationContext $compilationContex
                 default:
                     throw new CompilerException(
                         'Invalid key type: '
-                        . $resolvedExprKey->getType(), $item['key']
+                        . $resolvedExprKey->getType(),
+                        $item['key']
                     );
             }
         }

From 5b34408483d574ddad2421178ee033b39f5a7d8d Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 7 Dec 2023 12:04:37 -0600
Subject: [PATCH 312/375] correcting workflow

---
 .github/workflows/main.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dcba20b3ba..d91df2b98e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -213,13 +213,13 @@ jobs:
         with:
           fetch-depth: 2
 
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.2
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-        with:
-          args: --baseline,qodana.sarif.json
-
+#      - name: 'Qodana Scan'
+#        uses: JetBrains/qodana-action@v2023.2
+#        env:
+#          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+#        with:
+#          args: --baseline,qodana.sarif.json
+#
       - name: 'Qodana Scan'
         run: |
           docker run \

From f018ec731c3e9e75a8d910234a97959421bf87d6 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 7 Dec 2023 12:43:10 -0600
Subject: [PATCH 313/375] reverting scan options

---
 .github/workflows/main.yml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d91df2b98e..5e1fa33c89 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -213,21 +213,21 @@ jobs:
         with:
           fetch-depth: 2
 
-#      - name: 'Qodana Scan'
-#        uses: JetBrains/qodana-action@v2023.2
-#        env:
-#          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-#        with:
-#          args: --baseline,qodana.sarif.json
-#
       - name: 'Qodana Scan'
-        run: |
-          docker run \
-            -v $(pwd):/data/project/ \
-            -v $(pwd):/data/base/ \
-            -e QODANA_TOKEN="${{ secrets.CODECOV_TOKEN }}" \
-            jetbrains/qodana-php \
-            --baseline /data/base/qodana.sarif.json
+        uses: JetBrains/qodana-action@v2023.2
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+        with:
+          args: --baseline,./qodana.sarif.json
+
+#      - name: 'Qodana Scan'
+#        run: |
+#          docker run \
+#            -v $(pwd):/data/project/ \
+#            -v $(pwd):/data/base/ \
+#            -e QODANA_TOKEN="${{ secrets.CODECOV_TOKEN }}" \
+#            jetbrains/qodana-php \
+#            --baseline /data/base/qodana.sarif.json
 
       - name: "Create download folder"
         run: |
@@ -261,7 +261,7 @@ jobs:
 
       - name: Upload build artifacts after Failure
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: debug-PHP-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.name }}-${{ matrix.arch }}
           path: |

From ffc24f7812543be23819382ba2a06a25eef2a688 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Thu, 7 Dec 2023 14:00:08 -0600
Subject: [PATCH 314/375] updating qodana baseline and fixing readme

---
 README.md         |     4 +-
 qodana.sarif.json | 82987 ++++++++++++++++++++++++++++++++++++++++++--
 qodana.yaml       |     3 +
 3 files changed, 80800 insertions(+), 2194 deletions(-)

diff --git a/README.md b/README.md
index c3f9080951..377f967784 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Functionality is exposed to the PHP language.
 ## Community
 
 * Follow us on [GitHub][zephir] and [Facebook][facebook]
-* Get Zephir support on [Discord][discord] and [Github discussions][discussions]
+* Get Zephir support on [Discord][discord] and [GitHub discussions][discussions]
 * Read our [Code of Conduct](./CODE_OF_CONDUCT.md)
 
 ## Contributing
@@ -28,7 +28,7 @@ for details about contributions to this repository.
 
 ## Sponsors
 
-Become a sponsor and get your logo on our README on Github with a link to your site.
+Become a sponsor and get your logo on our README on GitHub with a link to your site.
 [[Become a sponsor](https://opencollective.com/phalcon#sponsor)]
 
 <a href="https://opencollective.com/phalcon/#contributors">
diff --git a/qodana.sarif.json b/qodana.sarif.json
index 02265a9e05..2fca670411 100644
--- a/qodana.sarif.json
+++ b/qodana.sarif.json
@@ -153,13 +153,13 @@
               "name": "MySQL"
             },
             {
-              "id": "PHP/Control flow",
-              "name": "Control flow",
+              "id": "PHP/PHPDoc/Code style",
+              "name": "Code style",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP",
-                    "index": 0,
+                    "id": "PHP/PHPDoc",
+                    "index": 2,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -171,13 +171,13 @@
               ]
             },
             {
-              "id": "PHP/PHPDoc/Code style",
-              "name": "Code style",
+              "id": "PHP/Control flow",
+              "name": "Control flow",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP/PHPDoc",
-                    "index": 2,
+                    "id": "PHP",
+                    "index": 0,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -196,10 +196,6 @@
               "id": "HTML",
               "name": "HTML"
             },
-            {
-              "id": "Cucumber",
-              "name": "Cucumber"
-            },
             {
               "id": "JavaScript and TypeScript/Unused symbols",
               "name": "Unused symbols",
@@ -218,6 +214,10 @@
                 }
               ]
             },
+            {
+              "id": "Cucumber",
+              "name": "Cucumber"
+            },
             {
               "id": "JavaScript and TypeScript/Flow type checker",
               "name": "Flow type checker",
@@ -335,13 +335,13 @@
               ]
             },
             {
-              "id": "PHP/Undefined symbols",
-              "name": "Undefined symbols",
+              "id": "JavaScript and TypeScript/ES2015 migration aids",
+              "name": "ES2015 migration aids",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP",
-                    "index": 0,
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -353,13 +353,13 @@
               ]
             },
             {
-              "id": "JavaScript and TypeScript/ES2015 migration aids",
-              "name": "ES2015 migration aids",
+              "id": "PHP/Undefined symbols",
+              "name": "Undefined symbols",
               "relationships": [
                 {
                   "target": {
-                    "id": "JavaScript and TypeScript",
-                    "index": 7,
+                    "id": "PHP",
+                    "index": 0,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -530,10 +530,6 @@
                 }
               ]
             },
-            {
-              "id": "XML",
-              "name": "XML"
-            },
             {
               "id": "JavaScript and TypeScript/Control flow issues",
               "name": "Control flow issues",
@@ -552,6 +548,10 @@
                 }
               ]
             },
+            {
+              "id": "XML",
+              "name": "XML"
+            },
             {
               "id": "JavaScript and TypeScript/Potentially undesirable code constructs",
               "name": "Potentially undesirable code constructs",
@@ -959,13 +959,13 @@
               ]
             },
             {
-              "id": "PHP/Quality tools",
-              "name": "Quality tools",
+              "id": "JavaScript and TypeScript/Function metrics",
+              "name": "Function metrics",
               "relationships": [
                 {
                   "target": {
-                    "id": "PHP",
-                    "index": 0,
+                    "id": "JavaScript and TypeScript",
+                    "index": 7,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -977,13 +977,13 @@
               ]
             },
             {
-              "id": "JavaScript and TypeScript/Function metrics",
-              "name": "Function metrics",
+              "id": "PHP/Quality tools",
+              "name": "Quality tools",
               "relationships": [
                 {
                   "target": {
-                    "id": "JavaScript and TypeScript",
-                    "index": 7,
+                    "id": "PHP",
+                    "index": 0,
                     "toolComponent": {
                       "name": "QDPHP"
                     }
@@ -1524,27 +1524,27 @@
                 ]
               },
               {
-                "id": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
+                "id": "PhpMissingDocCommentInspection",
                 "shortDescription": {
-                  "text": "Write access to referenced array value without 'unset'"
+                  "text": "Missing PHPDoc comment"
                 },
                 "fullDescription": {
-                  "text": "Reports the write access expressions on variables that are still referencing the array value previously used in a 'foreach' statement. It is recommended to destroy such references by using 'unset'. See foreach (php.net) and unset (php.net) for details.",
-                  "markdown": "Reports the write access expressions on variables that are still referencing the array value previously used in a `foreach` statement.\n\n\nIt is recommended to destroy such references by using `unset`.\n\n\nSee [foreach (php.net)](https://www.php.net/manual/en/control-structures.foreach.php) and [unset (php.net)](https://www.php.net/manual/en/function.unset.php) for details."
+                  "text": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the '@noinspection' tag. You can use the Enforce PHPDoc Comment inspection to report fully typed elements.",
+                  "markdown": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the `@noinspection` tag.\n\nYou can use the *Enforce PHPDoc Comment* inspection to report fully typed elements."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "warning",
+                  "enabled": false,
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "PhpMissingDocCommentInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Control flow",
+                      "id": "PHP/PHPDoc/Code style",
                       "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
@@ -1557,27 +1557,27 @@
                 ]
               },
               {
-                "id": "PhpMissingDocCommentInspection",
+                "id": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
                 "shortDescription": {
-                  "text": "Missing PHPDoc comment"
+                  "text": "Write access to referenced array value without 'unset'"
                 },
                 "fullDescription": {
-                  "text": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the '@noinspection' tag. You can use the Enforce PHPDoc Comment inspection to report fully typed elements.",
-                  "markdown": "Reports non-fully typed elements without a PHPDoc comment or with a PHPDoc comment only containing the `@noinspection` tag.\n\nYou can use the *Enforce PHPDoc Comment* inspection to report fully typed elements."
+                  "text": "Reports the write access expressions on variables that are still referencing the array value previously used in a 'foreach' statement. It is recommended to destroy such references by using 'unset'. See foreach (php.net) and unset (php.net) for details.",
+                  "markdown": "Reports the write access expressions on variables that are still referencing the array value previously used in a `foreach` statement.\n\n\nIt is recommended to destroy such references by using `unset`.\n\n\nSee [foreach (php.net)](https://www.php.net/manual/en/control-structures.foreach.php) and [unset (php.net)](https://www.php.net/manual/en/function.unset.php) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "note",
+                  "enabled": true,
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "PhpMissingDocCommentInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "PhpWriteAccessToReferencedArrayValueWithoutUnsetInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/PHPDoc/Code style",
+                      "id": "PHP/Control flow",
                       "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
@@ -1710,7 +1710,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -1875,7 +1875,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -1908,7 +1908,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -2172,7 +2172,7 @@
                   {
                     "target": {
                       "id": "PHP/PHPDoc/Code style",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -2601,7 +2601,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -2997,7 +2997,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3009,28 +3009,28 @@
                 ]
               },
               {
-                "id": "PhpDefineConstantNameStartsWithLeadingSlashInspection",
+                "id": "PhpUnitAssertCountInspection",
                 "shortDescription": {
-                  "text": "Constant name defined with a leading slash"
+                  "text": "Usage 'assertCount/assertSameSize' methods instead of assertEquals"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'define' constructs in which the constant's FQN starts with a leading slash. Such constants will not be correctly registered by PHP.",
-                  "markdown": "Reports the `define` constructs in which the constant's FQN starts with a leading slash. Such constants will not be correctly registered by PHP."
+                  "text": "Reports alternative usage of the 'assertEquals' and 'assertNotEquals' methods with 'count' function as a parameter See Usage of the assertCount for details. See Usage of the assertSameSize for details.",
+                  "markdown": "Reports alternative usage of the `assertEquals` and `assertNotEquals` methods with `count` function as a parameter\n\n\nSee [Usage of the assertCount](https://phpunit.readthedocs.io/en/stable/assertions.html#assertcount) for details.\n\n\nSee [Usage of the assertSameSize](https://hotexamples.com/examples/-/PHPUnit_Framework_Assert/assertSameSize/php-phpunit_framework_assert-assertsamesize-method-examples.html) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpDefineConstantNameStartsWithLeadingSlashInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "PhpUnitAssertCountInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code smell",
-                      "index": 1,
+                      "id": "PHP/PHPUnit",
+                      "index": 20,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3042,28 +3042,28 @@
                 ]
               },
               {
-                "id": "PhpUnitAssertCountInspection",
+                "id": "PhpDefineConstantNameStartsWithLeadingSlashInspection",
                 "shortDescription": {
-                  "text": "Usage 'assertCount/assertSameSize' methods instead of assertEquals"
+                  "text": "Constant name defined with a leading slash"
                 },
                 "fullDescription": {
-                  "text": "Reports alternative usage of the 'assertEquals' and 'assertNotEquals' methods with 'count' function as a parameter See Usage of the assertCount for details. See Usage of the assertSameSize for details.",
-                  "markdown": "Reports alternative usage of the `assertEquals` and `assertNotEquals` methods with `count` function as a parameter\n\n\nSee [Usage of the assertCount](https://phpunit.readthedocs.io/en/stable/assertions.html#assertcount) for details.\n\n\nSee [Usage of the assertSameSize](https://hotexamples.com/examples/-/PHPUnit_Framework_Assert/assertSameSize/php-phpunit_framework_assert-assertsamesize-method-examples.html) for details."
+                  "text": "Reports the 'define' constructs in which the constant's FQN starts with a leading slash. Such constants will not be correctly registered by PHP.",
+                  "markdown": "Reports the `define` constructs in which the constant's FQN starts with a leading slash. Such constants will not be correctly registered by PHP."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "PhpUnitAssertCountInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "PhpDefineConstantNameStartsWithLeadingSlashInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/PHPUnit",
-                      "index": 20,
+                      "id": "PHP/Code smell",
+                      "index": 1,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3261,7 +3261,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3525,7 +3525,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -3723,7 +3723,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4065,19 +4065,19 @@
                 ]
               },
               {
-                "id": "PhpToStringMayProduceExceptionInspection",
+                "id": "PhpForeachArrayIsUsedAsValueInspection",
                 "shortDescription": {
-                  "text": "'__toString' may throw an exception"
+                  "text": "Foreach array is used as value"
                 },
                 "fullDescription": {
-                  "text": "Reports the usages of '__toString' that may throw an exception, which is not allowed for PHP language level lower than 7.4.",
-                  "markdown": "Reports the usages of `__toString` that may throw an exception, which is not allowed for PHP language level lower than 7.4."
+                  "text": "Reports the variables that are used in a 'foreach' loop as both an array expression and an array's key or value (for example, 'foreach ($items as $items) {}'). Commonly, this is the result of a typing error.",
+                  "markdown": "Reports the variables that are used in a `foreach` loop as both an array expression and an array's key or value (for example, `foreach ($items as $items) {}`).\n\n\nCommonly, this is the result of a typing error."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "PhpToStringMayProduceExceptionInspection",
+                    "suppressToolId": "PhpForeachArrayIsUsedAsValueInspection",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -4085,8 +4085,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code smell",
-                      "index": 1,
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4098,19 +4098,19 @@
                 ]
               },
               {
-                "id": "PhpForeachArrayIsUsedAsValueInspection",
+                "id": "PhpToStringMayProduceExceptionInspection",
                 "shortDescription": {
-                  "text": "Foreach array is used as value"
+                  "text": "'__toString' may throw an exception"
                 },
                 "fullDescription": {
-                  "text": "Reports the variables that are used in a 'foreach' loop as both an array expression and an array's key or value (for example, 'foreach ($items as $items) {}'). Commonly, this is the result of a typing error.",
-                  "markdown": "Reports the variables that are used in a `foreach` loop as both an array expression and an array's key or value (for example, `foreach ($items as $items) {}`).\n\n\nCommonly, this is the result of a typing error."
+                  "text": "Reports the usages of '__toString' that may throw an exception, which is not allowed for PHP language level lower than 7.4.",
+                  "markdown": "Reports the usages of `__toString` that may throw an exception, which is not allowed for PHP language level lower than 7.4."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "PhpForeachArrayIsUsedAsValueInspection",
+                    "suppressToolId": "PhpToStringMayProduceExceptionInspection",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -4118,8 +4118,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Probable bugs",
-                      "index": 9,
+                      "id": "PHP/Code smell",
+                      "index": 1,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4218,7 +4218,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4416,7 +4416,7 @@
                   {
                     "target": {
                       "id": "PHP/PHPDoc/Code style",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4614,7 +4614,7 @@
                   {
                     "target": {
                       "id": "PHP/PHPDoc/Code style",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4779,7 +4779,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4824,28 +4824,28 @@
                 ]
               },
               {
-                "id": "PhpDangerousArrayInitializationInspection",
+                "id": "PhpDeprecatedImplodeUsageInspection",
                 "shortDescription": {
-                  "text": "Dangerous array initialization"
+                  "text": "Deprecated 'implode/join' usage"
                 },
                 "fullDescription": {
-                  "text": "Reports dangerous array initializations (such as '$arr[] = value'). This practice is discouraged because if '$arr' already contains some value (for example, a string from a request variable), then this value will stay in place and '[]' may actually stand for string access operator. It is always preferable to initialize a variable by direct assignment. See Creating/modifying with square bracket syntax (php.net) for details.",
-                  "markdown": "Reports dangerous array initializations (such as `$arr[] = value`).\n\n\nThis practice is discouraged because if `$arr` already contains some value (for example, a string from a request variable), then this value will stay in place and `[]` may actually stand for string access operator. It is always preferable to initialize a variable by direct assignment.\n\nSee [Creating/modifying with square bracket syntax (php.net)](https://www.php.net/manual/en/language.types.array.php#language.types.array.syntax.modifying) for details."
+                  "text": "Reports deprecated usage of the 'implode' and 'join' functions. Starting from PHP 7.4, using 'implode' and 'join' with an array as the first argument and a string as the second argument is deprecated. See Deprecations for PHP 7.4 (php.net) for details.",
+                  "markdown": "Reports deprecated usage of the `implode` and `join` functions.\n\nStarting from PHP 7.4, using `implode` and `join` with an array as the first argument and a string as the second argument is deprecated.\n\n\nSee [Deprecations for PHP 7.4 (php.net)](https://wiki.php.net/rfc/deprecations_php_7_4#implode_parameter_order_mix) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "note",
+                  "enabled": true,
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "PhpDangerousArrayInitializationInspection",
-                    "ideaSeverity": "INFORMATION",
-                    "qodanaSeverity": "Info"
+                    "suppressToolId": "PhpDeprecatedImplodeUsageInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code style",
-                      "index": 3,
+                      "id": "PHP/General",
+                      "index": 6,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -4857,28 +4857,28 @@
                 ]
               },
               {
-                "id": "PhpDeprecatedImplodeUsageInspection",
+                "id": "PhpDangerousArrayInitializationInspection",
                 "shortDescription": {
-                  "text": "Deprecated 'implode/join' usage"
+                  "text": "Dangerous array initialization"
                 },
                 "fullDescription": {
-                  "text": "Reports deprecated usage of the 'implode' and 'join' functions. Starting from PHP 7.4, using 'implode' and 'join' with an array as the first argument and a string as the second argument is deprecated. See Deprecations for PHP 7.4 (php.net) for details.",
-                  "markdown": "Reports deprecated usage of the `implode` and `join` functions.\n\nStarting from PHP 7.4, using `implode` and `join` with an array as the first argument and a string as the second argument is deprecated.\n\n\nSee [Deprecations for PHP 7.4 (php.net)](https://wiki.php.net/rfc/deprecations_php_7_4#implode_parameter_order_mix) for details."
+                  "text": "Reports dangerous array initializations (such as '$arr[] = value'). This practice is discouraged because if '$arr' already contains some value (for example, a string from a request variable), then this value will stay in place and '[]' may actually stand for string access operator. It is always preferable to initialize a variable by direct assignment. See Creating/modifying with square bracket syntax (php.net) for details.",
+                  "markdown": "Reports dangerous array initializations (such as `$arr[] = value`).\n\n\nThis practice is discouraged because if `$arr` already contains some value (for example, a string from a request variable), then this value will stay in place and `[]` may actually stand for string access operator. It is always preferable to initialize a variable by direct assignment.\n\nSee [Creating/modifying with square bracket syntax (php.net)](https://www.php.net/manual/en/language.types.array.php#language.types.array.syntax.modifying) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "warning",
+                  "enabled": false,
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpDeprecatedImplodeUsageInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "PhpDangerousArrayInitializationInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/General",
-                      "index": 6,
+                      "id": "PHP/Code style",
+                      "index": 3,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5142,7 +5142,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5208,7 +5208,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5549,39 +5549,6 @@
                   }
                 ]
               },
-              {
-                "id": "PhpArrayIsAlwaysEmptyInspection",
-                "shortDescription": {
-                  "text": "Array is always empty at the point of access"
-                },
-                "fullDescription": {
-                  "text": "Reports the iterated/accessed arrays that are known to be empty at the point of access.",
-                  "markdown": "Reports the iterated/accessed arrays that are known to be empty at the point of access."
-                },
-                "defaultConfiguration": {
-                  "enabled": true,
-                  "level": "note",
-                  "parameters": {
-                    "suppressToolId": "PhpArrayIsAlwaysEmptyInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "PHP/Code smell",
-                      "index": 1,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
               {
                 "id": "PhpIllegalArrayKeyTypeInspection",
                 "shortDescription": {
@@ -5615,6 +5582,39 @@
                   }
                 ]
               },
+              {
+                "id": "PhpArrayIsAlwaysEmptyInspection",
+                "shortDescription": {
+                  "text": "Array is always empty at the point of access"
+                },
+                "fullDescription": {
+                  "text": "Reports the iterated/accessed arrays that are known to be empty at the point of access.",
+                  "markdown": "Reports the iterated/accessed arrays that are known to be empty at the point of access."
+                },
+                "defaultConfiguration": {
+                  "enabled": true,
+                  "level": "note",
+                  "parameters": {
+                    "suppressToolId": "PhpArrayIsAlwaysEmptyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "PHP/Code smell",
+                      "index": 1,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
               {
                 "id": "PhpLoopNeverIteratesInspection",
                 "shortDescription": {
@@ -5637,7 +5637,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -5802,7 +5802,7 @@
                   {
                     "target": {
                       "id": "PHP/PHPDoc/Code style",
-                      "index": 12,
+                      "index": 11,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -6429,7 +6429,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -6804,19 +6804,19 @@
                 ]
               },
               {
-                "id": "PhpUnusedFieldDefaultValueInspection",
+                "id": "PhpArrayIndexResetIsUnnecessaryInspection",
                 "shortDescription": {
-                  "text": "Redundant property initializer"
+                  "text": "Array internal pointer reset is unnecessary"
                 },
                 "fullDescription": {
-                  "text": "Reports the fields with default initializers that are always overwritten in the class constructor.",
-                  "markdown": "Reports the fields with default initializers that are always overwritten in the class constructor."
+                  "text": "Reports the 'reset($array)' calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed. See reset (php.net) for details.",
+                  "markdown": "Reports the `reset($array)` calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed.\n\n\nSee [reset (php.net)](https://www.php.net/manual/en/function.reset.php) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpUnusedFieldDefaultValueInspection",
+                    "suppressToolId": "PhpArrayIndexResetIsUnnecessaryInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -6824,8 +6824,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Unused symbols",
-                      "index": 37,
+                      "id": "PHP/Code smell",
+                      "index": 1,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -6870,19 +6870,19 @@
                 ]
               },
               {
-                "id": "PhpArrayIndexResetIsUnnecessaryInspection",
+                "id": "PhpUnusedFieldDefaultValueInspection",
                 "shortDescription": {
-                  "text": "Array internal pointer reset is unnecessary"
+                  "text": "Redundant property initializer"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'reset($array)' calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed. See reset (php.net) for details.",
-                  "markdown": "Reports the `reset($array)` calls on arrays whose internal pointer is already set on the first element. Such calls are redundant and can be safely removed.\n\n\nSee [reset (php.net)](https://www.php.net/manual/en/function.reset.php) for details."
+                  "text": "Reports the fields with default initializers that are always overwritten in the class constructor.",
+                  "markdown": "Reports the fields with default initializers that are always overwritten in the class constructor."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpArrayIndexResetIsUnnecessaryInspection",
+                    "suppressToolId": "PhpUnusedFieldDefaultValueInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -6890,8 +6890,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code smell",
-                      "index": 1,
+                      "id": "PHP/Unused symbols",
+                      "index": 37,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7089,7 +7089,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7188,7 +7188,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7386,7 +7386,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7617,7 +7617,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -7914,7 +7914,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -8574,7 +8574,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9168,7 +9168,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9300,7 +9300,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9576,28 +9576,28 @@
                 ]
               },
               {
-                "id": "PhpContinueTargetingSwitchInspection",
+                "id": "PhpGetClassCanBeReplacedWithClassNameLiteralInspection",
                 "shortDescription": {
-                  "text": "'continue' is targeting 'switch' statement"
+                  "text": "'get_class()' call can be replaced with '::class'"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'continue' statements that are targeting 'switch' statements. In PHP 7.3 and later, such usages are deprecated and will emit an 'E_WARNING', since they are most likely the result of a programming mistake. In PHP, such 'continue' statements are equivalent to 'break', that is, they end the execution of the current 'switch' structure. In other languages, such 'continue' statements behave as 'continue 2' in PHP, that is, they take the execution to a higher level control structure (for example, the next iteration of an outer loop). See continue (php.net), break (php.net), and switch (php.net) for details.",
-                  "markdown": "Reports the `continue` statements that are targeting `switch` statements. In PHP 7.3 and later, such usages are deprecated and will emit an `E_WARNING`, since they are most likely the result of a programming mistake.\n\n* In PHP, such `continue` statements are equivalent to `break`, that is, they end the execution of the current `switch` structure.\n* In other languages, such `continue` statements behave as `continue 2` in PHP, that is, they take the execution to a higher level control structure (for example, the next iteration of an outer loop).\n\n\nSee [continue (php.net)](https://www.php.net/manual/en/control-structures.continue.php), [break (php.net)](https://www.php.net/manual/en/control-structures.break.php), and [switch (php.net)](https://www.php.net/manual/en/control-structures.switch.php) for details."
+                  "text": "Reports the 'get_class()' calls and suggests replacing them with '::class' when PHP Language level is set to 8.0 or later. See Allow ::class on objects (php.net) for details.",
+                  "markdown": "Reports the `get_class()` calls and suggests replacing them with `::class` when PHP Language level is set to 8.0 or later.\n\n\nSee [Allow ::class on objects (php.net)](https://wiki.php.net/rfc/class_name_literal_on_object) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": true,
+                  "enabled": false,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpContinueTargetingSwitchInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "PhpGetClassCanBeReplacedWithClassNameLiteralInspection",
+                    "ideaSeverity": "INFORMATION",
+                    "qodanaSeverity": "Info"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code smell",
-                      "index": 1,
+                      "id": "PHP/Code style",
+                      "index": 3,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9609,28 +9609,28 @@
                 ]
               },
               {
-                "id": "PhpGetClassCanBeReplacedWithClassNameLiteralInspection",
+                "id": "PhpContinueTargetingSwitchInspection",
                 "shortDescription": {
-                  "text": "'get_class()' call can be replaced with '::class'"
+                  "text": "'continue' is targeting 'switch' statement"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'get_class()' calls and suggests replacing them with '::class' when PHP Language level is set to 8.0 or later. See Allow ::class on objects (php.net) for details.",
-                  "markdown": "Reports the `get_class()` calls and suggests replacing them with `::class` when PHP Language level is set to 8.0 or later.\n\n\nSee [Allow ::class on objects (php.net)](https://wiki.php.net/rfc/class_name_literal_on_object) for details."
+                  "text": "Reports the 'continue' statements that are targeting 'switch' statements. In PHP 7.3 and later, such usages are deprecated and will emit an 'E_WARNING', since they are most likely the result of a programming mistake. In PHP, such 'continue' statements are equivalent to 'break', that is, they end the execution of the current 'switch' structure. In other languages, such 'continue' statements behave as 'continue 2' in PHP, that is, they take the execution to a higher level control structure (for example, the next iteration of an outer loop). See continue (php.net), break (php.net), and switch (php.net) for details.",
+                  "markdown": "Reports the `continue` statements that are targeting `switch` statements. In PHP 7.3 and later, such usages are deprecated and will emit an `E_WARNING`, since they are most likely the result of a programming mistake.\n\n* In PHP, such `continue` statements are equivalent to `break`, that is, they end the execution of the current `switch` structure.\n* In other languages, such `continue` statements behave as `continue 2` in PHP, that is, they take the execution to a higher level control structure (for example, the next iteration of an outer loop).\n\n\nSee [continue (php.net)](https://www.php.net/manual/en/control-structures.continue.php), [break (php.net)](https://www.php.net/manual/en/control-structures.break.php), and [switch (php.net)](https://www.php.net/manual/en/control-structures.switch.php) for details."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
+                  "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpGetClassCanBeReplacedWithClassNameLiteralInspection",
-                    "ideaSeverity": "INFORMATION",
-                    "qodanaSeverity": "Info"
+                    "suppressToolId": "PhpContinueTargetingSwitchInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Code style",
-                      "index": 3,
+                      "id": "PHP/Code smell",
+                      "index": 1,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9795,7 +9795,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -9828,7 +9828,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10521,7 +10521,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10719,7 +10719,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10830,19 +10830,19 @@
                 ]
               },
               {
-                "id": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
+                "id": "PhpRegExpRedundantModifierInspection",
                 "shortDescription": {
-                  "text": "Attribute can be added to overriding member "
+                  "text": "Redundant modifier"
                 },
                 "fullDescription": {
-                  "text": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters. See Attributes (php.net) for details.",
-                  "markdown": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
+                  "text": "Reports the 'i' (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed.",
+                  "markdown": "Reports the `i` (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
+                    "suppressToolId": "PhpRegExpRedundantModifierInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -10850,8 +10850,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Attributes",
-                      "index": 45,
+                      "id": "PHP/Regular expressions",
+                      "index": 68,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -10863,19 +10863,19 @@
                 ]
               },
               {
-                "id": "PhpRegExpRedundantModifierInspection",
+                "id": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
                 "shortDescription": {
-                  "text": "Redundant modifier"
+                  "text": "Attribute can be added to overriding member "
                 },
                 "fullDescription": {
-                  "text": "Reports the 'i' (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed.",
-                  "markdown": "Reports the `i` (case insensitivity) modifiers that are used in regular expression patterns containing no letters. Such modifiers are redundant and can be safely removed."
+                  "text": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters. See Attributes (php.net) for details.",
+                  "markdown": "Reports the methods' and parameters' attributes that can be propagated to overriding methods/parameters.\n\n\nSee [Attributes (php.net)](https://wiki.php.net/rfc/attributes_v2) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
                   "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpRegExpRedundantModifierInspection",
+                    "suppressToolId": "PhpAttributeCanBeAddedToOverriddenMemberInspection",
                     "ideaSeverity": "WEAK WARNING",
                     "qodanaSeverity": "Moderate"
                   }
@@ -10883,8 +10883,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Regular expressions",
-                      "index": 68,
+                      "id": "PHP/Attributes",
+                      "index": 45,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -11049,7 +11049,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -11523,21 +11523,21 @@
                 ]
               },
               {
-                "id": "PhpUnitAssertCanBeReplacedWithEmptyInspection",
+                "id": "PhpUnitInvalidMockingEntityInspection",
                 "shortDescription": {
-                  "text": "Assertion can be replaced with 'assertEmpty/assertNotEmpty'"
+                  "text": "Invalid PHPUnit mocking target"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'assertTrue'/'assertFalse' usages that can be replaced with 'assertEmpty'/'assertNotEmpty' in PHPUnit tests. See assertEmpty (phpunit.readthedocs.io) for details.",
-                  "markdown": "Reports the `assertTrue`/`assertFalse` usages that can be replaced with `assertEmpty`/`assertNotEmpty` in PHPUnit tests.\n\n\nSee [assertEmpty (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html#assertempty) for details."
+                  "text": "Reports the methods and classes that are incorrectly mocked in PHPUnit tests. The following entities are reported: Enums and 'final' classes 'private', 'static', or 'final' methods Duplicate methods provided in the mocked methods lists via 'addMethods()', 'onlyMethods()', 'setMethods()', and so on.",
+                  "markdown": "Reports the methods and classes that are incorrectly mocked in PHPUnit tests.\n\n\nThe following entities are reported:\n\n* Enums and `final` classes\n* `private`, `static`, or `final` methods\n* Duplicate methods provided in the mocked methods lists via `addMethods()`, `onlyMethods()`, `setMethods()`, and so on."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
-                  "level": "note",
+                  "level": "error",
                   "parameters": {
-                    "suppressToolId": "PhpUnitAssertCanBeReplacedWithEmptyInspection",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "PhpUnitInvalidMockingEntityInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
                   }
                 },
                 "relationships": [
@@ -11556,21 +11556,21 @@
                 ]
               },
               {
-                "id": "PhpUnitInvalidMockingEntityInspection",
+                "id": "PhpUnitAssertCanBeReplacedWithEmptyInspection",
                 "shortDescription": {
-                  "text": "Invalid PHPUnit mocking target"
+                  "text": "Assertion can be replaced with 'assertEmpty/assertNotEmpty'"
                 },
                 "fullDescription": {
-                  "text": "Reports the methods and classes that are incorrectly mocked in PHPUnit tests. The following entities are reported: Enums and 'final' classes 'private', 'static', or 'final' methods Duplicate methods provided in the mocked methods lists via 'addMethods()', 'onlyMethods()', 'setMethods()', and so on.",
-                  "markdown": "Reports the methods and classes that are incorrectly mocked in PHPUnit tests.\n\n\nThe following entities are reported:\n\n* Enums and `final` classes\n* `private`, `static`, or `final` methods\n* Duplicate methods provided in the mocked methods lists via `addMethods()`, `onlyMethods()`, `setMethods()`, and so on."
+                  "text": "Reports the 'assertTrue'/'assertFalse' usages that can be replaced with 'assertEmpty'/'assertNotEmpty' in PHPUnit tests. See assertEmpty (phpunit.readthedocs.io) for details.",
+                  "markdown": "Reports the `assertTrue`/`assertFalse` usages that can be replaced with `assertEmpty`/`assertNotEmpty` in PHPUnit tests.\n\n\nSee [assertEmpty (phpunit.readthedocs.io)](https://phpunit.readthedocs.io/en/stable/assertions.html#assertempty) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
-                  "level": "error",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "PhpUnitInvalidMockingEntityInspection",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "PhpUnitAssertCanBeReplacedWithEmptyInspection",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
@@ -11841,7 +11841,7 @@
                   {
                     "target": {
                       "id": "PHP/Control flow",
-                      "index": 11,
+                      "index": 12,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -12039,7 +12039,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -12105,7 +12105,7 @@
                   {
                     "target": {
                       "id": "PHP/Undefined symbols",
-                      "index": 25,
+                      "index": 26,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -12150,28 +12150,28 @@
                 ]
               },
               {
-                "id": "PhpInvalidStringOffsetUsageInspection",
+                "id": "PhpWrongForeachArgumentTypeInspection",
                 "shortDescription": {
-                  "text": "Invalid string offset usage"
+                  "text": "Invalid argument supplied for 'foreach()'"
                 },
                 "fullDescription": {
-                  "text": "Reports invalid string offset usages that will result in a runtime error. The following usages are reported: Using string offsets as objects or arrays Unsetting string offsets via 'unset' Passing string offsets by reference Creating references to or from string offsets Incrementing or decrementing string offsets Using combined operator assignments such as '+=' or '.=' on string offsets Assigning string offsets with empty strings or strings with length >1",
-                  "markdown": "Reports invalid string offset usages that will result in a runtime error.\n\n\nThe following usages are reported:\n\n* Using string offsets as objects or arrays\n* Unsetting string offsets via `unset`\n* Passing string offsets by reference\n* Creating references to or from string offsets\n* Incrementing or decrementing string offsets\n* Using combined operator assignments such as `+=` or `.=` on string offsets\n* Assigning string offsets with empty strings or strings with length \\>1"
+                  "text": "Reports the 'foreach' constructs used on variables of the 'string', 'float', 'int', or 'boolean' type. See foreach (php.net) for details.",
+                  "markdown": "Reports the `foreach` constructs used on variables of the `string`, `float`, `int`, or `boolean` type.\n\n\nSee [foreach (php.net)](http://www.php.net/manual/en/control-structures.foreach.php) for details."
                 },
                 "defaultConfiguration": {
                   "enabled": true,
-                  "level": "error",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "PhpInvalidStringOffsetUsageInspection",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
+                    "suppressToolId": "PhpWrongForeachArgumentTypeInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Probable bugs",
-                      "index": 9,
+                      "id": "PHP/Type compatibility",
+                      "index": 23,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -12183,28 +12183,28 @@
                 ]
               },
               {
-                "id": "PhpWrongForeachArgumentTypeInspection",
+                "id": "PhpInvalidStringOffsetUsageInspection",
                 "shortDescription": {
-                  "text": "Invalid argument supplied for 'foreach()'"
+                  "text": "Invalid string offset usage"
                 },
                 "fullDescription": {
-                  "text": "Reports the 'foreach' constructs used on variables of the 'string', 'float', 'int', or 'boolean' type. See foreach (php.net) for details.",
-                  "markdown": "Reports the `foreach` constructs used on variables of the `string`, `float`, `int`, or `boolean` type.\n\n\nSee [foreach (php.net)](http://www.php.net/manual/en/control-structures.foreach.php) for details."
+                  "text": "Reports invalid string offset usages that will result in a runtime error. The following usages are reported: Using string offsets as objects or arrays Unsetting string offsets via 'unset' Passing string offsets by reference Creating references to or from string offsets Incrementing or decrementing string offsets Using combined operator assignments such as '+=' or '.=' on string offsets Assigning string offsets with empty strings or strings with length >1",
+                  "markdown": "Reports invalid string offset usages that will result in a runtime error.\n\n\nThe following usages are reported:\n\n* Using string offsets as objects or arrays\n* Unsetting string offsets via `unset`\n* Passing string offsets by reference\n* Creating references to or from string offsets\n* Incrementing or decrementing string offsets\n* Using combined operator assignments such as `+=` or `.=` on string offsets\n* Assigning string offsets with empty strings or strings with length \\>1"
                 },
                 "defaultConfiguration": {
                   "enabled": true,
-                  "level": "warning",
+                  "level": "error",
                   "parameters": {
-                    "suppressToolId": "PhpWrongForeachArgumentTypeInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "PhpInvalidStringOffsetUsageInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "PHP/Type compatibility",
-                      "index": 23,
+                      "id": "PHP/Probable bugs",
+                      "index": 9,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -12878,39 +12878,6 @@
                   }
                 ]
               },
-              {
-                "id": "SqlCallNotationInspection",
-                "shortDescription": {
-                  "text": "Using of named and positional arguments"
-                },
-                "fullDescription": {
-                  "text": "Reports calls in which positional arguments go after the named ones. Works in PostgreSQL, Oracle, and Db2. Example (In PostgreSQL): 'CREATE FUNCTION foo(a int, b int, c int) RETURNS int\n    LANGUAGE plpgsql AS\n$$\nBEGIN\n    RETURN a + b + c;\nEND\n$$;\nSELECT foo(a => 1, b => 2, c => 3);\n  -- `3` goes after the named argument\nSELECT foo(1, b => 2, 3);\n  -- `1` and `3` go after the named argument\nSELECT foo(b => 2, 1, 3);'",
-                  "markdown": "Reports calls in which positional arguments go after the named ones. Works in PostgreSQL, Oracle, and Db2.\n\nExample (In PostgreSQL):\n\n    CREATE FUNCTION foo(a int, b int, c int) RETURNS int\n        LANGUAGE plpgsql AS\n    $$\n    BEGIN\n        RETURN a + b + c;\n    END\n    $$;\n    SELECT foo(a => 1, b => 2, c => 3);\n      -- `3` goes after the named argument\n    SELECT foo(1, b => 2, 3);\n      -- `1` and `3` go after the named argument\n    SELECT foo(b => 2, 1, 3);\n"
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "SqlCallNotation",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "SQL",
-                      "index": 34,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
               {
                 "id": "MysqlParsingInspection",
                 "shortDescription": {
@@ -12944,6 +12911,39 @@
                   }
                 ]
               },
+              {
+                "id": "SqlCallNotationInspection",
+                "shortDescription": {
+                  "text": "Using of named and positional arguments"
+                },
+                "fullDescription": {
+                  "text": "Reports calls in which positional arguments go after the named ones. Works in PostgreSQL, Oracle, and Db2. Example (In PostgreSQL): 'CREATE FUNCTION foo(a int, b int, c int) RETURNS int\n    LANGUAGE plpgsql AS\n$$\nBEGIN\n    RETURN a + b + c;\nEND\n$$;\nSELECT foo(a => 1, b => 2, c => 3);\n  -- `3` goes after the named argument\nSELECT foo(1, b => 2, 3);\n  -- `1` and `3` go after the named argument\nSELECT foo(b => 2, 1, 3);'",
+                  "markdown": "Reports calls in which positional arguments go after the named ones. Works in PostgreSQL, Oracle, and Db2.\n\nExample (In PostgreSQL):\n\n    CREATE FUNCTION foo(a int, b int, c int) RETURNS int\n        LANGUAGE plpgsql AS\n    $$\n    BEGIN\n        RETURN a + b + c;\n    END\n    $$;\n    SELECT foo(a => 1, b => 2, c => 3);\n      -- `3` goes after the named argument\n    SELECT foo(1, b => 2, 3);\n      -- `1` and `3` go after the named argument\n    SELECT foo(b => 2, 1, 3);\n"
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "SqlCallNotation",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "SQL",
+                      "index": 34,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
               {
                 "id": "SqlShadowingAliasInspection",
                 "shortDescription": {
@@ -15168,7 +15168,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15432,7 +15432,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15531,7 +15531,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15564,7 +15564,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15630,7 +15630,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15696,7 +15696,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15828,7 +15828,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -15993,7 +15993,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16092,7 +16092,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16455,7 +16455,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16587,7 +16587,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16719,7 +16719,7 @@
                   {
                     "target": {
                       "id": "XML",
-                      "index": 39,
+                      "index": 40,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -16969,249 +16969,6 @@
             ],
             "isComprehensive": false
           },
-          {
-            "name": "gherkin",
-            "version": "232.9881",
-            "rules": [
-              {
-                "id": "GherkinScenarioToScenarioOutline",
-                "shortDescription": {
-                  "text": "Scenario with Examples section"
-                },
-                "fullDescription": {
-                  "text": "Reports Gherkin scenarios that contain an 'Examples' section. Use the quick-fix to convert 'Scenario' to 'Scenario Outline'.",
-                  "markdown": "Reports Gherkin scenarios that contain an `Examples` section.\n\nUse the quick-fix to convert `Scenario` to `Scenario Outline`."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "GherkinScenarioToScenarioOutline",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 15,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "CucumberTableInspection",
-                "shortDescription": {
-                  "text": "Unused or missing columns in Cucumber tables"
-                },
-                "fullDescription": {
-                  "text": "Reports tables in 'Examples' sections in Cucumber .feature files with unused or missing columns.",
-                  "markdown": "Reports tables in `Examples` sections in Cucumber .feature files with unused or missing columns."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "warning",
-                  "parameters": {
-                    "suppressToolId": "CucumberTableInspection",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 15,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "GherkinBrokenTableInspection",
-                "shortDescription": {
-                  "text": "Gherkin table is broken"
-                },
-                "fullDescription": {
-                  "text": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header.",
-                  "markdown": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "GherkinBrokenTableInspection",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 15,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "GherkinMisplacedBackground",
-                "shortDescription": {
-                  "text": "Misplaced background section"
-                },
-                "fullDescription": {
-                  "text": "Reports 'Background' sections that are located incorrectly. The 'Background' section must be located before the 'Scenario' section.",
-                  "markdown": "Reports `Background` sections that are located incorrectly. The `Background` section must be located before the `Scenario` section."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "GherkinMisplacedBackground",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 15,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "CucumberMissedExamples",
-                "shortDescription": {
-                  "text": "Missing examples section"
-                },
-                "fullDescription": {
-                  "text": "Reports scenario outlines in Cucumber .feature files that do not have the 'Examples' section. Use the quick-fix to automatically create the 'Examples' section with a pre-filled table header.",
-                  "markdown": "Reports scenario outlines in Cucumber .feature files that do not have the `Examples` section.\n\nUse the quick-fix to automatically create the `Examples` section with a pre-filled table header."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "CucumberMissedExamples",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 15,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "CucumberUndefinedStep",
-                "shortDescription": {
-                  "text": "Undefined step"
-                },
-                "fullDescription": {
-                  "text": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions. Use the quick-fix to automatically create a new step definition.",
-                  "markdown": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions.\n\nUse the quick-fix to automatically create a new step definition."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "warning",
-                  "parameters": {
-                    "suppressToolId": "CucumberUndefinedStep",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 15,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              },
-              {
-                "id": "CucumberExamplesColon",
-                "shortDescription": {
-                  "text": "Missing ':' after examples keyword"
-                },
-                "fullDescription": {
-                  "text": "Reports 'Examples' sections in Cucumber .feature files if they do not have ':' after the 'Examples' keyword.",
-                  "markdown": "Reports `Examples` sections in Cucumber .feature files if they do not have ':' after the `Examples` keyword."
-                },
-                "defaultConfiguration": {
-                  "enabled": false,
-                  "level": "error",
-                  "parameters": {
-                    "suppressToolId": "CucumberExamplesColon",
-                    "ideaSeverity": "ERROR",
-                    "qodanaSeverity": "Critical"
-                  }
-                },
-                "relationships": [
-                  {
-                    "target": {
-                      "id": "Cucumber",
-                      "index": 15,
-                      "toolComponent": {
-                        "name": "QDPHP"
-                      }
-                    },
-                    "kinds": [
-                      "superset"
-                    ]
-                  }
-                ]
-              }
-            ],
-            "language": "en-US",
-            "contents": [
-              "localizedData",
-              "nonLocalizedData"
-            ],
-            "isComprehensive": false
-          },
           {
             "name": "JavaScript",
             "version": "232.9881",
@@ -17238,7 +16995,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Unused symbols",
-                      "index": 16,
+                      "index": 15,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17403,7 +17160,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17667,7 +17424,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -17898,7 +17655,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18063,7 +17820,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Unused symbols",
-                      "index": 16,
+                      "index": 15,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18096,7 +17853,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18273,28 +18030,28 @@
                 ]
               },
               {
-                "id": "ES6PossiblyAsyncFunction",
+                "id": "TextLabelInSwitchStatementJS",
                 "shortDescription": {
-                  "text": "'await' in non-async function"
+                  "text": "Text label in 'switch' statement"
                 },
                 "fullDescription": {
-                  "text": "Reports a usage of 'await' in a function that was possibly intended to be async but is actually missing the 'async' modifier. Although 'await' can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made 'async'.",
-                  "markdown": "Reports a usage of `await` in a function that was possibly intended to be async but is actually missing the `async` modifier. Although `await` can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made `async`."
+                  "text": "Reports a labeled statement inside a 'switch' statement, which often results from a typo. Example: 'switch(x)\n    {\n        case 1:\n        case2:   //typo!\n        case 3:\n            break;\n    }'",
+                  "markdown": "Reports a labeled statement inside a `switch` statement, which often results from a typo.\n\nExample:\n\n\n        switch(x)\n        {\n            case 1:\n            case2:   //typo!\n            case 3:\n                break;\n        }\n"
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "ES6PossiblyAsyncFunction",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "TextLabelInSwitchStatementJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Async code and promises",
-                      "index": 55,
+                      "id": "JavaScript and TypeScript/Switch statement issues",
+                      "index": 53,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18306,28 +18063,28 @@
                 ]
               },
               {
-                "id": "TextLabelInSwitchStatementJS",
+                "id": "ES6PossiblyAsyncFunction",
                 "shortDescription": {
-                  "text": "Text label in 'switch' statement"
+                  "text": "'await' in non-async function"
                 },
                 "fullDescription": {
-                  "text": "Reports a labeled statement inside a 'switch' statement, which often results from a typo. Example: 'switch(x)\n    {\n        case 1:\n        case2:   //typo!\n        case 3:\n            break;\n    }'",
-                  "markdown": "Reports a labeled statement inside a `switch` statement, which often results from a typo.\n\nExample:\n\n\n        switch(x)\n        {\n            case 1:\n            case2:   //typo!\n            case 3:\n                break;\n        }\n"
+                  "text": "Reports a usage of 'await' in a function that was possibly intended to be async but is actually missing the 'async' modifier. Although 'await' can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made 'async'.",
+                  "markdown": "Reports a usage of `await` in a function that was possibly intended to be async but is actually missing the `async` modifier. Although `await` can be used as an identifier, it is likely that it was intended to be used as an operator, so the containing function should be made `async`."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "TextLabelInSwitchStatementJS",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "ES6PossiblyAsyncFunction",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Switch statement issues",
-                      "index": 53,
+                      "id": "JavaScript and TypeScript/Async code and promises",
+                      "index": 55,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18657,7 +18414,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18768,19 +18525,19 @@
                 ]
               },
               {
-                "id": "ES6ClassMemberInitializationOrder",
+                "id": "EmptyTryBlockJS",
                 "shortDescription": {
-                  "text": "Use of possibly unassigned property in a static initializer"
+                  "text": "Empty 'try' block"
                 },
                 "fullDescription": {
-                  "text": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet. Initialization of class members happens consequently for fields, so a field cannot reference another field that is declared later.",
-                  "markdown": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet.   \n\nInitialization of class members happens consequently for fields, so a field cannot reference another field that is declared later."
+                  "text": "Reports an empty 'try' block, which usually indicates an error.",
+                  "markdown": "Reports an empty `try` block, which usually indicates an error."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "ES6ClassMemberInitializationOrder",
+                    "suppressToolId": "EmptyTryBlockJS",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -18788,8 +18545,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/General",
-                      "index": 24,
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18801,19 +18558,19 @@
                 ]
               },
               {
-                "id": "EmptyTryBlockJS",
+                "id": "ES6ClassMemberInitializationOrder",
                 "shortDescription": {
-                  "text": "Empty 'try' block"
+                  "text": "Use of possibly unassigned property in a static initializer"
                 },
                 "fullDescription": {
-                  "text": "Reports an empty 'try' block, which usually indicates an error.",
-                  "markdown": "Reports an empty `try` block, which usually indicates an error."
+                  "text": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet. Initialization of class members happens consequently for fields, so a field cannot reference another field that is declared later.",
+                  "markdown": "Reports a class member initializer which references another non-hoisted class member while the latter may be not initialized yet.   \n\nInitialization of class members happens consequently for fields, so a field cannot reference another field that is declared later."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "EmptyTryBlockJS",
+                    "suppressToolId": "ES6ClassMemberInitializationOrder",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -18821,8 +18578,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Try statement issues",
-                      "index": 35,
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -18954,7 +18711,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19020,7 +18777,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19152,7 +18909,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19251,7 +19008,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19614,7 +19371,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19680,7 +19437,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19845,7 +19602,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -19878,7 +19635,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20043,7 +19800,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20208,7 +19965,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20307,7 +20064,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20352,19 +20109,19 @@
                 ]
               },
               {
-                "id": "ES6UnusedImports",
+                "id": "InnerHTMLJS",
                 "shortDescription": {
-                  "text": "Unused import"
+                  "text": "Use of 'innerHTML' property"
                 },
                 "fullDescription": {
-                  "text": "Reports a redundant 'import' statement. This is usually the case if the imported symbols are not used in the source file. To avoid side-effects, consider using bare import 'import 'packageName'' instead of the regular one.",
-                  "markdown": "Reports a redundant `import` statement. This is usually the case if the imported symbols are not used in the source file. To avoid side-effects, consider using bare import `import 'packageName'` instead of the regular one."
+                  "text": "Reports a JavaScript access to DOM nodes as text using the 'innerHTML' property. Most usages of 'innerHTML' are performed better with explicit DOM calls, such as 'getElementByID()' and 'createElement()'. Additionally, 'innerHTML' will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can lead to difficulties in diagnosing bugs.",
+                  "markdown": "Reports a JavaScript access to DOM nodes as text using the `innerHTML` property. Most usages of `innerHTML` are performed better with explicit DOM calls, such as `getElementByID()` and `createElement()`. Additionally, `innerHTML` will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can lead to difficulties in diagnosing bugs."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "ES6UnusedImports",
+                    "suppressToolId": "InnerHTMLJS",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20372,8 +20129,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Imports and dependencies",
-                      "index": 59,
+                      "id": "JavaScript and TypeScript/DOM issues",
+                      "index": 54,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20385,19 +20142,19 @@
                 ]
               },
               {
-                "id": "InnerHTMLJS",
+                "id": "ES6UnusedImports",
                 "shortDescription": {
-                  "text": "Use of 'innerHTML' property"
+                  "text": "Unused import"
                 },
                 "fullDescription": {
-                  "text": "Reports a JavaScript access to DOM nodes as text using the 'innerHTML' property. Most usages of 'innerHTML' are performed better with explicit DOM calls, such as 'getElementByID()' and 'createElement()'. Additionally, 'innerHTML' will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can lead to difficulties in diagnosing bugs.",
-                  "markdown": "Reports a JavaScript access to DOM nodes as text using the `innerHTML` property. Most usages of `innerHTML` are performed better with explicit DOM calls, such as `getElementByID()` and `createElement()`. Additionally, `innerHTML` will not work with XML DOMs, including DOMs for XHTML if viewed as XML. This can lead to difficulties in diagnosing bugs."
+                  "text": "Reports a redundant 'import' statement. This is usually the case if the imported symbols are not used in the source file. To avoid side-effects, consider using bare import 'import 'packageName'' instead of the regular one.",
+                  "markdown": "Reports a redundant `import` statement. This is usually the case if the imported symbols are not used in the source file. To avoid side-effects, consider using bare import `import 'packageName'` instead of the regular one."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "InnerHTMLJS",
+                    "suppressToolId": "ES6UnusedImports",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20405,8 +20162,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/DOM issues",
-                      "index": 54,
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20505,7 +20262,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20637,7 +20394,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20682,19 +20439,19 @@
                 ]
               },
               {
-                "id": "JSValidateJSDoc",
+                "id": "IfStatementWithTooManyBranchesJS",
                 "shortDescription": {
-                  "text": "Syntax errors and unresolved references in JSDoc"
+                  "text": "'if' statement with too many branches"
                 },
                 "fullDescription": {
-                  "text": "Reports a syntax discrepancy in a documentation comment.",
-                  "markdown": "Reports a syntax discrepancy in a documentation comment."
+                  "text": "Reports an 'if' statement with too many branches. Such statements may be confusing, and often indicate inadequate levels of design abstraction. Use the field below to specify the maximum number of branches expected.",
+                  "markdown": "Reports an `if` statement with too many branches. Such statements may be confusing, and often indicate inadequate levels of design abstraction.\n\n\nUse the field below to specify the maximum number of branches expected."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "JSValidateJSDoc",
+                    "suppressToolId": "IfStatementWithTooManyBranchesJS",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20702,8 +20459,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/General",
-                      "index": 24,
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20715,19 +20472,19 @@
                 ]
               },
               {
-                "id": "IfStatementWithTooManyBranchesJS",
+                "id": "JSValidateJSDoc",
                 "shortDescription": {
-                  "text": "'if' statement with too many branches"
+                  "text": "Syntax errors and unresolved references in JSDoc"
                 },
                 "fullDescription": {
-                  "text": "Reports an 'if' statement with too many branches. Such statements may be confusing, and often indicate inadequate levels of design abstraction. Use the field below to specify the maximum number of branches expected.",
-                  "markdown": "Reports an `if` statement with too many branches. Such statements may be confusing, and often indicate inadequate levels of design abstraction.\n\n\nUse the field below to specify the maximum number of branches expected."
+                  "text": "Reports a syntax discrepancy in a documentation comment.",
+                  "markdown": "Reports a syntax discrepancy in a documentation comment."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "IfStatementWithTooManyBranchesJS",
+                    "suppressToolId": "JSValidateJSDoc",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -20735,8 +20492,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "id": "JavaScript and TypeScript/General",
+                      "index": 24,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -20934,7 +20691,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21033,7 +20790,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21111,19 +20868,19 @@
                 ]
               },
               {
-                "id": "TypeScriptMissingConfigOption",
+                "id": "JSObjectNullOrUndefined",
                 "shortDescription": {
-                  "text": "Missing tsconfig.json option "
+                  "text": "Object is 'null' or 'undefined'"
                 },
                 "fullDescription": {
-                  "text": "Reports a usage that requires an explicit option in 'tsconfig.json'. For example, to use JSX in '.tsx' files, 'tsconfig.json' must contain '\"jsx\"' property.",
-                  "markdown": "Reports a usage that requires an explicit option in `tsconfig.json`. For example, to use JSX in `.tsx` files, `tsconfig.json` must contain `\"jsx\"` property."
+                  "text": "Reports an error caused by invoking a method, accessing a property, or calling a function on an object that is 'undefined' or 'null'.",
+                  "markdown": "Reports an error caused by invoking a method, accessing a property, or calling a function on an object that is `undefined` or `null`."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "TypeScriptMissingConfigOption",
+                    "suppressToolId": "JSObjectNullOrUndefined",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -21131,8 +20888,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/TypeScript",
-                      "index": 51,
+                      "id": "JavaScript and TypeScript/Control flow issues",
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21144,19 +20901,19 @@
                 ]
               },
               {
-                "id": "JSObjectNullOrUndefined",
+                "id": "TypeScriptMissingConfigOption",
                 "shortDescription": {
-                  "text": "Object is 'null' or 'undefined'"
+                  "text": "Missing tsconfig.json option "
                 },
                 "fullDescription": {
-                  "text": "Reports an error caused by invoking a method, accessing a property, or calling a function on an object that is 'undefined' or 'null'.",
-                  "markdown": "Reports an error caused by invoking a method, accessing a property, or calling a function on an object that is `undefined` or `null`."
+                  "text": "Reports a usage that requires an explicit option in 'tsconfig.json'. For example, to use JSX in '.tsx' files, 'tsconfig.json' must contain '\"jsx\"' property.",
+                  "markdown": "Reports a usage that requires an explicit option in `tsconfig.json`. For example, to use JSX in `.tsx` files, `tsconfig.json` must contain `\"jsx\"` property."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
                   "level": "warning",
                   "parameters": {
-                    "suppressToolId": "JSObjectNullOrUndefined",
+                    "suppressToolId": "TypeScriptMissingConfigOption",
                     "ideaSeverity": "WARNING",
                     "qodanaSeverity": "High"
                   }
@@ -21164,8 +20921,8 @@
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "id": "JavaScript and TypeScript/TypeScript",
+                      "index": 51,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21429,7 +21186,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21528,7 +21285,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21561,7 +21318,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21693,7 +21450,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21792,7 +21549,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21837,28 +21594,28 @@
                 ]
               },
               {
-                "id": "NpmUsedModulesInstalled",
+                "id": "UnusedCatchParameterJS",
                 "shortDescription": {
-                  "text": "Missing module dependency"
+                  "text": "Unused 'catch' parameter"
                 },
                 "fullDescription": {
-                  "text": "Reports a module from a 'require()' call or an 'import' statement that is not installed or is not listed in package.json dependencies. Suggests installing the module and/or including it into package.json. For 'require()' calls, works only in the files from the scope of Node.js Core JavaScript library.",
-                  "markdown": "Reports a module from a `require()` call or an `import` statement that is not installed or is not listed in package.json dependencies.\n\nSuggests installing the module and/or including it into package.json.\n\nFor `require()` calls, works only in the files from the scope of *Node.js Core* JavaScript library."
+                  "text": "Reports a 'catch' parameter that is not used in the corresponding block. The 'catch' parameters named 'ignore' or 'ignored' are ignored. Use the checkbox below to disable this inspection for 'catch' blocks with comments.",
+                  "markdown": "Reports a `catch` parameter that is not used in the corresponding block. The `catch` parameters named `ignore` or `ignored` are ignored.\n\n\nUse the checkbox below to disable this inspection for `catch`\nblocks with comments."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "note",
+                  "level": "warning",
                   "parameters": {
-                    "suppressToolId": "NpmUsedModulesInstalled",
-                    "ideaSeverity": "WEAK WARNING",
-                    "qodanaSeverity": "Moderate"
+                    "suppressToolId": "UnusedCatchParameterJS",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Imports and dependencies",
-                      "index": 59,
+                      "id": "JavaScript and TypeScript/Try statement issues",
+                      "index": 35,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -21870,28 +21627,28 @@
                 ]
               },
               {
-                "id": "UnusedCatchParameterJS",
+                "id": "NpmUsedModulesInstalled",
                 "shortDescription": {
-                  "text": "Unused 'catch' parameter"
+                  "text": "Missing module dependency"
                 },
                 "fullDescription": {
-                  "text": "Reports a 'catch' parameter that is not used in the corresponding block. The 'catch' parameters named 'ignore' or 'ignored' are ignored. Use the checkbox below to disable this inspection for 'catch' blocks with comments.",
-                  "markdown": "Reports a `catch` parameter that is not used in the corresponding block. The `catch` parameters named `ignore` or `ignored` are ignored.\n\n\nUse the checkbox below to disable this inspection for `catch`\nblocks with comments."
+                  "text": "Reports a module from a 'require()' call or an 'import' statement that is not installed or is not listed in package.json dependencies. Suggests installing the module and/or including it into package.json. For 'require()' calls, works only in the files from the scope of Node.js Core JavaScript library.",
+                  "markdown": "Reports a module from a `require()` call or an `import` statement that is not installed or is not listed in package.json dependencies.\n\nSuggests installing the module and/or including it into package.json.\n\nFor `require()` calls, works only in the files from the scope of *Node.js Core* JavaScript library."
                 },
                 "defaultConfiguration": {
                   "enabled": false,
-                  "level": "warning",
+                  "level": "note",
                   "parameters": {
-                    "suppressToolId": "UnusedCatchParameterJS",
-                    "ideaSeverity": "WARNING",
-                    "qodanaSeverity": "High"
+                    "suppressToolId": "NpmUsedModulesInstalled",
+                    "ideaSeverity": "WEAK WARNING",
+                    "qodanaSeverity": "Moderate"
                   }
                 },
                 "relationships": [
                   {
                     "target": {
-                      "id": "JavaScript and TypeScript/Try statement issues",
-                      "index": 35,
+                      "id": "JavaScript and TypeScript/Imports and dependencies",
+                      "index": 59,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22419,7 +22176,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22848,7 +22605,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -22980,7 +22737,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23046,7 +22803,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/ES2015 migration aids",
-                      "index": 26,
+                      "index": 25,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23145,7 +22902,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -23409,7 +23166,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Function metrics",
-                      "index": 70,
+                      "index": 69,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24135,7 +23892,7 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Control flow issues",
-                      "index": 40,
+                      "index": 39,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -24234,6 +23991,249 @@
                   {
                     "target": {
                       "id": "JavaScript and TypeScript/Unused symbols",
+                      "index": 15,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              }
+            ],
+            "language": "en-US",
+            "contents": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "isComprehensive": false
+          },
+          {
+            "name": "gherkin",
+            "version": "232.9881",
+            "rules": [
+              {
+                "id": "GherkinScenarioToScenarioOutline",
+                "shortDescription": {
+                  "text": "Scenario with Examples section"
+                },
+                "fullDescription": {
+                  "text": "Reports Gherkin scenarios that contain an 'Examples' section. Use the quick-fix to convert 'Scenario' to 'Scenario Outline'.",
+                  "markdown": "Reports Gherkin scenarios that contain an `Examples` section.\n\nUse the quick-fix to convert `Scenario` to `Scenario Outline`."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinScenarioToScenarioOutline",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberTableInspection",
+                "shortDescription": {
+                  "text": "Unused or missing columns in Cucumber tables"
+                },
+                "fullDescription": {
+                  "text": "Reports tables in 'Examples' sections in Cucumber .feature files with unused or missing columns.",
+                  "markdown": "Reports tables in `Examples` sections in Cucumber .feature files with unused or missing columns."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CucumberTableInspection",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "GherkinBrokenTableInspection",
+                "shortDescription": {
+                  "text": "Gherkin table is broken"
+                },
+                "fullDescription": {
+                  "text": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header.",
+                  "markdown": "Reports a table if there is at least one row with the number of cells different from the number of cells in the table header."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinBrokenTableInspection",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "GherkinMisplacedBackground",
+                "shortDescription": {
+                  "text": "Misplaced background section"
+                },
+                "fullDescription": {
+                  "text": "Reports 'Background' sections that are located incorrectly. The 'Background' section must be located before the 'Scenario' section.",
+                  "markdown": "Reports `Background` sections that are located incorrectly. The `Background` section must be located before the `Scenario` section."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "GherkinMisplacedBackground",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberMissedExamples",
+                "shortDescription": {
+                  "text": "Missing examples section"
+                },
+                "fullDescription": {
+                  "text": "Reports scenario outlines in Cucumber .feature files that do not have the 'Examples' section. Use the quick-fix to automatically create the 'Examples' section with a pre-filled table header.",
+                  "markdown": "Reports scenario outlines in Cucumber .feature files that do not have the `Examples` section.\n\nUse the quick-fix to automatically create the `Examples` section with a pre-filled table header."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CucumberMissedExamples",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberUndefinedStep",
+                "shortDescription": {
+                  "text": "Undefined step"
+                },
+                "fullDescription": {
+                  "text": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions. Use the quick-fix to automatically create a new step definition.",
+                  "markdown": "Reports steps in Cucumber (or some other Gherkin) .feature files that do not have matching step definitions.\n\nUse the quick-fix to automatically create a new step definition."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "warning",
+                  "parameters": {
+                    "suppressToolId": "CucumberUndefinedStep",
+                    "ideaSeverity": "WARNING",
+                    "qodanaSeverity": "High"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
+                      "index": 16,
+                      "toolComponent": {
+                        "name": "QDPHP"
+                      }
+                    },
+                    "kinds": [
+                      "superset"
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "CucumberExamplesColon",
+                "shortDescription": {
+                  "text": "Missing ':' after examples keyword"
+                },
+                "fullDescription": {
+                  "text": "Reports 'Examples' sections in Cucumber .feature files if they do not have ':' after the 'Examples' keyword.",
+                  "markdown": "Reports `Examples` sections in Cucumber .feature files if they do not have ':' after the `Examples` keyword."
+                },
+                "defaultConfiguration": {
+                  "enabled": false,
+                  "level": "error",
+                  "parameters": {
+                    "suppressToolId": "CucumberExamplesColon",
+                    "ideaSeverity": "ERROR",
+                    "qodanaSeverity": "Critical"
+                  }
+                },
+                "relationships": [
+                  {
+                    "target": {
+                      "id": "Cucumber",
                       "index": 16,
                       "toolComponent": {
                         "name": "QDPHP"
@@ -27711,7 +27711,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -27777,7 +27777,7 @@
                   "markdown": "Global taint analysis inspection."
                 },
                 "defaultConfiguration": {
-                  "enabled": false,
+                  "enabled": true,
                   "level": "warning",
                   "parameters": {
                     "suppressToolId": "PhpVulnerablePathsInspection",
@@ -28356,7 +28356,7 @@
                   {
                     "target": {
                       "id": "PHP/Quality tools",
-                      "index": 69,
+                      "index": 70,
                       "toolComponent": {
                         "name": "QDPHP"
                       }
@@ -28440,8 +28440,8 @@
       "versionControlProvenance": [
         {
           "repositoryUri": "https://github.com/zephir-lang/zephir",
-          "revisionId": "cf3ab03e8f1923787643ad37cb8abc158332c284",
-          "branch": "phpcs-changes",
+          "revisionId": "f018ec731c3e9e75a8d910234a97959421bf87d6",
+          "branch": "phpcs-2",
           "properties": {
             "repoUrl": "https://github.com/zephir-lang/zephir",
             "lastAuthorName": "Nikolaos Dimopoulos",
@@ -28463,26 +28463,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/ExportSymbol.php",
+                  "uri": "src/Detectors/WriteDetector.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 44,
+                  "startLine": 110,
                   "startColumn": 9,
-                  "charOffset": 1077,
-                  "charLength": 1195,
+                  "charOffset": 3033,
+                  "charLength": 504,
                   "snippet": {
-                    "text": "$codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol   = $compilationContext->backend->getVariableCode($symbolVariable);"
+                    "text": "if (isset($expression['parameters'])) {\n            foreach ($expression['parameters'] as $parameter) {\n                $usePass = self::DETECT_PARAM_PASS == ($this->detectionFlags & self::DETECT_PARAM_PASS);\n                if ($usePass && 'variable' == $parameter['parameter']['type']) {\n                    $this->increaseMutations($parameter['parameter']['value']);\n                } else {\n                    $this->passExpression($parameter['parameter']);\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 44,
+                  "startLine": 110,
                   "startColumn": 1,
-                  "charOffset": 1069,
-                  "charLength": 1203,
+                  "charOffset": 3025,
+                  "charLength": 512,
                   "snippet": {
-                    "text": "        $codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol   = $compilationContext->backend->getVariableCode($symbolVariable);"
+                    "text": "        if (isset($expression['parameters'])) {\n            foreach ($expression['parameters'] as $parameter) {\n                $usePass = self::DETECT_PARAM_PASS == ($this->detectionFlags & self::DETECT_PARAM_PASS);\n                if ($usePass && 'variable' == $parameter['parameter']['type']) {\n                    $this->increaseMutations($parameter['parameter']['value']);\n                } else {\n                    $this->passExpression($parameter['parameter']);\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28497,26 +28497,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/ExportSymbolString.php",
+                  "uri": "src/Detectors/WriteDetector.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 44,
+                  "startLine": 250,
                   "startColumn": 9,
-                  "charOffset": 1119,
-                  "charLength": 1187,
+                  "charOffset": 7299,
+                  "charLength": 504,
                   "snippet": {
-                    "text": "$codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol = $compilationContext->backend->getVariableCode($variable);"
+                    "text": "if (isset($expression['parameters'])) {\n            foreach ($expression['parameters'] as $parameter) {\n                $usePass = self::DETECT_PARAM_PASS == ($this->detectionFlags & self::DETECT_PARAM_PASS);\n                if ($usePass && 'variable' == $parameter['parameter']['type']) {\n                    $this->increaseMutations($parameter['parameter']['value']);\n                } else {\n                    $this->passExpression($parameter['parameter']);\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 44,
+                  "startLine": 250,
                   "startColumn": 1,
-                  "charOffset": 1111,
-                  "charLength": 1195,
+                  "charOffset": 7291,
+                  "charLength": 512,
                   "snippet": {
-                    "text": "        $codePrinter = $compilationContext->codePrinter;\n\n        $variable = $compilationContext->symbolTable->getTempVariable('variable', $compilationContext, $statement);\n        $variable->setMustInitNull(true);\n\n        $letStatement = new LetStatement([\n            'type'        => 'let',\n            'assignments' => [\n                [\n                    'assign-type' => 'variable',\n                    'variable'    => $variable->getName(),\n                    'operator'    => 'assign',\n                    'expr'        => [\n                        'type'  => $resolvedExpr->getType(),\n                        'value' => $resolvedExpr->getCode(),\n                        'file'  => $statement['file'],\n                        'line'  => $statement['line'],\n                        'char'  => $statement['char'],\n                    ],\n                    'file'        => $statement['file'],\n                    'line'        => $statement['line'],\n                    'char'        => $statement['char'],\n                ],\n            ],\n        ]);\n        $letStatement->compile($compilationContext);\n\n        $symbol = $compilationContext->backend->getVariableCode($variable);"
+                    "text": "        if (isset($expression['parameters'])) {\n            foreach ($expression['parameters'] as $parameter) {\n                $usePass = self::DETECT_PARAM_PASS == ($this->detectionFlags & self::DETECT_PARAM_PASS);\n                if ($usePass && 'variable' == $parameter['parameter']['type']) {\n                    $this->increaseMutations($parameter['parameter']['value']);\n                } else {\n                    $this->passExpression($parameter['parameter']);\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28530,9 +28530,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "007fa875708218660836ace1924fc922751392efd8537e891680598c5cf15c3f"
+            "equalIndicator/v1": "0b6c76a9b6ff1c0934e331c0194370f70afb2736498afbf1cca75dc21cec6b2c"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28553,26 +28552,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/ShortTernaryOperator.php",
+                  "uri": "src/Expression/PropertyAccess.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 46,
+                  "startLine": 53,
                   "startColumn": 9,
-                  "charOffset": 1250,
-                  "charLength": 643,
+                  "charOffset": 1278,
+                  "charLength": 959,
                   "snippet": {
-                    "text": "$this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                    "text": "switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 46,
+                  "startLine": 53,
                   "startColumn": 1,
-                  "charOffset": 1242,
-                  "charLength": 651,
+                  "charOffset": 1270,
+                  "charLength": 967,
                   "snippet": {
-                    "text": "        $this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                    "text": "        switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28587,26 +28586,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/TernaryOperator.php",
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 41,
+                  "startLine": 49,
                   "startColumn": 9,
-                  "charOffset": 1070,
-                  "charLength": 643,
+                  "charOffset": 1285,
+                  "charLength": 957,
                   "snippet": {
-                    "text": "$this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                    "text": "switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 41,
+                  "startLine": 49,
                   "startColumn": 1,
-                  "charOffset": 1062,
-                  "charLength": 651,
+                  "charOffset": 1277,
+                  "charLength": 965,
                   "snippet": {
-                    "text": "        $this->setReadOnly(false);\n        $returnVariable = $this->getExpected($compilationContext, $expression, false);\n        /* Make sure that passed variables (passed symbol variables) are promoted */\n        $returnVariable->setLocalOnly(false);\n\n        if ('variable' != $returnVariable->getType() || 'return_value' == $returnVariable->getName()) {\n            $returnVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext\n            );\n            if ($returnVariable->isTemporal()) {\n                $returnVariable->skipInitVariant(2);\n            }\n        }"
+                    "text": "        switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28620,9 +28619,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "08f2f448026d85d619648c5cd79b372a3ceffd6ff784cac4e438ae722c1acf96"
+            "equalIndicator/v1": "2b8f91a04d1c03dc3973b4e140aa755d17f338a989ddc5c4fd9964ccfb24174d"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28643,26 +28641,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/BasenameOptimizer.php",
+                  "uri": "src/Optimizers/FunctionCall/GetClassOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
+                  "startLine": 51,
                   "startColumn": 9,
-                  "charOffset": 958,
-                  "charLength": 778,
+                  "charOffset": 1168,
+                  "charLength": 545,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);\n\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 51,
                   "startColumn": 1,
-                  "charOffset": 950,
-                  "charLength": 786,
+                  "charOffset": 1160,
+                  "charLength": 553,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);\n\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28677,26 +28675,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/FilemtimeOptimizer.php",
+                  "uri": "src/Optimizers/FunctionCall/GetNsClassOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
+                  "startLine": 53,
                   "startColumn": 9,
-                  "charOffset": 961,
-                  "charLength": 777,
+                  "charOffset": 1279,
+                  "charLength": 544,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 53,
                   "startColumn": 1,
-                  "charOffset": 953,
-                  "charLength": 785,
+                  "charOffset": 1271,
+                  "charLength": 552,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28710,9 +28708,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "0ae41db8f8c0bef77b8d675ee99d6a3523098f4cff89c1d9c1245f8318af02cd"
+            "equalIndicator/v1": "2bf2b02bd3334a9221abb5cb5f10e8c05ca2896198f7589354802f75d6487c72"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28733,26 +28730,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/CreateInstanceOptimizer.php",
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 53,
-                  "startColumn": 9,
-                  "charOffset": 1378,
-                  "charLength": 838,
+                  "startLine": 587,
+                  "startColumn": 41,
+                  "charOffset": 27657,
+                  "charLength": 1099,
                   "snippet": {
-                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 53,
+                  "startLine": 587,
                   "startColumn": 1,
-                  "charOffset": 1370,
-                  "charLength": 846,
+                  "charOffset": 27617,
+                  "charLength": 1139,
                   "snippet": {
-                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28767,26 +28764,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/CreateInstanceParamsOptimizer.php",
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 49,
-                  "startColumn": 9,
-                  "charOffset": 1334,
-                  "charLength": 837,
+                  "startLine": 689,
+                  "startColumn": 41,
+                  "charOffset": 33220,
+                  "charLength": 1099,
                   "snippet": {
-                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 49,
+                  "startLine": 689,
                   "startColumn": 1,
-                  "charOffset": 1326,
-                  "charLength": 845,
+                  "charOffset": 33180,
+                  "charLength": 1139,
                   "snippet": {
-                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariable($symbolVariable, $expression);\n\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        /*\n         * Add the last call status to the current symbol table\n         */\n        $call->addCallStatusFlag($context);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28800,9 +28797,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "0d67bca7fae6d45ad7bf2511bf847317eb7e7514c7087f3ae8354745a3be6e50"
+            "equalIndicator/v1": "2e35988b7244037b15d2063b4904d4bbd8e20e3422a0bc82aa94c5ed2a6ead6b"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28823,26 +28819,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uri": "src/Detectors/WriteDetector.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 38,
-                  "startColumn": 9,
-                  "charOffset": 955,
-                  "charLength": 452,
+                  "startLine": 324,
+                  "startColumn": 21,
+                  "charOffset": 10210,
+                  "charLength": 596,
                   "snippet": {
-                    "text": "$this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                    "text": "if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['value'])) {\n                        $this->increaseMutations($statement['value']);\n                    }\n                    if (isset($statement['key'])) {\n                        $this->increaseMutations($statement['key']);\n                    }\n                    if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 38,
+                  "startLine": 324,
                   "startColumn": 1,
-                  "charOffset": 947,
-                  "charLength": 460,
+                  "charOffset": 10190,
+                  "charLength": 616,
                   "snippet": {
-                    "text": "        $this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                    "text": "                    if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['value'])) {\n                        $this->increaseMutations($statement['value']);\n                    }\n                    if (isset($statement['key'])) {\n                        $this->increaseMutations($statement['key']);\n                    }\n                    if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28857,26 +28853,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uri": "src/Passes/MutateGathererPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 38,
-                  "startColumn": 9,
-                  "charOffset": 954,
-                  "charLength": 452,
+                  "startLine": 318,
+                  "startColumn": 21,
+                  "charOffset": 9234,
+                  "charLength": 596,
                   "snippet": {
-                    "text": "$this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                    "text": "if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['value'])) {\n                        $this->increaseMutations($statement['value']);\n                    }\n                    if (isset($statement['key'])) {\n                        $this->increaseMutations($statement['key']);\n                    }\n                    if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 38,
+                  "startLine": 318,
                   "startColumn": 1,
-                  "charOffset": 946,
-                  "charLength": 460,
+                  "charOffset": 9214,
+                  "charLength": 616,
                   "snippet": {
-                    "text": "        $this->checkLeft($expression);\n        $this->checkRight($expression);\n\n        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        $compilationContext->headersManager->add('kernel/operators');"
+                    "text": "                    if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['value'])) {\n                        $this->increaseMutations($statement['value']);\n                    }\n                    if (isset($statement['key'])) {\n                        $this->increaseMutations($statement['key']);\n                    }\n                    if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28890,9 +28886,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "12396187edc198e27c96f5755ad98754d322bac119bd2b300b2ebfb8ec29e475"
+            "equalIndicator/v1": "3b7c056f40fdbab64936205983e403c063605d0e27cacc4a5179cca125a2286b"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -28913,26 +28908,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uri": "src/Expression/NativeArrayAccess.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 139,
+                  "startLine": 176,
                   "startColumn": 17,
-                  "charOffset": 5345,
-                  "charLength": 1460,
+                  "charOffset": 5402,
+                  "charLength": 768,
                   "snippet": {
-                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 139,
+                  "startLine": 176,
                   "startColumn": 1,
-                  "charOffset": 5329,
-                  "charLength": 1476,
+                  "charOffset": 5386,
+                  "charLength": 784,
                   "snippet": {
-                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28947,26 +28942,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uri": "src/Expression/PropertyAccess.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 183,
+                  "startLine": 189,
                   "startColumn": 17,
-                  "charOffset": 7441,
-                  "charLength": 1464,
+                  "charOffset": 6802,
+                  "charLength": 768,
                   "snippet": {
-                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 183,
+                  "startLine": 189,
                   "startColumn": 1,
-                  "charOffset": 7425,
-                  "charLength": 1480,
+                  "charOffset": 6786,
+                  "charLength": 784,
                   "snippet": {
-                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
+                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -28980,9 +28975,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "24f08abd3bb01f9d7345fa1ca459533dab83e08a1e2216c322b5acbb63cde9b6"
+            "equalIndicator/v1": "4c84af03a538a10ccbd7475768837a6f57838da11904651cdd871fb94359d988"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29003,60 +28997,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/DivOperator.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 595,
-                  "startColumn": 41,
-                  "charOffset": 28052,
-                  "charLength": 1044,
-                  "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 595,
-                  "startColumn": 1,
-                  "charOffset": 28012,
-                  "charLength": 1084,
-                  "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uri": "src/Statements/Let/ObjectProperty.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 630,
-                  "startColumn": 41,
-                  "charOffset": 29563,
-                  "charLength": 1204,
+                  "startLine": 286,
+                  "startColumn": 17,
+                  "charOffset": 11122,
+                  "charLength": 490,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
+                    "text": "$codePrinter->increaseLevel();\n                $context->backend->updateProperty($symbolVariable, $propertyName, 'true', $context);\n                $codePrinter->decreaseLevel();\n                $codePrinter->output('} else {');\n                $codePrinter->increaseLevel();\n                $context->backend->updateProperty($symbolVariable, $propertyName, 'false', $context);\n                $codePrinter->decreaseLevel();\n                $codePrinter->output('}');\n                break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 630,
+                  "startLine": 286,
                   "startColumn": 1,
-                  "charOffset": 29523,
-                  "charLength": 1244,
+                  "charOffset": 11106,
+                  "charLength": 506,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
+                    "text": "                $codePrinter->increaseLevel();\n                $context->backend->updateProperty($symbolVariable, $propertyName, 'true', $context);\n                $codePrinter->decreaseLevel();\n                $codePrinter->output('} else {');\n                $codePrinter->increaseLevel();\n                $context->backend->updateProperty($symbolVariable, $propertyName, 'false', $context);\n                $codePrinter->decreaseLevel();\n                $codePrinter->output('}');\n                break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29071,26 +29031,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uri": "src/Statements/Let/ObjectProperty.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 641,
-                  "startColumn": 41,
-                  "charOffset": 30112,
-                  "charLength": 1050,
+                  "startLine": 333,
+                  "startColumn": 25,
+                  "charOffset": 13556,
+                  "charLength": 554,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "$codePrinter->increaseLevel();\n                        $context->backend->updateProperty($symbolVariable, $propertyName, 'true', $context);\n                        $codePrinter->decreaseLevel();\n                        $codePrinter->output('} else {');\n                        $codePrinter->increaseLevel();\n                        $context->backend->updateProperty($symbolVariable, $propertyName, 'false', $context);\n                        $codePrinter->decreaseLevel();\n                        $codePrinter->output('}');\n                        break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 641,
+                  "startLine": 333,
                   "startColumn": 1,
-                  "charOffset": 30072,
-                  "charLength": 1090,
+                  "charOffset": 13532,
+                  "charLength": 578,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "                        $codePrinter->increaseLevel();\n                        $context->backend->updateProperty($symbolVariable, $propertyName, 'true', $context);\n                        $codePrinter->decreaseLevel();\n                        $codePrinter->output('} else {');\n                        $codePrinter->increaseLevel();\n                        $context->backend->updateProperty($symbolVariable, $propertyName, 'false', $context);\n                        $codePrinter->decreaseLevel();\n                        $codePrinter->output('}');\n                        break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29104,9 +29064,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "3f69053074a524ab597f3415079b660a6b7d8373ef878c83f84ce1ea942336eb"
+            "equalIndicator/v1": "55ed0ef421d34698aedf96bf5abb99907ebd5656aa4b5bd83081c6e80f247132"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29127,26 +29086,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFile.php",
+                  "uri": "src/Detectors/WriteDetector.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 184,
-                  "startColumn": 9,
-                  "charOffset": 4992,
-                  "charLength": 571,
+                  "startLine": 352,
+                  "startColumn": 21,
+                  "charOffset": 11308,
+                  "charLength": 688,
                   "snippet": {
-                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    if (isset($statement['catches'])) {\n                        foreach ($statement['catches'] as $catch) {\n                            if (isset($catch['variable'])) {\n                                $this->increaseMutations($catch['variable']['value']);\n                            }\n                            if (isset($catch['statements'])) {\n                                $this->passStatementBlock($catch['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 184,
+                  "startLine": 352,
                   "startColumn": 1,
-                  "charOffset": 4984,
-                  "charLength": 579,
+                  "charOffset": 11288,
+                  "charLength": 708,
                   "snippet": {
-                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "                    if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    if (isset($statement['catches'])) {\n                        foreach ($statement['catches'] as $catch) {\n                            if (isset($catch['variable'])) {\n                                $this->increaseMutations($catch['variable']['value']);\n                            }\n                            if (isset($catch['statements'])) {\n                                $this->passStatementBlock($catch['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29161,26 +29120,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFileAnonymous.php",
+                  "uri": "src/Passes/MutateGathererPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 244,
-                  "startColumn": 9,
-                  "charOffset": 7132,
-                  "charLength": 571,
+                  "startLine": 346,
+                  "startColumn": 21,
+                  "charOffset": 10332,
+                  "charLength": 688,
                   "snippet": {
-                    "text": "$code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    if (isset($statement['catches'])) {\n                        foreach ($statement['catches'] as $catch) {\n                            if (isset($catch['variable'])) {\n                                $this->increaseMutations($catch['variable']['value']);\n                            }\n                            if (isset($catch['statements'])) {\n                                $this->passStatementBlock($catch['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 244,
+                  "startLine": 346,
                   "startColumn": 1,
-                  "charOffset": 7124,
-                  "charLength": 579,
+                  "charOffset": 10312,
+                  "charLength": 708,
                   "snippet": {
-                    "text": "        $code .= PHP_EOL;\n\n        $code .= '#include \"kernel/main.h\"' . PHP_EOL;\n\n        if ('class' == $classDefinition->getType()) {\n            foreach ($compilationContext->headersManager->get() as $header => $one) {\n                $code .= '#include \"' . $header . '.h\"' . PHP_EOL;\n            }\n        }\n\n        if (count($this->headerCBlocks) > 0) {\n            $code .= implode(PHP_EOL, $this->headerCBlocks) . PHP_EOL;\n        }\n\n        /**\n         * Prepend the required files to the header\n         */\n        $compilationContext->codePrinter->preOutput($code);"
+                    "text": "                    if (isset($statement['statements'])) {\n                        $this->passStatementBlock($statement['statements']);\n                    }\n                    if (isset($statement['catches'])) {\n                        foreach ($statement['catches'] as $catch) {\n                            if (isset($catch['variable'])) {\n                                $this->increaseMutations($catch['variable']['value']);\n                            }\n                            if (isset($catch['statements'])) {\n                                $this->passStatementBlock($catch['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29194,9 +29153,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "4b5cee72bcbbadce4fc761c12530223b00f00b3b7e5c2faa3973277df457d6c6"
+            "equalIndicator/v1": "59f8177995833e65667177ed64c654190eae318eded512017c9f03d889d8314d"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29217,26 +29175,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/BasenameOptimizer.php",
+                  "uri": "src/Expression/StaticPropertyAccess.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
+                  "startLine": 87,
                   "startColumn": 9,
-                  "charOffset": 958,
-                  "charLength": 706,
+                  "charOffset": 2896,
+                  "charLength": 885,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                    "text": "$this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $expression\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $expression\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $expression\n                );\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 87,
                   "startColumn": 1,
-                  "charOffset": 950,
-                  "charLength": 714,
+                  "charOffset": 2888,
+                  "charLength": 893,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                    "text": "        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $expression\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $expression\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $expression\n                );\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29251,26 +29209,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/FileGetContentsOptimizer.php",
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
+                  "startLine": 86,
                   "startColumn": 9,
-                  "charOffset": 981,
-                  "charLength": 705,
+                  "charOffset": 2844,
+                  "charLength": 882,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                    "text": "$this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 86,
                   "startColumn": 1,
-                  "charOffset": 973,
-                  "charLength": 713,
+                  "charOffset": 2836,
+                  "charLength": 890,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                    "text": "        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29281,30 +29239,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5c21bca61e28d82bdfbc8e8ef8177eee843e4be65186c4eb4e73f045d9aac021"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/FilemtimeOptimizer.php",
+                  "uri": "src/Statements/Let/ObjectPropertyAppend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
+                  "startLine": 69,
                   "startColumn": 9,
-                  "charOffset": 961,
-                  "charLength": 705,
+                  "charOffset": 1736,
+                  "charLength": 1308,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 69,
                   "startColumn": 1,
-                  "charOffset": 953,
-                  "charLength": 713,
+                  "charOffset": 1728,
+                  "charLength": 1316,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }"
+                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29315,52 +29294,30 @@
                   "kind": "module"
                 }
               ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "4b94f01d2137a3c924a6e906729935c1a01d5f8d05150b8e7780cfa9e6d51377"
-          },
-          "baselineState": "unchanged",
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
+            },
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndexAppend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 176,
-                  "startColumn": 17,
-                  "charOffset": 5402,
-                  "charLength": 768,
+                  "startLine": 120,
+                  "startColumn": 9,
+                  "charOffset": 3582,
+                  "charLength": 1309,
                   "snippet": {
-                    "text": "if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /**\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 176,
+                  "startLine": 120,
                   "startColumn": 1,
-                  "charOffset": 5386,
-                  "charLength": 784,
+                  "charOffset": 3574,
+                  "charLength": 1317,
                   "snippet": {
-                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /**\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29375,26 +29332,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/PropertyAccess.php",
+                  "uri": "src/Statements/Let/ObjectPropertyDecr.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 189,
-                  "startColumn": 17,
-                  "charOffset": 6802,
-                  "charLength": 768,
+                  "startLine": 84,
+                  "startColumn": 9,
+                  "charOffset": 2257,
+                  "charLength": 1308,
                   "snippet": {
-                    "text": "if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 189,
+                  "startLine": 84,
                   "startColumn": 1,
-                  "charOffset": 6786,
-                  "charLength": 784,
+                  "charOffset": 2249,
+                  "charLength": 1316,
                   "snippet": {
-                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()\n                        );\n                        if (1 == $numberMutations) {\n                            if ($symbolVariable->getNumberMutations() == $numberMutations) {\n                                $symbolVariable->setMemoryTracked(false);\n                                $readOnly = true;\n                            }\n                        }\n                    }\n                }"
+                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29408,9 +29365,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "4c84af03a538a10ccbd7475768837a6f57838da11904651cdd871fb94359d988"
+            "equalIndicator/v1": "5d53dd48ab9c75067d8b728476c9f845850bb812b1cb8753fcd37c8cbbed9fb2"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29431,26 +29387,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/Crc32Optimizer.php",
+                  "uri": "src/Detectors/WriteDetector.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 949,
-                  "charLength": 487,
+                  "startLine": 380,
+                  "startColumn": 21,
+                  "charOffset": 12413,
+                  "charLength": 775,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "if ('array-access' == $statement['expr']['type']) {\n                        if ('variable' == $statement['expr']['left']['type']) {\n                            $this->increaseMutations($statement['expr']['left']['value']);\n                        }\n                    } else {\n                        if ('list' == $statement['expr']['type']) {\n                            if ('array-access' == $statement['expr']['left']['type']) {\n                                if ('variable' == $statement['expr']['left']['left']['type']) {\n                                    $this->increaseMutations($statement['expr']['left']['left']['value']);\n                                }\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 380,
                   "startColumn": 1,
-                  "charOffset": 941,
-                  "charLength": 495,
+                  "charOffset": 12393,
+                  "charLength": 795,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "                    if ('array-access' == $statement['expr']['type']) {\n                        if ('variable' == $statement['expr']['left']['type']) {\n                            $this->increaseMutations($statement['expr']['left']['value']);\n                        }\n                    } else {\n                        if ('list' == $statement['expr']['type']) {\n                            if ('array-access' == $statement['expr']['left']['type']) {\n                                if ('variable' == $statement['expr']['left']['left']['type']) {\n                                    $this->increaseMutations($statement['expr']['left']['left']['value']);\n                                }\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29465,26 +29421,81 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/Md5Optimizer.php",
+                  "uri": "src/Passes/MutateGathererPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 943,
-                  "charLength": 487,
+                  "startLine": 374,
+                  "startColumn": 21,
+                  "charOffset": 11437,
+                  "charLength": 775,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "if ('array-access' == $statement['expr']['type']) {\n                        if ('variable' == $statement['expr']['left']['type']) {\n                            $this->increaseMutations($statement['expr']['left']['value']);\n                        }\n                    } else {\n                        if ('list' == $statement['expr']['type']) {\n                            if ('array-access' == $statement['expr']['left']['type']) {\n                                if ('variable' == $statement['expr']['left']['left']['type']) {\n                                    $this->increaseMutations($statement['expr']['left']['left']['value']);\n                                }\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 374,
                   "startColumn": 1,
-                  "charOffset": 935,
-                  "charLength": 495,
+                  "charOffset": 11417,
+                  "charLength": 795,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "                    if ('array-access' == $statement['expr']['type']) {\n                        if ('variable' == $statement['expr']['left']['type']) {\n                            $this->increaseMutations($statement['expr']['left']['value']);\n                        }\n                    } else {\n                        if ('list' == $statement['expr']['type']) {\n                            if ('array-access' == $statement['expr']['left']['type']) {\n                                if ('variable' == $statement['expr']['left']['left']['type']) {\n                                    $this->increaseMutations($statement['expr']['left']['left']['value']);\n                                }\n                            }\n                        }\n                    }\n                    break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "64956060aed098c22282964b7ee84928eaf8ceefeaa3c451961a56f4ca1d623c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "DuplicatedCode",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Duplicated code",
+            "markdown": "Duplicated code"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 771,
+                  "startColumn": 17,
+                  "charOffset": 35545,
+                  "charLength": 1122,
+                  "snippet": {
+                    "text": "if ($isExpecting) {\n                    if ('return_value' == $symbolVariable->getName()) {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                        );\n                    } else {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(\n                            ) . $paramsStr . ');'\n                        );\n                    }\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 771,
+                  "startColumn": 1,
+                  "charOffset": 35529,
+                  "charLength": 1138,
+                  "snippet": {
+                    "text": "                if ($isExpecting) {\n                    if ('return_value' == $symbolVariable->getName()) {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                        );\n                    } else {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(\n                            ) . $paramsStr . ');'\n                        );\n                    }\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29499,26 +29510,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
+                  "uri": "src/StaticCall.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 44,
-                  "startColumn": 9,
-                  "charOffset": 1028,
-                  "charLength": 487,
+                  "startLine": 439,
+                  "startColumn": 13,
+                  "charOffset": 16948,
+                  "charLength": 904,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 44,
+                  "startLine": 439,
                   "startColumn": 1,
-                  "charOffset": 1020,
-                  "charLength": 495,
+                  "charOffset": 16936,
+                  "charLength": 916,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "            if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29533,26 +29544,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/UcfirstOptimizer.php",
+                  "uri": "src/StaticCall.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 955,
-                  "charLength": 487,
+                  "startLine": 536,
+                  "startColumn": 13,
+                  "charOffset": 20776,
+                  "charLength": 904,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 536,
                   "startColumn": 1,
-                  "charOffset": 947,
-                  "charLength": 495,
+                  "charOffset": 20764,
+                  "charLength": 916,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                    "text": "            if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29566,9 +29577,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "4d36d56beb9e89409bd76c2f6ecb22e953444d6fdf1fd7e4049e2d6bf5a9afbd"
+            "equalIndicator/v1": "67c8450c4612f8a204bc1aa2ac110f5f5c99ad6f17b647691f2798c9b7cedced"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29589,26 +29599,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/Closure.php",
+                  "uri": "src/Optimizers/FunctionCall/BasenameOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 116,
+                  "startLine": 45,
                   "startColumn": 9,
-                  "charOffset": 3043,
-                  "charLength": 900,
+                  "charOffset": 1029,
+                  "charLength": 671,
                   "snippet": {
-                    "text": "$classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 116,
+                  "startLine": 45,
                   "startColumn": 1,
-                  "charOffset": 3035,
-                  "charLength": 908,
+                  "charOffset": 1021,
+                  "charLength": 679,
                   "snippet": {
-                    "text": "        $classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29623,26 +29633,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/ClosureArrow.php",
+                  "uri": "src/Optimizers/FunctionCall/FileGetContentsOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 90,
+                  "startLine": 42,
                   "startColumn": 9,
-                  "charOffset": 2716,
-                  "charLength": 900,
+                  "charOffset": 981,
+                  "charLength": 670,
                   "snippet": {
-                    "text": "$classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 90,
+                  "startLine": 42,
                   "startColumn": 1,
-                  "charOffset": 2708,
-                  "charLength": 908,
+                  "charOffset": 973,
+                  "charLength": 678,
                   "snippet": {
-                    "text": "        $classDefinition->addMethod($classMethod, $block);\n\n        $compilationContext->headersManager->add('kernel/object');\n\n        if ($this->expecting) {\n            if ($this->expectingVariable) {\n                $symbolVariable = $this->expectingVariable;\n            } else {\n                $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }\n        } else {\n            $symbolVariable = $compilationContext->symbolTable->getTempVariableForWrite(\n                'variable',\n                $compilationContext,\n                $expression\n            );\n        }\n\n        $symbolVariable->initVariant($compilationContext);\n        $compilationContext->backend->createClosure($symbolVariable, $classDefinition, $compilationContext);"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29656,9 +29666,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "599df81d41f5be810b08fb69c471bc5bca897579db4c7866fbcbf605b38c241f"
+            "equalIndicator/v1": "7baef90fb27fefb6a5ceaac52951a800f10fee8fe6ecd9d946e9b40b4c1b141e"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29679,60 +29688,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/ObjectPropertyAppend.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 69,
-                  "startColumn": 9,
-                  "charOffset": 1736,
-                  "charLength": 1308,
-                  "snippet": {
-                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 69,
-                  "startColumn": 1,
-                  "charOffset": 1728,
-                  "charLength": 1316,
-                  "snippet": {
-                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Statements/Let/ObjectPropertyArrayIndexAppend.php",
+                  "uri": "src/StaticCall.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 120,
+                  "startLine": 395,
                   "startColumn": 9,
-                  "charOffset": 3582,
-                  "charLength": 1309,
+                  "charOffset": 15081,
+                  "charLength": 685,
                   "snippet": {
-                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /**\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                    "text": "$compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 120,
+                  "startLine": 395,
                   "startColumn": 1,
-                  "charOffset": 3574,
-                  "charLength": 1317,
+                  "charOffset": 15073,
+                  "charLength": 693,
                   "snippet": {
-                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /**\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                    "text": "        $compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29747,26 +29722,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/ObjectPropertyDecr.php",
+                  "uri": "src/StaticCall.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 84,
+                  "startLine": 773,
                   "startColumn": 9,
-                  "charOffset": 2257,
-                  "charLength": 1308,
+                  "charOffset": 30750,
+                  "charLength": 685,
                   "snippet": {
-                    "text": "if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                    "text": "$compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 84,
+                  "startLine": 773,
                   "startColumn": 1,
-                  "charOffset": 2249,
-                  "charLength": 1316,
+                  "charOffset": 30742,
+                  "charLength": 693,
                   "snippet": {
-                    "text": "        if ('this' == $symbolVariable->getRealName()) {\n            $classDefinition = $compilationContext->classDefinition;\n            $this->checkClassHasProperty(\n                $classDefinition,\n                $property,\n                $statement\n            );\n        } else {\n            /*\n             * If we know the class related to a variable we could check if the property\n             * is defined on that class\n             */\n            if ($symbolVariable->hasAnyDynamicType('object')) {\n                $classType = current($symbolVariable->getClassTypes());\n                $compiler  = $compilationContext->compiler;\n\n                if ($compiler->isClass($classType)) {\n                    $classDefinition = $compiler->getClassDefinition($classType);\n                    if (!$classDefinition) {\n                        throw new CompilerException(\n                            'Cannot locate class definition for class: ' . $classType,\n                            $statement\n                        );\n                    }\n\n                    $this->checkClassHasProperty(\n                        $classDefinition,\n                        $property,\n                        $statement,\n                        $classType\n                    );\n                }\n            }\n        }"
+                    "text": "        $compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29780,9 +29755,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "5d53dd48ab9c75067d8b728476c9f845850bb812b1cb8753fcd37c8cbbed9fb2"
+            "equalIndicator/v1": "7eaca14c21fabab6e49ad89b5c646e4ac6a54a5027cf168a3998bd74edf98200"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29803,60 +29777,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/MethodCall.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 770,
-                  "startColumn": 17,
-                  "charOffset": 35532,
-                  "charLength": 1122,
-                  "snippet": {
-                    "text": "if ($isExpecting) {\n                    if ('return_value' == $symbolVariable->getName()) {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                        );\n                    } else {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(\n                            ) . $paramsStr . ');'\n                        );\n                    }\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 770,
-                  "startColumn": 1,
-                  "charOffset": 35516,
-                  "charLength": 1138,
-                  "snippet": {
-                    "text": "                if ($isExpecting) {\n                    if ('return_value' == $symbolVariable->getName()) {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                        );\n                    } else {\n                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(\n                            ) . $paramsStr . ');'\n                        );\n                    }\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/StaticCall.php",
+                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 439,
-                  "startColumn": 13,
-                  "charOffset": 16949,
-                  "charLength": 904,
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 981,
+                  "charLength": 582,
                   "snippet": {
-                    "text": "if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 439,
+                  "startLine": 42,
                   "startColumn": 1,
-                  "charOffset": 16937,
-                  "charLength": 916,
+                  "charOffset": 973,
+                  "charLength": 590,
                   "snippet": {
-                    "text": "            if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29871,26 +29811,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/StaticCall.php",
+                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 536,
-                  "startColumn": 13,
-                  "charOffset": 20778,
-                  "charLength": 904,
+                  "startLine": 42,
+                  "startColumn": 9,
+                  "charOffset": 952,
+                  "charLength": 582,
                   "snippet": {
-                    "text": "if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 536,
+                  "startLine": 42,
                   "startColumn": 1,
-                  "charOffset": 20766,
-                  "charLength": 916,
+                  "charOffset": 944,
+                  "charLength": 590,
                   "snippet": {
-                    "text": "            if ($isExpecting) {\n                if ('return_value' == $symbolVariable->getName()) {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 1, $paramCount);\n                    $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n                } else {\n                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }\n            } else {\n                $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 0, $paramCount);\n                $codePrinter->output($macro . '(' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');');\n            }"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29904,9 +29844,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "63fb053eb03a3eeb273a001ccc30905905075bfbff24662ac374dd80b3e9654e"
+            "equalIndicator/v1": "85c329c4716072967778fb33b25cf012514ce0ed7d1994738b7a6d4e5857125c"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -29927,60 +29866,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/Md5Optimizer.php",
+                  "uri": "src/Cache/MethodCache.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 943,
-                  "charLength": 831,
-                  "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 42,
-                  "startColumn": 1,
-                  "charOffset": 935,
-                  "charLength": 839,
-                  "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 44,
-                  "startColumn": 9,
-                  "charOffset": 1028,
-                  "charLength": 877,
+                  "startLine": 83,
+                  "startColumn": 21,
+                  "charOffset": 2736,
+                  "charLength": 612,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,\n            $expression\n        );\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "if ($compiler->isClass($classType)) {\n                        $classDefinition = $compiler->getClassDefinition($classType);\n                    } else {\n                        $classDefinition = $compiler->getInternalClassDefinition($classType);\n                    }\n\n                    if (!$classDefinition) {\n                        continue;\n                    }\n\n                    if ($classDefinition->hasMethod($methodName) && !$classDefinition->isInterface()) {\n                        ++$numberPoly;\n                        $method = $classDefinition->getMethod($methodName);\n                    }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 44,
+                  "startLine": 83,
                   "startColumn": 1,
-                  "charOffset": 1020,
-                  "charLength": 885,
+                  "charOffset": 2716,
+                  "charLength": 632,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,\n            $expression\n        );\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "                    if ($compiler->isClass($classType)) {\n                        $classDefinition = $compiler->getClassDefinition($classType);\n                    } else {\n                        $classDefinition = $compiler->getInternalClassDefinition($classType);\n                    }\n\n                    if (!$classDefinition) {\n                        continue;\n                    }\n\n                    if ($classDefinition->hasMethod($methodName) && !$classDefinition->isInterface()) {\n                        ++$numberPoly;\n                        $method = $classDefinition->getMethod($methodName);\n                    }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -29995,26 +29900,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/UcfirstOptimizer.php",
+                  "uri": "src/MethodCall.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 955,
-                  "charLength": 830,
+                  "startLine": 887,
+                  "startColumn": 21,
+                  "charOffset": 40050,
+                  "charLength": 612,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "if ($compiler->isClass($classType)) {\n                        $classDefinition = $compiler->getClassDefinition($classType);\n                    } else {\n                        $classDefinition = $compiler->getInternalClassDefinition($classType);\n                    }\n\n                    if (!$classDefinition) {\n                        continue;\n                    }\n\n                    if ($classDefinition->hasMethod($methodName) && !$classDefinition->isInterface()) {\n                        ++$numberPoly;\n                        $method = $classDefinition->getMethod($methodName);\n                    }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 887,
                   "startColumn": 1,
-                  "charOffset": 947,
-                  "charLength": 838,
+                  "charOffset": 40030,
+                  "charLength": 632,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (1 != count($expression['parameters'])) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "                    if ($compiler->isClass($classType)) {\n                        $classDefinition = $compiler->getClassDefinition($classType);\n                    } else {\n                        $classDefinition = $compiler->getInternalClassDefinition($classType);\n                    }\n\n                    if (!$classDefinition) {\n                        continue;\n                    }\n\n                    if ($classDefinition->hasMethod($methodName) && !$classDefinition->isInterface()) {\n                        ++$numberPoly;\n                        $method = $classDefinition->getMethod($methodName);\n                    }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30028,9 +29933,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "68c15a0339486870360e7eb97b3bce1d6c56a259032f453b3b503df6ee1874df"
+            "equalIndicator/v1": "9cab9644f64be61eb8884d0a33c31ffccfb1652c73b693fd1db4574ad576062f"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30055,22 +29959,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 595,
+                  "startLine": 569,
                   "startColumn": 41,
-                  "charOffset": 28052,
-                  "charLength": 540,
+                  "charOffset": 26904,
+                  "charLength": 1005,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 595,
+                  "startLine": 569,
                   "startColumn": 1,
-                  "charOffset": 28012,
-                  "charLength": 580,
+                  "charOffset": 26864,
+                  "charLength": 1045,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected     = $this->getExpected($compilationContext, $expression);\n                                        $expectedCode = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedCode . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30089,56 +29993,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 630,
+                  "startLine": 531,
                   "startColumn": 41,
-                  "charOffset": 29563,
-                  "charLength": 526,
+                  "charOffset": 25577,
+                  "charLength": 991,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 630,
+                  "startLine": 531,
                   "startColumn": 1,
-                  "charOffset": 29523,
-                  "charLength": 566,
+                  "charOffset": 25537,
+                  "charLength": 1031,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ModOperator.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 745,
-                  "startColumn": 49,
-                  "charOffset": 35768,
-                  "charLength": 566,
-                  "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 745,
-                  "startColumn": 1,
-                  "charOffset": 35720,
-                  "charLength": 614,
-                  "snippet": {
-                    "text": "                                                $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                                $expected = $this->getExpected($compilationContext, $expression);\n                                                $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                                $compilationContext->codePrinter->output(\n                                                    $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                                );"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $symbol   = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $symbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        return new CompiledExpression(\n                                            'variable',\n                                            $expected->getName(),\n                                            $expression\n                                        );"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30157,22 +30027,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 641,
+                  "startLine": 632,
                   "startColumn": 41,
-                  "charOffset": 30112,
-                  "charLength": 546,
+                  "charOffset": 29639,
+                  "charLength": 837,
                   "snippet": {
-                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "$op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 641,
+                  "startLine": 632,
                   "startColumn": 1,
-                  "charOffset": 30072,
-                  "charLength": 586,
+                  "charOffset": 29599,
+                  "charLength": 877,
                   "snippet": {
-                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );"
+                    "text": "                                        $op2 = $compilationContext->backend->getVariableCode($variableRight);\n\n                                        $expected       = $this->getExpected($compilationContext, $expression);\n                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n\n                                        $this->checkVariableTemporal($variableLeft);\n                                        $this->checkVariableTemporal($variableRight);\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30186,9 +30056,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "6d36e4ef6709e868286eaa84de3db359e148aee2d9ea1c2b24fc6a6c90c45642"
+            "equalIndicator/v1": "bf58bb02b18139be9e5b207856cfed4e939d732ddce6aefa7e7d1db8fdfc00a6"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30209,116 +30078,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 981,
-                  "charLength": 582,
-                  "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 42,
-                  "startColumn": 1,
-                  "charOffset": 973,
-                  "charLength": 590,
-                  "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            },
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
+                  "uri": "src/Operators/Other/FetchOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
-                  "startColumn": 9,
-                  "charOffset": 952,
-                  "charLength": 582,
+                  "startLine": 140,
+                  "startColumn": 17,
+                  "charOffset": 5338,
+                  "charLength": 1460,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
+                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 140,
                   "startColumn": 1,
-                  "charOffset": 944,
-                  "charLength": 590,
-                  "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        $context->headersManager->add('kernel/file');\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable();\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);"
-                  },
-                  "sourceLanguage": "PHP"
-                }
-              },
-              "logicalLocations": [
-                {
-                  "fullyQualifiedName": "project",
-                  "kind": "module"
-                }
-              ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "85c329c4716072967778fb33b25cf012514ce0ed7d1994738b7a6d4e5857125c"
-          },
-          "baselineState": "unchanged",
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
-            {
-              "physicalLocation": {
-                "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
-                  "uriBaseId": "SRCROOT"
-                },
-                "region": {
-                  "startLine": 47,
-                  "startColumn": 13,
-                  "charOffset": 1290,
-                  "charLength": 1935,
-                  "snippet": {
-                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
-                  },
-                  "sourceLanguage": "PHP"
-                },
-                "contextRegion": {
-                  "startLine": 47,
-                  "startColumn": 13,
-                  "charOffset": 1290,
-                  "charLength": 1935,
+                  "charOffset": 5322,
+                  "charLength": 1476,
                   "snippet": {
-                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                switch ($resolvedParam->getType()) {\n                    case 'array':\n                        $type = 'array';\n                        break;\n                    default:\n                        $type = 'variable';\n                        break;\n                }\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
+                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $variable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30333,26 +30112,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
+                  "uri": "src/Operators/Other/FetchOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 57,
-                  "startColumn": 9,
-                  "charOffset": 1516,
-                  "charLength": 1790,
+                  "startLine": 184,
+                  "startColumn": 17,
+                  "charOffset": 7434,
+                  "charLength": 1464,
                   "snippet": {
-                    "text": "if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
+                    "text": "$exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 57,
+                  "startLine": 184,
                   "startColumn": 1,
-                  "charOffset": 1508,
-                  "charLength": 1798,
+                  "charOffset": 7418,
+                  "charLength": 1480,
                   "snippet": {
-                    "text": "        if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            switch ($resolvedParam->getType()) {\n                case 'array':\n                    $type = 'array';\n                    break;\n                default:\n                    $type = 'variable';\n                    break;\n            }\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
+                    "text": "                $exprVariable = new Expression($expression['right']['left']);\n                $exprVariable->setReadOnly(true);\n                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException(\n                        'Expression type: ' . $exprCompiledVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                $evalVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprCompiledVariable->getCode(),\n                    $compilationContext,\n                    $expression['right']['left']\n                );\n                if ('variable' != $evalVariable->getType()) {\n                    throw new CompilerException(\n                        'Variable type: ' . $evalVariable->getType() . ' cannot be used as object',\n                        $expression['right']['left']\n                    );\n                }\n\n                if ($evalVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {\n                    $compilationContext->logger->warning(\n                        'Possible attempt to use non object in fetch operator',\n                        ['non-valid-fetch', $expression['right']]\n                    );\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30366,9 +30145,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "9c667466bb2f3e596e8dc820bfd85552e107e589217e244f70d57b9be4e7fc54"
+            "equalIndicator/v1": "c9c24624894c7675f0279343b835e8d2274f8825e0c7d4aeb017a875fee6088d"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30389,26 +30167,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/CamelizeOptimizer.php",
+                  "uri": "src/Detectors/WriteDetector.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 50,
-                  "startColumn": 9,
-                  "charOffset": 1237,
-                  "charLength": 494,
+                  "startLine": 298,
+                  "startColumn": 21,
+                  "charOffset": 9112,
+                  "charLength": 657,
                   "snippet": {
-                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                    "text": "if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 50,
+                  "startLine": 298,
                   "startColumn": 1,
-                  "charOffset": 1229,
-                  "charLength": 502,
+                  "charOffset": 9092,
+                  "charLength": 677,
                   "snippet": {
-                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                    "text": "                    if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30423,26 +30201,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/TrimOptimizer.php",
+                  "uri": "src/Passes/CallGathererPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 48,
-                  "startColumn": 9,
-                  "charOffset": 1087,
-                  "charLength": 493,
+                  "startLine": 315,
+                  "startColumn": 21,
+                  "charOffset": 9204,
+                  "charLength": 657,
                   "snippet": {
-                    "text": "$charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                    "text": "if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 48,
+                  "startLine": 315,
                   "startColumn": 1,
-                  "charOffset": 1079,
-                  "charLength": 501,
+                  "charOffset": 9184,
+                  "charLength": 677,
                   "snippet": {
-                    "text": "        $charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                    "text": "                    if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30457,26 +30235,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/UncamelizeOptimizer.php",
+                  "uri": "src/Passes/LocalContextPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 50,
-                  "startColumn": 9,
-                  "charOffset": 1245,
-                  "charLength": 494,
+                  "startLine": 432,
+                  "startColumn": 21,
+                  "charOffset": 14042,
+                  "charLength": 657,
                   "snippet": {
-                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                    "text": "if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 50,
+                  "startLine": 432,
                   "startColumn": 1,
-                  "charOffset": 1237,
-                  "charLength": 502,
+                  "charOffset": 14022,
+                  "charLength": 677,
                   "snippet": {
-                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);"
+                    "text": "                    if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30487,52 +30265,30 @@
                   "kind": "module"
                 }
               ]
-            }
-          ],
-          "partialFingerprints": {
-            "equalIndicator/v1": "9cc60933b60115369adb7ae20f2fad84bcadcda683e07663d606855d40f8d9bc"
-          },
-          "baselineState": "unchanged",
-          "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
-            "tags": [
-              "PHP"
-            ]
-          }
-        },
-        {
-          "ruleId": "DuplicatedCode",
-          "kind": "fail",
-          "level": "note",
-          "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
-          },
-          "locations": [
+            },
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uri": "src/Passes/MutateGathererPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 56,
-                  "startColumn": 9,
-                  "charOffset": 1332,
-                  "charLength": 454,
+                  "startLine": 292,
+                  "startColumn": 21,
+                  "charOffset": 8136,
+                  "charLength": 657,
                   "snippet": {
-                    "text": "$this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 56,
+                  "startLine": 292,
                   "startColumn": 1,
-                  "charOffset": 1324,
-                  "charLength": 462,
+                  "charOffset": 8116,
+                  "charLength": 677,
                   "snippet": {
-                    "text": "        $this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "                    if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30547,26 +30303,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/ArrayMergeOptimizer.php",
+                  "uri": "src/Passes/StaticTypeInference.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 56,
-                  "startColumn": 9,
-                  "charOffset": 1335,
-                  "charLength": 454,
+                  "startLine": 479,
+                  "startColumn": 21,
+                  "charOffset": 14374,
+                  "charLength": 657,
                   "snippet": {
-                    "text": "$this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 56,
+                  "startLine": 479,
                   "startColumn": 1,
-                  "charOffset": 1327,
-                  "charLength": 462,
+                  "charOffset": 14354,
+                  "charLength": 677,
                   "snippet": {
-                    "text": "        $this->checkNotVariable($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/array');\n\n        $symbolVariable->setDynamicTypes('array');\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "                    if (isset($statement['expr'])) {\n                        $this->passExpression($statement['expr']);\n                    }\n                    if (isset($statement['clauses'])) {\n                        foreach ($statement['clauses'] as $clause) {\n                            if (isset($clause['expr'])) {\n                                $this->passExpression($clause['expr']);\n                            }\n                            if (isset($clause['statements'])) {\n                                $this->passStatementBlock($clause['statements']);\n                            }\n                        }\n                    }\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30580,9 +30336,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "a2db45685cf7e89e0b892e3f49ab2536a98f512729f5bc953c503ea69172a94e"
+            "equalIndicator/v1": "d3c0ba88b555b2af173ec2fc25f08731fe2a3a1540e93da5d993834601224b8b"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30603,26 +30358,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFile.php",
+                  "uri": "src/SymbolTable.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 402,
+                  "startLine": 716,
                   "startColumn": 9,
-                  "charOffset": 12863,
-                  "charLength": 381,
+                  "charOffset": 25793,
+                  "charLength": 1054,
                   "snippet": {
-                    "text": "$path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                    "text": "if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 402,
+                  "startLine": 716,
                   "startColumn": 1,
-                  "charOffset": 12855,
-                  "charLength": 389,
+                  "charOffset": 25785,
+                  "charLength": 1062,
                   "snippet": {
-                    "text": "        $path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                    "text": "        if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30637,26 +30392,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFileAnonymous.php",
+                  "uri": "src/SymbolTable.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 117,
+                  "startLine": 769,
                   "startColumn": 9,
-                  "charOffset": 3408,
-                  "charLength": 381,
+                  "charOffset": 27740,
+                  "charLength": 1054,
                   "snippet": {
-                    "text": "$path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                    "text": "if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 117,
+                  "startLine": 769,
                   "startColumn": 1,
-                  "charOffset": 3400,
-                  "charLength": 389,
+                  "charOffset": 27732,
+                  "charLength": 1062,
                   "snippet": {
-                    "text": "        $path = str_replace('\\\\', DIRECTORY_SEPARATOR, strtolower($completeName));\n\n        $filePath       = 'ext/' . $path . '.zep.c';\n        $filePathHeader = 'ext/' . $path . '.zep.h';\n\n        if (strpos($path, DIRECTORY_SEPARATOR)) {\n            $dirname = dirname($filePath);\n            if (!is_dir($dirname)) {\n                mkdir($dirname, 0755, true);\n            }\n        }"
+                    "text": "        if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30670,9 +30425,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "a520debf0252582235eface5631c62fea290e447afb6e745f53d01fcba26ee87"
+            "equalIndicator/v1": "da50221b5e3ab440623dc84a9c425167aa37e1739d51d042ca747fe3a80cb844"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30693,26 +30447,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/SymbolTable.php",
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 747,
+                  "startLine": 41,
                   "startColumn": 9,
-                  "charOffset": 26366,
-                  "charLength": 1054,
+                  "charOffset": 904,
+                  "charLength": 392,
                   "snippet": {
-                    "text": "if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 747,
+                  "startLine": 41,
                   "startColumn": 1,
-                  "charOffset": 26358,
-                  "charLength": 1062,
+                  "charOffset": 896,
+                  "charLength": 400,
                   "snippet": {
-                    "text": "        if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30727,26 +30481,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/SymbolTable.php",
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 800,
+                  "startLine": 38,
                   "startColumn": 9,
-                  "charOffset": 28313,
-                  "charLength": 1054,
+                  "charOffset": 879,
+                  "charLength": 392,
                   "snippet": {
-                    "text": "if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 800,
+                  "startLine": 38,
                   "startColumn": 1,
-                  "charOffset": 28305,
-                  "charLength": 1062,
+                  "charOffset": 871,
+                  "charLength": 400,
                   "snippet": {
-                    "text": "        if ($this->globalsManager->isSuperGlobal($name)) {\n            if (!$this->hasVariable($name)) {\n                /**\n                 * TODO:, injecting globals, initialize to null and check first?\n                 */\n                $superVar = new Variable('variable', $name, $compilationContext->branchManager->getCurrentBranch());\n                $superVar->setIsInitialized(true, $compilationContext);\n                $superVar->setDynamicTypes('array');\n                $superVar->increaseMutates();\n                $superVar->increaseUses();\n                $superVar->setIsExternal(true);\n                $superVar->setUsed(true, $statement);\n                $this->addRawVariable($superVar);\n\n                return $superVar;\n            }\n        }\n\n        if (!$this->hasVariable($name)) {\n            throw new CompilerException(\"Cannot mutate variable '\" . $name . \"' because it wasn't defined\", $statement);\n        }\n\n        $variable = $this->getVariable($name);\n        $variable->increaseUses();\n        $variable->increaseMutates();"
+                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30760,9 +30514,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "b552b9808f9cf70b1ecefa055b86445de001d35dad47517e9435eca0f8a97632"
+            "equalIndicator/v1": "e1dc5f4694fcbd691dc96a462008cbdf13f317264d1ba5f846c6407a43296598"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30783,26 +30536,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/PropertyAccess.php",
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 53,
-                  "startColumn": 9,
-                  "charOffset": 1278,
-                  "charLength": 959,
+                  "startLine": 48,
+                  "startColumn": 13,
+                  "charOffset": 1314,
+                  "charLength": 1830,
                   "snippet": {
-                    "text": "switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                $type = match ($resolvedParam->getType()) {\n                    Types::T_ARRAY => 'array',\n                    default        => 'variable',\n                };\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 53,
-                  "startColumn": 1,
-                  "charOffset": 1270,
-                  "charLength": 967,
+                  "startLine": 48,
+                  "startColumn": 13,
+                  "charOffset": 1314,
+                  "charLength": 1830,
                   "snippet": {
-                    "text": "        switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                    "text": "if (!$variable || !$variable->isVariable()) {\n                /*\n                 * Complex expressions require a temporary variable\n                 */\n                $type = match ($resolvedParam->getType()) {\n                    Types::T_ARRAY => 'array',\n                    default        => 'variable',\n                };\n\n                $variable = $context->symbolTable->addTemp($type, $context);\n                $variable->initVariant($context);\n\n                $statement = new LetStatement([\n                    'type'        => 'let',\n                    'assignments' => [\n                        [\n                            'assign-type' => $type,\n                            'variable'    => $variable->getName(),\n                            'operator'    => 'assign',\n                            'expr'        => [\n                                'type'  => $resolvedParam->getType(),\n                                'value' => $resolvedParam->getCode(),\n                                'file'  => $expression['file'],\n                                'line'  => $expression['line'],\n                                'char'  => $expression['char'],\n                            ],\n                            'file'        => $expression['file'],\n                            'line'        => $expression['line'],\n                            'char'        => $expression['char'],\n                        ],\n                    ],\n                ]);\n                $statement->compile($context);\n            } else {\n                /**\n                 * This mark the variable as used.\n                 */\n                $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n            }\n\n            $symbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30817,26 +30570,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 48,
+                  "startLine": 58,
                   "startColumn": 9,
-                  "charOffset": 1261,
-                  "charLength": 957,
+                  "charOffset": 1540,
+                  "charLength": 1701,
                   "snippet": {
-                    "text": "switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                    "text": "if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            $type = match ($resolvedParam->getType()) {\n                Types::T_ARRAY => 'array',\n                default        => 'variable',\n            };\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 48,
+                  "startLine": 58,
                   "startColumn": 1,
-                  "charOffset": 1253,
-                  "charLength": 965,
+                  "charOffset": 1532,
+                  "charLength": 1709,
                   "snippet": {
-                    "text": "        switch ($exprVariable->getType()) {\n            case 'variable':\n                $variableVariable = $compilationContext->symbolTable->getVariableForRead(\n                    $exprVariable->getCode(),\n                    $compilationContext,\n                    $expression\n                );\n                switch ($variableVariable->getType()) {\n                    case 'variable':\n                        break;\n                    default:\n                        throw new CompilerException(\n                            'Variable type: ' . $variableVariable->getType() . ' cannot be used as object',\n                            $propertyAccess['left']\n                        );\n                }\n                break;\n            default:\n                throw new CompilerException(\n                    'Cannot use expression: ' . $exprVariable->getType() . ' as an object',\n                    $propertyAccess['left']\n                );\n        }"
+                    "text": "        if (!$symbolVariable || !$symbolVariable->isVariable()) {\n            /*\n             * Complex expressions require a temporary variable\n             */\n            $type = match ($resolvedParam->getType()) {\n                Types::T_ARRAY => 'array',\n                default        => 'variable',\n            };\n\n            $variable = $context->symbolTable->addTemp($type, $context);\n            $variable->initVariant($context);\n\n            $statement = new LetStatement([\n                'type'        => 'let',\n                'assignments' => [\n                    [\n                        'assign-type' => $type,\n                        'variable'    => $variable->getName(),\n                        'operator'    => 'assign',\n                        'expr'        => [\n                            'type'  => $resolvedParam->getType(),\n                            'value' => $resolvedParam->getCode(),\n                            'file'  => $expression['file'],\n                            'line'  => $expression['line'],\n                            'char'  => $expression['char'],\n                        ],\n                        'file'        => $expression['file'],\n                        'line'        => $expression['line'],\n                        'char'        => $expression['char'],\n                    ],\n                ],\n            ]);\n            $statement->compile($context);\n        } else {\n            /**\n             * This mark the variable as used.\n             */\n            $variable = $context->symbolTable->getVariableForRead($resolvedParam->getCode(), $context, $expression);\n        }\n        $variableSymbol = $context->backend->getVariableCode($variable);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30850,9 +30603,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "b86f2c8f01924e92a9b683c40d0371fd72e37cdd8bc53ace61830c749bcb2f8a"
+            "equalIndicator/v1": "e6a0470cdbc98183bc192f660a183f47ea4753958aedbbc234bfaef753b1ee67"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30873,26 +30625,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
+                  "uri": "src/Passes/CallGathererPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 145,
-                  "startColumn": 9,
-                  "charOffset": 4750,
-                  "charLength": 1230,
+                  "startLine": 193,
+                  "startColumn": 17,
+                  "charOffset": 5356,
+                  "charLength": 422,
                   "snippet": {
-                    "text": "$property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                    "text": "if (FunctionCall::CALL_NORMAL == $expression['call-type']) {\n                    $name = $expression['name'];\n                    if (!isset($this->functionCalls[$name])) {\n                        $this->functionCalls[$name] = 1;\n                    } else {\n                        ++$this->functionCalls[$name];\n                    }\n                }\n                $this->passCall($expression);\n                break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 145,
+                  "startLine": 193,
                   "startColumn": 1,
-                  "charOffset": 4742,
-                  "charLength": 1238,
+                  "charOffset": 5340,
+                  "charLength": 438,
                   "snippet": {
-                    "text": "        $property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                    "text": "                if (FunctionCall::CALL_NORMAL == $expression['call-type']) {\n                    $name = $expression['name'];\n                    if (!isset($this->functionCalls[$name])) {\n                        $this->functionCalls[$name] = 1;\n                    } else {\n                        ++$this->functionCalls[$name];\n                    }\n                }\n                $this->passCall($expression);\n                break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30907,26 +30659,26 @@
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uri": "src/Passes/CallGathererPass.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 147,
-                  "startColumn": 9,
-                  "charOffset": 4778,
-                  "charLength": 1230,
+                  "startLine": 365,
+                  "startColumn": 21,
+                  "charOffset": 11110,
+                  "charLength": 440,
                   "snippet": {
-                    "text": "$property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                    "text": "if (FunctionCall::CALL_NORMAL == $expr['call-type']) {\n                        $name = $expr['name'];\n                        if (!isset($this->functionCalls[$name])) {\n                            $this->functionCalls[$name] = 1;\n                        } else {\n                            ++$this->functionCalls[$name];\n                        }\n                    }\n                    $this->passCall($expr);\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 147,
+                  "startLine": 365,
                   "startColumn": 1,
-                  "charOffset": 4770,
-                  "charLength": 1238,
+                  "charOffset": 11090,
+                  "charLength": 460,
                   "snippet": {
-                    "text": "        $property = $statement['property'];\n        $compilationContext->headersManager->add('kernel/object');\n\n        /**\n         * Create a temporal zval (if needed).\n         */\n        $variableExpr = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n\n        /**\n         * Only string/variable/int.\n         */\n        $offsetExpressions = [];\n        foreach ($statement['index-expr'] as $indexExpr) {\n            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':\n                case 'int':\n                case 'uint':\n                case 'ulong':\n                case 'long':\n                case 'variable':\n                    break;\n                default:\n                    throw new CompilerException(\n                        sprintf(\n                            'Expression: %s cannot be used as index without cast',\n                            $resolvedIndex->getType()\n                        ),\n                        $statement['index-expr']\n                    );\n            }\n\n            $offsetExpressions[] = $resolvedIndex;\n        }"
+                    "text": "                    if (FunctionCall::CALL_NORMAL == $expr['call-type']) {\n                        $name = $expr['name'];\n                        if (!isset($this->functionCalls[$name])) {\n                            $this->functionCalls[$name] = 1;\n                        } else {\n                            ++$this->functionCalls[$name];\n                        }\n                    }\n                    $this->passCall($expr);\n                    break;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30940,9 +30692,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "c297ffead8a798d3eb526d472b3c5f063c68e46328f4bd67f2159b53db037e0c"
+            "equalIndicator/v1": "e9b4ab84d6b7c06820c9badc665723934eda3726bf3903df3ce982bdeda45766"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -30952,37 +30703,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpComposerExtensionStubsInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "'ext-gmp' is specified in 'require-dev' section but used outside of tests",
+            "markdown": "'ext-gmp' is specified in 'require-dev' section but used outside of tests"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/GetClassLowerOptimizer.php",
+                  "uri": "src/Expression/NativeArray.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 54,
-                  "startColumn": 9,
-                  "charOffset": 1352,
-                  "charLength": 579,
+                  "startLine": 30,
+                  "startColumn": 14,
+                  "charOffset": 663,
+                  "charLength": 10,
                   "snippet": {
-                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "gmp_strval"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 54,
+                  "startLine": 28,
                   "startColumn": 1,
-                  "charOffset": 1344,
-                  "charLength": 587,
+                  "charOffset": 592,
+                  "charLength": 87,
                   "snippet": {
-                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "use function function_exists;\nuse function gmp_nextprime;\nuse function gmp_strval;\n\n/**"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -30993,30 +30744,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "049a05b823beab8478b118c172ba7e072274fbf8d0add5c2c4052cd23cc7d7f7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpComposerExtensionStubsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'ext-gmp' is specified in 'require-dev' section but used outside of tests",
+            "markdown": "'ext-gmp' is specified in 'require-dev' section but used outside of tests"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/GetClassNsOptimizer.php",
+                  "uri": "src/Expression/NativeArray.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 54,
-                  "startColumn": 9,
-                  "charOffset": 1373,
-                  "charLength": 579,
+                  "startLine": 29,
+                  "startColumn": 14,
+                  "charOffset": 635,
+                  "charLength": 13,
                   "snippet": {
-                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "gmp_nextprime"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 54,
+                  "startLine": 27,
                   "startColumn": 1,
-                  "charOffset": 1365,
-                  "charLength": 587,
+                  "charOffset": 572,
+                  "charLength": 103,
                   "snippet": {
-                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "use function count;\nuse function function_exists;\nuse function gmp_nextprime;\nuse function gmp_strval;\n"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31027,30 +30799,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c0a927182a2b26135263ba90831205fc01910ea5673dfb4fba8ab3fc77776294"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpComposerExtensionStubsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'ext-gmp' is specified in 'require-dev' section but used outside of tests",
+            "markdown": "'ext-gmp' is specified in 'require-dev' section but used outside of tests"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/GetClassOptimizer.php",
+                  "uri": "src/Expression/NativeArray.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 54,
-                  "startColumn": 9,
-                  "charOffset": 1363,
-                  "charLength": 579,
+                  "startLine": 106,
+                  "startColumn": 33,
+                  "charOffset": 3179,
+                  "charLength": 10,
                   "snippet": {
-                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "gmp_strval"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 54,
+                  "startLine": 104,
                   "startColumn": 1,
-                  "charOffset": 1355,
-                  "charLength": 587,
+                  "charOffset": 3026,
+                  "charLength": 208,
                   "snippet": {
-                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "        $arrayLength = count($expression['left']);\n        if ($arrayLength >= 33 && function_exists('gmp_nextprime')) {\n            $arrayLength = (int)gmp_strval(gmp_nextprime($arrayLength - 1));\n        }\n"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31061,30 +30854,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d6a9bc5e729aab418ad24e473e922ebface7003fdb28b36d83a89b1951120d36"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'in_array($className, ['self', 'static'])' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because 'in_array($className, \\['self', 'static'\\])' is already 'false' at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/GetNsClassOptimizer.php",
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 53,
-                  "startColumn": 9,
-                  "charOffset": 1279,
-                  "charLength": 578,
+                  "startLine": 67,
+                  "startColumn": 21,
+                  "charOffset": 2025,
+                  "charLength": 22,
                   "snippet": {
-                    "text": "$call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "'parent' == $className"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 53,
+                  "startLine": 65,
                   "startColumn": 1,
-                  "charOffset": 1271,
-                  "charLength": 586,
+                  "charOffset": 1911,
+                  "charLength": 292,
                   "snippet": {
-                    "text": "        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/object');\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31098,9 +30912,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "daceb7645de2ce66ffc3380fd5e91089998f247f3c6a0bf1f6021c7b53ab00cb"
+            "equalIndicator/v1": "0dad8a1568e70ddfa502ca49d6d3dc64303009190234ca4be4a4f2b5985e6b2d"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31110,37 +30923,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Condition is always 'true' because '1 != count($expression['parameters'])' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because '1 != count($expression\\['parameters'\\])' is already 'false' at this point"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFile.php",
+                  "uri": "src/Optimizers/FunctionCall/StrtokOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 164,
-                  "startColumn": 9,
-                  "charOffset": 4112,
-                  "charLength": 518,
+                  "startLine": 50,
+                  "startColumn": 13,
+                  "charOffset": 1138,
+                  "charLength": 37,
                   "snippet": {
-                    "text": "$separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                    "text": "1 == count($expression['parameters'])"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 164,
+                  "startLine": 48,
                   "startColumn": 1,
-                  "charOffset": 4104,
-                  "charLength": 526,
+                  "charOffset": 1115,
+                  "charLength": 146,
                   "snippet": {
-                    "text": "        $separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                    "text": "        }\n\n        if (1 == count($expression['parameters'])) {\n            return new CompiledExpression('bool', 'false', $expression);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31151,30 +30964,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0f24f8a2cb526e35900b262beaba75e0332358debfb0bfcee5f6c4d87d933131"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '$statementsBlock' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$statementsBlock' is evaluated at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFileAnonymous.php",
+                  "uri": "src/Class/Property.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 228,
-                  "startColumn": 9,
-                  "charOffset": 6413,
-                  "charLength": 518,
+                  "startLine": 420,
+                  "startColumn": 17,
+                  "charOffset": 12920,
+                  "charLength": 16,
                   "snippet": {
-                    "text": "$separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                    "text": "$statementsBlock"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 228,
+                  "startLine": 418,
                   "startColumn": 1,
-                  "charOffset": 6405,
-                  "charLength": 526,
+                  "charOffset": 12801,
+                  "charLength": 272,
                   "snippet": {
-                    "text": "        $separators = str_repeat('../', count(explode('\\\\', $classDefinition->getCompleteName())) - 1);\n\n        $code = PHP_EOL;\n        $code .= '#ifdef HAVE_CONFIG_H' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext_config.h\"' . PHP_EOL;\n        $code .= '#endif' . PHP_EOL;\n        $code .= PHP_EOL;\n\n        $code .= '#include <php.h>' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'php_ext.h\"' . PHP_EOL;\n        $code .= '#include \"' . $separators . 'ext.h\"' . PHP_EOL;\n        $code .= PHP_EOL;"
+                    "text": "        if ($constructMethod) {\n            $statementsBlock = $constructMethod->getStatementsBlock();\n            if ($statementsBlock) {\n                $statements   = $statementsBlock->getStatements();\n                $letStatement = $this->getLetStatement()->build();"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31188,9 +31022,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "df506eed38ba50eda828a4a252b9c78b9430fb05d68dcc90ac65ce12ab5eb980"
+            "equalIndicator/v1": "1c660a7fdbfe2c48138daf1d50a7d4eede4bf57ad8fdd7cea2b37936d09fee1e"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31200,37 +31033,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Condition is always 'true' because '$returnClassTypes' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$returnClassTypes' is evaluated at this point"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
+                  "uri": "src/MethodCall.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 41,
-                  "startColumn": 9,
-                  "charOffset": 904,
-                  "charLength": 392,
+                  "startLine": 520,
+                  "startColumn": 25,
+                  "charOffset": 23587,
+                  "charLength": 26,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                    "text": "null !== $returnClassTypes"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 41,
+                  "startLine": 518,
                   "startColumn": 1,
-                  "charOffset": 896,
-                  "charLength": 400,
+                  "charOffset": 23490,
+                  "charLength": 269,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                    "text": "                    $returnClassTypes = $method->getReturnClassTypes();\n\n                    if (null !== $returnClassTypes) {\n                        $symbolVariable->setDynamicTypes('object');\n                        foreach ($returnClassTypes as &$returnClassType) {"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31241,30 +31074,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38401ffe61bd8d3a4893709612172af4b998b1ad498b81626a96741a8a5ee4b6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '$interfaces' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$interfaces' is evaluated at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
+                  "uri": "src/Class/Definition/Definition.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 38,
-                  "startColumn": 9,
-                  "charOffset": 879,
-                  "charLength": 392,
+                  "startLine": 507,
+                  "startColumn": 13,
+                  "charOffset": 15428,
+                  "charLength": 21,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                    "text": "is_array($interfaces)"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 38,
+                  "startLine": 505,
                   "startColumn": 1,
-                  "charOffset": 871,
-                  "charLength": 400,
+                  "charOffset": 15362,
+                  "charLength": 140,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (2 != count($expression['parameters'])) {\n            return false;\n        }\n\n        if ('string' == $expression['parameters'][1]['parameter']['type']) {\n            $str = Name::addSlashes($expression['parameters'][1]['parameter']['value']);\n            unset($expression['parameters'][1]);\n        }"
+                    "text": "        $compiler   = $compilationContext->compiler;\n\n        if (is_array($interfaces)) {\n            $codePrinter->outputBlankLine(true);\n"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31278,9 +31132,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "e1dc5f4694fcbd691dc96a462008cbdf13f317264d1ba5f846c6407a43296598"
+            "equalIndicator/v1": "388429471940f618787be53d9cfebb607abe02909473f435a943948b11b4bf8e"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31290,37 +31143,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Condition is always 'false' because ''string' !== $expr['right']['type']' is already 'false' at this point",
+            "markdown": "Condition is always 'false' because ''string' !== $expr\\['right'\\]\\['type'\\]' is already 'false' at this point"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 595,
-                  "startColumn": 41,
-                  "charOffset": 27996,
-                  "charLength": 1312,
+                  "startLine": 880,
+                  "startColumn": 13,
+                  "charOffset": 39362,
+                  "charLength": 35,
                   "snippet": {
-                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "'string' !== $expr['right']['type']"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 595,
+                  "startLine": 878,
                   "startColumn": 1,
-                  "charOffset": 27956,
-                  "charLength": 1352,
+                  "charOffset": 39232,
+                  "charLength": 296,
                   "snippet": {
-                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "        $variableVariable = $compilationContext->symbolTable->getVariableForRead($code, $compilationContext, $expr);\n\n        if ('string' !== $expr['right']['type']) {\n            throw new CompilerException('Right expression of typeof operator must be \"string\" type', $expr['right']);\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31331,30 +31184,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3977286db4a6066e7fd4d14ab1d48b4638e21a50731ebc2d013c1d4d6f5d0211"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '($file = $this->getFile())' is already 'true' at this point",
+            "markdown": "Condition is always 'true' because '($file = $this-\\>getFile())' is already 'true' at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 701,
-                  "startColumn": 41,
-                  "charOffset": 33776,
-                  "charLength": 1312,
+                  "startLine": 33,
+                  "startColumn": 75,
+                  "charOffset": 642,
+                  "charLength": 14,
                   "snippet": {
-                    "text": "$compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "null !== $file"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 701,
+                  "startLine": 31,
                   "startColumn": 1,
-                  "charOffset": 33736,
-                  "charLength": 1352,
+                  "charOffset": 526,
+                  "charLength": 185,
                   "snippet": {
-                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n\n                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n\n                                        if ($variableLeft->isTemporal()) {\n                                            $variableLeft->setIdle(true);\n                                        }\n                                        if ($variableRight->isTemporal()) {\n                                            $variableRight->setIdle(true);\n                                        }\n\n                                        $expected->setDynamicTypes(\n                                            $this->getDynamicTypes($variableLeft, $variableRight)\n                                        );\n\n                                        return new CompiledExpression('variable', $expected->getName(), $expression);"
+                    "text": "        $expression = $this->preBuild();\n\n        if (!isset($expression['file']) && (($file = $this->getFile()) && null !== $file)) {\n            $expression['file'] = $file;\n        }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31368,9 +31242,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "e2ab5b6f5941508f0ba058657d169f316fe00dd42f7b672ac1f6eccef2d0ec30"
+            "equalIndicator/v1": "4284633246736641dcf1c9fb2de1013d73e76a7a19e66f6950d2a7bc4950e35f"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31380,37 +31253,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Condition is always 'true' because ''string' == $type' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because ''string' == $type' is already 'false' at this point"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uri": "src/Backend/Backend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 50,
-                  "startColumn": 9,
-                  "charOffset": 1166,
-                  "charLength": 2877,
+                  "startLine": 910,
+                  "startColumn": 42,
+                  "charOffset": 31749,
+                  "charLength": 15,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "'char' == $type"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 50,
-                  "startColumn": 9,
-                  "charOffset": 1166,
-                  "charLength": 2877,
+                  "startLine": 908,
+                  "startColumn": 1,
+                  "charOffset": 31656,
+                  "charLength": 196,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "            case 'string':\n            case 'char':\n                if ('string' == $type || 'char' == $type) {\n                    $value = '\"' . Name::addSlashes($value) . '\"';\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31421,30 +31294,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5ed3aa85975cc6cf3edb2d91e6d68fa04647682fcf8caaa245cb4bedd60325ea"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'false' because ''variable' !== $symbolVariable->getType()' is already 'false' at this point",
+            "markdown": "Condition is always 'false' because ''variable' !== $symbolVariable-\\>getType()' is already 'false' at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
+                  "uri": "src/Statements/Let/ObjectDynamicStringProperty.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 52,
-                  "startColumn": 9,
-                  "charOffset": 1242,
-                  "charLength": 2877,
+                  "startLine": 78,
+                  "startColumn": 13,
+                  "charOffset": 2183,
+                  "charLength": 40,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "'variable' != $symbolVariable->getType()"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 52,
-                  "startColumn": 9,
-                  "charOffset": 1242,
-                  "charLength": 2877,
+                  "startLine": 76,
+                  "startColumn": 1,
+                  "charOffset": 2160,
+                  "charLength": 161,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "        }\n\n        if ('variable' != $symbolVariable->getType()) {\n            throw CompilerException::cannotUseVariableTypeAs(\n                $symbolVariable,"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31455,30 +31349,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "671ec86619a2aa5c5df6fbb886b6293daf3e2c508cd20cf6b4e8a652ea5fb312"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'CompilationContext $compilationContext' is evaluated at this point",
+            "markdown": "Condition is always 'true' because 'CompilationContext $compilationContext' is evaluated at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uri": "src/SymbolTable.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 52,
-                  "startColumn": 9,
-                  "charOffset": 1231,
-                  "charLength": 2947,
+                  "startLine": 857,
+                  "startColumn": 31,
+                  "charOffset": 30669,
+                  "charLength": 19,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "$compilationContext"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 52,
-                  "startColumn": 9,
-                  "charOffset": 1231,
-                  "charLength": 2947,
+                  "startLine": 855,
+                  "startColumn": 1,
+                  "charOffset": 30541,
+                  "charLength": 266,
                   "snippet": {
-                    "text": "$compiler = $compilationContext->compiler;\n        if (!in_array($className, ['self', 'static', 'parent'])) {\n            $className = $compilationContext->getFullName($className);\n            if ($compiler->isClass($className)) {\n                $classDefinition = $compiler->getClassDefinition($className);\n            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\n                        \"Cannot locate class '\" . $className . \"'\",\n                        $statement\n                    );\n                }\n            }\n        } else {\n            if (in_array($className, ['self', 'static'])) {\n                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();\n                    if (!$extendsClass) {\n                        throw new CompilerException(\n                            'Cannot assign static property \"'\n                            . $property\n                            . '\" on parent because class '\n                            . $classDefinition->getCompleteName()\n                            . ' does not extend any class',\n                            $statement\n                        );\n                    } else {\n                        $classDefinition = $classDefinition->getExtendsClassDefinition();\n                    }\n                }\n            }\n        }\n\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        /** @var Property $propertyDefinition */\n        $propertyDefinition = $classDefinition->getProperty($property);\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition != $compilationContext->classDefinition) {\n                throw new CompilerException(\n                    \"Cannot access private static property '\"\n                    . $classDefinition->getCompleteName()\n                    . '::'\n                    . $property\n                    . \"' out of its declaring context\",\n                    $statement\n                );\n            }\n        }\n\n        $compilationContext->headersManager->add('kernel/object');\n        $classEntry = $classDefinition->getClassEntry($compilationContext);\n        $this->_assignStaticPropertyArrayMultipleIndex(\n            $classEntry,\n            $property,\n            $resolvedExpr,\n            $compilationContext,\n            $statement\n        );"
+                    "text": "    public function markTemporalVariablesIdle(CompilationContext $compilationContext): void\n    {\n        $compilationContext = $compilationContext ?: $this->compilationContext;\n        $branchId           = $compilationContext->branchManager->getCurrentBranchId();\n"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31492,9 +31407,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "e6388c9a408c11b6121122837c3a96fa31789243a4f2e1d0ce1a771dceab2000"
+            "equalIndicator/v1": "6d317f849f5d879c3a0d12f67ea77df90183287fc37478e578935050cfdb906b"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31504,37 +31418,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Variable is always 'true' when reached",
+            "markdown": "Variable is always 'true' when reached"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/TrimOptimizer.php",
+                  "uri": "src/Statements/ForStatement.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 48,
-                  "startColumn": 9,
-                  "charOffset": 1087,
-                  "charLength": 992,
+                  "startLine": 218,
+                  "startColumn": 13,
+                  "charOffset": 7258,
+                  "charLength": 13,
                   "snippet": {
-                    "text": "$charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$duplicateKey"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 48,
+                  "startLine": 216,
                   "startColumn": 1,
-                  "charOffset": 1079,
-                  "charLength": 1000,
+                  "charOffset": 7115,
+                  "charLength": 215,
                   "snippet": {
-                    "text": "        $charlist = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $charlist = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "            isset($this->statement['key']) ? $keyVariable : null,\n            isset($this->statement['value']) ? $variable : null,\n            $duplicateKey,\n            $duplicateHash,\n            $this->statement,"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31545,30 +31459,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7394fb56f9409b60f33e7558f21543ab162557eb1078e8d500d4b33c9c04b249"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '$optimized' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$optimized' is evaluated at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/UncamelizeOptimizer.php",
+                  "uri": "src/Operators/Other/ConcatOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 50,
-                  "startColumn": 9,
-                  "charOffset": 1245,
-                  "charLength": 994,
+                  "startLine": 52,
+                  "startColumn": 13,
+                  "charOffset": 1374,
+                  "charLength": 20,
                   "snippet": {
-                    "text": "$delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "is_array($optimized)"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
                   "startLine": 50,
                   "startColumn": 1,
-                  "charOffset": 1237,
-                  "charLength": 1002,
+                  "charOffset": 1252,
+                  "charLength": 262,
                   "snippet": {
-                    "text": "        $delimiter = 'NULL ';\n        if (2 == count($expression['parameters'])) {\n            if ('null' == $expression['parameters'][1]['parameter']['type']) {\n                unset($expression['parameters'][1]);\n            }\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {\n            $delimiter = $resolvedParams[1];\n        }\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "         */\n        $optimized = $this->_getOptimizedConcat($expression, $compilationContext, $isFullString);\n        if (is_array($optimized)) {\n            if (!$isFullString) {\n                $expected = $this->getExpectedComplexLiteral($compilationContext);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31582,9 +31517,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "ecfe95d185fb897b5b506b22c4bc611675bb9e573263e7a804a9836d4c0361df"
+            "equalIndicator/v1": "77863d2ddf259e8d9d2050e9476c36cd5863c97703b9e573c1326f9f568c9d5b"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31594,37 +31528,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Condition is always 'false' because 'string $url' is evaluated at this point",
+            "markdown": "Condition is always 'false' because 'string $url' is evaluated at this point"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/StaticCall.php",
+                  "uri": "src/Documentation/Template.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 395,
-                  "startColumn": 9,
-                  "charOffset": 15082,
-                  "charLength": 685,
+                  "startLine": 139,
+                  "startColumn": 19,
+                  "charOffset": 3389,
+                  "charLength": 26,
                   "snippet": {
-                    "text": "$compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                    "text": "$url instanceof Definition"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 395,
+                  "startLine": 137,
                   "startColumn": 1,
-                  "charOffset": 15074,
-                  "charLength": 693,
+                  "charOffset": 3328,
+                  "charLength": 202,
                   "snippet": {
-                    "text": "        $compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                    "text": "                return $url;\n            }\n        } elseif ($url instanceof Definition) {\n            return $this->url(Documentation::classUrl($url));\n        } elseif ($url instanceof CompilerFile) {"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31635,7 +31569,138 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "79d9951aa4c024f9d8130d757c11687fb492b15d6f47dd4fb1c500985970d5ee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'isset($expression['parameters'])' is already 'true' at this point",
+            "markdown": "Condition is always 'true' because 'isset($expression\\['parameters'\\])' is already 'true' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 590,
+                  "startColumn": 68,
+                  "charOffset": 26199,
+                  "charLength": 32,
+                  "snippet": {
+                    "text": "isset($expression['parameters'])"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 588,
+                  "startColumn": 1,
+                  "charOffset": 25998,
+                  "charLength": 385,
+                  "snippet": {
+                    "text": "            // We check here if a correct parameter type is passed to the called method\n            if (self::CALL_NORMAL == $type) {\n                if (isset($method) && $method instanceof Method && isset($expression['parameters'])) {\n                    $resolvedTypes        = $this->getResolvedTypes();\n                    $resolvedDynamicTypes = $this->getResolvedDynamicTypes();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7a52360a65c3cd25bf00bc8faedde0ca4697d18c5ca8cd21b0c35337d31be469"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '!$pattern' is already 'false' at this point",
+            "markdown": "Condition is always 'true' because '!$pattern' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2244,
+                  "startColumn": 37,
+                  "charOffset": 74244,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$pattern"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2242,
+                  "startColumn": 1,
+                  "charOffset": 74072,
+                  "charLength": 377,
+                  "snippet": {
+                    "text": "                    $this->recursiveProcess($pathName, $dest . DIRECTORY_SEPARATOR . $fileName, $pattern, $callback);\n                }\n            } elseif (!$pattern || ($pattern && 1 === preg_match($pattern, $fileName))) {\n                $path    = $dest . DIRECTORY_SEPARATOR . $fileName;\n                $success = $success && call_user_func($callback, $pathName, $path);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "864f8e68dcc0aea431f21286a8c86ee02d0cfe38da9e6775a12adad119d03426"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'Method $method' is evaluated at this point",
+            "markdown": "Condition is always 'true' because 'Method $method' is evaluated at this point"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
@@ -31643,22 +31708,78397 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 773,
-                  "startColumn": 9,
-                  "charOffset": 30753,
-                  "charLength": 685,
+                  "startLine": 784,
+                  "startColumn": 64,
+                  "charOffset": 31192,
+                  "charLength": 7,
                   "snippet": {
-                    "text": "$compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                    "text": "$method"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 773,
+                  "startLine": 782,
                   "startColumn": 1,
-                  "charOffset": 30745,
-                  "charLength": 693,
+                  "charOffset": 31034,
+                  "charLength": 198,
                   "snippet": {
-                    "text": "        $compilationContext->symbolTable->mustGrownStack(true);\n\n        if ($mustInit) {\n            $symbolVariable->setMustInitNull(true);\n            $symbolVariable->trackVariant($compilationContext);\n        }\n\n        /**\n         * Check if the  method call can have an inline cache.\n         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];\n        if (isset($expression['parameters']) && count($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }"
+                    "text": "         */\n        $methodCache  = $compilationContext->cacheManager->getStaticMethodCache();\n        $cachePointer = $methodCache->get($compilationContext, $method ?? null);\n\n        $params = [];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8c9d01ea1fc4796b0d89558906772b01b1df3a359a05c1b276f7e0c79891bcb5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'false' because '!$symbolVariable->isVariable()' is already 'false' at this point",
+            "markdown": "Condition is always 'false' because '!$symbolVariable-\\>isVariable()' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectDynamicProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 80,
+                  "startColumn": 13,
+                  "charOffset": 2326,
+                  "charLength": 30,
+                  "snippet": {
+                    "text": "!$symbolVariable->isVariable()"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 78,
+                  "startColumn": 1,
+                  "charOffset": 2303,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "        }\n\n        if (!$symbolVariable->isVariable()) {\n            throw CompilerException::cannotUseVariableTypeAs(\n                $symbolVariable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "94d561c5c6762611b0ca8923dea691d95ecb35765da25041aa6b575803e32f9e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'false' because '!$symbolVariable->isVariable()' is already 'false' at this point",
+            "markdown": "Condition is always 'false' because '!$symbolVariable-\\>isVariable()' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 78,
+                  "startColumn": 13,
+                  "charOffset": 2020,
+                  "charLength": 30,
+                  "snippet": {
+                    "text": "!$symbolVariable->isVariable()"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 76,
+                  "startColumn": 1,
+                  "charOffset": 1997,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "        }\n\n        if (!$symbolVariable->isVariable()) {\n            throw new Exception(\n                \"Cannot use variable type: {$symbolVariable->getType()} as an object\","
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a10062e73e26e436a8ba0d5f60b4f5c922f9bc01969a3f9890528f0638c62473"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '($line = $this->getLine())' is already 'true' at this point",
+            "markdown": "Condition is always 'true' because '($line = $this-\\>getLine())' is already 'true' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 75,
+                  "charOffset": 787,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "null !== $line"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 702,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "        }\n\n        if (!isset($expression['line']) && (($line = $this->getLine()) && null !== $line)) {\n            $expression['line'] = $line;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a1aa7ff735f189adb49b5ef022b368baa6bd7fc951fa027adc53bdb4a346eaf9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'string $url' is evaluated at this point",
+            "markdown": "Condition is always 'true' because 'string $url' is evaluated at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 133,
+                  "startColumn": 13,
+                  "charOffset": 3168,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "is_string($url)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 131,
+                  "startColumn": 1,
+                  "charOffset": 3105,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "    public function url(string $url): string\n    {\n        if (is_string($url)) {\n            if ('/' == $url[0]) {\n                return $this->getPathToRoot() . ltrim($url, '/');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a30521646e25186b820c1c400e05b20589e14a2b4336f4e4f44b8ae2be54c276"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '$returnTypes' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$returnTypes' is evaluated at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 529,
+                  "startColumn": 25,
+                  "charOffset": 24069,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "null !== $returnTypes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 527,
+                  "startColumn": 1,
+                  "charOffset": 23982,
+                  "charLength": 261,
+                  "snippet": {
+                    "text": "\n                    $returnTypes = $method->getReturnTypes();\n                    if (null !== $returnTypes) {\n                        foreach ($returnTypes as $dataType => $returnType) {\n                            $symbolVariable->setDynamicTypes($dataType);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a8b7e1097ee9f41758488e08a5489857c9a70baa81d62ae57f5ff33b930e3d2b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '($char = $this->getChar())' is already 'true' at this point",
+            "markdown": "Condition is always 'true' because '($char = $this-\\>getChar())' is already 'true' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 75,
+                  "charOffset": 932,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "null !== $char"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 847,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "        }\n\n        if (!isset($expression['char']) && (($char = $this->getChar()) && null !== $char)) {\n            $expression['char'] = $char;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ad48c9361966c66aa5138ab7a732eadd559adddf3e7129f3882241bb27024b59"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because '$this->compiler' is evaluated at this point",
+            "markdown": "Condition is always 'true' because '$this-\\>compiler' is evaluated at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Definition/Definition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 891,
+                  "startColumn": 70,
+                  "charOffset": 29502,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$this->compiler"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 889,
+                  "startColumn": 1,
+                  "charOffset": 29358,
+                  "charLength": 276,
+                  "snippet": {
+                    "text": "    public function getExtendsClassDefinition(): ?AbstractDefinition\n    {\n        if (!$this->extendsClassDefinition && $this->extendsClass && $this->compiler) {\n            $this->setExtendsClassDefinition($this->compiler->getClassDefinition($this->extendsClass));\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b2f20b7f6b9de44a36ca535e5554d0d531b56f1306003820e6c1690ece805748"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'false' because '$url instanceof Definition' is already 'false' at this point",
+            "markdown": "Condition is always 'false' because '$url instanceof Definition' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 141,
+                  "startColumn": 19,
+                  "charOffset": 3499,
+                  "charLength": 28,
+                  "snippet": {
+                    "text": "$url instanceof CompilerFile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 139,
+                  "startColumn": 1,
+                  "charOffset": 3371,
+                  "charLength": 253,
+                  "snippet": {
+                    "text": "        } elseif ($url instanceof Definition) {\n            return $this->url(Documentation::classUrl($url));\n        } elseif ($url instanceof CompilerFile) {\n            return $this->url(Documentation::classUrl($url->getClassDefinition()));\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b9e35e67ac63309e6941d527fde15595bec11bddc081629c8e5c892ab511e4eb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'false' because '$classInterfaceDefinition' is evaluated at this point",
+            "markdown": "Condition is always 'false' because '$classInterfaceDefinition' is evaluated at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 220,
+                  "startColumn": 41,
+                  "charOffset": 7957,
+                  "charLength": 26,
+                  "snippet": {
+                    "text": "!$classInterfaceDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 218,
+                  "startColumn": 1,
+                  "charOffset": 7736,
+                  "charLength": 428,
+                  "snippet": {
+                    "text": "                                if (!$classInterfaceDefinition) {\n                                    $classInterfaceDefinition = $compiler->getInternalClassDefinition($interface);\n                                    if (!$classInterfaceDefinition) {\n                                        throw new CompilerException(\n                                            \"Couldn't locate internal or external interface: \" . $interface,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bdaa8eeb0313b38bc02f51e80e24dd19bb78e745a2ba1239fd4402fa653dbae7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable already equals the assigned value",
+            "markdown": "Variable already equals the assigned value"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 208,
+                  "startColumn": 25,
+                  "charOffset": 6949,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "$duplicateKey = true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 206,
+                  "startColumn": 1,
+                  "charOffset": 6746,
+                  "charLength": 264,
+                  "snippet": {
+                    "text": "                    $detector->setDetectionFlags(WriteDetector::DETECT_ALL);\n                    if ($detector->detect($keyVariable->getName(), $this->statement['statements'])) {\n                        $duplicateKey = true;\n                    }\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bfbafd065bedcb62fdefe936f341c366d9868c57fa861205057e1c8b0bb5ddc1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'true' because 'is_string($url)' is already 'true' at this point",
+            "markdown": "Condition is always 'true' because 'is_string($url)' is already 'true' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 136,
+                  "startColumn": 23,
+                  "charOffset": 3309,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "is_string($url)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 3187,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "            if ('/' == $url[0]) {\n                return $this->getPathToRoot() . ltrim($url, '/');\n            } elseif (is_string($url)) {\n                return $url;\n            }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c86cfd8ad97a38eaa1bcf974efc06d210d0f2262cac82c820632261a03ba22a5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'false' because '!$symbolVariable->isInitialized()' is already 'false' at this point",
+            "markdown": "Condition is always 'false' because '!$symbolVariable-\\>isInitialized()' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 67,
+                  "startColumn": 13,
+                  "charOffset": 1683,
+                  "charLength": 33,
+                  "snippet": {
+                    "text": "!$symbolVariable->isInitialized()"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 65,
+                  "startColumn": 1,
+                  "charOffset": 1600,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "        $className    = $context->classDefinition->getCompleteName();\n\n        if (!$symbolVariable->isInitialized()) {\n            throw new Exception(\n                sprintf("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d0d335f73984a0d633455a281e445a0127d5b381ae5a79d1cb364d6f6b5a6b9e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is always 'false' because '$interface || $class' is already 'false' at this point",
+            "markdown": "Condition is always 'false' because '$interface \\|\\| $class' is already 'false' at this point"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 336,
+                  "startColumn": 25,
+                  "charOffset": 10781,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$interface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 334,
+                  "startColumn": 1,
+                  "charOffset": 10693,
+                  "charLength": 249,
+                  "snippet": {
+                    "text": "                case 'class':\n                case 'interface':\n                    if ($interface || $class) {\n                        throw new CompilerException('More than one class defined in the same file', $topStatement);\n                    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "df38aaded1e7868c6165c4ecc93d46d3c36431685112a72b02c4dd6276bbc507"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionCheckedByNextConditionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is unnecessary because it is checked by 'empty($resolvedParams[0])'",
+            "markdown": "Condition is unnecessary because it is checked by 'empty($resolvedParams\\[0\\])'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GlobalsSetOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 72,
+                  "startColumn": 17,
+                  "charOffset": 2156,
+                  "charLength": 26,
+                  "snippet": {
+                    "text": "!isset($resolvedParams[0])"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 70,
+                  "startColumn": 1,
+                  "charOffset": 2023,
+                  "charLength": 354,
+                  "snippet": {
+                    "text": "            $resolvedParams   = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n            if (!isset($resolvedParams[0]) || empty($resolvedParams[0]) || !is_string($resolvedParams[0])) {\n                throw new CompilerException(\n                    \"Unable to reslove value for '{$globalName}' global variable.\","
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1f82d5cc19e4d793a204a7f33ca3c060f6bd639fa29c63662d11b8efcc790032"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpConditionCheckedByNextConditionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Condition is unnecessary because it is checked by '$expr instanceof self'",
+            "markdown": "Condition is unnecessary because it is checked by '$expr instanceof self'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 160,
+                  "startColumn": 13,
+                  "charOffset": 2965,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "is_object($expr)"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 158,
+                  "startColumn": 1,
+                  "charOffset": 2942,
+                  "charLength": 112,
+                  "snippet": {
+                    "text": "        }\n\n        if (is_object($expr) && $expr instanceof self) {\n            return $expr->build();\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "40d0b747a1f8e7c33d39dd31021acb642bcd03ec2203fdc91eb625ec985aab8c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'recursiveProcess' is deprecated",
+            "markdown": "Method 'recursiveProcess' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1968,
+                  "startColumn": 30,
+                  "charOffset": 66115,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "recursiveProcess"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1966,
+                  "startColumn": 1,
+                  "charOffset": 66016,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "        $sourceKernelPath = $this->backend->getInternalKernelPath();\n\n        $configured = $this->recursiveProcess(\n            $sourceKernelPath,\n            $kernelPath,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1cd442023a7c37ae8ea06e3282909b227ef672858b9cf12d67b5e4648d3f9e9b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'recursiveProcess' is deprecated",
+            "markdown": "Method 'recursiveProcess' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2242,
+                  "startColumn": 28,
+                  "charOffset": 74099,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "recursiveProcess"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2240,
+                  "startColumn": 1,
+                  "charOffset": 73966,
+                  "charLength": 331,
+                  "snippet": {
+                    "text": "                        mkdir($dest . DIRECTORY_SEPARATOR . $fileName, 0755, true);\n                    }\n                    $this->recursiveProcess($pathName, $dest . DIRECTORY_SEPARATOR . $fileName, $pattern, $callback);\n                }\n            } elseif (!$pattern || ($pattern && 1 === preg_match($pattern, $fileName))) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "252ada7d3408a1cb2ec19b7bd7460107465f978bcb5e33294d36ab0e8db809ca"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'renderPhalconCompatible' is deprecated",
+            "markdown": "Method 'renderPhalconCompatible' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Code/ArgInfoDefinition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 20,
+                  "charOffset": 1247,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "renderPhalconCompatible"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1187,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    public function render(): void\n    {\n        if ($this->renderPhalconCompatible()) {\n            $this->codePrinter->outputBlankLine();\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4c1775a966d925e1d6e9b5220d7813211525ab3d1fb9816301abbdc84bad3eeb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'getParserManager' is deprecated",
+            "markdown": "Method 'getParserManager' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 484,
+                  "startColumn": 34,
+                  "charOffset": 15856,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "getParserManager"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 482,
+                  "startColumn": 1,
+                  "charOffset": 15766,
+                  "charLength": 263,
+                  "snippet": {
+                    "text": "\n        if (!$this->filesystem->exists($compilePath)) {\n            $parser = $compiler->getParserManager()->getParser();\n            $ir     = $parser->parse($zepRealPath);\n            $this->filesystem->write($compilePath, json_encode($ir, JSON_PRETTY_PRINT));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4deb1c011c79042e9c0c3fd7702c7d962b7a6ed5ae004484fd1c28d80d283808"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'recursiveDeletePath' is deprecated",
+            "markdown": "Method 'recursiveDeletePath' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1977,
+                  "startColumn": 20,
+                  "charOffset": 66379,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "recursiveDeletePath"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1975,
+                  "startColumn": 1,
+                  "charOffset": 66267,
+                  "charLength": 197,
+                  "snippet": {
+                    "text": "        if (!$configured) {\n            $this->logger->info('Cleaning old kernel files...');\n            $this->recursiveDeletePath($kernelPath, '@^.*\\.[lcho]$@');\n\n            @mkdir($kernelPath);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8e50c6ad69f00cc80ac7379ee300a83c5093403a38a385cc96bba12ec6128aa4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'removeMemoryStackReferences' is deprecated",
+            "markdown": "Method 'removeMemoryStackReferences' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Method/Method.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1413,
+                  "startColumn": 24,
+                  "charOffset": 54430,
+                  "charLength": 27,
+                  "snippet": {
+                    "text": "removeMemoryStackReferences"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1411,
+                  "startColumn": 1,
+                  "charOffset": 54310,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "         * Remove macros that grow/restore the memory frame stack if it wasn't used.\n         */\n        $code = $this->removeMemoryStackReferences($symbolTable, $codePrinter->getOutput());\n\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c51843a3eb4468bc75886e47e9da55264883570ae0afa8173462d5d565abd79b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDeprecationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method 'recursiveProcess' is deprecated",
+            "markdown": "Method 'recursiveProcess' is deprecated"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1982,
+                  "startColumn": 20,
+                  "charOffset": 66549,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "recursiveProcess"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1980,
+                  "startColumn": 1,
+                  "charOffset": 66465,
+                  "charLength": 160,
+                  "snippet": {
+                    "text": "\n            $this->logger->info('Copying new kernel files...');\n            $this->recursiveProcess($sourceKernelPath, $kernelPath, '@^.*\\.[ch]$@');\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f77d88b86ea86baf1a1b13e74d6cdf790f7f51437c255b0139c8e1a5c64398ac"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 193,
+                  "startColumn": 8,
+                  "charOffset": 5325,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 191,
+                  "startColumn": 1,
+                  "charOffset": 5277,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws CompilerException\n     */\n    protected function _callDynamic(array $expression, CompilationContext $compilationContext)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0729faf7e3ba9ca0bb81e58ad4778e6d18551d990711e94c73f3a94bfb525274"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/DoublevalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 824,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 765,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "08be9382087826f6a83d44d2dd0fff88d28f577fac85fe2b8c2a006d76961d3d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateArrayOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 844,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 790,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0a42d921798473de00cf4fe5330ed68dd35609e492864d3b07075247d8d8bf32"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FloorOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 812,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 753,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0a7b12367aebdebab3c312b61ae1c479e014460c3ebeea0a405e944e57a6cc16"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MergeAppendOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 831,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 772,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0d2bf055a22460901a267507d7d1cc36dbe451b957b31da263bc219dd3b3163d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FunctionExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 6,
+                  "charOffset": 777,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 720,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0ec1d61b106fcfc86bec53ef32d62b98c2395376b158b5ca63143d2f3688a9fd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/TernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 6,
+                  "charOffset": 746,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 700,
+                  "charLength": 155,
+                  "snippet": {
+                    "text": "     *\n     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext): CompiledExpression\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0ec389123446d0c9d366ec94c022ad8f3b25596ab0a21ee0c99e7f691d96a645"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ClassExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 831,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 772,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "151777ee715691003478056d8bd0ad8242746bac565d1e8a95fb6d1a253bd8f7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FeofOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 760,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 703,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "155b09349935b1d65a82920a0b32c53bfdc5aaad275988e2cc6174b37824df49"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonEncodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 592,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 534,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "class JsonEncodeOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1d0a82b384c2800c8b9370d4c5ded6460afb89d69ea65f7b8c2ed4fc2948abea"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 661,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 616,
+                  "charLength": 146,
+                  "snippet": {
+                    "text": "    protected bool $literalOnly = true;\n\n    /**\n     * @param array              $expression\n     * @param CompilationContext $compilationContext"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1d89b784899130af7d3ede3ddb245ca925b5789c4a5eded64bdfe42a690dbf97"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 5,
+                  "charOffset": 667,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 609,
+                  "charLength": 121,
+                  "snippet": {
+                    "text": "    protected string $zvalOperator = 'div_function';\n\n    /**\n     * Compiles the arithmetical division operation.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "20ff1cf69dcf3a7a714c98b74368ed325e61344fdc7623064eccd6f001bdfdb6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileGetContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 844,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 785,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2289e9fefcb246fd500222db8a9c61f5218cb6d70b832c495f98da621a919f49"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 114,
+                  "startColumn": 8,
+                  "charOffset": 3330,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 112,
+                  "startColumn": 1,
+                  "charOffset": 3283,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     *\n     * @throws CompilerException\n     * @throws Exception\n     */\n    protected function _assignArrayIndexMultiple("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "22b43d80fb0d6cc07d2d92dea4db3efb3481139fe3f5732f11234e664d6cae18"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsScalarOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 6,
+                  "charOffset": 833,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 776,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "24c26d75109d7d5c3689420009befeadd90646f798dc423e6c0bd1ae626a607f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/HashEqualsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 828,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 769,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2578aaf42ba132e23d9b5187f6466afed7ddd316469c25284bd3b9a1709fa588"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 438,
+                  "startColumn": 8,
+                  "charOffset": 14121,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 436,
+                  "startColumn": 1,
+                  "charOffset": 14054,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "     * @param FunctionDefinition $functionDefinition\n     *\n     * @throws Exception\n     */\n    public function compileFunction("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2b674659d839e1704dc895709c1901e6798e9ac6cbc004118b6486c0b4fa9974"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/RequireStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 8,
+                  "charOffset": 652,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 585,
+                  "charLength": 174,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     *\n     * @throws CompilerException\n     */\n    public function compile(CompilationContext $compilationContext): void"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2c91cdf21f442ff07641ae6c1007c9a0e915950f335a3758c6922d0d3f6b0107"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/RangeExclusiveOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 8,
+                  "charOffset": 775,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 727,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws Exception\n     */\n    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "32bbf36676d21c46a81859683337144956cb300b5ac1b072c8d43ed97d530786"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 8,
+                  "charOffset": 828,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 780,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws Exception\n     */\n    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "32d5962766eef7e286113895c8849523b0fa16dc711fb239d88d5faf2db4a7a3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/RangeInclusiveOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 8,
+                  "charOffset": 753,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 705,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws Exception\n     */\n    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "35f079cbd44f3b0d014f8928cc30251c9987a57469e465d9521f45f4da08aa05"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 622,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 567,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "class VarDumpOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38eebf89a49cf9302f98cd35e75df7764ff0e4f89f805fbc1ed3a51d97596330"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 6,
+                  "charOffset": 798,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 741,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3fb84a983617529c01bcae73fb5b7a74e33119338e860d50e7ab095aee973f04"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ShortTernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 5,
+                  "charOffset": 738,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 680,
+                  "charLength": 101,
+                  "snippet": {
+                    "text": "class ShortTernaryOperator extends AbstractOperator\n{\n    /**\n     * Compile ternary operator.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "410d89eafd6614fc9b8da4d11597cff4bed106052d6b66fc5d2660872dd3ca97"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/EmptyOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 8,
+                  "charOffset": 740,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 692,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws Exception\n     */\n    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4167d5d8cbef870d66d7efc87a548a41978d1acbc4a1e149ed9fa1f797c83eec"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 843,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 784,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "43fb4ab17aeb03db83a7fa98e26c891fcbafa583bfe89f1a83265379b006ca53"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsScalarOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 5,
+                  "charOffset": 646,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 590,
+                  "charLength": 143,
+                  "snippet": {
+                    "text": "class IsScalarOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "452d2982440e7bf80ccf1418dd851d02ee2ef885d6bb01d0a893385210aba44d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 809,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 752,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "49e34c13eaca0e57522e4694bdd94843b0a8d1301acebcf8c085d195fea52cf6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 822,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 763,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a4634fa7563353babf5c312546b63f02b09c54971537b525a536ee0276db557"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 133,
+                  "startColumn": 6,
+                  "charOffset": 4396,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 131,
+                  "startColumn": 1,
+                  "charOffset": 4294,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     * @param array              $statement\n     */\n    protected function _assignStaticPropertyArrayMultipleIndex(\n        $classEntry,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4bfc75d2aed1377b5f6e41ac9207ae8ef240c650300c74b6c9984927aca2b60d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/EvalExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 84,
+                  "startColumn": 8,
+                  "charOffset": 1774,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 82,
+                  "startColumn": 1,
+                  "charOffset": 1733,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "     * @return bool|string\n     *\n     * @throws Exception\n     */\n    public function optimize($exprRaw, CompilationContext $compilationContext)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4eccae0b3b6ea0d10e3930574f6a1265dbaa593e28fddfa0aab21c1e0a19487c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ImplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 8,
+                  "charOffset": 811,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 752,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4fefbc043632539b11dc05def349b173ff2063341ada8cae2c7ba0cdfb68ba87"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CeilOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 809,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 750,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4fff0b619641159030c1dd0492d20b74f5004e1aaeb66c67d9d4676b33d75635"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 8,
+                  "charOffset": 987,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 929,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "     * @param array              $statement\n     *\n     * @throws CompilerException\n     */\n    public function assign("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "552baba5ed3760578d7c00685a48538ade20e1f57bbfd1ea0b238db00a0aaff6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 838,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 779,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5a30aa6e632aa480dec197d6ac06b3e1c4cdf0482c40cd973b9189762bff7cbf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/TernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 5,
+                  "charOffset": 558,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 505,
+                  "charLength": 96,
+                  "snippet": {
+                    "text": "class TernaryOperator extends AbstractOperator\n{\n    /**\n     * Compile ternary operator.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5b0286bbbdfba46a254ed0989823ed3107d3057e75077c110b216179e21dd6d4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CountOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 763,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 706,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5b071f820049b16f9b24a28bff8561496c9060f347b2da5f47f51ee6c089549b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 844,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 785,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5f306534d0c4104810eb4bdbf177661218ebfb6f1e4b957059e1f1735915ff1e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CountOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 576,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 523,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "class CountOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "613e1306b9ea08cb55d9504aff40f01f698120dcca762f3bef863f25cb4d5bf7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/WhileStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 6,
+                  "charOffset": 568,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 502,
+                  "charLength": 148,
+                  "snippet": {
+                    "text": "    /**\n     * @param CompilationContext $compilationContext\n     */\n    public function compile(CompilationContext $compilationContext): void\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "665de0a1d8e6686eaf25921881f4799d98e668fc72b86a5d638e46f198359aad"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ShortTernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 6,
+                  "charOffset": 926,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 880,
+                  "charLength": 155,
+                  "snippet": {
+                    "text": "     *\n     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext): CompiledExpression\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "69ea4a228976e4da17d3d7d3b8b22b3b8ef43ed73b9b58eaed9608ae923c52ab"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrposOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 815,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 756,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6ab95cf40b98d90d588e3a1cb89fc016df718f8fac6ebe7e865e65a4972fdaf7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/LdexpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 8,
+                  "charOffset": 851,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 792,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6b5ea4c36081ba59df9a101808e9a791e8ebd125b99b4a9b3dbd323bc4b9e9da"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 6,
+                  "charOffset": 1020,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 974,
+                  "charLength": 135,
+                  "snippet": {
+                    "text": "     *\n     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6da1587f194bf4702c5f8f228d5640acf55c13a63019042eaaabb1fa57bd859f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 5,
+                  "charOffset": 810,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 753,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "    protected bool      $readOnly          = false;\n\n    /**\n     * Resolves the access to a property in an object.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "70a81cd040f59ce3689c975096eb83872325a00eaf21634934ee1ca8c26e3613"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsNumericOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 776,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 719,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "746330f2a4301c2c233574971f2f475000f325aac7927a030cb904931b65d0f1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsNumericOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 589,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 532,
+                  "charLength": 144,
+                  "snippet": {
+                    "text": "class IsNumericOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "74943ca86c8041736e65cc2e1c38186534ade1c3b9e0806e81c65025cda86f58"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 6,
+                  "charOffset": 857,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 754,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "     * @param array              $expression\n     * @param CompilationContext $compilationContext\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "754dbc94363d38f45c87f45fb4f82a086627150b12e8a0473d48aa4f48f03591"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 691,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 633,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "    protected string $zvalOperator = 'mod_function';\n\n    /**\n     * Compiles the arithmetical modulus operation.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "75e62e374d3fea75847d5d59ee4329e98c649b2008784617b53b36c9a4e584f9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Call.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 615,
+                  "startColumn": 8,
+                  "charOffset": 25943,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 613,
+                  "startColumn": 1,
+                  "charOffset": 25888,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression[]|null\n     *\n     * @throws Exception\n     */\n    public function getResolvedParamsAsExpr("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7795aa14cc67fb22c77232cf37ddb672f6671a321b25c2d4ef3056c09c74c12a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateInstanceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 8,
+                  "charOffset": 980,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 926,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "77e7fcc78f890e79f71c88470caf6d04eaa97faa898a53ac057b964824346b27"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 5,
+                  "charOffset": 777,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 728,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "    protected bool      $readOnly  = false;\n\n    /**\n     * Resolves the access to a property in an object.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7848d1ee31f2b2f1baf758c90eb6b9880e3e930a55965fa8b06cfae9272a4f98"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 8,
+                  "charOffset": 865,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 811,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "     *\n     * @return false|CompiledExpression\n     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "78eddea99c8607b2c1bc8adcba0d8844a91b04c41603bc4e0afa06a2c64b1566"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonEncodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 779,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 722,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "78fdc2bd331f66bf252225d8a78e4cbb9775b417c404b963031f0f72a3a68e21"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonDecodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 779,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 722,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7bd113c27b96482b549fea34d5c759c841e973aa1f8fd56ba0e513de3fa44305"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsCallableOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 592,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 534,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "class IsCallableOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7d043e1920c7324655c646fef7401b05b294cbff4ca05c3bedf11ca093fab6c2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 125,
+                  "startColumn": 5,
+                  "charOffset": 4080,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 123,
+                  "startColumn": 1,
+                  "charOffset": 4069,
+                  "charLength": 89,
+                  "snippet": {
+                    "text": "    }\n\n    /**\n     * Compiles x::y[a][b][] = {expr} (multiple offset assignment).\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7e5915bbda776cedf36100ef03f93269aba3469237526a450983a4040590025f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/EndsWithOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 6,
+                  "charOffset": 886,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 829,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "849f87c1fc8c53757a7589e2cdcdb35179ced2fccfa27c8aea00672a72d40294"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrlenOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 766,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 709,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "86f64ea5971058a044c4bfe4ad0b0caefc78fcd320bc4d18e6efca115e3811f9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 5,
+                  "charOffset": 586,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 526,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "class MethodExistsOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8a05bcc7fdf620fe0f2e8f0c562a8bf463acac9eb305126bba682cd13f0c9310"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 859,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 805,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8e31c33859b2a8bb0159c6ecb1f1a22cb11176c0439ade9d0ba42425a8df34cc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 827,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 768,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8e4abed6f377b6b948fd7da2596466bf5d625d377494a29fcea8556932ebeab6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsCallableOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 6,
+                  "charOffset": 779,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 722,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "91875889ace43a7c6102b9ca830fd1188701951c7ccc24097cfbf7ac40c72229"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/RoundOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 8,
+                  "charOffset": 895,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 836,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "93dd438c9226517b4aa6342c27a64a026c102216c114b7294728bcd9b4cbd8f2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CompareMtimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 834,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 775,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "942d34097e5ab85fd529a4894e3193dc80be9898e08959dc68ceeee94535b13a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CamelizeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 8,
+                  "charOffset": 998,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 939,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9508e8ab1403447d365c6cbbf1eeaa59844ac787cc477b42dae48d22923a7d70"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrReplaceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 828,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 769,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "95d455bf20538a918287d681dfa61a4cb2f1d286d89e3ce782d28d7888db5104"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/EndsWithOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 33,
+                  "startColumn": 5,
+                  "charOffset": 699,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 31,
+                  "startColumn": 1,
+                  "charOffset": 631,
+                  "charLength": 155,
+                  "snippet": {
+                    "text": "    protected string $zephirMethodStr = 'zephir_end_with_str';\n\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9925bb90e9278460756e22b943d5d48532b174a113389547dd8760ad21bad4d2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MicrotimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 824,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 765,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9acecb4cb59756e4dd9289876e3be135d9ff34ca74e44399d296c53ca678bba7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IntvalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 815,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 756,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9f25355b26a69f4ce215c3e76d2531db80bc549c94b66c52366a837b02fee8db"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 182,
+                  "startColumn": 8,
+                  "charOffset": 5418,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 180,
+                  "startColumn": 1,
+                  "charOffset": 5360,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "     * @param array              $statement\n     *\n     * @throws CompilerException\n     */\n    protected function _assignArrayIndexSingle("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a3d5302be73057b5458f2ed360040494865679a5d827846b46af50fa7c993cb0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 5,
+                  "charOffset": 2394,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 2383,
+                  "charLength": 77,
+                  "snippet": {
+                    "text": "    }\n\n    /**\n     * Compiles foo[y][x][] = {expr} (multiple offset).\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a591fc97230359389b2c6ee12057c8eb3bb84cf9bb42bdc4a3bb7695d4886090"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 6,
+                  "charOffset": 773,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 716,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a5d51c514f033852d17bc84c80fa6ef01ff9fa87271d65e521b1107b4a9da0c6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 6,
+                  "charOffset": 987,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 941,
+                  "charLength": 135,
+                  "snippet": {
+                    "text": "     *\n     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a9121c4123dbc4029225c1bfa38edecc6e2fc9cf4c1477e0680e9dd03bac15e0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 8,
+                  "charOffset": 724,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 665,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ab051579427f1ae6fa70bab9b5efa42d4725413fa5bf71c44463e6e5979057d7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 99,
+                  "startColumn": 8,
+                  "charOffset": 2671,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 97,
+                  "startColumn": 1,
+                  "charOffset": 2613,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "     * @param array              $statement\n     *\n     * @throws CompilerException\n     */\n    protected function _assignPropertyArrayMultipleIndex("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ab34bf5d86c1359b1cf834425fb44e648fd8d444251b53940a27ee3b9570224e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonDecodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 592,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 534,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "class JsonDecodeOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b05ec121bb0cc36ba2c8adaaaeb6528f6a301f2df0248b6162811d63d7996552"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/NewInstanceTypeOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 8,
+                  "charOffset": 928,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 880,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws CompilerException\n     */\n    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b198fdb31f56e1500be8729167e732d5c0fdddacfc1bee148a1e7703dbed1bef"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/WhileStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 5,
+                  "charOffset": 506,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 453,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "class WhileStatement extends StatementAbstract\n{\n    /**\n     * @param CompilationContext $compilationContext\n     */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b1c4035aab3e3c49e7717873656fa6a6b8d3f920751cabe0a9d677b1ffccb9f4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 269,
+                  "startColumn": 8,
+                  "charOffset": 8819,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 267,
+                  "startColumn": 1,
+                  "charOffset": 8760,
+                  "charLength": 178,
+                  "snippet": {
+                    "text": "     * @param StringsManager $stringsManager\n     *\n     * @throws CompilerException\n     */\n    public function compile(Compiler $compiler, StringsManager $stringsManager): void"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b20a587e166cab8421c16abc8f9ec7a146a3f24f3cc066c627d57c5e6858dfe0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FuncGetArgOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 8,
+                  "charOffset": 878,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 830,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b2e28dbc13bca7c5c7c1fc67e3a4de547d2e96f34260bbd34122fdb18b5ddbcf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 6,
+                  "charOffset": 814,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 763,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b3485b61e0f089369249d238fe7f53cd66bc5bf66e732ab1ab334eb6bab08787"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 164,
+                  "startColumn": 8,
+                  "charOffset": 4739,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 162,
+                  "startColumn": 1,
+                  "charOffset": 4681,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "     * @param array              $statement\n     *\n     * @throws CompilerException\n     */\n    protected function _assignPropertyArraySingleIndex("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b6597ab24907d211ebc16c2757f6783661c4b4e6e00352dc8056144e24c3f227"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GettypeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 818,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 759,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b8e0503490d3d691afa3567a2788efe29466543bb279805852e9f439645c971d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 8,
+                  "charOffset": 2330,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 2263,
+                  "charLength": 174,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     *\n     * @throws CompilerException\n     */\n    public function compile(CompilationContext $compilationContext): void"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "babd7d1e708fd90c20363e845fa1b0ee2d346ba2c2e947bed1306e4dbd297f1b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 853,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 794,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bcfa8ba7b0bb94bb7d68ddae627792c6db8c729dad9af997ec1a62af99b0e094"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 815,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 756,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bd456dbfe27e9f0673e5494c663b0fe493c21c056c37404ca735b159c35c3bac"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CallUserFuncOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 6,
+                  "charOffset": 864,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 807,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bdd5044c7e77a82722f44e219a397899c064edd0c4d70d8deccc4b8646cac562"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 8,
+                  "charOffset": 1069,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1030,
+                  "charLength": 153,
+                  "snippet": {
+                    "text": "     *\n     * @throws Exception\n     * @throws CompilerException\n     */\n    public function compile($expression, CompilationContext $compilationContext)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "be944aafd945c7177f3a6571a3dbefd62c10e1154ed2cb46f1034793a512cb0e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 6,
+                  "charOffset": 950,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 846,
+                  "charLength": 153,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext ,\n     * @param array              $statement\n     */\n    public function assign(\n        $variable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c09c334911d28dd3a6795d8c067c496ec6d87c93c18bd6fe784224f60f4afaaa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/SubstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 815,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 756,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c2e049fcb53d8326127592b24646ec05c6166a7e676e8f5c78ef0013c11e75d0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniqueKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 8,
+                  "charOffset": 936,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 877,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c54c0a4bcd5fb38b6d68851aa7e7246e74bdcf77cc552f60df594ab9523f3f74"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/CloneOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 8,
+                  "charOffset": 729,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 681,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     *\n     * @throws Exception\n     */\n    public function compile(array $expression, CompilationContext $compilationContext): CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c69f77cb6a23efa42523838fe0d5da6023d30232477642ff7e2b8fc47de1f0ea"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 8,
+                  "charOffset": 811,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 752,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c85d46f44778287d830391c25e84173d45a1a39b8baff5baaf064694e2238291"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StripslashesOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 8,
+                  "charOffset": 894,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 835,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c8e455bbce53806151f1617470af1450a02fe184c9909e29e484c96cbd8a4019"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 89,
+                  "startColumn": 6,
+                  "charOffset": 2702,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 87,
+                  "startColumn": 1,
+                  "charOffset": 2600,
+                  "charLength": 173,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     * @param array              $statement\n     */\n    protected function _assignArrayIndexMultiple(\n        $variable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cf0ea9a9a26d5edeccd6c2b95e1d2d98f4e5420ef06b20af1590ea59846f475e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FunctionExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 5,
+                  "charOffset": 590,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 528,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "class FunctionExistsOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cf4218eadb02daccbfc27f2d27050a537349789f8ce0ad351a5870e77059b57a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FcloseOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 815,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 756,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d3b6412fe7b09bb6932bcaa37ae4f847aa6ec6df677fd6b57bf6db031263796b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExitOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 8,
+                  "charOffset": 788,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 729,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d4d6c437f366560de52940176be34302ab4d2682a50ccfcbe5b7c9d033cdb80c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 828,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 769,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "da690c1e838e345dc244be8fa6e5b33513e13b881909ccdef1afe0a676f93dfd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CallUserFuncOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 33,
+                  "startColumn": 5,
+                  "charOffset": 677,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 31,
+                  "startColumn": 1,
+                  "charOffset": 608,
+                  "charLength": 156,
+                  "snippet": {
+                    "text": "    protected string $zephirMethod   = 'ZEPHIR_CALL_USER_FUNC';\n\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dc9633acebee7dd1ac2a0c1cc35229c61c9d1ebcf102a6a2126c95c071512891"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 5,
+                  "charOffset": 663,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 601,
+                  "charLength": 105,
+                  "snippet": {
+                    "text": "class ObjectPropertyArrayIndexAppend extends ArrayIndex\n{\n    /**\n     * Compiles x->y[z][] = foo.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dd52710c8cfb0ce0021610c70a49182bb020120cab5828597c85ed00c0524612"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 8,
+                  "charOffset": 938,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 879,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dfdf80844768595f6332a9c1f04efabae935764efce488a28d0b207f961f7a7f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FeofOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 573,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 521,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "class FeofOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e2d645f6a68ee1d1430330a06494ba4ead2b128ce518bb82c9f70d98fd5be64e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 8,
+                  "charOffset": 947,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 908,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "     *\n     * @throws Exception\n     * @throws CompilerException\n     */\n    public function assignStatic("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e691fc2efbfc5077e8a4a47e4539ccbab4a2b736e592f3354feb0abca1a57482"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 5,
+                  "charOffset": 611,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 557,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "class MemstrOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e7e3af4064012626a7a267808cd274d6f3ea3a88d63f324a57007b4a24a0f9f9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrlenOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 579,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 525,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "class StrlenOptimizer extends OptimizerAbstract\n{\n    /**\n     * @param array              $expression\n     * @param Call               $call"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ecd36f83ae67502e65dc7ed856ac167a8006bace9681293a528ca8e359eab0b5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 6,
+                  "charOffset": 834,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 731,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "     * @param array              $expression\n     * @param CompilationContext $compilationContext\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ed6dfbfb46b5da34c966dfba4932537e0eb6dd968247b6b83cd7da108c97e51a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetNsClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 8,
+                  "charOffset": 829,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "@throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 770,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f097aed876fc384f2e3b7e6cb24a9145dc3c3e044f011f8b3ea1f243c4fa0774"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocMissingThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
+            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 69,
+                  "startColumn": 8,
+                  "charOffset": 1874,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 67,
+                  "startColumn": 1,
+                  "charOffset": 1815,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "     * @param StringsManager $stringsManager\n     *\n     * @throws Exception\n     */\n    public function compile(Compiler $compiler, StringsManager $stringsManager): void"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f5de5700120fb964fa8258b7d9625ff84d7feed29b35f601ac75f5f4b713ccc7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocRedundantThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Exception 'Exception' is never thrown in the function",
+            "markdown": "Exception 'Exception' is never thrown in the function"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 167,
+                  "startColumn": 8,
+                  "charOffset": 5465,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "@throws Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 165,
+                  "startColumn": 1,
+                  "charOffset": 5402,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @return array\n     * @throws ReflectionException\n     * @throws Exception\n     */\n    protected function getOffsetExpressions("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8cae4b2f170cdbb58e9c2d21f8b7ab61e4a3786b8d0fb8f8607651e6846b8299"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocRedundantThrowsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Exception 'ReflectionException' is never thrown in the function",
+            "markdown": "Exception 'ReflectionException' is never thrown in the function"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 166,
+                  "startColumn": 8,
+                  "charOffset": 5430,
+                  "charLength": 27,
+                  "snippet": {
+                    "text": "@throws ReflectionException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 164,
+                  "startColumn": 1,
+                  "charOffset": 5395,
+                  "charLength": 95,
+                  "snippet": {
+                    "text": "     *\n     * @return array\n     * @throws ReflectionException\n     * @throws Exception\n     */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ffeda0a31f6608a880573535303fc8819c2eaafaabb9414ecfcbc16725142845"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Exception/CompilerException.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 213,
+                  "startColumn": 5,
+                  "charOffset": 6387,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 211,
+                  "startColumn": 1,
+                  "charOffset": 6376,
+                  "charLength": 50,
+                  "snippet": {
+                    "text": "    }\n\n    /**\n     * Unknown variable type\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "356cac0c743a4c04f6697c414c5b8f3d5b3c7c455ad0f4d2bd8640adfa30fc51"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 6,
+                  "charOffset": 857,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 754,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "     * @param array              $expression\n     * @param CompilationContext $compilationContext\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "66f9dac515774a836c162f3bfda22533fd0e9bca3a42a36c02e4dd1dfc645d0d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 5,
+                  "charOffset": 667,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 609,
+                  "charLength": 121,
+                  "snippet": {
+                    "text": "    protected string $zvalOperator = 'div_function';\n\n    /**\n     * Compiles the arithmetical division operation.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "68b4ae5cc7a3825964347f35fe6db41dc3a6acdc017b9f499efdf521fc523342"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Exception/CompilerException.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 221,
+                  "startColumn": 6,
+                  "charOffset": 6599,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 219,
+                  "startColumn": 1,
+                  "charOffset": 6567,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "     *\n     * @return self\n     */\n    public static function unknownType(\n        Variable $variable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6916e5e4749eec88b764a269f65ba6bc033bbd7e855f8d52c0b70d55689b841d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Exception/CompilerException.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 121,
+                  "startColumn": 5,
+                  "charOffset": 3618,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 119,
+                  "startColumn": 1,
+                  "charOffset": 3607,
+                  "charLength": 77,
+                  "snippet": {
+                    "text": "    }\n\n    /**\n     * Cannot use non-initialized variable as an object\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "70df175e6050d888732f315c861f4d98ca22c3e5e484b620afc5a65820196758"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 6,
+                  "charOffset": 783,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 751,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "     *\n     * @return void\n     */\n    protected function checkAccessNonStaticProperty(\n        Property $propertyDefinition,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7adfc6a419c1edb72e7eb38cbd8b1c05f14b7814aea74a5d0e33f6a1321e8952"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Exception/CompilerException.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 97,
+                  "startColumn": 5,
+                  "charOffset": 2841,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 95,
+                  "startColumn": 1,
+                  "charOffset": 2830,
+                  "charLength": 77,
+                  "snippet": {
+                    "text": "    }\n\n    /**\n     * Cannot use non-initialized variable as an object\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7b08b28e1eb5632b72412c84c0f4ff1a176bcb1fb44847cd47b5d2b75b1ed973"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Exception/CompilerException.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 105,
+                  "startColumn": 6,
+                  "charOffset": 3205,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 103,
+                  "startColumn": 1,
+                  "charOffset": 3173,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "     *\n     * @return self\n     */\n    public static function cannotUseValueTypeAs(\n        Variable $variable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81cb85713162c6cc7ca9984efe5588cbdde6d931e4f457c43e63a8bfb4bfef03"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 5,
+                  "charOffset": 1321,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1310,
+                  "charLength": 65,
+                  "snippet": {
+                    "text": "    }\n\n    /**\n     * Check whether a class has a property\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9e44a57ea707b9c90613710e5e98b0437068b1a284279929b0cb88c69fb6826b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 6,
+                  "charOffset": 834,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 731,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "     * @param array              $expression\n     * @param CompilationContext $compilationContext\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bc38337eac18bdc5f681c29d4626408d1a0bc657e9ccc861e5a44293b9a6b459"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 6,
+                  "charOffset": 1521,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1489,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "     *\n     * @return void\n     */\n    protected function checkClassHasProperty(\n        Definition $classDefinition,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d223107813814fa20508df5c2ac3b8d46d61a12caf41bac2b63d986b51cd0a0b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Traits/VariablesTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 5,
+                  "charOffset": 583,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 556,
+                  "charLength": 81,
+                  "snippet": {
+                    "text": "trait VariablesTrait\n{\n    /**\n     * Check whether a class has a property\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f14e54f22520b9e08469fee7ce9f7a7f11f0d1627d06e19ac00c709e2a6198c4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Exception/CompilerException.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 129,
+                  "startColumn": 6,
+                  "charOffset": 3982,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "*/"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 127,
+                  "startColumn": 1,
+                  "charOffset": 3950,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     *\n     * @return self\n     */\n    public static function cannotUseVariableTypeAs(\n        Variable $variable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fa5be3008d990174d4a80f07e9e80f171b6cf9b9c63c54309bb7bf96bb6b58d3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "PHPDoc comment signature is not complete",
+            "markdown": "PHPDoc comment signature is not complete"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 5,
+                  "charOffset": 691,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "/**"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 633,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "    protected string $zvalOperator = 'mod_function';\n\n    /**\n     * Compiles the arithmetical modulus operation.\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "feada92f0fa24ed4e4eede3671d7f71cc2875e2e2d2a4cfd0de634e6fedefe19"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDuplicateCaseInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Duplicate case expression",
+            "markdown": "Duplicate case expression"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/CallGathererPass.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 218,
+                  "startColumn": 18,
+                  "charOffset": 6144,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "'short-ternary'"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 216,
+                  "startColumn": 1,
+                  "charOffset": 6072,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "            case 'cast':\n            case 'type-hint':\n            case 'short-ternary':\n            case 'ternary':\n            case 'fetch':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ef6baacb97f6814bf81b0253261e0c80704401ba6f89c317c91639e9cc236f9d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDynamicFieldDeclarationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Property declared dynamically",
+            "markdown": "Property declared dynamically"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 16,
+                  "charOffset": 1831,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 1735,
+                  "charLength": 217,
+                  "snippet": {
+                    "text": "        $this->config        = $config;\n        $this->classes       = $classes;\n        $this->logger        = new NullLogger();\n        $this->templatesPath = $templatesPath;\n        $this->options       = $options;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0b24fd7f1df119e66d06e0ad936cf119eb9e8b32de2a1a767f417c867cd4babd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDynamicFieldDeclarationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Property declared dynamically",
+            "markdown": "Property declared dynamically"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 128,
+                  "startColumn": 16,
+                  "charOffset": 2970,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 126,
+                  "startColumn": 1,
+                  "charOffset": 2908,
+                  "charLength": 182,
+                  "snippet": {
+                    "text": "    ) {\n        $this->config       = $config;\n        $this->logger       = new NullLogger();\n        $this->aliasManager = $aliasManager;\n        $this->filesystem   = $filesystem;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "10489014c0519162625c4a9a5f8710793146d5f931ba9386a8c5fd556a1bd493"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDynamicFieldDeclarationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Property declared dynamically",
+            "markdown": "Property declared dynamically"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 16,
+                  "charOffset": 1692,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1592,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "        $this->config          = $config;\n        $this->context         = $context;\n        $this->logger          = new NullLogger();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "135bf489d5a732fa637446d6d402318807c6aae2a609cd9576fcaf26fd894787"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpDynamicFieldDeclarationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Property declared dynamically",
+            "markdown": "Property declared dynamically"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 150,
+                  "startColumn": 16,
+                  "charOffset": 3985,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 148,
+                  "startColumn": 1,
+                  "charOffset": 3904,
+                  "charLength": 233,
+                  "snippet": {
+                    "text": "        private CompilerFileFactory $compilerFileFactory,\n    ) {\n        $this->logger        = new NullLogger();\n        $this->stringManager = new StringsManager();\n        $this->fcallManager  = $this->backend->getFcallManager();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2def1e80fc569a15a11c1bae2933df1b643a648058043ff3fa72a147f6587979"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpElementIsNotAvailableInCurrentPhpVersionInspection",
+          "kind": "fail",
+          "level": "error",
+          "message": {
+            "text": "'ReturnTypeWillChange' is available starting with 8.1 PHP version",
+            "markdown": "'ReturnTypeWillChange' is available starting with 8.1 PHP version"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 5,
+                  "charOffset": 316,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "ReturnTypeWillChange"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 273,
+                  "charLength": 96,
+                  "snippet": {
+                    "text": "use ArrayAccess;\nuse JsonSerializable;\nuse ReturnTypeWillChange;\n\nuse function array_key_exists;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4784c30899df298a1c80ac8a4013c87998109e10a00d21af559493908eda78c1"
+          },
+          "properties": {
+            "ideaSeverity": "ERROR",
+            "qodanaSeverity": "Critical",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpFieldAssignmentTypeMismatchInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Incompatible types: Expected property of type 'null|\\Psr\\Log\\LoggerInterface', '\\Psr\\Log\\NullLogger' provided",
+            "markdown": "Incompatible types: Expected property of type 'null\\|\\\\Psr\\\\Log\\\\LoggerInterface', '\\\\Psr\\\\Log\\\\NullLogger' provided"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 86,
+                  "startColumn": 9,
+                  "charOffset": 2490,
+                  "charLength": 51,
+                  "snippet": {
+                    "text": "$compilationContext->logger         = $this->logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 84,
+                  "startColumn": 1,
+                  "charOffset": 2364,
+                  "charLength": 307,
+                  "snippet": {
+                    "text": "        $compilationContext->compiler       = $compiler;\n        $compilationContext->config         = $this->config;\n        $compilationContext->logger         = $this->logger;\n        $compilationContext->stringsManager = $stringsManager;\n        $compilationContext->backend        = $compiler->backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3482c1c96b22cd5d3ab73165abc00558e35a7b1389ba142d9c9fec718b9f721c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpFieldAssignmentTypeMismatchInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Incompatible types: Expected property of type 'null|\\Psr\\Log\\LoggerInterface', '\\Psr\\Log\\NullLogger' provided",
+            "markdown": "Incompatible types: Expected property of type 'null\\|\\\\Psr\\\\Log\\\\LoggerInterface', '\\\\Psr\\\\Log\\\\NullLogger' provided"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 559,
+                  "startColumn": 9,
+                  "charOffset": 17673,
+                  "charLength": 49,
+                  "snippet": {
+                    "text": "$compilationContext->logger       = $this->logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 557,
+                  "startColumn": 1,
+                  "charOffset": 17551,
+                  "charLength": 301,
+                  "snippet": {
+                    "text": "        $compilationContext->compiler     = $compiler;\n        $compilationContext->config       = $this->config;\n        $compilationContext->logger       = $this->logger;\n        $compilationContext->aliasManager = $this->aliasManager;\n        $compilationContext->backend      = $compiler->backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3c801b1258708406a35bb54c83c2abf8478874359ef78163cf8cd8550373cbf3"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpFieldAssignmentTypeMismatchInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Incompatible types: Expected property of type 'null|\\Psr\\Log\\LoggerInterface', '\\Psr\\Log\\NullLogger' provided",
+            "markdown": "Incompatible types: Expected property of type 'null\\|\\\\Psr\\\\Log\\\\LoggerInterface', '\\\\Psr\\\\Log\\\\NullLogger' provided"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 302,
+                  "startColumn": 9,
+                  "charOffset": 9782,
+                  "charLength": 43,
+                  "snippet": {
+                    "text": "$compilationContext->logger = $this->logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 300,
+                  "startColumn": 1,
+                  "charOffset": 9706,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "         * Set global logger in the compilation context\n         */\n        $compilationContext->logger = $this->logger;\n\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "78fab1fb4e843c1012d2a9c3b7f8b110038d6083f9dcee7079bdcd4f5853e3dd"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpInconsistentReturnPointsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Missing 'return' statement",
+            "markdown": "Missing 'return' statement"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/Types.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 137,
+                  "startColumn": 13,
+                  "charOffset": 4454,
+                  "charLength": 1,
+                  "snippet": {
+                    "text": "}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 135,
+                  "startColumn": 1,
+                  "charOffset": 4391,
+                  "charLength": 148,
+                  "snippet": {
+                    "text": "                    return $ret;\n                }\n            });\n\n            return implode('|', array_values($withoutNullable)) . $nullableType;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2ba9229198309302708c17e883a74e1a37b0da912e599b77d2c53d2abf7e3261"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpInconsistentReturnPointsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Missing 'return' statement",
+            "markdown": "Missing 'return' statement"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/StaticTypeInference.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 409,
+                  "startColumn": 5,
+                  "charOffset": 11915,
+                  "charLength": 1,
+                  "snippet": {
+                    "text": "}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 407,
+                  "startColumn": 1,
+                  "charOffset": 11878,
+                  "charLength": 100,
+                  "snippet": {
+                    "text": "                break;\n        }\n    }\n\n    public function passLetStatement(array $statement): void"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aad6e68c300ce6c780632ccbc9e9fdc7cf111db7931dffecf0a6754db061236d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpInconsistentReturnPointsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Missing 'return' statement",
+            "markdown": "Missing 'return' statement"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 96,
+                  "startColumn": 5,
+                  "charOffset": 2865,
+                  "charLength": 1,
+                  "snippet": {
+                    "text": "}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 94,
+                  "startColumn": 1,
+                  "charOffset": 2748,
+                  "charLength": 127,
+                  "snippet": {
+                    "text": "                return $this->accessStringOffset($expression, $variableVariable, $compilationContext);\n        }\n    }\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e1901231a4c64bb2e4d855415a9fee984a5739a4bd8ff3832d1f8ad419068bc2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpInconsistentReturnPointsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Missing 'return' statement",
+            "markdown": "Missing 'return' statement"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PowOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 5,
+                  "charOffset": 1165,
+                  "charLength": 1,
+                  "snippet": {
+                    "text": "}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1125,
+                  "charLength": 50,
+                  "snippet": {
+                    "text": "            return false;\n        }\n    }\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f3be7324978e7a00d1e3ff6d7891edb43c2b4325e45cf7ea1530f336b1e2c42d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpLoopCanBeReplacedWithStdFunctionCallsInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Loop can be replaced with 'array_key_exists()'",
+            "markdown": "Loop can be replaced with 'array_key_exists()'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Definition/Definition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1150,
+                  "startColumn": 9,
+                  "charOffset": 36123,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "foreach"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1148,
+                  "startColumn": 1,
+                  "charOffset": 36057,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "    {\n        $methodNameLower = strtolower($methodName);\n        foreach ($this->methods as $name => $method) {\n            if ($methodNameLower === $name) {\n                return true;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5a30fd7ae1aaf3691894df797a0dce73e5bc391f316640990e497c67717fa9d9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMatchExpressionWithOnlyDefaultArmInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'match' expression has only default arm and should be simplified",
+            "markdown": "'match' expression has only default arm and should be simplified"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 307,
+                  "startColumn": 23,
+                  "charOffset": 12666,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "match"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 305,
+                  "startColumn": 1,
+                  "charOffset": 12616,
+                  "charLength": 201,
+                  "snippet": {
+                    "text": "\n            case 'string':\n                throw match ($right->getType()) {\n                    default => new CompilerException(\n                        'Operation is not supported between strings',"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1c3bd63b16c83ccab3498f4b0c4ec366d7ea23d046186c86f4623ff47b8f6157"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMatchExpressionWithOnlyDefaultArmInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'match' expression has only default arm and should be simplified",
+            "markdown": "'match' expression has only default arm and should be simplified"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 255,
+                  "startColumn": 23,
+                  "charOffset": 10359,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "match"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 253,
+                  "startColumn": 1,
+                  "charOffset": 10309,
+                  "charLength": 201,
+                  "snippet": {
+                    "text": "\n            case 'string':\n                throw match ($right->getType()) {\n                    default => new CompilerException(\n                        'Operation is not supported between strings',"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8ccc4f3164834ed845e6e2b37ae5ca836f1137e9233af57a36d2dfd69b9145e1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMatchExpressionWithOnlyDefaultArmInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'match' expression has only default arm and should be simplified",
+            "markdown": "'match' expression has only default arm and should be simplified"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 208,
+                  "startColumn": 23,
+                  "charOffset": 8304,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "match"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 206,
+                  "startColumn": 1,
+                  "charOffset": 8229,
+                  "charLength": 239,
+                  "snippet": {
+                    "text": "            case 'string':\n            case 'array':\n                throw match ($right->getType()) {\n                    default => new CompilerException(\n                        'Operation is not supported between ' . $right->getType(),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ce9a24ef7c229f016e4e166ca90184a19defefb40b1ded3090ff835a0cf2012f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 2 parameters, but the method signature uses 1 parameters",
+            "markdown": "Method call is provided 2 parameters, but the method signature uses 1 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 316,
+                  "startColumn": 45,
+                  "charOffset": 13516,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "$compilationContext"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 314,
+                  "startColumn": 1,
+                  "charOffset": 13308,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "                                        $variableRight = $compilationContext->backend->getVariableCode(\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0d359cf74b12bbb4a6191ce4c16c5916bb501a66a4425c7ddb386998ced182c5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 3 parameters, but the method signature uses 2 parameters",
+            "markdown": "Method call is provided 3 parameters, but the method signature uses 2 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 210,
+                  "startColumn": 21,
+                  "charOffset": 7075,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 208,
+                  "startColumn": 1,
+                  "charOffset": 6982,
+                  "charLength": 137,
+                  "snippet": {
+                    "text": "                    'variable',\n                    $compilationContext,\n                    $expression\n                );\n            }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "10b759aba2fe16119af10fb03c5dd9ecf4c9e8c3e5e98cae10291764c0843702"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 3 parameters, but the method signature uses 2 parameters",
+            "markdown": "Method call is provided 3 parameters, but the method signature uses 2 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 580,
+                  "startColumn": 83,
+                  "charOffset": 19533,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 578,
+                  "startColumn": 1,
+                  "charOffset": 19328,
+                  "charLength": 262,
+                  "snippet": {
+                    "text": "    ): void {\n        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);\n        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);\n\n        $compilationContext->codePrinter->output("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "149639fea32545ca0fea129bc555a487c00ff9abca1eb3cc525f91c13568c173"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 3 parameters, but the method signature uses 2 parameters",
+            "markdown": "Method call is provided 3 parameters, but the method signature uses 2 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 603,
+                  "startColumn": 83,
+                  "charOffset": 20328,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 601,
+                  "startColumn": 1,
+                  "charOffset": 20123,
+                  "charLength": 289,
+                  "snippet": {
+                    "text": "    ): void {\n        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);\n        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);\n\n        $offsetStr = $offsetItems ? ', ' . implode(', ', $offsetItems) : '';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "37dab5aa4807d5c695f4c322a4a6e7d9bc86f5bda2d46a7e33bc60993ec7b5fa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 3 parameters, but the method signature uses 2 parameters",
+            "markdown": "Method call is provided 3 parameters, but the method signature uses 2 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 202,
+                  "startColumn": 29,
+                  "charOffset": 6774,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 200,
+                  "startColumn": 1,
+                  "charOffset": 6657,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "                            'variable',\n                            $compilationContext,\n                            $expression\n                        );\n                    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "457cd8470aecc47e98e125f2c6b3837f43d57c905e031f1ff7096d3e55237690"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 2 parameters, but the method signature uses 1 parameters",
+            "markdown": "Method call is provided 2 parameters, but the method signature uses 1 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 375,
+                  "startColumn": 45,
+                  "charOffset": 16674,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "$compilationContext"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 373,
+                  "startColumn": 1,
+                  "charOffset": 16466,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "                                        $variableRight = $compilationContext->backend->getVariableCode(\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "493dd0c3b795bd668269d392c78227103b2aab5c738370b291362376c8cfe2fe"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 2 parameters, but the method signature uses 1 parameters",
+            "markdown": "Method call is provided 2 parameters, but the method signature uses 1 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 227,
+                  "startColumn": 37,
+                  "charOffset": 9262,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "$compilationContext"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 225,
+                  "startColumn": 1,
+                  "charOffset": 9078,
+                  "charLength": 239,
+                  "snippet": {
+                    "text": "                                $variableRight = $compilationContext->backend->getVariableCode(\n                                    $variableRight,\n                                    $compilationContext\n                                );\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7e3153334b7636040c742d7afe0e303dbb49ef98e8b1e88c58272682b12032fa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 3 parameters, but the method signature uses 2 parameters",
+            "markdown": "Method call is provided 3 parameters, but the method signature uses 2 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1848,
+                  "startColumn": 67,
+                  "charOffset": 64213,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1846,
+                  "startColumn": 1,
+                  "charOffset": 64111,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "        $flags = null\n    ): void {\n        $value = $this->resolveValue($value, $compilationContext, true);\n        if (!isset($flags)) {\n            $flags = 'PH_COPY';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "93e9980a81ee1de197e550f28dab30e4bad36c7ab415c88c81220a810ab1e0fa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 2 parameters, but the method signature uses 1 parameters",
+            "markdown": "Method call is provided 2 parameters, but the method signature uses 1 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 99,
+                  "startColumn": 57,
+                  "charOffset": 2379,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$class"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 97,
+                  "startColumn": 1,
+                  "charOffset": 2262,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "\n            // class source file (source/ns1/n2/class.html)\n            $sfile = new File\\SourceFile($this->config, $class);\n            $this->theme->drawFile($sfile);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bc7d7f87feed53f8ef3de3f8df04e301ec68b0bf77756ea65f9f7a0a6f72fa9b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 2 parameters, but the method signature uses 1 parameters",
+            "markdown": "Method call is provided 2 parameters, but the method signature uses 1 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 453,
+                  "startColumn": 45,
+                  "charOffset": 20743,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "$compilationContext"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 451,
+                  "startColumn": 1,
+                  "charOffset": 20535,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "                                        $variableRight = $compilationContext->backend->getVariableCode(\n                                            $variableRight,\n                                            $compilationContext\n                                        );\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dac7045a453c0ba2fd8d1ca8ce0ce19dd4f7c3936ca7364cf84fdc09854a59ae"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMethodParametersCountMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Method call is provided 3 parameters, but the method signature uses 2 parameters",
+            "markdown": "Method call is provided 3 parameters, but the method signature uses 2 parameters"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 515,
+                  "startColumn": 78,
+                  "charOffset": 16942,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 513,
+                  "startColumn": 1,
+                  "charOffset": 16755,
+                  "charLength": 297,
+                  "snippet": {
+                    "text": "        [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);\n\n        $symbol  = $this->resolveValue($symbolVariable, $compilationContext, true);\n        $varCode = $this->getVariableCode($variable);\n        $compilationContext->codePrinter->output("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e2ff953b7652a7fe5a7e3f7effae742aa3b0019871fa6c6c2314e2a23fccf06d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingBreakStatementInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing 'break' statement",
+            "markdown": "Missing 'break' statement"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1319,
+                  "startColumn": 17,
+                  "charOffset": 46965,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "case"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1317,
+                  "startColumn": 1,
+                  "charOffset": 46921,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "                    break;\n\n                case 'char':\n                    $defaultValue = (string)$defaultValue;\n                    if (strlen($defaultValue) > 4) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d784dd488e6aa9a45848982f3938ee41f78386f8e7332d6b62c6eafd358ac963"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 15,
+                  "charOffset": 1106,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$themeDir"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1034,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "    protected $projectConfig;\n    protected $themeConfig;\n    protected $themeDir;\n    protected $themeInfos = [];\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "01e9ccefcac0a4a632908803401bd8be45b8a8e73ff242c906cb96f164aed299"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 15,
+                  "charOffset": 904,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$documentation"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 856,
+                  "charLength": 89,
+                  "snippet": {
+                    "text": "     * @var Documentation\n     */\n    protected $documentation;\n    /**\n     * @var Theme"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "036c6d37ecf8dba9c88e3dc5f761a2b40ca223a97ac66148205284ea5270c1bd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/RawExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 13,
+                  "charOffset": 405,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 347,
+                  "charLength": 79,
+                  "snippet": {
+                    "text": "class RawExpression extends AbstractBuilder\n{\n    private $expression;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "03e10424d253aeaae50549f57045ef681fcf6fe13a3c207a292b5da788c72785"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 15,
+                  "charOffset": 475,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$annotationLen"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 432,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "{\n    protected $annotation;\n    protected $annotationLen;\n    protected $annotationNameOpen;\n    protected $annotationOpen;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "067c86e77bfe864be933089a6f5b94bbfca7e6818425ffb088c983a4c9c7e695"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 13,
+                  "charOffset": 820,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$arguments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 721,
+                  "charLength": 152,
+                  "snippet": {
+                    "text": "     */\n    public const TYPE_CALL_DYNAMIC_STRING = FunctionCall::CALL_DYNAMIC_STRING;\n    private $arguments;\n    private $name;\n    private $typeCall;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0db75629ba1c6c7cb5e7fd2236f41a91b46b37d7334d6a17dd8ef1e80ed55be2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 15,
+                  "charOffset": 1022,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$outputDir"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 954,
+                  "charLength": 137,
+                  "snippet": {
+                    "text": "    protected $extendedTheme;\n    protected $options;\n    protected $outputDir;\n    protected $projectConfig;\n    protected $themeConfig;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "109ebcd025640481cf98a2326287f4f06531e6c40f863edf5d309601fc026ad0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 31,
+                  "startColumn": 15,
+                  "charOffset": 626,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$allowedTypes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 29,
+                  "startColumn": 1,
+                  "charOffset": 556,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "class IsPhpVersionOptimizer extends OptimizerAbstract\n{\n    protected $allowedTypes = [\n        'string'  => true,\n        'int'     => true,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "10c80259abc3a0760ff062209e58851cc1dae2ccabb5663d32bb0213bcc4deee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 13,
+                  "charOffset": 668,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$statements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 620,
+                  "charLength": 69,
+                  "snippet": {
+                    "text": "     * @var StatementsBlock\n     */\n    private $statements;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "121abe82c95b6deeed4bf8934ebdeb7b4e6af2e5ab616bc0807b916528e1fc7a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 28,
+                  "startColumn": 15,
+                  "charOffset": 505,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "$annotationNameOpen"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 26,
+                  "startColumn": 1,
+                  "charOffset": 434,
+                  "charLength": 150,
+                  "snippet": {
+                    "text": "    protected $annotation;\n    protected $annotationLen;\n    protected $annotationNameOpen;\n    protected $annotationOpen;\n    protected $commentOpen;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1519e3218cede19eac00556f4b57914245911bf5f5ff98197a3e6a032c9b38da"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Call.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 15,
+                  "charOffset": 1018,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$reflection"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 973,
+                  "charLength": 83,
+                  "snippet": {
+                    "text": "     * @var mixed|null\n     */\n    protected $reflection;\n    /**\n     * @var array"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "15eaddd1f710992def9dfb321caff215e3d552b264b67219eec7690b3945cc5d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 15,
+                  "charOffset": 1107,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$config"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1046,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "    protected $classes;\n    /** @var Config */\n    protected $config;\n    /** @var array */\n    protected $options;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "17da5ac400201382822ebb4e14343fd8b3062d504fabb6e554ae7dcf06496243"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 15,
+                  "charOffset": 571,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$commentOpen"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 491,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "    protected $annotationNameOpen;\n    protected $annotationOpen;\n    protected $commentOpen;\n\n    // Parsing helpers"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "17dfd732afc8d64ecabae8955bb75645ce6eb55869bdb9130e43dfc677976ed3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 15,
+                  "charOffset": 765,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$currentLine"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 690,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "    protected $currentChar;\n    protected $currentCharIndex;\n    protected $currentLine;\n    protected $descriptionOpen;\n    protected $descriptionStr;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "18d0dce815811edd8f36e2adcf8db60cd98f0ed9dbc5dffa95725cf1dab513c0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/NamespaceAccessor.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 15,
+                  "charOffset": 447,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$classes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 398,
+                  "charLength": 89,
+                  "snippet": {
+                    "text": "     * @var CompilerFile[]\n     */\n    protected $classes;\n    protected $namespaceTree;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1b1d9829eac89ed0e7d4be0224b19e8e6d3a1aa0d191a538b9ad14a95cac6bf6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 15,
+                  "charOffset": 1005,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$baseUrl"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 964,
+                  "charLength": 105,
+                  "snippet": {
+                    "text": "    use LoggerAwareTrait;\n\n    protected $baseUrl;\n    /** @var CompilerFile[] */\n    protected $classes;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "24a82ba924bcc993fd614e9cdc16d04f7c34497d58a7db40e8fe20cb2f1b8a1d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 23,
+                  "startColumn": 13,
+                  "charOffset": 461,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$arguments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 21,
+                  "startColumn": 1,
+                  "charOffset": 395,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "class CallStaticStatement extends AbstractStatement\n{\n    private $arguments;\n    private $class;\n    private $dynamicClass  = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "26e4e8b7d248c4ad932f079d966be91cf4ff2fbb839cb3e5dc3b3be83b1a3f03"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 15,
+                  "charOffset": 1152,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$options"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1093,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "    protected $config;\n    /** @var array */\n    protected $options;\n    protected $outputDirectory;\n    /** @var Theme */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2873aed1b653ce03932fb4a162d342e4fa10cce488e64d2d2fc922a08ce8d7da"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 13,
+                  "charOffset": 577,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$method"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 493,
+                  "charLength": 101,
+                  "snippet": {
+                    "text": "    private $dynamicClass  = false;\n    private $dynamicMethod = false;\n    private $method;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "28c4ac9f516bf1c3de4e38311990ae9914bb2e510a7e273a72ed51d8aae466f3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/File/Sitemap.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 24,
+                  "startColumn": 15,
+                  "charOffset": 441,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$baseUrl"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 22,
+                  "startColumn": 1,
+                  "charOffset": 386,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "class Sitemap implements FileInterface\n{\n    protected $baseUrl;\n    protected $classes;\n    protected $namespaces;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2a4fca2ac8ddf31a51a4999a36f1c21653e6e0cdeeb69e2172d8a8b587000be3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 15,
+                  "charOffset": 998,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$options"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 946,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "     */\n    protected $extendedTheme;\n    protected $options;\n    protected $outputDir;\n    protected $projectConfig;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2cc7ecd765c95fc75c4690714aa8248ea4fd8012e546f825c596370d16bf0190"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Closure.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 22,
+                  "charOffset": 969,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "$id"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 914,
+                  "charLength": 88,
+                  "snippet": {
+                    "text": "     * Unique closure ID.\n     */\n    protected static $id = 0;\n    /**\n     * @var bool"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "30d8173cb443078024c66f3b5076188a731b422511e650d0f2783cdc9bfbc69f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 22,
+                  "charOffset": 1489,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$optimizers"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1370,
+                  "charLength": 155,
+                  "snippet": {
+                    "text": "    protected static $functionReflection   = [];\n    protected static $optimizerDirectories = [];\n    protected static $optimizers           = [];\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3180eee5d8bf1c893cc8e1f7df660f7abd28bac0ebcd84321698c09e223ef119"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 33,
+                  "startColumn": 15,
+                  "charOffset": 623,
+                  "charLength": 28,
+                  "snippet": {
+                    "text": "$currentAnnotationContentStr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 31,
+                  "startColumn": 1,
+                  "charOffset": 585,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "\n    // Parsing helpers\n    protected $currentAnnotationContentStr;\n    protected $currentAnnotationStr;\n    protected $currentChar;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "323be222a34905c646d39557f842301dbe07c9973682712c160b1670acc02f36"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 15,
+                  "charOffset": 1396,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$lastStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1351,
+                  "charLength": 90,
+                  "snippet": {
+                    "text": "     * @var array|null\n     */\n    protected $lastStatement;\n    protected $loop = false;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "343c2c3add19e52823831936a1ce32f3b9ac392461b3a82060d2d6dc36134c5a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 15,
+                  "charOffset": 704,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$currentChar"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 609,
+                  "charLength": 169,
+                  "snippet": {
+                    "text": "    protected $currentAnnotationContentStr;\n    protected $currentAnnotationStr;\n    protected $currentChar;\n    protected $currentCharIndex;\n    protected $currentLine;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "365669eaa4d9dff9c1cba5f47c632c82afa8c95820a655aaaab94161bc8fcd5c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 15,
+                  "charOffset": 1060,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$classes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 991,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "    protected $baseUrl;\n    /** @var CompilerFile[] */\n    protected $classes;\n    /** @var Config */\n    protected $config;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "39418d498ca2ef1d29b4ee9cf6793467f99ff40a3a04366836d95eb58f637ae6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 15,
+                  "charOffset": 540,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$annotationOpen"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 461,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "    protected $annotationLen;\n    protected $annotationNameOpen;\n    protected $annotationOpen;\n    protected $commentOpen;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "40564e6f1827fff06e3b1a6733a1136b73334b8995f72c76dd30647bb896f5c3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 15,
+                  "charOffset": 1078,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$themeConfig"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1008,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    protected $outputDir;\n    protected $projectConfig;\n    protected $themeConfig;\n    protected $themeDir;\n    protected $themeInfos = [];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a7974ec394f87f0f906d1607a2295f3d6453c7fd274d9d53a7888d3ad61d13b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 15,
+                  "charOffset": 1327,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$debug"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 1289,
+                  "charLength": 84,
+                  "snippet": {
+                    "text": "class StatementsBlock\n{\n    protected $debug = false;\n    /**\n     * @var array|null"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4bb417e95dd275e087e253401f65b18903be4194966b6e3e8787ee15948e7220"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 15,
+                  "charOffset": 448,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$annotation"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 411,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "class DocblockParser\n{\n    protected $annotation;\n    protected $annotationLen;\n    protected $annotationNameOpen;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4c893954771fbabc3e636cdc5f5cfe4a7eedaf1e72393f5fed4426152bb4cc45"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 13,
+                  "charOffset": 541,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$dynamicMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 473,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "    private $class;\n    private $dynamicClass  = false;\n    private $dynamicMethod = false;\n    private $method;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4fcfb4aaa2b07bb16a3366fb121104a6f4a3c70b109484ccdf73a065e4a68945"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Annotation/See.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 15,
+                  "charOffset": 490,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$resource"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 445,
+                  "charLength": 77,
+                  "snippet": {
+                    "text": "class See extends Annotation\n{\n    protected $resource;\n    protected $text;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5c031693f9521f3d6fa86a333be7779759a1e39d2891858319e48eab5f28f82b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 120,
+                  "startColumn": 13,
+                  "charOffset": 2720,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$rightExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 118,
+                  "startColumn": 1,
+                  "charOffset": 2656,
+                  "charLength": 90,
+                  "snippet": {
+                    "text": "    private $leftExpression;\n    private $operator;\n    private $rightExpression;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5cedc55e32c30238636627d7149088e989db4dca41dce94b42d2527b115852b9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/UnaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 64,
+                  "startColumn": 13,
+                  "charOffset": 1380,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 62,
+                  "startColumn": 1,
+                  "charOffset": 1299,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "    // y = typeof a\n    public const OPERATOR_UNLIKELY = 'unlikely';\n    private $expression;\n    private $operator;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5e016096ca3417660430ca575294f38c48f03fac7339c50d030f1e77d7020c1c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 15,
+                  "charOffset": 736,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$themeOptions"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 684,
+                  "charLength": 75,
+                  "snippet": {
+                    "text": "     */\n    protected $projectConfig;\n    protected $themeOptions;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "605fb11e95a14c62838b1747b99ec56cd687434c5000596e0115f1084f0a752d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 15,
+                  "charOffset": 913,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$docblockObj"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 870,
+                  "charLength": 112,
+                  "snippet": {
+                    "text": "     * @var Docblock\n     */\n    protected $docblockObj;\n    protected $ignoreSpaces;\n    protected $ignoreStar;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "61f7fdfcebfa2e787a2620c85a49b93072ee6e398c73ae741a6f9cbfa3b534eb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 24,
+                  "startColumn": 13,
+                  "charOffset": 485,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$class"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 22,
+                  "startColumn": 1,
+                  "charOffset": 447,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "{\n    private $arguments;\n    private $class;\n    private $dynamicClass  = false;\n    private $dynamicMethod = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "628304c0975d914ea550044e9c5d92aa475b806ef92afc1393d420a4d5ba238f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/File/Sitemap.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 15,
+                  "charOffset": 465,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$classes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 425,
+                  "charLength": 98,
+                  "snippet": {
+                    "text": "{\n    protected $baseUrl;\n    protected $classes;\n    protected $namespaces;\n    private $baseDir;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "656f83b6f21ab9693f7953f39396220bbdc079044fe4a66073ae977b19b2dae0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 119,
+                  "startColumn": 13,
+                  "charOffset": 2697,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$operator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 117,
+                  "startColumn": 1,
+                  "charOffset": 2605,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "    public const OPERATOR_TYPE_HINT = 'type-hint';\n    private $leftExpression;\n    private $operator;\n    private $rightExpression;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "67f382d312bd9c1a45c835f178f8c7dc2b6f9591e48434eee44ab8f7430ab0d5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 23,
+                  "startColumn": 13,
+                  "charOffset": 428,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$file"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 21,
+                  "startColumn": 1,
+                  "charOffset": 395,
+                  "charLength": 59,
+                  "snippet": {
+                    "text": "{\n    private $char;\n    private $file;\n    private $line;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "69613d2409c40dda4faba51599fc10a2b73d1460a3db3d2eb3de792a46d4433a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/UnaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 65,
+                  "startColumn": 13,
+                  "charOffset": 1405,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$operator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 63,
+                  "startColumn": 1,
+                  "charOffset": 1319,
+                  "charLength": 105,
+                  "snippet": {
+                    "text": "    public const OPERATOR_UNLIKELY = 'unlikely';\n    private $expression;\n    private $operator;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6b196a9b7224805da5613f3a017e14a60ee8615567a3fdc85c43e00a346a72c0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 24,
+                  "startColumn": 13,
+                  "charOffset": 447,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$line"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 22,
+                  "startColumn": 1,
+                  "charOffset": 397,
+                  "charLength": 65,
+                  "snippet": {
+                    "text": "    private $char;\n    private $file;\n    private $line;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6f941e44a19b92de98b4509e5a941f5f4c46098ea049cd10fe57765ffe261b12"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 13,
+                  "charOffset": 425,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$assignments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 366,
+                  "charLength": 81,
+                  "snippet": {
+                    "text": "class LetStatement extends AbstractStatement\n{\n    private $assignments;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "72dd547bbb1bd1f2290a2c11aa2244ca131cc82d13b258bd92b4c101e5a320dc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 118,
+                  "startColumn": 13,
+                  "charOffset": 2668,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$leftExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 116,
+                  "startColumn": 1,
+                  "charOffset": 2587,
+                  "charLength": 150,
+                  "snippet": {
+                    "text": "    // x [{expr}]\n    public const OPERATOR_TYPE_HINT = 'type-hint';\n    private $leftExpression;\n    private $operator;\n    private $rightExpression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "79f1f158eb19175cf569ed13ba196744cbef9121740a5521b63337a34b8685ad"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/RawStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 13,
+                  "charOffset": 396,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 358,
+                  "charLength": 59,
+                  "snippet": {
+                    "text": "     * @var array\n     */\n    private $expression;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7f5a7fbffd272befed999f441a6f0c80733c628e073cfcdfc4daa8e120e70530"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 15,
+                  "charOffset": 1176,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$outputDirectory"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 1116,
+                  "charLength": 121,
+                  "snippet": {
+                    "text": "    /** @var array */\n    protected $options;\n    protected $outputDirectory;\n    /** @var Theme */\n    protected $theme;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8c7a10fd1bd27da65affa1d2099c0d53d0e8ef50aa8c915f03df86c516951a1f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/NamespaceAccessor.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 15,
+                  "charOffset": 471,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$namespaceTree"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 425,
+                  "charLength": 70,
+                  "snippet": {
+                    "text": "     */\n    protected $classes;\n    protected $namespaceTree;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8e3106e7f74d1e384e95d99f5484d3ce40f962ee99381baf37e6f6e9ef26698a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 13,
+                  "charOffset": 505,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$dynamicClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 449,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "    private $arguments;\n    private $class;\n    private $dynamicClass  = false;\n    private $dynamicMethod = false;\n    private $method;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "90030a9a72aaad6cc4631306a29ed014e3338c5a4a54ffd5b8ae132024a2ce59"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 15,
+                  "charOffset": 706,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$projectConfig"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 665,
+                  "charLength": 86,
+                  "snippet": {
+                    "text": "     * @var Config\n     */\n    protected $projectConfig;\n    protected $themeOptions;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9259e400a52eeb7637cb6cbcf3a761ce17bc0e27634d61780ce0f8c4ca44653a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 15,
+                  "charOffset": 1456,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$mutateGatherer"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1412,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "    protected $loop = false;\n\n    protected $mutateGatherer;\n    protected ?bool $unreachable = null;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "928994a1e5197c47ec15523478cef06bb8833d01a2b6b2d1f8a7936d19ef41d1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 24,
+                  "startColumn": 15,
+                  "charOffset": 529,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$operatorsFactory"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 22,
+                  "startColumn": 1,
+                  "charOffset": 450,
+                  "charLength": 165,
+                  "snippet": {
+                    "text": "    protected static $instance;\n    /** @var OperatorsFactory */\n    protected $operatorsFactory;\n    /** @var StatementsFactory */\n    protected $statementsFactory;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "92cd9cfcaaa39d59e8351f7040bee9cf7c3d889ce22cabdd8033f04ed39b04f7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 15,
+                  "charOffset": 667,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "$currentAnnotationStr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 586,
+                  "charLength": 164,
+                  "snippet": {
+                    "text": "    // Parsing helpers\n    protected $currentAnnotationContentStr;\n    protected $currentAnnotationStr;\n    protected $currentChar;\n    protected $currentCharIndex;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9e191846f10237cd55897559247a9f93f641c8ae515b0bd2b66d19b8bd4c6d5a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 13,
+                  "charOffset": 527,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$condition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 478,
+                  "charLength": 96,
+                  "snippet": {
+                    "text": "     * @var AbstractOperator\n     */\n    private $condition;\n    /**\n     * @var StatementsBlock"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a0bf55b55cd9f73b1d6038e123ebf0b3d326348d0858702ccd1518aba6cdb930"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 22,
+                  "charOffset": 1391,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "$functionReflection"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1328,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "     */\n    public const CALL_NORMAL = 1;\n    protected static $functionReflection   = [];\n    protected static $optimizerDirectories = [];\n    protected static $optimizers           = [];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a3cc682a5f3a0f122628655176e67cb3a652b4dccbff41d5ee95d89eca9b2baf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 15,
+                  "charOffset": 732,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$currentCharIndex"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 653,
+                  "charLength": 157,
+                  "snippet": {
+                    "text": "    protected $currentAnnotationStr;\n    protected $currentChar;\n    protected $currentCharIndex;\n    protected $currentLine;\n    protected $descriptionOpen;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a513c1b20fd6c673e32e0efa2bc0c84af424c7f98adb46b2fa837d0297ad7c16"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Builder/Operators/UnaryOperatorBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 15,
+                  "charOffset": 545,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$leftExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 505,
+                  "charLength": 85,
+                  "snippet": {
+                    "text": "     * @var mixed\n     */\n    protected $leftExpression;\n    /**\n     * Operator name"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a640882970aae883975722cb0602ea78ab5f9b2055b273755c74796cf1a80f50"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 15,
+                  "charOffset": 825,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$descriptionStr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 751,
+                  "charLength": 110,
+                  "snippet": {
+                    "text": "    protected $currentLine;\n    protected $descriptionOpen;\n    protected $descriptionStr;\n\n    // parsed data"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a94f3bcf7da8ceebd8edb48504a880f81d62f4a8a1708768ef2f1088d33e613a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/NamespaceAccessor.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 15,
+                  "charOffset": 376,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$byNamespace"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 336,
+                  "charLength": 88,
+                  "snippet": {
+                    "text": "class NamespaceAccessor\n{\n    protected $byNamespace;\n    /**\n     * @var CompilerFile[]"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b0c952872a59bcd8922027c5b1ba4bc8e834f43ce7d968aab5400c1dd4f03547"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 15,
+                  "charOffset": 997,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$summaryOpen"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 927,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "    protected $ignoreSpaces;\n    protected $ignoreStar;\n    protected $summaryOpen;\n    protected $summaryStr;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b27585686bd5499eb12fb57f7e5573bc1722fa4f0fc0f1df60e34487e3654e94"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallMethodStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 13,
+                  "charOffset": 432,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 362,
+                  "charLength": 89,
+                  "snippet": {
+                    "text": "class CallMethodStatement extends CallFunctionStatement\n{\n    private $variable;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b296a2aa8a36c928e595aad9a51b14dd8c450bbf3a49c64034ed4391b37290e8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/File/Sitemap.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 13,
+                  "charOffset": 514,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$baseDir"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 451,
+                  "charLength": 153,
+                  "snippet": {
+                    "text": "    protected $classes;\n    protected $namespaces;\n    private $baseDir;\n\n    public function __construct($baseDir, $baseUrl, $classList, $namespaceList)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b458e195fde0c6600243eddc6c3a823e0006c3186261a1950b4c9fad202c8788"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 15,
+                  "charOffset": 596,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "$statementsFactory"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 515,
+                  "charLength": 109,
+                  "snippet": {
+                    "text": "    protected $operatorsFactory;\n    /** @var StatementsFactory */\n    protected $statementsFactory;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b546ae9b8461a57fb5c0760ea65b4be1b85e0fbfa6b18253ebae18f830b0c854"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Annotation/Link.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 15,
+                  "charOffset": 572,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "$uri"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 505,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "    protected $linkText;\n    /** @var string|null */\n    protected $uri;\n\n    public function getLinkText()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b72b8de0494474f0fe820f7aee650369054d52c8852a1ed98040743e8f52eb83"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Annotation/See.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 15,
+                  "charOffset": 515,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$text"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 474,
+                  "charLength": 90,
+                  "snippet": {
+                    "text": "{\n    protected $resource;\n    protected $text;\n\n    public function getResource(): string"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b9b4508eb4b135199f22a7f25447093216292cdc79a5c1b33ff2c14055e04c2a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 15,
+                  "charOffset": 1131,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$themeInfos"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 1064,
+                  "charLength": 193,
+                  "snippet": {
+                    "text": "    protected $themeConfig;\n    protected $themeDir;\n    protected $themeInfos = [];\n\n    public function __construct($themeDir, $outputDir, $themeConfig, $config, Documentation $documentation)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba66b03e7823047ff1a4542cd62cfb02d7589d31c0e26f37f0dea00efd3270a4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 13,
+                  "charOffset": 863,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$typeCall"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 808,
+                  "charLength": 74,
+                  "snippet": {
+                    "text": "    private $arguments;\n    private $name;\n    private $typeCall;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bdf4cc3462479b286e7532487bde004d235cf1aa6d76da0b800b0f00f22318a8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 13,
+                  "charOffset": 844,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 729,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "    public const TYPE_CALL_DYNAMIC_STRING = FunctionCall::CALL_DYNAMIC_STRING;\n    private $arguments;\n    private $name;\n    private $typeCall;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c2f92a885119a5949eea0713b10c74f9e723b697c083952ca92ccdd0f9b49d45"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 13,
+                  "charOffset": 409,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$char"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 364,
+                  "charLength": 89,
+                  "snippet": {
+                    "text": "abstract class AbstractBuilder\n{\n    private $char;\n    private $file;\n    private $line;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c62b1416d9c63489375d3cd77a40d318473702af75573d8de6689a7812eeb2d5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Annotation/Link.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 15,
+                  "charOffset": 519,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$linkText"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 475,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "{\n    /** @var string|null */\n    protected $linkText;\n    /** @var string|null */\n    protected $uri;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c799dc64db24b362fe2e6289c9d50fa0024604784c540a6350a52bd155cdb536"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 15,
+                  "charOffset": 1426,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$loop"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1374,
+                  "charLength": 98,
+                  "snippet": {
+                    "text": "     */\n    protected $lastStatement;\n    protected $loop = false;\n\n    protected $mutateGatherer;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ca0aef65b573f04dc0897734d66bad25611f561eca59264988aee04bef7442e0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 15,
+                  "charOffset": 793,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$descriptionOpen"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 718,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "    protected $currentCharIndex;\n    protected $currentLine;\n    protected $descriptionOpen;\n    protected $descriptionStr;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d0bbf2c37cf9982c2fbd022e4a6000bbc3610d706cbd2d0c7cd6cd68a7e3541f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 13,
+                  "charOffset": 1313,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$templatesPath"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1272,
+                  "charLength": 65,
+                  "snippet": {
+                    "text": "\n    /** @var string|null */\n    private $templatesPath;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d1b1ce7c1ed4188858f26e042c769035e4e6731ef4526b3ec7a5c12fae4ee96f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 23,
+                  "startColumn": 13,
+                  "charOffset": 475,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$statements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 21,
+                  "startColumn": 1,
+                  "charOffset": 415,
+                  "charLength": 81,
+                  "snippet": {
+                    "text": "class StatementsBlock extends AbstractBuilder\n{\n    private $statements;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d3acc483aa50da34ef29bf149c6c1465078e89309d4a1132c4bb9a9e883e6442"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Branch.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 13,
+                  "charOffset": 1092,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$uniqueId"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 1054,
+                  "charLength": 57,
+                  "snippet": {
+                    "text": "     * @var mixed\n     */\n    private $uniqueId;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d4068559c9ab3a501c849ff1a50c4ef6d301b55596e8498412a7a0e2dcc516e6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 15,
+                  "charOffset": 1230,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$theme"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1162,
+                  "charLength": 110,
+                  "snippet": {
+                    "text": "    protected $outputDirectory;\n    /** @var Theme */\n    protected $theme;\n    protected $themesDirectories;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d5ae7f178277814bd0b9e331e895fd520535a60445a8e4295cb47e2000af9f07"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 22,
+                  "charOffset": 1440,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "$optimizerDirectories"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1336,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "    public const CALL_NORMAL = 1;\n    protected static $functionReflection   = [];\n    protected static $optimizerDirectories = [];\n    protected static $optimizers           = [];\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d82d4154517e5f304e1c5cdeaca8e01a1d5f428235dee0cc507cb992b18a15ed"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 15,
+                  "charOffset": 1048,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$projectConfig"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 984,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "    protected $options;\n    protected $outputDir;\n    protected $projectConfig;\n    protected $themeConfig;\n    protected $themeDir;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "db33400cd9805b489290de2ed55975cc1764d1f76c4bf8ea11964a350d25483e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 113,
+                  "startColumn": 13,
+                  "charOffset": 2567,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$originalNode"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 111,
+                  "startColumn": 1,
+                  "charOffset": 2529,
+                  "charLength": 61,
+                  "snippet": {
+                    "text": "     * @var mixed\n     */\n    private $originalNode;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dd49ff01bc0dbe39738c61146f4a0560a4db9a1434b7cbea81d4f230ab16008b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 15,
+                  "charOffset": 970,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$ignoreStar"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 899,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "    protected $docblockObj;\n    protected $ignoreSpaces;\n    protected $ignoreStar;\n    protected $summaryOpen;\n    protected $summaryStr;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ddfd7fca5848361b49cdd2017e2de45e3957ba2b6de8470617831613c56cc91e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 22,
+                  "charOffset": 471,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$instance"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 427,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "{\n    /** @var self */\n    protected static $instance;\n    /** @var OperatorsFactory */\n    protected $operatorsFactory;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e165f2ca7b20dd848f306a3b1f87e6906aab10ba3c480ce0f62d2fd1c5c1f843"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/RawOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 13,
+                  "charOffset": 393,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 355,
+                  "charLength": 59,
+                  "snippet": {
+                    "text": "     * @var array\n     */\n    private $expression;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e2fa628b3dae52857c50d49e64cac99a1a515359a4217db87eb4e735ba128285"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 15,
+                  "charOffset": 968,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$extendedTheme"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 928,
+                  "charLength": 105,
+                  "snippet": {
+                    "text": "     * @var Theme\n     */\n    protected $extendedTheme;\n    protected $options;\n    protected $outputDir;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e6d707df636c74f08d28f6c6f2662a9e061d0b31b87e0feaea46fde921381996"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 15,
+                  "charOffset": 1025,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$summaryStr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 956,
+                  "charLength": 90,
+                  "snippet": {
+                    "text": "    protected $ignoreStar;\n    protected $summaryOpen;\n    protected $summaryStr;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e77dde5e5cf1be3274eb2db8468e644c478c0bd4fb7029a3eecde7c2b277ae5e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 13,
+                  "charOffset": 595,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$elseStatements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 547,
+                  "charLength": 100,
+                  "snippet": {
+                    "text": "     * @var StatementsBlock\n     */\n    private $elseStatements;\n    /**\n     * @var StatementsBlock"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ea0e98b59b8aa13674c4b85135927875556a5df67d8a1bcc4fbfb32823f8eaf6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 15,
+                  "charOffset": 1252,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "$themesDirectories"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1194,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "    /** @var Theme */\n    protected $theme;\n    protected $themesDirectories;\n\n    /** @var string|null */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ea73c80cd7d3cd02c33e108aaae4029d7c8663cc8ee7a2dda9eb65c1d9b2e5f3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/File/Sitemap.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 15,
+                  "charOffset": 489,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$namespaces"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 427,
+                  "charLength": 97,
+                  "snippet": {
+                    "text": "    protected $baseUrl;\n    protected $classes;\n    protected $namespaces;\n    private $baseDir;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f38a56d0ff8e9d9e5c0d71efbcce32f755b228027486e27589f3cd93fd7774b9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingFieldTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing property's type declaration",
+            "markdown": "Missing property's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 15,
+                  "charOffset": 941,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$ignoreSpaces"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 891,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "     */\n    protected $docblockObj;\n    protected $ignoreSpaces;\n    protected $ignoreStar;\n    protected $summaryOpen;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f4726b0748eac37e56058574367a7f5b344b913631fc017cf455c0984fb4c39f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 295,
+                  "startColumn": 33,
+                  "charOffset": 10432,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$readOnly"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 293,
+                  "startColumn": 1,
+                  "charOffset": 10363,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @param bool $readOnly\n     */\n    public function setReadOnly($readOnly): void\n    {\n        $this->readOnly = $readOnly;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "010205f938b7300cce4ef8252270c347179210edf32d221de11de6d1a2449a2a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 256,
+                  "startColumn": 50,
+                  "charOffset": 7483,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 254,
+                  "startColumn": 1,
+                  "charOffset": 7402,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempLocalVariableForWrite($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'stack');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "01601dc4c6f6e8f83e67eb5c8a8327cdc283dc2e38c5f3bb6e8c4db4dd20e465"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 592,
+                  "startColumn": 9,
+                  "charOffset": 23338,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$mustInit"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 590,
+                  "startColumn": 1,
+                  "charOffset": 23278,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "        array $expression,\n        $symbolVariable,\n        $mustInit,\n        $isExpecting,\n        CompilationContext $compilationContext"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "06880f6f82dbced3bd8d470ba1758ffb78b1559386b3eeb208b4da9c25d74381"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 80,
+                  "startColumn": 50,
+                  "charOffset": 2153,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$resolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 78,
+                  "startColumn": 1,
+                  "charOffset": 2074,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    protected function getOutput(string $symbol, $resolvedParams): string\n    {\n        return sprintf("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "081a3380d3605b7163347c26a6bead4f7e44513e3b70865b7ab93e9cfd0b0431"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1062,
+                  "startColumn": 9,
+                  "charOffset": 36720,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$readOnly"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1060,
+                  "startColumn": 1,
+                  "charOffset": 36667,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "        $classDefinition,\n        $property,\n        $readOnly,\n        CompilationContext $context\n    ): void {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "098903c5ae72382d3616f47a6224c5a6847a75fcbf513380fc3efd0e5919c499"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 130,
+                  "startColumn": 38,
+                  "charOffset": 2396,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$dynamicMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 128,
+                  "startColumn": 1,
+                  "charOffset": 2316,
+                  "charLength": 148,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setDynamicMethod($dynamicMethod)\n    {\n        $this->dynamicMethod = $dynamicMethod;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0a9c6dacbc04b61dc14557e81d47bb5cc0b56babfe810c04229959606e8cdf9f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 160,
+                  "startColumn": 41,
+                  "charOffset": 4197,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 158,
+                  "startColumn": 1,
+                  "charOffset": 4122,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "     * @return string|null\n     */\n    public function findThemePathByName($name)\n    {\n        // check the theme from the config"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0fc3b0f0ec85f09204bc32f048a49bacf301733366072940fd1bdfde8bc33ea8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 103,
+                  "startColumn": 61,
+                  "charOffset": 3018,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 101,
+                  "startColumn": 1,
+                  "charOffset": 2916,
+                  "charLength": 159,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    protected function passNativeFCall($compiledExpression, $expression)\n    {\n        return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "13a427b2c129551ac16ab440fc32ecaaa7f55b0b5574507b8ce33372340d6335"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyDecr.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 9,
+                  "charOffset": 1098,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$statement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1002,
+                  "charLength": 201,
+                  "snippet": {
+                    "text": "        ZephirVariable $symbolVariable,\n        CompilationContext $compilationContext,\n        $statement\n    ): void {\n        $this->checkVariableInitialized($variable, $symbolVariable, $statement);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "14f0fd11aeab1a14c9cb5d9ff2734ac4550b3888b608ce907d8058a5ca000a98"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/StaticTypeInference.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 72,
+                  "startColumn": 34,
+                  "charOffset": 2039,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 70,
+                  "startColumn": 1,
+                  "charOffset": 1971,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "     * @param string $type\n     */\n    public function markVariable($variable, $type): void\n    {\n        if (isset($this->variables[$variable])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "167d6e7552a92b57478687b1092c41b31a83d7eecaafc167fcaa2725806e4633"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 157,
+                  "startColumn": 30,
+                  "charOffset": 5245,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$noisy"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 155,
+                  "startColumn": 1,
+                  "charOffset": 5182,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "     * @param bool $noisy\n     */\n    public function setNoisy($noisy): void\n    {\n        $this->noisy = $noisy;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "182c2e88895c58ed3449d9aa426e7105c55246d96bd0abd181adedffb240c563"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 118,
+                  "startColumn": 37,
+                  "charOffset": 2171,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$dynamicClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 116,
+                  "startColumn": 1,
+                  "charOffset": 2092,
+                  "charLength": 144,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setDynamicClass($dynamicClass)\n    {\n        $this->dynamicClass = $dynamicClass;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "191010113798046afc6129406ce46f189b55e2df8197349a4d40d26c86df1fe1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyDecr.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 9,
+                  "charOffset": 991,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$property"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 936,
+                  "charLength": 153,
+                  "snippet": {
+                    "text": "    public function assign(\n        $variable,\n        $property,\n        ZephirVariable $symbolVariable,\n        CompilationContext $compilationContext,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1a24c219e15033a5e2d1915fa24527a14f342e73e1ce1f2d44a449518aca3e11"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyDecr.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 9,
+                  "charOffset": 972,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 928,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "     */\n    public function assign(\n        $variable,\n        $property,\n        ZephirVariable $symbolVariable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1bbcbcdf73cb2a7a9ce883c733c8a0315ecc0e0a3f96bc25149ef017b6ef8cf6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 284,
+                  "startColumn": 41,
+                  "charOffset": 7988,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$themeConfig"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 282,
+                  "startColumn": 1,
+                  "charOffset": 7909,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "     * @throws ConfigException\n     */\n    private function findThemeDirectory($themeConfig, $path = null)\n    {\n        // check if there are additional theme paths in the config"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1c3215c2de8eb95d951c27faebdfd0bc2a29f95399a1d0add907c0ca559a8546"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 103,
+                  "startColumn": 36,
+                  "charOffset": 2747,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$functionName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 101,
+                  "startColumn": 1,
+                  "charOffset": 2684,
+                  "charLength": 158,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function functionExists($functionName, CompilationContext $context)\n    {\n        if (function_exists($functionName)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1d3d1974d87df8b8bde051817095d1be37f1ff68e0c4450f921fb02c6557f268"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 528,
+                  "startColumn": 35,
+                  "charOffset": 17940,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$funcName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 526,
+                  "startColumn": 1,
+                  "charOffset": 17865,
+                  "charLength": 161,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    protected function isReadOnly($funcName, array $expression)\n    {\n        if ($this->isBuiltInFunction($funcName)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1e1fa19a339705930bab294a5e738821d5dc44e8a53e1f0d089747b7286c9e01"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 29,
+                  "charOffset": 1131,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1062,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $this->checkLeft($expression, CompilerException::class, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1e318d31fdbe01d87079a7c560d9d618f847839687d22efdea2521f164c5dd7f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 29,
+                  "charOffset": 1018,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 948,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $propertyAccess = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1ee970923e679d8f4bcfdbb63e34887049bed6a7d8d07d1eb2a396daa72c596b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 328,
+                  "startColumn": 83,
+                  "charOffset": 10032,
+                  "charLength": 26,
+                  "snippet": {
+                    "text": "$initNonReferenced = false"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 326,
+                  "startColumn": 1,
+                  "charOffset": 9918,
+                  "charLength": 215,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempNonTrackedVariable($type, CompilationContext $context, $initNonReferenced = false)\n    {\n        $variable = $this->reuseTempVariable($type, 'non-tracked');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "266080839ec895910186e3ad9742e104e8e06879ec52705ae982f3d26b108808"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 186,
+                  "startColumn": 33,
+                  "charOffset": 4141,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$operator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 184,
+                  "startColumn": 1,
+                  "charOffset": 4071,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "     * @return BinaryOperator\n     */\n    public function setOperator($operator)\n    {\n        $this->operator = $operator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "272424e5228c43e079224805e3bf36a9c070a78bad62988985a0f1b0c9472b36"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 520,
+                  "startColumn": 40,
+                  "charOffset": 16352,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 518,
+                  "startColumn": 1,
+                  "charOffset": 16272,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function getVariableForRead($name, CompilationContext $compilationContext = null, array $statement = null)\n    {\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2798e86199d71d87c2658b2c3adfcd276d996aa9c96143cff74c49afb47a9573"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 187,
+                  "startColumn": 41,
+                  "charOffset": 6318,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 185,
+                  "startColumn": 1,
+                  "charOffset": 6244,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "     * @return Annotation\n     */\n    private function __createAnnotation($name, $string)\n    {\n        switch ($name) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "280ec4b46237326b885b4620e290b70f8ff8cf939080b149c584ccde9a14632a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 34,
+                  "charOffset": 1768,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$arguments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 1692,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setArguments($arguments)\n    {\n        $this->arguments = $arguments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2c84d719c7c980b39897889d381572c0b8d7a6f4cb3d7e7d3fefcd22cd02f37e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 482,
+                  "startColumn": 9,
+                  "charOffset": 18784,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 480,
+                  "startColumn": 1,
+                  "charOffset": 18728,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "        $methodName,\n        array $expression,\n        $symbolVariable,\n        $mustInit,\n        $isExpecting,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2e62cb26dd96fdbc83a8949246b7b71348357ac80c82c5b8a1edf9f139030ee9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/StaticTypeInference.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 72,
+                  "startColumn": 45,
+                  "charOffset": 2050,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 70,
+                  "startColumn": 1,
+                  "charOffset": 1971,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "     * @param string $type\n     */\n    public function markVariable($variable, $type): void\n    {\n        if (isset($this->variables[$variable])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2f9f21cd9022c32d38e0eff372f99bedf2825a2322e88d5b0e9b3b6833e95b7e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler/FileInterface.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 35,
+                  "charOffset": 1097,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$external"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1026,
+                  "charLength": 85,
+                  "snippet": {
+                    "text": "     * @param bool $external\n     */\n    public function setIsExternal($external);\n}\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3210ab16c41543357c90d13a5f260705a9c6fb50061c321f95639e618c6b2bfb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 661,
+                  "startColumn": 33,
+                  "charOffset": 22822,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$funcName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 659,
+                  "startColumn": 1,
+                  "charOffset": 22757,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    protected function optimize($funcName, array $expression, Call $call, CompilationContext $compilationContext)\n    {\n        $optimizer = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "34b95845b8c1ad299c510578ef29d3e8df445604bc5d50f98983779db4ffd64d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallMethodStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 33,
+                  "startColumn": 9,
+                  "charOffset": 717,
+                  "charLength": 30,
+                  "snippet": {
+                    "text": "$type = self::TYPE_CALL_DIRECT"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 31,
+                  "startColumn": 1,
+                  "charOffset": 653,
+                  "charLength": 158,
+                  "snippet": {
+                    "text": "        $name = null,\n        array $parameters = null,\n        $type = self::TYPE_CALL_DIRECT\n    ) {\n        parent::__construct($name, $parameters, $type);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3aaf1d7e6e42b19c07e4e8531f6123a9007224254ac7a4836082f8129e161b7e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 126,
+                  "startColumn": 34,
+                  "charOffset": 2324,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$file"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 124,
+                  "startColumn": 1,
+                  "charOffset": 2262,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setParseInfo($file, $line, $char = null)\n    {\n        $this->setFile($file);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3b46a446fd9068d24e5ba1bb6fe39561d1cee9eb1a29d2d2eeec268668d30443"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 925,
+                  "startColumn": 9,
+                  "charOffset": 32915,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$location"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 923,
+                  "startColumn": 1,
+                  "charOffset": 32847,
+                  "charLength": 160,
+                  "snippet": {
+                    "text": "    protected function registerTempVariable(\n        $type,\n        $location,\n        Variable $variable,\n        CompilationContext $compilationContext = null"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3ca35a77a1bf7605bac863189aa0adcfeff33f00829c2c1f862f19d55cfe6e2b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 103,
+                  "startColumn": 40,
+                  "charOffset": 2997,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "$compiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 101,
+                  "startColumn": 1,
+                  "charOffset": 2916,
+                  "charLength": 159,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    protected function passNativeFCall($compiledExpression, $expression)\n    {\n        return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3d403a95a664b4f710ad34106637a7a63b35bf1255f24b8ace8ac658c7a01857"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 256,
+                  "startColumn": 42,
+                  "charOffset": 6978,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$outputDir"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 254,
+                  "startColumn": 1,
+                  "charOffset": 6902,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @return string|null\n     */\n    private function findOutputDirectory($outputDir)\n    {\n        $outputDir = str_replace('%version%', $this->config->get('version'), $outputDir);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4025222629e79f4c8b510d8464059ffccc69826540fe80c710d9a8a14684042f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/NamespaceAccessor.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 33,
+                  "charOffset": 572,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$files"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 496,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     * @param CompilerFile[] $files\n     */\n    public function __construct($files)\n    {\n        $this->classes = $files;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "417fa132d2dad0952ba7bdf8841f5f0d7f44e416a9d7aa57d8323099660f69e5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 261,
+                  "startColumn": 34,
+                  "charOffset": 8087,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$offset"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 259,
+                  "startColumn": 1,
+                  "charOffset": 8026,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function offsetExists($offset): bool\n    {\n        return isset($this->container[$offset]) || array_key_exists($offset, $this->container);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "43533acd2969d0342376898e2e226ff792c48dd91333e000d4140d03e5f3d767"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 603,
+                  "startColumn": 9,
+                  "charOffset": 20460,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$parameters"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 601,
+                  "startColumn": 1,
+                  "charOffset": 20394,
+                  "charLength": 148,
+                  "snippet": {
+                    "text": "    protected function markReferences(\n        $funcName,\n        $parameters,\n        CompilationContext $compilationContext,\n        &$references,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "45d4130585277d545bc6f66941a637657de94307e68e133afc1936d15a15679c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 480,
+                  "startColumn": 9,
+                  "charOffset": 18736,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$methodName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 478,
+                  "startColumn": 1,
+                  "charOffset": 18682,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "     */\n    protected function callFromClass(\n        $methodName,\n        array $expression,\n        $symbolVariable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "46de1619e542bc62c485984b065298cd6de32197ca6036456a81e3580946b6af"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 9,
+                  "charOffset": 1043,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$property"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 981,
+                  "charLength": 162,
+                  "snippet": {
+                    "text": "    public function assignStatic(\n        $className,\n        $property,\n        CompiledExpression $resolvedExpr,\n        CompilationContext $compilationContext,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "47ace55285e4fc23ff25a3e27d3a5f88df8a1df0fc5453f4e1ec5824bb7d8669"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 593,
+                  "startColumn": 9,
+                  "charOffset": 23357,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$isExpecting"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 591,
+                  "startColumn": 1,
+                  "charOffset": 23305,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "        $symbolVariable,\n        $mustInit,\n        $isExpecting,\n        CompilationContext $compilationContext\n    ): void {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b085eee09f3f9c5069d5899103b58af6e34c39f6886b3030c54f5f4e7bc0e14"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 220,
+                  "startColumn": 59,
+                  "charOffset": 6268,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 218,
+                  "startColumn": 1,
+                  "charOffset": 6178,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempComplexLiteralVariableForWrite($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'heap-literal');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b6ca582eae029eb91bfa10c3585595d032c79000a3d0bfff1b02d54d43a022e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 106,
+                  "startColumn": 30,
+                  "charOffset": 1969,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$class"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 104,
+                  "startColumn": 1,
+                  "charOffset": 1897,
+                  "charLength": 116,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setClass($class)\n    {\n        $this->class = $class;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4d1124daf314aa3307a76168c577e222de366873045c5f54cbf07c233d518723"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2150,
+                  "startColumn": 42,
+                  "charOffset": 71396,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$path"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2148,
+                  "startColumn": 1,
+                  "charOffset": 71340,
+                  "charLength": 157,
+                  "snippet": {
+                    "text": "     *\n     */\n    private function recursiveDeletePath($path, $mask): void\n    {\n        if (!file_exists($path) || !is_dir($path) || !is_readable($path)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4dcdabf4b822a3120dbc1ca6b3636ba324a931a07707ce79cccb4eee4b51b43a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/ArrayType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 26,
+                  "charOffset": 2980,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$caller"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 2922,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function join($caller, CompilationContext $compilationContext, Call $call, array $expression)\n    {\n        $functionCall = BuilderFactory::getInstance()->statements()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "52f7961dab4e86c8b2d7e066bd4b901f742e21ef538cc3445cda695260944c9a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 29,
+                  "charOffset": 1051,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 981,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $propertyAccess = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "53f2c4f8a25f012fa74fcc266f3c3dcad49f677303e544c8d88a7227061e79b4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 733,
+                  "startColumn": 104,
+                  "charOffset": 24268,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$docblock"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 731,
+                  "startColumn": 1,
+                  "charOffset": 24114,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "     * @param array              $docblock\n     */\n    public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock): void\n    {\n        $classDefinition = new Definition($namespace, $topStatement['name']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "55873ca8852efbe61545446e50dfaa527269fd88b577184abfdeed32d52d16d1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 35,
+                  "charOffset": 772,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$assignment"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 709,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function addAssignment($assignment)\n    {\n        $this->assignments[] = $assignment;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "55b1cf02c639b8c1029d06915e7c57bda65c87c89467287651d436a730e955b4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 9,
+                  "charOffset": 984,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 940,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "     */\n    public function assign(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5622ec99bb8f73ae4ac626ac90e5592b574461832bff2e4f981d6d981f5be49e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/HeadersManager.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 65,
+                  "startColumn": 32,
+                  "charOffset": 1178,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$position = 0"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 63,
+                  "startColumn": 1,
+                  "charOffset": 1099,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "     * @throws InvalidArgumentException\n     */\n    public function add($path, $position = 0): void\n    {\n        if (!is_string($path)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "577f4e7c9c2129e0ee2e9ec69920211c6f48d219c7b60890c1f9ec3d43403682"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Property.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 249,
+                  "startColumn": 80,
+                  "charOffset": 6716,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 247,
+                  "startColumn": 1,
+                  "charOffset": 6596,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    protected function declareProperty(CompilationContext $compilationContext, $type, $value): void\n    {\n        $codePrinter = $compilationContext->codePrinter;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5a04dfe9aac8ae7bca911827cb8df41a7626e649a0b8c8a01db95da54ea7a50e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 34,
+                  "charOffset": 1241,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1163,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "     * @return CallFunctionStatement\n     */\n    public function functionCall($name, $parameters = null, $type = CallFunctionStatement::TYPE_CALL_DIRECT)\n    {\n        return new CallFunctionStatement($name, $parameters, $type);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5b1aa6173acadad0481003eb02178e6dadc2204a909b8cf0037172cb92b926e3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 241,
+                  "startColumn": 31,
+                  "charOffset": 7631,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$namespace = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 239,
+                  "startColumn": 1,
+                  "charOffset": 7567,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @return mixed|null\n     */\n    public function get($key, $namespace = null)\n    {\n        return null !== $namespace ? $this->offsetGet([$namespace => $key]) : $this->offsetGet($key);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5b8f8128669e547907606b124b0a16ca5cd407da93a64fb9b7c60b05ee8df8ee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 135,
+                  "startColumn": 9,
+                  "charOffset": 4471,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$classEntry"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 133,
+                  "startColumn": 1,
+                  "charOffset": 4391,
+                  "charLength": 160,
+                  "snippet": {
+                    "text": "     */\n    protected function _assignStaticPropertyArrayMultipleIndex(\n        $classEntry,\n        string $property,\n        CompiledExpression $resolvedExpr,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5cfdbc6c16a47e68eb5f86a4f890960187aaab4afda84521fdeab5d54e42f2e7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 284,
+                  "startColumn": 55,
+                  "charOffset": 8002,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$path = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 282,
+                  "startColumn": 1,
+                  "charOffset": 7909,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "     * @throws ConfigException\n     */\n    private function findThemeDirectory($themeConfig, $path = null)\n    {\n        // check if there are additional theme paths in the config"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5d7a3d686993cc70666a9a1a009f6314b304fc46f6b3607e7ae366eceb5422b7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1923,
+                  "startColumn": 67,
+                  "charOffset": 67135,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$value"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1921,
+                  "startColumn": 1,
+                  "charOffset": 67041,
+                  "charLength": 198,
+                  "snippet": {
+                    "text": "     * @return void\n     */\n    public function updateProperty(Variable $variable, $property, $value, CompilationContext $context): void\n    {\n        $value = $this->resolveValue($value, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "601a764f9cd6dd49d07ad735689529aadff5bccd17f3455da2f4559c3489a47f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ExportSymbol.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 9,
+                  "charOffset": 1095,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$statement = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 983,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "        CompiledExpression $resolvedExpr = null,\n        CompilationContext $compilationContext = null,\n        $statement = null\n    ): void {\n        $codePrinter = $compilationContext->codePrinter;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "60389c9f2ab5291020e5f4a8a64507dc298963fb290b020d6f9c60022398bd1c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 328,
+                  "startColumn": 33,
+                  "charOffset": 9726,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$offset"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 326,
+                  "startColumn": 1,
+                  "charOffset": 9658,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "     */\n    #[ReturnTypeWillChange]\n    public function offsetUnset($offset): void\n    {\n        unset($this->container[$offset]);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "60d8a7503b8a41debb14cf6e9397f0b2ee2ac941d45ae5270c0a83218135a539"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 451,
+                  "startColumn": 88,
+                  "charOffset": 13954,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$init = true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 449,
+                  "startColumn": 1,
+                  "charOffset": 13835,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempVariableForWrite(string $type, CompilationContext $context, $init = true): Variable\n    {\n        $variable = $this->reuseTempVariable($type, 'heap');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "62a1cdaf793ff92f18be7eba59bb97169095ff63be491a201a324c33c929aa62"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 109,
+                  "startColumn": 38,
+                  "charOffset": 2588,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$projectConfig"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 107,
+                  "startColumn": 1,
+                  "charOffset": 2508,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     * @param array $projectConfig\n     */\n    public function setProjectConfig($projectConfig): void\n    {\n        $this->projectConfig = $projectConfig;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6351972e5f72e0f37fe829036ed7112674737f2eb0ca0108a0093796a89fe476"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 924,
+                  "startColumn": 9,
+                  "charOffset": 32900,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 922,
+                  "startColumn": 1,
+                  "charOffset": 32839,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     */\n    protected function registerTempVariable(\n        $type,\n        $location,\n        Variable $variable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "63ec5eb0263bd40ab2e44fb3038b75efd4e2175df90e33d970e5f8ba6425e9f2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/UnlikelyOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 29,
+                  "charOffset": 1020,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 949,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "     * @throws ReflectionException\n     */\n    public function compile($expression, CompilationContext $compilationContext): CompiledExpression\n    {\n        if (!isset($expression['left'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6c608f3473df452e0d9efe5ac036eca02df35cb9c9fd4c14ed6abdde62609454"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 102,
+                  "startColumn": 9,
+                  "charOffset": 2771,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 100,
+                  "startColumn": 1,
+                  "charOffset": 2697,
+                  "charLength": 166,
+                  "snippet": {
+                    "text": "     */\n    protected function _assignPropertyArrayMultipleIndex(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6ea415f2060ec497f246118471b18e2c9be01572ba5acdb52180622a08bdb394"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 29,
+                  "charOffset": 845,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 770,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $this->checkLeft($expression, CompilerException::class, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6f1738291272087c4a9f0a284c80c98dd3efe30bb077b6dd32ba177b5bb6aed2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 340,
+                  "startColumn": 31,
+                  "charOffset": 9972,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$value"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 338,
+                  "startColumn": 1,
+                  "charOffset": 9903,
+                  "charLength": 218,
+                  "snippet": {
+                    "text": "     * @param mixed $namespace\n     */\n    public function set($key, $value, $namespace = null): void\n    {\n        null !== $namespace ? $this->offsetSet([$namespace => $key], $value) : $this->offsetSet($key, $value);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "74af00528def1405417e3286a1ece2eab14ab0c02acd828f84be888b3e19e76d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 9,
+                  "charOffset": 1206,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$statement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1108,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "        CompiledExpression $resolvedExpr,\n        CompilationContext $compilationContext,\n        $statement\n    ): void {\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7904180e15d03eec25b81c281bb23bb1fc11facbe5c7297f17e9066c42889d3d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 591,
+                  "startColumn": 9,
+                  "charOffset": 23313,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 589,
+                  "startColumn": 1,
+                  "charOffset": 23250,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "        string $methodName,\n        array $expression,\n        $symbolVariable,\n        $mustInit,\n        $isExpecting,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7ced52839d36050cadc089ddf1ab7ff7bf2344ba26501683b562154aae10861c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 119,
+                  "startColumn": 37,
+                  "charOffset": 2836,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$themeOptions"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 117,
+                  "startColumn": 1,
+                  "charOffset": 2758,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "     * @param array $themeOptions\n     */\n    public function setThemeOptions($themeOptions): void\n    {\n        $this->themeOptions = $themeOptions;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7d3d923030d16f4f662bc478597587b5b2aee799d22e4248cccde67a0eada85f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 761,
+                  "startColumn": 9,
+                  "charOffset": 30377,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$mustInit"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 759,
+                  "startColumn": 1,
+                  "charOffset": 30317,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "        array $expression,\n        $symbolVariable,\n        $mustInit,\n        $isExpecting,\n        Definition $classDefinition,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8033f32b6ee5c900f04e1d331f7468a52d9e12916aa0cf2686f23649906abbfe"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 340,
+                  "startColumn": 25,
+                  "charOffset": 9966,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "$key"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 338,
+                  "startColumn": 1,
+                  "charOffset": 9903,
+                  "charLength": 218,
+                  "snippet": {
+                    "text": "     * @param mixed $namespace\n     */\n    public function set($key, $value, $namespace = null): void\n    {\n        null !== $namespace ? $this->offsetSet([$namespace => $key], $value) : $this->offsetSet($key, $value);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "80cf6474e3e81c385638b18b1e86908ea338b0ae5e610d7e9b6c7f2b69a1c32d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2150,
+                  "startColumn": 49,
+                  "charOffset": 71403,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$mask"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2148,
+                  "startColumn": 1,
+                  "charOffset": 71340,
+                  "charLength": 157,
+                  "snippet": {
+                    "text": "     *\n     */\n    private function recursiveDeletePath($path, $mask): void\n    {\n        if (!file_exists($path) || !is_dir($path) || !is_readable($path)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "80f6c605fee9789319d44dce2113911b0b0552d2c2dd7674faf57ed7fecfb6a2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 760,
+                  "startColumn": 9,
+                  "charOffset": 30352,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 758,
+                  "startColumn": 1,
+                  "charOffset": 30289,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "        string $methodName,\n        array $expression,\n        $symbolVariable,\n        $mustInit,\n        $isExpecting,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8234a6d6fdcb8f4463df9e080a073ba1835b896e7e196312cc2f87f6adff1314"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 75,
+                  "startColumn": 65,
+                  "charOffset": 1671,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$templatesPath"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 73,
+                  "startColumn": 1,
+                  "charOffset": 1574,
+                  "charLength": 159,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function __construct(array $classes, Config $config, $templatesPath, array $options)\n    {\n        ksort($classes);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "84af102510cac3c3a4a94ccfabb9e0f437601777375fe3b33526a7bc279ddb75"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 117,
+                  "startColumn": 9,
+                  "charOffset": 3414,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 115,
+                  "startColumn": 1,
+                  "charOffset": 3348,
+                  "charLength": 158,
+                  "snippet": {
+                    "text": "     */\n    protected function _assignArrayIndexMultiple(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "87b8531cf3947b4964b0774a450c9eecf6eaf8666db830dcbd25cd2783821c5a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 418,
+                  "startColumn": 56,
+                  "charOffset": 12848,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 416,
+                  "startColumn": 1,
+                  "charOffset": 12761,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempVariableForObserveOrNullify($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'observe-nullify');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8a64169fc673197168be28dbd1607996d38f241374aa8bd99c456aca5b5a1226"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 764,
+                  "startColumn": 41,
+                  "charOffset": 27587,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 762,
+                  "startColumn": 1,
+                  "charOffset": 27506,
+                  "charLength": 169,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function getVariableForWrite($name, CompilationContext $compilationContext, array $statement = null)\n    {\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8d1b6ad454009798a29c43d04314543f72b1c9a9f3ec9a9f25b75697c2a1c7a5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 295,
+                  "startColumn": 60,
+                  "charOffset": 8879,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 293,
+                  "startColumn": 1,
+                  "charOffset": 8788,
+                  "charLength": 214,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempNonTrackedUninitializedVariable($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'non-tracked-uninitialized');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "92071d3c3ff158f0917394dcc1cb493fca2bf4265ea6c9e9ee34dd382efa2ff9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/OperatorsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 138,
+                  "startColumn": 27,
+                  "charOffset": 3807,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$operator = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 136,
+                  "startColumn": 1,
+                  "charOffset": 3744,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @return UnaryOperator\n     */\n    public function unary($operator = null, AbstractBuilder $expression = null)\n    {\n        return new UnaryOperator($operator, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "934aebc95e15548a7d474778271696432640125175c3844ebc04dc231f3a6349"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 301,
+                  "startColumn": 40,
+                  "charOffset": 9143,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$value"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 299,
+                  "startColumn": 1,
+                  "charOffset": 9068,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     */\n    #[ReturnTypeWillChange]\n    public function offsetSet($offset, $value): void\n    {\n        if (!is_array($offset)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "93a2c26703dc636050d99e8868b43720cea779253d3053544f03caa7a7ea0d54"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 188,
+                  "startColumn": 9,
+                  "charOffset": 5638,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$statement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 186,
+                  "startColumn": 1,
+                  "charOffset": 5540,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "        CompiledExpression $resolvedExpr,\n        CompilationContext $compilationContext,\n        $statement\n    ): void {\n        $expression = new Expression($statement['index-expr'][0]);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "961f0e8c9bbf2d6b63b43e1d10c832bb5b6ab4c7f28b056e0e666a9096ca92e3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 167,
+                  "startColumn": 9,
+                  "charOffset": 4837,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 165,
+                  "startColumn": 1,
+                  "charOffset": 4765,
+                  "charLength": 164,
+                  "snippet": {
+                    "text": "     */\n    protected function _assignPropertyArraySingleIndex(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "96c90c41a9a0fbf8efe613441c27dcab4584d60330bdd4c6d3c4d20f742a4931"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/CharType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 27,
+                  "charOffset": 1009,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$caller"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 950,
+                  "charLength": 199,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function toHex($caller, CompilationContext $compilationContext, Call $call, array $expression)\n    {\n        $exprBuilder  = BuilderFactory::getInstance();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "96edf37a43d7ece73cebf48d5df8569885328ef7316993f81c476835ef777343"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 249,
+                  "startColumn": 45,
+                  "charOffset": 7168,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 247,
+                  "startColumn": 1,
+                  "charOffset": 7095,
+                  "charLength": 121,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function getThemeInfoExtendAware($name)\n    {\n        if ($this->extendedTheme) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "97b6558525d30bf369a6291f95e8d83db55eb94983105fdd578205b3d9b01f4e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 112,
+                  "startColumn": 29,
+                  "charOffset": 2094,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$line"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 110,
+                  "startColumn": 1,
+                  "charOffset": 2027,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function setLine($line)\n    {\n        $this->line = $line;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "986355ece56f493ae0b8c3b647b714914a2d398aa5e90e3939e87af785900459"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 733,
+                  "startColumn": 89,
+                  "charOffset": 24253,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$topStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 731,
+                  "startColumn": 1,
+                  "charOffset": 24114,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "     * @param array              $docblock\n     */\n    public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock): void\n    {\n        $classDefinition = new Definition($namespace, $topStatement['name']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "98dd7b784c581d2c0c4596fd576352d5efacd107f697156b1e8f404726690df1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 605,
+                  "startColumn": 9,
+                  "charOffset": 20529,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "&$references"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 603,
+                  "startColumn": 1,
+                  "charOffset": 20452,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "        $parameters,\n        CompilationContext $compilationContext,\n        &$references,\n        $expression\n    ): void {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9ab5a8b6d84f239503cedcfde734b74095e3a1a0305406258684ebe8fadb4e13"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/StaticTypeInference.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 36,
+                  "charOffset": 1442,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1379,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function getInferedType($variable)\n    {\n        if (isset($this->variables[$variable])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9bcba5c530b7b4ddda4d6057ac48981996c4becd9c964edf8d8840260a2014c2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1923,
+                  "startColumn": 56,
+                  "charOffset": 67124,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$property"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1921,
+                  "startColumn": 1,
+                  "charOffset": 67041,
+                  "charLength": 198,
+                  "snippet": {
+                    "text": "     * @return void\n     */\n    public function updateProperty(Variable $variable, $property, $value, CompilationContext $context): void\n    {\n        $value = $this->resolveValue($value, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a54f33eef5bb6a939732cdf6ae4dff162385eeb9eac0ade14cd2fe060b996dcd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 340,
+                  "startColumn": 39,
+                  "charOffset": 9980,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$namespace = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 338,
+                  "startColumn": 1,
+                  "charOffset": 9903,
+                  "charLength": 218,
+                  "snippet": {
+                    "text": "     * @param mixed $namespace\n     */\n    public function set($key, $value, $namespace = null): void\n    {\n        null !== $namespace ? $this->offsetSet([$namespace => $key], $value) : $this->offsetSet($key, $value);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a6c77f32c4d22edc330e4112341c064b0d2ebcdfa81e56754829a56d03410dd7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 44,
+                  "charOffset": 1677,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$directory"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1594,
+                  "charLength": 158,
+                  "snippet": {
+                    "text": "     * @param string $directory\n     */\n    public static function addOptimizerDir($directory): void\n    {\n        self::$optimizerDirectories[] = $directory;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a741d9a732dfbc7031adbb8bdd06473f8b552a38c9cd67198d41db5b7653e83f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 233,
+                  "startColumn": 34,
+                  "charOffset": 6784,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 231,
+                  "startColumn": 1,
+                  "charOffset": 6717,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return mixed|null\n     */\n    public function getThemeInfo($name)\n    {\n        if (isset($this->themeInfos[$name])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a757ea2cd09c25056bf43f06902795ff221ba7220c0aae90187f642a936e25bd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/StaticTypeInference.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 178,
+                  "startColumn": 54,
+                  "charOffset": 5137,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 176,
+                  "startColumn": 1,
+                  "charOffset": 5049,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "     * @param string $type\n     */\n    public function markVariableIfUnknown($variable, $type): void\n    {\n        $this->variables[$variable] = $type;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a9a0e632ba3d9ae862bf56ea67a8d5baeeffbfd84939cb24aa25102afe8ea5d8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/AbstractType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 64,
+                  "startColumn": 9,
+                  "charOffset": 1434,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$caller"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 62,
+                  "startColumn": 1,
+                  "charOffset": 1371,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "    public function invokeMethod(\n        $methodName,\n        $caller,\n        CompilationContext $compilationContext,\n        Call $call,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aa119720db24186a5e982009a4d77cde0a874f2883b0f1601cea41d5a27c4c42"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1013,
+                  "startColumn": 9,
+                  "charOffset": 35179,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$readOnly"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1011,
+                  "startColumn": 1,
+                  "charOffset": 35116,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "        Variable $variableVariable,\n        $property,\n        $readOnly,\n        CompilationContext $context\n    ): void {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aa27c3b17cf8df657501fd2d6f2025f3f21ff9ecbcfb950b48ce636a6c657758"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 274,
+                  "startColumn": 31,
+                  "charOffset": 8401,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$offset"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 272,
+                  "startColumn": 1,
+                  "charOffset": 8335,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     */\n    #[ReturnTypeWillChange]\n    public function offsetGet($offset)\n    {\n        if (!is_array($offset)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aa66b79b3619599926fb8c84677a4c3e24d43c9a00cd072ef193c2efeb2b0db2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 128,
+                  "startColumn": 33,
+                  "charOffset": 2401,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$typeCall"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 126,
+                  "startColumn": 1,
+                  "charOffset": 2340,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setTypeCall($typeCall)\n    {\n        $this->typeCall = $typeCall;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aa72a1bacd00510068fbdf530ab02b79a71fd0d8d317fd1479f70a0009056471"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 109,
+                  "startColumn": 33,
+                  "charOffset": 2206,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 107,
+                  "startColumn": 1,
+                  "charOffset": 2145,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setVariable($variable)\n    {\n        $this->variable = $variable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b0977eada3ad90da20f9bccb7aa39f4c9c3461c9b5940ab5d59516fad77d9186"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 116,
+                  "startColumn": 29,
+                  "charOffset": 2225,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 114,
+                  "startColumn": 1,
+                  "charOffset": 2168,
+                  "charLength": 98,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setName($name)\n    {\n        $this->name = $name;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b26f10d22de70445fd892f5b10dad57328bbd47f4ed3db555d209ac75260a940"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/HeadersManager.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 65,
+                  "startColumn": 25,
+                  "charOffset": 1171,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$path"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 63,
+                  "startColumn": 1,
+                  "charOffset": 1099,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "     * @throws InvalidArgumentException\n     */\n    public function add($path, $position = 0): void\n    {\n        if (!is_string($path)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b501ec6b37905313bda017c4adba54f4e5974fed36d0324ab06483b68339a35d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 26,
+                  "charOffset": 2334,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$value"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 2273,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "     * @return RawStatement\n     */\n    public function rawC($value)\n    {\n        return $this->raw(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b5d8f62d029e3f67774e58cba525302b8c3fa2e040da9a0f7b9900912ed27cdc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 301,
+                  "startColumn": 31,
+                  "charOffset": 9134,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$offset"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 299,
+                  "startColumn": 1,
+                  "charOffset": 9068,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     */\n    #[ReturnTypeWillChange]\n    public function offsetSet($offset, $value): void\n    {\n        if (!is_array($offset)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba6fb7353fd80da802d852bb2f9d9b8fc26044a47f534ee746b93be3b90f47eb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2224,
+                  "startColumn": 69,
+                  "charOffset": 73376,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "$callback = 'copy'"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2222,
+                  "startColumn": 1,
+                  "charOffset": 73293,
+                  "charLength": 134,
+                  "snippet": {
+                    "text": "     *\n     */\n    private function recursiveProcess($src, $dest, $pattern = null, $callback = 'copy')\n    {\n        $success  = true;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bdd993864287c6af7f0bf7c38ca4f6952808f760bc6ceced8329218055e0e6d6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2224,
+                  "startColumn": 52,
+                  "charOffset": 73359,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$pattern = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2222,
+                  "startColumn": 1,
+                  "charOffset": 73293,
+                  "charLength": 134,
+                  "snippet": {
+                    "text": "     *\n     */\n    private function recursiveProcess($src, $dest, $pattern = null, $callback = 'copy')\n    {\n        $success  = true;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c3432fd418e9cfc237f252b752843e1e4e10f1081e07572c6519e16975edd6a7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 136,
+                  "startColumn": 34,
+                  "charOffset": 3705,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$funcName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 3625,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "     * @return ReflectionFunction|null\n     */\n    public function getReflector($funcName)\n    {\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c37d2a9491a1c358345de84bd0fe60bd127a26c1688ec68c08ac1c4b226a1f34"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 133,
+                  "startColumn": 9,
+                  "charOffset": 4686,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "&$isFullString"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 131,
+                  "startColumn": 1,
+                  "charOffset": 4603,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "        array $expression,\n        CompilationContext $compilationContext,\n        &$isFullString\n    ): array {\n        $originalExpr = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c49815b55f756cfd9b78b6f08352b2cd5e64fa438bea3b245b4451a5ba3710ea"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 29,
+                  "charOffset": 1732,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$char"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 1665,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function setChar($char)\n    {\n        $this->char = $char;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c58df3e83b03284fc3ff8e85ef175500d92d4b08397e0c3f4317c0abb86618a1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 484,
+                  "startColumn": 9,
+                  "charOffset": 18828,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$isExpecting"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 482,
+                  "startColumn": 1,
+                  "charOffset": 18776,
+                  "charLength": 150,
+                  "snippet": {
+                    "text": "        $symbolVariable,\n        $mustInit,\n        $isExpecting,\n        Definition $classDefinition,\n        CompilationContext $compilationContext,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c6c28f766280335cf8e44be5c1a7879a8b2f7f1ed069ffd8dc3f7a33a242befb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/AbstractType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 9,
+                  "charOffset": 1413,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$methodName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1363,
+                  "charLength": 127,
+                  "snippet": {
+                    "text": "     */\n    public function invokeMethod(\n        $methodName,\n        $caller,\n        CompilationContext $compilationContext,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c6c81de57e0a424a51024b6e071069aeb9e6e730bb131c11a2aaf5172b5122a8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 846,
+                  "startColumn": 41,
+                  "charOffset": 28273,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$namespace"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 844,
+                  "startColumn": 1,
+                  "charOffset": 28194,
+                  "charLength": 206,
+                  "snippet": {
+                    "text": "     * @param array  $docblock\n     */\n    public function preCompileInterface($namespace, $topStatement, $docblock): void\n    {\n        $classDefinition = new Definition($namespace, $topStatement['name']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c7b631fb9a789358fc8eaa972238f00a7f44aa2beb838342e700485c7fcd2a06"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 41,
+                  "charOffset": 1248,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "$parameters = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1163,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "     * @return CallFunctionStatement\n     */\n    public function functionCall($name, $parameters = null, $type = CallFunctionStatement::TYPE_CALL_DIRECT)\n    {\n        return new CallFunctionStatement($name, $parameters, $type);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c809a0944d22a4f6b4a06a7bb5e33e316db0737fafbb5818f8efc74918daee7e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 241,
+                  "startColumn": 25,
+                  "charOffset": 7625,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "$key"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 239,
+                  "startColumn": 1,
+                  "charOffset": 7567,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @return mixed|null\n     */\n    public function get($key, $namespace = null)\n    {\n        return null !== $namespace ? $this->offsetGet([$namespace => $key]) : $this->offsetGet($key);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c89f788a28630f881bfcc8b573b0a2b0fbe01f736092c4ecaae659e9e9a911aa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 762,
+                  "startColumn": 9,
+                  "charOffset": 30396,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$isExpecting"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 760,
+                  "startColumn": 1,
+                  "charOffset": 30344,
+                  "charLength": 150,
+                  "snippet": {
+                    "text": "        $symbolVariable,\n        $mustInit,\n        $isExpecting,\n        Definition $classDefinition,\n        CompilationContext $compilationContext,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c96592670d4b91f7dbaf7d2051dd32c0ad8ae98c5268abe69c1395858949d3b4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 121,
+                  "startColumn": 9,
+                  "charOffset": 3563,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$statement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 119,
+                  "startColumn": 1,
+                  "charOffset": 3465,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "        CompiledExpression $resolvedExpr,\n        CompilationContext $compilationContext,\n        $statement\n    ): void {\n        $offsetExprs = [];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "caf3fb3e2d5c16fc6b22cf6a3d4e44de1bffe044950656cada420ff223f6f6b6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 846,
+                  "startColumn": 53,
+                  "charOffset": 28285,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$topStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 844,
+                  "startColumn": 1,
+                  "charOffset": 28194,
+                  "charLength": 206,
+                  "snippet": {
+                    "text": "     * @param array  $docblock\n     */\n    public function preCompileInterface($namespace, $topStatement, $docblock): void\n    {\n        $classDefinition = new Definition($namespace, $topStatement['name']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cbd8389bfdbff24dcaef49faa41f78b6786b6ba39b9fb7d1a395ecc8e376aea8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 146,
+                  "startColumn": 37,
+                  "charOffset": 4929,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$expecting"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 144,
+                  "startColumn": 1,
+                  "charOffset": 4838,
+                  "charLength": 197,
+                  "snippet": {
+                    "text": "     * @param Variable|null $expectingVariable\n     */\n    public function setExpectReturn($expecting, Variable $expectingVariable = null): void\n    {\n        $this->expecting         = $expecting;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ccbe4bda924b8a97aea525ee6bb903776f155e28aafa0e9efbe7e00108d21b3d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 427,
+                  "startColumn": 76,
+                  "charOffset": 13838,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$topStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 425,
+                  "startColumn": 1,
+                  "charOffset": 13708,
+                  "charLength": 242,
+                  "snippet": {
+                    "text": "     * @param array              $topStatement\n     */\n    public function compileComment(CompilationContext $compilationContext, $topStatement): void\n    {\n        $compilationContext->codePrinter->output('/' . $topStatement['value'] . '/');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ce3786f253706f8fe10703df6f88910d3a942c1f9874d7bff3ec3dbff709087e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 35,
+                  "charOffset": 1256,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$statements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1193,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setStatements($statements)\n    {\n        $this->statements = $statements;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d144f8cfcc08605d59724df7acc6ec48faab2c3eef55b59fabaac6eb7b6b7204"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 167,
+                  "startColumn": 33,
+                  "charOffset": 5455,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$readOnly"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 165,
+                  "startColumn": 1,
+                  "charOffset": 5386,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @param bool $readOnly\n     */\n    public function setReadOnly($readOnly): void\n    {\n        $this->readOnly = $readOnly;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d162c3f42ff4ca8abd71135d4b82f2e5fe78d2d9cd5f9d8964142e3c516ca6f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 126,
+                  "startColumn": 41,
+                  "charOffset": 2331,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$line"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 124,
+                  "startColumn": 1,
+                  "charOffset": 2262,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setParseInfo($file, $line, $char = null)\n    {\n        $this->setFile($file);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d1911ed8a5144c8381cd358a0f4affe3125d6bcce69f5d2128769d19ff10139a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1060,
+                  "startColumn": 9,
+                  "charOffset": 36675,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1058,
+                  "startColumn": 1,
+                  "charOffset": 36592,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "    public function fetchStaticProperty(\n        Variable $symbolVariable,\n        $classDefinition,\n        $property,\n        $readOnly,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d5bb2e6bbb9cfe6c26a7d8eef7d6661536e20a6e43f7eb90db672a3bf5a7ef58"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/StaticTypeInference.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 178,
+                  "startColumn": 43,
+                  "charOffset": 5126,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 176,
+                  "startColumn": 1,
+                  "charOffset": 5049,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "     * @param string $type\n     */\n    public function markVariableIfUnknown($variable, $type): void\n    {\n        $this->variables[$variable] = $type;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d73ba907f0ce357cc00d632e289d6504b5b727d7936f74ba948085a2e97a2c61"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 385,
+                  "startColumn": 47,
+                  "charOffset": 11758,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$type"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 383,
+                  "startColumn": 1,
+                  "charOffset": 11680,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempVariableForObserve($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'observe');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "de1090bff7306282e9d15ceed1a1ef20e74cbf113af20ae4fa7e380d6c6f0ef7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 100,
+                  "startColumn": 29,
+                  "charOffset": 1913,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$file"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 98,
+                  "startColumn": 1,
+                  "charOffset": 1846,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function setFile($file)\n    {\n        $this->file = $file;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "df05420dcc7eae3bd1e1a15d705d9255d2c79022117b01bad6b64b9147eaf587"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ExportSymbol.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 9,
+                  "charOffset": 925,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 881,
+                  "charLength": 150,
+                  "snippet": {
+                    "text": "     */\n    public function assign(\n        $variable,\n        ZephirVariable $symbolVariable = null,\n        CompiledExpression $resolvedExpr = null,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dfa94a4a8428f7d0788db77640c1c902d9c1f11ab721168633fcfb96afc815a2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 649,
+                  "startColumn": 52,
+                  "charOffset": 21612,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$code"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 647,
+                  "startColumn": 1,
+                  "charOffset": 21511,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     */\n    public function assignZval(Variable $variable, $code, CompilationContext $context): void\n    {\n        $code = $this->resolveValue($code, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e187343889a1a58bc7d513907a22a99f3772d998fe2c9051a6d63e782197df5a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 142,
+                  "startColumn": 31,
+                  "charOffset": 2611,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$method"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 140,
+                  "startColumn": 1,
+                  "charOffset": 2538,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setMethod($method)\n    {\n        $this->method = $method;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e1fbeda17c735a9c738d40fdd63163d8a530939f7ad4d83fc866e9f7e2eab2a9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 733,
+                  "startColumn": 77,
+                  "charOffset": 24241,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$namespace"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 731,
+                  "startColumn": 1,
+                  "charOffset": 24114,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "     * @param array              $docblock\n     */\n    public function preCompileClass(CompilationContext $compilationContext, $namespace, $topStatement, $docblock): void\n    {\n        $classDefinition = new Definition($namespace, $topStatement['name']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e2836b3b4b5b0fe7887be606c7b56e34fcdd0b8cb798bec8752a34a9546c4b34"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 61,
+                  "charOffset": 1268,
+                  "charLength": 47,
+                  "snippet": {
+                    "text": "$type = CallFunctionStatement::TYPE_CALL_DIRECT"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1163,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "     * @return CallFunctionStatement\n     */\n    public function functionCall($name, $parameters = null, $type = CallFunctionStatement::TYPE_CALL_DIRECT)\n    {\n        return new CallFunctionStatement($name, $parameters, $type);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e2c73a099a8c96f23f67fd748aff48006d2d67731e2760931969cf386e6ffbe2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 9,
+                  "charOffset": 1057,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1013,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "     */\n    public function assign(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e5fc4fea2f81deff1e20b99cab5468db07cbd3decad16dc1e9922bea56d99af8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 602,
+                  "startColumn": 9,
+                  "charOffset": 20441,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$funcName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 600,
+                  "startColumn": 1,
+                  "charOffset": 20386,
+                  "charLength": 134,
+                  "snippet": {
+                    "text": "     */\n    protected function markReferences(\n        $funcName,\n        $parameters,\n        CompilationContext $compilationContext,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e65da6b24f0358b17beb6e424d4acc03e6b0a39dd35b4367f912782816582d81"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 483,
+                  "startColumn": 9,
+                  "charOffset": 18809,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$mustInit"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 481,
+                  "startColumn": 1,
+                  "charOffset": 18749,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "        array $expression,\n        $symbolVariable,\n        $mustInit,\n        $isExpecting,\n        Definition $classDefinition,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e7f9c2c4e588c6c59165a41973b6a2de95fa3ded1f2f266713b50baf84a08dd1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 668,
+                  "startColumn": 9,
+                  "charOffset": 26511,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 666,
+                  "startColumn": 1,
+                  "charOffset": 26418,
+                  "charLength": 160,
+                  "snippet": {
+                    "text": "    protected function callFromDynamicClassDynamicMethod(\n        array $expression,\n        $symbolVariable,\n        bool $mustInit,\n        bool $isExpecting,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e86715129b1c3bd7fad9ae9a49b9a8a983fc43ea2c75c0ddeebdddfa256b2e46"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 846,
+                  "startColumn": 68,
+                  "charOffset": 28300,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$docblock"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 844,
+                  "startColumn": 1,
+                  "charOffset": 28194,
+                  "charLength": 206,
+                  "snippet": {
+                    "text": "     * @param array  $docblock\n     */\n    public function preCompileInterface($namespace, $topStatement, $docblock): void\n    {\n        $classDefinition = new Definition($namespace, $topStatement['name']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e90123451c5b0e81d7c0eb43645870b5571cafac1508b7c29bcc2d15599b9ad8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ListCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 48,
+                  "charOffset": 639,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$mergeArgs = true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 554,
+                  "charLength": 171,
+                  "snippet": {
+                    "text": "     * @param bool $mergeArgs\n     */\n    public function mergeApplicationDefinition($mergeArgs = true): void\n    {\n        parent::mergeApplicationDefinition($mergeArgs);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ed911ec734bb3aaba5004564f7b69f6b1016593d05e0393c9e04f715bd353492"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 36,
+                  "charOffset": 1099,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$assignments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1035,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setAssignments($assignments)\n    {\n        $this->assignments = $assignments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ee1a16411b707a227193cf3f4f9faa959d0e172b9e3647d3e5d71d029b6f1dbd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1012,
+                  "startColumn": 9,
+                  "charOffset": 35160,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$property"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1010,
+                  "startColumn": 1,
+                  "charOffset": 35082,
+                  "charLength": 143,
+                  "snippet": {
+                    "text": "        Variable $symbolVariable,\n        Variable $variableVariable,\n        $property,\n        $readOnly,\n        CompilationContext $context"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ef5456d38604963a79422bef21c4a0465b29506c41faf3bc59342541d581bd8c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 606,
+                  "startColumn": 9,
+                  "charOffset": 20551,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 604,
+                  "startColumn": 1,
+                  "charOffset": 20473,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "        CompilationContext $compilationContext,\n        &$references,\n        $expression\n    ): void {\n        if ($this->isBuiltInFunction($funcName)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ef859b923d5936a905125786823cba2d1cf8ccf4295dbcba10fa951440aca88f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 337,
+                  "startColumn": 56,
+                  "charOffset": 9919,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$options = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 335,
+                  "startColumn": 1,
+                  "charOffset": 9831,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    private function prepareThemeOptions($themeConfig, $options = null)\n    {\n        $parsedOptions = null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "efbf59af0e821cc1cb44bc54003f53a4ece790840400df9d9f2d026cd62a32d0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 337,
+                  "startColumn": 42,
+                  "charOffset": 9905,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$themeConfig"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 335,
+                  "startColumn": 1,
+                  "charOffset": 9831,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    private function prepareThemeOptions($themeConfig, $options = null)\n    {\n        $parsedOptions = null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f355d516e448c0ea8dfdafb4c7e8990817401e01595f52b4907ef2af0b70960f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 187,
+                  "startColumn": 48,
+                  "charOffset": 6325,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$string"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 185,
+                  "startColumn": 1,
+                  "charOffset": 6244,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "     * @return Annotation\n     */\n    private function __createAnnotation($name, $string)\n    {\n        switch ($name) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f3ba096c0555fc6ba1894e2822b9eed75052fdd91a6d6e1d087ffa3f12fd31b4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 9,
+                  "charOffset": 1023,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$className"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 973,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     */\n    public function assignStatic(\n        $className,\n        $property,\n        CompiledExpression $resolvedExpr,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f3fe0383d9aa85f6db83370cdd3f471cbd17200c3f9caa9fcfea2a41f60413b0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 629,
+                  "startColumn": 9,
+                  "charOffset": 21085,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "$value"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 627,
+                  "startColumn": 1,
+                  "charOffset": 21015,
+                  "charLength": 150,
+                  "snippet": {
+                    "text": "    public function assignString(\n        Variable $variable,\n        $value,\n        CompilationContext $context,\n        bool $useCodePrinter = true"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f4578d3a57f3f0721177dd2c295909530859b7eb56ddf31a817f5f09f021f587"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParamTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing parameter's type declaration",
+            "markdown": "Missing parameter's type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Cache/MethodCache.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 201,
+                  "startColumn": 39,
+                  "charOffset": 7139,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "$classDefinition = null"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 199,
+                  "startColumn": 1,
+                  "charOffset": 7073,
+                  "charLength": 156,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    private function isClassCacheable($classDefinition = null): bool\n    {\n        if ($classDefinition instanceof Definition) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f8e9daa180ed915ae87b224465e7ba926a5463b9b2836b88be347e92bdd18488"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingParentConstructorInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Missing parent constructor call",
+            "markdown": "Missing parent constructor call"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionDefinition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 21,
+                  "charOffset": 563,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 506,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "    private bool $isGlobal = false;\n\n    public function __construct(\n        private string $namespace,\n        protected string $name,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "27793a1c4a39d77b77d249d2e3a4f3f94d3fb91bcc8b2c8c8f31aac015f6c6cf"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 21,
+                  "charOffset": 1821,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "setCondition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 1772,
+                  "charLength": 135,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setCondition(AbstractOperator $condition)\n    {\n        $this->condition = $condition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "003f5c475408944ad613a952cc6593933a602eedbaf55e01ed9abcbe5d0a53a7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 21,
+                  "charOffset": 1854,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getTypeCall"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 1807,
+                  "charLength": 98,
+                  "snippet": {
+                    "text": "     * @return int\n     */\n    public function getTypeCall()\n    {\n        return $this->typeCall;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0068fe52bb48a5a2a880dce97044faab85565c3e8eeb6a1d19ed19d1cceffa11"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 21,
+                  "charOffset": 1117,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getArguments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1068,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getArguments()\n    {\n        return $this->arguments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "00cfdb0980b6f57975182228a4c33df4677b321a74a03d9eb9ba14d7959eed3c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 78,
+                  "startColumn": 24,
+                  "charOffset": 1406,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 76,
+                  "startColumn": 1,
+                  "charOffset": 1354,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function preBuild()\n    {\n        return $this->getStatements();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0104e3d5e86c2a4c5582b6f45fddf8943fb1c81759ac414942ad8a171e3f98ae"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 128,
+                  "startColumn": 21,
+                  "charOffset": 2389,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "setTypeCall"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 126,
+                  "startColumn": 1,
+                  "charOffset": 2340,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setTypeCall($typeCall)\n    {\n        $this->typeCall = $typeCall;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "014ae50816e6dd3cee23ba52f03087358f344ecda45cfc27f1385b4f64668b9e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 100,
+                  "startColumn": 21,
+                  "charOffset": 2048,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "setElseStatements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 98,
+                  "startColumn": 1,
+                  "charOffset": 1999,
+                  "charLength": 154,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setElseStatements(StatementsBlock $elseStatements)\n    {\n        $this->elseStatements = $elseStatements;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "01c39ad614420a7dcf6fd8b76ec4135d4c9a56f0241bd908e3852f469ab608a9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/RawStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 684,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 635,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function getExpression()\n    {\n        return $this->expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "028c454f5b485d4179193816890ab17d4a2aa4defbb6c23d72352304a4f309c9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UcfirstOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 21,
+                  "charOffset": 890,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 837,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0525860df493df8c51738baafe0f9f67d44dea996a48a19b2ad27b5753357588"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/RawStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 21,
+                  "charOffset": 843,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 794,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setExpression(array $expression)\n    {\n        $this->expression = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "054d65c87f65b61d9e16cc78d4bfb5d3a2c5f1abb60df6fc95afb3e7fdafae75"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FcloseOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 869,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 808,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "057f042ffd874e69b00bf0ffc85d185ac1ceba99664df1e38ea39e66f88158ed"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsArrayOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 24,
+                  "charOffset": 514,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 434,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "class IsArrayOptimizer extends IsTypeOptimizerAbstract\n{\n    protected function getType()\n    {\n        return 'IS_ARRAY';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "05f8679aaf0231ee69f7d123ff7f2c23e72ef3133bce3675357217723de31902"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/OperatorsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 113,
+                  "startColumn": 21,
+                  "charOffset": 3235,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "hint"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 111,
+                  "startColumn": 1,
+                  "charOffset": 3180,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "     * @return RawOperator\n     */\n    public function hint($type, AbstractBuilder $expression)\n    {\n        return $this->raw(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "066c4cc045a9e061aadaed99e789158cbb2479ef0f0e48cffc7b6295971a5234"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 174,
+                  "startColumn": 21,
+                  "charOffset": 3889,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "setLeftExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 172,
+                  "startColumn": 1,
+                  "charOffset": 3831,
+                  "charLength": 163,
+                  "snippet": {
+                    "text": "     * @return BinaryOperator\n     */\n    public function setLeftExpression(AbstractBuilder $leftExpression)\n    {\n        $this->leftExpression = $leftExpression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "06e2ccdc5ea59bcc5c5768dc057dde764b900c2e265c36dd5db212c0ef5d6d6c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 21,
+                  "charOffset": 785,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 712,
+                  "charLength": 195,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        $call->processExpectedReturn($context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "080db03f65fe9ef6aa3ad645634d6ae0181036b0e3f78a762b1d12ab72ff8fb9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 897,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 836,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "08d8f4bff4cf373c2624f440d563d71a9a3f4aa240ae126ba5f9763d93c55ed9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/UnaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 115,
+                  "startColumn": 21,
+                  "charOffset": 2355,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "setOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 113,
+                  "startColumn": 1,
+                  "charOffset": 2306,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setOperator($operator)\n    {\n        $this->operator = $operator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "09f01186c2e0383001bb0b29e8daf5b42471af34383fe5d12c7f8ef7b7abc630"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 274,
+                  "startColumn": 21,
+                  "charOffset": 8391,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "offsetGet"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 272,
+                  "startColumn": 1,
+                  "charOffset": 8335,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     */\n    #[ReturnTypeWillChange]\n    public function offsetGet($offset)\n    {\n        if (!is_array($offset)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0a5422b26f129f74d754cf3dada2a15feb22a6ec4b92ee342bae89caa56e9788"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/FileSystemInterface.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 114,
+                  "startColumn": 21,
+                  "charOffset": 2380,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "requireFile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 112,
+                  "startColumn": 1,
+                  "charOffset": 2331,
+                  "charLength": 84,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function requireFile(string $path);\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0b040d516b39137d4a3219575ec22cdff4dae64f1089941a82b60ca65205b102"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CamelizeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 21,
+                  "charOffset": 1052,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 991,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0b0d06a19011bf64e6ae4e34e2ec422c262a643aa158e04c8a6d1bde57de4853"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 232,
+                  "startColumn": 22,
+                  "charOffset": 7733,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "nextCharacter"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 230,
+                  "startColumn": 1,
+                  "charOffset": 7656,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @return string the new current character\n     */\n    private function nextCharacter()\n    {\n        ++$this->currentCharIndex;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0bb9a806e6b6764f07f71746f3ed0c552f15552581ac3232e11e1a77b8d9e360"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrReplaceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 882,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 821,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0e45a953884d2fd0806da5eab090ab70d3c770ef975cdfb90cf808431db63659"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 882,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 821,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0f47eb9bb9df756c1990bc6aae462d6841cbbfd2aa4ed76c23a469b558488557"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 87,
+                  "startColumn": 21,
+                  "charOffset": 1846,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 85,
+                  "startColumn": 1,
+                  "charOffset": 1796,
+                  "charLength": 101,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getVariable()\n    {\n        return $this->variable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0fd69886b36e9a67b472edb56dcc5972273861d51939db934e389e3675825dc9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/OptimizerAbstract.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 33,
+                  "startColumn": 30,
+                  "charOffset": 678,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 31,
+                  "startColumn": 1,
+                  "charOffset": 620,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    abstract public function optimize(array $expression, Call $call, CompilationContext $context);\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "10652cb8887e6a8b10d0f8959a584ce837ddafa1a82de1fa8f572ff48971eeac"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Annotation/Link.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 31,
+                  "startColumn": 21,
+                  "charOffset": 599,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getLinkText"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 29,
+                  "startColumn": 1,
+                  "charOffset": 558,
+                  "charLength": 97,
+                  "snippet": {
+                    "text": "    protected $uri;\n\n    public function getLinkText()\n    {\n        if (!$this->contentParsed) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "10fd06e95bba11654b345f1623cfc505873aebd28785baaa4e54b74d1abbcab7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Property.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 346,
+                  "startColumn": 24,
+                  "charOffset": 9701,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getLetStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 344,
+                  "startColumn": 1,
+                  "charOffset": 9671,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "    }\n\n    protected function getLetStatement()\n    {\n        $exprBuilder = BuilderFactory::getInstance();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "11db90c66cec3c63598d1edd9c9e7396c236b5d2a2fe336a988dfb0318fbaea1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetCalledClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 895,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 834,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "121d2d036d6105e0202266a8c8e6890c4220e1734d1142cc268285df412fd0b5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 21,
+                  "charOffset": 865,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 804,
+                  "charLength": 146,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "13ebdf9e585828c1c92f23d20597343aa78ce18ca3134bc8920a2e1b17941525"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 21,
+                  "charOffset": 1083,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getStatements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1034,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function getStatements()\n    {\n        return $this->statements;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "141dd98c38a0203657a5354bb2b9e6e289e1f29a3a1f50f17a401f81d3820a0e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 78,
+                  "startColumn": 21,
+                  "charOffset": 1575,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getLine"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 76,
+                  "startColumn": 1,
+                  "charOffset": 1525,
+                  "charLength": 93,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getLine()\n    {\n        return $this->line;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "14cac5cabc9a19ead9b03b70fc6f3e3cc35699fd51b06865c39ccbdff88f22c7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 21,
+                  "charOffset": 955,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "build"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 906,
+                  "charLength": 112,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function build()\n    {\n        return $this->resolve($this->preBuild());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "156a7a9bbdbed77eecc8760d2e96d0cf3d1ee8ad0f873c89fdd8a9321ffb1be9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArray.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 21,
+                  "charOffset": 1217,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1164,
+                  "charLength": 137,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function compile(array $expression, CompilationContext $compilationContext)\n    {\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "165323488362cc7b8735a6ac9a8289fe725ae2a577b68ebbb86cb82dff051e15"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Constants.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 21,
+                  "charOffset": 2155,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 2094,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function compile(array $expression, CompilationContext $compilationContext)\n    {\n        $isPhpConstant    = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "184d95afb2244d67d898520bf574cca8feadbd8492db31ab82fe381f1d46cd8e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 186,
+                  "startColumn": 21,
+                  "charOffset": 4129,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "setOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 184,
+                  "startColumn": 1,
+                  "charOffset": 4071,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "     * @return BinaryOperator\n     */\n    public function setOperator($operator)\n    {\n        $this->operator = $operator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1adf4aa4913472785ba24a6a63fd43dc5103515246e4c7d7f83527c6fef58994"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 119,
+                  "startColumn": 24,
+                  "charOffset": 2350,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 117,
+                  "startColumn": 1,
+                  "charOffset": 2298,
+                  "charLength": 85,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     */\n    protected function preBuild()\n    {\n        return ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1d144d193b91e156e37a85401bf64550ea47543e1c0bc68ba8bd77a0b3fb5b56"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/NamespaceAccessor.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 83,
+                  "startColumn": 21,
+                  "charOffset": 1932,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getByNamespace"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 81,
+                  "startColumn": 1,
+                  "charOffset": 1871,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "     * @return NamespaceHelper[]\n     */\n    public function getByNamespace()\n    {\n        return $this->byNamespace;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1d686b8331b7d933ad319170c7ccddea54ee2d9f07bff80063f40d94d82a3e4a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MicrotimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 878,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 817,
+                  "charLength": 201,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        /* microtime has one optional parameter (get_as_float) */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1f6460f2825bd0105cc79ec7b8bd8c3112a9a2713b35e549f5ad7ce35e8fe350"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 184,
+                  "startColumn": 21,
+                  "charOffset": 4759,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "getOutputDirectory"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 182,
+                  "startColumn": 1,
+                  "charOffset": 4709,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getOutputDirectory()\n    {\n        return $this->outputDirectory;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "20227e56d23b1e5b752b63c0ddd6f67b00103dcfcf35dd45f5df7c9353daeb27"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IntvalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 869,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 808,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "22d7e09afff701bbc429440eaf69bfc73a3230c6f521e5974e0f239bcb682fb3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsCallableOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 802,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 729,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "233b21ef558a472e53a05cf6c34ffeac71ed2e97fc7b15a0f6565fc1abe64d97"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseNotOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 21,
+                  "charOffset": 797,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 744,
+                  "charLength": 197,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $this->checkLeft($expression, CompilerException::class, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "239ac758d40092a00dd357889810186c2a94bbc5a63f5a3663cc3ca154ca71d9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 148,
+                  "startColumn": 24,
+                  "charOffset": 2695,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "resolve"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 146,
+                  "startColumn": 1,
+                  "charOffset": 2643,
+                  "charLength": 103,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function resolve($expr)\n    {\n        if (is_array($expr)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "255b4980b47f57f692947496126942289ce4b03e8d98ff1fc1494c19a3406827"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PregMatchOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 122,
+                  "startColumn": 22,
+                  "charOffset": 3639,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "createMatches"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 120,
+                  "startColumn": 1,
+                  "charOffset": 3586,
+                  "charLength": 171,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    private function createMatches(array $expression, CompilationContext $context)\n    {\n        if (isset($expression['parameters'][2])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "263091743dd0bfcf3a85448477477c8580871a34c9c3d87c8401c2684e21bb6e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 21,
+                  "charOffset": 1345,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "getMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1296,
+                  "charLength": 96,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getMethod()\n    {\n        return $this->method;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "263d1f7055c00a9492c9e9de0854f17137c7aa0b684f78ec1b09a1bfcd0359e7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonEncodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 802,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 729,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2688dfce9a2df2dd993ac5f04ccc62bc2ad8b9808889f9706698fc2956a27268"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 283,
+                  "startColumn": 24,
+                  "charOffset": 8822,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "_getResolvedArrayItem"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 281,
+                  "startColumn": 1,
+                  "charOffset": 8758,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    protected function _getResolvedArrayItem(CompiledExpression $resolvedExpr, CompilationContext $compilationContext)\n    {\n        switch ($resolvedExpr->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "26caa32fd18199c0d22e0b9188e033e982ab1ddc3dd82ee0e15940e886720672"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 269,
+                  "startColumn": 21,
+                  "charOffset": 7590,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getThemePath"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 267,
+                  "startColumn": 1,
+                  "charOffset": 7540,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getThemePath($path)\n    {\n        $path         = pathinfo($this->themeDir . '/' . $path);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2822a300578f57b1f0b02ea0bb8af5fc16b0579ac3a330c1f246ca4dc5801a0a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 195,
+                  "startColumn": 24,
+                  "charOffset": 5382,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "_callDynamic"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 193,
+                  "startColumn": 1,
+                  "charOffset": 5318,
+                  "charLength": 215,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    protected function _callDynamic(array $expression, CompilationContext $compilationContext)\n    {\n        $variable = $compilationContext->symbolTable->getVariableForRead("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "28f9c7e9409adffe20f8affb630388712d450b16dcbc03b1f37827512330b04a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsBoolOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 24,
+                  "charOffset": 511,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 432,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "class IsBoolOptimizer extends IsTypeOptimizerAbstract\n{\n    protected function getType()\n    {\n        return 'IS_BOOL';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2a21c750056102ddf4cb6a18c7c7d9b54511f95757e020807cae086d998c5f8d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 100,
+                  "startColumn": 21,
+                  "charOffset": 1905,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setFile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 98,
+                  "startColumn": 1,
+                  "charOffset": 1846,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function setFile($file)\n    {\n        $this->file = $file;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2a9a6d690b9d12453b5bfe6ae93cf2f9e14649d41390bb5a6e75746d45369bf2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 557,
+                  "startColumn": 21,
+                  "charOffset": 18604,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "assignLong"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 555,
+                  "startColumn": 1,
+                  "charOffset": 18577,
+                  "charLength": 243,
+                  "snippet": {
+                    "text": "    }\n\n    public function assignLong(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)\n    {\n        return $this->assignHelper('ZVAL_LONG', $this->getVariableCode($variable), $value, $context, $useCodePrinter);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2b3fe5c314447fcd45801f50ca39ba385cae5c0d645e29ac7b9b9912576be28e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 70,
+                  "startColumn": 21,
+                  "charOffset": 1466,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getFile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 68,
+                  "startColumn": 1,
+                  "charOffset": 1416,
+                  "charLength": 93,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getFile()\n    {\n        return $this->file;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2b7248cd23f7d92c49ccb31a5858fd89581c68f6bcd1954a811c980086094b9d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsObjectOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 24,
+                  "charOffset": 516,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 435,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "class IsObjectOptimizer extends IsTypeOptimizerAbstract\n{\n    protected function getType()\n    {\n        return 'IS_OBJECT';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2c1a5d5e715aa464ad5b012015b4cad315bd3916cb05d09afac899c647c29ccb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 880,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 799,
+                  "charLength": 232,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2c6f4e76984cc94ed4a945921cd4e6fa5a6a6d19df85ed2fc92c2509d69b0e07"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 778,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 717,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2dc18b997aed4a5fb1206948b525c13a02894afe4ff349e4b84950c5e3b09132"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 152,
+                  "startColumn": 24,
+                  "charOffset": 2749,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 150,
+                  "startColumn": 1,
+                  "charOffset": 2697,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function preBuild()\n    {\n        if ($arguments = $this->getArguments()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3000431440eea23ca4f1407df11393730286414a1ec2dca7a73a1328aa9a52d2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 21,
+                  "charOffset": 1357,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getChar"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1310,
+                  "charLength": 90,
+                  "snippet": {
+                    "text": "     * @return int\n     */\n    public function getChar()\n    {\n        return $this->char;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "302c737329faa09bb1060d45c724aa8f62289265f0007e9a871ed610d55f56ab"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 83,
+                  "startColumn": 21,
+                  "charOffset": 2148,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "raw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 81,
+                  "startColumn": 1,
+                  "charOffset": 2092,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "     * @return RawStatement\n     */\n    public function raw(array $expression)\n    {\n        return new RawStatement($expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "310719fb5704853d54fa0c52f59bd254c56090fc1e064e2253e52331cab664d1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 24,
+                  "charOffset": 1092,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "execute"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 1062,
+                  "charLength": 152,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $command   = $this->getApplication()->find('clean');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "32792ebcda1aa16f68a4c880e6ff25c9775f9ddb6ae2107d9d6b6ce2f3c9e4ed"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 383,
+                  "startColumn": 21,
+                  "charOffset": 11726,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "arrayIssetFetch2"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 381,
+                  "startColumn": 1,
+                  "charOffset": 11699,
+                  "charLength": 93,
+                  "snippet": {
+                    "text": "    }\n\n    public function arrayIssetFetch2(\n        Variable $target,\n        Variable $var,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "34b3c68f7a15f1dd99e5fcd1736db10b6d171ca403223ea0684904b5a5eb53df"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 76,
+                  "startColumn": 21,
+                  "charOffset": 1456,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "isDynamicClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 74,
+                  "startColumn": 1,
+                  "charOffset": 1408,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function isDynamicClass()\n    {\n        return $this->dynamicClass;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3647a6f6724d56a924ff93d3b76539b1e0798cb348237a250516f44cc4cdbc5e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 913,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 852,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "394fc6bfa85c930140f1f46679579b1b1000968b9e32e2fddb2a786ff1e200a1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrposOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 869,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 808,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3b90838456965a3356a2894bedb738e249e124c7a2963108044420a24992660a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 21,
+                  "charOffset": 785,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 712,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        return new CompiledExpression('int', 'ZEND_NUM_ARGS()', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3c0b9c19ecc90cb8dfe7284b0cf198cc5fb3199738ae56bbacea45d01bd2e329"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsStringOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 24,
+                  "charOffset": 517,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 436,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "class IsStringOptimizer extends IsTypeOptimizerAbstract\n{\n    protected function getType()\n    {\n        return 'IS_STRING';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3cf4ae55a9391b7f385b52ec9b881f82507236bd5a4abe95c8f0b81c81ef4d20"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/HashEqualsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 882,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 821,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters']) || 2 != count($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3d655bdf9fc4a6c99c80ca45782e57fd1267cdb353d2b5400687b611e88f5fa5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 21,
+                  "charOffset": 1235,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "getClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1186,
+                  "charLength": 94,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getClass()\n    {\n        return $this->class;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3dfa01b99e86fa6c996fa4d5cee155da13d1071767e1a4fedc8b2f8208c288bc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 106,
+                  "startColumn": 21,
+                  "charOffset": 2572,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "returnX"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 104,
+                  "startColumn": 1,
+                  "charOffset": 2516,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return RawStatement\n     */\n    public function returnX(AbstractBuilder $expression)\n    {\n        return $this->raw(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3fc51c1e23a99fe2cc0270dd31c3ad383446cc355ae2f2694be3c6e86a36bfc1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 21,
+                  "charOffset": 821,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 748,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "43a04c15aaf8519c948e1bf84f33cb48f57dde8e5424e81346cce4771fee8a8b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 418,
+                  "startColumn": 21,
+                  "charOffset": 12813,
+                  "charLength": 34,
+                  "snippet": {
+                    "text": "getTempVariableForObserveOrNullify"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 416,
+                  "startColumn": 1,
+                  "charOffset": 12761,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempVariableForObserveOrNullify($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'observe-nullify');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "46ce3890f6b9b8ce87e98754bed78323298eada5c385287b7f771d053db789c8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 187,
+                  "startColumn": 22,
+                  "charOffset": 6299,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "__createAnnotation"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 185,
+                  "startColumn": 1,
+                  "charOffset": 6244,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "     * @return Annotation\n     */\n    private function __createAnnotation($name, $string)\n    {\n        switch ($name) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "474772b34c6bf7ecfe79d3be82f0342bf36e1b2fe178cfc3333c05131d358348"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 156,
+                  "startColumn": 21,
+                  "charOffset": 3571,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 154,
+                  "startColumn": 1,
+                  "charOffset": 3521,
+                  "charLength": 101,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getOperator()\n    {\n        return $this->operator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4751cb803a19a35ed4ff73bd9fd8ea48ba387fd21884c9ad52c171d5c01e14fb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/RawOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 21,
+                  "charOffset": 840,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 791,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setExpression(array $expression)\n    {\n        $this->expression = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "47a5ab6c8cd6a943b1fbd9a38fa4c3cd9014bead4117b5646a08c0ae8e4e5e49"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 116,
+                  "startColumn": 21,
+                  "charOffset": 2217,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 114,
+                  "startColumn": 1,
+                  "charOffset": 2168,
+                  "charLength": 98,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setName($name)\n    {\n        $this->name = $name;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "47ab42187432f94bb58f41397609408713a9a72b03045fc07d5fbc49a41178d1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Docblock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 134,
+                  "startColumn": 21,
+                  "charOffset": 2772,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "setAnnotations"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 132,
+                  "startColumn": 1,
+                  "charOffset": 2704,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "     * @param Annotation[] $annotations\n     */\n    public function setAnnotations(array $annotations)\n    {\n        $this->annotations = $annotations;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4859809284fed5b0690bc5781298bbaad5e2a8cba78843b8a21017e5ea4a4dec"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/OperatorsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 84,
+                  "startColumn": 21,
+                  "charOffset": 2499,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "binary"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 82,
+                  "startColumn": 1,
+                  "charOffset": 2441,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "     * @return BinaryOperator\n     */\n    public function binary(\n        $operator = null,\n        AbstractBuilder $leftExpression = null,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "48deec0c7d21595adfb94617837fa82a625ff961515211fa6dc7c11084b23827"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 21,
+                  "charOffset": 992,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 931,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "48e6eb6d4e251d4181328e50c7b21bfc7bceedcaa25a903e39700080489032bc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/AbstractType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 21,
+                  "charOffset": 1391,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "invokeMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1328,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @throws ReflectionException\n     */\n    public function invokeMethod(\n        $methodName,\n        $caller,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a12cf5547eb529db168264143cea6e00d9f422f965397bffda30a189fb11bf8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 86,
+                  "startColumn": 21,
+                  "charOffset": 2392,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "buildJsonClassDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 84,
+                  "startColumn": 1,
+                  "charOffset": 2365,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "    }\n\n    public function buildJsonClassDefinition($classList, NamespaceAccessor $nsA)\n    {\n        $output = ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a798317b1184de5de865027fd643b7bdecaede09b64392b2603ee958dccd510"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 21,
+                  "charOffset": 1167,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "operators"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1107,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "     * @return OperatorsFactory\n     */\n    public function operators()\n    {\n        if (!$this->operatorsFactory) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b6eee92f6821c0e85c87795165b1f0849cfc28fcea25cd4808fe4d804167997"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 21,
+                  "charOffset": 911,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 858,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4cb37de7dd94bdcbbb17d48cddf427a7cbb821b253a54438208538ef8e020a34"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 21,
+                  "charOffset": 1084,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "setAssignments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1035,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setAssignments($assignments)\n    {\n        $this->assignments = $assignments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4ce830b96f626db6d1b854e2bec13671bcd4c607e07e1d0372dde5183c0404c1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 205,
+                  "startColumn": 21,
+                  "charOffset": 5899,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "arrayFetch"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 203,
+                  "startColumn": 1,
+                  "charOffset": 5872,
+                  "charLength": 84,
+                  "snippet": {
+                    "text": "    }\n\n    public function arrayFetch(\n        Variable $var,\n        Variable $src,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4d434b7939ae089d97e3c4b62cb07a15f0ee3132c28b2f611b44489b3bca08e9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/DoublevalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 878,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 817,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4f1dc8d9b020b5fb86c5f5cb7a147eb7ff66ebd7219b889435c4721a77ef7496"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniqueKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 21,
+                  "charOffset": 990,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 929,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4f437beadae59abc70b9988fb65cb97bd6c8609a977d85ef16dca5822a61977a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 355,
+                  "startColumn": 21,
+                  "charOffset": 10832,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "arrayIssetFetch"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 353,
+                  "startColumn": 1,
+                  "charOffset": 10805,
+                  "charLength": 92,
+                  "snippet": {
+                    "text": "    }\n\n    public function arrayIssetFetch(\n        Variable $target,\n        Variable $var,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "51e324fd0ee75a8475977b30ba11814a019c1088b6acbdc4b96e58ba2588a4ec"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Config.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 241,
+                  "startColumn": 21,
+                  "charOffset": 7621,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "get"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 239,
+                  "startColumn": 1,
+                  "charOffset": 7567,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @return mixed|null\n     */\n    public function get($key, $namespace = null)\n    {\n        return null !== $namespace ? $this->offsetGet([$namespace => $key]) : $this->offsetGet($key);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "52f5d65d210eb163cc7f514b70e880d915de9d17e2f8e15fda2f124ef2395af0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 164,
+                  "startColumn": 21,
+                  "charOffset": 3697,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "getRightExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 162,
+                  "startColumn": 1,
+                  "charOffset": 3638,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function getRightExpression()\n    {\n        return $this->rightExpression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "53447de9ca13a0e5cd47374ae21106c8a53872f04bfb48259f7add54eb746f34"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1758,
+                  "startColumn": 21,
+                  "charOffset": 61036,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "propertyIsset"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1756,
+                  "startColumn": 1,
+                  "charOffset": 61009,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "    }\n\n    public function propertyIsset(Variable $var, $key)\n    {\n        return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "539ba9bee1c694eebe49d9b29f904d652d8e6f284a480ce2b991af5776b36521"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonDecodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 802,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 729,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "54cc0d0237076f38c08859e7a702bba32929ec93c4cf75f36e903c6f7beda831"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 160,
+                  "startColumn": 21,
+                  "charOffset": 4177,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "findThemePathByName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 158,
+                  "startColumn": 1,
+                  "charOffset": 4122,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "     * @return string|null\n     */\n    public function findThemePathByName($name)\n    {\n        // check the theme from the config"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5675abe5f8ef60bc8ffe47516b724c5e1095a9e747c8505cf8416b46dde66d94"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/RawExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 24,
+                  "charOffset": 980,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 928,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function preBuild()\n    {\n        return $this->getExpression();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "58d76f4b8f333b0c31b13249e5ea4cb4b7c07ca4bc2bfd172e70c55bbbc34f92"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 84,
+                  "startColumn": 21,
+                  "charOffset": 1578,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "isDynamicMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 82,
+                  "startColumn": 1,
+                  "charOffset": 1530,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function isDynamicMethod()\n    {\n        return $this->dynamicMethod;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "59f637bbd435c252c72be4823c409203e327991278c3cb40e95d3c76ba6700cb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 21,
+                  "charOffset": 972,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 919,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function compile(array $expression, CompilationContext $compilationContext)\n    {\n        $conditions = $this->optimizeTypeOf($expression, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5cd82a0d04478ede172e12655eecdfb66958e48bfb3e90cb08d2c359f5608711"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2224,
+                  "startColumn": 22,
+                  "charOffset": 73329,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "recursiveProcess"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2222,
+                  "startColumn": 1,
+                  "charOffset": 73293,
+                  "charLength": 134,
+                  "snippet": {
+                    "text": "     *\n     */\n    private function recursiveProcess($src, $dest, $pattern = null, $callback = 'copy')\n    {\n        $success  = true;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5cf1446625e2181803710e5dabb1d61eb388af340cc678c8200e45559c18ba00"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/EvalExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 86,
+                  "startColumn": 21,
+                  "charOffset": 1820,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 84,
+                  "startColumn": 1,
+                  "charOffset": 1767,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function optimize($exprRaw, CompilationContext $compilationContext)\n    {\n        $conditions = $this->optimizeNot($exprRaw, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5dd23809fb0c377ea0a558e4c70ed1b122893501a6fd2e20c5e7e617d7d5d546"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/RawStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 24,
+                  "charOffset": 1013,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 961,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function preBuild()\n    {\n        return $this->getExpression();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5f61c73d0ec8d19d797acba0a235d57c16e3e519e82e74b67120c53742dde259"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 73,
+                  "startColumn": 21,
+                  "charOffset": 1538,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "parse"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 71,
+                  "startColumn": 1,
+                  "charOffset": 1466,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "     * @return Docblock the parsed docblock\n     */\n    public function parse()\n    {\n        $this->docblockObj = new Docblock();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6029db17da907fd897b30467a832094dcb6280b442c3ba52a4231c38a2d2af41"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 376,
+                  "startColumn": 21,
+                  "charOffset": 13018,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "getLastStatementType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 374,
+                  "startColumn": 1,
+                  "charOffset": 12968,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getLastStatementType()\n    {\n        return $this->lastStatement['type'];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "61c60f9318a1b6b0f31941b728c1ba0a83296e6eecb202136cf31409bd76d12b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/OperatorsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 127,
+                  "startColumn": 21,
+                  "charOffset": 3556,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "raw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 125,
+                  "startColumn": 1,
+                  "charOffset": 3501,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @return RawOperator\n     */\n    public function raw(array $expression)\n    {\n        return new RawOperator($expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6229401d3545cb59e0a3baffc262bba00e3c7effbd89f27568629353ab432176"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/EvalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 21,
+                  "charOffset": 913,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 860,
+                  "charLength": 216,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters']) || count($expression['parameters']) > 1) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "639feb165c9dff46696e774ab199e03b0f6329f31b76b5d859bfc401c6556883"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 118,
+                  "startColumn": 21,
+                  "charOffset": 2155,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "setDynamicClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 116,
+                  "startColumn": 1,
+                  "charOffset": 2092,
+                  "charLength": 144,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setDynamicClass($dynamicClass)\n    {\n        $this->dynamicClass = $dynamicClass;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "652505d6c6d769b815adbbacfb4c60353760ea7fb101deb61ab83c638a190298"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsNullOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 24,
+                  "charOffset": 511,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 432,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "class IsNullOptimizer extends IsTypeOptimizerAbstract\n{\n    protected function getType()\n    {\n        return 'IS_NULL';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6577a10fc1e510761a529f25bb21714826fabe283702e1dca8b0e09bd1a26a15"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 136,
+                  "startColumn": 21,
+                  "charOffset": 3692,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getReflector"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 3625,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "     * @return ReflectionFunction|null\n     */\n    public function getReflector($funcName)\n    {\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "66977e1b7dafc8b659dde75f435141a60a5aebbdda5cc7299ad3a9c911f6a283"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/RoundOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 21,
+                  "charOffset": 949,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 888,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "66d6fd3c6bd7fab4a68a6ecaf1ee52d02f2a8a4d4a9eae863352741c0ff634ea"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FloorOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 866,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 805,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6765f54c430a4086232f6bed437e2ec4b30f50eac8cbdcbe870c0644479239f9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 104,
+                  "startColumn": 21,
+                  "charOffset": 2013,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "setArguments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 102,
+                  "startColumn": 1,
+                  "charOffset": 1964,
+                  "charLength": 131,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setArguments(array $arguments = null)\n    {\n        $this->arguments = $arguments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "68f7a07dbab24d26438d72d7613f0c890849dca2cf2fa0712b087f40376ba8bc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/OperatorsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 138,
+                  "startColumn": 21,
+                  "charOffset": 3801,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "unary"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 136,
+                  "startColumn": 1,
+                  "charOffset": 3744,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @return UnaryOperator\n     */\n    public function unary($operator = null, AbstractBuilder $expression = null)\n    {\n        return new UnaryOperator($operator, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6919deaf626532cbbc1115b4eeccc4774c2facea366d65cc14c542f5d4dbcbc7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 141,
+                  "startColumn": 28,
+                  "charOffset": 3750,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "classUrl"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 139,
+                  "startColumn": 1,
+                  "charOffset": 3716,
+                  "charLength": 73,
+                  "snippet": {
+                    "text": "    }\n\n    public static function classUrl($c)\n    {\n        $cname = $c;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6936abec9f12d09b4863a303471f4d9356b8d17bb2f9d7c5ddc3543109d6ad5f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExitOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 21,
+                  "charOffset": 842,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 781,
+                  "charLength": 223,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (isset($expression['parameters']) && count($expression['parameters']) > 1) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6ba4176f58135c508a1073f98c0feb4949a50e10b5e6d456cf876b0ee59c660a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 126,
+                  "startColumn": 21,
+                  "charOffset": 2311,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "setParseInfo"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 124,
+                  "startColumn": 1,
+                  "charOffset": 2262,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setParseInfo($file, $line, $char = null)\n    {\n        $this->setFile($file);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6bd93bf1d068579b84306f6fe26741fcb9a0488a807eb0bb814f544c2442a8bb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 528,
+                  "startColumn": 24,
+                  "charOffset": 17929,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "isReadOnly"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 526,
+                  "startColumn": 1,
+                  "charOffset": 17865,
+                  "charLength": 161,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    protected function isReadOnly($funcName, array $expression)\n    {\n        if ($this->isBuiltInFunction($funcName)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6c3391eee607158934c019f8cbb00fa823d8374d31e38396c04ec1613c216f3a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 216,
+                  "startColumn": 21,
+                  "charOffset": 6301,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getOutputPath"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 214,
+                  "startColumn": 1,
+                  "charOffset": 6274,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "    }\n\n    public function getOutputPath($path)\n    {\n        $path         = pathinfo($this->outputDir . '/' . $path);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6c344630d15988e8d6739f46849914fbefbe1b97897ae8ce68cc2aa0e153cf05"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 562,
+                  "startColumn": 21,
+                  "charOffset": 18848,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "assignNull"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 560,
+                  "startColumn": 1,
+                  "charOffset": 18821,
+                  "charLength": 191,
+                  "snippet": {
+                    "text": "    }\n\n    public function assignNull(Variable $variable, CompilationContext $context, $useCodePrinter = true)\n    {\n        $output = 'ZVAL_NULL(' . $this->getVariableCode($variable) . ');';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6c59f4dc6609af76efd60bcff28597b3a97f7128bde3af4b11ee9a68a6541177"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 130,
+                  "startColumn": 21,
+                  "charOffset": 2379,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "setDynamicMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 128,
+                  "startColumn": 1,
+                  "charOffset": 2316,
+                  "charLength": 148,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setDynamicMethod($dynamicMethod)\n    {\n        $this->dynamicMethod = $dynamicMethod;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6cc98b03da5b65e519ab787606a73f2b2859b9e20b4a325a56040e185725a01a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 21,
+                  "charOffset": 1252,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "get"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1152,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "     *             Use {@link \\Zephir\\Builder\\AbstractBuilder::build()}\n     */\n    public function get()\n    {\n        return $this->build();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6ccea83951a04c5629de574335052ec757cda7c63a9289a7ff7c9b4bfe4d8d09"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FuncGetArgOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 21,
+                  "charOffset": 932,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 871,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters']) || 1 != count($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6e02ff6bf1ee6f75db938d2c6c2fb821bf51971abd1377018b90d22a7e589442"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 31,
+                  "startColumn": 28,
+                  "charOffset": 680,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getInstance"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 29,
+                  "startColumn": 1,
+                  "charOffset": 625,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return self\n     */\n    public static function getInstance()\n    {\n        if (!static::$instance) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6f22c20056916eaf78fe75c207a2e192938915227619eb1295058ec3bf233e3a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 79,
+                  "startColumn": 21,
+                  "charOffset": 1594,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "statements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 77,
+                  "startColumn": 1,
+                  "charOffset": 1533,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "     * @return StatementsFactory\n     */\n    public function statements()\n    {\n        if (!$this->statementsFactory) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6f5806a59dfaaffac0b23201ff54c6a064dd5d51e359cc45bdc1ad579db9463f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 21,
+                  "charOffset": 857,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 776,
+                  "charLength": 232,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6f7ffadd12e1ba9c58f8a54531a67d7972d3b57e93b21d39f7264983c7d4cc69"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 21,
+                  "charOffset": 512,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "build"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 463,
+                  "charLength": 103,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function build()\n    {\n        $expression = $this->preBuild();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "710242919e613e5048536434242f64cd3c41db3cc5a4a14cd96d1012b12792ed"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/ArrayType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 21,
+                  "charOffset": 2975,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "join"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 2922,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function join($caller, CompilationContext $compilationContext, Call $call, array $expression)\n    {\n        $functionCall = BuilderFactory::getInstance()->statements()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "74e3efc69c647aee3bf2e6d0309a01c1d321ae42a3f901f29b10e101923b3e75"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 148,
+                  "startColumn": 21,
+                  "charOffset": 3442,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "getLeftExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 146,
+                  "startColumn": 1,
+                  "charOffset": 3383,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function getLeftExpression()\n    {\n        return $this->leftExpression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "759ac709b93bb685cd80d0e23a1a880dcc53560d26743a45456c09e01c3ba4d9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 366,
+                  "startColumn": 21,
+                  "charOffset": 12828,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "getLastStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 364,
+                  "startColumn": 1,
+                  "charOffset": 12774,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "     * @return array|null\n     */\n    public function getLastStatement()\n    {\n        return $this->lastStatement;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "75e296bd7cffccfde2b81be5c66a97697d560c0ab57eec19e97b170fe3eaabba"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 70,
+                  "startColumn": 21,
+                  "charOffset": 1514,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "getElseStatements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 68,
+                  "startColumn": 1,
+                  "charOffset": 1455,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     * @return StatementsBlock\n     */\n    public function getElseStatements()\n    {\n        return $this->elseStatements;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "782326024d540694c188d99e849e83c15d57cfc20d1b4e3d7b332f4cafd0440c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 165,
+                  "startColumn": 21,
+                  "charOffset": 4580,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "isBuiltInFunction"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 163,
+                  "startColumn": 1,
+                  "charOffset": 4532,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function isBuiltInFunction(string $functionName)\n    {\n        return match ($functionName) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "790852c9ad70a0f1f36ce64ee1b571b934570e5fffe028c9bd620e8ea87ed976"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsResourceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 24,
+                  "charOffset": 519,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 436,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "class IsResourceOptimizer extends IsTypeOptimizerAbstract\n{\n    protected function getType()\n    {\n        return 'IS_RESOURCE';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7ae6de722b2655456381309c36d92c1da9bd41bff08e8eaf255cc3887f20f47b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 21,
+                  "charOffset": 1010,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 948,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $propertyAccess = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7c03ae8d1770d36c332ae069022e18c9cc0a12c707baf9df7e19c086f921922a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtokOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 875,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 814,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7ef086a5bef63651769ffaa6030ae75af04fcf3ffc3fb3956be16846838535dd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 73,
+                  "startColumn": 21,
+                  "charOffset": 1954,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "let"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 71,
+                  "startColumn": 1,
+                  "charOffset": 1898,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "     * @return LetStatement\n     */\n    public function let(array $assignments = null)\n    {\n        return new LetStatement($assignments);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8173c13403e746c5bf643be2beb0529bce8e31f28d6828b20850f4129231acfd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StripslashesOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 21,
+                  "charOffset": 948,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 887,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81a63fb28d37b08432a75d2fb5259183fffd9178a74034dff62b5c72f56c4888"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 71,
+                  "startColumn": 21,
+                  "charOffset": 1608,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 69,
+                  "startColumn": 1,
+                  "charOffset": 1559,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getExpression()\n    {\n        return $this->expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81c17ba23c15f00417c371ba2d671188bd15dbf31f46e6c87233853e1880b841"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Branch.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 21,
+                  "charOffset": 1773,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getUniqueId"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 1724,
+                  "charLength": 100,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getUniqueId()\n    {\n        return $this->uniqueId;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81c905dd5aba2b1767cb4d08624630db15d432a9420b369beb6d2d1004c44b55"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 103,
+                  "startColumn": 21,
+                  "charOffset": 2732,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "functionExists"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 101,
+                  "startColumn": 1,
+                  "charOffset": 2684,
+                  "charLength": 158,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function functionExists($functionName, CompilationContext $context)\n    {\n        if (function_exists($functionName)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81da348bf0244c6d428a7401b183628094b9cc354e9f8af5bdb325979cf97143"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 21,
+                  "charOffset": 922,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getAssignments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 873,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getAssignments()\n    {\n        return $this->assignments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "820e7fdebd9bfe972e4b985bb27c3c3ce9efbd58f8ff15781eab5ca6b03d774c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArray.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 467,
+                  "startColumn": 21,
+                  "charOffset": 20558,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getArrayValue"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 465,
+                  "startColumn": 1,
+                  "charOffset": 20491,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "     * @return GlobalConstant|Variable\n     */\n    public function getArrayValue(\n        CompiledExpression $exprCompiled,\n        CompilationContext $compilationContext"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "824c666f44ec8fe716c6db9b728abfc3220d0e90b68713c8d9323e991e7edc63"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 256,
+                  "startColumn": 22,
+                  "charOffset": 6958,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "findOutputDirectory"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 254,
+                  "startColumn": 1,
+                  "charOffset": 6902,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @return string|null\n     */\n    private function findOutputDirectory($outputDir)\n    {\n        $outputDir = str_replace('%version%', $this->config->get('version'), $outputDir);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "833262b4281172f267832618372329040885b5101f3f10d975259396203b6257"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 21,
+                  "charOffset": 1228,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "functionCall"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1163,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "     * @return CallFunctionStatement\n     */\n    public function functionCall($name, $parameters = null, $type = CallFunctionStatement::TYPE_CALL_DIRECT)\n    {\n        return new CallFunctionStatement($name, $parameters, $type);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8396535ba3d84550e8629448c90890295d0775574cfc11ca3d33ad9703018c28"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 814,
+                  "startColumn": 21,
+                  "charOffset": 29366,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getVariables"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 812,
+                  "startColumn": 1,
+                  "charOffset": 29312,
+                  "charLength": 93,
+                  "snippet": {
+                    "text": "     * @return Variable[]\n     */\n    public function getVariables()\n    {\n        $ret = [];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "85694a8758c1407887ad82e5a962fe281e195e78752b31e147c0129a93b09167"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/RawOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 681,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 632,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function getExpression()\n    {\n        return $this->expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "868d7ee90c07adf900146734502598d54d9280a917a7a19d9f3bcc0a0abda220"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 86,
+                  "startColumn": 21,
+                  "charOffset": 1748,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 84,
+                  "startColumn": 1,
+                  "charOffset": 1698,
+                  "charLength": 93,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getName()\n    {\n        return $this->name;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "87c7bba195b4bc563e9fb108e1802b45de77ec7a64d27ba7b649501aa3cebfb2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/UnaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 125,
+                  "startColumn": 24,
+                  "charOffset": 2511,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 123,
+                  "startColumn": 1,
+                  "charOffset": 2459,
+                  "charLength": 85,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     */\n    protected function preBuild()\n    {\n        return ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "884e56c170756262b68799c5a98cd51c0204d6f849f2e684c53e21b465e72779"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 988,
+                  "startColumn": 21,
+                  "charOffset": 34407,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "fetchGlobal"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 986,
+                  "startColumn": 1,
+                  "charOffset": 34380,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "    }\n\n    public function fetchGlobal(Variable $globalVar, CompilationContext $compilationContext, $useCodePrinter = true)\n    {\n        $name   = $globalVar->getName();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "88a228f2f6efa6455f6d9591424b5b86244542a6fe65e37ab4e483c5ad98bdb9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PregMatchOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 178,
+                  "startColumn": 22,
+                  "charOffset": 5505,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "processOptionals"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 176,
+                  "startColumn": 1,
+                  "charOffset": 5443,
+                  "charLength": 169,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    private function processOptionals(array &$expression, Call $call, CompilationContext $context)\n    {\n        $flags  = null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "898fc6ee15025a7f4cef5be4a3a6e660cdf3d8f53da95939b75b6ed2a15969c5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 290,
+                  "startColumn": 21,
+                  "charOffset": 8107,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "getThemePathExtendsAware"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 288,
+                  "startColumn": 1,
+                  "charOffset": 8057,
+                  "charLength": 134,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getThemePathExtendsAware($path)\n    {\n        $newPath = $this->getThemePath($path);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8a173f16fb4c985681f231d480ad61e837cc673cfe64aec502e0b1a941226ff6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/RawExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 681,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 632,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getExpression()\n    {\n        return $this->expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8b13f5fd26540079d3d4655c2a4c5e9537f33f11e2ee359faacd0875e0bd000a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 71,
+                  "startColumn": 21,
+                  "charOffset": 1448,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "raw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 69,
+                  "startColumn": 1,
+                  "charOffset": 1391,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return RawExpression\n     */\n    public function raw($expression)\n    {\n        return new RawExpression($expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8ba780c085cd33f128fc2542529cb3cfc8a20ff272edd57822bbbcad39a23e32"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler/FileInterface.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 723,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "isExternal"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 675,
+                  "charLength": 70,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function isExternal();\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8c4318b5dcaf16d450a025b80e4237704a8937228fe49f2439794ef641021d78"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 103,
+                  "startColumn": 24,
+                  "charOffset": 2981,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "passNativeFCall"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 101,
+                  "startColumn": 1,
+                  "charOffset": 2916,
+                  "charLength": 159,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    protected function passNativeFCall($compiledExpression, $expression)\n    {\n        return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8cab31eb7ff7b43d498ff43c18c0310ed412cf8fa159b72159447acd55e10e60"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/CharType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 21,
+                  "charOffset": 1003,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "toHex"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 950,
+                  "charLength": 199,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function toHex($caller, CompilationContext $compilationContext, Call $call, array $expression)\n    {\n        $exprBuilder  = BuilderFactory::getInstance();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8e26dffac5fc5cc8aa61de1178eb2582bb8560131759497f14cf95e3a9932d93"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/EndsWithOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 909,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 836,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8f38a08265575a81c7932741a7169dfad4022670017d9ca51f6fdeef9f302deb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/UnaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 85,
+                  "startColumn": 21,
+                  "charOffset": 1862,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 83,
+                  "startColumn": 1,
+                  "charOffset": 1813,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getExpression()\n    {\n        return $this->expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8f6f77ee6d44ed616ff84c007435068394d1b7689a95b395ab658b4e09579fbf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 24,
+                  "charOffset": 1412,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "execute"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1382,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9288b345c1eaa266c562ac9609a747c7199c39e34e62d9f5fa23ae7d5bea643e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 112,
+                  "startColumn": 21,
+                  "charOffset": 2290,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setStatements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 110,
+                  "startColumn": 1,
+                  "charOffset": 2241,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setStatements(StatementsBlock $statements)\n    {\n        $this->statements = $statements;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "93040d3063c40a93ef880be02ea0057f6129a6d1c46ad213dd0cb688cd5a9b65"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallMethodStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 21,
+                  "charOffset": 960,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 911,
+                  "charLength": 100,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getVariable()\n    {\n        return $this->variable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "931757c5ed624420189d1055fb860a3c1f3e7c1b0a9b3afc701e2f933242bd31"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 189,
+                  "startColumn": 28,
+                  "charOffset": 4859,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "namespaceUrl"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 187,
+                  "startColumn": 1,
+                  "charOffset": 4825,
+                  "charLength": 127,
+                  "snippet": {
+                    "text": "    }\n\n    public static function namespaceUrl($ns)\n    {\n        return '/namespace/' . str_replace('\\\\', '/', $ns) . '.html';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "936f939c6e46f86209986096e086c6afb764015b268225a3d9d4651ec5e1367c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 79,
+                  "startColumn": 21,
+                  "charOffset": 1729,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 77,
+                  "startColumn": 1,
+                  "charOffset": 1679,
+                  "charLength": 101,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getOperator()\n    {\n        return $this->operator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "95c5702345586ed19701f0a87ab85a2fd019112db154c2bca8f952184d5f5e46"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 21,
+                  "charOffset": 1386,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getCondition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1326,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "     * @return AbstractOperator\n     */\n    public function getCondition()\n    {\n        return $this->condition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9671ee8a4785ea9ba2eb256f43453c3814f706dafc3868d093d5bcf50d10dd15"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 83,
+                  "startColumn": 21,
+                  "charOffset": 2014,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 81,
+                  "startColumn": 1,
+                  "charOffset": 1943,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "     * @throws CompilerException|Exception\n     */\n    public function compile(Expression $expr, CompilationContext $compilationContext)\n    {\n        $this->expression = $expr;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "97b3f49931aa46c911921129878fcae3870d584c5a2c9c8e34ab5c8401fd67fa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 837,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 770,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $this->checkLeft($expression, CompilerException::class, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "97f92e2324b830bae8e64c546244884d7b3e8db32a6bf0eced661d523ad8b888"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 106,
+                  "startColumn": 21,
+                  "charOffset": 1960,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "setClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 104,
+                  "startColumn": 1,
+                  "charOffset": 1897,
+                  "charLength": 116,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setClass($class)\n    {\n        $this->class = $class;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "98194bc6672c61ca51e03e617aa2381a2a3e3c664efeaa611ad374c96f3891b4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsNumericOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 799,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 726,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "998526f7dfc4ef94f43402e703bdb699920813cbda5d516e9eb58d46934efa24"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CallUserFuncOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 887,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 814,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9a254c6562e3cca59ef64bc3dbb7987645733fe43acf6cdc3e545c64c26c602f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/UnaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 21,
+                  "charOffset": 1982,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 1933,
+                  "charLength": 100,
+                  "snippet": {
+                    "text": "     * @return mixed\n     */\n    public function getOperator()\n    {\n        return $this->operator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9a29aa1693ae3e4f63ceeda884dec717e094ccf3c3692512bc24fd099c372558"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 303,
+                  "startColumn": 21,
+                  "charOffset": 8978,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "arrayIsset2"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 301,
+                  "startColumn": 1,
+                  "charOffset": 8951,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "    }\n\n    public function arrayIsset2(Variable $var, $resolvedExpr, $expression, CompilationContext $context)\n    {\n        if (!($resolvedExpr instanceof Variable)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9a4742640b6ae4586e04f51ff030d0e1a77933e18b2c9e89270296bcddb21937"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 21,
+                  "charOffset": 1026,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 963,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "     * @throws ReflectionException\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9ac10f7b2613cb625084a99a17877fa05aedc1828fc3451c77c9ca933ad830a3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/UnaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 103,
+                  "startColumn": 21,
+                  "charOffset": 2147,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 101,
+                  "startColumn": 1,
+                  "charOffset": 2098,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setExpression(AbstractBuilder $expression)\n    {\n        $this->expression = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9b1ed4203e8fa8675d3215fa01a0d1e7a5a07329ee6100318012c658139a2115"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 157,
+                  "startColumn": 21,
+                  "charOffset": 4777,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getCompiledFile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 155,
+                  "startColumn": 1,
+                  "charOffset": 4727,
+                  "charLength": 109,
+                  "snippet": {
+                    "text": "     * @return string\n     */\n    public function getCompiledFile()\n    {\n        return $this->compiledFile;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9bc1a03cd69d96b96f8c754c507bc243b75b957c7d692345723a5a5a5f39cdbf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 21,
+                  "charOffset": 1043,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 981,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $propertyAccess = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9bf4d25e85d8ffd66d46caec86ce0e3d8079de89a40de8af0c6a4fa6a3595a83"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 24,
+                  "charOffset": 1252,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1200,
+                  "charLength": 85,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     */\n    protected function preBuild()\n    {\n        return ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9d080a6a9c6dc40c0f8149632fa0e5ff8e4b7457e6a90a09062af9e1c98bfa6a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 21,
+                  "charOffset": 1616,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "ifX"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1561,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "     * @return IfStatement\n     */\n    public function ifX(\n        AbstractOperator $condition = null,\n        StatementsBlock $statements = null,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9d2b43b27fa26f7aded1e55fc93bbef1ddc7b9a41969221212fc8b8458612942"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 892,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 831,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9e585d056afd800ba4e71d51e7f7521c2dc1ea7428e2d21340b83853b444f3ab"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 21,
+                  "charOffset": 1242,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setStatements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1193,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setStatements($statements)\n    {\n        $this->statements = $statements;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9fc04144de1b98ea95d9bd655083baf42fbf82f8de7c9cfd9cf1f5e6f8467e3c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallMethodStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 21,
+                  "charOffset": 1107,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "setVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1058,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setVariable($variable)\n    {\n        $this->variable = $variable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a10c67a62f89b99ed4205f0608bff01988cb5b6ce1b7e48c3e0d84b09ebb1a64"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 208,
+                  "startColumn": 24,
+                  "charOffset": 4545,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 206,
+                  "startColumn": 1,
+                  "charOffset": 4493,
+                  "charLength": 85,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     */\n    protected function preBuild()\n    {\n        return ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a665b08f663beb1405dce4de4f61687722b2828f74215412929730ac59648941"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CeilOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 863,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 802,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a7193b56815af596f973f62e5495996cef8f83ea27292e9e97b91885c3a35960"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/BasenameOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 21,
+                  "charOffset": 946,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 893,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a7792cefd7f608d2ad13be109d01832ef429d08c055afb195f7ab14916baf99e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 69,
+                  "startColumn": 21,
+                  "charOffset": 1465,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "parse"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 67,
+                  "startColumn": 1,
+                  "charOffset": 1438,
+                  "charLength": 91,
+                  "snippet": {
+                    "text": "    }\n\n    public function parse()\n    {\n        foreach ($this->data as $name => $value) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a896733ed1940c2a5d57546f0ae013798353ab497002b850feea1fc60d09a99f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 284,
+                  "startColumn": 22,
+                  "charOffset": 7969,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "findThemeDirectory"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 282,
+                  "startColumn": 1,
+                  "charOffset": 7909,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "     * @throws ConfigException\n     */\n    private function findThemeDirectory($themeConfig, $path = null)\n    {\n        // check if there are additional theme paths in the config"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a8ff7bdbb81a48b044d41e6cf22af8876b13d0be047b65f5c6d122f52a52877b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1651,
+                  "startColumn": 21,
+                  "charOffset": 57439,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "initObject"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1649,
+                  "startColumn": 1,
+                  "charOffset": 57412,
+                  "charLength": 182,
+                  "snippet": {
+                    "text": "    }\n\n    public function initObject(Variable $variable, $ce, CompilationContext $context, $useCodePrinter = true)\n    {\n        $variableAccess = $this->getVariableCode($variable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a93064f5cea6f6dc892012df80e3edaaf0820228c5302bbdf688075363bb79a7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/EvalExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 21,
+                  "charOffset": 974,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getEvalVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 922,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getEvalVariable()\n    {\n        return end($this->usedVariables);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aa922f6de259fd78a53fcdd82736af8f0e1290d959042df06e9954b845b50a94"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Annotation/Link.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 761,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "getUri"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 734,
+                  "charLength": 78,
+                  "snippet": {
+                    "text": "    }\n\n    public function getUri()\n    {\n        if (!$this->contentParsed) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aba0d69b7755f5c6bb599e7727932cd56c83f0501e79c23f2e0152bebeb00c96"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 955,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "block"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 896,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "     * @return StatementsBlock\n     */\n    public function block(array $statements = null)\n    {\n        return new StatementsBlock($statements);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b292de7f326eda3df5897771bae63017a5be2c2d5d045031030cf1f659f4ef79"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateInstanceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 21,
+                  "charOffset": 1034,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 973,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b2ec91b1920ef7f1c9ba4268b611fe93ad489a285cb7c5171b17a9a6ab7b3bbd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 24,
+                  "charOffset": 2459,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "execute"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 2429,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $options = array_merge("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b30e3c8cf62d61e72d3a8efdba6ad6e40866ae400f7fa7e3cf4d1c14824fe0ac"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 487,
+                  "startColumn": 21,
+                  "charOffset": 15099,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 485,
+                  "startColumn": 1,
+                  "charOffset": 15042,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|Variable\n     */\n    public function getVariable($name, CompilationContext $compilationContext = null)\n    {\n        /* Check if the variable already is referencing a branch */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b3af69a66b80ebe52dda96f8219577b8784038632deb526d4f2e97c294050a93"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 711,
+                  "startColumn": 21,
+                  "charOffset": 25611,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "getVariableForUpdate"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 709,
+                  "startColumn": 1,
+                  "charOffset": 25559,
+                  "charLength": 169,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getVariableForUpdate(string $name, CompilationContext $compilationContext, array $statement = null)\n    {\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b3ba31da7b01169dd129572ee45499259f250c4875ce82667f6d6acfed9af9c9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 142,
+                  "startColumn": 21,
+                  "charOffset": 2601,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "setMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 140,
+                  "startColumn": 1,
+                  "charOffset": 2538,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setMethod($method)\n    {\n        $this->method = $method;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b3eff7cf0dcbbdf59a25004a2af5612f7fdc815bc70479623f1652959b65ddaa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 122,
+                  "startColumn": 24,
+                  "charOffset": 2470,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 120,
+                  "startColumn": 1,
+                  "charOffset": 2418,
+                  "charLength": 92,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     */\n    protected function preBuild()\n    {\n        $expression = ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b4cf7486afaf79b4ff708b9501fe427cf4df6145f0063d7681fa6ee89a990c9d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/TimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 21,
+                  "charOffset": 842,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 781,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b54977ed933d166eed9c1af61167c517359d93685f974f462e346ea6a70b540a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallMethodStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 65,
+                  "startColumn": 24,
+                  "charOffset": 1263,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 63,
+                  "startColumn": 1,
+                  "charOffset": 1211,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function preBuild()\n    {\n        $expression             = parent::preBuild();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b610c53f82fc7a227131149d24c87f73d9c0b2a66715e9c5216fd00e92382822"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 24,
+                  "charOffset": 1714,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "execute"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1684,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b6b29b50c9fad361a4783304e5dc089bcafe5c0acc935064b01c01abcfc67b01"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 898,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 837,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b9d52792e6d4e536691e84c9b4fc5c659a53a7d2e4a2619e7af7ad4705929209"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/StaticTypeInference.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 21,
+                  "charOffset": 1427,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getInferedType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1379,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    public function getInferedType($variable)\n    {\n        if (isset($this->variables[$variable])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "badba27b16eabdd328f9c00d34637e9ce0ef09701b19d663cfda134e91ad30eb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 748,
+                  "startColumn": 21,
+                  "charOffset": 35710,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "optimizeConstantFolding"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 746,
+                  "startColumn": 1,
+                  "charOffset": 35643,
+                  "charLength": 250,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression\n     */\n    public function optimizeConstantFolding(array $expression, CompilationContext $compilationContext)\n    {\n        if ('int' != $expression['left']['type'] && 'double' != $expression['left']['type']) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bbbf105d6fec01b1281c41486d798d5f543f78a16dae32d90ccccb09991e8aae"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/OperatorsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 98,
+                  "startColumn": 21,
+                  "charOffset": 2873,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "cast"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 96,
+                  "startColumn": 1,
+                  "charOffset": 2818,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "     * @return RawOperator\n     */\n    public function cast($type, AbstractBuilder $expression)\n    {\n        return $this->raw(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bc8c568a1bb1c189e2e3abedbd33c973d8cf4dc100b63e299c9fdffaed45c177"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsScalarOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 21,
+                  "charOffset": 856,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 783,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bdf512a34dd2969714c7b6fd15695e0489fe750cf7c8c696d086e6d0084f5535"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 21,
+                  "charOffset": 758,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "addAssignment"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 709,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function addAssignment($assignment)\n    {\n        $this->assignments[] = $assignment;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bfa378fb7174e434bbc189d900fc9bce0effa6cf0eab253bc47698f10a5aefb3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetNsClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 883,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 822,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bfe441f603e6bc473bfaf03e30dc0e2ad736f1891c5bf1aa19ddc5690cdbe251"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/LdexpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 21,
+                  "charOffset": 905,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 844,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters']) || 2 != count($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c113111365b45eead3f6511c075dc8b1a85cfe9fa3b5d273b6f8149238719fcc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 21,
+                  "charOffset": 1724,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setChar"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 1665,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function setChar($char)\n    {\n        $this->char = $char;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c1ae96651d3af153b4ea5456429a79534822aeb358e2418f2dac7bf22b45afea"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 337,
+                  "startColumn": 22,
+                  "charOffset": 9885,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "prepareThemeOptions"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 335,
+                  "startColumn": 1,
+                  "charOffset": 9831,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    private function prepareThemeOptions($themeConfig, $options = null)\n    {\n        $parsedOptions = null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c1d33cd80b489c8742e160d84ee88a52dbfa6c7a9bf79c96b1aca8f2d2bc2899"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/RawExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 21,
+                  "charOffset": 828,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 779,
+                  "charLength": 110,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setExpression($expr)\n    {\n        $this->expression = $expr;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c1eb77e5f74faeeb23921fd33770de8f2ce099c7b0bf4b199750cf67927fedb2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsPrivatePropertyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 21,
+                  "charOffset": 946,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 885,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c331bdef14583bb61db5c8bb3352715d6f6f7434cdf4ba8e774092619cf2a16e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeyExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 21,
+                  "charOffset": 858,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 805,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c38c176bc5079abf734bc177ac85c790a49054b0365f863c5af6ed35a59de0c2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 876,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 815,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c39728174a6de1cad53bc6767e48283733688f9eaa16f3399a17d22d12661877"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FunctionExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 800,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 727,
+                  "charLength": 238,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters']) || 1 !== count($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c510c02aa7bcaa0d0b340fa119a77e482fe46288176cbb7294cc9f25c3992ad6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 82,
+                  "startColumn": 21,
+                  "charOffset": 1757,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "partial"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 80,
+                  "startColumn": 1,
+                  "charOffset": 1730,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "    }\n\n    public function partial(string $fileName, array $data = [])\n    {\n        $newLevel = $this->nestedLevel + 1;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c70bc23e37276ebde6177bb611c51cf0ae43712b8afca14fc31a05c8fe1c66f3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 109,
+                  "startColumn": 21,
+                  "charOffset": 2194,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "setVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 107,
+                  "startColumn": 1,
+                  "charOffset": 2145,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setVariable($variable)\n    {\n        $this->variable = $variable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c85219fb9c34dac9addd1595705695eabf587053ea9d765ca1892692d98d456c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 284,
+                  "startColumn": 21,
+                  "charOffset": 8317,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "arrayIsset"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 282,
+                  "startColumn": 1,
+                  "charOffset": 8290,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "    }\n\n    public function arrayIsset(Variable $var, $resolvedExpr, $expression, CompilationContext $context)\n    {\n        if (!($resolvedExpr instanceof Variable)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c90b898e5b5bb06d364b070c4b17f3a72beecbf1117a781c95995d21bc2fc65d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 141,
+                  "startColumn": 33,
+                  "charOffset": 2595,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 139,
+                  "startColumn": 1,
+                  "charOffset": 2534,
+                  "charLength": 81,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    abstract protected function preBuild();\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c978ff3383d6b888765b51a9f074ee2efcf85a0a613ba691dbf779368d4656a9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 21,
+                  "charOffset": 955,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "literal"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 898,
+                  "charLength": 120,
+                  "snippet": {
+                    "text": "     * @return RawExpression\n     */\n    public function literal($type, $value = null)\n    {\n        return $this->raw(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ca24379e85ffe4c6cbca36e1017e170b7a4e24240e89be3ab174de78f77f27f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 661,
+                  "startColumn": 24,
+                  "charOffset": 22813,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 659,
+                  "startColumn": 1,
+                  "charOffset": 22757,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    protected function optimize($funcName, array $expression, Call $call, CompilationContext $compilationContext)\n    {\n        $optimizer = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cf24aec99507df22fec73681dca50cfe6fd7710fafc5f522e8a71d792999ebd2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 385,
+                  "startColumn": 21,
+                  "charOffset": 11732,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getTempVariableForObserve"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 383,
+                  "startColumn": 1,
+                  "charOffset": 11680,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempVariableForObserve($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'observe');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cfe476f8f257e4e3ad064ef4828e41b51fe6244107c1d8fa12c49a4f32c7a42d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 24,
+                  "charOffset": 1519,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "execute"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1489,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d0012b3999cc7ae35cc98f2d15bcca22001b36977d2fae512b8a209d195502a6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Docblock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 142,
+                  "startColumn": 21,
+                  "charOffset": 2933,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "setDescription"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 140,
+                  "startColumn": 1,
+                  "charOffset": 2871,
+                  "charLength": 146,
+                  "snippet": {
+                    "text": "     * @param string $description\n     */\n    public function setDescription(string $description)\n    {\n        $this->description = $description;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d111848e1983cae1d7c9c860a333cb10623ca385666475296b56ba79078af6ab"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 888,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 827,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d1c670cf84416ea987569e0982171b30128981ed2192929281825e26a74c8ab7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 21,
+                  "charOffset": 1123,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1062,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function compile($expression, CompilationContext $compilationContext)\n    {\n        $this->checkLeft($expression, CompilerException::class, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d2369ae88d24c58c0a41372cc334b15b54bd731e69e98dd12db252e6a1b3f845"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ImplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 21,
+                  "charOffset": 865,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 804,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d2983985b3e2d74872da94fc562673bb1326bef0b498808c1e8d47651f89238c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 328,
+                  "startColumn": 21,
+                  "charOffset": 9970,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getTempNonTrackedVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 326,
+                  "startColumn": 1,
+                  "charOffset": 9918,
+                  "charLength": 215,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempNonTrackedVariable($type, CompilationContext $context, $initNonReferenced = false)\n    {\n        $variable = $this->reuseTempVariable($type, 'non-tracked');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d44d4b30201089396193d9a2169e04d973eb2919b6823d93c4c6858233748db1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ClassExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 885,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 824,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d45d94681daa73dc4c9db194923f7d4bd74709c5bafaa0405f95822a75429833"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 552,
+                  "startColumn": 21,
+                  "charOffset": 18356,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "assignDouble"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 550,
+                  "startColumn": 1,
+                  "charOffset": 18329,
+                  "charLength": 247,
+                  "snippet": {
+                    "text": "    }\n\n    public function assignDouble(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)\n    {\n        return $this->assignHelper('ZVAL_DOUBLE', $this->getVariableCode($variable), $value, $context, $useCodePrinter);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d480a1c3202a67c4f7e53c3b81554842d8b701086c937983b86aeef87949bfae"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/BuilderFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 21,
+                  "charOffset": 1874,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 1817,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "     * @return RawExpression\n     */\n    public function variable($name)\n    {\n        return $this->raw(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d7130b4c73699a211a459eed5f898502b6de80939fe879f862a3fdd0155424ee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 520,
+                  "startColumn": 21,
+                  "charOffset": 16333,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "getVariableForRead"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 518,
+                  "startColumn": 1,
+                  "charOffset": 16272,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function getVariableForRead($name, CompilationContext $compilationContext = null, array $statement = null)\n    {\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d8718d945d68e6aea6710b63e3328ec2c7c33c953a63282686bc500a03af4ec4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/AddslashesOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 21,
+                  "charOffset": 843,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 790,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "daa0016724d662f69763f2df55ac64e28ede950a750d3c1a9efe49bc17e989f3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PowOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 21,
+                  "charOffset": 911,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 850,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "daa2bc761c2c4bc4700d90df91d35c324ca0a44d90530e84935f3f35d648245a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 97,
+                  "startColumn": 21,
+                  "charOffset": 1995,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 95,
+                  "startColumn": 1,
+                  "charOffset": 1946,
+                  "charLength": 122,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function setExpression($expression)\n    {\n        $this->expression = $expression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dbbf85e118b4a3f176554fe2f3a5158ad4fbce9cbe7025592d1cd502450f7648"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/BinaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 198,
+                  "startColumn": 21,
+                  "charOffset": 4345,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "setRightExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 196,
+                  "startColumn": 1,
+                  "charOffset": 4287,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "     * @return BinaryOperator\n     */\n    public function setRightExpression(AbstractBuilder $rightExpression)\n    {\n        $this->rightExpression = $rightExpression;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dd499f6a68aaa140b40b635d560b86910d9d6f196c0a2b18973de0b0ea548e4c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 24,
+                  "charOffset": 1205,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "execute"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1175,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        if (!$this->filesystem->isInitialized()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dd724f99eae553cd5712b259b9d381150416ab1701a3687fe22ad42b4c05c783"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 881,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 820,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dd8013f2aa00969fc7f4148cedeeb624e79003eb43b5c3b6dc0b0b39bc6533cc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CompareMtimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 888,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 827,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "de38ffca15cce2a94e7aed9356b74f5fbea629c66732cfbb6373d2949c3924de"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 764,
+                  "startColumn": 21,
+                  "charOffset": 27567,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "getVariableForWrite"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 762,
+                  "startColumn": 1,
+                  "charOffset": 27506,
+                  "charLength": 169,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function getVariableForWrite($name, CompilationContext $compilationContext, array $statement = null)\n    {\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "deecca77504e420fc79b3a2fa5d14e1b0673df658ca63fb6abb4ab9d4ef880a9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileGetContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 898,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 837,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "df03ecc7952b7829d810b5b4299a2fe8dbc6b76bd7bb44387d5fc9f2eb23dd61"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 295,
+                  "startColumn": 21,
+                  "charOffset": 8840,
+                  "charLength": 38,
+                  "snippet": {
+                    "text": "getTempNonTrackedUninitializedVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 293,
+                  "startColumn": 1,
+                  "charOffset": 8788,
+                  "charLength": 214,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempNonTrackedUninitializedVariable($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'non-tracked-uninitialized');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "df320d262a045e51ba4a3a7938a7c0fc8061f33c0d6d5855a1bcb2d845f55472"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MergeAppendOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 885,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 824,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e1116614aae14d2eb9850620db76df8a16c742c67f22566b4ff97bc04abb30bf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrlenOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 789,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 716,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e222e6031e96386388e7c6a7caaa85133b6e3be8d214419c5d893eb4cbf07632"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 256,
+                  "startColumn": 21,
+                  "charOffset": 7454,
+                  "charLength": 28,
+                  "snippet": {
+                    "text": "getTempLocalVariableForWrite"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 254,
+                  "startColumn": 1,
+                  "charOffset": 7402,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempLocalVariableForWrite($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'stack');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e43fea052dc829da102058d34fc9ffb41053f12ad925be6b8a4d906bdf7579cb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/SymbolTable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 220,
+                  "startColumn": 21,
+                  "charOffset": 6230,
+                  "charLength": 37,
+                  "snippet": {
+                    "text": "getTempComplexLiteralVariableForWrite"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 218,
+                  "startColumn": 1,
+                  "charOffset": 6178,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "     * @return Variable\n     */\n    public function getTempComplexLiteralVariableForWrite($type, CompilationContext $context)\n    {\n        $variable = $this->reuseTempVariable($type, 'heap-literal');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e4bda14d7fca8fe3c4aa2b07947fa5e698414879337a1f16c5797bfa3449ba55"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PregMatchOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 21,
+                  "charOffset": 1039,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 978,
+                  "charLength": 224,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters']) || count($expression['parameters']) < 2) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e535b24810f6f1fc1692b1046b556507d995b854a980db2d2d286753f5ca08d0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 21,
+                  "charOffset": 1473,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "addArgument"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1424,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function addArgument($argument)\n    {\n        $this->arguments[] = $argument;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e7e05eff656f2aac1f5e524a334b1ed89899e1121e47f96fea7fd408e567d0e3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 547,
+                  "startColumn": 21,
+                  "charOffset": 18112,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "assignBool"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 545,
+                  "startColumn": 1,
+                  "charOffset": 18085,
+                  "charLength": 243,
+                  "snippet": {
+                    "text": "    }\n\n    public function assignBool(Variable $variable, $value, CompilationContext $context, $useCodePrinter = true)\n    {\n        return $this->assignHelper('ZVAL_BOOL', $this->getVariableCode($variable), $value, $context, $useCodePrinter);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e863046a7392d11e22547f0e33eea5ae73b79cc59352e298c32fdd32a0806e3e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 112,
+                  "startColumn": 21,
+                  "charOffset": 2086,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setLine"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 110,
+                  "startColumn": 1,
+                  "charOffset": 2027,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "     * @return AbstractBuilder\n     */\n    public function setLine($line)\n    {\n        $this->line = $line;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "eb4c110c726bb757c2014edb7817c05246bc1262b35f058643c73e8d291bb407"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallStaticStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 21,
+                  "charOffset": 1755,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "setArguments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 1692,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "     * @return CallStaticStatement\n     */\n    public function setArguments($arguments)\n    {\n        $this->arguments = $arguments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "eb5ef6c2a175de8aa08b6db93d527f2c52a460d72e93792e6f4b9bc7a863f744"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/IfStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 78,
+                  "startColumn": 21,
+                  "charOffset": 1652,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getStatements"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 76,
+                  "startColumn": 1,
+                  "charOffset": 1593,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "     * @return StatementsBlock\n     */\n    public function getStatements()\n    {\n        return $this->statements;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ec204bb3a16b01d24c9a6a1240157e2305f3f7685dfae36eb644c2f57355bd09"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GettypeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 872,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 811,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ec66ddfa7a3dede39c130220d874e083981ce298dd3d79bfd34560aef05d4139"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/SubstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 869,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 808,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ecef55813a671a5519049d777c82668028b85948ee611fe72ddc62fef6342d68"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CountOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 786,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 713,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ed4852735e243aa15172300e4ff8b79fd021a793ce2dbf2db36cbb03f9c2b914"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 78,
+                  "startColumn": 21,
+                  "charOffset": 1629,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getArguments"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 76,
+                  "startColumn": 1,
+                  "charOffset": 1580,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function getArguments()\n    {\n        return $this->arguments;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f04b49646be7c3b7f87513110f41c83a98fa68bd624d652d04fc294a1016fa0c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 869,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 808,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f07191fd879669c182ca4d328a49abf5bbdf6312ab7ca85b0ba030cbf69792f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 194,
+                  "startColumn": 28,
+                  "charOffset": 4987,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "sourceUrl"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 192,
+                  "startColumn": 1,
+                  "charOffset": 4953,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "    }\n\n    public static function sourceUrl(Definition $c)\n    {\n        return '/source/' . str_replace('\\\\', '/', $c->getCompleteName()) . '.html';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f0bf9fc55e6658e81750458f29bd60a288006b122394238d4b1660c189d47b60"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateArrayOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 898,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 837,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f20bb612a9f07c2fa9a3dadfb09fcfafadaeac56b12686c88d181ff52e807b17"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 907,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 846,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f50c141c69bf0ae5d0ab5a2837f35e3927c425b76aed2a36ab922173286a60ae"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Factory/StatementsFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 21,
+                  "charOffset": 2329,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "rawC"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 2273,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "     * @return RawStatement\n     */\n    public function rawC($value)\n    {\n        return $this->raw(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f5682dfb48244e007917c5c99693d138b666e272bed8b2aaf97fbb305edd6c59"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FeofOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 783,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 710,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f681df20709c3c3fae391e3878848278167c9e99bc12c61fa9d367877720984f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsIntOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 24,
+                  "charOffset": 508,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 430,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "class IsIntOptimizer extends IsTypeOptimizerAbstract\n{\n    protected function getType()\n    {\n        return 'IS_LONG';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f6d1170a89254445cb6476f81b3fda5378561274ae071a4404ed0f4ed58dca91"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/StatementsBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 21,
+                  "charOffset": 795,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "addStatement"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 746,
+                  "charLength": 121,
+                  "snippet": {
+                    "text": "     * @return $this\n     */\n    public function addStatement($statement)\n    {\n        $this->statements[] = $statement;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f84a7e6c7d55319bf98ecd34af3836f50c561adc45952e88054d0e71cd1e2e87"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 233,
+                  "startColumn": 21,
+                  "charOffset": 6771,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getThemeInfo"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 231,
+                  "startColumn": 1,
+                  "charOffset": 6717,
+                  "charLength": 126,
+                  "snippet": {
+                    "text": "     * @return mixed|null\n     */\n    public function getThemeInfo($name)\n    {\n        if (isset($this->themeInfos[$name])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f8640a960385d343ae07a9e921ab6ae7598e5b34839cdb3fca30284a451b9a32"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 21,
+                  "charOffset": 1337,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "getParsedDocblock"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1265,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "     * @return Docblock the parsed docblock\n     */\n    public function getParsedDocblock()\n    {\n        return $this->docblockObj;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f8713d1b6bb9ff1f24d793338cfaaf82e8234e840d848c9e86ce18e551b9437b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 499,
+                  "startColumn": 21,
+                  "charOffset": 16251,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "getClassDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 497,
+                  "startColumn": 1,
+                  "charOffset": 16197,
+                  "charLength": 150,
+                  "snippet": {
+                    "text": "     * @return Definition\n     */\n    public function getClassDefinition()\n    {\n        $this->classDefinition->setAliasManager($this->aliasManager);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f87672c7b9f90e2a8889febaeb4e3477cd51ee4f0839b9127d9a392f5cf6589a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 21,
+                  "charOffset": 832,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 759,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f9392c5736a4252f450e8bcb2f1f46b6d39b628de779ef080d6de4c5952db52e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 21,
+                  "charOffset": 796,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 723,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f9fefae79ae0463c83e77401585c29db989a38f24bd631f7f4912c8c6566baf4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsPhpVersionOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 21,
+                  "charOffset": 1044,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 982,
+                  "charLength": 185,
+                  "snippet": {
+                    "text": "     * @return CompiledExpression\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fb9b97c3e253b31871b733c685abb3635d6f81f64d5a22a91405b0108669df2e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1828,
+                  "startColumn": 21,
+                  "charOffset": 63450,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "returnString"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1826,
+                  "startColumn": 1,
+                  "charOffset": 63423,
+                  "charLength": 197,
+                  "snippet": {
+                    "text": "    }\n\n    public function returnString($value, CompilationContext $context, $useCodePrinter = true)\n    {\n        return $this->returnHelper('RETURN_MM_STRING', $value, $context, $useCodePrinter);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fcb0e74b0870daba17122f220e8c5e222433cc87cff0247478df1575c4fc5cbc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 336,
+                  "startColumn": 24,
+                  "charOffset": 10597,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "_callNormal"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 334,
+                  "startColumn": 1,
+                  "charOffset": 10523,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "     * @throws Exception|CompilerException\n     */\n    protected function _callNormal(array $expression, CompilationContext $compilationContext)\n    {\n        $funcName = strtolower($expression['name']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fdadea27d641867e6c7ec2059c31c201b04dd4a95740eeb299707e8fd86bdf25"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Statements/CallFunctionStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 138,
+                  "startColumn": 24,
+                  "charOffset": 2545,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 136,
+                  "startColumn": 1,
+                  "charOffset": 2493,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function preBuild()\n    {\n        if ($arguments = $this->getArguments()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fe3045f6c12c0728d017855e3913d0108c87460c88f4555efa6399fb61117bc3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 21,
+                  "charOffset": 865,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 804,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "     * @throws CompilerException\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)\n    {\n        if (!isset($expression['parameters'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fe3e8abd0f5be17509ded36f52424692fef4777df238025ad9341df9622e1ab0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 249,
+                  "startColumn": 21,
+                  "charOffset": 7144,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "getThemeInfoExtendAware"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 247,
+                  "startColumn": 1,
+                  "charOffset": 7095,
+                  "charLength": 121,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    public function getThemeInfoExtendAware($name)\n    {\n        if ($this->extendedTheme) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fe6e671f75f047951198bd67e3bf4688022d19a759ee00adcc94ef05e81e6eee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler/FileInterface.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 21,
+                  "charOffset": 563,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "getClassDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 509,
+                  "charLength": 84,
+                  "snippet": {
+                    "text": "     * @return Definition\n     */\n    public function getClassDefinition();\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fe8e5782714fd3d3fdbf28e2e37bf9706cbec96388337673538d295d632491b7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMissingReturnTypeInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Missing function's return type declaration",
+            "markdown": "Missing function's return type declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/RawOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 24,
+                  "charOffset": 1010,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "preBuild"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 958,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "     * @return array\n     */\n    protected function preBuild()\n    {\n        return $this->getExpression();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ff3574ad2040ec791324ae8efbe25d868b2aff6db6581119f318955e32d927b9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpMixedReturnTypeCanBeReducedInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Type can be narrowed to 'CompiledExpression|bool'",
+            "markdown": "Type can be narrowed to 'CompiledExpression\\|bool'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 66,
+                  "startColumn": 88,
+                  "charOffset": 1531,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 64,
+                  "startColumn": 1,
+                  "charOffset": 1401,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "     * @throws ReflectionException\n     */\n    public function compile(Expression $expr, CompilationContext $compilationContext): mixed\n    {\n        $expression = $expr->getExpression();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "83f1a7556b63e7d0e542532aaf5ef3605c8d890998e844a6c46fc7d233f34c47"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpNonStrictObjectEqualityInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Non-strict object equality comparison",
+            "markdown": "Non-strict object equality comparison"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Cache/MethodCache.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 147,
+                  "startColumn": 56,
+                  "charOffset": 5442,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "=="
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 145,
+                  "startColumn": 1,
+                  "charOffset": 5289,
+                  "charLength": 272,
+                  "snippet": {
+                    "text": "            $staticCacheable = !$method->getClassDefinition()->isInterface() &&\n                (\n                    $compilationContext->currentMethod == $method ||\n                    $method->getClassDefinition()->isFinal() ||\n                    $method->isFinal() ||"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7278ff3dd417a2af9efcef330d2b5883bb286a6d828029265a23bc33e1bed2e6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpNotInstalledPackagesInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Packages are not installed",
+            "markdown": "Packages are not installed"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "composer.json",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 23,
+                  "startColumn": 5,
+                  "charOffset": 629,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "\"require\""
+                  },
+                  "sourceLanguage": "JSON"
+                },
+                "contextRegion": {
+                  "startLine": 21,
+                  "startColumn": 1,
+                  "charOffset": 608,
+                  "charLength": 83,
+                  "snippet": {
+                    "text": "        }\n    ],\n    \"require\": {\n        \"php\": \">=8.0\",\n        \"ext-ctype\": \"*\","
+                  },
+                  "sourceLanguage": "JSON"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "574d956496a7f3d13d1e88038e2d2332c7f8d6ac18b2c2b7017646da31c6e53b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "JSON"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpNotInstalledPackagesInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Packages are not installed",
+            "markdown": "Packages are not installed"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "composer.json",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 5,
+                  "charOffset": 969,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "\"require-dev\""
+                  },
+                  "sourceLanguage": "JSON"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 915,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "        \"symfony/event-dispatcher\": \"^5.3\"\n    },\n    \"require-dev\": {\n        \"ext-gmp\": \"*\",\n        \"ext-pdo\": \"*\","
+                  },
+                  "sourceLanguage": "JSON"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d43f95314a8e0ddb2d554d109da414e7c5955f1d244884709a3c244bdbd00c1f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "JSON"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$file' type is not compatible with declaration",
+            "markdown": "Parameter '$file' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 819,
+                  "startColumn": 65,
+                  "charOffset": 28237,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$file"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 817,
+                  "startColumn": 1,
+                  "charOffset": 28098,
+                  "charLength": 257,
+                  "snippet": {
+                    "text": "        foreach ($this->compiledFiles as $file) {\n            if ($file) {\n                $fileH            = str_replace('.c', '.zep.h', $file);\n                $include          = '#include \"' . $fileH . '\"';\n                $includeHeaders[] = $include;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "299f4f4aa8538cdf39b04e502e0b401166c04f1decb2efc8420a403529dc75f7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$logger' type is not compatible with declaration",
+            "markdown": "Parameter '$logger' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 109,
+                  "startColumn": 69,
+                  "charOffset": 2954,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 107,
+                  "startColumn": 1,
+                  "charOffset": 2855,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "    $consoleStdOutHandler,\n]);\n$compilerFactory = new Compiler\\CompilerFileFactory($config, $disk, $logger);\n$backend = new Backend($config, $rootPath.'/kernel', $rootPath.'/templates');\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3bf26e80486614d559b649fc747bfa398d55313500683ee73ada93b302caf886"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$expression' type is not compatible with declaration",
+            "markdown": "Parameter '$expression' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/NewInstanceTypeOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 83,
+                  "startColumn": 59,
+                  "charOffset": 2405,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$expression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 81,
+                  "startColumn": 1,
+                  "charOffset": 2252,
+                  "charLength": 201,
+                  "snippet": {
+                    "text": "            return $expression->compile($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $expression, $e->getCode(), $e);\n        }\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3c6a8e78f46eb54e9022dee66b733b02069b5cec0cf5ce9d32612c2664f846e5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$this->config' type is not compatible with declaration",
+            "markdown": "Parameter '$this-\\>config' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 99,
+                  "startColumn": 42,
+                  "charOffset": 2364,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$this->config"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 97,
+                  "startColumn": 1,
+                  "charOffset": 2262,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "\n            // class source file (source/ns1/n2/class.html)\n            $sfile = new File\\SourceFile($this->config, $class);\n            $this->theme->drawFile($sfile);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "632fbc378ba47dd4fd640823893b3901fc60d3461e6c9461c4973db2a971858e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$logger' type is not compatible with declaration",
+            "markdown": "Parameter '$logger' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 125,
+                  "startColumn": 54,
+                  "charOffset": 3703,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 123,
+                  "startColumn": 1,
+                  "charOffset": 3556,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "$application->add(new FullCleanCommand());\n$application->add(new GenerateCommand($compiler));\n$application->add(new InitCommand($backend, $config, $logger));\n$application->add(new InstallCommand($compiler, $config));\n$application->add(new ListCommand());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bdce38ccece735be8a59e6ffc771fffe601b495a211177f993a1888688c4bf6a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$this->projectConfig' type is not compatible with declaration",
+            "markdown": "Parameter '$this-\\>projectConfig' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 89,
+                  "startColumn": 37,
+                  "charOffset": 2102,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "$this->projectConfig"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 87,
+                  "startColumn": 1,
+                  "charOffset": 1951,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "        $template->setPathToRoot($this->getPathToRoot());\n        $template->setThemeOptions($this->themeOptions);\n        $template->setProjectConfig($this->projectConfig);\n\n        return $template->parse();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c08ddbbd8e158a925394aefdfbfbdcaff4666840e13ce69f4f77d6d3dc06b2ae"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$variable' type is not compatible with declaration",
+            "markdown": "Parameter '$variable' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 944,
+                  "startColumn": 87,
+                  "charOffset": 32920,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 942,
+                  "startColumn": 1,
+                  "charOffset": 32770,
+                  "charLength": 273,
+                  "snippet": {
+                    "text": "             */\n            foreach ($variables as $variable) {\n                $nextCode = $this->generateInitCode($groupVariables, $type, $pointer, $variable);\n                if ($nextCode && $additionalCode) {\n                    $additionalCode .= PHP_EOL . $nextCode;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f8fe8e4d246cbf40311af55992c8768b555c62fd9c5c9dabc2c3b8d28d27d120"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$this->classes' type is not compatible with declaration",
+            "markdown": "Parameter '$this-\\>classes' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 104,
+                  "startColumn": 38,
+                  "charOffset": 2519,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$this->classes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 102,
+                  "startColumn": 1,
+                  "charOffset": 2442,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "\n        // classes file (classes.html)\n        $file = new File\\ClassesFile($this->classes);\n        $this->theme->drawFile($file);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fa621e674e168d6feb8f151a9b2bdd6bc097733c75fcb6d25886c648c211dc9c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$itemVariable' type is not compatible with declaration",
+            "markdown": "Parameter '$itemVariable' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArray.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 572,
+                  "startColumn": 92,
+                  "charOffset": 25132,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$itemVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 570,
+                  "startColumn": 1,
+                  "charOffset": 25011,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "\n                    default:\n                        throw new CompilerException('Unknown ' . $itemVariable->getType(), $itemVariable);\n                }\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fee7a8d8a870c2637f5c056dc8883ddb4c3d5710ef05d3d7a39bb27addaf0585"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpParamsInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Parameter '$exprCompiled' type is not compatible with declaration",
+            "markdown": "Parameter '$exprCompiled' type is not compatible with declaration"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArray.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 577,
+                  "startColumn": 56,
+                  "charOffset": 25266,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$exprCompiled"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 575,
+                  "startColumn": 1,
+                  "charOffset": 25189,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "\n            default:\n                throw new CompilerException('Unknown', $exprCompiled);\n        }\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "feff6d8b16365cc191d70df5c3f718ac8cb24d1e5b07b7a41345c24af24ac9fe"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPointlessBooleanExpressionInConditionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Boolean expression can be simplified",
+            "markdown": "Boolean expression can be simplified"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PregMatchOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 151,
+                  "startColumn": 17,
+                  "charOffset": 4765,
+                  "charLength": 35,
+                  "snippet": {
+                    "text": "false == $variable->isInitialized()"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 149,
+                  "startColumn": 1,
+                  "charOffset": 4734,
+                  "charLength": 180,
+                  "snippet": {
+                    "text": "            }\n\n            if (false == $variable->isInitialized()) {\n                $variable->initVariant($context);\n                $variable->setIsInitialized(true, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "147f13a42d43a5451cab35bdaba785b62a7d8aaab9b2300c9f34fdfc9dff66e3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 326,
+                  "startColumn": 36,
+                  "charOffset": 13135,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "zvalNullOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 324,
+                  "startColumn": 1,
+                  "charOffset": 13009,
+                  "charLength": 250,
+                  "snippet": {
+                    "text": "                        return new CompiledExpression(\n                            'bool',\n                            $this->zvalNullOperator . '(' . $variableLeftCode . ')',\n                            $expression['left']\n                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "08307be2837006ef237f0a187a964e96828266bca4c95f5afb26624ec3b9e582"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertySub.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 35,
+                  "charOffset": 1606,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getCompleteName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1430,
+                  "charLength": 248,
+                  "snippet": {
+                    "text": "        if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0ae026673c17c3158d0d031b33535bc1d90b45bbbfd06893ac042af2418819f1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 668,
+                  "startColumn": 44,
+                  "charOffset": 29995,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "zvalNullOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 666,
+                  "startColumn": 1,
+                  "charOffset": 29845,
+                  "charLength": 286,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalNullOperator . '(' . $variableCode . ')',\n                                    $expression['left']\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0b78ff5f70bb01049fbb4359c580388d1de4af4eedc32a645207dd7020af5632"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 417,
+                  "startColumn": 75,
+                  "charOffset": 18672,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 415,
+                  "startColumn": 1,
+                  "charOffset": 18491,
+                  "charLength": 317,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                                    ) . ')',\n                                    $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0d582d5ece2523d02b292aa8f38c65211fc2b66523f3a7191dad09b1cdedccc2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertySub.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 91,
+                  "startColumn": 45,
+                  "charOffset": 2585,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getClassEntry"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 89,
+                  "startColumn": 1,
+                  "charOffset": 2526,
+                  "charLength": 217,
+                  "snippet": {
+                    "text": "\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1149134c7f94b52585233fb13644542b51ae8bdef2ffc7833ecbb9b3dd3e42cc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 356,
+                  "startColumn": 44,
+                  "charOffset": 14519,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "zvalOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 354,
+                  "startColumn": 1,
+                  "charOffset": 14369,
+                  "charLength": 302,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalOperator . '(' . $variableLeftCode . ', ' . $variableRight . ')',\n                                    $expression\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1203833a9c8f8f4d85487b6276018a0779c475ded4bbee99f1a9e21a5c0e5501"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Property.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 411,
+                  "startColumn": 63,
+                  "charOffset": 12521,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getInitMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 409,
+                  "startColumn": 1,
+                  "charOffset": 12424,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "\n        if (!$this->isStatic()) {\n            $constructParentMethod = $parentClassDefinition?->getInitMethod();\n            $constructMethod       = $classDefinition->getInitMethod();\n        } else {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "14e9d45cd1c9703acc7438db420dbc4d9597b1b1a7e9e5d5ce42818d9217903b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 746,
+                  "startColumn": 74,
+                  "charOffset": 33813,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "zvalBoolFalseOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 744,
+                  "startColumn": 1,
+                  "charOffset": 33619,
+                  "charLength": 280,
+                  "snippet": {
+                    "text": "                            case 'bool':\n                                $zvalBoolOperator = 'true' === $right->getCode(\n                                ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;\n\n                                return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2302723284c89040c1ddb20f3b6eeaaec69fdaff812816274bb68bed8738b3f0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 541,
+                  "startColumn": 63,
+                  "charOffset": 24684,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 539,
+                  "startColumn": 1,
+                  "charOffset": 24490,
+                  "charLength": 345,
+                  "snippet": {
+                    "text": "                                            'int',\n                                            '((int) (' . $variableLeft->getName(\n                                            ) . ') ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2e7a5d44b66d04c404c71b3ae08c24990d64c0c085a3370ee60de104841fe891"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Stubs/Generator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 172,
+                  "startColumn": 87,
+                  "charOffset": 4773,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "isBundled"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 170,
+                  "startColumn": 1,
+                  "charOffset": 4587,
+                  "charLength": 355,
+                  "snippet": {
+                    "text": "            $hasAliasForExtends = $aliasManager->isAlias($extendsClassDefinition->getShortName());\n\n            $source .= ' extends ' . ($hasAliasForExtends || $extendsClassDefinition->isBundled() ? '' : '\\\\');\n            $source .= $hasAliasForExtends ? $extendsClassDefinition->getShortName(\n            ) : $extendsClassDefinition->getCompleteName();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "397b5ca132c9805176f284e0c6fee1249a986fb027d23196df3ef6ded7b27110"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 445,
+                  "startColumn": 62,
+                  "charOffset": 20227,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 443,
+                  "startColumn": 1,
+                  "charOffset": 20040,
+                  "charLength": 338,
+                  "snippet": {
+                    "text": "                                            'bool',\n                                            '(' . $variableLeft->getName(\n                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3b2a7321b1df0466e037cedf6f05124d749dfbe3015f8ff361401b8fd373599c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 740,
+                  "startColumn": 44,
+                  "charOffset": 33450,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "zvalLongOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 738,
+                  "startColumn": 1,
+                  "charOffset": 33300,
+                  "charLength": 317,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalLongOperator . '(' . $variableCode . ', \\'' . $right->getCode() . '\\')',\n                                    $expression['left']\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3b644aeb6c95ec9d6cec51533a2610131b74715ff15404f7ce43ff4cf1a19a03"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 154,
+                  "startColumn": 74,
+                  "charOffset": 5824,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 152,
+                  "startColumn": 1,
+                  "charOffset": 5661,
+                  "charLength": 287,
+                  "snippet": {
+                    "text": "                        return new CompiledExpression(\n                            'int',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . '((' . $right->getCode(\n                            ) . ') ? 1 : 0))',\n                            $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "431e1d06ebdd4a1b054992506bdbd255a9651fbc6b98282d63c78701e40579d1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 161,
+                  "startColumn": 70,
+                  "charOffset": 6181,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 159,
+                  "startColumn": 1,
+                  "charOffset": 6017,
+                  "charLength": 274,
+                  "snippet": {
+                    "text": "                    Types::T_BOOL   => new CompiledExpression(\n                        'bool',\n                        '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',\n                        $expression\n                    ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "49407df3adba653e7aa0c56481e01d02ddcb62eeaa1859b8825d16687c8deaa6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 732,
+                  "startColumn": 44,
+                  "charOffset": 33052,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "zvalLongOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 730,
+                  "startColumn": 1,
+                  "charOffset": 32902,
+                  "charLength": 313,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalLongOperator . '(' . $variableCode . ', ' . $right->getCode() . ')',\n                                    $expression['left']\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a001eb86fe07ee27d6420d526dbfb313708eefd74655dde48a3718a15030a42"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 774,
+                  "startColumn": 52,
+                  "charOffset": 35271,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "zvalLongOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 772,
+                  "startColumn": 1,
+                  "charOffset": 35097,
+                  "charLength": 355,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalLongOperator . '(' . $variableCode . ', ' . $variableRight->getName(\n                                            ) . ')',\n                                            $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5115527f55f97eabbbdcf5545cbc1d673fca52de44ac1432f9d478bf72ab37af"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 790,
+                  "startColumn": 52,
+                  "charOffset": 36173,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "zvalBoolOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 788,
+                  "startColumn": 1,
+                  "charOffset": 35999,
+                  "charLength": 355,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalBoolOperator . '(' . $variableCode . ', ' . $variableRight->getName(\n                                            ) . ')',\n                                            $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5a30ef682cab3ab1c1e6494d47329ddb7ce791b0061884b2475d843cd590bdcb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 746,
+                  "startColumn": 44,
+                  "charOffset": 33783,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "zvalBoolTrueOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 744,
+                  "startColumn": 1,
+                  "charOffset": 33619,
+                  "charLength": 280,
+                  "snippet": {
+                    "text": "                            case 'bool':\n                                $zvalBoolOperator = 'true' === $right->getCode(\n                                ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;\n\n                                return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5a77fc73bf5733e1b584aa05d199d1ce2151ac0666567f24d47519a70724f8af"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 694,
+                  "startColumn": 52,
+                  "charOffset": 31365,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "zvalOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 692,
+                  "startColumn": 1,
+                  "charOffset": 31191,
+                  "charLength": 338,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalOperator . '(' . $variableCode . ', ' . $variableRight . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5d2635ca908ddf6f44429f2a88f755288017f054873a766d0802ce8c17e0cafe"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 450,
+                  "startColumn": 62,
+                  "charOffset": 19876,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 448,
+                  "startColumn": 1,
+                  "charOffset": 19690,
+                  "charLength": 337,
+                  "snippet": {
+                    "text": "                                            'int',\n                                            '(' . $variableLeft->getName(\n                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "65965f22f35f67e7f539ce48dc22da7c7fcd2010bfa1b9bca1837ae1f0ae833a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Stubs/Generator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 174,
+                  "startColumn": 42,
+                  "charOffset": 4924,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getCompleteName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 172,
+                  "startColumn": 1,
+                  "charOffset": 4687,
+                  "charLength": 266,
+                  "snippet": {
+                    "text": "            $source .= ' extends ' . ($hasAliasForExtends || $extendsClassDefinition->isBundled() ? '' : '\\\\');\n            $source .= $hasAliasForExtends ? $extendsClassDefinition->getShortName(\n            ) : $extendsClassDefinition->getCompleteName();\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6b3c735b2957305e8dec23f04c9ddce79f4c7b33e7a358b94a5fafaa1ac31728"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 415,
+                  "startColumn": 75,
+                  "charOffset": 17907,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 413,
+                  "startColumn": 1,
+                  "charOffset": 17727,
+                  "charLength": 316,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'int',\n                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                                    ) . ')',\n                                    $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6c8944c42ddedd21cbb6217ac586f7f537eff8f46825b0055ea26281d30ef516"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Stubs/Generator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 170,
+                  "startColumn": 83,
+                  "charOffset": 4669,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getShortName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 168,
+                  "startColumn": 1,
+                  "charOffset": 4572,
+                  "charLength": 226,
+                  "snippet": {
+                    "text": "            }\n\n            $hasAliasForExtends = $aliasManager->isAlias($extendsClassDefinition->getShortName());\n\n            $source .= ' extends ' . ($hasAliasForExtends || $extendsClassDefinition->isBundled() ? '' : '\\\\');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "75852d80a0a7344aa989ad48560ed13237bba36f0e65333ade21f0f3829a7c4d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 336,
+                  "startColumn": 36,
+                  "charOffset": 13510,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "zvalStringOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 334,
+                  "startColumn": 1,
+                  "charOffset": 13384,
+                  "charLength": 281,
+                  "snippet": {
+                    "text": "                        return new CompiledExpression(\n                            'bool',\n                            $this->zvalStringOperator . '(' . $variableLeftCode . ', \"' . $right->getCode() . '\")',\n                            $expression['left']\n                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7c6d83bb68d5b138ae1cacaaff17bfba153208c7659d2ab66a05fe402fd1e718"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 508,
+                  "startColumn": 55,
+                  "charOffset": 22716,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 506,
+                  "startColumn": 1,
+                  "charOffset": 22554,
+                  "charLength": 296,
+                  "snippet": {
+                    "text": "                                    'int',\n                                    '((int) (' . $left->getCode(\n                                    ) . ') ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',\n                                    $expression\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "80fa75dfd96509134e6644e0b34e717a8f3a74dd97e67eedf18030f1ae95fc16"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertySub.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 79,
+                  "startColumn": 43,
+                  "charOffset": 2251,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getCompleteName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 77,
+                  "startColumn": 1,
+                  "charOffset": 2078,
+                  "charLength": 248,
+                  "snippet": {
+                    "text": "                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9249d77cae491a23f4c9f74d226b10a7fda657305300bdd8f0bb77b7b4a2fc3e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 286,
+                  "startColumn": 74,
+                  "charOffset": 11425,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "zvalBoolFalseOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 284,
+                  "startColumn": 1,
+                  "charOffset": 11179,
+                  "charLength": 381,
+                  "snippet": {
+                    "text": "                                $compilationContext->headersManager->add('kernel/operators');\n                                $boolOperator  = '1' == $left->getBooleanCode(\n                                ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;\n                                $variableRight = $compilationContext->backend->getVariableCode($variableRight);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "941821390873ca981e0dc770df59020eb60167fe4085d715fbb28f8666e16bc5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 803,
+                  "startColumn": 52,
+                  "charOffset": 36898,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "zvalOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 801,
+                  "startColumn": 1,
+                  "charOffset": 36724,
+                  "charLength": 338,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalOperator . '(' . $variableCode . ', ' . $variableRight . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9474740ae3f4b25cc86d339c7b8f237598408977bb756ec756879afa5331aaef"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 644,
+                  "startColumn": 52,
+                  "charOffset": 28930,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "zvalOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 642,
+                  "startColumn": 1,
+                  "charOffset": 28756,
+                  "charLength": 338,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalOperator . '(' . $variableCode . ', ' . $variableRight . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9706098f5bea50b9eb7f89dc2113668b347545459d972d83b2c65b17083cc7aa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 637,
+                  "startColumn": 52,
+                  "charOffset": 30071,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "zvalOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 635,
+                  "startColumn": 1,
+                  "charOffset": 29822,
+                  "charLength": 364,
+                  "snippet": {
+                    "text": "                                        $expectedSymbol = $compilationContext->backend->getVariableCode($expected);\n                                        $compilationContext->codePrinter->output(\n                                            $this->zvalOperator . '(' . $expectedSymbol . ', ' . $op1 . ', ' . $op2 . ');'\n                                        );\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9bc3b14f6c78be3ac464e6edd2223841328c76de7a24c38b7346a172fcf7161a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Stubs/Generator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 173,
+                  "startColumn": 71,
+                  "charOffset": 4869,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getShortName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 171,
+                  "startColumn": 1,
+                  "charOffset": 4686,
+                  "charLength": 266,
+                  "snippet": {
+                    "text": "\n            $source .= ' extends ' . ($hasAliasForExtends || $extendsClassDefinition->isBundled() ? '' : '\\\\');\n            $source .= $hasAliasForExtends ? $extendsClassDefinition->getShortName(\n            ) : $extendsClassDefinition->getCompleteName();\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9f5848c04acb93424be7df056c0b4444a1be3d565264948e4f8e67e0a34e9871"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 591,
+                  "startColumn": 52,
+                  "charOffset": 27961,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "zvalOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 589,
+                  "startColumn": 1,
+                  "charOffset": 27720,
+                  "charLength": 368,
+                  "snippet": {
+                    "text": "                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a151d7edf3b73ba43e5c062f5a4520487821361fdb39950106e8cefa34b918a2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 757,
+                  "startColumn": 44,
+                  "charOffset": 34312,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "zvalStringOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 755,
+                  "startColumn": 1,
+                  "charOffset": 34162,
+                  "charLength": 317,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalStringOperator . '(' . $variableCode . ', \"' . $right->getCode() . '\")',\n                                    $expression['left']\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a250d637f65537bd38f0e2b6cb5c3e6bbd9055385b9fa2c0a740235c62a9c5d3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertySub.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 54,
+                  "charOffset": 1483,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "getProperty"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1383,
+                  "charLength": 241,
+                  "snippet": {
+                    "text": "        $method          = $this->methodName;\n\n        if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a3e9d1561226aa1a166db47ec64ab5f515d290c254d8d88d7b2d1a382c15b295"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 592,
+                  "startColumn": 52,
+                  "charOffset": 26237,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "zvalBoolTrueOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 590,
+                  "startColumn": 1,
+                  "charOffset": 25993,
+                  "charLength": 463,
+                  "snippet": {
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n                                        $boolOperator      = '1' == $left->getBooleanCode(\n                                        ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;\n                                        $variableRightCode = $compilationContext->backend->getVariableCode(\n                                            $variableRight"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "acb81faf3f562643ddf7901855530e9da2e95547a7e8c40f909e08116091796d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 782,
+                  "startColumn": 52,
+                  "charOffset": 35722,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "zvalDoubleOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 780,
+                  "startColumn": 1,
+                  "charOffset": 35548,
+                  "charLength": 357,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalDoubleOperator . '(' . $variableCode . ', ' . $variableRight->getName(\n                                            ) . ')',\n                                            $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aded87bf1fd17b821e54e32008020682d5f7195dc508cecd2675c55ab39346e5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. Method does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. Method does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilationContext.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 164,
+                  "startColumn": 59,
+                  "charOffset": 4576,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "getNamespace"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 162,
+                  "startColumn": 1,
+                  "charOffset": 4438,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "    {\n        $isFunction = $this->currentMethod instanceof FunctionDefinition;\n        $namespace  = $isFunction ? $this->currentMethod->getNamespace() : $this->classDefinition->getNamespace();\n\n        return Name::fetchFQN($className, $namespace, $this->aliasManager);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bc360fecc9142da0d5d08640221541712dd015b9487e1f1ceabd4cbc021c7835"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 538,
+                  "startColumn": 62,
+                  "charOffset": 25119,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 536,
+                  "startColumn": 1,
+                  "charOffset": 24932,
+                  "charLength": 338,
+                  "snippet": {
+                    "text": "                                            'bool',\n                                            '(' . $variableLeft->getName(\n                                            ) . ' ' . $this->bitOperator . ' ' . $variableRight->getName() . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c58ff67213cc33f432944a56d7f7e5dc26716cec6435153b87a4d050c3a319c5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 286,
+                  "startColumn": 44,
+                  "charOffset": 11395,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "zvalBoolTrueOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 284,
+                  "startColumn": 1,
+                  "charOffset": 11179,
+                  "charLength": 381,
+                  "snippet": {
+                    "text": "                                $compilationContext->headersManager->add('kernel/operators');\n                                $boolOperator  = '1' == $left->getBooleanCode(\n                                ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;\n                                $variableRight = $compilationContext->backend->getVariableCode($variableRight);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c69bf1a12a54e443bf45b0b765858484f87905ddd95a02e9dad4173ca219bc6c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Property.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 414,
+                  "startColumn": 63,
+                  "charOffset": 12689,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "getStaticInitMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 412,
+                  "startColumn": 1,
+                  "charOffset": 12538,
+                  "charLength": 261,
+                  "snippet": {
+                    "text": "            $constructMethod       = $classDefinition->getInitMethod();\n        } else {\n            $constructParentMethod = $parentClassDefinition?->getStaticInitMethod();\n            $constructMethod       = $classDefinition->getStaticInitMethod();\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c9a7f93d6405ec35c5a09820e9016918c6aecc2820035603b4f589fc0c3ba3ee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 624,
+                  "startColumn": 44,
+                  "charOffset": 27771,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "zvalNullOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 622,
+                  "startColumn": 1,
+                  "charOffset": 27621,
+                  "charLength": 286,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalNullOperator . '(' . $variableCode . ')',\n                                    $expression['left']\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cd1a7333425d415c07a9963a7691089891cdee9eea4a74ba08e53846a7ffce5e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 675,
+                  "startColumn": 44,
+                  "charOffset": 30326,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "zvalStringOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 673,
+                  "startColumn": 1,
+                  "charOffset": 30176,
+                  "charLength": 317,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalStringOperator . '(' . $variableCode . ', \"' . $right->getCode() . '\")',\n                                    $expression['left']\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d2bf82cd985d427251551f10abd1dc9644ac3270867edfe714a0a38abfa63847"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 693,
+                  "startColumn": 52,
+                  "charOffset": 33524,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "zvalOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 691,
+                  "startColumn": 1,
+                  "charOffset": 33283,
+                  "charLength": 368,
+                  "snippet": {
+                    "text": "                                        $expected = $this->getExpected($compilationContext, $expression);\n                                        $compilationContext->backend->zvalOperator(\n                                            $this->zvalOperator,\n                                            $expected,\n                                            $variableLeft,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d5b25338010e22ca91c5950d755df57bc5685abd5a182fee8394dfe3be0bf258"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 592,
+                  "startColumn": 82,
+                  "charOffset": 26267,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "zvalBoolFalseOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 590,
+                  "startColumn": 1,
+                  "charOffset": 25993,
+                  "charLength": 463,
+                  "snippet": {
+                    "text": "                                        $compilationContext->headersManager->add('kernel/operators');\n                                        $boolOperator      = '1' == $left->getBooleanCode(\n                                        ) ? $this->zvalBoolTrueOperator : $this->zvalBoolFalseOperator;\n                                        $variableRightCode = $compilationContext->backend->getVariableCode(\n                                            $variableRight"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "da795729063535a2976dee085c7dcad1f2451ed7fc3963afdef88624166d3aec"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 870,
+                  "startColumn": 62,
+                  "charOffset": 40140,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 868,
+                  "startColumn": 1,
+                  "charOffset": 40000,
+                  "charLength": 234,
+                  "snippet": {
+                    "text": "            Types::T_BOOL   => new CompiledExpression(\n                'bool',\n                '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode() . ')',\n                $expression\n            ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e5fc937390c8938d24a7b6f3fc5376e5999fa440b5d1284ee100d0b548e36b34"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 201,
+                  "startColumn": 44,
+                  "charOffset": 7708,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "zvalLongNegOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 199,
+                  "startColumn": 1,
+                  "charOffset": 7558,
+                  "charLength": 307,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    $this->zvalLongNegOperator . '(' . $variableCode . ', ' . $left->getCode() . ')',\n                                    $expression\n                                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ec57cba638568f5aad5dd77e2d63f5871c97bf1ffd61edc271c6de3b614b2007"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. BitwiseBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 162,
+                  "startColumn": 74,
+                  "charOffset": 6173,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 160,
+                  "startColumn": 1,
+                  "charOffset": 6010,
+                  "charLength": 283,
+                  "snippet": {
+                    "text": "                        return new CompiledExpression(\n                            'int',\n                            '(' . $left->getBooleanCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                            ) . ')',\n                            $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f55f56c595355636a0913b0d68f7b7a84823ff4b8d31b8b47403e87ac3711f52"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 524,
+                  "startColumn": 52,
+                  "charOffset": 22820,
+                  "charLength": 21,
+                  "snippet": {
+                    "text": "zvalDoubleNegOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 522,
+                  "startColumn": 1,
+                  "charOffset": 22646,
+                  "charLength": 351,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalDoubleNegOperator . '(' . $variableRightCode . ', ' . $variableCode . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f6baeb7ff32c7f665a088ac32d323d9100013a845018d4e90e3052dc65c72bb7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. DefinitionRuntime does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertySub.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 75,
+                  "startColumn": 35,
+                  "charOffset": 1953,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getCompleteName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 73,
+                  "startColumn": 1,
+                  "charOffset": 1870,
+                  "charLength": 236,
+                  "snippet": {
+                    "text": "\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f918d160ffcb008c29c334c9b7d5dede2cee77d147f72612566071a4b8a5e88a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ComparisonBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 446,
+                  "startColumn": 52,
+                  "charOffset": 18877,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "zvalLongNegOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 444,
+                  "startColumn": 1,
+                  "charOffset": 18703,
+                  "charLength": 349,
+                  "snippet": {
+                    "text": "                                        return new CompiledExpression(\n                                            'bool',\n                                            $this->zvalLongNegOperator . '(' . $variableRightCode . ', ' . $variableCode . ')',\n                                            $expression\n                                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f9dfeaad18f70570ac535f4d9f45dc53140e08ad01b24aa229da86552d20129b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpPossiblePolymorphicInvocationInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy",
+            "markdown": "Potentially polymorphic call. ArithmeticalBaseOperator does not have members in its hierarchy"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 503,
+                  "startColumn": 75,
+                  "charOffset": 23141,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "bitOperator"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 501,
+                  "startColumn": 1,
+                  "charOffset": 22960,
+                  "charLength": 317,
+                  "snippet": {
+                    "text": "                                return new CompiledExpression(\n                                    'bool',\n                                    '(' . $left->getCode() . ' ' . $this->bitOperator . ' ' . $right->getBooleanCode(\n                                    ) . ')',\n                                    $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fc1d4f594b0925566c1f6ffefa368ddd7b43f33342f10ec3e7ef86aa626c808e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpRedundantOptionalArgumentInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Argument matches the parameter's default value",
+            "markdown": "Argument matches the parameter's default value"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 715,
+                  "startColumn": 85,
+                  "charOffset": 23880,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "'request'"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 713,
+                  "startColumn": 1,
+                  "charOffset": 23697,
+                  "charLength": 349,
+                  "snippet": {
+                    "text": "        $initializers = $this->config->get('initializers');\n        if (is_array($initializers)) {\n            $invokeRequestInitializers = $this->processCodeInjection($initializers, 'request');\n            $includes                  .= PHP_EOL . $invokeRequestInitializers[0];\n            $reqInitializers           = $invokeRequestInitializers[1];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2a6918923d2f7967f904d0f2d2a47c7da370e1e25b04d3547275942dfdf915c5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpRedundantOptionalArgumentInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Argument matches the parameter's default value",
+            "markdown": "Argument matches the parameter's default value"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Comparison/ComparisonBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 320,
+                  "startColumn": 21,
+                  "charOffset": 12907,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "true"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 318,
+                  "startColumn": 1,
+                  "charOffset": 12808,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "                    $left->getCode(),\n                    $compilationContext,\n                    true\n                );\n                switch ($right->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6425689b29e6af4dd7bedf04223f88c02eb7eae761bedd0170290c6c60760d41"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpRedundantOptionalArgumentInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Argument matches the parameter's default value",
+            "markdown": "Argument matches the parameter's default value"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 693,
+                  "startColumn": 83,
+                  "charOffset": 22676,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "'request'"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 691,
+                  "startColumn": 1,
+                  "charOffset": 22498,
+                  "charLength": 340,
+                  "snippet": {
+                    "text": "        $destructors = $this->config->get('destructors');\n        if (is_array($destructors)) {\n            $invokeRequestDestructors = $this->processCodeInjection($destructors, 'request');\n            $includes                 .= PHP_EOL . $invokeRequestDestructors[0];\n            $reqDestructors           = $invokeRequestDestructors[1];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dacb089e9f1080dfb643f8b710e571fa7cc7c77dad429b7512b9c18553e8bc17"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CountOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 728,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 664,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "01ff59fbe23e7c77b25a245955f0b17e1481c5f7db4e3c2be765eb455ab90e3b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FuncGetArgsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 16,
+                  "charOffset": 767,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 703,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "086d105526102e2b6ab14c5766c9811e99fcfa05c930e10ae8245f953c35f50b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 820,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 756,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0cd73e06b28a00b9928d6061d1e476644b0fbdf7b5321a2d5e55b27d69e53df8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CeilOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 765,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 701,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0eaabf68b5f2b1ff5c7a1905ca8369e189a69d410c00dcc02776923e8f3b2ebb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CompareMtimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 790,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 726,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0f6af6981f52ca6d0131df747a8ebab8f412faa361aa995a6e74eb42b8e38f1c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IntvalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 771,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 707,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1386fc3b7201b740bb7459ccdc5ab0036656d071cfcba8f0d3503cdeb97f0433"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExitOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 16,
+                  "charOffset": 744,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 680,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "17054d07b1c5437d71964cc6bd5592b24bf479358c5e7b43f69e33a5e99373ee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrposOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 771,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 707,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1aa571e6808e4a908b45284f87e178baa3be1c1fad33e183f27b031a46c3fe38"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniqueKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 16,
+                  "charOffset": 892,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 828,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1f1dbee54f11e79cd7ed7f35e33b086ca5458a484dd641a96bab917fdf3cb394"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StripslashesOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 16,
+                  "charOffset": 850,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 786,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2f810297185e9a88c33d354289c0eb5c3f70b3e9b73ea043b8795f5a78d60d1f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrReplaceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 784,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 720,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "32c7493ca2a0702dbe1add784f9b9c42e1fe2506ec61c20e86a87612309b3dac"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsScalarOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 16,
+                  "charOffset": 798,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 734,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38cce484770d15b21c9750323c7b065413dd652de901fc07e8e96398b8ee9d07"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileGetContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 800,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 736,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "45c4613cb8614d804903d2e1734b0d078da66b4458385f1625b1327da38b962f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 16,
+                  "charOffset": 763,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 699,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4658411ec766baafb6cbb5650b3eaeac43cff79fc7781353cb6b3a3352f81036"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MicrotimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 780,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 716,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b958ed4a6088502dacbe7e6cde0ad7c613306a2c0b5cb6181316cfc237664df"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 799,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 735,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4f772090b06f610bdcb016f28f45195bb7f24644af811cf945a92e5e4c69ebee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PowOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 16,
+                  "charOffset": 813,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 749,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5274c15bce7ba46e479a72cf59f12c2892d3c37b7e6faaf73defbbff4e17624a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/CharType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 16,
+                  "charOffset": 878,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|mixed|CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 811,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "     * @param array              $expression\n     *\n     * @return bool|mixed|CompiledExpression\n     *\n     * @throws ReflectionException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "540425f02075f2ad0d45098c65e2d663a68ee1052c90acac483466f0b1c3b8bd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 16,
+                  "charOffset": 894,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 830,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "555c7583f8dde7863ddc8e2a85808cb8ce8064e82aa89e84edac11a8ea22040b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Types/ArrayType.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 16,
+                  "charOffset": 2856,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "bool|CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 2789,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "     * @param array              $expression\n     *\n     * @return bool|CompiledExpression\n     *\n     * @throws ReflectionException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "56771485c7b23305cf1c05aac094f5cae53599c5fce12546282874e8d8e023af"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 767,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 703,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5d19d244b9e175dc66d682b04b2d38c1efd69d70fbec49475642ec5f0c24689e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 33,
+                  "startColumn": 16,
+                  "charOffset": 727,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 31,
+                  "startColumn": 1,
+                  "charOffset": 663,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6602ff83df032e44c3500c7d01bb870c8103d490c9d9475ba131269bc8e8778b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FunctionExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 16,
+                  "charOffset": 742,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 678,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "675cdd78b523b00eb34db92a62282588ec1ef464e644b4bca4d581682663c624"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/DoublevalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 780,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 716,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6769ec13716ba86b942455abef81ac31df276686bb8ffb770c4d456f4fa012c4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FcloseOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 771,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 707,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "67d3bab24004532e669e9fe7c8fca994b6f5d8a6ede6ce6189a96cee3f155971"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GettypeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 774,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 710,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6a76b0b7fe220022ac757e1732f2602ba78df4b7af34e0f10e34d6847316b09b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrlenOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 731,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 667,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6acfc2c8bb4f81b12bb29400ea353c107ca2e57b429ad69fa78f083179b4f5f1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 809,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 745,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6c8111d1b2a99e64ccc90a0acfdd1b4dd9a2c38d28083f7c0649e231b913c498"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ClassExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 787,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 723,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6d7147329c61c2d657716f899c1c1f7dc0f1ffcfab4e6d9d55278fcb66cb147b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/RoundOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 16,
+                  "charOffset": 851,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 787,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "72ab96a239a504a3c0209d1a1b95525f3887290fe01632df8bad9b6a44bf095e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 784,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 720,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "794a792675e6ac605a0b95f184bd60b3af8da101d8cb3640a79a4a90c645c226"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 771,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 707,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8206f46e2aba99345d004f349080f1dfc60e326816e466d8d5a333c504729016"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtokOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 777,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 713,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "88f0f4d304e89ba18e0a189fe1aa37333523636ddefde9098906e3ad7c98d41f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ImplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 767,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 703,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8aa70ea5429896417de0dc5f96929e777371be402867ce12500bcedda574f06f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 16,
+                  "charOffset": 781,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 717,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @return false|CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8c583bdaa5332c5d5f841fb5eaf0c678f1374cfdabc8e6eaa7c4d3d1e7e9dc7b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/TimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 16,
+                  "charOffset": 744,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 680,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8f3c1c8ffaf738efd7a82889dee03a7a3d20239f00da59c27a7fcc25f486e455"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 794,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 730,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "99a86f5c26747ee66b9abc53dcb1e2afa68ef67a5f9906d99381f927a0af19b1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsNumericOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 741,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 677,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a3c50c4a3d211121517e987ac2f649d1eebc26fcc01240ebcc39e59964e035fb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CallUserFuncOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 16,
+                  "charOffset": 829,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 765,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a48c1344f9755cee10f34721e73aba5eedd629f8a028b519ffe92ecb5db29c7a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonEncodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 744,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 680,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a70a7f36077cf6f9730ffb093c3301736881654c32f3fe0eb212afc719e6be20"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/BasenameOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 16,
+                  "charOffset": 816,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 752,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @return false|CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aa5435a3af537b4df14309192049cec8e1982454767ede699e1940b7217d90e2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 69,
+                  "startColumn": 16,
+                  "charOffset": 1574,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 67,
+                  "startColumn": 1,
+                  "charOffset": 1550,
+                  "charLength": 73,
+                  "snippet": {
+                    "text": "\n    /**\n     * @return mixed\n     */\n    public function getExpression()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aaa3217a6af5ae3bd071e44f6c05f19e0eac1d1a60c009e8de074e0a8f8f2b58"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FeofOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 725,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 661,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ac57d9dc53e1089b0dc312d11e38473020fa606f3125b09d172b353fd8f2bb48"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonDecodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 744,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 680,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ac5a00b7d1fe23ba620d6942cd80bb825010c5b47a39071616122180e09fb586"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/SubstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 771,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 707,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ae94023ef92c332012e4633c5d75d5b3a1ba4a2dc8e92b4631832c74e5566286"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 16,
+                  "charOffset": 785,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "bool|CompiledExpression"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 710,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $compilationContext\n     *\n     * @return bool|CompiledExpression\n     */\n    public function compile($expression, CompilationContext $compilationContext)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aed5d57d6fd3cc3927f311a4c4458d391af4cc9ab61873448606f2867eccea39"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CamelizeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 16,
+                  "charOffset": 954,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 890,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b822827c2ed993be1467d43f2cde370309eb3c28e2f4e6c92738c6e6f67c5b5f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FloorOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 768,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 704,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba13f9a36d1740dad1e47fdb1b23833ad144428529566b07475cd18f90145ab1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 795,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 731,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bbd94624b1d6c979dd2a64686e4f032536a0dc7af962f52a5e4a5810b4d4854e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 32,
+                  "startColumn": 16,
+                  "charOffset": 680,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 30,
+                  "startColumn": 1,
+                  "charOffset": 616,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bf76af1b147c4bc15d5ddae57e25d92945422a9effd92bdaf59bbc68042d6f1a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 778,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 714,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c34ed8b3bed8582f5c6f996733caa0588b1eced652621f0152bc83045dab4692"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetNsClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 785,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 721,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cbc4b1fb21d9efc9dd254e119d5f96bf09fb8fcb6867114f3c2c8b06577aa3fe"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 16,
+                  "charOffset": 738,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 674,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ccf987ce33804342a458a0aa71542ebc0e505effba981697657df8fc0fcd41fd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Builder/Operators/AssignVariableOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 85,
+                  "startColumn": 16,
+                  "charOffset": 1811,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "string"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 83,
+                  "startColumn": 1,
+                  "charOffset": 1787,
+                  "charLength": 72,
+                  "snippet": {
+                    "text": "\n    /**\n     * @return string\n     */\n    public function getVariable()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cecede694cecbf62cb985a900c30ccccc996859220d355d2c13aba31280cf065"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 800,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 736,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d4849ae176e656c599d1d50b9cbbc862e29253f9e33559acd7a43636a36a8282"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsCallableOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 744,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 680,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "daaf75cca5ff6533cbf3b24c2d3c489f14cd3ea9390768fa9b19cb5f9cde1298"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 783,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 719,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dae2572da5fd15a939eb165a54e9cc13b4dc45a6247b88c2711b8f1030219015"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MergeAppendOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 787,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 723,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "de827be31e6c9760a58211dabd9228b60dcc96a7a22e70e063ba31e4cd328847"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/LdexpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 16,
+                  "charOffset": 807,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 743,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e104ae90304cb568b2146ef5c3fa48274c53409cbf6e8d30473d5fb2f5de36b3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetCalledClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 797,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 733,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e68a9be2f1b603ab37ba8137766da1e127edaa8381eca2062ae134292bdffff7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 16,
+                  "charOffset": 774,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 710,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e9776c33e7f4ea01703ed02401b6e1b6eee331697302c8ba3a76dbf5df7d14f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/HashEqualsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 784,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 720,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ed69fd7b802c00067ba6db4386086c52e2cf93a389079b1904af85ec62329740"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/EndsWithOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 16,
+                  "charOffset": 851,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 787,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "eeae0b8239090fffa97a058530e0b59af7898ec3da72bc8f7ee6909a935ee71f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateInstanceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 16,
+                  "charOffset": 941,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 877,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f5571172c5ff2aace0a987fc71d0c965b02e36bf64589ba1a5692fc045b5d085"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateArrayOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 16,
+                  "charOffset": 805,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 741,
+                  "charLength": 128,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f57a8edd1e9f3c4a9a0b49eb6fbb6a4cc597c339acb12a93af59ed33251f1b09"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FuncNumArgsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 33,
+                  "startColumn": 16,
+                  "charOffset": 727,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 31,
+                  "startColumn": 1,
+                  "charOffset": 663,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ff3a85536c6f29ee678610bf0a90baab8c68af5ba9f6c716d952e1c3e03160fa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpReturnDocTypeMismatchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Return type in PHPDoc does not match the actual return type",
+            "markdown": "Return type in PHPDoc does not match the actual return type"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/EvalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 16,
+                  "charOffset": 790,
+                  "charLength": 29,
+                  "snippet": {
+                    "text": "bool|CompiledExpression|mixed"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 726,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * @param CompilationContext $context\n     *\n     * @return bool|CompiledExpression|mixed\n     *\n     * @throws CompilerException"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ffd6b3ae2ebbc3149a440c34aa03b1e6377b2d7428f8415d7f681294a2564c64"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpStatementHasEmptyBodyInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Statement has empty body",
+            "markdown": "Statement has empty body"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/DocblockParser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 99,
+                  "startColumn": 13,
+                  "charOffset": 2372,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "if"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 97,
+                  "startColumn": 1,
+                  "charOffset": 2312,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "            $currentChar = $this->currentChar;\n\n            if ($this->ignoreSpaces && ctype_space($currentChar)) {\n            } else {\n                if (!$this->commentOpen) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5909ea6a95173876e265533dd44ca507aa0059c05afe1a562efa0af98a485176"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpStatementHasEmptyBodyInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Statement has empty body",
+            "markdown": "Statement has empty body"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExitOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 9,
+                  "charOffset": 1104,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "if"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 1041,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "\n        $context->headersManager->add('kernel/exit');\n        if (isset($expression['parameters'])) {\n            // TODO: protect resolvedParams[0] from restore\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "94331957a9d0d34a33d4711e9f980667faeff91ab4e655df4dd6a1dd63e60724"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpStatementHasEmptyBodyInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Statement has empty body",
+            "markdown": "Statement has empty body"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 487,
+                  "startColumn": 31,
+                  "charOffset": 22488,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "else"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 485,
+                  "startColumn": 1,
+                  "charOffset": 22385,
+                  "charLength": 206,
+                  "snippet": {
+                    "text": "                                    );\n                                }\n                            } else {\n                                // TODO:, raise an exception here?\n                            }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cdf62d936d284f33c9549ea48e1fb2ea40a83fe14c53c4f3e325fd6d59a1b950"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpStrictComparisonWithOperandsOfDifferentTypesInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Operands have incompatible types",
+            "markdown": "Operands have incompatible types"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 191,
+                  "startColumn": 31,
+                  "charOffset": 6965,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "==="
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 189,
+                  "startColumn": 1,
+                  "charOffset": 6786,
+                  "charLength": 391,
+                  "snippet": {
+                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2044d1fd4ed1f721aaef771b63d122a3c8ccf288402eb65333c37428fdfa1775"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpStrictComparisonWithOperandsOfDifferentTypesInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Operands have incompatible types",
+            "markdown": "Operands have incompatible types"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 178,
+                  "startColumn": 31,
+                  "charOffset": 5565,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "==="
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 176,
+                  "startColumn": 1,
+                  "charOffset": 5386,
+                  "charLength": 391,
+                  "snippet": {
+                    "text": "                if ('return_value' != $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2d35583c64d82c44a4c6fc6b34050f9bedf8b22f96fca4fda646c355b9a0257a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpStrictComparisonWithOperandsOfDifferentTypesInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Operands have incompatible types",
+            "markdown": "Operands have incompatible types"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 221,
+                  "startColumn": 31,
+                  "charOffset": 7550,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "==="
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 219,
+                  "startColumn": 1,
+                  "charOffset": 7370,
+                  "charLength": 392,
+                  "snippet": {
+                    "text": "                if ('return_value' !== $symbolVariable->getName()) {\n                    $line = $compilationContext->symbolTable->getLastCallLine();\n                    if (false === $line || ($line > 0 && $line < $expression['line'])) {\n                        $numberMutations = $compilationContext->symbolTable->getExpectedMutations(\n                            $symbolVariable->getName()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "67d6ea83b3ddde3efc015b1b3a897b7cb52513f0597346a8eb91b2b36dfa6a07"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpSwitchCanBeReplacedWithMatchExpressionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'switch' statement can be converted to 'match' expression",
+            "markdown": "'switch' statement can be converted to 'match' expression"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 217,
+                  "startColumn": 9,
+                  "charOffset": 6201,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "switch"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 215,
+                  "startColumn": 1,
+                  "charOffset": 6142,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "        $isVariable = $index instanceof Variable;\n\n        switch ($index->getType()) {\n            case 'int':\n            case 'uint':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38c729d4e7ac1250d0852e312f821c2ffeea6697026f0f37a5a05869e3ff51b9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpSwitchCanBeReplacedWithMatchExpressionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'switch' statement can be converted to 'match' expression",
+            "markdown": "'switch' statement can be converted to 'match' expression"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1398,
+                  "startColumn": 17,
+                  "charOffset": 49544,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "switch"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1396,
+                  "startColumn": 1,
+                  "charOffset": 49423,
+                  "charLength": 220,
+                  "snippet": {
+                    "text": "        if (is_object($parameters)) {\n            foreach ($parameters->getParameters() as $parameter) {\n                switch ($parameter['data-type']) {\n                    case 'int':\n                    case 'uint':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6b0c14c3e4c567f267b95993de75df24e6777abe7de167ce2b6c0ee477024ff1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpSwitchCanBeReplacedWithMatchExpressionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "'switch' statement can be converted to 'match' expression",
+            "markdown": "'switch' statement can be converted to 'match' expression"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1778,
+                  "startColumn": 13,
+                  "charOffset": 61609,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "switch"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1776,
+                  "startColumn": 1,
+                  "charOffset": 61543,
+                  "charLength": 182,
+                  "snippet": {
+                    "text": "    {\n        if ($value instanceof GlobalConstant) {\n            switch ($value->getName()) {\n                case 'ZEPHIR_GLOBAL(global_null)':\n                    $value = 'null';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d7cfdef1b9a137729e7bb5e221a634f6549732be4a43b3622948352a8c420a08"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpSwitchStatementWitSingleBranchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Switch has only single case",
+            "markdown": "Switch has only single case"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 106,
+                  "startColumn": 17,
+                  "charOffset": 4199,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "switch"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 104,
+                  "startColumn": 1,
+                  "charOffset": 4121,
+                  "charLength": 238,
+                  "snippet": {
+                    "text": "                $expr = new Expression($assignment['expr']);\n\n                switch ($assignment['assign-type']) {\n                    case 'variable':\n                        if (!$readDetector->detect($variable, $assignment['expr'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4b0512b0a9c975e29f2d2e4c5b7a44d7a2e6998b4687e7f7ab9124ae86af1b2d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpSwitchStatementWitSingleBranchInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Switch has only single case",
+            "markdown": "Switch has only single case"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Passes/LocalContextPass.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 376,
+                  "startColumn": 21,
+                  "charOffset": 12041,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "switch"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 374,
+                  "startColumn": 1,
+                  "charOffset": 11908,
+                  "charLength": 298,
+                  "snippet": {
+                    "text": "                case 'variable-append':\n                    $this->markVariableNoLocal($assignment['variable']);\n                    switch ($assignment['expr']['type']) {\n                        case 'variable':\n                            $this->markVariableNoLocal($assignment['expr']['value']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "57701aacf1cda8168f76c54f7d396660e2fec19f5f6ce18bfd0d8ad0e5b420ee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 55,
+                  "charOffset": 1443,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1382,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "024997eaf6c686e9b72cf4a67c6eb009dbf68bfa3fb52b7c0ad1d3e50e7d6e2d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Command'",
+            "markdown": "Undefined class 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/AbstractCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 39,
+                  "charOffset": 327,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Command\\Command;\n\nabstract class AbstractCommand extends Command"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "05c44d767a4dfc7c9e7c334fe304e7aed5401548f81cb8b8af2c2844cf80dcda"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 28,
+                  "startColumn": 37,
+                  "charOffset": 925,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 26,
+                  "startColumn": 1,
+                  "charOffset": 784,
+                  "charLength": 262,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0743d6b0347eb5969bbabbe5fc8357bdbc543f6fe5e002a32cd8ac58a71c01b3"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 187,
+                  "startColumn": 53,
+                  "charOffset": 5156,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 185,
+                  "startColumn": 1,
+                  "charOffset": 5037,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "     * @return InputDefinition An InputDefinition instance\n     */\n    protected function getDefaultInputDefinition(): InputDefinition\n    {\n        return new InputDefinition(["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0824b598bb93fa59b037632761b904f52d74143dfa857ec9789de2cccb05eada"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 377,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "08b26d355b9e3b55b1e1105c60b86b0352a5d91113abbcbdd0a185a045351efd"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ConsoleErrorEvent'",
+            "markdown": "Undefined class 'ConsoleErrorEvent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/ErrorListener.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 317,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "ConsoleErrorEvent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 162,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console;\n\nuse Symfony\\Component\\Console\\Event\\ConsoleErrorEvent;\nuse Zephir\\Exception\\CompilerException;\nuse Zephir\\Exception\\ExceptionInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "08d9aaceb4a4336130f260e0c57fb99964033f21e9c16aec3d77e2fcdb5cc961"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 32,
+                  "charOffset": 1491,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1453,
+                  "charLength": 116,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        // call generate"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "096c5a873a819c9ab2638d123d3b5047a16401fb40f7aafb07b0c000c71961bd"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 496,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 355,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0d20b604698ddac62bfd11e78f51c44e15f3284046a953dfcd9f0db8037c4c45"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'RuntimeException'",
+            "markdown": "Undefined class 'RuntimeException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 105,
+                  "startColumn": 45,
+                  "charOffset": 3149,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "RuntimeException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 103,
+                  "startColumn": 1,
+                  "charOffset": 3040,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "        try {\n            return parent::doRun($input, $output);\n        } catch (CommandNotFoundException | RuntimeException $e) {\n            fprintf(STDERR, $e->getMessage() . PHP_EOL);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0d90d61a2d5da9f05789e4723f8f85adbbe8a631b3033a5ee59eb71df48d62dc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 479,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 337,
+                  "charLength": 212,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Exception\\FileSystemException;\nuse Zephir\\Os;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0de89a0aaa0a2b9d3ae879eaab7ce24acf9e2b11e2f8718ff6df247fec22fb1e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 32,
+                  "charOffset": 1717,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1679,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output): int\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0e93b2890029f86ee2275b328a2e4d99edae3b7603c74dd3429d21b1741f92ff"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 19,
+                  "charOffset": 1492,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1389,
+                  "charLength": 148,
+                  "snippet": {
+                    "text": "    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);\n\n        try {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0ecc8caa32572ec486932935842bd4cb6753fe8c9407e2c4a1a8b92b4b8b6b98"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/RemoveOptionsTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 16,
+                  "charOffset": 615,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 527,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "        $filtered = array_filter(\n            $definition->getOptions(),\n            fn(InputOption $option) => !in_array($option->getName(), $names, true)\n        );\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0ffeec19f522147cca10e8c7da4886854ce176c51681d0743fb0229c42a6c6b2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 72,
+                  "startColumn": 21,
+                  "charOffset": 2008,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 70,
+                  "startColumn": 1,
+                  "charOffset": 1912,
+                  "charLength": 165,
+                  "snippet": {
+                    "text": "                    'Output directory to generate theme'\n                ),\n                new InputOption(\n                    'options',\n                    null,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "112cbd5a4440de4c5acace12b155ade36acf57cdac01f4ef4325adb44f0fe1ad"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 340,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "\nuse Exception;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "114d039fd48208f74454fad325749b7ec72a25e41e7a08dd785e3b86f39a282a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 37,
+                  "charOffset": 533,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 394,
+                  "charLength": 213,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Exception\\CompilerException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "11f8e65bf73d3c66a1261b1f182e9191ff34f5f7531c11770ab0d5db250cb75a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ListCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 9,
+                  "charOffset": 884,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 829,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "    protected function configure(): void\n    {\n        parent::configure();\n\n        $this->setHidden(true);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "13413098d8f2eae7efb7f95102f02cf8cfe5aa92a0e3f9866ccff827d64ed38d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 19,
+                  "charOffset": 1794,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1686,
+                  "charLength": 222,
+                  "snippet": {
+                    "text": "    protected function execute(InputInterface $input, OutputInterface $output): int\n    {\n        $io = new SymfonyStyle($input, $output);\n\n        $jobs = $input->hasOption('jobs') ? (int)$input->getOption('jobs') : null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "137b721b7f0abdeb6082c6bb3034110002236ca72fb520353db152899fe927dc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 44,
+                  "charOffset": 1502,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 1452,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "    }\n\n    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "14c054f7a6dfac04c94f2149fc6ecff1c1850b10a44d28f8eaa7ea3b9dd73680"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ConsoleErrorEvent'",
+            "markdown": "Undefined class 'ConsoleErrorEvent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/ErrorListener.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 36,
+                  "charOffset": 558,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "ConsoleErrorEvent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 501,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "class ErrorListener\n{\n    public function onCommandError(ConsoleErrorEvent $event): void\n    {\n        if (!filter_var(getenv('ZEPHIR_DEBUG'), FILTER_VALIDATE_BOOLEAN)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1664219a4f695705d52999fd65aed89a9d22cb071c0521a4ebdcfd6c9cd0ff7a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ExceptionInterface'",
+            "markdown": "Undefined class 'ExceptionInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 84,
+                  "startColumn": 18,
+                  "charOffset": 2417,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "ExceptionInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 82,
+                  "startColumn": 1,
+                  "charOffset": 2251,
+                  "charLength": 301,
+                  "snippet": {
+                    "text": "            // Makes ArgvInput::getFirstArgument() able to distinguish an option from an argument.\n            $input->bind($this->getDefinition());\n        } catch (ExceptionInterface) {\n            // Errors must be ignored, full binding/validation happens later when the command is known.\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "17a3c996f81b5aae35061ab37bc478b8b034086a4cb6535b05855a7f93d4d5eb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'EventDispatcher'",
+            "markdown": "Undefined class 'EventDispatcher'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 27,
+                  "charOffset": 1466,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "EventDispatcher"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1383,
+                  "charLength": 199,
+                  "snippet": {
+                    "text": "        parent::__construct('Zephir', Zephir::VERSION);\n\n        $dispatcher = new EventDispatcher();\n        $dispatcher->addListener(ConsoleEvents::ERROR, [new ErrorListener(), 'onCommandError']);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "197b12de32a690996d39a5cb01b9ae2c6a97d6920579d3946f6e4778787b35a7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 210,
+                  "startColumn": 17,
+                  "charOffset": 6125,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 208,
+                  "startColumn": 1,
+                  "charOffset": 6061,
+                  "charLength": 166,
+                  "snippet": {
+                    "text": "                'vernum',\n                null,\n                InputOption::VALUE_NONE,\n                'Print the version of the compiler as integer'\n            ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1ca72ca2ab7cc00c9840077bcb3062b326c84f9125d41f0bf643c1465c8fe939"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 79,
+                  "startColumn": 31,
+                  "charOffset": 2284,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 77,
+                  "startColumn": 1,
+                  "charOffset": 2239,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "\n        try {\n            $command->run(new ArrayInput($arguments), $output);\n        } catch (Exception $e) {\n            $io->getErrorStyle()->error($e->getMessage());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1d0c7630c6250fd41f99dafe3c48f615cff30a0bbd534b2711425ccba5253a1a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'BaseApplication'",
+            "markdown": "Undefined class 'BaseApplication'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 33,
+                  "charOffset": 1325,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "BaseApplication"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 1274,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "use const STDERR;\n\nfinal class Application extends BaseApplication\n{\n    public function __construct()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1d4f1bef6ccef7ba087356cc49a1aa983b94fceded5c2e3a92102a9df444538d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 325,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1f94eef3340f89187fab4bdeb2d33992b68f203f4d875bf3a2673b6c0e8bf97d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 32,
+                  "charOffset": 2016,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 1978,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output): int\n    {\n        $namespace = $this->sanitizeNamespace($input->getArgument('namespace'));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "201c24925430e508e91d5f6b2c50e31e083fc84e72c9dcd322f52c899f30e612"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'CommandNotFoundException'",
+            "markdown": "Undefined class 'CommandNotFoundException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 41,
+                  "charOffset": 541,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "CommandNotFoundException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 405,
+                  "charLength": 279,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2048ae8ebd92a740a14836a703933872f7bdb52bd0bc8bffb90b5d05e198e6fd"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 9,
+                  "charOffset": 1544,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1511,
+                  "charLength": 59,
+                  "snippet": {
+                    "text": "{\n    use CompilerTrait;\n    use LoggerAwareTrait;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "209a8c6d65370a6d7776f69b17e60bebc5e19366df1602948404f42cbe14d060"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Logger'",
+            "markdown": "Undefined class 'Logger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 105,
+                  "startColumn": 15,
+                  "charOffset": 2807,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 103,
+                  "startColumn": 1,
+                  "charOffset": 2768,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "\n$parser = new Parser();\n$logger = new Logger('zephir', [\n    $consoleStdErrorHandler,\n    $consoleStdOutHandler,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "20c866375027fe241e804cdcc8eadc0882ad5353aafc9884215a589bfffac7f9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 36,
+                  "charOffset": 1851,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 1735,
+                  "charLength": 217,
+                  "snippet": {
+                    "text": "        $this->config        = $config;\n        $this->classes       = $classes;\n        $this->logger        = new NullLogger();\n        $this->templatesPath = $templatesPath;\n        $this->options       = $options;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2212a7df922f368b00a0428a22c429d2a5b3c7a00dfa2675ba45f9a728a9745b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerInterface'",
+            "markdown": "Undefined class 'LoggerInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler/CompilerFileFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 13,
+                  "charOffset": 294,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "LoggerInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "namespace Zephir\\Compiler;\n\nuse Psr\\Log\\LoggerInterface;\nuse Zephir\\AliasManager;\nuse Zephir\\CompilerFile;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "22973076ed36990cbe33e2a9f5f0c4010c32ce03447fe1a0f4bdfeeab91f669d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Config'",
+            "markdown": "Undefined class 'Config'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": ".php-cs-fixer.dist.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 26,
+                  "charOffset": 986,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Config"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 916,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "    ->notPath('#tests/ext-bootstrap.php#');\n\n$config = new PhpCsFixer\\Config();\n$config\n    ->setRiskyAllowed(true)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "22d86635b33ca385fc6648c14671972795305141d05edf3589265f70918dc82c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Command'",
+            "markdown": "Undefined class 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 175,
+                  "startColumn": 16,
+                  "charOffset": 4826,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 173,
+                  "startColumn": 1,
+                  "charOffset": 4783,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     *\n     * @return Command[] An array of default Command instances\n     */\n    protected function getDefaultCommands(): array"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "22ddc2dff75b01e29f44417dbe8279bef2fc7ef68fdde560b5955573021333c4"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputArgument'",
+            "markdown": "Undefined class 'InputArgument'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 190,
+                  "startColumn": 42,
+                  "charOffset": 5256,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "InputArgument"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 188,
+                  "startColumn": 1,
+                  "charOffset": 5172,
+                  "charLength": 165,
+                  "snippet": {
+                    "text": "    {\n        return new InputDefinition([\n            new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),\n\n            new InputOption("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "24598d840743d84635eb18f5915ee7707f142cee2dc8546e2c5607eac640c09a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 38,
+                  "charOffset": 1714,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1592,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "        $this->config          = $config;\n        $this->context         = $context;\n        $this->logger          = new NullLogger();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2576acb061f1073d9bba5790deeac165d9a201c8c709c9eacd955e62f5ae3183"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Finder'",
+            "markdown": "Undefined class 'Finder'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": ".php-cs-fixer.dist.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 22,
+                  "charOffset": 548,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Finder"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 521,
+                  "charLength": 86,
+                  "snippet": {
+                    "text": "EOF;\n\n$finder = PhpCsFixer\\Finder::create()\n    ->in(__DIR__)\n    ->append([__FILE__])"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "257ce527a6f118fe918331075ad58d0947e249613e1488569a6a9f3a920c4393"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputArgument'",
+            "markdown": "Undefined class 'InputArgument'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 74,
+                  "startColumn": 21,
+                  "charOffset": 1863,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "InputArgument"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 72,
+                  "startColumn": 1,
+                  "charOffset": 1775,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "                new InputArgument(\n                    'namespace',\n                    InputArgument::REQUIRED,\n                    'The extension namespace'\n                ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "262c5dc1835cf7b3139ea7c74dd5bde89591ab87f6764e265054fd0bca661269"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 55,
+                  "charOffset": 1236,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1175,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        if (!$this->filesystem->isInitialized()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "28d47c886e570751e3fbee695c41b5ad0bb1a232c234891fd856a44359ea44a7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 67,
+                  "startColumn": 27,
+                  "charOffset": 1846,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 65,
+                  "startColumn": 1,
+                  "charOffset": 1777,
+                  "charLength": 219,
+                  "snippet": {
+                    "text": "     * @throws Exception|Throwable\n     */\n    public function doRun(InputInterface $input, OutputInterface $output): int\n    {\n        if (true === $input->hasParameterOption(['--dumpversion', '-dumpversion'], true)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "28dbe7c035a093a46e4456874b24b071f083cf6541c9b1828e49d87c5d29abc5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'HelpCommand'",
+            "markdown": "Undefined class 'HelpCommand'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 39,
+                  "charOffset": 443,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "HelpCommand"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 296,
+                  "charLength": 270,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Application as BaseApplication;\nuse Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "29e29092f764510e43f5304eb6353e3363fddcf9ec3ed29e3cb7a7986433ccc6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/AbstractCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 9,
+                  "charOffset": 552,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 461,
+                  "charLength": 207,
+                  "snippet": {
+                    "text": "    public function mergeApplicationDefinition(bool $mergeArgs = true): void\n    {\n        parent::mergeApplicationDefinition($mergeArgs);\n\n        $this->removeOptions(['dumpversion', 'version', 'vernum']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2e1b87fd84b53822b19dac9045145382073ec3b391d606f08f62711ca09f2876"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 37,
+                  "charOffset": 486,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 341,
+                  "charLength": 267,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "328083067688e2199d0b7c3aae08c03fc07304d58630f1cf7990a25254106cb8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'CommandNotFoundException'",
+            "markdown": "Undefined class 'CommandNotFoundException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 105,
+                  "startColumn": 18,
+                  "charOffset": 3122,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "CommandNotFoundException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 103,
+                  "startColumn": 1,
+                  "charOffset": 3040,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "        try {\n            return parent::doRun($input, $output);\n        } catch (CommandNotFoundException | RuntimeException $e) {\n            fprintf(STDERR, $e->getMessage() . PHP_EOL);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "329bef857af3fdbc298883a942ec4e91c71b4cb8e4584e312ff298ff259cfab9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 13,
+                  "charOffset": 315,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;\nuse Zephir\\Class\\Definition\\Definition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "336200ae402758bb8c07e4dbfdaa6390bfdc05d4b8b4264625821b4a76284c42"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerInterface'",
+            "markdown": "Undefined class 'LoggerInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilationContext.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 108,
+                  "startColumn": 13,
+                  "charOffset": 2725,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "LoggerInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 106,
+                  "startColumn": 1,
+                  "charOffset": 2683,
+                  "charLength": 133,
+                  "snippet": {
+                    "text": "     * Global logger.\n     */\n    public ?LoggerInterface $logger = null;\n    /**\n     * Whether the current method is static or not."
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "35171be01d3eb9b3984ea176a9e1f1d1d362bba25904f08da47cc1fcff524d52"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 325,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "35930481aea105a001006d9ffee46e53337cb1bed298a95a32437f9dede48571"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 20,
+                  "charOffset": 1543,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1459,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition(\n            [\n                new InputOption("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "36d8620336fb281296a92fa5382ce70a3a5896e0b2cc0386141e42f54c43ccd5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 198,
+                  "startColumn": 17,
+                  "charOffset": 5576,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 196,
+                  "startColumn": 1,
+                  "charOffset": 5432,
+                  "charLength": 349,
+                  "snippet": {
+                    "text": "                \"Print the version of the compiler and don't do anything else (also works with a single hyphen)\"\n            ),\n            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Print this help message'),\n            new InputOption('--no-ansi', null, InputOption::VALUE_NONE, 'Disable ANSI output'),\n            new InputOption("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3762bfd3ab63756d683a6892aa3f3e991c92ee71aad66731552e061b664b75fc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 38,
+                  "charOffset": 431,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 229,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "37db4839ac4a27b82a594db4edfeb936d77d096f74204aca7c896cd92697ad5c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LineFormatter'",
+            "markdown": "Undefined class 'LineFormatter'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 23,
+                  "charOffset": 312,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "LineFormatter"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 92,
+                  "snippet": {
+                    "text": "namespace Zephir\\Logger\\Formatter;\n\nuse Monolog\\Formatter\\LineFormatter;\nuse Zephir\\Config;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38c847935ad62e3273de7332055979941ea6485f2730d2223f2ee75cdf54adc8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'RuntimeException'",
+            "markdown": "Undefined class 'RuntimeException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 161,
+                  "startColumn": 23,
+                  "charOffset": 4858,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "RuntimeException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 159,
+                  "startColumn": 1,
+                  "charOffset": 4754,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "        // If sanitizing returns an empty string\n        if (empty($namespace)) {\n            throw new RuntimeException('Cannot obtain a valid initial namespace for the project.');\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38da71dc01ad67f0d6a7b9879acd3a3cbcf826288bde28d93a131455ec2c84ea"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 13,
+                  "charOffset": 338,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 273,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "use DirectoryIterator;\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse RecursiveDirectoryIterator;\nuse RecursiveIteratorIterator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "390bd85a904d958e23106649c1124057e9fd090198a8cf66578391a8d91246e0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputArgument'",
+            "markdown": "Undefined class 'InputArgument'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 37,
+                  "charOffset": 769,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "InputArgument"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 627,
+                  "charLength": 261,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "390c7fb96f9df6fbac9812e1ec36545b43223b045ee6d3380045d5329479af38"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 37,
+                  "charOffset": 430,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 257,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3970e997899369cad05bf8147c0864f9ccef597f6f830be7f72e77d4a6d87881"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 24,
+                  "charOffset": 1655,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1545,
+                  "charLength": 164,
+                  "snippet": {
+                    "text": "        // call generate\n        $command = $this->getApplication()->find('generate');\n        $io      = new SymfonyStyle($input, $output);\n\n        $arguments = ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "399fcb5074596658ef2c723b40325d3c525787225ef4f938ebb9d05fb5ed4a4b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 38,
+                  "charOffset": 543,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 405,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3b96584f9f6c1fff33b93306c50ab261b23c96c6f275928db4d5d98f0b79e76e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 24,
+                  "startColumn": 37,
+                  "charOffset": 721,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 22,
+                  "startColumn": 1,
+                  "charOffset": 567,
+                  "charLength": 269,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3e7bf756b09bed2da3484ddafbe9f64c64d742f9c5f7b7bfb2ac835097910e5c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 55,
+                  "charOffset": 1123,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 1062,
+                  "charLength": 152,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $command   = $this->getApplication()->find('clean');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3eca0cb6e80e8bdba52d65a75aebea9e25f8590b65c582748976aa18f9240398"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 373,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3f586ac3fc7fc0f267e3be849e22c8ec7a9abde983898db7f599fac8f233db36"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 20,
+                  "charOffset": 1658,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1574,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition([]);\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3fc3e7d341a73a3c1e3b65bf0cbef10b62d81ebe2f8f354c0d070b6bde36bbeb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Logger'",
+            "markdown": "Undefined class 'Logger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 96,
+                  "startColumn": 61,
+                  "charOffset": 2518,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 94,
+                  "startColumn": 1,
+                  "charOffset": 2412,
+                  "charLength": 182,
+                  "snippet": {
+                    "text": "$formatter = new CompilerFormatter($config);\n\n$consoleStdErrorHandler = new StreamHandler('php://stderr', Logger::WARNING, false);\n$consoleStdErrorHandler->setFormatter($formatter);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "41ad1115aa03768aa9fa0249c8f18c4dd93a39b8ad1b0f79225066e4dee728a9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ListCommand'",
+            "markdown": "Undefined class 'ListCommand'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ListCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 39,
+                  "charOffset": 327,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "ListCommand"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 101,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Command\\ListCommand as Command;\n\n/**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "430e06b98ede133db017fdece011a788833995f6a1e061381951f4cdd595aab0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 199,
+                  "startColumn": 17,
+                  "charOffset": 5673,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 197,
+                  "startColumn": 1,
+                  "charOffset": 5545,
+                  "charLength": 265,
+                  "snippet": {
+                    "text": "            ),\n            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Print this help message'),\n            new InputOption('--no-ansi', null, InputOption::VALUE_NONE, 'Disable ANSI output'),\n            new InputOption(\n                '--verbose',"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "45fa0c4760407a79efeeb0175c0e0900be5041a19ff041b9f627e2ec08e55758"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 15,
+                  "charOffset": 1683,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1641,
+                  "charLength": 109,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     *\n     * @param InputInterface  $input\n     * @param OutputInterface $output\n     *"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "46a817a4c5fa377eddc37481f2cc4def7da36fc7177c741511ea623d20c9afb2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 100,
+                  "startColumn": 38,
+                  "charOffset": 2984,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 98,
+                  "startColumn": 1,
+                  "charOffset": 2902,
+                  "charLength": 137,
+                  "snippet": {
+                    "text": "            $command = $this->find('list');\n\n            return $command->run(new ArrayInput(['command' => 'list']), $output);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "47bc82e6d07cfe62a3a920d72876bb827f35e66d3b73600ab625fe3d9756a258"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 119,
+                  "startColumn": 31,
+                  "charOffset": 3409,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 117,
+                  "startColumn": 1,
+                  "charOffset": 3335,
+                  "charLength": 99,
+                  "snippet": {
+                    "text": "    public function getHelp(): string\n    {\n        return Zephir::LOGO . parent::getHelp();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a0221700d66a3d93def1db9d4350ed4c2578ef23ff9e9a2cc25668d6fc98f7d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 9,
+                  "charOffset": 1391,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1343,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": "    public function __construct()\n    {\n        parent::__construct('Zephir', Zephir::VERSION);\n\n        $dispatcher = new EventDispatcher();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a2790a65d6f27efc8d5e4f96ee7aa5479eb932751ab802e27cf379789a58e3b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 38,
+                  "charOffset": 1195,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1044,
+                  "charLength": 422,
+                  "snippet": {
+                    "text": "            ->setDescription('Compile a Zephir extension')\n            ->setDefinition($this->createDefinition())\n            ->addOption('dev', null, InputOption::VALUE_NONE, 'Compile the extension in development mode')\n            ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Compile the extension in production mode')\n            ->addOption('jobs', 'j', InputOption::VALUE_REQUIRED, 'Set make -j (job slots)')"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a44bd0764f82d35cbab37c4f9d6cebf01fe71a39281e189ba10626277c1ad36"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 41,
+                  "charOffset": 1515,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1258,
+                  "charLength": 425,
+                  "snippet": {
+                    "text": "            ->setDescription('Installs the extension in the extension directory (may require root password)')\n            ->addOption('dev', null, InputOption::VALUE_NONE, 'Install the extension in development mode')\n            ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Install the extension in production mode')\n            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())\n        ;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4c7cb9fb43eae2304426f1078418d9339f7db211eddf8e084d93041e5c63b8d9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 19,
+                  "charOffset": 1428,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1373,
+                  "charLength": 100,
+                  "snippet": {
+                    "text": "\n        $this->filesystem->clean();\n        $io = new SymfonyStyle($input, $output);\n\n        try {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4caf172f60c4e8e1da4095ec9b3dee453395a929286abdabae45d6656c2a42d2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 55,
+                  "charOffset": 1740,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1679,
+                  "charLength": 145,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output): int\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4d6c7bad5bcd5c407c20c9464e847076f39d8bd5a97a0ca5634e58fb28ffa1f5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 13,
+                  "charOffset": 308,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 109,
+                  "snippet": {
+                    "text": "\nuse DirectoryIterator;\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse RecursiveDirectoryIterator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4ed3a38f24f602d8c14da7af9678d2dac47fa661e7c4d4b8632f708f71e96a02"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 38,
+                  "charOffset": 1066,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 895,
+                  "charLength": 435,
+                  "snippet": {
+                    "text": "            ->setDescription('Generates/Compiles/Installs a Zephir extension')\n            ->setDefinition($this->createDefinition())\n            ->addOption('dev', null, InputOption::VALUE_NONE, 'Build the extension in development mode')\n            ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Build the extension in production mode')\n            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "514496549d142a6196744f3c93189e864432655974c626edcde16d3fdcb21060"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 55,
+                  "charOffset": 1514,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1453,
+                  "charLength": 116,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        // call generate"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "51eb4b85cbbbcaaf4d778b60f30015bf7fdece6b65c68159a2483bb82df676c9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 17,
+                  "charOffset": 1213,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1186,
+                  "charLength": 88,
+                  "snippet": {
+                    "text": "        }\n\n        $vars = parent::normalize($record);\n\n        $output = $this->format;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5285f60d3bd042321196aba617d3c90c1da7cc8c17e58a8809e025cb844578ed"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 9,
+                  "charOffset": 972,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 942,
+                  "charLength": 72,
+                  "snippet": {
+                    "text": "class Documentation\n{\n    use LoggerAwareTrait;\n\n    protected $baseUrl;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5618ff051f60e7d874230cf2dd9e4c3c77e4b4b51ce34b1c0d0f12848b0fd989"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 75,
+                  "startColumn": 21,
+                  "charOffset": 2098,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 73,
+                  "startColumn": 1,
+                  "charOffset": 2021,
+                  "charLength": 160,
+                  "snippet": {
+                    "text": "                    'options',\n                    null,\n                    InputOption::VALUE_REQUIRED,\n                    'Theme options'\n                ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5637878808dc3de0128f6b9e7582c2c5f4dbb86634253f92f13f6e1d35ef1aec"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'StreamHandler'",
+            "markdown": "Undefined class 'StreamHandler'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 96,
+                  "startColumn": 31,
+                  "charOffset": 2488,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "StreamHandler"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 94,
+                  "startColumn": 1,
+                  "charOffset": 2412,
+                  "charLength": 182,
+                  "snippet": {
+                    "text": "$formatter = new CompilerFormatter($config);\n\n$consoleStdErrorHandler = new StreamHandler('php://stderr', Logger::WARNING, false);\n$consoleStdErrorHandler->setFormatter($formatter);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "57fb982a12c167219b357faaec138ea1b31ea2597ad800e693765970e76a8cde"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 13,
+                  "charOffset": 315,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse Zephir\\Class\\Definition\\Definition;\nuse Zephir\\Documentation\\File;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "586ca828af7c6204ad7d15c2e4f5c43df2b16529f0167a26bdb9f8631a6a6006"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 37,
+                  "charOffset": 493,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 352,
+                  "charLength": 257,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "59a2dcab7984fe72a127d9479dab89ecde5658749f783c27161cd9ec833dc35f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 480,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 341,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Config;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5aa474698b699a882e4681d76c23667c62f6b4ee5de6bb1d57da666ad4c1746c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 19,
+                  "charOffset": 1599,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1496,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);\n\n        $trace = $input->getOption('trace');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5b4d5fdfb7bc8a43798aa66aacb5d676551456e46f4b8d5e5b8a0e2a5b38ff11"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'RuntimeException'",
+            "markdown": "Undefined class 'RuntimeException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 154,
+                  "startColumn": 23,
+                  "charOffset": 4595,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "RuntimeException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 152,
+                  "startColumn": 1,
+                  "charOffset": 4508,
+                  "charLength": 163,
+                  "snippet": {
+                    "text": "        // Prevent \"\" namespace\n        if (empty($namespace)) {\n            throw new RuntimeException('Not enough arguments (missing: \"namespace\").');\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5b7c1501daf60f8f6259e229584ea4ee5176896f37e60feaabbce5fa4e04c0e1"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'StreamHandler'",
+            "markdown": "Undefined class 'StreamHandler'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 99,
+                  "startColumn": 29,
+                  "charOffset": 2623,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "StreamHandler"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 97,
+                  "startColumn": 1,
+                  "charOffset": 2543,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "$consoleStdErrorHandler->setFormatter($formatter);\n\n$consoleStdOutHandler = new StreamHandler('php://stdout', Logger::INFO, false);\n$consoleStdOutHandler->setFormatter($formatter);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5ba40ba85eb5efeea42fea8bbe7b794992073f1b9a880898d2165e7deca5c471"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/DevelopmentModeAwareTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 15,
+                  "charOffset": 477,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 406,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "     * Checks if the development mode is enabled.\n     *\n     * @param InputInterface $input\n     *\n     * @return bool"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5ba6a9fc40a6894402ddb58fe0e102f39177e23ef5d640f2f09e0b27db8ad069"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 38,
+                  "charOffset": 427,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5d8f2eeb930c74faa4833c60ec561c558ae723f0f35ee790333fcbec953702bc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 96,
+                  "startColumn": 38,
+                  "charOffset": 2772,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 94,
+                  "startColumn": 1,
+                  "charOffset": 2720,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "\n        try {\n            return $command->run(new ArrayInput($arguments), $output);\n        } catch (Exception $e) {\n            $io->getErrorStyle()->error($e->getMessage());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5db2b878bf34d3cbfb583b9a4a701847c4f69f31d9b351b5c2a950d474aaa594"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 67,
+                  "startColumn": 50,
+                  "charOffset": 1869,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 65,
+                  "startColumn": 1,
+                  "charOffset": 1777,
+                  "charLength": 219,
+                  "snippet": {
+                    "text": "     * @throws Exception|Throwable\n     */\n    public function doRun(InputInterface $input, OutputInterface $output): int\n    {\n        if (true === $input->hasParameterOption(['--dumpversion', '-dumpversion'], true)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5eceebe737bdb23680a713cde5e761d09604161237b4dc07f1bce432a77893a4"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LineFormatter'",
+            "markdown": "Undefined class 'LineFormatter'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 39,
+                  "charOffset": 725,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "LineFormatter"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 616,
+                  "charLength": 219,
+                  "snippet": {
+                    "text": " * Formatter for warnings/notices/errors generated in compilation.\n */\nfinal class CompilerFormatter extends LineFormatter\n{\n    public const SIMPLE_FORMAT = \" %level_name%: %message% in %file% on line %line% %type%\\n\";"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5f8b66499f91219813536fdc97153871a172c18278b343f4f15d4e821ce04c0d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputArgument'",
+            "markdown": "Undefined class 'InputArgument'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 435,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "InputArgument"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 312,
+                  "charLength": 242,
+                  "snippet": {
+                    "text": "use Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "63c4dee159b864a1861d2b8158d62c3197899b47f709d8bed5cfcbd1968ae1ff"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 13,
+                  "charOffset": 315,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;\nuse Zephir\\Class\\Constant;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6403a1c84dad62f45c05ed6daf875887d104830f6f80ffd15325e2d51b0789f6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Command'",
+            "markdown": "Undefined class 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 39,
+                  "charOffset": 396,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 281,
+                  "charLength": 219,
+                  "snippet": {
+                    "text": "use Exception;\nuse Symfony\\Component\\Console\\Application as BaseApplication;\nuse Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "65e3c7a16848534a50030fb767db497ad6634c82789e1f2b9a561b5e5a6e6488"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ListCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 34,
+                  "startColumn": 9,
+                  "charOffset": 678,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 32,
+                  "startColumn": 1,
+                  "charOffset": 592,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "    public function mergeApplicationDefinition($mergeArgs = true): void\n    {\n        parent::mergeApplicationDefinition($mergeArgs);\n\n        $this->removeOptions(['dumpversion', 'version']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6a09e9d2a369e6cd0b3140bba934b50bd74e269382ef7f670c233c175ee353d8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ConsoleEvents'",
+            "markdown": "Undefined class 'ConsoleEvents'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1518,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "ConsoleEvents"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1439,
+                  "charLength": 186,
+                  "snippet": {
+                    "text": "\n        $dispatcher = new EventDispatcher();\n        $dispatcher->addListener(ConsoleEvents::ERROR, [new ErrorListener(), 'onCommandError']);\n\n        $this->setDispatcher($dispatcher);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6cb6ba96e5950c227f9a8c8cc96db5009050db75970f3df692972148e047375c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 65,
+                  "startColumn": 19,
+                  "charOffset": 1794,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 63,
+                  "startColumn": 1,
+                  "charOffset": 1691,
+                  "charLength": 148,
+                  "snippet": {
+                    "text": "    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);\n\n        try {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6cf664de8412c3dbe5ac4e5ecc44d6bce445df1bcd3a2e51a2b87c337e4334c2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 446,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 304,
+                  "charLength": 212,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Throwable;\nuse Zephir\\Exception\\FileSystemException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6eac88ebf625cd24eac1e34237c350a4c1fe82346b00126bd7edc60bd9b88c80"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 377,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "70aa110ec294afdca34a553aa0b3db1c42526bf1d86214da56103ea97fc2cdb6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 378,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 208,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "711d36f1102a099b578abdb432deec54a28f4069738f3c88d277913c5e6b856c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'HelpCommand'",
+            "markdown": "Undefined class 'HelpCommand'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 179,
+                  "startColumn": 21,
+                  "charOffset": 4959,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "HelpCommand"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 177,
+                  "startColumn": 1,
+                  "charOffset": 4882,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "    protected function getDefaultCommands(): array\n    {\n        return [new HelpCommand(), new ListCommand()];\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "715061b3c1a251d78eb686adc2527a0368d95688c2a878934bdfd150f304410c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerInterface'",
+            "markdown": "Undefined class 'LoggerInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 13,
+                  "charOffset": 1106,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "LoggerInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 1019,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "    private Backend         $backend;\n    private Config          $config;\n    private LoggerInterface $logger;\n\n    public function __construct(Backend $backend, Config $config, LoggerInterface $logger)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "737f587b2911411e7934b7fe9f5f06f7fb40dc1ceba6a632c17037ff8c0eb8c6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Command'",
+            "markdown": "Undefined class 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ListCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 23,
+                  "startColumn": 33,
+                  "charOffset": 479,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 21,
+                  "startColumn": 1,
+                  "charOffset": 375,
+                  "charLength": 141,
+                  "snippet": {
+                    "text": " * Displays the list of all available commands for the application.\n */\nfinal class ListCommand extends Command\n{\n    use RemoveOptionsTrait;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "779c505ceb777e8ff9ed150f65c59551399095414c87ecd3fa9049862431548d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputArgument'",
+            "markdown": "Undefined class 'InputArgument'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 72,
+                  "startColumn": 21,
+                  "charOffset": 1795,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "InputArgument"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 70,
+                  "startColumn": 1,
+                  "charOffset": 1725,
+                  "charLength": 162,
+                  "snippet": {
+                    "text": "        return new InputDefinition(\n            [\n                new InputArgument(\n                    'namespace',\n                    InputArgument::REQUIRED,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "78ffdd278cd48b2f29c9cd3fb80da666ed3bb61eec3f359b17226464441b1caa"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/DevelopmentModeAwareTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 49,
+                  "charOffset": 582,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 506,
+                  "charLength": 163,
+                  "snippet": {
+                    "text": "     * @return bool\n     */\n    protected function isDevelopmentModeEnabled(InputInterface $input): bool\n    {\n        if (false === $input->getOption('no-dev')) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7919938334f72beb6675e5bfa9191c431bdb86f535a9c0f962d493b4f22601f7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 37,
+                  "charOffset": 873,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 733,
+                  "charLength": 258,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7a07551b27a62fc4fd7b2f9637dec973504aadf982b9de0b20e3f7f5df2bdf49"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 198,
+                  "startColumn": 45,
+                  "charOffset": 5604,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 196,
+                  "startColumn": 1,
+                  "charOffset": 5432,
+                  "charLength": 349,
+                  "snippet": {
+                    "text": "                \"Print the version of the compiler and don't do anything else (also works with a single hyphen)\"\n            ),\n            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Print this help message'),\n            new InputOption('--no-ansi', null, InputOption::VALUE_NONE, 'Disable ANSI output'),\n            new InputOption("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7a0fab4392e1507852c64b06ace7dd6c1a639d03834636dc723ad1b3e63eea18"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'StreamHandler'",
+            "markdown": "Undefined class 'StreamHandler'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 15,
+                  "startColumn": 21,
+                  "charOffset": 293,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "StreamHandler"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 13,
+                  "startColumn": 1,
+                  "charOffset": 247,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "declare(strict_types=1);\n\nuse Monolog\\Handler\\StreamHandler;\nuse Monolog\\Logger;\nuse Zephir\\Backend\\Backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7e955e46d67ee34131637445ca09172c7dc562f3d19921aa5ddd2a2753270ee9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Logger'",
+            "markdown": "Undefined class 'Logger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 99,
+                  "startColumn": 59,
+                  "charOffset": 2653,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 97,
+                  "startColumn": 1,
+                  "charOffset": 2543,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "$consoleStdErrorHandler->setFormatter($formatter);\n\n$consoleStdOutHandler = new StreamHandler('php://stdout', Logger::INFO, false);\n$consoleStdOutHandler->setFormatter($formatter);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "80ba959c7cd103f59e760b8775a0e9dd28b99535d79d87fc6c2380c1e180991a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 41,
+                  "charOffset": 1174,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 974,
+                  "charLength": 366,
+                  "snippet": {
+                    "text": "            ->setDefinition($this->createDefinition())\n            ->addOption('dev', null, InputOption::VALUE_NONE, 'Build the extension in development mode')\n            ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Build the extension in production mode')\n            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())\n        ;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8119a681b8e2bc13535e2a32c2c9cc963f2fca74be222c795256a45faaca5e9a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Logger'",
+            "markdown": "Undefined class 'Logger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 13,
+                  "charOffset": 320,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Logger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "\nuse Monolog\\Handler\\StreamHandler;\nuse Monolog\\Logger;\nuse Zephir\\Backend\\Backend;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81578dff98382510cf92f5eba515e02661024d6bbb6e3f8a164eae86e5c18b1b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 325,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 193,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81fbd15b734e2ee9405bfce3ed9d5db2be67128f1807852066b9d8262957c31f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 55,
+                  "charOffset": 2039,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 1978,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output): int\n    {\n        $namespace = $this->sanitizeNamespace($input->getArgument('namespace'));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "848b484ec2a1d9f8a7363137a0732300244e3c5275ffb88b8308a5bac4886ccb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InvalidArgumentException'",
+            "markdown": "Undefined class 'InvalidArgumentException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 41,
+                  "charOffset": 329,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "InvalidArgumentException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Exception\\InvalidArgumentException;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "869611735ef9276ca5974977dfe30efddb6d09407a95ee7db7455aeb9903e400"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 150,
+                  "startColumn": 36,
+                  "charOffset": 4005,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 148,
+                  "startColumn": 1,
+                  "charOffset": 3904,
+                  "charLength": 233,
+                  "snippet": {
+                    "text": "        private CompilerFileFactory $compilerFileFactory,\n    ) {\n        $this->logger        = new NullLogger();\n        $this->stringManager = new StringsManager();\n        $this->fcallManager  = $this->backend->getFcallManager();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "871309371770865075e914d19d08d10961eed87b974e1d5f2b497644fd45f7be"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 441,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 304,
+                  "charLength": 255,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8723da959b6a914d9a1086b8d5d858721bb821f079366b3db1884549a48ed3d4"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 56,
+                  "startColumn": 44,
+                  "charOffset": 1617,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 54,
+                  "startColumn": 1,
+                  "charOffset": 1567,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "    }\n\n    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition([]);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "87937588e5c45ac81c6e71b95a7355c5e48f3363e9c0b56c5128bf8614d71964"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 13,
+                  "charOffset": 285,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 112,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse Zephir\\Class\\Definition\\Definition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8a48df61dd192690e0f261c2aa471d1b297897a1538558f6d3e970595795e408"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 70,
+                  "startColumn": 20,
+                  "charOffset": 1744,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 68,
+                  "startColumn": 1,
+                  "charOffset": 1660,
+                  "charLength": 149,
+                  "snippet": {
+                    "text": "    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition(\n            [\n                new InputArgument("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8a8212bce373dd762505150fdaa6a1f2affd5ed87c72abf4be47b7afdc8d050f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 66,
+                  "startColumn": 21,
+                  "charOffset": 1795,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 64,
+                  "startColumn": 1,
+                  "charOffset": 1709,
+                  "charLength": 153,
+                  "snippet": {
+                    "text": "                    'The API theme to be used'\n                ),\n                new InputOption(\n                    'output',\n                    'o',"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8de802b2c79170132ab38b1af2c9d6e3490eabbc93abd2b3739c6a9573f55bb0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 44,
+                  "charOffset": 1320,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1270,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "    }\n\n    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition([]);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8e4311f655b056407c730ec14b7d27ebd8f3066e623ba5674cba091e2eea9fe2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 37,
+                  "charOffset": 539,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 399,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Backend\\Backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "90b17ddefa7fdf56d5e103ada2fdc17811d7baa4ac66464cebfd72e32bec42d5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Exception'",
+            "markdown": "Undefined class 'Exception'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 16,
+                  "charOffset": 873,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 811,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "     *\n     * @return false|CompiledExpression\n     * @throws Exception\n     */\n    public function optimize(array $expression, Call $call, CompilationContext $context)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "91853990866c35dd3f9050c783ecf539cb12ec3a1dd4c3f967f9375e0ce7f89c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerInterface'",
+            "markdown": "Undefined class 'LoggerInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 13,
+                  "charOffset": 324,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "LoggerInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 161,
+                  "snippet": {
+                    "text": "\nuse DirectoryIterator;\nuse Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "91dffb54d5a154834432c83d7ab313b4a4a64016041bd26941c41eadea9a9dac"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 55,
+                  "charOffset": 2490,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 2429,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $options = array_merge("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "933a4b28b15c0838a70ce7498c1c6e0f8a2f8c648109c306978d1b37bc30c8b0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 21,
+                  "charOffset": 1680,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1607,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "                    'path',\n                    'p',\n                    InputOption::VALUE_REQUIRED,\n                    'The API theme to be used'\n                ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "971f8380e04987724a3bf456a8610c931e6f83eb8c8d72ba4accd082b019f9b5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 150,
+                  "startColumn": 33,
+                  "charOffset": 4217,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 148,
+                  "startColumn": 1,
+                  "charOffset": 4139,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "    public function getVerNum(): string\n    {\n        $version = explode('-', parent::getVersion());\n        $version = explode('.', $version[0]);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "97d5c582bf60a72c89bbb7619e0fdf3b5b61ee3ba47867a965cbc27a5d63da18"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 195,
+                  "startColumn": 17,
+                  "charOffset": 5407,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 193,
+                  "startColumn": 1,
+                  "charOffset": 5338,
+                  "charLength": 221,
+                  "snippet": {
+                    "text": "                'dumpversion',\n                null,\n                InputOption::VALUE_NONE,\n                \"Print the version of the compiler and don't do anything else (also works with a single hyphen)\"\n            ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "98cbc63f14aaf1e47eddb60e8817601dc761747db8ed69587105089f6dfe7143"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 38,
+                  "charOffset": 480,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 342,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9a32af2e448e420d9f4b85cb41411fad977e621c083d0d8539457388e7af8100"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 111,
+                  "startColumn": 49,
+                  "charOffset": 3102,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 109,
+                  "startColumn": 1,
+                  "charOffset": 3047,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "    }\n\n    protected function sanitizeOptionsFromInput(InputInterface $input): array\n    {\n        $defaults = $this->getDefaultOptions();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9c7b70309a8ff6982c8ceae7f177f0375bf2b44883f6b225dd90749b7c356ee4"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 39,
+                  "charOffset": 1288,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1125,
+                  "charLength": 363,
+                  "snippet": {
+                    "text": "            ->setName('generate')\n            ->setDescription('Generates C code from the Zephir code without compiling it')\n            ->addOption('trace', 't', InputOption::VALUE_NONE, 'Show trace message output (in case of exception error)')\n            ->setHelp(sprintf('%s.', $this->getDescription()) . PHP_EOL . PHP_EOL . $this->getZflagsHelp())\n        ;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9df6e613758bbc3e938878a2938970c3630f4b81baf1204a6cd74a7dc494ea40"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 32,
+                  "charOffset": 1100,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 1062,
+                  "charLength": 152,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $command   = $this->getApplication()->find('clean');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9ec51c6d6692527d21a6c5f4e8d362f0315d0bb42df5b51d700a7a955cc19249"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'EventDispatcher'",
+            "markdown": "Undefined class 'EventDispatcher'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 39,
+                  "charOffset": 1030,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "EventDispatcher"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 889,
+                  "charLength": 212,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Throwable;\nuse Zephir\\Console\\Command\\ListCommand;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9ec943cf7c76a5111cea37d0078b5126b0a328f42231036e1e8e49da6ce1a88e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 21,
+                  "charOffset": 2288,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 2215,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "                    'url',\n                    null,\n                    InputOption::VALUE_REQUIRED,\n                    'The base URL to be used when generating links'\n                ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9f55e5f92517254487b63b181fce6641bb1344cea1d2d6eeb770bcc50660c494"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ExceptionInterface'",
+            "markdown": "Undefined class 'ExceptionInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 41,
+                  "charOffset": 607,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "ExceptionInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 456,
+                  "charLength": 276,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a5e33fa50028460709bd79e425019d18bf825364c62a763b2dc599455165d101"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 37,
+                  "charOffset": 388,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 216,
+                  "snippet": {
+                    "text": "use Exception;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a79cc92104c26b736a386953b425cbe1be780fd67fc76f8c10feb553bbc9db40"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 189,
+                  "startColumn": 20,
+                  "charOffset": 5197,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 187,
+                  "startColumn": 1,
+                  "charOffset": 5104,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "    protected function getDefaultInputDefinition(): InputDefinition\n    {\n        return new InputDefinition([\n            new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a7c62d38c13c0104f4f5bc6484609699ba22d3850fc0d16761b22245748abe3b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 480,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 341,
+                  "charLength": 195,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Exception;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a7cabdee1825450b27909a1e853c76c7c8c5d034f501ca48ee5e9676ee7652e2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputArgument'",
+            "markdown": "Undefined class 'InputArgument'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 190,
+                  "startColumn": 17,
+                  "charOffset": 5231,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "InputArgument"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 188,
+                  "startColumn": 1,
+                  "charOffset": 5172,
+                  "charLength": 165,
+                  "snippet": {
+                    "text": "    {\n        return new InputDefinition([\n            new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),\n\n            new InputOption("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a9630a29f0e1dc44550832dab8f2a3dc66c0ac4ac6033cbde4e34cbe4700797f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 203,
+                  "startColumn": 17,
+                  "charOffset": 5849,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 201,
+                  "startColumn": 1,
+                  "charOffset": 5782,
+                  "charLength": 234,
+                  "snippet": {
+                    "text": "                '--verbose',\n                '-v',\n                InputOption::VALUE_NONE,\n                'Displays more detail in error messages from exceptions generated by commands ' .\n                '(can also disable with -V)'"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aaaa40f6df62ad893c6d45d4a59a34a3a44d6c0b720779558ee468c34e08c18b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 9,
+                  "charOffset": 1033,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 963,
+                  "charLength": 99,
+                  "snippet": {
+                    "text": "    public function __construct(private Config $config)\n    {\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aade100c006f6d356fddc5f30128bfedd2d37b1666a1beae1cc9508d1c4e6da9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'RuntimeException'",
+            "markdown": "Undefined class 'RuntimeException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 23,
+                  "startColumn": 41,
+                  "charOffset": 667,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "RuntimeException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 21,
+                  "startColumn": 1,
+                  "charOffset": 501,
+                  "charLength": 282,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ab5b6b40069cb0d557475c4f78e6b389dbab60ca9998c82c6a60f372de56bf11"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 55,
+                  "charOffset": 1745,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1684,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ac04c36118ea4b625d8ec0fd0febe9b0b8e6873680c28cfc1801ce366eb604e3"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 340,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 171,
+                  "snippet": {
+                    "text": "\nuse Exception;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ac5c952907546bb042dfc46fb93fa237069bc9c389e9a36305420d225efc8b41"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 15,
+                  "charOffset": 1720,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1662,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "     *\n     * @param InputInterface  $input\n     * @param OutputInterface $output\n     *\n     * @return int"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ac72feec2a4b0030755dc1b6331103177615f4454e30cc6318ffaccbafe5fcea"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 20,
+                  "charOffset": 1361,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1277,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition([]);\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ad9f39ab0b5cc71417470a34f4ee57a349d838df03ce75a9c17b4083597bc02b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'NullLogger'",
+            "markdown": "Undefined class 'NullLogger'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 128,
+                  "startColumn": 35,
+                  "charOffset": 2989,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "NullLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 126,
+                  "startColumn": 1,
+                  "charOffset": 2908,
+                  "charLength": 182,
+                  "snippet": {
+                    "text": "    ) {\n        $this->config       = $config;\n        $this->logger       = new NullLogger();\n        $this->aliasManager = $aliasManager;\n        $this->filesystem   = $filesystem;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b2c1330085d968f3620e40db5e37b410f7d29d4b4ebefde4be7f0c29903af281"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 19,
+                  "charOffset": 1281,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 1215,
+                  "charLength": 109,
+                  "snippet": {
+                    "text": "        $arguments = ['command' => 'install'];\n\n        $io = new SymfonyStyle($input, $output);\n\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b2dae96fdd4e8dedf276aeb462e24afaf5f28b4f2b552f17acd792154405c61f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 38,
+                  "charOffset": 426,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 245,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Exception\\FileSystemException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b32bc99a7a30f7cdfefd0a9539f6e6269d2a65e138eec8a40e8d7f6b4f8b9150"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InvalidArgumentException'",
+            "markdown": "Undefined class 'InvalidArgumentException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 124,
+                  "startColumn": 27,
+                  "charOffset": 3605,
+                  "charLength": 24,
+                  "snippet": {
+                    "text": "InvalidArgumentException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 122,
+                  "startColumn": 1,
+                  "charOffset": 3482,
+                  "charLength": 243,
+                  "snippet": {
+                    "text": "            // Prevent \"\" values\n            if (empty($value) || !preg_match('/.+/', $value)) {\n                throw new InvalidArgumentException(\n                    sprintf('The \"--%s\" option requires a value.', $option)\n                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b3c8da4a29b71cf6f1689e0edfa1be73a17e4f56c63209c3b0840b882a99f6df"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'RuntimeException'",
+            "markdown": "Undefined class 'RuntimeException'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 41,
+                  "charOffset": 381,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "RuntimeException"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 213,
+                  "snippet": {
+                    "text": "use DirectoryIterator;\nuse Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b3f800432edf184f22c31b8957e63fc994885d97da983e87870bdd5b4d9cd562"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerInterface'",
+            "markdown": "Undefined class 'LoggerInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler/CompilerFileFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 17,
+                  "charOffset": 588,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "LoggerInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 491,
+                  "charLength": 135,
+                  "snippet": {
+                    "text": "        private Config $config,\n        private FileSystemInterface $filesystem,\n        private LoggerInterface $logger,\n    ) {\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b40693f655f3a8e6c6b5d111566c128e6af928c410fd60b46225f3861e59a827"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 213,
+                  "startColumn": 48,
+                  "charOffset": 6275,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 211,
+                  "startColumn": 1,
+                  "charOffset": 6150,
+                  "charLength": 215,
+                  "snippet": {
+                    "text": "                'Print the version of the compiler as integer'\n            ),\n            new InputOption('--version', null, InputOption::VALUE_NONE, 'Print compiler version information and quit'),\n        ]);\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b42ded25be5fef73ef5870613b12005ef085a2ae24229769b9715a2a441c8002"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 38,
+                  "charOffset": 1405,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1225,
+                  "charLength": 448,
+                  "snippet": {
+                    "text": "            ->setName('install')\n            ->setDescription('Installs the extension in the extension directory (may require root password)')\n            ->addOption('dev', null, InputOption::VALUE_NONE, 'Install the extension in development mode')\n            ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Install the extension in production mode')\n            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b497b165ee87149b53a4233323f31ff2fa5ec3969dde46d2296742a76dafcc58"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 104,
+                  "startColumn": 20,
+                  "charOffset": 3073,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 102,
+                  "startColumn": 1,
+                  "charOffset": 3039,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "\n        try {\n            return parent::doRun($input, $output);\n        } catch (CommandNotFoundException | RuntimeException $e) {\n            fprintf(STDERR, $e->getMessage() . PHP_EOL);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b576065717661f2145c53ff43643155879f0f823815295d08a67e2d7b85f6ed9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 38,
+                  "charOffset": 975,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 837,
+                  "charLength": 224,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Throwable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b5a7acf2bc8cc9fef0d24410922d0f3a43e8717e5d68156158cf72afb696f6ba"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 37,
+                  "charOffset": 484,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 342,
+                  "charLength": 217,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Exception\\ExceptionInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba0b46928911e470f4b782b2d9d1a30cee1e64e3ed382865ffec5f3999ba1460"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 32,
+                  "charOffset": 2467,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 2429,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $options = array_merge("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba1469f113c41142c3d4e65293e83f5e89dc577bb8a6c6763b245d1b8696ee7a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 24,
+                  "charOffset": 2552,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 2444,
+                  "charLength": 162,
+                  "snippet": {
+                    "text": "        // call install\n        $command = $this->getApplication()->find('install');\n        $io      = new SymfonyStyle($input, $output);\n\n        $arguments = ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba2bb90105105846960a2739af55868f52bb1d8565739da8f48e6b107576dbfb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 69,
+                  "startColumn": 21,
+                  "charOffset": 1883,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 67,
+                  "startColumn": 1,
+                  "charOffset": 1808,
+                  "charLength": 179,
+                  "snippet": {
+                    "text": "                    'output',\n                    'o',\n                    InputOption::VALUE_REQUIRED,\n                    'Output directory to generate theme'\n                ),"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bb71de93f83bdb6657d6dadff9e850755683cc551c4585732bd4da4c829b00b4"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'parent'",
+            "markdown": "Undefined class 'parent'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 163,
+                  "startColumn": 33,
+                  "charOffset": 4580,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "parent"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 161,
+                  "startColumn": 1,
+                  "charOffset": 4501,
+                  "charLength": 173,
+                  "snippet": {
+                    "text": "    public function getVersion(): string\n    {\n        $version = explode('-', parent::getVersion());\n\n        if (isset($version[1]) && str_starts_with($version[1], '$')) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bc5be8338e6c3fbe51da993c65d95b73976b0a78ac103235b19aed87c2074bab"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerInterface'",
+            "markdown": "Undefined class 'LoggerInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 67,
+                  "charOffset": 1198,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "LoggerInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1094,
+                  "charLength": 169,
+                  "snippet": {
+                    "text": "    private LoggerInterface $logger;\n\n    public function __construct(Backend $backend, Config $config, LoggerInterface $logger)\n    {\n        $this->backend = $backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bd34a15bde3bc0df9661a2dc50ede54e3bf757662c81a31b9a22d913d45836d3"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 71,
+                  "startColumn": 24,
+                  "charOffset": 2071,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 69,
+                  "startColumn": 1,
+                  "charOffset": 1963,
+                  "charLength": 162,
+                  "snippet": {
+                    "text": "        // call compile\n        $command = $this->getApplication()->find('compile');\n        $io      = new SymfonyStyle($input, $output);\n\n        $arguments = ["
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bfd55a5720b61b7b074cd6a7454b9fef2f4855eacbfa78cfe292210f80b5896c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 32,
+                  "charOffset": 1527,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1489,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c4f5a096f5934eb716efbe567843f2f0138b68677d6ca9eb94f6c1dfade0124e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/DevelopmentModeAwareTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 325,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputInterface;\n\nuse const PHP_DEBUG;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c6400732c1983de448035d84a3c655ed7fb1291f342cdb440f85be8ebf2ea389"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 13,
+                  "charOffset": 285,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 97,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c8e063faac74a59aea3a9125947bb12116aaf2a962abac452c09b884cb734db7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Application'",
+            "markdown": "Undefined class 'Application'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 326,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "Application"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 280,
+                  "charLength": 175,
+                  "snippet": {
+                    "text": "\nuse Exception;\nuse Symfony\\Component\\Console\\Application as BaseApplication;\nuse Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cacc0ffd2750b3227552ad77632bb2f271e3a4e5e3b7655f86c01aae034e8137"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 200,
+                  "startColumn": 17,
+                  "charOffset": 5769,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 198,
+                  "startColumn": 1,
+                  "charOffset": 5560,
+                  "charLength": 272,
+                  "snippet": {
+                    "text": "            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Print this help message'),\n            new InputOption('--no-ansi', null, InputOption::VALUE_NONE, 'Disable ANSI output'),\n            new InputOption(\n                '--verbose',\n                '-v',"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cae05d3c83478049884fa9dba80a71869d42daed47fc611de88e74780afe7c88"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 55,
+                  "charOffset": 1550,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1489,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cb53125e0bbaa7e8a2bb33f002f7e79de74440e2e1672a372a762baf29cd09fd"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 213,
+                  "startColumn": 17,
+                  "charOffset": 6244,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 211,
+                  "startColumn": 1,
+                  "charOffset": 6150,
+                  "charLength": 215,
+                  "snippet": {
+                    "text": "                'Print the version of the compiler as integer'\n            ),\n            new InputOption('--version', null, InputOption::VALUE_NONE, 'Print compiler version information and quit'),\n        ]);\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cc437989c29294a53f534421e8f5a634ee634aa474e879eb389d421e6d6cf1ed"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 32,
+                  "charOffset": 1722,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1684,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cd67725d7ed69330b398c138f95b3f2a6060b3d6abee48cdcad1cb584411e347"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 391,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 220,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Exception\\InvalidArgumentException;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cdc7421bc0f8714db6ae787d9eecf8d454f09989826b07aae792c59e318e8f35"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 107,
+                  "startColumn": 9,
+                  "charOffset": 2603,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 105,
+                  "startColumn": 1,
+                  "charOffset": 2572,
+                  "charLength": 57,
+                  "snippet": {
+                    "text": "final class Compiler\n{\n    use LoggerAwareTrait;\n\n    /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d142617841a5b321b1d3b25ddd7770e04215c895ac1da9fc48a0e253871395d2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 38,
+                  "charOffset": 393,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 185,
+                  "snippet": {
+                    "text": "use Exception;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Throwable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d6d6c071c271b1ae7faddef275f28c275956ccab8582a763fb66168d9d4c5bd5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 13,
+                  "charOffset": 285,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 97,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d85be0324de454bc94e0aebd71422bdc4004642fd0f6efa85597dfb32924713f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 32,
+                  "charOffset": 1213,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1175,
+                  "charLength": 142,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        if (!$this->filesystem->isInitialized()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d8e63d1d7136363d7125692c81d4b62e1c19027952d17033a935d31e8ef3ed84"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerAwareTrait'",
+            "markdown": "Undefined class 'LoggerAwareTrait'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 9,
+                  "charOffset": 810,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "LoggerAwareTrait"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 777,
+                  "charLength": 103,
+                  "snippet": {
+                    "text": "{\n    use CompilerTrait;\n    use LoggerAwareTrait;\n\n    protected Definition          $classDefinition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d9224d4e533ff0b1645c5b88c1d025d79bf23e9f2414e84018c3b8f5918837df"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 37,
+                  "charOffset": 820,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 685,
+                  "charLength": 252,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d9b7510e3ca00230ba156d5ef9e88682a09736dff6c20267891a1680df67c811"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 192,
+                  "startColumn": 17,
+                  "charOffset": 5325,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 190,
+                  "startColumn": 1,
+                  "charOffset": 5215,
+                  "charLength": 175,
+                  "snippet": {
+                    "text": "            new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),\n\n            new InputOption(\n                'dumpversion',\n                null,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d9f750cbf0a618f4e4469526745e50a435371b9612ede37d6292684d7c393a47"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'Command'",
+            "markdown": "Undefined class 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/AbstractCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 40,
+                  "charOffset": 376,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Command\\Command;\n\nabstract class AbstractCommand extends Command\n{\n    use RemoveOptionsTrait;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "db0a66b39a3484961b7207e83e1dc0e170b6904651cc08d09b0746a131d596c2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ConsoleEvents'",
+            "markdown": "Undefined class 'ConsoleEvents'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 31,
+                  "charOffset": 486,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "ConsoleEvents"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 358,
+                  "charLength": 268,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "de1a7b3c7ef1c0e9a1f7c237eb3faff7a9b26d923c48e8717c91a840de43c7b9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 325,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dee7e51920263f4269a7f0c9a0c1de26b71610c9d163f8e3b6609ac53af26e35"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'LoggerInterface'",
+            "markdown": "Undefined class 'LoggerInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilationContext.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 13,
+                  "charOffset": 285,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "LoggerInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerInterface;\nuse Zephir\\Backend\\Backend;\nuse Zephir\\Cache\\FunctionCache;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e00a7c872c65a809a225b0921db0c81f0b245bfac09e2a739aa77dd3ea4414d7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 207,
+                  "startColumn": 17,
+                  "charOffset": 6048,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 205,
+                  "startColumn": 1,
+                  "charOffset": 5972,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "                '(can also disable with -V)'\n            ),\n            new InputOption(\n                'vernum',\n                null,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e13ac940dfd4454d7f3570bccea55c8924ccdcdc4cb6f208873f33dd1bc299a9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 325,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e28ef07e587b89352b7cc084d8d6ff6b78af97398a72df93eece0ba70fc3b3f2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 37,
+                  "charOffset": 444,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 273,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\InvalidArgumentException;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e42c872f2f4d42c84138177fb06107ff6b8f77657e1fc5d558cee7814f605612"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 31,
+                  "charOffset": 1803,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1758,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "\n        try {\n            $command->run(new ArrayInput($arguments), $output);\n        } catch (Exception $e) {\n            $io->getErrorStyle()->error($e->getMessage());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e456461c923c84984546eea5157b824d76348be8e35487ee1af8823cc9b2e347"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 78,
+                  "startColumn": 21,
+                  "charOffset": 2202,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 76,
+                  "startColumn": 1,
+                  "charOffset": 2127,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "                    'Theme options'\n                ),\n                new InputOption(\n                    'url',\n                    null,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e578e9b38e43b839e0dbb0800e213502fd01fe03778b76ba708d48100cbaec0f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 44,
+                  "charOffset": 1391,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1341,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "    }\n\n    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition([]);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e6338c6cffea287240fa05eeadbd57ac9be600d0c72fc2dd3a66b11c8eeb1f06"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'SymfonyStyle'",
+            "markdown": "Undefined class 'SymfonyStyle'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 37,
+                  "charOffset": 596,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "SymfonyStyle"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 457,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\n\nuse const PHP_EOL;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e669659ae2f3a4f75ff113288720ff5791312bcee2cd1d432a4972811496fa27"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'ArrayInput'",
+            "markdown": "Undefined class 'ArrayInput'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 41,
+                  "charOffset": 1535,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "ArrayInput"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1469,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "         */\n        try {\n            if (0 === $command->run(new ArrayInput($arguments), $output)) {\n                if (Os::isWindows()) {\n                    system('cd ext && phpize --clean');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e7604e997a32f7a35bc808bfc839aa737a310918db7328f4135c73e76e08c485"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 21,
+                  "charOffset": 1594,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1524,
+                  "charLength": 135,
+                  "snippet": {
+                    "text": "        return new InputDefinition(\n            [\n                new InputOption(\n                    'path',\n                    'p',"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e83810cc1cfa76f590dd9c6da68b8d84a77996989001ed06b1d14b648d4bbaae"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 41,
+                  "charOffset": 1305,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 1103,
+                  "charLength": 453,
+                  "snippet": {
+                    "text": "            ->setDefinition($this->createDefinition())\n            ->addOption('dev', null, InputOption::VALUE_NONE, 'Compile the extension in development mode')\n            ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Compile the extension in production mode')\n            ->addOption('jobs', 'j', InputOption::VALUE_REQUIRED, 'Set make -j (job slots)')\n            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "eb08f4bc66bfb53f2e79fbaf5c577b754038b9304955aa03f344fed92654a350"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 32,
+                  "charOffset": 1420,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1382,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $io = new SymfonyStyle($input, $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ec72b73c7cc6b2a28445fb048f3ea2f17081ae38c1422b44656ff382c13ad594"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 38,
+                  "charOffset": 1411,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1158,
+                  "charLength": 408,
+                  "snippet": {
+                    "text": "            ->addOption('dev', null, InputOption::VALUE_NONE, 'Compile the extension in development mode')\n            ->addOption('no-dev', null, InputOption::VALUE_NONE, 'Compile the extension in production mode')\n            ->addOption('jobs', 'j', InputOption::VALUE_REQUIRED, 'Set make -j (job slots)')\n            ->setHelp($this->getDevelopmentModeHelp() . PHP_EOL . $this->getZflagsHelp())\n        ;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "efc334889c1695b1642b738c68aae1eb08423e64fd914b38aa997547872d8bdb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 38,
+                  "charOffset": 546,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 408,
+                  "charLength": 194,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Compiler;\nuse Zephir\\Config;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f33657a919a25745bae308a19bdc488c2db1d4038dc41de55bf678004d2b3993"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 38,
+                  "charOffset": 592,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 450,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Backend\\Backend;\nuse Zephir\\Config;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f477b5daf1ff3c9aaae3b60fc75b44e132619bca4f102d2da04b7d454c988223"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 199,
+                  "startColumn": 48,
+                  "charOffset": 5704,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 197,
+                  "startColumn": 1,
+                  "charOffset": 5545,
+                  "charLength": 265,
+                  "snippet": {
+                    "text": "            ),\n            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Print this help message'),\n            new InputOption('--no-ansi', null, InputOption::VALUE_NONE, 'Disable ANSI output'),\n            new InputOption(\n                '--verbose',"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f86561272c4bd8ba742d9b1d3cc0d99a36b41149c8b46ab6311da49b88dfa6d5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 20,
+                  "charOffset": 1432,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1348,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition([]);\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fa65cb2b09a12a527b07596159b999654ff5c79e116a4b32ac5d85eacf8f1e0c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputInterface'",
+            "markdown": "Undefined class 'InputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 37,
+                  "charOffset": 378,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "InputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fbeaa3fced82056dae7b166a5300c33864a9ddee2153586dd48ae8498be5a856"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputOption'",
+            "markdown": "Undefined class 'InputOption'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/RemoveOptionsTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 37,
+                  "charOffset": 325,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "InputOption"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputOption;\n\nuse function array_filter;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fcec9198044db87e515e2a7ff28bef35dea9b7ebc2efe98e8aed633f1f22af31"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'OutputInterface'",
+            "markdown": "Undefined class 'OutputInterface'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 38,
+                  "charOffset": 427,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "OutputInterface"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fdba3c7a7adcad9fa7a1c19d8079c5511b6e51e885a257c66e9515f385ae7786"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 185,
+                  "startColumn": 16,
+                  "charOffset": 5052,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 183,
+                  "startColumn": 1,
+                  "charOffset": 5009,
+                  "charLength": 162,
+                  "snippet": {
+                    "text": "     * {@inheritdoc}\n     *\n     * @return InputDefinition An InputDefinition instance\n     */\n    protected function getDefaultInputDefinition(): InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fee3d7541f28fb4cb3bbc56a4ab5fa675659af61348844b259c8b389bea6d750"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedClassInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined class 'InputDefinition'",
+            "markdown": "Undefined class 'InputDefinition'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 68,
+                  "startColumn": 44,
+                  "charOffset": 1703,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "InputDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 66,
+                  "startColumn": 1,
+                  "charOffset": 1653,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "    }\n\n    protected function createDefinition(): InputDefinition\n    {\n        return new InputDefinition("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ff3c23abfab85d2c80fbf870f4ce7acf19f7e8a89e27b936f5345c4e3bf7bd68"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedFieldInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Property 'format' is undefined",
+            "markdown": "Property 'format' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 26,
+                  "charOffset": 1267,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "format"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1197,
+                  "charLength": 96,
+                  "snippet": {
+                    "text": "        $vars = parent::normalize($record);\n\n        $output = $this->format;\n\n        // unused"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "22c01ffd55e6d692892ff2c9fba7230e4af6ca055203b5ea047ed3072c92d5db"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedFunctionInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined function 'zephir_parse_file'",
+            "markdown": "Undefined function 'zephir_parse_file'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Parser/Parser.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 75,
+                  "startColumn": 16,
+                  "charOffset": 1790,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "zephir_parse_file"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 73,
+                  "startColumn": 1,
+                  "charOffset": 1764,
+                  "charLength": 73,
+                  "snippet": {
+                    "text": "        }\n\n        return zephir_parse_file($content, $filePath);\n    }\n}"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5868b149b8869d7dd4f059e67b40a9562c6774c7f877357c6032cd55770c4f55"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedFunctionInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined function 'add_slashes'",
+            "markdown": "Undefined function 'add_slashes'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/VariablesManager.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 41,
+                  "charOffset": 558,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "add_slashes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 476,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "use function strlen;\nuse function substr;\nuse function Zephir\\Backend\\ZendEngine3\\add_slashes;\n\nclass VariablesManager"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6b8cc5a366a458d231f187853473249c10349a98e7da996e24793a9418a5ce6b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedFunctionInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined function 'add_slashes'",
+            "markdown": "Undefined function 'add_slashes'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/VariablesManager.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 167,
+                  "startColumn": 27,
+                  "charOffset": 4949,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "add_slashes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 165,
+                  "startColumn": 1,
+                  "charOffset": 4855,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "        switch ($value['type']) {\n            case Types::T_STRING:\n                $string = add_slashes($value['value']);\n                $context->backend->assignString($variable, $string, $context);\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9951b8845a70724ccfa8c8feb9371ad44a6dfed4b04a44621532e84c6d4784a8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedFunctionInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined function 'add_slashes'",
+            "markdown": "Undefined function 'add_slashes'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/VariablesManager.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 139,
+                  "startColumn": 27,
+                  "charOffset": 4082,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "add_slashes"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 137,
+                  "startColumn": 1,
+                  "charOffset": 4021,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "\n            case Types::T_STRING:\n                $string = add_slashes($value['value']);\n                $context->backend->assignString($variable, $string, $context);\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c7ce793070b22bdbec92190f190b2b52db6a0e72c35feef25fec014a362a9a6a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setHidden' is undefined",
+            "markdown": "Method 'setHidden' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ListCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 16,
+                  "charOffset": 921,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "setHidden"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 876,
+                  "charLength": 69,
+                  "snippet": {
+                    "text": "        parent::configure();\n\n        $this->setHidden(true);\n    }\n}"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "081bf9de8d757d7350736d90f6c6e08c8b96e5ebee8d65a424d84706fc20acd6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDescription' is undefined",
+            "markdown": "Method 'getDescription' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 45,
+                  "charOffset": 1378,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getDescription"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1180,
+                  "charLength": 277,
+                  "snippet": {
+                    "text": "            ->setDescription('Generates a HTML API based on the classes exposed in the extension')\n            ->setDefinition($this->createDefinition())\n            ->setHelp(sprintf('%s.', $this->getDescription()) . PHP_EOL . PHP_EOL . $this->getZflagsHelp())\n        ;\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0a0b1bbef84917316a8e860b3d1cdfff5128879495fa0709abd632828d4d331c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setLogger' is undefined",
+            "markdown": "Method 'setLogger' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler/CompilerFileFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 41,
+                  "startColumn": 20,
+                  "charOffset": 1057,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "setLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 39,
+                  "startColumn": 1,
+                  "charOffset": 950,
+                  "charLength": 159,
+                  "snippet": {
+                    "text": "        $compiler->setClassName($className);\n        $compiler->setFilePath($filePath);\n        $compiler->setLogger($this->logger);\n\n        return $compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0ba8b82a476b53e0aca0afb6f21cdaa92e9c2fcaba704a7700ed31cf37bfebcb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 119,
+                  "startColumn": 15,
+                  "charOffset": 3382,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 117,
+                  "startColumn": 1,
+                  "charOffset": 3333,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "\n$application = new Application();\n$application->add(new ApiCommand($compiler, $config));\n$application->add(new BuildCommand());\n$application->add(new CleanCommand($disk));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0f528339669795d94db5a87f6bb3332e541a68d40e4ac2f7be2d94c66c6d8df6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 127,
+                  "startColumn": 15,
+                  "charOffset": 3787,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 125,
+                  "startColumn": 1,
+                  "charOffset": 3650,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "$application->add(new InitCommand($backend, $config, $logger));\n$application->add(new InstallCommand($compiler, $config));\n$application->add(new ListCommand());\n$application->add(new StubsCommand($compiler));\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1740f0c3328cdffc0549e2b3788e15baba23ba0b6eaf8ee770a98454c7340c2f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDescription' is undefined",
+            "markdown": "Method 'getDescription' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 45,
+                  "charOffset": 1146,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getDescription"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 990,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "            ->setName('clean')\n            ->setDescription('Cleans any object files created by the extension')\n            ->setHelp(sprintf('%s.', $this->getDescription()))\n        ;\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "18ecf3f4ecccb4b62f4a9bc409a5b6c826660f0e3b5f73b92cfc5542016aba70"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 15,
+                  "charOffset": 1002,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 968,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('stubs')\n            ->setDescription('Generates stubs that can be used in a PHP IDE')\n            ->setDefinition($this->createDefinition())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1a0ad5fc0d59cac5055140156828482f41e681f7ff2844d031dad34dfb1a3d01"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getApplication' is undefined",
+            "markdown": "Method 'getApplication' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 87,
+                  "startColumn": 27,
+                  "charOffset": 2494,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getApplication"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 85,
+                  "startColumn": 1,
+                  "charOffset": 2443,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "\n        // call install\n        $command = $this->getApplication()->find('install');\n        $io      = new SymfonyStyle($input, $output);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "295372e0c63c193776edc3944b493a562fe939f2008d239ca9b5d5334b36463c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDefinition' is undefined",
+            "markdown": "Method 'getDefinition' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 83,
+                  "startColumn": 33,
+                  "charOffset": 2382,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 81,
+                  "startColumn": 1,
+                  "charOffset": 2237,
+                  "charLength": 305,
+                  "snippet": {
+                    "text": "        try {\n            // Makes ArgvInput::getFirstArgument() able to distinguish an option from an argument.\n            $input->bind($this->getDefinition());\n        } catch (ExceptionInterface) {\n            // Errors must be ignored, full binding/validation happens later when the command is known."
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2f4244a596e0344e31796b28a1b8fe6dd053b3a09fe6c76521b49529dd0af7b8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setLogger' is undefined",
+            "markdown": "Method 'setLogger' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 116,
+                  "startColumn": 12,
+                  "charOffset": 3313,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "setLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 114,
+                  "startColumn": 1,
+                  "charOffset": 3190,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "$compiler->setOptimizersPath($rootPath.'/src/Optimizers');\n$compiler->setTemplatesPath($rootPath.'/templates');\n$compiler->setLogger($logger);\n\n$application = new Application();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "30452368c1fd346ccc41f3a466560f228d477be06def4aa901bd3601cddc9527"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'run' is undefined",
+            "markdown": "Method 'run' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 130,
+                  "startColumn": 15,
+                  "charOffset": 3874,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "run"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 128,
+                  "startColumn": 1,
+                  "charOffset": 3811,
+                  "charLength": 70,
+                  "snippet": {
+                    "text": "$application->add(new StubsCommand($compiler));\n\n$application->run();\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3eee82d8bb1a91c901e8c72e5bf1e37f3f223adfb96034dc9cfacc7e2b4353ec"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'stringify' is undefined",
+            "markdown": "Method 'stringify' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 143,
+                  "startColumn": 35,
+                  "charOffset": 4215,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "stringify"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 141,
+                  "startColumn": 1,
+                  "charOffset": 4094,
+                  "charLength": 194,
+                  "snippet": {
+                    "text": "        foreach ($vars as $var => $val) {\n            $placeholder = '%' . $var . '%';\n            $realValue   = $this->stringify($val);\n\n            if (!str_contains($output, $placeholder)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "44129377aeca27fa47dda673cd531ab1703748711cdeef01b38e8bb494aa5cd9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 15,
+                  "charOffset": 878,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 844,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('build')\n            ->setDescription('Generates/Compiles/Installs a Zephir extension')\n            ->setDefinition($this->createDefinition())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "452e343b36bbb5ab7b0f1cfdcc810c50e1a8b84a92f910721b0131abda03a064"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 15,
+                  "charOffset": 1139,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1105,
+                  "charLength": 265,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('generate')\n            ->setDescription('Generates C code from the Zephir code without compiling it')\n            ->addOption('trace', 't', InputOption::VALUE_NONE, 'Show trace message output (in case of exception error)')"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4bc0710fd961c6ab463de76d02492ae5ea57c2019d7305addeb664c93999c135"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method '__construct' is undefined",
+            "markdown": "Method '__construct' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 17,
+                  "charOffset": 1068,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 962,
+                  "charLength": 127,
+                  "snippet": {
+                    "text": "    public function __construct(private Compiler $compiler, private Config $config)\n    {\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4cd640672f3f168e5fc91161bafcd2087eecca2022a6eae7c8d525f2c8d9d0a6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDescription' is undefined",
+            "markdown": "Method 'getDescription' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 45,
+                  "charOffset": 1196,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getDescription"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1019,
+                  "charLength": 256,
+                  "snippet": {
+                    "text": "            ->setDescription('Generates stubs that can be used in a PHP IDE')\n            ->setDefinition($this->createDefinition())\n            ->setHelp(sprintf('%s.', $this->getDescription()) . PHP_EOL . PHP_EOL . $this->getZflagsHelp())\n        ;\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4eee20cccc70bca2a52a833ef500a50b18765ee666292cfaa7df27287c19db78"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'find' is undefined",
+            "markdown": "Method 'find' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 98,
+                  "startColumn": 31,
+                  "charOffset": 2932,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "find"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 96,
+                  "startColumn": 1,
+                  "charOffset": 2875,
+                  "charLength": 153,
+                  "snippet": {
+                    "text": "\n        if ($wantsHelp) {\n            $command = $this->find('list');\n\n            return $command->run(new ArrayInput(['command' => 'list']), $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "50a2fcc4b615d74dce0833da3d91d362cde209f842c3efa75ff4fd2af72510e8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getApplication' is undefined",
+            "markdown": "Method 'getApplication' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 27,
+                  "charOffset": 1596,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getApplication"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1539,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "    {\n        // call generate\n        $command = $this->getApplication()->find('generate');\n        $io      = new SymfonyStyle($input, $output);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "542d13646db26923151ff941b41781ef4da4d63578c38ccf07b4a539b42f4c30"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method '__construct' is undefined",
+            "markdown": "Method '__construct' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 42,
+                  "startColumn": 17,
+                  "charOffset": 905,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 40,
+                  "startColumn": 1,
+                  "charOffset": 851,
+                  "charLength": 75,
+                  "snippet": {
+                    "text": "        $this->compiler = $compiler;\n\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "552933fd95c95da5c703803758d440d6c9c1ebfec6c4ef8a19c6652e0428ebac"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getType' is undefined",
+            "markdown": "Method 'getType' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/CloneOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 76,
+                  "charOffset": 1748,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getType"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1605,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "        );\n        if ('variable' !== $clonedVariable->getType()) {\n            throw new CompilerException('Variable type: ' . $exprVariable->getType() . ' cannot be cloned');\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5c4aa6ff8b28dd8a4a03d952777491afb05e873bde484cc064ba070c1488d96f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'stringify' is undefined",
+            "markdown": "Method 'stringify' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 99,
+                  "startColumn": 52,
+                  "charOffset": 2819,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "stringify"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 97,
+                  "startColumn": 1,
+                  "charOffset": 2594,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "            $output = str_replace('%file%', $this->stringify($vars['file']), $output);\n            $output = str_replace('%line%', $this->stringify($vars['line']), $output);\n            $output = str_replace('%type%', $this->stringify($vars['type']), $output);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "77941b542c55206582f288dd198c9822f4bd04ad9d12b3671255b4c98ca9d8eb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setLogger' is undefined",
+            "markdown": "Method 'setLogger' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 211,
+                  "startColumn": 24,
+                  "charOffset": 5965,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "setLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 209,
+                  "startColumn": 1,
+                  "charOffset": 5843,
+                  "charLength": 239,
+                  "snippet": {
+                    "text": "\n        $documentator = new Documentation($this->files, $this->config, $templatesPath, $options);\n        $documentator->setLogger($this->logger);\n\n        $this->logger->info('Generating API into ' . $documentator->getOutputDirectory());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "79ef006643eebeea9b025ef6271e3a4ba741ff8edf911bc45d5c91c05943bebd"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getApplication' is undefined",
+            "markdown": "Method 'getApplication' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 70,
+                  "startColumn": 27,
+                  "charOffset": 2013,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getApplication"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 68,
+                  "startColumn": 1,
+                  "charOffset": 1962,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "\n        // call compile\n        $command = $this->getApplication()->find('compile');\n        $io      = new SymfonyStyle($input, $output);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7fa41522c267c36bae81e9b7f8e980c491c5fd49a2c3e14fd5d963c109e055ad"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 15,
+                  "charOffset": 1025,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 991,
+                  "charLength": 166,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('compile')\n            ->setDescription('Compile a Zephir extension')\n            ->setDefinition($this->createDefinition())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "824e104ef0a6392fa451cc707399336752a475fd907755bab6dfd610e4bf1d5f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 15,
+                  "charOffset": 1165,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1131,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('api')\n            ->setDescription('Generates a HTML API based on the classes exposed in the extension')\n            ->setDefinition($this->createDefinition())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "876d34a7cc433d8522ebc433c36a1fffef6ee60f0c9b3830b28893fecdca0301"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 36,
+                  "startColumn": 15,
+                  "charOffset": 849,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 34,
+                  "startColumn": 1,
+                  "charOffset": 815,
+                  "charLength": 236,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('fullclean')\n            ->setDescription('Cleans any object files created by the extension (including files generated by phpize)')\n            ->setHelp(sprintf('%s.', $this->getDescription()))"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "89e9f9f9c1ae0d18ed217f0cfa4e0a2a294008ee9f253bca9b29904ada8575ef"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'stringify' is undefined",
+            "markdown": "Method 'stringify' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 98,
+                  "startColumn": 52,
+                  "charOffset": 2732,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "stringify"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 96,
+                  "startColumn": 1,
+                  "charOffset": 2593,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "\n            $output = str_replace('%file%', $this->stringify($vars['file']), $output);\n            $output = str_replace('%line%', $this->stringify($vars['line']), $output);\n            $output = str_replace('%type%', $this->stringify($vars['type']), $output);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8be38c395e2b53a6b1e918786b12b864bd251c000502b22719f55ecad0cc23d5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method '__construct' is undefined",
+            "markdown": "Method '__construct' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 17,
+                  "charOffset": 1142,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1090,
+                  "charLength": 73,
+                  "snippet": {
+                    "text": "        $this->config   = $config;\n\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8d3a9931c27b24cd3b1ae6d6280904cc0833655a818d5939bea3ac61983d406e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDescription' is undefined",
+            "markdown": "Method 'getDescription' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 45,
+                  "charOffset": 1033,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getDescription"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 835,
+                  "charLength": 232,
+                  "snippet": {
+                    "text": "            ->setName('fullclean')\n            ->setDescription('Cleans any object files created by the extension (including files generated by phpize)')\n            ->setHelp(sprintf('%s.', $this->getDescription()))\n        ;\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "92c5844a1ee2f0052fedf8285161da65c33ffb42fcda0d1db596b633a2ef82e7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 121,
+                  "startColumn": 15,
+                  "charOffset": 3476,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 119,
+                  "startColumn": 1,
+                  "charOffset": 3368,
+                  "charLength": 230,
+                  "snippet": {
+                    "text": "$application->add(new ApiCommand($compiler, $config));\n$application->add(new BuildCommand());\n$application->add(new CleanCommand($disk));\n$application->add(new CompileCommand($compiler));\n$application->add(new FullCleanCommand());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "930e483da436e442c3308bef469747557a8c1e20b0fdf075a0f67cb15f3225c8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setLogger' is undefined",
+            "markdown": "Method 'setLogger' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/ClosureArrow.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 24,
+                  "charOffset": 1403,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "setLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1281,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "\n        $compilerFile = new CompilerFileAnonymous($classDefinition, $compilationContext->config);\n        $compilerFile->setLogger($compilationContext->logger);\n\n        $compilationContext->compiler->addClassDefinition($compilerFile, $classDefinition);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9db70a558d9297b807a326f79e8582b7ef1a7b298e2c5a27da3ae784c4c647be"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 126,
+                  "startColumn": 15,
+                  "charOffset": 3728,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 124,
+                  "startColumn": 1,
+                  "charOffset": 3599,
+                  "charLength": 259,
+                  "snippet": {
+                    "text": "$application->add(new GenerateCommand($compiler));\n$application->add(new InitCommand($backend, $config, $logger));\n$application->add(new InstallCommand($compiler, $config));\n$application->add(new ListCommand());\n$application->add(new StubsCommand($compiler));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a13167d505aad6977d194f8b2f617e7213f983b5082f9ab1ff6232fa40f1d124"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 15,
+                  "charOffset": 1239,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1205,
+                  "charLength": 269,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('install')\n            ->setDescription('Installs the extension in the extension directory (may require root password)')\n            ->addOption('dev', null, InputOption::VALUE_NONE, 'Install the extension in development mode')"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a17286fc12bac793d17026c0b5d058a5214a1c30e0923c51c047919764f5707c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDescription' is undefined",
+            "markdown": "Method 'getDescription' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 45,
+                  "charOffset": 1415,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getDescription"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1159,
+                  "charLength": 335,
+                  "snippet": {
+                    "text": "            ->setDescription('Generates C code from the Zephir code without compiling it')\n            ->addOption('trace', 't', InputOption::VALUE_NONE, 'Show trace message output (in case of exception error)')\n            ->setHelp(sprintf('%s.', $this->getDescription()) . PHP_EOL . PHP_EOL . $this->getZflagsHelp())\n        ;\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aa95e5c9b4496f5cec1ffa8cd7552c13bd82b6137d5313e1b4de87aa2ec03de1"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'stringify' is undefined",
+            "markdown": "Method 'stringify' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 97,
+                  "startColumn": 52,
+                  "charOffset": 2645,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "stringify"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 95,
+                  "startColumn": 1,
+                  "charOffset": 2579,
+                  "charLength": 275,
+                  "snippet": {
+                    "text": "            }\n\n            $output = str_replace('%file%', $this->stringify($vars['file']), $output);\n            $output = str_replace('%line%', $this->stringify($vars['line']), $output);\n            $output = str_replace('%type%', $this->stringify($vars['type']), $output);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b22f58ef866e5e0651f8d64e3127762c65deada042924f56a67351c7618677ed"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 120,
+                  "startColumn": 15,
+                  "charOffset": 3437,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 118,
+                  "startColumn": 1,
+                  "charOffset": 3334,
+                  "charLength": 221,
+                  "snippet": {
+                    "text": "$application = new Application();\n$application->add(new ApiCommand($compiler, $config));\n$application->add(new BuildCommand());\n$application->add(new CleanCommand($disk));\n$application->add(new CompileCommand($compiler));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b3f0383f3a8f5a7faee788d658fcbc7c4fff4e197249b46ac4696c1e4a3b1c6c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method '__construct' is undefined",
+            "markdown": "Method '__construct' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 17,
+                  "charOffset": 907,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 849,
+                  "charLength": 79,
+                  "snippet": {
+                    "text": "        $this->filesystem = $filesystem;\n\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b6cb3934525b804efb6288872597546d739c7247033821d001dd82eba94343e0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 124,
+                  "startColumn": 15,
+                  "charOffset": 3613,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 122,
+                  "startColumn": 1,
+                  "charOffset": 3506,
+                  "charLength": 266,
+                  "snippet": {
+                    "text": "$application->add(new CompileCommand($compiler));\n$application->add(new FullCleanCommand());\n$application->add(new GenerateCommand($compiler));\n$application->add(new InitCommand($backend, $config, $logger));\n$application->add(new InstallCommand($compiler, $config));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba0105d5ad5ed8419d46f1951ef903a08a9ef3d747b4a6c1bb6264bda9089c2d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method '__construct' is undefined",
+            "markdown": "Method '__construct' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 17,
+                  "charOffset": 1349,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1298,
+                  "charLength": 72,
+                  "snippet": {
+                    "text": "        $this->logger  = $logger;\n\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bc8550a80179c893059683b23e4b68730f6dc9da38cf14c248444e08eced19ae"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 123,
+                  "startColumn": 15,
+                  "charOffset": 3570,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 121,
+                  "startColumn": 1,
+                  "charOffset": 3462,
+                  "charLength": 251,
+                  "snippet": {
+                    "text": "$application->add(new CleanCommand($disk));\n$application->add(new CompileCommand($compiler));\n$application->add(new FullCleanCommand());\n$application->add(new GenerateCommand($compiler));\n$application->add(new InitCommand($backend, $config, $logger));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bd06637a4f28f558f8bd0acff9234af72d2198582257b4411f4eaaec70c4b22c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getName' is undefined",
+            "markdown": "Method 'getName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 136,
+                  "startColumn": 24,
+                  "charOffset": 3948,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "getName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 3716,
+                  "charLength": 295,
+                  "snippet": {
+                    "text": "                '%s <info>%s</info> by the <comment>Phalcon Team</comment>' . PHP_EOL .\n                'Thanks to the work by: <comment>Andres Gutierrez</comment> and <comment>Serghei Iakovlev</comment> %s',\n                $this->getName(),\n                $version[0],\n                $commit"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bf407dfaa84f2d8479daad919c7dcc7537be872e87c92981d02237a93000009a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getCompleteName' is undefined",
+            "markdown": "Method 'getCompleteName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 187,
+                  "startColumn": 39,
+                  "charOffset": 5291,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getCompleteName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 185,
+                  "startColumn": 1,
+                  "charOffset": 5152,
+                  "charLength": 236,
+                  "snippet": {
+                    "text": "        if (isset($this->functionDefinitions[$funcName])) {\n            throw new CompilerException(\n                \"Function '\" . $func->getCompleteName() . \"' was defined more than one time\",\n                $statement\n            );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c108f4a0e4b91182015e3a6257d7d5e721443843c6e72bb19be28319b0acc95f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 122,
+                  "startColumn": 15,
+                  "charOffset": 3520,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 120,
+                  "startColumn": 1,
+                  "charOffset": 3423,
+                  "charLength": 226,
+                  "snippet": {
+                    "text": "$application->add(new BuildCommand());\n$application->add(new CleanCommand($disk));\n$application->add(new CompileCommand($compiler));\n$application->add(new FullCleanCommand());\n$application->add(new GenerateCommand($compiler));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c60ba50b0785707c10c03e465ebdfd6b770678c3aee4a6319a897b605414108e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 15,
+                  "charOffset": 1446,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1412,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('init')\n            ->setDescription('Initializes a Zephir extension')\n            ->setDefinition($this->createDefinition())"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cbb14899e93686779b2b66806d9dc8d676bdb3fc9b7941e699953137d6e46dd8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getApplication' is undefined",
+            "markdown": "Method 'getApplication' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 29,
+                  "charOffset": 1182,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getApplication"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 1069,
+                  "charLength": 193,
+                  "snippet": {
+                    "text": "    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $command   = $this->getApplication()->find('clean');\n        $arguments = ['command' => 'install'];\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d3b3cf695f30bd18c520023585559873113ecd841bdc64fd598efa5e6c3ee63c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setDispatcher' is undefined",
+            "markdown": "Method 'setDispatcher' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 16,
+                  "charOffset": 1598,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "setDispatcher"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1485,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "        $dispatcher->addListener(ConsoleEvents::ERROR, [new ErrorListener(), 'onCommandError']);\n\n        $this->setDispatcher($dispatcher);\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d66c99d07841d47b4816e62746b451cadfe6549bf52977467e70f07d9aec2263"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method '__construct' is undefined",
+            "markdown": "Method '__construct' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 17,
+                  "charOffset": 1042,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 988,
+                  "charLength": 75,
+                  "snippet": {
+                    "text": "        $this->compiler = $compiler;\n\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dc495b2d113d446baa4c2e542a125ae02321148deafccf30affffed7214d14bc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method '__construct' is undefined",
+            "markdown": "Method '__construct' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 40,
+                  "startColumn": 17,
+                  "charOffset": 928,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "__construct"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 38,
+                  "startColumn": 1,
+                  "charOffset": 874,
+                  "charLength": 75,
+                  "snippet": {
+                    "text": "        $this->compiler = $compiler;\n\n        parent::__construct();\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ddfa50335005f318d6d89f6b5c3f6c405a07d8b9ad222882fbc944c5d60540f4"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDescription' is undefined",
+            "markdown": "Method 'getDescription' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 64,
+                  "startColumn": 45,
+                  "charOffset": 1624,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getDescription"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 62,
+                  "startColumn": 1,
+                  "charOffset": 1462,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "            ->setDescription('Initializes a Zephir extension')\n            ->setDefinition($this->createDefinition())\n            ->setHelp(sprintf('%s.', $this->getDescription()))\n        ;\n    }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "eb354ae2e84bdab210a5b49bd31f45ec1c52398d209ac333de1303adbe2c7031"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setName' is undefined",
+            "markdown": "Method 'setName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 45,
+                  "startColumn": 15,
+                  "charOffset": 1004,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "setName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 970,
+                  "charLength": 194,
+                  "snippet": {
+                    "text": "    {\n        $this\n            ->setName('clean')\n            ->setDescription('Cleans any object files created by the extension')\n            ->setHelp(sprintf('%s.', $this->getDescription()))"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "edc398b3688a3e8c7dc5ecfabbc027fefed67e3c6ce7dc4634500c4ba6eeda75"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 128,
+                  "startColumn": 15,
+                  "charOffset": 3825,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 126,
+                  "startColumn": 1,
+                  "charOffset": 3714,
+                  "charLength": 166,
+                  "snippet": {
+                    "text": "$application->add(new InstallCommand($compiler, $config));\n$application->add(new ListCommand());\n$application->add(new StubsCommand($compiler));\n\n$application->run();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ef7ac0f9edfd9e4793007ea62aca80f29fcd8b96f2af7a16027a601fd1cb75ab"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'setLogger' is undefined",
+            "markdown": "Method 'setLogger' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/Closure.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 72,
+                  "startColumn": 24,
+                  "charOffset": 1720,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "setLogger"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 70,
+                  "startColumn": 1,
+                  "charOffset": 1577,
+                  "charLength": 275,
+                  "snippet": {
+                    "text": "\n        $compilerFile = new CompilerFileAnonymous($classDefinition, $compilationContext->config, $compilationContext);\n        $compilerFile->setLogger($compilationContext->logger);\n\n        $compilationContext->compiler->addClassDefinition($compilerFile, $classDefinition);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f42138d4f258beead7401a9e270158301f1752f55abd329e079cd9bfe4d5d41e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'add' is undefined",
+            "markdown": "Method 'add' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 125,
+                  "startColumn": 15,
+                  "charOffset": 3664,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "add"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 123,
+                  "startColumn": 1,
+                  "charOffset": 3556,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "$application->add(new FullCleanCommand());\n$application->add(new GenerateCommand($compiler));\n$application->add(new InitCommand($backend, $config, $logger));\n$application->add(new InstallCommand($compiler, $config));\n$application->add(new ListCommand());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f51d5ebe09f7be1d29478be0952b73a6041524b2b5fbed5645df53021fffc048"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getCommandName' is undefined",
+            "markdown": "Method 'getCommandName' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 89,
+                  "startColumn": 29,
+                  "charOffset": 2610,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "getCommandName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 87,
+                  "startColumn": 1,
+                  "charOffset": 2553,
+                  "charLength": 158,
+                  "snippet": {
+                    "text": "\n        $wantsHelp = false;\n        $name      = $this->getCommandName($input);\n\n        if ($name && 'help' == strtolower($name) && 2 == $_SERVER['argc']) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fb339b1521de295a6ae44f807a4a5abd8cc5c7dd6ecde4c83a69451a6629c66f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedMethodInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Method 'getDefinition' is undefined",
+            "markdown": "Method 'getDefinition' is undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/RemoveOptionsTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 30,
+                  "charOffset": 509,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 417,
+                  "charLength": 143,
+                  "snippet": {
+                    "text": "    protected function removeOptions(array $names): void\n    {\n        $definition = $this->getDefinition();\n\n        $filtered = array_filter("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fcbd72980d25338c133f860a7b5379b1a1b37a0ed38aa71c0e28bb948dacf642"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 372,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 208,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "013cd648e61bf885586319efcb43543cd92f9819deef327a6f884068175daffc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 28,
+                  "startColumn": 31,
+                  "charOffset": 919,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 26,
+                  "startColumn": 1,
+                  "charOffset": 784,
+                  "charLength": 262,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0244bbec6d4d3ed30c74e5f38536c51be16d5653d28172aafac160e673d0f908"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Console'",
+            "markdown": "Undefined namespace 'Console'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 23,
+                  "charOffset": 478,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Console"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 358,
+                  "charLength": 268,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "03d80e846f2d1fdf6339db808e9b334922211e215293f6366121a39796feff4e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 31,
+                  "charOffset": 585,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 450,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Backend\\Backend;\nuse Zephir\\Config;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "08d8e43411a5daba385245f7bee877d1e45d5e4548448f972eca8eeb540ff22d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 31,
+                  "charOffset": 480,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 341,
+                  "charLength": 267,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0b737caa68978447f18189deff2d0cd07075923e1b5f12ca00595c7ca9bddf9c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 31,
+                  "charOffset": 533,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 399,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Backend\\Backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0c6dbd8ee50a440788d17206f9bee097b5b9c0e3312b0b6a6828ab948f24e5ae"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 435,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 304,
+                  "charLength": 255,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "10378de4df3dd3d252d694f07bd476b88feef926ff8e6fca0f99e9f9e4bca1ff"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/DevelopmentModeAwareTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputInterface;\n\nuse const PHP_DEBUG;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "13e537e0b0c1d81850b901b648fb047d087613cf74606c659b33da40d8c9403c"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Style'",
+            "markdown": "Undefined namespace 'Style'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 478,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Style"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 342,
+                  "charLength": 217,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Exception\\ExceptionInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1777f61dfbd4f6b181c36891fe3714b2591790b9e35d5767015623dc84722774"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Style'",
+            "markdown": "Undefined namespace 'Style'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 31,
+                  "charOffset": 590,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Style"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 457,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\n\nuse const PHP_EOL;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1b8ca54926535207349bfd88065b2d2ccc012d73acd3f23b2cb16e24267dcb34"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 386,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 185,
+                  "snippet": {
+                    "text": "use Exception;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Throwable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1f0aa6c0c469d197250e12389d5eff7e657e575e7ec961983d1defeca127608e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Handler'",
+            "markdown": "Undefined namespace 'Handler'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 15,
+                  "startColumn": 13,
+                  "charOffset": 285,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Handler"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 13,
+                  "startColumn": 1,
+                  "charOffset": 247,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "declare(strict_types=1);\n\nuse Monolog\\Handler\\StreamHandler;\nuse Monolog\\Logger;\nuse Zephir\\Backend\\Backend;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "31e96a0c9e818a88a851c75e829caad15e6a268e29feaf414c22d17a4ae6f839"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 193,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "32f074ff819b849ecd1fdceaf97d5b2a7e6b98694a7e7f1debaddf2d5f4957b0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 9,
+                  "charOffset": 311,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;\nuse Zephir\\Class\\Constant;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "330b5e0d006c5e809f925ba09d6a276333b829a7bb58a8d57a6cdaf682c8ba2d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 9,
+                  "charOffset": 334,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 273,
+                  "charLength": 139,
+                  "snippet": {
+                    "text": "use DirectoryIterator;\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse RecursiveDirectoryIterator;\nuse RecursiveIteratorIterator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3313df33ff2d82e651260b0d8df1e3a516846372ab096508af8f88c2e392fd24"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 424,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 229,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "347d215cb213025478fc37de135fc7ac006bcf06d1ec44017fd8d2fef37f17fa"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'ZendEngine3'",
+            "markdown": "Undefined namespace 'ZendEngine3'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/VariablesManager.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 29,
+                  "charOffset": 546,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "ZendEngine3"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 476,
+                  "charLength": 118,
+                  "snippet": {
+                    "text": "use function strlen;\nuse function substr;\nuse function Zephir\\Backend\\ZendEngine3\\add_slashes;\n\nclass VariablesManager"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3d7c6f1c2b0e1dc6d1eca2bc1fdc9304f7b3cbf166e78b40da66ae5c9822001a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3e78389c18722879dd5ab3ae4e5634dde2fb93a69638693784f56b7e49340c0f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 9,
+                  "charOffset": 311,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;\nuse Zephir\\Class\\Definition\\Definition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3f335c313e1cc9cf6ac762bfda32106630e5534965bac21c5252165a38347526"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 9,
+                  "charOffset": 281,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 97,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "443da23df032641608b53fc0c7fe39623d6a02328de84931e109dcb3fddbf403"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 490,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 355,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "45587045d101c2a74bc507d059c4c3559a37db581cd53be5bc1d6ddf0fceed6a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 9,
+                  "charOffset": 320,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 161,
+                  "snippet": {
+                    "text": "\nuse DirectoryIterator;\nuse Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "498a019c51596c1382b1b31ba63a4e9b2a9f04c43451c8f53e2b75b05d52fed6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4bd3a0d0db558151bc2f5386224f422552ca74259f9df5d8952409cdd1673cb9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 473,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 342,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4e539c2da67778b444bc6d99f212be54f6b045d6a387ee5da022a8cbb3ffee76"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 9,
+                  "charOffset": 281,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 112,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse Zephir\\Class\\Definition\\Definition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5084f9df695de0baf604549eeef29e8a50a79447f44949f96ced42a49225deda"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 429,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 312,
+                  "charLength": 242,
+                  "snippet": {
+                    "text": "use Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "50ac1ee2046ee64e8b00940d1f6ebd55338ab677c05d0fe4ac650633ba2dd908"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Command'",
+            "markdown": "Undefined namespace 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 435,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 296,
+                  "charLength": 270,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Application as BaseApplication;\nuse Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "51e849512e7ee77041b778c8617afb8b291c6674f3d54abaf225fcc7caf102fb"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler/CompilerFileFactory.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 9,
+                  "charOffset": 290,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 106,
+                  "snippet": {
+                    "text": "namespace Zephir\\Compiler;\n\nuse Psr\\Log\\LoggerInterface;\nuse Zephir\\AliasManager;\nuse Zephir\\CompilerFile;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "57116e0c4b68cae60d1ae36f4325964670e1e7d0369243db8bea237ef3b5a714"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5923fa39d430e6245cafe306e5daee42d5f6d09c3fae9a70c12d57728a99afc5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 26,
+                  "startColumn": 31,
+                  "charOffset": 814,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 24,
+                  "startColumn": 1,
+                  "charOffset": 685,
+                  "charLength": 252,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5b897ac5452046ad9253ca17fdec51f9687486d9fdd8c44acf179d355283f015"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Style'",
+            "markdown": "Undefined namespace 'Style'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 474,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Style"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 341,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Config;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5eb4377bf10c57c30ca12bb05776bbf339440eaa85fd03929981ca58a30480df"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 371,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "61799bde1bba18f521257989311d3c592fb855c7691cec7b867d10a1ec52c99f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 25,
+                  "startColumn": 31,
+                  "charOffset": 763,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 23,
+                  "startColumn": 1,
+                  "charOffset": 627,
+                  "charLength": 261,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "734960dcfc8468f6f7d63c3694a5c316839568f5832da533ea6a2c30627c58fd"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 31,
+                  "charOffset": 536,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 405,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "73e86b2cf1981618fb2acbdbad0ac1fefffb33516dfb55a9c55b7d15e277687e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 334,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 171,
+                  "snippet": {
+                    "text": "\nuse Exception;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "74537af4af34929a98e28cdc852181c18217040e06bce43fbe06997818943460"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Command'",
+            "markdown": "Undefined namespace 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 388,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 281,
+                  "charLength": 219,
+                  "snippet": {
+                    "text": "use Exception;\nuse Symfony\\Component\\Console\\Application as BaseApplication;\nuse Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "74985da6f239c3778c05b6d9eea5b1eb06908cac318b31eb9efee0579f18a6de"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Style'",
+            "markdown": "Undefined namespace 'Style'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 473,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Style"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 337,
+                  "charLength": 212,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Exception\\FileSystemException;\nuse Zephir\\Os;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7670410bfc23da2945eb9189f8734d5680c42e84b33b654518c8a4e9872c14e5"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'EventDispatcher'",
+            "markdown": "Undefined namespace 'EventDispatcher'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 30,
+                  "startColumn": 23,
+                  "charOffset": 1014,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "EventDispatcher"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 28,
+                  "startColumn": 1,
+                  "charOffset": 889,
+                  "charLength": 212,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Throwable;\nuse Zephir\\Console\\Command\\ListCommand;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7a019f68639d773f966c9ce954117d9acc6d98e8d260530d2e8eeea506a430c2"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 372,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7ca8add743248e186ed950d6acbb16b5d7a0e8557ad7016303036515d388f834"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Event'",
+            "markdown": "Undefined namespace 'Event'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/ErrorListener.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 311,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Event"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 162,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console;\n\nuse Symfony\\Component\\Console\\Event\\ConsoleErrorEvent;\nuse Zephir\\Exception\\CompilerException;\nuse Zephir\\Exception\\ExceptionInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8002949bcf67732520d24227c8d1468015482ba99cb308cdd3f1657874c1d261"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Console'",
+            "markdown": "Undefined namespace 'Console'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 23,
+                  "charOffset": 318,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Console"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 280,
+                  "charLength": 175,
+                  "snippet": {
+                    "text": "\nuse Exception;\nuse Symfony\\Component\\Console\\Application as BaseApplication;\nuse Symfony\\Component\\Console\\Command\\Command;\nuse Symfony\\Component\\Console\\Command\\HelpCommand;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "823f3992a13ed1e873c574b9dd4e58b2c39c7cbe3a20dd40c83fb5198dbf8965"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 9,
+                  "charOffset": 304,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 109,
+                  "snippet": {
+                    "text": "\nuse DirectoryIterator;\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse RecursiveDirectoryIterator;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "82ffcf7eb0af0e1d3a9a208b4498bed70ffb057bda305af6c5469486ff8d6909"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Exception'",
+            "markdown": "Undefined namespace 'Exception'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 22,
+                  "startColumn": 31,
+                  "charOffset": 597,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 20,
+                  "startColumn": 1,
+                  "charOffset": 456,
+                  "charLength": 276,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "84d60e9df13440978a47bf8daef91af1d7a93e0af7d1493c65425f0d61d26bb3"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/RemoveOptionsTrait.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 111,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\InputOption;\n\nuse function array_filter;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8799cac1c6b02f5d8239e3818b3af300ca05fc47f7fb90036aaa98dafe34b6dc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 367,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8e18ae416b9071da01f62f225f75d7965b8473f9c24d14e962adc94b66a95a8e"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Style'",
+            "markdown": "Undefined namespace 'Style'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 474,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Style"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 341,
+                  "charLength": 195,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Exception;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "90f72e36086e56ad76c444a300a3052bdc0c55d17de9a77b08d40a312ce6f2f7"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Formatter'",
+            "markdown": "Undefined namespace 'Formatter'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Logger/Formatter/CompilerFormatter.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 13,
+                  "charOffset": 302,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "Formatter"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 92,
+                  "snippet": {
+                    "text": "namespace Zephir\\Logger\\Formatter;\n\nuse Monolog\\Formatter\\LineFormatter;\nuse Zephir\\Config;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "969a797a51eacd2ae9afce3718d2f1214a21ffbc3b993d96abc9239df29d0a25"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Exception'",
+            "markdown": "Undefined namespace 'Exception'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 371,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 213,
+                  "snippet": {
+                    "text": "use DirectoryIterator;\nuse Psr\\Log\\LoggerInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9713dfdef948963b04eea9fcca9f376e89658642db59d8f9ea4be04d4d08a9a8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 420,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "97e66bec5ba6452d931d0405b99b44ab74633aa2c65d099c31524d6d46449f2d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 334,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "\nuse Exception;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9c1f82eb2570f951c2de1f03bb9a31c9f29bd40fd6c1b3ff06a057f2afdfbb97"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilationContext.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 9,
+                  "charOffset": 281,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 107,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerInterface;\nuse Zephir\\Backend\\Backend;\nuse Zephir\\Cache\\FunctionCache;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a3f677c19d100a32e2e1cf9f6b456118a1c070f4e323b2bbb6a484b9a3b584c1"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 382,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 216,
+                  "snippet": {
+                    "text": "use Exception;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a73346b0d32436c8735ed89dd8c30a8c2f93247728f9dcc40901d61f146f4ff6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 420,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a98413724194573b609a819beeee1846c75cfad31cc81350faa757ad1cc1d460"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 31,
+                  "charOffset": 867,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 733,
+                  "charLength": 258,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aee7343fb88c737b7f2eb480f87658e966452606534b86eb248ce3c96fd92143"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'PhpCsFixer'",
+            "markdown": "Undefined namespace 'PhpCsFixer'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": ".php-cs-fixer.dist.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 15,
+                  "charOffset": 975,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "PhpCsFixer"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 916,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "    ->notPath('#tests/ext-bootstrap.php#');\n\n$config = new PhpCsFixer\\Config();\n$config\n    ->setRiskyAllowed(true)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b554a4d8f10adc7d0eceffafcc314ed6a440664c69657fd2610e6968f67ddb6d"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 438,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 273,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\InvalidArgumentException;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ba2b0b169e6108d5780fa95713186fbbb17a7fb4bbeeaf773d3fc3719fcc5a3a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Style'",
+            "markdown": "Undefined namespace 'Style'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 31,
+                  "charOffset": 527,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Style"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 394,
+                  "charLength": 213,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Compiler;\nuse Zephir\\Exception\\CompilerException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bdbc148a11434144618d763ab3d1cb9f46009a9797ea5a3f947afc436252cb74"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c1f18519c196bc59814e2c151204a20f4522b107d4550338b7a730aed73cb6f0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 385,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 220,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Exception\\InvalidArgumentException;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c24e7f427c411d315e2a433a55ba0b3ee5e5aa00d376520d1b631e83afe56d3a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 9,
+                  "charOffset": 311,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse Zephir\\Class\\Definition\\Definition;\nuse Zephir\\Documentation\\File;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c986a1df354a86c011c87b52d4c2f63e132c356011d0551115ebc966a21e190a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InstallCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 17,
+                  "startColumn": 31,
+                  "charOffset": 371,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 15,
+                  "startColumn": 1,
+                  "charOffset": 288,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ca60fc3292a0aac461693aba4f64b1647c3223ca8d69626e82f262382c3634dc"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 29,
+                  "startColumn": 31,
+                  "charOffset": 968,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 27,
+                  "startColumn": 1,
+                  "charOffset": 837,
+                  "charLength": 224,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\EventDispatcher\\EventDispatcher;\nuse Throwable;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cbc903146377ccbb4e7fec52e8b49926dc6fc7e1533b0e5950f10f89785274a8"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/BuildCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 31,
+                  "charOffset": 487,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 352,
+                  "charLength": 257,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cbcc121b9a080e10fd106bd88c18f588858df90f5bdb9fbcd4dbe042cc39fd60"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Log'",
+            "markdown": "Undefined namespace 'Log'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 9,
+                  "charOffset": 281,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "Log"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 97,
+                  "snippet": {
+                    "text": "namespace Zephir;\n\nuse Psr\\Log\\LoggerAwareTrait;\nuse Psr\\Log\\NullLogger;\nuse ReflectionException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d0b3bbeaa1c2b9edb2f442723db79ac9ad2b3281503ddaa1de135bba31cbbb53"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Command'",
+            "markdown": "Undefined namespace 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/AbstractCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 129,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Command\\Command;\n\nabstract class AbstractCommand extends Command"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d5ccb09e96abc74c6311876f0109c3335aa937141ae0d8f11666b7c8ce4bb2b6"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Command'",
+            "markdown": "Undefined namespace 'Command'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ListCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Command"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 101,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Command\\ListCommand as Command;\n\n/**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d611c10483c9398d877bf6a7a08181417ca8f86157f2d16a1b03bc2b2f2b4a0b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Exception'",
+            "markdown": "Undefined namespace 'Exception'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 23,
+                  "startColumn": 31,
+                  "charOffset": 657,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 21,
+                  "startColumn": 1,
+                  "charOffset": 501,
+                  "charLength": 282,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d62086227efc5cc49a55f20c4428081559d482d445c223430a1356160a9f8ba9"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 20,
+                  "startColumn": 31,
+                  "charOffset": 539,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 18,
+                  "startColumn": 1,
+                  "charOffset": 408,
+                  "charLength": 194,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Zephir\\Compiler;\nuse Zephir\\Config;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d7120f43e45b40544a321f06a027ad4db45a0770ae6352e3f40b6921bd72636b"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Style'",
+            "markdown": "Undefined namespace 'Style'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 19,
+                  "startColumn": 31,
+                  "charOffset": 440,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Style"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 17,
+                  "startColumn": 1,
+                  "charOffset": 304,
+                  "charLength": 212,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Throwable;\nuse Zephir\\Exception\\FileSystemException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d91a5fd7c9884e83624cbd322cecd85de03190dc9308d9844b0f97307c97a84a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Output'",
+            "markdown": "Undefined namespace 'Output'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/FullCleanCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 419,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "Output"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 245,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Zephir\\Exception\\FileSystemException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e25e36e4d0b37abc2680f2e40752200c01de342b20a9526a5a76c457aac55a4f"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Monolog'",
+            "markdown": "Undefined namespace 'Monolog'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 5,
+                  "charOffset": 312,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "Monolog"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 272,
+                  "charLength": 104,
+                  "snippet": {
+                    "text": "\nuse Monolog\\Handler\\StreamHandler;\nuse Monolog\\Logger;\nuse Zephir\\Backend\\Backend;\nuse Zephir\\Compiler;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e68cde025f679c97518c484b977f0c11bb6bbbd3c01daf5093774093b099b3c0"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 24,
+                  "startColumn": 31,
+                  "charOffset": 715,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 22,
+                  "startColumn": 1,
+                  "charOffset": 567,
+                  "charLength": 269,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;\nuse Symfony\\Component\\Console\\Input\\ArrayInput;\nuse Symfony\\Component\\Console\\Input\\InputArgument;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ee9d591b9fd6687f74f8afd6dce20051baa32237852d786eec7ced6b01c4e48a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Exception'",
+            "markdown": "Undefined namespace 'Exception'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 16,
+                  "startColumn": 31,
+                  "charOffset": 319,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 14,
+                  "startColumn": 1,
+                  "charOffset": 254,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "namespace Zephir\\Console\\Command;\n\nuse Symfony\\Component\\Console\\Exception\\InvalidArgumentException;\nuse Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f86e41bf5dc36131a8390f5ee0c27e9d52a8de1500052254dd5ef137a95537ab"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'PhpCsFixer'",
+            "markdown": "Undefined namespace 'PhpCsFixer'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": ".php-cs-fixer.dist.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 27,
+                  "startColumn": 11,
+                  "charOffset": 537,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "PhpCsFixer"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 25,
+                  "startColumn": 1,
+                  "charOffset": 521,
+                  "charLength": 86,
+                  "snippet": {
+                    "text": "EOF;\n\n$finder = PhpCsFixer\\Finder::create()\n    ->in(__DIR__)\n    ->append([__FILE__])"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fc005e58123fb437e6d058e33468d8ffd2363668c14f14db3f490075fdcd741a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Input'",
+            "markdown": "Undefined namespace 'Input'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 18,
+                  "startColumn": 31,
+                  "charOffset": 424,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "Input"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 16,
+                  "startColumn": 1,
+                  "charOffset": 289,
+                  "charLength": 257,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Input\\InputDefinition;\nuse Symfony\\Component\\Console\\Input\\InputInterface;\nuse Symfony\\Component\\Console\\Input\\InputOption;\nuse Symfony\\Component\\Console\\Output\\OutputInterface;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fc97b959d6a3286de20d21fdbbecadccf42efe0f9746427b8da276fa93eb24a1"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedNamespaceInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Undefined namespace 'Exception'",
+            "markdown": "Undefined namespace 'Exception'"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 21,
+                  "startColumn": 31,
+                  "charOffset": 531,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "Exception"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 19,
+                  "startColumn": 1,
+                  "charOffset": 405,
+                  "charLength": 279,
+                  "snippet": {
+                    "text": "use Symfony\\Component\\Console\\Command\\HelpCommand;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Exception\\CommandNotFoundException;\nuse Symfony\\Component\\Console\\Exception\\ExceptionInterface;\nuse Symfony\\Component\\Console\\Exception\\RuntimeException;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fe5072469d80ea33c4119a2bc3aefdff935933512f6c2ba4e2a32add70bf221a"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 250,
+                  "startColumn": 62,
+                  "charOffset": 10149,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 248,
+                  "startColumn": 1,
+                  "charOffset": 9983,
+                  "charLength": 243,
+                  "snippet": {
+                    "text": "                case 'object-property-append':\n                    $let = new LetObjectPropertyAppend();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "026f3ec34b7fde574a1c05d63b6bd2445988c589a806c37a56fa7e6817197824"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variable' is probably undefined",
+            "markdown": "Variable '$variable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 217,
+                  "startColumn": 48,
+                  "charOffset": 7228,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 215,
+                  "startColumn": 1,
+                  "charOffset": 7088,
+                  "charLength": 212,
+                  "snippet": {
+                    "text": "            $exprVariable,\n            isset($this->statement['key']) ? $keyVariable : null,\n            isset($this->statement['value']) ? $variable : null,\n            $duplicateKey,\n            $duplicateHash,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "037ae5dfb0c16d94044982b627b5392d60ce53c99d237f51d60f1f61aa0b2d88"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$parameterCode' is probably undefined",
+            "markdown": "Variable '$parameterCode' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 819,
+                  "startColumn": 65,
+                  "charOffset": 28442,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$parameterCode"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 817,
+                  "startColumn": 1,
+                  "charOffset": 28250,
+                  "charLength": 321,
+                  "snippet": {
+                    "text": "                $context->headersManager->add('kernel/operators');\n                $context->symbolTable->mustGrownStack(true);\n                $codePrinter->output('if (EXPECTED(Z_TYPE_P(' . $parameterCode . ') == IS_STRING)) {');\n                $codePrinter->increaseLevel();\n                $targetVar = $var['name'];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0478961172d81e1e8c4d21fd854562c86def6929eea1c2ebdb5b998ffc2fe33f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classDefinition' is probably undefined",
+            "markdown": "Variable '$classDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 467,
+                  "startColumn": 34,
+                  "charOffset": 21346,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 465,
+                  "startColumn": 1,
+                  "charOffset": 21257,
+                  "charLength": 250,
+                  "snippet": {
+                    "text": "\n                        if (0 == $numberImplemented) {\n                            if (!$classDefinition->isInterface()) {\n                                if (count($classTypes) > 1) {\n                                    throw new CompilerException("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0488b6b0ac3b4d72ce335f366435f4fedf5c4b6a7d4d6a81faff883bb941cde1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 159,
+                  "startColumn": 25,
+                  "charOffset": 6358,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 157,
+                  "startColumn": 1,
+                  "charOffset": 6258,
+                  "charLength": 198,
+                  "snippet": {
+                    "text": "                        $variable,\n                        $symbolVariable,\n                        $resolvedExpr,\n                        $readDetector,\n                        $compilationContext,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "051f57b2d31db11a9a4f1dc4d2d64545a5ac86de6a05dd4e641afba95b02c643"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$method' is probably undefined",
+            "markdown": "Variable '$method' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 780,
+                  "startColumn": 88,
+                  "charOffset": 36215,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$method"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 778,
+                  "startColumn": 1,
+                  "charOffset": 35967,
+                  "charLength": 350,
+                  "snippet": {
+                    "text": "                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 2, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $symbolCode . ', ' . $variableCode . ', ' . $method->getInternalName(\n                            ) . $paramsStr . ');'\n                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "05bc3b2f76428b77cd159c3db184e8c8d3574d27530a8e8ebaf4e16a94d0fd7e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$method' is probably undefined",
+            "markdown": "Variable '$method' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Cache/MethodCache.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 123,
+                  "startColumn": 15,
+                  "charOffset": 4471,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$method"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 121,
+                  "startColumn": 1,
+                  "charOffset": 4446,
+                  "charLength": 161,
+                  "snippet": {
+                    "text": "        }\n\n        if (!($method instanceof ReflectionMethod)) {\n            if ($method->getClassDefinition()->isExternal()) {\n                return 'NULL, 0';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "07fa6e4d267f29ae3ed83f6ef1beb2ccd92186336ae69b2e65f6434127bca53b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$references' is probably undefined",
+            "markdown": "Variable '$references' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 830,
+                  "startColumn": 23,
+                  "charOffset": 38158,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$references"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 828,
+                  "startColumn": 1,
+                  "charOffset": 38037,
+                  "charLength": 252,
+                  "snippet": {
+                    "text": "        // Release parameters marked as references\n        if (isset($expression['parameters'])) {\n            if (count($references)) {\n                foreach ($params as $position => $param) {\n                    if (isset($references[$position])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "09745733bf0921d99b1907ff53de3a66639b7e879add28885e16c1f3f5737782"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$name' is probably undefined",
+            "markdown": "Variable '$name' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Stubs/MethodDocBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 167,
+                  "startColumn": 39,
+                  "charOffset": 4570,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "$name"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 165,
+                  "startColumn": 1,
+                  "charOffset": 4470,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "            switch ($docType) {\n                case 'param':\n                    $this->parameters[$name] = [$type, $description];\n                    break;\n                case 'return':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0f7d4e033ab0b3c39681f579a68921d6ca3cffe53217d84d99c1b85bde1c22dc"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 543,
+                  "startColumn": 40,
+                  "charOffset": 21308,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 541,
+                  "startColumn": 1,
+                  "charOffset": 21117,
+                  "charLength": 308,
+                  "snippet": {
+                    "text": "                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "114dbfa2f647d708f012a0cbedb0cc650839d0869aaae29e0278592bf57eeeec"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$functionName' is probably undefined",
+            "markdown": "Variable '$functionName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1074,
+                  "startColumn": 29,
+                  "charOffset": 40529,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$functionName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1072,
+                  "startColumn": 1,
+                  "charOffset": 40369,
+                  "charLength": 328,
+                  "snippet": {
+                    "text": "                        $compilationContext->headersManager->add('kernel/operators');\n                        $codePrinter->output(\n                            $functionName . '(' . $symbol . ', ' . $compilationContext->backend->getVariableCode(\n                                $tempVariable\n                            ) . ');'"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1533a3d28f70641df858e5968c9e8529f61dd8a0224ca3ea29587a8636ab724d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classDefinition' is probably undefined",
+            "markdown": "Variable '$classDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 87,
+                  "startColumn": 13,
+                  "charOffset": 2886,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 85,
+                  "startColumn": 1,
+                  "charOffset": 2835,
+                  "charLength": 114,
+                  "snippet": {
+                    "text": "\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $statement"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "163555d417cd4b2eb199ae753ff2aea0bad25cbbcd5bfa50b9c5689e3f8eecd0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$defaultIndex' is probably undefined",
+            "markdown": "Variable '$defaultIndex' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/SwitchStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 181,
+                  "startColumn": 13,
+                  "charOffset": 6243,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$defaultIndex"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 179,
+                  "startColumn": 1,
+                  "charOffset": 6220,
+                  "charLength": 102,
+                  "snippet": {
+                    "text": "        }\n\n        if ($defaultIndex === count($clauses) - 1) {\n            return $clauses;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "16c62bba7eb3f1b6f907dfbc8f51b1a4393007f0d87d339244920b9a7e31e143"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 260,
+                  "startColumn": 62,
+                  "charOffset": 10668,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 258,
+                  "startColumn": 1,
+                  "charOffset": 10480,
+                  "charLength": 265,
+                  "snippet": {
+                    "text": "                case 'object-property-array-index-append':\n                    $let = new LetObjectPropertyArrayIndexAppend();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "18b46d126dcdb3dee7c6ec2b2c5b0869ff7fe3614dbfffab64e577eb4ceb9772"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 168,
+                  "startColumn": 62,
+                  "charOffset": 6697,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 166,
+                  "startColumn": 1,
+                  "charOffset": 6544,
+                  "charLength": 230,
+                  "snippet": {
+                    "text": "                case 'variable-append':\n                    $let = new LetVariableAppend();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "196ab6ac405bb1a63b2c883f9486d50b4c26502f92c6f27b2e6a651534d1ea74"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classEntry' is probably undefined",
+            "markdown": "Variable '$classEntry' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/InstanceOfOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 136,
+                  "startColumn": 57,
+                  "charOffset": 5982,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$classEntry"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 5867,
+                  "charLength": 168,
+                  "snippet": {
+                    "text": "        return new CompiledExpression(\n            'bool',\n            'zephir_instance_of_ev(' . $symbol . ', ' . $classEntry . ')',\n            $expression\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1bf9d6b21da4535103cce50ecbe2f2dc3fa9d592c882c5e7aa2271d212023e49"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 178,
+                  "startColumn": 62,
+                  "charOffset": 7183,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 176,
+                  "startColumn": 1,
+                  "charOffset": 7006,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "                case 'variable-dynamic-object-property':\n                    $let = new LetObjectDynamicProperty();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1cc24d286996ffa24a3883107849ee51d604c90d7f2fe5e3fb25219e7bc35989"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 183,
+                  "startColumn": 62,
+                  "charOffset": 7442,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 181,
+                  "startColumn": 1,
+                  "charOffset": 7261,
+                  "charLength": 258,
+                  "snippet": {
+                    "text": "                case 'string-dynamic-object-property':\n                    $let = new LetObjectDynamicStringProperty();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1e560a1ac063c49111c815139b84055f34713c8bd78ab458ea095461eb254011"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 721,
+                  "startColumn": 57,
+                  "charOffset": 28893,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 719,
+                  "startColumn": 1,
+                  "charOffset": 28750,
+                  "charLength": 321,
+                  "snippet": {
+                    "text": "                } else {\n                    $compilationContext->codePrinter->output(\n                        'ZEPHIR_CALL_CE_STATIC_ZVAL(' . $symbol . ', ' . $classEntry . ', ' . $methodNameVariable->getName(\n                        ) . ', ' . $cachePointer . ', ' . implode(', ', $params) . ');'\n                    );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "27944d21aef6617792a48e519d94f7c34e7a69f8b383a042e749111216a98104"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 221,
+                  "startColumn": 25,
+                  "charOffset": 8955,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 219,
+                  "startColumn": 1,
+                  "charOffset": 8847,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "                        $variable,\n                        $assignment['property'],\n                        $resolvedExpr,\n                        $compilationContext,\n                        $assignment"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2a89f7b51dd70e61b06609e51ecb43f0804866c89a9253d0cdfabf50680b4911"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$typeKey' is probably undefined",
+            "markdown": "Variable '$typeKey' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 126,
+                  "startColumn": 39,
+                  "charOffset": 3411,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "$typeKey"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 124,
+                  "startColumn": 1,
+                  "charOffset": 3228,
+                  "charLength": 278,
+                  "snippet": {
+                    "text": "            if ('variable' == $key->getType()) {\n                $var    = $context->symbolTable->getVariableForRead($key->getCode(), $context);\n                $keyStr = 'string' == $typeKey ?\n                    'Z_STRVAL_P('\n                    . $this->getVariableCode($var)"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2d8c90b3b7b1c4cb243385ecc60d5f9bc36f6052014b35189ef97be1a1faeef9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$arrayNumKey' is probably undefined",
+            "markdown": "Variable '$arrayNumKey' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1130,
+                  "startColumn": 91,
+                  "charOffset": 39574,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$arrayNumKey"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1128,
+                  "startColumn": 1,
+                  "charOffset": 39384,
+                  "charLength": 318,
+                  "snippet": {
+                    "text": "            $macro = 'ZEND_HASH_' . $reverse . 'FOREACH_KEY_VAL';\n            $codePrinter->output(\n                $macro . '(Z_ARRVAL_P(' . $this->getVariableCode($exprVariable) . '), ' . $arrayNumKey->getName(\n                ) . ', ' . $arrayStrKey->getName() . ', ' . $tempVariable->getName() . ')'\n            );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "327162dce469b67039253092fe1bb55745d25084766d6e08159f47ee0b56d87f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classDefinition' is probably undefined",
+            "markdown": "Variable '$classDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 510,
+                  "startColumn": 33,
+                  "charOffset": 23233,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 508,
+                  "startColumn": 1,
+                  "charOffset": 23063,
+                  "charLength": 305,
+                  "snippet": {
+                    "text": "                            sprintf(\n                                \"Method '%s::%s' is marked as '%s' and it does not return anything\",\n                                $classDefinition->getCompleteName(),\n                                $expression['name'],\n                                Types::T_VOID"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "33ce97068d591504e96ac3a99b0a5229719f82a2c111cfb3dea26fb4659d7cf7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$parameterVariable' is probably undefined",
+            "markdown": "Variable '$parameterVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 832,
+                  "startColumn": 68,
+                  "charOffset": 29140,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "$parameterVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 830,
+                  "startColumn": 1,
+                  "charOffset": 29024,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "                break;\n            case 'array':\n                $context->backend->assignZval($inputParamVariable, $parameterVariable, $context);\n                break;\n            case 'object':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "33f8c145b89fd28d22807f323605ef63219582eca560f767338c4875b73748f7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$methodName' is probably undefined",
+            "markdown": "Variable '$methodName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 203,
+                  "startColumn": 50,
+                  "charOffset": 7093,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$methodName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 201,
+                  "startColumn": 1,
+                  "charOffset": 6909,
+                  "charLength": 273,
+                  "snippet": {
+                    "text": "            if ('this' == $variableVariable->getRealName()) {\n                $classDefinition = $compilationContext->classDefinition;\n                if (!$classDefinition->hasMethod($methodName)) {\n                    if ($check) {\n                        $found = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "36df782cb3fd0600c404dea03742049fad6075595e007776ec60ced80f241a43"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableVariable' is probably undefined",
+            "markdown": "Variable '$variableVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 729,
+                  "startColumn": 75,
+                  "charOffset": 33779,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$variableVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 727,
+                  "startColumn": 1,
+                  "charOffset": 33569,
+                  "charLength": 276,
+                  "snippet": {
+                    "text": "        // Generate the code according to the call type\n        if (self::CALL_NORMAL == $type || self::CALL_DYNAMIC_STRING == $type) {\n            $realMethod = $this->getRealCalledMethod($compilationContext, $variableVariable, $methodName);\n\n            $isInternal = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3aa8329d17b3cb033f614089c8401e76167f2a920e287ab5c6a8f16dcbbd5fee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$readOnly' is probably undefined",
+            "markdown": "Variable '$readOnly' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 18,
+                  "charOffset": 3049,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$readOnly"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 3021,
+                  "charLength": 99,
+                  "snippet": {
+                    "text": "        }\n\n        $flags = $readOnly ? '1' : '0';\n\n        switch ($expression['right']['type']) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3e193fbb86b218686de3e9c3a347f471269ced40e2682b5fed97ef192f0ca2c6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableRight' is probably undefined",
+            "markdown": "Variable '$variableRight' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 100,
+                  "startColumn": 90,
+                  "charOffset": 3601,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$variableRight"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 98,
+                  "startColumn": 1,
+                  "charOffset": 3379,
+                  "charLength": 268,
+                  "snippet": {
+                    "text": "        if ('string' == $left->getType() && 'variable' == $right->getType()) {\n            $compilationContext->codePrinter->output(\n                'ZEPHIR_CONCAT_SV(' . $expectedCode . ', \"' . $left->getCode() . '\", ' . $variableRight . ');'\n            );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4563407537fe09ed1b2f954a940b8bfad6cabf6e47f588ba416a971c56f03f57"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 232,
+                  "startColumn": 25,
+                  "charOffset": 9377,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 230,
+                  "startColumn": 1,
+                  "charOffset": 9269,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "                        $variable,\n                        $assignment['property'],\n                        $resolvedExpr,\n                        $compilationContext,\n                        $assignment"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "45efbafc98df13ac59fdfc818a14f053c76227d8e15ad114390834ea598fbb91"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 446,
+                  "startColumn": 40,
+                  "charOffset": 17480,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 444,
+                  "startColumn": 1,
+                  "charOffset": 17289,
+                  "charLength": 308,
+                  "snippet": {
+                    "text": "                    $macro = $compilationContext->backend->getFcallManager()->getMacro(true, 2, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $symbol . ', ' . $ce . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "465613b9ab6f348c89a64ea626048249b398bbd27f878fc5fa28629238c92157"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyStr' is probably undefined",
+            "markdown": "Variable '$keyStr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 180,
+                  "startColumn": 19,
+                  "charOffset": 5275,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$keyStr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 178,
+                  "startColumn": 1,
+                  "charOffset": 5182,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "                . $this->getVariableCode($variable)\n                . ', '\n                . $keyStr\n                . ', '\n                . $valueStr"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "47c6299635672d3dbc4d878e15e0b34efef3fe7cfc11846b239665126a0fdd82"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variable' is probably undefined",
+            "markdown": "Variable '$variable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 381,
+                  "startColumn": 65,
+                  "charOffset": 13121,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 379,
+                  "startColumn": 1,
+                  "charOffset": 12963,
+                  "charLength": 238,
+                  "snippet": {
+                    "text": "            $compilationContext->codePrinter->output(\n                'ZEPHIR_ITERATOR_COPY('\n                . $compilationContext->backend->getVariableCode($variable)\n                . ', '\n                . $iteratorVariable->getName()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "49ea00a4c4478a2a6b500a3fe605958b135ebecf5def3b278d446f00e57c40f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$method' is probably undefined",
+            "markdown": "Variable '$method' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 787,
+                  "startColumn": 63,
+                  "charOffset": 36580,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$method"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 785,
+                  "startColumn": 1,
+                  "charOffset": 36365,
+                  "charLength": 302,
+                  "snippet": {
+                    "text": "                    $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 0, $paramCount);\n                    $codePrinter->output(\n                        $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4d784608301249034374ca495c3ae3fb55d0d961ef76e900c2c4ecea2c6a8d9f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$functionName' is probably undefined",
+            "markdown": "Variable '$functionName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 229,
+                  "startColumn": 29,
+                  "charOffset": 8566,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$functionName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 227,
+                  "startColumn": 1,
+                  "charOffset": 8465,
+                  "charLength": 303,
+                  "snippet": {
+                    "text": "                        );\n                        $codePrinter->output(\n                            $functionName . '(' . $context->backend->getVariableCode(\n                                $tempVariable\n                            ) . ', ' . $context->backend->getVariableCode($resolvedVariable) . ')'"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4daf7a5a08ea3aa28934600cbdce3970d4d7b7d0fbffd279b28188e2d0df38e9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$parameterCode' is probably undefined",
+            "markdown": "Variable '$parameterCode' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 802,
+                  "startColumn": 70,
+                  "charOffset": 27646,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$parameterCode"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 800,
+                  "startColumn": 1,
+                  "charOffset": 27528,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "            case 'int':\n            case 'long':\n                $codePrinter->output($var['name'] . ' = Z_LVAL_P(' . $parameterCode . ');');\n                break;\n            case 'uint':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "520af7ab75154d18eb4cef9d1d88b62bba95626be81a4b76195b42e887bdcf0b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 429,
+                  "startColumn": 59,
+                  "charOffset": 16510,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 427,
+                  "startColumn": 1,
+                  "charOffset": 16385,
+                  "charLength": 239,
+                  "snippet": {
+                    "text": "                } else {\n                    $codePrinter->output(\n                        'ZEPHIR_CALL_' . $context . '(' . $symbol . ', \"' . $methodName . '\", ' . $cachePointer . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "536f4b4f914438c48ab8a30522286c39f52bf3292066cc32d96cc3ebd9e86547"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbolVariable' is probably undefined",
+            "markdown": "Variable '$symbolVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 242,
+                  "startColumn": 14,
+                  "charOffset": 8815,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 240,
+                  "startColumn": 1,
+                  "charOffset": 8719,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "         * Variable that receives a property value must be polymorphic\n         */\n        if (!$symbolVariable->isVariable()) {\n            throw new CompilerException(\n                'Cannot use variable: '"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "563b718b92a6604050e6746a5f2eac178e1578bd97b753eba6f1acd4fd18c004"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classDefinition' is probably undefined",
+            "markdown": "Variable '$classDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 607,
+                  "startColumn": 37,
+                  "charOffset": 27165,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 605,
+                  "startColumn": 1,
+                  "charOffset": 26963,
+                  "charLength": 350,
+                  "snippet": {
+                    "text": "                                    'Passing possible incorrect type for parameter: %s::%s(%s), ' .\n                                    'passing: %s, expecting: %s',\n                                    $classDefinition->getCompleteName(),\n                                    $method->getName(),\n                                    $parameter['name'],"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5d77b0f52fcc666d23068ae409e75a5ce599b58e0c120588f54ba66556db12c2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyStr' is probably undefined",
+            "markdown": "Variable '$keyStr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 160,
+                  "startColumn": 19,
+                  "charOffset": 4596,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$keyStr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 158,
+                  "startColumn": 1,
+                  "charOffset": 4503,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "                . $this->getVariableCode($variable)\n                . ', '\n                . $keyStr\n                . ', '\n                . $valueStr"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "66ea9664b3bd1d538a66c1170f61fe46c271613a112cff499443afa978810ab7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$completeName' is probably undefined",
+            "markdown": "Variable '$completeName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Cache/StaticMethodCache.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 83,
+                  "startColumn": 26,
+                  "charOffset": 2809,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$completeName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 81,
+                  "startColumn": 1,
+                  "charOffset": 2729,
+                  "charLength": 143,
+                  "snippet": {
+                    "text": "\n        if (!($method instanceof ReflectionMethod)) {\n            $this->cache[$completeName][$method->getName()] = $functionCache;\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6a21819e8f2cc24db8eebf11a5595d8cf2fd002356a3602ada817f312dd73cdf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classMethod' is probably undefined",
+            "markdown": "Variable '$classMethod' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 270,
+                  "startColumn": 25,
+                  "charOffset": 10348,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$classMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 268,
+                  "startColumn": 1,
+                  "charOffset": 10219,
+                  "charLength": 301,
+                  "snippet": {
+                    "text": "                     * Private methods must be called in their declaration scope\n                     */\n                    if ($classMethod->isPrivate()) {\n                        if ($classMethod->getClassDefinition() !== $classDefinition) {\n                            throw new CompilerException("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "77a838bb07d392da7534fa692661c87b15ee9380b2caff2162d5b128a8a5c164"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classInterfaceDefinition' is probably undefined",
+            "markdown": "Variable '$classInterfaceDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Definition/Definition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 555,
+                  "startColumn": 60,
+                  "charOffset": 17651,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "$classInterfaceDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 553,
+                  "startColumn": 1,
+                  "charOffset": 17503,
+                  "charLength": 194,
+                  "snippet": {
+                    "text": "                 */\n                if (!$this->isAbstract() && !$this->isInterface()) {\n                    $this->checkInterfaceImplements($this, $classInterfaceDefinition);\n                }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "83158b8cbc62726f9f1e9e0d13353c74cd7edead1379f424e7c2b1acc59686c5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$methodName' is probably undefined",
+            "markdown": "Variable '$methodName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 729,
+                  "startColumn": 94,
+                  "charOffset": 33798,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$methodName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 727,
+                  "startColumn": 1,
+                  "charOffset": 33569,
+                  "charLength": 276,
+                  "snippet": {
+                    "text": "        // Generate the code according to the call type\n        if (self::CALL_NORMAL == $type || self::CALL_DYNAMIC_STRING == $type) {\n            $realMethod = $this->getRealCalledMethod($compilationContext, $variableVariable, $methodName);\n\n            $isInternal = false;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "88cddc05fa5aef4a6b82cbda96c2ec5e93371d20fc958a4ff0eb70751b4facc7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$nh' is probably undefined",
+            "markdown": "Variable '$nh' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/NamespaceAccessor.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 73,
+                  "startColumn": 13,
+                  "charOffset": 1739,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "$nh"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 71,
+                  "startColumn": 1,
+                  "charOffset": 1712,
+                  "charLength": 60,
+                  "snippet": {
+                    "text": "            }\n\n            $nh->addClass($class);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8ac5c8cf5ed0a49e25925904edddce13dc61bef87962042dcaf9493120a048af"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$arrayStrKey' is probably undefined",
+            "markdown": "Variable '$arrayStrKey' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1131,
+                  "startColumn": 28,
+                  "charOffset": 39624,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$arrayStrKey"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1129,
+                  "startColumn": 1,
+                  "charOffset": 39450,
+                  "charLength": 293,
+                  "snippet": {
+                    "text": "            $codePrinter->output(\n                $macro . '(Z_ARRVAL_P(' . $this->getVariableCode($exprVariable) . '), ' . $arrayNumKey->getName(\n                ) . ', ' . $arrayStrKey->getName() . ', ' . $tempVariable->getName() . ')'\n            );\n        } elseif (isset($keyVariable)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8b3285bb6310260625ea96f2da69deb7cd49396ec2c922d966a3a12db218cbee"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableMethod' is probably undefined",
+            "markdown": "Variable '$variableMethod' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 793,
+                  "startColumn": 25,
+                  "charOffset": 36770,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$variableMethod"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 791,
+                  "startColumn": 1,
+                  "charOffset": 36682,
+                  "charLength": 189,
+                  "snippet": {
+                    "text": "        } else {\n            if (self::CALL_DYNAMIC == $type) {\n                switch ($variableMethod->getType()) {\n                    case 'string':\n                    case 'variable':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8d0afa23be120e300a6b5dac39ad8f541d129ed2a790b570516926aa338fdde1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 173,
+                  "startColumn": 62,
+                  "charOffset": 6928,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 171,
+                  "startColumn": 1,
+                  "charOffset": 6775,
+                  "charLength": 230,
+                  "snippet": {
+                    "text": "                case 'object-property':\n                    $let = new LetObjectProperty();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8d5535bc0a4247def45ff79db69b3098adbb0c6eacff99d62bccc97ae7215e60"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$functionName' is probably undefined",
+            "markdown": "Variable '$functionName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/Variable.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1185,
+                  "startColumn": 29,
+                  "charOffset": 45772,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$functionName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1183,
+                  "startColumn": 1,
+                  "charOffset": 45612,
+                  "charLength": 383,
+                  "snippet": {
+                    "text": "                        $compilationContext->headersManager->add('kernel/operators');\n                        $codePrinter->output(\n                            $functionName . '(' . $compilationContext->backend->getVariableCode(\n                                $symbolVariable\n                            ) . ', ' . $compilationContext->backend->getVariableCode($tempVariable) . ');'"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8fca84141fea76a069d4f18e2b1cc23c6f1112808c54b61c0ac143941e2e1064"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbolVariable' is probably undefined",
+            "markdown": "Variable '$symbolVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 351,
+                  "startColumn": 21,
+                  "charOffset": 12282,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 349,
+                  "startColumn": 1,
+                  "charOffset": 12146,
+                  "charLength": 285,
+                  "snippet": {
+                    "text": "                $compilationContext->headersManager->add('kernel/operators');\n                $codePrinter->output(\n                    $symbolVariable->getName(\n                    ) . ' = ZEPHIR_STRING_OFFSET(' . $variableCode . ', ' . $exprIndex->getCode() . ');'\n                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "91128bb6e5037012ad7b0b9b3735b272a539df2829d9d2c0cd12c3114988fcd6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$parameterCode' is probably undefined",
+            "markdown": "Variable '$parameterCode' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 813,
+                  "startColumn": 70,
+                  "charOffset": 28150,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$parameterCode"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 811,
+                  "startColumn": 1,
+                  "charOffset": 28031,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "                break;\n            case 'double':\n                $codePrinter->output($var['name'] . ' = Z_DVAL_P(' . $parameterCode . ');');\n                break;\n            case 'string':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "92f23b7a94b3d10556c67ef465859ccc4c8c2b89126eda24e786fe7415aef70a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variable' is probably undefined",
+            "markdown": "Variable '$variable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 895,
+                  "startColumn": 20,
+                  "charOffset": 32481,
+                  "charLength": 9,
+                  "snippet": {
+                    "text": "$variable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 893,
+                  "startColumn": 1,
+                  "charOffset": 32362,
+                  "charLength": 255,
+                  "snippet": {
+                    "text": "        $compilationContext->headersManager->add('kernel/operators');\n        $codePrinter->output(\n            \"\\t\" . $variable->getName(\n            ) . ' = ZEPHIR_STRING_OFFSET(' . $stringVariableCode . ', ' . $tempVariable->getName() . ');'\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "92f6d211d13efc156cda24635ba4bd051f9973a57e86722f67a565b2921c5abe"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classDefinition' is probably undefined",
+            "markdown": "Variable '$classDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/StaticConstantAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 14,
+                  "charOffset": 3257,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 3170,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "         * so we need to check that they effectively do exist\n         */\n        if (!$classDefinition->hasConstant($constant)) {\n            throw new CompilerException(\n                sprintf("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "93846f50c4b7610e23818dbd151b49ac7c212d4b2c241d74381b65a401f3a696"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$completeName' is probably undefined",
+            "markdown": "Variable '$completeName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Cache/MethodCache.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 188,
+                  "startColumn": 26,
+                  "charOffset": 6814,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$completeName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 186,
+                  "startColumn": 1,
+                  "charOffset": 6734,
+                  "charLength": 143,
+                  "snippet": {
+                    "text": "\n        if (!($method instanceof ReflectionMethod)) {\n            $this->cache[$completeName][$method->getName()] = $functionCache;\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "93906612f9b25c32a5d3e14de14bfb4d3670f953346d4d05e3df3f285e219472"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyVariable' is probably undefined",
+            "markdown": "Variable '$keyVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 565,
+                  "startColumn": 34,
+                  "charOffset": 20220,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$keyVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 563,
+                  "startColumn": 1,
+                  "charOffset": 20129,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "         */\n        if (isset($this->statement['key'])) {\n            $codePrinter->output($keyVariable->getName() . ' = 0;');\n        }\n        $codePrinter->output($flagVariable->getName() . ' = 0;');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "99d877b3794f7c3b257f7a498eabc4bad8168c0bb30951b304df5d0b81bd9c7f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 631,
+                  "startColumn": 52,
+                  "charOffset": 25124,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 629,
+                  "startColumn": 1,
+                  "charOffset": 24986,
+                  "charLength": 300,
+                  "snippet": {
+                    "text": "                } else {\n                    $compilationContext->codePrinter->output(\n                        'ZEPHIR_CALL_CE_STATIC(' . $symbol . ', ' . $classEntry . ', \"' . $methodName . '\", ' . $cachePointer . ', ' . implode(\n                            ', ',\n                            $params"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9cb68bf14642500e324cb0cefc8cc148b6028708a114d712b7850e5441e6be81"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$writeDetector' is probably undefined",
+            "markdown": "Variable '$writeDetector' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Class/Method/Method.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1060,
+                  "startColumn": 37,
+                  "charOffset": 40765,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$writeDetector"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1058,
+                  "startColumn": 1,
+                  "charOffset": 40589,
+                  "charLength": 351,
+                  "snippet": {
+                    "text": "                            $name = $parameter['name'];\n                            if (!$this->localContext instanceof LocalContextPass) {\n                                if ($writeDetector->detect($name, $this->statements->getStatements())) {\n                                    $parametersToSeparate[$name] = true;\n                                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a16ef00fa79548dcae3bc0193443518516486d37bdd6e0b1262dc3ea72e29e9a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$method' is probably undefined",
+            "markdown": "Variable '$method' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 775,
+                  "startColumn": 67,
+                  "charOffset": 35864,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$method"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 773,
+                  "startColumn": 1,
+                  "charOffset": 35637,
+                  "charLength": 329,
+                  "snippet": {
+                    "text": "                        $macro = $compilationContext->backend->getFcallManager()->getMacro(false, 1, $paramCount);\n                        $codePrinter->output(\n                            $macro . '(' . $variableCode . ', ' . $method->getInternalName() . $paramsStr . ');'\n                        );\n                    } else {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a1edb73aea69f8f4580c89a8dd0b1ddc28819710095840ec0e105b1b479534f9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableLeft' is probably undefined",
+            "markdown": "Variable '$variableLeft' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 112,
+                  "startColumn": 68,
+                  "charOffset": 4121,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$variableLeft"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 110,
+                  "startColumn": 1,
+                  "charOffset": 3919,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "        if ('variable' == $left->getType() && 'variable' == $right->getType()) {\n            $compilationContext->codePrinter->output(\n                'zephir_concat_function(' . $expectedCode . ', ' . $variableLeft . ', ' . $variableRight . ');'\n            );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a324ee2f9eb371bb0d89fa63e8d1263b68f55d91a4973810c6a2867bd9dd3087"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableLeft' is probably undefined",
+            "markdown": "Variable '$variableLeft' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 106,
+                  "startColumn": 62,
+                  "charOffset": 3843,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$variableLeft"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 104,
+                  "startColumn": 1,
+                  "charOffset": 3649,
+                  "charLength": 268,
+                  "snippet": {
+                    "text": "        if ('variable' == $left->getType() && 'string' == $right->getType()) {\n            $compilationContext->codePrinter->output(\n                'ZEPHIR_CONCAT_VS(' . $expectedCode . ', ' . $variableLeft . ', \"' . $right->getCode() . '\");'\n            );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a69933d2eea5ef3f2a77253cbd0b3e9de6afaa646723b0223d7cfc5fb372b412"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 245,
+                  "startColumn": 62,
+                  "charOffset": 9905,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 243,
+                  "startColumn": 1,
+                  "charOffset": 9747,
+                  "charLength": 235,
+                  "snippet": {
+                    "text": "                case 'array-index-append':\n                    $let = new LetArrayIndexAppend();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aab74018d9c392c78091fcc6f2701731ea6457c5eacf73c39ac200e0cd7ea235"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 199,
+                  "startColumn": 25,
+                  "charOffset": 8146,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 197,
+                  "startColumn": 1,
+                  "charOffset": 8038,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "                        $variable,\n                        $assignment['property'],\n                        $resolvedExpr,\n                        $compilationContext,\n                        $assignment"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b2adbb1592bb01feb1a106c10915635c431ef30b79e77dc0a88c4a1672d29cb5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$parameterVariable' is probably undefined",
+            "markdown": "Variable '$parameterVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 809,
+                  "startColumn": 63,
+                  "charOffset": 27969,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "$parameterVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 807,
+                  "startColumn": 1,
+                  "charOffset": 27844,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "            case 'bool':\n                $codePrinter->output(\n                    $var['name'] . ' = ' . $this->getBoolCode($parameterVariable, $context, false) . ';'\n                );\n                break;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b62800f5808e8062a4d27899f18491191fdfbd9c4db2d552d493a767d5d61b13"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyVariable' is probably undefined",
+            "markdown": "Variable '$keyVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 704,
+                  "startColumn": 36,
+                  "charOffset": 25951,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$keyVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 702,
+                  "startColumn": 1,
+                  "charOffset": 25835,
+                  "charLength": 155,
+                  "snippet": {
+                    "text": "                $keyVariableName = $this->statement['key'];\n            } else {\n                $keyVariableName = $keyVariable->getName();\n            }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b8f2c0ac3e25121092c10d6717f9590f672dde68d465442cf75fe06b4c98d942"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 290,
+                  "startColumn": 62,
+                  "charOffset": 12031,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 288,
+                  "startColumn": 1,
+                  "charOffset": 11866,
+                  "charLength": 242,
+                  "snippet": {
+                    "text": "                case 'dynamic-variable-string':\n                    $let = new LetExportSymbolString();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "badf62250adf4948d0e882a5d86f4231b70b469487c6ddf7295c9adf38a1faed"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 255,
+                  "startColumn": 62,
+                  "charOffset": 10402,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 253,
+                  "startColumn": 1,
+                  "charOffset": 10227,
+                  "charLength": 252,
+                  "snippet": {
+                    "text": "                case 'object-property-array-index':\n                    $let = new LetObjectPropertyArrayIndex();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bb1cfadf3749b484118846c93983be70728d02d371ee32e32923acd593b1cbcf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyVariable' is probably undefined",
+            "markdown": "Variable '$keyVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 205,
+                  "startColumn": 22,
+                  "charOffset": 6716,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$keyVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 203,
+                  "startColumn": 1,
+                  "charOffset": 6629,
+                  "charLength": 295,
+                  "snippet": {
+                    "text": "             */\n            if (isset($this->statement['key'])) {\n                if (!$keyVariable->isTemporal()) {\n                    $detector->setDetectionFlags(WriteDetector::DETECT_ALL);\n                    if ($detector->detect($keyVariable->getName(), $this->statement['statements'])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bfa7cf46701555e0763d5ffa2ae360380c980c26730d56d5878d766e88ef84e1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyVariable' is probably undefined",
+            "markdown": "Variable '$keyVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 602,
+                  "startColumn": 34,
+                  "charOffset": 21546,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$keyVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 600,
+                  "startColumn": 1,
+                  "charOffset": 21466,
+                  "charLength": 124,
+                  "snippet": {
+                    "text": "\n        if (isset($this->statement['key'])) {\n            $codePrinter->output($keyVariable->getName() . '++;');\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c0f7084639f878111424c42ff3c86085ba85a4e83ae03d05400ace630d3ee183"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 285,
+                  "startColumn": 62,
+                  "charOffset": 11788,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 283,
+                  "startColumn": 1,
+                  "charOffset": 11636,
+                  "charLength": 229,
+                  "snippet": {
+                    "text": "                case 'dynamic-variable':\n                    $let = new LetExportSymbol();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c258637910a7c21ce402573aa65a0dbcb483d6b2416e3aa1022ad17f8467ec34"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbolVariable' is probably undefined",
+            "markdown": "Variable '$symbolVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/NativeArrayAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 367,
+                  "startColumn": 29,
+                  "charOffset": 12932,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 365,
+                  "startColumn": 1,
+                  "charOffset": 12825,
+                  "charLength": 276,
+                  "snippet": {
+                    "text": "                    case 'long':\n                        $codePrinter->output(\n                            $symbolVariable->getName(\n                            ) . ' = ZEPHIR_STRING_OFFSET(' . $variableCode . ', ' . $variableIndex->getName() . ');'\n                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c44c6d368bef3354c67b79a3a0619909a3821e2ff776c30623f0c52dca56d710"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$references' is probably undefined",
+            "markdown": "Variable '$references' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 580,
+                  "startColumn": 23,
+                  "charOffset": 25711,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$references"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 578,
+                  "startColumn": 1,
+                  "charOffset": 25673,
+                  "charLength": 169,
+                  "snippet": {
+                    "text": "            );\n\n            if (count($references)) {\n                foreach ($params as $position => $param) {\n                    if (isset($references[$position])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c522df1d348644fe1922b69bc4bab8d77e854ce6e6dcda9f7cb9467740a3ce16"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyVariable' is probably undefined",
+            "markdown": "Variable '$keyVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 886,
+                  "startColumn": 19,
+                  "charOffset": 32222,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$keyVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 884,
+                  "startColumn": 1,
+                  "charOffset": 32149,
+                  "charLength": 163,
+                  "snippet": {
+                    "text": "            $codePrinter->output(\n                \"\\t\"\n                . $keyVariable->getName()\n                . ' = '\n                . $tempVariable->getName()"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c526828167f6d64458ff538258992805abd639a4475ecb7adbbc1dbfd5e3b058"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyVariable' is probably undefined",
+            "markdown": "Variable '$keyVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 216,
+                  "startColumn": 46,
+                  "charOffset": 7160,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$keyVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 214,
+                  "startColumn": 1,
+                  "charOffset": 7036,
+                  "charLength": 236,
+                  "snippet": {
+                    "text": "        $compilationContext->backend->forStatement(\n            $exprVariable,\n            isset($this->statement['key']) ? $keyVariable : null,\n            isset($this->statement['value']) ? $variable : null,\n            $duplicateKey,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c844049d7f2fbf459ff38af30da6c3f4b138ee13d484ba01a21505b3bd558d80"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$functionName' is probably undefined",
+            "markdown": "Variable '$functionName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 150,
+                  "startColumn": 29,
+                  "charOffset": 4948,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$functionName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 148,
+                  "startColumn": 1,
+                  "charOffset": 4847,
+                  "charLength": 303,
+                  "snippet": {
+                    "text": "                        );\n                        $codePrinter->output(\n                            $functionName . '(' . $context->backend->getVariableCode(\n                                $tempVariable\n                            ) . ', ' . $context->backend->getVariableCode($resolvedVariable) . ')'"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c91038888f8e1926db97be376b45fef59e390a72c0852d22be3c805de7f0f0af"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$methodName' is probably undefined",
+            "markdown": "Variable '$methodName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 189,
+                  "startColumn": 47,
+                  "charOffset": 6547,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$methodName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 187,
+                  "startColumn": 1,
+                  "charOffset": 6470,
+                  "charLength": 151,
+                  "snippet": {
+                    "text": "            }\n        } else {\n            return $builtInType->invokeMethod($methodName, $caller, $compilationContext, $this, $expression);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cf7a62107a30e72f731c4f3ad2100e94952854f425e0d1d88077eabfc5c1ebf3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 240,
+                  "startColumn": 62,
+                  "charOffset": 9669,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 238,
+                  "startColumn": 1,
+                  "charOffset": 9524,
+                  "charLength": 222,
+                  "snippet": {
+                    "text": "                case 'array-index':\n                    $let = new LetArrayIndex();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cfda1ccfa56a03d8d43e69651c89f80dc4302a7b6e9258851fe260ebd20851fd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 442,
+                  "startColumn": 51,
+                  "charOffset": 14575,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 440,
+                  "startColumn": 1,
+                  "charOffset": 14461,
+                  "charLength": 213,
+                  "snippet": {
+                    "text": "                    }\n                    $codePrinter->output(\n                        'ZEPHIR_CALL_FUNCTION(' . $symbol . ', \"' . $funcName . '\", ' . $cachePointer . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d6decf687136b647bf6a4294ed26dcc1a6d88b08ef1489e3ffd6aa8bcd73c13d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 612,
+                  "startColumn": 52,
+                  "charOffset": 24194,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 610,
+                  "startColumn": 1,
+                  "charOffset": 24056,
+                  "charLength": 260,
+                  "snippet": {
+                    "text": "                } else {\n                    $compilationContext->codePrinter->output(\n                        'ZEPHIR_CALL_CE_STATIC(' . $symbol . ', ' . $classEntry . ', \"' . $methodName . '\", ' . $cachePointer . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "da1f3ba969f54c2fed5ad1354c6b0a88192ae92023d6cdd4e8efd19a38c0603d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 466,
+                  "startColumn": 43,
+                  "charOffset": 15739,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 464,
+                  "startColumn": 1,
+                  "charOffset": 15561,
+                  "charLength": 296,
+                  "snippet": {
+                    "text": "                    $codePrinter->output(\n                        strtr('ZEPHIR_CALL_FUNCTION(:symbol, \":func\", :pointer, :params);', [\n                            ':symbol'  => $symbol,\n                            ':func'    => $funcName,\n                            ':pointer' => $cachePointer,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dcae8241fb864acb6089bbf75e1fcd422a45124474b8b1c4f9ad6177667fd31f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classDefinition' is probably undefined",
+            "markdown": "Variable '$classDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 272,
+                  "startColumn": 21,
+                  "charOffset": 10952,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 270,
+                  "startColumn": 1,
+                  "charOffset": 10847,
+                  "charLength": 214,
+                  "snippet": {
+                    "text": "                if (\n                    in_array($className, ['self', 'static']) ||\n                    $classDefinition == $compilationContext->classDefinition\n                ) {\n                    $this->call("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "deda8997a44648b98c33ca9d1d65b0c28029c9821735e09467cc29bb16be11ad"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 702,
+                  "startColumn": 57,
+                  "charOffset": 27907,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 700,
+                  "startColumn": 1,
+                  "charOffset": 27764,
+                  "charLength": 289,
+                  "snippet": {
+                    "text": "                } else {\n                    $compilationContext->codePrinter->output(\n                        'ZEPHIR_CALL_CE_STATIC_ZVAL(' . $symbol . ', ' . $classEntry . ', ' . $methodNameVariable->getName(\n                        ) . ', ' . $cachePointer . ');'\n                    );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e2fc4b39ca95dc33bdef5f095e769b550cf7d5587cee994f13b403b88e66c6b9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$indexVariable' is probably undefined",
+            "markdown": "Variable '$indexVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 321,
+                  "startColumn": 17,
+                  "charOffset": 10460,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$indexVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 319,
+                  "startColumn": 1,
+                  "charOffset": 10433,
+                  "charLength": 110,
+                  "snippet": {
+                    "text": "        }\n\n        switch ($indexVariable->getType()) {\n            case 'variable':\n            case 'mixed':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e4f00810a352c41fdb366eb9383c608e37a3eb6be6bd7b3fa1a3c7853b923ed9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableVariable' is probably undefined",
+            "markdown": "Variable '$variableVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 809,
+                  "startColumn": 21,
+                  "charOffset": 37368,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$variableVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 807,
+                  "startColumn": 1,
+                  "charOffset": 37231,
+                  "charLength": 227,
+                  "snippet": {
+                    "text": "                $compilationContext->backend->callMethod(\n                    $isExpecting ? $symbolVariable : null,\n                    $variableVariable,\n                    $variableMethod,\n                    $cachePointer,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e675f1e09fc76d74fa0df5100fbab3148325a5bb4cef32b913bd7005d8f4cfd6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$currentClassDefinition' is probably undefined",
+            "markdown": "Variable '$currentClassDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 292,
+                  "startColumn": 29,
+                  "charOffset": 11760,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "$currentClassDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 290,
+                  "startColumn": 1,
+                  "charOffset": 11651,
+                  "charLength": 226,
+                  "snippet": {
+                    "text": "                            $mustInit,\n                            $isExpecting,\n                            $currentClassDefinition,\n                            $compilationContext,\n                            $method ?? null"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e6e3c7c2a1a7b923e59cb9f2aad58067d97294934b24ef0b90ec46ed989e979f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableVariable' is probably undefined",
+            "markdown": "Variable '$variableVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 201,
+                  "startColumn": 27,
+                  "charOffset": 6935,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "$variableVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 199,
+                  "startColumn": 1,
+                  "charOffset": 6855,
+                  "charLength": 253,
+                  "snippet": {
+                    "text": "         */\n        if (self::CALL_NORMAL == $type) {\n            if ('this' == $variableVariable->getRealName()) {\n                $classDefinition = $compilationContext->classDefinition;\n                if (!$classDefinition->hasMethod($methodName)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e8531e2492e48078847d786730149bade471a4a948676e68bfcfaabf5c19a4da"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$variableRight' is probably undefined",
+            "markdown": "Variable '$variableRight' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 112,
+                  "startColumn": 91,
+                  "charOffset": 4144,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$variableRight"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 110,
+                  "startColumn": 1,
+                  "charOffset": 3919,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "        if ('variable' == $left->getType() && 'variable' == $right->getType()) {\n            $compilationContext->codePrinter->output(\n                'zephir_concat_function(' . $expectedCode . ', ' . $variableLeft . ', ' . $variableRight . ');'\n            );\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ed25aa7c0f853434204e5f094732392e7fead749a81dd34419fe98a79146f120"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbolVariable' is probably undefined",
+            "markdown": "Variable '$symbolVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 111,
+                  "startColumn": 13,
+                  "charOffset": 3741,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "$symbolVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 109,
+                  "startColumn": 1,
+                  "charOffset": 3646,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "         * Variable that receives a property value must be polymorphic\n         */\n        if ($symbolVariable && !$symbolVariable->isVariable()) {\n            throw new CompilerException(\n                'Cannot use variable: '"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "efda358bbdd210437ddfc46740deb62ca1d69de7ad89b0b5f2b255433eb21732"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$symbol' is probably undefined",
+            "markdown": "Variable '$symbol' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 558,
+                  "startColumn": 52,
+                  "charOffset": 22117,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "$symbol"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 556,
+                  "startColumn": 1,
+                  "charOffset": 21999,
+                  "charLength": 253,
+                  "snippet": {
+                    "text": "                } else {\n                    $codePrinter->output(\n                        'ZEPHIR_CALL_CE_STATIC(' . $symbol . ', ' . $classEntry . ', \"' . $methodName . '\", ' . $cachePointer . $paramsStr . ');'\n                    );\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f075606a0535243fe1394f218c3f050fa65479869a99161fb0c89164a944b29a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$parameterCode' is probably undefined",
+            "markdown": "Variable '$parameterCode' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 805,
+                  "startColumn": 79,
+                  "charOffset": 27796,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "$parameterCode"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 803,
+                  "startColumn": 1,
+                  "charOffset": 27670,
+                  "charLength": 198,
+                  "snippet": {
+                    "text": "                break;\n            case 'uint':\n                $codePrinter->output($var['name'] . ' = ZEND_ABS(Z_LVAL_P(' . $parameterCode . '));');\n                break;\n            case 'bool':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f488c8dffd90f907bf6408887bf01ac25e8d9e2870e3c9ac02a4e1295dc462f9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$methodName' is probably undefined",
+            "markdown": "Variable '$methodName' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/MethodCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 353,
+                  "startColumn": 66,
+                  "charOffset": 14635,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "$methodName"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 351,
+                  "startColumn": 1,
+                  "charOffset": 14535,
+                  "charLength": 262,
+                  "snippet": {
+                    "text": "                                }\n\n                                if (!$classDefinition->hasMethod($methodName)) {\n                                    if (!$classDefinition->isInterface()) {\n                                        if (1 == count($classTypes)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f5b92092a6900c3eba81dbe9ed567d9b807db957e009b06641ed355af5042ee7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$resolvedExpr' is probably undefined",
+            "markdown": "Variable '$resolvedExpr' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 210,
+                  "startColumn": 25,
+                  "charOffset": 8546,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "$resolvedExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 208,
+                  "startColumn": 1,
+                  "charOffset": 8438,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "                        $variable,\n                        $assignment['property'],\n                        $resolvedExpr,\n                        $compilationContext,\n                        $assignment"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f60f20ee49cf94c5e68af6c1f277ef493099e6a8e604cf6455d5e622d8f25d95"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$keyVariable' is probably undefined",
+            "markdown": "Variable '$keyVariable' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/ForStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 710,
+                  "startColumn": 54,
+                  "charOffset": 26148,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "$keyVariable"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 708,
+                  "startColumn": 1,
+                  "charOffset": 26007,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "             * Create an implicit 'let' operation, TODO: use a builder.\n             */\n            $this->getLetStatement($keyVariableName, $keyVariable, $compilationContext);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fa4f5264a57eef70659a4ffd278eadaf450dc87f0e1d7c64e6ec0464b40596a2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$classDefinition' is probably undefined",
+            "markdown": "Variable '$classDefinition' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/StaticPropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 88,
+                  "startColumn": 13,
+                  "charOffset": 2938,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "$classDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 86,
+                  "startColumn": 1,
+                  "charOffset": 2887,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "\n        $this->checkClassHasProperty(\n            $classDefinition,\n            $property,\n            $expression"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fcdcb750baca3e6a8ec60f01acb1d9c44131dc71e5a98ea3114c56c027ff1f67"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUndefinedVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Variable '$className' is probably undefined",
+            "markdown": "Variable '$className' is probably undefined"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 271,
+                  "startColumn": 30,
+                  "charOffset": 10897,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "$className"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 269,
+                  "startColumn": 1,
+                  "charOffset": 10826,
+                  "charLength": 202,
+                  "snippet": {
+                    "text": "            } else {\n                if (\n                    in_array($className, ['self', 'static']) ||\n                    $classDefinition == $compilationContext->classDefinition\n                ) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fe752e12cb70279b252e8f2d77a88ea56fb68565cfbe47409bcb53cd57472cab"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 28,
+                  "charOffset": 1657,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1535,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "058204ac99ecb9dc4d28d140a8420642069a1b4bf7fda28ad914906e7c3cda3d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarDumpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 34,
+                  "charOffset": 1085,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "getResolvedParamsAsExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 992,
+                  "charLength": 222,
+                  "snippet": {
+                    "text": "\n        $context->headersManager->add('kernel/variables');\n        $resolvedParams = $call->getResolvedParamsAsExpr($expression['parameters'], $context, $expression);\n\n        foreach ($resolvedParams as $resolvedParam) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "05a8d5a6510b4a7afa7207bb3e66385b09cd6e03e75d105ea7dc6b148fc206ec"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ImplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 34,
+                  "charOffset": 1639,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1595,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "06e1cb9a56a9747c1e481a8fc0d8cf13d9a9e6574b7135e0e3decf0d73778ebf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 58,
+                  "startColumn": 51,
+                  "charOffset": 1632,
+                  "charLength": 26,
+                  "snippet": {
+                    "text": "getInternalClassDefinition"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 56,
+                  "startColumn": 1,
+                  "charOffset": 1500,
+                  "charLength": 301,
+                  "snippet": {
+                    "text": "            } else {\n                if ($compiler->isBundledClass($className)) {\n                    $classDefinition = $compiler->getInternalClassDefinition($className);\n                } else {\n                    throw new CompilerException(\"Cannot locate class '\" . $className . \"'\", $statement);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "09e9f833b6f8f6d81b218a938156602470b3d5e504b0f987f1692dcefe758f7c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/WhileStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 18,
+                  "charOffset": 1688,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1569,
+                  "charLength": 159,
+                  "snippet": {
+                    "text": "            $st = new StatementsBlock($this->statement['statements']);\n            $st->isLoop(true);\n            $st->compile($compilationContext);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0b421468e713b77d1449a6159e2f5ddcf8b0d884855a5372e678e67a993078ff"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 183,
+                  "startColumn": 27,
+                  "charOffset": 7407,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "assign"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 181,
+                  "startColumn": 1,
+                  "charOffset": 7261,
+                  "charLength": 258,
+                  "snippet": {
+                    "text": "                case 'string-dynamic-object-property':\n                    $let = new LetObjectDynamicStringProperty();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "11b20f79d12f094f67173ec61d9175221610057160f171e8c399aa2d67d9230e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 148,
+                  "startColumn": 37,
+                  "charOffset": 4953,
+                  "charLength": 20,
+                  "snippet": {
+                    "text": "getOffsetExpressions"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 146,
+                  "startColumn": 1,
+                  "charOffset": 4810,
+                  "charLength": 268,
+                  "snippet": {
+                    "text": "         */\n        $variableExpr      = $this->_getResolvedArrayItem($resolvedExpr, $compilationContext);\n        $offsetExpressions = $this->getOffsetExpressions($statement, $compilationContext);\n\n        $compilationContext->backend->assignStaticPropertyArrayMulti("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "16eb566ef243ac343596d303a38c33025e9671488e858470a5901aabf42b26cd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GettypeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 34,
+                  "charOffset": 1473,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1387,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1a078e8e830a6354c63a69d20fae3db4b156ce2bfd6989b63c8dae8d1fee365d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileGetContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 34,
+                  "charOffset": 1501,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1398,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1caa4574958733f04eed7b381c4f704ca000d3880cb7edb83ab92479473ee0e2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/StubsCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 66,
+                  "startColumn": 30,
+                  "charOffset": 1625,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "stubs"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 64,
+                  "startColumn": 1,
+                  "charOffset": 1524,
+                  "charLength": 210,
+                  "snippet": {
+                    "text": "        try {\n            // TODO: Move all the stuff from the compiler\n            $this->compiler->stubs();\n        } catch (ExceptionInterface $e) {\n            $io->getErrorStyle()->error($e->getMessage());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1f2c791ec494039c167530b9a76970b11f0ed9bb4807528725d4034b1db78c62"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 32,
+                  "charOffset": 1239,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1117,
+                  "charLength": 196,
+                  "snippet": {
+                    "text": "        $expr = new Expression($propertyAccess['left']);\n        $expr->setReadOnly(true);\n        $exprVariable = $expr->compile($compilationContext);\n\n        switch ($exprVariable->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1fc001e56de0b7a308d5e13cba24c05d2ed5a2840aaa49c746e42fc6fc437c06"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/LdexpOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 34,
+                  "charOffset": 1334,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1290,
+                  "charLength": 131,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "20965cc8028d754493534d478227ddf13dafc5dcd12050b9e7ae8b6474433619"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 34,
+                  "charOffset": 1490,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1404,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "22786f7db32e67d8268194b1bb76a0af7a34a476b49c806b461501665bf5ecc1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 178,
+                  "startColumn": 27,
+                  "charOffset": 7148,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "assign"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 176,
+                  "startColumn": 1,
+                  "charOffset": 7006,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "                case 'variable-dynamic-object-property':\n                    $let = new LetObjectDynamicProperty();\n                    $let->assign($variable, $symbolVariable, $resolvedExpr, $compilationContext, $assignment);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2354e112f8ae2b75b2108db12fcc0ed2ad87b201e429397dab0def24cf67a82b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 229,
+                  "startColumn": 27,
+                  "charOffset": 9255,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "assignStatic"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 227,
+                  "startColumn": 1,
+                  "charOffset": 9102,
+                  "charLength": 250,
+                  "snippet": {
+                    "text": "                case 'static-property-array-index-append':\n                    $let = new LetStaticPropertyArrayIndexAppend();\n                    $let->assignStatic(\n                        $variable,\n                        $assignment['property'],"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "25a1a0c3d8e0eb07408d9e02c353fb09ef945c7854e1341b22b2473b4bfb1de8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsScalarOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 34,
+                  "charOffset": 1140,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1096,
+                  "charLength": 229,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('bool', 'zephir_is_scalar(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "28740837148a65f64e8d2b5f79d41efd1cd8c92dbd4c1956dddf2dc21b1b824b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/VarExportOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 34,
+                  "charOffset": 1410,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "getResolvedParamsAsExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1317,
+                  "charLength": 214,
+                  "snippet": {
+                    "text": "\n        $context->headersManager->add('kernel/variables');\n        $resolvedParams = $call->getResolvedParamsAsExpr($expression['parameters'], $context, $expression);\n        $resolvedParam  = $resolvedParams[0];\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2ada072364cfb791004c1573423768a848c1dd1b913bc91583766b9a01d7e684"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 218,
+                  "startColumn": 72,
+                  "charOffset": 9117,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 216,
+                  "startColumn": 1,
+                  "charOffset": 8987,
+                  "charLength": 286,
+                  "snippet": {
+                    "text": "                $exprVariableProperty->setReadOnly(true);\n\n                $exprCompiledVariableProperty = $exprVariableProperty->compile($compilationContext);\n                if ('variable' != $exprCompiledVariableProperty->getType()) {\n                    throw new CompilerException("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2bf62575669ae07c93a6d3637501066125593bde2dcd0eee412635e9df9c6ffa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/CloneOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 44,
+                  "startColumn": 48,
+                  "charOffset": 1133,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 42,
+                  "startColumn": 1,
+                  "charOffset": 1039,
+                  "charLength": 227,
+                  "snippet": {
+                    "text": "        $exprVariable->setExpectReturn(true);\n\n        $exprCompiledVariable = $exprVariable->compile($compilationContext);\n        if ('variable' !== $exprCompiledVariable->getType()) {\n            throw new CompilerException("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2cdc30b7ca3a71c262494497a75e007183ad570a4447db407702e3d7c96ed609"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 77,
+                  "startColumn": 25,
+                  "charOffset": 2101,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "throw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 75,
+                  "startColumn": 1,
+                  "charOffset": 1938,
+                  "charLength": 265,
+                  "snippet": {
+                    "text": "                    $extThemePath = $documentation->findThemePathByName($themeInfos['extends']);\n                    if (!$extThemePath) {\n                        throw new Exception('Unable to find extended theme ' . $themeInfos['extends']);\n                    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2d2a7db807c49b413723940c652eb553ec37f6ff0042787dbf83e66d4b4e5b7d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/PrepareVirtualPathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 34,
+                  "charOffset": 1510,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1407,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2f6e74335946d391cefbf16bde0d5bca3c143691ba2fcd61878fa0cac9f79bfd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Expression/PropertyDynamicAccess.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 32,
+                  "charOffset": 1246,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 1149,
+                  "charLength": 171,
+                  "snippet": {
+                    "text": "\n        $expr         = new Expression($propertyAccess['left']);\n        $exprVariable = $expr->compile($compilationContext);\n\n        switch ($exprVariable->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "311462ae10ec57fbad7e8ea7237feae1e19f1562a2ac7170daa30bf50bee00b2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MemstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 54,
+                  "startColumn": 34,
+                  "charOffset": 1331,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 52,
+                  "startColumn": 1,
+                  "charOffset": 1287,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $context->headersManager->add('kernel/string');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "31dc7a6612aeb3949b8b5a3bc889a672134a8dd11c4af68c42b5b7e3366bed99"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 96,
+                  "startColumn": 56,
+                  "charOffset": 3386,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 94,
+                  "startColumn": 1,
+                  "charOffset": 3282,
+                  "charLength": 252,
+                  "snippet": {
+                    "text": "                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "33c05e1f70539f80e51c3f7121505dbd962938a77f6e479a67ef2728ddc20f9b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateArrayOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 66,
+                  "startColumn": 38,
+                  "charOffset": 1788,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 64,
+                  "startColumn": 1,
+                  "charOffset": 1702,
+                  "charLength": 215,
+                  "snippet": {
+                    "text": "\n        if (isset($expression['parameters'])) {\n            $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        } else {\n            $resolvedParams = null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3593ae7217d7fbfd64da8c50c30150e05f32b328c49a44cf4fa9c0529fe65b2e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FeofOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 34,
+                  "charOffset": 1122,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1034,
+                  "charLength": 268,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/file');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('bool', 'zephir_feof(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3688fb9d2e3b49ae006777be350b80568a75c48a38dd78045023bc04099a75c0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 62,
+                  "startColumn": 34,
+                  "charOffset": 1538,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 60,
+                  "startColumn": 1,
+                  "charOffset": 1452,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38a419d9bddd3ad976b6924b47aa4ab6488403dfc8f50299adebb51fc434df04"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/SubstrOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 34,
+                  "charOffset": 1306,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1230,
+                  "charLength": 213,
+                  "snippet": {
+                    "text": "         * Process parameters.\n         */\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $params         = [];\n        $flags          = '0';"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3c02a6232c7806cf7b47b2db552c31a13e11040da857f995beff4bf381aa680d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 340,
+                  "startColumn": 28,
+                  "charOffset": 11005,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "compileClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 338,
+                  "startColumn": 1,
+                  "charOffset": 10921,
+                  "charLength": 146,
+                  "snippet": {
+                    "text": "                    }\n                    $class = true;\n                    $this->compileClass($compilationContext);\n                    break;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "45374465a7bd8b9c874642063aa282a0163b1ecf1c3742a87268eb4604fb4312"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/ApiCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 96,
+                  "startColumn": 26,
+                  "charOffset": 2736,
+                  "charLength": 3,
+                  "snippet": {
+                    "text": "api"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 94,
+                  "startColumn": 1,
+                  "charOffset": 2656,
+                  "charLength": 113,
+                  "snippet": {
+                    "text": "\n        // TODO: Move all the stuff from the compiler\n        $this->compiler->api($options);\n\n        return 0;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "46965dd234931b9ca280b677d75e7b4fedd67c136a3bb872139662ef1a1b0fc2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 451,
+                  "startColumn": 30,
+                  "charOffset": 14753,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 449,
+                  "startColumn": 1,
+                  "charOffset": 14571,
+                  "charLength": 287,
+                  "snippet": {
+                    "text": "        $codePrinter = $compilationContext->codePrinter;\n        $codePrinter->output('PHP_FUNCTION(' . $functionDefinition->getInternalName() . ') {');\n        $functionDefinition->compile($compilationContext);\n        $codePrinter->output('}');\n        $codePrinter->outputBlankLine();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "489ad3044c2063744931368ea177e4952c0cb251a32f1ad3d3fb2a0fa66eda1b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/RoundOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 34,
+                  "charOffset": 1602,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1463,
+                  "charLength": 290,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/math');\n        $symbolVariable->setDynamicTypes('double');\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "49f2b07d45334ac67b04c2a3f85e8cc71f35d03dffc070a71b123c7c71ed8d3b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 28,
+                  "charOffset": 1425,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1303,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4a79841715a69be86ea716df97df18911568c984cd989ab764d924965348a866"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonDecodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 34,
+                  "charOffset": 1475,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1385,
+                  "charLength": 178,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4ca8ecd1b0adb525321cf823250d60be79fedef690039b61efa5d448e3a2d8b8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CallUserFuncOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 67,
+                  "startColumn": 34,
+                  "charOffset": 1760,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 65,
+                  "startColumn": 1,
+                  "charOffset": 1682,
+                  "charLength": 165,
+                  "snippet": {
+                    "text": "        $call->addCallStatusFlag($context);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4dfa41e1d349556bc19e0b5240684aa90de0caef2c4662d882159564abfadf76"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Bitwise/BitwiseBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 30,
+                  "charOffset": 1583,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1456,
+                  "charLength": 193,
+                  "snippet": {
+                    "text": "        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        switch ($left->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4e266bcaef1f10a638f3ac88a9b60e0bf0366a22127e70b2b145eea750ea6278"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IntvalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1213,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1120,
+                  "charLength": 279,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/operators');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('long', 'zephir_get_intval(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "50276403c48223d799a02f2c0e5d8dd1fc2fcbc280752723141b1af00826ec68"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FuncGetArgOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 67,
+                  "startColumn": 34,
+                  "charOffset": 1852,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 65,
+                  "startColumn": 1,
+                  "charOffset": 1747,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "        $symbol = $context->backend->getVariableCode($symbolVariable);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        // zephir_get_intval"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "50f3f4c97d2eacfde436307cc141c34a271b81ab339e1dc85870dff0f2724dc7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/HashEqualsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 34,
+                  "charOffset": 1562,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1486,
+                  "charLength": 227,
+                  "snippet": {
+                    "text": "         * Process parameters.\n         */\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "53c08feae57a9e4cb8f15249fab969705c5dd39260cf520e550fc7dc0bc97854"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1183,
+                  "startColumn": 23,
+                  "charOffset": 40914,
+                  "charLength": 6,
+                  "snippet": {
+                    "text": "render"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1181,
+                  "startColumn": 1,
+                  "charOffset": 40848,
+                  "charLength": 109,
+                  "snippet": {
+                    "text": "            $argInfo->setRichFormat(true);\n\n            $argInfo->render();\n\n            /** Generate FE's */"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "56cb72e2d8f585b38be38decf801d1c7f0596a21129d65c2b83d2a0d0d5303ce"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/TryCatchStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 139,
+                  "startColumn": 27,
+                  "charOffset": 5403,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 137,
+                  "startColumn": 1,
+                  "charOffset": 5311,
+                  "charLength": 165,
+                  "snippet": {
+                    "text": "\n            $ifStatement = new IfStatement($primaryIf->build());\n            $ifStatement->compile($compilationContext);\n\n            $codePrinter->decreaseLevel();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "56de6bc280bec8c99087cf322c3b9c38d86dc2858a87a293cdd86ceb6baa5239"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "zephir",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 73,
+                  "startColumn": 9,
+                  "charOffset": 1926,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "throw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 71,
+                  "startColumn": 1,
+                  "charOffset": 1803,
+                  "charLength": 201,
+                  "snippet": {
+                    "text": "set_error_handler(static function ($code, $message, $file = '', $line = -1) {\n    if (error_reporting() & $code) {\n        throw new ErrorException($message, 0, $code, (string) $file, $line);\n    }\n});"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "57049d4ad6949911927e80a0bd59c5e6cda2a6d83c49cbb10941a536db0c4ead"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ModOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 38,
+                  "startColumn": 34,
+                  "charOffset": 980,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "preCompileChecks"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 36,
+                  "startColumn": 1,
+                  "charOffset": 860,
+                  "charLength": 208,
+                  "snippet": {
+                    "text": "    public function compile($expression, CompilationContext $compilationContext)\n    {\n        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);\n\n        switch ($left->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5f01d5bfac1062c2f88d9f0480160ba4b6fc6c99bcc73f6460769363e0c200dd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrtoupperOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 64,
+                  "startColumn": 34,
+                  "charOffset": 1652,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 62,
+                  "startColumn": 1,
+                  "charOffset": 1563,
+                  "charLength": 176,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes($this->type);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5f4e2d050822d7398495511790e7e83662c51453db425e8ef5dc3a2e8bfbfa25"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 16,
+                  "charOffset": 1494,
+                  "charLength": 33,
+                  "snippet": {
+                    "text": "_assignPropertyArrayMultipleIndex"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1468,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "        }\n\n        $this->_assignPropertyArrayMultipleIndex($symbolVariable, $resolvedExpr, $compilationContext, $statement);\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "60b153fd754ba67223569d26ab804ccad663a5bb26c0ee12de6d13cb7198551a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrposOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 59,
+                  "startColumn": 34,
+                  "charOffset": 1541,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 57,
+                  "startColumn": 1,
+                  "charOffset": 1497,
+                  "charLength": 226,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if (count($resolvedParams) >= 3) {\n            $context->headersManager->add('kernel/operators');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "63996e6c383cab231737851ac86ddbd927933783c61122633c3ab07ff66c67b6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniqueKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 23,
+                  "charOffset": 1333,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "processOptimizer"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1204,
+                  "charLength": 183,
+                  "snippet": {
+                    "text": "            throw new CompilerException(\"'unique_key' only accepts two parameter\", $expression);\n        }\n        return $this->processOptimizer($call, $context, $expression);\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6516af273098651b31363391a4ab13b379ceb9a06ac469b8711f2976a5fe290c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Logical/LogicalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 35,
+                  "startColumn": 28,
+                  "charOffset": 990,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 33,
+                  "startColumn": 1,
+                  "charOffset": 857,
+                  "charLength": 222,
+                  "snippet": {
+                    "text": "        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly($this->readOnly);\n        $left = $leftExpr->compile($compilationContext);\n\n        $rightExpr = new Expression($expression['right']);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "66a01edf1b73634b7ee8c457b3c146595b5296b3ab7f13bf77978f9ddaa0b829"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/RequireStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 16,
+                  "charOffset": 1134,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1035,
+                  "charLength": 136,
+                  "snippet": {
+                    "text": "        $expr = new Expression($expression);\n        $expr->setExpectReturn(false);\n        $expr->compile($compilationContext);\n    }\n}"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "66d24236a3b476cfa7383872998df5a6712bc2804cb46098133fe98cf5036e9b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/EmptyOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 46,
+                  "startColumn": 28,
+                  "charOffset": 1237,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 44,
+                  "startColumn": 1,
+                  "charOffset": 1115,
+                  "charLength": 229,
+                  "snippet": {
+                    "text": "        $leftExpr = new Expression($expression['left']);\n        $leftExpr->setReadOnly(true);\n        $left = $leftExpr->compile($compilationContext);\n\n        if ('variable' != $left->getType() && 'array' != $left->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "674d8bd06a8bab8ac747e2f50b62ca964e688c43948238ffd68909d9ed86b561"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 191,
+                  "startColumn": 36,
+                  "charOffset": 5765,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 189,
+                  "startColumn": 1,
+                  "charOffset": 5649,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "    ): void {\n        $expression = new Expression($statement['index-expr'][0]);\n        $exprIndex  = $expression->compile($compilationContext);\n\n        switch ($exprIndex->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "709e41f3f2238bd805a27a0c4d2cf0471ec56f0aa04ac1f051047da649493c38"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 16,
+                  "charOffset": 1105,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "getResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1040,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "         * Resolve parameters as vars\n         */\n        $call->getResolvedParams($expression['parameters'], $context, $expression);\n        /**\n         * Get CompiledExpression(s) for resolved var(s)."
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7366a19ea8240f6a71ee8011fce677ebac2e64d274baf61dc3939df8e5d8eef6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 218,
+                  "startColumn": 27,
+                  "charOffset": 8833,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "assignStatic"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 216,
+                  "startColumn": 1,
+                  "charOffset": 8693,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "                case 'static-property-array-index':\n                    $let = new LetStaticPropertyArrayIndex();\n                    $let->assignStatic(\n                        $variable,\n                        $assignment['property'],"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "73905fcc489be20164137b34e6b77d95f9fd90ad3ee09e4f564f7a1c9c061779"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsCallableOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 34,
+                  "charOffset": 1086,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 1042,
+                  "charLength": 231,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('bool', 'zephir_is_callable(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "74b8b25b119cad6f2420964fc0da05e63b20f16bca79623f58117df39f64baa9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 74,
+                  "startColumn": 24,
+                  "charOffset": 1592,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "getTemplatePath"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 72,
+                  "startColumn": 1,
+                  "charOffset": 1530,
+                  "charLength": 138,
+                  "snippet": {
+                    "text": "            $$name = $value;\n        }\n        $path = $this->getTemplatePath($this->template);\n        ob_start();\n        include $path;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "75892121ae31ed20c6a8e24a48e48437f6cc5da107ea6b45446d57820e6b1148"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 128,
+                  "startColumn": 39,
+                  "charOffset": 3811,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 126,
+                  "startColumn": 1,
+                  "charOffset": 3675,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "            $expression = new Expression($indexExpr);\n            $expression->setReadOnly(true);\n            $exprIndex = $expression->compile($compilationContext);\n\n            switch ($exprIndex->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7c94c635fcc2b334f5ade983a98fe12112ffa6fea81093fdfcc879ef8139a4ab"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/UniquePathKeyOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 34,
+                  "charOffset": 1647,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1559,
+                  "charLength": 236,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/file');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7e24a202af0b0f444009c6a16fcb0f1565ac495c413ec674a49f34ba6a222213"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 291,
+                  "startColumn": 33,
+                  "charOffset": 11085,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 289,
+                  "startColumn": 1,
+                  "charOffset": 11038,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "            }\n\n            return $expression->compile($context);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $expression->getExpression());"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7ea1954cc8fc4676861cbfdfd23a073c2b7ee0d00771e146213f4e4d4a324e45"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrlenOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 34,
+                  "charOffset": 1130,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1040,
+                  "charLength": 279,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('int', 'zephir_fast_strlen_ev(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7f067130abd2543d7ab798cee2524810d7847b63935758de5e7029963e8e15e6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StrReplaceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 65,
+                  "startColumn": 34,
+                  "charOffset": 1715,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 63,
+                  "startColumn": 1,
+                  "charOffset": 1629,
+                  "charLength": 210,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8078f79741e86903114a771c0d0b286de85650fe00b0d4584fe29545b17e819e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 128,
+                  "startColumn": 40,
+                  "charOffset": 4963,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 126,
+                  "startColumn": 1,
+                  "charOffset": 4842,
+                  "charLength": 221,
+                  "snippet": {
+                    "text": "                $expr->setReadOnly(true);\n                $expr->setNoisy(false);\n                $resolvedExpr = $expr->compile($compilationContext);\n\n                return $compilationContext->backend->arrayIssetFetch("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "81b59ea5b44cdcbff77fde8778f43a8740c1219b112969d624654815bcc95927"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CountOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 47,
+                  "startColumn": 34,
+                  "charOffset": 1070,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 45,
+                  "startColumn": 1,
+                  "charOffset": 1026,
+                  "charLength": 233,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('int', 'zephir_fast_count_int(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8429543d977fdba668eb125e00ccfe0e6a1553697edccfbc34466e2fafe18e8c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/NewInstanceTypeOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 33,
+                  "charOffset": 2284,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 2237,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "\n        try {\n            return $expression->compile($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $expression, $e->getCode(), $e);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8875b706acdb41a206c2a875a2a761727ca06c201816d39d115f7590d5cf48bf"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 180,
+                  "startColumn": 46,
+                  "charOffset": 5307,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 178,
+                  "startColumn": 1,
+                  "charOffset": 5178,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "         */\n        $indexExpression = new Expression($statement['index-expr'][0]);\n        $resolvedIndex   = $indexExpression->compile($compilationContext);\n\n        switch ($resolvedIndex->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "88fd1ead2bae802e8bf788a58c13fba12e898009ddac3e94beb8fe201a6c6351"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ClassExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 50,
+                  "startColumn": 34,
+                  "charOffset": 1231,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 48,
+                  "startColumn": 1,
+                  "charOffset": 1187,
+                  "charLength": 132,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8c582779566eeab9ce7afaa2610c23ccc94bb2b2eb759b2b16452a52341de06b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ArrayKeysOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 64,
+                  "startColumn": 34,
+                  "charOffset": 1582,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 62,
+                  "startColumn": 1,
+                  "charOffset": 1497,
+                  "charLength": 236,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('array');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8ed24cccee92d65966c5fca21c9f398ba3c07a2484e57f70d9365c3a4f3afbbe"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 163,
+                  "startColumn": 13,
+                  "charOffset": 4099,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "throw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 161,
+                  "startColumn": 1,
+                  "charOffset": 4042,
+                  "charLength": 127,
+                  "snippet": {
+                    "text": "\n        if (!file_exists($inputFilename)) {\n            throw new Exception(\"Template not found : $inputFilename\");\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8f2ad894c0e98c730bfa285705cb108f9b1b96e45ac793768450ac892ffb9528"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 20,
+                  "charOffset": 2764,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "_assignArrayIndexMultiple"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 2619,
+                  "charLength": 231,
+                  "snippet": {
+                    "text": "            $this->_assignArrayIndexSingle($symbolVariable, $resolvedExpr, $compilationContext, $statement);\n        } else {\n            $this->_assignArrayIndexMultiple(\n                $variable,\n                $symbolVariable,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9005412ec4bac501aa83cd9812cabb34268a7b0e230c80277fd4fa87b0dedb81"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 354,
+                  "startColumn": 20,
+                  "charOffset": 11410,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "compileFunction"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 352,
+                  "startColumn": 1,
+                  "charOffset": 11284,
+                  "charLength": 184,
+                  "snippet": {
+                    "text": "        /* ensure functions are handled last */\n        foreach ($this->functionDefinitions as $funcDef) {\n            $this->compileFunction($compilationContext, $funcDef);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "91944d50bbf8c2516544f83fce1031d730c23356c4e7e1cf41391adbf26887aa"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FwriteOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 34,
+                  "charOffset": 1458,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1355,
+                  "charLength": 261,
+                  "snippet": {
+                    "text": "        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($symbolVariable) {\n            if ($call->mustInitSymbolVariable()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9204906a35f880fe6ab38f278768a494e2e6797f91512117df7df4a7ae34748c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/TryCatchStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 43,
+                  "startColumn": 18,
+                  "charOffset": 1187,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 41,
+                  "startColumn": 1,
+                  "charOffset": 1046,
+                  "charLength": 181,
+                  "snippet": {
+                    "text": "        if (isset($this->statement['statements'])) {\n            $st = new StatementsBlock($this->statement['statements']);\n            $st->compile($compilationContext);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9313d0e3f5177ce659a3d5e0a615094e13d7cef65924cca4fa5be5fc7a39078a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFileAnonymous.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 104,
+                  "startColumn": 16,
+                  "charOffset": 3097,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "compileClass"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 102,
+                  "startColumn": 1,
+                  "charOffset": 3040,
+                  "charLength": 159,
+                  "snippet": {
+                    "text": "        $codePrinter->outputBlankLine();\n\n        $this->compileClass($compilationContext);\n\n        $completeName = $this->classDefinition->getCompleteName();"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "95272fe2f53297c994cec847080b8c8d46df69fcc75248cbe024a606db8591d2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MicrotimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 66,
+                  "startColumn": 38,
+                  "charOffset": 1957,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 64,
+                  "startColumn": 1,
+                  "charOffset": 1847,
+                  "charLength": 293,
+                  "snippet": {
+                    "text": "        } else {\n            $symbolVariable->setDynamicTypes('double');\n            $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n            if ($call->mustInitSymbolVariable()) {\n                $symbolVariable->initVariant($context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "95b9f7f76ad8af58a0b5ce96ef48f40dccb8217c899788e63770f19f40cc4349"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Theme.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 71,
+                  "startColumn": 17,
+                  "charOffset": 1759,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "throw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 69,
+                  "startColumn": 1,
+                  "charOffset": 1630,
+                  "charLength": 254,
+                  "snippet": {
+                    "text": "            $themeInfos = json_decode(file_get_contents($themeInfosPath), true);\n            if (!$themeInfos) {\n                throw new Exception(\"Cant parse file $themeInfosPath\");\n            } else {\n                $this->themeInfos = $themeInfos;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "96c8c59b26e37283e3279d2cc9622a5f3f2fbdf679b48b4722e233d75fd43133"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Logical/LogicalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 39,
+                  "startColumn": 30,
+                  "charOffset": 1159,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 37,
+                  "startColumn": 1,
+                  "charOffset": 1021,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly($this->readOnly);\n        $right = $rightExpr->compile($compilationContext);\n\n        switch ($left->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "984815910c86f8d9ce8239a2a007fc9ef4b5e720e2f175ac614a776365af9a6e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/RangeInclusiveOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 29,
+                  "charOffset": 1729,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1649,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "        $expression->setReadOnly($this->readOnly);\n\n        return $expression->compile($compilationContext);\n    }\n}"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "99b3c2e094c4f401957f1bac89416883544ae194492ce39c223a4b35be0f6366"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CamelizeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 74,
+                  "startColumn": 34,
+                  "charOffset": 1988,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 72,
+                  "startColumn": 1,
+                  "charOffset": 1902,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[1])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9ccff521497c3b7b633061f0f0acdf5b71d1eca2557e52d39eab7467b78b4402"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/TernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 29,
+                  "charOffset": 1729,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1657,
+                  "charLength": 203,
+                  "snippet": {
+                    "text": "\n        $expr      = new EvalExpression();\n        $condition = $expr->optimize($expression['left'], $compilationContext);\n        $compilationContext->codePrinter->output('if (' . $condition . ') {');\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "9dd4b8112bd602a54aba30d1fc90b6d513203696a591217378d545696c9a8323"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CreateInstanceOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 73,
+                  "startColumn": 34,
+                  "charOffset": 2003,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 71,
+                  "startColumn": 1,
+                  "charOffset": 1917,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a0537e2c1b10635714b41c242595672e7107268e7f325682420e93b13dc3fff1"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/InterfaceExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 65,
+                  "startColumn": 34,
+                  "charOffset": 1724,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 63,
+                  "startColumn": 1,
+                  "charOffset": 1680,
+                  "charLength": 164,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (2 == count($resolvedParams)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a07dc967add38ae502a0ff91a5c8c14273f8a10169fa186659e25cdfededbf48"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/ShortTernaryOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 95,
+                  "startColumn": 23,
+                  "charOffset": 3422,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 93,
+                  "startColumn": 1,
+                  "charOffset": 3340,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "\n        $ifStatement = new IfStatement($ifBuilder->get());\n        $ifStatement->compile($compilationContext);\n\n        return new CompiledExpression('variable', $returnVariable->getName(), $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a494de956391ce243f00ad1dca866411daeedc7c47b7b20cb3013eb930b81aa3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CeilOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1202,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1114,
+                  "charLength": 270,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/math');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('double', 'zephir_ceil(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a4c708287dfdb0e0af4db24aa4e56ecc24fe89f086c49a3190c529af65487ca3"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExitOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 51,
+                  "startColumn": 38,
+                  "charOffset": 1384,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 49,
+                  "startColumn": 1,
+                  "charOffset": 1263,
+                  "charLength": 294,
+                  "snippet": {
+                    "text": "            $context->codePrinter->output('zephir_exit_empty();');\n        } else {\n            $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n            $context->codePrinter->output('zephir_exit(' . $resolvedParams[0] . ');');\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a6b9b1e408ba5d844aaf41339005d21ae83dc2e6a18a1bb7be579ac00810455d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/RangeExclusiveOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 29,
+                  "charOffset": 1725,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1645,
+                  "charLength": 117,
+                  "snippet": {
+                    "text": "        $expression->setReadOnly($this->readOnly);\n\n        return $expression->compile($compilationContext);\n    }\n}"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a78ee4d04a05b9b7ab85485cc0e2a63b80d8f538c0929fa711f83954c09c3cc4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/MathOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 38,
+                  "charOffset": 1293,
+                  "charLength": 23,
+                  "snippet": {
+                    "text": "getResolvedParamsAsExpr"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1186,
+                  "charLength": 192,
+                  "snippet": {
+                    "text": "         * Get CompiledExpression(s) for resolved var(s).\n         */\n        $resolvedParams     = $call->getResolvedParamsAsExpr(\n            $expression['parameters'],\n            $context,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "abc5e5127524bd78b0777896242c136e0eac82c5378d095ea3d94f747e97c2ce"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FileExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1221,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1133,
+                  "charLength": 204,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/file');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ae797951dfc7c505d4e6e99ad6ac1ec6711fd26a7d3269dfea37bd2fbce97b4c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Documentation/Template.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 86,
+                  "startColumn": 25,
+                  "charOffset": 1876,
+                  "charLength": 4,
+                  "snippet": {
+                    "text": "self"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 84,
+                  "startColumn": 1,
+                  "charOffset": 1807,
+                  "charLength": 258,
+                  "snippet": {
+                    "text": "        $newLevel = $this->nestedLevel + 1;\n\n        $template = new self($this->theme, array_merge($this->data, $data), $fileName, $newLevel);\n        $template->setPathToRoot($this->getPathToRoot());\n        $template->setThemeOptions($this->themeOptions);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b355fa7752fb067e58eac5f666cb6f3e5cadd044c73a0c8ddd2054ed023471e9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Call.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 694,
+                  "startColumn": 45,
+                  "charOffset": 29310,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 692,
+                  "startColumn": 1,
+                  "charOffset": 29243,
+                  "charLength": 144,
+                  "snippet": {
+                    "text": "                    }\n\n                    $params[] = $paramExpr->compile($compilationContext);\n                    continue;\n                }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "bed76e05b8eccd3efcedddd71877be3cbf7f48ec0efded0b72c93fdc3312c3c6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/EndsWithOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 55,
+                  "startColumn": 34,
+                  "charOffset": 1442,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 53,
+                  "startColumn": 1,
+                  "charOffset": 1398,
+                  "charLength": 131,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c2dcdd101895b04d77f528eab38b5902252915f11ec2c442583ab1ed202821ae"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 188,
+                  "startColumn": 56,
+                  "charOffset": 7650,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 186,
+                  "startColumn": 1,
+                  "charOffset": 7546,
+                  "charLength": 252,
+                  "snippet": {
+                    "text": "                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c5ad828ef0ba11955998bfa5ee20a0525b2cef7609d4f4c089eccad31225754d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 123,
+                  "startColumn": 48,
+                  "charOffset": 3479,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 121,
+                  "startColumn": 1,
+                  "charOffset": 3372,
+                  "charLength": 216,
+                  "snippet": {
+                    "text": "            $indexExpression = new Expression($indexExpr);\n\n            $resolvedIndex = $indexExpression->compile($compilationContext);\n            switch ($resolvedIndex->getType()) {\n                case 'string':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c75398f199f4e24513c04e4cef64fa91bbf9cd4576852b10144534b284750299"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/DoublevalOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1222,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1129,
+                  "charLength": 284,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/operators');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('double', 'zephir_get_doubleval(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c805ddeaefd78b5657e1d38b75004b8ded33e73d0cf2e339f030d88a252fe016"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FilePutContentsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 60,
+                  "startColumn": 34,
+                  "charOffset": 1487,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 58,
+                  "startColumn": 1,
+                  "charOffset": 1384,
+                  "charLength": 285,
+                  "snippet": {
+                    "text": "        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if ($symbolVariable) {\n            $symbol = $context->backend->getVariableCode($symbolVariable);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cb41ca92e3f50bc1083520eda8c58c9ed4fd280e99a166b8de7ee39a019cb18b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/StripslashesOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 63,
+                  "startColumn": 34,
+                  "charOffset": 1590,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 61,
+                  "startColumn": 1,
+                  "charOffset": 1504,
+                  "charLength": 173,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams(\n            $expression['parameters'],\n            $context,"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cc5d9abee09df3adce2fc8fc7220ae7be34a98a3b362d76bff8e20067650c715"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/WhileStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 48,
+                  "startColumn": 40,
+                  "charOffset": 1176,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "optimize"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 46,
+                  "startColumn": 1,
+                  "charOffset": 1082,
+                  "charLength": 174,
+                  "snippet": {
+                    "text": "\n        $expr                 = new EvalExpression();\n        $condition            = $expr->optimize($exprRaw, $compilationContext);\n        $this->evalExpression = $expr;\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cd5909d9f1e49cfa20f15afb199f446334b242f71b6952edcc2dbf0cbee3f114"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/EvalExpression.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 105,
+                  "startColumn": 38,
+                  "charOffset": 2381,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 103,
+                  "startColumn": 1,
+                  "charOffset": 2276,
+                  "charLength": 147,
+                  "snippet": {
+                    "text": "        $expr->setReadOnly(true);\n        $expr->setEvalMode(true);\n        $compiledExpression = $expr->compile($compilationContext);\n\n        /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cef245004aff502b043b4cbeb58556f6f942dd83f7611a305200de216f858567"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Other/FetchOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 144,
+                  "startColumn": 56,
+                  "charOffset": 5554,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 142,
+                  "startColumn": 1,
+                  "charOffset": 5450,
+                  "charLength": 252,
+                  "snippet": {
+                    "text": "                $exprVariable->setNoisy(false);\n\n                $exprCompiledVariable = $exprVariable->compile($compilationContext);\n                if ('variable' != $exprCompiledVariable->getType()) {\n                    throw new CompilerException("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d042ebd0fd267081d7ed23065a9825d5598b072b5a13d8274b2c796803ccaf4d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/DivOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 37,
+                  "startColumn": 34,
+                  "charOffset": 957,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "preCompileChecks"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 35,
+                  "startColumn": 1,
+                  "charOffset": 837,
+                  "charLength": 208,
+                  "snippet": {
+                    "text": "    public function compile($expression, CompilationContext $compilationContext)\n    {\n        [$left, $right] = $this->preCompileChecks($expression, $compilationContext);\n\n        switch ($left->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d1142debd01360bfa02e1f26205fb8fe6735d056cb425b903c07fed4e5334b2b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/CompareMtimeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 34,
+                  "charOffset": 1353,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1271,
+                  "charLength": 198,
+                  "snippet": {
+                    "text": "        $call->processExpectedReturn($context);\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d2347e3c2914a14f50cb7390100835bd194540382e1bead7738da065f885c986"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 207,
+                  "startColumn": 27,
+                  "charOffset": 8424,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "assignStatic"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 205,
+                  "startColumn": 1,
+                  "charOffset": 8293,
+                  "charLength": 228,
+                  "snippet": {
+                    "text": "                case 'static-property-append':\n                    $let = new LetStaticPropertyAppend();\n                    $let->assignStatic(\n                        $variable,\n                        $assignment['property'],"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d3bb10256e9cb26108f37e2c5b784a4d659e4326f728c3478ffac91455a8ea91"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FloorOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1205,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1117,
+                  "charLength": 271,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/math');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('double', 'zephir_floor(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d58935995947ee351f7bd8918498fb4b7e3836a437f28043ae10c951314ad647"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FunctionExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 34,
+                  "charOffset": 1320,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1230,
+                  "charLength": 236,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/object');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        if (isset($str)) {\n            return new CompiledExpression("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d8b27df55115a38f354154daf3b3ad5566067c24fcfd7863572da4764b7bd925"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GetNsClassOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 34,
+                  "charOffset": 1600,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1514,
+                  "charLength": 237,
+                  "snippet": {
+                    "text": "        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        $this->checkInitSymbolVariable($call, $symbolVariable, $context);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "de775c6eb701b94f6d9b09a2a38df8fd9c54f30f12b9b52d85dd2ac2f73ebcf4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 64,
+                  "startColumn": 30,
+                  "charOffset": 1815,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 62,
+                  "startColumn": 1,
+                  "charOffset": 1688,
+                  "charLength": 193,
+                  "snippet": {
+                    "text": "        $rightExpr = new Expression($expression['right']);\n        $rightExpr->setReadOnly(true);\n        $right = $rightExpr->compile($compilationContext);\n\n        switch ($left->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "de7e819250c714af27c6142799e0f54795fdca0c9cb94c076249e177bdc5cbcb"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MethodExistsOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1362,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1272,
+                  "charLength": 194,
+                  "snippet": {
+                    "text": "\n        $context->headersManager->add('kernel/object');\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($str)) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dedc82c6043ffcb3f96b1ea8f91c50a1c594db68d680fbbecb9376ad14f29649"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Code/ArgInfoDefinition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 228,
+                  "startColumn": 29,
+                  "charOffset": 7108,
+                  "charLength": 5,
+                  "snippet": {
+                    "text": "throw"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 226,
+                  "startColumn": 1,
+                  "charOffset": 6954,
+                  "charLength": 225,
+                  "snippet": {
+                    "text": "                    if (isset($parameter['cast'])) {\n                        if ($parameter['cast']['type'] !== 'variable') {\n                            throw new Exception('Unexpected exception');\n                        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e54412f4ac86309b5587b43ad7212f5855cbf39be5d1a1f310c91dddcb50677b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/FcloseOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 34,
+                  "charOffset": 1208,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1120,
+                  "charLength": 270,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/file');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('bool', 'zephir_fclose(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e719cbd3a53fa62169557fed94cbf959eb10a572648674298eb3081867231b46"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/GenerateCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 82,
+                  "startColumn": 30,
+                  "charOffset": 2217,
+                  "charLength": 8,
+                  "snippet": {
+                    "text": "generate"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 80,
+                  "startColumn": 1,
+                  "charOffset": 2116,
+                  "charLength": 205,
+                  "snippet": {
+                    "text": "        try {\n            // TODO: Move all the stuff from the compiler\n            $this->compiler->generate(true);\n        } catch (InvalidArgumentException $e) {\n            $io->getErrorStyle()->error("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e9bd1f8fa9a119d6f6bfa9cf14efcb61784bd8eae140d1f22b38839f813142ad"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/MergeAppendOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 57,
+                  "startColumn": 34,
+                  "charOffset": 1351,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 55,
+                  "startColumn": 1,
+                  "charOffset": 1262,
+                  "charLength": 285,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/array');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n        $context->codePrinter->output('zephir_merge_append(' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');');\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ec10204a47ffe3d6b28d47a3ab06e7ed3315efa84fe3569bb1c2a2f269eabf15"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/CompileCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 69,
+                  "startColumn": 30,
+                  "charOffset": 2011,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 67,
+                  "startColumn": 1,
+                  "charOffset": 1910,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "        try {\n            // TODO: Move all the stuff from the compiler\n            $this->compiler->compile(\n                $this->isDevelopmentModeEnabled($input),\n                $jobs"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ed20e919a4907dc55342f1440274ed183374afa5968798517389f0ef5c3cf9fd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/JsonEncodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 53,
+                  "startColumn": 34,
+                  "charOffset": 1311,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 51,
+                  "startColumn": 1,
+                  "charOffset": 1221,
+                  "charLength": 178,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        /*"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "ef9225c121a7c7d04448be22654162608a31d36ec90cbea05a31d2849bc7af53"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 219,
+                  "startColumn": 30,
+                  "charOffset": 6123,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "getResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 217,
+                  "startColumn": 1,
+                  "charOffset": 6034,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "         */\n        if (isset($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        } else {\n            $params = [];"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f1629e504eba62ea4d0e7804c185144f2a7fbb79ac3156d3cb430aaca566ca51"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ArrayIndexAppend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 101,
+                  "startColumn": 39,
+                  "charOffset": 3159,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 99,
+                  "startColumn": 1,
+                  "charOffset": 3023,
+                  "charLength": 211,
+                  "snippet": {
+                    "text": "            $expression = new Expression($indexExpr);\n            $expression->setReadOnly(true);\n            $exprIndex = $expression->compile($compilationContext);\n\n            switch ($exprIndex->getType()) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f2e615b7575978398227af13aea002496da92c367206cc8ea4f5f7f7794bde5a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/ExplodeOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 74,
+                  "startColumn": 34,
+                  "charOffset": 2157,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 72,
+                  "startColumn": 1,
+                  "charOffset": 2113,
+                  "charLength": 173,
+                  "snippet": {
+                    "text": "        }\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if (isset($resolvedParams[$limitOffset])) {"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f2e67be8303ee356096710488461dc06930f644f96d9e96b4300a04543826957"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/StaticCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 864,
+                  "startColumn": 30,
+                  "charOffset": 34350,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "getResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 862,
+                  "startColumn": 1,
+                  "charOffset": 34250,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "        $params = [];\n        if (!empty($expression['parameters'])) {\n            $params = $this->getResolvedParams($expression['parameters'], $compilationContext, $expression);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f3197356d192c2b873c190caebbc13085bbbc0986e7f0440955c713f8bd7502b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/IsNumericOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 49,
+                  "startColumn": 34,
+                  "charOffset": 1143,
+                  "charLength": 25,
+                  "snippet": {
+                    "text": "getReadOnlyResolvedParams"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 47,
+                  "startColumn": 1,
+                  "charOffset": 1050,
+                  "charLength": 279,
+                  "snippet": {
+                    "text": "        $context->headersManager->add('kernel/operators');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        return new CompiledExpression('bool', 'zephir_is_numeric(' . $resolvedParams[0] . ')', $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f3d49f588110656b1aa199a4699e2d77324077ba4f9aa3d86f2a1360f89fb779"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 892,
+                  "startColumn": 42,
+                  "charOffset": 31322,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "getClassEntry"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 890,
+                  "startColumn": 1,
+                  "charOffset": 31182,
+                  "charLength": 188,
+                  "snippet": {
+                    "text": "    public function declareConstant($type, $name, $value, CompilationContext $context): void\n    {\n        $ce = $context->classDefinition->getClassEntry($context);\n\n        $dType = null;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f53edc6a571e3f2d6437e9dc59d66e3449109c5b6bb319648b8fd8857b36f61f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnhandledExceptionInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unhandled exceptions",
+            "markdown": "Unhandled exceptions"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/LetStatement.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 136,
+                  "startColumn": 40,
+                  "charOffset": 5560,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "compile"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 134,
+                  "startColumn": 1,
+                  "charOffset": 5502,
+                  "charLength": 108,
+                  "snippet": {
+                    "text": "                }\n\n                $resolvedExpr = $expr->compile($compilationContext);\n\n                /**"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fd1b7515c2d9e42c8d0e0a8e69f87204ecb3253bb3725be7dcb2b002b6924d00"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 246,
+                  "startColumn": 44,
+                  "charOffset": 6394,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "{$this->localPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 244,
+                  "startColumn": 1,
+                  "charOffset": 6255,
+                  "charLength": 185,
+                  "snippet": {
+                    "text": "        $redirect = \"{$this->localPath}/{$destination}\";\n        if (!empty($this->basePath)) {\n            $redirect = \"{$this->basePath}/{$this->localPath}/{$destination}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0744226bda42625f935ee9e260f4443c83a634c3de466db7f9a8d767a540e3d0"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 233,
+                  "startColumn": 47,
+                  "charOffset": 5929,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "{$this->localPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 231,
+                  "startColumn": 1,
+                  "charOffset": 5838,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "    {\n        if (!empty($this->basePath)) {\n            return require \"{$this->basePath}/{$this->localPath}/{$path}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "0942a690d5734b4d8aefe6c1575e7b251dad62eb31060e8f4cc6d0a9eae5e783"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2153,
+                  "startColumn": 48,
+                  "charOffset": 71545,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 2151,
+                  "startColumn": 1,
+                  "charOffset": 71416,
+                  "charLength": 186,
+                  "snippet": {
+                    "text": "    {\n        if (!file_exists($path) || !is_dir($path) || !is_readable($path)) {\n            $this->logger->warning(\"Directory '{$path}' is not readable. Skip...\");\n\n            return;"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "16b0d384df48edf1e5501fda2d48d4e86fd9fc8d3f1dc76611fb8ce091afee70"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 246,
+                  "startColumn": 63,
+                  "charOffset": 6413,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "{$destination}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 244,
+                  "startColumn": 1,
+                  "charOffset": 6255,
+                  "charLength": 185,
+                  "snippet": {
+                    "text": "        $redirect = \"{$this->localPath}/{$destination}\";\n        if (!empty($this->basePath)) {\n            $redirect = \"{$this->basePath}/{$this->localPath}/{$destination}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "1aa1de406bcffd937ca4bdf2b49b2ff2db55355eced756471bb90e33e082cc6f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Stubs/DocBlock.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 76,
+                  "startColumn": 63,
+                  "charOffset": 2078,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "{$this->indent}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 74,
+                  "startColumn": 1,
+                  "charOffset": 1953,
+                  "charLength": 174,
+                  "snippet": {
+                    "text": "                $line = preg_replace('#\\t#', $indent, $line);\n\n                $this->lines[] = array_pop($this->lines) . \"\\n{$this->indent}\" . $line;\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "23b117bfe1f724f163d1b27a1ce061b6e3c6473b5fe08ca65fed6785c1e607ef"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 246,
+                  "startColumn": 26,
+                  "charOffset": 6376,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "{$this->basePath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 244,
+                  "startColumn": 1,
+                  "charOffset": 6255,
+                  "charLength": 185,
+                  "snippet": {
+                    "text": "        $redirect = \"{$this->localPath}/{$destination}\";\n        if (!empty($this->basePath)) {\n            $redirect = \"{$this->basePath}/{$this->localPath}/{$destination}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "269e2def5f3a024bde6c0e5fa4bd0db1e63aaf1a0665334b336802c9da7bf000"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 262,
+                  "startColumn": 88,
+                  "charOffset": 6902,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 260,
+                  "startColumn": 1,
+                  "charOffset": 6749,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "    public function write(string $path, string $data): void\n    {\n        file_put_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . \"/{$path}\", $data);\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2b5f75fea02f2c94df137a9d63b5f2cfff50d797bbc28156e3746b9d41714952"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1961,
+                  "startColumn": 70,
+                  "charOffset": 65923,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$kernelPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1959,
+                  "startColumn": 1,
+                  "charOffset": 65762,
+                  "charLength": 201,
+                  "snippet": {
+                    "text": "        if (!file_exists($kernelPath)) {\n            if (!mkdir($kernelPath, 0775, true)) {\n                throw new Exception(\"Cannot create kernel directory: {$kernelPath}\");\n            }\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2c836e6693eb06f1c951a55ef7c388ea82b7fa873fe463ec84651cc95c1793b6"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 52,
+                  "startColumn": 42,
+                  "charOffset": 1233,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "{$variable}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 50,
+                  "startColumn": 1,
+                  "charOffset": 1110,
+                  "charLength": 209,
+                  "snippet": {
+                    "text": "        if (!$symbolVariable->isInitialized()) {\n            throw new Exception(\n                \"Cannot mutate variable '{$variable}' because it is not initialized\",\n                $statement\n            );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "2ea220b83868934d83fa98fafab5a53a4a7823be777a68f77ce02c4b8b4e4053"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 233,
+                  "startColumn": 66,
+                  "charOffset": 5948,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 231,
+                  "startColumn": 1,
+                  "charOffset": 5838,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "    {\n        if (!empty($this->basePath)) {\n            return require \"{$this->basePath}/{$this->localPath}/{$path}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "34032bd6cffb452f006cfb9e8078981ce159662f2044a6b54fe9dedbd2fa2d1c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1405,
+                  "startColumn": 31,
+                  "charOffset": 47984,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$currentDir}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1403,
+                  "startColumn": 1,
+                  "charOffset": 47900,
+                  "charLength": 190,
+                  "snippet": {
+                    "text": "            [\n                ':cflags' => $gccFlags,\n                ':stderr' => \"{$currentDir}/compile-errors.log\",\n                ':stdout' => \"{$currentDir}/compile.log\",\n            ]"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "34ad6b0c9e865904a001e8c2db074cff53f2a08d3e9d85572ed97df728404619"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 130,
+                  "startColumn": 22,
+                  "charOffset": 3656,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$version[1]}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 128,
+                  "startColumn": 1,
+                  "charOffset": 3575,
+                  "charLength": 119,
+                  "snippet": {
+                    "text": "    {\n        $version = explode('-', $this->getVersion());\n        $commit  = \"({$version[1]})\";\n\n        return trim("
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3561057bce6ef21d614035bbeb8c8cb53fccdf85e98006024f7ab5cdf3508dcd"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 35,
+                  "charOffset": 2528,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$namespace}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 2445,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "        $this->config->set('name', $namespace);\n\n        if (!is_dir(\"{$namespace}/{$namespace}\")) {\n            mkdir(\"{$namespace}/{$namespace}\", 0755, true);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "38c20b3d5e54c34b71ac278a36982febfbc35ff1d50e2bc847a61ad96acdb9a2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 684,
+                  "startColumn": 52,
+                  "charOffset": 23780,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$className}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 682,
+                  "startColumn": 1,
+                  "charOffset": 23668,
+                  "charLength": 167,
+                  "snippet": {
+                    "text": "\n                    if (!class_exists($className, false)) {\n                        throw new Exception(\"Class {$className} cannot be loaded\");\n                    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "406743717208ec19b2beedd669300348fd4bb8edc3b454b54f8a1ae963e9aaf8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 33,
+                  "charOffset": 2578,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$namespace}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 2493,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "\n        if (!is_dir(\"{$namespace}/{$namespace}\")) {\n            mkdir(\"{$namespace}/{$namespace}\", 0755, true);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4381ed73a05a882042683071903e278b9875030b8424327f7ea99adacedfad45"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GlobalsSetOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 81,
+                  "startColumn": 52,
+                  "charOffset": 2593,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$globalName}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 79,
+                  "startColumn": 1,
+                  "charOffset": 2444,
+                  "charLength": 233,
+                  "snippet": {
+                    "text": "            if (!isset($globalDefinition['type'])) {\n                throw new CompilerException(\n                    \"Unable to determine type for '{$globalName}' global variable.\",\n                    $expression\n                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "44386274ba6d7bdac080ad7b66e77c8e72c24d9619b302d629c009b7dfb2ff0c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 93,
+                  "startColumn": 22,
+                  "charOffset": 2515,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$namespace}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 91,
+                  "startColumn": 1,
+                  "charOffset": 2445,
+                  "charLength": 170,
+                  "snippet": {
+                    "text": "        $this->config->set('name', $namespace);\n\n        if (!is_dir(\"{$namespace}/{$namespace}\")) {\n            mkdir(\"{$namespace}/{$namespace}\", 0755, true);\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "490141b757ea379eb67e3b1e3b79bbc5b2f876d220d3f416cea1918983c2a190"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 201,
+                  "startColumn": 87,
+                  "charOffset": 5055,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 199,
+                  "startColumn": 1,
+                  "charOffset": 4907,
+                  "charLength": 165,
+                  "snippet": {
+                    "text": "    public function modificationTime(string $path): int\n    {\n        return filemtime($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . \"/{$path}\");\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "4e4e4a853a15b9bc74fbb6262ce349819b277f48cc014ee02f0488fb52792c56"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1419,
+                  "startColumn": 62,
+                  "charOffset": 48459,
+                  "charLength": 11,
+                  "snippet": {
+                    "text": "{$fileName}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1417,
+                  "startColumn": 1,
+                  "charOffset": 48325,
+                  "charLength": 298,
+                  "snippet": {
+                    "text": "        $fileName = $this->config->get('extension-name') ?: $namespace;\n\n        if (false === file_exists(\"{$currentDir}/ext/modules/{$fileName}.so\")) {\n            throw new CompilerException(\n                'Internal extension compilation failed. Check compile-errors.log for more information.'"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "51240dbcfd49b5ae90dbcadb27080ba319574d0238999f14687f4d42c0007556"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 580,
+                  "startColumn": 41,
+                  "charOffset": 18549,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$namespace}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 578,
+                  "startColumn": 1,
+                  "charOffset": 18393,
+                  "charLength": 266,
+                  "snippet": {
+                    "text": "                    if (!preg_match('/^[A-Z]/', $namespace)) {\n                        throw new CompilerException(\n                            \"Namespace '{$namespace}' must be in camelized-form\",\n                            $topStatement\n                        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5c9c8d49b89fde08fc60c9c807e112d406e9f834215bc0dcf7702f627ee08f3e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GlobalsSetOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 74,
+                  "startColumn": 51,
+                  "charOffset": 2344,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$globalName}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 72,
+                  "startColumn": 1,
+                  "charOffset": 2140,
+                  "charLength": 288,
+                  "snippet": {
+                    "text": "            if (!isset($resolvedParams[0]) || empty($resolvedParams[0]) || !is_string($resolvedParams[0])) {\n                throw new CompilerException(\n                    \"Unable to reslove value for '{$globalName}' global variable.\",\n                    $expression\n                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "5e39fa42356cc0ee7d760b4859a8529ffd59d1037ca5861a056b671d7601a54c"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Application.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 166,
+                  "startColumn": 21,
+                  "charOffset": 4695,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$version[0]}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 164,
+                  "startColumn": 1,
+                  "charOffset": 4603,
+                  "charLength": 125,
+                  "snippet": {
+                    "text": "\n        if (isset($version[1]) && str_starts_with($version[1], '$')) {\n            return \"{$version[0]}-source\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "6509e3f714963c85777eec80d297a703d4376982b73f373fb5b436bf7feb20c2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 105,
+                  "startColumn": 32,
+                  "charOffset": 3033,
+                  "charLength": 15,
+                  "snippet": {
+                    "text": "{$propertyName}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 103,
+                  "startColumn": 1,
+                  "charOffset": 2891,
+                  "charLength": 249,
+                  "snippet": {
+                    "text": "            if (!$context->classDefinition->hasProperty($propertyName)) {\n                throw new Exception(\n                    \"Property '{$propertyName}' is not defined on class '{$className}'\",\n                    $statement\n                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7285ae5ce278899938fa44a75b1ec6dbcf48f6dd8d615940256b79ca8a85b4b4"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Console/Command/InitCommand.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 20,
+                  "charOffset": 2565,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$namespace}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 2493,
+                  "charLength": 123,
+                  "snippet": {
+                    "text": "\n        if (!is_dir(\"{$namespace}/{$namespace}\")) {\n            mkdir(\"{$namespace}/{$namespace}\", 0755, true);\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7a0797103c0e544a065cc8d4bb538fd64e12ab7b880de585884f47ab92c4ca72"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1645,
+                  "startColumn": 44,
+                  "charOffset": 57329,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$code}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1643,
+                  "startColumn": 1,
+                  "charOffset": 57223,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "            $output = \"array_init({$code});\";\n        } else {\n            $output = \"zephir_create_array({$code}, {$size}, 0);\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7a809fc545306e24950811727c4202b2e21a8e6d8116c4ad4ecb436298b54590"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GlobalsSetOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 66,
+                  "charOffset": 3040,
+                  "charLength": 16,
+                  "snippet": {
+                    "text": "{$internalValue}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 2959,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "            );\n\n            $context->codePrinter->output(\"{$internalAccessor} = {$internalValue};\");\n\n            return new CompiledExpression('null', null, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "82280abd26a7ffa24918f66015729d17578eb167eead5447d433dd461010ed58"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FunctionCall.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 690,
+                  "startColumn": 52,
+                  "charOffset": 24009,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$className}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 688,
+                  "startColumn": 1,
+                  "charOffset": 23887,
+                  "charLength": 198,
+                  "snippet": {
+                    "text": "\n                    if (!($optimizer instanceof OptimizerAbstract)) {\n                        throw new Exception(\"Class {$className} must be instance of OptimizerAbstract\");\n                    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "873942ab4ee0e203aa501ed9c3b125c8b92a7affa5ffd72809c948b347d8c59f"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 111,
+                  "startColumn": 22,
+                  "charOffset": 2703,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "{$this->localPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 109,
+                  "startColumn": 1,
+                  "charOffset": 2627,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "            $path = $this->localPath;\n        } else {\n            $path = \"{$this->localPath}/{$path}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "87e6083a6487943739224516cb11667a8bc724d36ba21dbe2f4f8afbc32c699e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 103,
+                  "startColumn": 77,
+                  "charOffset": 2511,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 101,
+                  "startColumn": 1,
+                  "charOffset": 2382,
+                  "charLength": 146,
+                  "snippet": {
+                    "text": "    public function delete(string $path): void\n    {\n        unlink($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . \"/{$path}\");\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "91553b3b6ca3650b04e23054da3c155e0b0938bd27fde998a4871d1de6c749a5"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 236,
+                  "startColumn": 96,
+                  "charOffset": 6064,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 234,
+                  "startColumn": 1,
+                  "charOffset": 5958,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "        }\n\n        $code = file_get_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . \"/{$path}\");\n\n        return eval(str_replace('<?php ', '', $code));"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "99058a8d418431fa8e4a3c2af722f5517b8ef01effb1677883e2b05e73dcc0f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GlobalsSetOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 94,
+                  "startColumn": 44,
+                  "charOffset": 3018,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "{$internalAccessor}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 92,
+                  "startColumn": 1,
+                  "charOffset": 2959,
+                  "charLength": 172,
+                  "snippet": {
+                    "text": "            );\n\n            $context->codePrinter->output(\"{$internalAccessor} = {$internalValue};\");\n\n            return new CompiledExpression('null', null, $expression);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "990645484a140d3e1505be21478fc1f76548783caf643f7cd438f839317b6550"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 255,
+                  "startColumn": 25,
+                  "charOffset": 6663,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "{$command}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 253,
+                  "startColumn": 1,
+                  "charOffset": 6589,
+                  "charLength": 152,
+                  "snippet": {
+                    "text": "                break;\n            case 'stderr':\n                system(\"{$command} 2> \" . escapeshellarg($redirect));\n                break;\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a390457ebb750e68850e8137aca7a8368acff8a6526c0edd665863f1018e6e62"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 233,
+                  "startColumn": 29,
+                  "charOffset": 5911,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "{$this->basePath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 231,
+                  "startColumn": 1,
+                  "charOffset": 5838,
+                  "charLength": 130,
+                  "snippet": {
+                    "text": "    {\n        if (!empty($this->basePath)) {\n            return require \"{$this->basePath}/{$this->localPath}/{$path}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a8bb6c8e615b4e2aaaf6b482adc3b75979c2e33df8f999671ed2e2969a117517"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 252,
+                  "startColumn": 25,
+                  "charOffset": 6544,
+                  "charLength": 10,
+                  "snippet": {
+                    "text": "{$command}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 250,
+                  "startColumn": 1,
+                  "charOffset": 6472,
+                  "charLength": 166,
+                  "snippet": {
+                    "text": "            default:\n            case 'stdout':\n                system(\"{$command} > \" . escapeshellarg($redirect));\n                break;\n            case 'stderr':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "a8e35d2f08a59045e2e5fa936e183fec746a39d3fedab72594e4072f90d455a2"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1645,
+                  "startColumn": 53,
+                  "charOffset": 57338,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$size}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1643,
+                  "startColumn": 1,
+                  "charOffset": 57223,
+                  "charLength": 140,
+                  "snippet": {
+                    "text": "            $output = \"array_init({$code});\";\n        } else {\n            $output = \"zephir_create_array({$code}, {$size}, 0);\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "aff97a177a1abbf419e2dc5a990c21979e9f2bea3e2b01b2338f4043359fccd7"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 973,
+                  "startColumn": 44,
+                  "charOffset": 33526,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "{$optimizersPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 971,
+                  "startColumn": 1,
+                  "charOffset": 33372,
+                  "charLength": 263,
+                  "snippet": {
+                    "text": "        if (false === self::$loadedPrototypes) {\n            $optimizersPath = $this->resolveOptimizersPath();\n            FunctionCall::addOptimizerDir(\"{$optimizersPath}/FunctionCall\");\n\n            $customOptimizersPaths = $this->config->get('optimizer-dirs');"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "b4ee667c7eae59ec21be133a66715807d37aafbb3ed6b6349130480b85f9e169"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 294,
+                  "startColumn": 45,
+                  "charOffset": 8774,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$namespace}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 292,
+                  "startColumn": 1,
+                  "charOffset": 8659,
+                  "charLength": 144,
+                  "snippet": {
+                    "text": "\n        if (file_exists(\"$currentDir/ext/modules/{$namespace}.so\")) {\n            unlink(\"$currentDir/ext/modules/{$namespace}.so\");\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c1b6721eec7920405a740bcd7e2a8965b33c1517a9eaac630ff34d76f1c364f8"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 119,
+                  "startColumn": 100,
+                  "charOffset": 2972,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 117,
+                  "startColumn": 1,
+                  "charOffset": 2821,
+                  "charLength": 216,
+                  "snippet": {
+                    "text": "    public function file(string $path): array\n    {\n        $contents = file_get_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . \"/{$path}\");\n\n        return preg_split(\"/\\r\\n|\\n|\\r/\", $contents);"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c2161f5bb51173d8ecddc223ff72c1c462f788e9537bd439f758420ceb403e22"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 244,
+                  "startColumn": 22,
+                  "charOffset": 6276,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "{$this->localPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 242,
+                  "startColumn": 1,
+                  "charOffset": 6229,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "    {\n        // fallback\n        $redirect = \"{$this->localPath}/{$destination}\";\n        if (!empty($this->basePath)) {\n            $redirect = \"{$this->basePath}/{$this->localPath}/{$destination}\";"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c21b1289ec9ffa025c101452cc0a686418f421e1a8e84c49276279e223a9b993"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1406,
+                  "startColumn": 31,
+                  "charOffset": 48049,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$currentDir}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1404,
+                  "startColumn": 1,
+                  "charOffset": 47914,
+                  "charLength": 187,
+                  "snippet": {
+                    "text": "                ':cflags' => $gccFlags,\n                ':stderr' => \"{$currentDir}/compile-errors.log\",\n                ':stdout' => \"{$currentDir}/compile.log\",\n            ]\n        );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c34e1f4646807a5daf3ed9b57283fe896d0fa433fb68cc788a0eaca9f315c153"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 111,
+                  "startColumn": 41,
+                  "charOffset": 2722,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 109,
+                  "startColumn": 1,
+                  "charOffset": 2627,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "            $path = $this->localPath;\n        } else {\n            $path = \"{$this->localPath}/{$path}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c711ccb28033b1ce7c508c214d32b93447aff21738262947909753036351bf29"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 293,
+                  "startColumn": 50,
+                  "charOffset": 8709,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$namespace}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 291,
+                  "startColumn": 1,
+                  "charOffset": 8649,
+                  "charLength": 153,
+                  "snippet": {
+                    "text": "        }\n\n        if (file_exists(\"$currentDir/ext/modules/{$namespace}.so\")) {\n            unlink(\"$currentDir/ext/modules/{$namespace}.so\");\n        }"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c7e5791afdd68016e892b53c80e8f8d5c08885e9ddc0fe9e009bd8ca880aca0d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 227,
+                  "startColumn": 95,
+                  "charOffset": 5767,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 225,
+                  "startColumn": 1,
+                  "charOffset": 5620,
+                  "charLength": 164,
+                  "snippet": {
+                    "text": "    public function read(string $path): string\n    {\n        return file_get_contents($this->basePath . DIRECTORY_SEPARATOR . $this->localPath . \"/{$path}\");\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "c88191659fda15c508696140042a22b5d3989d7f68319d7255d0384a2b934d0e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Statements/Let/ObjectProperty.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 105,
+                  "startColumn": 74,
+                  "charOffset": 3075,
+                  "charLength": 12,
+                  "snippet": {
+                    "text": "{$className}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 103,
+                  "startColumn": 1,
+                  "charOffset": 2891,
+                  "charLength": 249,
+                  "snippet": {
+                    "text": "            if (!$context->classDefinition->hasProperty($propertyName)) {\n                throw new Exception(\n                    \"Property '{$propertyName}' is not defined on class '{$className}'\",\n                    $statement\n                );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cb549d89d070f3262e1f63cd95778d5a507b477c3ba24911399f1a9a70f6eda9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 183,
+                  "startColumn": 41,
+                  "charOffset": 4615,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$path}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 181,
+                  "startColumn": 1,
+                  "charOffset": 4520,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "            $path = $this->localPath;\n        } else {\n            $path = \"{$this->localPath}/{$path}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "cdc140433483f286363256acf9fcee7e60e05891a899841cc9f85f6f99ec542b"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1425,
+                  "startColumn": 51,
+                  "charOffset": 50555,
+                  "charLength": 19,
+                  "snippet": {
+                    "text": "{$signaturePattern}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1423,
+                  "startColumn": 1,
+                  "charOffset": 50494,
+                  "charLength": 90,
+                  "snippet": {
+                    "text": "        }\n\n        return \"void {$method->getInternalName()}({$signaturePattern})\";\n    }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d36ce2c7de909d78da30b65294083c296346704d1b2d83e8b4d889ee803d775e"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Code/ArgInfoDefinition.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 200,
+                  "startColumn": 22,
+                  "charOffset": 5743,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$flag}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 198,
+                  "startColumn": 1,
+                  "charOffset": 5652,
+                  "charLength": 193,
+                  "snippet": {
+                    "text": "\n        foreach ($this->parameters->getParameters() as $parameter) {\n            switch (\"{$flag}:\" . $parameter['data-type']) {\n                case '0:array':\n                case '1:array':"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "d6274691fe6e38cb24d06e31983078a769a54459182579627855b02bbd434c4a"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 244,
+                  "startColumn": 41,
+                  "charOffset": 6295,
+                  "charLength": 14,
+                  "snippet": {
+                    "text": "{$destination}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 242,
+                  "startColumn": 1,
+                  "charOffset": 6229,
+                  "charLength": 200,
+                  "snippet": {
+                    "text": "    {\n        // fallback\n        $redirect = \"{$this->localPath}/{$destination}\";\n        if (!empty($this->basePath)) {\n            $redirect = \"{$this->basePath}/{$this->localPath}/{$destination}\";"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "dcc7b388fcaf7c4c2ed6b31a051953e75ea863065fa4490674a43fbd4aba3d22"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Optimizers/FunctionCall/GlobalsSetOptimizer.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 61,
+                  "startColumn": 35,
+                  "charOffset": 1763,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$globalName}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 59,
+                  "startColumn": 1,
+                  "charOffset": 1621,
+                  "charLength": 245,
+                  "snippet": {
+                    "text": "        if (!$context->compiler->isExtensionGlobal($globalName)) {\n            throw new CompilerException(\n                \"Global variable '{$globalName}' cannot be written because it wasn't defined\",\n                $expression\n            );"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "df51f3a51a9729e173de63205d2bc8aa9fafa80bd49a8569980539566cc7579d"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/FileSystem/HardDisk.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 183,
+                  "startColumn": 22,
+                  "charOffset": 4596,
+                  "charLength": 18,
+                  "snippet": {
+                    "text": "{$this->localPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 181,
+                  "startColumn": 1,
+                  "charOffset": 4520,
+                  "charLength": 115,
+                  "snippet": {
+                    "text": "            $path = $this->localPath;\n        } else {\n            $path = \"{$this->localPath}/{$path}\";\n        }\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e12b2486ad882438cd6631638bf0113d34b52d41178978bf86390787e29b2cb9"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Backend/Backend.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1643,
+                  "startColumn": 35,
+                  "charOffset": 57257,
+                  "charLength": 7,
+                  "snippet": {
+                    "text": "{$code}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1641,
+                  "startColumn": 1,
+                  "charOffset": 57192,
+                  "charLength": 160,
+                  "snippet": {
+                    "text": "\n        if (null === $size) {\n            $output = \"array_init({$code});\";\n        } else {\n            $output = \"zephir_create_array({$code}, {$size}, 0);\";"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "e3e99fb716d9b1fcf7754265d8a47e66b2c65bf4bec235fb9751ccc530985a25"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/CompilerFile.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 474,
+                  "startColumn": 25,
+                  "charOffset": 15459,
+                  "charLength": 17,
+                  "snippet": {
+                    "text": "{$normalizedPath}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 472,
+                  "startColumn": 1,
+                  "charOffset": 15357,
+                  "charLength": 177,
+                  "snippet": {
+                    "text": "        $normalizedPath = $this->filesystem->normalizePath($this->filePath);\n\n        $compilePath = \"{$normalizedPath}.json\";\n        $zepRealPath = realpath($this->filePath);\n"
+                  },
+                  "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "f3c5fe7ba788e77cec03d6d583a511f3e77c359a3165d1cd83ad100dc821e748"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryCurlyVarSyntaxInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary curly braces",
+            "markdown": "Unnecessary curly braces"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 1419,
+                  "startColumn": 36,
+                  "charOffset": 48433,
+                  "charLength": 13,
+                  "snippet": {
+                    "text": "{$currentDir}"
+                  },
+                  "sourceLanguage": "PHP"
+                },
+                "contextRegion": {
+                  "startLine": 1417,
+                  "startColumn": 1,
+                  "charOffset": 48325,
+                  "charLength": 298,
+                  "snippet": {
+                    "text": "        $fileName = $this->config->get('extension-name') ?: $namespace;\n\n        if (false === file_exists(\"{$currentDir}/ext/modules/{$fileName}.so\")) {\n            throw new CompilerException(\n                'Internal extension compilation failed. Check compile-errors.log for more information.'"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31672,9 +110112,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "ee5ac15645dac240d3a11ee68eec3b9879e016f7240275fdae3339b21c23f4ad"
+            "equalIndicator/v1": "f82060f1c599436ff729cd5982890885f078dc957f7239eefc5dfcf6d81f6724"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31684,37 +110123,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpUnnecessaryLocalVariableInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Unnecessary local variable",
+            "markdown": "Unnecessary local variable"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/AddslashesOptimizer.php",
+                  "uri": "src/Documentation/Template.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
+                  "startLine": 77,
                   "startColumn": 9,
-                  "charOffset": 964,
-                  "charLength": 832,
+                  "charOffset": 1677,
+                  "charLength": 8,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$content"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 75,
                   "startColumn": 1,
-                  "charOffset": 956,
-                  "charLength": 840,
+                  "charOffset": 1626,
+                  "charLength": 103,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "        ob_start();\n        include $path;\n        $content = ob_get_clean();\n\n        return $content;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31725,30 +110164,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "3dbaf535a9729c410b46427e858b83feed1ea979061d3d3a0c376f3f52ad6031"
+          },
+          "properties": {
+            "ideaSeverity": "WEAK WARNING",
+            "qodanaSeverity": "Moderate",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnnecessaryLocalVariableInspection",
+          "kind": "fail",
+          "level": "note",
+          "message": {
+            "text": "Unnecessary local variable",
+            "markdown": "Unnecessary local variable"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/ZephirStringToHexOptimizer.php",
+                  "uri": "src/Documentation/Theme.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 42,
+                  "startLine": 221,
                   "startColumn": 9,
-                  "charOffset": 964,
-                  "charLength": 832,
+                  "charOffset": 6487,
+                  "charLength": 13,
                   "snippet": {
-                    "text": "if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "$pathFilename"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 42,
+                  "startLine": 219,
                   "startColumn": 1,
-                  "charOffset": 956,
-                  "charLength": 840,
+                  "charOffset": 6394,
+                  "charLength": 175,
                   "snippet": {
-                    "text": "        if (!isset($expression['parameters'])) {\n            return false;\n        }\n\n        if (count($expression['parameters']) > 1) {\n            return false;\n        }\n\n        /*\n         * Process the expected symbol to be returned\n         */\n        $call->processExpectedReturn($context);\n\n        $symbolVariable = $call->getSymbolVariable(true, $context);\n        $this->checkNotVariableString($symbolVariable, $expression);\n\n        $context->headersManager->add('kernel/string');\n\n        $symbolVariable->setDynamicTypes('string');\n\n        $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);\n\n        if ($call->mustInitSymbolVariable()) {\n            $symbolVariable->initVariant($context);\n        }\n\n        $symbol = $context->backend->getVariableCode($symbolVariable);"
+                    "text": "        $pathDirname  = $path['dirname'];\n        $pathBasename = $path['basename'];\n        $pathFilename = $pathDirname . '/' . $pathBasename;\n\n        return $pathFilename;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31762,9 +110222,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "efce78143face75554db6a523489645a5fdfbb257132f7a7c6c8996224bd232a"
+            "equalIndicator/v1": "8bb021c4c1365e39c2bc198ff4e869ca92c5f366710172ad6811d5826d1bcf35"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -31774,37 +110233,37 @@
           }
         },
         {
-          "ruleId": "DuplicatedCode",
+          "ruleId": "PhpUnreachableStatementInspection",
           "kind": "fail",
-          "level": "note",
+          "level": "warning",
           "message": {
-            "text": "Duplicated code",
-            "markdown": "Duplicated code"
+            "text": "Unreachable statement",
+            "markdown": "Unreachable statement"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticProperty.php",
+                  "uri": "src/Optimizers/EvalExpression.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 53,
-                  "startColumn": 9,
-                  "charOffset": 1238,
-                  "charLength": 1315,
+                  "startLine": 245,
+                  "startColumn": 17,
+                  "charOffset": 7920,
+                  "charLength": 6,
                   "snippet": {
-                    "text": "if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                    "text": "break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 53,
+                  "startLine": 243,
                   "startColumn": 1,
-                  "charOffset": 1230,
-                  "charLength": 1323,
+                  "charOffset": 7859,
+                  "charLength": 89,
                   "snippet": {
-                    "text": "        if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                    "text": "                        );\n                }\n                break;\n\n            default:"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31815,30 +110274,51 @@
                   "kind": "module"
                 }
               ]
-            },
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "7e00aef051bb4499add808e48c30c7f58f4dfee2b92719fe251c61b71a871fab"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "PhpUnreachableStatementInspection",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Unreachable statement",
+            "markdown": "Unreachable statement"
+          },
+          "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertySub.php",
+                  "uri": "src/Optimizers/MathOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 58,
-                  "startColumn": 9,
-                  "charOffset": 1408,
-                  "charLength": 1315,
+                  "startLine": 69,
+                  "startColumn": 17,
+                  "charOffset": 1796,
+                  "charLength": 6,
                   "snippet": {
-                    "text": "if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                    "text": "break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 58,
+                  "startLine": 67,
                   "startColumn": 1,
-                  "charOffset": 1400,
-                  "charLength": 1323,
+                  "charOffset": 1698,
+                  "charLength": 229,
                   "snippet": {
-                    "text": "        if (!$propertyDefinition = $classDefinition->getProperty($property)) {\n            throw CompilerException::classDoesNotHaveProperty(\n                $classDefinition->getCompleteName(),\n                $property,\n                $statement\n            );\n        }\n\n        $this->checkAccessNonStaticProperty(\n            $propertyDefinition,\n            $classDefinition,\n            $property,\n            $statement\n        );\n\n        if ($propertyDefinition->isPrivate()) {\n            if ($classDefinition->getCompleteName() != $compilationContext->classDefinition->getCompleteName()) {\n                throw new CompilerException(\n                    sprintf(\n                        \"Cannot access private static property '%s::%s out of its declaring context\",\n                        $classDefinition->getCompleteName(),\n                        $property\n                    ),\n                    $statement\n                );\n            }\n        }\n\n        $codePrinter = $compilationContext->codePrinter;\n        $compilationContext->headersManager->add('kernel/object');\n\n        try {\n            $classEntry = $classDefinition->getClassEntry($compilationContext);\n        } catch (Exception $e) {\n            throw new CompilerException($e->getMessage(), $statement, $e->getCode(), $e);\n        }"
+                    "text": "\n                return $this->passNativeFCall($compiledExpression, $expression);\n                break;\n            case 'variable':\n                $variable = $context->symbolTable->getVariable($compiledExpression->getCode());"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31852,49 +110332,48 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "f5100c21fdcabe67b5c986419306ee8c1d0c9ff4dab52fc23e74c7e3b6221c83"
+            "equalIndicator/v1": "b785ddb5d65c3a56a8f5d288ffa2c359dcb504a1561d5784035f037a69890ae6"
           },
-          "baselineState": "unchanged",
           "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
             "tags": [
               "PHP"
             ]
           }
         },
         {
-          "ruleId": "PhpComposerExtensionStubsInspection",
+          "ruleId": "PhpUnreachableStatementInspection",
           "kind": "fail",
-          "level": "note",
+          "level": "warning",
           "message": {
-            "text": "'ext-gmp' is specified in 'require-dev' section but used outside of tests",
-            "markdown": "'ext-gmp' is specified in 'require-dev' section but used outside of tests"
+            "text": "Unreachable statement",
+            "markdown": "Unreachable statement"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/NativeArray.php",
+                  "uri": "src/Optimizers/MathOptimizer.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 27,
-                  "startColumn": 14,
-                  "charOffset": 577,
-                  "charLength": 13,
+                  "startLine": 81,
+                  "startColumn": 25,
+                  "charOffset": 2321,
+                  "charLength": 6,
                   "snippet": {
-                    "text": "gmp_nextprime"
+                    "text": "break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 25,
+                  "startLine": 79,
                   "startColumn": 1,
-                  "charOffset": 514,
-                  "charLength": 103,
+                  "charOffset": 2207,
+                  "charLength": 227,
                   "snippet": {
-                    "text": "use function count;\nuse function function_exists;\nuse function gmp_nextprime;\nuse function gmp_strval;\n"
+                    "text": "\n                        return $this->passNativeFCall($compiledExpression, $expression);\n                        break;\n                    case 'variable':\n                        $context->headersManager->add('kernel/math');"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31908,24 +110387,23 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "86fd4e479dea5e9ac17025dfc059677c3dafd655750281e2e553e9147df86e1e"
+            "equalIndicator/v1": "f33e017278a7f4c5ba0c76b75b5c0352cc47bce5559843d5a0003748850fd572"
           },
-          "baselineState": "unchanged",
           "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
             "tags": [
               "PHP"
             ]
           }
         },
         {
-          "ruleId": "PhpComposerExtensionStubsInspection",
+          "ruleId": "PhpUnreachableStatementInspection",
           "kind": "fail",
-          "level": "note",
+          "level": "warning",
           "message": {
-            "text": "'ext-gmp' is specified in 'require-dev' section but used outside of tests",
-            "markdown": "'ext-gmp' is specified in 'require-dev' section but used outside of tests"
+            "text": "Unreachable statement",
+            "markdown": "Unreachable statement"
           },
           "locations": [
             {
@@ -31935,22 +110413,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 28,
-                  "startColumn": 14,
-                  "charOffset": 605,
-                  "charLength": 10,
+                  "startLine": 574,
+                  "startColumn": 17,
+                  "charOffset": 25182,
+                  "charLength": 6,
                   "snippet": {
-                    "text": "gmp_strval"
+                    "text": "break;"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 26,
+                  "startLine": 572,
                   "startColumn": 1,
-                  "charOffset": 534,
-                  "charLength": 87,
+                  "charOffset": 25041,
+                  "charLength": 169,
                   "snippet": {
-                    "text": "use function function_exists;\nuse function gmp_nextprime;\nuse function gmp_strval;\n\n/**"
+                    "text": "                        throw new CompilerException('Unknown ' . $itemVariable->getType(), $itemVariable);\n                }\n                break;\n\n            default:"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -31964,49 +110442,48 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "fd614b6d75285018cff55a963992918f4171f55ce3b155009f405c717c22e968"
+            "equalIndicator/v1": "fa4e32a343d35e4e95ceb3cd16eef395aea96c882ac0317b90bf1e196de93df2"
           },
-          "baselineState": "unchanged",
           "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
             "tags": [
               "PHP"
             ]
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedLocalVariableInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because '1 != count($expression['parameters'])' is already 'false' at this point",
-            "markdown": "Condition is always 'true' because '1 != count($expression\\['parameters'\\])' is already 'false' at this point"
+            "text": "Unused local variable 'i'. The value of the variable is not used anywhere.",
+            "markdown": "Unused local variable 'i'. The value of the variable is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Optimizers/FunctionCall/StrtokOptimizer.php",
+                  "uri": "src/Stubs/DocBlock.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 50,
-                  "startColumn": 13,
-                  "charOffset": 1138,
-                  "charLength": 37,
+                  "startLine": 86,
+                  "startColumn": 38,
+                  "charOffset": 2424,
+                  "charLength": 2,
                   "snippet": {
-                    "text": "1 == count($expression['parameters'])"
+                    "text": "$i"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 48,
+                  "startLine": 84,
                   "startColumn": 1,
-                  "charOffset": 1115,
-                  "charLength": 146,
+                  "charOffset": 2334,
+                  "charLength": 206,
                   "snippet": {
-                    "text": "        }\n\n        if (1 == count($expression['parameters'])) {\n            return new CompiledExpression('bool', 'false', $expression);\n        }"
+                    "text": "            $cleaned = [];\n            $empty   = 0;\n            foreach ($description as $i => $line) {\n                if (preg_match('#^([\\s\\t]+)?[*]([\\s\\t]+)?$#', $line)) {\n                    ++$empty;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32020,9 +110497,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "0f24f8a2cb526e35900b262beaba75e0332358debfb0bfcee5f6c4d87d933131"
+            "equalIndicator/v1": "00aef91e089a8bbb176e1833d58806e4e4e034f6c9a21367efe9afe061c8550f"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32032,12 +110508,12 @@
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedLocalVariableInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because '$interfaces' is evaluated at this point",
-            "markdown": "Condition is always 'true' because '$interfaces' is evaluated at this point"
+            "text": "Unused local variable 'e'. The value of the variable is not used anywhere.",
+            "markdown": "Unused local variable 'e'. The value of the variable is not used anywhere."
           },
           "locations": [
             {
@@ -32047,22 +110523,22 @@
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 507,
-                  "startColumn": 13,
-                  "charOffset": 15428,
-                  "charLength": 21,
+                  "startLine": 1162,
+                  "startColumn": 42,
+                  "charOffset": 36628,
+                  "charLength": 2,
                   "snippet": {
-                    "text": "is_array($interfaces)"
+                    "text": "$e"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 505,
+                  "startLine": 1160,
                   "startColumn": 1,
-                  "charOffset": 15362,
-                  "charLength": 140,
+                  "charOffset": 36513,
+                  "charLength": 180,
                   "snippet": {
-                    "text": "        $compiler   = $compilationContext->compiler;\n\n        if (is_array($interfaces)) {\n            $codePrinter->outputBlankLine(true);\n"
+                    "text": "                    $extendsClassDefinition->getName()\n                );\n            } catch (ReflectionException $e) {\n                // Do nothing\n                return false;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32076,9 +110552,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "388429471940f618787be53d9cfebb607abe02909473f435a943948b11b4bf8e"
+            "equalIndicator/v1": "00c6748c69d652175404e60cb78882fb041155dc279c93df65543920d5557d49"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32088,37 +110563,37 @@
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedLocalVariableInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because 'in_array($className, ['self', 'static'])' is already 'false' at this point",
-            "markdown": "Condition is always 'true' because 'in_array($className, \\['self', 'static'\\])' is already 'false' at this point"
+            "text": "Unused local variable 'exit'. The value of the variable is not used anywhere.",
+            "markdown": "Unused local variable 'exit'. The value of the variable is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndexAppend.php",
+                  "uri": "src/Compiler.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 71,
-                  "startColumn": 21,
-                  "charOffset": 2135,
-                  "charLength": 22,
+                  "startLine": 1416,
+                  "startColumn": 33,
+                  "charOffset": 48317,
+                  "charLength": 5,
                   "snippet": {
-                    "text": "'parent' == $className"
+                    "text": "$exit"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 69,
+                  "startLine": 1414,
                   "startColumn": 1,
-                  "charOffset": 2021,
-                  "charLength": 292,
+                  "charOffset": 48247,
+                  "charLength": 150,
                   "snippet": {
-                    "text": "                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();"
+                    "text": "        }, explode('&&', $command));\n\n        exec($command, $output, $exit);\n        $fileName = $this->config->get('extension-name') ?: $namespace;\n"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32132,9 +110607,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "6837f21a2020d4c1cddc38a3505af4f347ae13b03cebfb1451515fc67138fb1b"
+            "equalIndicator/v1": "12be4abb7119f62ee1ef8b1e2ffd283909308cc268f169aab4e37f21a663e360"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32144,37 +110618,37 @@
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedLocalVariableInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because '$optimized' is evaluated at this point",
-            "markdown": "Condition is always 'true' because '$optimized' is evaluated at this point"
+            "text": "Unused local variable 'namespaceName'. The value of the variable is not used anywhere.",
+            "markdown": "Unused local variable 'namespaceName'. The value of the variable is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/ConcatOperator.php",
+                  "uri": "src/Documentation.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 52,
-                  "startColumn": 13,
-                  "charOffset": 1374,
-                  "charLength": 20,
+                  "startLine": 112,
+                  "startColumn": 34,
+                  "charOffset": 2777,
+                  "charLength": 14,
                   "snippet": {
-                    "text": "is_array($optimized)"
+                    "text": "$namespaceName"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 50,
+                  "startLine": 110,
                   "startColumn": 1,
-                  "charOffset": 1252,
-                  "charLength": 262,
+                  "charOffset": 2682,
+                  "charLength": 234,
                   "snippet": {
-                    "text": "         */\n        $optimized = $this->_getOptimizedConcat($expression, $compilationContext, $isFullString);\n        if (is_array($optimized)) {\n            if (!$isFullString) {\n                $expected = $this->getExpectedComplexLiteral($compilationContext);"
+                    "text": "        $byNamespace = $namespaceAccessor->getByNamespace();\n\n        foreach ($byNamespace as $namespaceName => $nh) {\n            // namespace files (namespace/ns1/n2/namespace.html)\n            $nfile = new File\\NamespaceFile($nh);"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32188,9 +110662,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "77863d2ddf259e8d9d2050e9476c36cd5863c97703b9e573c1326f9f568c9d5b"
+            "equalIndicator/v1": "39721715dc8ece8f8ad1ffadb9b81162480d625f1676eb1f36353699e8c011f5"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32200,37 +110673,37 @@
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedLocalVariableInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because 'in_array($className, ['self', 'static'])' is already 'false' at this point",
-            "markdown": "Condition is always 'true' because 'in_array($className, \\['self', 'static'\\])' is already 'false' at this point"
+            "text": "Unused local variable 'e'. The value of the variable is not used anywhere.",
+            "markdown": "Unused local variable 'e'. The value of the variable is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
+                  "uri": "src/FunctionCall.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 66,
-                  "startColumn": 21,
-                  "charOffset": 2000,
-                  "charLength": 22,
+                  "startLine": 144,
+                  "startColumn": 42,
+                  "charOffset": 3989,
+                  "charLength": 2,
                   "snippet": {
-                    "text": "'parent' == $className"
+                    "text": "$e"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 64,
+                  "startLine": 142,
                   "startColumn": 1,
-                  "charOffset": 1886,
-                  "charLength": 292,
+                  "charOffset": 3857,
+                  "charLength": 195,
                   "snippet": {
-                    "text": "                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();"
+                    "text": "            try {\n                $reflectionFunction = new ReflectionFunction($funcName);\n            } catch (ReflectionException $e) {\n                $reflectionFunction = null;\n            }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32244,9 +110717,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "7f5de0870ec898b1680e5cbb4867c23f27372c9a67e3b0c0e52697531ce92690"
+            "equalIndicator/v1": "8a17ec6817d93474eb576b91ef32331030a883fc65149bedfe16b275790c458e"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32256,37 +110728,37 @@
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedLocalVariableInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because 'string $url' is evaluated at this point",
-            "markdown": "Condition is always 'true' because 'string $url' is evaluated at this point"
+            "text": "Unused local variable 'e'. The value of the variable is not used anywhere.",
+            "markdown": "Unused local variable 'e'. The value of the variable is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Documentation/Template.php",
+                  "uri": "src/Class/Definition/Definition.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 133,
-                  "startColumn": 13,
-                  "charOffset": 3168,
-                  "charLength": 15,
+                  "startLine": 257,
+                  "startColumn": 50,
+                  "charOffset": 6714,
+                  "charLength": 2,
                   "snippet": {
-                    "text": "is_string($url)"
+                    "text": "$e"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 131,
+                  "startLine": 255,
                   "startColumn": 1,
-                  "charOffset": 3105,
-                  "charLength": 181,
+                  "charOffset": 6569,
+                  "charLength": 254,
                   "snippet": {
-                    "text": "    public function url(string $url): string\n    {\n        if (is_string($url)) {\n            if ('/' == $url[0]) {\n                return $this->getPathToRoot() . ltrim($url, '/');"
+                    "text": "                    try {\n                        $params['default'] = $row->getDefaultValue();\n                    } catch (ReflectionException $e) {\n                        // TODO: dummy default value\n                        $params['default'] = true;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32300,9 +110772,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "a30521646e25186b820c1c400e05b20589e14a2b4336f4e4f44b8ae2be54c276"
+            "equalIndicator/v1": "dd172497a067d3a4629e1e9bac11447b148ca0940da6f974951f2a88d4ba9c9e"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32312,37 +110783,37 @@
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because 'in_array($className, ['self', 'static'])' is already 'false' at this point",
-            "markdown": "Condition is always 'true' because 'in_array($className, \\['self', 'static'\\])' is already 'false' at this point"
+            "text": "Unused parameter 'calleeDefinition'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'calleeDefinition'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/StaticPropertyArrayIndex.php",
+                  "uri": "src/Call.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 68,
-                  "startColumn": 21,
-                  "charOffset": 2076,
-                  "charLength": 22,
+                  "startLine": 389,
+                  "startColumn": 9,
+                  "charOffset": 14906,
+                  "charLength": 17,
                   "snippet": {
-                    "text": "'parent' == $className"
+                    "text": "$calleeDefinition"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 66,
+                  "startLine": 387,
                   "startColumn": 1,
-                  "charOffset": 1962,
-                  "charLength": 292,
+                  "charOffset": 14823,
+                  "charLength": 179,
                   "snippet": {
-                    "text": "                $classDefinition = $compilationContext->classDefinition;\n            } else {\n                if ('parent' == $className) {\n                    $classDefinition = $compilationContext->classDefinition;\n                    $extendsClass    = $classDefinition->getExtendsClass();"
+                    "text": "        CompilationContext $compilationContext,\n        array $expression,\n        $calleeDefinition = null\n    ): array {\n        $codePrinter = $compilationContext->codePrinter;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32356,9 +110827,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "b5c352b560807d2a81a76c4accd132f5224c98a579b2340b413bd225439582ac"
+            "equalIndicator/v1": "16e1b010249489ecc7a9a9b908bf0710f37daa151cf3a56b2cc892b517b36fb9"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32368,37 +110838,37 @@
           }
         },
         {
-          "ruleId": "PhpConditionAlreadyCheckedInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is always 'true' because 'is_string($url)' is already 'true' at this point",
-            "markdown": "Condition is always 'true' because 'is_string($url)' is already 'true' at this point"
+            "text": "Unused parameter 'variable'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'variable'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Documentation/Template.php",
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 136,
-                  "startColumn": 23,
-                  "charOffset": 3309,
-                  "charLength": 15,
+                  "startLine": 167,
+                  "startColumn": 9,
+                  "charOffset": 4837,
+                  "charLength": 9,
                   "snippet": {
-                    "text": "is_string($url)"
+                    "text": "$variable"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 134,
+                  "startLine": 165,
                   "startColumn": 1,
-                  "charOffset": 3187,
-                  "charLength": 183,
+                  "charOffset": 4765,
+                  "charLength": 164,
                   "snippet": {
-                    "text": "            if ('/' == $url[0]) {\n                return $this->getPathToRoot() . ltrim($url, '/');\n            } elseif (is_string($url)) {\n                return $url;\n            }"
+                    "text": "     */\n    protected function _assignPropertyArraySingleIndex(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32412,9 +110882,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "c86cfd8ad97a38eaa1bcf974efc06d210d0f2262cac82c820632261a03ba22a5"
+            "equalIndicator/v1": "1a18e75b739cc9ca335d47dc02836a015fd952fba09a8356b22367394d49fb78"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32424,37 +110893,37 @@
           }
         },
         {
-          "ruleId": "PhpConditionCheckedByNextConditionInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Condition is unnecessary because it is checked by '$expr instanceof self'",
-            "markdown": "Condition is unnecessary because it is checked by '$expr instanceof self'"
+            "text": "Unused parameter 'variable'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'variable'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Expression/Builder/AbstractBuilder.php",
+                  "uri": "src/Statements/Let/ObjectPropertyArrayIndex.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 160,
-                  "startColumn": 13,
-                  "charOffset": 2965,
-                  "charLength": 16,
+                  "startLine": 102,
+                  "startColumn": 9,
+                  "charOffset": 2771,
+                  "charLength": 9,
                   "snippet": {
-                    "text": "is_object($expr)"
+                    "text": "$variable"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 158,
+                  "startLine": 100,
                   "startColumn": 1,
-                  "charOffset": 2942,
-                  "charLength": 112,
+                  "charOffset": 2697,
+                  "charLength": 166,
                   "snippet": {
-                    "text": "        }\n\n        if (is_object($expr) && $expr instanceof self) {\n            return $expr->build();\n        }"
+                    "text": "     */\n    protected function _assignPropertyArrayMultipleIndex(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32468,9 +110937,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "40d0b747a1f8e7c33d39dd31021acb642bcd03ec2203fdc91eb625ec985aab8c"
+            "equalIndicator/v1": "206803c3814fae7b71300731002a5f603b5058c522af18a49496d138dc6019e6"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32480,37 +110948,37 @@
           }
         },
         {
-          "ruleId": "PhpDeprecationInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Method 'removeMemoryStackReferences' is deprecated",
-            "markdown": "Method 'removeMemoryStackReferences' is deprecated"
+            "text": "Unused parameter 'call'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'call'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Class/Method/Method.php",
+                  "uri": "src/Types/CharType.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 1458,
-                  "startColumn": 24,
-                  "charOffset": 57039,
-                  "charLength": 27,
+                  "startLine": 44,
+                  "startColumn": 81,
+                  "charOffset": 1063,
+                  "charLength": 5,
                   "snippet": {
-                    "text": "removeMemoryStackReferences"
+                    "text": "$call"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 1456,
+                  "startLine": 42,
                   "startColumn": 1,
-                  "charOffset": 56919,
-                  "charLength": 202,
+                  "charOffset": 950,
+                  "charLength": 199,
                   "snippet": {
-                    "text": "         * Remove macros that grow/restore the memory frame stack if it wasn't used.\n         */\n        $code = $this->removeMemoryStackReferences($symbolTable, $codePrinter->getOutput());\n\n        /**"
+                    "text": "     * @throws Exception\n     */\n    public function toHex($caller, CompilationContext $compilationContext, Call $call, array $expression)\n    {\n        $exprBuilder  = BuilderFactory::getInstance();"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32524,9 +110992,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "7396fe10dd43e57c19745f441a70348431044417934c9e2c2151a535531e8094"
+            "equalIndicator/v1": "235cbf5ab9bc1f0906e88d546f09f786b5542b72bb9c46511d81d8f40856cdd3"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32536,37 +111003,37 @@
           }
         },
         {
-          "ruleId": "PhpDocFieldTypeMismatchInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Property type does not match",
-            "markdown": "Property type does not match"
+            "text": "Unused parameter 'context'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'context'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/SymbolTable.php",
+                  "uri": "src/Operators/Other/InstanceOfOperator.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 49,
-                  "startColumn": 8,
-                  "charOffset": 925,
-                  "charLength": 21,
+                  "startLine": 141,
+                  "startColumn": 79,
+                  "charOffset": 6121,
+                  "charLength": 8,
                   "snippet": {
-                    "text": "@var LocalContextPass"
+                    "text": "$context"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 47,
+                  "startLine": 139,
                   "startColumn": 1,
-                  "charOffset": 909,
-                  "charLength": 99,
+                  "charOffset": 6036,
+                  "charLength": 175,
                   "snippet": {
-                    "text": "\n    /**\n     * @var LocalContextPass\n     */\n    protected ?LocalContextPass $localContext = null;"
+                    "text": "    }\n\n    private function prepareBackendSpecificCode($variable, CompilationContext $context): string\n    {\n        return strtr('Z_STRVAL_P(:p:name), Z_STRLEN_P(:p:name)', ["
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32580,9 +111047,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "34b9c7787e54cca9109c76146fb5dd81a54415ad7706a10cb41622fca0a7df72"
+            "equalIndicator/v1": "2ed75b35db3f366332e4c78c8e57d9a3050d47c13dc8dcc8d3df6a28eede1a25"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32592,37 +111058,37 @@
           }
         },
         {
-          "ruleId": "PhpDocMissingThrowsInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "PHPDoc comment doesn't contain all the necessary @throws tags",
-            "markdown": "PHPDoc comment doesn't contain all the necessary @throws tags"
+            "text": "Unused parameter 'property'. The parameter's value is overwritten immediately.",
+            "markdown": "Unused parameter 'property'. The parameter's value is overwritten immediately."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/ArrayIndex.php",
+                  "uri": "src/Statements/Let/StaticPropertyAppend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 114,
-                  "startColumn": 8,
-                  "charOffset": 3341,
-                  "charLength": 17,
+                  "startLine": 136,
+                  "startColumn": 16,
+                  "charOffset": 4499,
+                  "charLength": 9,
                   "snippet": {
-                    "text": "@throws Exception"
+                    "text": "$property"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 112,
+                  "startLine": 134,
                   "startColumn": 1,
-                  "charOffset": 3294,
-                  "charLength": 122,
+                  "charOffset": 4399,
+                  "charLength": 200,
                   "snippet": {
-                    "text": "     *\n     * @throws CompilerException\n     * @throws Exception\n     */\n    protected function _assignArrayIndexMultiple("
+                    "text": "    protected function _assignStaticPropertyArrayMultipleIndex(\n        $classEntry,\n        string $property,\n        CompiledExpression $resolvedExpr,\n        CompilationContext $compilationContext,"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32636,9 +111102,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "639491302fec5cd8545ca8fc36cadce5bbfc5cf33d5a758494c16553f9b4ad4a"
+            "equalIndicator/v1": "4cd7511adf37d4beb02f429809a179779e584b61408e7536f1029fda9e4f8051"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32648,37 +111113,37 @@
           }
         },
         {
-          "ruleId": "PhpDocSignatureInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Argument type does not match the declared",
-            "markdown": "Argument type does not match the declared"
+            "text": "Unused parameter 'call'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'call'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/Let/ExportSymbolString.php",
+                  "uri": "src/Types/ArrayType.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 34,
-                  "startColumn": 8,
-                  "charOffset": 773,
-                  "charLength": 47,
+                  "startLine": 93,
+                  "startColumn": 80,
+                  "charOffset": 3034,
+                  "charLength": 5,
                   "snippet": {
-                    "text": "@param CompilationContext $compilationContext ,"
+                    "text": "$call"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 32,
+                  "startLine": 91,
                   "startColumn": 1,
-                  "charOffset": 670,
-                  "charLength": 202,
+                  "charOffset": 2922,
+                  "charLength": 211,
                   "snippet": {
-                    "text": "     * @param ZephirVariable     $symbolVariable\n     * @param CompiledExpression $resolvedExpr\n     * @param CompilationContext $compilationContext ,\n     * @param array              $statement\n     */"
+                    "text": "     * @throws Exception\n     */\n    public function join($caller, CompilationContext $compilationContext, Call $call, array $expression)\n    {\n        $functionCall = BuilderFactory::getInstance()->statements()"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32692,9 +111157,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "96692b641ca56badc02ece320184e765c799b340be00e9246379d1e953134fcc"
+            "equalIndicator/v1": "9a36baa21707a9d91174f6bce42352d49d4b5efa0417f8382867ebfa2d1c16f8"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32704,37 +111168,37 @@
           }
         },
         {
-          "ruleId": "PhpDocSignatureInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Return type does not match the declared",
-            "markdown": "Return type does not match the declared"
+            "text": "Unused parameter 'output'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'output'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Statements/ForStatement.php",
+                  "uri": "src/Console/Command/ApiCommand.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 945,
-                  "startColumn": 8,
-                  "charOffset": 34022,
-                  "charLength": 20,
+                  "startLine": 88,
+                  "startColumn": 71,
+                  "charOffset": 2506,
+                  "charLength": 7,
                   "snippet": {
-                    "text": "@return LetStatement"
+                    "text": "$output"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 943,
+                  "startLine": 86,
                   "startColumn": 1,
-                  "charOffset": 33955,
-                  "charLength": 133,
+                  "charOffset": 2429,
+                  "charLength": 123,
                   "snippet": {
-                    "text": "     * @param CompilationContext $compilationContext\n     *\n     * @return LetStatement\n     */\n    private function getLetStatement("
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output)\n    {\n        $options = array_merge("
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32748,9 +111212,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "d7f3248a0b3d8e6fac793009a2ce7c8c955a70462594b98a6f2efeee5033d860"
+            "equalIndicator/v1": "adf6d5c89b53aa8bc97090004799b903fe2a14c4a7bb35825207e1e2b86b9423"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32760,37 +111223,37 @@
           }
         },
         {
-          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "PHPDoc comment signature is not complete",
-            "markdown": "PHPDoc comment signature is not complete"
+            "text": "Unused parameter 'context'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'context'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Traits/VariablesTrait.php",
+                  "uri": "src/Backend/Backend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 53,
-                  "startColumn": 5,
-                  "charOffset": 1294,
-                  "charLength": 3,
+                  "startLine": 1384,
+                  "startColumn": 77,
+                  "charOffset": 49010,
+                  "charLength": 8,
                   "snippet": {
-                    "text": "/**"
+                    "text": "$context"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 51,
+                  "startLine": 1382,
                   "startColumn": 1,
-                  "charOffset": 1283,
-                  "charLength": 65,
+                  "charOffset": 48904,
+                  "charLength": 193,
                   "snippet": {
-                    "text": "    }\n\n    /**\n     * Check whether a class has a property\n     *"
+                    "text": "     * @return string\n     */\n    public function getInternalSignature(Method $method, CompilationContext $context): string\n    {\n        if ($method->isInitializer() && !$method->isStatic()) {"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32804,9 +111267,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "cdba39ccc70934f7041973f3dd2bb5c52517ca73c9369bfb4582e2eb0b94e648"
+            "equalIndicator/v1": "ae1b3f7ed45f86730858495f2e109beb675baadef00d31fb7514be2516bcf530"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32816,37 +111278,37 @@
           }
         },
         {
-          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "PHPDoc comment signature is not complete",
-            "markdown": "PHPDoc comment signature is not complete"
+            "text": "Unused parameter 'output'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'output'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Traits/VariablesTrait.php",
+                  "uri": "src/Console/Command/InitCommand.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 34,
-                  "startColumn": 6,
-                  "charOffset": 756,
-                  "charLength": 2,
+                  "startLine": 81,
+                  "startColumn": 71,
+                  "charOffset": 2055,
+                  "charLength": 7,
                   "snippet": {
-                    "text": "*/"
+                    "text": "$output"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 32,
+                  "startLine": 79,
                   "startColumn": 1,
-                  "charOffset": 724,
-                  "charLength": 125,
+                  "charOffset": 1978,
+                  "charLength": 177,
                   "snippet": {
-                    "text": "     *\n     * @return void\n     */\n    protected function checkAccessNonStaticProperty(\n        Property $propertyDefinition,"
+                    "text": "    }\n\n    protected function execute(InputInterface $input, OutputInterface $output): int\n    {\n        $namespace = $this->sanitizeNamespace($input->getArgument('namespace'));"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32860,9 +111322,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "d6b49f0574e9f7a971dac1029ca72eac46b5a1a68b35009c1c5a1be048f1de5d"
+            "equalIndicator/v1": "c3853f2f03510447fc448e1460c729b0057961cb0d453ce0e95a26b72b2628b7"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32872,37 +111333,37 @@
           }
         },
         {
-          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "PHPDoc comment signature is not complete",
-            "markdown": "PHPDoc comment signature is not complete"
+            "text": "Unused parameter 'variable'. The parameter's value is overwritten immediately.",
+            "markdown": "Unused parameter 'variable'. The parameter's value is overwritten immediately."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Traits/VariablesTrait.php",
+                  "uri": "src/Statements/Let/ExportSymbol.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 26,
-                  "startColumn": 5,
-                  "charOffset": 556,
-                  "charLength": 3,
+                  "startLine": 37,
+                  "startColumn": 9,
+                  "charOffset": 925,
+                  "charLength": 9,
                   "snippet": {
-                    "text": "/**"
+                    "text": "$variable"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 24,
+                  "startLine": 35,
                   "startColumn": 1,
-                  "charOffset": 529,
-                  "charLength": 81,
+                  "charOffset": 881,
+                  "charLength": 150,
                   "snippet": {
-                    "text": "trait VariablesTrait\n{\n    /**\n     * Check whether a class has a property\n     *"
+                    "text": "     */\n    public function assign(\n        $variable,\n        ZephirVariable $symbolVariable = null,\n        CompiledExpression $resolvedExpr = null,"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32916,9 +111377,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "d8fc7944b03e4b505cc9baa64309ba1ac7687557faafee3dc3fb0e38b3c927ad"
+            "equalIndicator/v1": "cbfc8418119d4412eae974b6a699df9b6569c48eef665e7aef369c0ba8509428"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32928,37 +111388,37 @@
           }
         },
         {
-          "ruleId": "PhpDocSignatureIsNotCompleteInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "PHPDoc comment signature is not complete",
-            "markdown": "PHPDoc comment signature is not complete"
+            "text": "Unused parameter 'symbolVariable'. The parameter's value is overwritten immediately.",
+            "markdown": "Unused parameter 'symbolVariable'. The parameter's value is overwritten immediately."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Traits/VariablesTrait.php",
+                  "uri": "src/Statements/Let/ArrayIndex.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 61,
-                  "startColumn": 6,
-                  "charOffset": 1494,
-                  "charLength": 2,
+                  "startLine": 118,
+                  "startColumn": 24,
+                  "charOffset": 3448,
+                  "charLength": 15,
                   "snippet": {
-                    "text": "*/"
+                    "text": "$symbolVariable"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 59,
+                  "startLine": 116,
                   "startColumn": 1,
-                  "charOffset": 1462,
-                  "charLength": 117,
+                  "charOffset": 3356,
+                  "charLength": 198,
                   "snippet": {
-                    "text": "     *\n     * @return void\n     */\n    protected function checkClassHasProperty(\n        Definition $classDefinition,"
+                    "text": "    protected function _assignArrayIndexMultiple(\n        $variable,\n        ZephirVariable $symbolVariable,\n        CompiledExpression $resolvedExpr,\n        CompilationContext $compilationContext,"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -32972,9 +111432,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "f06a836071c2c373655cfc8f599e556d5abfa79a68b93948001f4ab6594599b6"
+            "equalIndicator/v1": "e81c70c9e83a9869b6df9499f5c65f3ab697e76a0bac3caf09d2245f9bb48c0e"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -32984,37 +111443,37 @@
           }
         },
         {
-          "ruleId": "PhpDuplicateSwitchCaseBodyInspection",
+          "ruleId": "PhpUnusedParameterInspection",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch",
-            "markdown": "Branch in 'switch' is a duplicate of 'case 'ulong'' branch"
+            "text": "Unused parameter 'context'. The parameter's value is not used anywhere.",
+            "markdown": "Unused parameter 'context'. The parameter's value is not used anywhere."
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Arithmetical/ArithmeticalBaseOperator.php",
+                  "uri": "src/Backend/Backend.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 111,
-                  "startColumn": 29,
-                  "charOffset": 3853,
-                  "charLength": 362,
+                  "startLine": 303,
+                  "startColumn": 95,
+                  "charOffset": 9052,
+                  "charLength": 8,
                   "snippet": {
-                    "text": "case 'bool':\n                                return new CompiledExpression(\n                                    'int',\n                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(\n                                    ) . ')',\n                                    $expression\n                                );"
+                    "text": "$context"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 109,
+                  "startLine": 301,
                   "startColumn": 1,
-                  "charOffset": 3789,
-                  "charLength": 470,
+                  "charOffset": 8951,
+                  "charLength": 168,
                   "snippet": {
-                    "text": "                                );\n\n                            case 'bool':\n                                return new CompiledExpression(\n                                    'int',\n                                    '(' . $left->getCode() . ' ' . $this->operator . ' ' . $variableRight->getName(\n                                    ) . ')',\n                                    $expression\n                                );\n\n                            case 'double':"
+                    "text": "    }\n\n    public function arrayIsset2(Variable $var, $resolvedExpr, $expression, CompilationContext $context)\n    {\n        if (!($resolvedExpr instanceof Variable)) {"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -33028,9 +111487,8 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "8ac7868a4ca09e6833fb99c7383b0b551295344932723aa0db062870f062b6f8"
+            "equalIndicator/v1": "ec63033ea941b3ac966a865ecef87f7e013586e960e212e39488ad0d8583f1ae"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
@@ -33040,37 +111498,37 @@
           }
         },
         {
-          "ruleId": "PhpElementIsNotAvailableInCurrentPhpVersionInspection",
+          "ruleId": "PhpVoidFunctionResultUsedInspection",
           "kind": "fail",
-          "level": "error",
+          "level": "warning",
           "message": {
-            "text": "'ReturnTypeWillChange' is available starting with 8.1 PHP version",
-            "markdown": "'ReturnTypeWillChange' is available starting with 8.1 PHP version"
+            "text": "'void' method 'compileIterator' result used",
+            "markdown": "'void' method 'compileIterator' result used"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Config.php",
+                  "uri": "src/Statements/ForStatement.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 18,
-                  "startColumn": 5,
-                  "charOffset": 316,
-                  "charLength": 20,
+                  "startLine": 58,
+                  "startColumn": 27,
+                  "charOffset": 1489,
+                  "charLength": 53,
                   "snippet": {
-                    "text": "ReturnTypeWillChange"
+                    "text": "$this->compileIterator($exprRaw, $compilationContext)"
                   },
                   "sourceLanguage": "PHP"
                 },
                 "contextRegion": {
-                  "startLine": 16,
+                  "startLine": 56,
                   "startColumn": 1,
-                  "charOffset": 273,
-                  "charLength": 96,
+                  "charOffset": 1411,
+                  "charLength": 201,
                   "snippet": {
-                    "text": "use ArrayAccess;\nuse JsonSerializable;\nuse ReturnTypeWillChange;\n\nuse function array_key_exists;"
+                    "text": "\n            if ('iterator' === $exprRaw['name']) {\n                $status = $this->compileIterator($exprRaw, $compilationContext);\n                if (false !== $status) {\n                    return;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -33084,49 +111542,143 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "4784c30899df298a1c80ac8a4013c87998109e10a00d21af559493908eda78c1"
+            "equalIndicator/v1": "c309cf8155e3555a8293a95cea9a2d4131cf63c8f3d9fcf1da18f10d6098efd7"
           },
-          "baselineState": "unchanged",
           "properties": {
-            "ideaSeverity": "ERROR",
-            "qodanaSeverity": "Critical",
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
             "tags": [
               "PHP"
             ]
           }
         },
         {
-          "ruleId": "PhpFieldAssignmentTypeMismatchInspection",
+          "ruleId": "PhpVulnerablePathsInspection",
           "kind": "fail",
           "level": "warning",
           "message": {
-            "text": "Incompatible types: Expected property of type 'null|\\Psr\\Log\\LoggerInterface', '\\Psr\\Log\\NullLogger' provided",
-            "markdown": "Incompatible types: Expected property of type 'null\\|\\\\Psr\\\\Log\\\\LoggerInterface', '\\\\Psr\\\\Log\\\\NullLogger' provided"
+            "text": "Vulnerable code flow",
+            "markdown": "Vulnerable code flow"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFileAnonymous.php",
+                  "uri": "templates/Api/themes/zephir/partials/source.phtml",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 95,
-                  "startColumn": 9,
-                  "charOffset": 2689,
-                  "charLength": 51,
+                  "startLine": 43,
+                  "startColumn": 1,
+                  "charOffset": 1286,
+                  "charLength": 139,
                   "snippet": {
-                    "text": "$compilationContext->logger         = $this->logger"
+                    "text": "\n</div>\n\n<pre class=\"zephir-source-file prettyprint linenums\">\n    <?= file_get_contents(realpath($compilerFile->getFilePath())) ?>\n</pre>\n"
                   },
                   "sourceLanguage": "PHP"
+                }
+              },
+              "relationships": [
+                {
+                  "target": 1,
+                  "kinds": [
+                    "includes"
+                  ]
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "fbb12c6cf95fa45eb8c42c7f3119388a9694f22ad8284953aea3ca7e796a1015"
+          },
+          "graphs": [
+            {
+              "nodes": [
+                {
+                  "id": "1",
+                  "location": {
+                    "physicalLocation": {
+                      "artifactLocation": {
+                        "uri": "templates/Api/themes/zephir/partials/source.phtml",
+                        "uriBaseId": "SRCROOT"
+                      },
+                      "region": {
+                        "startLine": 47,
+                        "startColumn": 9,
+                        "charOffset": 1357,
+                        "charLength": 57,
+                        "snippet": {
+                          "text": "file_get_contents(realpath($compilerFile->getFilePath()))"
+                        },
+                        "sourceLanguage": "PHP"
+                      }
+                    }
+                  },
+                  "properties": {
+                    "successors": [],
+                    "predecessors": [],
+                    "sanitized_vulnerabilities": []
+                  }
+                }
+              ],
+              "edges": []
+            }
+          ],
+          "properties": {
+            "sources": [
+              {
+                "file": "file://$PROJECT_DIR$/templates/Api/themes/zephir/partials/source.phtml",
+                "sanitized_vulnerabilities": [],
+                "text": "file_get_contents(realpath($compilerFile->getFilePath()))",
+                "order": "1"
+              }
+            ],
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "sink": {
+              "text": "file_get_contents(realpath($compilerFile->getFilePath()))",
+              "fqn": "\\echo",
+              "vulnerabilities": [
+                "XSS"
+              ]
+            },
+            "tags": [
+              "PHP"
+            ]
+          }
+        },
+        {
+          "ruleId": "RegExpRedundantEscape",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Redundant character escape '\\#' in RegExp",
+            "markdown": "Redundant character escape `\\#` in RegExp"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2071,
+                  "startColumn": 35,
+                  "charOffset": 68885,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "\\#"
+                  },
+                  "sourceLanguage": "RegExp"
                 },
                 "contextRegion": {
-                  "startLine": 93,
+                  "startLine": 2069,
                   "startColumn": 1,
-                  "charOffset": 2563,
-                  "charLength": 307,
+                  "charOffset": 68794,
+                  "charLength": 259,
                   "snippet": {
-                    "text": "        $compilationContext->compiler       = $compiler;\n        $compilationContext->config         = $this->config;\n        $compilationContext->logger         = $this->logger;\n        $compilationContext->stringsManager = $stringsManager;\n        $compilationContext->backend        = $compiler->backend;"
+                    "text": "\n            foreach (file($constantsSource) as $line) {\n                if (preg_match('/^\\#define[ \\t]+([A-Z0-9\\_]+)[ \\t]+([0-9]+)/', $line, $matches)) {\n                    $this->constants[$matches[1]] = ['int', $matches[2]];\n                    continue;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -33140,49 +111692,48 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "52956a1b95edf8732f4d3feffd38ef990ce10eeeb23954de17701ccd4cef5d01"
+            "equalIndicator/v1": "55bbe496b5d7b31ec881efa363c7fc2800d4b622b1a7a215f3c8526d555347e2"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WARNING",
             "qodanaSeverity": "High",
             "tags": [
-              "PHP"
+              "RegExp"
             ]
           }
         },
         {
-          "ruleId": "PhpFieldAssignmentTypeMismatchInspection",
+          "ruleId": "RegExpRedundantEscape",
           "kind": "fail",
           "level": "warning",
           "message": {
-            "text": "Incompatible types: Expected property of type 'null|\\Psr\\Log\\LoggerInterface', '\\Psr\\Log\\NullLogger' provided",
-            "markdown": "Incompatible types: Expected property of type 'null\\|\\\\Psr\\\\Log\\\\LoggerInterface', '\\\\Psr\\\\Log\\\\NullLogger' provided"
+            "text": "Redundant character escape '\\_' in RegExp",
+            "markdown": "Redundant character escape `\\_` in RegExp"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/CompilerFile.php",
+                  "uri": "src/Compiler.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 600,
-                  "startColumn": 9,
-                  "charOffset": 19008,
-                  "charLength": 49,
+                  "startLine": 2071,
+                  "startColumn": 57,
+                  "charOffset": 68907,
+                  "charLength": 2,
                   "snippet": {
-                    "text": "$compilationContext->logger       = $this->logger"
+                    "text": "\\_"
                   },
-                  "sourceLanguage": "PHP"
+                  "sourceLanguage": "RegExp"
                 },
                 "contextRegion": {
-                  "startLine": 598,
+                  "startLine": 2069,
                   "startColumn": 1,
-                  "charOffset": 18886,
-                  "charLength": 301,
+                  "charOffset": 68794,
+                  "charLength": 259,
                   "snippet": {
-                    "text": "        $compilationContext->compiler     = $compiler;\n        $compilationContext->config       = $this->config;\n        $compilationContext->logger       = $this->logger;\n        $compilationContext->aliasManager = $this->aliasManager;\n        $compilationContext->backend      = $compiler->backend;"
+                    "text": "\n            foreach (file($constantsSource) as $line) {\n                if (preg_match('/^\\#define[ \\t]+([A-Z0-9\\_]+)[ \\t]+([0-9]+)/', $line, $matches)) {\n                    $this->constants[$matches[1]] = ['int', $matches[2]];\n                    continue;"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -33196,49 +111747,103 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "9f2530558094bcf672efc0cabe088629aafab7dfdb85a1b264ae2ebcc4c19e35"
+            "equalIndicator/v1": "751dad78fca54e75105b6adc237c62bcd464d72357db6941134cab983be194ba"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WARNING",
             "qodanaSeverity": "High",
             "tags": [
-              "PHP"
+              "RegExp"
             ]
           }
         },
         {
-          "ruleId": "PhpMissingParamTypeInspection",
+          "ruleId": "RegExpRedundantEscape",
           "kind": "fail",
-          "level": "note",
+          "level": "warning",
           "message": {
-            "text": "Missing parameter's type declaration",
-            "markdown": "Missing parameter's type declaration"
+            "text": "Redundant character escape '\\_' in RegExp",
+            "markdown": "Redundant character escape `\\_` in RegExp"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/Operators/Other/UnlikelyOperator.php",
+                  "uri": "src/Compiler.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 43,
-                  "startColumn": 29,
-                  "charOffset": 1020,
-                  "charLength": 11,
+                  "startLine": 2075,
+                  "startColumn": 57,
+                  "charOffset": 69128,
+                  "charLength": 2,
                   "snippet": {
-                    "text": "$expression"
+                    "text": "\\_"
+                  },
+                  "sourceLanguage": "RegExp"
+                },
+                "contextRegion": {
+                  "startLine": 2073,
+                  "startColumn": 1,
+                  "charOffset": 69024,
+                  "charLength": 243,
+                  "snippet": {
+                    "text": "                    continue;\n                }\n                if (preg_match('/^\\#define[ \\t]+([A-Z0-9\\_]+)[ \\t]+(\\'(.){1}\\')/', $line, $matches)) {\n                    $this->constants[$matches[1]] = ['char', $matches[3]];\n                }"
                   },
                   "sourceLanguage": "PHP"
+                }
+              },
+              "logicalLocations": [
+                {
+                  "fullyQualifiedName": "project",
+                  "kind": "module"
+                }
+              ]
+            }
+          ],
+          "partialFingerprints": {
+            "equalIndicator/v1": "8797007a4c93c2bf1eca29dfb7ecdde078c9816b9cd75cb3d608c5e5ef08ffab"
+          },
+          "properties": {
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
+            "tags": [
+              "RegExp"
+            ]
+          }
+        },
+        {
+          "ruleId": "RegExpRedundantEscape",
+          "kind": "fail",
+          "level": "warning",
+          "message": {
+            "text": "Redundant character escape '\\#' in RegExp",
+            "markdown": "Redundant character escape `\\#` in RegExp"
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "src/Compiler.php",
+                  "uriBaseId": "SRCROOT"
+                },
+                "region": {
+                  "startLine": 2075,
+                  "startColumn": 35,
+                  "charOffset": 69106,
+                  "charLength": 2,
+                  "snippet": {
+                    "text": "\\#"
+                  },
+                  "sourceLanguage": "RegExp"
                 },
                 "contextRegion": {
-                  "startLine": 41,
+                  "startLine": 2073,
                   "startColumn": 1,
-                  "charOffset": 949,
-                  "charLength": 192,
+                  "charOffset": 69024,
+                  "charLength": 243,
                   "snippet": {
-                    "text": "     * @throws ReflectionException\n     */\n    public function compile($expression, CompilationContext $compilationContext): CompiledExpression\n    {\n        if (!isset($expression['left'])) {"
+                    "text": "                    continue;\n                }\n                if (preg_match('/^\\#define[ \\t]+([A-Z0-9\\_]+)[ \\t]+(\\'(.){1}\\')/', $line, $matches)) {\n                    $this->constants[$matches[1]] = ['char', $matches[3]];\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -33252,49 +111857,48 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "6c608f3473df452e0d9efe5ac036eca02df35cb9c9fd4c14ed6abdde62609454"
+            "equalIndicator/v1": "c6b165008e5487e1323819e02bb04a6abf9fc44738213f81258a1d2a9ce42ba3"
           },
-          "baselineState": "unchanged",
           "properties": {
-            "ideaSeverity": "WEAK WARNING",
-            "qodanaSeverity": "Moderate",
+            "ideaSeverity": "WARNING",
+            "qodanaSeverity": "High",
             "tags": [
-              "PHP"
+              "RegExp"
             ]
           }
         },
         {
-          "ruleId": "PhpVarTagWithoutVariableNameInspection",
+          "ruleId": "RegExpSimplifiable",
           "kind": "fail",
           "level": "note",
           "message": {
-            "text": "Doc tag without variable name doesn't provide type information for any expression",
-            "markdown": "Doc tag without variable name doesn't provide type information for any expression"
+            "text": "'{1}' is redundant",
+            "markdown": "`{1}` is redundant"
           },
           "locations": [
             {
               "physicalLocation": {
                 "artifactLocation": {
-                  "uri": "src/MethodCall.php",
+                  "uri": "src/Compiler.php",
                   "uriBaseId": "SRCROOT"
                 },
                 "region": {
-                  "startLine": 91,
-                  "startColumn": 32,
-                  "charOffset": 2649,
-                  "charLength": 17,
+                  "startLine": 2075,
+                  "startColumn": 74,
+                  "charOffset": 69145,
+                  "charLength": 3,
                   "snippet": {
-                    "text": "@var AbstractType"
+                    "text": "{1}"
                   },
-                  "sourceLanguage": "PHP"
+                  "sourceLanguage": "RegExp"
                 },
                 "contextRegion": {
-                  "startLine": 89,
+                  "startLine": 2073,
                   "startColumn": 1,
-                  "charOffset": 2523,
+                  "charOffset": 69024,
                   "charLength": 243,
                   "snippet": {
-                    "text": "                        if (class_exists($builtInTypeClass)) {\n                            /**\n                             * @var AbstractType\n                             */\n                            $builtInType = new $builtInTypeClass();"
+                    "text": "                    continue;\n                }\n                if (preg_match('/^\\#define[ \\t]+([A-Z0-9\\_]+)[ \\t]+(\\'(.){1}\\')/', $line, $matches)) {\n                    $this->constants[$matches[1]] = ['char', $matches[3]];\n                }"
                   },
                   "sourceLanguage": "PHP"
                 }
@@ -33308,21 +111912,20 @@
             }
           ],
           "partialFingerprints": {
-            "equalIndicator/v1": "7a9b26a98853332953d1eb416c2b687a02a7b6f4a9c2477ef14b4c6257d2662f"
+            "equalIndicator/v1": "a6493845445e0e7b4ef35d1e59bb8c6b9ca5f7f5b1c1818ff054db58a267f1cf"
           },
-          "baselineState": "unchanged",
           "properties": {
             "ideaSeverity": "WEAK WARNING",
             "qodanaSeverity": "Moderate",
             "tags": [
-              "PHP"
+              "RegExp"
             ]
           }
         }
       ],
       "automationDetails": {
-        "id": "project/qodana/2023-11-30",
-        "guid": "d4cffa2a-172c-40fb-940d-4831b7efc77b",
+        "id": "project/qodana/2023-12-07",
+        "guid": "a73614b4-eeb6-4985-99a4-296503f9a841",
         "properties": {
           "jobUrl": ""
         }
diff --git a/qodana.yaml b/qodana.yaml
index 160c0077ca..5b01e8c468 100644
--- a/qodana.yaml
+++ b/qodana.yaml
@@ -33,11 +33,14 @@ exclude:
   - name: All
     paths:
       - config
+      - ext
       - kernel
       - prototypes
       - stub
       - templates
+      - tests
       - vendor
+
 include:
   - name: CheckDependencyLicenses
   - name: PhpVulnerablePathsInspection

From 04780174a8e600f56d950326421e14afc5818b37 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 17 Dec 2023 12:20:39 +0000
Subject: [PATCH 315/375] Fix docblock

---
 src/Backend/Backend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index c07625b3b1..df0c19f471 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -938,7 +938,7 @@ public function declareVariables($method, $typeToVariables)
             $groupVariables = [];
 
             /**
-             * @var Variable[] $variable
+             * @var Variable[] $variables
              */
             foreach ($variables as $variable) {
                 $nextCode = $this->generateInitCode($groupVariables, $type, $pointer, $variable);

From f610d9265de40b2a5395f0889636d816bccceabf Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 17 Dec 2023 14:11:43 +0000
Subject: [PATCH 316/375] Make default value of `$used` to `false`

As variable, during declaration is not used.
---
 src/SymbolTable.php       | 7 ++++++-
 src/Variable/Variable.php | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index ddbc4fbb36..87189dead6 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -98,6 +98,7 @@ public function addTemp(string $type, CompilationContext $context): Variable
         $variable = $this->addVariable($type, '_' . $tempVar, $context);
         $variable->setIsInitialized(true, $context);
         $variable->setTemporal(true);
+        $variable->setUsed(true);
         $variable->increaseUses();
         $variable->increaseMutates();
 
@@ -124,6 +125,7 @@ public function addVariable(
         }
 
         $variable = new Variable($type, $varName, $currentBranch);
+        $variable->setUsed(true);
 
         /**
          * Checks whether a variable can be optimized to be static or not
@@ -503,7 +505,10 @@ public function getVariable($name, CompilationContext $compilationContext = null
             return false;
         }
 
-        return $this->branchVariables[$branchId][$name];
+        $variable = $this->branchVariables[$branchId][$name];
+        $variable->setUsed(true);
+
+        return $variable;
     }
 
     /**
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index 6d858a6f44..f5960c7de3 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -104,7 +104,7 @@ class Variable implements TypeAwareInterface
     /**
      * Whether the variable was used or not.
      */
-    protected bool $used = true;
+    protected bool $used = false;
 
     /**
      * Last AST node where the variable was used.

From 91cf93210af2771811c82ddb8ebf973d5bc87fd4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 17 Dec 2023 17:25:00 +0000
Subject: [PATCH 317/375] Adjust test case

---
 tests/Zephir/Variable/VariableTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Zephir/Variable/VariableTest.php b/tests/Zephir/Variable/VariableTest.php
index 80f477e25a..65171f15e3 100644
--- a/tests/Zephir/Variable/VariableTest.php
+++ b/tests/Zephir/Variable/VariableTest.php
@@ -48,7 +48,7 @@ public function testShouldSetProperties(): void
         $this->assertFalse($this->zephirVar->isTemporal());
         $this->assertTrue($this->zephirVar->isReusable());
         $this->assertFalse($this->zephirVar->isIdle());
-        $this->assertTrue($this->zephirVar->isUsed());
+        $this->assertFalse($this->zephirVar->isUsed());
         $this->assertFalse($this->zephirVar->isDoublePointer());
         $this->assertTrue($this->zephirVar->isMemoryTracked());
         $this->assertSame('UnitTest', $this->zephirVar->getRealName());

From 5255750c5ba60b5f9d0f6d6076958799a588d3eb Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 17 Dec 2023 17:25:11 +0000
Subject: [PATCH 318/375] Reformat and simplify code

---
 src/SymbolTable.php | 52 ++++++++++++---------------------------------
 1 file changed, 13 insertions(+), 39 deletions(-)

diff --git a/src/SymbolTable.php b/src/SymbolTable.php
index 87189dead6..ac0495fa69 100644
--- a/src/SymbolTable.php
+++ b/src/SymbolTable.php
@@ -480,13 +480,8 @@ public function getTempVariableForWrite(string $type, CompilationContext $contex
 
     /**
      * Returns a variable in the symbol table.
-     *
-     * @param                         $name
-     * @param CompilationContext|null $compilationContext
-     *
-     * @return bool|Variable
      */
-    public function getVariable($name, CompilationContext $compilationContext = null)
+    public function getVariable(string $name, ?CompilationContext $compilationContext = null)
     {
         /* Check if the variable already is referencing a branch */
         $pos = strpos($name, Variable::BRANCH_MAGIC);
@@ -499,8 +494,10 @@ public function getVariable($name, CompilationContext $compilationContext = null
             if (!$branch) {
                 return false;
             }
+
             $branchId = $branch->getUniqueId();
         }
+
         if (!isset($this->branchVariables[$branchId]) || !isset($this->branchVariables[$branchId][$name])) {
             return false;
         }
@@ -706,12 +703,6 @@ public function getVariableForRead($name, CompilationContext $compilationContext
     /**
      * Return a variable in the symbol table, it will be used for a mutating operation
      * This method implies mutation of one of the members of the variable but no the variables itself.
-     *
-     * @param string             $name
-     * @param CompilationContext $compilationContext
-     * @param array|null         $statement
-     *
-     * @return Variable
      */
     public function getVariableForUpdate(string $name, CompilationContext $compilationContext, array $statement = null)
     {
@@ -768,7 +759,7 @@ public function getVariableForUpdate(string $name, CompilationContext $compilati
      */
     public function getVariableForWrite($name, CompilationContext $compilationContext, array $statement = null)
     {
-        /*
+        /**
          * Create superglobals just in time
          */
         if ($this->globalsManager->isSuperGlobal($name)) {
@@ -816,7 +807,7 @@ public function getVariableForWrite($name, CompilationContext $compilationContex
      *
      * @return Variable[]
      */
-    public function getVariables()
+    public function getVariables(): array
     {
         $ret = [];
         foreach ($this->branchVariables as $vars) {
@@ -854,14 +845,10 @@ public function hasVariableInBranch(
     /**
      * Traverses temporal variables created in a specific branch
      * marking them as idle.
-     *
-     * @param CompilationContext $compilationContext
      */
     public function markTemporalVariablesIdle(CompilationContext $compilationContext): void
     {
-        $compilationContext = $compilationContext ?: $this->compilationContext;
-        $branchId           = $compilationContext->branchManager->getCurrentBranchId();
-
+        $branchId = $compilationContext->branchManager->getCurrentBranchId();
         if (!isset($this->branchTempVariables[$branchId])) {
             return;
         }
@@ -919,17 +906,12 @@ public function setLocalContext(LocalContextPass $localContext): void
 
     /**
      * Register a variable as temporal.
-     *
-     * @param string                  $type
-     * @param string                  $location
-     * @param Variable                $variable
-     * @param CompilationContext|null $compilationContext
      */
     protected function registerTempVariable(
-        $type,
-        $location,
+        string $type,
+        string $location,
         Variable $variable,
-        CompilationContext $compilationContext = null
+        ?CompilationContext $compilationContext = null
     ): void {
         $compilationContext = $compilationContext ?: $this->compilationContext;
         $branchId           = $compilationContext->branchManager->getCurrentBranchId();
@@ -942,29 +924,21 @@ protected function registerTempVariable(
 
     /**
      * Reuse variables marked as idle after leave a branch.
-     *
-     * @param string                  $type
-     * @param string                  $location
-     * @param CompilationContext|null $compilationContext
-     *
-     * @return Variable|null
      */
     protected function reuseTempVariable(
         string $type,
         string $location,
-        CompilationContext $compilationContext = null
+        ?CompilationContext $compilationContext = null,
     ): ?Variable {
         $compilationContext = $compilationContext ?: $this->compilationContext;
         $branchId           = $compilationContext->branchManager->getCurrentBranchId();
 
         if (isset($this->branchTempVariables[$branchId][$location][$type])) {
             foreach ($this->branchTempVariables[$branchId][$location][$type] as $variable) {
-                if (!$variable->isDoublePointer()) {
-                    if ($variable->isIdle()) {
-                        $variable->setIdle(false);
+                if (!$variable->isDoublePointer() && $variable->isIdle()) {
+                    $variable->setIdle(false);
 
-                        return $variable;
-                    }
+                    return $variable;
                 }
             }
         }

From a30145e5d4a96ac71423741ccfabe7d880bbc7d4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 17 Dec 2023 18:25:01 +0000
Subject: [PATCH 319/375] Implement `this_ptr` dynamic removal

In cases, when variable was not used inside function.
---
 src/Backend/Backend.php                       |  7 ++--
 src/Class/Method/Method.php                   | 14 ++++++++
 .../Let/ObjectPropertyArrayIndex.php          |  3 +-
 src/Statements/Let/ObjectPropertyDecr.php     | 34 ++++++-------------
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index df0c19f471..f5536b1d46 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -577,7 +577,8 @@ public function assignPropertyArrayMulti(
         CompilationContext $compilationContext
     ): void {
         [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
+        $valueVariable = $this->resolveValue($valueVariable, $compilationContext);
+        $variable->setUsed(true);
 
         $compilationContext->codePrinter->output(
             sprintf(
@@ -600,7 +601,7 @@ public function assignStaticPropertyArrayMulti(
         CompilationContext $compilationContext
     ): void {
         [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
-        $valueVariable = $this->resolveValue($valueVariable, $compilationContext, true);
+        $valueVariable = $this->resolveValue($valueVariable, $compilationContext);
 
         $offsetStr = $offsetItems ? ', ' . implode(', ', $offsetItems) : '';
         $compilationContext->codePrinter->output(
@@ -1580,6 +1581,8 @@ public function getTypeofCondition(
 
     public function getVariableCode(Variable $variable): string
     {
+        $variable->setUsed(true);
+
         if (
             $variable->isDoublePointer() ||
             in_array($variable->getName(), ['this_ptr', 'return_value']) ||
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index 019b71454a..d80353b7d2 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -1237,6 +1237,7 @@ public function compile(CompilationContext $compilationContext): void
          */
         $usedVariables = [];
         $completeName  = $this->getClassDefinition()?->getCompleteName() ?: '[unknown]';
+        $thisUnused = false;
 
         foreach ($symbolTable->getVariables() as $variable) {
             if ($variable->getNumberUses() <= 0) {
@@ -1276,6 +1277,10 @@ public function compile(CompilationContext $compilationContext): void
 
                 $usedVariables[$type][] = $variable;
             }
+
+            if ('this_ptr' === $variable->getName() && !$variable->isUsed()) {
+                $thisUnused = true;
+            }
         }
 
         /**
@@ -1412,6 +1417,15 @@ public function compile(CompilationContext $compilationContext): void
          */
         $code = $this->removeMemoryStackReferences($symbolTable, $codePrinter->getOutput());
 
+        /**
+         * Remove unused this_ptr variable.
+         */
+        if ($thisUnused) {
+            $code = str_replace("\t" . 'zval *this_ptr = getThis();' . PHP_EOL, '', $code);
+        }
+
+        $code = preg_replace("/(\R){3,}/", "$1", $code);
+
         /**
          * Restore the compilation context
          */
diff --git a/src/Statements/Let/ObjectPropertyArrayIndex.php b/src/Statements/Let/ObjectPropertyArrayIndex.php
index 9b0c4955ea..ffdce4f363 100644
--- a/src/Statements/Let/ObjectPropertyArrayIndex.php
+++ b/src/Statements/Let/ObjectPropertyArrayIndex.php
@@ -65,9 +65,10 @@ public function assign(
             );
         }
 
-        /*
+        /**
          * Update the property according to the number of array-offsets
          */
+        $symbolVariable->setUsed(true);
         if (1 == count($statement['index-expr'])) {
             $this->_assignPropertyArraySingleIndex(
                 $variable,
diff --git a/src/Statements/Let/ObjectPropertyDecr.php b/src/Statements/Let/ObjectPropertyDecr.php
index cb82b3a843..0ac5201b72 100644
--- a/src/Statements/Let/ObjectPropertyDecr.php
+++ b/src/Statements/Let/ObjectPropertyDecr.php
@@ -21,8 +21,6 @@
 use function current;
 
 /**
- * ObjectPropertyDecr.
- *
  * Decrements an object property
  */
 class ObjectPropertyDecr
@@ -33,28 +31,22 @@ class ObjectPropertyDecr
 
     /**
      * Compiles obj->x++/obj->x--.
-     *
-     * @param string             $variable
-     * @param string             $property
-     * @param ZephirVariable     $symbolVariable
-     * @param CompilationContext $compilationContext
-     * @param array              $statement
      */
     public function assign(
-        $variable,
-        $property,
+        string $variable,
+        string $property,
         ZephirVariable $symbolVariable,
         CompilationContext $compilationContext,
-        $statement
+        array $statement,
     ): void {
         $this->checkVariableInitialized($variable, $symbolVariable, $statement);
 
-        /*
+        /**
          * Arrays must be stored in the HEAP
          */
         $this->checkVariableLocalOnly($variable, $symbolVariable, $statement);
 
-        /*
+        /**
          * Only dynamic variables can be used as arrays
          */
         if (!$symbolVariable->isVariable()) {
@@ -68,7 +60,7 @@ public function assign(
             throw CompilerException::cannotUseNonInitializedVariableAsObject($statement);
         }
 
-        /*
+        /**
          * Trying to use a non-object dynamic variable as object
          */
         if ($symbolVariable->hasDifferentDynamicType(['undefined', 'object', 'null'])) {
@@ -78,18 +70,13 @@ public function assign(
             );
         }
 
-        /*
+        /**
          * Check if the variable to update is defined
          */
-        if ('this' == $symbolVariable->getRealName()) {
-            $classDefinition = $compilationContext->classDefinition;
-            $this->checkClassHasProperty(
-                $classDefinition,
-                $property,
-                $statement
-            );
+        if ('this' === $symbolVariable->getRealName()) {
+            $this->checkClassHasProperty($compilationContext->classDefinition, $property, $statement);
         } else {
-            /*
+            /**
              * If we know the class related to a variable we could check if the property
              * is defined on that class
              */
@@ -116,6 +103,7 @@ public function assign(
             }
         }
 
+        $symbolVariable->setUsed(true);
         $compilationContext->headersManager->add('kernel/object');
         $compilationContext->codePrinter->output(
             'RETURN_ON_FAILURE(' . $this->zephirMethod . '(' . $symbolVariable->getName(

From ceb228b2401f66696466a09a23df047275c18ae6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 17 Dec 2023 18:25:49 +0000
Subject: [PATCH 320/375] Regenerate ext/ directory

---
 ext/config.m4                                 |    1 +
 ext/config.w32                                |    2 +-
 ext/kernel/exception.c                        |    5 -
 ext/kernel/exception.h                        |    4 -
 ext/kernel/fcall.h                            |    4 -
 ext/kernel/main.h                             |   22 +-
 ext/kernel/memory.c                           |  226 ----
 ext/kernel/memory.h                           |   65 +-
 ext/kernel/operators.h                        |    2 +-
 ext/stub.c                                    |    2 +
 ext/stub.h                                    |    1 +
 ext/stub/0__closure.zep.c                     |    5 -
 ext/stub/10__closure.zep.c                    |    5 -
 ext/stub/11__closure.zep.c                    |    5 -
 ext/stub/12__closure.zep.c                    |    3 -
 ext/stub/13__closure.zep.c                    |   11 +-
 ext/stub/1__closure.zep.c                     |    3 -
 ext/stub/2__closure.zep.c                     |    3 -
 ext/stub/3__closure.zep.c                     |    5 -
 ext/stub/4__closure.zep.c                     |    5 -
 ext/stub/5__closure.zep.c                     |    5 -
 ext/stub/6__closure.zep.c                     |    5 -
 ext/stub/7__closure.zep.c                     |    5 -
 ext/stub/8__closure.zep.c                     |    3 -
 ext/stub/9__closure.zep.c                     |    3 -
 ext/stub/arithmetic.zep.c                     | 1027 ++---------------
 ext/stub/arrayaccessarr.zep.c                 |   32 +-
 ext/stub/arrayaccessobj.zep.c                 |   49 +-
 ext/stub/arrayaccesstest.zep.c                |  168 +--
 ext/stub/arrayiterator.zep.c                  |   30 +-
 ext/stub/arrayiteratortest.zep.c              |   13 +-
 ext/stub/arraymanipulation.zep.c              |   23 +-
 ext/stub/arraysearch.zep.c                    |   24 +-
 ext/stub/assign.zep.c                         |  855 +++-----------
 ext/stub/bench/foo.zep.c                      |  145 ---
 ext/stub/bitwise.zep.c                        |  550 +--------
 ext/stub/branchprediction.zep.c               |   16 -
 ext/stub/builtin/arraymethods.zep.c           |   33 +-
 ext/stub/builtin/charmethods.zep.c            |   21 +-
 ext/stub/builtin/intmethods.zep.c             |  147 +--
 ext/stub/builtin/stringmethods.zep.c          |  307 +----
 ext/stub/cast.zep.c                           |  527 +--------
 ext/stub/cblock.zep.c                         |   10 -
 ext/stub/chars.zep.c                          |   20 -
 ext/stub/closures.zep.c                       |   70 +-
 ext/stub/compare.zep.c                        |   64 +-
 ext/stub/concat.zep.c                         |   81 +-
 ext/stub/constants.zep.c                      |   93 +-
 ext/stub/constantsinterface.zep.c             |   36 -
 ext/stub/constantsinterfacea.zep.c            |   18 -
 ext/stub/constantsinterfaceb.zep.c            |   18 -
 ext/stub/constructors/issue1803.zep.c         |    9 +-
 ext/stub/declaretest.zep.c                    |  113 +-
 ext/stub/echoes.zep.c                         |   15 -
 ext/stub/emptytest.zep.c                      |   46 +-
 ext/stub/evaltest.zep.c                       |   10 +-
 ext/stub/exception.zep.c                      |   10 +-
 ext/stub/exceptions.zep.c                     |  145 +--
 ext/stub/exists.zep.c                         |   26 +-
 ext/stub/exitdie.zep.c                        |   10 -
 ext/stub/factorial.zep.c                      |   20 +-
 ext/stub/fannkuch.zep.c                       |   18 +-
 ext/stub/fasta.zep.c                          |   45 +-
 ext/stub/fcall.zep.c                          |  244 +---
 ext/stub/fetchtest.zep.c                      |   98 --
 ext/stub/fibonnaci.zep.c                      |   74 +-
 ext/stub/flow.zep.c                           |  551 +--------
 ext/stub/flow/switchflow.zep.c                |   86 +-
 ext/stub/fortytwo.zep.c                       |   14 +-
 ext/stub/functional.zep.c                     |   18 +-
 ext/stub/functionexists.zep.c                 |   24 +-
 ext/stub/functions.zep.c                      |   22 +-
 ext/stub/geometry.zep.c                       |   25 -
 ext/stub/globals.zep.c                        |   73 --
 ext/stub/globals/env.zep.c                    |   12 +-
 ext/stub/globals/post.zep.c                   |    8 -
 ext/stub/globals/server.zep.c                 |   13 -
 ext/stub/globals/serverrequestfactory.zep.c   |   49 +-
 ext/stub/globals/session/base.zep.c           |   46 +-
 ext/stub/globals/session/child.zep.c          |   10 +-
 ext/stub/instance.zep.c                       |   30 +-
 ext/stub/instanceoff.zep.c                    |   68 +-
 ext/stub/interfaces/implementint.zep.c        |    8 -
 ext/stub/interfaces/implementinterface.zep.c  |   17 +-
 ext/stub/internalclasses.zep.c                |   14 +-
 ext/stub/internalinterfaces.zep.c             |    3 -
 ext/stub/invoke.zep.c                         |   25 +-
 ext/stub/invokes/abstractinvoker.zep.c        |   12 +-
 ext/stub/invokes/abstractinvokercomplex.zep.c |   12 +-
 ext/stub/invokes/abstractprotected.zep.c      |   52 +-
 ext/stub/invokes/invokeprotected.zep.c        |    8 -
 ext/stub/invokes/invokeprotectedcomplex.zep.c |    8 -
 ext/stub/issettest.zep.c                      |   66 +-
 ext/stub/issue1134.zep.c                      |   20 +-
 ext/stub/issue1404.zep.c                      |   84 --
 ext/stub/issue1521.zep.c                      |    8 +-
 ext/stub/issue2165/issue.zep.c                |  150 +--
 ext/stub/issue663.zep.c                       |   30 +-
 ext/stub/issue887.zep.c                       |   23 +-
 ext/stub/issue914.zep.c                       |   10 -
 ext/stub/issues.zep.c                         |   16 +-
 ext/stub/json.zep.c                           |   70 +-
 ext/stub/logical.zep.c                        |   58 -
 ext/stub/mcall.zep.c                          |  411 +------
 ext/stub/mcall/caller.zep.c                   |   13 +-
 ext/stub/mcallchained.zep.c                   |   43 +-
 ext/stub/mcalldynamic.zep.c                   |   31 +-
 ext/stub/mcallinternal.zep.c                  |   73 +-
 ext/stub/methodabstract.zep.c                 |    9 -
 ext/stub/methodargs.zep.c                     |   63 +-
 ext/stub/namespaces/classentry.zep.c          |   10 -
 ext/stub/nativearray.zep.c                    |  833 +++----------
 ext/stub/oo.zep.c                             |  137 +--
 ext/stub/oo/abstractstatic.zep.c              |    3 -
 ext/stub/oo/concretestatic.zep.c              |   27 +-
 ext/stub/oo/constantsinterface.zep.c          |   18 -
 ext/stub/oo/deprecatedmethods.zep.c           |   18 +-
 ext/stub/oo/dynamicprop.zep.c                 |  154 +--
 ext/stub/oo/extendpdoclass.zep.c              |   19 +-
 ext/stub/oo/ooconstruct.zep.c                 |    3 -
 ext/stub/oo/ooconstructparams.zep.c           |   10 -
 ext/stub/oo/oodestruct.zep.c                  |  115 +-
 ext/stub/oo/oodynamica.zep.c                  |   39 +-
 ext/stub/oo/oodynamicb.zep.c                  |    6 -
 ext/stub/oo/oonativeimplements.zep.c          |   78 --
 ext/stub/oo/ooparams.zep.c                    |  171 +--
 ext/stub/oo/propertyaccess.zep.c              |   24 +-
 ext/stub/oo/scopes/abstractclass.zep.c        |   13 -
 ext/stub/oo/scopes/abstractclassmagic.zep.c   |   16 -
 ext/stub/oo/scopes/hasprivatemethod.zep.c     |   13 +-
 ext/stub/oo/scopes/privatescopetester.zep.c   |   51 +-
 ext/stub/openssl.zep.c                        |  111 ++
 ext/stub/openssl.zep.h                        |   26 +
 ext/stub/operator.zep.c                       |   47 +-
 ext/stub/optimizers/acos.zep.c                |   60 +-
 ext/stub/optimizers/arraymerge.zep.c          |   10 +-
 ext/stub/optimizers/asin.zep.c                |   60 +-
 ext/stub/optimizers/cos.zep.c                 |   27 -
 ext/stub/optimizers/createarray.zep.c         |   11 -
 ext/stub/optimizers/isscalar.zep.c            |   39 +-
 ext/stub/optimizers/ldexp.zep.c               |   38 +-
 ext/stub/optimizers/sin.zep.c                 |   27 -
 ext/stub/optimizers/sqrt.zep.c                |   27 -
 ext/stub/optimizers/strreplace.zep.c          |   64 +-
 ext/stub/optimizers/substr.zep.c              |   10 -
 ext/stub/optimizers/tan.zep.c                 |   31 -
 ext/stub/pregmatch.zep.c                      |  144 +--
 ext/stub/properties/app.zep.c                 |   10 -
 .../properties/extendspublicproperties.zep.c  |   20 +-
 ext/stub/properties/getobjectvars.zep.c       |   12 +-
 ext/stub/properties/privateproperties.zep.c   |   21 -
 ext/stub/properties/propertyarray.zep.c       |   52 +-
 ext/stub/properties/propertyupdate.zep.c      |    9 +-
 ext/stub/properties/protectedproperties.zep.c |   48 +-
 ext/stub/properties/publicproperties.zep.c    |   32 +-
 .../properties/staticprivateproperties.zep.c  |    8 -
 ext/stub/properties/staticpropertyarray.zep.c |   11 +-
 .../staticprotectedproperties.zep.c           |   48 -
 .../properties/staticpublicproperties.zep.c   |   37 +-
 ext/stub/quantum.zep.c                        |   42 +-
 ext/stub/range.zep.c                          |   18 +-
 ext/stub/references.zep.c                     |    3 -
 ext/stub/reflection.zep.c                     |   30 +-
 ext/stub/regexdna.zep.c                       |   33 +-
 ext/stub/requires.zep.c                       |   54 +-
 ext/stub/requires/external3.zep.c             |   13 +-
 ext/stub/resourcetest.zep.c                   |   59 +-
 ext/stub/returns.zep.c                        |   23 -
 ext/stub/router.zep.c                         |  259 +----
 ext/stub/router/route.zep.c                   |  154 +--
 ext/stub/scall.zep.c                          |  238 +---
 ext/stub/scalldynamic.zep.c                   |   14 -
 ext/stub/scallexternal.zep.c                  |   27 +-
 ext/stub/scalllateconstruct.zep.c             |   21 -
 ext/stub/scallparent.zep.c                    |   20 +-
 ext/stub/scope.zep.c                          |   54 +-
 ext/stub/sort.zep.c                           |   24 +-
 ext/stub/spectralnorm.zep.c                   |   85 +-
 ext/stub/spl.zep.c                            |   12 +-
 ext/stub/spropertyaccess.zep.c                |   67 +-
 ext/stub/statements.zep.c                     |   75 +-
 ext/stub/strings.zep.c                        |  324 +-----
 ext/stub/stubs.zep.c                          |   45 +-
 ext/stub/ternary.zep.c                        |  102 +-
 ext/stub/trytest.zep.c                        |  215 +---
 ext/stub/typeinstances.zep.c                  |   21 -
 ext/stub/typeoff.zep.c                        |   94 +-
 ext/stub/types/maybe.zep.c                    |    9 -
 ext/stub/types/mixedtype.zep.c                |  128 +-
 ext/stub/types/obj.zep.c                      |    9 -
 ext/stub/unsettest.zep.c                      |   57 +-
 ext/stub/usetest.zep.c                        |   37 +-
 ext/stub/vars.zep.c                           |  175 +--
 193 files changed, 1702 insertions(+), 11683 deletions(-)
 create mode 100644 ext/stub/openssl.zep.c
 create mode 100644 ext/stub/openssl.zep.h

diff --git a/ext/config.m4 b/ext/config.m4
index c1fb9625c7..cac98f9af4 100644
--- a/ext/config.m4
+++ b/ext/config.m4
@@ -158,6 +158,7 @@ if test "$PHP_STUB" = "yes"; then
 	stub/oo/scopes/abstractclassmagic.zep.c
 	stub/oo/scopes/privatescopetester.zep.c
 	stub/ooimpl/abeginning.zep.c
+	stub/openssl.zep.c
 	stub/operator.zep.c
 	stub/optimizers/isscalar.zep.c
 	stub/optimizers/acos.zep.c
diff --git a/ext/config.w32 b/ext/config.w32
index 505cec6072..adc844df18 100644
--- a/ext/config.w32
+++ b/ext/config.w32
@@ -11,7 +11,7 @@ if (PHP_STUB != "no") {
   }
   
   ADD_SOURCES(configure_module_dirname + "/stub/invokes", "abstractprotected.zep.c abstractinvoker.zep.c abstractinvokercomplex.zep.c invokeprotected.zep.c invokeprotectedcomplex.zep.c", "stub");
-	ADD_SOURCES(configure_module_dirname + "/stub", "testinterface.zep.c scallparent.zep.c constantsparent.zep.c methodinterface.zep.c arithmetic.zep.c arrayaccessarr.zep.c arrayaccessobj.zep.c arrayaccesstest.zep.c arrayiterator.zep.c arrayiteratortest.zep.c arraymanipulation.zep.c arrayobject.zep.c arraysearch.zep.c assign.zep.c bitwise.zep.c branchprediction.zep.c cast.zep.c cblock.zep.c chars.zep.c closures.zep.c compare.zep.c concat.zep.c constants.zep.c constantsinterface.zep.c constantsinterfacea.zep.c constantsinterfaceb.zep.c declaretest.zep.c diinterface.zep.c echoes.zep.c emptytest.zep.c evaltest.zep.c exception.zep.c exceptions.zep.c exists.zep.c exitdie.zep.c extendedinterface.zep.c factorial.zep.c fannkuch.zep.c fasta.zep.c fcall.zep.c fetchtest.zep.c fibonnaci.zep.c flow.zep.c fortytwo.zep.c functional.zep.c functionexists.zep.c functions.zep.c geometry.zep.c globals.zep.c instance.zep.c instanceoff.zep.c internalclasses.zep.c internalinterfaces.zep.c invoke.zep.c issettest.zep.c issue1134.zep.c issue1404.zep.c issue1521.zep.c issue663.zep.c issue887.zep.c issue893.zep.c issue914.zep.c issues.zep.c json.zep.c logical.zep.c mcall.zep.c mcallchained.zep.c mcalldynamic.zep.c mcallinternal.zep.c methodabstract.zep.c methodargs.zep.c nativearray.zep.c oo.zep.c operator.zep.c pdostatement.zep.c pregmatch.zep.c quantum.zep.c range.zep.c references.zep.c reflection.zep.c regexdna.zep.c requires.zep.c resourcetest.zep.c returns.zep.c router.zep.c scall.zep.c scalldynamic.zep.c scallexternal.zep.c scalllateconstruct.zep.c scope.zep.c sort.zep.c spectralnorm.zep.c spl.zep.c spropertyaccess.zep.c statements.zep.c strings.zep.c stubs.zep.c ternary.zep.c trytest.zep.c typeinstances.zep.c typeoff.zep.c unknownclass.zep.c unsettest.zep.c usetest.zep.c vars.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c", "stub");
+	ADD_SOURCES(configure_module_dirname + "/stub", "testinterface.zep.c scallparent.zep.c constantsparent.zep.c methodinterface.zep.c arithmetic.zep.c arrayaccessarr.zep.c arrayaccessobj.zep.c arrayaccesstest.zep.c arrayiterator.zep.c arrayiteratortest.zep.c arraymanipulation.zep.c arrayobject.zep.c arraysearch.zep.c assign.zep.c bitwise.zep.c branchprediction.zep.c cast.zep.c cblock.zep.c chars.zep.c closures.zep.c compare.zep.c concat.zep.c constants.zep.c constantsinterface.zep.c constantsinterfacea.zep.c constantsinterfaceb.zep.c declaretest.zep.c diinterface.zep.c echoes.zep.c emptytest.zep.c evaltest.zep.c exception.zep.c exceptions.zep.c exists.zep.c exitdie.zep.c extendedinterface.zep.c factorial.zep.c fannkuch.zep.c fasta.zep.c fcall.zep.c fetchtest.zep.c fibonnaci.zep.c flow.zep.c fortytwo.zep.c functional.zep.c functionexists.zep.c functions.zep.c geometry.zep.c globals.zep.c instance.zep.c instanceoff.zep.c internalclasses.zep.c internalinterfaces.zep.c invoke.zep.c issettest.zep.c issue1134.zep.c issue1404.zep.c issue1521.zep.c issue663.zep.c issue887.zep.c issue893.zep.c issue914.zep.c issues.zep.c json.zep.c logical.zep.c mcall.zep.c mcallchained.zep.c mcalldynamic.zep.c mcallinternal.zep.c methodabstract.zep.c methodargs.zep.c nativearray.zep.c oo.zep.c openssl.zep.c operator.zep.c pdostatement.zep.c pregmatch.zep.c quantum.zep.c range.zep.c references.zep.c reflection.zep.c regexdna.zep.c requires.zep.c resourcetest.zep.c returns.zep.c router.zep.c scall.zep.c scalldynamic.zep.c scallexternal.zep.c scalllateconstruct.zep.c scope.zep.c sort.zep.c spectralnorm.zep.c spl.zep.c spropertyaccess.zep.c statements.zep.c strings.zep.c stubs.zep.c ternary.zep.c trytest.zep.c typeinstances.zep.c typeoff.zep.c unknownclass.zep.c unsettest.zep.c usetest.zep.c vars.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c", "stub");
 	ADD_SOURCES(configure_module_dirname + "/stub/oo/extend", "exception.zep.c", "stub");
 	ADD_SOURCES(configure_module_dirname + "/stub/issue2165", "issueextendinterface.zep.c issueinterface.zep.c issue.zep.c", "stub");
 	ADD_SOURCES(configure_module_dirname + "/stub/oo/extend/db", "exception.zep.c", "stub");
diff --git a/ext/kernel/exception.c b/ext/kernel/exception.c
index 404162af8d..46b1ca7c82 100644
--- a/ext/kernel/exception.c
+++ b/ext/kernel/exception.c
@@ -31,16 +31,12 @@
 void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 {
 	zend_class_entry *default_exception_ce;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	int ZEPHIR_LAST_CALL_STATUS = 0;
 	zval curline;
 	zval object_copy;
 
 	ZVAL_UNDEF(&curline);
 
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	if (Z_TYPE_P(object) != IS_OBJECT) {
 		ZVAL_COPY_VALUE(&object_copy, object);
 		object_init_ex(object, zend_exception_get_default());
@@ -63,7 +59,6 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 	if (ZEPHIR_LAST_CALL_STATUS != FAILURE) {
 		zend_throw_exception_object(object);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
diff --git a/ext/kernel/exception.h b/ext/kernel/exception.h
index 5ae19973ad..c13f7498cb 100644
--- a/ext/kernel/exception.h
+++ b/ext/kernel/exception.h
@@ -19,25 +19,21 @@
 #define ZEPHIR_THROW_EXCEPTION_STR(class_entry, message) \
 	do { \
 		zephir_throw_exception_string(class_entry, message, strlen(message)); \
-		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_STR(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_string_debug(class_entry, message, strlen(message), file, line); \
-    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_ZVAL(class_entry, message) \
 	do { \
 		zephir_throw_exception_zval(class_entry, message); \
-		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_ZVAL(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_zval(class_entry, message, file, line); \
-    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 
diff --git a/ext/kernel/fcall.h b/ext/kernel/fcall.h
index 4754bf4626..4e879d2674 100644
--- a/ext/kernel/fcall.h
+++ b/ext/kernel/fcall.h
@@ -394,7 +394,6 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 #define zephir_check_call_status() \
 	do { \
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
-			ZEPHIR_MM_RESTORE(); \
 			return; \
 		} \
 	} while(0)
@@ -404,9 +403,6 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
 			if (EG(exception)) { \
 				goto label; \
-			} else { \
-				ZEPHIR_MM_RESTORE(); \
-				return; \
 			} \
 		} \
 	} while (0)
diff --git a/ext/kernel/main.h b/ext/kernel/main.h
index 7d28f37757..a191372de5 100644
--- a/ext/kernel/main.h
+++ b/ext/kernel/main.h
@@ -112,7 +112,6 @@ extern zend_string* i_self;
 #define RETURN_CTOR(var)        \
 	do {                        \
 		RETVAL_ZVAL(var, 1, 0); \
-		ZEPHIR_MM_RESTORE();    \
 		return;                 \
 	} while (0)
 
@@ -127,7 +126,6 @@ extern zend_string* i_self;
 #define RETURN_CCTOR(v)            \
 	do {                           \
 		ZVAL_DUP(return_value, v); \
-		ZEPHIR_MM_RESTORE();       \
 		return;                    \
 	} while (0)
 
@@ -146,7 +144,6 @@ extern zend_string* i_self;
 #define RETURN_THIS() { \
 		RETVAL_ZVAL(getThis(), 1, 0); \
 	} \
-	ZEPHIR_MM_RESTORE(); \
 	return;
 
 #define RETURN_LCTORW(var) RETURN_CCTORW(var);
@@ -160,28 +157,25 @@ extern zend_string* i_self;
 	zephir_return_property(return_value, object, SL(member_name)); \
 	return;
 
-/** Return without change return_value */
-#define RETURN_MM()                 { ZEPHIR_MM_RESTORE(); return; }
-
 /** Return null restoring memory frame */
-#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); return; }
 
 /** Return string restoring memory frame */
-#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); ZEPHIR_MM_RESTORE(); return; }
-#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); return; }
+#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); return; }
 
 /* Return long */
-#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); return; }
 
 /* Return double */
-#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); return; }
 
 /**
  * Returns a zval in an object member
  */
 #define RETURN_MM_MEMBER(object, member_name) \
   zephir_return_property(return_value, object, SL(member_name)); \
-  RETURN_MM();
+  return;
 
 #define RETURN_ON_FAILURE(what) \
 	do { \
@@ -193,13 +187,12 @@ extern zend_string* i_self;
 #define RETURN_MM_ON_FAILURE(what) \
 	do { \
 		if (what == FAILURE) { \
-			ZEPHIR_MM_RESTORE(); \
 			return; \
 		} \
 	} while (0)
 
 /** Return null restoring memory frame */
-#define RETURN_MM_NULL()            { RETVAL_NULL(); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_NULL()            { RETVAL_NULL(); return; }
 
 /* Globals functions */
 int zephir_get_global(zval *arr, const char *global, unsigned int global_length);
@@ -245,7 +238,6 @@ int zephir_is_iterable_ex(zval *arr, int duplicate);
 #define zephir_is_iterable(var, duplicate, file, line) \
 	if (!zephir_is_iterable_ex(var, duplicate)) { \
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(zend_exception_get_default(), "The argument is not initialized or iterable()", file, line); \
-		ZEPHIR_MM_RESTORE(); \
 		return; \
 	}
 
diff --git a/ext/kernel/memory.c b/ext/kernel/memory.c
index f0bf4326f3..964f9b91f7 100644
--- a/ext/kernel/memory.c
+++ b/ext/kernel/memory.c
@@ -36,152 +36,6 @@
  * Not all methods must grow/restore the zephir_memory_entry.
  */
 
-static zend_always_inline zend_execute_data* find_symbol_table(zend_execute_data* ex)
-{
-    while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->common.type))) {
-        ex = ex->prev_execute_data;
-    }
-
-    return ex;
-}
-
-/**
- * Adds a memory frame in the current executed method
- */
-void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func)
-{
-	if (g->active_memory == NULL) {
-		zephir_memory_entry *active_memory;
-
-		active_memory = (zephir_memory_entry *) pecalloc(1, sizeof(zephir_memory_entry), 0);
-
-		active_memory->addresses = pecalloc(24, sizeof(zval*), 0);
-		active_memory->capacity  = 24;
-
-		g->active_memory = active_memory;
-	}
-
-	assert(g->active_memory != NULL);
-	assert(g->active_memory->pointer == 0);
-
-#ifndef ZEPHIR_RELEASE
-	g->active_memory->func = func;
-#endif
-}
-
-void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func)
-{
-	size_t i;
-	zephir_memory_entry *active_memory;
-	zephir_symbol_table *active_symbol_table;
-	zval *ptr;
-#ifndef ZEPHIR_RELEASE
-	int show_backtrace = 0;
-#endif
-
-#ifndef ZEPHIR_RELEASE
-	if (UNEXPECTED(g->active_memory == NULL)) {
-		fprintf(stderr, "WARNING: calling zephir_memory_restore_stack() without an active memory frame!\n");
-		fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
-		fprintf(stderr, "Calling function: %s\n", func);
-		zephir_print_backtrace();
-		return;
-	}
-
-	if (UNEXPECTED(g->active_memory->func != func)) {
-		fprintf(stderr, "Trying to free someone else's memory frame!\n");
-		fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
-		fprintf(stderr, "Calling function: %s\n", func);
-		zephir_print_backtrace();
-		return;
-	}
-#endif
-
-	active_memory = g->active_memory;
-	assert(active_memory != NULL);
-
-	if (EXPECTED(!CG(unclean_shutdown))) {
-		/* Clean active symbol table */
-		if (g->active_symbol_table) {
-			active_symbol_table = g->active_symbol_table;
-			while (active_symbol_table && active_symbol_table->scope == active_memory) {
-				zend_execute_data *ex = find_symbol_table(EG(current_execute_data));
-#ifndef ZEPHIR_RELEASE
-				if (UNEXPECTED(!ex)) {
-					fprintf(stderr, "ERROR: unable to find a symbol table");
-					zephir_print_backtrace();
-					return;
-				}
-#endif
-				zend_hash_destroy(ex->symbol_table);
-				efree(ex->symbol_table);
-				ex->symbol_table = active_symbol_table->symbol_table;
-				zend_attach_symbol_table(ex);
-				zend_rebuild_symbol_table();
-
-				g->active_symbol_table = active_symbol_table->prev;
-				efree(active_symbol_table);
-				active_symbol_table = g->active_symbol_table;
-			}
-		}
-
-#ifndef ZEPHIR_RELEASE
-		for (i = 0; i < active_memory->pointer; ++i) {
-			if (active_memory->addresses[i] != NULL) {
-				zval *var = active_memory->addresses[i];
-				if (Z_TYPE_P(var) > IS_CALLABLE) {
-					fprintf(stderr, "%s: observed variable #%d (%p) has invalid type %u [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
-					show_backtrace = 1;
-				}
-
-				if (!Z_REFCOUNTED_P(var)) {
-					continue;
-				}
-
-				if (Z_REFCOUNT_P(var) == 0) {
-					fprintf(stderr, "%s: observed variable #%d (%p) has 0 references, type=%d [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
-					show_backtrace = 1;
-				}
-				else if (Z_REFCOUNT_P(var) >= 1000000) {
-					fprintf(stderr, "%s: observed variable #%d (%p) has too many references (%u), type=%d  [%s]\n", __func__, (int)i, var, Z_REFCOUNT_P(var), Z_TYPE_P(var), active_memory->func);
-					show_backtrace = 1;
-				}
-			}
-		}
-#endif
-
-		/* Traverse all zvals allocated, reduce the reference counting or free them */
-		for (i = 0; i < active_memory->pointer; ++i) {
-			ptr = active_memory->addresses[i];
-			if (EXPECTED(ptr != NULL)) {
-				if (!Z_REFCOUNTED_P(ptr)) continue;
-				if (Z_REFCOUNT_P(ptr) == 1) {
-					zval_ptr_dtor(ptr);
-				} else {
-					Z_DELREF_P(ptr);
-				}
-			}
-		}
-	}
-
-#ifndef ZEPHIR_RELEASE
-	active_memory->func = NULL;
-#endif
-
-	if (active_memory->addresses != NULL) {
-		pefree(active_memory->addresses, 0);
-	}
-
-	pefree(g->active_memory, 0);
-	g->active_memory = NULL;
-
-#ifndef ZEPHIR_RELEASE
-	if (show_backtrace == 1) {
-		zephir_print_backtrace();
-	}
-#endif
-}
-
 /**
  * Pre-allocates memory for further use in execution
  */
@@ -212,47 +66,6 @@ void zephir_deinitialize_memory()
 	zephir_globals_ptr->initialized = 0;
 }
 
-/**
- * Creates a virtual symbol tables dynamically
- */
-void zephir_create_symbol_table(zephir_method_globals *gptr)
-{
-	zephir_symbol_table *entry;
-	zend_array *symbol_table;
-
-#ifndef ZEPHIR_RELEASE
-	if (!gptr->active_memory) {
-		fprintf(stderr, "ERROR: Trying to create a virtual symbol table without a memory frame");
-		zephir_print_backtrace();
-		return;
-	}
-#endif
-
-	zend_execute_data* ex = find_symbol_table(EG(current_execute_data));
-#ifndef ZEPHIR_RELEASE
-    if (UNEXPECTED(!ex)) {
-        fprintf(stderr, "ERROR: unable to find a symbol table");
-        zephir_print_backtrace();
-        return;
-    }
-#endif
-
-	zend_rebuild_symbol_table();
-	zend_detach_symbol_table(ex);
-
-	entry               = (zephir_symbol_table*)emalloc(sizeof(zephir_symbol_table));
-	entry->scope        = gptr->active_memory;
-	entry->symbol_table = ex->symbol_table;
-	entry->prev         = gptr->active_symbol_table;
-
-	symbol_table = (zend_array*)emalloc(sizeof(zend_array));
-	zend_hash_init(symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0);
-	zend_hash_real_init(symbol_table, 0);
-
-	ex->symbol_table          = symbol_table;
-	gptr->active_symbol_table = entry;
-}
-
 /**
  * Exports symbols to the active symbol table
  */
@@ -273,42 +86,3 @@ int zephir_set_symbol(zval *key_name, zval *value)
 
 	return SUCCESS;
 }
-
-void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g)
-{
-	zephir_memory_entry *frame = g->active_memory;
-#ifndef ZEPHIR_RELEASE
-	if (UNEXPECTED(frame == NULL)) {
-		fprintf(stderr, "ZEPHIR_MM_GROW() must be called before using any of MM functions or macros!");
-		zephir_print_backtrace();
-		abort();
-	}
-#endif
-
-	if (UNEXPECTED(frame->pointer == frame->capacity)) {
-		void *buf = perealloc(frame->addresses, sizeof(zval *) * (frame->capacity + 16), 0);
-		if (EXPECTED(buf != NULL)) {
-			frame->capacity += 16;
-			frame->addresses = buf;
-		} else {
-			zend_error(E_CORE_ERROR, "Memory allocation failed");
-			return;
-		}
-	}
-
-#ifndef ZEPHIR_RELEASE
-	{
-		size_t i;
-		for (i = 0; i < frame->pointer; ++i) {
-			if (frame->addresses[i] == var) {
-				fprintf(stderr, "Variable %p is already observed", var);
-				zephir_print_backtrace();
-				abort();
-			}
-		}
-	}
-#endif
-
-	frame->addresses[frame->pointer] = var;
-	++frame->pointer;
-}
diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
index 7da4ec47e2..800ccafb31 100644
--- a/ext/kernel/memory.h
+++ b/ext/kernel/memory.h
@@ -17,64 +17,13 @@
 #include "php_ext.h"
 #include "kernel/globals.h"
 
-/** Memory frame */
-typedef struct _zephir_memory_entry {
-	size_t pointer;
-	size_t capacity;
-	zval **addresses;
-#ifndef ZEPHIR_RELEASE
-	int permanent;
-	const char *func;
-#endif
-} zephir_memory_entry;
-
-/** Virtual Symbol Table */
-typedef struct _zephir_symbol_table {
-	struct _zephir_memory_entry *scope;
-	zend_array *symbol_table;
-	struct _zephir_symbol_table *prev;
-} zephir_symbol_table;
-
-typedef struct _zephir_method_globals {
-	/* Memory */
-	zephir_memory_entry *active_memory; /**< The current memory frame */
-
-	/* Virtual Symbol Tables */
-	zephir_symbol_table *active_symbol_table;
-} zephir_method_globals;
-
-/* Memory Frames */
-void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func);
-void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
-
-#define ZEPHIR_MM_RESTORE() \
-	zephir_memory_restore_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); \
-	pefree(ZEPHIR_METHOD_GLOBALS_PTR, 0); \
-	ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
-
-void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
-#define zephir_memory_observe(var) zephir_do_memory_observe(var, ZEPHIR_METHOD_GLOBALS_PTR);
-
-#define zephir_safe_zval_ptr_dtor(pzval)
-
-void zephir_create_symbol_table(zephir_method_globals *g);
-
-#define ZEPHIR_CREATE_SYMBOL_TABLE() zephir_create_symbol_table(ZEPHIR_METHOD_GLOBALS_PTR);
-
 int zephir_set_symbol(zval *key_name, zval *value);
 
-#define ZEPHIR_INIT_VAR(z) \
-	zephir_memory_observe(z); \
-	ZVAL_NULL(z);
-
 #define ZEPHIR_INIT_NVAR(z) \
 	do { \
-		if (Z_TYPE_P(z) == IS_UNDEF) { \
-			zephir_memory_observe(z); \
-		} else if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
+		if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
 			if (Z_REFCOUNT_P(z) > 1) { \
 				Z_DELREF_P(z); \
 			} else { \
@@ -90,8 +39,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
 			zval_ptr_dtor(d); \
 		} \
-	} else { \
-		zephir_memory_observe(d); \
 	} \
 	ZVAL_COPY_VALUE(d, v);
 
@@ -103,12 +50,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	} \
 	ZVAL_DUP(d, v);
 
-#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
-	if (Z_TYPE_P(z) == IS_UNDEF) { \
-		zephir_memory_observe(z); \
-	} \
-	ZVAL_COPY(z, v);
-
 #define ZEPHIR_HASH_COPY(z, v) \
 	if (Z_TYPE_P(z) == IS_ARRAY && Z_TYPE_P(v) == IS_ARRAY) { \
 		zend_hash_copy(Z_ARRVAL_P(z), Z_ARRVAL_P(v), (copy_ctor_func_t) zval_add_ref); \
@@ -122,8 +63,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 			zval_ptr_dtor(z); \
 			ZVAL_NULL(z); \
 		} \
-	} else { \
-		zephir_memory_observe(z); \
 	}
 
 /* TODO: this might causes troubles, since we cannot observe here, since we aren't using double pointers
@@ -135,8 +74,6 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (tmp_ != NULL) { \
 			if (Z_TYPE_P(tmp_) != IS_UNDEF) { \
 				zval_ptr_dtor(tmp_); \
-			} else { \
-				zephir_memory_observe(tmp_); \
 			} \
 			ZVAL_NULL(tmp_); \
 		} \
diff --git a/ext/kernel/operators.h b/ext/kernel/operators.h
index 44351f897a..7659b62c8b 100644
--- a/ext/kernel/operators.h
+++ b/ext/kernel/operators.h
@@ -229,7 +229,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 		if (Z_TYPE_P(right) == IS_STRING) { \
 			ZEPHIR_CPY_WRT(left, right); \
 		} else if (Z_TYPE_P(right) == IS_NULL) { \
-		    ZEPHIR_INIT_VAR(left); \
+		    ZVAL_NULL(left); \
 		} else { \
 			use_copy_right = zephir_make_printable_zval(right, &right_tmp); \
 			if (use_copy_right) { \
diff --git a/ext/stub.c b/ext/stub.c
index 8af92d7614..2acae2d3be 100644
--- a/ext/stub.c
+++ b/ext/stub.c
@@ -186,6 +186,7 @@ zend_class_entry *stub_oo_propertyaccess_ce;
 zend_class_entry *stub_oo_scopes_abstractclass_ce;
 zend_class_entry *stub_oo_scopes_abstractclassmagic_ce;
 zend_class_entry *stub_oo_scopes_privatescopetester_ce;
+zend_class_entry *stub_openssl_ce;
 zend_class_entry *stub_operator_ce;
 zend_class_entry *stub_optimizers_acos_ce;
 zend_class_entry *stub_optimizers_arraymerge_ce;
@@ -417,6 +418,7 @@ static PHP_MINIT_FUNCTION(stub)
 	ZEPHIR_INIT(Stub_Oo_Scopes_AbstractClass);
 	ZEPHIR_INIT(Stub_Oo_Scopes_AbstractClassMagic);
 	ZEPHIR_INIT(Stub_Oo_Scopes_PrivateScopeTester);
+	ZEPHIR_INIT(Stub_Openssl);
 	ZEPHIR_INIT(Stub_Operator);
 	ZEPHIR_INIT(Stub_Optimizers_ACos);
 	ZEPHIR_INIT(Stub_Optimizers_ASin);
diff --git a/ext/stub.h b/ext/stub.h
index 48be14ef4f..02f8e7ed58 100644
--- a/ext/stub.h
+++ b/ext/stub.h
@@ -153,6 +153,7 @@
 #include "stub/oo/scopes/abstractclassmagic.zep.h"
 #include "stub/oo/scopes/privatescopetester.zep.h"
 #include "stub/ooimpl/abeginning.zep.h"
+#include "stub/openssl.zep.h"
 #include "stub/operator.zep.h"
 #include "stub/optimizers/isscalar.zep.h"
 #include "stub/optimizers/acos.zep.h"
diff --git a/ext/stub/0__closure.zep.c b/ext/stub/0__closure.zep.c
index bf61b8eab1..3bf21974eb 100644
--- a/ext/stub/0__closure.zep.c
+++ b/ext/stub/0__closure.zep.c
@@ -27,17 +27,12 @@ ZEPHIR_INIT_CLASS(stub_0__closure)
 PHP_METHOD(stub_0__closure, __invoke)
 {
 	zval *x, x_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
-
-
 	RETURN_LONG((zephir_get_numberval(x) * 100));
 }
 
diff --git a/ext/stub/10__closure.zep.c b/ext/stub/10__closure.zep.c
index c17742a26e..b74a33c19a 100644
--- a/ext/stub/10__closure.zep.c
+++ b/ext/stub/10__closure.zep.c
@@ -26,17 +26,12 @@ ZEPHIR_INIT_CLASS(stub_10__closure)
 PHP_METHOD(stub_10__closure, __invoke)
 {
 	zval *config, config_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&config_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(config)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &config);
-
-
 	RETVAL_ZVAL(config, 1, 0);
 	return;
 }
diff --git a/ext/stub/11__closure.zep.c b/ext/stub/11__closure.zep.c
index 4f89d8999f..3ca9b384e4 100644
--- a/ext/stub/11__closure.zep.c
+++ b/ext/stub/11__closure.zep.c
@@ -27,17 +27,12 @@ ZEPHIR_INIT_CLASS(stub_11__closure)
 PHP_METHOD(stub_11__closure, __invoke)
 {
 	zval *x, x_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
-
-
 	mul_function(return_value, x, x);
 	return;
 }
diff --git a/ext/stub/12__closure.zep.c b/ext/stub/12__closure.zep.c
index 0c969f7be9..327f365347 100644
--- a/ext/stub/12__closure.zep.c
+++ b/ext/stub/12__closure.zep.c
@@ -24,9 +24,6 @@ ZEPHIR_INIT_CLASS(stub_12__closure)
 
 PHP_METHOD(stub_12__closure, __invoke)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(5);
 }
diff --git a/ext/stub/13__closure.zep.c b/ext/stub/13__closure.zep.c
index 6229650900..de95a2bb31 100644
--- a/ext/stub/13__closure.zep.c
+++ b/ext/stub/13__closure.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(stub_13__closure)
@@ -26,17 +25,9 @@ ZEPHIR_INIT_CLASS(stub_13__closure)
 
 PHP_METHOD(stub_13__closure, __invoke)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_mcall_caller_ce, "perform", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/1__closure.zep.c b/ext/stub/1__closure.zep.c
index 2b68c6696a..e888e319b0 100644
--- a/ext/stub/1__closure.zep.c
+++ b/ext/stub/1__closure.zep.c
@@ -24,9 +24,6 @@ ZEPHIR_INIT_CLASS(stub_1__closure)
 
 PHP_METHOD(stub_1__closure, __invoke)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
diff --git a/ext/stub/2__closure.zep.c b/ext/stub/2__closure.zep.c
index 1d473f352a..250a54f644 100644
--- a/ext/stub/2__closure.zep.c
+++ b/ext/stub/2__closure.zep.c
@@ -24,9 +24,6 @@ ZEPHIR_INIT_CLASS(stub_2__closure)
 
 PHP_METHOD(stub_2__closure, __invoke)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
diff --git a/ext/stub/3__closure.zep.c b/ext/stub/3__closure.zep.c
index 23070f1ed1..fd7f02b840 100644
--- a/ext/stub/3__closure.zep.c
+++ b/ext/stub/3__closure.zep.c
@@ -26,16 +26,11 @@ ZEPHIR_INIT_CLASS(stub_3__closure)
 PHP_METHOD(stub_3__closure, __invoke)
 {
 	zval *param1, param1_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param1);
-
-
 }
 
diff --git a/ext/stub/4__closure.zep.c b/ext/stub/4__closure.zep.c
index abca7ef8ab..4a22a518c6 100644
--- a/ext/stub/4__closure.zep.c
+++ b/ext/stub/4__closure.zep.c
@@ -26,16 +26,11 @@ ZEPHIR_INIT_CLASS(stub_4__closure)
 PHP_METHOD(stub_4__closure, __invoke)
 {
 	zval *param1, param1_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param1);
-
-
 }
 
diff --git a/ext/stub/5__closure.zep.c b/ext/stub/5__closure.zep.c
index 0d5e844e74..bf006718f2 100644
--- a/ext/stub/5__closure.zep.c
+++ b/ext/stub/5__closure.zep.c
@@ -26,17 +26,12 @@ ZEPHIR_INIT_CLASS(stub_5__closure)
 PHP_METHOD(stub_5__closure, __invoke)
 {
 	zval *param1, param1_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param1);
-
-
 	RETURN_NULL();
 }
 
diff --git a/ext/stub/6__closure.zep.c b/ext/stub/6__closure.zep.c
index e0d9e10796..c75beecf02 100644
--- a/ext/stub/6__closure.zep.c
+++ b/ext/stub/6__closure.zep.c
@@ -27,17 +27,12 @@ ZEPHIR_INIT_CLASS(stub_6__closure)
 PHP_METHOD(stub_6__closure, __invoke)
 {
 	zval *x, x_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
-
-
 	RETURN_LONG((zephir_get_numberval(x) + 100));
 }
 
diff --git a/ext/stub/7__closure.zep.c b/ext/stub/7__closure.zep.c
index 6bc91c44bb..075e3a3153 100644
--- a/ext/stub/7__closure.zep.c
+++ b/ext/stub/7__closure.zep.c
@@ -27,17 +27,12 @@ ZEPHIR_INIT_CLASS(stub_7__closure)
 PHP_METHOD(stub_7__closure, __invoke)
 {
 	zval *x, x_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &x);
-
-
 	RETURN_LONG((((zephir_get_numberval(x) + 100)) + ((zephir_get_numberval(x) * 150))));
 }
 
diff --git a/ext/stub/8__closure.zep.c b/ext/stub/8__closure.zep.c
index 138be7593c..069acede3f 100644
--- a/ext/stub/8__closure.zep.c
+++ b/ext/stub/8__closure.zep.c
@@ -27,11 +27,8 @@ ZEPHIR_INIT_CLASS(stub_8__closure)
 PHP_METHOD(stub_8__closure, __invoke)
 {
 	zval abc;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&abc);
-
-
 	zephir_read_static_property_ce(&abc, stub_8__closure_ce, SL("abc"), PH_NOISY_CC);
 
 	RETURN_LONG((zephir_get_numberval(&abc) + 1));
diff --git a/ext/stub/9__closure.zep.c b/ext/stub/9__closure.zep.c
index 261fad039d..9fa1df6933 100644
--- a/ext/stub/9__closure.zep.c
+++ b/ext/stub/9__closure.zep.c
@@ -27,12 +27,9 @@ ZEPHIR_INIT_CLASS(stub_9__closure)
 PHP_METHOD(stub_9__closure, __invoke)
 {
 	zval abc, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&abc);
 	ZVAL_UNDEF(&_0);
-
-
 	zephir_read_static_property_ce(&abc, stub_9__closure_ce, SL("abc"), PH_NOISY_CC);
 
 	zephir_array_fetch_string(&_0, &abc, SL("a"), PH_NOISY | PH_READONLY, "stub/closures.zep", 66);
diff --git a/ext/stub/arithmetic.zep.c b/ext/stub/arithmetic.zep.c
index 49468abfe2..f14582d76c 100644
--- a/ext/stub/arithmetic.zep.c
+++ b/ext/stub/arithmetic.zep.c
@@ -34,11 +34,6 @@ ZEPHIR_INIT_CLASS(Stub_Arithmetic)
 PHP_METHOD(Stub_Arithmetic, intSum)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a + b);
@@ -48,11 +43,6 @@ PHP_METHOD(Stub_Arithmetic, intSum)
 PHP_METHOD(Stub_Arithmetic, int2Sum)
 {
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a + 2);
 	RETURN_LONG(c);
@@ -61,11 +51,6 @@ PHP_METHOD(Stub_Arithmetic, int2Sum)
 PHP_METHOD(Stub_Arithmetic, intSumSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 3;
 	RETURN_LONG(c);
 }
@@ -73,11 +58,6 @@ PHP_METHOD(Stub_Arithmetic, intSumSimple)
 PHP_METHOD(Stub_Arithmetic, boolSum)
 {
 	zend_bool a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2) ? 1 : 0);
 	c = (a | b);
@@ -87,11 +67,6 @@ PHP_METHOD(Stub_Arithmetic, boolSum)
 PHP_METHOD(Stub_Arithmetic, bool2Sum)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	c = (a + 2);
 	RETURN_BOOL(c);
@@ -100,11 +75,6 @@ PHP_METHOD(Stub_Arithmetic, bool2Sum)
 PHP_METHOD(Stub_Arithmetic, bool3Sum)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a | 0);
 	RETURN_BOOL(c);
@@ -113,11 +83,6 @@ PHP_METHOD(Stub_Arithmetic, bool3Sum)
 PHP_METHOD(Stub_Arithmetic, boolSumSimple)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = ((3) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -126,17 +91,10 @@ PHP_METHOD(Stub_Arithmetic, boolSumExpression)
 {
 	zval _0, _1;
 	zend_bool a = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
@@ -147,39 +105,24 @@ PHP_METHOD(Stub_Arithmetic, boolSumExpression)
 PHP_METHOD(Stub_Arithmetic, doubleSum)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = (double) (2);
-	c = (a + b);
+	c =  ((a + b));
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, double2Sum)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
-	b = 2.0;
-	c = (a + b);
+	a =  (1.0);
+	b =  (2.0);
+	c =  ((a + b));
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, doubleSumSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (3);
 	RETURN_DOUBLE(c);
 }
@@ -187,29 +130,17 @@ PHP_METHOD(Stub_Arithmetic, doubleSumSimple)
 PHP_METHOD(Stub_Arithmetic, doubleSum2Simple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	c = 3;
+	c =  (3);
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, doubleSumExpression)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
 	zephir_check_call_status();
@@ -220,18 +151,11 @@ PHP_METHOD(Stub_Arithmetic, doubleSumVarExpression)
 {
 	zval _0, _1;
 	double a = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	a = 1.0;
+	a =  (1.0);
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
 	zephir_check_call_status();
@@ -241,11 +165,6 @@ PHP_METHOD(Stub_Arithmetic, doubleSumVarExpression)
 PHP_METHOD(Stub_Arithmetic, varSum)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a + b);
@@ -255,11 +174,6 @@ PHP_METHOD(Stub_Arithmetic, varSum)
 PHP_METHOD(Stub_Arithmetic, varSumSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 3;
 	RETURN_LONG(c);
 }
@@ -268,11 +182,6 @@ PHP_METHOD(Stub_Arithmetic, intDoubleSum)
 {
 	double a = 0;
 	zend_long b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
 	c = (long) ((a +  (double) b));
@@ -282,11 +191,6 @@ PHP_METHOD(Stub_Arithmetic, intDoubleSum)
 PHP_METHOD(Stub_Arithmetic, intDoubleSumSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (long) (3);
 	RETURN_LONG(c);
 }
@@ -295,37 +199,22 @@ PHP_METHOD(Stub_Arithmetic, doubleIntSum)
 {
 	double a = 0, c = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
-	c = (a +  (double) b);
+	c =  ((a +  (double) b));
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, doubleIntSumSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	c = 3;
+	c =  (3);
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, varIntSum)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a + b);
@@ -335,11 +224,6 @@ PHP_METHOD(Stub_Arithmetic, varIntSum)
 PHP_METHOD(Stub_Arithmetic, intVarSum)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (b + a);
@@ -350,22 +234,15 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCastSum)
 {
 	zend_long c = 0;
 	zval a, b, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "2");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_add_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -375,16 +252,9 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sum)
 {
 	zend_long b = 0, c = 0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b + zephir_get_numberval(&a));
@@ -394,23 +264,13 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sum)
 PHP_METHOD(Stub_Arithmetic, complexSum)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	c = 3;
+	c =  (3);
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, complex2Sum)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (1 | 1);
 	RETURN_BOOL(c);
 }
@@ -418,11 +278,6 @@ PHP_METHOD(Stub_Arithmetic, complex2Sum)
 PHP_METHOD(Stub_Arithmetic, complex3Sum)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 + 1.0)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -430,16 +285,9 @@ PHP_METHOD(Stub_Arithmetic, complex3Sum)
 PHP_METHOD(Stub_Arithmetic, complex4Sum)
 {
 	zval c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_DOUBLE(&c, (1.0 + 1));
 	RETURN_CCTOR(&c);
 }
@@ -447,11 +295,6 @@ PHP_METHOD(Stub_Arithmetic, complex4Sum)
 PHP_METHOD(Stub_Arithmetic, complex5Sum)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (1 + 1);
 	RETURN_LONG(c);
 }
@@ -459,11 +302,6 @@ PHP_METHOD(Stub_Arithmetic, complex5Sum)
 PHP_METHOD(Stub_Arithmetic, complex6Sum)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 + 1)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -472,11 +310,6 @@ PHP_METHOD(Stub_Arithmetic, complex7Sum)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (a + b);
@@ -487,11 +320,6 @@ PHP_METHOD(Stub_Arithmetic, complex9Sum)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (b + a);
@@ -503,11 +331,6 @@ PHP_METHOD(Stub_Arithmetic, complex10Sum)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1.0 != 0.0) ? 1 : 0);
 	b = 2;
 	c = (double) ((b + a));
@@ -519,11 +342,6 @@ PHP_METHOD(Stub_Arithmetic, complex11Sum)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (double) ((b + a));
@@ -534,11 +352,6 @@ PHP_METHOD(Stub_Arithmetic, complex12Sum)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (b + a);
@@ -549,11 +362,6 @@ PHP_METHOD(Stub_Arithmetic, complex13Sum)
 {
 	zend_long c = 0;
 	zend_bool a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b | a);
@@ -564,11 +372,6 @@ PHP_METHOD(Stub_Arithmetic, complex14Sum)
 {
 	zend_bool b = 0;
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b + a);
@@ -580,13 +383,8 @@ PHP_METHOD(Stub_Arithmetic, complex15Sum)
 	zend_bool c = 0;
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
+	b =  (2.0);
 	c = (((b +  (double) a) != 0.0) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -595,14 +393,9 @@ PHP_METHOD(Stub_Arithmetic, complex16Sum)
 {
 	double b = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
-	c = (b +  (double) a);
+	b =  (2.0);
+	c =  ((b +  (double) a));
 	RETURN_DOUBLE(c);
 }
 
@@ -611,11 +404,6 @@ PHP_METHOD(Stub_Arithmetic, complex17Sum)
 	double c = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (double) ((a + b));
@@ -627,15 +415,10 @@ PHP_METHOD(Stub_Arithmetic, complex18Sum)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a + b));
-	c = (double) ((a + b) + d);
+	c =  ((double) ((a + b) + d));
 	RETURN_DOUBLE(c);
 }
 
@@ -644,15 +427,10 @@ PHP_METHOD(Stub_Arithmetic, complex19Sum)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a + b));
-	c = (((double) a + d) + b);
+	c =  ((((double) a + d) + b));
 	RETURN_DOUBLE(c);
 }
 
@@ -661,15 +439,10 @@ PHP_METHOD(Stub_Arithmetic, complex20Sum)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a + b));
-	c = (double) ((double) ((d + d) + d) + d);
+	c =  ((double) ((double) ((d + d) + d) + d));
 	RETURN_DOUBLE(c);
 }
 
@@ -678,15 +451,10 @@ PHP_METHOD(Stub_Arithmetic, complex21Sum)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a + b));
-	c = ((double) (((double) ((double) (((b + d) + b) + d) + d) + b) + d) + b);
+	c =  (((double) (((double) ((double) (((b + d) + b) + d) + d) + b) + d) + b));
 	RETURN_DOUBLE(c);
 }
 
@@ -694,15 +462,10 @@ PHP_METHOD(Stub_Arithmetic, complex22Sum)
 {
 	double d = 0, c = 0;
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = (long) (2.0);
 	d = (double) ((a + b));
-	c = ((double) (((double) ((double) ((double) (((double) b + d) + d) + d) + d) + b) + d) + b);
+	c =  (((double) (((double) ((double) ((double) (((double) b + d) + d) + d) + d) + b) + d) + b));
 	RETURN_DOUBLE(c);
 }
 
@@ -711,11 +474,6 @@ PHP_METHOD(Stub_Arithmetic, complex23Sum)
 	double d = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a + b));
@@ -727,11 +485,6 @@ PHP_METHOD(Stub_Arithmetic, complex24Sum)
 	zend_bool b = 0;
 	double d = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((((1 + a) + 0) + b));
@@ -741,11 +494,6 @@ PHP_METHOD(Stub_Arithmetic, complex24Sum)
 PHP_METHOD(Stub_Arithmetic, addSum1)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a += 10;
 	RETURN_LONG(a);
@@ -754,11 +502,6 @@ PHP_METHOD(Stub_Arithmetic, addSum1)
 PHP_METHOD(Stub_Arithmetic, addSum2)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a += 0;
 	RETURN_LONG(a);
@@ -767,11 +510,6 @@ PHP_METHOD(Stub_Arithmetic, addSum2)
 PHP_METHOD(Stub_Arithmetic, addSum2b)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	a += 0;
 	RETURN_LONG(a);
@@ -780,11 +518,6 @@ PHP_METHOD(Stub_Arithmetic, addSum2b)
 PHP_METHOD(Stub_Arithmetic, addSum3)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a += 1;
 	RETURN_LONG(a);
@@ -793,11 +526,6 @@ PHP_METHOD(Stub_Arithmetic, addSum3)
 PHP_METHOD(Stub_Arithmetic, addSum4)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a += 0;
 	RETURN_LONG(a);
@@ -806,11 +534,6 @@ PHP_METHOD(Stub_Arithmetic, addSum4)
 PHP_METHOD(Stub_Arithmetic, addSum5)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a += (long) (1.0);
 	RETURN_LONG(a);
@@ -819,11 +542,6 @@ PHP_METHOD(Stub_Arithmetic, addSum5)
 PHP_METHOD(Stub_Arithmetic, addSum6)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a += (long) (1.0);
 	RETURN_LONG(a);
@@ -832,12 +550,7 @@ PHP_METHOD(Stub_Arithmetic, addSum6)
 PHP_METHOD(Stub_Arithmetic, addSum7)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a += (double) (10);
 	RETURN_DOUBLE(a);
 }
@@ -845,12 +558,7 @@ PHP_METHOD(Stub_Arithmetic, addSum7)
 PHP_METHOD(Stub_Arithmetic, addSum8)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a += 0.0;
 	RETURN_DOUBLE(a);
 }
@@ -858,12 +566,7 @@ PHP_METHOD(Stub_Arithmetic, addSum8)
 PHP_METHOD(Stub_Arithmetic, addSum8b)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 6.3;
+	a =  (6.3);
 	a += 0.0;
 	RETURN_DOUBLE(a);
 }
@@ -871,12 +574,7 @@ PHP_METHOD(Stub_Arithmetic, addSum8b)
 PHP_METHOD(Stub_Arithmetic, addSum9)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a += 1;
 	RETURN_DOUBLE(a);
 }
@@ -884,12 +582,7 @@ PHP_METHOD(Stub_Arithmetic, addSum9)
 PHP_METHOD(Stub_Arithmetic, addSum10)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a += 0;
 	RETURN_DOUBLE(a);
 }
@@ -897,24 +590,14 @@ PHP_METHOD(Stub_Arithmetic, addSum10)
 PHP_METHOD(Stub_Arithmetic, addSum11)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
-	a += 1.0;
+	a =  (0.0);
+	a +=  (1.0);
 	RETURN_DOUBLE(a);
 }
 
 PHP_METHOD(Stub_Arithmetic, addSum12)
 {
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	b = 10;
 	a += b;
@@ -925,11 +608,6 @@ PHP_METHOD(Stub_Arithmetic, addSum13)
 {
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	b = 1;
 	a += b;
@@ -940,11 +618,6 @@ PHP_METHOD(Stub_Arithmetic, addSum14)
 {
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	b = 0;
 	a += b;
@@ -955,13 +628,8 @@ PHP_METHOD(Stub_Arithmetic, addSum15)
 {
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
-	b = 1.0;
+	b =  (1.0);
 	a += (long) b;
 	RETURN_LONG(a);
 }
@@ -969,14 +637,9 @@ PHP_METHOD(Stub_Arithmetic, addSum15)
 PHP_METHOD(Stub_Arithmetic, addSum16)
 {
 	double a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
-	b = 10.0;
-	a += b;
+	a =  (0.0);
+	b =  (10.0);
+	a +=  b;
 	RETURN_DOUBLE(a);
 }
 
@@ -984,12 +647,7 @@ PHP_METHOD(Stub_Arithmetic, addSum17)
 {
 	zend_bool b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 1;
 	a += (double) b;
 	RETURN_DOUBLE(a);
@@ -999,12 +657,7 @@ PHP_METHOD(Stub_Arithmetic, addSum18)
 {
 	zend_bool b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 0;
 	a += (double) b;
 	RETURN_DOUBLE(a);
@@ -1014,12 +667,7 @@ PHP_METHOD(Stub_Arithmetic, addSum19)
 {
 	zend_long b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 1;
 	a += (double) b;
 	RETURN_DOUBLE(a);
@@ -1028,11 +676,6 @@ PHP_METHOD(Stub_Arithmetic, addSum19)
 PHP_METHOD(Stub_Arithmetic, addSum20)
 {
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (long) (0.0);
 	b = 1;
 	a += b;
@@ -1043,12 +686,7 @@ PHP_METHOD(Stub_Arithmetic, addSum21)
 {
 	zend_long b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 1;
 	a += (double) b;
 	RETURN_DOUBLE(a);
@@ -1058,16 +696,9 @@ PHP_METHOD(Stub_Arithmetic, addSum22)
 {
 	zend_long b = 0, _0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_DOUBLE(&a, 0.0);
 	b = 1;
 	ZEPHIR_INIT_NVAR(&a);
@@ -1079,11 +710,6 @@ PHP_METHOD(Stub_Arithmetic, addSum22)
 PHP_METHOD(Stub_Arithmetic, addSum23)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	a += 1024;
 	RETURN_LONG(a);
@@ -1091,38 +717,25 @@ PHP_METHOD(Stub_Arithmetic, addSum23)
 
 PHP_METHOD(Stub_Arithmetic, addSum24)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1024);
 	ZEPHIR_ADD_ASSIGN(a, &_0);
 	RETVAL_ZVAL(a, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Arithmetic, intSub)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a - b);
@@ -1132,11 +745,6 @@ PHP_METHOD(Stub_Arithmetic, intSub)
 PHP_METHOD(Stub_Arithmetic, intLetSub)
 {
 	zend_long b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 1;
 	b = 2;
 	c -= b;
@@ -1146,11 +754,6 @@ PHP_METHOD(Stub_Arithmetic, intLetSub)
 PHP_METHOD(Stub_Arithmetic, intSub2)
 {
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a - 2);
 	RETURN_LONG(c);
@@ -1159,11 +762,6 @@ PHP_METHOD(Stub_Arithmetic, intSub2)
 PHP_METHOD(Stub_Arithmetic, intSubSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = -1;
 	RETURN_LONG(c);
 }
@@ -1171,11 +769,6 @@ PHP_METHOD(Stub_Arithmetic, intSubSimple)
 PHP_METHOD(Stub_Arithmetic, boolSub)
 {
 	zend_bool a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2) ? 1 : 0);
 	c = (a & b);
@@ -1185,11 +778,6 @@ PHP_METHOD(Stub_Arithmetic, boolSub)
 PHP_METHOD(Stub_Arithmetic, bool2Sub)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	c = (a - 2);
 	RETURN_BOOL(c);
@@ -1198,11 +786,6 @@ PHP_METHOD(Stub_Arithmetic, bool2Sub)
 PHP_METHOD(Stub_Arithmetic, bool3Sub)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a & 0);
 	RETURN_BOOL(c);
@@ -1211,11 +794,6 @@ PHP_METHOD(Stub_Arithmetic, bool3Sub)
 PHP_METHOD(Stub_Arithmetic, bool4Sub)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a & 1);
 	RETURN_BOOL(c);
@@ -1224,11 +802,6 @@ PHP_METHOD(Stub_Arithmetic, bool4Sub)
 PHP_METHOD(Stub_Arithmetic, boolSubSimple)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = ((-1) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1236,39 +809,24 @@ PHP_METHOD(Stub_Arithmetic, boolSubSimple)
 PHP_METHOD(Stub_Arithmetic, doubleSub)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = (double) (2);
-	c = (a - b);
+	c =  ((a - b));
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, double2Sub)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
-	b = 2.0;
-	c = (a - b);
+	a =  (1.0);
+	b =  (2.0);
+	c =  ((a - b));
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, doubleSubSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (-1);
 	RETURN_DOUBLE(c);
 }
@@ -1276,23 +834,13 @@ PHP_METHOD(Stub_Arithmetic, doubleSubSimple)
 PHP_METHOD(Stub_Arithmetic, doubleSub2Simple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	c = -1;
+	c =  (-1);
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, varSub)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a - b);
@@ -1302,11 +850,6 @@ PHP_METHOD(Stub_Arithmetic, varSub)
 PHP_METHOD(Stub_Arithmetic, varSubSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = -1;
 	RETURN_LONG(c);
 }
@@ -1315,11 +858,6 @@ PHP_METHOD(Stub_Arithmetic, intDoubleSub)
 {
 	double a = 0;
 	zend_long b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
 	c = (long) ((a -  (double) b));
@@ -1329,11 +867,6 @@ PHP_METHOD(Stub_Arithmetic, intDoubleSub)
 PHP_METHOD(Stub_Arithmetic, intDoubleSubSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (long) (-1);
 	RETURN_LONG(c);
 }
@@ -1342,37 +875,22 @@ PHP_METHOD(Stub_Arithmetic, doubleIntSub)
 {
 	double a = 0, c = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
-	c = (a -  (double) b);
+	c =  ((a -  (double) b));
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, doubleIntSubSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	c = -1;
+	c =  (-1);
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, varIntSub)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a - b);
@@ -1382,11 +900,6 @@ PHP_METHOD(Stub_Arithmetic, varIntSub)
 PHP_METHOD(Stub_Arithmetic, intVarSub)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (b - a);
@@ -1397,22 +910,15 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCastSub)
 {
 	zend_long c = 0;
 	zval a, b, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "2");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_sub_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -1422,16 +928,9 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sub)
 {
 	zend_long b = 0, c = 0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b - zephir_get_numberval(&a));
@@ -1441,23 +940,13 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sub)
 PHP_METHOD(Stub_Arithmetic, complexSub)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	c = 1;
+	c =  (1);
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, complex2Sub)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (1 & 1);
 	RETURN_BOOL(c);
 }
@@ -1465,11 +954,6 @@ PHP_METHOD(Stub_Arithmetic, complex2Sub)
 PHP_METHOD(Stub_Arithmetic, complex3Sub)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 + 1.0)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1477,16 +961,9 @@ PHP_METHOD(Stub_Arithmetic, complex3Sub)
 PHP_METHOD(Stub_Arithmetic, complex4Sub)
 {
 	zval c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_DOUBLE(&c, (1.0 - 1));
 	RETURN_CCTOR(&c);
 }
@@ -1494,11 +971,6 @@ PHP_METHOD(Stub_Arithmetic, complex4Sub)
 PHP_METHOD(Stub_Arithmetic, complex5Sub)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (1 - 1);
 	RETURN_LONG(c);
 }
@@ -1506,11 +978,6 @@ PHP_METHOD(Stub_Arithmetic, complex5Sub)
 PHP_METHOD(Stub_Arithmetic, complex6Sub)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 + 1)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1519,11 +986,6 @@ PHP_METHOD(Stub_Arithmetic, complex7Sub)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (a - b);
@@ -1534,11 +996,6 @@ PHP_METHOD(Stub_Arithmetic, complex9Sub)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (b - a);
@@ -1550,11 +1007,6 @@ PHP_METHOD(Stub_Arithmetic, complex10Sub)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1.0 != 0.0) ? 1 : 0);
 	b = 2;
 	c = (double) ((b - a));
@@ -1566,11 +1018,6 @@ PHP_METHOD(Stub_Arithmetic, complex11Sub)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (double) ((b - a));
@@ -1581,11 +1028,6 @@ PHP_METHOD(Stub_Arithmetic, complex12Sub)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (b - a);
@@ -1596,11 +1038,6 @@ PHP_METHOD(Stub_Arithmetic, complex13Sub)
 {
 	zend_long c = 0;
 	zend_bool a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b & a);
@@ -1611,11 +1048,6 @@ PHP_METHOD(Stub_Arithmetic, complex14Sub)
 {
 	zend_bool b = 0;
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b - a);
@@ -1627,13 +1059,8 @@ PHP_METHOD(Stub_Arithmetic, complex15Sub)
 	zend_bool c = 0;
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
+	b =  (2.0);
 	c = (((b -  (double) a) != 0.0) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1642,14 +1069,9 @@ PHP_METHOD(Stub_Arithmetic, complex16Sub)
 {
 	double b = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
-	c = (b -  (double) a);
+	b =  (2.0);
+	c =  ((b -  (double) a));
 	RETURN_DOUBLE(c);
 }
 
@@ -1658,11 +1080,6 @@ PHP_METHOD(Stub_Arithmetic, complex17Sub)
 	double c = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (double) ((a - b));
@@ -1674,32 +1091,22 @@ PHP_METHOD(Stub_Arithmetic, complex18Sub)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a - b));
-	c = (double) ((a - b) - d);
+	c =  ((double) ((a - b) - d));
 	RETURN_DOUBLE(c);
 }
 
 PHP_METHOD(Stub_Arithmetic, complex19Sub)
 {
-	zend_bool b = 0;
-	double d = 0, c = 0;
-	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
+	zend_bool b = 0;
+	double d = 0, c = 0;
+	zend_long a = 0;
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a - b));
-	c = (((double) a - d) - b);
+	c =  ((((double) a - d) - b));
 	RETURN_DOUBLE(c);
 }
 
@@ -1708,15 +1115,10 @@ PHP_METHOD(Stub_Arithmetic, complex20Sub)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a - b));
-	c = (double) ((double) ((d - d) - d) - d);
+	c =  ((double) ((double) ((d - d) - d) - d));
 	RETURN_DOUBLE(c);
 }
 
@@ -1725,15 +1127,10 @@ PHP_METHOD(Stub_Arithmetic, complex21Sub)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a - b));
-	c = ((double) (((double) ((double) (((b - d) - b) - d) - d) - b) - d) - b);
+	c =  (((double) (((double) ((double) (((b - d) - b) - d) - d) - b) - d) - b));
 	RETURN_DOUBLE(c);
 }
 
@@ -1741,15 +1138,10 @@ PHP_METHOD(Stub_Arithmetic, complex22Sub)
 {
 	double d = 0, c = 0;
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = (long) (2.0);
 	d = (double) ((a - b));
-	c = ((double) (((double) ((double) ((double) (((double) b - d) - d) - d) - d) - b) - d) - b);
+	c =  (((double) (((double) ((double) ((double) (((double) b - d) - d) - d) - d) - b) - d) - b));
 	RETURN_DOUBLE(c);
 }
 
@@ -1758,11 +1150,6 @@ PHP_METHOD(Stub_Arithmetic, complex23Sub)
 	double d = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a - b));
@@ -1774,11 +1161,6 @@ PHP_METHOD(Stub_Arithmetic, complex24Sub)
 	zend_bool b = 0;
 	double d = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((((1 - a) - 0) - b));
@@ -1788,11 +1170,6 @@ PHP_METHOD(Stub_Arithmetic, complex24Sub)
 PHP_METHOD(Stub_Arithmetic, sub1)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a -= 10;
 	RETURN_LONG(a);
@@ -1801,11 +1178,6 @@ PHP_METHOD(Stub_Arithmetic, sub1)
 PHP_METHOD(Stub_Arithmetic, sub2)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a -= 0;
 	RETURN_LONG(a);
@@ -1814,11 +1186,6 @@ PHP_METHOD(Stub_Arithmetic, sub2)
 PHP_METHOD(Stub_Arithmetic, sub2b)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	a -= 0;
 	RETURN_LONG(a);
@@ -1827,11 +1194,6 @@ PHP_METHOD(Stub_Arithmetic, sub2b)
 PHP_METHOD(Stub_Arithmetic, sub3)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a -= 1;
 	RETURN_LONG(a);
@@ -1840,11 +1202,6 @@ PHP_METHOD(Stub_Arithmetic, sub3)
 PHP_METHOD(Stub_Arithmetic, sub4)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a -= 0;
 	RETURN_LONG(a);
@@ -1853,11 +1210,6 @@ PHP_METHOD(Stub_Arithmetic, sub4)
 PHP_METHOD(Stub_Arithmetic, sub5)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a -= (long) (1.0);
 	RETURN_LONG(a);
@@ -1866,11 +1218,6 @@ PHP_METHOD(Stub_Arithmetic, sub5)
 PHP_METHOD(Stub_Arithmetic, sub6)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	a -= (long) (1.0);
 	RETURN_LONG(a);
@@ -1879,12 +1226,7 @@ PHP_METHOD(Stub_Arithmetic, sub6)
 PHP_METHOD(Stub_Arithmetic, sub7)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a -= (double) (10);
 	RETURN_DOUBLE(a);
 }
@@ -1892,12 +1234,7 @@ PHP_METHOD(Stub_Arithmetic, sub7)
 PHP_METHOD(Stub_Arithmetic, sub8)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a -= 0.0;
 	RETURN_DOUBLE(a);
 }
@@ -1905,12 +1242,7 @@ PHP_METHOD(Stub_Arithmetic, sub8)
 PHP_METHOD(Stub_Arithmetic, sub8b)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 6.3;
+	a =  (6.3);
 	a -= 0.0;
 	RETURN_DOUBLE(a);
 }
@@ -1918,12 +1250,7 @@ PHP_METHOD(Stub_Arithmetic, sub8b)
 PHP_METHOD(Stub_Arithmetic, sub9)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a -= 1;
 	RETURN_DOUBLE(a);
 }
@@ -1931,12 +1258,7 @@ PHP_METHOD(Stub_Arithmetic, sub9)
 PHP_METHOD(Stub_Arithmetic, sub10)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	a -= 0;
 	RETURN_DOUBLE(a);
 }
@@ -1944,24 +1266,14 @@ PHP_METHOD(Stub_Arithmetic, sub10)
 PHP_METHOD(Stub_Arithmetic, sub11)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
-	a -= 1.0;
+	a =  (0.0);
+	a -=  (1.0);
 	RETURN_DOUBLE(a);
 }
 
 PHP_METHOD(Stub_Arithmetic, sub12)
 {
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	b = 10;
 	a -= b;
@@ -1972,11 +1284,6 @@ PHP_METHOD(Stub_Arithmetic, sub13)
 {
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	b = 1;
 	a -= b;
@@ -1987,11 +1294,6 @@ PHP_METHOD(Stub_Arithmetic, sub14)
 {
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	b = 0;
 	a -= b;
@@ -2002,13 +1304,8 @@ PHP_METHOD(Stub_Arithmetic, sub15)
 {
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
-	b = 1.0;
+	b =  (1.0);
 	a -= (long) b;
 	RETURN_LONG(a);
 }
@@ -2016,14 +1313,9 @@ PHP_METHOD(Stub_Arithmetic, sub15)
 PHP_METHOD(Stub_Arithmetic, sub16)
 {
 	double a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
-	b = 10.0;
-	a -= b;
+	a =  (0.0);
+	b =  (10.0);
+	a -=  b;
 	RETURN_DOUBLE(a);
 }
 
@@ -2031,12 +1323,7 @@ PHP_METHOD(Stub_Arithmetic, sub17)
 {
 	zend_bool b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 1;
 	a -= (double) b;
 	RETURN_DOUBLE(a);
@@ -2046,12 +1333,7 @@ PHP_METHOD(Stub_Arithmetic, sub18)
 {
 	zend_bool b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 0;
 	a -= (double) b;
 	RETURN_DOUBLE(a);
@@ -2061,12 +1343,7 @@ PHP_METHOD(Stub_Arithmetic, sub19)
 {
 	zend_long b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 1;
 	a -= (double) b;
 	RETURN_DOUBLE(a);
@@ -2075,11 +1352,6 @@ PHP_METHOD(Stub_Arithmetic, sub19)
 PHP_METHOD(Stub_Arithmetic, sub20)
 {
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (long) (0.0);
 	b = 1;
 	a -= b;
@@ -2090,12 +1362,7 @@ PHP_METHOD(Stub_Arithmetic, sub21)
 {
 	zend_long b = 0;
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 0.0;
+	a =  (0.0);
 	b = 1;
 	a -= (double) b;
 	RETURN_DOUBLE(a);
@@ -2105,16 +1372,9 @@ PHP_METHOD(Stub_Arithmetic, sub22)
 {
 	zend_long b = 0, _0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_DOUBLE(&a, 0.0);
 	b = 1;
 	ZEPHIR_INIT_NVAR(&a);
@@ -2126,11 +1386,6 @@ PHP_METHOD(Stub_Arithmetic, sub22)
 PHP_METHOD(Stub_Arithmetic, sub23)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	a -= 1024;
 	RETURN_LONG(a);
@@ -2138,38 +1393,25 @@ PHP_METHOD(Stub_Arithmetic, sub23)
 
 PHP_METHOD(Stub_Arithmetic, sub24)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1024);
 	ZEPHIR_SUB_ASSIGN(a, &_0);
 	RETVAL_ZVAL(a, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Arithmetic, mul1)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	a *= 5;
 	RETURN_LONG(a);
@@ -2177,38 +1419,25 @@ PHP_METHOD(Stub_Arithmetic, mul1)
 
 PHP_METHOD(Stub_Arithmetic, mul2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 5);
 	ZEPHIR_MUL_ASSIGN(a, &_0);
 	RETVAL_ZVAL(a, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Arithmetic, mul3)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	a *= 1024;
 	RETURN_LONG(a);
@@ -2217,11 +1446,6 @@ PHP_METHOD(Stub_Arithmetic, mul3)
 PHP_METHOD(Stub_Arithmetic, less1)
 {
 	zend_long a, b;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	RETURN_BOOL(a < b);
@@ -2230,11 +1454,6 @@ PHP_METHOD(Stub_Arithmetic, less1)
 PHP_METHOD(Stub_Arithmetic, less2)
 {
 	zend_long a, b;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 2;
 	b = 1;
 	RETURN_BOOL(a < b);
@@ -2243,45 +1462,30 @@ PHP_METHOD(Stub_Arithmetic, less2)
 PHP_METHOD(Stub_Arithmetic, less3)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(ZEPHIR_LT_LONG(a, 5));
 }
 
 PHP_METHOD(Stub_Arithmetic, less4)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(ZEPHIR_LT_LONG(a, 5.0));
 }
 
 PHP_METHOD(Stub_Arithmetic, greater1)
 {
 	zend_long a, b;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	RETURN_BOOL(a > b);
@@ -2290,11 +1494,6 @@ PHP_METHOD(Stub_Arithmetic, greater1)
 PHP_METHOD(Stub_Arithmetic, greater2)
 {
 	zend_long a, b;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 2;
 	b = 1;
 	RETURN_BOOL(a > b);
@@ -2303,45 +1502,30 @@ PHP_METHOD(Stub_Arithmetic, greater2)
 PHP_METHOD(Stub_Arithmetic, greater3)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(ZEPHIR_GT_LONG(a, 5));
 }
 
 PHP_METHOD(Stub_Arithmetic, greater4)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(ZEPHIR_GT_LONG(a, 5.0));
 }
 
 PHP_METHOD(Stub_Arithmetic, letStatementIntMinus)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = -1;
 	RETURN_LONG(a);
 }
@@ -2349,11 +1533,6 @@ PHP_METHOD(Stub_Arithmetic, letStatementIntMinus)
 PHP_METHOD(Stub_Arithmetic, declaredIntMinus)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = -1;
 	RETURN_LONG(a);
 }
@@ -2365,17 +1544,12 @@ PHP_METHOD(Stub_Arithmetic, letStatementBoolMinus)
 {
 	zend_bool a = 0;
 	zval *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &b);
-
-
 	zephir_negate(b);
 	a = zephir_is_true(b);
 	RETURN_BOOL(a);
@@ -2383,22 +1557,14 @@ PHP_METHOD(Stub_Arithmetic, letStatementBoolMinus)
 
 PHP_METHOD(Stub_Arithmetic, letStatementVarMinus)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *b, b_sub, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&a);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b);
-
-
 	zephir_negate(b);
 	ZEPHIR_CPY_WRT(&a, b);
 	RETURN_CCTOR(&a);
@@ -2407,11 +1573,6 @@ PHP_METHOD(Stub_Arithmetic, letStatementVarMinus)
 PHP_METHOD(Stub_Arithmetic, div1)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 100;
 	RETURN_DOUBLE(zephir_safe_div_long_long(((a - 1)), 4));
 }
@@ -2422,9 +1583,6 @@ PHP_METHOD(Stub_Arithmetic, div2)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
 	RETURN_DOUBLE(zephir_safe_div_long_long(((zephir_get_numberval(&_0) - 1)), 4));
 }
@@ -2436,21 +1594,16 @@ PHP_METHOD(Stub_Arithmetic, absParam)
 {
 	zval *val_param = NULL;
 	zend_ulong val;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type uint"));
 		RETURN_NULL();
 	}
 	val = ZEND_ABS(Z_LVAL_P(val_param));
-
-
 	RETURN_LONG(val);
 }
 
@@ -2458,17 +1611,11 @@ PHP_METHOD(Stub_Arithmetic, negativeInt)
 {
 	zval *val_param = NULL;
 	zend_long val;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
-	val = zephir_get_intval(val_param);
-
-
 	RETURN_LONG(val);
 }
 
@@ -2476,17 +1623,11 @@ PHP_METHOD(Stub_Arithmetic, negativeLong)
 {
 	zval *val_param = NULL;
 	long val;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
-	val = zephir_get_intval(val_param);
-
-
 	RETURN_LONG(val);
 }
 
diff --git a/ext/stub/arrayaccessarr.zep.c b/ext/stub/arrayaccessarr.zep.c
index d5c089988f..2a1feca63d 100644
--- a/ext/stub/arrayaccessarr.zep.c
+++ b/ext/stub/arrayaccessarr.zep.c
@@ -29,22 +29,15 @@ ZEPHIR_INIT_CLASS(Stub_ArrayAccessArr)
 PHP_METHOD(Stub_ArrayAccessArr, __construct)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 3, 0);
 	add_assoc_long_ex(&_0, SL("one"), 1);
 	add_assoc_long_ex(&_0, SL("two"), 2);
 	add_assoc_long_ex(&_0, SL("three"), 3);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessArr, offsetSet)
@@ -59,11 +52,7 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetSet)
 		Z_PARAM_ZVAL(offset)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &offset, &value);
-
-
 	if (Z_TYPE_P(offset) == IS_NULL) {
 		zephir_update_property_array_append(this_ptr, SL("test"), value);
 	} else {
@@ -82,11 +71,7 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetExists)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	RETURN_BOOL(zephir_array_isset(&_0, offset));
 }
@@ -102,11 +87,7 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetUnset)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
-
-
 	zephir_unset_property_array(this_ptr, ZEND_STRL("test"), offset);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_unset(&_0, offset, PH_SEPARATE);
@@ -114,7 +95,6 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetUnset)
 
 PHP_METHOD(Stub_ArrayAccessArr, offsetGet)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, _0, _1, _2;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -126,19 +106,15 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetGet)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset(&_1, offset)) {
 		zephir_read_property(&_2, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
+		ZEPHIR_OBS_NVAR(&_0);
 		zephir_array_fetch(&_0, &_2, offset, PH_NOISY, "stub/arrayaccessarr.zep", 37);
 	} else {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_NULL(&_0);
 	}
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/arrayaccessobj.zep.c b/ext/stub/arrayaccessobj.zep.c
index d174db5022..ded8703f63 100644
--- a/ext/stub/arrayaccessobj.zep.c
+++ b/ext/stub/arrayaccessobj.zep.c
@@ -30,19 +30,13 @@ ZEPHIR_INIT_CLASS(Stub_ArrayAccessObj)
 PHP_METHOD(Stub_ArrayAccessObj, __construct)
 {
 	zval obj, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&obj);
+	ZVAL_NULL(&obj);
 	object_init(&obj);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "val1");
 	zephir_update_property_zval(&obj, ZEND_STRL("key1"), &_0);
@@ -53,12 +47,10 @@ PHP_METHOD(Stub_ArrayAccessObj, __construct)
 	ZVAL_STRING(&_0, "val3");
 	zephir_update_property_zval(&obj, ZEND_STRL("key3"), &_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &obj);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessObj, offsetSet)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, value_sub, obj;
 	zval *offset, *value;
 	zval *this_ptr = getThis();
@@ -70,25 +62,16 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetSet)
 		Z_PARAM_ZVAL(offset)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &offset, &value);
-
-
-	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	if (!(Z_TYPE_P(offset) == IS_NULL)) {
 		zephir_update_property_zval_zval(&obj, offset, value);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &obj);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, obj;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -98,14 +81,7 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
-
-
-	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	RETURN_MM_BOOL(zephir_isset_property_zval(&obj, offset));
 }
@@ -113,7 +89,6 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 PHP_METHOD(Stub_ArrayAccessObj, offsetUnset)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, obj;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -124,26 +99,17 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetUnset)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
-
-
-	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	zephir_get_arrval(&_0, &obj);
 	ZEPHIR_CPY_WRT(&obj, &_0);
 	zephir_array_unset(&obj, offset, PH_SEPARATE);
 	zephir_convert_to_object(&obj);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &obj);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessObj, offsetGet)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, _0, _1, _2;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -155,20 +121,15 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetGet)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_isset_property_zval(&_1, offset)) {
-		zephir_memory_observe(&_2);
 		zephir_read_property(&_2, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
+		ZEPHIR_OBS_NVAR(&_0);
 		zephir_read_property_zval(&_0, &_2, offset, PH_NOISY_CC);
 	} else {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_NULL(&_0);
 	}
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/arrayaccesstest.zep.c b/ext/stub/arrayaccesstest.zep.c
index f488ce9c47..04e0eb6b9c 100644
--- a/ext/stub/arrayaccesstest.zep.c
+++ b/ext/stub/arrayaccesstest.zep.c
@@ -36,17 +36,10 @@ ZEPHIR_INIT_CLASS(Stub_ArrayAccessTest)
 PHP_METHOD(Stub_ArrayAccessTest, exits)
 {
 	zval arr;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	object_init_ex(&arr, stub_arrayaccessarr_ce);
 	ZEPHIR_CALL_METHOD(NULL, &arr, "__construct", NULL, 3);
 	zephir_check_call_status();
@@ -56,18 +49,11 @@ PHP_METHOD(Stub_ArrayAccessTest, exits)
 PHP_METHOD(Stub_ArrayAccessTest, get)
 {
 	zval arr, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	object_init_ex(&arr, stub_arrayaccessarr_ce);
 	ZEPHIR_CALL_METHOD(NULL, &arr, "__construct", NULL, 3);
 	zephir_check_call_status();
@@ -77,11 +63,9 @@ PHP_METHOD(Stub_ArrayAccessTest, get)
 
 PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval data;
 	zval *key_param = NULL, *data_param = NULL;
 	zval key;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&key);
 	ZVAL_UNDEF(&data);
@@ -89,10 +73,6 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 		Z_PARAM_STR(key)
 		Z_PARAM_ARRAY(data)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &key_param, &data_param);
 	if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string"));
@@ -101,18 +81,15 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 	if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) {
 		zephir_get_strval(&key, key_param);
 	} else {
-		ZEPHIR_INIT_VAR(&key);
+		ZVAL_NULL(&key);
 	}
 	zephir_get_arrval(&data, data_param);
-
-
 	zephir_array_unset(&data, &key, PH_SEPARATE);
 	RETURN_CTOR(&data);
 }
 
 PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval dataFromProperty;
 	zval *key_param = NULL, *dataFromProperty_param = NULL, _0;
 	zval key;
@@ -125,10 +102,6 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 		Z_PARAM_STR(key)
 		Z_PARAM_ARRAY(dataFromProperty)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &key_param, &dataFromProperty_param);
 	if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string"));
@@ -137,11 +110,9 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 	if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) {
 		zephir_get_strval(&key, key_param);
 	} else {
-		ZEPHIR_INIT_VAR(&key);
+		ZVAL_NULL(&key);
 	}
 	zephir_get_arrval(&dataFromProperty, dataFromProperty_param);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("assigedFromMethod"), &dataFromProperty);
 	zephir_unset_property_array(this_ptr, ZEND_STRL("assigedFromMethod"), &key);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("assigedFromMethod"), PH_NOISY_CC | PH_READONLY);
@@ -155,20 +126,13 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 PHP_METHOD(Stub_ArrayAccessTest, issue645)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_0);
-	zephir_memory_observe(&_1);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("data"), PH_NOISY_CC);
 	RETURN_CCTOR(&_1);
 }
@@ -180,20 +144,13 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1155)
 {
 	zval s, _0;
 	zval arr;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&s);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	zephir_create_array(&arr, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "0");
 	zephir_array_fast_append(&arr, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -202,7 +159,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1155)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "");
 	zephir_array_fast_append(&arr, &_0);
-	ZEPHIR_INIT_VAR(&s);
+	ZVAL_NULL(&s);
 	ZVAL_STRING(&s, "true");
 	RETURN_MM_BOOL(zephir_fast_in_array(&s, &arr));
 }
@@ -210,10 +167,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1155)
 PHP_METHOD(Stub_ArrayAccessTest, issue1094Test1)
 {
 	zend_bool isItemsNULL = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *items_param = NULL;
 	zval items;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&items);
 	bool is_null_true = 1;
@@ -221,28 +176,20 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
-		ZEPHIR_INIT_VAR(&items);
+		ZVAL_NULL(&items);
 	} else {
 		zephir_get_arrval(&items, items_param);
 	}
-
-
 	RETURN_MM_BOOL(isItemsNULL);
 }
 
 PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 {
 	zend_bool isItemsNULL = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *items_param = NULL;
 	zval items;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&items);
 	bool is_null_true = 1;
@@ -250,18 +197,12 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
-		ZEPHIR_INIT_VAR(&items);
+		ZVAL_NULL(&items);
 	} else {
 		zephir_get_arrval(&items, items_param);
 	}
-
-
 	isItemsNULL = ZEPHIR_IS_NULL(&items);
 	RETURN_MM_BOOL(isItemsNULL);
 }
@@ -269,10 +210,8 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
 {
 	zend_bool isItemsNULL = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *items_param = NULL;
 	zval items;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&items);
 	bool is_null_true = 1;
@@ -280,18 +219,12 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
-		ZEPHIR_INIT_VAR(&items);
+		ZVAL_NULL(&items);
 	} else {
 		zephir_get_arrval(&items, items_param);
 	}
-
-
 	isItemsNULL = Z_TYPE_P(&items) == IS_NULL;
 	RETURN_MM_BOOL(isItemsNULL);
 }
@@ -301,28 +234,19 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
  */
 PHP_METHOD(Stub_ArrayAccessTest, issue1086Strict)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *params_param = NULL, _0;
 	zval params;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(params)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &params_param);
-	ZEPHIR_OBS_COPY_OR_DUP(&params, params_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_COPY(&params, params_param);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1234);
 	zephir_array_update_string(&params, SL("test2"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -332,20 +256,13 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithStr
 {
 	zval _0;
 	zval params;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&params);
+	ZVAL_NULL(&params);
 	array_init(&params);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 123);
 	zephir_array_update_string(&params, SL("test"), &_0, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_SELF(NULL, "issue1086strict", NULL, 0, &params);
@@ -358,28 +275,19 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithStr
  */
 PHP_METHOD(Stub_ArrayAccessTest, issue1086NotStrictParams)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *params_param = NULL, _0;
 	zval params;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(params)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &params_param);
 	zephir_get_arrval(&params, params_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1234);
 	zephir_array_update_string(&params, SL("test2"), &_0, PH_COPY | PH_SEPARATE);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -389,20 +297,13 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithout
 {
 	zval _0;
 	zval params;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&params);
+	ZVAL_NULL(&params);
 	array_init(&params);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 123);
 	zephir_array_update_string(&params, SL("test"), &_0, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_SELF(NULL, "issue1086notstrictparams", NULL, 0, &params);
@@ -416,19 +317,12 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithout
 PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetKeyFromArrayInternalVariable)
 {
 	zval ret, unsetData;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&unsetData);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	array_init(&ret);
-	ZEPHIR_INIT_VAR(&unsetData);
+	ZVAL_NULL(&unsetData);
 	zephir_create_array(&unsetData, 2, 0);
 	add_assoc_stringl_ex(&unsetData, SL("key_a"), SL("marcin"));
 	add_assoc_stringl_ex(&unsetData, SL("key_b"), SL("paula"));
@@ -445,7 +339,6 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetStringKeyFromArrayProperty)
 {
 	zval _0, _1, _2, _3;
 	zval ret;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
@@ -453,12 +346,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetStringKeyFromArrayProperty)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	array_init(&ret);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("unsetData"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_append(&ret, &_0, PH_SEPARATE, "stub/arrayaccesstest.zep", 168);
@@ -476,7 +364,6 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetLongKeyFromArrayProperty)
 {
 	zval _0, _1, _2, _3;
 	zval ret;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
@@ -484,12 +371,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetLongKeyFromArrayProperty)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	array_init(&ret);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("unsetData"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_append(&ret, &_0, PH_SEPARATE, "stub/arrayaccesstest.zep", 179);
@@ -507,27 +389,23 @@ zend_object *zephir_init_properties_Stub_ArrayAccessTest(zend_class_entry *class
 {
 		zval _1$$3;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("unsetData"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			zephir_create_array(&_1$$3, 3, 0);
 			add_assoc_stringl_ex(&_1$$3, SL("key_a"), SL("marcin"));
 			add_assoc_stringl_ex(&_1$$3, SL("key_b"), SL("paula"));
 			add_index_stringl(&_1$$3, 3, SL("long value"));
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("unsetData"), &_1$$3);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/arrayiterator.zep.c b/ext/stub/arrayiterator.zep.c
index 6137537996..cf62813862 100644
--- a/ext/stub/arrayiterator.zep.c
+++ b/ext/stub/arrayiterator.zep.c
@@ -31,20 +31,14 @@ PHP_METHOD(Stub_ArrayIterator, __construct)
 {
 	zval _1, _2;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "one");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -57,7 +51,6 @@ PHP_METHOD(Stub_ArrayIterator, __construct)
 	ZVAL_UNDEF(&_2);
 	ZVAL_LONG(&_2, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("position"), &_2);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayIterator, rewind)
@@ -66,9 +59,6 @@ PHP_METHOD(Stub_ArrayIterator, rewind)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("position"), &_0);
@@ -77,19 +67,12 @@ PHP_METHOD(Stub_ArrayIterator, rewind)
 PHP_METHOD(Stub_ArrayIterator, current)
 {
 	zval _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
-	zephir_memory_observe(&_2);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("position"), PH_NOISY_CC);
 	zephir_array_fetch(&_1, &_0, &_2, PH_NOISY | PH_READONLY, "stub/arrayiterator.zep", 25);
 	RETURN_CTOR(&_1);
@@ -97,9 +80,6 @@ PHP_METHOD(Stub_ArrayIterator, current)
 
 PHP_METHOD(Stub_ArrayIterator, key)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "position");
 }
@@ -107,9 +87,6 @@ PHP_METHOD(Stub_ArrayIterator, key)
 PHP_METHOD(Stub_ArrayIterator, next)
 {
 	zval *this_ptr = getThis();
-
-
-
 	RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("position")));
 }
 
@@ -120,9 +97,6 @@ PHP_METHOD(Stub_ArrayIterator, valid)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("position"), PH_NOISY_CC | PH_READONLY);
 	RETURN_BOOL(zephir_array_isset(&_0, &_1));
diff --git a/ext/stub/arrayiteratortest.zep.c b/ext/stub/arrayiteratortest.zep.c
index da472fb56a..854b407c74 100644
--- a/ext/stub/arrayiteratortest.zep.c
+++ b/ext/stub/arrayiteratortest.zep.c
@@ -30,20 +30,13 @@ PHP_METHOD(Stub_ArrayIteratorTest, test)
 	zend_string *_3;
 	zend_ulong _2;
 	zval arr, k, v, *_0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	object_init_ex(&arr, stub_arrayiterator_ce);
 	ZEPHIR_CALL_METHOD(NULL, &arr, "__construct", NULL, 4);
 	zephir_check_call_status();
@@ -60,7 +53,7 @@ PHP_METHOD(Stub_ArrayIteratorTest, test)
 			ZEPHIR_INIT_NVAR(&v);
 			ZVAL_COPY(&v, _0);
 			ZEPHIR_CONCAT_VV(return_value, &k, &v);
-			RETURN_MM();
+			return;
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &arr, "rewind", NULL, 0);
@@ -76,7 +69,7 @@ PHP_METHOD(Stub_ArrayIteratorTest, test)
 			ZEPHIR_CALL_METHOD(&v, &arr, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_CONCAT_VV(return_value, &k, &v);
-				RETURN_MM();
+				return;
 			ZEPHIR_CALL_METHOD(NULL, &arr, "next", NULL, 0);
 			zephir_check_call_status();
 		}
diff --git a/ext/stub/arraymanipulation.zep.c b/ext/stub/arraymanipulation.zep.c
index 17ac725536..026241969a 100644
--- a/ext/stub/arraymanipulation.zep.c
+++ b/ext/stub/arraymanipulation.zep.c
@@ -34,7 +34,6 @@ ZEPHIR_INIT_CLASS(Stub_ArrayManipulation)
 PHP_METHOD(Stub_ArrayManipulation, arrayFillMany)
 {
 	zval _0, _1, _2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
@@ -42,14 +41,9 @@ PHP_METHOD(Stub_ArrayManipulation, arrayFillMany)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 1000000);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "message");
 	ZEPHIR_CALL_FUNCTION(&_3, "array_fill", NULL, 5, &_0, &_1, &_2);
 	zephir_check_call_status();
@@ -64,18 +58,11 @@ PHP_METHOD(Stub_ArrayManipulation, issue774)
 {
 	zval _1;
 	zval obj, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&obj);
+	ZVAL_NULL(&obj);
 	object_init(&obj);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
@@ -91,24 +78,20 @@ PHP_METHOD(Stub_ArrayManipulation, issue774)
 zend_object *zephir_init_properties_Stub_ArrayManipulation(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("arrayFillQueue"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("arrayFillQueue"), &_1$$3);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/arraysearch.zep.c b/ext/stub/arraysearch.zep.c
index 84c800a2ec..5973b3a09d 100644
--- a/ext/stub/arraysearch.zep.c
+++ b/ext/stub/arraysearch.zep.c
@@ -29,12 +29,10 @@ ZEPHIR_INIT_CLASS(Stub_ArraySearch)
 /** @issue https://github.com/zephir-lang/zephir/issues/1609 */
 PHP_METHOD(Stub_ArraySearch, simpleSearch)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zend_bool strict;
 	zval haystack;
 	zval *needle, needle_sub, *haystack_param = NULL, *strict_param = NULL, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&needle_sub);
 	ZVAL_UNDEF(&_0);
@@ -45,23 +43,16 @@ PHP_METHOD(Stub_ArraySearch, simpleSearch)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(strict)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 1, &needle, &haystack_param, &strict_param);
 	zephir_get_arrval(&haystack, haystack_param);
 	if (!strict_param) {
 		strict = 0;
 	} else {
-		strict = zephir_get_boolval(strict_param);
-	}
-
-
+		}
 	ZVAL_BOOL(&_0, (strict ? 1 : 0));
 	ZEPHIR_RETURN_CALL_FUNCTION("array_search", NULL, 6, needle, &haystack, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /** @issue https://github.com/zephir-lang/zephir/issues/1609 */
@@ -69,21 +60,14 @@ PHP_METHOD(Stub_ArraySearch, searchUsingArrayInsideZephir)
 {
 	zval _0, pos;
 	zval itoA64;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&itoA64);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&pos);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&itoA64);
+	ZVAL_NULL(&itoA64);
 	zephir_create_array(&itoA64, 9, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, ".");
 	zephir_array_fast_append(&itoA64, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/assign.zep.c b/ext/stub/assign.zep.c
index c8f12c58cb..2fd7e1dc7d 100644
--- a/ext/stub/assign.zep.c
+++ b/ext/stub/assign.zep.c
@@ -34,18 +34,12 @@ ZEPHIR_INIT_CLASS(Stub_Assign)
 
 PHP_METHOD(Stub_Assign, getTestVar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "testVar");
 }
 
 PHP_METHOD(Stub_Assign, getMyArray)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "myArray");
 }
@@ -53,11 +47,6 @@ PHP_METHOD(Stub_Assign, getMyArray)
 PHP_METHOD(Stub_Assign, testAssign1)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_LONG(a);
 }
@@ -65,11 +54,6 @@ PHP_METHOD(Stub_Assign, testAssign1)
 PHP_METHOD(Stub_Assign, testAssign2)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_LONG(a);
 }
@@ -77,11 +61,6 @@ PHP_METHOD(Stub_Assign, testAssign2)
 PHP_METHOD(Stub_Assign, testAssign3)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_LONG(a);
 }
@@ -89,11 +68,6 @@ PHP_METHOD(Stub_Assign, testAssign3)
 PHP_METHOD(Stub_Assign, testAssign4)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_LONG(a);
 }
@@ -101,11 +75,6 @@ PHP_METHOD(Stub_Assign, testAssign4)
 PHP_METHOD(Stub_Assign, testAssign5)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (long) (2.0);
 	RETURN_LONG(a);
 }
@@ -113,11 +82,6 @@ PHP_METHOD(Stub_Assign, testAssign5)
 PHP_METHOD(Stub_Assign, testAssign6)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	RETURN_BOOL(a);
 }
@@ -125,11 +89,6 @@ PHP_METHOD(Stub_Assign, testAssign6)
 PHP_METHOD(Stub_Assign, testAssign7)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1.0 != 0.0) ? 1 : 0);
 	RETURN_BOOL(a);
 }
@@ -137,11 +96,6 @@ PHP_METHOD(Stub_Assign, testAssign7)
 PHP_METHOD(Stub_Assign, testAssign8)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_BOOL(a);
 }
@@ -149,11 +103,6 @@ PHP_METHOD(Stub_Assign, testAssign8)
 PHP_METHOD(Stub_Assign, testAssign9)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_BOOL(a);
 }
@@ -161,11 +110,6 @@ PHP_METHOD(Stub_Assign, testAssign9)
 PHP_METHOD(Stub_Assign, testAssign10)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_BOOL(a);
 }
@@ -173,11 +117,6 @@ PHP_METHOD(Stub_Assign, testAssign10)
 PHP_METHOD(Stub_Assign, testAssign11)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0.0;
 	RETURN_DOUBLE(a);
 }
@@ -185,11 +124,6 @@ PHP_METHOD(Stub_Assign, testAssign11)
 PHP_METHOD(Stub_Assign, testAssign12)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (4);
 	RETURN_DOUBLE(a);
 }
@@ -197,11 +131,6 @@ PHP_METHOD(Stub_Assign, testAssign12)
 PHP_METHOD(Stub_Assign, testAssign13)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_DOUBLE(a);
 }
@@ -209,11 +138,6 @@ PHP_METHOD(Stub_Assign, testAssign13)
 PHP_METHOD(Stub_Assign, testAssign14)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_DOUBLE(a);
 }
@@ -221,23 +145,13 @@ PHP_METHOD(Stub_Assign, testAssign14)
 PHP_METHOD(Stub_Assign, testAssign15)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 5.0;
+	a =  (5.0);
 	RETURN_DOUBLE(a);
 }
 
 PHP_METHOD(Stub_Assign, testAssign16)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_LONG(a);
 }
@@ -245,23 +159,13 @@ PHP_METHOD(Stub_Assign, testAssign16)
 PHP_METHOD(Stub_Assign, testAssign17)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
+	a =  (1.0);
 	RETURN_DOUBLE(a);
 }
 
 PHP_METHOD(Stub_Assign, testAssign18)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_BOOL(a);
 }
@@ -269,11 +173,6 @@ PHP_METHOD(Stub_Assign, testAssign18)
 PHP_METHOD(Stub_Assign, testAssign19)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_BOOL(a);
 }
@@ -281,16 +180,9 @@ PHP_METHOD(Stub_Assign, testAssign19)
 PHP_METHOD(Stub_Assign, testAssign20)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_NULL(&a);
 	RETURN_CCTOR(&a);
 }
@@ -298,11 +190,6 @@ PHP_METHOD(Stub_Assign, testAssign20)
 PHP_METHOD(Stub_Assign, testAssign21)
 {
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = a;
 	RETURN_LONG(b);
@@ -311,24 +198,14 @@ PHP_METHOD(Stub_Assign, testAssign21)
 PHP_METHOD(Stub_Assign, testAssign22)
 {
 	double a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
-	b = a;
+	a =  (1.0);
+	b =  a;
 	RETURN_DOUBLE(b);
 }
 
 PHP_METHOD(Stub_Assign, testAssign23)
 {
 	zend_bool a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = a;
 	RETURN_BOOL(b);
@@ -338,11 +215,6 @@ PHP_METHOD(Stub_Assign, testAssign24)
 {
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = (double) a;
 	RETURN_DOUBLE(b);
@@ -352,11 +224,6 @@ PHP_METHOD(Stub_Assign, testAssign25)
 {
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = (double) a;
 	RETURN_DOUBLE(b);
@@ -366,11 +233,6 @@ PHP_METHOD(Stub_Assign, testAssign26)
 {
 	double a = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = (long) a;
 	RETURN_LONG(b);
@@ -380,11 +242,6 @@ PHP_METHOD(Stub_Assign, testAssign27)
 {
 	double a = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 1;
 	a = (double) b;
 	RETURN_DOUBLE(a);
@@ -394,11 +251,6 @@ PHP_METHOD(Stub_Assign, testAssign28)
 {
 	zend_bool a = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 1;
 	a = ((b) ? 1 : 0);
 	RETURN_BOOL(a);
@@ -408,12 +260,7 @@ PHP_METHOD(Stub_Assign, testAssign29)
 {
 	zend_bool a = 0;
 	double b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	b = 1.0;
+	b =  (1.0);
 	a = ((b != 0.0) ? 1 : 0);
 	RETURN_BOOL(a);
 }
@@ -422,11 +269,6 @@ PHP_METHOD(Stub_Assign, testAssign30)
 {
 	zend_long a = 0;
 	zend_bool b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	a = b;
 	RETURN_LONG(a);
@@ -436,11 +278,6 @@ PHP_METHOD(Stub_Assign, testAssign31)
 {
 	double a = 0;
 	zend_bool b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	a = (double) b;
 	RETURN_DOUBLE(a);
@@ -449,11 +286,6 @@ PHP_METHOD(Stub_Assign, testAssign31)
 PHP_METHOD(Stub_Assign, testAssign32)
 {
 	zend_bool b = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	a = b;
 	RETURN_BOOL(a);
@@ -462,11 +294,6 @@ PHP_METHOD(Stub_Assign, testAssign32)
 PHP_METHOD(Stub_Assign, testAssign33)
 {
 	zend_bool b = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	a = b;
 	RETURN_BOOL(a);
@@ -476,11 +303,6 @@ PHP_METHOD(Stub_Assign, testAssign34)
 {
 	zend_bool a = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	a = ((b) ? 1 : 0);
 	RETURN_BOOL(a);
@@ -490,11 +312,6 @@ PHP_METHOD(Stub_Assign, testAssign35)
 {
 	zend_bool a = 0;
 	double b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	a = ((b != 0.0) ? 1 : 0);
 	RETURN_BOOL(a);
@@ -503,11 +320,6 @@ PHP_METHOD(Stub_Assign, testAssign35)
 PHP_METHOD(Stub_Assign, testAssign36)
 {
 	zend_bool b = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	a = b;
 	RETURN_BOOL(a);
@@ -517,8 +329,6 @@ PHP_METHOD(Stub_Assign, testAssign37)
 {
 	zval _1, _4;
 	zval v, arr, _0, _2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&arr);
@@ -527,21 +337,16 @@ PHP_METHOD(Stub_Assign, testAssign37)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_4);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&v);
+	ZVAL_NULL(&v);
 	ZVAL_STRING(&v, "abc");
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	array_init(&arr);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_stringl_ex(&_1, SL("b_key"), SL("b_val"));
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	array_init(&_2);
 	zephir_array_update_string(&_1, SL("b"), &_2, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&_0, SL("a"), &_1, PH_COPY | PH_SEPARATE);
@@ -552,12 +357,12 @@ PHP_METHOD(Stub_Assign, testAssign37)
 	ZEPHIR_INIT_NVAR(&_2);
 	ZVAL_LONG(&_2, 1);
 	zephir_array_update_string(&arr, SL("s"), &_2, PH_COPY | PH_SEPARATE);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_STRING(&_3, "f");
 	zephir_array_update_multi(&arr, &_3, SL("sssss"), 10, SL("a"), SL("b"), SL("c"), SL("d"), SL("e"));
 	ZEPHIR_INIT_NVAR(&_1);
 	zephir_create_array(&_1, 1, 0);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	zephir_create_array(&_4, 1, 0);
 	add_index_long(&_4, 3, 4);
 	zephir_array_update_long(&_1, 2, &_4, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -571,9 +376,7 @@ PHP_METHOD(Stub_Assign, testAssign37)
 
 PHP_METHOD(Stub_Assign, testAssign38)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, arr, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&arr);
@@ -581,16 +384,10 @@ PHP_METHOD(Stub_Assign, testAssign38)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	array_init(&arr);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "val");
 	zephir_array_update_zval(&arr, index, &_0, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&arr);
@@ -599,26 +396,19 @@ PHP_METHOD(Stub_Assign, testAssign38)
 PHP_METHOD(Stub_Assign, testAssign39)
 {
 	zval a, b, c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "hello");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_BOOL(&b, 0);
 	ZEPHIR_INIT_NVAR(&a);
 	ZVAL_LONG(&a, 10);
 	ZEPHIR_INIT_NVAR(&b);
 	ZVAL_STRING(&b, "140");
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	zephir_add_function(&c, &a, &b);
 	RETURN_CCTOR(&c);
 }
@@ -626,26 +416,19 @@ PHP_METHOD(Stub_Assign, testAssign39)
 PHP_METHOD(Stub_Assign, testAssign40)
 {
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	object_init(&b);
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	ZEPHIR_INIT_NVAR(&a);
 	ZVAL_STRING(&a, "123");
 	ZEPHIR_INIT_NVAR(&b);
 	ZVAL_LONG(&b, 7);
 	zephir_sub_function(return_value, &a, &b);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -655,17 +438,11 @@ PHP_METHOD(Stub_Assign, testAssign41)
 {
 	zval *num_param = NULL;
 	zend_long num, a = 0;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	a = 42;
 	a /= num;
 	RETURN_LONG(a);
@@ -678,17 +455,11 @@ PHP_METHOD(Stub_Assign, testAssign42)
 {
 	zval *num_param = NULL;
 	zend_long num, a = 0;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	a = 2;
 	num /= a;
 	RETURN_LONG(num);
@@ -698,17 +469,11 @@ PHP_METHOD(Stub_Assign, testAssign43)
 {
 	zval *num_param = NULL;
 	zend_long num, a = 0;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	a = 43;
 	a %= num;
 	RETURN_LONG(a);
@@ -718,17 +483,11 @@ PHP_METHOD(Stub_Assign, testAssign44)
 {
 	zval *num_param = NULL;
 	zend_long num, a = 0;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	a = 2;
 	num %= a;
 	RETURN_LONG(num);
@@ -736,7 +495,6 @@ PHP_METHOD(Stub_Assign, testAssign44)
 
 PHP_METHOD(Stub_Assign, testPropertyAssign1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -745,11 +503,6 @@ PHP_METHOD(Stub_Assign, testPropertyAssign1)
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
@@ -770,7 +523,7 @@ PHP_METHOD(Stub_Assign, testPropertyAssign1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 'A');
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "hello");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_1);
@@ -787,7 +540,6 @@ PHP_METHOD(Stub_Assign, testPropertyAssign2)
 	zend_bool d;
 	double b;
 	zend_long a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, c, _0;
 	zval *this_ptr = getThis();
 
@@ -796,18 +548,13 @@ PHP_METHOD(Stub_Assign, testPropertyAssign2)
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&f);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
-	b = 1.5;
-	ZEPHIR_INIT_VAR(&c);
+	b =  (1.5);
+	ZVAL_NULL(&c);
 	ZVAL_NULL(&c);
 	d = 0;
 	e = 'A';
-	ZEPHIR_INIT_VAR(&f);
+	ZVAL_NULL(&f);
 	array_init(&f);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, a);
@@ -834,9 +581,6 @@ PHP_METHOD(Stub_Assign, testPropertyIncr1)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
@@ -847,20 +591,14 @@ PHP_METHOD(Stub_Assign, testPropertyIncr1)
 PHP_METHOD(Stub_Assign, testPropertyAddAssign1)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_ADD_ASSIGN(&_0, &_1)
@@ -871,20 +609,14 @@ PHP_METHOD(Stub_Assign, testPropertyAddAssign1)
 PHP_METHOD(Stub_Assign, testPropertyAddAssign2)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_ADD_ASSIGN(&_0, &_1)
@@ -899,9 +631,6 @@ PHP_METHOD(Stub_Assign, testPropertyAssignValuePlus1)
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
@@ -918,9 +647,6 @@ PHP_METHOD(Stub_Assign, testPropertyDecr)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 2);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
@@ -931,20 +657,14 @@ PHP_METHOD(Stub_Assign, testPropertyDecr)
 PHP_METHOD(Stub_Assign, testPropertySubAssign1)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_SUB_ASSIGN(&_0, &_1)
@@ -955,20 +675,14 @@ PHP_METHOD(Stub_Assign, testPropertySubAssign1)
 PHP_METHOD(Stub_Assign, testPropertySubAssign2)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_SUB_ASSIGN(&_0, &_1)
@@ -979,20 +693,14 @@ PHP_METHOD(Stub_Assign, testPropertySubAssign2)
 PHP_METHOD(Stub_Assign, testPropertyMulAssign1)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_MUL_ASSIGN(&_0, &_1)
@@ -1003,20 +711,14 @@ PHP_METHOD(Stub_Assign, testPropertyMulAssign1)
 PHP_METHOD(Stub_Assign, testPropertyMulAssign2)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 3);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_MUL_ASSIGN(&_0, &_1)
@@ -1027,16 +729,10 @@ PHP_METHOD(Stub_Assign, testPropertyMulAssign2)
 PHP_METHOD(Stub_Assign, testPropertyAssignStringConcat)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "test");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
@@ -1047,7 +743,6 @@ PHP_METHOD(Stub_Assign, testPropertyAssignStringConcat)
 
 PHP_METHOD(Stub_Assign, testPropertyArray1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, _0, _1, _2;
 	zval *this_ptr = getThis();
 
@@ -1057,12 +752,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
 	ZVAL_UNDEF(&_1);
@@ -1086,10 +776,10 @@ PHP_METHOD(Stub_Assign, testPropertyArray1)
 	ZVAL_LONG(&_1, 'A');
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
 	ZVAL_UNDEF(&_1);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "hello");
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	array_init(&_2);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_2);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -1103,27 +793,21 @@ PHP_METHOD(Stub_Assign, testPropertyArray2)
 	zval c, _0, _1;
 	double b;
 	zend_long a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&f);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
-	b = 1.5;
-	ZEPHIR_INIT_VAR(&c);
+	b =  (1.5);
+	ZVAL_NULL(&c);
 	ZVAL_NULL(&c);
 	d = 0;
 	e = 'A';
-	ZEPHIR_INIT_VAR(&f);
+	ZVAL_NULL(&f);
 	array_init(&f);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
 	ZVAL_UNDEF(&_1);
@@ -1145,7 +829,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray2)
 
 PHP_METHOD(Stub_Assign, testPropertyArray3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11;
 	zval *this_ptr = getThis();
 
@@ -1164,41 +847,36 @@ PHP_METHOD(Stub_Assign, testPropertyArray3)
 	ZVAL_UNDEF(&_9);
 	ZVAL_UNDEF(&_10);
 	ZVAL_UNDEF(&_11);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 0);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_LONG(&_2, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_1, &_2);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_LONG(&_3, 0);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	ZVAL_DOUBLE(&_4, 1.5);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_3, &_4);
-	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_NULL(&_5);
 	ZVAL_LONG(&_5, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_5, &__$null);
-	ZEPHIR_INIT_VAR(&_6);
+	ZVAL_NULL(&_6);
 	ZVAL_LONG(&_6, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_6, &__$false);
-	ZEPHIR_INIT_VAR(&_7);
+	ZVAL_NULL(&_7);
 	ZVAL_LONG(&_7, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_7, &__$true);
-	ZEPHIR_INIT_VAR(&_8);
+	ZVAL_NULL(&_8);
 	ZVAL_LONG(&_8, 0);
-	ZEPHIR_INIT_VAR(&_9);
+	ZVAL_NULL(&_9);
 	ZVAL_LONG(&_9, 'A');
 	zephir_update_property_array(this_ptr, SL("myArray"), &_8, &_9);
-	ZEPHIR_INIT_VAR(&_10);
+	ZVAL_NULL(&_10);
 	array_init(&_10);
-	ZEPHIR_INIT_VAR(&_11);
+	ZVAL_NULL(&_11);
 	ZVAL_LONG(&_11, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_11, &_10);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -1206,7 +884,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray3)
 
 PHP_METHOD(Stub_Assign, testPropertyArray4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2, _3, _4;
 	zval *this_ptr = getThis();
 
@@ -1222,29 +899,23 @@ PHP_METHOD(Stub_Assign, testPropertyArray4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_DOUBLE(&_2, 1.5);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_2);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &__$null);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &__$false);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &__$true);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_3);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	array_init(&_4);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_4);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -1252,7 +923,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray4)
 
 PHP_METHOD(Stub_Assign, testPropertyArray5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, __$null, __$false, __$true, _0, _1, _2, _3, _4;
 	zval index;
 	zval *this_ptr = getThis();
@@ -1269,30 +939,24 @@ PHP_METHOD(Stub_Assign, testPropertyArray5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_DOUBLE(&_2, 1.5);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_2);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &__$null);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &__$false);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &__$true);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_3);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	array_init(&_4);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_4);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -1300,7 +964,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray5)
 
 PHP_METHOD(Stub_Assign, testPropertyArray6)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -1309,15 +972,10 @@ PHP_METHOD(Stub_Assign, testPropertyArray6)
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("ll"), 2, 0, 1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1340,7 +998,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray6)
 
 PHP_METHOD(Stub_Assign, testPropertyArray7)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -1349,15 +1006,10 @@ PHP_METHOD(Stub_Assign, testPropertyArray7)
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("ss"), 4, SL("hello"), SL("hello"));
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1380,7 +1032,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray7)
 
 PHP_METHOD(Stub_Assign, testPropertyArray8)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -1393,17 +1044,11 @@ PHP_METHOD(Stub_Assign, testPropertyArray8)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zz"), 2, index, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1426,7 +1071,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray8)
 
 PHP_METHOD(Stub_Assign, testPropertyArray9)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, __$null, __$false, __$true, _0, _1;
 	zend_long index;
 	zval *this_ptr = getThis();
@@ -1439,18 +1083,11 @@ PHP_METHOD(Stub_Assign, testPropertyArray9)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
-	index = zephir_get_intval(index_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("ll"), 2, index, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1473,7 +1110,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray9)
 
 PHP_METHOD(Stub_Assign, testPropertyArray10)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, __$null, __$false, __$true, _0, _1;
 	zval index;
 	zval *this_ptr = getThis();
@@ -1487,18 +1123,12 @@ PHP_METHOD(Stub_Assign, testPropertyArray10)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zz"), 2, &index, &index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1521,7 +1151,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray10)
 
 PHP_METHOD(Stub_Assign, testPropertyArray11)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2, _3, _4;
 	zval *this_ptr = getThis();
 
@@ -1537,29 +1166,23 @@ PHP_METHOD(Stub_Assign, testPropertyArray11)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_0, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_DOUBLE(&_1, 1.5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_LONG(&_2, 'A');
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_2, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_STRING(&_3, "hello");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_3, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	array_init(&_4);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_4, SL("zza"), 3, index, index);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -1567,7 +1190,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray11)
 
 PHP_METHOD(Stub_Assign, testPropertyArray12)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, temp1, temp2, temp3, _0, _1, _2, _3, _4, _5, _6;
 	zval *this_ptr = getThis();
 
@@ -1588,45 +1210,36 @@ PHP_METHOD(Stub_Assign, testPropertyArray12)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_0, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_DOUBLE(&_1, 1.5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("zza"), 3, index, index);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	zephir_memory_observe(&temp1);
 	zephir_array_fetch(&temp1, &_2, index, PH_NOISY, "stub/assign.zep", 657);
-	zephir_memory_observe(&temp2);
 	zephir_read_property(&temp2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_3, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	ZVAL_STRING(&_4, "hello");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_4, SL("zza"), 3, index, index);
-	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_NULL(&_5);
 	array_init(&_5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_5, SL("zza"), 3, index, index);
 	zephir_read_property(&_6, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_VAR(&temp3);
+	ZVAL_NULL(&temp3);
 	ZVAL_LONG(&temp3, zephir_fast_count_int(&_6));
 	RETURN_MM_MEMBER(getThis(), "myArray");
 }
 
 PHP_METHOD(Stub_Assign, testPropertyArray13)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, temp1, temp2, temp3, _0, _1, _2, _3, _4, _5, _6;
 	zval *this_ptr = getThis();
 
@@ -1647,38 +1260,30 @@ PHP_METHOD(Stub_Assign, testPropertyArray13)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_0, SL("za"), 2, index);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_DOUBLE(&_1, 1.5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("za"), 2, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("za"), 2, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("za"), 2, index);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	zephir_memory_observe(&temp1);
 	zephir_array_fetch(&temp1, &_2, index, PH_NOISY, "stub/assign.zep", 674);
-	zephir_memory_observe(&temp2);
 	zephir_read_property(&temp2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("za"), 2, index);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_3, SL("za"), 2, index);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	ZVAL_STRING(&_4, "hello");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_4, SL("za"), 2, index);
-	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_NULL(&_5);
 	array_init(&_5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_5, SL("za"), 2, index);
 	zephir_read_property(&_6, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_VAR(&temp3);
+	ZVAL_NULL(&temp3);
 	ZVAL_LONG(&temp3, zephir_fast_count_int(&_6));
 	RETURN_MM_MEMBER(getThis(), "myArray");
 }
@@ -1687,7 +1292,6 @@ PHP_METHOD(Stub_Assign, testPropertyArray14)
 {
 	zval _0, _1, _3;
 	zval v, _2, _4, _5, _6;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
@@ -1698,38 +1302,33 @@ PHP_METHOD(Stub_Assign, testPropertyArray14)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&v);
+	ZVAL_NULL(&v);
 	ZVAL_STRING(&v, "abc");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 1, 0);
 	add_assoc_stringl_ex(&_1, SL("b_key"), SL("b_val"));
 	zephir_array_update_string(&_0, SL("a"), &_1, PH_COPY | PH_SEPARATE);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "d_val");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_2, SL("sss"), 6, SL("a"), SL("b"), SL("d_key"));
 	ZEPHIR_INIT_NVAR(&_1);
 	zephir_create_array(&_1, 1, 0);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	zephir_create_array(&_3, 1, 0);
 	add_index_long(&_3, 3, 4);
 	zephir_array_update_long(&_1, 2, &_3, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_2);
 	ZVAL_LONG(&_2, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_2, &_1);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	ZVAL_STRING(&_4, "s");
-	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_NULL(&_5);
 	ZVAL_LONG(&_5, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_4, &_5);
-	ZEPHIR_INIT_VAR(&_6);
+	ZVAL_NULL(&_6);
 	ZVAL_STRING(&_6, "f");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_6, SL("sssss"), 10, SL("a"), SL("b"), SL("c"), SL("d"), SL("e"));
 	ZEPHIR_INIT_NVAR(&_6);
@@ -1742,9 +1341,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray14)
 PHP_METHOD(Stub_Assign, testStaticPropertyAssign1)
 {
 	zval _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _3;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -1753,11 +1350,6 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign1)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
@@ -1771,15 +1363,15 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign1)
 	ZVAL_LONG(&_0, 'A');
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	array_init(&_1);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	zephir_create_array(&_2, 3, 0);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_LONG(&_3, 1);
 	zephir_array_fast_append(&_2, &_3);
 	ZEPHIR_INIT_NVAR(&_3);
@@ -1801,24 +1393,17 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign2)
 	zval c, _0;
 	double b;
 	zend_long a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&f);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
-	b = 1.5;
-	ZEPHIR_INIT_VAR(&c);
+	b =  (1.5);
+	ZVAL_NULL(&c);
 	ZVAL_NULL(&c);
 	d = 0;
 	e = 'A';
-	ZEPHIR_INIT_VAR(&f);
+	ZVAL_NULL(&f);
 	array_init(&f);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, a);
@@ -1840,9 +1425,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign2)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArray1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -1850,15 +1433,10 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("l"), 1, 0);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1882,9 +1460,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray1)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArray2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -1892,15 +1468,10 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray2)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("s"), 2, SL("hello"));
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1924,9 +1495,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray2)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_NULL(&__$null);
@@ -1938,17 +1507,11 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("z"), 1, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1972,23 +1535,16 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "test");
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("a"), 1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -2007,9 +1563,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -2017,15 +1571,10 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("ll"), 2, 0, 0);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -2049,9 +1598,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli1)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -2059,15 +1606,10 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli2)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("ss"), 4, SL("hello"), SL("hello"));
 	ZEPHIR_INIT_NVAR(&_1);
@@ -2091,9 +1633,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli2)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_NULL(&__$null);
@@ -2105,17 +1645,11 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli3)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("zz"), 2, index, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -2141,8 +1675,6 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMulti4)
 {
 	zval _0, _1, _3;
 	zval v, _2, _4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&_2);
@@ -2150,26 +1682,21 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMulti4)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&v);
+	ZVAL_NULL(&v);
 	ZVAL_STRING(&v, "abc");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 1, 0);
 	add_assoc_stringl_ex(&_1, SL("b_key"), SL("b_val"));
 	zephir_array_update_string(&_0, SL("a"), &_1, PH_COPY | PH_SEPARATE);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "d_val");
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_2, SL("sss"), 6, SL("a"), SL("b"), SL("d_key"));
 	ZEPHIR_INIT_NVAR(&_1);
 	zephir_create_array(&_1, 1, 0);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	zephir_create_array(&_3, 1, 0);
 	add_index_long(&_3, 3, 4);
 	zephir_array_update_long(&_1, 2, &_3, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -2190,9 +1717,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMulti4)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -2200,15 +1725,10 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("la"), 2, 0);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -2232,9 +1752,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend1)
 
 PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, *value, value_sub, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
@@ -2243,14 +1761,8 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
-
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_zval(&a, index, value, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&a);
@@ -2258,9 +1770,7 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 
 PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, *value, value_sub, _POST;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
@@ -2269,14 +1779,8 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
-
-
-	ZEPHIR_INIT_VAR(&_POST);
+	ZVAL_NULL(&_POST);
 	array_init(&_POST);
 	zephir_array_update_zval(&_POST, index, value, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&_POST);
@@ -2284,9 +1788,7 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 
 PHP_METHOD(Stub_Assign, testArrayProperty)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, *value, value_sub, _POST;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
@@ -2295,14 +1797,8 @@ PHP_METHOD(Stub_Assign, testArrayProperty)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
-
-
-	ZEPHIR_INIT_VAR(&_POST);
+	ZVAL_NULL(&_POST);
 	array_init(&_POST);
 	zephir_array_update_zval(&_POST, index, value, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&_POST);
@@ -2314,7 +1810,6 @@ PHP_METHOD(Stub_Assign, testArrayProperty)
 PHP_METHOD(Stub_Assign, testGlobalVarAssign)
 {
 	zval *index, index_sub, *value, value_sub, _POST;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index_sub);
 	ZVAL_UNDEF(&value_sub);
@@ -2323,12 +1818,8 @@ PHP_METHOD(Stub_Assign, testGlobalVarAssign)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params_without_memory_grow(2, 0, &index, &value);
-
-
 	zephir_array_update_zval(&_POST, index, value, PH_COPY | PH_SEPARATE);
 }
 
@@ -2338,21 +1829,13 @@ PHP_METHOD(Stub_Assign, testGlobalVarAssign)
 PHP_METHOD(Stub_Assign, testConstantKeyAssign)
 {
 	zval elements;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&elements);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&elements);
+	ZVAL_NULL(&elements);
 	zephir_create_array(&elements, 3, 0);
 	add_assoc_long_ex(&elements, SL("abc"), 1);
 	add_index_long(&elements, 131072, 131079);
 	add_index_long(&elements, 131073, 131080);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -2362,7 +1845,6 @@ PHP_METHOD(Stub_Assign, testConstantKeyAssign)
 PHP_METHOD(Stub_Assign, testArrayBoolExpressionAssign)
 {
 	zval str, _0, _1, _2, _3, _4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
@@ -2371,24 +1853,19 @@ PHP_METHOD(Stub_Assign, testArrayBoolExpressionAssign)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&str);
+	ZVAL_NULL(&str);
 	ZVAL_STRING(&str, "abc");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "a");
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_BOOL(&_2, ZEPHIR_IS_STRING(&str, "abc"));
 	zephir_update_property_array(this_ptr, SL("myArray"), &_1, &_2);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_STRING(&_3, "b");
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	ZVAL_BOOL(&_4, !ZEPHIR_IS_STRING(&str, "abc"));
 	zephir_update_property_array(this_ptr, SL("myArray"), &_3, &_4);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -2397,10 +1874,8 @@ PHP_METHOD(Stub_Assign, testArrayBoolExpressionAssign)
 PHP_METHOD(Stub_Assign, testAssignBitwiseX)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, *b_param = NULL, op, i, result, _1, *_2, _3;
 	zend_long a, b, ZEPHIR_LAST_CALL_STATUS, _4$$4, _5$$5, _6$$6, _7$$7, _8$$8, _9$$10, _10$$11, _11$$12, _12$$13, _13$$14;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&op);
 	ZVAL_UNDEF(&i);
@@ -2412,20 +1887,12 @@ PHP_METHOD(Stub_Assign, testAssignBitwiseX)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
-	ZEPHIR_INIT_VAR(&result);
+	ZVAL_NULL(&result);
 	array_init(&result);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 5, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "or");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -2543,9 +2010,7 @@ PHP_METHOD(Stub_Assign, testAssignBitwiseX)
  */
 PHP_METHOD(Stub_Assign, testAssignSuperGlobals)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _GET, v, _0, _1, _2, _3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_GET);
 	ZVAL_UNDEF(&v);
@@ -2553,28 +2018,23 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobals)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 
-	ZEPHIR_INIT_VAR(&v);
+	ZVAL_NULL(&v);
 	ZVAL_STRING(&v, "stest2");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "stest");
 	zephir_array_update_string(&_GET, SL("steststr"), &_0, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&_GET, SL("steststr2"), &v, PH_COPY | PH_SEPARATE);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_update_string(&_GET, SL("stestint"), &_1, PH_COPY | PH_SEPARATE);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_LONG(&_2, 2);
 	zephir_array_update_string(&_GET, SL("stestint2"), &_2, PH_COPY | PH_SEPARATE);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_STRING(&_3, "testval");
 	zephir_array_update_zval(&_GET, &v, &_3, PH_COPY | PH_SEPARATE);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -2583,27 +2043,20 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobals)
 PHP_METHOD(Stub_Assign, testAssignSuperGlobalsSERVER)
 {
 	zval _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _SERVER, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_SERVER);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_stringl_ex(&_1, SL("g1"), SL("aaa"));
 	add_assoc_stringl_ex(&_1, SL("g2"), SL("bbb"));
 	zephir_fast_array_merge(&_0, &_SERVER, &_1);
 	ZEPHIR_HASH_COPY(&_SERVER, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -2612,43 +2065,30 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobalsSERVER)
 PHP_METHOD(Stub_Assign, testAssignSuperGlobalsGET)
 {
 	zval _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _GET, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_GET);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_stringl_ex(&_1, SL("g1"), SL("aaa"));
 	add_assoc_stringl_ex(&_1, SL("g2"), SL("bbb"));
 	zephir_fast_array_merge(&_0, &_GET, &_1);
 	ZEPHIR_HASH_COPY(&_GET, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Assign, issue597)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _POST, _GET, s$$4, _0$$4;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_POST);
 	ZVAL_UNDEF(&_GET);
 	ZVAL_UNDEF(&s$$4);
 	ZVAL_UNDEF(&_0$$4);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 	zephir_get_global(&_POST, SL("_POST"));
 
@@ -2658,11 +2098,10 @@ PHP_METHOD(Stub_Assign, issue597)
 	}
 	if (zephir_array_isset_string(&_GET, SL("s"))) {
 		zephir_array_fetch_string(&_0$$4, &_GET, SL("s"), PH_NOISY | PH_READONLY, "stub/assign.zep", 983);
-		ZEPHIR_INIT_VAR(&s$$4);
+		ZVAL_NULL(&s$$4);
 		ZVAL_LONG(&s$$4, (zephir_get_numberval(&_0$$4) * 5));
 		zephir_array_update_string(&_GET, SL("s"), &s$$4, PH_COPY | PH_SEPARATE);
 		RETURN_CCTOR(&s$$4);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/bench/foo.zep.c b/ext/stub/bench/foo.zep.c
index cbe89421b3..8c43f7b6bf 100644
--- a/ext/stub/bench/foo.zep.c
+++ b/ext/stub/bench/foo.zep.c
@@ -33,9 +33,7 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
@@ -43,13 +41,7 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -67,16 +59,13 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 			ZVAL_LONG(&i, _1);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, readStatic)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, x, i, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&x);
@@ -85,13 +74,7 @@ PHP_METHOD(Stub_Bench_Foo, readStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -111,16 +94,13 @@ PHP_METHOD(Stub_Bench_Foo, readStatic)
 			zephir_read_static_property_ce(&x, stub_bench_foo_ce, SL("a"), PH_NOISY_CC);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, writeStatic)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
@@ -129,13 +109,7 @@ PHP_METHOD(Stub_Bench_Foo, writeStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -156,16 +130,13 @@ PHP_METHOD(Stub_Bench_Foo, writeStatic)
 			zephir_update_static_property_ce(stub_bench_foo_ce, ZEND_STRL("a"), &_3$$3);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, issetStatic)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
@@ -173,13 +144,7 @@ PHP_METHOD(Stub_Bench_Foo, issetStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -198,16 +163,13 @@ PHP_METHOD(Stub_Bench_Foo, issetStatic)
 			x = (0 == 0);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
@@ -216,13 +178,7 @@ PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -243,14 +199,12 @@ PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 			x = ZEPHIR_IS_EMPTY(&_3$$3);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, readProp)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, x, i, _2;
 	zval *this_ptr = getThis();
 
@@ -261,13 +215,7 @@ PHP_METHOD(Stub_Bench_Foo, readProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -286,14 +234,12 @@ PHP_METHOD(Stub_Bench_Foo, readProp)
 			zephir_read_property(&x, this_ptr, ZEND_STRL("b"), PH_NOISY_CC | PH_READONLY);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, writeProp)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
 	zval *this_ptr = getThis();
 
@@ -304,13 +250,7 @@ PHP_METHOD(Stub_Bench_Foo, writeProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -331,14 +271,12 @@ PHP_METHOD(Stub_Bench_Foo, writeProp)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_3$$3);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3, _4$$3;
 	zval *this_ptr = getThis();
 
@@ -350,13 +288,7 @@ PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -379,7 +311,6 @@ PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_3$$3);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -402,7 +333,6 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 	zval *this_ptr = getThis();
 
@@ -412,13 +342,7 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -437,14 +361,12 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 			RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("b")));
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, postDecProp)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 	zval *this_ptr = getThis();
 
@@ -454,13 +376,7 @@ PHP_METHOD(Stub_Bench_Foo, postDecProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -479,14 +395,12 @@ PHP_METHOD(Stub_Bench_Foo, postDecProp)
 			RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("b")));
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, issetProp)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 	zval *this_ptr = getThis();
 
@@ -496,13 +410,7 @@ PHP_METHOD(Stub_Bench_Foo, issetProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -521,14 +429,12 @@ PHP_METHOD(Stub_Bench_Foo, issetProp)
 			x = zephir_isset_property(this_ptr, SL("b"));
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, emptyProp)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
 	zval *this_ptr = getThis();
 
@@ -539,13 +445,7 @@ PHP_METHOD(Stub_Bench_Foo, emptyProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -566,21 +466,16 @@ PHP_METHOD(Stub_Bench_Foo, emptyProp)
 			x = ZEPHIR_IS_EMPTY(&_3$$3);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, g)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Bench_Foo, call)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zval *n, n_sub, i, _2;
@@ -592,13 +487,7 @@ PHP_METHOD(Stub_Bench_Foo, call)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -618,22 +507,15 @@ PHP_METHOD(Stub_Bench_Foo, call)
 			zephir_check_call_status();
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, staticMethod)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Bench_Foo, staticMethod1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
@@ -641,11 +523,9 @@ PHP_METHOD(Stub_Bench_Foo, staticMethod1)
 PHP_METHOD(Stub_Bench_Foo, scall)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zval *n, n_sub, i, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
@@ -653,13 +533,7 @@ PHP_METHOD(Stub_Bench_Foo, scall)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -679,17 +553,14 @@ PHP_METHOD(Stub_Bench_Foo, scall)
 			zephir_check_call_status();
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zval *n, n_sub, i, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
@@ -697,13 +568,7 @@ PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -723,16 +588,13 @@ PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 			zephir_check_call_status();
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, readConst)
 {
 	zend_long _1;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, x, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&i);
@@ -741,13 +603,7 @@ PHP_METHOD(Stub_Bench_Foo, readConst)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
 	_0 = 0;
@@ -767,6 +623,5 @@ PHP_METHOD(Stub_Bench_Foo, readConst)
 			ZVAL_LONG(&x, 0);
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/bitwise.zep.c b/ext/stub/bitwise.zep.c
index 03f5c2dcbb..3f43884349 100644
--- a/ext/stub/bitwise.zep.c
+++ b/ext/stub/bitwise.zep.c
@@ -31,11 +31,6 @@ ZEPHIR_INIT_CLASS(Stub_Bitwise)
 PHP_METHOD(Stub_Bitwise, intAnd)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a & b);
@@ -45,11 +40,6 @@ PHP_METHOD(Stub_Bitwise, intAnd)
 PHP_METHOD(Stub_Bitwise, int2And)
 {
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a & 2);
 	RETURN_LONG(c);
@@ -58,11 +48,6 @@ PHP_METHOD(Stub_Bitwise, int2And)
 PHP_METHOD(Stub_Bitwise, intAndSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 0;
 	RETURN_LONG(c);
 }
@@ -70,11 +55,6 @@ PHP_METHOD(Stub_Bitwise, intAndSimple)
 PHP_METHOD(Stub_Bitwise, boolAnd)
 {
 	zend_bool a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2) ? 1 : 0);
 	c = (((a & b)) ? 1 : 0);
@@ -84,11 +64,6 @@ PHP_METHOD(Stub_Bitwise, boolAnd)
 PHP_METHOD(Stub_Bitwise, bool2And)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	c = (((a & 2)) ? 1 : 0);
 	RETURN_BOOL(c);
@@ -97,11 +72,6 @@ PHP_METHOD(Stub_Bitwise, bool2And)
 PHP_METHOD(Stub_Bitwise, bool3And)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (((a & 0)) ? 1 : 0);
 	RETURN_BOOL(c);
@@ -110,11 +80,6 @@ PHP_METHOD(Stub_Bitwise, bool3And)
 PHP_METHOD(Stub_Bitwise, boolAndSimple)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = ((0) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -122,11 +87,6 @@ PHP_METHOD(Stub_Bitwise, boolAndSimple)
 PHP_METHOD(Stub_Bitwise, doubleAnd)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = (double) (2);
 	c = (double) (((int) (a) & (int) (b)));
@@ -136,13 +96,8 @@ PHP_METHOD(Stub_Bitwise, doubleAnd)
 PHP_METHOD(Stub_Bitwise, double2And)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
-	b = 2.0;
+	a =  (1.0);
+	b =  (2.0);
 	c = (double) (((int) (a) & (int) (b)));
 	RETURN_DOUBLE(c);
 }
@@ -150,11 +105,6 @@ PHP_METHOD(Stub_Bitwise, double2And)
 PHP_METHOD(Stub_Bitwise, doubleAndSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (0);
 	RETURN_DOUBLE(c);
 }
@@ -162,11 +112,6 @@ PHP_METHOD(Stub_Bitwise, doubleAndSimple)
 PHP_METHOD(Stub_Bitwise, doubleAnd2Simple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (0.0);
 	RETURN_DOUBLE(c);
 }
@@ -174,11 +119,6 @@ PHP_METHOD(Stub_Bitwise, doubleAnd2Simple)
 PHP_METHOD(Stub_Bitwise, varAnd)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a & b);
@@ -188,11 +128,6 @@ PHP_METHOD(Stub_Bitwise, varAnd)
 PHP_METHOD(Stub_Bitwise, varAndSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 0;
 	RETURN_LONG(c);
 }
@@ -201,11 +136,6 @@ PHP_METHOD(Stub_Bitwise, intDoubleAnd)
 {
 	double a = 0;
 	zend_long b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
 	c = ((int) (a) &  b);
@@ -215,11 +145,6 @@ PHP_METHOD(Stub_Bitwise, intDoubleAnd)
 PHP_METHOD(Stub_Bitwise, intDoubleAndSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 0;
 	RETURN_LONG(c);
 }
@@ -228,11 +153,6 @@ PHP_METHOD(Stub_Bitwise, doubleIntAnd)
 {
 	double a = 0, c = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
 	c = (double) (((int) (a) &  b));
@@ -242,11 +162,6 @@ PHP_METHOD(Stub_Bitwise, doubleIntAnd)
 PHP_METHOD(Stub_Bitwise, doubleIntAndSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (0);
 	RETURN_DOUBLE(c);
 }
@@ -254,11 +169,6 @@ PHP_METHOD(Stub_Bitwise, doubleIntAndSimple)
 PHP_METHOD(Stub_Bitwise, varIntAnd)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a & b);
@@ -268,11 +178,6 @@ PHP_METHOD(Stub_Bitwise, varIntAnd)
 PHP_METHOD(Stub_Bitwise, intVarAnd)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (b & a);
@@ -283,22 +188,15 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCastAnd)
 {
 	zend_long c = 0;
 	zval a, b, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "2");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_bitwise_and_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -308,16 +206,9 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2And)
 {
 	zend_long b = 0, c = 0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b & (int) (zephir_get_numberval(&a)));
@@ -327,11 +218,6 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2And)
 PHP_METHOD(Stub_Bitwise, complexAnd)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (0);
 	RETURN_DOUBLE(c);
 }
@@ -339,11 +225,6 @@ PHP_METHOD(Stub_Bitwise, complexAnd)
 PHP_METHOD(Stub_Bitwise, complex2And)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 & 1)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -351,11 +232,6 @@ PHP_METHOD(Stub_Bitwise, complex2And)
 PHP_METHOD(Stub_Bitwise, complex3And)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 &((1.0) ? 1 : 0))) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -363,16 +239,9 @@ PHP_METHOD(Stub_Bitwise, complex3And)
 PHP_METHOD(Stub_Bitwise, complex4And)
 {
 	zval c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_LONG(&c, ((int) (1.0) & 1));
 	RETURN_CCTOR(&c);
 }
@@ -380,11 +249,6 @@ PHP_METHOD(Stub_Bitwise, complex4And)
 PHP_METHOD(Stub_Bitwise, complex5And)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (1 & 1);
 	RETURN_LONG(c);
 }
@@ -392,11 +256,6 @@ PHP_METHOD(Stub_Bitwise, complex5And)
 PHP_METHOD(Stub_Bitwise, complex6And)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 &((1) ? 1 : 0))) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -405,11 +264,6 @@ PHP_METHOD(Stub_Bitwise, complex7And)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (a & b);
@@ -420,11 +274,6 @@ PHP_METHOD(Stub_Bitwise, complex9And)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (b & a);
@@ -436,11 +285,6 @@ PHP_METHOD(Stub_Bitwise, complex10And)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1.0 != 0.0) ? 1 : 0);
 	b = 2;
 	c = (double) ((b & a));
@@ -452,11 +296,6 @@ PHP_METHOD(Stub_Bitwise, complex11And)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (double) ((b & a));
@@ -467,11 +306,6 @@ PHP_METHOD(Stub_Bitwise, complex12And)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (b & a);
@@ -482,11 +316,6 @@ PHP_METHOD(Stub_Bitwise, complex13And)
 {
 	zend_long c = 0;
 	zend_bool a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b & a);
@@ -497,11 +326,6 @@ PHP_METHOD(Stub_Bitwise, complex14And)
 {
 	zend_bool b = 0;
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b & a);
@@ -513,13 +337,8 @@ PHP_METHOD(Stub_Bitwise, complex15And)
 	zend_bool c = 0;
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
+	b =  (2.0);
 	c = ((((int) (b) &  a)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -528,13 +347,8 @@ PHP_METHOD(Stub_Bitwise, complex16And)
 {
 	double b = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
+	b =  (2.0);
 	c = (double) (((int) (b) &  a));
 	RETURN_DOUBLE(c);
 }
@@ -544,11 +358,6 @@ PHP_METHOD(Stub_Bitwise, complex17And)
 	double c = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (double) ((a & b));
@@ -560,11 +369,6 @@ PHP_METHOD(Stub_Bitwise, complex18And)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a & b));
@@ -577,11 +381,6 @@ PHP_METHOD(Stub_Bitwise, complex19And)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a & b));
@@ -594,11 +393,6 @@ PHP_METHOD(Stub_Bitwise, complex20And)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a & b));
@@ -611,11 +405,6 @@ PHP_METHOD(Stub_Bitwise, complex21And)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a & b));
@@ -627,11 +416,6 @@ PHP_METHOD(Stub_Bitwise, complex22And)
 {
 	double d = 0, c = 0;
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = (long) (2.0);
 	d = (double) ((a & b));
@@ -644,11 +428,6 @@ PHP_METHOD(Stub_Bitwise, complex23And)
 	double d = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a & b));
@@ -659,11 +438,6 @@ PHP_METHOD(Stub_Bitwise, complex24And)
 {
 	zend_bool b = 0;
 	zend_long a = 0, d = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (1 & (a & ((int) (0) & b)));
@@ -673,11 +447,6 @@ PHP_METHOD(Stub_Bitwise, complex24And)
 PHP_METHOD(Stub_Bitwise, intOr)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a | b);
@@ -687,11 +456,6 @@ PHP_METHOD(Stub_Bitwise, intOr)
 PHP_METHOD(Stub_Bitwise, int2Or)
 {
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a | 2);
 	RETURN_LONG(c);
@@ -700,11 +464,6 @@ PHP_METHOD(Stub_Bitwise, int2Or)
 PHP_METHOD(Stub_Bitwise, intOrSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 3;
 	RETURN_LONG(c);
 }
@@ -712,11 +471,6 @@ PHP_METHOD(Stub_Bitwise, intOrSimple)
 PHP_METHOD(Stub_Bitwise, boolOr)
 {
 	zend_bool a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2) ? 1 : 0);
 	c = (((a | b)) ? 1 : 0);
@@ -726,11 +480,6 @@ PHP_METHOD(Stub_Bitwise, boolOr)
 PHP_METHOD(Stub_Bitwise, bool2Or)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	c = (((a | 2)) ? 1 : 0);
 	RETURN_BOOL(c);
@@ -739,11 +488,6 @@ PHP_METHOD(Stub_Bitwise, bool2Or)
 PHP_METHOD(Stub_Bitwise, bool3Or)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (((a | 0)) ? 1 : 0);
 	RETURN_BOOL(c);
@@ -752,11 +496,6 @@ PHP_METHOD(Stub_Bitwise, bool3Or)
 PHP_METHOD(Stub_Bitwise, bool4Or)
 {
 	zend_bool a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (((a | 1)) ? 1 : 0);
 	RETURN_BOOL(c);
@@ -765,11 +504,6 @@ PHP_METHOD(Stub_Bitwise, bool4Or)
 PHP_METHOD(Stub_Bitwise, boolOrSimple)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = ((3) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -777,11 +511,6 @@ PHP_METHOD(Stub_Bitwise, boolOrSimple)
 PHP_METHOD(Stub_Bitwise, doubleOr)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = (double) (2);
 	c = (double) (((int) (a) | (int) (b)));
@@ -791,13 +520,8 @@ PHP_METHOD(Stub_Bitwise, doubleOr)
 PHP_METHOD(Stub_Bitwise, double2Or)
 {
 	double a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
-	b = 2.0;
+	a =  (1.0);
+	b =  (2.0);
 	c = (double) (((int) (a) | (int) (b)));
 	RETURN_DOUBLE(c);
 }
@@ -805,11 +529,6 @@ PHP_METHOD(Stub_Bitwise, double2Or)
 PHP_METHOD(Stub_Bitwise, doubleOrSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (3);
 	RETURN_DOUBLE(c);
 }
@@ -817,11 +536,6 @@ PHP_METHOD(Stub_Bitwise, doubleOrSimple)
 PHP_METHOD(Stub_Bitwise, doubleOr2Simple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (3.0);
 	RETURN_DOUBLE(c);
 }
@@ -829,11 +543,6 @@ PHP_METHOD(Stub_Bitwise, doubleOr2Simple)
 PHP_METHOD(Stub_Bitwise, varOr)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a | b);
@@ -843,11 +552,6 @@ PHP_METHOD(Stub_Bitwise, varOr)
 PHP_METHOD(Stub_Bitwise, varOrSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 3;
 	RETURN_LONG(c);
 }
@@ -856,11 +560,6 @@ PHP_METHOD(Stub_Bitwise, intDoubleOr)
 {
 	double a = 0;
 	zend_long b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
 	c = ((int) (a) |  b);
@@ -870,11 +569,6 @@ PHP_METHOD(Stub_Bitwise, intDoubleOr)
 PHP_METHOD(Stub_Bitwise, intDoubleOrSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 3.0;
 	RETURN_LONG(c);
 }
@@ -883,11 +577,6 @@ PHP_METHOD(Stub_Bitwise, doubleIntOr)
 {
 	double a = 0, c = 0;
 	zend_long b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	b = 2;
 	c = (double) (((int) (a) |  b));
@@ -897,11 +586,6 @@ PHP_METHOD(Stub_Bitwise, doubleIntOr)
 PHP_METHOD(Stub_Bitwise, doubleIntOrSimple)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (3.0);
 	RETURN_DOUBLE(c);
 }
@@ -909,11 +593,6 @@ PHP_METHOD(Stub_Bitwise, doubleIntOrSimple)
 PHP_METHOD(Stub_Bitwise, varIntOr)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a | b);
@@ -923,11 +602,6 @@ PHP_METHOD(Stub_Bitwise, varIntOr)
 PHP_METHOD(Stub_Bitwise, intVarOr)
 {
 	zend_long b = 0, c = 0, a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (b | a);
@@ -938,22 +612,15 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCastOr)
 {
 	zend_long c = 0;
 	zval a, b, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "2");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_bitwise_or_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -963,16 +630,9 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2Or)
 {
 	zend_long b = 0, c = 0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b | (int) (zephir_get_numberval(&a)));
@@ -982,11 +642,6 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2Or)
 PHP_METHOD(Stub_Bitwise, complexOr)
 {
 	double c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (double) (3.0);
 	RETURN_DOUBLE(c);
 }
@@ -994,11 +649,6 @@ PHP_METHOD(Stub_Bitwise, complexOr)
 PHP_METHOD(Stub_Bitwise, complex2Or)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 | 1)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1006,11 +656,6 @@ PHP_METHOD(Stub_Bitwise, complex2Or)
 PHP_METHOD(Stub_Bitwise, complex3Or)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 |((1.0) ? 1 : 0))) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1018,16 +663,9 @@ PHP_METHOD(Stub_Bitwise, complex3Or)
 PHP_METHOD(Stub_Bitwise, complex4Or)
 {
 	zval c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_LONG(&c, ((int) (1.0) | 1));
 	RETURN_CCTOR(&c);
 }
@@ -1035,11 +673,6 @@ PHP_METHOD(Stub_Bitwise, complex4Or)
 PHP_METHOD(Stub_Bitwise, complex5Or)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (1 | 1);
 	RETURN_LONG(c);
 }
@@ -1047,11 +680,6 @@ PHP_METHOD(Stub_Bitwise, complex5Or)
 PHP_METHOD(Stub_Bitwise, complex6Or)
 {
 	zend_bool c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = (((1 |((1) ? 1 : 0))) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1060,11 +688,6 @@ PHP_METHOD(Stub_Bitwise, complex7Or)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (a | b);
@@ -1075,11 +698,6 @@ PHP_METHOD(Stub_Bitwise, complex9Or)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = 2;
 	c = (b | a);
@@ -1091,11 +709,6 @@ PHP_METHOD(Stub_Bitwise, complex10Or)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1.0 != 0.0) ? 1 : 0);
 	b = 2;
 	c = (double) ((b | a));
@@ -1107,11 +720,6 @@ PHP_METHOD(Stub_Bitwise, complex11Or)
 	double c = 0;
 	zend_long b = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (double) ((b | a));
@@ -1122,11 +730,6 @@ PHP_METHOD(Stub_Bitwise, complex12Or)
 {
 	zend_long b = 0, c = 0;
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = (long) (2.0);
 	c = (b | a);
@@ -1137,11 +740,6 @@ PHP_METHOD(Stub_Bitwise, complex13Or)
 {
 	zend_long c = 0;
 	zend_bool a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b | a);
@@ -1152,11 +750,6 @@ PHP_METHOD(Stub_Bitwise, complex14Or)
 {
 	zend_bool b = 0;
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (b | a);
@@ -1168,13 +761,8 @@ PHP_METHOD(Stub_Bitwise, complex15Or)
 	zend_bool c = 0;
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
+	b =  (2.0);
 	c = ((((int) (b) |  a)) ? 1 : 0);
 	RETURN_BOOL(c);
 }
@@ -1183,13 +771,8 @@ PHP_METHOD(Stub_Bitwise, complex16Or)
 {
 	double b = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	b = 2.0;
+	b =  (2.0);
 	c = (double) (((int) (b) |  a));
 	RETURN_DOUBLE(c);
 }
@@ -1199,11 +782,6 @@ PHP_METHOD(Stub_Bitwise, complex17Or)
 	double c = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	c = (double) ((a | b));
@@ -1215,11 +793,6 @@ PHP_METHOD(Stub_Bitwise, complex18Or)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a | b));
@@ -1232,11 +805,6 @@ PHP_METHOD(Stub_Bitwise, complex19Or)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a | b));
@@ -1249,11 +817,6 @@ PHP_METHOD(Stub_Bitwise, complex20Or)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a | b));
@@ -1266,11 +829,6 @@ PHP_METHOD(Stub_Bitwise, complex21Or)
 	zend_bool b = 0;
 	double d = 0, c = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a | b));
@@ -1282,11 +840,6 @@ PHP_METHOD(Stub_Bitwise, complex22Or)
 {
 	double d = 0, c = 0;
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = (long) (2.0);
 	d = (double) ((a | b));
@@ -1299,11 +852,6 @@ PHP_METHOD(Stub_Bitwise, complex23Or)
 	double d = 0;
 	zend_bool b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((a | b));
@@ -1315,11 +863,6 @@ PHP_METHOD(Stub_Bitwise, complex24Or)
 	zend_bool b = 0;
 	double d = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = ((2.0 != 0.0) ? 1 : 0);
 	d = (double) ((((1 | a) | 0) | b));
@@ -1329,11 +872,6 @@ PHP_METHOD(Stub_Bitwise, complex24Or)
 PHP_METHOD(Stub_Bitwise, intShiftLeft)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a << b);
@@ -1343,11 +881,6 @@ PHP_METHOD(Stub_Bitwise, intShiftLeft)
 PHP_METHOD(Stub_Bitwise, int2ShiftLeft)
 {
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a << 2);
 	RETURN_LONG(c);
@@ -1356,11 +889,6 @@ PHP_METHOD(Stub_Bitwise, int2ShiftLeft)
 PHP_METHOD(Stub_Bitwise, intShiftLeftSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 4;
 	RETURN_LONG(c);
 }
@@ -1368,11 +896,6 @@ PHP_METHOD(Stub_Bitwise, intShiftLeftSimple)
 PHP_METHOD(Stub_Bitwise, intShiftRight)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = (a >> b);
@@ -1382,11 +905,6 @@ PHP_METHOD(Stub_Bitwise, intShiftRight)
 PHP_METHOD(Stub_Bitwise, int2ShiftRight)
 {
 	zend_long a = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	c = (a >> 2);
 	RETURN_LONG(c);
@@ -1395,11 +913,6 @@ PHP_METHOD(Stub_Bitwise, int2ShiftRight)
 PHP_METHOD(Stub_Bitwise, intShiftRightSimple)
 {
 	zend_long c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	c = 0;
 	RETURN_LONG(c);
 }
@@ -1408,17 +921,11 @@ PHP_METHOD(Stub_Bitwise, testBitwiseNot)
 {
 	zval *a_param = NULL;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	RETURN_LONG(~a);
 }
 
@@ -1426,19 +933,12 @@ PHP_METHOD(Stub_Bitwise, testBitwiseAndNot)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	zend_long a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_LONG((a & ~b));
 }
 
@@ -1446,17 +946,11 @@ PHP_METHOD(Stub_Bitwise, getInt)
 {
 	zval *num_param = NULL;
 	zend_long num;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	RETURN_LONG(num);
 }
 
@@ -1466,18 +960,12 @@ PHP_METHOD(Stub_Bitwise, getInt)
 PHP_METHOD(Stub_Bitwise, testbitwiseXor)
 {
 	zval i, _0, j;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&j);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 123);
 	ZEPHIR_CALL_METHOD(&i, this_ptr, "getint", NULL, 0, &_0);
 	zephir_check_call_status();
@@ -1485,6 +973,6 @@ PHP_METHOD(Stub_Bitwise, testbitwiseXor)
 	ZEPHIR_CALL_METHOD(&j, this_ptr, "getint", NULL, 0, &_0);
 	zephir_check_call_status();
 	zephir_bitwise_xor_function(return_value, &i, &j);
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/branchprediction.zep.c b/ext/stub/branchprediction.zep.c
index c70b759828..59467964bf 100644
--- a/ext/stub/branchprediction.zep.c
+++ b/ext/stub/branchprediction.zep.c
@@ -29,9 +29,6 @@ ZEPHIR_INIT_CLASS(Stub_BranchPrediction)
 
 PHP_METHOD(Stub_BranchPrediction, testLikely1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	if (EXPECTED(1 == 1)) {
 		RETURN_BOOL(1);
@@ -43,17 +40,12 @@ PHP_METHOD(Stub_BranchPrediction, testLikely1)
 PHP_METHOD(Stub_BranchPrediction, testLikely2)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	if (EXPECTED(ZEPHIR_IS_LONG_IDENTICAL(a, 1))) {
 		RETURN_BOOL(1);
 	} else {
@@ -63,9 +55,6 @@ PHP_METHOD(Stub_BranchPrediction, testLikely2)
 
 PHP_METHOD(Stub_BranchPrediction, testUnlikely1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	if (EXPECTED(1 == 1)) {
 		RETURN_BOOL(1);
@@ -77,17 +66,12 @@ PHP_METHOD(Stub_BranchPrediction, testUnlikely1)
 PHP_METHOD(Stub_BranchPrediction, testUnlikely2)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	if (EXPECTED(ZEPHIR_IS_LONG_IDENTICAL(a, 1))) {
 		RETURN_BOOL(1);
 	} else {
diff --git a/ext/stub/builtin/arraymethods.zep.c b/ext/stub/builtin/arraymethods.zep.c
index e4409b29c9..8c9ce8935e 100644
--- a/ext/stub/builtin/arraymethods.zep.c
+++ b/ext/stub/builtin/arraymethods.zep.c
@@ -30,19 +30,12 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getJoin1)
 {
 	zval _1;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -60,21 +53,14 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getReversed1)
 {
 	zval _1, _2;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -92,21 +78,14 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getMap1)
 {
 	zval _1, _2;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
diff --git a/ext/stub/builtin/charmethods.zep.c b/ext/stub/builtin/charmethods.zep.c
index e09bb34311..88dbc18262 100644
--- a/ext/stub/builtin/charmethods.zep.c
+++ b/ext/stub/builtin/charmethods.zep.c
@@ -28,18 +28,11 @@ ZEPHIR_INIT_CLASS(Stub_BuiltIn_CharMethods)
 PHP_METHOD(Stub_BuiltIn_CharMethods, getHex)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "a");
 	zephir_string_to_hex(&_0, &_1);
 	RETURN_CCTOR(&_0);
@@ -49,10 +42,8 @@ PHP_METHOD(Stub_BuiltIn_CharMethods, getHexForString)
 {
 	long _0;
 	char ch = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, o, _1$$3, _2$$3, _3$$3;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&o);
@@ -62,15 +53,9 @@ PHP_METHOD(Stub_BuiltIn_CharMethods, getHexForString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	ZVAL_STRING(&o, "");
 	for (_0 = 0; _0 < Z_STRLEN_P(&str); _0++) {
 		ch = ZEPHIR_STRING_OFFSET(&str, _0);
diff --git a/ext/stub/builtin/intmethods.zep.c b/ext/stub/builtin/intmethods.zep.c
index 65b61b1d59..83dbec9424 100644
--- a/ext/stub/builtin/intmethods.zep.c
+++ b/ext/stub/builtin/intmethods.zep.c
@@ -28,24 +28,15 @@ ZEPHIR_INIT_CLASS(Stub_BuiltIn_IntMethods)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 9, &_0);
 	zephir_check_call_status();
@@ -55,17 +46,10 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs)
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs1)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, -5);
 	ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 9, &_0);
 	zephir_check_call_status();
@@ -74,24 +58,15 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs1)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getBinary)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "decbin", NULL, 10, &_0);
 	zephir_check_call_status();
@@ -100,24 +75,15 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getBinary)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getHex)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "dechex", NULL, 11, &_0);
 	zephir_check_call_status();
@@ -126,24 +92,15 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getHex)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getOctal)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "decoct", NULL, 12, &_0);
 	zephir_check_call_status();
@@ -152,10 +109,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getOctal)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getPow)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, *exp_param = NULL, _0, _1, _2;
-	zend_long num, exp;
-	zval *this_ptr = getThis();
+	zend_long num, exp, ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
@@ -164,62 +119,39 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getPow)
 		Z_PARAM_LONG(num)
 		Z_PARAM_LONG(exp)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &num_param, &exp_param);
-	num = zephir_get_intval(num_param);
-	exp = zephir_get_intval(exp_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZVAL_LONG(&_1, num);
-	ZVAL_LONG(&_2, exp);
-	zephir_pow_function(&_0, &_1, &_2);
-	RETURN_CCTOR(&_0);
+	ZVAL_LONG(&_0, num);
+	ZVAL_LONG(&_1, exp);
+	ZEPHIR_CALL_FUNCTION(&_2, "pow", NULL, 13, &_0, &_1);
+	zephir_check_call_status();
+	RETURN_CCTOR(&_2);
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getSqrt)
 {
 	zval *num_param = NULL, _0;
 	zend_long num;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	RETURN_DOUBLE(sqrt(num));
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getExp)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
 	zephir_check_call_status();
@@ -230,18 +162,12 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getSin)
 {
 	zval *num_param = NULL, _0;
 	zend_long num;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	RETURN_DOUBLE(sin(num));
 }
@@ -250,18 +176,12 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getCos)
 {
 	zval *num_param = NULL, _0;
 	zend_long num;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	RETURN_DOUBLE(cos(num));
 }
@@ -270,106 +190,71 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getTan)
 {
 	zval *num_param = NULL, _0;
 	zend_long num;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
 	RETURN_DOUBLE(tan(num));
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
-	ZEPHIR_CALL_FUNCTION(&_1, "asin", NULL, 13, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "asin", NULL, 14, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
-	ZEPHIR_CALL_FUNCTION(&_1, "acos", NULL, 14, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "acos", NULL, 15, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	ZVAL_LONG(&_0, num);
-	ZEPHIR_CALL_FUNCTION(&_1, "atan", NULL, 15, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "atan", NULL, 16, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, *base_param = NULL, _0$$3, _1$$3, _2, _3, _4;
 	zend_long num, base, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
@@ -381,28 +266,20 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(base)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &num_param, &base_param);
-	num = zephir_get_intval(num_param);
 	if (!base_param) {
 		base = -1;
 	} else {
-		base = zephir_get_intval(base_param);
-	}
-
-
+		}
 	if (base == -1) {
 		ZVAL_LONG(&_0$$3, num);
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "log", NULL, 16, &_0$$3);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "log", NULL, 17, &_0$$3);
 		zephir_check_call_status();
 		RETURN_CCTOR(&_1$$3);
 	}
 	ZVAL_LONG(&_2, num);
 	ZVAL_LONG(&_3, base);
-	ZEPHIR_CALL_FUNCTION(&_4, "log", NULL, 16, &_2, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "log", NULL, 17, &_2, &_3);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_4);
 }
diff --git a/ext/stub/builtin/stringmethods.zep.c b/ext/stub/builtin/stringmethods.zep.c
index 5987ba6bd5..4855ee6112 100644
--- a/ext/stub/builtin/stringmethods.zep.c
+++ b/ext/stub/builtin/stringmethods.zep.c
@@ -29,10 +29,8 @@ ZEPHIR_INIT_CLASS(Stub_BuiltIn_StringMethods)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, camelize)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&delimiter_sub);
@@ -44,29 +42,21 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, camelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
 		delimiter = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
-	zephir_camelize(&_0, &str, delimiter );
+	ZVAL_NULL(&_0);
+	zephir_camelize(&_0, &str, delimiter);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, uncamelize)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&delimiter_sub);
@@ -78,36 +68,23 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, uncamelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
 		delimiter = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
-	zephir_uncamelize(&_0, &str, delimiter );
+	ZVAL_NULL(&_0);
+	zephir_uncamelize(&_0, &str, delimiter);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -115,16 +92,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength1)
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength2)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -132,73 +102,48 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength2)
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength3)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "hello", "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
-
-
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&a));
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SV(&_0, "hello", &a);
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getIndex)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *needle_param = NULL, _0;
 	zval str, needle;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&needle);
@@ -207,27 +152,19 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndex)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(needle)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &needle_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&needle, needle_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_fast_strpos(&_0, &str, &needle, 0 );
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long position;
 	zval *str_param = NULL, *needle_param = NULL, *position_param = NULL, _0, _1;
 	zval str, needle;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&needle);
@@ -238,18 +175,11 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 		Z_PARAM_STR(needle)
 		Z_PARAM_LONG(position)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &str_param, &needle_param, &position_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&needle, needle_param);
-	position = zephir_get_intval(position_param);
-
-
 	ZVAL_LONG(&_0, position);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_fast_strpos(&_1, &str, &needle, zephir_get_intval(&_0) );
 	RETURN_CCTOR(&_1);
 }
@@ -257,18 +187,11 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, " hello \t\n");
 	zephir_fast_trim(&_0, &_1, NULL , ZEPHIR_TRIM_BOTH);
 	RETURN_CCTOR(&_0);
@@ -276,187 +199,129 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_fast_trim(&_0, &str, NULL , ZEPHIR_TRIM_BOTH);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLeftTrimmed)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_fast_trim(&_0, &str, NULL , ZEPHIR_TRIM_LEFT);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getRightTrimmed)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_fast_trim(&_0, &str, NULL , ZEPHIR_TRIM_RIGHT);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLower)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_fast_strtolower(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getUpper)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_fast_strtoupper(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "lcfirst", NULL, 17, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "lcfirst", NULL, 18, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getUpperFirst)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_ucfirst(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0, _1;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
@@ -464,131 +329,91 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello %s!");
-	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 18, &_0, &str);
+	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 19, &_0, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getMd5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_md5(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "sha1", NULL, 19, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "sha1", NULL, 20, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "nl2br", NULL, 20, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "nl2br", NULL, 21, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "str_getcsv", NULL, 21, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_getcsv", NULL, 22, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_bool assoc;
 	zval *str_param = NULL, *assoc_param = NULL, _0, _1;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
@@ -598,20 +423,13 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(assoc)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &assoc_param);
 	zephir_get_strval(&str, str_param);
 	if (!assoc_param) {
 		assoc = 1;
 	} else {
-		assoc = zephir_get_boolval(assoc_param);
-	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+		}
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_1, (assoc ? 1 : 0));
 	zephir_json_decode(&_0, &str, zephir_get_intval(&str) );
 	RETURN_CCTOR(&_0);
@@ -619,11 +437,9 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long count, ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, *count_param = NULL, _0, _1;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
@@ -632,54 +448,37 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 		Z_PARAM_STR(str)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &count_param);
 	zephir_get_strval(&str, str_param);
-	count = zephir_get_intval(count_param);
-
-
 	ZVAL_LONG(&_0, count);
-	ZEPHIR_CALL_FUNCTION(&_1, "str_repeat", NULL, 22, &str, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "str_repeat", NULL, 23, &str, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "str_shuffle", NULL, 23, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_shuffle", NULL, 24, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, *del_param = NULL, _0;
 	zval str, del;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&del);
@@ -688,27 +487,19 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(del)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &del_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&del, del_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 24, &str, &del);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 25, &str, &del);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *left_param = NULL, *right_param = NULL, _0;
 	zval left, right;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&left);
 	ZVAL_UNDEF(&right);
@@ -717,27 +508,19 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 		Z_PARAM_STR(left)
 		Z_PARAM_STR(right)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "strcmp", NULL, 25, &left, &right);
+	ZEPHIR_CALL_FUNCTION(&_0, "strcmp", NULL, 26, &left, &right);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *left_param = NULL, *right_param = NULL, _0;
 	zval left, right;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&left);
 	ZVAL_UNDEF(&right);
@@ -746,68 +529,46 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 		Z_PARAM_STR(left)
 		Z_PARAM_STR(right)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "strcoll", NULL, 26, &left, &right);
+	ZEPHIR_CALL_FUNCTION(&_0, "strcoll", NULL, 27, &left, &right);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 27, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 28, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getHtmlSpecialChars)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-
-
-	ZEPHIR_CALL_FUNCTION(&_0, "htmlspecialchars", NULL, 28, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "htmlspecialchars", NULL, 29, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/cast.zep.c b/ext/stub/cast.zep.c
index b4eb6d1930..faf4eb4c23 100644
--- a/ext/stub/cast.zep.c
+++ b/ext/stub/cast.zep.c
@@ -33,9 +33,6 @@ ZEPHIR_INIT_CLASS(Stub_Cast)
  */
 PHP_METHOD(Stub_Cast, testCharCastFromChar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG('a');
 }
@@ -46,11 +43,6 @@ PHP_METHOD(Stub_Cast, testCharCastFromChar)
 PHP_METHOD(Stub_Cast, testCharCastFromVariableChar)
 {
 	char a, _0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 'A';
 	_0 = a;
 	RETURN_LONG(_0);
@@ -61,9 +53,6 @@ PHP_METHOD(Stub_Cast, testCharCastFromVariableChar)
  */
 PHP_METHOD(Stub_Cast, testStringCastChar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("z");
 }
@@ -75,17 +64,10 @@ PHP_METHOD(Stub_Cast, testStringCastVariableChar)
 {
 	zval _0;
 	char a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 'X';
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRINGL(&_0, &a, 1);
 	RETURN_CTOR(&_0);
 }
@@ -97,17 +79,10 @@ PHP_METHOD(Stub_Cast, testStringCastFromNull)
 {
 	zval _0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_NULL(&a);
 	zephir_cast_to_string(&_0, &a);
 	RETURN_CTOR(&_0);
@@ -115,9 +90,6 @@ PHP_METHOD(Stub_Cast, testStringCastFromNull)
 
 PHP_METHOD(Stub_Cast, testIntCastFromFloat)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG((int) 5.0);
 }
@@ -125,12 +97,7 @@ PHP_METHOD(Stub_Cast, testIntCastFromFloat)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableFloat)
 {
 	double a;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 5.0;
+	a =  (5.0);
 	RETURN_LONG((int) (a));
 }
 
@@ -139,9 +106,6 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableFloat)
  */
 PHP_METHOD(Stub_Cast, testIntCastFromChar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG('A');
 }
@@ -152,29 +116,18 @@ PHP_METHOD(Stub_Cast, testIntCastFromChar)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableChar)
 {
 	char a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 'a';
 	RETURN_LONG(a);
 }
 
 PHP_METHOD(Stub_Cast, testIntCastFromBooleanTrue)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(1);
 }
 
 PHP_METHOD(Stub_Cast, testIntCastFromBooleanFalse)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(0);
 }
@@ -182,11 +135,6 @@ PHP_METHOD(Stub_Cast, testIntCastFromBooleanFalse)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableBooleanTrue)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_LONG((int) (a));
 }
@@ -194,11 +142,6 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableBooleanTrue)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableBooleanFalse)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_LONG((int) (a));
 }
@@ -206,16 +149,9 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableBooleanFalse)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableNull)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_NULL(&a);
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
@@ -223,16 +159,9 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableNull)
 PHP_METHOD(Stub_Cast, testIntCastFromStringValue)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "test");
 	RETURN_MM_LONG(zephir_get_intval_ex(&_0));
@@ -241,47 +170,29 @@ PHP_METHOD(Stub_Cast, testIntCastFromStringValue)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableString)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "test");
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
 
 PHP_METHOD(Stub_Cast, testIntCastFromParameterString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
-
-
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
 
 PHP_METHOD(Stub_Cast, testIntCastFromNull)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(0);
 }
@@ -289,16 +200,9 @@ PHP_METHOD(Stub_Cast, testIntCastFromNull)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableEmptyArray)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
@@ -306,16 +210,9 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableEmptyArray)
 PHP_METHOD(Stub_Cast, testIntCastFromEmptyArray)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	RETURN_MM_LONG(zephir_get_intval(&_0));
 }
@@ -323,19 +220,12 @@ PHP_METHOD(Stub_Cast, testIntCastFromEmptyArray)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableArray)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -354,19 +244,12 @@ PHP_METHOD(Stub_Cast, testIntCastFromArray)
 {
 	zval _1;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -388,16 +271,9 @@ PHP_METHOD(Stub_Cast, testIntCastFromArray)
 PHP_METHOD(Stub_Cast, testIntCastFromStdClass)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	object_init(&_0);
 	RETURN_MM_LONG(zephir_get_intval(&_0));
 }
@@ -409,16 +285,9 @@ PHP_METHOD(Stub_Cast, testIntCastFromStdClass)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableStdClass)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init(&a);
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
@@ -428,9 +297,6 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableStdClass)
  */
 PHP_METHOD(Stub_Cast, testLongCastFromChar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG((long) 'a');
 }
@@ -441,20 +307,12 @@ PHP_METHOD(Stub_Cast, testLongCastFromChar)
 PHP_METHOD(Stub_Cast, testLongCastFromVariableChar)
 {
 	char a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 'A';
 	RETURN_LONG(a);
 }
 
 PHP_METHOD(Stub_Cast, testFloatCastFromFloat)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(5.0);
 }
@@ -462,29 +320,18 @@ PHP_METHOD(Stub_Cast, testFloatCastFromFloat)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableFloat)
 {
 	double a;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 5.0;
+	a =  (5.0);
 	RETURN_DOUBLE((double) (a));
 }
 
 PHP_METHOD(Stub_Cast, testFloatCastFromBooleanTrue)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(1);
 }
 
 PHP_METHOD(Stub_Cast, testFloatCastFromBooleanFalse)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(0);
 }
@@ -492,11 +339,6 @@ PHP_METHOD(Stub_Cast, testFloatCastFromBooleanFalse)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableBooleanTrue)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_DOUBLE((double) (a));
 }
@@ -504,11 +346,6 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableBooleanTrue)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableBooleanFalse)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_DOUBLE((double) (a));
 }
@@ -516,25 +353,15 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableBooleanFalse)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableNull)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_NULL(&a);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&a));
 }
 
 PHP_METHOD(Stub_Cast, testFloatCastFromNull)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(0);
 }
@@ -542,16 +369,9 @@ PHP_METHOD(Stub_Cast, testFloatCastFromNull)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableEmptyArray)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&a));
 }
@@ -559,16 +379,9 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableEmptyArray)
 PHP_METHOD(Stub_Cast, testFloatCastFromEmptyArray)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&_0));
 }
@@ -576,19 +389,12 @@ PHP_METHOD(Stub_Cast, testFloatCastFromEmptyArray)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableArray)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -607,19 +413,12 @@ PHP_METHOD(Stub_Cast, testFloatCastFromArray)
 {
 	zval _1;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -641,16 +440,9 @@ PHP_METHOD(Stub_Cast, testFloatCastFromArray)
 PHP_METHOD(Stub_Cast, testFloatCastFromStdClass)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	object_init(&_0);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&_0));
 }
@@ -662,16 +454,9 @@ PHP_METHOD(Stub_Cast, testFloatCastFromStdClass)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableStdClass)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init(&a);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&a));
 }
@@ -681,9 +466,6 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableStdClass)
  */
 PHP_METHOD(Stub_Cast, testDoubleCastFromVChar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE((double) 'a');
 }
@@ -694,38 +476,24 @@ PHP_METHOD(Stub_Cast, testDoubleCastFromVChar)
 PHP_METHOD(Stub_Cast, testDoubleCastFromVariableChar)
 {
 	char a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 'A';
 	RETURN_DOUBLE((double) a);
 }
 
 PHP_METHOD(Stub_Cast, testBooleanCastFromIntTrue1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL((zend_bool) 1);
 }
 
 PHP_METHOD(Stub_Cast, testBooleanCastFromIntTrue2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL((zend_bool) 1000);
 }
 
 PHP_METHOD(Stub_Cast, testBooleanCastFromIntFalse)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL((zend_bool) 0);
 }
@@ -733,16 +501,9 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromIntFalse)
 PHP_METHOD(Stub_Cast, testBooleanCastFromObject)
 {
 	zval simpleObject;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&simpleObject);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&simpleObject);
+	ZVAL_NULL(&simpleObject);
 	object_init(&simpleObject);
 	RETURN_MM_BOOL(zephir_get_boolval(&simpleObject));
 }
@@ -750,16 +511,9 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromObject)
 PHP_METHOD(Stub_Cast, testBooleanCastFromEmptyArray)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	RETURN_MM_BOOL(zephir_get_boolval(&a));
 }
@@ -767,19 +521,12 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromEmptyArray)
 PHP_METHOD(Stub_Cast, testBooleanCastFromArray)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -797,16 +544,9 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromArray)
 PHP_METHOD(Stub_Cast, testBooleanCastFromNull)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_NULL(&a);
 	RETURN_MM_BOOL(zephir_get_boolval(&a));
 }
@@ -816,9 +556,6 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromNull)
  */
 PHP_METHOD(Stub_Cast, testBooleanCastFromChar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL((zend_bool) 'a');
 }
@@ -829,11 +566,6 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromChar)
 PHP_METHOD(Stub_Cast, testBooleanCastFromVariableChar)
 {
 	char a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 'A';
 	RETURN_BOOL((zend_bool) a);
 }
@@ -841,16 +573,9 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromVariableChar)
 PHP_METHOD(Stub_Cast, testObjectCastFromInt)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 5);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -859,16 +584,9 @@ PHP_METHOD(Stub_Cast, testObjectCastFromInt)
 PHP_METHOD(Stub_Cast, testObjectCastFromFloat)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_DOUBLE(&_0, 5.0);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -877,16 +595,9 @@ PHP_METHOD(Stub_Cast, testObjectCastFromFloat)
 PHP_METHOD(Stub_Cast, testObjectCastFromFalse)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_0, 0);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -895,16 +606,9 @@ PHP_METHOD(Stub_Cast, testObjectCastFromFalse)
 PHP_METHOD(Stub_Cast, testObjectCastFromTrue)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_0, 1);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -913,16 +617,9 @@ PHP_METHOD(Stub_Cast, testObjectCastFromTrue)
 PHP_METHOD(Stub_Cast, testObjectCastFromNull)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_NULL(&_0);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -931,17 +628,10 @@ PHP_METHOD(Stub_Cast, testObjectCastFromNull)
 PHP_METHOD(Stub_Cast, testObjectCastFromEmptyArray)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	ZEPHIR_CPY_WRT(&_1, &_0);
 	zephir_convert_to_object(&_1);
@@ -952,20 +642,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromArray)
 {
 	zval _1, _2;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -985,16 +668,9 @@ PHP_METHOD(Stub_Cast, testObjectCastFromArray)
 PHP_METHOD(Stub_Cast, testObjectCastFromEmptyString)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "");
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -1003,16 +679,9 @@ PHP_METHOD(Stub_Cast, testObjectCastFromEmptyString)
 PHP_METHOD(Stub_Cast, testObjectCastFromString)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "test string");
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -1021,16 +690,9 @@ PHP_METHOD(Stub_Cast, testObjectCastFromString)
 PHP_METHOD(Stub_Cast, testCastStdinToInteger)
 {
 	zval handle;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&handle);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&handle);
+	ZVAL_NULL(&handle);
 	ZEPHIR_GET_CONSTANT(&handle, "STDIN");
 	RETURN_MM_LONG(zephir_get_intval(&handle));
 }
@@ -1038,16 +700,9 @@ PHP_METHOD(Stub_Cast, testCastStdinToInteger)
 PHP_METHOD(Stub_Cast, testCastStdoutToInteger)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "STDOUT");
 	RETURN_MM_LONG(zephir_get_intval(&_0));
 }
@@ -1056,17 +711,12 @@ PHP_METHOD(Stub_Cast, testCastFileResourceToInteger)
 {
 	zend_long id = 0;
 	zval *fileName, fileName_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&fileName_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(fileName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &fileName);
-
-
 	id = zephir_get_intval(fileName);
 	RETURN_LONG(id);
 }
@@ -1075,20 +725,13 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableArray)
 {
 	zval _1;
 	zval uids, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	zephir_create_array(&uids, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&uids, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1106,17 +749,10 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableTrue)
 {
 	zval _0;
 	zval uids;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	ZVAL_BOOL(&uids, 1);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -1127,17 +763,10 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableFalse)
 {
 	zval _0;
 	zval uids;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	ZVAL_BOOL(&uids, 0);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -1148,17 +777,10 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableNull)
 {
 	zval _0;
 	zval uids;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	ZVAL_NULL(&uids);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -1169,17 +791,10 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableInteger)
 {
 	zval _0;
 	zval uids;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	ZVAL_LONG(&uids, 1);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -1190,17 +805,10 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableFloat)
 {
 	zval _0;
 	zval uids;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	ZVAL_DOUBLE(&uids, 1.1);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -1211,17 +819,10 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableString)
 {
 	zval _0;
 	zval uids;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	ZVAL_STRING(&uids, "aaa");
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -1232,20 +833,13 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableStdClass)
 {
 	zval _1;
 	zval uids, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&uids);
+	ZVAL_NULL(&uids);
 	object_init(&uids);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "v1");
 	zephir_update_property_zval(&uids, ZEND_STRL("p1"), &_0);
@@ -1263,31 +857,24 @@ PHP_METHOD(Stub_Cast, testIssue828)
 	double floatVersion = 0, floatNonNumeric = 0;
 	zval version, nonNumericString, _0;
 	zval ret;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&version);
 	ZVAL_UNDEF(&nonNumericString);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	array_init(&ret);
-	ZEPHIR_INIT_VAR(&version);
+	ZVAL_NULL(&version);
 	ZVAL_STRING(&version, "1.0 200 OK");
-	ZEPHIR_INIT_VAR(&nonNumericString);
+	ZVAL_NULL(&nonNumericString);
 	ZVAL_STRING(&nonNumericString, "OK");
 	zephir_array_append(&ret, &version, PH_SEPARATE, "stub/cast.zep", 501);
 	zephir_array_append(&ret, &nonNumericString, PH_SEPARATE, "stub/cast.zep", 502);
-	floatVersion = zephir_get_doubleval(&version);
+	floatVersion =  (zephir_get_doubleval(&version));
 	intVersion = zephir_get_intval(&version);
-	floatNonNumeric = zephir_get_doubleval(&nonNumericString);
+	floatNonNumeric =  (zephir_get_doubleval(&nonNumericString));
 	intNonNumeric = zephir_get_intval(&nonNumericString);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_DOUBLE(&_0, floatVersion);
 	zephir_array_append(&ret, &_0, PH_SEPARATE, "stub/cast.zep", 509);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/cblock.zep.c b/ext/stub/cblock.zep.c
index b2f9e223e8..a02bb343b4 100644
--- a/ext/stub/cblock.zep.c
+++ b/ext/stub/cblock.zep.c
@@ -46,11 +46,6 @@ ZEPHIR_INIT_CLASS(Stub_Cblock)
 PHP_METHOD(Stub_Cblock, testCblock1)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	
 			a = MAX_FACTOR;
@@ -61,11 +56,6 @@ PHP_METHOD(Stub_Cblock, testCblock1)
 PHP_METHOD(Stub_Cblock, testCblock2)
 {
 	long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	
 			a = fibonacci(MAX_FACTOR);
diff --git a/ext/stub/chars.zep.c b/ext/stub/chars.zep.c
index b93aa00964..a0616024f0 100644
--- a/ext/stub/chars.zep.c
+++ b/ext/stub/chars.zep.c
@@ -30,11 +30,6 @@ ZEPHIR_INIT_CLASS(Stub_Chars)
 PHP_METHOD(Stub_Chars, sumChars1)
 {
 	char ch, chlower = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	ch = 'A';
 	chlower = (ch + 32);
 	RETURN_LONG(chlower);
@@ -44,17 +39,12 @@ PHP_METHOD(Stub_Chars, sumChars2)
 {
 	zval *ch_param = NULL;
 	char ch, chlower = 0;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(ch)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &ch_param);
 	ch = zephir_get_charval(ch_param);
-
-
 	chlower = (ch + 32);
 	RETURN_LONG(chlower);
 }
@@ -62,11 +52,6 @@ PHP_METHOD(Stub_Chars, sumChars2)
 PHP_METHOD(Stub_Chars, diffChars1)
 {
 	char ch, chlower = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	ch = 'a';
 	chlower = (ch - 32);
 	RETURN_LONG(chlower);
@@ -76,17 +61,12 @@ PHP_METHOD(Stub_Chars, diffChars2)
 {
 	zval *ch_param = NULL;
 	char ch, chlower = 0;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(ch)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &ch_param);
 	ch = zephir_get_charval(ch_param);
-
-
 	chlower = (ch - 32);
 	RETURN_LONG(chlower);
 }
diff --git a/ext/stub/closures.zep.c b/ext/stub/closures.zep.c
index b5864b7361..5caad189f3 100644
--- a/ext/stub/closures.zep.c
+++ b/ext/stub/closures.zep.c
@@ -31,9 +31,6 @@ ZEPHIR_INIT_CLASS(Stub_Closures)
 
 PHP_METHOD(Stub_Closures, simple1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_create_closure_ex(return_value, NULL, stub_1__closure_ce, SL("__invoke"));
 	return;
@@ -41,9 +38,6 @@ PHP_METHOD(Stub_Closures, simple1)
 
 PHP_METHOD(Stub_Closures, simple2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_create_closure_ex(return_value, NULL, stub_2__closure_ce, SL("__invoke"));
 	return;
@@ -51,9 +45,6 @@ PHP_METHOD(Stub_Closures, simple2)
 
 PHP_METHOD(Stub_Closures, simple3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_create_closure_ex(return_value, NULL, stub_3__closure_ce, SL("__invoke"));
 	return;
@@ -61,9 +52,6 @@ PHP_METHOD(Stub_Closures, simple3)
 
 PHP_METHOD(Stub_Closures, simple4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_create_closure_ex(return_value, NULL, stub_4__closure_ce, SL("__invoke"));
 	return;
@@ -71,9 +59,6 @@ PHP_METHOD(Stub_Closures, simple4)
 
 PHP_METHOD(Stub_Closures, simple5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_create_closure_ex(return_value, NULL, stub_5__closure_ce, SL("__invoke"));
 	return;
@@ -81,9 +66,6 @@ PHP_METHOD(Stub_Closures, simple5)
 
 PHP_METHOD(Stub_Closures, arrow1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_create_closure_ex(return_value, NULL, stub_6__closure_ce, SL("__invoke"));
 	return;
@@ -91,9 +73,6 @@ PHP_METHOD(Stub_Closures, arrow1)
 
 PHP_METHOD(Stub_Closures, arrow2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_create_closure_ex(return_value, NULL, stub_7__closure_ce, SL("__invoke"));
 	return;
@@ -103,12 +82,8 @@ PHP_METHOD(Stub_Closures, testUseCommand)
 {
 	zval _0;
 	zend_long abc;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	abc = 1;
 	zephir_create_closure_ex(return_value, NULL, stub_8__closure_ce, SL("__invoke"));
 	ZVAL_UNDEF(&_0);
@@ -119,26 +94,18 @@ PHP_METHOD(Stub_Closures, testUseCommand)
 
 PHP_METHOD(Stub_Closures, issue1860)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *abc_param = NULL;
 	zval abc;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&abc);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(abc)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &abc_param);
-	ZEPHIR_OBS_COPY_OR_DUP(&abc, abc_param);
-
-
+	ZVAL_COPY(&abc, abc_param);
 	zephir_create_closure_ex(return_value, NULL, stub_9__closure_ce, SL("__invoke"));
 	zephir_update_static_property_ce(stub_9__closure_ce, ZEND_STRL("abc"), &abc);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -148,28 +115,21 @@ PHP_METHOD(Stub_Closures, issue642)
 {
 	zval _0;
 	zval obj, closure;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj);
 	ZVAL_UNDEF(&closure);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&obj);
+	ZVAL_NULL(&obj);
 	object_init(&obj);
-	ZEPHIR_INIT_VAR(&closure);
+	ZVAL_NULL(&closure);
 	zephir_create_closure_ex(&closure, NULL, stub_10__closure_ce, SL("__invoke"));
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
 	zephir_array_fast_append(&_0, &obj);
 	ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, &closure, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Closures, issue1036SetArgument)
@@ -181,11 +141,7 @@ PHP_METHOD(Stub_Closures, issue1036SetArgument)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(argument)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &argument);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_argument"), argument);
 }
 
@@ -198,11 +154,7 @@ PHP_METHOD(Stub_Closures, issue1036SetFunction)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(func)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &func);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_function"), func);
 }
 
@@ -212,21 +164,15 @@ PHP_METHOD(Stub_Closures, issue1036SetFunction)
 PHP_METHOD(Stub_Closures, issue1036Call)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_function"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("_argument"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 29, &_0, &_1);
+	ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 30, &_0, &_1);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/compare.zep.c b/ext/stub/compare.zep.c
index dc84464035..444c7379e2 100644
--- a/ext/stub/compare.zep.c
+++ b/ext/stub/compare.zep.c
@@ -32,19 +32,12 @@ PHP_METHOD(Stub_Compare, isLessInt)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	zend_long a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_BOOL(a < b);
 }
 
@@ -52,19 +45,12 @@ PHP_METHOD(Stub_Compare, isGreaterEqual)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	zend_long a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_BOOL(a >= b);
 }
 
@@ -72,19 +58,14 @@ PHP_METHOD(Stub_Compare, isLessDouble)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	double a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
 	a = zephir_get_doubleval(a_param);
 	b = zephir_get_doubleval(b_param);
-
-
 	RETURN_BOOL(a < b);
 }
 
@@ -92,17 +73,12 @@ PHP_METHOD(Stub_Compare, isLessThenPi)
 {
 	zval *a_param = NULL;
 	double a;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
 	a = zephir_get_doubleval(a_param);
-
-
 	RETURN_BOOL(a < 3.14);
 }
 
@@ -110,17 +86,12 @@ PHP_METHOD(Stub_Compare, isMoreThenPi)
 {
 	zval *a_param = NULL;
 	double a;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
 	a = zephir_get_doubleval(a_param);
-
-
 	RETURN_BOOL(3.14 < a);
 }
 
@@ -129,19 +100,13 @@ PHP_METHOD(Stub_Compare, isMoreThenPi)
  */
 PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	if (UNEXPECTED(Z_TYPE_P(str_param) != IS_STRING && Z_TYPE_P(str_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'str' must be of the type string"));
@@ -150,10 +115,8 @@ PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 	if (EXPECTED(Z_TYPE_P(str_param) == IS_STRING)) {
 		zephir_get_strval(&str, str_param);
 	} else {
-		ZEPHIR_INIT_VAR(&str);
+		ZVAL_NULL(&str);
 	}
-
-
 	if (ZEPHIR_IS_STRING_IDENTICAL(&str, "wrong testing")) {
 		ZEPHIR_INIT_NVAR(&str);
 		ZVAL_STRING(&str, "NOK");
@@ -177,17 +140,12 @@ PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 PHP_METHOD(Stub_Compare, testVarEqualsNull)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	if (Z_TYPE_P(a) == IS_NULL) {
 		RETURN_BOOL(1);
 	}
@@ -197,17 +155,12 @@ PHP_METHOD(Stub_Compare, testVarEqualsNull)
 PHP_METHOD(Stub_Compare, testNullEqualsVar)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	if (Z_TYPE_P(a) == IS_NULL) {
 		RETURN_BOOL(1);
 	}
@@ -217,11 +170,6 @@ PHP_METHOD(Stub_Compare, testNullEqualsVar)
 PHP_METHOD(Stub_Compare, testNotIdenticalZeroVar)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	RETURN_BOOL(0 != a);
 }
@@ -229,11 +177,6 @@ PHP_METHOD(Stub_Compare, testNotIdenticalZeroVar)
 PHP_METHOD(Stub_Compare, testNotIdenticalZeroInt)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	RETURN_BOOL(0 != a);
 }
@@ -241,11 +184,6 @@ PHP_METHOD(Stub_Compare, testNotIdenticalZeroInt)
 PHP_METHOD(Stub_Compare, testNotIdenticalZeroLong)
 {
 	long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	RETURN_BOOL(0 != a);
 }
diff --git a/ext/stub/concat.zep.c b/ext/stub/concat.zep.c
index 1460c7ffce..68a7e39702 100644
--- a/ext/stub/concat.zep.c
+++ b/ext/stub/concat.zep.c
@@ -29,60 +29,40 @@ ZEPHIR_INIT_CLASS(Stub_Concat)
 PHP_METHOD(Stub_Concat, getTestProperty)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_concat_ce, SL("testProperty"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
 
 PHP_METHOD(Stub_Concat, testConcatBySelfProperty)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *title_param = NULL, _0;
 	zval title;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&title);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(title)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &title_param);
 	zephir_get_strval(&title, title_param);
-
-
 	ZEPHIR_OBS_NVAR(&_0);
 	zephir_read_static_property_ce(&_0, stub_concat_ce, SL("testProperty"), PH_NOISY_CC);
 	SEPARATE_ZVAL(&title);
 	zephir_concat_function(&title, &_0, &title);
 	zephir_update_static_property_ce(stub_concat_ce, ZEND_STRL("testProperty"), &title);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Concat, testConcat1)
 {
 	zval url, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&url);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&url);
+	ZVAL_NULL(&url);
 	ZVAL_STRING(&url, "test");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SV(&_0, "append", &url);
 	ZEPHIR_CPY_WRT(&url, &_0);
 	RETURN_CCTOR(&url);
@@ -92,23 +72,16 @@ PHP_METHOD(Stub_Concat, testConcat2)
 {
 	zval _1;
 	zval url, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&url);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&url);
+	ZVAL_NULL(&url);
 	ZVAL_STRING(&url, "test");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SVS(&_0, "append", &url, "other");
 	ZEPHIR_CPY_WRT(&url, &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_CONCAT_SS(&_1, "append", "other");
 	ZEPHIR_CPY_WRT(&url, &_1);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -123,19 +96,12 @@ PHP_METHOD(Stub_Concat, testConcat2)
 PHP_METHOD(Stub_Concat, testConcat3)
 {
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "1");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "2");
 	zephir_concat_self(&b, &a);
 	RETURN_CCTOR(&b);
@@ -148,9 +114,7 @@ PHP_METHOD(Stub_Concat, testConcat4)
 {
 	zval query, _1, _3;
 	double min = 0, max = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value, value_sub, _0, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_0);
@@ -161,24 +125,16 @@ PHP_METHOD(Stub_Concat, testConcat4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
-
-
-	ZEPHIR_INIT_VAR(&query);
-	min = (zephir_safe_div_zval_long(value, 100) * (double) (25));
-	max = (zephir_safe_div_zval_long(value, 100) * (double) (50));
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&query);
+	min =  ((zephir_safe_div_zval_long(value, 100) * (double) (25)));
+	max =  ((zephir_safe_div_zval_long(value, 100) * (double) (50)));
 	ZVAL_DOUBLE(&_0, max);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_CONCAT_SV(&_1, "SELECT * FROM TEST WHERE value <= ", &_0);
 	zephir_concat_self(&query, &_1);
-	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_DOUBLE(&_2, min);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZEPHIR_CONCAT_SV(&_3, " AND value >= ", &_2);
 	zephir_concat_self(&query, &_3);
 	RETURN_CTOR(&query);
@@ -190,10 +146,8 @@ PHP_METHOD(Stub_Concat, testConcat4)
 PHP_METHOD(Stub_Concat, testConcat5)
 {
 	zval retval, left;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *number_param = NULL, _0;
 	double number;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&retval);
@@ -201,19 +155,12 @@ PHP_METHOD(Stub_Concat, testConcat5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(number)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &number_param);
 	number = zephir_get_doubleval(number_param);
-
-
-	ZEPHIR_INIT_VAR(&left);
+	ZVAL_NULL(&left);
 	ZVAL_STRING(&left, "Concatenated string with number ");
-	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, number);
-	ZEPHIR_INIT_VAR(&retval);
+	ZVAL_NULL(&retval);
 	ZEPHIR_CONCAT_VV(&retval, &left, &_0);
 	RETURN_CTOR(&retval);
 }
diff --git a/ext/stub/constants.zep.c b/ext/stub/constants.zep.c
index c9b858ea09..27575716d0 100644
--- a/ext/stub/constants.zep.c
+++ b/ext/stub/constants.zep.c
@@ -71,81 +71,54 @@ ZEPHIR_INIT_CLASS(Stub_Constants)
 
 PHP_METHOD(Stub_Constants, getPropWsVarsGet)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propWsVarsGet");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC1");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC2");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC3");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC4");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC5");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC6)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC6");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC7)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC7");
 }
 
 PHP_METHOD(Stub_Constants, getPropertyC8)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC8");
 }
@@ -154,54 +127,36 @@ PHP_METHOD(Stub_Constants, getPropertyC8)
  */
 PHP_METHOD(Stub_Constants, getPropertyC9)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propertyC9");
 }
 
 PHP_METHOD(Stub_Constants, testReadConstant)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(3);
 }
 
 PHP_METHOD(Stub_Constants, testReadClassConstant1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_Constants, testReadClassConstant2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_Constants, testReadClassConstant3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_Constants, testPHPVersionEnvConstant)
 {
-	zval *this_ptr = getThis();
-
-
 
 	ZEPHIR_GET_CONSTANT(return_value, "PHP_VERSION");
 	return;
@@ -209,45 +164,30 @@ PHP_METHOD(Stub_Constants, testPHPVersionEnvConstant)
 
 PHP_METHOD(Stub_Constants, testClassMagicConstant)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("Stub\\Constants");
 }
 
 PHP_METHOD(Stub_Constants, testMethodMagicConstant)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("Constants:testMethodMagicConstant");
 }
 
 PHP_METHOD(Stub_Constants, testFunctionMagicConstant)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("testFunctionMagicConstant");
 }
 
 PHP_METHOD(Stub_Constants, testNamespaceMagicConstant)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("Stub");
 }
 
 PHP_METHOD(Stub_Constants, testDirConstant)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
@@ -255,16 +195,9 @@ PHP_METHOD(Stub_Constants, testDirConstant)
 PHP_METHOD(Stub_Constants, testPHPVersionEnvConstantInExpValue)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZEPHIR_GET_CONSTANT(&a, "PHP_VERSION");
 	RETURN_CCTOR(&a);
 }
@@ -277,16 +210,9 @@ PHP_METHOD(Stub_Constants, testPHPVersionEnvConstantInExpValue)
 PHP_METHOD(Stub_Constants, testStringDelimiterConstantDoubleQuoted)
 {
 	zval delimiter;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&delimiter);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&delimiter);
+	ZVAL_NULL(&delimiter);
 	ZVAL_STRING(&delimiter, ".");
 	RETURN_CCTOR(&delimiter);
 }
@@ -294,34 +220,21 @@ PHP_METHOD(Stub_Constants, testStringDelimiterConstantDoubleQuoted)
 PHP_METHOD(Stub_Constants, testStringConstantWithVars)
 {
 	zval property;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&property);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&property);
+	ZVAL_NULL(&property);
 	ZVAL_STRING(&property, "$SOME/CSRF/KEY$");
 	RETURN_CCTOR(&property);
 }
 
 PHP_METHOD(Stub_Constants, testStringPropertyWithVarsAssigned)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propWsVarsAssigned");
 }
 
 PHP_METHOD(Stub_Constants, testStringPropertyWithVarsGet)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propWsVarsGet");
 }
diff --git a/ext/stub/constantsinterface.zep.c b/ext/stub/constantsinterface.zep.c
index e6ed8ba172..9c619ddf4a 100644
--- a/ext/stub/constantsinterface.zep.c
+++ b/ext/stub/constantsinterface.zep.c
@@ -25,108 +25,72 @@ ZEPHIR_INIT_CLASS(Stub_ConstantsInterface)
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInterfaceConstant1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInterfaceConstant2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInterfaceConstant3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInterfaceConstant4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInterfaceConstant5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(10.25);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInterfaceConstant6)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("test");
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(10.25);
 }
 
 PHP_METHOD(Stub_ConstantsInterface, testReadInheritanceFromInterfaceConstant6)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("test");
 }
diff --git a/ext/stub/constantsinterfacea.zep.c b/ext/stub/constantsinterfacea.zep.c
index b13995703a..288dc16bf1 100644
--- a/ext/stub/constantsinterfacea.zep.c
+++ b/ext/stub/constantsinterfacea.zep.c
@@ -25,54 +25,36 @@ ZEPHIR_INIT_CLASS(Stub_ConstantsInterfaceA)
 
 PHP_METHOD(Stub_ConstantsInterfaceA, testReadInterfaceConstant1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceA, testReadInterfaceConstant2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceA, testReadInterfaceConstant3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceA, testReadInterfaceConstant4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceA, testReadInterfaceConstant5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(10.25);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceA, testReadInterfaceConstant6)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("test");
 }
diff --git a/ext/stub/constantsinterfaceb.zep.c b/ext/stub/constantsinterfaceb.zep.c
index 2b5605012c..a12db42421 100644
--- a/ext/stub/constantsinterfaceb.zep.c
+++ b/ext/stub/constantsinterfaceb.zep.c
@@ -25,54 +25,36 @@ ZEPHIR_INIT_CLASS(Stub_ConstantsInterfaceB)
 
 PHP_METHOD(Stub_ConstantsInterfaceB, testReadInterfaceConstant1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceB, testReadInterfaceConstant2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceB, testReadInterfaceConstant3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceB, testReadInterfaceConstant4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceB, testReadInterfaceConstant5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(10.25);
 }
 
 PHP_METHOD(Stub_ConstantsInterfaceB, testReadInterfaceConstant6)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("test");
 }
diff --git a/ext/stub/constructors/issue1803.zep.c b/ext/stub/constructors/issue1803.zep.c
index 49c572a523..7295a1d12a 100644
--- a/ext/stub/constructors/issue1803.zep.c
+++ b/ext/stub/constructors/issue1803.zep.c
@@ -30,19 +30,12 @@ ZEPHIR_INIT_CLASS(Stub_Constructors_Issue1803)
 PHP_METHOD(Stub_Constructors_Issue1803, Issue1803)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "Value that won't be updated on class init");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("value"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/declaretest.zep.c b/ext/stub/declaretest.zep.c
index 4227ba3dd8..6c008e48f1 100644
--- a/ext/stub/declaretest.zep.c
+++ b/ext/stub/declaretest.zep.c
@@ -30,16 +30,9 @@ ZEPHIR_INIT_CLASS(Stub_DeclareTest)
 PHP_METHOD(Stub_DeclareTest, testStringDeclare1)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "/@(\\w+)(?:\\s*(?:\\(\\s*)?(.*?)(?:\\s*\\))?)??\\s*(?:\n|\\*\\/)/");
 	RETURN_CCTOR(&a);
 }
@@ -47,16 +40,9 @@ PHP_METHOD(Stub_DeclareTest, testStringDeclare1)
 PHP_METHOD(Stub_DeclareTest, testStringDeclare2)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "/(\\w+)\\s*=\\s*(\\[[^\\]]*\\]|\"[^\"]*\"|[^,)]*)\\s*(?:,|$)/");
 	RETURN_CCTOR(&a);
 }
@@ -64,11 +50,6 @@ PHP_METHOD(Stub_DeclareTest, testStringDeclare2)
 PHP_METHOD(Stub_DeclareTest, testDeclare1)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_LONG(a);
 }
@@ -76,11 +57,6 @@ PHP_METHOD(Stub_DeclareTest, testDeclare1)
 PHP_METHOD(Stub_DeclareTest, testDeclare2)
 {
 	zend_ulong a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_LONG(a);
 }
@@ -88,35 +64,20 @@ PHP_METHOD(Stub_DeclareTest, testDeclare2)
 PHP_METHOD(Stub_DeclareTest, testDeclare3)
 {
 	double a;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
+	a =  (1.0);
 	RETURN_DOUBLE(a);
 }
 
 PHP_METHOD(Stub_DeclareTest, testDeclare4)
 {
 	double a;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 1.0;
+	a =  (1.0);
 	RETURN_DOUBLE(a);
 }
 
 PHP_METHOD(Stub_DeclareTest, testDeclare5)
 {
 	char a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 'A';
 	RETURN_LONG(a);
 }
@@ -124,11 +85,6 @@ PHP_METHOD(Stub_DeclareTest, testDeclare5)
 PHP_METHOD(Stub_DeclareTest, testDeclare6)
 {
 	unsigned char a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 'A';
 	RETURN_LONG(a);
 }
@@ -136,11 +92,6 @@ PHP_METHOD(Stub_DeclareTest, testDeclare6)
 PHP_METHOD(Stub_DeclareTest, testDeclare7)
 {
 	long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_LONG(a);
 }
@@ -148,11 +99,6 @@ PHP_METHOD(Stub_DeclareTest, testDeclare7)
 PHP_METHOD(Stub_DeclareTest, testDeclare8)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_BOOL(a);
 }
@@ -160,11 +106,6 @@ PHP_METHOD(Stub_DeclareTest, testDeclare8)
 PHP_METHOD(Stub_DeclareTest, testDeclare9)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_BOOL(a);
 }
@@ -172,11 +113,6 @@ PHP_METHOD(Stub_DeclareTest, testDeclare9)
 PHP_METHOD(Stub_DeclareTest, testDeclare10)
 {
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 10;
 	RETURN_LONG(a);
 }
@@ -184,23 +120,13 @@ PHP_METHOD(Stub_DeclareTest, testDeclare10)
 PHP_METHOD(Stub_DeclareTest, testDeclare11)
 {
 	double a;
-	zval *this_ptr = getThis();
-
-
-
-
-	a = 10.5;
+	a =  (10.5);
 	RETURN_DOUBLE(a);
 }
 
 PHP_METHOD(Stub_DeclareTest, testDeclare12)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	RETURN_BOOL(a);
 }
@@ -208,11 +134,6 @@ PHP_METHOD(Stub_DeclareTest, testDeclare12)
 PHP_METHOD(Stub_DeclareTest, testDeclare13)
 {
 	zend_bool a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	RETURN_BOOL(a);
 }
@@ -220,16 +141,9 @@ PHP_METHOD(Stub_DeclareTest, testDeclare13)
 PHP_METHOD(Stub_DeclareTest, testDeclare14)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "hello");
 	RETURN_CCTOR(&a);
 }
@@ -237,16 +151,9 @@ PHP_METHOD(Stub_DeclareTest, testDeclare14)
 PHP_METHOD(Stub_DeclareTest, testDeclare15)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_NULL(&a);
 	RETURN_CCTOR(&a);
 }
@@ -254,16 +161,10 @@ PHP_METHOD(Stub_DeclareTest, testDeclare15)
 PHP_METHOD(Stub_DeclareTest, testDeclareMcallExpression)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_METHOD(&a, this_ptr, "testdeclare14", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&a);
diff --git a/ext/stub/echoes.zep.c b/ext/stub/echoes.zep.c
index b4523f63c8..45b76044e5 100644
--- a/ext/stub/echoes.zep.c
+++ b/ext/stub/echoes.zep.c
@@ -27,45 +27,30 @@ ZEPHIR_INIT_CLASS(Stub_Echoes)
 
 PHP_METHOD(Stub_Echoes, testEcho1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	php_printf("%d", 1);
 }
 
 PHP_METHOD(Stub_Echoes, testEcho2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	php_printf("%f", 1.0);
 }
 
 PHP_METHOD(Stub_Echoes, testEcho3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	php_printf("%s", 1 ? "1": "");
 }
 
 PHP_METHOD(Stub_Echoes, testEcho4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	php_printf("%s", 0 ? "1": "");
 }
 
 PHP_METHOD(Stub_Echoes, testEcho5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	php_printf("%s", "hello");
 }
diff --git a/ext/stub/emptytest.zep.c b/ext/stub/emptytest.zep.c
index 2cdc225dc6..ba89931d48 100644
--- a/ext/stub/emptytest.zep.c
+++ b/ext/stub/emptytest.zep.c
@@ -34,16 +34,9 @@ ZEPHIR_INIT_CLASS(Stub_EmptyTest)
 PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayEmpty)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
 }
@@ -51,19 +44,12 @@ PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayEmpty)
 PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayNotEmpty)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -81,16 +67,9 @@ PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayNotEmpty)
 PHP_METHOD(Stub_EmptyTest, testEmptyString)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "");
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
 }
@@ -98,39 +77,24 @@ PHP_METHOD(Stub_EmptyTest, testEmptyString)
 PHP_METHOD(Stub_EmptyTest, testNotEmptyString)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "test string");
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
 }
 
 PHP_METHOD(Stub_EmptyTest, testString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
-
-
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
 }
 
diff --git a/ext/stub/evaltest.zep.c b/ext/stub/evaltest.zep.c
index e836da966f..e001104323 100644
--- a/ext/stub/evaltest.zep.c
+++ b/ext/stub/evaltest.zep.c
@@ -27,24 +27,16 @@ ZEPHIR_INIT_CLASS(Stub_EvalTest)
 
 PHP_METHOD(Stub_EvalTest, evalCode)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *code_param = NULL;
 	zval code;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&code);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(code)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &code_param);
 	zephir_get_strval(&code, code_param);
-
-
 	zephir_eval_php(&code, return_value, "stub/evaltest.zep:7");
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/exception.zep.c b/ext/stub/exception.zep.c
index 705967611b..6105ba4a74 100644
--- a/ext/stub/exception.zep.c
+++ b/ext/stub/exception.zep.c
@@ -34,7 +34,6 @@ ZEPHIR_INIT_CLASS(Stub_Exception)
  */
 PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *message_param = NULL;
 	zval message;
 	zval *this_ptr = getThis();
@@ -43,10 +42,6 @@ PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(message)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &message_param);
 	if (UNEXPECTED(Z_TYPE_P(message_param) != IS_STRING && Z_TYPE_P(message_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'message' must be of the type string"));
@@ -55,11 +50,8 @@ PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 	if (EXPECTED(Z_TYPE_P(message_param) == IS_STRING)) {
 		zephir_get_strval(&message, message_param);
 	} else {
-		ZEPHIR_INIT_VAR(&message);
+		ZVAL_NULL(&message);
 	}
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("message"), &message);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/exceptions.zep.c b/ext/stub/exceptions.zep.c
index 5b66f879d2..cb68a326fb 100644
--- a/ext/stub/exceptions.zep.c
+++ b/ext/stub/exceptions.zep.c
@@ -31,9 +31,6 @@ ZEPHIR_INIT_CLASS(Stub_Exceptions)
 
 PHP_METHOD(Stub_Exceptions, testException1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(stub_exception_ce, "hello1", "stub/exceptions.zep", 11);
 	return;
@@ -41,9 +38,6 @@ PHP_METHOD(Stub_Exceptions, testException1)
 
 PHP_METHOD(Stub_Exceptions, testExceptionStringEscape)
 {
-	zval *this_ptr = getThis();
-
-
 
 	ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(stub_exception_ce, "hello \"simple code\" test", "stub/exceptions.zep", 16);
 	return;
@@ -52,138 +46,92 @@ PHP_METHOD(Stub_Exceptions, testExceptionStringEscape)
 PHP_METHOD(Stub_Exceptions, testException2)
 {
 	zval msg, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&msg);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&msg);
+	ZVAL_NULL(&msg);
 	ZVAL_STRING(&msg, "hello2");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	object_init_ex(&_0, stub_exception_ce);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 30, &msg);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 23);
-	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testException3)
 {
 	zval ex, msg;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ex);
 	ZVAL_UNDEF(&msg);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&msg);
+	ZVAL_NULL(&msg);
 	ZVAL_STRING(&msg, "hello3");
-	ZEPHIR_INIT_VAR(&ex);
+	ZVAL_NULL(&ex);
 	object_init_ex(&ex, stub_exception_ce);
-	ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 30, &msg);
+	ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 31, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&ex, "stub/exceptions.zep", 31);
-	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, getException)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	object_init_ex(return_value, stub_exception_ce);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello4");
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 30, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 31, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testException4)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getexception", NULL, 0);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 41);
-	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testException5)
 {
 	zval exception, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&exception);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&exception);
+	ZVAL_NULL(&exception);
 	object_init_ex(&exception, stub_exception_ce);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello5");
-	ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 30, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 31, &_0);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&exception, "stub/exceptions.zep", 49);
-	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionLiteral)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *type_param = NULL;
 	zval type;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&type);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(type)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &type_param);
 	zephir_get_strval(&type, type_param);
-
-
 	do {
 		if (ZEPHIR_IS_STRING(&type, "string")) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STR(stub_exception_ce, "Test", "stub/exceptions.zep", 56);
@@ -203,16 +151,13 @@ PHP_METHOD(Stub_Exceptions, testExceptionLiteral)
 		}
 	} while(0);
 
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *name_param = NULL, _0, _1;
 	zval name;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_0);
@@ -220,29 +165,20 @@ PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "Hello, %s");
-	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 18, &_0, &name);
+	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 19, &_0, &name);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_1, "stub/exceptions.zep", 68);
-	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionConcat)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *framework_param = NULL, *language_param = NULL;
 	zval framework, language, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&framework);
 	ZVAL_UNDEF(&language);
@@ -251,37 +187,23 @@ PHP_METHOD(Stub_Exceptions, testExceptionConcat)
 		Z_PARAM_STR(framework)
 		Z_PARAM_STR(language)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &framework_param, &language_param);
 	zephir_get_strval(&framework, framework_param);
 	zephir_get_strval(&language, language_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SVSV(&_0, "Framework ", &framework, " written using ", &language);
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 73);
-	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionRethrow)
 {
 	zval e, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "testexception1", NULL, 0);
@@ -290,24 +212,21 @@ PHP_METHOD(Stub_Exceptions, testExceptionRethrow)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_0);
+		ZVAL_NULL(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("Exception"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&e, &_0);
 			zephir_throw_exception_debug(&e, "stub/exceptions.zep", 83);
-			ZEPHIR_MM_RESTORE();
 			return;
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Exceptions, testMultiException)
 {
 	zend_bool _1$$4, _3$$7, _5$$10, _7$$13;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *returnValue, returnValue_sub, *exception, exception_sub, e, f, iexc, exc, _0, _2$$4, _4$$7, _6$$10, _8$$13;
 	zval *this_ptr = getThis();
@@ -327,28 +246,18 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 		Z_PARAM_ZVAL(returnValue)
 		Z_PARAM_ZVAL(exception)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &returnValue, &exception);
-
-
-	zephir_memory_observe(&iexc);
 	zephir_read_property(&iexc, this_ptr, ZEND_STRL("internalExceptionCallable"), PH_NOISY_CC);
-	zephir_memory_observe(&exc);
 	zephir_read_property(&exc, this_ptr, ZEND_STRL("exceptionCallable"), PH_NOISY_CC);
 
 	/* try_start_1: */
 
 		zephir_throw_exception_debug(exception, "stub/exceptions.zep", 95);
 		goto try_end_1;
-
-
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_0);
+		ZVAL_NULL(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_instance_of_ev(&_0, stub_exception_ce)) {
@@ -363,7 +272,6 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 			if (_1$$4) {
 			} else {
 				zephir_throw_exception_debug(&e, "stub/exceptions.zep", 101);
-				ZEPHIR_MM_RESTORE();
 				return;
 			}
 		} else {
@@ -379,7 +287,6 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 				if (_3$$7) {
 				} else {
 					zephir_throw_exception_debug(&e, "stub/exceptions.zep", 108);
-					ZEPHIR_MM_RESTORE();
 					return;
 				}
 			} else {
@@ -395,7 +302,6 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 					if (_5$$10) {
 					} else {
 						zephir_throw_exception_debug(&f, "stub/exceptions.zep", 115);
-						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				} else {
@@ -411,7 +317,6 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 						if (_7$$13) {
 						} else {
 							zephir_throw_exception_debug(&f, "stub/exceptions.zep", 115);
-							ZEPHIR_MM_RESTORE();
 							return;
 						}
 					}
@@ -420,34 +325,27 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 		}
 	}
 	RETVAL_ZVAL(returnValue, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Exceptions, issue1325)
 {
 	zval e, status, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&status);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(&status, this_ptr, "donoopexception", NULL, 31);
+		ZEPHIR_CALL_METHOD(&status, this_ptr, "donoopexception", NULL, 32);
 		zephir_check_call_status_or_jump(try_end_1);
 
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_0);
+		ZVAL_NULL(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("Exception"))) {
@@ -462,9 +360,6 @@ PHP_METHOD(Stub_Exceptions, issue1325)
 
 PHP_METHOD(Stub_Exceptions, doNoopException)
 {
-	zval *this_ptr = getThis();
-
-
 
 	ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(zend_ce_exception, "I am exception", "stub/exceptions.zep", 140);
 	return;
diff --git a/ext/stub/exists.zep.c b/ext/stub/exists.zep.c
index a1a5ab5ecc..2f5f5fd5c2 100644
--- a/ext/stub/exists.zep.c
+++ b/ext/stub/exists.zep.c
@@ -29,7 +29,6 @@ PHP_METHOD(Stub_Exists, testClassExists)
 {
 	zend_bool autoload;
 	zval *className, className_sub, *autoload_param = NULL, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className_sub);
 	ZVAL_UNDEF(&_0);
@@ -38,16 +37,11 @@ PHP_METHOD(Stub_Exists, testClassExists)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(autoload)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 1, &className, &autoload_param);
 	if (!autoload_param) {
 		autoload = 1;
 	} else {
-		autoload = zephir_get_boolval(autoload_param);
-	}
-
-
+		}
 	ZVAL_BOOL(&_0, (autoload ? 1 : 0));
 	RETURN_BOOL(zephir_class_exists(className, zephir_is_true(&_0) ));
 }
@@ -56,7 +50,6 @@ PHP_METHOD(Stub_Exists, testInterfaceExists)
 {
 	zend_bool autoload;
 	zval *interfaceName, interfaceName_sub, *autoload_param = NULL, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&interfaceName_sub);
 	ZVAL_UNDEF(&_0);
@@ -65,16 +58,11 @@ PHP_METHOD(Stub_Exists, testInterfaceExists)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(autoload)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 1, &interfaceName, &autoload_param);
 	if (!autoload_param) {
 		autoload = 1;
 	} else {
-		autoload = zephir_get_boolval(autoload_param);
-	}
-
-
+		}
 	ZVAL_BOOL(&_0, (autoload ? 1 : 0));
 	RETURN_BOOL(zephir_interface_exists(interfaceName, zephir_is_true(&_0) ));
 }
@@ -82,7 +70,6 @@ PHP_METHOD(Stub_Exists, testInterfaceExists)
 PHP_METHOD(Stub_Exists, testMethodExists)
 {
 	zval *obj, obj_sub, *methodName, methodName_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
 	ZVAL_UNDEF(&methodName_sub);
@@ -90,28 +77,19 @@ PHP_METHOD(Stub_Exists, testMethodExists)
 		Z_PARAM_ZVAL(obj)
 		Z_PARAM_ZVAL(methodName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &obj, &methodName);
-
-
 	RETURN_BOOL((zephir_method_exists(obj, methodName)  == SUCCESS));
 }
 
 PHP_METHOD(Stub_Exists, testFileExists)
 {
 	zval *fileName, fileName_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&fileName_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(fileName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &fileName);
-
-
 	RETURN_BOOL((zephir_file_exists(fileName) == SUCCESS));
 }
 
diff --git a/ext/stub/exitdie.zep.c b/ext/stub/exitdie.zep.c
index 372ca02297..c4d3b63b7b 100644
--- a/ext/stub/exitdie.zep.c
+++ b/ext/stub/exitdie.zep.c
@@ -28,7 +28,6 @@ ZEPHIR_INIT_CLASS(Stub_ExitDie)
 PHP_METHOD(Stub_ExitDie, testExit)
 {
 	zval *param = NULL, param_sub, __$null;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
@@ -37,15 +36,11 @@ PHP_METHOD(Stub_ExitDie, testExit)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
 	if (!param) {
 		param = &param_sub;
 		param = &__$null;
 	}
-
-
 	if (ZEPHIR_IS_EMPTY(param)) {
 		zephir_exit_empty();
 	}
@@ -55,7 +50,6 @@ PHP_METHOD(Stub_ExitDie, testExit)
 PHP_METHOD(Stub_ExitDie, testDie)
 {
 	zval *param = NULL, param_sub, __$null;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
@@ -64,15 +58,11 @@ PHP_METHOD(Stub_ExitDie, testDie)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
 	if (!param) {
 		param = &param_sub;
 		param = &__$null;
 	}
-
-
 	if (ZEPHIR_IS_EMPTY(param)) {
 		zephir_exit_empty();
 	}
diff --git a/ext/stub/factorial.zep.c b/ext/stub/factorial.zep.c
index 07d9ee68d8..4dff8b19c2 100644
--- a/ext/stub/factorial.zep.c
+++ b/ext/stub/factorial.zep.c
@@ -31,17 +31,11 @@ PHP_METHOD(Stub_Factorial, intIterativeFactorial)
 	long result, i = 0;
 	zval *n_param = NULL;
 	zend_long n, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &n_param);
-	n = zephir_get_intval(n_param);
-
-
 	result = 1;
 	_2 = n;
 	_1 = 2;
@@ -66,7 +60,6 @@ PHP_METHOD(Stub_Factorial, intIterativeFactorial)
 PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 {
 	zend_bool _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _2, _3;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
@@ -77,25 +70,20 @@ PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	_1 = num == 0;
 	if (!(_1)) {
 		_1 = num == 1;
 	}
 	if (_1) {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, 1);
 	} else {
 		ZVAL_LONG(&_3, (num - 1));
-		ZEPHIR_CALL_METHOD(&_2, this_ptr, "intrecursivefactorial", NULL, 32, &_3);
+		ZEPHIR_CALL_METHOD(&_2, this_ptr, "intrecursivefactorial", NULL, 33, &_3);
 		zephir_check_call_status();
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (num * zephir_get_numberval(&_2)));
 	}
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/fannkuch.zep.c b/ext/stub/fannkuch.zep.c
index e841eab040..3e67022db7 100644
--- a/ext/stub/fannkuch.zep.c
+++ b/ext/stub/fannkuch.zep.c
@@ -35,10 +35,8 @@ ZEPHIR_INIT_CLASS(Stub_Fannkuch)
 PHP_METHOD(Stub_Fannkuch, process)
 {
 	zend_bool _0, _5$$4, _11$$8;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n_param = NULL, perm, perm0, perm1, count, temp, _3$$3, _4$$6, _9$$4, _8$$7, _10$$8, _14$$9, _15$$14, _16$$15, _17$$13, _18$$13, _19$$13;
 	zend_long n, maxFlipsCount, permCount, checksum, i = 0, j = 0, flipsCount = 0, k = 0, r = 0, k2 = 0, _1, _2, _6$$4, _7$$4, _12$$8, _13$$8;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&perm);
 	ZVAL_UNDEF(&perm0);
@@ -59,22 +57,15 @@ PHP_METHOD(Stub_Fannkuch, process)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
-	n = zephir_get_intval(n_param);
-
-
 	maxFlipsCount = 0;
 	permCount = 0;
 	checksum = 0;
-	ZEPHIR_INIT_VAR(&perm);
+	ZVAL_NULL(&perm);
 	array_init(&perm);
-	ZEPHIR_INIT_VAR(&perm1);
+	ZVAL_NULL(&perm1);
 	array_init(&perm1);
-	ZEPHIR_INIT_VAR(&count);
+	ZVAL_NULL(&count);
 	array_init(&count);
 	_2 = n;
 	_1 = 0;
@@ -180,7 +171,7 @@ PHP_METHOD(Stub_Fannkuch, process)
 				ZEPHIR_INIT_NVAR(&_15$$14);
 				ZVAL_LONG(&_15$$14, maxFlipsCount);
 				zephir_array_fast_append(return_value, &_15$$14);
-				RETURN_MM();
+				return;
 			}
 			zephir_array_fetch_long(&perm0, &perm1, 0, PH_NOISY | PH_READONLY, "stub/fannkuch.zep", 75);
 			i = 0;
@@ -206,6 +197,5 @@ PHP_METHOD(Stub_Fannkuch, process)
 		}
 		permCount++;
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/fasta.zep.c b/ext/stub/fasta.zep.c
index 855678d958..9b74e43571 100644
--- a/ext/stub/fasta.zep.c
+++ b/ext/stub/fasta.zep.c
@@ -32,11 +32,9 @@ ZEPHIR_INIT_CLASS(Stub_Fasta)
 PHP_METHOD(Stub_Fasta, fastaRepeat)
 {
 	zval _2, _5;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, seqi, i = 0;
 	zval seq;
 	zval *n, n_sub, *seq_param = NULL, len, j, k, l, block, str, lines, _0, _1, _3, _4, _9, _10, _6$$3, _7$$3, _8$$3, _11$$6, _12$$7, _13$$7, _14$$7, _15$$7;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&n_sub);
 	ZVAL_UNDEF(&len);
@@ -67,30 +65,23 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 		Z_PARAM_ZVAL(n)
 		Z_PARAM_STR(seq)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &n, &seq_param);
 	zephir_get_strval(&seq, seq_param);
-
-
 	seqi = 0;
-	ZEPHIR_INIT_VAR(&len);
+	ZVAL_NULL(&len);
 	ZVAL_LONG(&len, zephir_fast_strlen_ev(&seq));
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_1, ((zephir_get_numberval(&len) * 60) + 1));
 	zephir_create_array(&_0, zephir_get_intval(&_1), 1);
 	zephir_get_arrval(&_2, &_0);
-	ZEPHIR_INIT_VAR(&str);
+	ZVAL_NULL(&str);
 	zephir_fast_join(&str, &seq, &_2);
-	ZEPHIR_INIT_VAR(&_3);
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_3);
 	mul_function(&_4, &len, &len);
 	zephir_create_array(&_3, zephir_get_intval(&_4), 1);
 	zephir_get_arrval(&_5, &_3);
 	ZEPHIR_CPY_WRT(&lines, &_5);
-	ZEPHIR_INIT_VAR(&j);
+	ZVAL_NULL(&j);
 	mul_function(&j, &len, &len);
 	i = zephir_get_numberval(&j);
 	while (1) {
@@ -108,12 +99,12 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 	ZEPHIR_INIT_NVAR(&j);
 	ZVAL_LONG(&j, 0);
 	ZVAL_DOUBLE(&_9, zephir_safe_div_zval_long(n, 60));
-	ZEPHIR_INIT_VAR(&l);
+	ZVAL_NULL(&l);
 	ZVAL_DOUBLE(&l, zephir_floor(&_9));
 	ZVAL_DOUBLE(&_10, zephir_safe_div_zval_long(&l, i));
-	ZEPHIR_INIT_VAR(&k);
+	ZVAL_NULL(&k);
 	ZVAL_DOUBLE(&k, zephir_floor(&_10));
-	ZEPHIR_INIT_VAR(&block);
+	ZVAL_NULL(&block);
 	zephir_fast_join_str(&block, SL("\n"), &lines);
 	while (1) {
 		if (!(ZEPHIR_LT(&j, &k))) {
@@ -140,25 +131,20 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 		zephir_array_fetch(&_12$$7, &lines, &k, PH_NOISY | PH_READONLY, "stub/fasta.zep", 43);
 		ZVAL_LONG(&_13$$7, 0);
 		ZVAL_DOUBLE(&_14$$7, zephir_safe_mod_zval_long(n, 60));
-		ZEPHIR_INIT_VAR(&_15$$7);
+		ZVAL_NULL(&_15$$7);
 		zephir_substr(&_15$$7, &_12$$7, 0 , zephir_get_intval(&_14$$7), 0);
 		zend_print_zval(&_15$$7, 0);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fasta, fastRandom)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Fasta, main)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *n, n_sub, alu, iub, homoSap, _1;
 	zval *this_ptr = getThis();
@@ -172,17 +158,11 @@ PHP_METHOD(Stub_Fasta, main)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SSSSSSS(&_0, "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG", "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA", "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT", "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA", "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG", "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC", "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA");
 	ZEPHIR_CPY_WRT(&alu, &_0);
-	ZEPHIR_INIT_VAR(&iub);
+	ZVAL_NULL(&iub);
 	zephir_create_array(&iub, 15, 0);
 	add_assoc_double_ex(&iub, SL("a"), 0.27);
 	add_assoc_double_ex(&iub, SL("c"), 0.12);
@@ -199,7 +179,7 @@ PHP_METHOD(Stub_Fasta, main)
 	add_assoc_double_ex(&iub, SL("V"), 0.02);
 	add_assoc_double_ex(&iub, SL("W"), 0.02);
 	add_assoc_double_ex(&iub, SL("Y"), 0.02);
-	ZEPHIR_INIT_VAR(&homoSap);
+	ZVAL_NULL(&homoSap);
 	zephir_create_array(&homoSap, 4, 0);
 	add_assoc_double_ex(&homoSap, SL("a"), 0.3029549426680);
 	add_assoc_double_ex(&homoSap, SL("c"), 0.1979883004921);
@@ -209,6 +189,5 @@ PHP_METHOD(Stub_Fasta, main)
 	ZVAL_LONG(&_1, (2 * zephir_get_numberval(n)));
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "fastarepeat", NULL, 0, &_1, &alu);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/fcall.zep.c b/ext/stub/fcall.zep.c
index c5bb93b079..18c48fa4b5 100644
--- a/ext/stub/fcall.zep.c
+++ b/ext/stub/fcall.zep.c
@@ -40,55 +40,39 @@ ZEPHIR_INIT_CLASS(Stub_Fcall)
 PHP_METHOD(Stub_Fcall, testCall1)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "h");
 	zephir_fast_strpos(return_value, &_0, &_1, 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testCall2)
 {
 	zval _0$$3, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	while (1) {
 		ZVAL_LONG(&_0$$3, 0);
 		ZVAL_LONG(&_1$$3, 100);
-		ZEPHIR_RETURN_CALL_FUNCTION("mt_rand", &_2, 33, &_0$$3, &_1$$3);
+		ZEPHIR_RETURN_CALL_FUNCTION("mt_rand", &_2, 34, &_0$$3, &_1$$3);
 		zephir_check_call_status();
-		RETURN_MM();
+		return;
 	}
 }
 
 PHP_METHOD(Stub_Fcall, testCall3)
 {
 	zval handle, handle2, buffer, _0, _1, _3$$4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL, *_4 = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&handle);
 	ZVAL_UNDEF(&handle2);
@@ -96,27 +80,22 @@ PHP_METHOD(Stub_Fcall, testCall3)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3$$4);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "inputfile.txt");
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "r");
-	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 34, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 35, &_0, &_1);
 	zephir_check_call_status();
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "outputfile.txt");
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 34, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 35, &_0, &_1);
 	zephir_check_call_status();
 	if (zephir_is_true(&handle)) {
 		while (1) {
 			ZVAL_LONG(&_3$$4, 4096);
-			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 35, &handle, &_3$$4);
+			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 36, &handle, &_3$$4);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_FALSE_IDENTICAL(&buffer)) {
 				break;
@@ -126,16 +105,13 @@ PHP_METHOD(Stub_Fcall, testCall3)
 		zephir_fclose(&handle);
 		zephir_fclose(&handle2);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, testCall4)
 {
 	zval handle, handle2, buffer, _0, _1, _3$$4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL, *_4 = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&handle);
 	ZVAL_UNDEF(&handle2);
@@ -143,27 +119,22 @@ PHP_METHOD(Stub_Fcall, testCall4)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3$$4);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "r");
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "inputfile.txt");
-	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 34, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 35, &_0, &_1);
 	zephir_check_call_status();
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "outputfile.txt");
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 34, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 35, &_0, &_1);
 	zephir_check_call_status();
 	if (zephir_is_true(&handle)) {
 		while (1) {
 			ZVAL_LONG(&_3$$4, 4096);
-			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 35, &handle, &_3$$4);
+			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 36, &handle, &_3$$4);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_FALSE_IDENTICAL(&buffer)) {
 				break;
@@ -173,15 +144,12 @@ PHP_METHOD(Stub_Fcall, testCall4)
 		zephir_fclose(&handle);
 		zephir_fclose(&handle2);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, testCall5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -189,56 +157,31 @@ PHP_METHOD(Stub_Fcall, testCall5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 22, a, b);
+	ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 23, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testCall6)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 36);
+	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 37);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testCall7)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 37);
+	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 38);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, zvalFcallWith1Parameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *callback, callback_sub, *param1 = NULL, param1_sub, __$null;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&callback_sub);
 	ZVAL_UNDEF(&param1_sub);
@@ -249,28 +192,19 @@ PHP_METHOD(Stub_Fcall, zvalFcallWith1Parameter)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param1)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &callback, &param1);
 	if (!param1) {
 		param1 = &param1_sub;
 		param1 = &__$null;
 	}
-
-
 	ZEPHIR_CALL_ZVAL_FUNCTION(NULL, callback, NULL, 0, param1);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, testCall8)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, x;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -279,14 +213,8 @@ PHP_METHOD(Stub_Fcall, testCall8)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	ZEPHIR_CALL_FUNCTION(&x, "str_repeat", NULL, 22, a, b);
+	ZEPHIR_CALL_FUNCTION(&x, "str_repeat", NULL, 23, a, b);
 	zephir_check_call_status();
 	RETURN_CCTOR(&x);
 }
@@ -294,68 +222,49 @@ PHP_METHOD(Stub_Fcall, testCall8)
 PHP_METHOD(Stub_Fcall, testCall1FromVar)
 {
 	zval funcName, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&funcName);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&funcName);
+	ZVAL_NULL(&funcName);
 	ZVAL_STRING(&funcName, "strpos");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "l");
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(&funcName, NULL, 0, &_0, &_1);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testStrtokFalse)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_Fcall, testStrtokVarBySlash)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *value, value_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "/");
-	ZEPHIR_RETURN_CALL_FUNCTION("strtok", NULL, 38, value, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("strtok", NULL, 39, value, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testFunctionGetArgs)
 {
 	zval *param1, param1_sub, *param2, param2_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
 	ZVAL_UNDEF(&param2_sub);
@@ -363,20 +272,13 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArgs)
 		Z_PARAM_ZVAL(param1)
 		Z_PARAM_ZVAL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &param1, &param2);
-
-
 	zephir_get_args(return_value);
 	return;
 }
 
 PHP_METHOD(Stub_Fcall, testFunctionGetArgsAllExtra)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_get_args(return_value);
 	return;
@@ -384,9 +286,6 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArgsAllExtra)
 
 PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgsAllExtra)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_get_args(return_value);
 	return;
@@ -394,9 +293,7 @@ PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgsAllExtra)
 
 PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param1, param1_sub, *param2, param2_sub, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
 	ZVAL_UNDEF(&param2_sub);
@@ -407,15 +304,9 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 		Z_PARAM_ZVAL(param1)
 		Z_PARAM_ZVAL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &param1, &param2);
-
-
 	zephir_create_array(return_value, 2, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_1, 0);
 	zephir_get_arg(&_0, zephir_get_intval(&_1));
 	zephir_array_fast_append(return_value, &_0);
@@ -423,25 +314,18 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 	ZVAL_LONG(&_2, 1);
 	zephir_get_arg(&_0, zephir_get_intval(&_2));
 	zephir_array_fast_append(return_value, &_0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testFunctionGetArgAllExtra)
 {
 	zval _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_create_array(return_value, 2, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_1, 0);
 	zephir_get_arg(&_0, zephir_get_intval(&_1));
 	zephir_array_fast_append(return_value, &_0);
@@ -449,25 +333,18 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArgAllExtra)
 	ZVAL_LONG(&_2, 1);
 	zephir_get_arg(&_0, zephir_get_intval(&_2));
 	zephir_array_fast_append(return_value, &_0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgAllExtra)
 {
 	zval _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_create_array(return_value, 2, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_1, 0);
 	zephir_get_arg(&_0, zephir_get_intval(&_1));
 	zephir_array_fast_append(return_value, &_0);
@@ -475,30 +352,23 @@ PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgAllExtra)
 	ZVAL_LONG(&_2, 1);
 	zephir_get_arg(&_0, zephir_get_intval(&_2));
 	zephir_array_fast_append(return_value, &_0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Fcall, testArrayFill)
 {
 	zval v1, v2, _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_3 = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v1);
 	ZVAL_UNDEF(&v2);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 5);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "?");
 	ZEPHIR_CALL_FUNCTION(&v1, "array_fill", &_3, 5, &_0, &_1, &_2);
 	zephir_check_call_status();
@@ -511,11 +381,10 @@ PHP_METHOD(Stub_Fcall, testArrayFill)
 	zephir_create_array(return_value, 2, 0);
 	zephir_array_fast_append(return_value, &v1);
 	zephir_array_fast_append(return_value, &v2);
-	RETURN_MM();
+	return;
 }
 
 PHP_FUNCTION(g_stub_zephir_global_method_test) {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str, str_sub, _0;
 		ZVAL_UNDEF(&str_sub);
@@ -523,23 +392,17 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	object_init_ex(&_0, stub_fcall_ce);
 	if (zephir_has_constructor(&_0)) {
 		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "teststrtokvarbyslash", NULL, 39, str);
+	ZEPHIR_RETURN_CALL_METHOD(&_0, "teststrtokvarbyslash", NULL, 40, str);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_FUNCTION(g_stub_zephir_global_method_with_type_casting) {
@@ -548,17 +411,12 @@ PHP_FUNCTION(g_stub_zephir_global_method_with_type_casting) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &variable);
-
-
 	RETVAL_ZVAL(variable, 1, 0);
 	return;
 }
 
 PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str, str_sub, _0, _1;
 		ZVAL_UNDEF(&str_sub);
@@ -567,14 +425,8 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	object_init_ex(&_0, stub_fcall_ce);
 	if (zephir_has_constructor(&_0)) {
 		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
@@ -582,9 +434,9 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 	}
 
 	ZVAL_LONG(&_1, 5);
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "testcall5", NULL, 40, str, &_1);
+	ZEPHIR_RETURN_CALL_METHOD(&_0, "testcall5", NULL, 41, str, &_1);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_FUNCTION(f_Stub_test_call_relative_object_hint) {
@@ -593,11 +445,7 @@ PHP_FUNCTION(f_Stub_test_call_relative_object_hint) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(1);
 }
 
@@ -607,11 +455,7 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_with_type_casting) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &variable);
-
-
 	RETVAL_ZVAL(variable, 1, 0);
 	return;
 }
@@ -622,11 +466,7 @@ PHP_FUNCTION(f_Stub_test_call_object_hint) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(1);
 }
 
diff --git a/ext/stub/fetchtest.zep.c b/ext/stub/fetchtest.zep.c
index 6f7ea34b93..0d2525ac82 100644
--- a/ext/stub/fetchtest.zep.c
+++ b/ext/stub/fetchtest.zep.c
@@ -38,29 +38,20 @@ PHP_METHOD(Stub_FetchTest, setValues)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(values)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &values);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("values"), values);
 	RETURN_THISW();
 }
 
 PHP_METHOD(Stub_FetchTest, getValues)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "values");
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, *b, b_sub, c;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -69,22 +60,13 @@ PHP_METHOD(Stub_FetchTest, testFetchArray1)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a = NULL, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -92,24 +74,16 @@ PHP_METHOD(Stub_FetchTest, testFetchArray2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_SEPARATE_PARAM(a);
-
-
 	ZEPHIR_OBS_NVAR(a);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(a, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long b;
 	zval *a, a_sub, *b_param = NULL, c;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&c);
@@ -117,49 +91,30 @@ PHP_METHOD(Stub_FetchTest, testFetchArray3)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
-	b = zephir_get_intval(b_param);
-
-
-	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_long_fetch(&c, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long b;
 	zval *a = NULL, a_sub, *b_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	ZEPHIR_SEPARATE_PARAM(a);
-	b = zephir_get_intval(b_param);
-
-
 	ZEPHIR_OBS_NVAR(a);
 	RETURN_MM_BOOL(zephir_array_isset_long_fetch(a, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval b;
 	zval *a, a_sub, *b_param = NULL, c;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&c);
@@ -168,24 +123,15 @@ PHP_METHOD(Stub_FetchTest, testFetchArray5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	zephir_get_strval(&b, b_param);
-
-
-	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, &b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray6)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval b;
 	zval *a = NULL, a_sub, *b_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b);
@@ -193,24 +139,16 @@ PHP_METHOD(Stub_FetchTest, testFetchArray6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	ZEPHIR_SEPARATE_PARAM(a);
 	zephir_get_strval(&b, b_param);
-
-
 	ZEPHIR_OBS_NVAR(a);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(a, a, &b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchObject1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, *b, b_sub, c;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -219,22 +157,13 @@ PHP_METHOD(Stub_FetchTest, testFetchObject1)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_fetch_property_zval(&c, a, b, PH_SILENT_CC));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchObject2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a = NULL, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -242,23 +171,15 @@ PHP_METHOD(Stub_FetchTest, testFetchObject2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_SEPARATE_PARAM(a);
-
-
 	ZEPHIR_OBS_NVAR(a);
 	RETURN_MM_BOOL(zephir_fetch_property_zval(a, a, b, PH_SILENT_CC));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchPost)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *b, b_sub, _POST, c;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&_POST);
@@ -266,15 +187,8 @@ PHP_METHOD(Stub_FetchTest, testFetchPost)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &b);
-
-
-	zephir_memory_observe(&c);
 	if (!(zephir_array_isset_fetch(&c, &_POST, b, 0))) {
 		RETURN_MM_BOOL(0);
 	}
@@ -292,12 +206,8 @@ PHP_METHOD(Stub_FetchTest, hasValue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params_without_memory_grow(1, 0, &name);
-
-
 	if (zephir_array_isset(&_POST, name)) {
 		RETURN_BOOL(1);
 	} else {
@@ -311,7 +221,6 @@ PHP_METHOD(Stub_FetchTest, hasValue)
 
 PHP_METHOD(Stub_FetchTest, getValue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name, name_sub, _POST, value, _0$$3;
 	zval *this_ptr = getThis();
 
@@ -322,15 +231,8 @@ PHP_METHOD(Stub_FetchTest, getValue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &name);
-
-
-	zephir_memory_observe(&value);
 	if (!(zephir_array_isset_fetch(&value, &_POST, name, 0))) {
 		ZEPHIR_OBS_NVAR(&value);
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("values"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/stub/fibonnaci.zep.c b/ext/stub/fibonnaci.zep.c
index ee86c4b892..473876aca0 100644
--- a/ext/stub/fibonnaci.zep.c
+++ b/ext/stub/fibonnaci.zep.c
@@ -29,11 +29,6 @@ ZEPHIR_INIT_CLASS(Stub_Fibonnaci)
 PHP_METHOD(Stub_Fibonnaci, fibInt)
 {
 	zend_long x = 0, y = 0, n = 0, z = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	z = 0;
 	x = 1;
 	y = 2;
@@ -52,22 +47,17 @@ PHP_METHOD(Stub_Fibonnaci, fibInt)
 PHP_METHOD(Stub_Fibonnaci, fibDouble)
 {
 	double x = 0, y = 0, n = 0, z = 0;
-	zval *this_ptr = getThis();
-
-
-
-
-	z = 0.0;
-	x = 1.0;
-	y = 2.0;
-	n = 10.0;
+	z =  (0.0);
+	x =  (1.0);
+	y =  (2.0);
+	n =  (10.0);
 	while (1) {
 		if (!(z < n)) {
 			break;
 		}
-		z = (x + y);
-		x = y;
-		y = z;
+		z =  ((x + y));
+		x =  y;
+		y =  z;
 	}
 	RETURN_DOUBLE(z);
 }
@@ -76,22 +66,15 @@ PHP_METHOD(Stub_Fibonnaci, fibArray)
 {
 	zend_long i = 0, n = 0, k = 0, j = 0;
 	zval fib, a, b, c, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&fib);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&fib);
+	ZVAL_NULL(&fib);
 	zephir_create_array(&fib, 2, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(&fib, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -121,22 +104,15 @@ PHP_METHOD(Stub_Fibonnaci, fibArray2)
 {
 	zend_long i = 0, n = 0;
 	zval fib, _0, _1$$3, _2$$3, _3$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&fib);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&fib);
+	ZVAL_NULL(&fib);
 	zephir_create_array(&fib, 2, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(&fib, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -160,7 +136,6 @@ PHP_METHOD(Stub_Fibonnaci, fibArray2)
 
 PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_2 = NULL;
 	zval *n_param = NULL, _0$$6, _1$$6, _3$$6;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS;
@@ -172,14 +147,7 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
-	n = zephir_get_intval(n_param);
-
-
 	if (n == 0) {
 		RETURN_MM_LONG(0);
 	} else {
@@ -187,20 +155,19 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 			RETURN_MM_LONG(1);
 		} else {
 			ZVAL_LONG(&_1$$6, (n - 1));
-			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccirecursive", &_2, 41, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccirecursive", &_2, 42, &_1$$6);
 			zephir_check_call_status();
 			ZVAL_LONG(&_1$$6, (n - 2));
-			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccirecursive", &_2, 41, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccirecursive", &_2, 42, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
-			RETURN_MM();
+			return;
 		}
 	}
 }
 
 PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_2 = NULL;
 	zval *n_param = NULL, _0$$6, _1$$6, _3$$6;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS;
@@ -212,14 +179,7 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
-	n = zephir_get_intval(n_param);
-
-
 	if (n == 0) {
 		RETURN_MM_LONG(0);
 	} else {
@@ -227,13 +187,13 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 			RETURN_MM_LONG(1);
 		} else {
 			ZVAL_LONG(&_1$$6, (n - 1));
-			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccifinalrecursive", &_2, 42, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccifinalrecursive", &_2, 43, &_1$$6);
 			zephir_check_call_status();
 			ZVAL_LONG(&_1$$6, (n - 2));
-			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccifinalrecursive", &_2, 42, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccifinalrecursive", &_2, 43, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
-			RETURN_MM();
+			return;
 		}
 	}
 }
diff --git a/ext/stub/flow.zep.c b/ext/stub/flow.zep.c
index 8b13641e07..8b383577aa 100644
--- a/ext/stub/flow.zep.c
+++ b/ext/stub/flow.zep.c
@@ -35,11 +35,6 @@ ZEPHIR_INIT_CLASS(Stub_Flow)
 PHP_METHOD(Stub_Flow, testIf1)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	if (a) {
 		RETURN_LONG(1);
@@ -50,11 +45,6 @@ PHP_METHOD(Stub_Flow, testIf1)
 PHP_METHOD(Stub_Flow, testIf2)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	if (a) {
 		RETURN_LONG(1);
@@ -65,11 +55,6 @@ PHP_METHOD(Stub_Flow, testIf2)
 PHP_METHOD(Stub_Flow, testIf3)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (1);
 	if (a) {
 		RETURN_LONG(1);
@@ -80,11 +65,6 @@ PHP_METHOD(Stub_Flow, testIf3)
 PHP_METHOD(Stub_Flow, testIf4)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (0);
 	if (a) {
 		RETURN_LONG(1);
@@ -95,11 +75,6 @@ PHP_METHOD(Stub_Flow, testIf4)
 PHP_METHOD(Stub_Flow, testIf5)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((1) ? 1 : 0);
 	if (a) {
 		RETURN_LONG(1);
@@ -110,11 +85,6 @@ PHP_METHOD(Stub_Flow, testIf5)
 PHP_METHOD(Stub_Flow, testIf6)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = ((0) ? 1 : 0);
 	if (a) {
 		RETURN_LONG(1);
@@ -125,11 +95,6 @@ PHP_METHOD(Stub_Flow, testIf6)
 PHP_METHOD(Stub_Flow, testIf7)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	if (a) {
 		RETURN_LONG(1);
@@ -141,11 +106,6 @@ PHP_METHOD(Stub_Flow, testIf7)
 PHP_METHOD(Stub_Flow, testIf8)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 0;
 	if (a) {
 		RETURN_LONG(1);
@@ -159,11 +119,6 @@ PHP_METHOD(Stub_Flow, testIf9)
 	zend_bool c = 0;
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	if (a) {
 		b = (double) (1);
@@ -182,11 +137,6 @@ PHP_METHOD(Stub_Flow, testIf10)
 	zend_bool c = 0;
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	if (a) {
 		b = (double) (1);
@@ -210,11 +160,6 @@ PHP_METHOD(Stub_Flow, testIf12)
 	zend_bool c = 0;
 	double b = 0;
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	if (a) {
 		b = (double) (1);
@@ -236,11 +181,6 @@ PHP_METHOD(Stub_Flow, testIf12)
 PHP_METHOD(Stub_Flow, testIf13)
 {
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	if ((a + b)) {
@@ -252,11 +192,6 @@ PHP_METHOD(Stub_Flow, testIf13)
 PHP_METHOD(Stub_Flow, testIf14)
 {
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	if ((a + b)) {
@@ -268,11 +203,6 @@ PHP_METHOD(Stub_Flow, testIf14)
 PHP_METHOD(Stub_Flow, testIf15)
 {
 	zend_long a = 0, b = 0, c = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	b = 2;
 	c = 3;
@@ -285,17 +215,12 @@ PHP_METHOD(Stub_Flow, testIf15)
 PHP_METHOD(Stub_Flow, testIf16)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	if (ZEPHIR_IS_EMPTY(a)) {
 		RETURN_BOOL(1);
 	}
@@ -305,17 +230,12 @@ PHP_METHOD(Stub_Flow, testIf16)
 PHP_METHOD(Stub_Flow, testIf17)
 {
 	zval *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &b);
-
-
 	if (Z_TYPE_P(b) != IS_NULL) {
 		RETURN_BOOL(1);
 	}
@@ -325,11 +245,6 @@ PHP_METHOD(Stub_Flow, testIf17)
 PHP_METHOD(Stub_Flow, testLoop1)
 {
 	zend_bool a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	while (1) {
 		if (a) {
@@ -342,11 +257,6 @@ PHP_METHOD(Stub_Flow, testLoop1)
 PHP_METHOD(Stub_Flow, testLoop2)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	while (1) {
 		a = (a + 1);
@@ -360,11 +270,6 @@ PHP_METHOD(Stub_Flow, testLoop2)
 PHP_METHOD(Stub_Flow, testLoop3)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	while (1) {
 		a = (a + 1);
@@ -382,11 +287,6 @@ PHP_METHOD(Stub_Flow, testLoop3)
 PHP_METHOD(Stub_Flow, testLoop4)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	while (1) {
 		a = (a + 1);
@@ -404,11 +304,6 @@ PHP_METHOD(Stub_Flow, testLoop4)
 PHP_METHOD(Stub_Flow, testWhile1)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	while (1) {
 		if (!(a)) {
@@ -422,11 +317,6 @@ PHP_METHOD(Stub_Flow, testWhile1)
 PHP_METHOD(Stub_Flow, testWhile2)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	while (1) {
 		if (!(a)) {
@@ -441,11 +331,6 @@ PHP_METHOD(Stub_Flow, testWhile3)
 {
 	double c = 0;
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	b = 0;
 	while (1) {
@@ -469,11 +354,6 @@ PHP_METHOD(Stub_Flow, testWhile4)
 {
 	double c = 0;
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	b = 0;
 	while (1) {
@@ -496,11 +376,6 @@ PHP_METHOD(Stub_Flow, testWhile4)
 PHP_METHOD(Stub_Flow, testWhile5)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	while (1) {
 		if (!(a)) {
@@ -514,11 +389,6 @@ PHP_METHOD(Stub_Flow, testWhile5)
 PHP_METHOD(Stub_Flow, testWhile6)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	while (1) {
 		if (!(a)) {
@@ -532,11 +402,6 @@ PHP_METHOD(Stub_Flow, testWhile6)
 PHP_METHOD(Stub_Flow, testWhile7)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (5);
 	while (1) {
 		if (!(a)) {
@@ -550,11 +415,6 @@ PHP_METHOD(Stub_Flow, testWhile7)
 PHP_METHOD(Stub_Flow, testWhile8)
 {
 	double a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = (double) (5);
 	while (1) {
 		if (!(a)) {
@@ -569,11 +429,6 @@ PHP_METHOD(Stub_Flow, testWhile9)
 {
 	double c = 0;
 	zend_long a = 0, b = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	b = 0;
 	while (1) {
@@ -597,22 +452,14 @@ PHP_METHOD(Stub_Flow, testWhile10)
 {
 	double c = 0;
 	zend_long b = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
-
-
 	b = 0;
 	while (1) {
 		if (!(zephir_is_true(a))) {
@@ -636,9 +483,7 @@ PHP_METHOD(Stub_Flow, testWhile11)
 {
 	double c = 0;
 	zend_long b = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, *d, d_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&d_sub);
@@ -646,14 +491,8 @@ PHP_METHOD(Stub_Flow, testWhile11)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &d);
 	ZEPHIR_SEPARATE_PARAM(a);
-
-
 	b = 0;
 	while (1) {
 		if (!(zephir_is_true(a))) {
@@ -677,17 +516,10 @@ PHP_METHOD(Stub_Flow, testWhile12)
 {
 	zval _0;
 	zval b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "+", "10");
 	ZEPHIR_CPY_WRT(&b, &_0);
 	while (1) {
@@ -705,18 +537,11 @@ PHP_METHOD(Stub_Flow, testWhile13)
 	zval _0;
 	zend_long a;
 	zval b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 5;
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "+", "10");
 	ZEPHIR_CPY_WRT(&b, &_0);
 	while (1) {
@@ -731,9 +556,6 @@ PHP_METHOD(Stub_Flow, testWhile13)
 
 PHP_METHOD(Stub_Flow, testDoWhile1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	do {
 	} while (1);
@@ -741,11 +563,9 @@ PHP_METHOD(Stub_Flow, testDoWhile1)
 
 PHP_METHOD(Stub_Flow, testWhileNextTest)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL, *_3 = NULL;
 	zval *variable, variable_sub, returnValue, _0, _2$$3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&variable_sub);
 	ZVAL_UNDEF(&returnValue);
@@ -754,24 +574,18 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &variable);
-
-
-	ZEPHIR_INIT_VAR(&returnValue);
+	ZVAL_NULL(&returnValue);
 	array_init(&returnValue);
 	while (1) {
 		ZEPHIR_MAKE_REF(variable);
-		ZEPHIR_CALL_FUNCTION(&_0, "next", &_1, 43, variable);
+		ZEPHIR_CALL_FUNCTION(&_0, "next", &_1, 44, variable);
 		ZEPHIR_UNREF(variable);
 		zephir_check_call_status();
 		if (!(zephir_is_true(&_0))) {
 			break;
 		}
-		ZEPHIR_CALL_FUNCTION(&_2$$3, "current", &_3, 44, variable);
+		ZEPHIR_CALL_FUNCTION(&_2$$3, "current", &_3, 45, variable);
 		zephir_check_call_status();
 		zephir_array_append(&returnValue, &_2$$3, PH_SEPARATE, "stub/flow.zep", 420);
 	}
@@ -780,11 +594,9 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 
 PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL, *_3 = NULL;
 	zval *variable, variable_sub, returnValue, _2, _0$$3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&variable_sub);
 	ZVAL_UNDEF(&returnValue);
@@ -793,21 +605,15 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &variable);
-
-
-	ZEPHIR_INIT_VAR(&returnValue);
+	ZVAL_NULL(&returnValue);
 	array_init(&returnValue);
 	do {
-		ZEPHIR_CALL_FUNCTION(&_0$$3, "current", &_1, 44, variable);
+		ZEPHIR_CALL_FUNCTION(&_0$$3, "current", &_1, 45, variable);
 		zephir_check_call_status();
 		zephir_array_append(&returnValue, &_0$$3, PH_SEPARATE, "stub/flow.zep", 430);
 		ZEPHIR_MAKE_REF(variable);
-		ZEPHIR_CALL_FUNCTION(&_2, "next", &_3, 43, variable);
+		ZEPHIR_CALL_FUNCTION(&_2, "next", &_3, 44, variable);
 		ZEPHIR_UNREF(variable);
 		zephir_check_call_status();
 	} while (zephir_is_true(&_2));
@@ -817,23 +623,16 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 PHP_METHOD(Stub_Flow, testFor1)
 {
 	zval v, b, _0, *_1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, c = 0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	c = 0;
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	zephir_create_array(&b, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&b, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -879,24 +678,17 @@ PHP_METHOD(Stub_Flow, testFor2)
 	zend_ulong _3;
 	double c = 0;
 	zval v, k, b, _0, *_1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	c = (double) (0);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	zephir_create_array(&b, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&b, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -948,25 +740,18 @@ PHP_METHOD(Stub_Flow, testFor2)
 PHP_METHOD(Stub_Flow, testFor3)
 {
 	zval v, b, c, _0, *_1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	array_init(&c);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	zephir_create_array(&b, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&b, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1011,17 +796,10 @@ PHP_METHOD(Stub_Flow, testFor4)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = 1;
@@ -1048,11 +826,6 @@ PHP_METHOD(Stub_Flow, testFor5)
 {
 	zend_bool _0;
 	zend_long a = 0, b = 0, _1, _2;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	_2 = 10;
 	_1 = 1;
@@ -1079,17 +852,10 @@ PHP_METHOD(Stub_Flow, testFor6)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = _2;
@@ -1116,11 +882,6 @@ PHP_METHOD(Stub_Flow, testFor7)
 {
 	zend_bool _0;
 	zend_long a = 0, b = 0, _1, _2;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	_2 = 10;
 	_1 = _2;
@@ -1146,11 +907,6 @@ PHP_METHOD(Stub_Flow, testFor8)
 {
 	zend_bool _0;
 	zend_long a = 0, b = 0, c = 0, d = 0, _1, _2;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	c = 1;
 	d = 10;
@@ -1178,11 +934,6 @@ PHP_METHOD(Stub_Flow, testFor9)
 {
 	zend_bool _0;
 	zend_long a = 0, b = 0, c = 0, d = 0, _1, _2;
-	zval *this_ptr = getThis();
-
-
-
-
 	b = 0;
 	c = 1;
 	d = 10;
@@ -1211,17 +962,10 @@ PHP_METHOD(Stub_Flow, testFor10)
 	zend_bool _0;
 	zend_long c = 0, d = 0, _1, _2;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	c = 1;
 	d = 10;
@@ -1251,16 +995,9 @@ PHP_METHOD(Stub_Flow, testFor11)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	_2 = 'z';
 	_1 = 'a';
 	_0 = 0;
@@ -1286,16 +1023,9 @@ PHP_METHOD(Stub_Flow, testFor12)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	_2 = 'z';
 	_1 = _2;
 	_0 = 0;
@@ -1321,16 +1051,9 @@ PHP_METHOD(Stub_Flow, testFor13)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	_2 = '9';
 	_1 = '0';
 	_0 = 0;
@@ -1356,16 +1079,9 @@ PHP_METHOD(Stub_Flow, testFor14)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	_2 = '9';
 	_1 = _2;
 	_0 = 0;
@@ -1391,19 +1107,12 @@ PHP_METHOD(Stub_Flow, testFor15)
 	zend_bool _0;
 	zval *c_param = NULL, *d_param = NULL;
 	zend_long c, d, a = 0, b = 0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(c)
 		Z_PARAM_LONG(d)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &c_param, &d_param);
-	c = zephir_get_intval(c_param);
-	d = zephir_get_intval(d_param);
-
-
 	b = 0;
 	_2 = d;
 	_1 = _2;
@@ -1431,18 +1140,11 @@ PHP_METHOD(Stub_Flow, testFor16)
 	zend_bool _1;
 	long _0;
 	zval a, b, c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	array_init(&c);
 	_3 = 10;
 	_2 = 1;
@@ -1475,18 +1177,11 @@ PHP_METHOD(Stub_Flow, testFor17)
 	zend_bool _1;
 	long _0;
 	zval a, b, c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	array_init(&c);
 	_3 = 10;
 	_2 = _3;
@@ -1519,17 +1214,10 @@ PHP_METHOD(Stub_Flow, testFor18)
 	long _0;
 	zval c, _4$$3;
 	zend_long a = 0, b = 0, _2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_4$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	array_init(&c);
 	_3 = 10;
 	_2 = 1;
@@ -1561,17 +1249,10 @@ PHP_METHOD(Stub_Flow, testFor19)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = 1;
@@ -1599,17 +1280,10 @@ PHP_METHOD(Stub_Flow, testFor20)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = 1;
@@ -1637,17 +1311,10 @@ PHP_METHOD(Stub_Flow, testFor21)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 1;
 	_1 = 10;
@@ -1675,17 +1342,10 @@ PHP_METHOD(Stub_Flow, testFor22)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 1;
 	_1 = _2;
@@ -1714,17 +1374,10 @@ PHP_METHOD(Stub_Flow, testFor23)
 	zend_bool _0;
 	zval b;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	_2 = 'z';
 	_1 = _2;
 	_0 = 0;
@@ -1752,24 +1405,17 @@ PHP_METHOD(Stub_Flow, testFor24)
 	zval _0;
 	zval b;
 	zval a, _1, *_2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&b);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 'a');
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1815,20 +1461,13 @@ PHP_METHOD(Stub_Flow, testFor30)
 	zend_long v = 0;
 	zval b;
 	zval a, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "hello");
 	for (_0 = 0; _0 < Z_STRLEN_P(&b); _0++) {
 		v = ZEPHIR_STRING_OFFSET(&b, _0);
@@ -1845,20 +1484,13 @@ PHP_METHOD(Stub_Flow, testFor31)
 	zend_long k = 0, v = 0;
 	zval b;
 	zval a, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "hello");
 	for (_0 = 0; _0 < Z_STRLEN_P(&b); _0++) {
 		k = _0; 
@@ -1873,10 +1505,8 @@ PHP_METHOD(Stub_Flow, testFor31)
 PHP_METHOD(Stub_Flow, testFor32)
 {
 	long sum;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *e, e_sub, v, *_0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e_sub);
 	ZVAL_UNDEF(&v);
@@ -1884,13 +1514,7 @@ PHP_METHOD(Stub_Flow, testFor32)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(e)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &e);
-
-
 	sum = 0;
 	zephir_is_iterable(e, 0, "stub/flow.zep", 703);
 	if (Z_TYPE_P(e) == IS_ARRAY) {
@@ -1923,9 +1547,7 @@ PHP_METHOD(Stub_Flow, testFor32)
 PHP_METHOD(Stub_Flow, testFor33)
 {
 	zend_object_iterator *_0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *e, e_sub, v, result;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e_sub);
 	ZVAL_UNDEF(&v);
@@ -1933,14 +1555,8 @@ PHP_METHOD(Stub_Flow, testFor33)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(e, zend_ce_iterator)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &e);
-
-
-	ZEPHIR_INIT_VAR(&result);
+	ZVAL_NULL(&result);
 	array_init(&result);
 	_0 = zephir_get_iterator(e);
 	_0->funcs->rewind(_0);
@@ -1957,9 +1573,7 @@ PHP_METHOD(Stub_Flow, testFor33)
 PHP_METHOD(Stub_Flow, testFor34)
 {
 	zend_object_iterator *_0$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *e = NULL, e_sub, __$null, v, result;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e_sub);
 	ZVAL_NULL(&__$null);
@@ -1970,18 +1584,12 @@ PHP_METHOD(Stub_Flow, testFor34)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(e, zend_ce_iterator)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &e);
 	if (!e) {
 		e = &e_sub;
 		e = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&result);
+	ZVAL_NULL(&result);
 	array_init(&result);
 	if (Z_TYPE_P(e) == IS_OBJECT) {
 		_0$$3 = zephir_get_iterator(e);
@@ -1995,23 +1603,17 @@ PHP_METHOD(Stub_Flow, testFor34)
 		zend_iterator_dtor(_0$$3);
 		RETURN_CCTOR(&result);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow, testFor35Aux)
 {
 	zval *hello, hello_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&hello_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(hello)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &hello);
-
-
 	RETURN_BOOL(0);
 }
 
@@ -2019,18 +1621,12 @@ PHP_METHOD(Stub_Flow, testFor35)
 {
 	zend_bool _0;
 	zval i, _3$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_3$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	_2 = 100;
 	_1 = 1;
 	_0 = 0;
@@ -2058,17 +1654,12 @@ PHP_METHOD(Stub_Flow, testFor35)
 PHP_METHOD(Stub_Flow, testFor36Aux)
 {
 	zval *hello, hello_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&hello_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(hello)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &hello);
-
-
 	zephir_create_array(return_value, 1, 0);
 	zephir_array_fast_append(return_value, hello);
 	return;
@@ -2078,18 +1669,12 @@ PHP_METHOD(Stub_Flow, testFor36)
 {
 	zend_bool _0;
 	zval i, _3$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_3$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	_2 = 100;
 	_1 = 1;
 	_0 = 0;
@@ -2118,11 +1703,6 @@ PHP_METHOD(Stub_Flow, testFor37)
 {
 	zend_bool _0;
 	zend_long i, _1, _2;
-	zval *this_ptr = getThis();
-
-
-
-
 	i = 0;
 	_2 = 10;
 	_1 = 1;
@@ -2150,15 +1730,8 @@ PHP_METHOD(Stub_Flow, testFor38)
 	long _0;
 	zval v;
 	zend_long i, _2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	i = 0;
 	_3 = 10;
 	_2 = 1;
@@ -2190,17 +1763,9 @@ PHP_METHOD(Stub_Flow, testFor39)
 	long _1;
 	char _0;
 	zend_long i;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	i = 0;
-	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "hello");
 	for (_1 = 0; _1 < Z_STRLEN_P(&_2); _1++) {
 		_0 = ZEPHIR_STRING_OFFSET(&_2, _1);
@@ -2214,18 +1779,11 @@ PHP_METHOD(Stub_Flow, testFor40)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b, _3$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_3$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10000000;
 	_1 = 1;
@@ -2257,19 +1815,12 @@ PHP_METHOD(Stub_Flow, testUnrechable1)
 	zend_bool c;
 	double b;
 	zend_long a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&d);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 0;
-	b = 0.0;
+	b =  (0.0);
 	c = 0;
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	ZVAL_STRING(&d, "");
 	e = '\0';
 	if (a) {
@@ -2287,7 +1838,6 @@ PHP_METHOD(Stub_Flow, testUnrechable1)
 	if (e) {
 		php_printf("%s", "hello true");
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow, testUnrechable2)
@@ -2297,19 +1847,12 @@ PHP_METHOD(Stub_Flow, testUnrechable2)
 	zend_bool c;
 	double b;
 	zend_long a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&d);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
-	b = 1.0;
+	b =  (1.0);
 	c = 1;
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	ZVAL_STRING(&d, "hello");
 	e = 'A';
 	if (a) {
@@ -2337,17 +1880,11 @@ PHP_METHOD(Stub_Flow, testUnrechable2)
 	} else {
 		php_printf("%s", "hello false");
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow, testUnrechable3)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	if (3 < 1) {
 		if (1 > 2) {
 			a = 0;
diff --git a/ext/stub/flow/switchflow.zep.c b/ext/stub/flow/switchflow.zep.c
index 72e40a410c..e86d9fc4fe 100644
--- a/ext/stub/flow/switchflow.zep.c
+++ b/ext/stub/flow/switchflow.zep.c
@@ -28,11 +28,6 @@ ZEPHIR_INIT_CLASS(Stub_Flow_SwitchFlow)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch1)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 10;
 	RETURN_LONG(a);
 }
@@ -40,11 +35,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch1)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch2)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 10;
 	do {
 		if (a == 10) {
@@ -58,11 +48,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch2)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch3)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 10;
 	do {
 		if (a == 5) {
@@ -76,11 +61,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch3)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch4)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 10;
 	do {
 		if (a == 5) {
@@ -95,11 +75,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch4)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch5)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 10;
 	do {
 		if (a == 10) {
@@ -114,11 +89,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch5)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch6)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 10;
 	do {
 		if (a == 10 || a == 4) {
@@ -132,11 +102,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch6)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch7)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 4;
 	do {
 		if (a == 10 || a == 4) {
@@ -150,11 +115,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch7)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch8)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	do {
 		if (a == 10 || a == 4) {
@@ -168,11 +128,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch8)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch9)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	do {
 		if (a == 3 || a == 4) {
@@ -189,11 +144,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch9)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch10)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 5;
 	do {
 		if (a == 3 || a == 4) {
@@ -210,11 +160,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch10)
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch11)
 {
 	zend_long a = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
 	do {
 		if (a == 2) {
@@ -229,7 +174,6 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch12)
 {
 	zend_bool _0, _1, _2;
 	zval *var1, var1_sub, *var2, var2_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&var1_sub);
 	ZVAL_UNDEF(&var2_sub);
@@ -237,11 +181,7 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch12)
 		Z_PARAM_ZVAL(var1)
 		Z_PARAM_ZVAL(var2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &var1, &var2);
-
-
 	do {
 		_0 = 1;
 		_1 = ZEPHIR_GT(var1, var2);
@@ -265,11 +205,9 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch12)
 
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0, _1, _2;
 	long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
@@ -277,17 +215,10 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_FUNCTION(&_2, "mt_rand", NULL, 33, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "mt_rand", NULL, 34, &_0, &_1);
 	zephir_check_call_status();
 	do {
 		if (ZEPHIR_IS_LONG(&_2, 100)) {
@@ -296,14 +227,11 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 		RETURN_MM_LONG(0);
 	} while(0);
 
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch14)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *result_type = NULL, result_type_sub, ret, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&result_type_sub);
 	ZVAL_UNDEF(&ret);
@@ -312,23 +240,17 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch14)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(result_type)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &result_type);
 	if (!result_type) {
 		result_type = &result_type_sub;
-		ZEPHIR_INIT_VAR(result_type);
+		ZVAL_NULL(result_type);
 		ZVAL_LONG(result_type, 1);
 	}
-
-
 	do {
-		ZEPHIR_INIT_VAR(&_0);
+		ZVAL_NULL(&_0);
 		ZEPHIR_GET_CONSTANT(&_0, "MYSQL_ASSOC");
 		if (ZEPHIR_IS_LONG(result_type, 1) || ZEPHIR_IS_EQUAL(result_type, &_0) || ZEPHIR_IS_LONG(result_type, 1)) {
-			ZEPHIR_INIT_VAR(&ret);
+			ZVAL_NULL(&ret);
 			ZVAL_STRING(&ret, "aaa");
 			break;
 		}
diff --git a/ext/stub/fortytwo.zep.c b/ext/stub/fortytwo.zep.c
index acf5fade5c..77f45bb5be 100644
--- a/ext/stub/fortytwo.zep.c
+++ b/ext/stub/fortytwo.zep.c
@@ -35,9 +35,7 @@ PHP_METHOD(Stub_FortyTwo, proof)
 	zend_bool _4$$3, _8$$6;
 	zval _0;
 	zval box, side, _1, *_2, _3, _7$$4, _11$$7;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i = 0, j = 0, _5$$3, _6$$3, _9$$6, _10$$6;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&box);
 	ZVAL_UNDEF(&side);
@@ -46,16 +44,11 @@ PHP_METHOD(Stub_FortyTwo, proof)
 	ZVAL_UNDEF(&_7$$4);
 	ZVAL_UNDEF(&_11$$7);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&box);
+	ZVAL_NULL(&box);
 	zephir_create_array(&box, 15, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 10);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -302,6 +295,5 @@ PHP_METHOD(Stub_FortyTwo, proof)
 		}
 	}
 	ZEPHIR_INIT_NVAR(&side);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/functional.zep.c b/ext/stub/functional.zep.c
index a69c6f44f9..052d7be5cd 100644
--- a/ext/stub/functional.zep.c
+++ b/ext/stub/functional.zep.c
@@ -27,11 +27,9 @@ ZEPHIR_INIT_CLASS(Stub_Functional)
 
 PHP_METHOD(Stub_Functional, map1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0, _1;
 	zval a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
@@ -39,15 +37,9 @@ PHP_METHOD(Stub_Functional, map1)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_arrval(&a, a_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_11__closure_ce, SL("__invoke"));
 	ZEPHIR_CALL_FUNCTION(&_1, "array_map", NULL, 8, &_0, &a);
@@ -57,11 +49,9 @@ PHP_METHOD(Stub_Functional, map1)
 
 PHP_METHOD(Stub_Functional, map2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, *b, b_sub, _0;
 	zval a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b_sub);
@@ -70,14 +60,8 @@ PHP_METHOD(Stub_Functional, map2)
 		Z_PARAM_ARRAY(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a_param, &b);
 	zephir_get_arrval(&a, a_param);
-
-
 	ZEPHIR_CALL_FUNCTION(&_0, "array_map", NULL, 8, b, &a);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/functionexists.zep.c b/ext/stub/functionexists.zep.c
index 77217baf7d..bd3921d1ba 100644
--- a/ext/stub/functionexists.zep.c
+++ b/ext/stub/functionexists.zep.c
@@ -28,23 +28,15 @@ ZEPHIR_INIT_CLASS(Stub_FunctionExists)
 
 PHP_METHOD(Stub_FunctionExists, testWithPassedName)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *func_param = NULL;
 	zval func;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&func);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(func)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &func_param);
 	zephir_get_strval(&func, func_param);
-
-
 	RETURN_MM_BOOL((zephir_function_exists(&func) == SUCCESS));
 }
 
@@ -52,9 +44,7 @@ PHP_METHOD(Stub_FunctionExists, testBuiltInFunctions)
 {
 	zval result, functions;
 	zval func, _0, *_1, _2, _3$$3, _4$$4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&func);
 	ZVAL_UNDEF(&_0);
@@ -63,16 +53,11 @@ PHP_METHOD(Stub_FunctionExists, testBuiltInFunctions)
 	ZVAL_UNDEF(&_4$$4);
 	ZVAL_UNDEF(&result);
 	ZVAL_UNDEF(&functions);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&result);
+	ZVAL_NULL(&result);
 	array_init(&result);
-	ZEPHIR_INIT_VAR(&functions);
+	ZVAL_NULL(&functions);
 	zephir_create_array(&functions, 8, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "substr");
 	zephir_array_fast_append(&functions, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -130,9 +115,6 @@ PHP_METHOD(Stub_FunctionExists, testBuiltInFunctions)
 
 PHP_METHOD(Stub_FunctionExists, testWithString)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL((zephir_function_exists_ex(ZEND_STRL("substr")) == SUCCESS));
 }
diff --git a/ext/stub/functions.zep.c b/ext/stub/functions.zep.c
index 75643678e2..65dbb51356 100644
--- a/ext/stub/functions.zep.c
+++ b/ext/stub/functions.zep.c
@@ -31,24 +31,17 @@ ZEPHIR_INIT_CLASS(Stub_Functions)
 PHP_METHOD(Stub_Functions, filterVar1)
 {
 	zval ret, _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
-	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 45, &ret, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 46, &ret, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(ZEPHIR_IS_FALSE_IDENTICAL(&_2));
 }
@@ -59,24 +52,17 @@ PHP_METHOD(Stub_Functions, filterVar1)
 PHP_METHOD(Stub_Functions, filterVar2)
 {
 	zval ret, _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
-	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 45, &ret, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 46, &ret, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(ZEPHIR_IS_FALSE(&_2));
 }
diff --git a/ext/stub/geometry.zep.c b/ext/stub/geometry.zep.c
index a105a27c7f..587b661667 100644
--- a/ext/stub/geometry.zep.c
+++ b/ext/stub/geometry.zep.c
@@ -29,12 +29,10 @@ ZEPHIR_INIT_CLASS(Stub_Geometry)
 
 PHP_METHOD(Stub_Geometry, run)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zend_long count, ZEPHIR_LAST_CALL_STATUS, i;
 	zval *list_param = NULL, *count_param = NULL, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3, _8$$3;
 	zval list;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&list);
 	ZVAL_UNDEF(&_1$$3);
@@ -49,15 +47,8 @@ PHP_METHOD(Stub_Geometry, run)
 		Z_PARAM_ARRAY(list)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &list_param, &count_param);
 	zephir_get_arrval(&list, list_param);
-	count = zephir_get_intval(count_param);
-
-
 	i = 0;
 	while (1) {
 		if (!(i < count)) {
@@ -75,17 +66,14 @@ PHP_METHOD(Stub_Geometry, run)
 		zephir_check_call_status();
 		i = (i + 1);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Geometry, runOptimize)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zend_long count, ZEPHIR_LAST_CALL_STATUS, i;
 	zval *list_param = NULL, *count_param = NULL, item, _1$$3, _2$$3, _3$$3, _4$$3;
 	zval list;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&list);
 	ZVAL_UNDEF(&item);
@@ -97,15 +85,8 @@ PHP_METHOD(Stub_Geometry, runOptimize)
 		Z_PARAM_ARRAY(list)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &list_param, &count_param);
 	zephir_get_arrval(&list, list_param);
-	count = zephir_get_intval(count_param);
-
-
 	i = 0;
 	while (1) {
 		if (!(i < count)) {
@@ -121,14 +102,12 @@ PHP_METHOD(Stub_Geometry, runOptimize)
 		zephir_check_call_status();
 		i++;
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Geometry, distanceStatic)
 {
 	zval *x1_param = NULL, *y1_param = NULL, *x2_param = NULL, *y2_param = NULL, _0;
 	double x1, y1, x2, y2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(4, 4)
@@ -137,15 +116,11 @@ PHP_METHOD(Stub_Geometry, distanceStatic)
 		Z_PARAM_ZVAL(x2)
 		Z_PARAM_ZVAL(y2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(4, 0, &x1_param, &y1_param, &x2_param, &y2_param);
 	x1 = zephir_get_doubleval(x1_param);
 	y1 = zephir_get_doubleval(y1_param);
 	x2 = zephir_get_doubleval(x2_param);
 	y2 = zephir_get_doubleval(y2_param);
-
-
 	ZVAL_DOUBLE(&_0, ((((x1 - x2)) * ((x1 - x2))) + (((y1 - y2)) * ((y1 - y2)))));
 	RETURN_DOUBLE(sqrt(((((x1 - x2)) * ((x1 - x2))) + (((y1 - y2)) * ((y1 - y2))))));
 }
diff --git a/ext/stub/globals.zep.c b/ext/stub/globals.zep.c
index 27598f17ac..6e1e089a42 100644
--- a/ext/stub/globals.zep.c
+++ b/ext/stub/globals.zep.c
@@ -27,132 +27,89 @@ ZEPHIR_INIT_CLASS(Stub_Globals)
 PHP_METHOD(Stub_Globals, setBoolValueUsingDotNotation)
 {
 	zval *value, value_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
-
-
 	ZEPHIR_GLOBAL(db).my_setting_1 = zend_is_true(value);
 }
 
 PHP_METHOD(Stub_Globals, setIntValueUsingDotNotation)
 {
 	zval *value, value_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
-
-
 	ZEPHIR_GLOBAL(db).my_setting_2 = zval_get_long(value);
 }
 
 PHP_METHOD(Stub_Globals, setCharValue)
 {
 	zval *value, value_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
-
-
 	ZEPHIR_GLOBAL(my_setting_4) = (Z_TYPE_P(value) == IS_STRING ? (Z_STRLEN_P(value) ? Z_STRVAL_P(value)[0] : NULL) : zval_get_long(value));
 }
 
 PHP_METHOD(Stub_Globals, setStringValue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value_param = NULL;
 	zval value;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
-
-
 	ZEPHIR_GLOBAL(my_setting_5) = ZSTR_VAL(zval_get_string(&value));
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals, setBoolValue)
 {
 	zval *value, value_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
-
-
 	ZEPHIR_GLOBAL(my_setting_1) = zend_is_true(value);
 }
 
 PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCacheLevel)
 {
 	zval *value, value_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
-
-
 	ZEPHIR_GLOBAL(orm).cache_level = zval_get_long(value);
 }
 
 PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCachePrefix)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value_param = NULL;
 	zval value;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
-
-
 	ZEPHIR_GLOBAL(orm).cache_prefix = ZSTR_VAL(zval_get_string(&value));
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -160,9 +117,6 @@ PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCachePrefix)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(ZEPHIR_GLOBAL(db).my_setting_1);
 }
@@ -172,9 +126,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals1)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(ZEPHIR_GLOBAL(db).my_setting_2);
 }
@@ -184,9 +135,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals2)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(ZEPHIR_GLOBAL(db).my_setting_3);
 }
@@ -196,9 +144,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals3)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(ZEPHIR_GLOBAL(my_setting_1));
 }
@@ -208,9 +153,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals4)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(ZEPHIR_GLOBAL(my_setting_2));
 }
@@ -220,9 +162,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals5)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals6)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(ZEPHIR_GLOBAL(my_setting_3));
 }
@@ -232,9 +171,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals6)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals7)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(ZEPHIR_GLOBAL(my_setting_4));
 }
@@ -244,9 +180,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals7)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobals8)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING(ZEPHIR_GLOBAL(my_setting_5));
 }
@@ -256,9 +189,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobals8)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobalsOrmCacheLevel)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(ZEPHIR_GLOBAL(orm).cache_level);
 }
@@ -268,9 +198,6 @@ PHP_METHOD(Stub_Globals, getDefaultGlobalsOrmCacheLevel)
  */
 PHP_METHOD(Stub_Globals, getDefaultGlobalsOrmCachePrefix)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING(ZEPHIR_GLOBAL(orm).cache_prefix);
 }
diff --git a/ext/stub/globals/env.zep.c b/ext/stub/globals/env.zep.c
index 11873ea1aa..05e23a342e 100644
--- a/ext/stub/globals/env.zep.c
+++ b/ext/stub/globals/env.zep.c
@@ -27,10 +27,8 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Env)
 
 PHP_METHOD(Stub_Globals_Env, read)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, _ENV, _0;
 	zval name;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_ENV);
@@ -38,19 +36,15 @@ PHP_METHOD(Stub_Globals_Env, read)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_ENV, SL("_ENV"));
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (zephir_array_isset(&_ENV, &name)) {
+		ZEPHIR_OBS_NVAR(&_0);
 		zephir_array_fetch(&_0, &_ENV, &name, PH_NOISY, "stub/globals/env.zep", 8);
 	} else {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_BOOL(&_0, 0);
 	}
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/globals/post.zep.c b/ext/stub/globals/post.zep.c
index e0bd855057..6c57101e1f 100644
--- a/ext/stub/globals/post.zep.c
+++ b/ext/stub/globals/post.zep.c
@@ -32,25 +32,17 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Post)
  */
 PHP_METHOD(Stub_Globals_Post, hasValue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, _POST;
 	zval name;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
 	ZVAL_UNDEF(&_POST);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
-
-
 	RETURN_MM_BOOL(zephir_array_isset(&_POST, &name));
 }
 
diff --git a/ext/stub/globals/server.zep.c b/ext/stub/globals/server.zep.c
index 24b8a9c196..df2dcc8971 100644
--- a/ext/stub/globals/server.zep.c
+++ b/ext/stub/globals/server.zep.c
@@ -15,7 +15,6 @@
 #include "kernel/array.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Globals_Server)
@@ -30,7 +29,6 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Server)
  */
 PHP_METHOD(Stub_Globals_Server, f1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval _SERVER, _0, _1;
 	zval *this_ptr = getThis();
@@ -38,10 +36,6 @@ PHP_METHOD(Stub_Globals_Server, f1)
 	ZVAL_UNDEF(&_SERVER);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
 	zephir_array_fetch_string(&_0, &_SERVER, SL("PHP_SELF"), PH_NOISY | PH_READONLY, "stub/globals/server.zep", 10);
@@ -50,18 +44,14 @@ PHP_METHOD(Stub_Globals_Server, f1)
 	zephir_check_call_status();
 	zephir_array_fetch_string(&_1, &_SERVER, SL("PHP_SELF"), PH_NOISY | PH_READONLY, "stub/globals/server.zep", 12);
 	zend_print_zval(&_1, 0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals_Server, f2)
 {
 	zval _SERVER, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_SERVER);
 	ZVAL_UNDEF(&_0);
-
-
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
 	zephir_array_fetch_string(&_0, &_SERVER, SL("SCRIPT_NAME"), PH_NOISY | PH_READONLY, "stub/globals/server.zep", 17);
@@ -74,12 +64,9 @@ PHP_METHOD(Stub_Globals_Server, f2)
 PHP_METHOD(Stub_Globals_Server, check)
 {
 	zval _SERVER, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_SERVER);
 	ZVAL_UNDEF(&_0);
-
-
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
 	zephir_array_fetch_string(&_0, &_SERVER, SL("HTTP_USER_AGENT"), PH_NOISY | PH_READONLY, "stub/globals/server.zep", 25);
diff --git a/ext/stub/globals/serverrequestfactory.zep.c b/ext/stub/globals/serverrequestfactory.zep.c
index f5fe6d140d..aed248712a 100644
--- a/ext/stub/globals/serverrequestfactory.zep.c
+++ b/ext/stub/globals/serverrequestfactory.zep.c
@@ -31,7 +31,6 @@ ZEPHIR_INIT_CLASS(Stub_Globals_ServerRequestFactory)
  */
 PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *server_param = NULL, *get_param = NULL, *post_param = NULL, *cookies_param = NULL, *files_param = NULL, _COOKIE, _FILES, _GET, _POST, _SERVER, _0, _2, _3, _4, _5;
@@ -67,10 +66,6 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 		Z_PARAM_ARRAY_OR_NULL(cookies)
 		Z_PARAM_ARRAY_OR_NULL(files)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_get_global(&_GET, SL("_GET"));
@@ -78,41 +73,39 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	zephir_get_global(&_COOKIE, SL("_COOKIE"));
 	zephir_fetch_params(1, 0, 5, &server_param, &get_param, &post_param, &cookies_param, &files_param);
 	if (!server_param) {
-		ZEPHIR_INIT_VAR(&server);
+		ZVAL_NULL(&server);
 	} else {
 		zephir_get_arrval(&server, server_param);
 	}
 	if (!get_param) {
-		ZEPHIR_INIT_VAR(&get);
+		ZVAL_NULL(&get);
 	} else {
 		zephir_get_arrval(&get, get_param);
 	}
 	if (!post_param) {
-		ZEPHIR_INIT_VAR(&post);
+		ZVAL_NULL(&post);
 	} else {
 		zephir_get_arrval(&post, post_param);
 	}
 	if (!cookies_param) {
-		ZEPHIR_INIT_VAR(&cookies);
+		ZVAL_NULL(&cookies);
 	} else {
 		zephir_get_arrval(&cookies, cookies_param);
 	}
 	if (!files_param) {
-		ZEPHIR_INIT_VAR(&files);
+		ZVAL_NULL(&files);
 	} else {
 		zephir_get_arrval(&files, files_param);
 	}
-
-
-	ZEPHIR_INIT_VAR(&globalCookies);
+	ZVAL_NULL(&globalCookies);
 	array_init(&globalCookies);
-	ZEPHIR_INIT_VAR(&globalFiles);
+	ZVAL_NULL(&globalFiles);
 	array_init(&globalFiles);
-	ZEPHIR_INIT_VAR(&globalGet);
+	ZVAL_NULL(&globalGet);
 	array_init(&globalGet);
-	ZEPHIR_INIT_VAR(&globalPost);
+	ZVAL_NULL(&globalPost);
 	array_init(&globalPost);
-	ZEPHIR_INIT_VAR(&globalServer);
+	ZVAL_NULL(&globalServer);
 	array_init(&globalServer);
 	if (!(ZEPHIR_IS_EMPTY(&_COOKIE))) {
 		ZEPHIR_CPY_WRT(&globalCookies, &_COOKIE);
@@ -129,19 +122,19 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	if (!(ZEPHIR_IS_EMPTY(&_SERVER))) {
 		ZEPHIR_CPY_WRT(&globalServer, &_SERVER);
 	}
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", &_1, 46, &server, &globalServer);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", &_1, 47, &server, &globalServer);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&server, &_0);
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", &_1, 46, &files, &globalFiles);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", &_1, 47, &files, &globalFiles);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&files, &_2);
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", &_1, 46, &cookies, &globalCookies);
+	ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", &_1, 47, &cookies, &globalCookies);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&cookies, &_3);
-	ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", &_1, 46, &get, &globalGet);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", &_1, 47, &get, &globalGet);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&get, &_4);
-	ZEPHIR_CALL_METHOD(&_5, this_ptr, "checknullarray", &_1, 46, &post, &globalPost);
+	ZEPHIR_CALL_METHOD(&_5, this_ptr, "checknullarray", &_1, 47, &post, &globalPost);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&post, &_5);
 	zephir_create_array(return_value, 5, 0);
@@ -150,7 +143,7 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	zephir_array_update_string(return_value, SL("cookies"), &cookies, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(return_value, SL("get"), &get, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(return_value, SL("post"), &post, PH_COPY | PH_SEPARATE);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -159,10 +152,8 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
  */
 PHP_METHOD(Stub_Globals_ServerRequestFactory, checkNullArray)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval super;
 	zval *source, source_sub, *super_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&source_sub);
 	ZVAL_UNDEF(&super);
@@ -170,18 +161,12 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, checkNullArray)
 		Z_PARAM_ZVAL(source)
 		Z_PARAM_ARRAY(super)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &source, &super_param);
 	zephir_get_arrval(&super, super_param);
-
-
 	if (UNEXPECTED(Z_TYPE_P(source) == IS_NULL)) {
 		RETURN_CTOR(&super);
 	}
 	RETVAL_ZVAL(source, 1, 0);
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/globals/session/base.zep.c b/ext/stub/globals/session/base.zep.c
index ad976aec99..a803b5f728 100644
--- a/ext/stub/globals/session/base.zep.c
+++ b/ext/stub/globals/session/base.zep.c
@@ -28,10 +28,8 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Session_Base)
 
 PHP_METHOD(Stub_Globals_Session_Base, set)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, *value, value_sub, _SESSION;
 	zval index;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index);
 	ZVAL_UNDEF(&value_sub);
@@ -40,48 +38,32 @@ PHP_METHOD(Stub_Globals_Session_Base, set)
 		Z_PARAM_STR(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 	zephir_fetch_params(1, 2, 0, &index_param, &value);
 	zephir_get_strval(&index, index_param);
-
-
 	zephir_array_update_zval(&_SESSION, &index, value, PH_COPY | PH_SEPARATE);
 	RETVAL_ZVAL(&_SESSION, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, remove)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, _SESSION;
 	zval index;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&index);
 	ZVAL_UNDEF(&_SESSION);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
-
-
 	zephir_array_unset(&_SESSION, &index, PH_SEPARATE);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, __set)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *index_param = NULL, *value, value_sub;
 	zval index;
@@ -93,22 +75,15 @@ PHP_METHOD(Stub_Globals_Session_Base, __set)
 		Z_PARAM_STR(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index_param, &value);
 	zephir_get_strval(&index, index_param);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "set", NULL, 0, &index, value);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, __unset)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *index_param = NULL;
 	zval index;
@@ -118,39 +93,26 @@ PHP_METHOD(Stub_Globals_Session_Base, __unset)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
-
-
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "remove", NULL, 0, &index);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, removeSessionData)
 {
 	zend_string *_4;
 	zend_ulong _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval _SESSION, key, _0, *_1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_SESSION);
 	ZVAL_UNDEF(&key);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_is_iterable(&_SESSION, 1, "stub/globals/session/base.zep", 36);
 	if (Z_TYPE_P(&_SESSION) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_SESSION), _3, _4, _1)
@@ -186,6 +148,6 @@ PHP_METHOD(Stub_Globals_Session_Base, removeSessionData)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZEPHIR_INIT_NVAR(&key);
 	RETVAL_ZVAL(&_SESSION, 1, 0);
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/globals/session/child.zep.c b/ext/stub/globals/session/child.zep.c
index 20780fafc7..48212cb8c9 100644
--- a/ext/stub/globals/session/child.zep.c
+++ b/ext/stub/globals/session/child.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Globals_Session_Child)
@@ -26,17 +25,10 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Session_Child)
 
 PHP_METHOD(Stub_Globals_Session_Child, destroy)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "removesessiondata", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/instance.zep.c b/ext/stub/instance.zep.c
index 47b2d3e1bb..a5d9702163 100644
--- a/ext/stub/instance.zep.c
+++ b/ext/stub/instance.zep.c
@@ -32,7 +32,6 @@ ZEPHIR_INIT_CLASS(Stub_Instance)
 PHP_METHOD(Stub_Instance, __construct)
 {
 	zval *a1, a1_sub, *a2, a2_sub, *a3, a3_sub, *a4, a4_sub, *a5, a5_sub, *a6, a6_sub, *a7, a7_sub, *a8, a8_sub, *a9, a9_sub, *a10, a10_sub, *a11, a11_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a1_sub);
 	ZVAL_UNDEF(&a2_sub);
@@ -58,30 +57,19 @@ PHP_METHOD(Stub_Instance, __construct)
 		Z_PARAM_OBJECT_OF_CLASS(a10, stub_compare_ce)
 		Z_PARAM_OBJECT_OF_CLASS(a11, stub_concat_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(11, 0, &a1, &a2, &a3, &a4, &a5, &a6, &a7, &a8, &a9, &a10, &a11);
-
-
 }
 
 PHP_METHOD(Stub_Instance, testIssue1339)
 {
 	zval parameters, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameters);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&parameters);
+	ZVAL_NULL(&parameters);
 	zephir_create_array(&parameters, 11, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	object_init_ex(&_0, stub_arithmetic_ce);
 	if (zephir_has_constructor(&_0)) {
 		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
@@ -91,7 +79,7 @@ PHP_METHOD(Stub_Instance, testIssue1339)
 	zephir_array_fast_append(&parameters, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	object_init_ex(&_0, stub_arrayobject_ce);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 47);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 48);
 	zephir_check_call_status();
 	zephir_array_fast_append(&parameters, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -170,31 +158,23 @@ PHP_METHOD(Stub_Instance, testIssue1339)
 	ZVAL_STRING(&_0, "Stub\\Instance");
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(return_value, &_0, &parameters);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Instance, testInstanceCreate)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className_param = NULL;
 	zval className;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(className)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className_param);
 	zephir_get_strval(&className, className_param);
-
-
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(return_value, &className);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/instanceoff.zep.c b/ext/stub/instanceoff.zep.c
index db280e01d2..b5131708ed 100644
--- a/ext/stub/instanceoff.zep.c
+++ b/ext/stub/instanceoff.zep.c
@@ -31,16 +31,9 @@ ZEPHIR_INIT_CLASS(Stub_Instanceoff)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf1)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init(&a);
 	RETURN_MM_BOOL(zephir_is_instance_of(&a, SL("stdClass")));
 }
@@ -48,17 +41,10 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf1)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf2)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
@@ -71,16 +57,9 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf2)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf3)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init(&a);
 	RETURN_MM_BOOL(zephir_instance_of_ev(&a, stub_unknownclass_ce));
 }
@@ -88,17 +67,12 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf3)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf4)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	if (zephir_zval_is_traversable(a)) {
 		RETURN_BOOL(1);
 	}
@@ -114,11 +88,7 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	if (zephir_instance_of_ev(a, stub_instanceoff_ce)) {
 		RETURN_BOOL(1);
 	}
@@ -128,17 +98,10 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf5)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf6)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
@@ -151,42 +114,29 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf6)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf7)
 {
 	zval *test, test_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&test_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(test)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &test);
-
-
 	RETURN_BOOL(zephir_instance_of_ev(test, stub_instanceoff_ce));
 }
 
 PHP_METHOD(Stub_Instanceoff, testInstanceOf8)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *test_param = NULL, a;
 	zval test;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&test);
 	ZVAL_UNDEF(&a);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(test)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &test_param);
 	zephir_get_strval(&test, test_param);
-
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
@@ -198,10 +148,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf8)
 
 PHP_METHOD(Stub_Instanceoff, testInstanceOf9)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval test;
 	zval *a, a_sub, *test_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&test);
@@ -209,14 +157,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf9)
 		Z_PARAM_OBJECT(a)
 		Z_PARAM_STR(test)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &test_param);
 	zephir_get_strval(&test, test_param);
-
-
 	RETURN_MM_BOOL(zephir_is_instance_of(a, Z_STRVAL_P(&test), Z_STRLEN_P(&test)));
 }
 
diff --git a/ext/stub/interfaces/implementint.zep.c b/ext/stub/interfaces/implementint.zep.c
index 1e17ece1d2..2c94400671 100644
--- a/ext/stub/interfaces/implementint.zep.c
+++ b/ext/stub/interfaces/implementint.zep.c
@@ -36,12 +36,7 @@ PHP_METHOD(Stub_Interfaces_ImplementInt, set)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val_param);
-	val = zephir_get_intval(val_param);
-
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, val);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("val"), &_0);
@@ -49,9 +44,6 @@ PHP_METHOD(Stub_Interfaces_ImplementInt, set)
 
 PHP_METHOD(Stub_Interfaces_ImplementInt, get)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "val");
 }
diff --git a/ext/stub/interfaces/implementinterface.zep.c b/ext/stub/interfaces/implementinterface.zep.c
index bf5dd259a3..d0841ecb97 100644
--- a/ext/stub/interfaces/implementinterface.zep.c
+++ b/ext/stub/interfaces/implementinterface.zep.c
@@ -28,25 +28,17 @@ ZEPHIR_INIT_CLASS(Stub_Interfaces_ImplementInterface)
 
 PHP_METHOD(Stub_Interfaces_ImplementInterface, get)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *obj, obj_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(obj, stub_interfaces_interfaceint_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &obj);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(obj, "get", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Interfaces_ImplementInterface, getVoid)
@@ -58,19 +50,12 @@ PHP_METHOD(Stub_Interfaces_ImplementInterface, getVoid)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(obj, stub_interfaces_interfaceint_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("obj"), obj);
 }
 
 PHP_METHOD(Stub_Interfaces_ImplementInterface, getObj)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "obj");
 }
diff --git a/ext/stub/internalclasses.zep.c b/ext/stub/internalclasses.zep.c
index 1832f5e797..9609d532c6 100644
--- a/ext/stub/internalclasses.zep.c
+++ b/ext/stub/internalclasses.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_InternalClasses)
@@ -27,26 +26,15 @@ ZEPHIR_INIT_CLASS(Stub_InternalClasses)
 PHP_METHOD(Stub_InternalClasses, testStaticCall)
 {
 	zend_class_entry *_0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	_0 = zephir_fetch_class_str_ex(SL("Phalcon\\Di"), ZEND_FETCH_CLASS_AUTO);
 	ZEPHIR_RETURN_CALL_CE_STATIC(_0, "getdefault", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_InternalClasses, testStaticPropertyFetch)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(303);
 }
diff --git a/ext/stub/internalinterfaces.zep.c b/ext/stub/internalinterfaces.zep.c
index 807b0cab46..ec629ea1a7 100644
--- a/ext/stub/internalinterfaces.zep.c
+++ b/ext/stub/internalinterfaces.zep.c
@@ -25,9 +25,6 @@ ZEPHIR_INIT_CLASS(Stub_InternalInterfaces)
 
 PHP_METHOD(Stub_InternalInterfaces, count)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(0);
 }
diff --git a/ext/stub/invoke.zep.c b/ext/stub/invoke.zep.c
index 7642a9f641..d4ad33ce25 100644
--- a/ext/stub/invoke.zep.c
+++ b/ext/stub/invoke.zep.c
@@ -28,20 +28,13 @@ ZEPHIR_INIT_CLASS(Stub_Invoke)
 PHP_METHOD(Stub_Invoke, __construct)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "aaa");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Invoke, __invoke)
@@ -50,9 +43,6 @@ PHP_METHOD(Stub_Invoke, __invoke)
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("a"), PH_NOISY_CC | PH_READONLY);
 	zephir_gettype(return_value, &_0);
 	return;
@@ -61,22 +51,15 @@ PHP_METHOD(Stub_Invoke, __invoke)
 PHP_METHOD(Stub_Invoke, test)
 {
 	zval func;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&func);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&func);
+	ZVAL_NULL(&func);
 	object_init_ex(&func, stub_invoke_ce);
-	ZEPHIR_CALL_METHOD(NULL, &func, "__construct", NULL, 48);
+	ZEPHIR_CALL_METHOD(NULL, &func, "__construct", NULL, 49);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(&func, NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/invokes/abstractinvoker.zep.c b/ext/stub/invokes/abstractinvoker.zep.c
index d798d669bb..90ecf058e1 100644
--- a/ext/stub/invokes/abstractinvoker.zep.c
+++ b/ext/stub/invokes/abstractinvoker.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvoker)
@@ -27,28 +26,19 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvoker)
 PHP_METHOD(Stub_Invokes_AbstractInvoker, __toString)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("text"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "renderarrayelements", NULL, 0, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Invokes_AbstractInvoker, __invoke)
 {
 	zval *this_ptr = getThis();
-
-
-
 	RETURN_THISW();
 }
 
diff --git a/ext/stub/invokes/abstractinvokercomplex.zep.c b/ext/stub/invokes/abstractinvokercomplex.zep.c
index d657b641bf..2476aa592a 100644
--- a/ext/stub/invokes/abstractinvokercomplex.zep.c
+++ b/ext/stub/invokes/abstractinvokercomplex.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvokerComplex)
@@ -27,28 +26,19 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvokerComplex)
 PHP_METHOD(Stub_Invokes_AbstractInvokerComplex, __toString)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("text"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "renderarrayelementscomplex", NULL, 0, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Invokes_AbstractInvokerComplex, __invoke)
 {
 	zval *this_ptr = getThis();
-
-
-
 	RETURN_THISW();
 }
 
diff --git a/ext/stub/invokes/abstractprotected.zep.c b/ext/stub/invokes/abstractprotected.zep.c
index d090e129b5..99cae3786c 100644
--- a/ext/stub/invokes/abstractprotected.zep.c
+++ b/ext/stub/invokes/abstractprotected.zep.c
@@ -30,10 +30,8 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractProtected)
 
 PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL, ret;
 	zval text, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&text);
 	ZVAL_UNDEF(&_0);
@@ -41,15 +39,9 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_VS(&_0, &text, "1");
 	ZEPHIR_CPY_WRT(&ret, &_0);
 	RETURN_CCTOR(&ret);
@@ -57,10 +49,8 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 
 PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL, ret;
 	zval text, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&text);
 	ZVAL_UNDEF(&_0);
@@ -68,15 +58,9 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CONCAT_VS(&_0, &text, "2");
 	ZEPHIR_CPY_WRT(&ret, &_0);
 	RETURN_CCTOR(&ret);
@@ -85,7 +69,6 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElements)
 {
 	zval _0, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *text_param = NULL, _1;
 	zval text;
@@ -98,32 +81,25 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElements)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 2, 0);
 	zephir_array_fast_append(&_0, this_ptr);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "protectedMethod2");
 	zephir_array_fast_append(&_0, &_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	zephir_create_array(&_2, 1, 0);
 	zephir_array_fast_append(&_2, &text);
 	ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, &_0, &_2);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElementsComplex)
 {
 	zval elements, _0, _2, _6$$3, _10$$4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *text_param = NULL, item, _1, *_3, _4, _5$$3, _7$$3, _8$$3, _9$$4, _11$$4, _12$$4;
 	zval text, result;
@@ -148,23 +124,17 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElementsComplex)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-
-
-	ZEPHIR_INIT_VAR(&result);
-	ZEPHIR_INIT_VAR(&elements);
+	ZVAL_NULL(&result);
+	ZVAL_NULL(&elements);
 	zephir_create_array(&elements, 2, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 2, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "protectedMethod1");
 	zephir_array_fast_append(&_0, &_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	zephir_create_array(&_2, 1, 0);
 	zephir_array_fast_append(&_2, &text);
 	zephir_array_fast_append(&_0, &_2);
diff --git a/ext/stub/invokes/invokeprotected.zep.c b/ext/stub/invokes/invokeprotected.zep.c
index f26d116e9e..deaf15551a 100644
--- a/ext/stub/invokes/invokeprotected.zep.c
+++ b/ext/stub/invokes/invokeprotected.zep.c
@@ -26,7 +26,6 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_InvokeProtected)
 
 PHP_METHOD(Stub_Invokes_InvokeProtected, __construct)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL;
 	zval text;
 	zval *this_ptr = getThis();
@@ -35,15 +34,8 @@ PHP_METHOD(Stub_Invokes_InvokeProtected, __construct)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("text"), &text);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/invokes/invokeprotectedcomplex.zep.c b/ext/stub/invokes/invokeprotectedcomplex.zep.c
index 0f6a992329..185e685a93 100644
--- a/ext/stub/invokes/invokeprotectedcomplex.zep.c
+++ b/ext/stub/invokes/invokeprotectedcomplex.zep.c
@@ -26,7 +26,6 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_InvokeProtectedComplex)
 
 PHP_METHOD(Stub_Invokes_InvokeProtectedComplex, __construct)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL;
 	zval text;
 	zval *this_ptr = getThis();
@@ -35,15 +34,8 @@ PHP_METHOD(Stub_Invokes_InvokeProtectedComplex, __construct)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("text"), &text);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/issettest.zep.c b/ext/stub/issettest.zep.c
index ab8f33dafe..7ca437a348 100644
--- a/ext/stub/issettest.zep.c
+++ b/ext/stub/issettest.zep.c
@@ -34,7 +34,6 @@ ZEPHIR_INIT_CLASS(Stub_IssetTest)
 PHP_METHOD(Stub_IssetTest, testIssetArray1)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -42,11 +41,7 @@ PHP_METHOD(Stub_IssetTest, testIssetArray1)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	RETURN_BOOL(zephir_array_isset(a, b));
 }
 
@@ -54,28 +49,20 @@ PHP_METHOD(Stub_IssetTest, testIssetArray2)
 {
 	zend_long b;
 	zval *a, a_sub, *b_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_BOOL(zephir_array_isset_long(a, b));
 }
 
 PHP_METHOD(Stub_IssetTest, testIssetArray3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval b;
 	zval *a, a_sub, *b_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b);
@@ -83,72 +70,50 @@ PHP_METHOD(Stub_IssetTest, testIssetArray3)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	zephir_get_strval(&b, b_param);
-
-
 	RETURN_MM_BOOL(zephir_array_isset(a, &b));
 }
 
 PHP_METHOD(Stub_IssetTest, testIssetArray4)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(zephir_array_isset_long(a, 0));
 }
 
 PHP_METHOD(Stub_IssetTest, testIssetArray5)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(zephir_array_isset_string(a, SL("a")));
 }
 
 PHP_METHOD(Stub_IssetTest, testIssetProperty1)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(zephir_isset_property(a, SL("b")));
 }
 
 PHP_METHOD(Stub_IssetTest, testIssetProperty2)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -156,44 +121,28 @@ PHP_METHOD(Stub_IssetTest, testIssetProperty2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	RETURN_BOOL(zephir_isset_property_zval(a, b));
 }
 
 PHP_METHOD(Stub_IssetTest, testIssetProperty3)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL((0 == 0));
 }
 
 PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty1)
 {
 	zval g;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&g);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	zephir_memory_observe(&g);
 	zephir_read_property(&g, this_ptr, ZEND_STRL("s"), PH_NOISY_CC);
 	if (zephir_array_isset_string(&g, SL("a"))) {
 		RETURN_MM_BOOL(1);
@@ -203,23 +152,14 @@ PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty1)
 
 PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *inp, inp_sub, g;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&inp_sub);
 	ZVAL_UNDEF(&g);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(inp)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &inp);
-
-
-	zephir_memory_observe(&g);
 	zephir_read_property(&g, inp, ZEND_STRL("s"), PH_NOISY_CC);
 	if (zephir_array_isset_string(&g, SL("a"))) {
 		RETURN_MM_BOOL(1);
@@ -231,25 +171,21 @@ zend_object *zephir_init_properties_Stub_IssetTest(zend_class_entry *class_type)
 {
 		zval _1$$3;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("s"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			zephir_create_array(&_1$$3, 1, 0);
 			add_assoc_stringl_ex(&_1$$3, SL("a"), SL("true"));
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("s"), &_1$$3);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/issue1134.zep.c b/ext/stub/issue1134.zep.c
index 71d13a6501..597c786d39 100644
--- a/ext/stub/issue1134.zep.c
+++ b/ext/stub/issue1134.zep.c
@@ -30,7 +30,6 @@ ZEPHIR_INIT_CLASS(Stub_Issue1134)
 
 PHP_METHOD(Stub_Issue1134, __construct)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *config_param = NULL;
 	zval config;
 	zval *this_ptr = getThis();
@@ -40,48 +39,33 @@ PHP_METHOD(Stub_Issue1134, __construct)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(config)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &config_param);
 	if (!config_param) {
-		ZEPHIR_INIT_VAR(&config);
+		ZVAL_NULL(&config);
 		array_init(&config);
 	} else {
 		zephir_get_arrval(&config, config_param);
 	}
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &config);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Issue1134, arrayWithFilledDefaultValue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someDefaultData_param = NULL;
 	zval someDefaultData;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someDefaultData);
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(someDefaultData)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &someDefaultData_param);
 	if (!someDefaultData_param) {
-		ZEPHIR_INIT_VAR(&someDefaultData);
+		ZVAL_NULL(&someDefaultData);
 		array_init(&someDefaultData);
 	} else {
 		zephir_get_arrval(&someDefaultData, someDefaultData_param);
 	}
-
-
 	RETURN_CTOR(&someDefaultData);
 }
 
diff --git a/ext/stub/issue1404.zep.c b/ext/stub/issue1404.zep.c
index a8f8af956e..2a10e0ffe5 100644
--- a/ext/stub/issue1404.zep.c
+++ b/ext/stub/issue1404.zep.c
@@ -24,252 +24,168 @@ ZEPHIR_INIT_CLASS(Stub_Issue1404)
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsingInteger70000)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70000));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsingDouble70100)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70100));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsingLong70000)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(21474836470000));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsingString70000)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70000));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsingZero)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(0));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing50000)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(50000));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing50500)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(50500));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing50600)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(50600));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70101)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70101));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70102)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70102));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70103)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70103));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70104)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70104));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70105)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70105));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70106)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70106));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70107)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70107));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70108)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70108));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70109)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70109));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70110)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70110));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70111)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70111));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70112)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70112));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70113)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70113));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70114)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70114));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70115)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70115));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70116)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70116));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70117)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70117));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70100)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70100));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70200)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70200));
 }
 
 PHP_METHOD(Stub_Issue1404, testIsPhpVersionUsing70300)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(zephir_is_php_version(70300));
 }
diff --git a/ext/stub/issue1521.zep.c b/ext/stub/issue1521.zep.c
index f0eb15723d..ffd187025a 100644
--- a/ext/stub/issue1521.zep.c
+++ b/ext/stub/issue1521.zep.c
@@ -28,16 +28,10 @@ ZEPHIR_INIT_CLASS(Stub_Issue1521)
 PHP_METHOD(Stub_Issue1521, test)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 2, 0);
 	add_assoc_stringl_ex(&_0, SL("merchantNumber"), SL("0818217122"));
 	add_assoc_stringl_ex(&_0, SL("zero"), SL("0"));
diff --git a/ext/stub/issue2165/issue.zep.c b/ext/stub/issue2165/issue.zep.c
index 5799b2574e..5f66b98253 100644
--- a/ext/stub/issue2165/issue.zep.c
+++ b/ext/stub/issue2165/issue.zep.c
@@ -37,11 +37,9 @@ ZEPHIR_INIT_CLASS(Stub_Issue2165_Issue)
 
 PHP_METHOD(Stub_Issue2165_Issue, build)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0;
 	zval a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
@@ -49,31 +47,24 @@ PHP_METHOD(Stub_Issue2165_Issue, build)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &a_param);
 	if (!a_param) {
-		ZEPHIR_INIT_VAR(&a);
+		ZVAL_NULL(&a);
 		array_init(&a);
 	} else {
 		zephir_get_arrval(&a, a_param);
 	}
-
-
 	object_init_ex(return_value, stub_issue2165_issue_ce);
 	ZVAL_BOOL(&_0, 1);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 49, &a, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 50, &a, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, __construct)
 {
 	zend_string *_6$$3;
 	zend_ulong _5$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_2 = NULL, *_10 = NULL, *_13 = NULL, *_18 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, m, n;
 	zend_bool validate, _16$$6, _22$$8, _35$$12, _40$$14;
@@ -124,25 +115,18 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(validate)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &a_param, &validate_param);
 	zephir_get_arrval(&a, a_param);
 	if (!validate_param) {
 		validate = 1;
 	} else {
-		validate = zephir_get_boolval(validate_param);
-	}
-
-
+		}
 	m = zephir_fast_count_int(&a);
-	ZEPHIR_CALL_FUNCTION(&_0, "current", NULL, 44, &a);
+	ZEPHIR_CALL_FUNCTION(&_0, "current", NULL, 45, &a);
 	zephir_check_call_status();
 	n = zephir_fast_count_int(&_0);
 	if (validate) {
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "array_values", &_2, 50, &a);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "array_values", &_2, 51, &a);
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&a, &_1$$3);
 		zephir_is_iterable(&a, 0, "stub/issue2165/issue.zep", 46);
@@ -161,16 +145,15 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 					ZEPHIR_INIT_NVAR(&_7$$5);
 					object_init_ex(&_7$$5, spl_ce_InvalidArgumentException);
 					ZVAL_LONG(&_8$$5, n);
-					ZEPHIR_CALL_FUNCTION(&_9$$5, "strval", &_10, 51, &_8$$5);
+					ZEPHIR_CALL_FUNCTION(&_9$$5, "strval", &_10, 52, &_8$$5);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_11$$5);
 					ZVAL_LONG(&_11$$5, zephir_fast_count_int(&rowA));
 					ZEPHIR_INIT_NVAR(&_12$$5);
 					ZEPHIR_CONCAT_SSVSVSSVS(&_12$$5, "The number of columns", " must be equal for all rows, ", &_9$$5, " needed but ", &_11$$5, " given", " at row offset ", &i, ".");
-					ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_13, 52, &_12$$5);
+					ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_13, 53, &_12$$5);
 					zephir_check_call_status();
 					zephir_throw_exception_debug(&_7$$5, "stub/issue2165/issue.zep", 33);
-					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				zephir_is_iterable(&rowA, 0, "stub/issue2165/issue.zep", 44);
@@ -181,7 +164,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						ZVAL_COPY(&valueA, _14$$4);
 						_16$$6 = !(Z_TYPE_P(&valueA) == IS_LONG);
 						if (_16$$6) {
-							ZEPHIR_CALL_FUNCTION(&_17$$6, "is_float", &_18, 53, &valueA);
+							ZEPHIR_CALL_FUNCTION(&_17$$6, "is_float", &_18, 54, &valueA);
 							zephir_check_call_status();
 							_16$$6 = !zephir_is_true(&_17$$6);
 						}
@@ -192,10 +175,9 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							zephir_gettype(&_20$$7, &valueA);
 							ZEPHIR_INIT_NVAR(&_21$$7);
 							ZEPHIR_CONCAT_SSVS(&_21$$7, "Matrix element must", " be an integer or floating point number, ", &_20$$7, " given.");
-							ZEPHIR_CALL_METHOD(NULL, &_19$$7, "__construct", &_13, 52, &_21$$7);
+							ZEPHIR_CALL_METHOD(NULL, &_19$$7, "__construct", &_13, 53, &_21$$7);
 							zephir_check_call_status();
 							zephir_throw_exception_debug(&_19$$7, "stub/issue2165/issue.zep", 40);
-							ZEPHIR_MM_RESTORE();
 							return;
 						}
 					} ZEND_HASH_FOREACH_END();
@@ -212,7 +194,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						zephir_check_call_status();
 							_22$$8 = !(Z_TYPE_P(&valueA) == IS_LONG);
 							if (_22$$8) {
-								ZEPHIR_CALL_FUNCTION(&_23$$8, "is_float", &_18, 53, &valueA);
+								ZEPHIR_CALL_FUNCTION(&_23$$8, "is_float", &_18, 54, &valueA);
 								zephir_check_call_status();
 								_22$$8 = !zephir_is_true(&_23$$8);
 							}
@@ -223,10 +205,9 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								zephir_gettype(&_25$$9, &valueA);
 								ZEPHIR_INIT_NVAR(&_26$$9);
 								ZEPHIR_CONCAT_SSVS(&_26$$9, "Matrix element must", " be an integer or floating point number, ", &_25$$9, " given.");
-								ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_13, 52, &_26$$9);
+								ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_13, 53, &_26$$9);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_24$$9, "stub/issue2165/issue.zep", 40);
-								ZEPHIR_MM_RESTORE();
 								return;
 							}
 						ZEPHIR_CALL_METHOD(NULL, &rowA, "next", NULL, 0);
@@ -234,7 +215,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 					}
 				}
 				ZEPHIR_INIT_NVAR(&valueA);
-				ZEPHIR_CALL_FUNCTION(&_27$$4, "array_values", &_2, 50, &rowA);
+				ZEPHIR_CALL_FUNCTION(&_27$$4, "array_values", &_2, 51, &rowA);
 				zephir_check_call_status();
 				zephir_array_append(&rowA, &_27$$4, PH_SEPARATE, "stub/issue2165/issue.zep", 44);
 			} ZEND_HASH_FOREACH_END();
@@ -255,16 +236,15 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						ZEPHIR_INIT_NVAR(&_28$$11);
 						object_init_ex(&_28$$11, spl_ce_InvalidArgumentException);
 						ZVAL_LONG(&_29$$11, n);
-						ZEPHIR_CALL_FUNCTION(&_30$$11, "strval", &_10, 51, &_29$$11);
+						ZEPHIR_CALL_FUNCTION(&_30$$11, "strval", &_10, 52, &_29$$11);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_31$$11);
 						ZVAL_LONG(&_31$$11, zephir_fast_count_int(&rowA));
 						ZEPHIR_INIT_NVAR(&_32$$11);
 						ZEPHIR_CONCAT_SSVSVSSVS(&_32$$11, "The number of columns", " must be equal for all rows, ", &_30$$11, " needed but ", &_31$$11, " given", " at row offset ", &i, ".");
-						ZEPHIR_CALL_METHOD(NULL, &_28$$11, "__construct", &_13, 52, &_32$$11);
+						ZEPHIR_CALL_METHOD(NULL, &_28$$11, "__construct", &_13, 53, &_32$$11);
 						zephir_check_call_status();
 						zephir_throw_exception_debug(&_28$$11, "stub/issue2165/issue.zep", 33);
-						ZEPHIR_MM_RESTORE();
 						return;
 					}
 					zephir_is_iterable(&rowA, 0, "stub/issue2165/issue.zep", 44);
@@ -275,7 +255,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							ZVAL_COPY(&valueA, _33$$10);
 							_35$$12 = !(Z_TYPE_P(&valueA) == IS_LONG);
 							if (_35$$12) {
-								ZEPHIR_CALL_FUNCTION(&_36$$12, "is_float", &_18, 53, &valueA);
+								ZEPHIR_CALL_FUNCTION(&_36$$12, "is_float", &_18, 54, &valueA);
 								zephir_check_call_status();
 								_35$$12 = !zephir_is_true(&_36$$12);
 							}
@@ -286,10 +266,9 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								zephir_gettype(&_38$$13, &valueA);
 								ZEPHIR_INIT_NVAR(&_39$$13);
 								ZEPHIR_CONCAT_SSVS(&_39$$13, "Matrix element must", " be an integer or floating point number, ", &_38$$13, " given.");
-								ZEPHIR_CALL_METHOD(NULL, &_37$$13, "__construct", &_13, 52, &_39$$13);
+								ZEPHIR_CALL_METHOD(NULL, &_37$$13, "__construct", &_13, 53, &_39$$13);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_37$$13, "stub/issue2165/issue.zep", 40);
-								ZEPHIR_MM_RESTORE();
 								return;
 							}
 						} ZEND_HASH_FOREACH_END();
@@ -306,7 +285,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							zephir_check_call_status();
 								_40$$14 = !(Z_TYPE_P(&valueA) == IS_LONG);
 								if (_40$$14) {
-									ZEPHIR_CALL_FUNCTION(&_41$$14, "is_float", &_18, 53, &valueA);
+									ZEPHIR_CALL_FUNCTION(&_41$$14, "is_float", &_18, 54, &valueA);
 									zephir_check_call_status();
 									_40$$14 = !zephir_is_true(&_41$$14);
 								}
@@ -317,10 +296,9 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 									zephir_gettype(&_43$$15, &valueA);
 									ZEPHIR_INIT_NVAR(&_44$$15);
 									ZEPHIR_CONCAT_SSVS(&_44$$15, "Matrix element must", " be an integer or floating point number, ", &_43$$15, " given.");
-									ZEPHIR_CALL_METHOD(NULL, &_42$$15, "__construct", &_13, 52, &_44$$15);
+									ZEPHIR_CALL_METHOD(NULL, &_42$$15, "__construct", &_13, 53, &_44$$15);
 									zephir_check_call_status();
 									zephir_throw_exception_debug(&_42$$15, "stub/issue2165/issue.zep", 40);
-									ZEPHIR_MM_RESTORE();
 									return;
 								}
 							ZEPHIR_CALL_METHOD(NULL, &rowA, "next", NULL, 0);
@@ -328,7 +306,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						}
 					}
 					ZEPHIR_INIT_NVAR(&valueA);
-					ZEPHIR_CALL_FUNCTION(&_45$$10, "array_values", &_2, 50, &rowA);
+					ZEPHIR_CALL_FUNCTION(&_45$$10, "array_values", &_2, 51, &rowA);
 					zephir_check_call_status();
 					zephir_array_append(&rowA, &_45$$10, PH_SEPARATE, "stub/issue2165/issue.zep", 44);
 				ZEPHIR_CALL_METHOD(NULL, &a, "next", NULL, 0);
@@ -345,16 +323,13 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 	ZVAL_UNDEF(&_46);
 	ZVAL_LONG(&_46, n);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("n"), &_46);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, quick)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0;
 	zval a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
@@ -362,32 +337,24 @@ PHP_METHOD(Stub_Issue2165_Issue, quick)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &a_param);
 	if (!a_param) {
-		ZEPHIR_INIT_VAR(&a);
+		ZVAL_NULL(&a);
 		array_init(&a);
 	} else {
 		zephir_get_arrval(&a, a_param);
 	}
-
-
 	object_init_ex(return_value, stub_issue2165_issue_ce);
 	ZVAL_BOOL(&_0, 0);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 49, &a, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 50, &a, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, ones)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *m_param = NULL, *n_param = NULL, _0, _1, _2;
 	zend_long m, n, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
@@ -396,31 +363,21 @@ PHP_METHOD(Stub_Issue2165_Issue, ones)
 		Z_PARAM_LONG(m)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &m_param, &n_param);
-	m = zephir_get_intval(m_param);
-	n = zephir_get_intval(n_param);
-
-
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, m);
 	ZVAL_LONG(&_2, n);
 	ZEPHIR_RETURN_CALL_SELF("fill", NULL, 0, &_0, &_1, &_2);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, fill)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_8 = NULL, *_17 = NULL;
 	zend_long m, n, ZEPHIR_LAST_CALL_STATUS;
 	zval *value, value_sub, *m_param = NULL, *n_param = NULL, _1, _14, _15, _16, _18, _2$$3, _3$$3, _4$$3, _5$$4, _6$$4, _7$$4, _9$$4, _10$$5, _11$$5, _12$$5, _13$$5;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&_1);
@@ -444,60 +401,49 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		Z_PARAM_LONG(m)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &value, &m_param, &n_param);
-	m = zephir_get_intval(m_param);
-	n = zephir_get_intval(n_param);
-
-
 	_0 = !(Z_TYPE_P(value) == IS_LONG);
 	if (_0) {
-		ZEPHIR_CALL_FUNCTION(&_1, "is_float", NULL, 53, value);
+		ZEPHIR_CALL_FUNCTION(&_1, "is_float", NULL, 54, value);
 		zephir_check_call_status();
 		_0 = !zephir_is_true(&_1);
 	}
 	if (UNEXPECTED(_0)) {
-		ZEPHIR_INIT_VAR(&_2$$3);
+		ZVAL_NULL(&_2$$3);
 		object_init_ex(&_2$$3, spl_ce_InvalidArgumentException);
-		ZEPHIR_INIT_VAR(&_3$$3);
+		ZVAL_NULL(&_3$$3);
 		zephir_gettype(&_3$$3, value);
-		ZEPHIR_INIT_VAR(&_4$$3);
+		ZVAL_NULL(&_4$$3);
 		ZEPHIR_CONCAT_SSVS(&_4$$3, "Value must be an", " integer or floating point number, ", &_3$$3, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 52, &_4$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 53, &_4$$3);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_2$$3, "stub/issue2165/issue.zep", 68);
-		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	if (UNEXPECTED(m < 1)) {
-		ZEPHIR_INIT_VAR(&_5$$4);
+		ZVAL_NULL(&_5$$4);
 		object_init_ex(&_5$$4, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_6$$4, m);
-		ZEPHIR_CALL_FUNCTION(&_7$$4, "strval", &_8, 51, &_6$$4);
+		ZEPHIR_CALL_FUNCTION(&_7$$4, "strval", &_8, 52, &_6$$4);
 		zephir_check_call_status();
-		ZEPHIR_INIT_VAR(&_9$$4);
+		ZVAL_NULL(&_9$$4);
 		ZEPHIR_CONCAT_SSVS(&_9$$4, "M must be", " greater than 0, ", &_7$$4, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 52, &_9$$4);
+		ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 53, &_9$$4);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_5$$4, "stub/issue2165/issue.zep", 73);
-		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	if (UNEXPECTED(n < 1)) {
-		ZEPHIR_INIT_VAR(&_10$$5);
+		ZVAL_NULL(&_10$$5);
 		object_init_ex(&_10$$5, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_11$$5, n);
-		ZEPHIR_CALL_FUNCTION(&_12$$5, "strval", &_8, 51, &_11$$5);
+		ZEPHIR_CALL_FUNCTION(&_12$$5, "strval", &_8, 52, &_11$$5);
 		zephir_check_call_status();
-		ZEPHIR_INIT_VAR(&_13$$5);
+		ZVAL_NULL(&_13$$5);
 		ZEPHIR_CONCAT_SSVS(&_13$$5, "N must be", " greater than 0, ", &_12$$5, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_10$$5, "__construct", NULL, 52, &_13$$5);
+		ZEPHIR_CALL_METHOD(NULL, &_10$$5, "__construct", NULL, 53, &_13$$5);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_10$$5, "stub/issue2165/issue.zep", 78);
-		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZVAL_LONG(&_14, 0);
@@ -510,57 +456,43 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_SELF("quick", NULL, 0, &_18);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, reciprocal)
 {
 	zval _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("m"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("n"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CALL_SELF(&_0, "ones", NULL, 0, &_1, &_2);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_0, "dividematrix", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, divideMatrix)
 {
 	zval c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&b_sub);
 	ZVAL_UNDEF(&c);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(b, stub_issue2165_issue_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b);
-
-
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	array_init(&c);
 	ZEPHIR_RETURN_CALL_SELF("quick", NULL, 0, &c);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/issue663.zep.c b/ext/stub/issue663.zep.c
index b8336a9eb9..05f24544ba 100644
--- a/ext/stub/issue663.zep.c
+++ b/ext/stub/issue663.zep.c
@@ -29,23 +29,15 @@ ZEPHIR_INIT_CLASS(Stub_Issue663)
 PHP_METHOD(Stub_Issue663, is_array_assoc)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zval *arr, arr_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr);
-
-
 	_0 = !(Z_TYPE_P(arr) == IS_ARRAY);
 	if (!(_0)) {
 		_0 = ZEPHIR_IS_EMPTY(arr);
@@ -53,32 +45,24 @@ PHP_METHOD(Stub_Issue663, is_array_assoc)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZEPHIR_RETURN_CALL_STATIC("is_array_assoc_internal", &_1, 54, arr);
+	ZEPHIR_RETURN_CALL_STATIC("is_array_assoc_internal", &_1, 55, arr);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Issue663, is_array_assoc_internal)
 {
 	zend_bool _0;
 	zend_long count = 0, i = 0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arr_param = NULL;
 	zval arr;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(arr)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr_param);
 	zephir_get_arrval(&arr, arr_param);
-
-
 	count = zephir_fast_count_int(&arr);
 	_2 = (count - 1);
 	_1 = 0;
@@ -105,24 +89,16 @@ PHP_METHOD(Stub_Issue663, is_array_assoc_internal)
 PHP_METHOD(Stub_Issue663, is_array_indexed)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL;
 	zval *arr, arr_sub, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr_sub);
 	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr);
-
-
 	_0 = !(Z_TYPE_P(arr) == IS_ARRAY);
 	if (!(_0)) {
 		_0 = ZEPHIR_IS_EMPTY(arr);
@@ -130,7 +106,7 @@ PHP_METHOD(Stub_Issue663, is_array_indexed)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZEPHIR_CALL_STATIC(&_1, "is_array_assoc_internal", &_2, 54, arr);
+	ZEPHIR_CALL_STATIC(&_1, "is_array_assoc_internal", &_2, 55, arr);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(!zephir_is_true(&_1));
 }
diff --git a/ext/stub/issue887.zep.c b/ext/stub/issue887.zep.c
index dd71f225c7..8e1e96f42b 100644
--- a/ext/stub/issue887.zep.c
+++ b/ext/stub/issue887.zep.c
@@ -31,19 +31,12 @@ ZEPHIR_INIT_CLASS(Stub_Issue887)
 PHP_METHOD(Stub_Issue887, __construct)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Issue887, add)
@@ -57,19 +50,12 @@ PHP_METHOD(Stub_Issue887, add)
 		Z_PARAM_ZVAL(key)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &key, &value);
-
-
 	zephir_update_property_array(this_ptr, SL("data"), key, value);
 }
 
 PHP_METHOD(Stub_Issue887, fetch_array)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "data");
 }
@@ -77,16 +63,9 @@ PHP_METHOD(Stub_Issue887, fetch_array)
 PHP_METHOD(Stub_Issue887, fetch_object)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/issue914.zep.c b/ext/stub/issue914.zep.c
index 1d19e09059..22b5cbed16 100644
--- a/ext/stub/issue914.zep.c
+++ b/ext/stub/issue914.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Issue914)
@@ -26,17 +25,8 @@ ZEPHIR_INIT_CLASS(Stub_Issue914)
 
 PHP_METHOD(Stub_Issue914, __construct)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_PARENT(NULL, stub_issue914_ce, getThis(), "__construct", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/issues.zep.c b/ext/stub/issues.zep.c
index ceaad90189..fd6e9a6690 100644
--- a/ext/stub/issues.zep.c
+++ b/ext/stub/issues.zep.c
@@ -34,17 +34,12 @@ PHP_METHOD(Stub_Issues, setAdapter)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(adapter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &adapter);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("adapter"), adapter);
 }
 
 PHP_METHOD(Stub_Issues, someMethod)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *methodName, methodName_sub, _0;
 	zval *this_ptr = getThis();
@@ -54,24 +49,15 @@ PHP_METHOD(Stub_Issues, someMethod)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(methodName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &methodName);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD_ZVAL(&_0, methodName, NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Issues, test)
 {
-	zval *this_ptr = getThis();
-
-
 
 	php_printf("%s", "test");
 }
diff --git a/ext/stub/json.zep.c b/ext/stub/json.zep.c
index d8a3100b55..01d6cce674 100644
--- a/ext/stub/json.zep.c
+++ b/ext/stub/json.zep.c
@@ -29,40 +29,26 @@ ZEPHIR_INIT_CLASS(Stub_Json)
 PHP_METHOD(Stub_Json, testEncodeObject)
 {
 	zval obj;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&obj);
+	ZVAL_NULL(&obj);
 	zephir_create_array(&obj, 3, 0);
 	add_assoc_stringl_ex(&obj, SL("a"), SL("hello"));
 	add_assoc_stringl_ex(&obj, SL("b"), SL("world"));
 	add_assoc_long_ex(&obj, SL("c"), 128);
 	zephir_json_encode(return_value, &obj, 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Json, testEncodeArray)
 {
 	zval arr, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	zephir_create_array(&arr, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&arr, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -72,26 +58,19 @@ PHP_METHOD(Stub_Json, testEncodeArray)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&arr, &_0);
 	zephir_json_encode(return_value, &arr, 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Json, testEncodeOptions)
 {
 	zval arr, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	zephir_create_array(&arr, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "<foo>");
 	zephir_array_fast_append(&arr, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -105,61 +84,40 @@ PHP_METHOD(Stub_Json, testEncodeOptions)
 	zephir_array_fast_append(&arr, &_0);
 	ZVAL_LONG(&_1, 1);
 	zephir_json_encode(return_value, &arr, zephir_get_intval(&_1) );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Json, testDecodeObject)
 {
 	zval obj;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&obj);
+	ZVAL_NULL(&obj);
 	ZVAL_STRING(&obj, "{\"a\":\"hello\",\"b\":\"world\",\"c\":128}");
 	zephir_json_decode(return_value, &obj, 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Json, testDecodeObject2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, obj;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&obj);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&obj);
+	ZVAL_NULL(&obj);
 	ZVAL_STRING(&obj, "{\"a\":\"hello\",\"b\":\"world\",\"c\":128}");
 	zephir_json_decode(return_value, &obj, zephir_get_intval(&__$true) );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Json, testDecodeArray)
 {
 	zval arr;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&arr);
+	ZVAL_NULL(&arr);
 	ZVAL_STRING(&arr, "[1,2,3]");
 	zephir_json_decode(return_value, &arr, 0 );
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/logical.zep.c b/ext/stub/logical.zep.c
index a22841f196..20a2a9c38e 100644
--- a/ext/stub/logical.zep.c
+++ b/ext/stub/logical.zep.c
@@ -32,11 +32,6 @@ ZEPHIR_INIT_CLASS(Stub_Logical)
 PHP_METHOD(Stub_Logical, testAnd1)
 {
 	zend_bool _0;
-	zval *this_ptr = getThis();
-
-
-
-
 	_0 = ((0) ? 1 : 0);
 	if (_0) {
 		_0 = ((0) ? 1 : 0);
@@ -47,11 +42,6 @@ PHP_METHOD(Stub_Logical, testAnd1)
 PHP_METHOD(Stub_Logical, testAnd2)
 {
 	zend_bool _0;
-	zval *this_ptr = getThis();
-
-
-
-
 	_0 = ((0) ? 1 : 0);
 	if (_0) {
 		_0 = ((1.5 != 0.0) ? 1 : 0);
@@ -62,11 +52,6 @@ PHP_METHOD(Stub_Logical, testAnd2)
 PHP_METHOD(Stub_Logical, testAnd3)
 {
 	zend_bool _0, _1;
-	zval *this_ptr = getThis();
-
-
-
-
 	_0 = ((0) ? 1 : 0);
 	if (_0) {
 		_0 = ((1.5 != 0.0) ? 1 : 0);
@@ -81,11 +66,6 @@ PHP_METHOD(Stub_Logical, testAnd3)
 PHP_METHOD(Stub_Logical, testAnd4)
 {
 	zend_bool _0, _1;
-	zval *this_ptr = getThis();
-
-
-
-
 	_0 = ((1) ? 1 : 0);
 	if (_0) {
 		_0 = ((0) ? 1 : 0);
@@ -102,7 +82,6 @@ PHP_METHOD(Stub_Logical, testAnd9)
 	zend_bool _0;
 	zend_long b;
 	zval *a, a_sub, *b_param = NULL, _1$$3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_1$$3);
@@ -110,12 +89,7 @@ PHP_METHOD(Stub_Logical, testAnd9)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b_param);
-	b = zephir_get_intval(b_param);
-
-
 	_0 = Z_TYPE_P(a) == IS_ARRAY;
 	if (_0) {
 		_0 = zephir_array_isset_long(a, b);
@@ -130,11 +104,6 @@ PHP_METHOD(Stub_Logical, testAnd9)
 PHP_METHOD(Stub_Logical, testOr1)
 {
 	zend_bool _0;
-	zval *this_ptr = getThis();
-
-
-
-
 	_0 = ((0) ? 1 : 0);
 	if (!(_0)) {
 		_0 = ((1) ? 1 : 0);
@@ -145,11 +114,6 @@ PHP_METHOD(Stub_Logical, testOr1)
 PHP_METHOD(Stub_Logical, testOr2)
 {
 	zend_bool _0;
-	zval *this_ptr = getThis();
-
-
-
-
 	_0 = ((0) ? 1 : 0);
 	if (!(_0)) {
 		_0 = 1;
@@ -161,11 +125,6 @@ PHP_METHOD(Stub_Logical, testMixed1)
 {
 	zend_bool _0, _1;
 	zend_long first = 0, second = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	first = 0;
 	second = 1;
 	_0 = ((first) ? 1 : 0);
@@ -187,7 +146,6 @@ PHP_METHOD(Stub_Logical, testMixed2)
 {
 	zend_bool _0, _1;
 	zval *match, match_sub, *minLength, minLength_sub, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&match_sub);
 	ZVAL_UNDEF(&minLength_sub);
@@ -196,11 +154,7 @@ PHP_METHOD(Stub_Logical, testMixed2)
 		Z_PARAM_ZVAL(match)
 		Z_PARAM_ZVAL(minLength)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &match, &minLength);
-
-
 	_0 = Z_TYPE_P(match) == IS_ARRAY;
 	if (_0) {
 		_0 = zephir_fast_count_int(match) == 2;
@@ -219,11 +173,6 @@ PHP_METHOD(Stub_Logical, testMixed2)
 PHP_METHOD(Stub_Logical, testMixed3)
 {
 	zend_bool a = 0, b = 0, _0, _1, _2, _3;
-	zval *this_ptr = getThis();
-
-
-
-
 	_0 = ((0) ? 1 : 0);
 	if (_0) {
 		_0 = ((1) ? 1 : 0);
@@ -249,19 +198,12 @@ PHP_METHOD(Stub_Logical, testMixed4)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	zend_bool a, b, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_BOOL(a)
 		Z_PARAM_BOOL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_boolval(a_param);
-	b = zephir_get_boolval(b_param);
-
-
 	_0 = !a;
 	if (_0) {
 		_0 = !b;
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
index e75059b0e4..d5141213aa 100644
--- a/ext/stub/mcall.zep.c
+++ b/ext/stub/mcall.zep.c
@@ -33,27 +33,18 @@ ZEPHIR_INIT_CLASS(Stub_Mcall)
 
 PHP_METHOD(Stub_Mcall, testMethod1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello public");
 }
 
 PHP_METHOD(Stub_Mcall, testMethod2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello protected");
 }
 
 PHP_METHOD(Stub_Mcall, testMethod3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello private");
 }
@@ -61,7 +52,6 @@ PHP_METHOD(Stub_Mcall, testMethod3)
 PHP_METHOD(Stub_Mcall, testMethod4)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -69,11 +59,7 @@ PHP_METHOD(Stub_Mcall, testMethod4)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	zephir_add_function(return_value, a, b);
 	return;
 }
@@ -81,7 +67,6 @@ PHP_METHOD(Stub_Mcall, testMethod4)
 PHP_METHOD(Stub_Mcall, testMethod5)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -89,11 +74,7 @@ PHP_METHOD(Stub_Mcall, testMethod5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	zephir_add_function(return_value, a, b);
 	return;
 }
@@ -101,7 +82,6 @@ PHP_METHOD(Stub_Mcall, testMethod5)
 PHP_METHOD(Stub_Mcall, testMethod6)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -109,20 +89,13 @@ PHP_METHOD(Stub_Mcall, testMethod6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	zephir_add_function(return_value, a, b);
 	return;
 }
 
 PHP_METHOD(Stub_Mcall, testMethod7)
 {
-	zval *this_ptr = getThis();
-
-
 
 	object_init(return_value);
 	return;
@@ -130,55 +103,33 @@ PHP_METHOD(Stub_Mcall, testMethod7)
 
 PHP_METHOD(Stub_Mcall, testCall1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 55);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 56);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -189,21 +140,14 @@ PHP_METHOD(Stub_Mcall, testCall4)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -214,21 +158,14 @@ PHP_METHOD(Stub_Mcall, testCall5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall6)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -239,21 +176,14 @@ PHP_METHOD(Stub_Mcall, testCall6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 56, a, b);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 57, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall7)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, _0, _2;
@@ -267,24 +197,17 @@ PHP_METHOD(Stub_Mcall, testCall7)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod4", &_1, 0, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "testmethod4", &_1, 0, a, b);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_2);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall8)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, _0, _2;
@@ -298,24 +221,17 @@ PHP_METHOD(Stub_Mcall, testCall8)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod5", &_1, 0, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "testmethod5", &_1, 0, a, b);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_2);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall9)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, _0, _1;
 	zval *this_ptr = getThis();
@@ -328,72 +244,44 @@ PHP_METHOD(Stub_Mcall, testCall9)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod6", NULL, 56, a, b);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod6", NULL, 57, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_1);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall10)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall11)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall12)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 55);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 56);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall13)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -404,21 +292,14 @@ PHP_METHOD(Stub_Mcall, testCall13)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall14)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -429,21 +310,14 @@ PHP_METHOD(Stub_Mcall, testCall14)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall15)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -454,21 +328,14 @@ PHP_METHOD(Stub_Mcall, testCall15)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 56, a, b);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 57, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall16)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *c, c_sub, *d, d_sub;
 	zval *this_ptr = getThis();
@@ -479,21 +346,14 @@ PHP_METHOD(Stub_Mcall, testCall16)
 		Z_PARAM_ZVAL(c)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &c, &d);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, c, d);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall17)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *c, c_sub, *d, d_sub;
 	zval *this_ptr = getThis();
@@ -504,58 +364,37 @@ PHP_METHOD(Stub_Mcall, testCall17)
 		Z_PARAM_ZVAL(c)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &c, &d);
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, c, d);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCall18)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 57);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 58);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testMethod19)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	long a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_LONG((a + b));
 }
 
 PHP_METHOD(Stub_Mcall, testCall20)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
@@ -568,14 +407,7 @@ PHP_METHOD(Stub_Mcall, testCall20)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
-	k = zephir_get_intval(k_param);
-
-
 	j = 0;
 	_2 = k;
 	_1 = 1;
@@ -603,26 +435,18 @@ PHP_METHOD(Stub_Mcall, testMethod21)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	long a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_LONG((a + b));
 }
 
 PHP_METHOD(Stub_Mcall, testCall22)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
@@ -635,14 +459,7 @@ PHP_METHOD(Stub_Mcall, testCall22)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
-	k = zephir_get_intval(k_param);
-
-
 	j = 0;
 	_2 = k;
 	_1 = 1;
@@ -658,7 +475,7 @@ PHP_METHOD(Stub_Mcall, testCall22)
 				_0 = 1;
 			}
 			i = _1;
-			ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "testmethod21", &_4, 58, p, p);
+			ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "testmethod21", &_4, 59, p, p);
 			zephir_check_call_status();
 			j += zephir_get_numberval(&_3$$3);
 		}
@@ -668,19 +485,13 @@ PHP_METHOD(Stub_Mcall, testCall22)
 
 PHP_METHOD(Stub_Mcall, optionalRequereString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param_param = NULL;
 	zval param;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &param_param);
 	if (UNEXPECTED(Z_TYPE_P(param_param) != IS_STRING && Z_TYPE_P(param_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param' must be of the type string"));
@@ -689,47 +500,35 @@ PHP_METHOD(Stub_Mcall, optionalRequereString)
 	if (EXPECTED(Z_TYPE_P(param_param) == IS_STRING)) {
 		zephir_get_strval(&param, param_param);
 	} else {
-		ZEPHIR_INIT_VAR(&param);
+		ZVAL_NULL(&param);
 	}
-
-
 	RETURN_CTOR(&param);
 }
 
 PHP_METHOD(Stub_Mcall, optionalParameterString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param_param = NULL;
 	zval param;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param);
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &param_param);
 	if (!param_param) {
-		ZEPHIR_INIT_VAR(&param);
+		ZVAL_NULL(&param);
 		ZVAL_STRING(&param, "test string");
 	} else {
 		zephir_get_strval(&param, param_param);
 	}
-
-
 	RETURN_CTOR(&param);
 }
 
 PHP_METHOD(Stub_Mcall, optionalParameterStringNull)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param_param = NULL;
 	zval param;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param);
 	bool is_null_true = 1;
@@ -737,18 +536,12 @@ PHP_METHOD(Stub_Mcall, optionalParameterStringNull)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &param_param);
 	if (!param_param) {
-		ZEPHIR_INIT_VAR(&param);
+		ZVAL_NULL(&param);
 	} else {
 		zephir_get_strval(&param, param_param);
 	}
-
-
 	RETURN_CTOR(&param);
 }
 
@@ -756,29 +549,22 @@ PHP_METHOD(Stub_Mcall, optionalParameterInt)
 {
 	zval *param_param = NULL;
 	zend_long param;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &param_param);
 	if (!param_param) {
 		param = 2;
 	} else {
-		param = zephir_get_intval(param_param);
-	}
-
-
+		}
 	RETURN_LONG(param);
 }
 
 PHP_METHOD(Stub_Mcall, optionalParameterVar)
 {
 	zval *param = NULL, param_sub, __$null;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
@@ -787,15 +573,11 @@ PHP_METHOD(Stub_Mcall, optionalParameterVar)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
 	if (!param) {
 		param = &param_sub;
 		param = &__$null;
 	}
-
-
 	RETVAL_ZVAL(param, 1, 0);
 	return;
 }
@@ -804,22 +586,16 @@ PHP_METHOD(Stub_Mcall, optionalParameterBoolTrue)
 {
 	zval *param_param = NULL;
 	zend_bool param;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &param_param);
 	if (!param_param) {
 		param = 1;
 	} else {
-		param = zephir_get_boolval(param_param);
-	}
-
-
+		}
 	RETURN_BOOL(param);
 }
 
@@ -827,22 +603,16 @@ PHP_METHOD(Stub_Mcall, optionalParameterBoolFalse)
 {
 	zval *param_param = NULL;
 	zend_bool param;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &param_param);
 	if (!param_param) {
 		param = 0;
 	} else {
-		param = zephir_get_boolval(param_param);
-	}
-
-
+		}
 	RETURN_BOOL(param);
 }
 
@@ -850,14 +620,11 @@ PHP_METHOD(Stub_Mcall, optionalParameterBoolean)
 {
 	zval *start_param = NULL;
 	zend_bool start;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(start)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &start_param);
 	if (!start_param) {
 		start = 1;
@@ -868,8 +635,6 @@ PHP_METHOD(Stub_Mcall, optionalParameterBoolean)
 	}
 	start = (Z_TYPE_P(start_param) == IS_TRUE);
 	}
-
-
 	RETURN_BOOL(start);
 }
 
@@ -877,15 +642,12 @@ PHP_METHOD(Stub_Mcall, optionalParameterBooleanNull)
 {
 	zval *value_param = NULL;
 	zend_bool value;
-	zval *this_ptr = getThis();
 
 	bool is_null_true = 1;
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL_OR_NULL(value, is_null_true)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &value_param);
 	if (!value_param) {
 		value = 0;
@@ -896,8 +658,6 @@ PHP_METHOD(Stub_Mcall, optionalParameterBooleanNull)
 	}
 	value = (Z_TYPE_P(value_param) == IS_TRUE);
 	}
-
-
 	RETURN_BOOL(value);
 }
 
@@ -906,38 +666,28 @@ PHP_METHOD(Stub_Mcall, optionalParameterBooleanNull)
  */
 PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultEmptyArray)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *driverOptions_param = NULL;
 	zval driverOptions;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&driverOptions);
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &driverOptions_param);
 	if (!driverOptions_param) {
-		ZEPHIR_INIT_VAR(&driverOptions);
+		ZVAL_NULL(&driverOptions);
 		array_init(&driverOptions);
 	} else {
 		zephir_get_arrval(&driverOptions, driverOptions_param);
 	}
-
-
 	RETURN_CTOR(&driverOptions);
 }
 
 PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultNullValue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *driverOptions_param = NULL;
 	zval driverOptions;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&driverOptions);
 	bool is_null_true = 1;
@@ -945,57 +695,38 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultNullValue)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &driverOptions_param);
 	if (!driverOptions_param) {
-		ZEPHIR_INIT_VAR(&driverOptions);
+		ZVAL_NULL(&driverOptions);
 	} else {
 		zephir_get_arrval(&driverOptions, driverOptions_param);
 	}
-
-
 	RETURN_CTOR(&driverOptions);
 }
 
 PHP_METHOD(Stub_Mcall, testArrayParam)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *driverOptions_param = NULL;
 	zval driverOptions;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&driverOptions);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &driverOptions_param);
 	zephir_get_arrval(&driverOptions, driverOptions_param);
-
-
 	RETURN_CTOR(&driverOptions);
 }
 
 PHP_METHOD(Stub_Mcall, testObjectParamCastStdClass)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, zend_standard_class_def)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	RETVAL_ZVAL(param, 1, 0);
 	return;
 }
@@ -1003,26 +734,18 @@ PHP_METHOD(Stub_Mcall, testObjectParamCastStdClass)
 PHP_METHOD(Stub_Mcall, testObjectParamCastOoParam)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, stub_oo_param_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	RETVAL_ZVAL(param, 1, 0);
 	return;
 }
 
 PHP_METHOD(Stub_Mcall, bb)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello");
 }
@@ -1030,89 +753,69 @@ PHP_METHOD(Stub_Mcall, bb)
 PHP_METHOD(Stub_Mcall, testCallablePass)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init_ex(&a, stub_oo_ooparams_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_12__closure_ce, SL("__invoke"));
-	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 59, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 60, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, testCallableArrayThisMethodPass)
 {
 	zval _0;
 	zval a, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init_ex(&a, stub_oo_ooparams_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 2, 0);
 	zephir_array_fast_append(&_0, this_ptr);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "bb");
 	zephir_array_fast_append(&_0, &_1);
-	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 59, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 60, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall, aa)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	object_init_ex(&a, stub_mcall_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_RETURN_CALL_METHOD(&a, "bb", NULL, 60);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "bb", NULL, 61);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1121,35 +824,28 @@ PHP_METHOD(Stub_Mcall, aa)
 PHP_METHOD(Stub_Mcall, issue1136)
 {
 	zval _finfo, _0, _1, _2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_finfo);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "PHP_VERSION");
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "8.0.0");
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, ">=");
-	ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 61, &_0, &_1, &_2);
+	ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 62, &_0, &_1, &_2);
 	zephir_check_call_status();
 	if (zephir_is_true(&_3)) {
-		ZEPHIR_INIT_VAR(&_finfo);
+		ZVAL_NULL(&_finfo);
 		object_init_ex(&_finfo, zephir_get_internal_ce(SL("finfo")));
 		ZEPHIR_CALL_METHOD(NULL, &_finfo, "__construct", NULL, 0);
 		zephir_check_call_status();
 	} else {
-		ZEPHIR_CALL_FUNCTION(&_finfo, "finfo_open", NULL, 62);
+		ZEPHIR_CALL_FUNCTION(&_finfo, "finfo_open", NULL, 63);
 		zephir_check_call_status();
 	}
 	RETURN_CCTOR(&_finfo);
@@ -1158,7 +854,6 @@ PHP_METHOD(Stub_Mcall, issue1136)
 PHP_METHOD(Stub_Mcall, issue2245VarArgumentNullable)
 {
 	zval *param = NULL, param_sub, __$null;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_NULL(&__$null);
@@ -1167,15 +862,11 @@ PHP_METHOD(Stub_Mcall, issue2245VarArgumentNullable)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &param);
 	if (!param) {
 		param = &param_sub;
 		param = &__$null;
 	}
-
-
 	RETVAL_ZVAL(param, 1, 0);
 	return;
 }
diff --git a/ext/stub/mcall/caller.zep.c b/ext/stub/mcall/caller.zep.c
index 002f56ec13..bca429cc0c 100644
--- a/ext/stub/mcall/caller.zep.c
+++ b/ext/stub/mcall/caller.zep.c
@@ -26,32 +26,21 @@ ZEPHIR_INIT_CLASS(Stub_Mcall_Caller)
 
 PHP_METHOD(Stub_Mcall_Caller, start)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *f, f_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&f_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(f)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &f);
-
-
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(f, NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Mcall_Caller, perform)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("Caller:perform");
 }
diff --git a/ext/stub/mcallchained.zep.c b/ext/stub/mcallchained.zep.c
index 785ce3a1ed..ce4d73f0e0 100644
--- a/ext/stub/mcallchained.zep.c
+++ b/ext/stub/mcallchained.zep.c
@@ -31,116 +31,83 @@ ZEPHIR_INIT_CLASS(Stub_McallChained)
 PHP_METHOD(Stub_McallChained, testMethod1)
 {
 	zval *this_ptr = getThis();
-
-
-
 	RETURN_THISW();
 }
 
 PHP_METHOD(Stub_McallChained, testMethod2)
 {
 	zval *this_ptr = getThis();
-
-
-
 	RETURN_THISW();
 }
 
 PHP_METHOD(Stub_McallChained, testMethod3)
 {
 	zval *this_ptr = getThis();
-
-
-
 	RETURN_THISW();
 }
 
 PHP_METHOD(Stub_McallChained, testChained1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_0, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_McallChained, testChained2)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod3", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_1, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_McallChained, testChained3)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 63);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 64);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod2", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_1, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_McallChained, testChained4)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("temp"), this_ptr);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("temp"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_1, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/mcalldynamic.zep.c b/ext/stub/mcalldynamic.zep.c
index 8cbe4db320..14855f3674 100644
--- a/ext/stub/mcalldynamic.zep.c
+++ b/ext/stub/mcalldynamic.zep.c
@@ -31,9 +31,6 @@ ZEPHIR_INIT_CLASS(Stub_McallDynamic)
 
 PHP_METHOD(Stub_McallDynamic, testMethod1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(1);
 }
@@ -41,28 +38,21 @@ PHP_METHOD(Stub_McallDynamic, testMethod1)
 PHP_METHOD(Stub_McallDynamic, testMagicCall1)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "method1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "method1", NULL, 0);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_1);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_McallDynamic, __call)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *method, method_sub, *arguments, arguments_sub, realMethod;
 	zval *this_ptr = getThis();
@@ -74,18 +64,12 @@ PHP_METHOD(Stub_McallDynamic, __call)
 		Z_PARAM_ZVAL(method)
 		Z_PARAM_ZVAL(arguments)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &method, &arguments);
-
-
-	ZEPHIR_INIT_VAR(&realMethod);
+	ZVAL_NULL(&realMethod);
 	ZEPHIR_CONCAT_SV(&realMethod, "test", method);
 	ZEPHIR_RETURN_CALL_METHOD_ZVAL(this_ptr, &realMethod, NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -94,18 +78,11 @@ PHP_METHOD(Stub_McallDynamic, __call)
 PHP_METHOD(Stub_McallDynamic, testCallAnonymousFunctionWithContext)
 {
 	zval result, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&result);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_13__closure_ce, SL("__invoke"));
 	ZEPHIR_CALL_CE_STATIC(&result, stub_mcall_caller_ce, "start", NULL, 0, &_0);
diff --git a/ext/stub/mcallinternal.zep.c b/ext/stub/mcallinternal.zep.c
index cf687c2f6a..4d9ba84cbe 100644
--- a/ext/stub/mcallinternal.zep.c
+++ b/ext/stub/mcallinternal.zep.c
@@ -32,14 +32,8 @@ ZEPHIR_INIT_CLASS(Stub_McallInternal)
 void zep_Stub_McallInternal_a(int ht, zend_execute_data *execute_data, zval *return_value, zval *this_ptr, int return_value_used)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -53,14 +47,9 @@ void zep_Stub_McallInternal_b(int ht, zend_execute_data *execute_data, zval *ret
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	a = a_ext;
 
 	b = b_ext;
-
-
-
 }
 
 void zep_Stub_McallInternal_c(int ht, zend_execute_data *execute_data, zval *return_value, zval *this_ptr, int return_value_used, zval *a_param_ext, zval *b_param_ext)
@@ -71,32 +60,18 @@ void zep_Stub_McallInternal_c(int ht, zend_execute_data *execute_data, zval *ret
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	a_param = a_param_ext;
 
 	b_param = b_param_ext;
-
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_LONG((a + b));
 }
 
 PHP_METHOD(Stub_McallInternal, e)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -105,16 +80,10 @@ PHP_METHOD(Stub_McallInternal, d)
 {
 	zval _3$$3;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a, i = 0, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 0;
 	_2 = 1000000;
 	_1 = 0;
@@ -142,17 +111,11 @@ PHP_METHOD(Stub_McallInternal, f)
 {
 	zval _3$$3;
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a, i = 0, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 0;
 	_2 = 1000000;
 	_1 = 0;
@@ -181,18 +144,12 @@ PHP_METHOD(Stub_McallInternal, g)
 	zval _3$$3, _4$$3, _5$$3;
 	zend_bool _0;
 	long i = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
 	ZVAL_UNDEF(&_5$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 0;
 	_2 = 1000;
 	_1 = 0;
@@ -226,16 +183,9 @@ void zep_Stub_McallInternal_other(int ht, zend_execute_data *execute_data, zval
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	a_param = a_param_ext;
 
 	b_param = b_param_ext;
-
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_DOUBLE(zephir_safe_div_long_long(a, b));
 }
 
@@ -245,18 +195,12 @@ PHP_METHOD(Stub_McallInternal, callFibonacci)
 	zend_bool _0;
 	long i;
 	double p;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
 	ZVAL_UNDEF(&_5$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	p = (double) (0);
 	i = 0;
 	_2 = 10000000;
@@ -277,7 +221,7 @@ PHP_METHOD(Stub_McallInternal, callFibonacci)
 			ZVAL_LONG(&_5$$3, (i + 1));
 			ZEPHIR_CALL_INTERNAL_METHOD_P2(&_3$$3, this_ptr, zep_Stub_McallInternal_other, &_4$$3, &_5$$3);
 			zephir_check_call_status();
-			p += zephir_get_doubleval(&_3$$3);
+			p +=  (zephir_get_doubleval(&_3$$3));
 		}
 	}
 	RETURN_MM_DOUBLE(p);
@@ -286,24 +230,15 @@ PHP_METHOD(Stub_McallInternal, callFibonacci)
 void zep_Stub_McallInternal_test1956(int ht, zend_execute_data *execute_data, zval *return_value, zval *this_ptr, int return_value_used)
 {
 	
-
-
 	RETURN_THISW();
 }
 
 PHP_METHOD(Stub_McallInternal, issue1956)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_INTERNAL_METHOD_P0(this_ptr, zep_Stub_McallInternal_test1956);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/methodabstract.zep.c b/ext/stub/methodabstract.zep.c
index 2d8fcc8d4a..f57abda735 100644
--- a/ext/stub/methodabstract.zep.c
+++ b/ext/stub/methodabstract.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_MethodAbstract)
@@ -27,17 +26,9 @@ ZEPHIR_INIT_CLASS(Stub_MethodAbstract)
 
 PHP_METHOD(Stub_MethodAbstract, testInterfaceMetho)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "testmethod", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/methodargs.zep.c b/ext/stub/methodargs.zep.c
index 6a80262f64..4aa99f4593 100644
--- a/ext/stub/methodargs.zep.c
+++ b/ext/stub/methodargs.zep.c
@@ -44,11 +44,7 @@ PHP_METHOD(Stub_MethodArgs, setCallable)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), a);
 }
 
@@ -61,11 +57,7 @@ PHP_METHOD(Stub_MethodArgs, setObject)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), a);
 }
 
@@ -78,15 +70,11 @@ PHP_METHOD(Stub_MethodArgs, setCallableStrict)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
 	if (UNEXPECTED(zephir_is_callable(a) != 1)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'a' must be of the type callable"));
 		RETURN_NULL();
 	}
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), a);
 }
 
@@ -99,15 +87,11 @@ PHP_METHOD(Stub_MethodArgs, setObjectStrict)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
 	if (UNEXPECTED(Z_TYPE_P(a) != IS_OBJECT)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'a' must be of the type object"));
 		RETURN_NULL();
 	}
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), a);
 }
 
@@ -120,15 +104,11 @@ PHP_METHOD(Stub_MethodArgs, setResourceStrict)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_RESOURCE(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
 	if (UNEXPECTED(Z_TYPE_P(a) != IS_RESOURCE)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'a' must be of the type resource"));
 		RETURN_NULL();
 	}
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), a);
 }
 
@@ -137,29 +117,21 @@ PHP_METHOD(Stub_MethodArgs, setResourceStrict)
  */
 PHP_METHOD(Stub_MethodArgs, methodOptionalValueWithDefaultStaticConstantAccess)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *method = NULL, method_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&method_sub);
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(method)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &method);
 	if (!method) {
 		method = &method_sub;
-		ZEPHIR_INIT_VAR(method);
+		ZVAL_NULL(method);
 		ZVAL_STRING(method, "get");
 	}
-
-
 	RETVAL_ZVAL(method, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -168,29 +140,21 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalValueWithDefaultStaticConstantAccess)
  */
 PHP_METHOD(Stub_MethodArgs, methodOptionalStringValueWithDefaultStaticConstantAccess)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *parameter_param = NULL;
 	zval parameter;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameter);
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &parameter_param);
 	if (!parameter_param) {
-		ZEPHIR_INIT_VAR(&parameter);
+		ZVAL_NULL(&parameter);
 		ZVAL_STRING(&parameter, "get");
 	} else {
 		zephir_get_strval(&parameter, parameter_param);
 	}
-
-
 	RETURN_CTOR(&parameter);
 }
 
@@ -202,22 +166,17 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalDoubleValueWithDefaultStaticConstantAc
 {
 	zval *parameter_param = NULL;
 	double parameter;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &parameter_param);
 	if (!parameter_param) {
 		parameter = 1.32;
 	} else {
 		parameter = zephir_get_doubleval(parameter_param);
 	}
-
-
 	RETURN_DOUBLE(parameter);
 }
 
@@ -229,22 +188,16 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalBoolValueWithDefaultStaticConstantAcce
 {
 	zval *parameter_param = NULL;
 	zend_bool parameter;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &parameter_param);
 	if (!parameter_param) {
 		parameter = 1;
 	} else {
-		parameter = zephir_get_boolval(parameter_param);
-	}
-
-
+		}
 	RETURN_BOOL(parameter);
 }
 
@@ -256,22 +209,16 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalIntValueWithDefaultStaticConstantAcces
 {
 	zval *parameter_param = NULL;
 	zend_long parameter;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &parameter_param);
 	if (!parameter_param) {
 		parameter = 12345;
 	} else {
-		parameter = zephir_get_intval(parameter_param);
-	}
-
-
+		}
 	RETURN_LONG(parameter);
 }
 
diff --git a/ext/stub/namespaces/classentry.zep.c b/ext/stub/namespaces/classentry.zep.c
index c2281e7a46..06715cbba9 100644
--- a/ext/stub/namespaces/classentry.zep.c
+++ b/ext/stub/namespaces/classentry.zep.c
@@ -26,17 +26,12 @@ ZEPHIR_INIT_CLASS(Stub_Namespaces_ClassEntry)
 PHP_METHOD(Stub_Namespaces_ClassEntry, setParam)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, stub_namespaces_a_b_sub_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	RETVAL_ZVAL(param, 1, 0);
 	return;
 }
@@ -44,17 +39,12 @@ PHP_METHOD(Stub_Namespaces_ClassEntry, setParam)
 PHP_METHOD(Stub_Namespaces_ClassEntry, setParamImported)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(param, stub_namespaces_a_b_sub_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	RETVAL_ZVAL(param, 1, 0);
 	return;
 }
diff --git a/ext/stub/nativearray.zep.c b/ext/stub/nativearray.zep.c
index 957e17641e..394c524a84 100644
--- a/ext/stub/nativearray.zep.c
+++ b/ext/stub/nativearray.zep.c
@@ -33,16 +33,9 @@ ZEPHIR_INIT_CLASS(Stub_NativeArray)
 PHP_METHOD(Stub_NativeArray, testArray1)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	RETURN_CCTOR(&a);
 }
@@ -50,19 +43,12 @@ PHP_METHOD(Stub_NativeArray, testArray1)
 PHP_METHOD(Stub_NativeArray, testArray2)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -77,19 +63,12 @@ PHP_METHOD(Stub_NativeArray, testArray2)
 PHP_METHOD(Stub_NativeArray, testArray3)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_DOUBLE(&_0, 1.1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -103,19 +82,12 @@ PHP_METHOD(Stub_NativeArray, testArray3)
 
 PHP_METHOD(Stub_NativeArray, testArray4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, __$true, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_fast_append(&a, &__$false);
 	zephir_array_fast_append(&a, &__$true);
@@ -125,18 +97,11 @@ PHP_METHOD(Stub_NativeArray, testArray4)
 
 PHP_METHOD(Stub_NativeArray, testArray5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_fast_append(&a, &__$null);
 	zephir_array_fast_append(&a, &__$null);
@@ -147,19 +112,12 @@ PHP_METHOD(Stub_NativeArray, testArray5)
 PHP_METHOD(Stub_NativeArray, testArray6)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "x");
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -175,22 +133,15 @@ PHP_METHOD(Stub_NativeArray, testArray7)
 {
 	zend_long a = 0, b = 0, c = 0;
 	zval d, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	b = 2;
 	c = 3;
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	zephir_create_array(&d, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_array_fast_append(&d, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -206,22 +157,15 @@ PHP_METHOD(Stub_NativeArray, testArray8)
 {
 	double a = 0, b = 0, c = 0;
 	zval d, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = (double) (1);
 	b = (double) (2);
 	c = (double) (3);
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	zephir_create_array(&d, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_DOUBLE(&_0, a);
 	zephir_array_fast_append(&d, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -237,22 +181,15 @@ PHP_METHOD(Stub_NativeArray, testArray9)
 {
 	zend_bool a = 0, b = 0, c = 0;
 	zval d, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	b = 0;
 	c = 1;
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	zephir_create_array(&d, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_array_fast_append(&d, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -268,25 +205,18 @@ PHP_METHOD(Stub_NativeArray, testArray10)
 {
 	zval a, b, c;
 	zval d;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "hello1");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "hello2");
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_STRING(&c, "hello3");
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	zephir_create_array(&d, 3, 0);
 	zephir_array_fast_append(&d, &a);
 	zephir_array_fast_append(&d, &b);
@@ -297,21 +227,14 @@ PHP_METHOD(Stub_NativeArray, testArray10)
 PHP_METHOD(Stub_NativeArray, testArray11)
 {
 	zval a, b, c, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -320,7 +243,7 @@ PHP_METHOD(Stub_NativeArray, testArray11)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	zephir_create_array(&b, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 4);
@@ -331,7 +254,7 @@ PHP_METHOD(Stub_NativeArray, testArray11)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 6);
 	zephir_array_fast_append(&b, &_0);
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	zephir_create_array(&c, 2, 0);
 	zephir_array_fast_append(&c, &a);
 	zephir_array_fast_append(&c, &b);
@@ -341,21 +264,14 @@ PHP_METHOD(Stub_NativeArray, testArray11)
 PHP_METHOD(Stub_NativeArray, testArray12)
 {
 	zval a, b, c, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -364,10 +280,10 @@ PHP_METHOD(Stub_NativeArray, testArray12)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	zephir_create_array(&b, 1, 0);
 	zephir_array_fast_append(&b, &a);
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	zephir_create_array(&c, 1, 0);
 	zephir_array_fast_append(&c, &b);
 	RETURN_CCTOR(&c);
@@ -376,16 +292,9 @@ PHP_METHOD(Stub_NativeArray, testArray12)
 PHP_METHOD(Stub_NativeArray, testArray13)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_index_stringl(&a, 1, SL("hello1"));
 	add_index_stringl(&a, 2, SL("hello2"));
@@ -396,16 +305,9 @@ PHP_METHOD(Stub_NativeArray, testArray13)
 PHP_METHOD(Stub_NativeArray, testArray14)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("hello1"), 1);
 	add_assoc_long_ex(&a, SL("hello2"), 2);
@@ -415,19 +317,12 @@ PHP_METHOD(Stub_NativeArray, testArray14)
 
 PHP_METHOD(Stub_NativeArray, testArray15)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_string(&a, SL("hello1"), &__$true, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&a, SL("hello2"), &__$false, PH_COPY | PH_SEPARATE);
@@ -438,16 +333,9 @@ PHP_METHOD(Stub_NativeArray, testArray15)
 PHP_METHOD(Stub_NativeArray, testArray16)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_double_ex(&a, SL("hello1"), 1.0);
 	add_assoc_double_ex(&a, SL("hello2"), 2.0);
@@ -457,18 +345,11 @@ PHP_METHOD(Stub_NativeArray, testArray16)
 
 PHP_METHOD(Stub_NativeArray, testArray17)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_string(&a, SL("hello1"), &__$null, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&a, SL("hello2"), &__$null, PH_COPY | PH_SEPARATE);
@@ -479,16 +360,9 @@ PHP_METHOD(Stub_NativeArray, testArray17)
 PHP_METHOD(Stub_NativeArray, testArray18)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_stringl_ex(&a, SL("hello1"), SL("a"));
 	add_assoc_stringl_ex(&a, SL("hello2"), SL("b"));
@@ -498,19 +372,12 @@ PHP_METHOD(Stub_NativeArray, testArray18)
 
 PHP_METHOD(Stub_NativeArray, testArray19)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &__$true, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &__$false, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -521,16 +388,9 @@ PHP_METHOD(Stub_NativeArray, testArray19)
 PHP_METHOD(Stub_NativeArray, testArray20)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_index_double(&a, 0, 1.0);
 	add_index_double(&a, 1, 2.0);
@@ -540,18 +400,11 @@ PHP_METHOD(Stub_NativeArray, testArray20)
 
 PHP_METHOD(Stub_NativeArray, testArray21)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &__$null, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &__$null, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -562,16 +415,9 @@ PHP_METHOD(Stub_NativeArray, testArray21)
 PHP_METHOD(Stub_NativeArray, testArray22)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_index_long(&a, 0, 4);
 	add_index_long(&a, 1, 5);
@@ -583,20 +429,13 @@ PHP_METHOD(Stub_NativeArray, testArray23)
 {
 	zend_long b = 0;
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	b = 0;
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, b);
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -612,20 +451,13 @@ PHP_METHOD(Stub_NativeArray, testArray24)
 {
 	double b = 0;
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	b = 0.0;
-	ZEPHIR_INIT_VAR(&a);
+	b =  (0.0);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_DOUBLE(&_0, b);
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -641,20 +473,13 @@ PHP_METHOD(Stub_NativeArray, testArray25)
 {
 	zend_bool b = 0;
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	b = 0;
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_0, b);
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -669,19 +494,12 @@ PHP_METHOD(Stub_NativeArray, testArray25)
 PHP_METHOD(Stub_NativeArray, testArray26)
 {
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
 	ZVAL_NULL(&b);
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&b);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -693,19 +511,12 @@ PHP_METHOD(Stub_NativeArray, testArray27)
 {
 	zval b;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "hello");
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -717,19 +528,12 @@ PHP_METHOD(Stub_NativeArray, testArray28)
 {
 	zval b;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "hello");
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -741,17 +545,10 @@ PHP_METHOD(Stub_NativeArray, testArray29)
 {
 	long b = 0;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	b = 1;
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
 	add_index_stringl(&a, b, SL("hello"));
 	RETURN_CCTOR(&a);
@@ -761,19 +558,12 @@ PHP_METHOD(Stub_NativeArray, testArray30)
 {
 	zval b;
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "hello");
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
 	add_assoc_stringl_ex(&a, Z_STRVAL_P(&b), Z_STRLEN_P(&b), SL("hello"));
 	RETURN_CCTOR(&a);
@@ -782,20 +572,13 @@ PHP_METHOD(Stub_NativeArray, testArray30)
 PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 {
 	zval a, b, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -804,7 +587,6 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &a, 0, PH_NOISY, "stub/nativearray.zep", 245);
 	RETURN_CCTOR(&b);
 }
@@ -812,22 +594,14 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 PHP_METHOD(Stub_NativeArray, testArrayAccess2)
 {
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	zephir_memory_observe(&b);
 	zephir_array_fetch_string(&b, &a, SL("a"), PH_NOISY, "stub/nativearray.zep", 255);
 	RETURN_CCTOR(&b);
 }
@@ -836,20 +610,13 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess3)
 {
 	long c = 0;
 	zval a, b, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -859,7 +626,6 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess3)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
 	c = 0;
-	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &a, c, PH_NOISY, "stub/nativearray.zep", 267);
 	RETURN_CCTOR(&b);
 }
@@ -868,25 +634,17 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess4)
 {
 	zval c;
 	zval a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_STRING(&c, "a");
-	zephir_memory_observe(&b);
 	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 279);
 	RETURN_CCTOR(&b);
 }
@@ -894,25 +652,17 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess4)
 PHP_METHOD(Stub_NativeArray, testArrayAccess5)
 {
 	zval a, b, c;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_STRING(&c, "a");
-	zephir_memory_observe(&b);
 	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 290);
 	RETURN_CCTOR(&b);
 }
@@ -920,26 +670,19 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess5)
 PHP_METHOD(Stub_NativeArray, testArrayAccess6)
 {
 	zval a, b, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
 	zephir_array_fetch_string(&_0, &a, SL("a"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 300);
 	zephir_array_fetch_string(&_1, &a, SL("b"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 300);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	zephir_add_function(&b, &_0, &_1);
 	RETURN_CCTOR(&b);
 }
@@ -948,27 +691,19 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess1)
 {
 	zval _0;
 	zval a, b, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 2, 0);
 	add_index_stringl(&_0, 0, SL("a"));
 	add_index_stringl(&_0, 1, SL("b"));
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_fetch_long(&_1, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 310);
-	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_1, 0, PH_NOISY, "stub/nativearray.zep", 310);
 	RETURN_CCTOR(&b);
 }
@@ -977,24 +712,17 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
 {
 	zval _0;
 	zval a, b, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 2, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "a");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1002,7 +730,6 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_2, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 320);
-	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_2, 1, PH_NOISY, "stub/nativearray.zep", 320);
 	RETURN_CCTOR(&b);
 }
@@ -1011,8 +738,6 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 {
 	zval _0, _1;
 	zval a, b, _2, _3, _4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
@@ -1021,18 +746,13 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 2, 0);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "a");
 	zephir_array_fast_append(&_1, &_2);
 	ZEPHIR_INIT_NVAR(&_2);
@@ -1042,7 +762,6 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
-	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 330);
 	RETURN_CCTOR(&b);
 }
@@ -1051,8 +770,6 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 {
 	zval _0, _1;
 	zval a, b, _2, _3, _4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
@@ -1061,18 +778,13 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 2, 0);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "a");
 	zephir_array_fast_append(&_1, &_2);
 	ZEPHIR_INIT_NVAR(&_2);
@@ -1082,7 +794,6 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
-	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 340);
 	RETURN_CCTOR(&b);
 }
@@ -1091,8 +802,6 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 {
 	zval _0, _1;
 	zval a, b, _2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
@@ -1100,16 +809,11 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_long_ex(&_1, SL("c"), 0);
 	add_assoc_long_ex(&_1, SL("d"), 1);
@@ -1117,7 +821,6 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 	zephir_array_update_string(&a, SL("a"), &_0, PH_COPY | PH_SEPARATE);
 	zephir_array_fetch_string(&_2, &a, SL("a"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
 	zephir_array_fetch_string(&_3, &_2, SL("b"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
-	zephir_memory_observe(&b);
 	zephir_array_fetch_string(&b, &_3, SL("c"), PH_NOISY, "stub/nativearray.zep", 350);
 	RETURN_CCTOR(&b);
 }
@@ -1125,19 +828,12 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 PHP_METHOD(Stub_NativeArray, testArrayUpdate1)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1156,19 +852,12 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate2)
 {
 	zend_long b = 0;
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1188,20 +877,13 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate3)
 {
 	zend_long b = 0;
 	zval a, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1215,7 +897,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate3)
 	ZVAL_LONG(&_0, 4);
 	zephir_array_update_long(&a, b, &_0, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	b = 1;
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 5);
 	zephir_array_update_long(&a, b, &_1, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	RETURN_CCTOR(&a);
@@ -1224,22 +906,15 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate3)
 PHP_METHOD(Stub_NativeArray, testArrayUpdate4)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 4);
 	zephir_array_update_string(&a, SL("a"), &_0, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&a);
@@ -1249,22 +924,15 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 {
 	zval _1, _2, _3;
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1273,7 +941,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -1285,7 +953,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&_1, &_0);
 	zephir_array_update_long(&a, 0, &_1, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	zephir_create_array(&_2, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -1297,7 +965,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&_2, &_0);
 	zephir_array_update_long(&a, 1, &_2, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	zephir_create_array(&_3, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -1315,22 +983,15 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 PHP_METHOD(Stub_NativeArray, testArrayAppend1)
 {
 	zval _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "hello");
 	zephir_array_append(&a, &_0, PH_SEPARATE, "stub/nativearray.zep", 402);
 	zephir_array_append(&a, &__$null, PH_SEPARATE, "stub/nativearray.zep", 402);
@@ -1343,7 +1004,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend1)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 5);
 	zephir_array_append(&a, &_0, PH_SEPARATE, "stub/nativearray.zep", 402);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -1365,29 +1026,22 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend2)
 	zend_bool d;
 	zval b;
 	zval a, c, g, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&g);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "hello");
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_NULL(&c);
 	d = 0;
-	e = 1.10;
+	e =  (1.10);
 	f = 5;
-	ZEPHIR_INIT_VAR(&g);
+	ZVAL_NULL(&g);
 	zephir_create_array(&g, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&g, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1396,7 +1050,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend2)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&g, &_0);
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_append(&a, &b, PH_SEPARATE, "stub/nativearray.zep", 409);
 	zephir_array_append(&a, &c, PH_SEPARATE, "stub/nativearray.zep", 409);
@@ -1415,18 +1069,11 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend2)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("ss"), 4, SL("x"), SL("y"));
 	RETURN_CCTOR(&a);
@@ -1434,18 +1081,11 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate1)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sss"), 6, SL("x"), SL("y"), SL("z"));
 	RETURN_CCTOR(&a);
@@ -1453,18 +1093,11 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate2)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("ll"), 2, 0, 1);
 	RETURN_CCTOR(&a);
@@ -1472,18 +1105,11 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate3)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("lll"), 3, 0, 1, 2);
 	RETURN_CCTOR(&a);
@@ -1491,18 +1117,11 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate4)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sls"), 5, SL("a"), 1, SL("c"));
 	RETURN_CCTOR(&a);
@@ -1510,18 +1129,11 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate5)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate6)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("lsl"), 4, 0, SL("b"), 2);
 	RETURN_CCTOR(&a);
@@ -1529,19 +1141,12 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate6)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate7)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$true, SL("sls"), 5, SL("a"), 1, SL("c"));
 	zephir_array_update_multi(&a, &__$false, SL("lsl"), 4, 0, SL("b"), 2);
@@ -1550,20 +1155,13 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate7)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate8)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sl"), 3, SL("a"), 0);
 	zephir_array_update_multi(&a, &__$true, SL("sl"), 3, SL("a"), 1);
@@ -1573,20 +1171,13 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate8)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate9)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sl"), 3, SL("a"), 0);
 	zephir_array_update_multi(&a, &__$true, SL("sl"), 3, SL("a"), 1);
@@ -1596,20 +1187,13 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate9)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate10)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sl"), 3, SL("a"), 0);
 	zephir_array_update_multi(&a, &__$true, SL("sl"), 3, SL("a"), 1);
@@ -1619,24 +1203,17 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate10)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate11)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, b, c;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "y");
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_STRING(&c, "x");
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("zz"), 2, &b, &c);
 	RETURN_CCTOR(&a);
@@ -1644,27 +1221,20 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate11)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate12)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, b, c, d;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&d);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "y");
-	ZEPHIR_INIT_VAR(&c);
+	ZVAL_NULL(&c);
 	ZVAL_STRING(&c, "x");
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	ZVAL_STRING(&d, "z");
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("zzz"), 3, &b, &c, &d);
 	RETURN_CCTOR(&a);
@@ -1673,9 +1243,7 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate12)
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate13)
 {
 	zval b, c, d, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -1684,26 +1252,21 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate13)
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&d);
+	ZVAL_NULL(&d);
 	zephir_create_array(&d, 3, 0);
 	zephir_array_update_string(&d, SL("x"), &__$null, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&d, SL("y"), &__$null, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&d, SL("z"), &__$null, PH_COPY | PH_SEPARATE);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	zephir_create_array(&b, 3, 0);
 	add_assoc_long_ex(&b, SL("a"), 1);
 	add_assoc_long_ex(&b, SL("b"), 2);
 	zephir_array_update_string(&b, SL("c"), &d, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CPY_WRT(&c, &b);
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 2, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 3, 0);
 	add_assoc_long_ex(&_0, SL("a"), 1);
 	add_assoc_long_ex(&_0, SL("b"), 2);
@@ -1715,21 +1278,14 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate13)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, b;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "y");
 	zephir_array_update_multi(&a, &__$null, SL("lsza"), 5, 0, SL("hello"), &b);
 	RETURN_CCTOR(&a);
@@ -1739,22 +1295,15 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend2)
 {
 	zval x;
 	zend_long b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&x);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	b = 100;
-	ZEPHIR_INIT_VAR(&x);
+	ZVAL_NULL(&x);
 	ZVAL_STRING(&x, "hello");
 	zephir_array_update_multi(&a, &__$null, SL("lslza"), 6, 0, SL("hello"), b, &x);
 	RETURN_CCTOR(&a);
@@ -1763,9 +1312,7 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend2)
 PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend3)
 {
 	zval _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, a, b, _0, _1, _3;
-	zval *this_ptr = getThis();
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$false, 0);
@@ -1775,26 +1322,21 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend3)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "y");
 	zephir_array_update_multi(&a, &__$null, SL("lsz"), 4, 0, SL("hello"), &b);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 100);
 	zephir_array_update_multi(&a, &_0, SL("lsza"), 5, 0, SL("hello"), &b);
 	zephir_array_update_multi(&a, &__$false, SL("lsza"), 5, 0, SL("hello"), &b);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_DOUBLE(&_1, 1.2);
 	zephir_array_update_multi(&a, &_1, SL("lsza"), 5, 0, SL("hello"), &b);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	zephir_create_array(&_2, 3, 0);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZVAL_LONG(&_3, 1);
 	zephir_array_fast_append(&_2, &_3);
 	ZEPHIR_INIT_NVAR(&_3);
@@ -1810,43 +1352,30 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend3)
 PHP_METHOD(Stub_NativeArray, testArrayKeys)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	zephir_array_keys(return_value, param);
 	return;
 }
 
 PHP_METHOD(Stub_NativeArray, testImplodeArray)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param, param_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_array_keys(&_0, param);
 	zephir_fast_join_str(return_value, SL("|"), &_0);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1855,17 +1384,10 @@ PHP_METHOD(Stub_NativeArray, testImplodeArray)
 PHP_METHOD(Stub_NativeArray, issue110)
 {
 	zval byteUnits, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&byteUnits);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&byteUnits);
+	ZVAL_NULL(&byteUnits);
 	zephir_create_array(&byteUnits, 9, 0);
 	add_assoc_long_ex(&byteUnits, SL("B"), 0);
 	add_assoc_long_ex(&byteUnits, SL("K"), 10);
@@ -1876,55 +1398,39 @@ PHP_METHOD(Stub_NativeArray, issue110)
 	add_assoc_long_ex(&byteUnits, SL("MB"), 20);
 	add_assoc_long_ex(&byteUnits, SL("GB"), 30);
 	add_assoc_long_ex(&byteUnits, SL("TB"), 40);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_array_keys(&_0, &byteUnits);
 	zephir_fast_join_str(return_value, SL("|"), &_0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_NativeArray, issue264)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *tokens_param = NULL;
 	zval tokens;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&tokens);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(tokens)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &tokens_param);
 	zephir_get_arrval(&tokens, tokens_param);
-
-
 	RETURN_MM_BOOL(!(zephir_array_isset_long(&tokens, 1)));
 }
 
 PHP_METHOD(Stub_NativeArray, issue743a)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *current743a_param = NULL, _0;
 	zval current743a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&current743a);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current743a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current743a_param);
 	zephir_get_arrval(&current743a, current743a_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "ok");
 	zephir_array_update_multi(&current743a, &_0, SL("ls"), 3, 42, SL("str"));
 	RETURN_CTOR(&current743a);
@@ -1932,25 +1438,17 @@ PHP_METHOD(Stub_NativeArray, issue743a)
 
 PHP_METHOD(Stub_NativeArray, issue743b)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *current_param = NULL, _0;
 	zval current;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&current);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current_param);
 	zephir_get_arrval(&current, current_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "ok");
 	zephir_array_update_multi(&current, &_0, SL("sl"), 3, SL("str"), 42);
 	RETURN_CTOR(&current);
@@ -1958,10 +1456,8 @@ PHP_METHOD(Stub_NativeArray, issue743b)
 
 PHP_METHOD(Stub_NativeArray, issue743c)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *current_param = NULL, key, _0;
 	zval current;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&current);
 	ZVAL_UNDEF(&key);
@@ -1969,17 +1465,11 @@ PHP_METHOD(Stub_NativeArray, issue743c)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current_param);
 	zephir_get_arrval(&current, current_param);
-
-
-	ZEPHIR_INIT_VAR(&key);
+	ZVAL_NULL(&key);
 	ZVAL_STRING(&key, "hey");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "ok");
 	zephir_array_update_multi(&current, &_0, SL("sz"), 3, SL("str"), &key);
 	RETURN_CTOR(&current);
@@ -1992,21 +1482,14 @@ PHP_METHOD(Stub_NativeArray, issue709)
 {
 	zend_bool works, _0, _7$$3;
 	zval c, arr, _3$$3, _4$$3, _5$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zephir_fcall_cache_entry *_6 = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
 	ZVAL_UNDEF(&_5$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	works = 1;
 	_2 = 50;
 	_1 = 0;
@@ -2031,7 +1514,7 @@ PHP_METHOD(Stub_NativeArray, issue709)
 			ZEPHIR_INIT_NVAR(&_3$$3);
 			ZVAL_LONG(&_3$$3, 2);
 			zephir_array_fast_append(&arr, &_3$$3);
-			ZEPHIR_CALL_FUNCTION(&_5$$3, "array_rand", &_6, 64, &arr);
+			ZEPHIR_CALL_FUNCTION(&_5$$3, "array_rand", &_6, 65, &arr);
 			zephir_check_call_status();
 			zephir_array_fetch(&_4$$3, &arr, &_5$$3, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 626);
 			ZEPHIR_CPY_WRT(&arr, &_4$$3);
@@ -2049,7 +1532,6 @@ PHP_METHOD(Stub_NativeArray, issue709)
 
 PHP_METHOD(Stub_NativeArray, Issue1140)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *prefix_param = NULL, *baseDir_param = NULL, _0, _2, _3, _1$$3;
 	zval prefix, baseDir;
@@ -2065,25 +1547,19 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 		Z_PARAM_STR(prefix)
 		Z_PARAM_STR(baseDir)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &prefix_param, &baseDir_param);
 	zephir_get_strval(&prefix, prefix_param);
 	zephir_get_strval(&baseDir, baseDir_param);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("prefixes"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_array_isset(&_0, &prefix))) {
-		ZEPHIR_INIT_VAR(&_1$$3);
+		ZVAL_NULL(&_1$$3);
 		array_init(&_1$$3);
 		zephir_update_property_array(this_ptr, SL("prefixes"), &prefix, &_1$$3);
 	}
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("prefixes"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_fetch(&_3, &_2, &prefix, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 639);
 	ZEPHIR_MAKE_REF(&_3);
-	ZEPHIR_CALL_FUNCTION(NULL, "array_push", NULL, 65, &_3, &baseDir);
+	ZEPHIR_CALL_FUNCTION(NULL, "array_push", NULL, 66, &_3, &baseDir);
 	ZEPHIR_UNREF(&_3);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "prefixes");
@@ -2092,19 +1568,12 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 PHP_METHOD(Stub_NativeArray, Issue1159)
 {
 	zval myvar, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&myvar);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&myvar);
+	ZVAL_NULL(&myvar);
 	ZVAL_LONG(&myvar, 1);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
 	zephir_array_fast_append(&_0, &myvar);
 	ZEPHIR_CPY_WRT(&myvar, &_0);
@@ -2114,24 +1583,20 @@ PHP_METHOD(Stub_NativeArray, Issue1159)
 zend_object *zephir_init_properties_Stub_NativeArray(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("prefixes"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("prefixes"), &_1$$3);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/oo.zep.c b/ext/stub/oo.zep.c
index e627b722ca..c9fdd4a066 100644
--- a/ext/stub/oo.zep.c
+++ b/ext/stub/oo.zep.c
@@ -32,16 +32,9 @@ ZEPHIR_INIT_CLASS(Stub_Oo)
 PHP_METHOD(Stub_Oo, testInstance1)
 {
 	zval o;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init(&o);
 	RETURN_CCTOR(&o);
 }
@@ -49,19 +42,12 @@ PHP_METHOD(Stub_Oo, testInstance1)
 PHP_METHOD(Stub_Oo, testInstance2)
 {
 	zval o;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_ooconstruct_ce);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -69,17 +55,10 @@ PHP_METHOD(Stub_Oo, testInstance2)
 PHP_METHOD(Stub_Oo, testInstance3)
 {
 	zval o;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_oonoconstruct_ce);
 	if (zephir_has_constructor(&o)) {
 		ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 0);
@@ -92,25 +71,18 @@ PHP_METHOD(Stub_Oo, testInstance3)
 PHP_METHOD(Stub_Oo, testInstance4)
 {
 	zval o, a, b;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "a");
-	ZEPHIR_INIT_VAR(&b);
+	ZVAL_NULL(&b);
 	ZVAL_STRING(&b, "b");
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &a, &b);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &a, &b);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -118,25 +90,18 @@ PHP_METHOD(Stub_Oo, testInstance4)
 PHP_METHOD(Stub_Oo, testInstance5)
 {
 	zval o, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "a");
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "b");
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -144,23 +109,16 @@ PHP_METHOD(Stub_Oo, testInstance5)
 PHP_METHOD(Stub_Oo, testInstance6)
 {
 	zval o, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -168,23 +126,16 @@ PHP_METHOD(Stub_Oo, testInstance6)
 PHP_METHOD(Stub_Oo, testInstance7)
 {
 	zval o, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_BOOL(&_0, 0);
 	ZVAL_BOOL(&_1, 1);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -192,23 +143,16 @@ PHP_METHOD(Stub_Oo, testInstance7)
 PHP_METHOD(Stub_Oo, testInstance8)
 {
 	zval o, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_DOUBLE(&_0, 1.2);
 	ZVAL_DOUBLE(&_1, 7.30);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -216,16 +160,9 @@ PHP_METHOD(Stub_Oo, testInstance8)
 PHP_METHOD(Stub_Oo, testInstance9)
 {
 	zval o;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
@@ -234,16 +171,9 @@ PHP_METHOD(Stub_Oo, testInstance9)
 PHP_METHOD(Stub_Oo, testInstance10)
 {
 	zval o;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamicb_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
@@ -252,23 +182,16 @@ PHP_METHOD(Stub_Oo, testInstance10)
 PHP_METHOD(Stub_Oo, testInstance11)
 {
 	zval o, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&o);
+	ZVAL_NULL(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -276,16 +199,9 @@ PHP_METHOD(Stub_Oo, testInstance11)
 PHP_METHOD(Stub_Oo, testInstance12)
 {
 	zval o;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&o);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "call1", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
@@ -296,9 +212,7 @@ PHP_METHOD(Stub_Oo, createInstancesInLoop)
 	zend_class_entry *_5$$3, *_9$$4;
 	zval result, _0;
 	zval className, instance, fqcn, _1, *_2, _3, _4$$3, _6$$3, _7$$3, _8$$4, _10$$4, _11$$4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&instance);
@@ -313,16 +227,11 @@ PHP_METHOD(Stub_Oo, createInstancesInLoop)
 	ZVAL_UNDEF(&_11$$4);
 	ZVAL_UNDEF(&result);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&result);
+	ZVAL_NULL(&result);
 	array_init(&result);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 2, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "OoDynamicA");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
diff --git a/ext/stub/oo/abstractstatic.zep.c b/ext/stub/oo/abstractstatic.zep.c
index c80a1699f7..af06789809 100644
--- a/ext/stub/oo/abstractstatic.zep.c
+++ b/ext/stub/oo/abstractstatic.zep.c
@@ -24,9 +24,6 @@ ZEPHIR_INIT_CLASS(Stub_Oo_AbstractStatic)
 
 PHP_METHOD(Stub_Oo_AbstractStatic, getCalledClass)
 {
-	zval *this_ptr = getThis();
-
-
 
 	zephir_get_called_class(return_value);
 	return;
diff --git a/ext/stub/oo/concretestatic.zep.c b/ext/stub/oo/concretestatic.zep.c
index 6748c43968..9012554963 100644
--- a/ext/stub/oo/concretestatic.zep.c
+++ b/ext/stub/oo/concretestatic.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Oo_ConcreteStatic)
@@ -26,50 +25,28 @@ ZEPHIR_INIT_CLASS(Stub_Oo_ConcreteStatic)
 
 PHP_METHOD(Stub_Oo_ConcreteStatic, parentFunction)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("ConcreteStatic:parentFunction");
 }
 
 PHP_METHOD(Stub_Oo_ConcreteStatic, childFunction)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("parentfunction", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_ConcreteStatic, callParentFunction)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_PARENT(stub_oo_concretestatic_ce, getThis(), "getcalledclass", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_ConcreteStatic, simpleStaticIntReturn)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(1337);
 }
diff --git a/ext/stub/oo/constantsinterface.zep.c b/ext/stub/oo/constantsinterface.zep.c
index 0695e3dfd7..0ea5c92e66 100644
--- a/ext/stub/oo/constantsinterface.zep.c
+++ b/ext/stub/oo/constantsinterface.zep.c
@@ -29,54 +29,36 @@ ZEPHIR_INIT_CLASS(Stub_Oo_ConstantsInterface)
 
 PHP_METHOD(Stub_Oo_ConstantsInterface, testReadInterfaceConstant1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
 
 PHP_METHOD(Stub_Oo_ConstantsInterface, testReadInterfaceConstant2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_Oo_ConstantsInterface, testReadInterfaceConstant3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
 
 PHP_METHOD(Stub_Oo_ConstantsInterface, testReadInterfaceConstant4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(10);
 }
 
 PHP_METHOD(Stub_Oo_ConstantsInterface, testReadInterfaceConstant5)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(10.25);
 }
 
 PHP_METHOD(Stub_Oo_ConstantsInterface, testReadInterfaceConstant6)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("test");
 }
diff --git a/ext/stub/oo/deprecatedmethods.zep.c b/ext/stub/oo/deprecatedmethods.zep.c
index d1f202e4b0..45c3c4cc83 100644
--- a/ext/stub/oo/deprecatedmethods.zep.c
+++ b/ext/stub/oo/deprecatedmethods.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Oo_DeprecatedMethods)
@@ -26,34 +25,21 @@ ZEPHIR_INIT_CLASS(Stub_Oo_DeprecatedMethods)
 
 PHP_METHOD(Stub_Oo_DeprecatedMethods, publicDeprecated)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
 
 PHP_METHOD(Stub_Oo_DeprecatedMethods, normalMethod)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 68);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 69);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_DeprecatedMethods, privateDeprecated)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
diff --git a/ext/stub/oo/dynamicprop.zep.c b/ext/stub/oo/dynamicprop.zep.c
index d42ed1ed50..73d3c8762e 100644
--- a/ext/stub/oo/dynamicprop.zep.c
+++ b/ext/stub/oo/dynamicprop.zep.c
@@ -32,7 +32,6 @@ ZEPHIR_INIT_CLASS(Stub_Oo_DynamicProp)
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -42,10 +41,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -54,19 +49,15 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 10);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, __$true;
 	zval property;
 	zval *this_ptr = getThis();
@@ -76,10 +67,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -88,17 +75,13 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	zephir_update_property_zval_zval(this_ptr, &property, &__$true);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, __$false;
 	zval property;
 	zval *this_ptr = getThis();
@@ -108,10 +91,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -120,17 +99,13 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	zephir_update_property_zval_zval(this_ptr, &property, &__$false);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -140,10 +115,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -152,20 +123,16 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "string");
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 {
 	char a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -175,10 +142,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -187,21 +150,17 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	a = 'A';
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 {
 	unsigned char a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -211,10 +170,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -223,20 +178,16 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	a = 'A';
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, __$null;
 	zval property;
 	zval *this_ptr = getThis();
@@ -246,10 +197,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -258,18 +205,14 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	zephir_update_property_zval_zval(this_ptr, &property, &__$null);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 {
 	zend_long a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -279,10 +222,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -291,20 +230,16 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	a = 10;
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, a;
 	zval property;
 	zval *this_ptr = getThis();
@@ -314,10 +249,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -326,20 +257,16 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "test");
 	zephir_update_property_zval_zval(this_ptr, &property, &a);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 {
 	zend_bool a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -349,10 +276,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -361,21 +284,17 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	a = 1;
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 {
 	zend_bool a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -385,10 +304,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -397,38 +312,27 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZEPHIR_INIT_VAR(&property);
+		ZVAL_NULL(&property);
 	}
-
-
 	a = 0;
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringProperty)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "works");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value_param = NULL;
 	zval value;
 	zval *this_ptr = getThis();
@@ -437,10 +341,6 @@ PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	if (UNEXPECTED(Z_TYPE_P(value_param) != IS_STRING && Z_TYPE_P(value_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'value' must be of the type string"));
@@ -449,29 +349,19 @@ PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 	if (EXPECTED(Z_TYPE_P(value_param) == IS_STRING)) {
 		zephir_get_strval(&value, value_param);
 	} else {
-		ZEPHIR_INIT_VAR(&value);
+		ZVAL_NULL(&value);
 	}
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("eproperty"), &value);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setNonExistingStringProperty)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "works");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("property"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/oo/extendpdoclass.zep.c b/ext/stub/oo/extendpdoclass.zep.c
index ab0a9f9738..621d052b28 100644
--- a/ext/stub/oo/extendpdoclass.zep.c
+++ b/ext/stub/oo/extendpdoclass.zep.c
@@ -30,11 +30,9 @@ ZEPHIR_INIT_CLASS(Stub_Oo_ExtendPdoClass)
 PHP_METHOD(Stub_Oo_ExtendPdoClass, __construct)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *dsn_param = NULL, *username_param = NULL, *password_param = NULL, *attrs = NULL, attrs_sub, _1;
 	zval dsn, username, password;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&dsn);
 	ZVAL_UNDEF(&username);
@@ -50,39 +48,32 @@ PHP_METHOD(Stub_Oo_ExtendPdoClass, __construct)
 		Z_PARAM_STR_OR_NULL(password)
 		Z_PARAM_ZVAL(attrs)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 3, &dsn_param, &username_param, &password_param, &attrs);
 	zephir_get_strval(&dsn, dsn_param);
 	if (!username_param) {
-		ZEPHIR_INIT_VAR(&username);
+		ZVAL_NULL(&username);
 	} else {
 		zephir_get_strval(&username, username_param);
 	}
 	if (!password_param) {
-		ZEPHIR_INIT_VAR(&password);
+		ZVAL_NULL(&password);
 	} else {
 		zephir_get_strval(&password, password_param);
 	}
 	if (!attrs) {
 		attrs = &attrs_sub;
-		ZEPHIR_INIT_VAR(attrs);
+		ZVAL_NULL(attrs);
 		array_init(attrs);
 	} else {
 		ZEPHIR_SEPARATE_PARAM(attrs);
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "Stub\\PdoStatement");
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_update_long(attrs, 13, &_0, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_CALL_PARENT(NULL, stub_oo_extendpdoclass_ce, getThis(), "__construct", NULL, 0, &dsn, &username, &password, attrs);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/oo/ooconstruct.zep.c b/ext/stub/oo/ooconstruct.zep.c
index 39a1b85888..491b25439f 100644
--- a/ext/stub/oo/ooconstruct.zep.c
+++ b/ext/stub/oo/ooconstruct.zep.c
@@ -27,9 +27,6 @@ ZEPHIR_INIT_CLASS(Stub_Oo_OoConstruct)
 
 PHP_METHOD(Stub_Oo_OoConstruct, __construct)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
diff --git a/ext/stub/oo/ooconstructparams.zep.c b/ext/stub/oo/ooconstructparams.zep.c
index 92b8f922c0..7f22d360f3 100644
--- a/ext/stub/oo/ooconstructparams.zep.c
+++ b/ext/stub/oo/ooconstructparams.zep.c
@@ -39,29 +39,19 @@ PHP_METHOD(Stub_Oo_OoConstructParams, __construct)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), a);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("b"), b);
 }
 
 PHP_METHOD(Stub_Oo_OoConstructParams, getA)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "a");
 }
 
 PHP_METHOD(Stub_Oo_OoConstructParams, getB)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "b");
 }
diff --git a/ext/stub/oo/oodestruct.zep.c b/ext/stub/oo/oodestruct.zep.c
index de9b954f2e..4a03c5f468 100644
--- a/ext/stub/oo/oodestruct.zep.c
+++ b/ext/stub/oo/oodestruct.zep.c
@@ -69,18 +69,12 @@ ZEPHIR_INIT_CLASS(Stub_Oo_OoDestruct)
  */
 PHP_METHOD(Stub_Oo_OoDestruct, getHeight)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "height");
 }
 
 PHP_METHOD(Stub_Oo_OoDestruct, getImage)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "image");
 }
@@ -90,18 +84,12 @@ PHP_METHOD(Stub_Oo_OoDestruct, getImage)
  */
 PHP_METHOD(Stub_Oo_OoDestruct, getMime)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "mime");
 }
 
 PHP_METHOD(Stub_Oo_OoDestruct, getRealpath)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "realpath");
 }
@@ -115,9 +103,6 @@ PHP_METHOD(Stub_Oo_OoDestruct, getRealpath)
  */
 PHP_METHOD(Stub_Oo_OoDestruct, getType)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "type");
 }
@@ -127,9 +112,6 @@ PHP_METHOD(Stub_Oo_OoDestruct, getType)
  */
 PHP_METHOD(Stub_Oo_OoDestruct, getWidth)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "width");
 }
@@ -138,7 +120,6 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 {
 	zend_bool _30$$13;
 	zend_class_entry *_26$$11 = NULL, *_22$$12 = NULL, *_32$$14 = NULL;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long width, height, ZEPHIR_LAST_CALL_STATUS;
 	zval *file_param = NULL, *width_param = NULL, *height_param = NULL, __$true, imageinfo, _0, _1, _2$$4, _3$$4, _4$$4, _9$$4, _28$$4, _29$$4, _5$$5, _6$$5, _7$$5, _8$$5, _10$$6, _11$$6, _12$$7, _13$$7, _14$$8, _15$$8, _16$$9, _17$$9, _18$$10, _19$$10, _20$$11, _25$$11, _27$$11, _21$$12, _23$$12, _24$$12, _35$$13, _36$$13, _37$$13, _38$$13, _39$$13, _40$$13, _31$$14, _33$$14, _34$$14;
 	zval file;
@@ -191,10 +172,6 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		Z_PARAM_LONG_OR_NULL(width, is_null_true)
 		Z_PARAM_LONG_OR_NULL(height, is_null_true)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &file_param, &width_param, &height_param);
 	if (UNEXPECTED(Z_TYPE_P(file_param) != IS_STRING && Z_TYPE_P(file_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'file' must be of the type string"));
@@ -203,20 +180,16 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 	if (EXPECTED(Z_TYPE_P(file_param) == IS_STRING)) {
 		zephir_get_strval(&file, file_param);
 	} else {
-		ZEPHIR_INIT_VAR(&file);
+		ZVAL_NULL(&file);
 	}
 	if (!width_param) {
 		width = 0;
 	} else {
-		width = zephir_get_intval(width_param);
-	}
+		}
 	if (!height_param) {
 		height = 0;
 	} else {
-		height = zephir_get_intval(height_param);
-	}
-
-
+		}
 	zephir_read_static_property_ce(&_0, stub_oo_oodestruct_ce, SL("checked"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
 		ZEPHIR_CALL_SELF(NULL, "check", NULL, 0);
@@ -226,11 +199,11 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
 	if ((zephir_file_exists(&_1) == SUCCESS)) {
 		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 69, &_2$$4);
+		ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 70, &_2$$4);
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_3$$4);
 		zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 70, &_4$$4);
+		ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 71, &_4$$4);
 		zephir_check_call_status();
 		if (zephir_is_true(&imageinfo)) {
 			zephir_array_fetch_long(&_5$$5, &imageinfo, 0, PH_NOISY | PH_READONLY, "stub/oo/oodestruct.zep", 62);
@@ -281,37 +254,35 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 			}
 			zephir_read_property(&_20$$11, this_ptr, ZEND_STRL("mime"), PH_NOISY_CC | PH_READONLY);
 			if (zephir_is_true(&_20$$11)) {
-				ZEPHIR_INIT_VAR(&_21$$12);
+				ZVAL_NULL(&_21$$12);
 				if (!_22$$12) {
 				_22$$12 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 				}
 				object_init_ex(&_21$$12, _22$$12);
 				if (zephir_has_constructor(&_21$$12)) {
 					zephir_read_property(&_23$$12, this_ptr, ZEND_STRL("mime"), PH_NOISY_CC | PH_READONLY);
-					ZEPHIR_INIT_VAR(&_24$$12);
+					ZVAL_NULL(&_24$$12);
 					ZEPHIR_CONCAT_SVS(&_24$$12, "Installed GD does not support ", &_23$$12, " images");
 					ZEPHIR_CALL_METHOD(NULL, &_21$$12, "__construct", NULL, 0, &_24$$12);
 					zephir_check_call_status();
 				}
 
 				zephir_throw_exception_debug(&_21$$12, "stub/oo/oodestruct.zep", 93);
-				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			ZEPHIR_INIT_VAR(&_25$$11);
+			ZVAL_NULL(&_25$$11);
 			if (!_26$$11) {
 			_26$$11 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 			}
 			object_init_ex(&_25$$11, _26$$11);
 			if (zephir_has_constructor(&_25$$11)) {
-				ZEPHIR_INIT_VAR(&_27$$11);
+				ZVAL_NULL(&_27$$11);
 				ZVAL_STRING(&_27$$11, "Installed GD does not support such images");
 				ZEPHIR_CALL_METHOD(NULL, &_25$$11, "__construct", NULL, 0, &_27$$11);
 				zephir_check_call_status();
 			}
 
 			zephir_throw_exception_debug(&_25$$11, "stub/oo/oodestruct.zep", 98);
-			ZEPHIR_MM_RESTORE();
 			return;
 		} while(0);
 
@@ -325,21 +296,20 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 			_30$$13 = !height;
 		}
 		if (UNEXPECTED(_30$$13)) {
-			ZEPHIR_INIT_VAR(&_31$$14);
+			ZVAL_NULL(&_31$$14);
 			if (!_32$$14) {
 			_32$$14 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 			}
 			object_init_ex(&_31$$14, _32$$14);
 			if (zephir_has_constructor(&_31$$14)) {
 				zephir_read_property(&_33$$14, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-				ZEPHIR_INIT_VAR(&_34$$14);
+				ZVAL_NULL(&_34$$14);
 				ZEPHIR_CONCAT_SV(&_34$$14, "Failed to create image from file ", &_33$$14);
 				ZEPHIR_CALL_METHOD(NULL, &_31$$14, "__construct", NULL, 0, &_34$$14);
 				zephir_check_call_status();
 			}
 
 			zephir_throw_exception_debug(&_31$$14, "stub/oo/oodestruct.zep", 107);
-			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		ZVAL_LONG(&_35$$13, width);
@@ -348,7 +318,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_37$$13);
 		zephir_read_property(&_35$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 71, &_35$$13, &__$true);
+		ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 72, &_35$$13, &__$true);
 		zephir_check_call_status();
 		zephir_read_property(&_36$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_BOOL(&_38$$13, 1);
@@ -365,44 +335,34 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		ZVAL_UNDEF(&_39$$13);
 		ZVAL_LONG(&_39$$13, 3);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_39$$13);
-		ZEPHIR_INIT_VAR(&_40$$13);
+		ZVAL_NULL(&_40$$13);
 		ZEPHIR_INIT_NVAR(&_40$$13);
 		ZVAL_STRING(&_40$$13, "image/png");
 		zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_40$$13);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_OoDestruct, __destruct)
 {
 	zval image, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&image);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&image, &_0);
 	if (Z_TYPE_P(&image) == IS_RESOURCE) {
 		ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 0, &image);
 		zephir_check_call_status();
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_OoDestruct, check)
 {
 	zend_class_entry *_2$$4 = NULL, *_8$$5 = NULL;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, version, _0, _4, _5, _6, _10, _1$$4, _3$$4, _7$$5, _9$$5;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&version);
@@ -415,55 +375,48 @@ PHP_METHOD(Stub_Oo_OoDestruct, check)
 	ZVAL_UNDEF(&_3$$4);
 	ZVAL_UNDEF(&_7$$5);
 	ZVAL_UNDEF(&_9$$5);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_static_property_ce(&_0, stub_oo_oodestruct_ce, SL("checked"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_is_true(&_0)) {
 		RETURN_MM_BOOL(1);
 	}
 	if (UNEXPECTED(!((zephir_function_exists_ex(ZEND_STRL("gd_info")) == SUCCESS)))) {
-		ZEPHIR_INIT_VAR(&_1$$4);
+		ZVAL_NULL(&_1$$4);
 		if (!_2$$4) {
 		_2$$4 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 		}
 		object_init_ex(&_1$$4, _2$$4);
 		if (zephir_has_constructor(&_1$$4)) {
-			ZEPHIR_INIT_VAR(&_3$$4);
+			ZVAL_NULL(&_3$$4);
 			ZVAL_STRING(&_3$$4, "GD is either not installed or not enabled, check your configuration");
 			ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 0, &_3$$4);
 			zephir_check_call_status();
 		}
 
 		zephir_throw_exception_debug(&_1$$4, "stub/oo/oodestruct.zep", 146);
-		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZEPHIR_CALL_SELF(&version, "getversion", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_4);
+	ZVAL_NULL(&_4);
 	ZVAL_STRING(&_4, "2.0.1");
-	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_NULL(&_5);
 	ZVAL_STRING(&_5, ">=");
-	ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 61, &version, &_4, &_5);
+	ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 62, &version, &_4, &_5);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_6))) {
-		ZEPHIR_INIT_VAR(&_7$$5);
+		ZVAL_NULL(&_7$$5);
 		if (!_8$$5) {
 		_8$$5 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 		}
 		object_init_ex(&_7$$5, _8$$5);
 		if (zephir_has_constructor(&_7$$5)) {
-			ZEPHIR_INIT_VAR(&_9$$5);
+			ZVAL_NULL(&_9$$5);
 			ZEPHIR_CONCAT_SV(&_9$$5, "Requires GD version '2.0.1' or greater, you have ", &version);
 			ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", NULL, 0, &_9$$5);
 			zephir_check_call_status();
 		}
 
 		zephir_throw_exception_debug(&_7$$5, "stub/oo/oodestruct.zep", 154);
-		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	zephir_update_static_property_ce(stub_oo_oodestruct_ce, ZEND_STRL("checked"), &__$true);
@@ -475,9 +428,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 {
 	zend_class_entry *_1$$3 = NULL;
 	zval version, info, matches, _3, _4, _0$$3, _2$$3, _5$$5, _6$$5, _7$$5, _8$$5;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&version);
 	ZVAL_UNDEF(&info);
@@ -490,47 +441,41 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 	ZVAL_UNDEF(&_6$$5);
 	ZVAL_UNDEF(&_7$$5);
 	ZVAL_UNDEF(&_8$$5);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	if (UNEXPECTED(!((zephir_function_exists_ex(ZEND_STRL("gd_info")) == SUCCESS)))) {
-		ZEPHIR_INIT_VAR(&_0$$3);
+		ZVAL_NULL(&_0$$3);
 		if (!_1$$3) {
 		_1$$3 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 		}
 		object_init_ex(&_0$$3, _1$$3);
 		if (zephir_has_constructor(&_0$$3)) {
-			ZEPHIR_INIT_VAR(&_2$$3);
+			ZVAL_NULL(&_2$$3);
 			ZVAL_STRING(&_2$$3, "GD is either not installed or not enabled, check your configuration");
 			ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 0, &_2$$3);
 			zephir_check_call_status();
 		}
 
 		zephir_throw_exception_debug(&_0$$3, "stub/oo/oodestruct.zep", 171);
-		ZEPHIR_MM_RESTORE();
 		return;
 	}
-	ZEPHIR_INIT_VAR(&version);
 	ZVAL_NULL(&version);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&version);
+	ZVAL_NULL(&_3);
 	ZVAL_STRING(&_3, "GD_VERSION");
-	ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 72, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 73, &_3);
 	zephir_check_call_status();
 	if (zephir_is_true(&_4)) {
 		ZEPHIR_INIT_NVAR(&version);
 		ZEPHIR_GET_CONSTANT(&version, "GD_VERSION");
 	} else {
-		ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 73);
+		ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 74);
 		zephir_check_call_status();
-		ZEPHIR_INIT_VAR(&matches);
+		ZVAL_NULL(&matches);
 		ZVAL_NULL(&matches);
 		zephir_array_fetch_string(&_5$$5, &info, SL("GD Version"), PH_NOISY | PH_READONLY, "stub/oo/oodestruct.zep", 182);
-		ZEPHIR_INIT_VAR(&_6$$5);
+		ZVAL_NULL(&_6$$5);
 		ZVAL_STRING(&_6$$5, "/\\d+\\.\\d+(?:\\.\\d+)?/");
-		ZEPHIR_INIT_VAR(&_7$$5);
-		ZEPHIR_INIT_VAR(&_8$$5);
+		ZVAL_NULL(&_7$$5);
+		ZVAL_NULL(&_8$$5);
 		ZVAL_STRING(&_8$$5, "/\\d+\\.\\d+(?:\\.\\d+)?/");
 		zephir_preg_match(&_7$$5, &_8$$5, &_5$$5, &matches, 0, 0 , 0 );
 		if (zephir_is_true(&_7$$5)) {
diff --git a/ext/stub/oo/oodynamica.zep.c b/ext/stub/oo/oodynamica.zep.c
index 3521406278..2c814a618a 100644
--- a/ext/stub/oo/oodynamica.zep.c
+++ b/ext/stub/oo/oodynamica.zep.c
@@ -32,21 +32,14 @@ PHP_METHOD(Stub_Oo_OoDynamicA, getNew)
 {
 	zend_class_entry *_1;
 	zval className, fullClassName, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&fullClassName);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&className);
+	ZVAL_NULL(&className);
 	zephir_get_called_class(&className);
-	ZEPHIR_INIT_VAR(&fullClassName);
+	ZVAL_NULL(&fullClassName);
 	ZEPHIR_CONCAT_SV(&fullClassName, "\\", &className);
 	zephir_fetch_safe_class(&_0, &fullClassName);
 	_1 = zephir_fetch_class_str_ex(Z_STRVAL_P(&_0), Z_STRLEN_P(&_0), ZEND_FETCH_CLASS_AUTO);
@@ -59,55 +52,33 @@ PHP_METHOD(Stub_Oo_OoDynamicA, getNew)
 		zephir_check_call_status();
 	}
 
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicA, call2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("getnew", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicA, call1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("call2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicA, execute)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("A");
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicA, execute2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("AA");
 }
diff --git a/ext/stub/oo/oodynamicb.zep.c b/ext/stub/oo/oodynamicb.zep.c
index 1c606c8496..e7e8632e45 100644
--- a/ext/stub/oo/oodynamicb.zep.c
+++ b/ext/stub/oo/oodynamicb.zep.c
@@ -27,18 +27,12 @@ ZEPHIR_INIT_CLASS(Stub_Oo_OoDynamicB)
 
 PHP_METHOD(Stub_Oo_OoDynamicB, execute)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("B");
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicB, execute2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("BB");
 }
diff --git a/ext/stub/oo/oonativeimplements.zep.c b/ext/stub/oo/oonativeimplements.zep.c
index 7c5cdbacef..4a14c44e65 100644
--- a/ext/stub/oo/oonativeimplements.zep.c
+++ b/ext/stub/oo/oonativeimplements.zep.c
@@ -36,73 +36,46 @@ ZEPHIR_INIT_CLASS(Stub_Oo_OoNativeImplements)
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, count)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, current)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, key)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, next)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, rewind)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, valid)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, getInnerIterator)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, getChildren)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, hasChildren)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
@@ -110,63 +83,43 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, seek)
 {
 	zval *position_param = NULL;
 	zend_long position;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(position)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &position_param);
-	position = zephir_get_intval(position_param);
-
-
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, getIterator)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, offsetExists)
 {
 	zval *offset, offset_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&offset_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
-
-
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, offsetGet)
 {
 	zval *offset, offset_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&offset_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
-
-
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, offsetSet)
 {
 	zval *offset, offset_sub, *value, value_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&offset_sub);
 	ZVAL_UNDEF(&value_sub);
@@ -174,63 +127,40 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, offsetSet)
 		Z_PARAM_ZVAL(offset)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &offset, &value);
-
-
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, offsetUnset)
 {
 	zval *offset, offset_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&offset_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &offset);
-
-
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, serialize)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, unserialize)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *serialized_param = NULL;
 	zval serialized;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&serialized);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(serialized)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &serialized_param);
 	zephir_get_strval(&serialized, serialized_param);
-
-
 }
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, __serialize)
 {
-	zval *this_ptr = getThis();
-
-
 
 	array_init(return_value);
 	return;
@@ -238,22 +168,14 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, __serialize)
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, __unserialize)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *data_param = NULL;
 	zval data;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&data);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(data)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &data_param);
 	zephir_get_arrval(&data, data_param);
-
-
 }
 
diff --git a/ext/stub/oo/ooparams.zep.c b/ext/stub/oo/ooparams.zep.c
index 9c4c1c43eb..44036ccae6 100644
--- a/ext/stub/oo/ooparams.zep.c
+++ b/ext/stub/oo/ooparams.zep.c
@@ -14,8 +14,8 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/memory.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/exception.h"
 
@@ -32,59 +32,37 @@ ZEPHIR_INIT_CLASS(Stub_Oo_OoParams)
 
 PHP_METHOD(Stub_Oo_OoParams, createThisClassWithoutWriteCurrentNamespace)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	object_init_ex(return_value, stub_oo_ooparams_ce);
 	if (zephir_has_constructor(return_value)) {
 		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_OoParams, createOtherClassWithoutWriteCurrentNamespace)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	object_init_ex(return_value, stub_oo_oodynamica_ce);
 	if (zephir_has_constructor(return_value)) {
 		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setAge)
 {
 	zval *age_param = NULL;
 	zend_long age;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &age_param);
-	age = zephir_get_intval(age_param);
-
-
 	RETURN_LONG(age);
 }
 
@@ -92,39 +70,26 @@ PHP_METHOD(Stub_Oo_OoParams, setAverage)
 {
 	zval *average_param = NULL;
 	double average;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &average_param);
 	average = zephir_get_doubleval(average_param);
-
-
 	RETURN_DOUBLE(average);
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setName)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL;
 	zval name;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
-
-
 	RETURN_CTOR(&name);
 }
 
@@ -132,39 +97,25 @@ PHP_METHOD(Stub_Oo_OoParams, setEnabled)
 {
 	zval *enabled_param = NULL;
 	zend_bool enabled;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(enabled)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &enabled_param);
-	enabled = zephir_get_boolval(enabled_param);
-
-
 	RETURN_BOOL(enabled);
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setList)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someList_param = NULL;
 	zval someList;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someList);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someList_param);
 	zephir_get_arrval(&someList, someList_param);
-
-
 	RETURN_CTOR(&someList);
 }
 
@@ -172,21 +123,16 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictAge)
 {
 	zval *age_param = NULL;
 	zend_long age;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &age_param);
 	if (UNEXPECTED(Z_TYPE_P(age_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'age' must be of the type int"));
 		RETURN_NULL();
 	}
 	age = Z_LVAL_P(age_param);
-
-
 	RETURN_LONG(age);
 }
 
@@ -194,58 +140,41 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictAverage)
 {
 	zval *average_param = NULL;
 	double average;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &average_param);
 	if (UNEXPECTED(Z_TYPE_P(average_param) != IS_DOUBLE)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'average' must be of the type double"));
 		RETURN_NULL();
 	}
 	average = Z_DVAL_P(average_param);
-
-
 	RETURN_DOUBLE(average);
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setStrictNameFromZephirLand)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 12345);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "setstrictname", NULL, 0, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setStrictName)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL;
 	zval name;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string"));
@@ -254,10 +183,8 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictName)
 	if (EXPECTED(Z_TYPE_P(name_param) == IS_STRING)) {
 		zephir_get_strval(&name, name_param);
 	} else {
-		ZEPHIR_INIT_VAR(&name);
+		ZVAL_NULL(&name);
 	}
-
-
 	RETURN_CTOR(&name);
 }
 
@@ -265,39 +192,25 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictEnabled)
 {
 	zval *enabled_param = NULL;
 	zend_bool enabled;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(enabled)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &enabled_param);
-	enabled = zephir_get_boolval(enabled_param);
-
-
 	RETURN_BOOL(enabled);
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setStrictList)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someList_param = NULL;
 	zval someList;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someList);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someList_param);
-	ZEPHIR_OBS_COPY_OR_DUP(&someList, someList_param);
-
-
+	ZVAL_COPY(&someList, someList_param);
 	RETURN_CTOR(&someList);
 }
 
@@ -305,22 +218,16 @@ PHP_METHOD(Stub_Oo_OoParams, setAgeDefault)
 {
 	zval *age_param = NULL;
 	zend_long age;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &age_param);
 	if (!age_param) {
 		age = 25;
 	} else {
-		age = zephir_get_intval(age_param);
-	}
-
-
+		}
 	RETURN_LONG(age);
 }
 
@@ -328,50 +235,37 @@ PHP_METHOD(Stub_Oo_OoParams, setAverageDefault)
 {
 	zval *average_param = NULL;
 	double average;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &average_param);
 	if (!average_param) {
 		average = (double) 25;
 	} else {
 		average = zephir_get_doubleval(average_param);
 	}
-
-
 	RETURN_DOUBLE(average);
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setNameDefault)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL;
 	zval name;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&name);
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &name_param);
 	if (!name_param) {
-		ZEPHIR_INIT_VAR(&name);
+		ZVAL_NULL(&name);
 		ZVAL_STRING(&name, "peter");
 	} else {
 		zephir_get_strval(&name, name_param);
 	}
-
-
 	RETURN_CTOR(&name);
 }
 
@@ -379,50 +273,36 @@ PHP_METHOD(Stub_Oo_OoParams, setEnabledDefault)
 {
 	zval *enabled_param = NULL;
 	zend_bool enabled;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(enabled)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &enabled_param);
 	if (!enabled_param) {
 		enabled = 0;
 	} else {
-		enabled = zephir_get_boolval(enabled_param);
-	}
-
-
+		}
 	RETURN_BOOL(enabled);
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setListDefault)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someList_param = NULL;
 	zval someList;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someList);
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &someList_param);
 	if (!someList_param) {
-		ZEPHIR_INIT_VAR(&someList);
+		ZVAL_NULL(&someList);
 		array_init(&someList);
 	} else {
 		zephir_get_arrval(&someList, someList_param);
 	}
-
-
 	RETURN_CTOR(&someList);
 }
 
@@ -430,17 +310,11 @@ PHP_METHOD(Stub_Oo_OoParams, setConstAge)
 {
 	zval *age_param = NULL;
 	zend_long age;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(age)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &age_param);
-	age = zephir_get_intval(age_param);
-
-
 	RETURN_LONG(age);
 }
 
@@ -448,34 +322,24 @@ PHP_METHOD(Stub_Oo_OoParams, setConstAverage)
 {
 	zval *average_param = NULL;
 	double average;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(average)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &average_param);
 	average = zephir_get_doubleval(average_param);
-
-
 	RETURN_DOUBLE(average);
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setObject)
 {
 	zval *obj, obj_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT(obj)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
-
-
 	RETVAL_ZVAL(obj, 1, 0);
 	return;
 }
@@ -483,17 +347,12 @@ PHP_METHOD(Stub_Oo_OoParams, setObject)
 PHP_METHOD(Stub_Oo_OoParams, setCallable)
 {
 	zval *obj, obj_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(obj)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
-
-
 	RETVAL_ZVAL(obj, 1, 0);
 	return;
 }
@@ -501,17 +360,12 @@ PHP_METHOD(Stub_Oo_OoParams, setCallable)
 PHP_METHOD(Stub_Oo_OoParams, setResource)
 {
 	zval *obj, obj_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_RESOURCE(obj)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &obj);
-
-
 	RETVAL_ZVAL(obj, 1, 0);
 	return;
 }
@@ -519,17 +373,12 @@ PHP_METHOD(Stub_Oo_OoParams, setResource)
 PHP_METHOD(Stub_Oo_OoParams, setObjectClassCast)
 {
 	zval *parameter, parameter_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameter_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(parameter, stub_oo_param_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &parameter);
-
-
 	RETVAL_ZVAL(parameter, 1, 0);
 	return;
 }
diff --git a/ext/stub/oo/propertyaccess.zep.c b/ext/stub/oo/propertyaccess.zep.c
index 7498e9435d..b343e60494 100644
--- a/ext/stub/oo/propertyaccess.zep.c
+++ b/ext/stub/oo/propertyaccess.zep.c
@@ -31,7 +31,6 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 {
 	zval _0, _6;
 	zval test, test1, _1, _2, _3, _4, _5, _7, _8, _9, _10;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&test);
@@ -47,16 +46,11 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	ZVAL_UNDEF(&_10);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_6);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&test);
+	ZVAL_NULL(&test);
 	object_init(&test);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 5, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "1");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -78,10 +72,9 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	zephir_read_property(&_4, &test, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_fetch_long(&_5, &_4, 1, PH_NOISY | PH_READONLY, "stub/oo/propertyaccess.zep", 18);
 	zephir_update_property_zval(&test, ZEND_STRL("test3"), &_5);
-	ZEPHIR_INIT_VAR(&_6);
+	ZVAL_NULL(&_6);
 	zephir_create_array(&_6, 4, 0);
 	zephir_read_property(&_7, &test, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
-	zephir_memory_observe(&_8);
 	zephir_array_fetch_long(&_8, &_7, 1, PH_NOISY, "stub/oo/propertyaccess.zep", 19);
 	zephir_array_fast_append(&_6, &_8);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -98,9 +91,7 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	zephir_read_property(&_9, this_ptr, ZEND_STRL("a"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_10, &_9, ZEND_STRL("test2"), PH_NOISY_CC | PH_READONLY);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_10);
-	zephir_memory_observe(&test1);
 	zephir_read_property(&test1, this_ptr, ZEND_STRL("a"), PH_NOISY_CC);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -115,11 +106,7 @@ PHP_METHOD(Stub_Oo_PropertyAccess, setPrivatevariable)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &value);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("privateVariable"), value);
 	RETURN_THISW();
 }
@@ -129,9 +116,6 @@ PHP_METHOD(Stub_Oo_PropertyAccess, setPrivatevariable)
  */
 PHP_METHOD(Stub_Oo_PropertyAccess, getPrivatevariable)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "privateVariable");
 }
diff --git a/ext/stub/oo/scopes/abstractclass.zep.c b/ext/stub/oo/scopes/abstractclass.zep.c
index 26f9e0d6a2..620a195973 100644
--- a/ext/stub/oo/scopes/abstractclass.zep.c
+++ b/ext/stub/oo/scopes/abstractclass.zep.c
@@ -28,7 +28,6 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_AbstractClass)
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClass, setProperty)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, *value, value_sub;
 	zval name;
 	zval *this_ptr = getThis();
@@ -39,32 +38,20 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClass, setProperty)
 		Z_PARAM_STR(name)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &name_param, &value);
 	zephir_get_strval(&name, name_param);
-
-
 	zephir_update_property_zval_zval(this_ptr, &name, value);
 	RETURN_THIS();
 }
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClass, getPrivateProperty2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "privateProperty2");
 }
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClass, getProtectedProperty2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "protectedProperty2");
 }
diff --git a/ext/stub/oo/scopes/abstractclassmagic.zep.c b/ext/stub/oo/scopes/abstractclassmagic.zep.c
index 024f924647..ffd5aad71a 100644
--- a/ext/stub/oo/scopes/abstractclassmagic.zep.c
+++ b/ext/stub/oo/scopes/abstractclassmagic.zep.c
@@ -30,7 +30,6 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_AbstractClassMagic)
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __set)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, *value, value_sub, _0, _1;
 	zval name;
 	zval *this_ptr = getThis();
@@ -43,25 +42,17 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __set)
 		Z_PARAM_STR(name)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &name_param, &value);
 	zephir_get_strval(&name, name_param);
-
-
 	zephir_update_property_zval_zval(this_ptr, &name, value);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("setCount"), PH_NOISY_CC | PH_READONLY);
 	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, (zephir_get_numberval(&_0) + 1));
 	zephir_update_property_zval(this_ptr, ZEND_STRL("setCount"), &_1);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __get)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, _0;
 	zval name;
 	zval *this_ptr = getThis();
@@ -71,15 +62,8 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __get)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
-
-
-	zephir_memory_observe(&_0);
 	zephir_read_property_zval(&_0, this_ptr, &name, PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/oo/scopes/hasprivatemethod.zep.c b/ext/stub/oo/scopes/hasprivatemethod.zep.c
index e144e69558..42f40b9537 100644
--- a/ext/stub/oo/scopes/hasprivatemethod.zep.c
+++ b/ext/stub/oo/scopes/hasprivatemethod.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_HasPrivateMethod)
@@ -26,25 +25,15 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_HasPrivateMethod)
 
 PHP_METHOD(Stub_Oo_Scopes_HasPrivateMethod, callPrivateMethod)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "isprivate", NULL, 1);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Oo_Scopes_HasPrivateMethod, isPrivate)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("isPrivate");
 }
diff --git a/ext/stub/oo/scopes/privatescopetester.zep.c b/ext/stub/oo/scopes/privatescopetester.zep.c
index a996c088f8..1a11f62267 100644
--- a/ext/stub/oo/scopes/privatescopetester.zep.c
+++ b/ext/stub/oo/scopes/privatescopetester.zep.c
@@ -28,18 +28,11 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_PrivateScopeTester)
 
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, run)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "callprivatemethod", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -47,10 +40,8 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, run)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval property;
 	zval *obj, obj_sub, *property_param = NULL, *value, value_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
 	ZVAL_UNDEF(&value_sub);
@@ -61,17 +52,10 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
 		Z_PARAM_STR(property)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &obj, &property_param, &value);
 	ZEPHIR_SEPARATE_PARAM(obj);
 	zephir_get_strval(&property, property_param);
-
-
 	zephir_update_property_zval_zval(obj, &property, value);
-	zephir_memory_observe(&_0);
 	zephir_read_property_zval(&_0, obj, &property, PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
@@ -81,11 +65,9 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className_param = NULL, *property_param = NULL, *value, value_sub, obj;
 	zval className, property;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&property);
@@ -96,16 +78,10 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
 		Z_PARAM_STR(property)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &className_param, &property_param, &value);
 	zephir_get_strval(&className, className_param);
 	zephir_get_strval(&property, property_param);
-
-
-	ZEPHIR_INIT_VAR(&obj);
+	ZVAL_NULL(&obj);
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(&obj, &className);
 	zephir_check_call_status();
 	zephir_update_property_zval_zval(&obj, &property, value);
@@ -117,25 +93,17 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *obj, obj_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(obj)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &obj);
-
-
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 74, obj);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 75, obj);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -143,7 +111,6 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getNewVars)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className_param = NULL, _0;
 	zval className;
@@ -154,19 +121,13 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getNewVars)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(className)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className_param);
 	zephir_get_strval(&className, className_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(&_0, &className);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getobjvars", NULL, 0, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/openssl.zep.c b/ext/stub/openssl.zep.c
new file mode 100644
index 0000000000..535748f098
--- /dev/null
+++ b/ext/stub/openssl.zep.c
@@ -0,0 +1,111 @@
+
+#ifdef HAVE_CONFIG_H
+#include "../ext_config.h"
+#endif
+
+#include <php.h>
+#include "../php_ext.h"
+#include "../ext.h"
+
+#include <Zend/zend_operators.h>
+#include <Zend/zend_exceptions.h>
+#include <Zend/zend_interfaces.h>
+
+#include "kernel/main.h"
+#include "kernel/fcall.h"
+#include "kernel/operators.h"
+#include "kernel/memory.h"
+#include "kernel/object.h"
+#include "kernel/array.h"
+
+
+ZEPHIR_INIT_CLASS(Stub_Openssl)
+{
+	ZEPHIR_REGISTER_CLASS(Stub, Openssl, stub, openssl, stub_openssl_method_entry, 0);
+
+	return SUCCESS;
+}
+
+PHP_METHOD(Stub_Openssl, randomPseudoBytes)
+{
+	zval *length_param = NULL, _0;
+	zend_long length, ZEPHIR_LAST_CALL_STATUS;
+
+	ZVAL_UNDEF(&_0);
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_LONG(length)
+	ZEND_PARSE_PARAMETERS_END();
+	zephir_fetch_params(1, 1, 0, &length_param);
+	ZVAL_LONG(&_0, length);
+	ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 76, &_0);
+	zephir_check_call_status();
+	return;
+}
+
+PHP_METHOD(Stub_Openssl, randomPseudoBytesLoop)
+{
+	zend_bool _0;
+	zval arr, i, _3$$3, _4$$3;
+	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
+	zephir_fcall_cache_entry *_5 = NULL;
+
+	ZVAL_UNDEF(&arr);
+	ZVAL_UNDEF(&i);
+	ZVAL_UNDEF(&_3$$3);
+	ZVAL_UNDEF(&_4$$3);
+	ZVAL_NULL(&i);
+	ZVAL_LONG(&i, 0);
+	ZVAL_NULL(&arr);
+	array_init(&arr);
+	_2 = 10;
+	_1 = 1;
+	_0 = 0;
+	if (_1 <= _2) {
+		while (1) {
+			if (_0) {
+				_1++;
+				if (!(_1 <= _2)) {
+					break;
+				}
+			} else {
+				_0 = 1;
+			}
+			ZEPHIR_INIT_NVAR(&i);
+			ZVAL_LONG(&i, _1);
+			ZVAL_LONG(&_3$$3, 10);
+			ZEPHIR_CALL_FUNCTION(&_4$$3, "openssl_random_pseudo_bytes", &_5, 76, &_3$$3);
+			zephir_check_call_status();
+			zephir_array_append(&arr, &_4$$3, PH_SEPARATE, "stub/openssl.zep", 16);
+		}
+	}
+	RETURN_CCTOR(&arr);
+}
+
+PHP_METHOD(Stub_Openssl, opensslEncrypt)
+{
+	zend_long ZEPHIR_LAST_CALL_STATUS;
+	zval *data_param = NULL, _0, _1, _2, _3;
+	zval data;
+
+	ZVAL_UNDEF(&data);
+	ZVAL_UNDEF(&_0);
+	ZVAL_UNDEF(&_1);
+	ZVAL_UNDEF(&_2);
+	ZVAL_UNDEF(&_3);
+	ZEND_PARSE_PARAMETERS_START(1, 1)
+		Z_PARAM_STR(data)
+	ZEND_PARSE_PARAMETERS_END();
+	zephir_fetch_params(1, 1, 0, &data_param);
+	zephir_get_strval(&data, data_param);
+	ZVAL_NULL(&_0);
+	ZVAL_STRING(&_0, "AES-256-CBC");
+	ZVAL_NULL(&_1);
+	ZVAL_STRING(&_1, "passphrase");
+	ZVAL_LONG(&_2, 1);
+	ZVAL_NULL(&_3);
+	ZVAL_STRING(&_3, "1234567890123456");
+	ZEPHIR_RETURN_CALL_FUNCTION("openssl_encrypt", NULL, 77, &data, &_0, &_1, &_2, &_3);
+	zephir_check_call_status();
+	return;
+}
+
diff --git a/ext/stub/openssl.zep.h b/ext/stub/openssl.zep.h
new file mode 100644
index 0000000000..dd64f7a12d
--- /dev/null
+++ b/ext/stub/openssl.zep.h
@@ -0,0 +1,26 @@
+
+extern zend_class_entry *stub_openssl_ce;
+
+ZEPHIR_INIT_CLASS(Stub_Openssl);
+
+PHP_METHOD(Stub_Openssl, randomPseudoBytes);
+PHP_METHOD(Stub_Openssl, randomPseudoBytesLoop);
+PHP_METHOD(Stub_Openssl, opensslEncrypt);
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_openssl_randompseudobytes, 0, 1, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_stub_openssl_randompseudobytesloop, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_openssl_opensslencrypt, 0, 0, 1)
+	ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEPHIR_INIT_FUNCS(stub_openssl_method_entry) {
+	PHP_ME(Stub_Openssl, randomPseudoBytes, arginfo_stub_openssl_randompseudobytes, ZEND_ACC_PUBLIC)
+	PHP_ME(Stub_Openssl, randomPseudoBytesLoop, arginfo_stub_openssl_randompseudobytesloop, ZEND_ACC_PUBLIC)
+	PHP_ME(Stub_Openssl, opensslEncrypt, arginfo_stub_openssl_opensslencrypt, ZEND_ACC_PUBLIC)
+	PHP_FE_END
+};
diff --git a/ext/stub/operator.zep.c b/ext/stub/operator.zep.c
index 8a32ef6789..daab08a486 100644
--- a/ext/stub/operator.zep.c
+++ b/ext/stub/operator.zep.c
@@ -29,7 +29,6 @@ ZEPHIR_INIT_CLASS(Stub_Operator)
 PHP_METHOD(Stub_Operator, testIdentical)
 {
 	zval *param1, param1_sub, *param2, param2_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1_sub);
 	ZVAL_UNDEF(&param2_sub);
@@ -37,20 +36,14 @@ PHP_METHOD(Stub_Operator, testIdentical)
 		Z_PARAM_ZVAL(param1)
 		Z_PARAM_ZVAL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &param1, &param2);
-
-
 	RETURN_BOOL(ZEPHIR_IS_IDENTICAL(param1, param2));
 }
 
 PHP_METHOD(Stub_Operator, testIdenticalIfComplex)
 {
 	zend_bool b = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *input, input_sub, a, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&input_sub);
 	ZVAL_UNDEF(&a);
@@ -58,14 +51,8 @@ PHP_METHOD(Stub_Operator, testIdenticalIfComplex)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(input)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &input);
-
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	zephir_create_array(&a, 1, 0);
 	zephir_array_update_string(&a, SL("1"), input, PH_COPY | PH_SEPARATE);
 	b = 0;
@@ -79,43 +66,31 @@ PHP_METHOD(Stub_Operator, testIdenticalIfComplex)
 PHP_METHOD(Stub_Operator, testIdenticalVarFalse)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	RETURN_BOOL(ZEPHIR_IS_FALSE_IDENTICAL(param));
 }
 
 PHP_METHOD(Stub_Operator, testIdenticalFalseVar)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	RETURN_BOOL(ZEPHIR_IS_FALSE_IDENTICAL(param));
 }
 
 PHP_METHOD(Stub_Operator, testBoolComparison)
 {
 	zend_bool var1, var2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *varTrue, varTrue_sub, *varFalse, varFalse_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&varTrue_sub);
 	ZVAL_UNDEF(&varFalse_sub);
@@ -124,17 +99,11 @@ PHP_METHOD(Stub_Operator, testBoolComparison)
 		Z_PARAM_ZVAL(varTrue)
 		Z_PARAM_ZVAL(varFalse)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &varTrue, &varFalse);
-
-
 	var1 = 1;
 	var2 = 0;
 	zephir_create_array(return_value, 8, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_BOOL(&_0, ZEPHIR_IS_BOOL_VALUE(varTrue, var1));
 	zephir_array_fast_append(return_value, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -158,29 +127,21 @@ PHP_METHOD(Stub_Operator, testBoolComparison)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_BOOL(&_0, !ZEPHIR_IS_BOOL_IDENTICAL(varFalse, var1));
 	zephir_array_fast_append(return_value, &_0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Operator, testNewInstanceOperator)
 {
 	zend_class_entry *_1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className, className_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(className)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className);
-
-
 	zephir_fetch_safe_class(&_0, className);
 	_1 = zephir_fetch_class_str_ex(Z_STRVAL_P(&_0), Z_STRLEN_P(&_0), ZEND_FETCH_CLASS_AUTO);
 	if(!_1) {
@@ -192,6 +153,6 @@ PHP_METHOD(Stub_Operator, testNewInstanceOperator)
 		zephir_check_call_status();
 	}
 
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/optimizers/acos.zep.c b/ext/stub/optimizers/acos.zep.c
index d2b40befc1..7f69299982 100644
--- a/ext/stub/optimizers/acos.zep.c
+++ b/ext/stub/optimizers/acos.zep.c
@@ -14,8 +14,8 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
@@ -28,107 +28,69 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
 PHP_METHOD(Stub_Optimizers_ACos, testInt)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVar)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntValue1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
 	zend_long a, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
-
-
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 14, a);
+	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, a);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/optimizers/arraymerge.zep.c b/ext/stub/optimizers/arraymerge.zep.c
index 3390f44da7..9436a3cc02 100644
--- a/ext/stub/optimizers/arraymerge.zep.c
+++ b/ext/stub/optimizers/arraymerge.zep.c
@@ -27,10 +27,8 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ArrayMerge)
 
 PHP_METHOD(Stub_Optimizers_ArrayMerge, mergeTwoRequiredArrays)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arr1_param = NULL, *arr2_param = NULL;
 	zval arr1, arr2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr1);
 	ZVAL_UNDEF(&arr2);
@@ -38,16 +36,10 @@ PHP_METHOD(Stub_Optimizers_ArrayMerge, mergeTwoRequiredArrays)
 		Z_PARAM_ARRAY(arr1)
 		Z_PARAM_ARRAY(arr2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arr1_param, &arr2_param);
 	zephir_get_arrval(&arr1, arr1_param);
 	zephir_get_arrval(&arr2, arr2_param);
-
-
 	zephir_fast_array_merge(return_value, &arr1, &arr2);
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/optimizers/asin.zep.c b/ext/stub/optimizers/asin.zep.c
index dd2d143cfc..751b902e05 100644
--- a/ext/stub/optimizers/asin.zep.c
+++ b/ext/stub/optimizers/asin.zep.c
@@ -14,8 +14,8 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
@@ -28,107 +28,69 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
 PHP_METHOD(Stub_Optimizers_ASin, testInt)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVar)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntValue1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
 	zend_long a, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
-
-
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 13, a);
+	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, a);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/optimizers/cos.zep.c b/ext/stub/optimizers/cos.zep.c
index 82e788e8c5..9139cb7f36 100644
--- a/ext/stub/optimizers/cos.zep.c
+++ b/ext/stub/optimizers/cos.zep.c
@@ -30,12 +30,8 @@ PHP_METHOD(Stub_Optimizers_Cos, testInt)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 4;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(cos(a));
@@ -45,12 +41,8 @@ PHP_METHOD(Stub_Optimizers_Cos, testVar)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 4;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(cos(a));
@@ -59,12 +51,8 @@ PHP_METHOD(Stub_Optimizers_Cos, testVar)
 PHP_METHOD(Stub_Optimizers_Cos, testIntValue1)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 4);
 	RETURN_DOUBLE(cos(4));
 }
@@ -72,12 +60,8 @@ PHP_METHOD(Stub_Optimizers_Cos, testIntValue1)
 PHP_METHOD(Stub_Optimizers_Cos, testIntValue2)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 16);
 	RETURN_DOUBLE(cos(16));
 }
@@ -86,18 +70,12 @@ PHP_METHOD(Stub_Optimizers_Cos, testIntParameter)
 {
 	zval *a_param = NULL, _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(cos(a));
 }
@@ -105,17 +83,12 @@ PHP_METHOD(Stub_Optimizers_Cos, testIntParameter)
 PHP_METHOD(Stub_Optimizers_Cos, testVarParameter)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_DOUBLE(zephir_cos(a));
 }
 
diff --git a/ext/stub/optimizers/createarray.zep.c b/ext/stub/optimizers/createarray.zep.c
index 46787d67d3..f622bac1cd 100644
--- a/ext/stub/optimizers/createarray.zep.c
+++ b/ext/stub/optimizers/createarray.zep.c
@@ -28,11 +28,6 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_CreateArray)
 PHP_METHOD(Stub_Optimizers_CreateArray, createNoSize)
 {
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-
 	zephir_create_array(return_value, 0, 1);
 	return;
 }
@@ -41,18 +36,12 @@ PHP_METHOD(Stub_Optimizers_CreateArray, createSize)
 {
 	zval *n_param = NULL, _0;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &n_param);
-	n = zephir_get_intval(n_param);
-
-
 	ZVAL_LONG(&_0, n);
 	zephir_create_array(return_value, zephir_get_intval(&_0), 1);
 	return;
diff --git a/ext/stub/optimizers/isscalar.zep.c b/ext/stub/optimizers/isscalar.zep.c
index 3bef89ba3c..8e8f5d30f3 100644
--- a/ext/stub/optimizers/isscalar.zep.c
+++ b/ext/stub/optimizers/isscalar.zep.c
@@ -27,12 +27,8 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testIntVar)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
 	RETURN_BOOL(zephir_is_scalar(&_0));
@@ -42,12 +38,8 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testDoubleVar)
 {
 	zval _0;
 	double a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = (double) (1);
 	ZVAL_DOUBLE(&_0, a);
 	RETURN_BOOL(zephir_is_scalar(&_0));
@@ -57,12 +49,8 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testBoolVar)
 {
 	zval _0;
 	zend_bool a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 1;
 	ZVAL_BOOL(&_0, (a ? 1 : 0));
 	RETURN_BOOL(zephir_is_scalar(&_0));
@@ -71,16 +59,9 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testBoolVar)
 PHP_METHOD(Stub_Optimizers_IsScalar, testStringVar)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "test string");
 	RETURN_MM_BOOL(zephir_is_scalar(&a));
 }
@@ -88,16 +69,9 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testStringVar)
 PHP_METHOD(Stub_Optimizers_IsScalar, testEmptyArrayVar)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	array_init(&a);
 	RETURN_MM_BOOL(zephir_is_scalar(&a));
 }
@@ -106,12 +80,8 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testVar)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
 	RETURN_BOOL(zephir_is_scalar(&_0));
@@ -120,17 +90,12 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testVar)
 PHP_METHOD(Stub_Optimizers_IsScalar, testVarParameter)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_BOOL(zephir_is_scalar(a));
 }
 
diff --git a/ext/stub/optimizers/ldexp.zep.c b/ext/stub/optimizers/ldexp.zep.c
index 8ad0396e25..e0212e351e 100644
--- a/ext/stub/optimizers/ldexp.zep.c
+++ b/ext/stub/optimizers/ldexp.zep.c
@@ -29,13 +29,9 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testInt)
 {
 	zval _0, _1;
 	zend_long x, exponent;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-
 	x = 2;
 	exponent = 3;
 	ZVAL_LONG(&_0, x);
@@ -48,14 +44,10 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testDoubleInt)
 	zval _0, _1;
 	zend_long exponent;
 	double x;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-
-	x = 2.0;
+	x =  (2.0);
 	exponent = 3;
 	ZVAL_DOUBLE(&_0, x);
 	ZVAL_LONG(&_1, exponent);
@@ -66,15 +58,11 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testDouble)
 {
 	zval _0, _1;
 	double x, exponent;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-
-	x = 2.0;
-	exponent = 3.0;
+	x =  (2.0);
+	exponent =  (3.0);
 	ZVAL_DOUBLE(&_0, x);
 	ZVAL_DOUBLE(&_1, exponent);
 	RETURN_DOUBLE(zephir_ldexp(&_0, &_1));
@@ -84,13 +72,9 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testVar)
 {
 	zval _0, _1;
 	zend_long x, exponent;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-
 	x = 2;
 	exponent = 3;
 	ZVAL_LONG(&_0, x);
@@ -101,13 +85,9 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testVar)
 PHP_METHOD(Stub_Optimizers_Ldexp, testIntValue1)
 {
 	zval _0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-
 	ZVAL_LONG(&_0, 2);
 	ZVAL_LONG(&_1, 3);
 	RETURN_DOUBLE(zephir_ldexp(&_0, &_1));
@@ -117,7 +97,6 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testIntParameter)
 {
 	zval *x_param = NULL, *exponent_param = NULL, _0, _1;
 	zend_long x, exponent;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
@@ -125,13 +104,7 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testIntParameter)
 		Z_PARAM_LONG(x)
 		Z_PARAM_LONG(exponent)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &x_param, &exponent_param);
-	x = zephir_get_intval(x_param);
-	exponent = zephir_get_intval(exponent_param);
-
-
 	ZVAL_LONG(&_0, x);
 	ZVAL_LONG(&_1, exponent);
 	RETURN_DOUBLE(zephir_ldexp(&_0, &_1));
@@ -140,7 +113,6 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testIntParameter)
 PHP_METHOD(Stub_Optimizers_Ldexp, testVarParameter)
 {
 	zval *x, x_sub, *exponent, exponent_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&x_sub);
 	ZVAL_UNDEF(&exponent_sub);
@@ -148,11 +120,7 @@ PHP_METHOD(Stub_Optimizers_Ldexp, testVarParameter)
 		Z_PARAM_ZVAL(x)
 		Z_PARAM_ZVAL(exponent)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &x, &exponent);
-
-
 	RETURN_DOUBLE(zephir_ldexp(x, exponent));
 }
 
diff --git a/ext/stub/optimizers/sin.zep.c b/ext/stub/optimizers/sin.zep.c
index 3177487586..295a08cd79 100644
--- a/ext/stub/optimizers/sin.zep.c
+++ b/ext/stub/optimizers/sin.zep.c
@@ -30,12 +30,8 @@ PHP_METHOD(Stub_Optimizers_Sin, testInt)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 4;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(sin(a));
@@ -45,12 +41,8 @@ PHP_METHOD(Stub_Optimizers_Sin, testVar)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 4;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(sin(a));
@@ -59,12 +51,8 @@ PHP_METHOD(Stub_Optimizers_Sin, testVar)
 PHP_METHOD(Stub_Optimizers_Sin, testIntValue1)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 4);
 	RETURN_DOUBLE(sin(4));
 }
@@ -72,12 +60,8 @@ PHP_METHOD(Stub_Optimizers_Sin, testIntValue1)
 PHP_METHOD(Stub_Optimizers_Sin, testIntValue2)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 16);
 	RETURN_DOUBLE(sin(16));
 }
@@ -86,18 +70,12 @@ PHP_METHOD(Stub_Optimizers_Sin, testIntParameter)
 {
 	zval *a_param = NULL, _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(sin(a));
 }
@@ -105,17 +83,12 @@ PHP_METHOD(Stub_Optimizers_Sin, testIntParameter)
 PHP_METHOD(Stub_Optimizers_Sin, testVarParameter)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_DOUBLE(zephir_sin(a));
 }
 
diff --git a/ext/stub/optimizers/sqrt.zep.c b/ext/stub/optimizers/sqrt.zep.c
index 323c8294a2..0f97dea2d0 100644
--- a/ext/stub/optimizers/sqrt.zep.c
+++ b/ext/stub/optimizers/sqrt.zep.c
@@ -30,12 +30,8 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testInt)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 4;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(sqrt(a));
@@ -45,12 +41,8 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testVar)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 4;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(sqrt(a));
@@ -59,12 +51,8 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testVar)
 PHP_METHOD(Stub_Optimizers_Sqrt, testIntValue1)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 4);
 	RETURN_DOUBLE(sqrt(4));
 }
@@ -72,12 +60,8 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testIntValue1)
 PHP_METHOD(Stub_Optimizers_Sqrt, testIntValue2)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 16);
 	RETURN_DOUBLE(sqrt(16));
 }
@@ -86,18 +70,12 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testIntParameter)
 {
 	zval *a_param = NULL, _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(sqrt(a));
 }
@@ -105,17 +83,12 @@ PHP_METHOD(Stub_Optimizers_Sqrt, testIntParameter)
 PHP_METHOD(Stub_Optimizers_Sqrt, testVarParameter)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_DOUBLE(zephir_sqrt(a));
 }
 
diff --git a/ext/stub/optimizers/strreplace.zep.c b/ext/stub/optimizers/strreplace.zep.c
index 7a2e014c15..8408234234 100644
--- a/ext/stub/optimizers/strreplace.zep.c
+++ b/ext/stub/optimizers/strreplace.zep.c
@@ -33,31 +33,24 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1055)
 {
 	zval _1, _3;
 	zval _0, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "aa");
 	zephir_array_fast_append(&_0, &_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	zephir_create_array(&_2, 1, 0);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "aaa");
 	zephir_array_fast_append(&_2, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "bla bla aa aaa askks");
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	zephir_fast_str_replace(&_3, &_0, &_2, &_1);
 	RETURN_CCTOR(&_3);
 }
@@ -65,23 +58,16 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1055)
 PHP_METHOD(Stub_Optimizers_StrReplace, issue1087)
 {
 	zval filtered, sanitize, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&filtered);
 	ZVAL_UNDEF(&sanitize);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&filtered);
+	ZVAL_NULL(&filtered);
 	ZVAL_STRING(&filtered, "test_test");
-	ZEPHIR_INIT_VAR(&sanitize);
+	ZVAL_NULL(&sanitize);
 	zephir_create_array(&sanitize, 8, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "/");
 	zephir_array_fast_append(&sanitize, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -106,7 +92,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1087)
 	ZVAL_STRING(&_0, "&");
 	zephir_array_fast_append(&sanitize, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "");
 	zephir_fast_str_replace(&_0, &sanitize, &_1, &filtered);
 	ZEPHIR_CPY_WRT(&filtered, &_0);
@@ -118,21 +104,14 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732A)
 	zval subject;
 	zval _0;
 	zval search, replace;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&search);
 	ZVAL_UNDEF(&replace);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&subject);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&search);
+	ZVAL_NULL(&search);
 	zephir_create_array(&search, 5, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "A");
 	zephir_array_fast_append(&search, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -147,7 +126,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732A)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "E");
 	zephir_array_fast_append(&search, &_0);
-	ZEPHIR_INIT_VAR(&replace);
+	ZVAL_NULL(&replace);
 	zephir_create_array(&replace, 5, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "B");
@@ -164,7 +143,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732A)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "F");
 	zephir_array_fast_append(&replace, &_0);
-	ZEPHIR_INIT_VAR(&subject);
+	ZVAL_NULL(&subject);
 	ZVAL_STRING(&subject, "A");
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_fast_str_replace(&_0, &search, &replace, &subject);
@@ -176,22 +155,15 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	zval subject;
 	zval _0;
 	zval patterns, replacements;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&patterns);
 	ZVAL_UNDEF(&replacements);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&subject);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&patterns);
+	ZVAL_NULL(&patterns);
 	zephir_create_array(&patterns, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "/quick/");
 	zephir_array_fast_append(&patterns, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -200,7 +172,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "/fox/");
 	zephir_array_fast_append(&patterns, &_0);
-	ZEPHIR_INIT_VAR(&replacements);
+	ZVAL_NULL(&replacements);
 	zephir_create_array(&replacements, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "bear");
@@ -211,10 +183,10 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "slow");
 	zephir_array_fast_append(&replacements, &_0);
-	ZEPHIR_INIT_VAR(&subject);
+	ZVAL_NULL(&subject);
 	ZVAL_STRING(&subject, "The quick brown fox jumped over the lazy dog.");
-	ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 75, &patterns, &replacements, &subject);
+	ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 78, &patterns, &replacements, &subject);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/optimizers/substr.zep.c b/ext/stub/optimizers/substr.zep.c
index f7d1992911..42d277a7ba 100644
--- a/ext/stub/optimizers/substr.zep.c
+++ b/ext/stub/optimizers/substr.zep.c
@@ -28,7 +28,6 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_Substr)
 PHP_METHOD(Stub_Optimizers_Substr, testTwoArguments)
 {
 	zval *str, str_sub, *start, start_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&start_sub);
@@ -36,11 +35,7 @@ PHP_METHOD(Stub_Optimizers_Substr, testTwoArguments)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(start)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &start);
-
-
 	zephir_substr(return_value, str, zephir_get_intval(start), 0, ZEPHIR_SUBSTR_NO_LENGTH);
 	return;
 }
@@ -48,7 +43,6 @@ PHP_METHOD(Stub_Optimizers_Substr, testTwoArguments)
 PHP_METHOD(Stub_Optimizers_Substr, testThreeArguments)
 {
 	zval *str, str_sub, *start, start_sub, *offset, offset_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&start_sub);
@@ -58,11 +52,7 @@ PHP_METHOD(Stub_Optimizers_Substr, testThreeArguments)
 		Z_PARAM_ZVAL(start)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(3, 0, &str, &start, &offset);
-
-
 	zephir_substr(return_value, str, zephir_get_intval(start), zephir_get_intval(offset), 0);
 	return;
 }
diff --git a/ext/stub/optimizers/tan.zep.c b/ext/stub/optimizers/tan.zep.c
index 46049d9b3e..8206af7726 100644
--- a/ext/stub/optimizers/tan.zep.c
+++ b/ext/stub/optimizers/tan.zep.c
@@ -30,12 +30,8 @@ PHP_METHOD(Stub_Optimizers_Tan, testInt)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 0;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(tan(a));
@@ -45,12 +41,8 @@ PHP_METHOD(Stub_Optimizers_Tan, testVar)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 0;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(tan(a));
@@ -60,12 +52,8 @@ PHP_METHOD(Stub_Optimizers_Tan, testVar2)
 {
 	zval _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(tan(a));
@@ -74,12 +62,8 @@ PHP_METHOD(Stub_Optimizers_Tan, testVar2)
 PHP_METHOD(Stub_Optimizers_Tan, testIntValue1)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 1);
 	RETURN_DOUBLE(tan(1));
 }
@@ -87,12 +71,8 @@ PHP_METHOD(Stub_Optimizers_Tan, testIntValue1)
 PHP_METHOD(Stub_Optimizers_Tan, testIntValue2)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_LONG(&_0, 2);
 	RETURN_DOUBLE(tan(2));
 }
@@ -101,18 +81,12 @@ PHP_METHOD(Stub_Optimizers_Tan, testIntParameter)
 {
 	zval *a_param = NULL, _0;
 	zend_long a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
-	a = zephir_get_intval(a_param);
-
-
 	ZVAL_LONG(&_0, a);
 	RETURN_DOUBLE(tan(a));
 }
@@ -120,17 +94,12 @@ PHP_METHOD(Stub_Optimizers_Tan, testIntParameter)
 PHP_METHOD(Stub_Optimizers_Tan, testVarParameter)
 {
 	zval *a, a_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &a);
-
-
 	RETURN_DOUBLE(zephir_tan(a));
 }
 
diff --git a/ext/stub/pregmatch.zep.c b/ext/stub/pregmatch.zep.c
index b0d89a7f1c..7369bcdc7d 100644
--- a/ext/stub/pregmatch.zep.c
+++ b/ext/stub/pregmatch.zep.c
@@ -30,53 +30,39 @@ ZEPHIR_INIT_CLASS(Stub_Pregmatch)
 PHP_METHOD(Stub_Pregmatch, testWithoutReturnAndMatches)
 {
 	zval pattern, subject, _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&pattern);
+	ZVAL_NULL(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZEPHIR_INIT_VAR(&subject);
+	ZVAL_NULL(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	zephir_preg_match(&_1, &pattern, &subject, &_0, 0, 0 , 0 );
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	zephir_preg_match(return_value, &pattern, &subject, &_2, 0, 0 , 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Pregmatch, testWithoutReturns)
 {
 	zval pattern, subject, matches, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&matches);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
-	ZEPHIR_INIT_VAR(&pattern);
+	ZVAL_NULL(&matches);
+	ZVAL_NULL(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZEPHIR_INIT_VAR(&subject);
+	ZVAL_NULL(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_preg_match(&_0, &pattern, &subject, &matches, 0, 0 , 0 );
 	RETURN_CCTOR(&matches);
 }
@@ -84,24 +70,17 @@ PHP_METHOD(Stub_Pregmatch, testWithoutReturns)
 PHP_METHOD(Stub_Pregmatch, testWithoutMatches)
 {
 	zval pattern, subject, matched, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&matched);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&pattern);
+	ZVAL_NULL(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZEPHIR_INIT_VAR(&subject);
+	ZVAL_NULL(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&matched);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&matched);
 	zephir_preg_match(&matched, &pattern, &subject, &_0, 0, 0 , 0 );
 	RETURN_CCTOR(&matched);
 }
@@ -109,58 +88,42 @@ PHP_METHOD(Stub_Pregmatch, testWithoutMatches)
 PHP_METHOD(Stub_Pregmatch, testPregMatchAll)
 {
 	zval pattern, subject, results;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&results);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&pattern);
+	ZVAL_NULL(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZEPHIR_INIT_VAR(&subject);
+	ZVAL_NULL(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZEPHIR_INIT_VAR(&results);
+	ZVAL_NULL(&results);
 	array_init(&results);
 	zephir_preg_match(return_value, &pattern, &subject, &results, 1, 0 , 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Pregmatch, testPregMatchFallback)
 {
 	zval pattern, subject, matches;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&matches);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&matches);
+	ZVAL_NULL(&matches);
 	ZVAL_NULL(&matches);
 	ZEPHIR_INIT_NVAR(&matches);
 	array_init(&matches);
-	ZEPHIR_INIT_VAR(&pattern);
+	ZVAL_NULL(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZEPHIR_INIT_VAR(&subject);
+	ZVAL_NULL(&subject);
 	ZVAL_STRING(&subject, "abcdef");
 	zephir_preg_match(return_value, &pattern, &subject, &matches, 0, 0 , 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Pregmatch, testPregMatch2Params)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *pattern, pattern_sub, *subject, subject_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern_sub);
 	ZVAL_UNDEF(&subject_sub);
@@ -169,22 +132,15 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch2Params)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_ZVAL(subject)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &pattern, &subject);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_preg_match(return_value, pattern, subject, &_0, 0, 0 , 0 );
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Pregmatch, testPregMatch3Params)
 {
 	zval *pattern, pattern_sub, *subject, subject_sub, *matches, matches_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern_sub);
 	ZVAL_UNDEF(&subject_sub);
@@ -194,11 +150,7 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch3Params)
 		Z_PARAM_ZVAL(subject)
 		Z_PARAM_ZVAL(matches)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(3, 0, &pattern, &subject, &matches);
-
-
 	zephir_preg_match(return_value, pattern, subject, matches, 0, 0 , 0 );
 	return;
 }
@@ -206,7 +158,6 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch3Params)
 PHP_METHOD(Stub_Pregmatch, testPregMatch4Params)
 {
 	zval *pattern, pattern_sub, *subject, subject_sub, *matches, matches_sub, *flags, flags_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern_sub);
 	ZVAL_UNDEF(&subject_sub);
@@ -218,11 +169,7 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch4Params)
 		Z_PARAM_ZVAL(matches)
 		Z_PARAM_ZVAL(flags)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(4, 0, &pattern, &subject, &matches, &flags);
-
-
 	zephir_preg_match(return_value, pattern, subject, matches, 0, zephir_get_intval(flags) , 0 );
 	return;
 }
@@ -230,7 +177,6 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch4Params)
 PHP_METHOD(Stub_Pregmatch, testPregMatch5Params)
 {
 	zval *pattern, pattern_sub, *subject, subject_sub, *matches, matches_sub, *flags, flags_sub, *offset, offset_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern_sub);
 	ZVAL_UNDEF(&subject_sub);
@@ -244,11 +190,7 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch5Params)
 		Z_PARAM_ZVAL(flags)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(5, 0, &pattern, &subject, &matches, &flags, &offset);
-
-
 	zephir_preg_match(return_value, pattern, subject, matches, 0, zephir_get_intval(flags) , zephir_get_intval(offset) );
 	return;
 }
@@ -258,10 +200,8 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch5Params)
  */
 PHP_METHOD(Stub_Pregmatch, testPregMatchSaveMatches)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *pattern_param = NULL, matches, _0;
 	zval str, pattern;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&pattern);
@@ -271,27 +211,19 @@ PHP_METHOD(Stub_Pregmatch, testPregMatchSaveMatches)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(pattern)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &pattern_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&pattern, pattern_param);
-
-
-	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&matches);
+	ZVAL_NULL(&_0);
 	zephir_preg_match(&_0, &pattern, &str, &matches, 0, 0 , 0 );
 	RETURN_CCTOR(&matches);
 }
 
 PHP_METHOD(Stub_Pregmatch, testMatchAll)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *flags, flags_sub, text, matches, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&flags_sub);
 	ZVAL_UNDEF(&text);
@@ -302,21 +234,15 @@ PHP_METHOD(Stub_Pregmatch, testMatchAll)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(flags)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &flags);
-
-
-	ZEPHIR_INIT_VAR(&matches);
+	ZVAL_NULL(&matches);
 	array_init(&matches);
-	ZEPHIR_INIT_VAR(&text);
+	ZVAL_NULL(&text);
 	ZVAL_STRING(&text, "test1,test2");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "/(test[0-9]+)/");
-	ZEPHIR_INIT_VAR(&_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_1);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "/(test[0-9]+)/");
 	zephir_preg_match(&_1, &_2, &text, &matches, 1, zephir_get_intval(flags) , 0 );
 	RETURN_CCTOR(&matches);
@@ -325,7 +251,6 @@ PHP_METHOD(Stub_Pregmatch, testMatchAll)
 PHP_METHOD(Stub_Pregmatch, testMatchAllInZep)
 {
 	zval m1, m2, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
@@ -333,11 +258,6 @@ PHP_METHOD(Stub_Pregmatch, testMatchAllInZep)
 	ZVAL_UNDEF(&m1);
 	ZVAL_UNDEF(&m2);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 1);
 	ZEPHIR_CALL_METHOD(&m1, this_ptr, "testmatchall", &_1, 0, &_0);
 	zephir_check_call_status();
@@ -347,6 +267,6 @@ PHP_METHOD(Stub_Pregmatch, testMatchAllInZep)
 	zephir_create_array(return_value, 2, 0);
 	zephir_array_fast_append(return_value, &m1);
 	zephir_array_fast_append(return_value, &m2);
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/properties/app.zep.c b/ext/stub/properties/app.zep.c
index 6a261ddd51..e27454998a 100644
--- a/ext/stub/properties/app.zep.c
+++ b/ext/stub/properties/app.zep.c
@@ -30,9 +30,6 @@ ZEPHIR_INIT_CLASS(Stub_Properties_App)
  */
 PHP_METHOD(Stub_Properties_App, getInstance)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "instance");
 }
@@ -40,19 +37,12 @@ PHP_METHOD(Stub_Properties_App, getInstance)
 PHP_METHOD(Stub_Properties_App, __construct)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_CE_STATIC(&_0, stub_properties_staticprivateproperties_ce, "getinstance", NULL, 0);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("instance"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/properties/extendspublicproperties.zep.c b/ext/stub/properties/extendspublicproperties.zep.c
index 4335b268ab..dc908d5388 100644
--- a/ext/stub/properties/extendspublicproperties.zep.c
+++ b/ext/stub/properties/extendspublicproperties.zep.c
@@ -33,7 +33,6 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 {
 		zval _1$$3, _2$$3, _4$$4, _6$$5, _11$$7;
 	zval _0, _3, _5, _8, _10, _7$$5, _9$$6, _12$$7;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_5);
@@ -49,17 +48,15 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 	ZVAL_UNDEF(&_11$$7);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("someArrayWithSubArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			zephir_create_array(&_1$$3, 4, 0);
-			ZEPHIR_INIT_VAR(&_2$$3);
+			ZVAL_NULL(&_2$$3);
 			zephir_create_array(&_2$$3, 1, 0);
 			add_assoc_stringl_ex(&_2$$3, SL("class"), SL("alert alert-success"));
 			zephir_array_update_string(&_1$$3, SL("success"), &_2$$3, PH_COPY | PH_SEPARATE);
@@ -79,7 +76,7 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 		}
 		zephir_read_property_ex(&_3, this_ptr, ZEND_STRL("someArrayWithSpecifyKeys"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_3) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_4$$4);
+			ZVAL_NULL(&_4$$4);
 			zephir_create_array(&_4$$4, 3, 0);
 			add_assoc_stringl_ex(&_4$$4, SL("a"), SL("A"));
 			add_assoc_stringl_ex(&_4$$4, SL("b"), SL("B"));
@@ -88,9 +85,9 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 		}
 		zephir_read_property_ex(&_5, this_ptr, ZEND_STRL("someArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_5) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_6$$5);
+			ZVAL_NULL(&_6$$5);
 			zephir_create_array(&_6$$5, 4, 0);
-			ZEPHIR_INIT_VAR(&_7$$5);
+			ZVAL_NULL(&_7$$5);
 			ZVAL_LONG(&_7$$5, 1);
 			zephir_array_fast_append(&_6$$5, &_7$$5);
 			ZEPHIR_INIT_NVAR(&_7$$5);
@@ -106,20 +103,19 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 		}
 		zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("someEmptyArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_8) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_9$$6);
+			ZVAL_NULL(&_9$$6);
 			array_init(&_9$$6);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someEmptyArray"), &_9$$6);
 		}
 		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("someGetterSetterArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_10) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_11$$7);
+			ZVAL_NULL(&_11$$7);
 			zephir_create_array(&_11$$7, 1, 0);
-			ZEPHIR_INIT_VAR(&_12$$7);
+			ZVAL_NULL(&_12$$7);
 			ZVAL_STRING(&_12$$7, "holy");
 			zephir_array_fast_append(&_11$$7, &_12$$7);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someGetterSetterArray"), &_11$$7);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/getobjectvars.zep.c b/ext/stub/properties/getobjectvars.zep.c
index d1d39a6fe8..3ea555a040 100644
--- a/ext/stub/properties/getobjectvars.zep.c
+++ b/ext/stub/properties/getobjectvars.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Properties_GetObjectVars)
@@ -32,17 +31,10 @@ ZEPHIR_INIT_CLASS(Stub_Properties_GetObjectVars)
  */
 PHP_METHOD(Stub_Properties_GetObjectVars, issue1245)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 74, this_ptr);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 75, this_ptr);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/properties/privateproperties.zep.c b/ext/stub/properties/privateproperties.zep.c
index c76bed136a..de0eb029ff 100644
--- a/ext/stub/properties/privateproperties.zep.c
+++ b/ext/stub/properties/privateproperties.zep.c
@@ -52,63 +52,42 @@ ZEPHIR_INIT_CLASS(Stub_Properties_PrivateProperties)
 
 PHP_METHOD(Stub_Properties_PrivateProperties, getSomeNull)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someNull");
 }
 
 PHP_METHOD(Stub_Properties_PrivateProperties, getSomeNullInitial)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someNullInitial");
 }
 
 PHP_METHOD(Stub_Properties_PrivateProperties, getSomeFalse)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someFalse");
 }
 
 PHP_METHOD(Stub_Properties_PrivateProperties, getSomeTrue)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someTrue");
 }
 
 PHP_METHOD(Stub_Properties_PrivateProperties, getSomeInteger)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someInteger");
 }
 
 PHP_METHOD(Stub_Properties_PrivateProperties, getSomeDouble)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someDouble");
 }
 
 PHP_METHOD(Stub_Properties_PrivateProperties, getSomeString)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someString");
 }
diff --git a/ext/stub/properties/propertyarray.zep.c b/ext/stub/properties/propertyarray.zep.c
index f1d50aaa64..df4206750f 100644
--- a/ext/stub/properties/propertyarray.zep.c
+++ b/ext/stub/properties/propertyarray.zep.c
@@ -47,29 +47,21 @@ PHP_METHOD(Stub_Properties_PropertyArray, __construct)
 {
 	zval _1;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someArray"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Properties_PropertyArray, appendSome)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value, value_sub;
 	zval *this_ptr = getThis();
 
@@ -78,16 +70,9 @@ PHP_METHOD(Stub_Properties_PropertyArray, appendSome)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
-
-
 	zephir_cast_to_string(&_0, value);
 	zephir_update_property_array_append(this_ptr, SL("someArray"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Properties_PropertyArray, setOtherArray)
@@ -99,19 +84,12 @@ PHP_METHOD(Stub_Properties_PropertyArray, setOtherArray)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &arr);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("otherArray"), arr);
 }
 
 PHP_METHOD(Stub_Properties_PropertyArray, getOtherArray)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "otherArray");
 }
@@ -119,7 +97,6 @@ PHP_METHOD(Stub_Properties_PropertyArray, getOtherArray)
 PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 {
 	zval info, headers, _0$$3, _2$$3, _3$$3, _5$$5;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL, *_4 = NULL, *_6 = NULL;
 	zval *this_ptr = getThis();
@@ -130,12 +107,7 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_5$$5);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&headers);
+	ZVAL_NULL(&headers);
 	array_init(&headers);
 	while (1) {
 		if (!(1)) {
@@ -143,12 +115,12 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 		}
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_MAKE_REF(&_0$$3);
-		ZEPHIR_CALL_FUNCTION(&info, "array_shift", &_1, 76, &_0$$3);
+		ZEPHIR_CALL_FUNCTION(&info, "array_shift", &_1, 79, &_0$$3);
 		ZEPHIR_UNREF(&_0$$3);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "header");
-		ZEPHIR_CALL_FUNCTION(&_3$$3, "stripos", &_4, 77, &info, &_2$$3);
+		ZEPHIR_CALL_FUNCTION(&_3$$3, "stripos", &_4, 80, &info, &_2$$3);
 		zephir_check_call_status();
 		if (!ZEPHIR_IS_FALSE_IDENTICAL(&_3$$3)) {
 			zephir_array_append(&headers, &info, PH_SEPARATE, "stub/properties/propertyarray.zep", 51);
@@ -156,7 +128,7 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 		} else {
 			zephir_read_property(&_5$$5, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 			ZEPHIR_MAKE_REF(&_5$$5);
-			ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", &_6, 78, &_5$$5, &info);
+			ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", &_6, 81, &_5$$5, &info);
 			ZEPHIR_UNREF(&_5$$5);
 			zephir_check_call_status();
 			break;
@@ -169,7 +141,6 @@ zend_object *zephir_init_properties_Stub_Properties_PropertyArray(zend_class_ent
 {
 		zval _3$$4;
 	zval _0, _2, _5, _1$$3, _4$$4, _6$$5;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_5);
@@ -179,23 +150,21 @@ zend_object *zephir_init_properties_Stub_Properties_PropertyArray(zend_class_ent
 	ZVAL_UNDEF(&_3$$4);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("otherArray"), &_1$$3);
 		}
 		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("someArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_2) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_3$$4);
+			ZVAL_NULL(&_3$$4);
 			zephir_create_array(&_3$$4, 4, 0);
-			ZEPHIR_INIT_VAR(&_4$$4);
+			ZVAL_NULL(&_4$$4);
 			ZVAL_LONG(&_4$$4, 1);
 			zephir_array_fast_append(&_3$$4, &_4$$4);
 			ZEPHIR_INIT_NVAR(&_4$$4);
@@ -211,11 +180,10 @@ zend_object *zephir_init_properties_Stub_Properties_PropertyArray(zend_class_ent
 		}
 		zephir_read_property_ex(&_5, this_ptr, ZEND_STRL("someEmptyArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_5) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_6$$5);
+			ZVAL_NULL(&_6$$5);
 			array_init(&_6$$5);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someEmptyArray"), &_6$$5);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/propertyupdate.zep.c b/ext/stub/properties/propertyupdate.zep.c
index 815eb3714b..0bf5f7f599 100644
--- a/ext/stub/properties/propertyupdate.zep.c
+++ b/ext/stub/properties/propertyupdate.zep.c
@@ -27,19 +27,12 @@ ZEPHIR_INIT_CLASS(Stub_Properties_PropertyUpdate)
 PHP_METHOD(Stub_Properties_PropertyUpdate, update1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "aaa");
 	zephir_update_property_array_append(this_ptr, SL("p1"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/properties/protectedproperties.zep.c b/ext/stub/properties/protectedproperties.zep.c
index d5419d990e..b348b13a6c 100644
--- a/ext/stub/properties/protectedproperties.zep.c
+++ b/ext/stub/properties/protectedproperties.zep.c
@@ -77,11 +77,7 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeVar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(someVar)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &someVar);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someVar"), someVar);
 	RETURN_THISW();
 }
@@ -90,9 +86,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeVar)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeVar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someVar");
 }
@@ -102,7 +95,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeVar)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeArrayVar)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someArrayVar_param = NULL;
 	zval someArrayVar;
 	zval *this_ptr = getThis();
@@ -111,14 +103,8 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeArrayVar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someArrayVar)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someArrayVar_param);
 	zephir_get_arrval(&someArrayVar, someArrayVar_param);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someArrayVar"), &someArrayVar);
 	RETURN_THIS();
 }
@@ -128,9 +114,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeArrayVar)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeArrayVar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someArrayVar");
 }
@@ -140,9 +123,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeArrayVar)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeNull)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someNull");
 }
@@ -159,11 +139,7 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeNull)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someNull"), param);
 }
 
@@ -172,9 +148,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeNull)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeNullInitial)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someNullInitial");
 }
@@ -184,9 +157,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeNullInitial)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeFalse)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someFalse");
 }
@@ -196,9 +166,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeFalse)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeTrue)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someTrue");
 }
@@ -208,9 +175,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeTrue)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeInteger)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someInteger");
 }
@@ -220,9 +184,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeInteger)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeDouble)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someDouble");
 }
@@ -232,9 +193,6 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeDouble)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeString)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someString");
 }
@@ -242,24 +200,20 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeString)
 zend_object *zephir_init_properties_Stub_Properties_ProtectedProperties(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("someArrayVar"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someArrayVar"), &_1$$3);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/publicproperties.zep.c b/ext/stub/properties/publicproperties.zep.c
index 7185dcb884..02ae672545 100644
--- a/ext/stub/properties/publicproperties.zep.c
+++ b/ext/stub/properties/publicproperties.zep.c
@@ -86,20 +86,13 @@ PHP_METHOD(Stub_Properties_PublicProperties, setSomeGetterSetterArray)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(someGetterSetterArray)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &someGetterSetterArray);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someGetterSetterArray"), someGetterSetterArray);
 	RETURN_THISW();
 }
 
 PHP_METHOD(Stub_Properties_PublicProperties, getSomeGetterSetterArray)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someGetterSetterArray");
 }
@@ -107,16 +100,9 @@ PHP_METHOD(Stub_Properties_PublicProperties, getSomeGetterSetterArray)
 PHP_METHOD(Stub_Properties_PublicProperties, test394Issue)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("someTrue"), PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
@@ -125,7 +111,6 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 {
 		zval _3$$4, _4$$4, _6$$5, _8$$6;
 	zval _0, _2, _5, _7, _10, _1$$3, _9$$6, _11$$7;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_5);
@@ -140,23 +125,21 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 	ZVAL_UNDEF(&_8$$6);
 	
 
-		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("someGetterSetterArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_1$$3);
+			ZVAL_NULL(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someGetterSetterArray"), &_1$$3);
 		}
 		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("someArrayWithSubArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_2) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_3$$4);
+			ZVAL_NULL(&_3$$4);
 			zephir_create_array(&_3$$4, 4, 0);
-			ZEPHIR_INIT_VAR(&_4$$4);
+			ZVAL_NULL(&_4$$4);
 			zephir_create_array(&_4$$4, 1, 0);
 			add_assoc_stringl_ex(&_4$$4, SL("class"), SL("alert alert-success"));
 			zephir_array_update_string(&_3$$4, SL("success"), &_4$$4, PH_COPY | PH_SEPARATE);
@@ -176,7 +159,7 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 		}
 		zephir_read_property_ex(&_5, this_ptr, ZEND_STRL("someArrayWithSpecifyKeys"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_5) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_6$$5);
+			ZVAL_NULL(&_6$$5);
 			zephir_create_array(&_6$$5, 3, 0);
 			add_assoc_stringl_ex(&_6$$5, SL("a"), SL("A"));
 			add_assoc_stringl_ex(&_6$$5, SL("b"), SL("B"));
@@ -185,9 +168,9 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 		}
 		zephir_read_property_ex(&_7, this_ptr, ZEND_STRL("someArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_7) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_8$$6);
+			ZVAL_NULL(&_8$$6);
 			zephir_create_array(&_8$$6, 4, 0);
-			ZEPHIR_INIT_VAR(&_9$$6);
+			ZVAL_NULL(&_9$$6);
 			ZVAL_LONG(&_9$$6, 1);
 			zephir_array_fast_append(&_8$$6, &_9$$6);
 			ZEPHIR_INIT_NVAR(&_9$$6);
@@ -203,11 +186,10 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 		}
 		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("someEmptyArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_10) == IS_NULL) {
-			ZEPHIR_INIT_VAR(&_11$$7);
+			ZVAL_NULL(&_11$$7);
 			array_init(&_11$$7);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someEmptyArray"), &_11$$7);
 		}
-		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/staticprivateproperties.zep.c b/ext/stub/properties/staticprivateproperties.zep.c
index 2db018e701..3ab8ddfd60 100644
--- a/ext/stub/properties/staticprivateproperties.zep.c
+++ b/ext/stub/properties/staticprivateproperties.zep.c
@@ -28,18 +28,10 @@ ZEPHIR_INIT_CLASS(Stub_Properties_StaticPrivateProperties)
 PHP_METHOD(Stub_Properties_StaticPrivateProperties, getInstance)
 {
 	zval localInstance, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&localInstance);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	zephir_memory_observe(&localInstance);
 	zephir_read_static_property_ce(&localInstance, stub_properties_staticprivateproperties_ce, SL("instance"), PH_NOISY_CC);
 	if (UNEXPECTED(Z_TYPE_P(&localInstance) != IS_OBJECT)) {
 		ZEPHIR_INIT_NVAR(&localInstance);
diff --git a/ext/stub/properties/staticpropertyarray.zep.c b/ext/stub/properties/staticpropertyarray.zep.c
index 2d1f4eb42b..5059055691 100644
--- a/ext/stub/properties/staticpropertyarray.zep.c
+++ b/ext/stub/properties/staticpropertyarray.zep.c
@@ -40,17 +40,11 @@ void zephir_init_static_properties_Stub_Properties_StaticPropertyArray()
 {
 	zval _1;
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -66,6 +60,5 @@ void zephir_init_static_properties_Stub_Properties_StaticPropertyArray()
 	ZEPHIR_INIT_NVAR(&_1);
 	array_init(&_1);
 	zephir_update_static_property_ce(stub_properties_staticpropertyarray_ce, ZEND_STRL("someEmptyArray"), &_1);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/properties/staticprotectedproperties.zep.c b/ext/stub/properties/staticprotectedproperties.zep.c
index fafcb661c6..355656c3b9 100644
--- a/ext/stub/properties/staticprotectedproperties.zep.c
+++ b/ext/stub/properties/staticprotectedproperties.zep.c
@@ -62,20 +62,13 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, setSomeVar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(someVar)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &someVar);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someVar"), someVar);
 	RETURN_THISW();
 }
 
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeVar)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "someVar");
 }
@@ -83,12 +76,8 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeVar)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeNull)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someNull"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
@@ -96,29 +85,20 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeNull)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, setSomeNull)
 {
 	zval *param, param_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &param);
-
-
 	zephir_update_static_property_ce(stub_properties_staticprotectedproperties_ce, ZEND_STRL("someNull"), param);
 }
 
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeNullInitial)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someNullInitial"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
@@ -126,12 +106,8 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeNullInitial)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeFalse)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someFalse"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
@@ -139,12 +115,8 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeFalse)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeTrue)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someTrue"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
@@ -152,12 +124,8 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeTrue)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeInteger)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someInteger"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
@@ -165,12 +133,8 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeInteger)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeDouble)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someDouble"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
@@ -178,12 +142,8 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeDouble)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeString)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someString"), PH_NOISY_CC | PH_READONLY);
 	RETURN_CTORW(&_0);
 }
@@ -194,17 +154,9 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeString)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, compareStaticNull)
 {
 	zval someNull, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&someNull);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	zephir_memory_observe(&_0);
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someNull"), PH_NOISY_CC);
 	ZEPHIR_CPY_WRT(&someNull, &_0);
 	if (Z_TYPE_P(&someNull) == IS_NULL) {
diff --git a/ext/stub/properties/staticpublicproperties.zep.c b/ext/stub/properties/staticpublicproperties.zep.c
index 5261820fb1..4c77714600 100644
--- a/ext/stub/properties/staticpublicproperties.zep.c
+++ b/ext/stub/properties/staticpublicproperties.zep.c
@@ -56,29 +56,20 @@ ZEPHIR_INIT_CLASS(Stub_Properties_StaticPublicProperties)
 PHP_METHOD(Stub_Properties_StaticPublicProperties, setSomeString)
 {
 	zval *val, val_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
-
-
 	zephir_update_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someString"), val);
 }
 
 PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &_0);
@@ -90,16 +81,9 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub)
 PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub2)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "2string");
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &_0);
@@ -107,18 +91,13 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub2)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "2string");
 	zephir_sub_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someSub"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub3)
 {
 	zval _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	ZVAL_UNDEF(&_0);
 	ZVAL_DOUBLE(&_0, 1.0);
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &_0);
@@ -131,12 +110,8 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub4)
 {
 	zval _0;
 	zend_long v = 0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-
 	v = 1;
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, v);
@@ -149,19 +124,11 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub4)
 PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub5)
 {
 	zval v;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&v);
+	ZVAL_NULL(&v);
 	ZVAL_STRING(&v, "1");
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &v);
 	zephir_sub_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someSub"), &v);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/quantum.zep.c b/ext/stub/quantum.zep.c
index b05f9d0cb6..fe427ce746 100644
--- a/ext/stub/quantum.zep.c
+++ b/ext/stub/quantum.zep.c
@@ -35,12 +35,10 @@ PHP_METHOD(Stub_Quantum, harmos)
 {
 	zval _8$$4, _10$$4, _11$$4;
 	zend_bool _12, _15$$5, _34$$5, _50$$5;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_5 = NULL, *_55 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i = 0, j = 0, n = 0, _13, _14, _16$$5, _17$$5, _35$$5, _36$$5;
 	zval *x_param = NULL, psr, psi, p2, v, paramater, fp, tmp, _0, _1, _2$$4, _3$$4, _4$$4, _6$$4, _7$$4, _9$$4, _18$$6, _19$$6, _20$$6, _21$$6, _22$$6, _23$$6, _24$$6, _25$$6, _26$$6, _27$$6, _28$$6, _29$$6, _30$$6, _31$$6, _32$$6, _33$$6, _37$$7, _38$$7, _39$$7, _40$$7, _41$$7, _42$$7, _43$$7, _44$$7, _45$$7, _46$$7, _47$$7, _48$$7, _49$$7, _51$$9, _52$$9, _53$$9, _54$$9, _56$$8, _57$$10, _58$$10, _59$$10;
 	double x, dt = 0, dx = 0, k0 = 0, item_psr = 0, item_psi = 0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&psr);
 	ZVAL_UNDEF(&psi);
@@ -100,20 +98,14 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &x_param);
 	x = zephir_get_doubleval(x_param);
-
-
-	dx = 0.02;
-	k0 = (3.0 * 3.14159265358979323846);
-	dt = zephir_safe_div_double_long((dx * dx), 4.0);
-	ZEPHIR_INIT_VAR(&paramater);
+	dx =  (0.02);
+	k0 =  ((3.0 * 3.14159265358979323846));
+	dt =  (zephir_safe_div_double_long((dx * dx), 4.0));
+	ZVAL_NULL(&paramater);
 	zephir_create_array(&paramater, 4, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_DOUBLE(&_0, dx);
 	zephir_array_fast_append(&paramater, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -126,19 +118,19 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZVAL_DOUBLE(&_0, x);
 	zephir_array_fast_append(&paramater, &_0);
 	i = 0;
-	ZEPHIR_INIT_VAR(&psr);
+	ZVAL_NULL(&psr);
 	array_init(&psr);
-	ZEPHIR_INIT_VAR(&psi);
+	ZVAL_NULL(&psi);
 	array_init(&psi);
-	ZEPHIR_INIT_VAR(&p2);
+	ZVAL_NULL(&p2);
 	array_init(&p2);
-	ZEPHIR_INIT_VAR(&v);
+	ZVAL_NULL(&v);
 	array_init(&v);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "harmos.txt");
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 34, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 35, &_0, &_1);
 	zephir_check_call_status();
 	if (!(zephir_is_true(&fp))) {
 		RETURN_MM_LONG(1);
@@ -151,12 +143,12 @@ PHP_METHOD(Stub_Quantum, harmos)
 		ZVAL_DOUBLE(&_3$$4, ((x * x) * 2.0));
 		ZEPHIR_CALL_FUNCTION(&_4$$4, "exp", &_5, 2, &_3$$4);
 		zephir_check_call_status();
-		item_psi = zephir_safe_div_double_zval(sin((k0 * x)), &_4$$4);
+		item_psi =  (zephir_safe_div_double_zval(sin((k0 * x)), &_4$$4));
 		ZVAL_DOUBLE(&_3$$4, (k0 * x));
 		ZVAL_DOUBLE(&_6$$4, ((x * x) * 2.0));
 		ZEPHIR_CALL_FUNCTION(&_7$$4, "exp", &_5, 2, &_6$$4);
 		zephir_check_call_status();
-		item_psr = zephir_safe_div_double_zval(cos((k0 * x)), &_7$$4);
+		item_psr =  (zephir_safe_div_double_zval(cos((k0 * x)), &_7$$4));
 		ZEPHIR_INIT_NVAR(&_8$$4);
 		zephir_create_array(&_8$$4, 1, 0);
 		ZEPHIR_INIT_NVAR(&_9$$4);
@@ -175,12 +167,12 @@ PHP_METHOD(Stub_Quantum, harmos)
 		ZVAL_DOUBLE(&_9$$4, (double) ((double) (5.0 * x) * x));
 		zephir_array_fast_append(&_11$$4, &_9$$4);
 		zephir_array_update_long(&v, i, &_11$$4, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
-		x = (x + dx);
+		x =  ((x + dx));
 		i++;
 	}
 	i = 1;
 	j = 1;
-	ZEPHIR_INIT_VAR(&tmp);
+	ZVAL_NULL(&tmp);
 	zephir_create_array(&tmp, 1, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_DOUBLE(&_0, 2.0);
@@ -343,13 +335,13 @@ PHP_METHOD(Stub_Quantum, harmos)
 					ZVAL_STRING(&_52$$9, "%16.8lf %16.8lf %16.8lf \n");
 					ZVAL_DOUBLE(&_53$$9, ((double) i * dx));
 					ZVAL_DOUBLE(&_54$$9, ((double) n * dt));
-					ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 79, &fp, &_52$$9, &_53$$9, &_54$$9, &_51$$9);
+					ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 82, &fp, &_52$$9, &_53$$9, &_54$$9, &_51$$9);
 					zephir_check_call_status();
 					i = (i + 10);
 				}
 				ZEPHIR_INIT_NVAR(&_56$$8);
 				ZVAL_STRING(&_56$$8, "\n");
-				ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 79, &fp, &_56$$8);
+				ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 82, &fp, &_56$$8);
 				zephir_check_call_status();
 			}
 			j = 1;
diff --git a/ext/stub/range.zep.c b/ext/stub/range.zep.c
index aa13c5d2dc..445133d67c 100644
--- a/ext/stub/range.zep.c
+++ b/ext/stub/range.zep.c
@@ -32,22 +32,15 @@ PHP_METHOD(Stub_Range, inclusive1)
 {
 	zval _3;
 	zval _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
-	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 80, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 83, &_0, &_1);
 	zephir_check_call_status();
 	zephir_get_arrval(&_3, &_2);
 	RETURN_CTOR(&_3);
@@ -57,22 +50,15 @@ PHP_METHOD(Stub_Range, exclusive1)
 {
 	zval _3;
 	zval _0, _1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
-	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 80, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 83, &_0, &_1);
 	zephir_check_call_status();
 	zephir_get_arrval(&_3, &_2);
 	RETURN_CTOR(&_3);
diff --git a/ext/stub/references.zep.c b/ext/stub/references.zep.c
index 2a15316e50..0b44f87f72 100644
--- a/ext/stub/references.zep.c
+++ b/ext/stub/references.zep.c
@@ -24,9 +24,6 @@ ZEPHIR_INIT_CLASS(Stub_References)
 
 PHP_METHOD(Stub_References, assignByRef)
 {
-	zval *this_ptr = getThis();
-
-
 
 }
 
diff --git a/ext/stub/reflection.zep.c b/ext/stub/reflection.zep.c
index 3d290d8d16..788259168d 100644
--- a/ext/stub/reflection.zep.c
+++ b/ext/stub/reflection.zep.c
@@ -28,19 +28,13 @@ ZEPHIR_INIT_CLASS(Stub_Reflection)
 PHP_METHOD(Stub_Reflection, getReflectionClass)
 {
 	zval r;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&r);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&r);
+	ZVAL_NULL(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionclass")));
-	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 81, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 84, this_ptr);
 	zephir_check_call_status();
 	RETURN_CCTOR(&r);
 }
@@ -48,22 +42,15 @@ PHP_METHOD(Stub_Reflection, getReflectionClass)
 PHP_METHOD(Stub_Reflection, getReflectionFunction)
 {
 	zval r, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&r);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&r);
+	ZVAL_NULL(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionfunction")));
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "abs");
-	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 82, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 85, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&r);
 }
@@ -77,20 +64,13 @@ PHP_METHOD(Stub_Reflection, setReflectionParameter)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(parameter, zephir_get_internal_ce(SL("reflectionparameter")))
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &parameter);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("reflectionParameter"), parameter);
 	RETURN_MEMBER(getThis(), "reflectionParameter");
 }
 
 PHP_METHOD(Stub_Reflection, getReflectionParameter)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "reflectionParameter");
 }
diff --git a/ext/stub/regexdna.zep.c b/ext/stub/regexdna.zep.c
index 030cf09af1..3e016e275b 100644
--- a/ext/stub/regexdna.zep.c
+++ b/ext/stub/regexdna.zep.c
@@ -35,11 +35,9 @@ ZEPHIR_INIT_CLASS(Stub_RegexDNA)
 
 PHP_METHOD(Stub_RegexDNA, process)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zval *path, path_sub, variants, vIUB, vIUBnew, stuffToRemove, contents, initialLength, regex, codeLength, discard, _0, _1, _2, *_4, _5, _6$$3, _7$$3, _8$$4, _9$$4;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&path_sub);
 	ZVAL_UNDEF(&variants);
@@ -62,18 +60,12 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
-
-
-	ZEPHIR_INIT_VAR(&discard);
 	ZVAL_NULL(&discard);
-	ZEPHIR_INIT_VAR(&variants);
+	ZVAL_NULL(&discard);
+	ZVAL_NULL(&variants);
 	zephir_create_array(&variants, 9, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "agggtaaa|tttaccct");
 	zephir_array_fast_append(&variants, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -100,9 +92,9 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "agggtaa[cgt]|[acg]ttaccct");
 	zephir_array_fast_append(&variants, &_0);
-	ZEPHIR_INIT_VAR(&vIUB);
+	ZVAL_NULL(&vIUB);
 	array_init(&vIUB);
-	ZEPHIR_INIT_VAR(&vIUBnew);
+	ZVAL_NULL(&vIUBnew);
 	array_init(&vIUBnew);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "/B/S");
@@ -170,22 +162,22 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "(c|t)");
 	zephir_array_append(&vIUBnew, &_0, PH_SEPARATE, "stub/regexdna.zep", 39);
-	ZEPHIR_INIT_VAR(&stuffToRemove);
+	ZVAL_NULL(&stuffToRemove);
 	ZVAL_STRING(&stuffToRemove, "^>.*$|\n");
 	ZEPHIR_INIT_NVAR(&discard);
 	ZVAL_NULL(&discard);
-	ZEPHIR_INIT_VAR(&contents);
+	ZVAL_NULL(&contents);
 	zephir_file_get_contents(&contents, path);
-	ZEPHIR_INIT_VAR(&initialLength);
+	ZVAL_NULL(&initialLength);
 	ZVAL_LONG(&initialLength, zephir_fast_strlen_ev(&contents));
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_CONCAT_SVS(&_1, "/", &stuffToRemove, "/mS");
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "");
-	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 75, &_1, &_0, &contents);
+	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 78, &_1, &_0, &contents);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&contents, &_2);
-	ZEPHIR_INIT_VAR(&codeLength);
+	ZVAL_NULL(&codeLength);
 	ZVAL_LONG(&codeLength, zephir_fast_strlen_ev(&contents));
 	zephir_is_iterable(&variants, 0, "stub/regexdna.zep", 58);
 	if (Z_TYPE_P(&variants) == IS_ARRAY) {
@@ -226,7 +218,7 @@ PHP_METHOD(Stub_RegexDNA, process)
 		}
 	}
 	ZEPHIR_INIT_NVAR(&regex);
-	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 75, &vIUB, &vIUBnew, &contents);
+	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 78, &vIUB, &vIUBnew, &contents);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&contents, &_2);
 	php_printf("%c", '\n');
@@ -236,6 +228,5 @@ PHP_METHOD(Stub_RegexDNA, process)
 	php_printf("%c", '\n');
 	php_printf("%d", zephir_fast_strlen_ev(&contents));
 	php_printf("%c", '\n');
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/requires.zep.c b/ext/stub/requires.zep.c
index 4c54a50ff8..5c7ec81b84 100644
--- a/ext/stub/requires.zep.c
+++ b/ext/stub/requires.zep.c
@@ -31,22 +31,14 @@ ZEPHIR_INIT_CLASS(Stub_Requires)
 
 PHP_METHOD(Stub_Requires, requireExternal1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *path, path_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&path_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
-
-
 	ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&_0);
 	if (zephir_require_zval_ret(&_0, path) == FAILURE) {
 		RETURN_MM_NULL();
@@ -57,17 +49,12 @@ PHP_METHOD(Stub_Requires, requireExternal1)
 PHP_METHOD(Stub_Requires, requireExternal2)
 {
 	zval *path, path_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&path_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &path);
-
-
 	if (zephir_require_zval(path) == FAILURE) {
 		RETURN_NULL();
 	}
@@ -76,7 +63,6 @@ PHP_METHOD(Stub_Requires, requireExternal2)
 
 PHP_METHOD(Stub_Requires, requireExternal3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *path, path_sub, external3, _0;
 	zval *this_ptr = getThis();
@@ -87,24 +73,16 @@ PHP_METHOD(Stub_Requires, requireExternal3)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
-
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_CREATE_SYMBOL_TABLE();
-	
-	ZEPHIR_INIT_VAR(&external3);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&external3);
 	object_init_ex(&external3, stub_requires_external3_ce);
 	if (zephir_has_constructor(&external3)) {
 		ZEPHIR_CALL_METHOD(NULL, &external3, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_CALL_METHOD(NULL, &external3, "req", NULL, 83, path, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &external3, "req", NULL, 86, path, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "content");
 }
@@ -118,11 +96,7 @@ PHP_METHOD(Stub_Requires, setContent)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(content)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &content);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("content"), content);
 }
 
@@ -130,11 +104,9 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 {
 	zend_string *_4$$3;
 	zend_ulong _3$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *templatePath_param = NULL, *params, params_sub, _0, key, value, _7, *_1$$3, _2$$3, _5$$4, _6$$5;
 	zval templatePath;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&templatePath);
 	ZVAL_UNDEF(&params_sub);
@@ -149,10 +121,6 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 		Z_PARAM_STR(templatePath)
 		Z_PARAM_ZVAL(params)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &templatePath_param, &params);
 	if (UNEXPECTED(Z_TYPE_P(templatePath_param) != IS_STRING && Z_TYPE_P(templatePath_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'templatePath' must be of the type string"));
@@ -161,13 +129,9 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 	if (EXPECTED(Z_TYPE_P(templatePath_param) == IS_STRING)) {
 		zephir_get_strval(&templatePath, templatePath_param);
 	} else {
-		ZEPHIR_INIT_VAR(&templatePath);
+		ZVAL_NULL(&templatePath);
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_CREATE_SYMBOL_TABLE();
-	
+	ZVAL_NULL(&_0);
 	if (Z_TYPE_P(params) == IS_ARRAY) {
 		zephir_is_iterable(params, 0, "stub/requires.zep", 47);
 		if (Z_TYPE_P(params) == IS_ARRAY) {
@@ -219,24 +183,16 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 
 PHP_METHOD(Stub_Requires, requireOnce)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *path_param = NULL, _0;
 	zval path;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&path);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(path)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path_param);
 	zephir_get_strval(&path, path_param);
-
-
 	ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&_0);
 	if (zephir_require_once_zval_ret(&_0, &path) == FAILURE) {
 		RETURN_MM_NULL();
diff --git a/ext/stub/requires/external3.zep.c b/ext/stub/requires/external3.zep.c
index d0439bbcea..b3d317f9df 100644
--- a/ext/stub/requires/external3.zep.c
+++ b/ext/stub/requires/external3.zep.c
@@ -31,10 +31,8 @@ ZEPHIR_INIT_CLASS(Stub_Requires_External3)
 
 PHP_METHOD(Stub_Requires_External3, req)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *path, path_sub, *requires, requires_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&path_sub);
 	ZVAL_UNDEF(&requires_sub);
@@ -43,22 +41,15 @@ PHP_METHOD(Stub_Requires_External3, req)
 		Z_PARAM_ZVAL(path)
 		Z_PARAM_ZVAL(requires)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &path, &requires);
-
-
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 84);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 87);
 	zephir_check_call_status();
 	if (zephir_require_zval(path) == FAILURE) {
 		RETURN_MM_NULL();
 	}
-	ZEPHIR_CALL_FUNCTION(&_0, "ob_get_contents", NULL, 85);
+	ZEPHIR_CALL_FUNCTION(&_0, "ob_get_contents", NULL, 88);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(NULL, requires, "setcontent", NULL, 0, &_0);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/resourcetest.zep.c b/ext/stub/resourcetest.zep.c
index 6034d0c999..c00ea31491 100644
--- a/ext/stub/resourcetest.zep.c
+++ b/ext/stub/resourcetest.zep.c
@@ -27,16 +27,9 @@ ZEPHIR_INIT_CLASS(Stub_ResourceTest)
 PHP_METHOD(Stub_ResourceTest, testLetStatementSTDIN)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	RETURN_CCTOR(&a);
 }
@@ -44,16 +37,9 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDIN)
 PHP_METHOD(Stub_ResourceTest, testLetStatementSTDOUT)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDOUT");
 	RETURN_CCTOR(&a);
 }
@@ -61,16 +47,9 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDOUT)
 PHP_METHOD(Stub_ResourceTest, testLetStatementSTDERR)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDERR");
 	RETURN_CCTOR(&a);
 }
@@ -78,19 +57,12 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDERR)
 PHP_METHOD(Stub_ResourceTest, testTypeOffResource)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_gettype(&_0, &a);
 	RETURN_CCTOR(&_0);
 }
@@ -98,16 +70,9 @@ PHP_METHOD(Stub_ResourceTest, testTypeOffResource)
 PHP_METHOD(Stub_ResourceTest, testIsResource)
 {
 	zval a;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	RETURN_MM_BOOL(Z_TYPE_P(&a) == IS_RESOURCE);
 }
@@ -115,22 +80,14 @@ PHP_METHOD(Stub_ResourceTest, testIsResource)
 PHP_METHOD(Stub_ResourceTest, testFunctionsForSTDIN)
 {
 	zval a, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	ZVAL_LONG(&_0, 1);
-	ZEPHIR_CALL_FUNCTION(NULL, "stream_set_blocking", NULL, 86, &a, &_0);
+	ZEPHIR_CALL_FUNCTION(NULL, "stream_set_blocking", NULL, 89, &a, &_0);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/returns.zep.c b/ext/stub/returns.zep.c
index 63e9e6f8fa..f1c70a36a4 100644
--- a/ext/stub/returns.zep.c
+++ b/ext/stub/returns.zep.c
@@ -26,36 +26,24 @@ ZEPHIR_INIT_CLASS(Stub_Returns)
 
 PHP_METHOD(Stub_Returns, testReturnCast1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG((int) 5.0);
 }
 
 PHP_METHOD(Stub_Returns, testReturnCast2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(1);
 }
 
 PHP_METHOD(Stub_Returns, testReturnCast3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(0);
 }
 
 PHP_METHOD(Stub_Returns, testReturnCast4)
 {
-	zval *this_ptr = getThis();
-
-
 
 	if (1) {
 		RETURN_LONG(1);
@@ -66,31 +54,20 @@ PHP_METHOD(Stub_Returns, testReturnCast4)
 
 PHP_METHOD(Stub_Returns, returnWithParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *parameter_param = NULL;
 	zval parameter;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&parameter);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(parameter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &parameter_param);
 	zephir_get_strval(&parameter, parameter_param);
-
-
 	RETURN_MM_STRING("Return back");
 }
 
 PHP_METHOD(Stub_Returns, returnWithoutParameter)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("Return back");
 }
diff --git a/ext/stub/router.zep.c b/ext/stub/router.zep.c
index cbdac3c2fb..dd89075379 100644
--- a/ext/stub/router.zep.c
+++ b/ext/stub/router.zep.c
@@ -85,7 +85,6 @@ ZEPHIR_INIT_CLASS(Stub_Router)
 PHP_METHOD(Stub_Router, __construct)
 {
 	zval _1$$3, _4$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *defaultRoutes_param = NULL, routes, _6, _0$$3, _2$$3, _5$$3;
@@ -103,49 +102,41 @@ PHP_METHOD(Stub_Router, __construct)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(defaultRoutes)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &defaultRoutes_param);
 	if (!defaultRoutes_param) {
 		defaultRoutes = 1;
 	} else {
-		defaultRoutes = zephir_get_boolval(defaultRoutes_param);
-	}
-
-
-	ZEPHIR_INIT_VAR(&routes);
+		}
+	ZVAL_NULL(&routes);
 	array_init(&routes);
 	if (defaultRoutes == 1) {
-		ZEPHIR_INIT_VAR(&_0$$3);
+		ZVAL_NULL(&_0$$3);
 		object_init_ex(&_0$$3, stub_router_route_ce);
-		ZEPHIR_INIT_VAR(&_1$$3);
+		ZVAL_NULL(&_1$$3);
 		zephir_create_array(&_1$$3, 1, 0);
 		add_assoc_long_ex(&_1$$3, SL("controller"), 1);
-		ZEPHIR_INIT_VAR(&_2$$3);
+		ZVAL_NULL(&_2$$3);
 		ZVAL_STRING(&_2$$3, "#^/([a-zA-Z0-9\\_\\-]+)[/]{0,1}$#");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", &_3, 87, &_2$$3, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", &_3, 90, &_2$$3, &_1$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "stub/router.zep", 89);
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		object_init_ex(&_2$$3, stub_router_route_ce);
-		ZEPHIR_INIT_VAR(&_4$$3);
+		ZVAL_NULL(&_4$$3);
 		zephir_create_array(&_4$$3, 3, 0);
 		add_assoc_long_ex(&_4$$3, SL("controller"), 1);
 		add_assoc_long_ex(&_4$$3, SL("action"), 2);
 		add_assoc_long_ex(&_4$$3, SL("params"), 3);
-		ZEPHIR_INIT_VAR(&_5$$3);
+		ZVAL_NULL(&_5$$3);
 		ZVAL_STRING(&_5$$3, "#^/([a-zA-Z0-9\\_\\-]+)/([a-zA-Z0-9\\.\\_]+)(/.*)*$#");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 87, &_5$$3, &_4$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 90, &_5$$3, &_4$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "stub/router.zep", 95);
 	}
-	ZEPHIR_INIT_VAR(&_6);
+	ZVAL_NULL(&_6);
 	array_init(&_6);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_params"), &_6);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_routes"), &routes);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -162,11 +153,7 @@ PHP_METHOD(Stub_Router, setDI)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(dependencyInjector, stub_diinterface_ce)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &dependencyInjector);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_dependencyInjector"), dependencyInjector);
 }
 
@@ -177,9 +164,6 @@ PHP_METHOD(Stub_Router, setDI)
  */
 PHP_METHOD(Stub_Router, getDI)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_dependencyInjector");
 }
@@ -191,7 +175,6 @@ PHP_METHOD(Stub_Router, getDI)
  */
 PHP_METHOD(Stub_Router, getRewriteUri)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _GET, _SERVER, url, urlParts, realUri, _0;
 	zval *this_ptr = getThis();
 
@@ -201,16 +184,11 @@ PHP_METHOD(Stub_Router, getRewriteUri)
 	ZVAL_UNDEF(&urlParts);
 	ZVAL_UNDEF(&realUri);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 	zephir_get_global(&_GET, SL("_GET"));
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_uriSource"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
-		zephir_memory_observe(&url);
 		if (zephir_array_isset_string_fetch(&url, &_GET, SL("_url"), 0)) {
 			if (!(zephir_is_true(&url))) {
 				RETURN_CCTOR(&url);
@@ -219,7 +197,7 @@ PHP_METHOD(Stub_Router, getRewriteUri)
 	} else {
 		ZEPHIR_OBS_NVAR(&url);
 		if (zephir_array_isset_string_fetch(&url, &_SERVER, SL("REQUEST_URI"), 0)) {
-			ZEPHIR_INIT_VAR(&urlParts);
+			ZVAL_NULL(&urlParts);
 			zephir_fast_explode_str(&urlParts, SL("?"), &url, LONG_MAX);
 			zephir_array_fetch_long(&realUri, &urlParts, 0, PH_NOISY | PH_READONLY, "stub/router.zep", 142);
 			if (!(zephir_is_true(&realUri))) {
@@ -249,11 +227,7 @@ PHP_METHOD(Stub_Router, setUriSource)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(uriSource)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &uriSource);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_uriSource"), uriSource);
 	RETURN_THISW();
 }
@@ -273,11 +247,7 @@ PHP_METHOD(Stub_Router, removeExtraSlashes)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(remove)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &remove);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_removeExtraSlashes"), remove);
 	RETURN_THISW();
 }
@@ -297,11 +267,7 @@ PHP_METHOD(Stub_Router, setDefaultNamespace)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(namespaceName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &namespaceName);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_defaultNamespace"), namespaceName);
 	RETURN_THISW();
 }
@@ -321,11 +287,7 @@ PHP_METHOD(Stub_Router, setDefaultModule)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(moduleName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &moduleName);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_defaultModule"), moduleName);
 	RETURN_THISW();
 }
@@ -345,11 +307,7 @@ PHP_METHOD(Stub_Router, setDefaultController)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(controllerName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &controllerName);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_defaultController"), controllerName);
 	RETURN_THISW();
 }
@@ -369,11 +327,7 @@ PHP_METHOD(Stub_Router, setDefaultAction)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(actionName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &actionName);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_defaultAction"), actionName);
 	RETURN_THISW();
 }
@@ -406,11 +360,7 @@ PHP_METHOD(Stub_Router, setDefaults)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(defaults)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &defaults);
-
-
 	if (Z_TYPE_P(defaults) != IS_ARRAY) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(stub_router_exception_ce, "Defaults must be an array", "stub/router.zep", 246);
 		return;
@@ -439,17 +389,12 @@ PHP_METHOD(Stub_Router, setDefaults)
 PHP_METHOD(Stub_Router, doRemoveExtraSlashes)
 {
 	zval *route, route_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&route_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(route)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &route);
-
-
 	RETVAL_ZVAL(route, 1, 0);
 	return;
 }
@@ -471,7 +416,6 @@ PHP_METHOD(Stub_Router, handle)
 {
 	zend_string *_12$$28, *_21$$62;
 	zend_ulong _11$$28, _20$$62;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *uri = NULL, uri_sub, __$true, __$false, __$null, realUri, request, currentHostName, routeFound, parts, params, matches, notFoundPaths, vnamespace, module, controller, action, paramsStr, strParams, paramsMerge, route, methods, dependencyInjector, hostname, regexHostName, matched, pattern, handledUri, beforeMatch, paths, converters, part, position, matchPosition, _0, _1, *_2, _3, _4$$9, _5$$9, _6$$8, _7$$13, _8$$17, *_9$$28, _10$$28, _13$$43, _14$$43, _15$$42, _16$$47, _17$$51, *_18$$62, _19$$62, _22$$82, _23$$85, _24$$88, _25$$91, _26$$92, _27$$96, _28$$96, _29$$96, _30$$96, _31$$96;
 	zval *this_ptr = getThis();
@@ -539,17 +483,11 @@ PHP_METHOD(Stub_Router, handle)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(uri)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &uri);
 	if (!uri) {
 		uri = &uri_sub;
 		uri = &__$null;
 	}
-
-
 	if (!(zephir_is_true(uri))) {
 		ZEPHIR_CALL_METHOD(&realUri, this_ptr, "getrewriteuri", NULL, 0);
 		zephir_check_call_status();
@@ -563,17 +501,17 @@ PHP_METHOD(Stub_Router, handle)
 	} else {
 		ZEPHIR_CPY_WRT(&handledUri, &realUri);
 	}
-	ZEPHIR_INIT_VAR(&request);
 	ZVAL_NULL(&request);
-	ZEPHIR_INIT_VAR(&currentHostName);
+	ZVAL_NULL(&request);
 	ZVAL_NULL(&currentHostName);
-	ZEPHIR_INIT_VAR(&routeFound);
+	ZVAL_NULL(&currentHostName);
+	ZVAL_NULL(&routeFound);
 	ZVAL_BOOL(&routeFound, 0);
-	ZEPHIR_INIT_VAR(&parts);
+	ZVAL_NULL(&parts);
 	array_init(&parts);
-	ZEPHIR_INIT_VAR(&params);
+	ZVAL_NULL(&params);
 	array_init(&params);
-	ZEPHIR_INIT_VAR(&matches);
+	ZVAL_NULL(&matches);
 	ZVAL_NULL(&matches);
 	if (0) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("_wasMatched"), &__$true);
@@ -923,7 +861,6 @@ PHP_METHOD(Stub_Router, handle)
 		}
 	}
 	if (!(zephir_is_true(&routeFound))) {
-		zephir_memory_observe(&notFoundPaths);
 		zephir_read_property(&notFoundPaths, this_ptr, ZEND_STRL("_notFoundPaths"), PH_NOISY_CC);
 		if (Z_TYPE_P(&notFoundPaths) != IS_NULL) {
 			ZEPHIR_CPY_WRT(&parts, &notFoundPaths);
@@ -932,7 +869,6 @@ PHP_METHOD(Stub_Router, handle)
 		}
 	}
 	if (zephir_is_true(&routeFound)) {
-		zephir_memory_observe(&vnamespace);
 		if (zephir_array_isset_string_fetch(&vnamespace, &parts, SL("namespace"), 0)) {
 			if (!(zephir_is_numeric(&vnamespace))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_namespace"), &vnamespace);
@@ -942,7 +878,6 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_22$$82, this_ptr, ZEND_STRL("_defaultNamespace"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_namespace"), &_22$$82);
 		}
-		zephir_memory_observe(&module);
 		if (zephir_array_isset_string_fetch(&module, &parts, SL("module"), 0)) {
 			if (!(zephir_is_numeric(&module))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_module"), &module);
@@ -952,7 +887,6 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_23$$85, this_ptr, ZEND_STRL("_defaultModule"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_module"), &_23$$85);
 		}
-		zephir_memory_observe(&controller);
 		if (zephir_array_isset_string_fetch(&controller, &parts, SL("controller"), 0)) {
 			if (!(zephir_is_numeric(&controller))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_controller"), &controller);
@@ -962,7 +896,6 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_24$$88, this_ptr, ZEND_STRL("_defaultController"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_controller"), &_24$$88);
 		}
-		zephir_memory_observe(&action);
 		if (zephir_array_isset_string_fetch(&action, &parts, SL("action"), 0)) {
 			if (!(zephir_is_numeric(&action))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_action"), &action);
@@ -972,10 +905,9 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_25$$91, this_ptr, ZEND_STRL("_defaultAction"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_action"), &_25$$91);
 		}
-		zephir_memory_observe(&paramsStr);
 		if (zephir_array_isset_string_fetch(&paramsStr, &parts, SL("params"), 0)) {
 			ZVAL_LONG(&_26$$92, 1);
-			ZEPHIR_INIT_VAR(&strParams);
+			ZVAL_NULL(&strParams);
 			zephir_substr(&strParams, &paramsStr, 1 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
 			if (zephir_is_true(&strParams)) {
 				ZEPHIR_INIT_NVAR(&params);
@@ -984,7 +916,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_array_unset_string(&parts, SL("params"), PH_SEPARATE);
 		}
 		if (zephir_fast_count_int(&params)) {
-			ZEPHIR_INIT_VAR(&paramsMerge);
+			ZVAL_NULL(&paramsMerge);
 			zephir_fast_array_merge(&paramsMerge, &params, &parts);
 		} else {
 			ZEPHIR_CPY_WRT(&paramsMerge, &parts);
@@ -1002,7 +934,6 @@ PHP_METHOD(Stub_Router, handle)
 		zephir_read_property(&_31$$96, this_ptr, ZEND_STRL("_defaultParams"), PH_NOISY_CC | PH_READONLY);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("_params"), &_31$$96);
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -1019,7 +950,6 @@ PHP_METHOD(Stub_Router, handle)
  */
 PHP_METHOD(Stub_Router, add)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, *httpMethods = NULL, httpMethods_sub, __$null, route;
 	zval *this_ptr = getThis();
@@ -1036,10 +966,6 @@ PHP_METHOD(Stub_Router, add)
 		Z_PARAM_ZVAL_OR_NULL(paths)
 		Z_PARAM_ZVAL_OR_NULL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &pattern, &paths, &httpMethods);
 	if (!paths) {
 		paths = &paths_sub;
@@ -1049,11 +975,9 @@ PHP_METHOD(Stub_Router, add)
 		httpMethods = &httpMethods_sub;
 		httpMethods = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&route);
+	ZVAL_NULL(&route);
 	object_init_ex(&route, stub_router_route_ce);
-	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 87, pattern, paths, httpMethods);
+	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 90, pattern, paths, httpMethods);
 	zephir_check_call_status();
 	zephir_update_property_array_append(this_ptr, SL("_routes"), &route);
 	RETURN_CCTOR(&route);
@@ -1068,7 +992,6 @@ PHP_METHOD(Stub_Router, add)
  */
 PHP_METHOD(Stub_Router, addGet)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1083,22 +1006,16 @@ PHP_METHOD(Stub_Router, addGet)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "GET");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1110,7 +1027,6 @@ PHP_METHOD(Stub_Router, addGet)
  */
 PHP_METHOD(Stub_Router, addPost)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1125,22 +1041,16 @@ PHP_METHOD(Stub_Router, addPost)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "POST");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1152,7 +1062,6 @@ PHP_METHOD(Stub_Router, addPost)
  */
 PHP_METHOD(Stub_Router, addPut)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1167,22 +1076,16 @@ PHP_METHOD(Stub_Router, addPut)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "PUT");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1194,7 +1097,6 @@ PHP_METHOD(Stub_Router, addPut)
  */
 PHP_METHOD(Stub_Router, addPatch)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1209,22 +1111,16 @@ PHP_METHOD(Stub_Router, addPatch)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "PATCH");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1236,7 +1132,6 @@ PHP_METHOD(Stub_Router, addPatch)
  */
 PHP_METHOD(Stub_Router, addDelete)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1251,22 +1146,16 @@ PHP_METHOD(Stub_Router, addDelete)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "DELETE");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1278,7 +1167,6 @@ PHP_METHOD(Stub_Router, addDelete)
  */
 PHP_METHOD(Stub_Router, addOptions)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1293,22 +1181,16 @@ PHP_METHOD(Stub_Router, addOptions)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "OPTIONS");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1320,7 +1202,6 @@ PHP_METHOD(Stub_Router, addOptions)
  */
 PHP_METHOD(Stub_Router, addHead)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1335,22 +1216,16 @@ PHP_METHOD(Stub_Router, addHead)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "HEAD");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -1361,7 +1236,6 @@ PHP_METHOD(Stub_Router, addHead)
  */
 PHP_METHOD(Stub_Router, mount)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *group, group_sub, groupRoutes, beforeMatch, hostname, routes, route, *_0$$5, _1$$5, *_2$$8, _3$$8, _4$$11;
 	zval *this_ptr = getThis();
@@ -1378,13 +1252,7 @@ PHP_METHOD(Stub_Router, mount)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(group)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &group);
-
-
 	if (Z_TYPE_P(group) != IS_OBJECT) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(stub_router_exception_ce, "The group of routes is not valid", "stub/router.zep", 677);
 		return;
@@ -1457,10 +1325,9 @@ PHP_METHOD(Stub_Router, mount)
 		}
 		ZEPHIR_INIT_NVAR(&route);
 	}
-	zephir_memory_observe(&routes);
 	zephir_read_property(&routes, this_ptr, ZEND_STRL("_routes"), PH_NOISY_CC);
 	if (Z_TYPE_P(&routes) == IS_ARRAY) {
-		ZEPHIR_INIT_VAR(&_4$$11);
+		ZVAL_NULL(&_4$$11);
 		zephir_fast_array_merge(&_4$$11, &routes, &groupRoutes);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("_routes"), &_4$$11);
 	} else {
@@ -1484,11 +1351,7 @@ PHP_METHOD(Stub_Router, notFound)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &paths);
-
-
 	if (Z_TYPE_P(paths) != IS_ARRAY) {
 		if (Z_TYPE_P(paths) != IS_STRING) {
 			ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(stub_router_exception_ce, "The not-found paths must be an array or string", "stub/router.zep", 724);
@@ -1505,19 +1368,12 @@ PHP_METHOD(Stub_Router, notFound)
 PHP_METHOD(Stub_Router, clear)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_routes"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -1527,9 +1383,6 @@ PHP_METHOD(Stub_Router, clear)
  */
 PHP_METHOD(Stub_Router, getNamespaceName)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_namespace");
 }
@@ -1541,9 +1394,6 @@ PHP_METHOD(Stub_Router, getNamespaceName)
  */
 PHP_METHOD(Stub_Router, getModuleName)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_module");
 }
@@ -1555,9 +1405,6 @@ PHP_METHOD(Stub_Router, getModuleName)
  */
 PHP_METHOD(Stub_Router, getControllerName)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_controller");
 }
@@ -1569,9 +1416,6 @@ PHP_METHOD(Stub_Router, getControllerName)
  */
 PHP_METHOD(Stub_Router, getActionName)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_action");
 }
@@ -1583,9 +1427,6 @@ PHP_METHOD(Stub_Router, getActionName)
  */
 PHP_METHOD(Stub_Router, getParams)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_params");
 }
@@ -1597,9 +1438,6 @@ PHP_METHOD(Stub_Router, getParams)
  */
 PHP_METHOD(Stub_Router, getMatchedRoute)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_matchedRoute");
 }
@@ -1611,9 +1449,6 @@ PHP_METHOD(Stub_Router, getMatchedRoute)
  */
 PHP_METHOD(Stub_Router, getMatches)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_matches");
 }
@@ -1625,9 +1460,6 @@ PHP_METHOD(Stub_Router, getMatches)
  */
 PHP_METHOD(Stub_Router, wasMatched)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_wasMatched");
 }
@@ -1639,9 +1471,6 @@ PHP_METHOD(Stub_Router, wasMatched)
  */
 PHP_METHOD(Stub_Router, getRoutes)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_routes");
 }
@@ -1654,7 +1483,6 @@ PHP_METHOD(Stub_Router, getRoutes)
  */
 PHP_METHOD(Stub_Router, getRouteById)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *id, id_sub, route, _0, *_1, _2, _3$$3, _4$$5;
 	zval *this_ptr = getThis();
@@ -1668,13 +1496,7 @@ PHP_METHOD(Stub_Router, getRouteById)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(id)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &id);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_routes"), PH_NOISY_CC | PH_READONLY);
 	zephir_is_iterable(&_0, 0, "stub/router.zep", 844);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
@@ -1720,7 +1542,6 @@ PHP_METHOD(Stub_Router, getRouteById)
  */
 PHP_METHOD(Stub_Router, getRouteByName)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *name, name_sub, route, _0, *_1, _2, _3$$3, _4$$5;
 	zval *this_ptr = getThis();
@@ -1734,13 +1555,7 @@ PHP_METHOD(Stub_Router, getRouteByName)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_routes"), PH_NOISY_CC | PH_READONLY);
 	zephir_is_iterable(&_0, 0, "stub/router.zep", 862);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
diff --git a/ext/stub/router/route.zep.c b/ext/stub/router/route.zep.c
index 17846378b9..10f1d2d73f 100644
--- a/ext/stub/router/route.zep.c
+++ b/ext/stub/router/route.zep.c
@@ -52,7 +52,6 @@ ZEPHIR_INIT_CLASS(Stub_Router_Route)
  */
 PHP_METHOD(Stub_Router_Route, __construct)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, *httpMethods = NULL, httpMethods_sub, __$null;
 	zval *this_ptr = getThis();
@@ -68,10 +67,6 @@ PHP_METHOD(Stub_Router_Route, __construct)
 		Z_PARAM_ZVAL_OR_NULL(paths)
 		Z_PARAM_ZVAL_OR_NULL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &pattern, &paths, &httpMethods);
 	if (!paths) {
 		paths = &paths_sub;
@@ -81,12 +76,9 @@ PHP_METHOD(Stub_Router_Route, __construct)
 		httpMethods = &httpMethods_sub;
 		httpMethods = &__$null;
 	}
-
-
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "reconfigure", NULL, 0, pattern, paths);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_methods"), httpMethods);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -97,9 +89,7 @@ PHP_METHOD(Stub_Router_Route, __construct)
  */
 PHP_METHOD(Stub_Router_Route, compilePattern)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *pattern = NULL, pattern_sub, idPattern, _0$$4, _1$$4, _2$$5, _3$$5, _4$$6, _5$$6, _6$$7, _7$$7, _8$$8, _9$$8, _10$$8, _11$$9, _12$$9, _13$$9;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern_sub);
 	ZVAL_UNDEF(&idPattern);
@@ -120,59 +110,53 @@ PHP_METHOD(Stub_Router_Route, compilePattern)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(pattern)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &pattern);
 	ZEPHIR_SEPARATE_PARAM(pattern);
-
-
 	if (zephir_memnstr_str(pattern, SL(":"), "stub/router/route.zep", 56)) {
-		ZEPHIR_INIT_VAR(&idPattern);
+		ZVAL_NULL(&idPattern);
 		ZVAL_STRING(&idPattern, "/([a-zA-Z0-9\\_\\-]+)");
 		if (zephir_memnstr_str(pattern, SL("/:module"), "stub/router/route.zep", 62)) {
-			ZEPHIR_INIT_VAR(&_0$$4);
-			ZEPHIR_INIT_VAR(&_1$$4);
+			ZVAL_NULL(&_0$$4);
+			ZVAL_NULL(&_1$$4);
 			ZVAL_STRING(&_1$$4, "/:module");
 			zephir_fast_str_replace(&_0$$4, &_1$$4, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_0$$4);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:controller"), "stub/router/route.zep", 67)) {
-			ZEPHIR_INIT_VAR(&_2$$5);
-			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_NULL(&_2$$5);
+			ZVAL_NULL(&_3$$5);
 			ZVAL_STRING(&_3$$5, "/:controller");
 			zephir_fast_str_replace(&_2$$5, &_3$$5, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_2$$5);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:namespace"), "stub/router/route.zep", 72)) {
-			ZEPHIR_INIT_VAR(&_4$$6);
-			ZEPHIR_INIT_VAR(&_5$$6);
+			ZVAL_NULL(&_4$$6);
+			ZVAL_NULL(&_5$$6);
 			ZVAL_STRING(&_5$$6, "/:namespace");
 			zephir_fast_str_replace(&_4$$6, &_5$$6, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_4$$6);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:action"), "stub/router/route.zep", 77)) {
-			ZEPHIR_INIT_VAR(&_6$$7);
-			ZEPHIR_INIT_VAR(&_7$$7);
+			ZVAL_NULL(&_6$$7);
+			ZVAL_NULL(&_7$$7);
 			ZVAL_STRING(&_7$$7, "/:action");
 			zephir_fast_str_replace(&_6$$7, &_7$$7, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_6$$7);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:params"), "stub/router/route.zep", 82)) {
-			ZEPHIR_INIT_VAR(&_8$$8);
-			ZEPHIR_INIT_VAR(&_9$$8);
+			ZVAL_NULL(&_8$$8);
+			ZVAL_NULL(&_9$$8);
 			ZVAL_STRING(&_9$$8, "/:params");
-			ZEPHIR_INIT_VAR(&_10$$8);
+			ZVAL_NULL(&_10$$8);
 			ZVAL_STRING(&_10$$8, "(/.*)*");
 			zephir_fast_str_replace(&_8$$8, &_9$$8, &_10$$8, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_8$$8);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:int"), "stub/router/route.zep", 87)) {
-			ZEPHIR_INIT_VAR(&_11$$9);
-			ZEPHIR_INIT_VAR(&_12$$9);
+			ZVAL_NULL(&_11$$9);
+			ZVAL_NULL(&_12$$9);
 			ZVAL_STRING(&_12$$9, "/:int");
-			ZEPHIR_INIT_VAR(&_13$$9);
+			ZVAL_NULL(&_13$$9);
 			ZVAL_STRING(&_13$$9, "/([0-9]+)");
 			zephir_fast_str_replace(&_11$$9, &_12$$9, &_13$$9, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_11$$9);
@@ -180,14 +164,14 @@ PHP_METHOD(Stub_Router_Route, compilePattern)
 	}
 	if (zephir_memnstr_str(pattern, SL("("), "stub/router/route.zep", 93)) {
 		ZEPHIR_CONCAT_SVS(return_value, "#^", pattern, "$#");
-		RETURN_MM();
+		return;
 	}
 	if (zephir_memnstr_str(pattern, SL("["), "stub/router/route.zep", 98)) {
 		ZEPHIR_CONCAT_SVS(return_value, "#^", pattern, "$#");
-		RETURN_MM();
+		return;
 	}
 	RETVAL_ZVAL(pattern, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -210,11 +194,7 @@ PHP_METHOD(Stub_Router_Route, via)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &httpMethods);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_methods"), httpMethods);
 	RETURN_THISW();
 }
@@ -230,10 +210,8 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	zend_bool notValid, _6$$12, _7$$12, _8$$12, _9$$12, _10$$12, _11$$12, _12$$12, _13$$12, _14$$12, _15$$12, _16$$12, _17$$12, _25$$18;
 	zend_long tmp = 0, cursor = 0, cursorVar = 0, marker = 0, bracketCount, parenthesesCount, foundPattern, intermediate, numberMatches;
 	char ch = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *pattern_param = NULL, matches, _1$$11, _2$$11, _3$$11, _18$$16, _19$$16, _20$$16, _22$$16, _23$$16, _27$$19, _28$$28;
 	zval pattern, route, item, variable, regexp, _4$$11, _21$$16, _24$$16, _29$$29;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&route);
@@ -258,14 +236,8 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(pattern)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &pattern_param);
 	zephir_get_strval(&pattern, pattern_param);
-
-
 	notValid = 0;
 	bracketCount = 0;
 	parenthesesCount = 0;
@@ -275,9 +247,9 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	if (zephir_fast_strlen_ev(&pattern) <= 0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZEPHIR_INIT_VAR(&matches);
+	ZVAL_NULL(&matches);
 	array_init(&matches);
-	ZEPHIR_INIT_VAR(&route);
+	ZVAL_NULL(&route);
 	for (_0 = 0; _0 < Z_STRLEN_P(&pattern); _0++) {
 		cursor = _0; 
 		ch = ZEPHIR_STRING_OFFSET(&pattern, _0);
@@ -453,7 +425,7 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	zephir_create_array(return_value, 2, 0);
 	zephir_array_fast_append(return_value, &route);
 	zephir_array_fast_append(return_value, &matches);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -464,7 +436,6 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
  */
 PHP_METHOD(Stub_Router_Route, reConfigure)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _0$$5;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, moduleName, controllerName, actionName, parts, routePaths, realClassName, namespaceName, pcrePattern, compiledPattern, extracted, _1$$10, _2$$19, _3$$19;
 	zval *this_ptr = getThis();
@@ -491,30 +462,24 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-
-
 	if (Z_TYPE_P(pattern) != IS_STRING) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(stub_router_exception_ce, "The pattern must be string", "stub/router/route.zep", 270);
 		return;
 	}
 	if (Z_TYPE_P(paths) != IS_NULL) {
 		if (Z_TYPE_P(paths) == IS_STRING) {
-			ZEPHIR_INIT_VAR(&moduleName);
 			ZVAL_NULL(&moduleName);
-			ZEPHIR_INIT_VAR(&controllerName);
+			ZVAL_NULL(&moduleName);
 			ZVAL_NULL(&controllerName);
-			ZEPHIR_INIT_VAR(&actionName);
+			ZVAL_NULL(&controllerName);
+			ZVAL_NULL(&actionName);
 			ZVAL_NULL(&actionName);
-			ZEPHIR_INIT_VAR(&parts);
+			ZVAL_NULL(&parts);
 			zephir_fast_explode_str(&parts, SL("::"), paths, LONG_MAX);
 			do {
 				_0$$5 = zephir_fast_count_int(&parts);
@@ -541,16 +506,16 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 				}
 			} while(0);
 
-			ZEPHIR_INIT_VAR(&routePaths);
+			ZVAL_NULL(&routePaths);
 			array_init(&routePaths);
 			if (Z_TYPE_P(&moduleName) != IS_NULL) {
 				zephir_array_update_string(&routePaths, SL("module"), &moduleName, PH_COPY | PH_SEPARATE);
 			}
 			if (Z_TYPE_P(&controllerName) != IS_NULL) {
 				if (zephir_memnstr_str(&controllerName, SL("\\"), "stub/router/route.zep", 310)) {
-					ZEPHIR_INIT_VAR(&realClassName);
+					ZVAL_NULL(&realClassName);
 					zephir_get_class_ns(&realClassName, &controllerName, 0);
-					ZEPHIR_INIT_VAR(&namespaceName);
+					ZVAL_NULL(&namespaceName);
 					zephir_get_ns_class(&namespaceName, &controllerName, 0);
 					if (zephir_is_true(&namespaceName)) {
 						zephir_array_update_string(&routePaths, SL("namespace"), &namespaceName, PH_COPY | PH_SEPARATE);
@@ -558,8 +523,8 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 				} else {
 					ZEPHIR_CPY_WRT(&realClassName, &controllerName);
 				}
-				ZEPHIR_INIT_VAR(&_1$$10);
-				zephir_uncamelize(&_1$$10, &realClassName, NULL  );
+				ZVAL_NULL(&_1$$10);
+				zephir_uncamelize(&_1$$10, &realClassName, NULL );
 				zephir_array_update_string(&routePaths, SL("controller"), &_1$$10, PH_COPY | PH_SEPARATE);
 			}
 			if (Z_TYPE_P(&actionName) != IS_NULL) {
@@ -580,9 +545,8 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 		if (zephir_memnstr_str(pattern, SL("{"), "stub/router/route.zep", 348)) {
 			ZEPHIR_CALL_METHOD(&extracted, this_ptr, "extractnamedparams", NULL, 0, pattern);
 			zephir_check_call_status();
-			zephir_memory_observe(&pcrePattern);
 			zephir_array_fetch_long(&pcrePattern, &extracted, 0, PH_NOISY, "stub/router/route.zep", 351);
-			ZEPHIR_INIT_VAR(&_2$$19);
+			ZVAL_NULL(&_2$$19);
 			zephir_array_fetch_long(&_3$$19, &extracted, 1, PH_NOISY | PH_READONLY, "stub/router/route.zep", 352);
 			zephir_fast_array_merge(&_2$$19, &routePaths, &_3$$19);
 			ZEPHIR_CPY_WRT(&routePaths, &_2$$19);
@@ -597,7 +561,6 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_pattern"), pattern);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_compiledPattern"), &compiledPattern);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_paths"), &routePaths);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -607,9 +570,6 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
  */
 PHP_METHOD(Stub_Router_Route, getName)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_name");
 }
@@ -635,11 +595,7 @@ PHP_METHOD(Stub_Router_Route, setName)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &name);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_name"), name);
 	RETURN_THISW();
 }
@@ -661,11 +617,7 @@ PHP_METHOD(Stub_Router_Route, beforeMatch)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(callback)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &callback);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_beforeMatch"), callback);
 	RETURN_THISW();
 }
@@ -677,9 +629,6 @@ PHP_METHOD(Stub_Router_Route, beforeMatch)
  */
 PHP_METHOD(Stub_Router_Route, getBeforeMatch)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_beforeMatch");
 }
@@ -691,9 +640,6 @@ PHP_METHOD(Stub_Router_Route, getBeforeMatch)
  */
 PHP_METHOD(Stub_Router_Route, getRouteId)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_id");
 }
@@ -705,9 +651,6 @@ PHP_METHOD(Stub_Router_Route, getRouteId)
  */
 PHP_METHOD(Stub_Router_Route, getPattern)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_pattern");
 }
@@ -719,9 +662,6 @@ PHP_METHOD(Stub_Router_Route, getPattern)
  */
 PHP_METHOD(Stub_Router_Route, getCompiledPattern)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_compiledPattern");
 }
@@ -733,9 +673,6 @@ PHP_METHOD(Stub_Router_Route, getCompiledPattern)
  */
 PHP_METHOD(Stub_Router_Route, getPaths)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_paths");
 }
@@ -750,7 +687,6 @@ PHP_METHOD(Stub_Router_Route, getReversedPaths)
 	zend_string *_4;
 	zend_ulong _3;
 	zval reversed, path, position, _0, *_1, _2;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
@@ -759,12 +695,7 @@ PHP_METHOD(Stub_Router_Route, getReversedPaths)
 	ZVAL_UNDEF(&position);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&reversed);
+	ZVAL_NULL(&reversed);
 	array_init(&reversed);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_paths"), PH_NOISY_CC | PH_READONLY);
 	zephir_is_iterable(&_0, 0, "stub/router/route.zep", 478);
@@ -824,11 +755,7 @@ PHP_METHOD(Stub_Router_Route, setHttpMethods)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &httpMethods);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_methods"), httpMethods);
 	RETURN_THISW();
 }
@@ -840,9 +767,6 @@ PHP_METHOD(Stub_Router_Route, setHttpMethods)
  */
 PHP_METHOD(Stub_Router_Route, getHttpMethods)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_methods");
 }
@@ -866,11 +790,7 @@ PHP_METHOD(Stub_Router_Route, setHostname)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(hostname)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &hostname);
-
-
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_hostname"), hostname);
 	RETURN_THISW();
 }
@@ -882,9 +802,6 @@ PHP_METHOD(Stub_Router_Route, setHostname)
  */
 PHP_METHOD(Stub_Router_Route, getHostname)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_hostname");
 }
@@ -907,11 +824,7 @@ PHP_METHOD(Stub_Router_Route, convert)
 		Z_PARAM_ZVAL(name)
 		Z_PARAM_ZVAL(converter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &name, &converter);
-
-
 	zephir_update_property_array(this_ptr, SL("_converters"), name, converter);
 	RETURN_THISW();
 }
@@ -923,9 +836,6 @@ PHP_METHOD(Stub_Router_Route, convert)
  */
 PHP_METHOD(Stub_Router_Route, getConverters)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "_converters");
 }
diff --git a/ext/stub/scall.zep.c b/ext/stub/scall.zep.c
index e891a931ef..47eb4fad13 100644
--- a/ext/stub/scall.zep.c
+++ b/ext/stub/scall.zep.c
@@ -30,27 +30,18 @@ ZEPHIR_INIT_CLASS(Stub_Scall)
 
 PHP_METHOD(Stub_Scall, testMethod1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello public");
 }
 
 PHP_METHOD(Stub_Scall, testMethod2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello protected");
 }
 
 PHP_METHOD(Stub_Scall, testMethod3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello private");
 }
@@ -58,7 +49,6 @@ PHP_METHOD(Stub_Scall, testMethod3)
 PHP_METHOD(Stub_Scall, testMethod4)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -66,11 +56,7 @@ PHP_METHOD(Stub_Scall, testMethod4)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	zephir_add_function(return_value, a, b);
 	return;
 }
@@ -78,7 +64,6 @@ PHP_METHOD(Stub_Scall, testMethod4)
 PHP_METHOD(Stub_Scall, testMethod5)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -86,11 +71,7 @@ PHP_METHOD(Stub_Scall, testMethod5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	zephir_add_function(return_value, a, b);
 	return;
 }
@@ -98,7 +79,6 @@ PHP_METHOD(Stub_Scall, testMethod5)
 PHP_METHOD(Stub_Scall, testMethod6)
 {
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -106,20 +86,13 @@ PHP_METHOD(Stub_Scall, testMethod6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a, &b);
-
-
 	zephir_add_function(return_value, a, b);
 	return;
 }
 
 PHP_METHOD(Stub_Scall, testMethod7)
 {
-	zval *this_ptr = getThis();
-
-
 
 	object_init(return_value);
 	return;
@@ -127,59 +100,33 @@ PHP_METHOD(Stub_Scall, testMethod7)
 
 PHP_METHOD(Stub_Scall, testCall1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod1", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 88);
+	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 91);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -187,24 +134,16 @@ PHP_METHOD(Stub_Scall, testCall4)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -212,25 +151,17 @@ PHP_METHOD(Stub_Scall, testCall5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall6)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -238,73 +169,41 @@ PHP_METHOD(Stub_Scall, testCall6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 89, a, b);
+	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 92, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall7)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod1", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall8)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall9)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 88);
+	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 91);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall10)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -312,24 +211,16 @@ PHP_METHOD(Stub_Scall, testCall10)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall11)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -337,25 +228,17 @@ PHP_METHOD(Stub_Scall, testCall11)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall12)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -363,95 +246,56 @@ PHP_METHOD(Stub_Scall, testCall12)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
-	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 89, a, b);
+	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 92, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall13)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall14)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testCall15)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_SELF("testmethod7", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, testMethod16)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	long a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_LONG((a + b));
 }
 
 PHP_METHOD(Stub_Scall, testCall17)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
 	long k, i = 0, j, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&p_sub);
 	ZVAL_UNDEF(&_3$$3);
@@ -459,14 +303,7 @@ PHP_METHOD(Stub_Scall, testCall17)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
-	k = zephir_get_intval(k_param);
-
-
 	j = 0;
 	_2 = k;
 	_1 = 1;
@@ -493,12 +330,10 @@ PHP_METHOD(Stub_Scall, testCall17)
 PHP_METHOD(Stub_Scall, testCall18)
 {
 	zend_bool _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
 	long k, i = 0, j, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&p_sub);
 	ZVAL_UNDEF(&_3$$3);
@@ -506,14 +341,7 @@ PHP_METHOD(Stub_Scall, testCall18)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
-	k = zephir_get_intval(k_param);
-
-
 	j = 0;
 	_2 = k;
 	_1 = 1;
@@ -539,9 +367,6 @@ PHP_METHOD(Stub_Scall, testCall18)
 
 PHP_METHOD(Stub_Scall, testMethodStatic)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello Scall");
 }
@@ -550,25 +375,18 @@ PHP_METHOD(Stub_Scall, interpolatedStaticReturn)
 {
 	zend_class_entry *_0;
 	zval className, methodName;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&methodName);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&className);
+	ZVAL_NULL(&className);
 	ZVAL_STRING(&className, "Stub\\Scall");
-	ZEPHIR_INIT_VAR(&methodName);
+	ZVAL_NULL(&methodName);
 	ZVAL_STRING(&methodName, "testMethodStatic");
 	_0 = zephir_fetch_class(&className);
 	ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL(_0, methodName, NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scall, interpolatedStaticEcho)
@@ -576,26 +394,18 @@ PHP_METHOD(Stub_Scall, interpolatedStaticEcho)
 	zend_class_entry *_1;
 	zval _0;
 	zval className, methodName;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&methodName);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&className);
+	ZVAL_NULL(&className);
 	ZVAL_STRING(&className, "Stub\\Scall");
-	ZEPHIR_INIT_VAR(&methodName);
+	ZVAL_NULL(&methodName);
 	ZVAL_STRING(&methodName, "testMethodStatic");
 	_1 = zephir_fetch_class(&className);
 	ZEPHIR_CALL_CE_STATIC_ZVAL(&_0, _1, methodName, NULL, 0);
 	zephir_check_call_status();
 	zend_print_zval(&_0, 0);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/scalldynamic.zep.c b/ext/stub/scalldynamic.zep.c
index 83a39118ec..060377c920 100644
--- a/ext/stub/scalldynamic.zep.c
+++ b/ext/stub/scalldynamic.zep.c
@@ -29,27 +29,18 @@ ZEPHIR_INIT_CLASS(Stub_ScallDynamic)
 
 PHP_METHOD(Stub_ScallDynamic, testMethod1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello public");
 }
 
 PHP_METHOD(Stub_ScallDynamic, testMethod2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello protected");
 }
 
 PHP_METHOD(Stub_ScallDynamic, testMethod3)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello private");
 }
@@ -58,17 +49,12 @@ PHP_METHOD(Stub_ScallDynamic, selfDynamicCall1)
 {
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *methodName, methodName_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&methodName_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(methodName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &methodName);
-
-
 	return;
 }
 
diff --git a/ext/stub/scallexternal.zep.c b/ext/stub/scallexternal.zep.c
index 3194760922..c5f3af9c71 100644
--- a/ext/stub/scallexternal.zep.c
+++ b/ext/stub/scallexternal.zep.c
@@ -31,26 +31,16 @@ ZEPHIR_INIT_CLASS(Stub_ScallExternal)
 
 PHP_METHOD(Stub_ScallExternal, testCall1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_ScallExternal, testCall2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&b_sub);
@@ -58,35 +48,22 @@ PHP_METHOD(Stub_ScallExternal, testCall2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-
-
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_ScallExternal, testMethod3)
 {
 	zval *a_param = NULL, *b_param = NULL;
 	long a, b;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &a_param, &b_param);
-	a = zephir_get_intval(a_param);
-	b = zephir_get_intval(b_param);
-
-
 	RETURN_LONG((a + b));
 }
 
diff --git a/ext/stub/scalllateconstruct.zep.c b/ext/stub/scalllateconstruct.zep.c
index 5d997a89a6..a8edd6e535 100644
--- a/ext/stub/scalllateconstruct.zep.c
+++ b/ext/stub/scalllateconstruct.zep.c
@@ -30,25 +30,14 @@ ZEPHIR_INIT_CLASS(Stub_ScallLateConstruct)
 
 PHP_METHOD(Stub_ScallLateConstruct, __construct)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "testpublicinit", NULL, 0);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ScallLateConstruct, testStaticInit)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello public");
 }
@@ -56,27 +45,17 @@ PHP_METHOD(Stub_ScallLateConstruct, testStaticInit)
 PHP_METHOD(Stub_ScallLateConstruct, testPublicInit)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_CALL_SELF(&_0, "teststaticinit", NULL, 0);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("protectedVar"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ScallLateConstruct, varValue)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "protectedVar");
 }
diff --git a/ext/stub/scallparent.zep.c b/ext/stub/scallparent.zep.c
index 91e1a96937..ffb7825f2c 100644
--- a/ext/stub/scallparent.zep.c
+++ b/ext/stub/scallparent.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
-#include "kernel/memory.h"
 
 
 /**
@@ -29,43 +28,26 @@ ZEPHIR_INIT_CLASS(Stub_ScallParent)
 
 PHP_METHOD(Stub_ScallParent, testMethod1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello parent public");
 }
 
 PHP_METHOD(Stub_ScallParent, testMethod2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello parent protected");
 }
 
 PHP_METHOD(Stub_ScallParent, testCallStatic)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZEPHIR_RETURN_CALL_STATIC("testmethodstatic", NULL, 0);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_ScallParent, testMethodStatic)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello ScallParent");
 }
diff --git a/ext/stub/scope.zep.c b/ext/stub/scope.zep.c
index 70f62d07cb..54cde08791 100644
--- a/ext/stub/scope.zep.c
+++ b/ext/stub/scope.zep.c
@@ -29,66 +29,46 @@ ZEPHIR_INIT_CLASS(Stub_Scope)
 
 PHP_METHOD(Stub_Scope, getStr)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("internal_string");
 }
 
 PHP_METHOD(Stub_Scope, getDyStr)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *g_param = NULL, _0;
 	zend_long g;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(g)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &g_param);
-	g = zephir_get_intval(g_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, g);
 	ZEPHIR_CONCAT_SV(return_value, "internal_", &_0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scope, test1)
 {
 	zval ret, k, k$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, r;
 	zephir_fcall_cache_entry *_0 = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&k$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	ZVAL_STRING(&ret, "");
-	ZEPHIR_CALL_SELF(&k, "getstr", &_0, 90);
+	ZEPHIR_CALL_SELF(&k, "getstr", &_0, 93);
 	zephir_check_call_status();
 	r = 1;
 	if (r == 1) {
-		ZEPHIR_INIT_VAR(&k$$3);
+		ZVAL_NULL(&k$$3);
 		ZVAL_STRING(&k$$3, "test");
 		zephir_concat_self(&ret, &k$$3);
 	}
 	ZEPHIR_CONCAT_VV(return_value, &ret, &k);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scope, test2)
@@ -96,21 +76,14 @@ PHP_METHOD(Stub_Scope, test2)
 	zend_bool _0;
 	zval k, c, _5, _3$$3, _4$$3;
 	zend_long p, _1, _2, p$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	p = 15;
-	ZEPHIR_INIT_VAR(&k);
+	ZVAL_NULL(&k);
 	ZVAL_STRING(&k, "");
 	_2 = 3;
 	_1 = 0;
@@ -136,31 +109,24 @@ PHP_METHOD(Stub_Scope, test2)
 		}
 	}
 	zephir_create_array(return_value, 2, 0);
-	ZEPHIR_INIT_VAR(&_5);
+	ZVAL_NULL(&_5);
 	ZVAL_LONG(&_5, p);
 	zephir_array_fast_append(return_value, &_5);
 	zephir_array_fast_append(return_value, &k);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Scope, test3)
 {
 	zend_bool _0;
 	zval k, c, str$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zephir_fcall_cache_entry *_3 = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&str$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&k);
+	ZVAL_NULL(&k);
 	ZVAL_STRING(&k, "");
 	_2 = 3;
 	_1 = 0;
@@ -177,7 +143,7 @@ PHP_METHOD(Stub_Scope, test3)
 			}
 			ZEPHIR_INIT_NVAR(&c);
 			ZVAL_LONG(&c, _1);
-			ZEPHIR_CALL_SELF(&str$$3, "getdystr", &_3, 91, &c);
+			ZEPHIR_CALL_SELF(&str$$3, "getdystr", &_3, 94, &c);
 			zephir_check_call_status();
 			zephir_concat_self(&k, &str$$3);
 		}
diff --git a/ext/stub/sort.zep.c b/ext/stub/sort.zep.c
index 6b4d0d536b..6d1685d41b 100644
--- a/ext/stub/sort.zep.c
+++ b/ext/stub/sort.zep.c
@@ -29,7 +29,6 @@ ZEPHIR_INIT_CLASS(Stub_Sort)
 PHP_METHOD(Stub_Sort, quick)
 {
 	zend_bool _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_8 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i = 0, length = 0, pivot = 0, item = 0, _2, _3;
 	zval *arr_param = NULL, left, right, _0, _7, _10, _11, _4$$4, _5$$5, _6$$6;
@@ -50,24 +49,17 @@ PHP_METHOD(Stub_Sort, quick)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(arr)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr_param);
 	zephir_get_arrval(&arr, arr_param);
-
-
 	length = zephir_fast_count_int(&arr);
 	if (length <= 1) {
 		RETURN_CTOR(&arr);
 	}
-	zephir_memory_observe(&_0);
 	zephir_array_fetch_long(&_0, &arr, 0, PH_NOISY, "stub/sort.zep", 18);
 	pivot = zephir_get_intval(&_0);
-	ZEPHIR_INIT_VAR(&left);
+	ZVAL_NULL(&left);
 	array_init(&left);
-	ZEPHIR_INIT_VAR(&right);
+	ZVAL_NULL(&right);
 	array_init(&right);
 	_3 = (length - 1);
 	_2 = 1;
@@ -97,17 +89,17 @@ PHP_METHOD(Stub_Sort, quick)
 			}
 		}
 	}
-	ZEPHIR_CALL_METHOD(&_7, this_ptr, "quick", &_8, 92, &left);
+	ZEPHIR_CALL_METHOD(&_7, this_ptr, "quick", &_8, 95, &left);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&_9);
+	ZVAL_NULL(&_9);
 	zephir_create_array(&_9, 1, 0);
-	ZEPHIR_INIT_VAR(&_10);
+	ZVAL_NULL(&_10);
 	ZVAL_LONG(&_10, pivot);
 	zephir_array_fast_append(&_9, &_10);
-	ZEPHIR_CALL_METHOD(&_11, this_ptr, "quick", &_8, 92, &right);
+	ZEPHIR_CALL_METHOD(&_11, this_ptr, "quick", &_8, 95, &right);
 	zephir_check_call_status();
-	ZEPHIR_RETURN_CALL_FUNCTION("array_merge", NULL, 93, &_7, &_9, &_11);
+	ZEPHIR_RETURN_CALL_FUNCTION("array_merge", NULL, 96, &_7, &_9, &_11);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/spectralnorm.zep.c b/ext/stub/spectralnorm.zep.c
index 63de1a33ed..229890ebe2 100644
--- a/ext/stub/spectralnorm.zep.c
+++ b/ext/stub/spectralnorm.zep.c
@@ -34,9 +34,7 @@ ZEPHIR_INIT_CLASS(Stub_SpectralNorm)
 
 PHP_METHOD(Stub_SpectralNorm, Ax)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *i, i_sub, *j, j_sub, _0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i_sub);
 	ZVAL_UNDEF(&j_sub);
@@ -46,24 +44,16 @@ PHP_METHOD(Stub_SpectralNorm, Ax)
 		Z_PARAM_ZVAL(i)
 		Z_PARAM_ZVAL(j)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &i, &j);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_add_function(&_0, i, j);
-	ZEPHIR_INIT_VAR(&_1);
 	zephir_add_function(&_1, i, j);
-	RETURN_MM_DOUBLE(zephir_safe_div_long_double((double) 1, ((zephir_safe_div_long_long((zephir_get_numberval(&_0) * (zephir_get_numberval(&_1) + 1)), 2) + zephir_get_numberval(i)) + (double) (1))));
+	RETURN_MM_DOUBLE(zephir_safe_div_long_double((double) 1, ((zephir_safe_div_long_long((zephir_get_numberval(&_0) * ((zephir_get_numberval(&_1) + 1))), 2) + zephir_get_numberval(i)) + (double) (1))));
 }
 
 PHP_METHOD(Stub_SpectralNorm, Au)
 {
 	zend_bool _0, _3$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL, *_15 = NULL;
 	zval *n_param = NULL, *u, u_sub, *v, v_sub, _13$$3, _14$$3, _6$$4, _7$$4, _8$$4, _10$$4, _12$$4;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS, t = 0, i = 0, j = 0, _1, _2, _4$$3, _5$$3;
@@ -83,14 +73,7 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 		Z_PARAM_OBJECT_OF_CLASS(u, spl_ce_SplFixedArray)
 		Z_PARAM_OBJECT_OF_CLASS(v, spl_ce_SplFixedArray)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &n_param, &u, &v);
-	n = zephir_get_intval(n_param);
-
-
 	_2 = (n - 1);
 	_1 = 0;
 	_0 = 0;
@@ -122,7 +105,7 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 					j = _4$$3;
 					ZVAL_LONG(&_7$$4, i);
 					ZVAL_LONG(&_8$$4, j);
-					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 94, &_7$$4, &_8$$4);
+					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 97, &_7$$4, &_8$$4);
 					zephir_check_call_status();
 					ZVAL_LONG(&_7$$4, j);
 					ZEPHIR_CALL_METHOD(&_10$$4, u, "offsetget", &_11, 0, &_7$$4);
@@ -138,13 +121,11 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 			zephir_check_call_status();
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SpectralNorm, Atu)
 {
 	zend_bool _0, _3$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL, *_15 = NULL;
 	zval *n_param = NULL, *u, u_sub, *v, v_sub, _13$$3, _14$$3, _6$$4, _7$$4, _8$$4, _10$$4, _12$$4;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS, t = 0, i = 0, j = 0, _1, _2, _4$$3, _5$$3;
@@ -164,14 +145,7 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 		Z_PARAM_OBJECT_OF_CLASS(u, spl_ce_SplFixedArray)
 		Z_PARAM_OBJECT_OF_CLASS(v, spl_ce_SplFixedArray)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &n_param, &u, &v);
-	n = zephir_get_intval(n_param);
-
-
 	_2 = (n - 1);
 	_1 = 0;
 	_0 = 0;
@@ -203,7 +177,7 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 					j = _4$$3;
 					ZVAL_LONG(&_7$$4, j);
 					ZVAL_LONG(&_8$$4, i);
-					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 94, &_7$$4, &_8$$4);
+					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 97, &_7$$4, &_8$$4);
 					zephir_check_call_status();
 					ZVAL_LONG(&_7$$4, j);
 					ZEPHIR_CALL_METHOD(&_10$$4, u, "offsetget", &_11, 0, &_7$$4);
@@ -219,12 +193,10 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 			zephir_check_call_status();
 		}
 	}
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SpectralNorm, AtAu)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *n, n_sub, *u, u_sub, *v, v_sub, *w, w_sub;
 	zval *this_ptr = getThis();
@@ -239,24 +211,16 @@ PHP_METHOD(Stub_SpectralNorm, AtAu)
 		Z_PARAM_ZVAL(v)
 		Z_PARAM_ZVAL(w)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 4, 0, &n, &u, &v, &w);
-
-
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "au", NULL, 95, n, u, w);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "au", NULL, 98, n, u, w);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "atu", NULL, 96, n, w, v);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "atu", NULL, 99, n, w, v);
 	zephir_check_call_status();
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SpectralNorm, process)
 {
 	zend_bool _1, _7, _12;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL, *_11 = NULL, *_17 = NULL;
 	zval *n_param = NULL, u, v, w, _0, _4$$3, _5$$3, _10$$4, _15$$5, _16$$5, _18$$5, _19$$5, _20$$5;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS, i = 0, vv, vBv, _2, _3, _8, _9, _13, _14;
@@ -277,30 +241,23 @@ PHP_METHOD(Stub_SpectralNorm, process)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
-	n = zephir_get_intval(n_param);
-
-
 	vv = 0;
 	vBv = 0;
-	ZEPHIR_INIT_VAR(&u);
+	ZVAL_NULL(&u);
 	object_init_ex(&u, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &u, "__construct", NULL, 97, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &u, "__construct", NULL, 100, &_0);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&v);
+	ZVAL_NULL(&v);
 	object_init_ex(&v, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &v, "__construct", NULL, 97, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &v, "__construct", NULL, 100, &_0);
 	zephir_check_call_status();
-	ZEPHIR_INIT_VAR(&w);
+	ZVAL_NULL(&w);
 	object_init_ex(&w, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &w, "__construct", NULL, 97, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &w, "__construct", NULL, 100, &_0);
 	zephir_check_call_status();
 	_3 = (n - 1);
 	_2 = 0;
@@ -318,15 +275,15 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			i = _2;
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &u, "offsetset", &_6, 98, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &u, "offsetset", &_6, 101, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &v, "offsetset", &_6, 98, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &v, "offsetset", &_6, 101, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &w, "offsetset", &_6, 98, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &w, "offsetset", &_6, 101, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 		}
 	}
@@ -345,10 +302,10 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			}
 			i = _8;
 			ZVAL_LONG(&_10$$4, n);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 99, &_10$$4, &u, &v, &w);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 102, &_10$$4, &u, &v, &w);
 			zephir_check_call_status();
 			ZVAL_LONG(&_10$$4, n);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 99, &_10$$4, &v, &u, &w);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 102, &_10$$4, &v, &u, &w);
 			zephir_check_call_status();
 		}
 	}
@@ -367,19 +324,19 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			}
 			i = _13;
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_15$$5, &u, "offsetget", &_17, 100, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_15$$5, &u, "offsetget", &_17, 103, &_16$$5);
 			zephir_check_call_status();
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 100, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 103, &_16$$5);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_19$$5);
 			mul_function(&_19$$5, &_15$$5, &_18$$5);
 			vBv += zephir_get_numberval(&_19$$5);
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_15$$5, &v, "offsetget", &_17, 100, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_15$$5, &v, "offsetget", &_17, 103, &_16$$5);
 			zephir_check_call_status();
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 100, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 103, &_16$$5);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_20$$5);
 			mul_function(&_20$$5, &_15$$5, &_18$$5);
diff --git a/ext/stub/spl.zep.c b/ext/stub/spl.zep.c
index 93a4d0ffdf..8c662a08f7 100644
--- a/ext/stub/spl.zep.c
+++ b/ext/stub/spl.zep.c
@@ -31,27 +31,19 @@ ZEPHIR_INIT_CLASS(Stub_Spl)
  */
 PHP_METHOD(Stub_Spl, issue1212)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *file_param = NULL;
 	zval file;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&file);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(file)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &file_param);
 	zephir_get_strval(&file, file_param);
-
-
 	object_init_ex(return_value, spl_ce_SplFileObject);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 101, &file);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 104, &file);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/spropertyaccess.zep.c b/ext/stub/spropertyaccess.zep.c
index 6244466ea3..ba7b1c50d6 100644
--- a/ext/stub/spropertyaccess.zep.c
+++ b/ext/stub/spropertyaccess.zep.c
@@ -41,43 +41,32 @@ ZEPHIR_INIT_CLASS(Stub_SPropertyAccess)
 PHP_METHOD(Stub_SPropertyAccess, __construct)
 {
 	zval _0, _1, _2, _3, _4;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "abc");
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("a"), &_0);
 	zephir_read_static_property_ce(&_0, stub_spropertyaccess_ce, SL("a"), PH_NOISY_CC | PH_READONLY);
 	ZVAL_LONG(&_1, 0);
 	ZVAL_LONG(&_2, 1);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	zephir_substr(&_3, &_0, 0 , 1 , 0);
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("b"), &_3);
-	zephir_memory_observe(&_4);
 	zephir_read_static_property_ce(&_4, stub_spropertyaccess_ce, SL("b"), PH_NOISY_CC);
 	zephir_update_static_property_ce(stub_scallexternal_ce, ZEND_STRL("sproperty"), &_4);
 	ZEPHIR_OBS_NVAR(&_4);
 	zephir_read_static_property_ce(&_4, stub_scallexternal_ce, SL("sproperty"), PH_NOISY_CC);
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("b"), &_4);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *delimiter = NULL, delimiter_sub, __$null;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
@@ -86,10 +75,6 @@ PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &delimiter);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
@@ -97,21 +82,17 @@ PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 	} else {
 		ZEPHIR_SEPARATE_PARAM(delimiter);
 	}
-
-
 	if (ZEPHIR_IS_EMPTY(delimiter)) {
 		ZEPHIR_OBS_NVAR(delimiter);
 		zephir_read_static_property_ce(delimiter, stub_spropertyaccess_ce, SL("_delimiterWithUnderscore"), PH_NOISY_CC);
 	}
 	RETVAL_ZVAL(delimiter, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_SPropertyAccess, testArgument)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *delimiter = NULL, delimiter_sub, __$null, _0$$3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_NULL(&__$null);
@@ -121,10 +102,6 @@ PHP_METHOD(Stub_SPropertyAccess, testArgument)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &delimiter);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
@@ -132,15 +109,12 @@ PHP_METHOD(Stub_SPropertyAccess, testArgument)
 	} else {
 		ZEPHIR_SEPARATE_PARAM(delimiter);
 	}
-
-
 	if (ZEPHIR_IS_EMPTY(delimiter)) {
-		zephir_memory_observe(&_0$$3);
 		zephir_read_static_property_ce(&_0$$3, stub_spropertyaccess_ce, SL("delimiter"), PH_NOISY_CC);
 		ZEPHIR_CPY_WRT(delimiter, &_0$$3);
 	}
 	RETVAL_ZVAL(delimiter, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_SPropertyAccess, mutateStringVarInsideCycle)
@@ -148,18 +122,11 @@ PHP_METHOD(Stub_SPropertyAccess, mutateStringVarInsideCycle)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval i, _5, _3$$3, _4$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	_2 = 3;
 	_1 = 0;
 	_0 = 0;
@@ -195,13 +162,9 @@ PHP_METHOD(Stub_SPropertyAccess, mutateIntVarInsideCycle)
 	zval _4, _3$$3;
 	zend_bool _0;
 	zend_long i = 0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_3$$3);
-
-
-
 	_2 = 3;
 	_1 = 0;
 	_0 = 0;
@@ -235,13 +198,9 @@ PHP_METHOD(Stub_SPropertyAccess, mutateDoubleVarInsideCycle)
 	zend_long _1, _2;
 	zend_bool _0;
 	double i = 0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_3$$3);
-
-
-
 	_2 = 3;
 	_1 = 0;
 	_0 = 0;
@@ -256,7 +215,7 @@ PHP_METHOD(Stub_SPropertyAccess, mutateDoubleVarInsideCycle)
 				_0 = 1;
 			}
 			_1 = _1;
-			i = 3.14;
+			i =  (3.14);
 			ZVAL_UNDEF(&_3$$3);
 			ZVAL_DOUBLE(&_3$$3, i);
 			zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("doubleVar"), &_3$$3);
@@ -271,19 +230,12 @@ PHP_METHOD(Stub_SPropertyAccess, mutateArrayVarInsideCycle)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval i, j, _5, _3$$3, _4$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&j);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	_2 = 3;
 	_1 = 0;
 	_0 = 0;
@@ -315,16 +267,9 @@ PHP_METHOD(Stub_SPropertyAccess, mutateArrayVarInsideCycle)
 void zephir_init_static_properties_Stub_SPropertyAccess()
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("arrayVar"), &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/statements.zep.c b/ext/stub/statements.zep.c
index acc613a2bb..d3971e88fa 100644
--- a/ext/stub/statements.zep.c
+++ b/ext/stub/statements.zep.c
@@ -42,7 +42,6 @@ ZEPHIR_INIT_CLASS(Stub_Statements)
 PHP_METHOD(Stub_Statements, testPropertyAcccessAvoidTmpReuse)
 {
 	zval result1, result2, result3, result4, _0, _1, _2, _3, _4, _5, _6, _7;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&result1);
@@ -57,45 +56,33 @@ PHP_METHOD(Stub_Statements, testPropertyAcccessAvoidTmpReuse)
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_6);
 	ZVAL_UNDEF(&_7);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_VAR(&result1);
+	ZVAL_NULL(&result1);
 	zephir_fast_strpos(&result1, &_0, &_1, 0 );
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_VAR(&result2);
+	ZVAL_NULL(&result2);
 	zephir_fast_strpos(&result2, &_2, &_3, 0 );
 	zephir_read_property(&_4, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_5, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_VAR(&result3);
+	ZVAL_NULL(&result3);
 	zephir_fast_strpos(&result3, &_4, &_5, 0 );
 	zephir_read_property(&_6, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_7, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_INIT_VAR(&result4);
+	ZVAL_NULL(&result4);
 	zephir_fast_strpos(&result4, &_6, &_7, 0 );
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Statements, testElseIf)
 {
 	zval *num_param = NULL;
 	zend_long num;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	if (num > 0) {
 		RETURN_STRING("more");
 	} else if (num == 0) {
@@ -111,17 +98,11 @@ PHP_METHOD(Stub_Statements, testElseIf1)
 {
 	zval *num_param = NULL;
 	zend_long num, total;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
-	num = zephir_get_intval(num_param);
-
-
 	total = 10;
 	if (num < total) {
 		RETURN_STRING("less");
@@ -136,19 +117,13 @@ PHP_METHOD(Stub_Statements, testElseIf2)
 {
 	zval *num_param = NULL, *total, total_sub;
 	zend_long num;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&total_sub);
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(num)
 		Z_PARAM_ZVAL(total)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &num_param, &total);
-	num = zephir_get_intval(num_param);
-
-
 	if (ZEPHIR_GT_LONG(total, num)) {
 		RETURN_STRING("less");
 	} else if (ZEPHIR_IS_LONG(total, num)) {
@@ -160,7 +135,6 @@ PHP_METHOD(Stub_Statements, testElseIf2)
 
 PHP_METHOD(Stub_Statements, test544Issue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_8 = NULL;
 	zval *step_param = NULL, _0, _1, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3, _9$$3, _10$$3, _11$$3, _12$$4, _13$$4, _14$$5, _15$$5;
 	zend_long step, ZEPHIR_LAST_CALL_STATUS, filledWidth = 0, unfilledWidth = 0;
@@ -184,18 +158,12 @@ PHP_METHOD(Stub_Statements, test544Issue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(step)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &step_param);
 	if (UNEXPECTED(Z_TYPE_P(step_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'step' must be of the type int"));
 		RETURN_MM_NULL();
 	}
 	step = Z_LVAL_P(step_param);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("totalSteps"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("totalSteps"), PH_NOISY_CC | PH_READONLY);
 	if (ZEPHIR_GT_LONG(&_0, step)) {
@@ -206,33 +174,32 @@ PHP_METHOD(Stub_Statements, test544Issue)
 		unfilledWidth = (((zephir_get_numberval(&_4$$3) - 1)) - filledWidth);
 		zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_6$$3, filledWidth);
-		ZEPHIR_CALL_FUNCTION(&_7$$3, "str_repeat", &_8, 22, &_5$$3, &_6$$3);
+		ZEPHIR_CALL_FUNCTION(&_7$$3, "str_repeat", &_8, 23, &_5$$3, &_6$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("arrow"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_10$$3, unfilledWidth);
-		ZEPHIR_CALL_FUNCTION(&_11$$3, "str_repeat", &_8, 22, &_9$$3, &_10$$3);
+		ZEPHIR_CALL_FUNCTION(&_11$$3, "str_repeat", &_8, 23, &_9$$3, &_10$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_7$$3, &_6$$3, &_11$$3);
-		RETURN_MM();
+		return;
 	} else if (ZEPHIR_IS_LONG_IDENTICAL(&_1, step)) {
 		zephir_read_property(&_12$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 22, &_12$$4, &_13$$4);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 23, &_12$$4, &_13$$4);
 		zephir_check_call_status();
-		RETURN_MM();
+		return;
 	} else {
 		zephir_read_property(&_14$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_15$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 22, &_14$$5, &_15$$5);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 23, &_14$$5, &_15$$5);
 		zephir_check_call_status();
-		RETURN_MM();
+		return;
 	}
 }
 
 PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL;
 	zval *step_param = NULL, _0, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3, _7$$3, _8$$3, _9$$3, _10$$4, _11$$4, _12$$5, _13$$5;
 	zend_long step, ZEPHIR_LAST_CALL_STATUS, filledWidth = 0, unfilledWidth = 0, totalSteps = 0;
@@ -254,18 +221,12 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(step)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &step_param);
 	if (UNEXPECTED(Z_TYPE_P(step_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'step' must be of the type int"));
 		RETURN_MM_NULL();
 	}
 	step = Z_LVAL_P(step_param);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("totalSteps"), PH_NOISY_CC | PH_READONLY);
 	totalSteps = zephir_get_numberval(&_0);
 	if (step < totalSteps) {
@@ -275,27 +236,27 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 		unfilledWidth = (((zephir_get_numberval(&_2$$3) - 1)) - filledWidth);
 		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_4$$3, filledWidth);
-		ZEPHIR_CALL_FUNCTION(&_5$$3, "str_repeat", &_6, 22, &_3$$3, &_4$$3);
+		ZEPHIR_CALL_FUNCTION(&_5$$3, "str_repeat", &_6, 23, &_3$$3, &_4$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("arrow"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_7$$3, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_8$$3, unfilledWidth);
-		ZEPHIR_CALL_FUNCTION(&_9$$3, "str_repeat", &_6, 22, &_7$$3, &_8$$3);
+		ZEPHIR_CALL_FUNCTION(&_9$$3, "str_repeat", &_6, 23, &_7$$3, &_8$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_5$$3, &_4$$3, &_9$$3);
-		RETURN_MM();
+		return;
 	} else if (step == totalSteps) {
 		zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 22, &_10$$4, &_11$$4);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 23, &_10$$4, &_11$$4);
 		zephir_check_call_status();
-		RETURN_MM();
+		return;
 	} else {
 		zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 22, &_12$$5, &_13$$5);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 23, &_12$$5, &_13$$5);
 		zephir_check_call_status();
-		RETURN_MM();
+		return;
 	}
 }
 
diff --git a/ext/stub/strings.zep.c b/ext/stub/strings.zep.c
index 108195c5ee..ae8c252750 100644
--- a/ext/stub/strings.zep.c
+++ b/ext/stub/strings.zep.c
@@ -32,10 +32,8 @@ ZEPHIR_INIT_CLASS(Stub_Strings)
 
 PHP_METHOD(Stub_Strings, camelize)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&delimiter_sub);
@@ -46,28 +44,20 @@ PHP_METHOD(Stub_Strings, camelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
 		delimiter = &__$null;
 	}
-
-
-	zephir_camelize(return_value, &str, delimiter );
-	RETURN_MM();
+	zephir_camelize(return_value, &str, delimiter);
+	return;
 }
 
 PHP_METHOD(Stub_Strings, uncamelize)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null;
 	zval str;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
 	ZVAL_UNDEF(&delimiter_sub);
@@ -78,36 +68,25 @@ PHP_METHOD(Stub_Strings, uncamelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
 		delimiter = &__$null;
 	}
-
-
-	zephir_uncamelize(return_value, &str, delimiter );
-	RETURN_MM();
+	zephir_uncamelize(return_value, &str, delimiter);
+	return;
 }
 
 PHP_METHOD(Stub_Strings, testTrim)
 {
 	zval *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	zephir_fast_trim(return_value, str, NULL , ZEPHIR_TRIM_BOTH);
 	return;
 }
@@ -115,17 +94,12 @@ PHP_METHOD(Stub_Strings, testTrim)
 PHP_METHOD(Stub_Strings, testRtrim)
 {
 	zval *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	zephir_fast_trim(return_value, str, NULL , ZEPHIR_TRIM_RIGHT);
 	return;
 }
@@ -133,17 +107,12 @@ PHP_METHOD(Stub_Strings, testRtrim)
 PHP_METHOD(Stub_Strings, testLtrim)
 {
 	zval *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	zephir_fast_trim(return_value, str, NULL , ZEPHIR_TRIM_LEFT);
 	return;
 }
@@ -151,7 +120,6 @@ PHP_METHOD(Stub_Strings, testLtrim)
 PHP_METHOD(Stub_Strings, testTrim2Params)
 {
 	zval *str, str_sub, *charlist, charlist_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&charlist_sub);
@@ -159,11 +127,7 @@ PHP_METHOD(Stub_Strings, testTrim2Params)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(charlist)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &charlist);
-
-
 	zephir_fast_trim(return_value, str, charlist, ZEPHIR_TRIM_BOTH);
 	return;
 }
@@ -171,7 +135,6 @@ PHP_METHOD(Stub_Strings, testTrim2Params)
 PHP_METHOD(Stub_Strings, testRtrim2Params)
 {
 	zval *str, str_sub, *charlist, charlist_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&charlist_sub);
@@ -179,11 +142,7 @@ PHP_METHOD(Stub_Strings, testRtrim2Params)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(charlist)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &charlist);
-
-
 	zephir_fast_trim(return_value, str, charlist, ZEPHIR_TRIM_RIGHT);
 	return;
 }
@@ -191,7 +150,6 @@ PHP_METHOD(Stub_Strings, testRtrim2Params)
 PHP_METHOD(Stub_Strings, testLtrim2Params)
 {
 	zval *str, str_sub, *charlist, charlist_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&charlist_sub);
@@ -199,11 +157,7 @@ PHP_METHOD(Stub_Strings, testLtrim2Params)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_ZVAL(charlist)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &charlist);
-
-
 	zephir_fast_trim(return_value, str, charlist, ZEPHIR_TRIM_LEFT);
 	return;
 }
@@ -211,7 +165,6 @@ PHP_METHOD(Stub_Strings, testLtrim2Params)
 PHP_METHOD(Stub_Strings, testImplode)
 {
 	zval *glue, glue_sub, *pieces, pieces_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&glue_sub);
 	ZVAL_UNDEF(&pieces_sub);
@@ -219,11 +172,7 @@ PHP_METHOD(Stub_Strings, testImplode)
 		Z_PARAM_ZVAL(glue)
 		Z_PARAM_ZVAL(pieces)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &glue, &pieces);
-
-
 	zephir_fast_join(return_value, glue, pieces);
 	return;
 }
@@ -231,7 +180,6 @@ PHP_METHOD(Stub_Strings, testImplode)
 PHP_METHOD(Stub_Strings, testStrpos)
 {
 	zval *haystack, haystack_sub, *needle, needle_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&haystack_sub);
 	ZVAL_UNDEF(&needle_sub);
@@ -239,11 +187,7 @@ PHP_METHOD(Stub_Strings, testStrpos)
 		Z_PARAM_ZVAL(haystack)
 		Z_PARAM_ZVAL(needle)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &haystack, &needle);
-
-
 	zephir_fast_strpos(return_value, haystack, needle, 0 );
 	return;
 }
@@ -252,7 +196,6 @@ PHP_METHOD(Stub_Strings, testStrposOffset)
 {
 	zend_long offset;
 	zval *haystack, haystack_sub, *needle, needle_sub, *offset_param = NULL, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&haystack_sub);
 	ZVAL_UNDEF(&needle_sub);
@@ -262,12 +205,7 @@ PHP_METHOD(Stub_Strings, testStrposOffset)
 		Z_PARAM_ZVAL(needle)
 		Z_PARAM_LONG(offset)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(3, 0, &haystack, &needle, &offset_param);
-	offset = zephir_get_intval(offset_param);
-
-
 	ZVAL_LONG(&_0, offset);
 	zephir_fast_strpos(return_value, haystack, needle, zephir_get_intval(&_0) );
 	return;
@@ -276,7 +214,6 @@ PHP_METHOD(Stub_Strings, testStrposOffset)
 PHP_METHOD(Stub_Strings, testExplode)
 {
 	zval *delimiter, delimiter_sub, *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&delimiter_sub);
 	ZVAL_UNDEF(&str_sub);
@@ -284,11 +221,7 @@ PHP_METHOD(Stub_Strings, testExplode)
 		Z_PARAM_ZVAL(delimiter)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &delimiter, &str);
-
-
 	zephir_fast_explode(return_value, delimiter, str, LONG_MAX);
 	return;
 }
@@ -296,17 +229,12 @@ PHP_METHOD(Stub_Strings, testExplode)
 PHP_METHOD(Stub_Strings, testExplodeStr)
 {
 	zval *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	zephir_fast_explode_str(return_value, SL(","), str, LONG_MAX);
 	return;
 }
@@ -315,7 +243,6 @@ PHP_METHOD(Stub_Strings, testExplodeLimit)
 {
 	zend_long limit;
 	zval *str, str_sub, *limit_param = NULL, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
@@ -323,12 +250,7 @@ PHP_METHOD(Stub_Strings, testExplodeLimit)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_LONG(limit)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &limit_param);
-	limit = zephir_get_intval(limit_param);
-
-
 	ZVAL_LONG(&_0, limit);
 	zephir_fast_explode_str(return_value, SL(","), str, zephir_get_intval(&_0) );
 	return;
@@ -338,7 +260,6 @@ PHP_METHOD(Stub_Strings, testSubstr)
 {
 	zend_long from, len;
 	zval *str, str_sub, *from_param = NULL, *len_param = NULL, _0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
@@ -348,13 +269,7 @@ PHP_METHOD(Stub_Strings, testSubstr)
 		Z_PARAM_LONG(from)
 		Z_PARAM_LONG(len)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(3, 0, &str, &from_param, &len_param);
-	from = zephir_get_intval(from_param);
-	len = zephir_get_intval(len_param);
-
-
 	ZVAL_LONG(&_0, from);
 	ZVAL_LONG(&_1, len);
 	zephir_substr(return_value, str, zephir_get_intval(&_0), zephir_get_intval(&_1), 0);
@@ -365,7 +280,6 @@ PHP_METHOD(Stub_Strings, testSubstr2)
 {
 	zend_long from;
 	zval *str, str_sub, *from_param = NULL, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
@@ -373,12 +287,7 @@ PHP_METHOD(Stub_Strings, testSubstr2)
 		Z_PARAM_ZVAL(str)
 		Z_PARAM_LONG(from)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &str, &from_param);
-	from = zephir_get_intval(from_param);
-
-
 	ZVAL_LONG(&_0, from);
 	zephir_substr(return_value, str, zephir_get_intval(&_0), 0, ZEPHIR_SUBSTR_NO_LENGTH);
 	return;
@@ -387,18 +296,13 @@ PHP_METHOD(Stub_Strings, testSubstr2)
 PHP_METHOD(Stub_Strings, testSubstr3)
 {
 	zval *str, str_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	ZVAL_LONG(&_0, -1);
 	zephir_substr(return_value, str, -1 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
 	return;
@@ -407,7 +311,6 @@ PHP_METHOD(Stub_Strings, testSubstr3)
 PHP_METHOD(Stub_Strings, testSubstr4)
 {
 	zval *str, str_sub, _0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZVAL_UNDEF(&_0);
@@ -415,11 +318,7 @@ PHP_METHOD(Stub_Strings, testSubstr4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, -1);
 	zephir_substr(return_value, str, 0 , -1 , 0);
@@ -429,17 +328,12 @@ PHP_METHOD(Stub_Strings, testSubstr4)
 PHP_METHOD(Stub_Strings, testAddslashes)
 {
 	zval *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	zephir_addslashes(return_value, str);
 	return;
 }
@@ -447,17 +341,12 @@ PHP_METHOD(Stub_Strings, testAddslashes)
 PHP_METHOD(Stub_Strings, testStripslashes)
 {
 	zval *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	zephir_stripslashes(return_value, str);
 	return;
 }
@@ -465,17 +354,12 @@ PHP_METHOD(Stub_Strings, testStripslashes)
 PHP_METHOD(Stub_Strings, testStripcslashes)
 {
 	zval *str, str_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &str);
-
-
 	zephir_stripcslashes(return_value, str);
 	return;
 }
@@ -483,7 +367,6 @@ PHP_METHOD(Stub_Strings, testStripcslashes)
 PHP_METHOD(Stub_Strings, testHashEquals)
 {
 	zval *str1, str1_sub, *str2, str2_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str1_sub);
 	ZVAL_UNDEF(&str2_sub);
@@ -491,28 +374,18 @@ PHP_METHOD(Stub_Strings, testHashEquals)
 		Z_PARAM_ZVAL(str1)
 		Z_PARAM_ZVAL(str2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &str1, &str2);
-
-
 	RETURN_BOOL(zephir_hash_equals(str1, str2));
 }
 
 PHP_METHOD(Stub_Strings, testHardcodedMultilineString)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("\n            Hello world\n        ");
 }
 
 PHP_METHOD(Stub_Strings, testEchoMultilineString)
 {
-	zval *this_ptr = getThis();
-
-
 
 	php_printf("%s", "\n            Hello world\n        ");
 }
@@ -520,44 +393,27 @@ PHP_METHOD(Stub_Strings, testEchoMultilineString)
 PHP_METHOD(Stub_Strings, testTrimMultilineString)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "\n            Hello world\n        ");
 	zephir_fast_trim(return_value, &_0, NULL , ZEPHIR_TRIM_BOTH);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Strings, testWellEscapedMultilineString)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "\n            \\\"\\}\\$hello\\$\\\"\'\n        ");
 	zephir_fast_trim(return_value, &_0, NULL , ZEPHIR_TRIM_BOTH);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Strings, testInternedString1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("hello");
 }
@@ -565,18 +421,11 @@ PHP_METHOD(Stub_Strings, testInternedString1)
 PHP_METHOD(Stub_Strings, testInternedString2)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	ZVAL_STRING(&_1, " hello ");
 	zephir_fast_trim(&_0, &_1, NULL , ZEPHIR_TRIM_BOTH);
 	RETURN_CCTOR(&_0);
@@ -585,12 +434,10 @@ PHP_METHOD(Stub_Strings, testInternedString2)
 PHP_METHOD(Stub_Strings, strToHex)
 {
 	unsigned char _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i;
 	zephir_fcall_cache_entry *_4 = NULL, *_6 = NULL;
 	zval *value_param = NULL, _0, _2$$3, _3$$3, _5$$3;
 	zval value, ret;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value);
 	ZVAL_UNDEF(&ret);
@@ -601,16 +448,10 @@ PHP_METHOD(Stub_Strings, strToHex)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
-
-
 	i = 0;
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	while (1) {
 		if (!(i < zephir_fast_strlen_ev(&value))) {
 			break;
@@ -618,7 +459,7 @@ PHP_METHOD(Stub_Strings, strToHex)
 		_1$$3 = ZEPHIR_STRING_OFFSET(&value, i);
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		ZVAL_STRINGL(&_2$$3, &_1$$3, 1);
-		ZEPHIR_CALL_FUNCTION(&_3$$3, "ord", &_4, 102, &_2$$3);
+		ZEPHIR_CALL_FUNCTION(&_3$$3, "ord", &_4, 105, &_2$$3);
 		zephir_check_call_status();
 		ZEPHIR_CALL_FUNCTION(&_5$$3, "dechex", &_6, 11, &_3$$3);
 		zephir_check_call_status();
@@ -631,11 +472,9 @@ PHP_METHOD(Stub_Strings, strToHex)
 PHP_METHOD(Stub_Strings, issue1267)
 {
 	zval _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_5 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *value = NULL, value_sub, x, _0, _2, _3, _4, _6, _7;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&value_sub);
 	ZVAL_UNDEF(&x);
@@ -649,18 +488,12 @@ PHP_METHOD(Stub_Strings, issue1267)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
 	ZEPHIR_SEPARATE_PARAM(value);
-
-
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	zephir_create_array(&_1, 3, 0);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZVAL_STRING(&_2, "\\");
 	zephir_array_fast_append(&_1, &_2);
 	ZEPHIR_INIT_NVAR(&_2);
@@ -674,29 +507,27 @@ PHP_METHOD(Stub_Strings, issue1267)
 	zephir_fast_str_replace(&_0, &_1, &_2, value);
 	ZEPHIR_CPY_WRT(value, &_0);
 	ZVAL_LONG(&_3, 516);
-	ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 45, value, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 46, value, &_3);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(value, &_4);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZEPHIR_CALL_FUNCTION(&_4, "strip_tags", &_5, 103, value);
+	ZEPHIR_CALL_FUNCTION(&_4, "strip_tags", &_5, 106, value);
 	zephir_check_call_status();
 	zephir_stripslashes(&_0, &_4);
-	ZEPHIR_INIT_VAR(&x);
+	ZVAL_NULL(&x);
 	zephir_fast_trim(&x, &_0, NULL , ZEPHIR_TRIM_BOTH);
-	ZEPHIR_INIT_VAR(&_6);
-	ZEPHIR_CALL_FUNCTION(&_7, "strip_tags", &_5, 103, value);
+	ZVAL_NULL(&_6);
+	ZEPHIR_CALL_FUNCTION(&_7, "strip_tags", &_5, 106, value);
 	zephir_check_call_status();
 	zephir_stripcslashes(&_6, &_7);
 	zephir_fast_trim(return_value, &_6, NULL , ZEPHIR_TRIM_BOTH);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Strings, issue2186)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
 	bool is_null_true = 1;
@@ -704,27 +535,19 @@ PHP_METHOD(Stub_Strings, issue2186)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
-
-
 	RETURN_MM_BOOL(ZEPHIR_IS_NULL(&val));
 }
 
 PHP_METHOD(Stub_Strings, issue2186SegFault)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
 	bool is_null_true = 1;
@@ -732,18 +555,12 @@ PHP_METHOD(Stub_Strings, issue2186SegFault)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
-
-
 	if (!(ZEPHIR_IS_EMPTY(&val))) {
 		RETURN_MM_BOOL(1);
 	}
@@ -752,7 +569,6 @@ PHP_METHOD(Stub_Strings, issue2186SegFault)
 
 PHP_METHOD(Stub_Strings, issue2186SegFaultCall)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *val_param = NULL;
 	zval val;
@@ -764,26 +580,19 @@ PHP_METHOD(Stub_Strings, issue2186SegFaultCall)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "issue2186child1", NULL, 0, &val);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Strings, issue2186Child1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *val_param = NULL;
 	zval val;
@@ -795,29 +604,21 @@ PHP_METHOD(Stub_Strings, issue2186Child1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "issue2186child2", NULL, 0, &val);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Strings, issue2186Child2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL, output;
 	zval val, _0$$3;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
 	ZVAL_UNDEF(&_0$$3);
@@ -827,22 +628,16 @@ PHP_METHOD(Stub_Strings, issue2186Child2)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
-
-
-	ZEPHIR_INIT_VAR(&output);
+	ZVAL_NULL(&output);
 	ZVAL_STRING(&output, "");
 	if (!(ZEPHIR_IS_EMPTY(&val))) {
-		ZEPHIR_INIT_VAR(&_0$$3);
+		ZVAL_NULL(&_0$$3);
 		ZEPHIR_CONCAT_VS(&_0$$3, &val, " all ok");
 		ZEPHIR_CPY_WRT(&output, &_0$$3);
 	}
@@ -854,10 +649,8 @@ PHP_METHOD(Stub_Strings, issue2186Child2)
  */
 PHP_METHOD(Stub_Strings, issue2234Strict)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
 	bool is_null_true = 1;
@@ -865,13 +658,9 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -880,11 +669,9 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	}
 	}
-
-
 	RETURN_MM_BOOL(ZEPHIR_IS_NULL(&val));
 }
 
@@ -893,7 +680,6 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
  */
 PHP_METHOD(Stub_Strings, issue2234StrictParent)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *val_param = NULL;
 	zval val;
@@ -905,13 +691,9 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -920,14 +702,12 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	}
 	}
-
-
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "issue2234strictchild", NULL, 0, &val);
 	zephir_check_call_status();
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -935,10 +715,8 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
  */
 PHP_METHOD(Stub_Strings, issue2234StrictChild)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
 	bool is_null_true = 1;
@@ -946,13 +724,9 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -961,11 +735,9 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	}
 	}
-
-
 	RETURN_CTOR(&val);
 }
 
@@ -974,10 +746,8 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
  */
 PHP_METHOD(Stub_Strings, nullableStringReturnType)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val);
 	bool is_null_true = 1;
@@ -985,13 +755,9 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -1000,11 +766,9 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZEPHIR_INIT_VAR(&val);
+		ZVAL_NULL(&val);
 	}
 	}
-
-
 	if (!ZEPHIR_IS_NULL(&val)) {
 		RETURN_CTOR(&val);
 	}
@@ -1016,10 +780,8 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
  */
 PHP_METHOD(Stub_Strings, issue2299NullableStringCondition)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *roleName_param = NULL;
 	zval roleName;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&roleName);
 	bool is_null_true = 1;
@@ -1027,18 +789,12 @@ PHP_METHOD(Stub_Strings, issue2299NullableStringCondition)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(roleName)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &roleName_param);
 	if (!roleName_param) {
-		ZEPHIR_INIT_VAR(&roleName);
+		ZVAL_NULL(&roleName);
 	} else {
 		zephir_get_strval(&roleName, roleName_param);
 	}
-
-
 	if (Z_TYPE_P(&roleName) != IS_NULL) {
 		RETURN_CTOR(&roleName);
 	}
diff --git a/ext/stub/stubs.zep.c b/ext/stub/stubs.zep.c
index 06120e86e6..7cef78637a 100644
--- a/ext/stub/stubs.zep.c
+++ b/ext/stub/stubs.zep.c
@@ -48,9 +48,6 @@ ZEPHIR_INIT_CLASS(Stub_Stubs)
  */
 PHP_METHOD(Stub_Stubs, testDockBlockAndReturnType)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propString");
 }
@@ -62,9 +59,6 @@ PHP_METHOD(Stub_Stubs, testDockBlockAndReturnType)
  */
 PHP_METHOD(Stub_Stubs, testDocBlockAndReturnTypeDeclared)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "propStringProtected");
 }
@@ -81,7 +75,6 @@ PHP_METHOD(Stub_Stubs, testMixedInputParamsDocBlock)
 {
 	zend_long number;
 	zval *intOrString, intOrString_sub, *number_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&intOrString_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 2)
@@ -89,16 +82,11 @@ PHP_METHOD(Stub_Stubs, testMixedInputParamsDocBlock)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(number)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 1, &intOrString, &number_param);
 	if (!number_param) {
 		number = 1;
 	} else {
-		number = zephir_get_intval(number_param);
-	}
-
-
+		}
 	RETURN_LONG(number);
 }
 
@@ -115,7 +103,6 @@ PHP_METHOD(Stub_Stubs, testMixedInputParamsDocBlockDeclared)
 {
 	zend_long number;
 	zval *intOrString, intOrString_sub, *number_param = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&intOrString_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 2)
@@ -123,16 +110,11 @@ PHP_METHOD(Stub_Stubs, testMixedInputParamsDocBlockDeclared)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(number)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 1, &intOrString, &number_param);
 	if (!number_param) {
 		number = 1;
 	} else {
-		number = zephir_get_intval(number_param);
-	}
-
-
+		}
 	RETURN_LONG(number);
 }
 
@@ -144,32 +126,21 @@ PHP_METHOD(Stub_Stubs, testVariableLength)
 {
 	zval _0, _1;
 	zval data;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&data);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&data);
+	ZVAL_NULL(&data);
 	array_init(&data);
-	ZEPHIR_INIT_VAR(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_0);
+	ZVAL_NULL(&_1);
 	zephir_get_args(&_1);
 	zephir_fast_array_merge(&_0, &data, &_1);
 	ZEPHIR_CPY_WRT(&data, &_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	array_init(return_value);
 	return;
@@ -177,18 +148,12 @@ PHP_METHOD(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature1)
 
 PHP_METHOD(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
 
 PHP_METHOD(Stub_Stubs, testMultiReturnTypeWithBool)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
diff --git a/ext/stub/ternary.zep.c b/ext/stub/ternary.zep.c
index 6423890521..564dcf7919 100644
--- a/ext/stub/ternary.zep.c
+++ b/ext/stub/ternary.zep.c
@@ -33,19 +33,14 @@ ZEPHIR_INIT_CLASS(Stub_Ternary)
 PHP_METHOD(Stub_Ternary, testTernary1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (100) {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (1 + 100));
 	} else {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_BOOL(&_0, 0);
 	}
 	RETURN_CCTOR(&_0);
@@ -53,27 +48,20 @@ PHP_METHOD(Stub_Ternary, testTernary1)
 
 PHP_METHOD(Stub_Ternary, testTernary2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *b_param = NULL, _0;
 	zend_bool b;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(b)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b_param);
-	b = zephir_get_boolval(b_param);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (b) {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_STRING(&_0, "foo");
 	} else {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_STRING(&_0, "bar");
 	}
 	RETURN_CCTOR(&_0);
@@ -81,10 +69,8 @@ PHP_METHOD(Stub_Ternary, testTernary2)
 
 PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *y, y_sub, _0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&y_sub);
@@ -94,15 +80,10 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(y)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &y);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (100) {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (1 + 100));
 	} else {
 		ZEPHIR_CALL_METHOD(&_1, a, "y", NULL, 0);
@@ -120,10 +101,8 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 
 PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *y, y_sub, _0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&y_sub);
@@ -133,14 +112,8 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(y)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &y);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (100) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (1 + 100));
@@ -160,23 +133,15 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 
 PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (Z_TYPE_P(a) == IS_RESOURCE) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_STRING(&_0, "unknown");
@@ -185,7 +150,7 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 		ZVAL_BOOL(&_0, 0);
 	}
 	zephir_gettype(return_value, &_0);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -194,27 +159,20 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 PHP_METHOD(Stub_Ternary, testTernaryWithPromotedTemporaryVariable)
 {
 	zval var2, var3, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&var2);
 	ZVAL_UNDEF(&var3);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&var2);
+	ZVAL_NULL(&var2);
 	zephir_create_array(&var2, 2, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_STRING(&_0, "_b_");
 	zephir_array_fast_append(&var2, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "_c_");
 	zephir_array_fast_append(&var2, &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	if (zephir_array_isset_long(&var2, 1)) {
 		ZEPHIR_OBS_NVAR(&_1);
 		zephir_array_fetch_long(&_1, &var2, 1, PH_NOISY, "stub/ternary.zep", 44);
@@ -222,7 +180,7 @@ PHP_METHOD(Stub_Ternary, testTernaryWithPromotedTemporaryVariable)
 		ZEPHIR_INIT_NVAR(&_1);
 		ZVAL_STRING(&_1, "");
 	}
-	ZEPHIR_INIT_VAR(&var3);
+	ZVAL_NULL(&var3);
 	zephir_fast_explode_str(&var3, SL("_"), &_1, LONG_MAX);
 	RETURN_CCTOR(&var3);
 }
@@ -233,16 +191,9 @@ PHP_METHOD(Stub_Ternary, testTernaryWithPromotedTemporaryVariable)
 PHP_METHOD(Stub_Ternary, testTernaryAfterLetVariable)
 {
 	zval s;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&s);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&s);
+	ZVAL_NULL(&s);
 	ZVAL_LONG(&s, 23);
 	if (1 == 1) {
 		ZEPHIR_INIT_NVAR(&s);
@@ -256,24 +207,17 @@ PHP_METHOD(Stub_Ternary, testTernaryAfterLetVariable)
 
 PHP_METHOD(Stub_Ternary, testShortTernary)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (!(zephir_is_true(a))) {
+		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_BOOL(&_0, 0);
 	} else {
 		ZEPHIR_CPY_WRT(&_0, a);
@@ -283,9 +227,7 @@ PHP_METHOD(Stub_Ternary, testShortTernary)
 
 PHP_METHOD(Stub_Ternary, testShortTernaryComplex)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *left, left_sub, *value, value_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&left_sub);
 	ZVAL_UNDEF(&value_sub);
@@ -294,14 +236,8 @@ PHP_METHOD(Stub_Ternary, testShortTernaryComplex)
 		Z_PARAM_ZVAL(left)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left, &value);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	if (!(zephir_is_true(left))) {
 		ZEPHIR_CPY_WRT(&_0, value);
 	} else {
diff --git a/ext/stub/trytest.zep.c b/ext/stub/trytest.zep.c
index fb79b2bd31..c47e3c7435 100644
--- a/ext/stub/trytest.zep.c
+++ b/ext/stub/trytest.zep.c
@@ -29,9 +29,6 @@ ZEPHIR_INIT_CLASS(Stub_TryTest)
 
 PHP_METHOD(Stub_TryTest, testThrow1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(zend_ce_exception, "error", "stub/trytest.zep", 10);
 	return;
@@ -40,38 +37,24 @@ PHP_METHOD(Stub_TryTest, testThrow1)
 PHP_METHOD(Stub_TryTest, testThrow2)
 {
 	zval message, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&message);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&message);
+	ZVAL_NULL(&message);
 	ZVAL_STRING(&message, "error");
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	object_init_ex(&_0, zend_ce_exception);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 30, &message);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &message);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/trytest.zep", 16);
-	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_TryTest, testTry1)
 {
-	zval *this_ptr = getThis();
-
-
-
 
 	/* try_start_1: */
-
-
 	try_end_1:
 
 	zend_clear_exception();
@@ -80,30 +63,20 @@ PHP_METHOD(Stub_TryTest, testTry1)
 PHP_METHOD(Stub_TryTest, testTry2)
 {
 	zval _0$$3, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
-		ZEPHIR_INIT_VAR(&_0$$3);
+		ZVAL_NULL(&_0$$3);
 		object_init_ex(&_0$$3, zend_ce_exception);
-		ZEPHIR_INIT_VAR(&_1$$3);
+		ZVAL_NULL(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 30, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 27);
 		goto try_end_1;
-
-
 	try_end_1:
 
 	zend_clear_exception();
@@ -112,39 +85,29 @@ PHP_METHOD(Stub_TryTest, testTry2)
 PHP_METHOD(Stub_TryTest, testTry3)
 {
 	zval _0$$3, _1$$3, _2, _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
-		ZEPHIR_INIT_VAR(&_0$$3);
+		ZVAL_NULL(&_0$$3);
 		object_init_ex(&_0$$3, zend_ce_exception);
-		ZEPHIR_INIT_VAR(&_1$$3);
+		ZVAL_NULL(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 30, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 34);
 		goto try_end_1;
-
-
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_2);
+		ZVAL_NULL(&_2);
 		ZVAL_OBJ(&_2, EG(exception));
 		Z_ADDREF_P(&_2);
-		ZEPHIR_INIT_VAR(&_3);
+		ZVAL_NULL(&_3);
 		if (zephir_is_instance_of(&_2, SL("Exception"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_3, &_2);
@@ -156,11 +119,9 @@ PHP_METHOD(Stub_TryTest, testTry3)
 
 PHP_METHOD(Stub_TryTest, testTry4)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0$$4, _1$$4, _2$$5, _3$$5, _4, _5, _6;
 	zend_bool a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0$$4);
 	ZVAL_UNDEF(&_1$$4);
@@ -172,33 +133,25 @@ PHP_METHOD(Stub_TryTest, testTry4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
-	a = zephir_get_boolval(a_param);
-
-
-
 	/* try_start_1: */
 
 		if (a) {
-			ZEPHIR_INIT_VAR(&_0$$4);
+			ZVAL_NULL(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZEPHIR_INIT_VAR(&_1$$4);
+			ZVAL_NULL(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 46);
 			goto try_end_1;
 
 		} else {
-			ZEPHIR_INIT_VAR(&_2$$5);
+			ZVAL_NULL(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_NULL(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 48);
 			goto try_end_1;
@@ -208,11 +161,11 @@ PHP_METHOD(Stub_TryTest, testTry4)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_4);
+		ZVAL_NULL(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
-		ZEPHIR_INIT_VAR(&_5);
-		ZEPHIR_INIT_VAR(&_6);
+		ZVAL_NULL(&_5);
+		ZVAL_NULL(&_6);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_5, &_4);
@@ -230,11 +183,9 @@ PHP_METHOD(Stub_TryTest, testTry4)
 
 PHP_METHOD(Stub_TryTest, testTry5)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0$$4, _1$$4, _2$$5, _3$$5, _4, _5;
 	zend_bool a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0$$4);
 	ZVAL_UNDEF(&_1$$4);
@@ -245,33 +196,25 @@ PHP_METHOD(Stub_TryTest, testTry5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
-	a = zephir_get_boolval(a_param);
-
-
-
 	/* try_start_1: */
 
 		if (a) {
-			ZEPHIR_INIT_VAR(&_0$$4);
+			ZVAL_NULL(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZEPHIR_INIT_VAR(&_1$$4);
+			ZVAL_NULL(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 63);
 			goto try_end_1;
 
 		} else {
-			ZEPHIR_INIT_VAR(&_2$$5);
+			ZVAL_NULL(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_NULL(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 65);
 			goto try_end_1;
@@ -281,10 +224,10 @@ PHP_METHOD(Stub_TryTest, testTry5)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_4);
+		ZVAL_NULL(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
-		ZEPHIR_INIT_VAR(&_5);
+		ZVAL_NULL(&_5);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_5, &_4);
@@ -302,11 +245,9 @@ PHP_METHOD(Stub_TryTest, testTry5)
 
 PHP_METHOD(Stub_TryTest, testTry6)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, e, _4, _0$$4, _1$$4, _2$$5, _3$$5;
 	zend_bool a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_4);
@@ -317,33 +258,25 @@ PHP_METHOD(Stub_TryTest, testTry6)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
-	a = zephir_get_boolval(a_param);
-
-
-
 	/* try_start_1: */
 
 		if (a) {
-			ZEPHIR_INIT_VAR(&_0$$4);
+			ZVAL_NULL(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZEPHIR_INIT_VAR(&_1$$4);
+			ZVAL_NULL(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 80);
 			goto try_end_1;
 
 		} else {
-			ZEPHIR_INIT_VAR(&_2$$5);
+			ZVAL_NULL(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_NULL(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 82);
 			goto try_end_1;
@@ -353,7 +286,7 @@ PHP_METHOD(Stub_TryTest, testTry6)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_4);
+		ZVAL_NULL(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
@@ -373,11 +306,9 @@ PHP_METHOD(Stub_TryTest, testTry6)
 
 PHP_METHOD(Stub_TryTest, testTry7)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, e, _4, _0$$4, _1$$4, _2$$5, _3$$5;
 	zend_bool a;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_4);
@@ -388,33 +319,25 @@ PHP_METHOD(Stub_TryTest, testTry7)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
-	a = zephir_get_boolval(a_param);
-
-
-
 	/* try_start_1: */
 
 		if (a) {
-			ZEPHIR_INIT_VAR(&_0$$4);
+			ZVAL_NULL(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZEPHIR_INIT_VAR(&_1$$4);
+			ZVAL_NULL(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 30, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 99);
 			goto try_end_1;
 
 		} else {
-			ZEPHIR_INIT_VAR(&_2$$5);
+			ZVAL_NULL(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZEPHIR_INIT_VAR(&_3$$5);
+			ZVAL_NULL(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 104, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 101);
 			goto try_end_1;
@@ -424,7 +347,7 @@ PHP_METHOD(Stub_TryTest, testTry7)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_4);
+		ZVAL_NULL(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
@@ -444,30 +367,20 @@ PHP_METHOD(Stub_TryTest, testTry7)
 PHP_METHOD(Stub_TryTest, testTry8)
 {
 	zval _0$$3, _1$$3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
-		ZEPHIR_INIT_VAR(&_0$$3);
+		ZVAL_NULL(&_0$$3);
 		object_init_ex(&_0$$3, zend_ce_exception);
-		ZEPHIR_INIT_VAR(&_1$$3);
+		ZVAL_NULL(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error 1!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 30, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 111);
 		goto try_end_1;
-
-
 	try_end_1:
 
 	zend_clear_exception();
@@ -477,9 +390,6 @@ PHP_METHOD(Stub_TryTest, testTry8)
 
 PHP_METHOD(Stub_TryTest, someMethod1)
 {
-	zval *this_ptr = getThis();
-
-
 
 	ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(spl_ce_RuntimeException, "some external exception", "stub/trytest.zep", 118);
 	return;
@@ -487,9 +397,6 @@ PHP_METHOD(Stub_TryTest, someMethod1)
 
 PHP_METHOD(Stub_TryTest, someMethod2)
 {
-	zval *this_ptr = getThis();
-
-
 
 	ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(spl_ce_DomainException, "some external exception", "stub/trytest.zep", 123);
 	return;
@@ -498,28 +405,21 @@ PHP_METHOD(Stub_TryTest, someMethod2)
 PHP_METHOD(Stub_TryTest, testTry9)
 {
 	zval e, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod1", NULL, 105);
+		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod1", NULL, 108);
 		zephir_check_call_status_or_jump(try_end_1);
 		RETURN_MM_STRING("not catched");
 
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_0);
+		ZVAL_NULL(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("RuntimeException"))) {
@@ -534,28 +434,21 @@ PHP_METHOD(Stub_TryTest, testTry9)
 PHP_METHOD(Stub_TryTest, testTry10)
 {
 	zval e, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod2", NULL, 106);
+		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod2", NULL, 109);
 		zephir_check_call_status_or_jump(try_end_1);
 		RETURN_MM_STRING("not catched");
 
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_0);
+		ZVAL_NULL(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("RuntimeException"))) {
@@ -570,17 +463,9 @@ PHP_METHOD(Stub_TryTest, testTry10)
 PHP_METHOD(Stub_TryTest, testTry11)
 {
 	zval ex, _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ex);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-
 	/* try_start_1: */
 
 		RETURN_MM_STRING("test");
@@ -588,7 +473,7 @@ PHP_METHOD(Stub_TryTest, testTry11)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZEPHIR_INIT_VAR(&_0);
+		ZVAL_NULL(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("Exception"))) {
diff --git a/ext/stub/typeinstances.zep.c b/ext/stub/typeinstances.zep.c
index b7d681057d..2eaaf176d3 100644
--- a/ext/stub/typeinstances.zep.c
+++ b/ext/stub/typeinstances.zep.c
@@ -33,18 +33,11 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString1)
 {
 	zval _2;
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 24);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
 	zephir_check_call_status();
@@ -56,18 +49,11 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString2)
 {
 	zval _2;
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, -24);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
 	zephir_check_call_status();
@@ -79,18 +65,11 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString3)
 {
 	zval _2;
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
 	zephir_check_call_status();
diff --git a/ext/stub/typeoff.zep.c b/ext/stub/typeoff.zep.c
index b22d199a4f..bfc3fe930c 100644
--- a/ext/stub/typeoff.zep.c
+++ b/ext/stub/typeoff.zep.c
@@ -30,16 +30,9 @@ ZEPHIR_INIT_CLASS(Stub_Typeoff)
 PHP_METHOD(Stub_Typeoff, testNativeStringFalse)
 {
 	zval testVar;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&testVar);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&testVar);
+	ZVAL_NULL(&testVar);
 	ZVAL_STRING(&testVar, "sdfsdf");
 	RETURN_MM_BOOL(1 == 0);
 }
@@ -47,16 +40,9 @@ PHP_METHOD(Stub_Typeoff, testNativeStringFalse)
 PHP_METHOD(Stub_Typeoff, testNativeStringTrue)
 {
 	zval testVar;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&testVar);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&testVar);
+	ZVAL_NULL(&testVar);
 	ZVAL_STRING(&testVar, "sdfsdf");
 	RETURN_MM_BOOL(1 == 1);
 }
@@ -64,11 +50,6 @@ PHP_METHOD(Stub_Typeoff, testNativeStringTrue)
 PHP_METHOD(Stub_Typeoff, testNativeIntFalse)
 {
 	zend_long testVar = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	testVar = 12345;
 	RETURN_BOOL(1 == 0);
 }
@@ -76,11 +57,6 @@ PHP_METHOD(Stub_Typeoff, testNativeIntFalse)
 PHP_METHOD(Stub_Typeoff, testNativeIntTrue)
 {
 	zend_long testVar = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	testVar = 12345;
 	RETURN_BOOL(1 == 1);
 }
@@ -88,11 +64,6 @@ PHP_METHOD(Stub_Typeoff, testNativeIntTrue)
 PHP_METHOD(Stub_Typeoff, testNativeDoubleTrue)
 {
 	double testVar = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	testVar = (double) (12345);
 	RETURN_BOOL(1 == 1);
 }
@@ -100,11 +71,6 @@ PHP_METHOD(Stub_Typeoff, testNativeDoubleTrue)
 PHP_METHOD(Stub_Typeoff, testNativeBoolTrue)
 {
 	zend_bool testVar = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	testVar = 1;
 	RETURN_BOOL(1 == 1);
 }
@@ -112,16 +78,9 @@ PHP_METHOD(Stub_Typeoff, testNativeBoolTrue)
 PHP_METHOD(Stub_Typeoff, testNotBoolTrue)
 {
 	zval testVar;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&testVar);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&testVar);
+	ZVAL_NULL(&testVar);
 	ZVAL_STRING(&testVar, "");
 	ZEPHIR_INIT_NVAR(&testVar);
 	ZVAL_BOOL(&testVar, 1);
@@ -131,11 +90,6 @@ PHP_METHOD(Stub_Typeoff, testNotBoolTrue)
 PHP_METHOD(Stub_Typeoff, testNativeBoolFalse)
 {
 	zend_bool testVar = 0;
-	zval *this_ptr = getThis();
-
-
-
-
 	testVar = 0;
 	RETURN_BOOL(1 == 0);
 }
@@ -143,16 +97,9 @@ PHP_METHOD(Stub_Typeoff, testNativeBoolFalse)
 PHP_METHOD(Stub_Typeoff, testArrayFalse)
 {
 	zval testVar;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&testVar);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&testVar);
+	ZVAL_NULL(&testVar);
 	array_init(&testVar);
 	RETURN_MM_BOOL(Z_TYPE_P(&testVar) == IS_STRING);
 }
@@ -160,16 +107,9 @@ PHP_METHOD(Stub_Typeoff, testArrayFalse)
 PHP_METHOD(Stub_Typeoff, testArrayTrue)
 {
 	zval testVar;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&testVar);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&testVar);
+	ZVAL_NULL(&testVar);
 	array_init(&testVar);
 	RETURN_MM_BOOL(Z_TYPE_P(&testVar) == IS_ARRAY);
 }
@@ -177,44 +117,29 @@ PHP_METHOD(Stub_Typeoff, testArrayTrue)
 PHP_METHOD(Stub_Typeoff, testClassPropertyAccess)
 {
 	zval _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "test string");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("property"), &_0);
-	zephir_memory_observe(&_1);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("property"), PH_NOISY_CC);
 	RETURN_MM_BOOL(Z_TYPE_P(&_1) == IS_STRING);
 }
 
 PHP_METHOD(Stub_Typeoff, testUnknownTypeOf)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *u, u_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&u_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(u)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &u);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	zephir_gettype(&_0, u);
 	RETURN_CCTOR(&_0);
 }
@@ -222,17 +147,12 @@ PHP_METHOD(Stub_Typeoff, testUnknownTypeOf)
 PHP_METHOD(Stub_Typeoff, testCallableTypeOf)
 {
 	zval *cb, cb_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&cb_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(cb)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &cb);
-
-
 	RETURN_BOOL(zephir_is_callable(cb) == 1);
 }
 
diff --git a/ext/stub/types/maybe.zep.c b/ext/stub/types/maybe.zep.c
index aca622c891..be2c7a95f9 100644
--- a/ext/stub/types/maybe.zep.c
+++ b/ext/stub/types/maybe.zep.c
@@ -28,25 +28,16 @@ PHP_METHOD(Stub_Types_MayBe, gc)
 {
 	zval *maxlifetime_param = NULL;
 	zend_long maxlifetime;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(maxlifetime)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &maxlifetime_param);
-	maxlifetime = zephir_get_intval(maxlifetime_param);
-
-
 	RETURN_LONG(1);
 }
 
 PHP_METHOD(Stub_Types_MayBe, gcFalse)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(0);
 }
diff --git a/ext/stub/types/mixedtype.zep.c b/ext/stub/types/mixedtype.zep.c
index 9049ee89f3..fae5935bda 100644
--- a/ext/stub/types/mixedtype.zep.c
+++ b/ext/stub/types/mixedtype.zep.c
@@ -30,9 +30,6 @@ ZEPHIR_INIT_CLASS(Stub_Types_MixedType)
  */
 PHP_METHOD(Stub_Types_MixedType, returnMixedObject)
 {
-	zval *this_ptr = getThis();
-
-
 
 	object_init(return_value);
 	return;
@@ -40,9 +37,6 @@ PHP_METHOD(Stub_Types_MixedType, returnMixedObject)
 
 PHP_METHOD(Stub_Types_MixedType, returnMixedArray)
 {
-	zval *this_ptr = getThis();
-
-
 
 	array_init(return_value);
 	return;
@@ -50,45 +44,30 @@ PHP_METHOD(Stub_Types_MixedType, returnMixedArray)
 
 PHP_METHOD(Stub_Types_MixedType, returnMixedString)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("mixed string");
 }
 
 PHP_METHOD(Stub_Types_MixedType, returnMixedInt)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(1);
 }
 
 PHP_METHOD(Stub_Types_MixedType, returnMixedFloat)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_DOUBLE(3.14);
 }
 
 PHP_METHOD(Stub_Types_MixedType, returnMixedBool)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_BOOL(1);
 }
 
 PHP_METHOD(Stub_Types_MixedType, returnMixedNull)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
@@ -97,22 +76,16 @@ PHP_METHOD(Stub_Types_MixedType, returnMixed74)
 {
 	zval *diff_param = NULL;
 	zend_bool diff;
-	zval *this_ptr = getThis();
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(diff)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(0, 1, &diff_param);
 	if (!diff_param) {
 		diff = 0;
 	} else {
-		diff = zephir_get_boolval(diff_param);
-	}
-
-
+		}
 	if (diff) {
 		RETURN_STRING("string");
 	}
@@ -122,9 +95,6 @@ PHP_METHOD(Stub_Types_MixedType, returnMixed74)
 
 PHP_METHOD(Stub_Types_MixedType, returnMultiButAlwaysMixed)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_STRING("ZEND_BEGIN_ARG_INFO_EX");
 }
@@ -136,17 +106,12 @@ PHP_METHOD(Stub_Types_MixedType, paramMixed)
 {
 	zval val_sub;
 	zval *val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
-
-
 	RETVAL_ZVAL(val, 1, 0);
 	return;
 }
@@ -155,7 +120,6 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedTwo)
 {
 	zval val1_sub, val2_sub;
 	zval *val1, *val2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val1_sub);
 	ZVAL_UNDEF(&val2_sub);
@@ -163,11 +127,7 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedTwo)
 		Z_PARAM_ZVAL(val1)
 		Z_PARAM_ZVAL(val2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &val1, &val2);
-
-
 	zephir_create_array(return_value, 2, 0);
 	zephir_array_fast_append(return_value, val1);
 	zephir_array_fast_append(return_value, val2);
@@ -176,12 +136,10 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedTwo)
 
 PHP_METHOD(Stub_Types_MixedType, paramMixedWithMulti)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *mixedVal;
 	zval stringVal;
 	zval *intVal_param = NULL, *stringVal_param = NULL, mixedVal_sub, _0;
 	zend_long intVal;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&mixedVal_sub);
 	ZVAL_UNDEF(&_0);
@@ -191,22 +149,15 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedWithMulti)
 		Z_PARAM_STR(stringVal)
 		Z_PARAM_ZVAL(mixedVal)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &intVal_param, &stringVal_param, &mixedVal);
-	intVal = zephir_get_intval(intVal_param);
 	zephir_get_strval(&stringVal, stringVal_param);
-
-
 	zephir_create_array(return_value, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, intVal);
 	zephir_array_fast_append(return_value, &_0);
 	zephir_array_fast_append(return_value, &stringVal);
 	zephir_array_fast_append(return_value, mixedVal);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -216,17 +167,12 @@ PHP_METHOD(Stub_Types_MixedType, paramAndReturnMixed)
 {
 	zval val_sub;
 	zval *val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
-
-
 	RETVAL_ZVAL(val, 1, 0);
 	return;
 }
@@ -234,23 +180,15 @@ PHP_METHOD(Stub_Types_MixedType, paramAndReturnMixed)
 PHP_METHOD(Stub_Types_MixedType, castToStringMixedAndReturnMixed)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
-
-
 	zephir_cast_to_string(&_0, val);
 	RETURN_CTOR(&_0);
 }
@@ -258,159 +196,112 @@ PHP_METHOD(Stub_Types_MixedType, castToStringMixedAndReturnMixed)
 PHP_METHOD(Stub_Types_MixedType, castToStringInternallyMixedAndReturnMixed)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
-
-
 	zephir_cast_to_string(&_0, val);
 	ZEPHIR_CPY_WRT(val, &_0);
 	RETVAL_ZVAL(val, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToIntMixedAndReturnMixed)
 {
 	zval val_sub;
 	zval *val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
-
-
 	RETURN_LONG(zephir_get_intval(val));
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToIntInternallyMixedAndReturnMixed)
 {
 	zend_long _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
-
-
 	_0 = zephir_get_intval(val);
 	ZEPHIR_INIT_NVAR(val);
 	ZVAL_LONG(val, _0);
 	RETVAL_ZVAL(val, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToBoolMixedAndReturnMixed)
 {
 	zval val_sub;
 	zval *val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
-
-
 	RETURN_BOOL(zephir_get_boolval(val));
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToBoolInternallyMixedAndReturnMixed)
 {
 	double _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
-
-
 	_0 = zephir_get_boolval(val);
 	ZEPHIR_INIT_NVAR(val);
 	ZVAL_BOOL(val, _0);
 	RETVAL_ZVAL(val, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToFloatMixedAndReturnMixed)
 {
 	zval val_sub;
 	zval *val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
-
-
 	RETURN_DOUBLE(zephir_get_doubleval(val));
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToFloatInternallyMixedAndReturnMixed)
 {
 	double _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
-
-
 	_0 = zephir_get_doubleval(val);
 	ZEPHIR_INIT_NVAR(val);
 	ZVAL_DOUBLE(val, _0);
 	RETVAL_ZVAL(val, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 /**
@@ -420,17 +311,12 @@ PHP_METHOD(Stub_Types_MixedType, mixedInCondition)
 {
 	zval val_sub;
 	zval *val;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&val_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &val);
-
-
 	if (UNEXPECTED(zephir_is_true(val))) {
 	}
 	if (ZEPHIR_IS_LONG_IDENTICAL(val, 1)) {
diff --git a/ext/stub/types/obj.zep.c b/ext/stub/types/obj.zep.c
index c7c5aea67c..c3de88c394 100644
--- a/ext/stub/types/obj.zep.c
+++ b/ext/stub/types/obj.zep.c
@@ -24,18 +24,12 @@ ZEPHIR_INIT_CLASS(Stub_Types_Obj)
 
 PHP_METHOD(Stub_Types_Obj, nullableObjectReturnNull)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_NULL();
 }
 
 PHP_METHOD(Stub_Types_Obj, nullableObjectReturnObj)
 {
-	zval *this_ptr = getThis();
-
-
 
 	object_init(return_value);
 	return;
@@ -43,9 +37,6 @@ PHP_METHOD(Stub_Types_Obj, nullableObjectReturnObj)
 
 PHP_METHOD(Stub_Types_Obj, objectReturn)
 {
-	zval *this_ptr = getThis();
-
-
 
 	object_init(return_value);
 	return;
diff --git a/ext/stub/unsettest.zep.c b/ext/stub/unsettest.zep.c
index 3a1df8e6fa..ae7ba0fed3 100644
--- a/ext/stub/unsettest.zep.c
+++ b/ext/stub/unsettest.zep.c
@@ -31,9 +31,6 @@ ZEPHIR_INIT_CLASS(Stub_Unsettest)
 
 PHP_METHOD(Stub_Unsettest, getProperty)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_MEMBER(getThis(), "property");
 }
@@ -48,11 +45,7 @@ PHP_METHOD(Stub_Unsettest, has)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(key)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &key);
-
-
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("property"), PH_NOISY_CC | PH_READONLY);
 	RETURN_BOOL(zephir_array_isset(&_0, key));
 }
@@ -68,11 +61,7 @@ PHP_METHOD(Stub_Unsettest, addValueToProperty)
 		Z_PARAM_ZVAL(key)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &key, &value);
-
-
 	zephir_update_property_array(this_ptr, SL("property"), key, value);
 }
 
@@ -86,11 +75,7 @@ PHP_METHOD(Stub_Unsettest, testUnsetValueFromProperty)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(key)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(1, 0, &key);
-
-
 	zephir_unset_property_array(this_ptr, ZEND_STRL("property"), key);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("property"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_unset(&_0, key, PH_SEPARATE);
@@ -98,32 +83,22 @@ PHP_METHOD(Stub_Unsettest, testUnsetValueFromProperty)
 
 PHP_METHOD(Stub_Unsettest, testUnsetFromArray)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arrayParameter, arrayParameter_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arrayParameter_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arrayParameter)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arrayParameter);
 	ZEPHIR_SEPARATE_PARAM(arrayParameter);
-
-
 	zephir_array_unset_long(arrayParameter, 0, PH_SEPARATE);
 	RETVAL_ZVAL(arrayParameter, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Unsettest, testUnsetFromArrayByIndexVar)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arrayParameter, arrayParameter_sub, *index, index_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arrayParameter_sub);
 	ZVAL_UNDEF(&index_sub);
@@ -131,25 +106,16 @@ PHP_METHOD(Stub_Unsettest, testUnsetFromArrayByIndexVar)
 		Z_PARAM_ZVAL(arrayParameter)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arrayParameter, &index);
 	ZEPHIR_SEPARATE_PARAM(arrayParameter);
-
-
 	zephir_array_unset(arrayParameter, index, PH_SEPARATE);
 	RETVAL_ZVAL(arrayParameter, 1, 0);
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_Unsettest, testUnsetProperty)
 {
 	zval *this_ptr = getThis();
-
-
-
 	zephir_unset_property(this_ptr, "property");
 	RETURN_MEMBER(getThis(), "property");
 }
@@ -157,23 +123,16 @@ PHP_METHOD(Stub_Unsettest, testUnsetProperty)
 PHP_METHOD(Stub_Unsettest, testStdClassUnset)
 {
 	zval simpleObject, _0, _1;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&simpleObject);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&simpleObject);
+	ZVAL_NULL(&simpleObject);
 	object_init(&simpleObject);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 12345);
 	zephir_update_property_zval(&simpleObject, ZEND_STRL("property1"), &_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "test");
 	zephir_update_property_zval(&simpleObject, ZEND_STRL("property2"), &_1);
@@ -186,11 +145,9 @@ PHP_METHOD(Stub_Unsettest, testStdClassUnset)
 
 PHP_METHOD(Stub_Unsettest, testUnsetTypedArray)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval key;
 	zval *arr_param = NULL, *key_param = NULL;
 	zval arr;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&key);
@@ -198,15 +155,9 @@ PHP_METHOD(Stub_Unsettest, testUnsetTypedArray)
 		Z_PARAM_ARRAY(arr)
 		Z_PARAM_STR(key)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arr_param, &key_param);
 	zephir_get_arrval(&arr, arr_param);
 	zephir_get_strval(&key, key_param);
-
-
 	zephir_array_unset(&arr, &key, PH_SEPARATE);
 	RETURN_CTOR(&arr);
 }
diff --git a/ext/stub/usetest.zep.c b/ext/stub/usetest.zep.c
index 534555afe0..e41a033a45 100644
--- a/ext/stub/usetest.zep.c
+++ b/ext/stub/usetest.zep.c
@@ -14,7 +14,6 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
-#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_UseTest)
@@ -27,9 +26,6 @@ ZEPHIR_INIT_CLASS(Stub_UseTest)
 
 PHP_METHOD(Stub_UseTest, createInstance)
 {
-	zval *this_ptr = getThis();
-
-
 
 	object_init(return_value);
 	return;
@@ -37,9 +33,6 @@ PHP_METHOD(Stub_UseTest, createInstance)
 
 PHP_METHOD(Stub_UseTest, count)
 {
-	zval *this_ptr = getThis();
-
-
 
 	RETURN_LONG(0);
 }
@@ -47,15 +40,7 @@ PHP_METHOD(Stub_UseTest, count)
 PHP_METHOD(Stub_UseTest, testUseClass1)
 {
 	zend_class_entry *_0 = NULL;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Oo\\OoConstruct"), ZEND_FETCH_CLASS_AUTO);
 	}
@@ -65,21 +50,13 @@ PHP_METHOD(Stub_UseTest, testUseClass1)
 		zephir_check_call_status();
 	}
 
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_UseTest, testUseClass2)
 {
 	zend_class_entry *_0 = NULL;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Strings"), ZEND_FETCH_CLASS_AUTO);
 	}
@@ -89,21 +66,13 @@ PHP_METHOD(Stub_UseTest, testUseClass2)
 		zephir_check_call_status();
 	}
 
-	RETURN_MM();
+	return;
 }
 
 PHP_METHOD(Stub_UseTest, testUseNamespaceAlias)
 {
 	zend_class_entry *_0 = NULL;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
-	zval *this_ptr = getThis();
-
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Oo\\OoConstruct"), ZEND_FETCH_CLASS_AUTO);
 	}
@@ -113,6 +82,6 @@ PHP_METHOD(Stub_UseTest, testUseNamespaceAlias)
 		zephir_check_call_status();
 	}
 
-	RETURN_MM();
+	return;
 }
 
diff --git a/ext/stub/vars.zep.c b/ext/stub/vars.zep.c
index 39694c976e..cb2614c169 100644
--- a/ext/stub/vars.zep.c
+++ b/ext/stub/vars.zep.c
@@ -33,12 +33,10 @@ PHP_METHOD(Stub_Vars, testParam)
 {
 	zend_string *_4;
 	zend_ulong _3;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *config_param = NULL, k, v, _0, *_1, _2, _5$$3, _7$$4;
 	zval config;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&config);
 	ZVAL_UNDEF(&k);
@@ -50,14 +48,8 @@ PHP_METHOD(Stub_Vars, testParam)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(config)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &config_param);
-	ZEPHIR_OBS_COPY_OR_DUP(&config, config_param);
-
-
+	ZVAL_COPY(&config, config_param);
 	zephir_array_fetch_string(&_0, &config, SL("dir"), PH_NOISY | PH_READONLY, "stub/vars.zep", 8);
 	zephir_is_iterable(&_0, 0, "stub/vars.zep", 11);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
@@ -71,7 +63,7 @@ PHP_METHOD(Stub_Vars, testParam)
 			}
 			ZEPHIR_INIT_NVAR(&v);
 			ZVAL_COPY(&v, _1);
-			ZEPHIR_CALL_FUNCTION(&_5$$3, "realpath", &_6, 69, &v);
+			ZEPHIR_CALL_FUNCTION(&_5$$3, "realpath", &_6, 70, &v);
 			zephir_check_call_status();
 			zephir_array_update_multi(&config, &_5$$3, SL("sz"), 3, SL("dir"), &k);
 		} ZEND_HASH_FOREACH_END();
@@ -88,7 +80,7 @@ PHP_METHOD(Stub_Vars, testParam)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&v, &_0, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_FUNCTION(&_7$$4, "realpath", &_6, 69, &v);
+				ZEPHIR_CALL_FUNCTION(&_7$$4, "realpath", &_6, 70, &v);
 				zephir_check_call_status();
 				zephir_array_update_multi(&config, &_7$$4, SL("sz"), 3, SL("dir"), &k);
 			ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0);
@@ -102,24 +94,17 @@ PHP_METHOD(Stub_Vars, testParam)
 
 PHP_METHOD(Stub_Vars, testVarDump)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, a, ar, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&ar);
 	ZVAL_UNDEF(&_0);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "hello");
-	ZEPHIR_INIT_VAR(&ar);
+	ZVAL_NULL(&ar);
 	zephir_create_array(&ar, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&ar, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -128,39 +113,27 @@ PHP_METHOD(Stub_Vars, testVarDump)
 	zephir_array_fast_append(&ar, &__$false);
 	zephir_var_dump(&ar);
 	zephir_var_dump(&a);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testVarDump2)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *ret, ret_sub, _0;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret_sub);
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(ret)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &ret);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_BOOL(&_0, ZEPHIR_IS_LONG(ret, 1));
 	zephir_var_dump(&_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testVarExport)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, a, ar, ret, _0, _1, _2;
-	zval *this_ptr = getThis();
 
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
@@ -169,28 +142,23 @@ PHP_METHOD(Stub_Vars, testVarExport)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
-	ZEPHIR_INIT_VAR(&a);
+	ZVAL_NULL(&a);
 	ZVAL_STRING(&a, "hello");
-	ZEPHIR_INIT_VAR(&ar);
+	ZVAL_NULL(&ar);
 	zephir_create_array(&ar, 3, 0);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&ar, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "world");
 	zephir_array_fast_append(&ar, &_0);
 	zephir_array_fast_append(&ar, &__$false);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_CPY_WRT(&_1, &ar);
 	zephir_var_export(&_1);
-	ZEPHIR_INIT_VAR(&ret);
+	ZVAL_NULL(&ret);
 	zephir_var_export_ex(&ret, &ar);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZEPHIR_CPY_WRT(&_2, &a);
 	zephir_var_export(&_2);
 	ZEPHIR_INIT_NVAR(&ret);
@@ -200,10 +168,8 @@ PHP_METHOD(Stub_Vars, testVarExport)
 
 PHP_METHOD(Stub_Vars, test88Issue)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param1_param = NULL, *param2_param = NULL, _0, _1, _2, _3;
 	zval param1, param2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1);
 	ZVAL_UNDEF(&param2);
@@ -217,10 +183,6 @@ PHP_METHOD(Stub_Vars, test88Issue)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(param2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &param1_param, &param2_param);
 	if (UNEXPECTED(Z_TYPE_P(param1_param) != IS_STRING && Z_TYPE_P(param1_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param1' must be of the type string"));
@@ -229,36 +191,31 @@ PHP_METHOD(Stub_Vars, test88Issue)
 	if (EXPECTED(Z_TYPE_P(param1_param) == IS_STRING)) {
 		zephir_get_strval(&param1, param1_param);
 	} else {
-		ZEPHIR_INIT_VAR(&param1);
+		ZVAL_NULL(&param1);
 	}
 	if (!param2_param) {
-		ZEPHIR_INIT_VAR(&param2);
+		ZVAL_NULL(&param2);
 	} else {
 		zephir_get_strval(&param2, param2_param);
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CPY_WRT(&_0, &param1);
 	zephir_var_dump(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_CPY_WRT(&_1, &param2);
 	zephir_var_dump(&_1);
-	ZEPHIR_INIT_VAR(&_2);
+	ZVAL_NULL(&_2);
 	ZEPHIR_CPY_WRT(&_2, &param1);
 	zephir_var_export(&_2);
-	ZEPHIR_INIT_VAR(&_3);
+	ZVAL_NULL(&_3);
 	ZEPHIR_CPY_WRT(&_3, &param2);
 	zephir_var_export(&_3);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param1_param = NULL, *param2_param = NULL, _0;
 	zval param1, param2;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&param1);
 	ZVAL_UNDEF(&param2);
@@ -268,10 +225,6 @@ PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(param2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &param1_param, &param2_param);
 	if (UNEXPECTED(Z_TYPE_P(param1_param) != IS_STRING && Z_TYPE_P(param1_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param1' must be of the type string"));
@@ -280,26 +233,22 @@ PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 	if (EXPECTED(Z_TYPE_P(param1_param) == IS_STRING)) {
 		zephir_get_strval(&param1, param1_param);
 	} else {
-		ZEPHIR_INIT_VAR(&param1);
+		ZVAL_NULL(&param1);
 	}
 	if (!param2_param) {
-		ZEPHIR_INIT_VAR(&param2);
+		ZVAL_NULL(&param2);
 		ZVAL_STRING(&param2, "test string");
 	} else {
 		zephir_get_strval(&param2, param2_param);
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CPY_WRT(&_0, &param2);
 	zephir_var_export(&_0);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testVarDump2param)
 {
 	zval *p1, p1_sub, *p2, p2_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&p1_sub);
 	ZVAL_UNDEF(&p2_sub);
@@ -307,11 +256,7 @@ PHP_METHOD(Stub_Vars, testVarDump2param)
 		Z_PARAM_ZVAL(p1)
 		Z_PARAM_ZVAL(p2)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(2, 0, &p1, &p2);
-
-
 	zephir_var_dump(p1);
 	zephir_var_dump(p2);
 }
@@ -319,7 +264,6 @@ PHP_METHOD(Stub_Vars, testVarDump2param)
 PHP_METHOD(Stub_Vars, testVarDump3param)
 {
 	zval *p1, p1_sub, *p2, p2_sub, *p3, p3_sub;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&p1_sub);
 	ZVAL_UNDEF(&p2_sub);
@@ -329,11 +273,7 @@ PHP_METHOD(Stub_Vars, testVarDump3param)
 		Z_PARAM_ZVAL(p2)
 		Z_PARAM_ZVAL(p3)
 	ZEND_PARSE_PARAMETERS_END();
-
-
 	zephir_fetch_params_without_memory_grow(3, 0, &p1, &p2, &p3);
-
-
 	zephir_var_dump(p1);
 	zephir_var_dump(p2);
 	zephir_var_dump(p3);
@@ -341,9 +281,7 @@ PHP_METHOD(Stub_Vars, testVarDump3param)
 
 PHP_METHOD(Stub_Vars, testCountOptimizerVarDumpAndExport)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *testVar, testVar_sub, _0, _1;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&testVar_sub);
 	ZVAL_UNDEF(&_0);
@@ -351,30 +289,21 @@ PHP_METHOD(Stub_Vars, testCountOptimizerVarDumpAndExport)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(testVar)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &testVar);
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, zephir_fast_count_int(testVar));
 	zephir_var_dump(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_LONG(&_1, zephir_fast_count_int(testVar));
 	zephir_var_export(&_1);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testArrayTypeVarDumpAndExport)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *testVar_param = NULL, _0, _1;
 	zval testVar;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&testVar);
 	ZVAL_UNDEF(&_0);
@@ -383,26 +312,19 @@ PHP_METHOD(Stub_Vars, testArrayTypeVarDumpAndExport)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(testVar)
 	ZEND_PARSE_PARAMETERS_END();
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &testVar_param);
 	if (!testVar_param) {
-		ZEPHIR_INIT_VAR(&testVar);
+		ZVAL_NULL(&testVar);
 		array_init(&testVar);
 	} else {
 		zephir_get_arrval(&testVar, testVar_param);
 	}
-
-
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_CPY_WRT(&_0, &testVar);
 	zephir_var_dump(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_CPY_WRT(&_1, &testVar);
 	zephir_var_export(&_1);
-	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -412,91 +334,62 @@ PHP_METHOD(Stub_Vars, testIntVarDump)
 {
 	zval _0, _1;
 	zend_long a = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_var_dump(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_LONG(&_1, a);
 	zephir_var_export(&_1);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testDoubleVarDump)
 {
 	zval _0, _1;
 	double a = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = (double) (1);
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_DOUBLE(&_0, a);
 	zephir_var_dump(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_DOUBLE(&_1, a);
 	zephir_var_export(&_1);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testBoolVarDump)
 {
 	zval _0, _1;
 	zend_bool a = 0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-
-
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
-	ZEPHIR_INIT_VAR(&_0);
+	ZVAL_NULL(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_var_dump(&_0);
-	ZEPHIR_INIT_VAR(&_1);
+	ZVAL_NULL(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_BOOL(&_1, a);
 	zephir_var_export(&_1);
-	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testGetDefinedVars)
 {
 	double pi;
 	zend_long a;
-	zval *this_ptr = getThis();
-
-
-
-
 	a = 1;
-	pi = 3.14;
+	pi =  (3.14);
 	zephir_get_defined_vars(return_value);
 	return;
 }

From 0b31e356e13ecccb127144520483d3439407db03 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 17 Dec 2023 22:37:29 +0000
Subject: [PATCH 321/375] Partial revert of refactored code

---
 src/Operators/Arithmetical/DivOperator.php | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 1b77c4185f..1b6a408c85 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -271,15 +271,25 @@ public function compile($expression, CompilationContext $compilationContext)
 
                                     case 'variable':
                                         $compilationContext->headersManager->add('kernel/operators');
-                                        return new CompiledExpression(
-                                            'double',
-                                            'zephir_safe_div_long_zval('
-                                            . $variableLeft->getName()
-                                            . ', '
-                                            . $this->getIsLocal($variableRight)
-                                            . $variableRight->getName() . ')',
-                                            $expression
-                                        );
+                                        if ($variableRight->isLocalOnly()) {
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
+                                                ) . ', &' . $variableRight->getName() . ')',
+                                                $expression
+                                            );
+                                        } else {
+                                            $variableRightCode = $compilationContext->backend->getVariableCode(
+                                                $variableRight
+                                            );
+
+                                            return new CompiledExpression(
+                                                'double',
+                                                'zephir_safe_div_long_zval(' . $variableLeft->getName(
+                                                ) . ', ' . $variableRightCode . ')',
+                                                $expression
+                                            );
+                                        }
 
                                     default:
                                         throw new CompilerException(

From 0d92241a1fb4314af4db03cf62a2750a459716d8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Fri, 22 Dec 2023 22:19:27 +0000
Subject: [PATCH 322/375] Revert "Remove memory management logic"

---
 kernel/exception.c                            |   5 +
 kernel/exception.h                            |   4 +
 kernel/fcall.h                                |   4 +
 kernel/main.h                                 |  21 +-
 kernel/memory.c                               | 226 ++++++++++++++++++
 kernel/memory.h                               |  65 ++++-
 kernel/operators.h                            |   2 +-
 src/Backend/Backend.php                       |   9 +-
 src/Class/Method/Method.php                   |  51 +++-
 src/Operators/Other/CloneOperator.php         |   2 +-
 .../CreateSymbolTableOptimizer.php            |   2 +
 src/Optimizers/FunctionCall/ExitOptimizer.php |   2 +
 src/Statements/ReturnStatement.php            |   2 +-
 src/Statements/ThrowStatement.php             |   1 +
 src/Variable/Variable.php                     |  10 +-
 15 files changed, 379 insertions(+), 27 deletions(-)

diff --git a/kernel/exception.c b/kernel/exception.c
index 46b1ca7c82..404162af8d 100644
--- a/kernel/exception.c
+++ b/kernel/exception.c
@@ -31,12 +31,16 @@
 void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 {
 	zend_class_entry *default_exception_ce;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	int ZEPHIR_LAST_CALL_STATUS = 0;
 	zval curline;
 	zval object_copy;
 
 	ZVAL_UNDEF(&curline);
 
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	if (Z_TYPE_P(object) != IS_OBJECT) {
 		ZVAL_COPY_VALUE(&object_copy, object);
 		object_init_ex(object, zend_exception_get_default());
@@ -59,6 +63,7 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 	if (ZEPHIR_LAST_CALL_STATUS != FAILURE) {
 		zend_throw_exception_object(object);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
diff --git a/kernel/exception.h b/kernel/exception.h
index c13f7498cb..5ae19973ad 100644
--- a/kernel/exception.h
+++ b/kernel/exception.h
@@ -19,21 +19,25 @@
 #define ZEPHIR_THROW_EXCEPTION_STR(class_entry, message) \
 	do { \
 		zephir_throw_exception_string(class_entry, message, strlen(message)); \
+		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_STR(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_string_debug(class_entry, message, strlen(message), file, line); \
+    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_ZVAL(class_entry, message) \
 	do { \
 		zephir_throw_exception_zval(class_entry, message); \
+		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_ZVAL(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_zval(class_entry, message, file, line); \
+    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 
diff --git a/kernel/fcall.h b/kernel/fcall.h
index 4e879d2674..4754bf4626 100644
--- a/kernel/fcall.h
+++ b/kernel/fcall.h
@@ -394,6 +394,7 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 #define zephir_check_call_status() \
 	do { \
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
+			ZEPHIR_MM_RESTORE(); \
 			return; \
 		} \
 	} while(0)
@@ -403,6 +404,9 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
 			if (EG(exception)) { \
 				goto label; \
+			} else { \
+				ZEPHIR_MM_RESTORE(); \
+				return; \
 			} \
 		} \
 	} while (0)
diff --git a/kernel/main.h b/kernel/main.h
index a191372de5..99194e3c92 100644
--- a/kernel/main.h
+++ b/kernel/main.h
@@ -112,6 +112,7 @@ extern zend_string* i_self;
 #define RETURN_CTOR(var)        \
 	do {                        \
 		RETVAL_ZVAL(var, 1, 0); \
+		ZEPHIR_MM_RESTORE();    \
 		return;                 \
 	} while (0)
 
@@ -126,6 +127,7 @@ extern zend_string* i_self;
 #define RETURN_CCTOR(v)            \
 	do {                           \
 		ZVAL_DUP(return_value, v); \
+		ZEPHIR_MM_RESTORE();       \
 		return;                    \
 	} while (0)
 
@@ -144,6 +146,7 @@ extern zend_string* i_self;
 #define RETURN_THIS() { \
 		RETVAL_ZVAL(getThis(), 1, 0); \
 	} \
+	ZEPHIR_MM_RESTORE(); \
 	return;
 
 #define RETURN_LCTORW(var) RETURN_CCTORW(var);
@@ -157,25 +160,28 @@ extern zend_string* i_self;
 	zephir_return_property(return_value, object, SL(member_name)); \
 	return;
 
+/** Return without change return_value */
+#define RETURN_MM()                 { ZEPHIR_MM_RESTORE(); return; }
+
 /** Return null restoring memory frame */
-#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); return; }
+#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); ZEPHIR_MM_RESTORE(); return; }
 
 /** Return string restoring memory frame */
-#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); return; }
-#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); return; }
+#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); ZEPHIR_MM_RESTORE(); return; }
 
 /* Return long */
-#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); return; }
+#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); ZEPHIR_MM_RESTORE(); return; }
 
 /* Return double */
-#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); return; }
+#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); ZEPHIR_MM_RESTORE(); return; }
 
 /**
  * Returns a zval in an object member
  */
 #define RETURN_MM_MEMBER(object, member_name) \
   zephir_return_property(return_value, object, SL(member_name)); \
-  return;
+  RETURN_MM();
 
 #define RETURN_ON_FAILURE(what) \
 	do { \
@@ -192,7 +198,7 @@ extern zend_string* i_self;
 	} while (0)
 
 /** Return null restoring memory frame */
-#define RETURN_MM_NULL()            { RETVAL_NULL(); return; }
+#define RETURN_MM_NULL()            { RETVAL_NULL(); ZEPHIR_MM_RESTORE(); return; }
 
 /* Globals functions */
 int zephir_get_global(zval *arr, const char *global, unsigned int global_length);
@@ -238,6 +244,7 @@ int zephir_is_iterable_ex(zval *arr, int duplicate);
 #define zephir_is_iterable(var, duplicate, file, line) \
 	if (!zephir_is_iterable_ex(var, duplicate)) { \
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(zend_exception_get_default(), "The argument is not initialized or iterable()", file, line); \
+		ZEPHIR_MM_RESTORE(); \
 		return; \
 	}
 
diff --git a/kernel/memory.c b/kernel/memory.c
index 964f9b91f7..68c76a15a1 100644
--- a/kernel/memory.c
+++ b/kernel/memory.c
@@ -36,6 +36,152 @@
  * Not all methods must grow/restore the zephir_memory_entry.
  */
 
+static zend_always_inline zend_execute_data* find_symbol_table(zend_execute_data* ex)
+{
+ while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->common.type))) {
+	 ex = ex->prev_execute_data;
+ }
+
+ return ex;
+}
+
+/**
+* Adds a memory frame in the current executed method
+*/
+void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func)
+{
+if (g->active_memory == NULL) {
+	zephir_memory_entry *active_memory;
+
+	active_memory = (zephir_memory_entry *) pecalloc(1, sizeof(zephir_memory_entry), 0);
+
+	active_memory->addresses = pecalloc(24, sizeof(zval*), 0);
+	active_memory->capacity  = 24;
+
+	g->active_memory = active_memory;
+}
+
+assert(g->active_memory != NULL);
+assert(g->active_memory->pointer == 0);
+
+#ifndef ZEPHIR_RELEASE
+g->active_memory->func = func;
+#endif
+}
+
+void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func)
+{
+size_t i;
+zephir_memory_entry *active_memory;
+zephir_symbol_table *active_symbol_table;
+zval *ptr;
+#ifndef ZEPHIR_RELEASE
+int show_backtrace = 0;
+#endif
+
+#ifndef ZEPHIR_RELEASE
+if (UNEXPECTED(g->active_memory == NULL)) {
+	fprintf(stderr, "WARNING: calling zephir_memory_restore_stack() without an active memory frame!\n");
+	fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
+	fprintf(stderr, "Calling function: %s\n", func);
+	zephir_print_backtrace();
+	return;
+}
+
+if (UNEXPECTED(g->active_memory->func != func)) {
+	fprintf(stderr, "Trying to free someone else's memory frame!\n");
+	fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
+	fprintf(stderr, "Calling function: %s\n", func);
+	zephir_print_backtrace();
+	return;
+}
+#endif
+
+active_memory = g->active_memory;
+assert(active_memory != NULL);
+
+if (EXPECTED(!CG(unclean_shutdown))) {
+	/* Clean active symbol table */
+	if (g->active_symbol_table) {
+		active_symbol_table = g->active_symbol_table;
+		while (active_symbol_table && active_symbol_table->scope == active_memory) {
+			zend_execute_data *ex = find_symbol_table(EG(current_execute_data));
+#ifndef ZEPHIR_RELEASE
+			if (UNEXPECTED(!ex)) {
+				fprintf(stderr, "ERROR: unable to find a symbol table");
+				zephir_print_backtrace();
+				return;
+			}
+#endif
+			zend_hash_destroy(ex->symbol_table);
+			efree(ex->symbol_table);
+			ex->symbol_table = active_symbol_table->symbol_table;
+			zend_attach_symbol_table(ex);
+			zend_rebuild_symbol_table();
+
+			g->active_symbol_table = active_symbol_table->prev;
+			efree(active_symbol_table);
+			active_symbol_table = g->active_symbol_table;
+		}
+	}
+
+#ifndef ZEPHIR_RELEASE
+	for (i = 0; i < active_memory->pointer; ++i) {
+		if (active_memory->addresses[i] != NULL) {
+			zval *var = active_memory->addresses[i];
+			if (Z_TYPE_P(var) > IS_CALLABLE) {
+				fprintf(stderr, "%s: observed variable #%d (%p) has invalid type %u [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
+				show_backtrace = 1;
+			}
+
+			if (!Z_REFCOUNTED_P(var)) {
+				continue;
+			}
+
+			if (Z_REFCOUNT_P(var) == 0) {
+				fprintf(stderr, "%s: observed variable #%d (%p) has 0 references, type=%d [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
+				show_backtrace = 1;
+			}
+			else if (Z_REFCOUNT_P(var) >= 1000000) {
+				fprintf(stderr, "%s: observed variable #%d (%p) has too many references (%u), type=%d  [%s]\n", __func__, (int)i, var, Z_REFCOUNT_P(var), Z_TYPE_P(var), active_memory->func);
+				show_backtrace = 1;
+			}
+		}
+	}
+#endif
+
+	/* Traverse all zvals allocated, reduce the reference counting or free them */
+	for (i = 0; i < active_memory->pointer; ++i) {
+		ptr = active_memory->addresses[i];
+		if (EXPECTED(ptr != NULL)) {
+			if (!Z_REFCOUNTED_P(ptr)) continue;
+			if (Z_REFCOUNT_P(ptr) == 1) {
+				zval_ptr_dtor(ptr);
+			} else {
+				Z_DELREF_P(ptr);
+			}
+		}
+	}
+}
+
+#ifndef ZEPHIR_RELEASE
+active_memory->func = NULL;
+#endif
+
+if (active_memory->addresses != NULL) {
+	pefree(active_memory->addresses, 0);
+}
+
+pefree(g->active_memory, 0);
+g->active_memory = NULL;
+
+#ifndef ZEPHIR_RELEASE
+if (show_backtrace == 1) {
+	zephir_print_backtrace();
+}
+#endif
+}
+
 /**
  * Pre-allocates memory for further use in execution
  */
@@ -66,6 +212,47 @@ void zephir_deinitialize_memory()
 	zephir_globals_ptr->initialized = 0;
 }
 
+/**
+ * Creates a virtual symbol tables dynamically
+ */
+void zephir_create_symbol_table(zephir_method_globals *gptr)
+{
+	zephir_symbol_table *entry;
+	zend_array *symbol_table;
+
+#ifndef ZEPHIR_RELEASE
+	if (!gptr->active_memory) {
+		fprintf(stderr, "ERROR: Trying to create a virtual symbol table without a memory frame");
+		zephir_print_backtrace();
+		return;
+	}
+#endif
+
+	zend_execute_data* ex = find_symbol_table(EG(current_execute_data));
+#ifndef ZEPHIR_RELEASE
+    if (UNEXPECTED(!ex)) {
+        fprintf(stderr, "ERROR: unable to find a symbol table");
+        zephir_print_backtrace();
+        return;
+    }
+#endif
+
+	zend_rebuild_symbol_table();
+	zend_detach_symbol_table(ex);
+
+	entry               = (zephir_symbol_table*)emalloc(sizeof(zephir_symbol_table));
+	entry->scope        = gptr->active_memory;
+	entry->symbol_table = ex->symbol_table;
+	entry->prev         = gptr->active_symbol_table;
+
+	symbol_table = (zend_array*)emalloc(sizeof(zend_array));
+	zend_hash_init(symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_real_init(symbol_table, 0);
+
+	ex->symbol_table          = symbol_table;
+	gptr->active_symbol_table = entry;
+}
+
 /**
  * Exports symbols to the active symbol table
  */
@@ -86,3 +273,42 @@ int zephir_set_symbol(zval *key_name, zval *value)
 
 	return SUCCESS;
 }
+
+void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g)
+{
+	zephir_memory_entry *frame = g->active_memory;
+#ifndef ZEPHIR_RELEASE
+	if (UNEXPECTED(frame == NULL)) {
+		fprintf(stderr, "ZEPHIR_MM_GROW() must be called before using any of MM functions or macros!");
+		zephir_print_backtrace();
+		abort();
+	}
+#endif
+
+	if (UNEXPECTED(frame->pointer == frame->capacity)) {
+		void *buf = perealloc(frame->addresses, sizeof(zval *) * (frame->capacity + 16), 0);
+		if (EXPECTED(buf != NULL)) {
+			frame->capacity += 16;
+			frame->addresses = buf;
+		} else {
+			zend_error(E_CORE_ERROR, "Memory allocation failed");
+			return;
+		}
+	}
+
+#ifndef ZEPHIR_RELEASE
+	{
+		size_t i;
+		for (i = 0; i < frame->pointer; ++i) {
+			if (frame->addresses[i] == var) {
+				fprintf(stderr, "Variable %p is already observed", var);
+				zephir_print_backtrace();
+				abort();
+			}
+		}
+	}
+#endif
+
+	frame->addresses[frame->pointer] = var;
+	++frame->pointer;
+}
diff --git a/kernel/memory.h b/kernel/memory.h
index 800ccafb31..7da4ec47e2 100644
--- a/kernel/memory.h
+++ b/kernel/memory.h
@@ -17,13 +17,64 @@
 #include "php_ext.h"
 #include "kernel/globals.h"
 
+/** Memory frame */
+typedef struct _zephir_memory_entry {
+	size_t pointer;
+	size_t capacity;
+	zval **addresses;
+#ifndef ZEPHIR_RELEASE
+	int permanent;
+	const char *func;
+#endif
+} zephir_memory_entry;
+
+/** Virtual Symbol Table */
+typedef struct _zephir_symbol_table {
+	struct _zephir_memory_entry *scope;
+	zend_array *symbol_table;
+	struct _zephir_symbol_table *prev;
+} zephir_symbol_table;
+
+typedef struct _zephir_method_globals {
+	/* Memory */
+	zephir_memory_entry *active_memory; /**< The current memory frame */
+
+	/* Virtual Symbol Tables */
+	zephir_symbol_table *active_symbol_table;
+} zephir_method_globals;
+
+/* Memory Frames */
+void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func);
+void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
+
+#define ZEPHIR_MM_RESTORE() \
+	zephir_memory_restore_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); \
+	pefree(ZEPHIR_METHOD_GLOBALS_PTR, 0); \
+	ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
+
+void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
+#define zephir_memory_observe(var) zephir_do_memory_observe(var, ZEPHIR_METHOD_GLOBALS_PTR);
+
+#define zephir_safe_zval_ptr_dtor(pzval)
+
+void zephir_create_symbol_table(zephir_method_globals *g);
+
+#define ZEPHIR_CREATE_SYMBOL_TABLE() zephir_create_symbol_table(ZEPHIR_METHOD_GLOBALS_PTR);
+
 int zephir_set_symbol(zval *key_name, zval *value);
 
+#define ZEPHIR_INIT_VAR(z) \
+	zephir_memory_observe(z); \
+	ZVAL_NULL(z);
+
 #define ZEPHIR_INIT_NVAR(z) \
 	do { \
-		if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
+		if (Z_TYPE_P(z) == IS_UNDEF) { \
+			zephir_memory_observe(z); \
+		} else if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
 			if (Z_REFCOUNT_P(z) > 1) { \
 				Z_DELREF_P(z); \
 			} else { \
@@ -39,6 +90,8 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
 			zval_ptr_dtor(d); \
 		} \
+	} else { \
+		zephir_memory_observe(d); \
 	} \
 	ZVAL_COPY_VALUE(d, v);
 
@@ -50,6 +103,12 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	} \
 	ZVAL_DUP(d, v);
 
+#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
+	if (Z_TYPE_P(z) == IS_UNDEF) { \
+		zephir_memory_observe(z); \
+	} \
+	ZVAL_COPY(z, v);
+
 #define ZEPHIR_HASH_COPY(z, v) \
 	if (Z_TYPE_P(z) == IS_ARRAY && Z_TYPE_P(v) == IS_ARRAY) { \
 		zend_hash_copy(Z_ARRVAL_P(z), Z_ARRVAL_P(v), (copy_ctor_func_t) zval_add_ref); \
@@ -63,6 +122,8 @@ int zephir_set_symbol(zval *key_name, zval *value);
 			zval_ptr_dtor(z); \
 			ZVAL_NULL(z); \
 		} \
+	} else { \
+		zephir_memory_observe(z); \
 	}
 
 /* TODO: this might causes troubles, since we cannot observe here, since we aren't using double pointers
@@ -74,6 +135,8 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (tmp_ != NULL) { \
 			if (Z_TYPE_P(tmp_) != IS_UNDEF) { \
 				zval_ptr_dtor(tmp_); \
+			} else { \
+				zephir_memory_observe(tmp_); \
 			} \
 			ZVAL_NULL(tmp_); \
 		} \
diff --git a/kernel/operators.h b/kernel/operators.h
index 7659b62c8b..44351f897a 100644
--- a/kernel/operators.h
+++ b/kernel/operators.h
@@ -229,7 +229,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 		if (Z_TYPE_P(right) == IS_STRING) { \
 			ZEPHIR_CPY_WRT(left, right); \
 		} else if (Z_TYPE_P(right) == IS_NULL) { \
-		    ZVAL_NULL(left); \
+		    ZEPHIR_INIT_VAR(left); \
 		} else { \
 			use_copy_right = zephir_make_printable_zval(right, &right_tmp); \
 			if (use_copy_right) { \
diff --git a/src/Backend/Backend.php b/src/Backend/Backend.php
index f5536b1d46..d7f09bc5c5 100644
--- a/src/Backend/Backend.php
+++ b/src/Backend/Backend.php
@@ -653,7 +653,7 @@ public function assignZval(Variable $variable, $code, CompilationContext $contex
         if (!$variable->isDoublePointer()) {
             $context->symbolTable->mustGrownStack(true);
             $symbolVariable = $this->getVariableCode($variable);
-            $context->codePrinter->output('ZVAL_COPY(' . $symbolVariable . ', ' . $code . ');');
+            $context->codePrinter->output('ZEPHIR_OBS_COPY_OR_DUP(' . $symbolVariable . ', ' . $code . ');');
         } else {
             $context->codePrinter->output($variable->getName() . ' = ' . $code . ';');
         }
@@ -1540,6 +1540,11 @@ public function getTypeDefinition($type): array
                 $code    = 'zephir_fcall_cache_entry';
                 break;
 
+            case 'zephir_method_globals':
+                $pointer = '*';
+                $code = 'zephir_method_globals';
+                break;
+
             default:
                 throw new CompilerException('Unsupported type in declare: ' . $type);
         }
@@ -1673,7 +1678,7 @@ public function initVar(
         bool $useCodePrinter = true,
         bool $second = false
     ): string {
-        $macro = !$second ? 'ZVAL_NULL' : 'ZEPHIR_INIT_NVAR';
+        $macro = !$second ? 'ZEPHIR_INIT_VAR' : 'ZEPHIR_INIT_NVAR';
         $code  = $macro . '(' . $this->getVariableCode($variable) . ');';
         if ($useCodePrinter) {
             $context->codePrinter->output($code);
diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index d80353b7d2..ec5c839175 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -34,6 +34,7 @@
 use Zephir\StatementsBlock;
 use Zephir\SymbolTable;
 
+use Zephir\Variable\Variable;
 use function array_diff;
 use function array_key_exists;
 use function array_keys;
@@ -1232,6 +1233,26 @@ public function compile(CompilationContext $compilationContext): void
             }
         }
 
+        /**
+         * Grow the stack if needed
+         */
+        if ($symbolTable->getMustGrownStack()) {
+            $compilationContext->headersManager->add('kernel/memory');
+            if (!$compilationContext->symbolTable->hasVariable('ZEPHIR_METHOD_GLOBALS_PTR')) {
+                $methodGlobals = new Variable('zephir_method_globals', 'ZEPHIR_METHOD_GLOBALS_PTR', $compilationContext->branchManager->getCurrentBranch());
+                $methodGlobals->setMustInitNull(true);
+                $methodGlobals->increaseUses();
+                $methodGlobals->setReusable(false);
+                $methodGlobals->setReadOnly(true);
+                $methodGlobals->setUsed(true);
+                $compilationContext->symbolTable->addRawVariable($methodGlobals);
+            }
+
+            // #define ZEPHIR_MM_GROW()
+            $codePrinter->preOutput("\t".'zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);');
+            $codePrinter->preOutput("\t".'ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);');
+        }
+
         /**
          * Check if there are unused variables.
          */
@@ -1393,20 +1414,25 @@ public function compile(CompilationContext $compilationContext): void
              */
             $lastType = $this->statements->getLastStatementType();
 
-            /**
-             * If a method has return-type hints we need to ensure the last
-             * statement is a 'return' statement
-             */
-            if (
-                'return' !== $lastType &&
+            if ('return' !== $lastType &&
                 'throw' !== $lastType &&
-                !$this->hasChildReturnStatementType($statement) &&
-                $this->hasReturnTypes()
+                !$this->hasChildReturnStatementType($statement)
             ) {
-                throw new CompilerException(
-                    'Reached end of the method without returning a valid type specified in the return-type hints',
-                    $this->expression['return-type']
-                );
+                if ($symbolTable->getMustGrownStack()) {
+                    $compilationContext->headersManager->add('kernel/memory');
+                    $codePrinter->output("\t".'ZEPHIR_MM_RESTORE();');
+                }
+
+                /**
+                 * If a method has return-type hints we need to ensure the last
+                 * statement is a 'return' statement
+                 */
+                if ($this->hasReturnTypes()) {
+                    throw new CompilerException(
+                        'Reached end of the method without returning a valid type specified in the return-type hints',
+                        $this->expression['return-type']
+                    );
+                }
             }
         }
 
@@ -2143,6 +2169,7 @@ public function removeMemoryStackReferences(SymbolTable $symbolTable, string $co
         $containerCode = str_replace('RETURN_MM_EMPTY_STRING', 'RETURN_MM_EMPTY_STRING', $containerCode);
         $containerCode = str_replace('RETURN_MM_EMPTY_ARRAY', 'RETURN_EMPTY_ARRAY', $containerCode);
         $containerCode = str_replace('RETURN_MM_MEMBER', 'RETURN_MEMBER', $containerCode);
+        $containerCode = str_replace('RETURN_MM()', 'return', $containerCode);
 
         return preg_replace('/[ \t]+ZEPHIR_MM_RESTORE\(\);' . PHP_EOL . '/s', '', $containerCode);
     }
diff --git a/src/Operators/Other/CloneOperator.php b/src/Operators/Other/CloneOperator.php
index 774be84c36..47d149e360 100644
--- a/src/Operators/Other/CloneOperator.php
+++ b/src/Operators/Other/CloneOperator.php
@@ -83,7 +83,7 @@ public function compile(array $expression, CompilationContext $compilationContex
         $compilationContext->codePrinter->output(
             'if (zephir_clone(' . $symbol . ', ' . $clonedSymbol . ') == FAILURE) {'
         );
-        $compilationContext->codePrinter->output("\t" . 'return;');
+        $compilationContext->codePrinter->output("\t" . 'RETURN_MM();');
         $compilationContext->codePrinter->output('}');
 
         return new CompiledExpression('variable', $symbolVariable->getName(), $expression);
diff --git a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
index 5d53e22df0..1bdef8af97 100644
--- a/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
+++ b/src/Optimizers/FunctionCall/CreateSymbolTableOptimizer.php
@@ -58,6 +58,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         // TODO: Still needed?
         $context->symbolTable->mustGrownStack(true);
+        $context->codePrinter->output('ZEPHIR_CREATE_SYMBOL_TABLE();');
+        $context->codePrinter->output('');
 
         return new CompiledExpression('null', null, $expression);
     }
diff --git a/src/Optimizers/FunctionCall/ExitOptimizer.php b/src/Optimizers/FunctionCall/ExitOptimizer.php
index 6651e0be7c..8396872898 100644
--- a/src/Optimizers/FunctionCall/ExitOptimizer.php
+++ b/src/Optimizers/FunctionCall/ExitOptimizer.php
@@ -46,9 +46,11 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
             // TODO: protect resolvedParams[0] from restore
         }
         if (!isset($expression['parameters'])) {
+            // $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
             $context->codePrinter->output('zephir_exit_empty();');
         } else {
             $resolvedParams = $call->getReadOnlyResolvedParams($expression['parameters'], $context, $expression);
+            // $context->codePrinter->output('ZEPHIR_MM_RESTORE();');
             $context->codePrinter->output('zephir_exit(' . $resolvedParams[0] . ');');
         }
 
diff --git a/src/Statements/ReturnStatement.php b/src/Statements/ReturnStatement.php
index 16ec625205..90898c1249 100644
--- a/src/Statements/ReturnStatement.php
+++ b/src/Statements/ReturnStatement.php
@@ -32,7 +32,7 @@ final class ReturnStatement extends StatementAbstract
 {
     use VariablesTrait;
 
-    private const RETURN_RETURN = 'return;';
+    private const RETURN_RETURN = 'RETURN_MM();';
 
     /**
      * @param CompilationContext $compilationContext
diff --git a/src/Statements/ThrowStatement.php b/src/Statements/ThrowStatement.php
index 86186c7a44..7da50b81c1 100644
--- a/src/Statements/ThrowStatement.php
+++ b/src/Statements/ThrowStatement.php
@@ -129,6 +129,7 @@ public function compile(CompilationContext $compilationContext): void
         );
 
         if (!$compilationContext->insideTryCatch) {
+            $codePrinter->output('ZEPHIR_MM_RESTORE();');
             $codePrinter->output('return;');
         } else {
             $codePrinter->output('goto try_end_' . $compilationContext->currentTryCatch . ';');
diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index f5960c7de3..ecdebbfec9 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -427,6 +427,8 @@ public function initComplexLiteralVariant(CompilationContext $compilationContext
                 if ($this->variantInits > 0 || $compilationContext->insideCycle) {
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&' . $this->getName() . ');');
+                } else {
+                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&'.$this->getName().');');
                 }
             }
 
@@ -458,7 +460,7 @@ public function initVariant(CompilationContext $compilationContext): void
         }
 
         /**
-         * Variables are allocated for the first time using ZVAL_NULL
+         * Variables are allocated for the first time using ZEPHIR_INIT_VAR
          * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
          * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
          */
@@ -490,6 +492,8 @@ public function initVariant(CompilationContext $compilationContext): void
                 if ($this->variantInits > 0 || $compilationContext->insideCycle) {
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&' . $this->getName() . ');');
+                } else {
+                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&'.$this->getName().');');
                 }
             }
 
@@ -794,6 +798,8 @@ public function observeVariant(CompilationContext $compilationContext): void
             if ($this->variantInits > 0 || $compilationContext->insideCycle) {
                 $this->mustInitNull = true;
                 $compilationContext->codePrinter->output('ZEPHIR_OBS_NVAR(' . $symbol . ');');
+            } else {
+                $compilationContext->codePrinter->output('zephir_memory_observe('.$symbol.');');
             }
 
             ++$this->variantInits;
@@ -1073,7 +1079,7 @@ public function trackVariant(CompilationContext $compilationContext): void
         }
 
         /**
-         * Variables are allocated for the first time using ZVAL_NULL
+         * Variables are allocated for the first time using ZEPHIR_INIT_VAR
          * the second, third, etc. times are allocated using ZEPHIR_INIT_NVAR
          * Variables initialized for the first time in a cycle are always initialized using ZEPHIR_INIT_NVAR
          */

From a10666741efa4ec476950c151f578411b3912427 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 12:50:19 +0000
Subject: [PATCH 323/375] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8c8eeb2b2..06ff17c4a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ The format based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
+### Added
+- Added support of PHP `8.3` [#2407](https://github.com/zephir-lang/zephir/issues/2407)
+- Added support of multiple return types in stubs
+
+### Changed
+- Changed minimal PHP version to `8.0` [#2407](https://github.com/zephir-lang/zephir/issues/2407)
 
 ## [0.17.0] - 2023-02-11
 ### Added

From 5ca070cab9f05bbeb5c9ff697a6d058d23d6dd0a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 12:50:52 +0000
Subject: [PATCH 324/375] Change stubs build to support multi return types

---
 src/Stubs/Generator.php | 60 +++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/src/Stubs/Generator.php b/src/Stubs/Generator.php
index 3512442e4b..9265fee031 100644
--- a/src/Stubs/Generator.php
+++ b/src/Stubs/Generator.php
@@ -299,47 +299,43 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
         }
 
         $return = '';
+        $returnTypes = [];
         if ($method->hasReturnTypes()) {
-            $supported = 0;
-
-            if (array_key_exists('object', $method->getReturnTypes())) {
-                $return = key($method->getReturnClassTypes());
-                ++$supported;
-            }
+            if (array_key_exists('variable', $method->getReturnTypes())) {
+                $returnTypes[] = 'mixed';
+            } else {
+                if (array_key_exists('object', $method->getReturnTypes())) {
+                    $returnTypes[] = key($method->getReturnClassTypes());
+                }
 
-            if ($method->areReturnTypesIntCompatible()) {
-                $return = 'int';
-                ++$supported;
-            }
+                if ($method->areReturnTypesIntCompatible()) {
+                    $returnTypes[] = 'int';
+                }
 
-            if ($method->areReturnTypesDoubleCompatible()) {
-                $return = 'float';
-                ++$supported;
-            }
+                if ($method->areReturnTypesDoubleCompatible()) {
+                    $returnTypes[] = 'float';
+                }
 
-            if ($method->areReturnTypesBoolCompatible()) {
-                $return = 'bool';
-                ++$supported;
-            }
+                if ($method->areReturnTypesFalseCompatible()) {
+                    $returnTypes[] = 'false';
+                } elseif ($method->areReturnTypesBoolCompatible()) {
+                    $returnTypes[] = 'bool';
+                }
 
-            if ($method->areReturnTypesStringCompatible()) {
-                $return = 'string';
-                ++$supported;
-            }
+                if ($method->areReturnTypesStringCompatible()) {
+                    $returnTypes[] = 'string';
+                }
 
-            if (array_key_exists('array', $method->getReturnTypes())) {
-                $return = 'array';
-                ++$supported;
-            }
+                if (array_key_exists('array', $method->getReturnTypes())) {
+                    $returnTypes[] = 'array';
+                }
 
-            if (!empty($return) && $method->areReturnTypesNullCompatible()) {
-                $return = '?' . $return;
+                if ($method->areReturnTypesNullCompatible()) {
+                    $returnTypes[] = 'null';
+                }
             }
 
-            // PHP doesn't support multiple return types (yet?)
-            if ($supported > 1 || array_key_exists('variable', $method->getReturnTypes())) {
-                $return = '';
-            }
+            $return = join('|', $returnTypes);
         } elseif ($method->isVoid()) {
             $return = 'void';
         }

From 401119b19f5aa14a08bc4b9d72813dd096806835 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 12:51:19 +0000
Subject: [PATCH 325/375] Bump version to `0.18.0`

---
 src/Zephir.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Zephir.php b/src/Zephir.php
index 6967197c08..0399ebe4a1 100644
--- a/src/Zephir.php
+++ b/src/Zephir.php
@@ -25,5 +25,5 @@ final class Zephir
 
 
 ASCII;
-    public const VERSION = '0.17.0-$Id$';
+    public const VERSION = '0.18.0-$Id$';
 }

From 4158d5f04ca010b3d1554bc7109741ef9c6f01f6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 12:52:12 +0000
Subject: [PATCH 326/375] Regenerate ext/ directory

---
 ext/kernel/exception.c                        |   5 +
 ext/kernel/exception.h                        |   4 +
 ext/kernel/fcall.h                            |   4 +
 ext/kernel/main.h                             |  21 +-
 ext/kernel/memory.c                           | 226 +++++++
 ext/kernel/memory.h                           |  65 +-
 ext/kernel/operators.h                        |   2 +-
 ext/php_stub.h                                |   2 +-
 ext/stub/13__closure.zep.c                    |   7 +-
 ext/stub/arithmetic.zep.c                     |  92 ++-
 ext/stub/arrayaccessarr.zep.c                 |  12 +-
 ext/stub/arrayaccessobj.zep.c                 |  29 +-
 ext/stub/arrayaccesstest.zep.c                | 110 +++-
 ext/stub/arrayiterator.zep.c                  |  14 +-
 ext/stub/arrayiteratortest.zep.c              |  10 +-
 ext/stub/arraymanipulation.zep.c              |  18 +-
 ext/stub/arraysearch.zep.c                    |  13 +-
 ext/stub/assign.zep.c                         | 464 +++++++++-----
 ext/stub/bench/foo.zep.c                      |  64 ++
 ext/stub/bitwise.zep.c                        |  50 +-
 ext/stub/builtin/arraymethods.zep.c           |  24 +-
 ext/stub/builtin/charmethods.zep.c            |  13 +-
 ext/stub/builtin/intmethods.zep.c             |  34 +
 ext/stub/builtin/stringmethods.zep.c          | 132 +++-
 ext/stub/cast.zep.c                           | 277 ++++++--
 ext/stub/closures.zep.c                       |  25 +-
 ext/stub/compare.zep.c                        |   5 +-
 ext/stub/concat.zep.c                         |  49 +-
 ext/stub/constants.zep.c                      |  18 +-
 ext/stub/constructors/issue1803.zep.c         |   7 +-
 ext/stub/declaretest.zep.c                    |  28 +-
 ext/stub/emptytest.zep.c                      |  29 +-
 ext/stub/evaltest.zep.c                       |   5 +-
 ext/stub/exception.zep.c                      |   6 +-
 ext/stub/exceptions.zep.c                     |  81 ++-
 ext/stub/factorial.zep.c                      |   5 +-
 ext/stub/fannkuch.zep.c                       |  12 +-
 ext/stub/fasta.zep.c                          |  33 +-
 ext/stub/fcall.zep.c                          | 121 +++-
 ext/stub/fetchtest.zep.c                      |  36 ++
 ext/stub/fibonnaci.zep.c                      |  26 +-
 ext/stub/flow.zep.c                           | 221 +++++--
 ext/stub/flow/switchflow.zep.c                |  13 +-
 ext/stub/fortytwo.zep.c                       |  11 +-
 ext/stub/functional.zep.c                     |   8 +-
 ext/stub/functionexists.zep.c                 |  13 +-
 ext/stub/functions.zep.c                      |  12 +-
 ext/stub/geometry.zep.c                       |   8 +
 ext/stub/globals.zep.c                        |   8 +
 ext/stub/globals/env.zep.c                    |   5 +-
 ext/stub/globals/post.zep.c                   |   3 +
 ext/stub/globals/server.zep.c                 |   5 +
 ext/stub/globals/serverrequestfactory.zep.c   |  30 +-
 ext/stub/globals/session/base.zep.c           |  25 +-
 ext/stub/globals/session/child.zep.c          |   7 +-
 ext/stub/instance.zep.c                       |  15 +-
 ext/stub/instanceoff.zep.c                    |  32 +-
 ext/stub/interfaces/implementinterface.zep.c  |   5 +-
 ext/stub/internalclasses.zep.c                |   7 +-
 ext/stub/invoke.zep.c                         |  15 +-
 ext/stub/invokes/abstractinvoker.zep.c        |   7 +-
 ext/stub/invokes/abstractinvokercomplex.zep.c |   7 +-
 ext/stub/invokes/abstractprotected.zep.c      |  34 +-
 ext/stub/invokes/invokeprotected.zep.c        |   4 +
 ext/stub/invokes/invokeprotectedcomplex.zep.c |   4 +
 ext/stub/issettest.zep.c                      |  18 +-
 ext/stub/issue1134.zep.c                      |  11 +-
 ext/stub/issue1521.zep.c                      |   6 +-
 ext/stub/issue2165/issue.zep.c                |  64 +-
 ext/stub/issue663.zep.c                       |  11 +-
 ext/stub/issue887.zep.c                       |  12 +-
 ext/stub/issue914.zep.c                       |   6 +
 ext/stub/issues.zep.c                         |   5 +-
 ext/stub/json.zep.c                           |  52 +-
 ext/stub/mcall.zep.c                          | 173 +++--
 ext/stub/mcall/caller.zep.c                   |   5 +-
 ext/stub/mcallchained.zep.c                   |  24 +-
 ext/stub/mcalldynamic.zep.c                   |  19 +-
 ext/stub/mcallinternal.zep.c                  |  34 +-
 ext/stub/methodabstract.zep.c                 |   6 +
 ext/stub/methodargs.zep.c                     |  12 +-
 ext/stub/nativearray.zep.c                    | 590 +++++++++++++-----
 ext/stub/oo.zep.c                             |  84 ++-
 ext/stub/oo/concretestatic.zep.c              |  13 +-
 ext/stub/oo/deprecatedmethods.zep.c           |   7 +-
 ext/stub/oo/dynamicprop.zep.c                 | 102 ++-
 ext/stub/oo/extendpdoclass.zep.c              |  14 +-
 ext/stub/oo/oodestruct.zep.c                  |  67 +-
 ext/stub/oo/oodynamica.zep.c                  |  22 +-
 ext/stub/oo/oonativeimplements.zep.c          |   6 +
 ext/stub/oo/ooparams.zep.c                    |  46 +-
 ext/stub/oo/propertyaccess.zep.c              |  15 +-
 ext/stub/oo/scopes/abstractclass.zep.c        |   3 +
 ext/stub/oo/scopes/abstractclassmagic.zep.c   |   8 +
 ext/stub/oo/scopes/hasprivatemethod.zep.c     |   7 +-
 ext/stub/oo/scopes/privatescopetester.zep.c   |  27 +-
 ext/stub/openssl.zep.c                        |  24 +-
 ext/stub/operator.zep.c                       |  17 +-
 ext/stub/optimizers/acos.zep.c                |  30 +-
 ext/stub/optimizers/arraymerge.zep.c          |   5 +-
 ext/stub/optimizers/asin.zep.c                |  30 +-
 ext/stub/optimizers/isscalar.zep.c            |  12 +-
 ext/stub/optimizers/strreplace.zep.c          |  50 +-
 ext/stub/pregmatch.zep.c                      |  97 ++-
 ext/stub/properties/app.zep.c                 |   5 +
 .../properties/extendspublicproperties.zep.c  |  20 +-
 ext/stub/properties/getobjectvars.zep.c       |   7 +-
 ext/stub/properties/propertyarray.zep.c       |  31 +-
 ext/stub/properties/propertyupdate.zep.c      |   7 +-
 ext/stub/properties/protectedproperties.zep.c |   9 +-
 ext/stub/properties/publicproperties.zep.c    |  23 +-
 .../properties/staticprivateproperties.zep.c  |   5 +
 ext/stub/properties/staticpropertyarray.zep.c |   9 +-
 .../staticprotectedproperties.zep.c           |   5 +
 .../properties/staticpublicproperties.zep.c   |  14 +-
 ext/stub/quantum.zep.c                        |  19 +-
 ext/stub/range.zep.c                          |   8 +
 ext/stub/reflection.zep.c                     |  14 +-
 ext/stub/regexdna.zep.c                       |  24 +-
 ext/stub/requires.zep.c                       |  24 +-
 ext/stub/requires/external3.zep.c             |   4 +
 ext/stub/resourcetest.zep.c                   |  39 +-
 ext/stub/returns.zep.c                        |   3 +
 ext/stub/router.zep.c                         | 123 +++-
 ext/stub/router/route.zep.c                   |  81 ++-
 ext/stub/scall.zep.c                          | 109 +++-
 ext/stub/scallexternal.zep.c                  |  11 +-
 ext/stub/scalllateconstruct.zep.c             |  10 +
 ext/stub/scallparent.zep.c                    |   7 +-
 ext/stub/scope.zep.c                          |  32 +-
 ext/stub/sort.zep.c                           |  14 +-
 ext/stub/spectralnorm.zep.c                   |  29 +-
 ext/stub/spl.zep.c                            |   5 +-
 ext/stub/spropertyaccess.zep.c                |  36 +-
 ext/stub/statements.zep.c                     |  31 +-
 ext/stub/strings.zep.c                        | 122 +++-
 ext/stub/stubs.zep.c                          |  11 +-
 ext/stub/ternary.zep.c                        |  56 +-
 ext/stub/trytest.zep.c                        | 107 ++--
 ext/stub/typeinstances.zep.c                  |  12 +
 ext/stub/typeoff.zep.c                        |  42 +-
 ext/stub/types/mixedtype.zep.c                |  30 +-
 ext/stub/unsettest.zep.c                      |  21 +-
 ext/stub/usetest.zep.c                        |  19 +-
 ext/stub/vars.zep.c                           | 109 +++-
 145 files changed, 4486 insertions(+), 1212 deletions(-)

diff --git a/ext/kernel/exception.c b/ext/kernel/exception.c
index 46b1ca7c82..404162af8d 100644
--- a/ext/kernel/exception.c
+++ b/ext/kernel/exception.c
@@ -31,12 +31,16 @@
 void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 {
 	zend_class_entry *default_exception_ce;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	int ZEPHIR_LAST_CALL_STATUS = 0;
 	zval curline;
 	zval object_copy;
 
 	ZVAL_UNDEF(&curline);
 
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	if (Z_TYPE_P(object) != IS_OBJECT) {
 		ZVAL_COPY_VALUE(&object_copy, object);
 		object_init_ex(object, zend_exception_get_default());
@@ -59,6 +63,7 @@ void zephir_throw_exception_debug(zval *object, const char *file, uint32_t line)
 	if (ZEPHIR_LAST_CALL_STATUS != FAILURE) {
 		zend_throw_exception_object(object);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
diff --git a/ext/kernel/exception.h b/ext/kernel/exception.h
index c13f7498cb..5ae19973ad 100644
--- a/ext/kernel/exception.h
+++ b/ext/kernel/exception.h
@@ -19,21 +19,25 @@
 #define ZEPHIR_THROW_EXCEPTION_STR(class_entry, message) \
 	do { \
 		zephir_throw_exception_string(class_entry, message, strlen(message)); \
+		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_STR(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_string_debug(class_entry, message, strlen(message), file, line); \
+    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_ZVAL(class_entry, message) \
 	do { \
 		zephir_throw_exception_zval(class_entry, message); \
+		ZEPHIR_MM_RESTORE(); \
 	} while (0)
 
 #define ZEPHIR_THROW_EXCEPTION_DEBUG_ZVAL(class_entry, message, file, line) \
   do { \
     zephir_throw_exception_zval(class_entry, message, file, line); \
+    ZEPHIR_MM_RESTORE(); \
   } while (0)
 
 
diff --git a/ext/kernel/fcall.h b/ext/kernel/fcall.h
index 4e879d2674..4754bf4626 100644
--- a/ext/kernel/fcall.h
+++ b/ext/kernel/fcall.h
@@ -394,6 +394,7 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 #define zephir_check_call_status() \
 	do { \
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
+			ZEPHIR_MM_RESTORE(); \
 			return; \
 		} \
 	} while(0)
@@ -403,6 +404,9 @@ ZEPHIR_ATTR_WARN_UNUSED_RESULT ZEPHIR_ATTR_NONNULL static inline int zephir_has_
 		if (ZEPHIR_LAST_CALL_STATUS == FAILURE) { \
 			if (EG(exception)) { \
 				goto label; \
+			} else { \
+				ZEPHIR_MM_RESTORE(); \
+				return; \
 			} \
 		} \
 	} while (0)
diff --git a/ext/kernel/main.h b/ext/kernel/main.h
index a191372de5..99194e3c92 100644
--- a/ext/kernel/main.h
+++ b/ext/kernel/main.h
@@ -112,6 +112,7 @@ extern zend_string* i_self;
 #define RETURN_CTOR(var)        \
 	do {                        \
 		RETVAL_ZVAL(var, 1, 0); \
+		ZEPHIR_MM_RESTORE();    \
 		return;                 \
 	} while (0)
 
@@ -126,6 +127,7 @@ extern zend_string* i_self;
 #define RETURN_CCTOR(v)            \
 	do {                           \
 		ZVAL_DUP(return_value, v); \
+		ZEPHIR_MM_RESTORE();       \
 		return;                    \
 	} while (0)
 
@@ -144,6 +146,7 @@ extern zend_string* i_self;
 #define RETURN_THIS() { \
 		RETVAL_ZVAL(getThis(), 1, 0); \
 	} \
+	ZEPHIR_MM_RESTORE(); \
 	return;
 
 #define RETURN_LCTORW(var) RETURN_CCTORW(var);
@@ -157,25 +160,28 @@ extern zend_string* i_self;
 	zephir_return_property(return_value, object, SL(member_name)); \
 	return;
 
+/** Return without change return_value */
+#define RETURN_MM()                 { ZEPHIR_MM_RESTORE(); return; }
+
 /** Return null restoring memory frame */
-#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); return; }
+#define RETURN_MM_BOOL(value)       { RETVAL_BOOL(value); ZEPHIR_MM_RESTORE(); return; }
 
 /** Return string restoring memory frame */
-#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); return; }
-#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); return; }
+#define RETURN_MM_STRING(str)       { RETVAL_STRING(str); ZEPHIR_MM_RESTORE(); return; }
+#define RETURN_MM_EMPTY_STRING()    { RETVAL_EMPTY_STRING(); ZEPHIR_MM_RESTORE(); return; }
 
 /* Return long */
-#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); return; }
+#define RETURN_MM_LONG(value)       { RETVAL_LONG(value); ZEPHIR_MM_RESTORE(); return; }
 
 /* Return double */
-#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); return; }
+#define RETURN_MM_DOUBLE(value)     { RETVAL_DOUBLE(value); ZEPHIR_MM_RESTORE(); return; }
 
 /**
  * Returns a zval in an object member
  */
 #define RETURN_MM_MEMBER(object, member_name) \
   zephir_return_property(return_value, object, SL(member_name)); \
-  return;
+  RETURN_MM();
 
 #define RETURN_ON_FAILURE(what) \
 	do { \
@@ -192,7 +198,7 @@ extern zend_string* i_self;
 	} while (0)
 
 /** Return null restoring memory frame */
-#define RETURN_MM_NULL()            { RETVAL_NULL(); return; }
+#define RETURN_MM_NULL()            { RETVAL_NULL(); ZEPHIR_MM_RESTORE(); return; }
 
 /* Globals functions */
 int zephir_get_global(zval *arr, const char *global, unsigned int global_length);
@@ -238,6 +244,7 @@ int zephir_is_iterable_ex(zval *arr, int duplicate);
 #define zephir_is_iterable(var, duplicate, file, line) \
 	if (!zephir_is_iterable_ex(var, duplicate)) { \
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STRW(zend_exception_get_default(), "The argument is not initialized or iterable()", file, line); \
+		ZEPHIR_MM_RESTORE(); \
 		return; \
 	}
 
diff --git a/ext/kernel/memory.c b/ext/kernel/memory.c
index 964f9b91f7..68c76a15a1 100644
--- a/ext/kernel/memory.c
+++ b/ext/kernel/memory.c
@@ -36,6 +36,152 @@
  * Not all methods must grow/restore the zephir_memory_entry.
  */
 
+static zend_always_inline zend_execute_data* find_symbol_table(zend_execute_data* ex)
+{
+ while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->common.type))) {
+	 ex = ex->prev_execute_data;
+ }
+
+ return ex;
+}
+
+/**
+* Adds a memory frame in the current executed method
+*/
+void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func)
+{
+if (g->active_memory == NULL) {
+	zephir_memory_entry *active_memory;
+
+	active_memory = (zephir_memory_entry *) pecalloc(1, sizeof(zephir_memory_entry), 0);
+
+	active_memory->addresses = pecalloc(24, sizeof(zval*), 0);
+	active_memory->capacity  = 24;
+
+	g->active_memory = active_memory;
+}
+
+assert(g->active_memory != NULL);
+assert(g->active_memory->pointer == 0);
+
+#ifndef ZEPHIR_RELEASE
+g->active_memory->func = func;
+#endif
+}
+
+void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func)
+{
+size_t i;
+zephir_memory_entry *active_memory;
+zephir_symbol_table *active_symbol_table;
+zval *ptr;
+#ifndef ZEPHIR_RELEASE
+int show_backtrace = 0;
+#endif
+
+#ifndef ZEPHIR_RELEASE
+if (UNEXPECTED(g->active_memory == NULL)) {
+	fprintf(stderr, "WARNING: calling zephir_memory_restore_stack() without an active memory frame!\n");
+	fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
+	fprintf(stderr, "Calling function: %s\n", func);
+	zephir_print_backtrace();
+	return;
+}
+
+if (UNEXPECTED(g->active_memory->func != func)) {
+	fprintf(stderr, "Trying to free someone else's memory frame!\n");
+	fprintf(stderr, "The frame was created by %s\n", g->active_memory->func);
+	fprintf(stderr, "Calling function: %s\n", func);
+	zephir_print_backtrace();
+	return;
+}
+#endif
+
+active_memory = g->active_memory;
+assert(active_memory != NULL);
+
+if (EXPECTED(!CG(unclean_shutdown))) {
+	/* Clean active symbol table */
+	if (g->active_symbol_table) {
+		active_symbol_table = g->active_symbol_table;
+		while (active_symbol_table && active_symbol_table->scope == active_memory) {
+			zend_execute_data *ex = find_symbol_table(EG(current_execute_data));
+#ifndef ZEPHIR_RELEASE
+			if (UNEXPECTED(!ex)) {
+				fprintf(stderr, "ERROR: unable to find a symbol table");
+				zephir_print_backtrace();
+				return;
+			}
+#endif
+			zend_hash_destroy(ex->symbol_table);
+			efree(ex->symbol_table);
+			ex->symbol_table = active_symbol_table->symbol_table;
+			zend_attach_symbol_table(ex);
+			zend_rebuild_symbol_table();
+
+			g->active_symbol_table = active_symbol_table->prev;
+			efree(active_symbol_table);
+			active_symbol_table = g->active_symbol_table;
+		}
+	}
+
+#ifndef ZEPHIR_RELEASE
+	for (i = 0; i < active_memory->pointer; ++i) {
+		if (active_memory->addresses[i] != NULL) {
+			zval *var = active_memory->addresses[i];
+			if (Z_TYPE_P(var) > IS_CALLABLE) {
+				fprintf(stderr, "%s: observed variable #%d (%p) has invalid type %u [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
+				show_backtrace = 1;
+			}
+
+			if (!Z_REFCOUNTED_P(var)) {
+				continue;
+			}
+
+			if (Z_REFCOUNT_P(var) == 0) {
+				fprintf(stderr, "%s: observed variable #%d (%p) has 0 references, type=%d [%s]\n", __func__, (int)i, var, Z_TYPE_P(var), active_memory->func);
+				show_backtrace = 1;
+			}
+			else if (Z_REFCOUNT_P(var) >= 1000000) {
+				fprintf(stderr, "%s: observed variable #%d (%p) has too many references (%u), type=%d  [%s]\n", __func__, (int)i, var, Z_REFCOUNT_P(var), Z_TYPE_P(var), active_memory->func);
+				show_backtrace = 1;
+			}
+		}
+	}
+#endif
+
+	/* Traverse all zvals allocated, reduce the reference counting or free them */
+	for (i = 0; i < active_memory->pointer; ++i) {
+		ptr = active_memory->addresses[i];
+		if (EXPECTED(ptr != NULL)) {
+			if (!Z_REFCOUNTED_P(ptr)) continue;
+			if (Z_REFCOUNT_P(ptr) == 1) {
+				zval_ptr_dtor(ptr);
+			} else {
+				Z_DELREF_P(ptr);
+			}
+		}
+	}
+}
+
+#ifndef ZEPHIR_RELEASE
+active_memory->func = NULL;
+#endif
+
+if (active_memory->addresses != NULL) {
+	pefree(active_memory->addresses, 0);
+}
+
+pefree(g->active_memory, 0);
+g->active_memory = NULL;
+
+#ifndef ZEPHIR_RELEASE
+if (show_backtrace == 1) {
+	zephir_print_backtrace();
+}
+#endif
+}
+
 /**
  * Pre-allocates memory for further use in execution
  */
@@ -66,6 +212,47 @@ void zephir_deinitialize_memory()
 	zephir_globals_ptr->initialized = 0;
 }
 
+/**
+ * Creates a virtual symbol tables dynamically
+ */
+void zephir_create_symbol_table(zephir_method_globals *gptr)
+{
+	zephir_symbol_table *entry;
+	zend_array *symbol_table;
+
+#ifndef ZEPHIR_RELEASE
+	if (!gptr->active_memory) {
+		fprintf(stderr, "ERROR: Trying to create a virtual symbol table without a memory frame");
+		zephir_print_backtrace();
+		return;
+	}
+#endif
+
+	zend_execute_data* ex = find_symbol_table(EG(current_execute_data));
+#ifndef ZEPHIR_RELEASE
+    if (UNEXPECTED(!ex)) {
+        fprintf(stderr, "ERROR: unable to find a symbol table");
+        zephir_print_backtrace();
+        return;
+    }
+#endif
+
+	zend_rebuild_symbol_table();
+	zend_detach_symbol_table(ex);
+
+	entry               = (zephir_symbol_table*)emalloc(sizeof(zephir_symbol_table));
+	entry->scope        = gptr->active_memory;
+	entry->symbol_table = ex->symbol_table;
+	entry->prev         = gptr->active_symbol_table;
+
+	symbol_table = (zend_array*)emalloc(sizeof(zend_array));
+	zend_hash_init(symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0);
+	zend_hash_real_init(symbol_table, 0);
+
+	ex->symbol_table          = symbol_table;
+	gptr->active_symbol_table = entry;
+}
+
 /**
  * Exports symbols to the active symbol table
  */
@@ -86,3 +273,42 @@ int zephir_set_symbol(zval *key_name, zval *value)
 
 	return SUCCESS;
 }
+
+void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g)
+{
+	zephir_memory_entry *frame = g->active_memory;
+#ifndef ZEPHIR_RELEASE
+	if (UNEXPECTED(frame == NULL)) {
+		fprintf(stderr, "ZEPHIR_MM_GROW() must be called before using any of MM functions or macros!");
+		zephir_print_backtrace();
+		abort();
+	}
+#endif
+
+	if (UNEXPECTED(frame->pointer == frame->capacity)) {
+		void *buf = perealloc(frame->addresses, sizeof(zval *) * (frame->capacity + 16), 0);
+		if (EXPECTED(buf != NULL)) {
+			frame->capacity += 16;
+			frame->addresses = buf;
+		} else {
+			zend_error(E_CORE_ERROR, "Memory allocation failed");
+			return;
+		}
+	}
+
+#ifndef ZEPHIR_RELEASE
+	{
+		size_t i;
+		for (i = 0; i < frame->pointer; ++i) {
+			if (frame->addresses[i] == var) {
+				fprintf(stderr, "Variable %p is already observed", var);
+				zephir_print_backtrace();
+				abort();
+			}
+		}
+	}
+#endif
+
+	frame->addresses[frame->pointer] = var;
+	++frame->pointer;
+}
diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
index 800ccafb31..7da4ec47e2 100644
--- a/ext/kernel/memory.h
+++ b/ext/kernel/memory.h
@@ -17,13 +17,64 @@
 #include "php_ext.h"
 #include "kernel/globals.h"
 
+/** Memory frame */
+typedef struct _zephir_memory_entry {
+	size_t pointer;
+	size_t capacity;
+	zval **addresses;
+#ifndef ZEPHIR_RELEASE
+	int permanent;
+	const char *func;
+#endif
+} zephir_memory_entry;
+
+/** Virtual Symbol Table */
+typedef struct _zephir_symbol_table {
+	struct _zephir_memory_entry *scope;
+	zend_array *symbol_table;
+	struct _zephir_symbol_table *prev;
+} zephir_symbol_table;
+
+typedef struct _zephir_method_globals {
+	/* Memory */
+	zephir_memory_entry *active_memory; /**< The current memory frame */
+
+	/* Virtual Symbol Tables */
+	zephir_symbol_table *active_symbol_table;
+} zephir_method_globals;
+
+/* Memory Frames */
+void ZEPHIR_FASTCALL zephir_memory_grow_stack(zephir_method_globals *g, const char *func);
+void ZEPHIR_FASTCALL zephir_memory_restore_stack(zephir_method_globals *g, const char *func);
+
+#define ZEPHIR_MM_RESTORE() \
+	zephir_memory_restore_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__); \
+	pefree(ZEPHIR_METHOD_GLOBALS_PTR, 0); \
+	ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+
 void zephir_initialize_memory(zend_zephir_globals_def *zephir_globals_ptr);
 void zephir_deinitialize_memory();
+
+void ZEPHIR_FASTCALL zephir_do_memory_observe(zval *var, const zephir_method_globals *g);
+#define zephir_memory_observe(var) zephir_do_memory_observe(var, ZEPHIR_METHOD_GLOBALS_PTR);
+
+#define zephir_safe_zval_ptr_dtor(pzval)
+
+void zephir_create_symbol_table(zephir_method_globals *g);
+
+#define ZEPHIR_CREATE_SYMBOL_TABLE() zephir_create_symbol_table(ZEPHIR_METHOD_GLOBALS_PTR);
+
 int zephir_set_symbol(zval *key_name, zval *value);
 
+#define ZEPHIR_INIT_VAR(z) \
+	zephir_memory_observe(z); \
+	ZVAL_NULL(z);
+
 #define ZEPHIR_INIT_NVAR(z) \
 	do { \
-		if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
+		if (Z_TYPE_P(z) == IS_UNDEF) { \
+			zephir_memory_observe(z); \
+		} else if (Z_REFCOUNTED_P(z) && !Z_ISREF_P(z)) { \
 			if (Z_REFCOUNT_P(z) > 1) { \
 				Z_DELREF_P(z); \
 			} else { \
@@ -39,6 +90,8 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (Z_REFCOUNTED_P(d) && Z_REFCOUNT_P(d) > 0) { \
 			zval_ptr_dtor(d); \
 		} \
+	} else { \
+		zephir_memory_observe(d); \
 	} \
 	ZVAL_COPY_VALUE(d, v);
 
@@ -50,6 +103,12 @@ int zephir_set_symbol(zval *key_name, zval *value);
 	} \
 	ZVAL_DUP(d, v);
 
+#define ZEPHIR_OBS_COPY_OR_DUP(z, v) \
+	if (Z_TYPE_P(z) == IS_UNDEF) { \
+		zephir_memory_observe(z); \
+	} \
+	ZVAL_COPY(z, v);
+
 #define ZEPHIR_HASH_COPY(z, v) \
 	if (Z_TYPE_P(z) == IS_ARRAY && Z_TYPE_P(v) == IS_ARRAY) { \
 		zend_hash_copy(Z_ARRVAL_P(z), Z_ARRVAL_P(v), (copy_ctor_func_t) zval_add_ref); \
@@ -63,6 +122,8 @@ int zephir_set_symbol(zval *key_name, zval *value);
 			zval_ptr_dtor(z); \
 			ZVAL_NULL(z); \
 		} \
+	} else { \
+		zephir_memory_observe(z); \
 	}
 
 /* TODO: this might causes troubles, since we cannot observe here, since we aren't using double pointers
@@ -74,6 +135,8 @@ int zephir_set_symbol(zval *key_name, zval *value);
 		if (tmp_ != NULL) { \
 			if (Z_TYPE_P(tmp_) != IS_UNDEF) { \
 				zval_ptr_dtor(tmp_); \
+			} else { \
+				zephir_memory_observe(tmp_); \
 			} \
 			ZVAL_NULL(tmp_); \
 		} \
diff --git a/ext/kernel/operators.h b/ext/kernel/operators.h
index 7659b62c8b..44351f897a 100644
--- a/ext/kernel/operators.h
+++ b/ext/kernel/operators.h
@@ -229,7 +229,7 @@ long zephir_safe_mod_double_zval(double op1, zval *op2);
 		if (Z_TYPE_P(right) == IS_STRING) { \
 			ZEPHIR_CPY_WRT(left, right); \
 		} else if (Z_TYPE_P(right) == IS_NULL) { \
-		    ZVAL_NULL(left); \
+		    ZEPHIR_INIT_VAR(left); \
 		} else { \
 			use_copy_right = zephir_make_printable_zval(right, &right_tmp); \
 			if (use_copy_right) { \
diff --git a/ext/php_stub.h b/ext/php_stub.h
index 1b24455ca5..c72a095d34 100644
--- a/ext/php_stub.h
+++ b/ext/php_stub.h
@@ -14,7 +14,7 @@
 #define PHP_STUB_VERSION     "1.0.0"
 #define PHP_STUB_EXTNAME     "stub"
 #define PHP_STUB_AUTHOR      "Phalcon Team and contributors"
-#define PHP_STUB_ZEPVERSION  "0.17.0-$Id$"
+#define PHP_STUB_ZEPVERSION  "0.18.0-$Id$"
 #define PHP_STUB_DESCRIPTION "Description <b>test</b> for<br/>Test Extension."
 
 typedef struct _zephir_struct_db { 
diff --git a/ext/stub/13__closure.zep.c b/ext/stub/13__closure.zep.c
index de95a2bb31..3903499e5e 100644
--- a/ext/stub/13__closure.zep.c
+++ b/ext/stub/13__closure.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(stub_13__closure)
@@ -25,9 +26,13 @@ ZEPHIR_INIT_CLASS(stub_13__closure)
 
 PHP_METHOD(stub_13__closure, __invoke)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_mcall_caller_ce, "perform", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/arithmetic.zep.c b/ext/stub/arithmetic.zep.c
index f14582d76c..c9567197d2 100644
--- a/ext/stub/arithmetic.zep.c
+++ b/ext/stub/arithmetic.zep.c
@@ -91,10 +91,14 @@ PHP_METHOD(Stub_Arithmetic, boolSumExpression)
 {
 	zval _0, _1;
 	zend_bool a = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
@@ -137,10 +141,14 @@ PHP_METHOD(Stub_Arithmetic, doubleSum2Simple)
 PHP_METHOD(Stub_Arithmetic, doubleSumExpression)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
 	zephir_check_call_status();
@@ -151,10 +159,14 @@ PHP_METHOD(Stub_Arithmetic, doubleSumVarExpression)
 {
 	zval _0, _1;
 	double a = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a =  (1.0);
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
@@ -234,15 +246,19 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCastSum)
 {
 	zend_long c = 0;
 	zval a, b, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "2");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_add_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -252,9 +268,13 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sum)
 {
 	zend_long b = 0, c = 0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b + zephir_get_numberval(&a));
@@ -285,9 +305,13 @@ PHP_METHOD(Stub_Arithmetic, complex3Sum)
 PHP_METHOD(Stub_Arithmetic, complex4Sum)
 {
 	zval c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_DOUBLE(&c, (1.0 + 1));
 	RETURN_CCTOR(&c);
 }
@@ -696,9 +720,13 @@ PHP_METHOD(Stub_Arithmetic, addSum22)
 {
 	zend_long b = 0, _0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_DOUBLE(&a, 0.0);
 	b = 1;
 	ZEPHIR_INIT_NVAR(&a);
@@ -717,6 +745,7 @@ PHP_METHOD(Stub_Arithmetic, addSum23)
 
 PHP_METHOD(Stub_Arithmetic, addSum24)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
 
 	ZVAL_UNDEF(&a_sub);
@@ -724,13 +753,15 @@ PHP_METHOD(Stub_Arithmetic, addSum24)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1024);
 	ZEPHIR_ADD_ASSIGN(a, &_0);
 	RETVAL_ZVAL(a, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Arithmetic, intSub)
@@ -910,15 +941,19 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCastSub)
 {
 	zend_long c = 0;
 	zval a, b, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "2");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_sub_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -928,9 +963,13 @@ PHP_METHOD(Stub_Arithmetic, intVarImplicitCast2Sub)
 {
 	zend_long b = 0, c = 0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b - zephir_get_numberval(&a));
@@ -961,9 +1000,13 @@ PHP_METHOD(Stub_Arithmetic, complex3Sub)
 PHP_METHOD(Stub_Arithmetic, complex4Sub)
 {
 	zval c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_DOUBLE(&c, (1.0 - 1));
 	RETURN_CCTOR(&c);
 }
@@ -1372,9 +1415,13 @@ PHP_METHOD(Stub_Arithmetic, sub22)
 {
 	zend_long b = 0, _0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_DOUBLE(&a, 0.0);
 	b = 1;
 	ZEPHIR_INIT_NVAR(&a);
@@ -1393,6 +1440,7 @@ PHP_METHOD(Stub_Arithmetic, sub23)
 
 PHP_METHOD(Stub_Arithmetic, sub24)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
 
 	ZVAL_UNDEF(&a_sub);
@@ -1400,13 +1448,15 @@ PHP_METHOD(Stub_Arithmetic, sub24)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1024);
 	ZEPHIR_SUB_ASSIGN(a, &_0);
 	RETVAL_ZVAL(a, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Arithmetic, mul1)
@@ -1419,6 +1469,7 @@ PHP_METHOD(Stub_Arithmetic, mul1)
 
 PHP_METHOD(Stub_Arithmetic, mul2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
 
 	ZVAL_UNDEF(&a_sub);
@@ -1426,13 +1477,15 @@ PHP_METHOD(Stub_Arithmetic, mul2)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 5);
 	ZEPHIR_MUL_ASSIGN(a, &_0);
 	RETVAL_ZVAL(a, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Arithmetic, mul3)
@@ -1557,6 +1610,7 @@ PHP_METHOD(Stub_Arithmetic, letStatementBoolMinus)
 
 PHP_METHOD(Stub_Arithmetic, letStatementVarMinus)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *b, b_sub, a;
 
 	ZVAL_UNDEF(&b_sub);
@@ -1564,6 +1618,8 @@ PHP_METHOD(Stub_Arithmetic, letStatementVarMinus)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b);
 	zephir_negate(b);
 	ZEPHIR_CPY_WRT(&a, b);
diff --git a/ext/stub/arrayaccessarr.zep.c b/ext/stub/arrayaccessarr.zep.c
index 2a1feca63d..319624f5fd 100644
--- a/ext/stub/arrayaccessarr.zep.c
+++ b/ext/stub/arrayaccessarr.zep.c
@@ -29,15 +29,20 @@ ZEPHIR_INIT_CLASS(Stub_ArrayAccessArr)
 PHP_METHOD(Stub_ArrayAccessArr, __construct)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
 	add_assoc_long_ex(&_0, SL("one"), 1);
 	add_assoc_long_ex(&_0, SL("two"), 2);
 	add_assoc_long_ex(&_0, SL("three"), 3);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessArr, offsetSet)
@@ -95,6 +100,7 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetUnset)
 
 PHP_METHOD(Stub_ArrayAccessArr, offsetGet)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, _0, _1, _2;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -106,8 +112,10 @@ PHP_METHOD(Stub_ArrayAccessArr, offsetGet)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_array_isset(&_1, offset)) {
 		zephir_read_property(&_2, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/stub/arrayaccessobj.zep.c b/ext/stub/arrayaccessobj.zep.c
index ded8703f63..7654f33755 100644
--- a/ext/stub/arrayaccessobj.zep.c
+++ b/ext/stub/arrayaccessobj.zep.c
@@ -30,13 +30,17 @@ ZEPHIR_INIT_CLASS(Stub_ArrayAccessObj)
 PHP_METHOD(Stub_ArrayAccessObj, __construct)
 {
 	zval obj, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&obj);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&obj);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&obj);
 	object_init(&obj);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "val1");
 	zephir_update_property_zval(&obj, ZEND_STRL("key1"), &_0);
@@ -47,10 +51,12 @@ PHP_METHOD(Stub_ArrayAccessObj, __construct)
 	ZVAL_STRING(&_0, "val3");
 	zephir_update_property_zval(&obj, ZEND_STRL("key3"), &_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &obj);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessObj, offsetSet)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, value_sub, obj;
 	zval *offset, *value;
 	zval *this_ptr = getThis();
@@ -62,16 +68,21 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetSet)
 		Z_PARAM_ZVAL(offset)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &offset, &value);
+	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	if (!(Z_TYPE_P(offset) == IS_NULL)) {
 		zephir_update_property_zval_zval(&obj, offset, value);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &obj);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, obj;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -81,7 +92,10 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
+	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	RETURN_MM_BOOL(zephir_isset_property_zval(&obj, offset));
 }
@@ -89,6 +103,7 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetExists)
 PHP_METHOD(Stub_ArrayAccessObj, offsetUnset)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, obj;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -99,17 +114,22 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetUnset)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
+	zephir_memory_observe(&obj);
 	zephir_read_property(&obj, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 	zephir_get_arrval(&_0, &obj);
 	ZEPHIR_CPY_WRT(&obj, &_0);
 	zephir_array_unset(&obj, offset, PH_SEPARATE);
 	zephir_convert_to_object(&obj);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &obj);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayAccessObj, offsetGet)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval offset_sub, _0, _1, _2;
 	zval *offset;
 	zval *this_ptr = getThis();
@@ -121,10 +141,13 @@ PHP_METHOD(Stub_ArrayAccessObj, offsetGet)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(offset)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &offset);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_isset_property_zval(&_1, offset)) {
+		zephir_memory_observe(&_2);
 		zephir_read_property(&_2, this_ptr, ZEND_STRL("test"), PH_NOISY_CC);
 		ZEPHIR_OBS_NVAR(&_0);
 		zephir_read_property_zval(&_0, &_2, offset, PH_NOISY_CC);
diff --git a/ext/stub/arrayaccesstest.zep.c b/ext/stub/arrayaccesstest.zep.c
index 04e0eb6b9c..6be1d339d7 100644
--- a/ext/stub/arrayaccesstest.zep.c
+++ b/ext/stub/arrayaccesstest.zep.c
@@ -36,10 +36,14 @@ ZEPHIR_INIT_CLASS(Stub_ArrayAccessTest)
 PHP_METHOD(Stub_ArrayAccessTest, exits)
 {
 	zval arr;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&arr);
-	ZVAL_NULL(&arr);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&arr);
 	object_init_ex(&arr, stub_arrayaccessarr_ce);
 	ZEPHIR_CALL_METHOD(NULL, &arr, "__construct", NULL, 3);
 	zephir_check_call_status();
@@ -49,11 +53,15 @@ PHP_METHOD(Stub_ArrayAccessTest, exits)
 PHP_METHOD(Stub_ArrayAccessTest, get)
 {
 	zval arr, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&arr);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&arr);
 	object_init_ex(&arr, stub_arrayaccessarr_ce);
 	ZEPHIR_CALL_METHOD(NULL, &arr, "__construct", NULL, 3);
 	zephir_check_call_status();
@@ -63,6 +71,7 @@ PHP_METHOD(Stub_ArrayAccessTest, get)
 
 PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval data;
 	zval *key_param = NULL, *data_param = NULL;
 	zval key;
@@ -73,6 +82,8 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 		Z_PARAM_STR(key)
 		Z_PARAM_ARRAY(data)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &key_param, &data_param);
 	if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string"));
@@ -81,7 +92,7 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 	if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) {
 		zephir_get_strval(&key, key_param);
 	} else {
-		ZVAL_NULL(&key);
+		ZEPHIR_INIT_VAR(&key);
 	}
 	zephir_get_arrval(&data, data_param);
 	zephir_array_unset(&data, &key, PH_SEPARATE);
@@ -90,6 +101,7 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromArray)
 
 PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval dataFromProperty;
 	zval *key_param = NULL, *dataFromProperty_param = NULL, _0;
 	zval key;
@@ -102,6 +114,8 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 		Z_PARAM_STR(key)
 		Z_PARAM_ARRAY(dataFromProperty)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &key_param, &dataFromProperty_param);
 	if (UNEXPECTED(Z_TYPE_P(key_param) != IS_STRING && Z_TYPE_P(key_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'key' must be of the type string"));
@@ -110,7 +124,7 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 	if (EXPECTED(Z_TYPE_P(key_param) == IS_STRING)) {
 		zephir_get_strval(&key, key_param);
 	} else {
-		ZVAL_NULL(&key);
+		ZEPHIR_INIT_VAR(&key);
 	}
 	zephir_get_arrval(&dataFromProperty, dataFromProperty_param);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("assigedFromMethod"), &dataFromProperty);
@@ -126,13 +140,18 @@ PHP_METHOD(Stub_ArrayAccessTest, unsetByKeyFromProperty)
 PHP_METHOD(Stub_ArrayAccessTest, issue645)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_0);
+	zephir_memory_observe(&_1);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("data"), PH_NOISY_CC);
 	RETURN_CCTOR(&_1);
 }
@@ -144,13 +163,17 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1155)
 {
 	zval s, _0;
 	zval arr;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&s);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&arr);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&arr);
 	zephir_create_array(&arr, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "0");
 	zephir_array_fast_append(&arr, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -159,7 +182,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1155)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "");
 	zephir_array_fast_append(&arr, &_0);
-	ZVAL_NULL(&s);
+	ZEPHIR_INIT_VAR(&s);
 	ZVAL_STRING(&s, "true");
 	RETURN_MM_BOOL(zephir_fast_in_array(&s, &arr));
 }
@@ -167,6 +190,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1155)
 PHP_METHOD(Stub_ArrayAccessTest, issue1094Test1)
 {
 	zend_bool isItemsNULL = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *items_param = NULL;
 	zval items;
 
@@ -176,9 +200,11 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
-		ZVAL_NULL(&items);
+		ZEPHIR_INIT_VAR(&items);
 	} else {
 		zephir_get_arrval(&items, items_param);
 	}
@@ -188,6 +214,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test1)
 PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 {
 	zend_bool isItemsNULL = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *items_param = NULL;
 	zval items;
 
@@ -197,9 +224,11 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
-		ZVAL_NULL(&items);
+		ZEPHIR_INIT_VAR(&items);
 	} else {
 		zephir_get_arrval(&items, items_param);
 	}
@@ -210,6 +239,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test2)
 PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
 {
 	zend_bool isItemsNULL = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *items_param = NULL;
 	zval items;
 
@@ -219,9 +249,11 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(items)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &items_param);
 	if (!items_param) {
-		ZVAL_NULL(&items);
+		ZEPHIR_INIT_VAR(&items);
 	} else {
 		zephir_get_arrval(&items, items_param);
 	}
@@ -234,6 +266,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1094Test3)
  */
 PHP_METHOD(Stub_ArrayAccessTest, issue1086Strict)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *params_param = NULL, _0;
 	zval params;
 
@@ -242,11 +275,14 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086Strict)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(params)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &params_param);
-	ZVAL_COPY(&params, params_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_OBS_COPY_OR_DUP(&params, params_param);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1234);
 	zephir_array_update_string(&params, SL("test2"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -256,13 +292,17 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithStr
 {
 	zval _0;
 	zval params;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&params);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&params);
 	array_init(&params);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 123);
 	zephir_array_update_string(&params, SL("test"), &_0, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_SELF(NULL, "issue1086strict", NULL, 0, &params);
@@ -275,6 +315,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithStr
  */
 PHP_METHOD(Stub_ArrayAccessTest, issue1086NotStrictParams)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *params_param = NULL, _0;
 	zval params;
 
@@ -283,11 +324,14 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086NotStrictParams)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(params)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &params_param);
 	zephir_get_arrval(&params, params_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1234);
 	zephir_array_update_string(&params, SL("test2"), &_0, PH_COPY | PH_SEPARATE);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -297,13 +341,17 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithout
 {
 	zval _0;
 	zval params;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&params);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&params);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&params);
 	array_init(&params);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 123);
 	zephir_array_update_string(&params, SL("test"), &_0, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CALL_SELF(NULL, "issue1086notstrictparams", NULL, 0, &params);
@@ -317,12 +365,16 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1086WontNullArrayAfterPassViaStaticWithout
 PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetKeyFromArrayInternalVariable)
 {
 	zval ret, unsetData;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&unsetData);
-	ZVAL_NULL(&ret);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
-	ZVAL_NULL(&unsetData);
+	ZEPHIR_INIT_VAR(&unsetData);
 	zephir_create_array(&unsetData, 2, 0);
 	add_assoc_stringl_ex(&unsetData, SL("key_a"), SL("marcin"));
 	add_assoc_stringl_ex(&unsetData, SL("key_b"), SL("paula"));
@@ -339,6 +391,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetStringKeyFromArrayProperty)
 {
 	zval _0, _1, _2, _3;
 	zval ret;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
@@ -346,7 +399,10 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetStringKeyFromArrayProperty)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-	ZVAL_NULL(&ret);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("unsetData"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_append(&ret, &_0, PH_SEPARATE, "stub/arrayaccesstest.zep", 168);
@@ -364,6 +420,7 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetLongKeyFromArrayProperty)
 {
 	zval _0, _1, _2, _3;
 	zval ret;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&ret);
@@ -371,7 +428,10 @@ PHP_METHOD(Stub_ArrayAccessTest, issue1259UnsetLongKeyFromArrayProperty)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-	ZVAL_NULL(&ret);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("unsetData"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_append(&ret, &_0, PH_SEPARATE, "stub/arrayaccesstest.zep", 179);
@@ -389,23 +449,27 @@ zend_object *zephir_init_properties_Stub_ArrayAccessTest(zend_class_entry *class
 {
 		zval _1$$3;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("unsetData"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			zephir_create_array(&_1$$3, 3, 0);
 			add_assoc_stringl_ex(&_1$$3, SL("key_a"), SL("marcin"));
 			add_assoc_stringl_ex(&_1$$3, SL("key_b"), SL("paula"));
 			add_index_stringl(&_1$$3, 3, SL("long value"));
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("unsetData"), &_1$$3);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/arrayiterator.zep.c b/ext/stub/arrayiterator.zep.c
index cf62813862..7fa60b0e36 100644
--- a/ext/stub/arrayiterator.zep.c
+++ b/ext/stub/arrayiterator.zep.c
@@ -31,14 +31,18 @@ PHP_METHOD(Stub_ArrayIterator, __construct)
 {
 	zval _1, _2;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "one");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -51,6 +55,7 @@ PHP_METHOD(Stub_ArrayIterator, __construct)
 	ZVAL_UNDEF(&_2);
 	ZVAL_LONG(&_2, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("position"), &_2);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ArrayIterator, rewind)
@@ -67,12 +72,17 @@ PHP_METHOD(Stub_ArrayIterator, rewind)
 PHP_METHOD(Stub_ArrayIterator, current)
 {
 	zval _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
+	zephir_memory_observe(&_2);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("position"), PH_NOISY_CC);
 	zephir_array_fetch(&_1, &_0, &_2, PH_NOISY | PH_READONLY, "stub/arrayiterator.zep", 25);
 	RETURN_CTOR(&_1);
diff --git a/ext/stub/arrayiteratortest.zep.c b/ext/stub/arrayiteratortest.zep.c
index 854b407c74..c4f7e9b1e8 100644
--- a/ext/stub/arrayiteratortest.zep.c
+++ b/ext/stub/arrayiteratortest.zep.c
@@ -30,13 +30,17 @@ PHP_METHOD(Stub_ArrayIteratorTest, test)
 	zend_string *_3;
 	zend_ulong _2;
 	zval arr, k, v, *_0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&arr);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&arr);
 	object_init_ex(&arr, stub_arrayiterator_ce);
 	ZEPHIR_CALL_METHOD(NULL, &arr, "__construct", NULL, 4);
 	zephir_check_call_status();
@@ -53,7 +57,7 @@ PHP_METHOD(Stub_ArrayIteratorTest, test)
 			ZEPHIR_INIT_NVAR(&v);
 			ZVAL_COPY(&v, _0);
 			ZEPHIR_CONCAT_VV(return_value, &k, &v);
-			return;
+			RETURN_MM();
 		} ZEND_HASH_FOREACH_END();
 	} else {
 		ZEPHIR_CALL_METHOD(NULL, &arr, "rewind", NULL, 0);
@@ -69,7 +73,7 @@ PHP_METHOD(Stub_ArrayIteratorTest, test)
 			ZEPHIR_CALL_METHOD(&v, &arr, "current", NULL, 0);
 			zephir_check_call_status();
 				ZEPHIR_CONCAT_VV(return_value, &k, &v);
-				return;
+				RETURN_MM();
 			ZEPHIR_CALL_METHOD(NULL, &arr, "next", NULL, 0);
 			zephir_check_call_status();
 		}
diff --git a/ext/stub/arraymanipulation.zep.c b/ext/stub/arraymanipulation.zep.c
index 026241969a..e51c841847 100644
--- a/ext/stub/arraymanipulation.zep.c
+++ b/ext/stub/arraymanipulation.zep.c
@@ -34,6 +34,7 @@ ZEPHIR_INIT_CLASS(Stub_ArrayManipulation)
 PHP_METHOD(Stub_ArrayManipulation, arrayFillMany)
 {
 	zval _0, _1, _2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
@@ -41,9 +42,12 @@ PHP_METHOD(Stub_ArrayManipulation, arrayFillMany)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 1000000);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "message");
 	ZEPHIR_CALL_FUNCTION(&_3, "array_fill", NULL, 5, &_0, &_1, &_2);
 	zephir_check_call_status();
@@ -58,11 +62,15 @@ PHP_METHOD(Stub_ArrayManipulation, issue774)
 {
 	zval _1;
 	zval obj, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&obj);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&obj);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&obj);
 	object_init(&obj);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
@@ -78,20 +86,24 @@ PHP_METHOD(Stub_ArrayManipulation, issue774)
 zend_object *zephir_init_properties_Stub_ArrayManipulation(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("arrayFillQueue"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("arrayFillQueue"), &_1$$3);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/arraysearch.zep.c b/ext/stub/arraysearch.zep.c
index 5973b3a09d..58ac3de266 100644
--- a/ext/stub/arraysearch.zep.c
+++ b/ext/stub/arraysearch.zep.c
@@ -29,6 +29,7 @@ ZEPHIR_INIT_CLASS(Stub_ArraySearch)
 /** @issue https://github.com/zephir-lang/zephir/issues/1609 */
 PHP_METHOD(Stub_ArraySearch, simpleSearch)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zend_bool strict;
 	zval haystack;
@@ -43,6 +44,8 @@ PHP_METHOD(Stub_ArraySearch, simpleSearch)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(strict)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 1, &needle, &haystack_param, &strict_param);
 	zephir_get_arrval(&haystack, haystack_param);
 	if (!strict_param) {
@@ -52,7 +55,7 @@ PHP_METHOD(Stub_ArraySearch, simpleSearch)
 	ZVAL_BOOL(&_0, (strict ? 1 : 0));
 	ZEPHIR_RETURN_CALL_FUNCTION("array_search", NULL, 6, needle, &haystack, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /** @issue https://github.com/zephir-lang/zephir/issues/1609 */
@@ -60,14 +63,18 @@ PHP_METHOD(Stub_ArraySearch, searchUsingArrayInsideZephir)
 {
 	zval _0, pos;
 	zval itoA64;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&itoA64);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&pos);
-	ZVAL_NULL(&itoA64);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&itoA64);
 	zephir_create_array(&itoA64, 9, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, ".");
 	zephir_array_fast_append(&itoA64, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/assign.zep.c b/ext/stub/assign.zep.c
index 2fd7e1dc7d..04e0b9fcc4 100644
--- a/ext/stub/assign.zep.c
+++ b/ext/stub/assign.zep.c
@@ -180,9 +180,13 @@ PHP_METHOD(Stub_Assign, testAssign19)
 PHP_METHOD(Stub_Assign, testAssign20)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
 	RETURN_CCTOR(&a);
 }
@@ -329,6 +333,7 @@ PHP_METHOD(Stub_Assign, testAssign37)
 {
 	zval _1, _4;
 	zval v, arr, _0, _2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&arr);
@@ -337,16 +342,19 @@ PHP_METHOD(Stub_Assign, testAssign37)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_4);
-	ZVAL_NULL(&v);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "abc");
-	ZVAL_NULL(&arr);
+	ZEPHIR_INIT_VAR(&arr);
 	array_init(&arr);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_stringl_ex(&_1, SL("b_key"), SL("b_val"));
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	array_init(&_2);
 	zephir_array_update_string(&_1, SL("b"), &_2, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&_0, SL("a"), &_1, PH_COPY | PH_SEPARATE);
@@ -357,12 +365,12 @@ PHP_METHOD(Stub_Assign, testAssign37)
 	ZEPHIR_INIT_NVAR(&_2);
 	ZVAL_LONG(&_2, 1);
 	zephir_array_update_string(&arr, SL("s"), &_2, PH_COPY | PH_SEPARATE);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "f");
 	zephir_array_update_multi(&arr, &_3, SL("sssss"), 10, SL("a"), SL("b"), SL("c"), SL("d"), SL("e"));
 	ZEPHIR_INIT_NVAR(&_1);
 	zephir_create_array(&_1, 1, 0);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	zephir_create_array(&_4, 1, 0);
 	add_index_long(&_4, 3, 4);
 	zephir_array_update_long(&_1, 2, &_4, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -376,6 +384,7 @@ PHP_METHOD(Stub_Assign, testAssign37)
 
 PHP_METHOD(Stub_Assign, testAssign38)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, arr, _0;
 
 	ZVAL_UNDEF(&index_sub);
@@ -384,10 +393,12 @@ PHP_METHOD(Stub_Assign, testAssign38)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&arr);
+	ZEPHIR_INIT_VAR(&arr);
 	array_init(&arr);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "val");
 	zephir_array_update_zval(&arr, index, &_0, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&arr);
@@ -396,19 +407,23 @@ PHP_METHOD(Stub_Assign, testAssign38)
 PHP_METHOD(Stub_Assign, testAssign39)
 {
 	zval a, b, c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_BOOL(&b, 0);
 	ZEPHIR_INIT_NVAR(&a);
 	ZVAL_LONG(&a, 10);
 	ZEPHIR_INIT_NVAR(&b);
 	ZVAL_STRING(&b, "140");
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	zephir_add_function(&c, &a, &b);
 	RETURN_CCTOR(&c);
 }
@@ -416,19 +431,23 @@ PHP_METHOD(Stub_Assign, testAssign39)
 PHP_METHOD(Stub_Assign, testAssign40)
 {
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	object_init(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	ZEPHIR_INIT_NVAR(&a);
 	ZVAL_STRING(&a, "123");
 	ZEPHIR_INIT_NVAR(&b);
 	ZVAL_LONG(&b, 7);
 	zephir_sub_function(return_value, &a, &b);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -495,6 +514,7 @@ PHP_METHOD(Stub_Assign, testAssign44)
 
 PHP_METHOD(Stub_Assign, testPropertyAssign1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -503,6 +523,9 @@ PHP_METHOD(Stub_Assign, testPropertyAssign1)
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
@@ -523,7 +546,7 @@ PHP_METHOD(Stub_Assign, testPropertyAssign1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 'A');
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "hello");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_1);
@@ -540,6 +563,7 @@ PHP_METHOD(Stub_Assign, testPropertyAssign2)
 	zend_bool d;
 	double b;
 	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, c, _0;
 	zval *this_ptr = getThis();
 
@@ -548,13 +572,16 @@ PHP_METHOD(Stub_Assign, testPropertyAssign2)
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&f);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	b =  (1.5);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_NULL(&c);
 	d = 0;
 	e = 'A';
-	ZVAL_NULL(&f);
+	ZEPHIR_INIT_VAR(&f);
 	array_init(&f);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, a);
@@ -591,14 +618,18 @@ PHP_METHOD(Stub_Assign, testPropertyIncr1)
 PHP_METHOD(Stub_Assign, testPropertyAddAssign1)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_ADD_ASSIGN(&_0, &_1)
@@ -609,14 +640,18 @@ PHP_METHOD(Stub_Assign, testPropertyAddAssign1)
 PHP_METHOD(Stub_Assign, testPropertyAddAssign2)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_ADD_ASSIGN(&_0, &_1)
@@ -657,14 +692,18 @@ PHP_METHOD(Stub_Assign, testPropertyDecr)
 PHP_METHOD(Stub_Assign, testPropertySubAssign1)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_SUB_ASSIGN(&_0, &_1)
@@ -675,14 +714,18 @@ PHP_METHOD(Stub_Assign, testPropertySubAssign1)
 PHP_METHOD(Stub_Assign, testPropertySubAssign2)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_SUB_ASSIGN(&_0, &_1)
@@ -693,14 +736,18 @@ PHP_METHOD(Stub_Assign, testPropertySubAssign2)
 PHP_METHOD(Stub_Assign, testPropertyMulAssign1)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 2);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_MUL_ASSIGN(&_0, &_1)
@@ -711,14 +758,18 @@ PHP_METHOD(Stub_Assign, testPropertyMulAssign1)
 PHP_METHOD(Stub_Assign, testPropertyMulAssign2)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 3);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("testVar"), PH_NOISY_CC);
 	ZEPHIR_MUL_ASSIGN(&_0, &_1)
@@ -729,10 +780,14 @@ PHP_METHOD(Stub_Assign, testPropertyMulAssign2)
 PHP_METHOD(Stub_Assign, testPropertyAssignStringConcat)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "test");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("testVar"), &_0);
@@ -743,6 +798,7 @@ PHP_METHOD(Stub_Assign, testPropertyAssignStringConcat)
 
 PHP_METHOD(Stub_Assign, testPropertyArray1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, _0, _1, _2;
 	zval *this_ptr = getThis();
 
@@ -752,7 +808,10 @@ PHP_METHOD(Stub_Assign, testPropertyArray1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
 	ZVAL_UNDEF(&_1);
@@ -776,10 +835,10 @@ PHP_METHOD(Stub_Assign, testPropertyArray1)
 	ZVAL_LONG(&_1, 'A');
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "hello");
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	array_init(&_2);
 	zephir_update_property_array_append(this_ptr, SL("myArray"), &_2);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -793,21 +852,25 @@ PHP_METHOD(Stub_Assign, testPropertyArray2)
 	zval c, _0, _1;
 	double b;
 	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&f);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	b =  (1.5);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_NULL(&c);
 	d = 0;
 	e = 'A';
-	ZVAL_NULL(&f);
+	ZEPHIR_INIT_VAR(&f);
 	array_init(&f);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
 	ZVAL_UNDEF(&_1);
@@ -829,6 +892,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray2)
 
 PHP_METHOD(Stub_Assign, testPropertyArray3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11;
 	zval *this_ptr = getThis();
 
@@ -847,36 +911,39 @@ PHP_METHOD(Stub_Assign, testPropertyArray3)
 	ZVAL_UNDEF(&_9);
 	ZVAL_UNDEF(&_10);
 	ZVAL_UNDEF(&_11);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 0);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_LONG(&_2, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_1, &_2);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_LONG(&_3, 0);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	ZVAL_DOUBLE(&_4, 1.5);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_3, &_4);
-	ZVAL_NULL(&_5);
+	ZEPHIR_INIT_VAR(&_5);
 	ZVAL_LONG(&_5, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_5, &__$null);
-	ZVAL_NULL(&_6);
+	ZEPHIR_INIT_VAR(&_6);
 	ZVAL_LONG(&_6, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_6, &__$false);
-	ZVAL_NULL(&_7);
+	ZEPHIR_INIT_VAR(&_7);
 	ZVAL_LONG(&_7, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_7, &__$true);
-	ZVAL_NULL(&_8);
+	ZEPHIR_INIT_VAR(&_8);
 	ZVAL_LONG(&_8, 0);
-	ZVAL_NULL(&_9);
+	ZEPHIR_INIT_VAR(&_9);
 	ZVAL_LONG(&_9, 'A');
 	zephir_update_property_array(this_ptr, SL("myArray"), &_8, &_9);
-	ZVAL_NULL(&_10);
+	ZEPHIR_INIT_VAR(&_10);
 	array_init(&_10);
-	ZVAL_NULL(&_11);
+	ZEPHIR_INIT_VAR(&_11);
 	ZVAL_LONG(&_11, 0);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_11, &_10);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -884,6 +951,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray3)
 
 PHP_METHOD(Stub_Assign, testPropertyArray4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2, _3, _4;
 	zval *this_ptr = getThis();
 
@@ -899,23 +967,25 @@ PHP_METHOD(Stub_Assign, testPropertyArray4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_DOUBLE(&_2, 1.5);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_2);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &__$null);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &__$false);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &__$true);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_3);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	array_init(&_4);
 	zephir_update_property_array(this_ptr, SL("myArray"), index, &_4);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -923,6 +993,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray4)
 
 PHP_METHOD(Stub_Assign, testPropertyArray5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, __$null, __$false, __$true, _0, _1, _2, _3, _4;
 	zval index;
 	zval *this_ptr = getThis();
@@ -939,24 +1010,26 @@ PHP_METHOD(Stub_Assign, testPropertyArray5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_DOUBLE(&_2, 1.5);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_2);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &__$null);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &__$false);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &__$true);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_3);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	array_init(&_4);
 	zephir_update_property_array(this_ptr, SL("myArray"), &index, &_4);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -964,6 +1037,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray5)
 
 PHP_METHOD(Stub_Assign, testPropertyArray6)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -972,10 +1046,13 @@ PHP_METHOD(Stub_Assign, testPropertyArray6)
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("ll"), 2, 0, 1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -998,6 +1075,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray6)
 
 PHP_METHOD(Stub_Assign, testPropertyArray7)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -1006,10 +1084,13 @@ PHP_METHOD(Stub_Assign, testPropertyArray7)
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("ss"), 4, SL("hello"), SL("hello"));
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1032,6 +1113,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray7)
 
 PHP_METHOD(Stub_Assign, testPropertyArray8)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1;
 	zval *this_ptr = getThis();
 
@@ -1044,11 +1126,13 @@ PHP_METHOD(Stub_Assign, testPropertyArray8)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zz"), 2, index, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1071,6 +1155,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray8)
 
 PHP_METHOD(Stub_Assign, testPropertyArray9)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, __$null, __$false, __$true, _0, _1;
 	zend_long index;
 	zval *this_ptr = getThis();
@@ -1083,11 +1168,13 @@ PHP_METHOD(Stub_Assign, testPropertyArray9)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("ll"), 2, index, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1110,6 +1197,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray9)
 
 PHP_METHOD(Stub_Assign, testPropertyArray10)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, __$null, __$false, __$true, _0, _1;
 	zval index;
 	zval *this_ptr = getThis();
@@ -1123,12 +1211,14 @@ PHP_METHOD(Stub_Assign, testPropertyArray10)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zz"), 2, &index, &index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1151,6 +1241,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray10)
 
 PHP_METHOD(Stub_Assign, testPropertyArray11)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2, _3, _4;
 	zval *this_ptr = getThis();
 
@@ -1166,23 +1257,25 @@ PHP_METHOD(Stub_Assign, testPropertyArray11)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_0, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_DOUBLE(&_1, 1.5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_LONG(&_2, 'A');
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_2, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "hello");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_3, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	array_init(&_4);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_4, SL("zza"), 3, index, index);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -1190,6 +1283,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray11)
 
 PHP_METHOD(Stub_Assign, testPropertyArray12)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, temp1, temp2, temp3, _0, _1, _2, _3, _4, _5, _6;
 	zval *this_ptr = getThis();
 
@@ -1210,36 +1304,41 @@ PHP_METHOD(Stub_Assign, testPropertyArray12)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_0, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_DOUBLE(&_1, 1.5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("zza"), 3, index, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("zza"), 3, index, index);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
+	zephir_memory_observe(&temp1);
 	zephir_array_fetch(&temp1, &_2, index, PH_NOISY, "stub/assign.zep", 657);
+	zephir_memory_observe(&temp2);
 	zephir_read_property(&temp2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_3, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	ZVAL_STRING(&_4, "hello");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_4, SL("zza"), 3, index, index);
-	ZVAL_NULL(&_5);
+	ZEPHIR_INIT_VAR(&_5);
 	array_init(&_5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_5, SL("zza"), 3, index, index);
 	zephir_read_property(&_6, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	ZVAL_NULL(&temp3);
+	ZEPHIR_INIT_VAR(&temp3);
 	ZVAL_LONG(&temp3, zephir_fast_count_int(&_6));
 	RETURN_MM_MEMBER(getThis(), "myArray");
 }
 
 PHP_METHOD(Stub_Assign, testPropertyArray13)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, temp1, temp2, temp3, _0, _1, _2, _3, _4, _5, _6;
 	zval *this_ptr = getThis();
 
@@ -1260,30 +1359,34 @@ PHP_METHOD(Stub_Assign, testPropertyArray13)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_0, SL("za"), 2, index);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_DOUBLE(&_1, 1.5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_1, SL("za"), 2, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$null, SL("za"), 2, index);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$false, SL("za"), 2, index);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
+	zephir_memory_observe(&temp1);
 	zephir_array_fetch(&temp1, &_2, index, PH_NOISY, "stub/assign.zep", 674);
+	zephir_memory_observe(&temp2);
 	zephir_read_property(&temp2, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &__$true, SL("za"), 2, index);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_LONG(&_3, 'A');
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_3, SL("za"), 2, index);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	ZVAL_STRING(&_4, "hello");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_4, SL("za"), 2, index);
-	ZVAL_NULL(&_5);
+	ZEPHIR_INIT_VAR(&_5);
 	array_init(&_5);
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_5, SL("za"), 2, index);
 	zephir_read_property(&_6, this_ptr, ZEND_STRL("myArray"), PH_NOISY_CC | PH_READONLY);
-	ZVAL_NULL(&temp3);
+	ZEPHIR_INIT_VAR(&temp3);
 	ZVAL_LONG(&temp3, zephir_fast_count_int(&_6));
 	RETURN_MM_MEMBER(getThis(), "myArray");
 }
@@ -1292,6 +1395,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray14)
 {
 	zval _0, _1, _3;
 	zval v, _2, _4, _5, _6;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&v);
@@ -1302,33 +1406,36 @@ PHP_METHOD(Stub_Assign, testPropertyArray14)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
-	ZVAL_NULL(&v);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "abc");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 1, 0);
 	add_assoc_stringl_ex(&_1, SL("b_key"), SL("b_val"));
 	zephir_array_update_string(&_0, SL("a"), &_1, PH_COPY | PH_SEPARATE);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "d_val");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_2, SL("sss"), 6, SL("a"), SL("b"), SL("d_key"));
 	ZEPHIR_INIT_NVAR(&_1);
 	zephir_create_array(&_1, 1, 0);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	zephir_create_array(&_3, 1, 0);
 	add_index_long(&_3, 3, 4);
 	zephir_array_update_long(&_1, 2, &_3, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_2);
 	ZVAL_LONG(&_2, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_2, &_1);
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	ZVAL_STRING(&_4, "s");
-	ZVAL_NULL(&_5);
+	ZEPHIR_INIT_VAR(&_5);
 	ZVAL_LONG(&_5, 1);
 	zephir_update_property_array(this_ptr, SL("myArray"), &_4, &_5);
-	ZVAL_NULL(&_6);
+	ZEPHIR_INIT_VAR(&_6);
 	ZVAL_STRING(&_6, "f");
 	zephir_update_property_array_multi(this_ptr, SL("myArray"), &_6, SL("sssss"), 10, SL("a"), SL("b"), SL("c"), SL("d"), SL("e"));
 	ZEPHIR_INIT_NVAR(&_6);
@@ -1341,6 +1448,7 @@ PHP_METHOD(Stub_Assign, testPropertyArray14)
 PHP_METHOD(Stub_Assign, testStaticPropertyAssign1)
 {
 	zval _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _3;
 
 	ZVAL_NULL(&__$null);
@@ -1350,6 +1458,9 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign1)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
@@ -1363,15 +1474,15 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign1)
 	ZVAL_LONG(&_0, 'A');
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	array_init(&_1);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	zephir_create_array(&_2, 3, 0);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_LONG(&_3, 1);
 	zephir_array_fast_append(&_2, &_3);
 	ZEPHIR_INIT_NVAR(&_3);
@@ -1393,17 +1504,21 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign2)
 	zval c, _0;
 	double b;
 	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&f);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	b =  (1.5);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_NULL(&c);
 	d = 0;
 	e = 'A';
-	ZVAL_NULL(&f);
+	ZEPHIR_INIT_VAR(&f);
 	array_init(&f);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, a);
@@ -1425,6 +1540,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyAssign2)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArray1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
 
 	ZVAL_NULL(&__$null);
@@ -1433,10 +1549,13 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("l"), 1, 0);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1460,6 +1579,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray1)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArray2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
 
 	ZVAL_NULL(&__$null);
@@ -1468,10 +1588,13 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray2)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("s"), 2, SL("hello"));
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1495,6 +1618,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray2)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2;
 
 	ZVAL_UNDEF(&index_sub);
@@ -1507,11 +1631,13 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("z"), 1, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1535,16 +1661,20 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArray3)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, _0, _1, _2;
 
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "test");
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("a"), 1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1563,6 +1693,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
 
 	ZVAL_NULL(&__$null);
@@ -1571,10 +1702,13 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("ll"), 2, 0, 0);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1598,6 +1732,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli1)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
 
 	ZVAL_NULL(&__$null);
@@ -1606,10 +1741,13 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli2)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("ss"), 4, SL("hello"), SL("hello"));
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1633,6 +1771,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli2)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, __$null, __$false, __$true, _0, _1, _2;
 
 	ZVAL_UNDEF(&index_sub);
@@ -1645,11 +1784,13 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMutli3)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("zz"), 2, index, index);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1675,6 +1816,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMulti4)
 {
 	zval _0, _1, _3;
 	zval v, _2, _4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&_2);
@@ -1682,21 +1824,24 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMulti4)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
-	ZVAL_NULL(&v);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "abc");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 1, 0);
 	add_assoc_stringl_ex(&_1, SL("b_key"), SL("b_val"));
 	zephir_array_update_string(&_0, SL("a"), &_1, PH_COPY | PH_SEPARATE);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "d_val");
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_2, SL("sss"), 6, SL("a"), SL("b"), SL("d_key"));
 	ZEPHIR_INIT_NVAR(&_1);
 	zephir_create_array(&_1, 1, 0);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	zephir_create_array(&_3, 1, 0);
 	add_index_long(&_3, 3, 4);
 	zephir_array_update_long(&_1, 2, &_3, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -1717,6 +1862,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayMulti4)
 
 PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, __$true, _0, _1, _2;
 
 	ZVAL_NULL(&__$null);
@@ -1725,10 +1871,13 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend1)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_assign_ce, ZEND_STRL("testVarStatic"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_update_static_property_array_multi_ce(stub_assign_ce, SL("testVarStatic"), &_1, SL("la"), 2, 0);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1752,6 +1901,7 @@ PHP_METHOD(Stub_Assign, testStaticPropertyArrayAppend1)
 
 PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, *value, value_sub, a;
 
 	ZVAL_UNDEF(&index_sub);
@@ -1761,8 +1911,10 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_zval(&a, index, value, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&a);
@@ -1770,6 +1922,7 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign1)
 
 PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, *value, value_sub, _POST;
 
 	ZVAL_UNDEF(&index_sub);
@@ -1779,8 +1932,10 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
-	ZVAL_NULL(&_POST);
+	ZEPHIR_INIT_VAR(&_POST);
 	array_init(&_POST);
 	zephir_array_update_zval(&_POST, index, value, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&_POST);
@@ -1788,6 +1943,7 @@ PHP_METHOD(Stub_Assign, testArrayVarAssign2)
 
 PHP_METHOD(Stub_Assign, testArrayProperty)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index, index_sub, *value, value_sub, _POST;
 
 	ZVAL_UNDEF(&index_sub);
@@ -1797,8 +1953,10 @@ PHP_METHOD(Stub_Assign, testArrayProperty)
 		Z_PARAM_ZVAL(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index, &value);
-	ZVAL_NULL(&_POST);
+	ZEPHIR_INIT_VAR(&_POST);
 	array_init(&_POST);
 	zephir_array_update_zval(&_POST, index, value, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&_POST);
@@ -1829,13 +1987,18 @@ PHP_METHOD(Stub_Assign, testGlobalVarAssign)
 PHP_METHOD(Stub_Assign, testConstantKeyAssign)
 {
 	zval elements;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&elements);
-	ZVAL_NULL(&elements);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&elements);
 	zephir_create_array(&elements, 3, 0);
 	add_assoc_long_ex(&elements, SL("abc"), 1);
 	add_index_long(&elements, 131072, 131079);
 	add_index_long(&elements, 131073, 131080);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -1845,6 +2008,7 @@ PHP_METHOD(Stub_Assign, testConstantKeyAssign)
 PHP_METHOD(Stub_Assign, testArrayBoolExpressionAssign)
 {
 	zval str, _0, _1, _2, _3, _4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&str);
@@ -1853,19 +2017,22 @@ PHP_METHOD(Stub_Assign, testArrayBoolExpressionAssign)
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
-	ZVAL_NULL(&str);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&str);
 	ZVAL_STRING(&str, "abc");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("myArray"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "a");
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_BOOL(&_2, ZEPHIR_IS_STRING(&str, "abc"));
 	zephir_update_property_array(this_ptr, SL("myArray"), &_1, &_2);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "b");
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	ZVAL_BOOL(&_4, !ZEPHIR_IS_STRING(&str, "abc"));
 	zephir_update_property_array(this_ptr, SL("myArray"), &_3, &_4);
 	RETURN_MM_MEMBER(getThis(), "myArray");
@@ -1874,6 +2041,7 @@ PHP_METHOD(Stub_Assign, testArrayBoolExpressionAssign)
 PHP_METHOD(Stub_Assign, testAssignBitwiseX)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, *b_param = NULL, op, i, result, _1, *_2, _3;
 	zend_long a, b, ZEPHIR_LAST_CALL_STATUS, _4$$4, _5$$5, _6$$6, _7$$7, _8$$8, _9$$10, _10$$11, _11$$12, _12$$13, _13$$14;
 
@@ -1887,12 +2055,14 @@ PHP_METHOD(Stub_Assign, testAssignBitwiseX)
 		Z_PARAM_LONG(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a_param, &b_param);
-	ZVAL_NULL(&result);
+	ZEPHIR_INIT_VAR(&result);
 	array_init(&result);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 5, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "or");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -2010,6 +2180,7 @@ PHP_METHOD(Stub_Assign, testAssignBitwiseX)
  */
 PHP_METHOD(Stub_Assign, testAssignSuperGlobals)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _GET, v, _0, _1, _2, _3;
 
 	ZVAL_UNDEF(&_GET);
@@ -2018,23 +2189,26 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobals)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 
-	ZVAL_NULL(&v);
+	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "stest2");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "stest");
 	zephir_array_update_string(&_GET, SL("steststr"), &_0, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&_GET, SL("steststr2"), &v, PH_COPY | PH_SEPARATE);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_update_string(&_GET, SL("stestint"), &_1, PH_COPY | PH_SEPARATE);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_LONG(&_2, 2);
 	zephir_array_update_string(&_GET, SL("stestint2"), &_2, PH_COPY | PH_SEPARATE);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "testval");
 	zephir_array_update_zval(&_GET, &v, &_3, PH_COPY | PH_SEPARATE);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -2043,20 +2217,24 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobals)
 PHP_METHOD(Stub_Assign, testAssignSuperGlobalsSERVER)
 {
 	zval _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _SERVER, _0;
 
 	ZVAL_UNDEF(&_SERVER);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_stringl_ex(&_1, SL("g1"), SL("aaa"));
 	add_assoc_stringl_ex(&_1, SL("g2"), SL("bbb"));
 	zephir_fast_array_merge(&_0, &_SERVER, &_1);
 	ZEPHIR_HASH_COPY(&_SERVER, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -2065,30 +2243,37 @@ PHP_METHOD(Stub_Assign, testAssignSuperGlobalsSERVER)
 PHP_METHOD(Stub_Assign, testAssignSuperGlobalsGET)
 {
 	zval _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _GET, _0;
 
 	ZVAL_UNDEF(&_GET);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_stringl_ex(&_1, SL("g1"), SL("aaa"));
 	add_assoc_stringl_ex(&_1, SL("g2"), SL("bbb"));
 	zephir_fast_array_merge(&_0, &_GET, &_1);
 	ZEPHIR_HASH_COPY(&_GET, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Assign, issue597)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _POST, _GET, s$$4, _0$$4;
 
 	ZVAL_UNDEF(&_POST);
 	ZVAL_UNDEF(&_GET);
 	ZVAL_UNDEF(&s$$4);
 	ZVAL_UNDEF(&_0$$4);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_GET, SL("_GET"));
 	zephir_get_global(&_POST, SL("_POST"));
 
@@ -2098,10 +2283,11 @@ PHP_METHOD(Stub_Assign, issue597)
 	}
 	if (zephir_array_isset_string(&_GET, SL("s"))) {
 		zephir_array_fetch_string(&_0$$4, &_GET, SL("s"), PH_NOISY | PH_READONLY, "stub/assign.zep", 983);
-		ZVAL_NULL(&s$$4);
+		ZEPHIR_INIT_VAR(&s$$4);
 		ZVAL_LONG(&s$$4, (zephir_get_numberval(&_0$$4) * 5));
 		zephir_array_update_string(&_GET, SL("s"), &s$$4, PH_COPY | PH_SEPARATE);
 		RETURN_CCTOR(&s$$4);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/bench/foo.zep.c b/ext/stub/bench/foo.zep.c
index 8c43f7b6bf..907ea6c1e4 100644
--- a/ext/stub/bench/foo.zep.c
+++ b/ext/stub/bench/foo.zep.c
@@ -33,6 +33,7 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 
 	ZVAL_UNDEF(&n_sub);
@@ -41,6 +42,8 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -59,12 +62,14 @@ PHP_METHOD(Stub_Bench_Foo, emptyForInRange)
 			ZVAL_LONG(&i, _1);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, readStatic)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, x, i, _2;
 
 	ZVAL_UNDEF(&n_sub);
@@ -74,6 +79,8 @@ PHP_METHOD(Stub_Bench_Foo, readStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -94,12 +101,14 @@ PHP_METHOD(Stub_Bench_Foo, readStatic)
 			zephir_read_static_property_ce(&x, stub_bench_foo_ce, SL("a"), PH_NOISY_CC);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, writeStatic)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
 
 	ZVAL_UNDEF(&n_sub);
@@ -109,6 +118,8 @@ PHP_METHOD(Stub_Bench_Foo, writeStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -130,12 +141,14 @@ PHP_METHOD(Stub_Bench_Foo, writeStatic)
 			zephir_update_static_property_ce(stub_bench_foo_ce, ZEND_STRL("a"), &_3$$3);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, issetStatic)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 
 	ZVAL_UNDEF(&n_sub);
@@ -144,6 +157,8 @@ PHP_METHOD(Stub_Bench_Foo, issetStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -163,12 +178,14 @@ PHP_METHOD(Stub_Bench_Foo, issetStatic)
 			x = (0 == 0);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
 
 	ZVAL_UNDEF(&n_sub);
@@ -178,6 +195,8 @@ PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -199,12 +218,14 @@ PHP_METHOD(Stub_Bench_Foo, emptyStatic)
 			x = ZEPHIR_IS_EMPTY(&_3$$3);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, readProp)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, x, i, _2;
 	zval *this_ptr = getThis();
 
@@ -215,6 +236,8 @@ PHP_METHOD(Stub_Bench_Foo, readProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -234,12 +257,14 @@ PHP_METHOD(Stub_Bench_Foo, readProp)
 			zephir_read_property(&x, this_ptr, ZEND_STRL("b"), PH_NOISY_CC | PH_READONLY);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, writeProp)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
 	zval *this_ptr = getThis();
 
@@ -250,6 +275,8 @@ PHP_METHOD(Stub_Bench_Foo, writeProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -271,12 +298,14 @@ PHP_METHOD(Stub_Bench_Foo, writeProp)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_3$$3);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3, _4$$3;
 	zval *this_ptr = getThis();
 
@@ -288,6 +317,8 @@ PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -311,6 +342,7 @@ PHP_METHOD(Stub_Bench_Foo, assignAddProp)
 			zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_3$$3);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -333,6 +365,7 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 	zval *this_ptr = getThis();
 
@@ -342,6 +375,8 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -361,12 +396,14 @@ PHP_METHOD(Stub_Bench_Foo, postIncProp)
 			RETURN_ON_FAILURE(zephir_property_incr(this_ptr, SL("b")));
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, postDecProp)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 	zval *this_ptr = getThis();
 
@@ -376,6 +413,8 @@ PHP_METHOD(Stub_Bench_Foo, postDecProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -395,12 +434,14 @@ PHP_METHOD(Stub_Bench_Foo, postDecProp)
 			RETURN_ON_FAILURE(zephir_property_decr(this_ptr, SL("b")));
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, issetProp)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2;
 	zval *this_ptr = getThis();
 
@@ -410,6 +451,8 @@ PHP_METHOD(Stub_Bench_Foo, issetProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -429,12 +472,14 @@ PHP_METHOD(Stub_Bench_Foo, issetProp)
 			x = zephir_isset_property(this_ptr, SL("b"));
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, emptyProp)
 {
 	zend_long _1;
 	zend_bool x = 0, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, _2, _3$$3;
 	zval *this_ptr = getThis();
 
@@ -445,6 +490,8 @@ PHP_METHOD(Stub_Bench_Foo, emptyProp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -466,6 +513,7 @@ PHP_METHOD(Stub_Bench_Foo, emptyProp)
 			x = ZEPHIR_IS_EMPTY(&_3$$3);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, g)
@@ -476,6 +524,7 @@ PHP_METHOD(Stub_Bench_Foo, g)
 PHP_METHOD(Stub_Bench_Foo, call)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zval *n, n_sub, i, _2;
@@ -487,6 +536,8 @@ PHP_METHOD(Stub_Bench_Foo, call)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -507,6 +558,7 @@ PHP_METHOD(Stub_Bench_Foo, call)
 			zephir_check_call_status();
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, staticMethod)
@@ -523,6 +575,7 @@ PHP_METHOD(Stub_Bench_Foo, staticMethod1)
 PHP_METHOD(Stub_Bench_Foo, scall)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zval *n, n_sub, i, _2;
@@ -533,6 +586,8 @@ PHP_METHOD(Stub_Bench_Foo, scall)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -553,11 +608,13 @@ PHP_METHOD(Stub_Bench_Foo, scall)
 			zephir_check_call_status();
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zval *n, n_sub, i, _2;
@@ -568,6 +625,8 @@ PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -588,12 +647,14 @@ PHP_METHOD(Stub_Bench_Foo, scallWithReturnTrue)
 			zephir_check_call_status();
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Bench_Foo, readConst)
 {
 	zend_long _1;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n, n_sub, i, x, _2;
 
 	ZVAL_UNDEF(&n_sub);
@@ -603,6 +664,8 @@ PHP_METHOD(Stub_Bench_Foo, readConst)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
 	ZEPHIR_CPY_WRT(&_2, n);
 	_1 = 1;
@@ -623,5 +686,6 @@ PHP_METHOD(Stub_Bench_Foo, readConst)
 			ZVAL_LONG(&x, 0);
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/bitwise.zep.c b/ext/stub/bitwise.zep.c
index 3f43884349..1c99fb069c 100644
--- a/ext/stub/bitwise.zep.c
+++ b/ext/stub/bitwise.zep.c
@@ -188,15 +188,19 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCastAnd)
 {
 	zend_long c = 0;
 	zval a, b, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "2");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_bitwise_and_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -206,9 +210,13 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2And)
 {
 	zend_long b = 0, c = 0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b & (int) (zephir_get_numberval(&a)));
@@ -239,9 +247,13 @@ PHP_METHOD(Stub_Bitwise, complex3And)
 PHP_METHOD(Stub_Bitwise, complex4And)
 {
 	zval c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_LONG(&c, ((int) (1.0) & 1));
 	RETURN_CCTOR(&c);
 }
@@ -612,15 +624,19 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCastOr)
 {
 	zend_long c = 0;
 	zval a, b, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "2");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_bitwise_or_function(&_0, &b, &a);
 	c = zephir_get_numberval(&_0);
 	RETURN_MM_LONG(c);
@@ -630,9 +646,13 @@ PHP_METHOD(Stub_Bitwise, intVarImplicitCast2Or)
 {
 	zend_long b = 0, c = 0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
 	b = 2;
 	c = (b | (int) (zephir_get_numberval(&a)));
@@ -663,9 +683,13 @@ PHP_METHOD(Stub_Bitwise, complex3Or)
 PHP_METHOD(Stub_Bitwise, complex4Or)
 {
 	zval c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_LONG(&c, ((int) (1.0) | 1));
 	RETURN_CCTOR(&c);
 }
@@ -960,12 +984,16 @@ PHP_METHOD(Stub_Bitwise, getInt)
 PHP_METHOD(Stub_Bitwise, testbitwiseXor)
 {
 	zval i, _0, j;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&j);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 123);
 	ZEPHIR_CALL_METHOD(&i, this_ptr, "getint", NULL, 0, &_0);
 	zephir_check_call_status();
@@ -973,6 +1001,6 @@ PHP_METHOD(Stub_Bitwise, testbitwiseXor)
 	ZEPHIR_CALL_METHOD(&j, this_ptr, "getint", NULL, 0, &_0);
 	zephir_check_call_status();
 	zephir_bitwise_xor_function(return_value, &i, &j);
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/builtin/arraymethods.zep.c b/ext/stub/builtin/arraymethods.zep.c
index 8c9ce8935e..b41f79ce82 100644
--- a/ext/stub/builtin/arraymethods.zep.c
+++ b/ext/stub/builtin/arraymethods.zep.c
@@ -30,12 +30,16 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getJoin1)
 {
 	zval _1;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -53,14 +57,18 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getReversed1)
 {
 	zval _1, _2;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -78,14 +86,18 @@ PHP_METHOD(Stub_BuiltIn_ArrayMethods, getMap1)
 {
 	zval _1, _2;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
diff --git a/ext/stub/builtin/charmethods.zep.c b/ext/stub/builtin/charmethods.zep.c
index 88dbc18262..b597545b34 100644
--- a/ext/stub/builtin/charmethods.zep.c
+++ b/ext/stub/builtin/charmethods.zep.c
@@ -28,11 +28,15 @@ ZEPHIR_INIT_CLASS(Stub_BuiltIn_CharMethods)
 PHP_METHOD(Stub_BuiltIn_CharMethods, getHex)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "a");
 	zephir_string_to_hex(&_0, &_1);
 	RETURN_CCTOR(&_0);
@@ -42,6 +46,7 @@ PHP_METHOD(Stub_BuiltIn_CharMethods, getHexForString)
 {
 	long _0;
 	char ch = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, o, _1$$3, _2$$3, _3$$3;
 	zval str;
 
@@ -53,9 +58,11 @@ PHP_METHOD(Stub_BuiltIn_CharMethods, getHexForString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&o);
+	ZEPHIR_INIT_VAR(&o);
 	ZVAL_STRING(&o, "");
 	for (_0 = 0; _0 < Z_STRLEN_P(&str); _0++) {
 		ch = ZEPHIR_STRING_OFFSET(&str, _0);
diff --git a/ext/stub/builtin/intmethods.zep.c b/ext/stub/builtin/intmethods.zep.c
index 83dbec9424..6b1948973e 100644
--- a/ext/stub/builtin/intmethods.zep.c
+++ b/ext/stub/builtin/intmethods.zep.c
@@ -28,6 +28,7 @@ ZEPHIR_INIT_CLASS(Stub_BuiltIn_IntMethods)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -36,6 +37,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 9, &_0);
@@ -46,10 +49,14 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs)
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs1)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, -5);
 	ZEPHIR_CALL_FUNCTION(&_1, "abs", NULL, 9, &_0);
 	zephir_check_call_status();
@@ -58,6 +65,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAbs1)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getBinary)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -66,6 +74,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getBinary)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "decbin", NULL, 10, &_0);
@@ -75,6 +85,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getBinary)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getHex)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -83,6 +94,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getHex)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "dechex", NULL, 11, &_0);
@@ -92,6 +105,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getHex)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getOctal)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -100,6 +114,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getOctal)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "decoct", NULL, 12, &_0);
@@ -109,6 +125,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getOctal)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getPow)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, *exp_param = NULL, _0, _1, _2;
 	zend_long num, exp, ZEPHIR_LAST_CALL_STATUS;
 
@@ -119,6 +136,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getPow)
 		Z_PARAM_LONG(num)
 		Z_PARAM_LONG(exp)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &num_param, &exp_param);
 	ZVAL_LONG(&_0, num);
 	ZVAL_LONG(&_1, exp);
@@ -143,6 +162,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getSqrt)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getExp)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -151,6 +171,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getExp)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "exp", NULL, 2, &_0);
@@ -202,6 +224,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getTan)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -210,6 +233,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "asin", NULL, 14, &_0);
@@ -219,6 +244,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -227,6 +253,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "acos", NULL, 15, &_0);
@@ -236,6 +264,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _1;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 
@@ -244,6 +273,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
 	ZEPHIR_CALL_FUNCTION(&_1, "atan", NULL, 16, &_0);
@@ -253,6 +284,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, *base_param = NULL, _0$$3, _1$$3, _2, _3, _4;
 	zend_long num, base, ZEPHIR_LAST_CALL_STATUS;
 
@@ -266,6 +298,8 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(base)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &num_param, &base_param);
 	if (!base_param) {
 		base = -1;
diff --git a/ext/stub/builtin/stringmethods.zep.c b/ext/stub/builtin/stringmethods.zep.c
index 4855ee6112..61b4a26800 100644
--- a/ext/stub/builtin/stringmethods.zep.c
+++ b/ext/stub/builtin/stringmethods.zep.c
@@ -29,6 +29,7 @@ ZEPHIR_INIT_CLASS(Stub_BuiltIn_StringMethods)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, camelize)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null, _0;
 	zval str;
 
@@ -42,19 +43,22 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, camelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
 		delimiter = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_camelize(&_0, &str, delimiter);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, uncamelize)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null, _0;
 	zval str;
 
@@ -68,13 +72,15 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, uncamelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
 		delimiter = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_uncamelize(&_0, &str, delimiter);
 	RETURN_CCTOR(&_0);
 }
@@ -82,9 +88,13 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, uncamelize)
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -92,9 +102,13 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength1)
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength2)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -102,15 +116,20 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength2)
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength3)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "hello", "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a;
 
@@ -118,6 +137,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&a));
@@ -125,6 +146,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength4)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLength5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a, _0;
 
@@ -133,15 +155,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLength5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SV(&_0, "hello", &a);
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getIndex)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *needle_param = NULL, _0;
 	zval str, needle;
 
@@ -152,16 +177,19 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndex)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(needle)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &needle_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&needle, needle_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_strpos(&_0, &str, &needle, 0 );
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long position;
 	zval *str_param = NULL, *needle_param = NULL, *position_param = NULL, _0, _1;
 	zval str, needle;
@@ -175,11 +203,13 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 		Z_PARAM_STR(needle)
 		Z_PARAM_LONG(position)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &str_param, &needle_param, &position_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&needle, needle_param);
 	ZVAL_LONG(&_0, position);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_fast_strpos(&_1, &str, &needle, zephir_get_intval(&_0) );
 	RETURN_CCTOR(&_1);
 }
@@ -187,11 +217,15 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getIndexWithPosition)
 PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, " hello \t\n");
 	zephir_fast_trim(&_0, &_1, NULL , ZEPHIR_TRIM_BOTH);
 	RETURN_CCTOR(&_0);
@@ -199,6 +233,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
 
@@ -207,15 +242,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getTrimmed1)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_trim(&_0, &str, NULL , ZEPHIR_TRIM_BOTH);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLeftTrimmed)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
 
@@ -224,15 +262,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLeftTrimmed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_trim(&_0, &str, NULL , ZEPHIR_TRIM_LEFT);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getRightTrimmed)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
 
@@ -241,15 +282,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRightTrimmed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_trim(&_0, &str, NULL , ZEPHIR_TRIM_RIGHT);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLower)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
 
@@ -258,15 +302,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLower)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_strtolower(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getUpper)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
 
@@ -275,15 +322,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getUpper)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_fast_strtoupper(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
@@ -293,6 +343,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "lcfirst", NULL, 18, &str);
@@ -302,6 +354,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getUpperFirst)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
 
@@ -310,15 +363,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getUpperFirst)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_ucfirst(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0, _1;
 	zval str;
@@ -329,9 +385,11 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello %s!");
 	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 19, &_0, &str);
 	zephir_check_call_status();
@@ -340,6 +398,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getMd5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, _0;
 	zval str;
 
@@ -348,15 +407,18 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getMd5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_md5(&_0, &str);
 	RETURN_CCTOR(&_0);
 }
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
@@ -366,6 +428,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "sha1", NULL, 20, &str);
@@ -375,6 +439,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
@@ -384,6 +449,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "nl2br", NULL, 21, &str);
@@ -393,6 +460,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
@@ -402,6 +470,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "str_getcsv", NULL, 22, &str);
@@ -411,6 +481,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_bool assoc;
 	zval *str_param = NULL, *assoc_param = NULL, _0, _1;
 	zval str;
@@ -423,13 +494,15 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(assoc)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &assoc_param);
 	zephir_get_strval(&str, str_param);
 	if (!assoc_param) {
 		assoc = 1;
 	} else {
 		}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_1, (assoc ? 1 : 0));
 	zephir_json_decode(&_0, &str, zephir_get_intval(&str) );
 	RETURN_CCTOR(&_0);
@@ -437,6 +510,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedJson)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long count, ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, *count_param = NULL, _0, _1;
 	zval str;
@@ -448,6 +522,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 		Z_PARAM_STR(str)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &count_param);
 	zephir_get_strval(&str, str_param);
 	ZVAL_LONG(&_0, count);
@@ -458,6 +534,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
@@ -467,6 +544,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "str_shuffle", NULL, 24, &str);
@@ -476,6 +555,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, *del_param = NULL, _0;
 	zval str, del;
@@ -487,6 +567,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(del)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &del_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&del, del_param);
@@ -497,6 +579,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *left_param = NULL, *right_param = NULL, _0;
 	zval left, right;
@@ -508,6 +591,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 		Z_PARAM_STR(left)
 		Z_PARAM_STR(right)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
@@ -518,6 +603,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *left_param = NULL, *right_param = NULL, _0;
 	zval left, right;
@@ -529,6 +615,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 		Z_PARAM_STR(left)
 		Z_PARAM_STR(right)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
@@ -539,6 +627,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
@@ -548,6 +637,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 28, &str);
@@ -557,6 +648,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 
 PHP_METHOD(Stub_BuiltIn_StringMethods, getHtmlSpecialChars)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str_param = NULL, _0;
 	zval str;
@@ -566,6 +658,8 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getHtmlSpecialChars)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "htmlspecialchars", NULL, 29, &str);
diff --git a/ext/stub/cast.zep.c b/ext/stub/cast.zep.c
index faf4eb4c23..aa5ee24d00 100644
--- a/ext/stub/cast.zep.c
+++ b/ext/stub/cast.zep.c
@@ -64,10 +64,14 @@ PHP_METHOD(Stub_Cast, testStringCastVariableChar)
 {
 	zval _0;
 	char a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 'X';
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRINGL(&_0, &a, 1);
 	RETURN_CTOR(&_0);
 }
@@ -79,10 +83,14 @@ PHP_METHOD(Stub_Cast, testStringCastFromNull)
 {
 	zval _0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
 	zephir_cast_to_string(&_0, &a);
 	RETURN_CTOR(&_0);
@@ -149,9 +157,13 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableBooleanFalse)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableNull)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
@@ -159,9 +171,13 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableNull)
 PHP_METHOD(Stub_Cast, testIntCastFromStringValue)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "test");
 	RETURN_MM_LONG(zephir_get_intval_ex(&_0));
@@ -170,15 +186,20 @@ PHP_METHOD(Stub_Cast, testIntCastFromStringValue)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableString)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "test");
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
 
 PHP_METHOD(Stub_Cast, testIntCastFromParameterString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a;
 
@@ -186,6 +207,8 @@ PHP_METHOD(Stub_Cast, testIntCastFromParameterString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
 	RETURN_MM_LONG(zephir_get_intval(&a));
@@ -200,9 +223,13 @@ PHP_METHOD(Stub_Cast, testIntCastFromNull)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableEmptyArray)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
@@ -210,9 +237,13 @@ PHP_METHOD(Stub_Cast, testIntCastFromVariableEmptyArray)
 PHP_METHOD(Stub_Cast, testIntCastFromEmptyArray)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	RETURN_MM_LONG(zephir_get_intval(&_0));
 }
@@ -220,12 +251,16 @@ PHP_METHOD(Stub_Cast, testIntCastFromEmptyArray)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableArray)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -244,12 +279,16 @@ PHP_METHOD(Stub_Cast, testIntCastFromArray)
 {
 	zval _1;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -271,9 +310,13 @@ PHP_METHOD(Stub_Cast, testIntCastFromArray)
 PHP_METHOD(Stub_Cast, testIntCastFromStdClass)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	object_init(&_0);
 	RETURN_MM_LONG(zephir_get_intval(&_0));
 }
@@ -285,9 +328,13 @@ PHP_METHOD(Stub_Cast, testIntCastFromStdClass)
 PHP_METHOD(Stub_Cast, testIntCastFromVariableStdClass)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
 	RETURN_MM_LONG(zephir_get_intval(&a));
 }
@@ -353,9 +400,13 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableBooleanFalse)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableNull)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&a));
 }
@@ -369,9 +420,13 @@ PHP_METHOD(Stub_Cast, testFloatCastFromNull)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableEmptyArray)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&a));
 }
@@ -379,9 +434,13 @@ PHP_METHOD(Stub_Cast, testFloatCastFromVariableEmptyArray)
 PHP_METHOD(Stub_Cast, testFloatCastFromEmptyArray)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&_0));
 }
@@ -389,12 +448,16 @@ PHP_METHOD(Stub_Cast, testFloatCastFromEmptyArray)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableArray)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -413,12 +476,16 @@ PHP_METHOD(Stub_Cast, testFloatCastFromArray)
 {
 	zval _1;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -440,9 +507,13 @@ PHP_METHOD(Stub_Cast, testFloatCastFromArray)
 PHP_METHOD(Stub_Cast, testFloatCastFromStdClass)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	object_init(&_0);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&_0));
 }
@@ -454,9 +525,13 @@ PHP_METHOD(Stub_Cast, testFloatCastFromStdClass)
 PHP_METHOD(Stub_Cast, testFloatCastFromVariableStdClass)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
 	RETURN_MM_DOUBLE(zephir_get_doubleval(&a));
 }
@@ -501,9 +576,13 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromIntFalse)
 PHP_METHOD(Stub_Cast, testBooleanCastFromObject)
 {
 	zval simpleObject;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&simpleObject);
-	ZVAL_NULL(&simpleObject);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&simpleObject);
 	object_init(&simpleObject);
 	RETURN_MM_BOOL(zephir_get_boolval(&simpleObject));
 }
@@ -511,9 +590,13 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromObject)
 PHP_METHOD(Stub_Cast, testBooleanCastFromEmptyArray)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	RETURN_MM_BOOL(zephir_get_boolval(&a));
 }
@@ -521,12 +604,16 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromEmptyArray)
 PHP_METHOD(Stub_Cast, testBooleanCastFromArray)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -544,9 +631,13 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromArray)
 PHP_METHOD(Stub_Cast, testBooleanCastFromNull)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
 	RETURN_MM_BOOL(zephir_get_boolval(&a));
 }
@@ -573,9 +664,13 @@ PHP_METHOD(Stub_Cast, testBooleanCastFromVariableChar)
 PHP_METHOD(Stub_Cast, testObjectCastFromInt)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 5);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -584,9 +679,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromInt)
 PHP_METHOD(Stub_Cast, testObjectCastFromFloat)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, 5.0);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -595,9 +694,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromFloat)
 PHP_METHOD(Stub_Cast, testObjectCastFromFalse)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, 0);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -606,9 +709,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromFalse)
 PHP_METHOD(Stub_Cast, testObjectCastFromTrue)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, 1);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -617,9 +724,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromTrue)
 PHP_METHOD(Stub_Cast, testObjectCastFromNull)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_NULL(&_0);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -628,10 +739,14 @@ PHP_METHOD(Stub_Cast, testObjectCastFromNull)
 PHP_METHOD(Stub_Cast, testObjectCastFromEmptyArray)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	ZEPHIR_CPY_WRT(&_1, &_0);
 	zephir_convert_to_object(&_1);
@@ -642,13 +757,17 @@ PHP_METHOD(Stub_Cast, testObjectCastFromArray)
 {
 	zval _1, _2;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -668,9 +787,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromArray)
 PHP_METHOD(Stub_Cast, testObjectCastFromEmptyString)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "");
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -679,9 +802,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromEmptyString)
 PHP_METHOD(Stub_Cast, testObjectCastFromString)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "test string");
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
@@ -690,9 +817,13 @@ PHP_METHOD(Stub_Cast, testObjectCastFromString)
 PHP_METHOD(Stub_Cast, testCastStdinToInteger)
 {
 	zval handle;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&handle);
-	ZVAL_NULL(&handle);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&handle);
 	ZEPHIR_GET_CONSTANT(&handle, "STDIN");
 	RETURN_MM_LONG(zephir_get_intval(&handle));
 }
@@ -700,9 +831,13 @@ PHP_METHOD(Stub_Cast, testCastStdinToInteger)
 PHP_METHOD(Stub_Cast, testCastStdoutToInteger)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "STDOUT");
 	RETURN_MM_LONG(zephir_get_intval(&_0));
 }
@@ -725,13 +860,17 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableArray)
 {
 	zval _1;
 	zval uids, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	zephir_create_array(&uids, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&uids, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -749,10 +888,14 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableTrue)
 {
 	zval _0;
 	zval uids;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_BOOL(&uids, 1);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -763,10 +906,14 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableFalse)
 {
 	zval _0;
 	zval uids;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_BOOL(&uids, 0);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -777,10 +924,14 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableNull)
 {
 	zval _0;
 	zval uids;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_NULL(&uids);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -791,10 +942,14 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableInteger)
 {
 	zval _0;
 	zval uids;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_LONG(&uids, 1);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -805,10 +960,14 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableFloat)
 {
 	zval _0;
 	zval uids;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_DOUBLE(&uids, 1.1);
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -819,10 +978,14 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableString)
 {
 	zval _0;
 	zval uids;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	ZVAL_STRING(&uids, "aaa");
 	zephir_get_arrval(&_0, &uids);
 	ZEPHIR_CPY_WRT(&uids, &_0);
@@ -833,13 +996,17 @@ PHP_METHOD(Stub_Cast, testArrayCastFromVariableStdClass)
 {
 	zval _1;
 	zval uids, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&uids);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&uids);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&uids);
 	object_init(&uids);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "v1");
 	zephir_update_property_zval(&uids, ZEND_STRL("p1"), &_0);
@@ -857,16 +1024,20 @@ PHP_METHOD(Stub_Cast, testIssue828)
 	double floatVersion = 0, floatNonNumeric = 0;
 	zval version, nonNumericString, _0;
 	zval ret;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&version);
 	ZVAL_UNDEF(&nonNumericString);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&ret);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&ret);
 	array_init(&ret);
-	ZVAL_NULL(&version);
+	ZEPHIR_INIT_VAR(&version);
 	ZVAL_STRING(&version, "1.0 200 OK");
-	ZVAL_NULL(&nonNumericString);
+	ZEPHIR_INIT_VAR(&nonNumericString);
 	ZVAL_STRING(&nonNumericString, "OK");
 	zephir_array_append(&ret, &version, PH_SEPARATE, "stub/cast.zep", 501);
 	zephir_array_append(&ret, &nonNumericString, PH_SEPARATE, "stub/cast.zep", 502);
@@ -874,7 +1045,7 @@ PHP_METHOD(Stub_Cast, testIssue828)
 	intVersion = zephir_get_intval(&version);
 	floatNonNumeric =  (zephir_get_doubleval(&nonNumericString));
 	intNonNumeric = zephir_get_intval(&nonNumericString);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, floatVersion);
 	zephir_array_append(&ret, &_0, PH_SEPARATE, "stub/cast.zep", 509);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/closures.zep.c b/ext/stub/closures.zep.c
index 5caad189f3..8bc03b1add 100644
--- a/ext/stub/closures.zep.c
+++ b/ext/stub/closures.zep.c
@@ -94,6 +94,7 @@ PHP_METHOD(Stub_Closures, testUseCommand)
 
 PHP_METHOD(Stub_Closures, issue1860)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *abc_param = NULL;
 	zval abc;
 
@@ -101,11 +102,13 @@ PHP_METHOD(Stub_Closures, issue1860)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(abc)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &abc_param);
-	ZVAL_COPY(&abc, abc_param);
+	ZEPHIR_OBS_COPY_OR_DUP(&abc, abc_param);
 	zephir_create_closure_ex(return_value, NULL, stub_9__closure_ce, SL("__invoke"));
 	zephir_update_static_property_ce(stub_9__closure_ce, ZEND_STRL("abc"), &abc);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -115,21 +118,25 @@ PHP_METHOD(Stub_Closures, issue642)
 {
 	zval _0;
 	zval obj, closure;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&obj);
 	ZVAL_UNDEF(&closure);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&obj);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&obj);
 	object_init(&obj);
-	ZVAL_NULL(&closure);
+	ZEPHIR_INIT_VAR(&closure);
 	zephir_create_closure_ex(&closure, NULL, stub_10__closure_ce, SL("__invoke"));
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
 	zephir_array_fast_append(&_0, &obj);
 	ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, &closure, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Closures, issue1036SetArgument)
@@ -164,15 +171,19 @@ PHP_METHOD(Stub_Closures, issue1036SetFunction)
 PHP_METHOD(Stub_Closures, issue1036Call)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_function"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("_argument"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 30, &_0, &_1);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/compare.zep.c b/ext/stub/compare.zep.c
index 444c7379e2..361245a0c9 100644
--- a/ext/stub/compare.zep.c
+++ b/ext/stub/compare.zep.c
@@ -100,6 +100,7 @@ PHP_METHOD(Stub_Compare, isMoreThenPi)
  */
 PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL;
 	zval str;
 
@@ -107,6 +108,8 @@ PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	if (UNEXPECTED(Z_TYPE_P(str_param) != IS_STRING && Z_TYPE_P(str_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'str' must be of the type string"));
@@ -115,7 +118,7 @@ PHP_METHOD(Stub_Compare, testVarWithStringEquals)
 	if (EXPECTED(Z_TYPE_P(str_param) == IS_STRING)) {
 		zephir_get_strval(&str, str_param);
 	} else {
-		ZVAL_NULL(&str);
+		ZEPHIR_INIT_VAR(&str);
 	}
 	if (ZEPHIR_IS_STRING_IDENTICAL(&str, "wrong testing")) {
 		ZEPHIR_INIT_NVAR(&str);
diff --git a/ext/stub/concat.zep.c b/ext/stub/concat.zep.c
index 68a7e39702..6e9f5b0f86 100644
--- a/ext/stub/concat.zep.c
+++ b/ext/stub/concat.zep.c
@@ -37,6 +37,7 @@ PHP_METHOD(Stub_Concat, getTestProperty)
 
 PHP_METHOD(Stub_Concat, testConcatBySelfProperty)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *title_param = NULL, _0;
 	zval title;
 
@@ -45,6 +46,8 @@ PHP_METHOD(Stub_Concat, testConcatBySelfProperty)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(title)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &title_param);
 	zephir_get_strval(&title, title_param);
 	ZEPHIR_OBS_NVAR(&_0);
@@ -52,17 +55,22 @@ PHP_METHOD(Stub_Concat, testConcatBySelfProperty)
 	SEPARATE_ZVAL(&title);
 	zephir_concat_function(&title, &_0, &title);
 	zephir_update_static_property_ce(stub_concat_ce, ZEND_STRL("testProperty"), &title);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Concat, testConcat1)
 {
 	zval url, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&url);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&url);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&url);
 	ZVAL_STRING(&url, "test");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SV(&_0, "append", &url);
 	ZEPHIR_CPY_WRT(&url, &_0);
 	RETURN_CCTOR(&url);
@@ -72,16 +80,20 @@ PHP_METHOD(Stub_Concat, testConcat2)
 {
 	zval _1;
 	zval url, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&url);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&url);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&url);
 	ZVAL_STRING(&url, "test");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SVS(&_0, "append", &url, "other");
 	ZEPHIR_CPY_WRT(&url, &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_CONCAT_SS(&_1, "append", "other");
 	ZEPHIR_CPY_WRT(&url, &_1);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -96,12 +108,16 @@ PHP_METHOD(Stub_Concat, testConcat2)
 PHP_METHOD(Stub_Concat, testConcat3)
 {
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "1");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "2");
 	zephir_concat_self(&b, &a);
 	RETURN_CCTOR(&b);
@@ -114,6 +130,7 @@ PHP_METHOD(Stub_Concat, testConcat4)
 {
 	zval query, _1, _3;
 	double min = 0, max = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value, value_sub, _0, _2;
 
 	ZVAL_UNDEF(&value_sub);
@@ -125,16 +142,20 @@ PHP_METHOD(Stub_Concat, testConcat4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
-	ZVAL_NULL(&query);
+	ZEPHIR_INIT_VAR(&query);
 	min =  ((zephir_safe_div_zval_long(value, 100) * (double) (25)));
 	max =  ((zephir_safe_div_zval_long(value, 100) * (double) (50)));
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, max);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_CONCAT_SV(&_1, "SELECT * FROM TEST WHERE value <= ", &_0);
 	zephir_concat_self(&query, &_1);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_DOUBLE(&_2, min);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZEPHIR_CONCAT_SV(&_3, " AND value >= ", &_2);
 	zephir_concat_self(&query, &_3);
 	RETURN_CTOR(&query);
@@ -146,6 +167,7 @@ PHP_METHOD(Stub_Concat, testConcat4)
 PHP_METHOD(Stub_Concat, testConcat5)
 {
 	zval retval, left;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *number_param = NULL, _0;
 	double number;
 
@@ -155,12 +177,15 @@ PHP_METHOD(Stub_Concat, testConcat5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(number)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &number_param);
 	number = zephir_get_doubleval(number_param);
-	ZVAL_NULL(&left);
+	ZEPHIR_INIT_VAR(&left);
 	ZVAL_STRING(&left, "Concatenated string with number ");
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, number);
-	ZVAL_NULL(&retval);
+	ZEPHIR_INIT_VAR(&retval);
 	ZEPHIR_CONCAT_VV(&retval, &left, &_0);
 	RETURN_CTOR(&retval);
 }
diff --git a/ext/stub/constants.zep.c b/ext/stub/constants.zep.c
index 27575716d0..eb47caedf9 100644
--- a/ext/stub/constants.zep.c
+++ b/ext/stub/constants.zep.c
@@ -195,9 +195,13 @@ PHP_METHOD(Stub_Constants, testDirConstant)
 PHP_METHOD(Stub_Constants, testPHPVersionEnvConstantInExpValue)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "PHP_VERSION");
 	RETURN_CCTOR(&a);
 }
@@ -210,9 +214,13 @@ PHP_METHOD(Stub_Constants, testPHPVersionEnvConstantInExpValue)
 PHP_METHOD(Stub_Constants, testStringDelimiterConstantDoubleQuoted)
 {
 	zval delimiter;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&delimiter);
-	ZVAL_NULL(&delimiter);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&delimiter);
 	ZVAL_STRING(&delimiter, ".");
 	RETURN_CCTOR(&delimiter);
 }
@@ -220,9 +228,13 @@ PHP_METHOD(Stub_Constants, testStringDelimiterConstantDoubleQuoted)
 PHP_METHOD(Stub_Constants, testStringConstantWithVars)
 {
 	zval property;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&property);
-	ZVAL_NULL(&property);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&property);
 	ZVAL_STRING(&property, "$SOME/CSRF/KEY$");
 	RETURN_CCTOR(&property);
 }
diff --git a/ext/stub/constructors/issue1803.zep.c b/ext/stub/constructors/issue1803.zep.c
index 7295a1d12a..da0d9eb0a8 100644
--- a/ext/stub/constructors/issue1803.zep.c
+++ b/ext/stub/constructors/issue1803.zep.c
@@ -30,12 +30,17 @@ ZEPHIR_INIT_CLASS(Stub_Constructors_Issue1803)
 PHP_METHOD(Stub_Constructors_Issue1803, Issue1803)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "Value that won't be updated on class init");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("value"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/declaretest.zep.c b/ext/stub/declaretest.zep.c
index 6c008e48f1..0af8801217 100644
--- a/ext/stub/declaretest.zep.c
+++ b/ext/stub/declaretest.zep.c
@@ -30,9 +30,13 @@ ZEPHIR_INIT_CLASS(Stub_DeclareTest)
 PHP_METHOD(Stub_DeclareTest, testStringDeclare1)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "/@(\\w+)(?:\\s*(?:\\(\\s*)?(.*?)(?:\\s*\\))?)??\\s*(?:\n|\\*\\/)/");
 	RETURN_CCTOR(&a);
 }
@@ -40,9 +44,13 @@ PHP_METHOD(Stub_DeclareTest, testStringDeclare1)
 PHP_METHOD(Stub_DeclareTest, testStringDeclare2)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "/(\\w+)\\s*=\\s*(\\[[^\\]]*\\]|\"[^\"]*\"|[^,)]*)\\s*(?:,|$)/");
 	RETURN_CCTOR(&a);
 }
@@ -141,9 +149,13 @@ PHP_METHOD(Stub_DeclareTest, testDeclare13)
 PHP_METHOD(Stub_DeclareTest, testDeclare14)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
 	RETURN_CCTOR(&a);
 }
@@ -151,9 +163,13 @@ PHP_METHOD(Stub_DeclareTest, testDeclare14)
 PHP_METHOD(Stub_DeclareTest, testDeclare15)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_NULL(&a);
 	RETURN_CCTOR(&a);
 }
@@ -161,10 +177,14 @@ PHP_METHOD(Stub_DeclareTest, testDeclare15)
 PHP_METHOD(Stub_DeclareTest, testDeclareMcallExpression)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(&a, this_ptr, "testdeclare14", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&a);
diff --git a/ext/stub/emptytest.zep.c b/ext/stub/emptytest.zep.c
index ba89931d48..d56e14f818 100644
--- a/ext/stub/emptytest.zep.c
+++ b/ext/stub/emptytest.zep.c
@@ -34,9 +34,13 @@ ZEPHIR_INIT_CLASS(Stub_EmptyTest)
 PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayEmpty)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
 }
@@ -44,12 +48,16 @@ PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayEmpty)
 PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayNotEmpty)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -67,9 +75,13 @@ PHP_METHOD(Stub_EmptyTest, testDynamicVarArrayNotEmpty)
 PHP_METHOD(Stub_EmptyTest, testEmptyString)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "");
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
 }
@@ -77,15 +89,20 @@ PHP_METHOD(Stub_EmptyTest, testEmptyString)
 PHP_METHOD(Stub_EmptyTest, testNotEmptyString)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "test string");
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
 }
 
 PHP_METHOD(Stub_EmptyTest, testString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL;
 	zval a;
 
@@ -93,6 +110,8 @@ PHP_METHOD(Stub_EmptyTest, testString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_strval(&a, a_param);
 	RETURN_MM_BOOL(ZEPHIR_IS_EMPTY(&a));
diff --git a/ext/stub/evaltest.zep.c b/ext/stub/evaltest.zep.c
index e001104323..ee8777f820 100644
--- a/ext/stub/evaltest.zep.c
+++ b/ext/stub/evaltest.zep.c
@@ -27,6 +27,7 @@ ZEPHIR_INIT_CLASS(Stub_EvalTest)
 
 PHP_METHOD(Stub_EvalTest, evalCode)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *code_param = NULL;
 	zval code;
 
@@ -34,9 +35,11 @@ PHP_METHOD(Stub_EvalTest, evalCode)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(code)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &code_param);
 	zephir_get_strval(&code, code_param);
 	zephir_eval_php(&code, return_value, "stub/evaltest.zep:7");
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/exception.zep.c b/ext/stub/exception.zep.c
index 6105ba4a74..24bf69dd52 100644
--- a/ext/stub/exception.zep.c
+++ b/ext/stub/exception.zep.c
@@ -34,6 +34,7 @@ ZEPHIR_INIT_CLASS(Stub_Exception)
  */
 PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *message_param = NULL;
 	zval message;
 	zval *this_ptr = getThis();
@@ -42,6 +43,8 @@ PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(message)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &message_param);
 	if (UNEXPECTED(Z_TYPE_P(message_param) != IS_STRING && Z_TYPE_P(message_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'message' must be of the type string"));
@@ -50,8 +53,9 @@ PHP_METHOD(Stub_Exception, testRuntimePropertyFetch)
 	if (EXPECTED(Z_TYPE_P(message_param) == IS_STRING)) {
 		zephir_get_strval(&message, message_param);
 	} else {
-		ZVAL_NULL(&message);
+		ZEPHIR_INIT_VAR(&message);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("message"), &message);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/exceptions.zep.c b/ext/stub/exceptions.zep.c
index cb68a326fb..1fda29a5ef 100644
--- a/ext/stub/exceptions.zep.c
+++ b/ext/stub/exceptions.zep.c
@@ -46,83 +46,108 @@ PHP_METHOD(Stub_Exceptions, testExceptionStringEscape)
 PHP_METHOD(Stub_Exceptions, testException2)
 {
 	zval msg, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&msg);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&msg);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&msg);
 	ZVAL_STRING(&msg, "hello2");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, stub_exception_ce);
 	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 23);
+	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testException3)
 {
 	zval ex, msg;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&ex);
 	ZVAL_UNDEF(&msg);
-	ZVAL_NULL(&msg);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&msg);
 	ZVAL_STRING(&msg, "hello3");
-	ZVAL_NULL(&ex);
+	ZEPHIR_INIT_VAR(&ex);
 	object_init_ex(&ex, stub_exception_ce);
 	ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 31, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&ex, "stub/exceptions.zep", 31);
+	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, getException)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	object_init_ex(return_value, stub_exception_ce);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello4");
 	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 31, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Exceptions, testException4)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "getexception", NULL, 0);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 41);
+	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testException5)
 {
 	zval exception, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&exception);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&exception);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&exception);
 	object_init_ex(&exception, stub_exception_ce);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello5");
 	ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 31, &_0);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&exception, "stub/exceptions.zep", 49);
+	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionLiteral)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *type_param = NULL;
 	zval type;
 
@@ -130,6 +155,8 @@ PHP_METHOD(Stub_Exceptions, testExceptionLiteral)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(type)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &type_param);
 	zephir_get_strval(&type, type_param);
 	do {
@@ -151,10 +178,12 @@ PHP_METHOD(Stub_Exceptions, testExceptionLiteral)
 		}
 	} while(0);
 
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *name_param = NULL, _0, _1;
 	zval name;
@@ -165,18 +194,22 @@ PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "Hello, %s");
 	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 19, &_0, &name);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_1, "stub/exceptions.zep", 68);
+	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionConcat)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *framework_param = NULL, *language_param = NULL;
 	zval framework, language, _0;
 
@@ -187,23 +220,29 @@ PHP_METHOD(Stub_Exceptions, testExceptionConcat)
 		Z_PARAM_STR(framework)
 		Z_PARAM_STR(language)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &framework_param, &language_param);
 	zephir_get_strval(&framework, framework_param);
 	zephir_get_strval(&language, language_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SVSV(&_0, "Framework ", &framework, " written using ", &language);
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 73);
+	ZEPHIR_MM_RESTORE();
 	return;
 }
 
 PHP_METHOD(Stub_Exceptions, testExceptionRethrow)
 {
 	zval e, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "testexception1", NULL, 0);
@@ -212,21 +251,24 @@ PHP_METHOD(Stub_Exceptions, testExceptionRethrow)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_0);
+		ZEPHIR_INIT_VAR(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("Exception"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&e, &_0);
 			zephir_throw_exception_debug(&e, "stub/exceptions.zep", 83);
+			ZEPHIR_MM_RESTORE();
 			return;
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Exceptions, testMultiException)
 {
 	zend_bool _1$$4, _3$$7, _5$$10, _7$$13;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *returnValue, returnValue_sub, *exception, exception_sub, e, f, iexc, exc, _0, _2$$4, _4$$7, _6$$10, _8$$13;
 	zval *this_ptr = getThis();
@@ -246,8 +288,12 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 		Z_PARAM_ZVAL(returnValue)
 		Z_PARAM_ZVAL(exception)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &returnValue, &exception);
+	zephir_memory_observe(&iexc);
 	zephir_read_property(&iexc, this_ptr, ZEND_STRL("internalExceptionCallable"), PH_NOISY_CC);
+	zephir_memory_observe(&exc);
 	zephir_read_property(&exc, this_ptr, ZEND_STRL("exceptionCallable"), PH_NOISY_CC);
 
 	/* try_start_1: */
@@ -257,7 +303,7 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_0);
+		ZEPHIR_INIT_VAR(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_instance_of_ev(&_0, stub_exception_ce)) {
@@ -272,6 +318,7 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 			if (_1$$4) {
 			} else {
 				zephir_throw_exception_debug(&e, "stub/exceptions.zep", 101);
+				ZEPHIR_MM_RESTORE();
 				return;
 			}
 		} else {
@@ -287,6 +334,7 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 				if (_3$$7) {
 				} else {
 					zephir_throw_exception_debug(&e, "stub/exceptions.zep", 108);
+					ZEPHIR_MM_RESTORE();
 					return;
 				}
 			} else {
@@ -302,6 +350,7 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 					if (_5$$10) {
 					} else {
 						zephir_throw_exception_debug(&f, "stub/exceptions.zep", 115);
+						ZEPHIR_MM_RESTORE();
 						return;
 					}
 				} else {
@@ -317,6 +366,7 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 						if (_7$$13) {
 						} else {
 							zephir_throw_exception_debug(&f, "stub/exceptions.zep", 115);
+							ZEPHIR_MM_RESTORE();
 							return;
 						}
 					}
@@ -325,18 +375,21 @@ PHP_METHOD(Stub_Exceptions, testMultiException)
 		}
 	}
 	RETVAL_ZVAL(returnValue, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Exceptions, issue1325)
 {
 	zval e, status, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&status);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
 		ZEPHIR_CALL_METHOD(&status, this_ptr, "donoopexception", NULL, 32);
@@ -345,7 +398,7 @@ PHP_METHOD(Stub_Exceptions, issue1325)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_0);
+		ZEPHIR_INIT_VAR(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("Exception"))) {
diff --git a/ext/stub/factorial.zep.c b/ext/stub/factorial.zep.c
index 4dff8b19c2..6b08b14048 100644
--- a/ext/stub/factorial.zep.c
+++ b/ext/stub/factorial.zep.c
@@ -60,6 +60,7 @@ PHP_METHOD(Stub_Factorial, intIterativeFactorial)
 PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 {
 	zend_bool _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *num_param = NULL, _0, _2, _3;
 	zend_long num, ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
@@ -70,8 +71,10 @@ PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	_1 = num == 0;
 	if (!(_1)) {
 		_1 = num == 1;
diff --git a/ext/stub/fannkuch.zep.c b/ext/stub/fannkuch.zep.c
index 3e67022db7..cd0e4ee587 100644
--- a/ext/stub/fannkuch.zep.c
+++ b/ext/stub/fannkuch.zep.c
@@ -35,6 +35,7 @@ ZEPHIR_INIT_CLASS(Stub_Fannkuch)
 PHP_METHOD(Stub_Fannkuch, process)
 {
 	zend_bool _0, _5$$4, _11$$8;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *n_param = NULL, perm, perm0, perm1, count, temp, _3$$3, _4$$6, _9$$4, _8$$7, _10$$8, _14$$9, _15$$14, _16$$15, _17$$13, _18$$13, _19$$13;
 	zend_long n, maxFlipsCount, permCount, checksum, i = 0, j = 0, flipsCount = 0, k = 0, r = 0, k2 = 0, _1, _2, _6$$4, _7$$4, _12$$8, _13$$8;
 
@@ -57,15 +58,17 @@ PHP_METHOD(Stub_Fannkuch, process)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	maxFlipsCount = 0;
 	permCount = 0;
 	checksum = 0;
-	ZVAL_NULL(&perm);
+	ZEPHIR_INIT_VAR(&perm);
 	array_init(&perm);
-	ZVAL_NULL(&perm1);
+	ZEPHIR_INIT_VAR(&perm1);
 	array_init(&perm1);
-	ZVAL_NULL(&count);
+	ZEPHIR_INIT_VAR(&count);
 	array_init(&count);
 	_2 = n;
 	_1 = 0;
@@ -171,7 +174,7 @@ PHP_METHOD(Stub_Fannkuch, process)
 				ZEPHIR_INIT_NVAR(&_15$$14);
 				ZVAL_LONG(&_15$$14, maxFlipsCount);
 				zephir_array_fast_append(return_value, &_15$$14);
-				return;
+				RETURN_MM();
 			}
 			zephir_array_fetch_long(&perm0, &perm1, 0, PH_NOISY | PH_READONLY, "stub/fannkuch.zep", 75);
 			i = 0;
@@ -197,5 +200,6 @@ PHP_METHOD(Stub_Fannkuch, process)
 		}
 		permCount++;
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/fasta.zep.c b/ext/stub/fasta.zep.c
index 9b74e43571..33621f0e62 100644
--- a/ext/stub/fasta.zep.c
+++ b/ext/stub/fasta.zep.c
@@ -32,6 +32,7 @@ ZEPHIR_INIT_CLASS(Stub_Fasta)
 PHP_METHOD(Stub_Fasta, fastaRepeat)
 {
 	zval _2, _5;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, seqi, i = 0;
 	zval seq;
 	zval *n, n_sub, *seq_param = NULL, len, j, k, l, block, str, lines, _0, _1, _3, _4, _9, _10, _6$$3, _7$$3, _8$$3, _11$$6, _12$$7, _13$$7, _14$$7, _15$$7;
@@ -65,23 +66,26 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 		Z_PARAM_ZVAL(n)
 		Z_PARAM_STR(seq)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &n, &seq_param);
 	zephir_get_strval(&seq, seq_param);
 	seqi = 0;
-	ZVAL_NULL(&len);
+	ZEPHIR_INIT_VAR(&len);
 	ZVAL_LONG(&len, zephir_fast_strlen_ev(&seq));
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_1, ((zephir_get_numberval(&len) * 60) + 1));
 	zephir_create_array(&_0, zephir_get_intval(&_1), 1);
 	zephir_get_arrval(&_2, &_0);
-	ZVAL_NULL(&str);
+	ZEPHIR_INIT_VAR(&str);
 	zephir_fast_join(&str, &seq, &_2);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
+	ZEPHIR_INIT_VAR(&_4);
 	mul_function(&_4, &len, &len);
 	zephir_create_array(&_3, zephir_get_intval(&_4), 1);
 	zephir_get_arrval(&_5, &_3);
 	ZEPHIR_CPY_WRT(&lines, &_5);
-	ZVAL_NULL(&j);
+	ZEPHIR_INIT_VAR(&j);
 	mul_function(&j, &len, &len);
 	i = zephir_get_numberval(&j);
 	while (1) {
@@ -99,12 +103,12 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 	ZEPHIR_INIT_NVAR(&j);
 	ZVAL_LONG(&j, 0);
 	ZVAL_DOUBLE(&_9, zephir_safe_div_zval_long(n, 60));
-	ZVAL_NULL(&l);
+	ZEPHIR_INIT_VAR(&l);
 	ZVAL_DOUBLE(&l, zephir_floor(&_9));
 	ZVAL_DOUBLE(&_10, zephir_safe_div_zval_long(&l, i));
-	ZVAL_NULL(&k);
+	ZEPHIR_INIT_VAR(&k);
 	ZVAL_DOUBLE(&k, zephir_floor(&_10));
-	ZVAL_NULL(&block);
+	ZEPHIR_INIT_VAR(&block);
 	zephir_fast_join_str(&block, SL("\n"), &lines);
 	while (1) {
 		if (!(ZEPHIR_LT(&j, &k))) {
@@ -131,10 +135,11 @@ PHP_METHOD(Stub_Fasta, fastaRepeat)
 		zephir_array_fetch(&_12$$7, &lines, &k, PH_NOISY | PH_READONLY, "stub/fasta.zep", 43);
 		ZVAL_LONG(&_13$$7, 0);
 		ZVAL_DOUBLE(&_14$$7, zephir_safe_mod_zval_long(n, 60));
-		ZVAL_NULL(&_15$$7);
+		ZEPHIR_INIT_VAR(&_15$$7);
 		zephir_substr(&_15$$7, &_12$$7, 0 , zephir_get_intval(&_14$$7), 0);
 		zend_print_zval(&_15$$7, 0);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fasta, fastRandom)
@@ -145,6 +150,7 @@ PHP_METHOD(Stub_Fasta, fastRandom)
 PHP_METHOD(Stub_Fasta, main)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *n, n_sub, alu, iub, homoSap, _1;
 	zval *this_ptr = getThis();
@@ -158,11 +164,13 @@ PHP_METHOD(Stub_Fasta, main)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SSSSSSS(&_0, "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG", "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA", "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT", "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA", "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG", "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC", "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA");
 	ZEPHIR_CPY_WRT(&alu, &_0);
-	ZVAL_NULL(&iub);
+	ZEPHIR_INIT_VAR(&iub);
 	zephir_create_array(&iub, 15, 0);
 	add_assoc_double_ex(&iub, SL("a"), 0.27);
 	add_assoc_double_ex(&iub, SL("c"), 0.12);
@@ -179,7 +187,7 @@ PHP_METHOD(Stub_Fasta, main)
 	add_assoc_double_ex(&iub, SL("V"), 0.02);
 	add_assoc_double_ex(&iub, SL("W"), 0.02);
 	add_assoc_double_ex(&iub, SL("Y"), 0.02);
-	ZVAL_NULL(&homoSap);
+	ZEPHIR_INIT_VAR(&homoSap);
 	zephir_create_array(&homoSap, 4, 0);
 	add_assoc_double_ex(&homoSap, SL("a"), 0.3029549426680);
 	add_assoc_double_ex(&homoSap, SL("c"), 0.1979883004921);
@@ -189,5 +197,6 @@ PHP_METHOD(Stub_Fasta, main)
 	ZVAL_LONG(&_1, (2 * zephir_get_numberval(n)));
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "fastarepeat", NULL, 0, &_1, &alu);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/fcall.zep.c b/ext/stub/fcall.zep.c
index 18c48fa4b5..0dcfea74e0 100644
--- a/ext/stub/fcall.zep.c
+++ b/ext/stub/fcall.zep.c
@@ -40,37 +40,46 @@ ZEPHIR_INIT_CLASS(Stub_Fcall)
 PHP_METHOD(Stub_Fcall, testCall1)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "h");
 	zephir_fast_strpos(return_value, &_0, &_1, 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testCall2)
 {
 	zval _0$$3, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL;
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	while (1) {
 		ZVAL_LONG(&_0$$3, 0);
 		ZVAL_LONG(&_1$$3, 100);
 		ZEPHIR_RETURN_CALL_FUNCTION("mt_rand", &_2, 34, &_0$$3, &_1$$3);
 		zephir_check_call_status();
-		return;
+		RETURN_MM();
 	}
 }
 
 PHP_METHOD(Stub_Fcall, testCall3)
 {
 	zval handle, handle2, buffer, _0, _1, _3$$4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL, *_4 = NULL;
 
@@ -80,9 +89,12 @@ PHP_METHOD(Stub_Fcall, testCall3)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3$$4);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "inputfile.txt");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "r");
 	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 35, &_0, &_1);
 	zephir_check_call_status();
@@ -105,11 +117,13 @@ PHP_METHOD(Stub_Fcall, testCall3)
 		zephir_fclose(&handle);
 		zephir_fclose(&handle2);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, testCall4)
 {
 	zval handle, handle2, buffer, _0, _1, _3$$4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL, *_4 = NULL;
 
@@ -119,9 +133,12 @@ PHP_METHOD(Stub_Fcall, testCall4)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3$$4);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "r");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "inputfile.txt");
 	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 35, &_0, &_1);
 	zephir_check_call_status();
@@ -144,10 +161,12 @@ PHP_METHOD(Stub_Fcall, testCall4)
 		zephir_fclose(&handle);
 		zephir_fclose(&handle2);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, testCall5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 
@@ -157,29 +176,41 @@ PHP_METHOD(Stub_Fcall, testCall5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 23, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testCall6)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 37);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testCall7)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 38);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, zvalFcallWith1Parameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *callback, callback_sub, *param1 = NULL, param1_sub, __$null;
 
@@ -192,6 +223,8 @@ PHP_METHOD(Stub_Fcall, zvalFcallWith1Parameter)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(param1)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &callback, &param1);
 	if (!param1) {
 		param1 = &param1_sub;
@@ -199,10 +232,12 @@ PHP_METHOD(Stub_Fcall, zvalFcallWith1Parameter)
 	}
 	ZEPHIR_CALL_ZVAL_FUNCTION(NULL, callback, NULL, 0, param1);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Fcall, testCall8)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, x;
 
@@ -213,6 +248,8 @@ PHP_METHOD(Stub_Fcall, testCall8)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_CALL_FUNCTION(&x, "str_repeat", NULL, 23, a, b);
 	zephir_check_call_status();
@@ -222,20 +259,24 @@ PHP_METHOD(Stub_Fcall, testCall8)
 PHP_METHOD(Stub_Fcall, testCall1FromVar)
 {
 	zval funcName, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&funcName);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&funcName);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&funcName);
 	ZVAL_STRING(&funcName, "strpos");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "l");
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(&funcName, NULL, 0, &_0, &_1);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testStrtokFalse)
@@ -246,6 +287,7 @@ PHP_METHOD(Stub_Fcall, testStrtokFalse)
 
 PHP_METHOD(Stub_Fcall, testStrtokVarBySlash)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *value, value_sub, _0;
 
@@ -254,12 +296,14 @@ PHP_METHOD(Stub_Fcall, testStrtokVarBySlash)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "/");
 	ZEPHIR_RETURN_CALL_FUNCTION("strtok", NULL, 39, value, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testFunctionGetArgs)
@@ -293,6 +337,7 @@ PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgsAllExtra)
 
 PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param1, param1_sub, *param2, param2_sub, _0, _1, _2;
 
 	ZVAL_UNDEF(&param1_sub);
@@ -304,9 +349,11 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 		Z_PARAM_ZVAL(param1)
 		Z_PARAM_ZVAL(param2)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &param1, &param2);
 	zephir_create_array(return_value, 2, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_1, 0);
 	zephir_get_arg(&_0, zephir_get_intval(&_1));
 	zephir_array_fast_append(return_value, &_0);
@@ -314,18 +361,22 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArg)
 	ZVAL_LONG(&_2, 1);
 	zephir_get_arg(&_0, zephir_get_intval(&_2));
 	zephir_array_fast_append(return_value, &_0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testFunctionGetArgAllExtra)
 {
 	zval _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_create_array(return_value, 2, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_1, 0);
 	zephir_get_arg(&_0, zephir_get_intval(&_1));
 	zephir_array_fast_append(return_value, &_0);
@@ -333,18 +384,22 @@ PHP_METHOD(Stub_Fcall, testFunctionGetArgAllExtra)
 	ZVAL_LONG(&_2, 1);
 	zephir_get_arg(&_0, zephir_get_intval(&_2));
 	zephir_array_fast_append(return_value, &_0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgAllExtra)
 {
 	zval _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_create_array(return_value, 2, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_1, 0);
 	zephir_get_arg(&_0, zephir_get_intval(&_1));
 	zephir_array_fast_append(return_value, &_0);
@@ -352,12 +407,13 @@ PHP_METHOD(Stub_Fcall, testStaticFunctionGetArgAllExtra)
 	ZVAL_LONG(&_2, 1);
 	zephir_get_arg(&_0, zephir_get_intval(&_2));
 	zephir_array_fast_append(return_value, &_0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Fcall, testArrayFill)
 {
 	zval v1, v2, _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_3 = NULL;
 
@@ -366,9 +422,12 @@ PHP_METHOD(Stub_Fcall, testArrayFill)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 5);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "?");
 	ZEPHIR_CALL_FUNCTION(&v1, "array_fill", &_3, 5, &_0, &_1, &_2);
 	zephir_check_call_status();
@@ -381,10 +440,11 @@ PHP_METHOD(Stub_Fcall, testArrayFill)
 	zephir_create_array(return_value, 2, 0);
 	zephir_array_fast_append(return_value, &v1);
 	zephir_array_fast_append(return_value, &v2);
-	return;
+	RETURN_MM();
 }
 
 PHP_FUNCTION(g_stub_zephir_global_method_test) {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str, str_sub, _0;
 		ZVAL_UNDEF(&str_sub);
@@ -392,8 +452,10 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, stub_fcall_ce);
 	if (zephir_has_constructor(&_0)) {
 		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
@@ -402,7 +464,7 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 
 	ZEPHIR_RETURN_CALL_METHOD(&_0, "teststrtokvarbyslash", NULL, 40, str);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_FUNCTION(g_stub_zephir_global_method_with_type_casting) {
@@ -417,6 +479,7 @@ PHP_FUNCTION(g_stub_zephir_global_method_with_type_casting) {
 }
 
 PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *str, str_sub, _0, _1;
 		ZVAL_UNDEF(&str_sub);
@@ -425,8 +488,10 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(str)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, stub_fcall_ce);
 	if (zephir_has_constructor(&_0)) {
 		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
@@ -436,7 +501,7 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 	ZVAL_LONG(&_1, 5);
 	ZEPHIR_RETURN_CALL_METHOD(&_0, "testcall5", NULL, 41, str, &_1);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_FUNCTION(f_Stub_test_call_relative_object_hint) {
diff --git a/ext/stub/fetchtest.zep.c b/ext/stub/fetchtest.zep.c
index 0d2525ac82..c006f98154 100644
--- a/ext/stub/fetchtest.zep.c
+++ b/ext/stub/fetchtest.zep.c
@@ -51,6 +51,7 @@ PHP_METHOD(Stub_FetchTest, getValues)
 
 PHP_METHOD(Stub_FetchTest, testFetchArray1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, *b, b_sub, c;
 
 	ZVAL_UNDEF(&a_sub);
@@ -60,12 +61,16 @@ PHP_METHOD(Stub_FetchTest, testFetchArray1)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a = NULL, a_sub, *b, b_sub;
 
 	ZVAL_UNDEF(&a_sub);
@@ -74,6 +79,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_SEPARATE_PARAM(a);
 	ZEPHIR_OBS_NVAR(a);
@@ -82,6 +89,7 @@ PHP_METHOD(Stub_FetchTest, testFetchArray2)
 
 PHP_METHOD(Stub_FetchTest, testFetchArray3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long b;
 	zval *a, a_sub, *b_param = NULL, c;
 
@@ -91,12 +99,16 @@ PHP_METHOD(Stub_FetchTest, testFetchArray3)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_long_fetch(&c, a, b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long b;
 	zval *a = NULL, a_sub, *b_param = NULL;
 
@@ -105,6 +117,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray4)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_LONG(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	ZEPHIR_SEPARATE_PARAM(a);
 	ZEPHIR_OBS_NVAR(a);
@@ -113,6 +127,7 @@ PHP_METHOD(Stub_FetchTest, testFetchArray4)
 
 PHP_METHOD(Stub_FetchTest, testFetchArray5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval b;
 	zval *a, a_sub, *b_param = NULL, c;
 
@@ -123,13 +138,17 @@ PHP_METHOD(Stub_FetchTest, testFetchArray5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	zephir_get_strval(&b, b_param);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_array_isset_fetch(&c, a, &b, 0));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchArray6)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval b;
 	zval *a = NULL, a_sub, *b_param = NULL;
 
@@ -139,6 +158,8 @@ PHP_METHOD(Stub_FetchTest, testFetchArray6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	ZEPHIR_SEPARATE_PARAM(a);
 	zephir_get_strval(&b, b_param);
@@ -148,6 +169,7 @@ PHP_METHOD(Stub_FetchTest, testFetchArray6)
 
 PHP_METHOD(Stub_FetchTest, testFetchObject1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, *b, b_sub, c;
 
 	ZVAL_UNDEF(&a_sub);
@@ -157,12 +179,16 @@ PHP_METHOD(Stub_FetchTest, testFetchObject1)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
+	zephir_memory_observe(&c);
 	RETURN_MM_BOOL(zephir_fetch_property_zval(&c, a, b, PH_SILENT_CC));
 }
 
 PHP_METHOD(Stub_FetchTest, testFetchObject2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a = NULL, a_sub, *b, b_sub;
 
 	ZVAL_UNDEF(&a_sub);
@@ -171,6 +197,8 @@ PHP_METHOD(Stub_FetchTest, testFetchObject2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_SEPARATE_PARAM(a);
 	ZEPHIR_OBS_NVAR(a);
@@ -179,6 +207,7 @@ PHP_METHOD(Stub_FetchTest, testFetchObject2)
 
 PHP_METHOD(Stub_FetchTest, testFetchPost)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *b, b_sub, _POST, c;
 
 	ZVAL_UNDEF(&b_sub);
@@ -187,8 +216,11 @@ PHP_METHOD(Stub_FetchTest, testFetchPost)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &b);
+	zephir_memory_observe(&c);
 	if (!(zephir_array_isset_fetch(&c, &_POST, b, 0))) {
 		RETURN_MM_BOOL(0);
 	}
@@ -221,6 +253,7 @@ PHP_METHOD(Stub_FetchTest, hasValue)
 
 PHP_METHOD(Stub_FetchTest, getValue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name, name_sub, _POST, value, _0$$3;
 	zval *this_ptr = getThis();
 
@@ -231,8 +264,11 @@ PHP_METHOD(Stub_FetchTest, getValue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &name);
+	zephir_memory_observe(&value);
 	if (!(zephir_array_isset_fetch(&value, &_POST, name, 0))) {
 		ZEPHIR_OBS_NVAR(&value);
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("values"), PH_NOISY_CC | PH_READONLY);
diff --git a/ext/stub/fibonnaci.zep.c b/ext/stub/fibonnaci.zep.c
index 473876aca0..97e83659e4 100644
--- a/ext/stub/fibonnaci.zep.c
+++ b/ext/stub/fibonnaci.zep.c
@@ -66,15 +66,19 @@ PHP_METHOD(Stub_Fibonnaci, fibArray)
 {
 	zend_long i = 0, n = 0, k = 0, j = 0;
 	zval fib, a, b, c, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&fib);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&fib);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&fib);
 	zephir_create_array(&fib, 2, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(&fib, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -104,15 +108,19 @@ PHP_METHOD(Stub_Fibonnaci, fibArray2)
 {
 	zend_long i = 0, n = 0;
 	zval fib, _0, _1$$3, _2$$3, _3$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&fib);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
-	ZVAL_NULL(&fib);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&fib);
 	zephir_create_array(&fib, 2, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 0);
 	zephir_array_fast_append(&fib, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -136,6 +144,7 @@ PHP_METHOD(Stub_Fibonnaci, fibArray2)
 
 PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_2 = NULL;
 	zval *n_param = NULL, _0$$6, _1$$6, _3$$6;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS;
@@ -147,6 +156,8 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	if (n == 0) {
 		RETURN_MM_LONG(0);
@@ -161,13 +172,14 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccirecursive", &_2, 42, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
-			return;
+			RETURN_MM();
 		}
 	}
 }
 
 PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_2 = NULL;
 	zval *n_param = NULL, _0$$6, _1$$6, _3$$6;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS;
@@ -179,6 +191,8 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	if (n == 0) {
 		RETURN_MM_LONG(0);
@@ -193,7 +207,7 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccifinalrecursive", &_2, 43, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
-			return;
+			RETURN_MM();
 		}
 	}
 }
diff --git a/ext/stub/flow.zep.c b/ext/stub/flow.zep.c
index 8b383577aa..93af47654d 100644
--- a/ext/stub/flow.zep.c
+++ b/ext/stub/flow.zep.c
@@ -452,12 +452,15 @@ PHP_METHOD(Stub_Flow, testWhile10)
 {
 	double c = 0;
 	zend_long b = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub;
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_SEPARATE_PARAM(a);
 	b = 0;
@@ -483,6 +486,7 @@ PHP_METHOD(Stub_Flow, testWhile11)
 {
 	double c = 0;
 	zend_long b = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, *d, d_sub;
 
 	ZVAL_UNDEF(&a_sub);
@@ -491,6 +495,8 @@ PHP_METHOD(Stub_Flow, testWhile11)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &d);
 	ZEPHIR_SEPARATE_PARAM(a);
 	b = 0;
@@ -516,10 +522,14 @@ PHP_METHOD(Stub_Flow, testWhile12)
 {
 	zval _0;
 	zval b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "+", "10");
 	ZEPHIR_CPY_WRT(&b, &_0);
 	while (1) {
@@ -537,11 +547,15 @@ PHP_METHOD(Stub_Flow, testWhile13)
 	zval _0;
 	zend_long a;
 	zval b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 5;
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_SS(&_0, "+", "10");
 	ZEPHIR_CPY_WRT(&b, &_0);
 	while (1) {
@@ -563,6 +577,7 @@ PHP_METHOD(Stub_Flow, testDoWhile1)
 
 PHP_METHOD(Stub_Flow, testWhileNextTest)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL, *_3 = NULL;
 	zval *variable, variable_sub, returnValue, _0, _2$$3;
@@ -574,8 +589,10 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &variable);
-	ZVAL_NULL(&returnValue);
+	ZEPHIR_INIT_VAR(&returnValue);
 	array_init(&returnValue);
 	while (1) {
 		ZEPHIR_MAKE_REF(variable);
@@ -594,6 +611,7 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 
 PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL, *_3 = NULL;
 	zval *variable, variable_sub, returnValue, _2, _0$$3;
@@ -605,8 +623,10 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(variable)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &variable);
-	ZVAL_NULL(&returnValue);
+	ZEPHIR_INIT_VAR(&returnValue);
 	array_init(&returnValue);
 	do {
 		ZEPHIR_CALL_FUNCTION(&_0$$3, "current", &_1, 45, variable);
@@ -623,16 +643,20 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 PHP_METHOD(Stub_Flow, testFor1)
 {
 	zval v, b, _0, *_1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, c = 0;
 
 	ZVAL_UNDEF(&v);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	c = 0;
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	zephir_create_array(&b, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&b, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -678,6 +702,7 @@ PHP_METHOD(Stub_Flow, testFor2)
 	zend_ulong _3;
 	double c = 0;
 	zval v, k, b, _0, *_1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&v);
@@ -685,10 +710,13 @@ PHP_METHOD(Stub_Flow, testFor2)
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	c = (double) (0);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	zephir_create_array(&b, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&b, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -740,6 +768,7 @@ PHP_METHOD(Stub_Flow, testFor2)
 PHP_METHOD(Stub_Flow, testFor3)
 {
 	zval v, b, c, _0, *_1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&v);
@@ -747,11 +776,14 @@ PHP_METHOD(Stub_Flow, testFor3)
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	zephir_create_array(&b, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&b, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -796,10 +828,14 @@ PHP_METHOD(Stub_Flow, testFor4)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = 1;
@@ -852,10 +888,14 @@ PHP_METHOD(Stub_Flow, testFor6)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = _2;
@@ -962,10 +1002,14 @@ PHP_METHOD(Stub_Flow, testFor10)
 	zend_bool _0;
 	zend_long c = 0, d = 0, _1, _2;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	c = 1;
 	d = 10;
@@ -995,9 +1039,13 @@ PHP_METHOD(Stub_Flow, testFor11)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	_2 = 'z';
 	_1 = 'a';
 	_0 = 0;
@@ -1023,9 +1071,13 @@ PHP_METHOD(Stub_Flow, testFor12)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	_2 = 'z';
 	_1 = _2;
 	_0 = 0;
@@ -1051,9 +1103,13 @@ PHP_METHOD(Stub_Flow, testFor13)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	_2 = '9';
 	_1 = '0';
 	_0 = 0;
@@ -1079,9 +1135,13 @@ PHP_METHOD(Stub_Flow, testFor14)
 	zend_bool _0;
 	zval b;
 	char a = 0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	_2 = '9';
 	_1 = _2;
 	_0 = 0;
@@ -1140,11 +1200,15 @@ PHP_METHOD(Stub_Flow, testFor16)
 	zend_bool _1;
 	long _0;
 	zval a, b, c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
 	_3 = 10;
 	_2 = 1;
@@ -1177,11 +1241,15 @@ PHP_METHOD(Stub_Flow, testFor17)
 	zend_bool _1;
 	long _0;
 	zval a, b, c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
 	_3 = 10;
 	_2 = _3;
@@ -1214,10 +1282,14 @@ PHP_METHOD(Stub_Flow, testFor18)
 	long _0;
 	zval c, _4$$3;
 	zend_long a = 0, b = 0, _2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_4$$3);
-	ZVAL_NULL(&c);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
 	_3 = 10;
 	_2 = 1;
@@ -1249,10 +1321,14 @@ PHP_METHOD(Stub_Flow, testFor19)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = 1;
@@ -1280,10 +1356,14 @@ PHP_METHOD(Stub_Flow, testFor20)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10;
 	_1 = 1;
@@ -1311,10 +1391,14 @@ PHP_METHOD(Stub_Flow, testFor21)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 1;
 	_1 = 10;
@@ -1342,10 +1426,14 @@ PHP_METHOD(Stub_Flow, testFor22)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 1;
 	_1 = _2;
@@ -1374,10 +1462,14 @@ PHP_METHOD(Stub_Flow, testFor23)
 	zend_bool _0;
 	zval b;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	_2 = 'z';
 	_1 = _2;
 	_0 = 0;
@@ -1405,6 +1497,7 @@ PHP_METHOD(Stub_Flow, testFor24)
 	zval _0;
 	zval b;
 	zval a, _1, *_2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&a);
@@ -1412,10 +1505,13 @@ PHP_METHOD(Stub_Flow, testFor24)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&b);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 'a');
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -1461,13 +1557,17 @@ PHP_METHOD(Stub_Flow, testFor30)
 	zend_long v = 0;
 	zval b;
 	zval a, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
 	for (_0 = 0; _0 < Z_STRLEN_P(&b); _0++) {
 		v = ZEPHIR_STRING_OFFSET(&b, _0);
@@ -1484,13 +1584,17 @@ PHP_METHOD(Stub_Flow, testFor31)
 	zend_long k = 0, v = 0;
 	zval b;
 	zval a, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
 	for (_0 = 0; _0 < Z_STRLEN_P(&b); _0++) {
 		k = _0; 
@@ -1505,6 +1609,7 @@ PHP_METHOD(Stub_Flow, testFor31)
 PHP_METHOD(Stub_Flow, testFor32)
 {
 	long sum;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *e, e_sub, v, *_0, _1;
 
@@ -1514,6 +1619,8 @@ PHP_METHOD(Stub_Flow, testFor32)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(e)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &e);
 	sum = 0;
 	zephir_is_iterable(e, 0, "stub/flow.zep", 703);
@@ -1547,6 +1654,7 @@ PHP_METHOD(Stub_Flow, testFor32)
 PHP_METHOD(Stub_Flow, testFor33)
 {
 	zend_object_iterator *_0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *e, e_sub, v, result;
 
 	ZVAL_UNDEF(&e_sub);
@@ -1555,8 +1663,10 @@ PHP_METHOD(Stub_Flow, testFor33)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(e, zend_ce_iterator)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &e);
-	ZVAL_NULL(&result);
+	ZEPHIR_INIT_VAR(&result);
 	array_init(&result);
 	_0 = zephir_get_iterator(e);
 	_0->funcs->rewind(_0);
@@ -1573,6 +1683,7 @@ PHP_METHOD(Stub_Flow, testFor33)
 PHP_METHOD(Stub_Flow, testFor34)
 {
 	zend_object_iterator *_0$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *e = NULL, e_sub, __$null, v, result;
 
 	ZVAL_UNDEF(&e_sub);
@@ -1584,12 +1695,14 @@ PHP_METHOD(Stub_Flow, testFor34)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(e, zend_ce_iterator)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &e);
 	if (!e) {
 		e = &e_sub;
 		e = &__$null;
 	}
-	ZVAL_NULL(&result);
+	ZEPHIR_INIT_VAR(&result);
 	array_init(&result);
 	if (Z_TYPE_P(e) == IS_OBJECT) {
 		_0$$3 = zephir_get_iterator(e);
@@ -1603,6 +1716,7 @@ PHP_METHOD(Stub_Flow, testFor34)
 		zend_iterator_dtor(_0$$3);
 		RETURN_CCTOR(&result);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow, testFor35Aux)
@@ -1621,12 +1735,16 @@ PHP_METHOD(Stub_Flow, testFor35)
 {
 	zend_bool _0;
 	zval i, _3$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_3$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	_2 = 100;
 	_1 = 1;
 	_0 = 0;
@@ -1669,12 +1787,16 @@ PHP_METHOD(Stub_Flow, testFor36)
 {
 	zend_bool _0;
 	zval i, _3$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_3$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	_2 = 100;
 	_1 = 1;
 	_0 = 0;
@@ -1730,8 +1852,12 @@ PHP_METHOD(Stub_Flow, testFor38)
 	long _0;
 	zval v;
 	zend_long i, _2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&v);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	i = 0;
 	_3 = 10;
 	_2 = 1;
@@ -1763,9 +1889,14 @@ PHP_METHOD(Stub_Flow, testFor39)
 	long _1;
 	char _0;
 	zend_long i;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	i = 0;
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "hello");
 	for (_1 = 0; _1 < Z_STRLEN_P(&_2); _1++) {
 		_0 = ZEPHIR_STRING_OFFSET(&_2, _1);
@@ -1779,11 +1910,15 @@ PHP_METHOD(Stub_Flow, testFor40)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval a, b, _3$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_3$$3);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_LONG(&b, 0);
 	_2 = 10000000;
 	_1 = 1;
@@ -1815,12 +1950,16 @@ PHP_METHOD(Stub_Flow, testUnrechable1)
 	zend_bool c;
 	double b;
 	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&d);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 0;
 	b =  (0.0);
 	c = 0;
-	ZVAL_NULL(&d);
+	ZEPHIR_INIT_VAR(&d);
 	ZVAL_STRING(&d, "");
 	e = '\0';
 	if (a) {
@@ -1838,6 +1977,7 @@ PHP_METHOD(Stub_Flow, testUnrechable1)
 	if (e) {
 		php_printf("%s", "hello true");
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow, testUnrechable2)
@@ -1847,12 +1987,16 @@ PHP_METHOD(Stub_Flow, testUnrechable2)
 	zend_bool c;
 	double b;
 	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&d);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	b =  (1.0);
 	c = 1;
-	ZVAL_NULL(&d);
+	ZEPHIR_INIT_VAR(&d);
 	ZVAL_STRING(&d, "hello");
 	e = 'A';
 	if (a) {
@@ -1880,6 +2024,7 @@ PHP_METHOD(Stub_Flow, testUnrechable2)
 	} else {
 		php_printf("%s", "hello false");
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow, testUnrechable3)
diff --git a/ext/stub/flow/switchflow.zep.c b/ext/stub/flow/switchflow.zep.c
index e86d9fc4fe..6cb6f83fe9 100644
--- a/ext/stub/flow/switchflow.zep.c
+++ b/ext/stub/flow/switchflow.zep.c
@@ -205,6 +205,7 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch12)
 
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0, _1, _2;
 	long a;
@@ -215,6 +216,8 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
@@ -227,10 +230,12 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 		RETURN_MM_LONG(0);
 	} while(0);
 
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch14)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *result_type = NULL, result_type_sub, ret, _0;
 
 	ZVAL_UNDEF(&result_type_sub);
@@ -240,17 +245,19 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch14)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(result_type)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &result_type);
 	if (!result_type) {
 		result_type = &result_type_sub;
-		ZVAL_NULL(result_type);
+		ZEPHIR_INIT_VAR(result_type);
 		ZVAL_LONG(result_type, 1);
 	}
 	do {
-		ZVAL_NULL(&_0);
+		ZEPHIR_INIT_VAR(&_0);
 		ZEPHIR_GET_CONSTANT(&_0, "MYSQL_ASSOC");
 		if (ZEPHIR_IS_LONG(result_type, 1) || ZEPHIR_IS_EQUAL(result_type, &_0) || ZEPHIR_IS_LONG(result_type, 1)) {
-			ZVAL_NULL(&ret);
+			ZEPHIR_INIT_VAR(&ret);
 			ZVAL_STRING(&ret, "aaa");
 			break;
 		}
diff --git a/ext/stub/fortytwo.zep.c b/ext/stub/fortytwo.zep.c
index 77f45bb5be..58c9f2da7f 100644
--- a/ext/stub/fortytwo.zep.c
+++ b/ext/stub/fortytwo.zep.c
@@ -35,6 +35,7 @@ PHP_METHOD(Stub_FortyTwo, proof)
 	zend_bool _4$$3, _8$$6;
 	zval _0;
 	zval box, side, _1, *_2, _3, _7$$4, _11$$7;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i = 0, j = 0, _5$$3, _6$$3, _9$$6, _10$$6;
 
 	ZVAL_UNDEF(&box);
@@ -44,11 +45,14 @@ PHP_METHOD(Stub_FortyTwo, proof)
 	ZVAL_UNDEF(&_7$$4);
 	ZVAL_UNDEF(&_11$$7);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&box);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&box);
 	zephir_create_array(&box, 15, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 10);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -295,5 +299,6 @@ PHP_METHOD(Stub_FortyTwo, proof)
 		}
 	}
 	ZEPHIR_INIT_NVAR(&side);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/functional.zep.c b/ext/stub/functional.zep.c
index 052d7be5cd..4c3d1241c3 100644
--- a/ext/stub/functional.zep.c
+++ b/ext/stub/functional.zep.c
@@ -27,6 +27,7 @@ ZEPHIR_INIT_CLASS(Stub_Functional)
 
 PHP_METHOD(Stub_Functional, map1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0, _1;
 	zval a;
@@ -37,9 +38,11 @@ PHP_METHOD(Stub_Functional, map1)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	zephir_get_arrval(&a, a_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_11__closure_ce, SL("__invoke"));
 	ZEPHIR_CALL_FUNCTION(&_1, "array_map", NULL, 8, &_0, &a);
@@ -49,6 +52,7 @@ PHP_METHOD(Stub_Functional, map1)
 
 PHP_METHOD(Stub_Functional, map2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, *b, b_sub, _0;
 	zval a;
@@ -60,6 +64,8 @@ PHP_METHOD(Stub_Functional, map2)
 		Z_PARAM_ARRAY(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a_param, &b);
 	zephir_get_arrval(&a, a_param);
 	ZEPHIR_CALL_FUNCTION(&_0, "array_map", NULL, 8, b, &a);
diff --git a/ext/stub/functionexists.zep.c b/ext/stub/functionexists.zep.c
index bd3921d1ba..9bc1140528 100644
--- a/ext/stub/functionexists.zep.c
+++ b/ext/stub/functionexists.zep.c
@@ -28,6 +28,7 @@ ZEPHIR_INIT_CLASS(Stub_FunctionExists)
 
 PHP_METHOD(Stub_FunctionExists, testWithPassedName)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *func_param = NULL;
 	zval func;
 
@@ -35,6 +36,8 @@ PHP_METHOD(Stub_FunctionExists, testWithPassedName)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(func)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &func_param);
 	zephir_get_strval(&func, func_param);
 	RETURN_MM_BOOL((zephir_function_exists(&func) == SUCCESS));
@@ -44,6 +47,7 @@ PHP_METHOD(Stub_FunctionExists, testBuiltInFunctions)
 {
 	zval result, functions;
 	zval func, _0, *_1, _2, _3$$3, _4$$4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&func);
@@ -53,11 +57,14 @@ PHP_METHOD(Stub_FunctionExists, testBuiltInFunctions)
 	ZVAL_UNDEF(&_4$$4);
 	ZVAL_UNDEF(&result);
 	ZVAL_UNDEF(&functions);
-	ZVAL_NULL(&result);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&result);
 	array_init(&result);
-	ZVAL_NULL(&functions);
+	ZEPHIR_INIT_VAR(&functions);
 	zephir_create_array(&functions, 8, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "substr");
 	zephir_array_fast_append(&functions, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/functions.zep.c b/ext/stub/functions.zep.c
index 65dbb51356..337bcb96c9 100644
--- a/ext/stub/functions.zep.c
+++ b/ext/stub/functions.zep.c
@@ -31,13 +31,17 @@ ZEPHIR_INIT_CLASS(Stub_Functions)
 PHP_METHOD(Stub_Functions, filterVar1)
 {
 	zval ret, _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&ret);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
@@ -52,13 +56,17 @@ PHP_METHOD(Stub_Functions, filterVar1)
 PHP_METHOD(Stub_Functions, filterVar2)
 {
 	zval ret, _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&ret);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
diff --git a/ext/stub/geometry.zep.c b/ext/stub/geometry.zep.c
index 587b661667..c3cb8b5ef3 100644
--- a/ext/stub/geometry.zep.c
+++ b/ext/stub/geometry.zep.c
@@ -29,6 +29,7 @@ ZEPHIR_INIT_CLASS(Stub_Geometry)
 
 PHP_METHOD(Stub_Geometry, run)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zend_long count, ZEPHIR_LAST_CALL_STATUS, i;
 	zval *list_param = NULL, *count_param = NULL, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3, _8$$3;
@@ -47,6 +48,8 @@ PHP_METHOD(Stub_Geometry, run)
 		Z_PARAM_ARRAY(list)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &list_param, &count_param);
 	zephir_get_arrval(&list, list_param);
 	i = 0;
@@ -66,10 +69,12 @@ PHP_METHOD(Stub_Geometry, run)
 		zephir_check_call_status();
 		i = (i + 1);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Geometry, runOptimize)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zend_long count, ZEPHIR_LAST_CALL_STATUS, i;
 	zval *list_param = NULL, *count_param = NULL, item, _1$$3, _2$$3, _3$$3, _4$$3;
@@ -85,6 +90,8 @@ PHP_METHOD(Stub_Geometry, runOptimize)
 		Z_PARAM_ARRAY(list)
 		Z_PARAM_LONG(count)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &list_param, &count_param);
 	zephir_get_arrval(&list, list_param);
 	i = 0;
@@ -102,6 +109,7 @@ PHP_METHOD(Stub_Geometry, runOptimize)
 		zephir_check_call_status();
 		i++;
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Geometry, distanceStatic)
diff --git a/ext/stub/globals.zep.c b/ext/stub/globals.zep.c
index 6e1e089a42..6ec87aa7a6 100644
--- a/ext/stub/globals.zep.c
+++ b/ext/stub/globals.zep.c
@@ -62,6 +62,7 @@ PHP_METHOD(Stub_Globals, setCharValue)
 
 PHP_METHOD(Stub_Globals, setStringValue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value_param = NULL;
 	zval value;
 
@@ -69,9 +70,12 @@ PHP_METHOD(Stub_Globals, setStringValue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
 	ZEPHIR_GLOBAL(my_setting_5) = ZSTR_VAL(zval_get_string(&value));
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals, setBoolValue)
@@ -100,6 +104,7 @@ PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCacheLevel)
 
 PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCachePrefix)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value_param = NULL;
 	zval value;
 
@@ -107,9 +112,12 @@ PHP_METHOD(Stub_Globals, setDefaultGlobalsOrmCachePrefix)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
 	ZEPHIR_GLOBAL(orm).cache_prefix = ZSTR_VAL(zval_get_string(&value));
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
diff --git a/ext/stub/globals/env.zep.c b/ext/stub/globals/env.zep.c
index 05e23a342e..a4cff5c6af 100644
--- a/ext/stub/globals/env.zep.c
+++ b/ext/stub/globals/env.zep.c
@@ -27,6 +27,7 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Env)
 
 PHP_METHOD(Stub_Globals_Env, read)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, _ENV, _0;
 	zval name;
 
@@ -36,10 +37,12 @@ PHP_METHOD(Stub_Globals_Env, read)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_ENV, SL("_ENV"));
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	if (zephir_array_isset(&_ENV, &name)) {
 		ZEPHIR_OBS_NVAR(&_0);
 		zephir_array_fetch(&_0, &_ENV, &name, PH_NOISY, "stub/globals/env.zep", 8);
diff --git a/ext/stub/globals/post.zep.c b/ext/stub/globals/post.zep.c
index 6c57101e1f..50f34f6058 100644
--- a/ext/stub/globals/post.zep.c
+++ b/ext/stub/globals/post.zep.c
@@ -32,6 +32,7 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Post)
  */
 PHP_METHOD(Stub_Globals_Post, hasValue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, _POST;
 	zval name;
 
@@ -40,6 +41,8 @@ PHP_METHOD(Stub_Globals_Post, hasValue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
diff --git a/ext/stub/globals/server.zep.c b/ext/stub/globals/server.zep.c
index df2dcc8971..d8d0400cbe 100644
--- a/ext/stub/globals/server.zep.c
+++ b/ext/stub/globals/server.zep.c
@@ -15,6 +15,7 @@
 #include "kernel/array.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Globals_Server)
@@ -29,6 +30,7 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Server)
  */
 PHP_METHOD(Stub_Globals_Server, f1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval _SERVER, _0, _1;
 	zval *this_ptr = getThis();
@@ -36,6 +38,8 @@ PHP_METHOD(Stub_Globals_Server, f1)
 	ZVAL_UNDEF(&_SERVER);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 
 	zephir_array_fetch_string(&_0, &_SERVER, SL("PHP_SELF"), PH_NOISY | PH_READONLY, "stub/globals/server.zep", 10);
@@ -44,6 +48,7 @@ PHP_METHOD(Stub_Globals_Server, f1)
 	zephir_check_call_status();
 	zephir_array_fetch_string(&_1, &_SERVER, SL("PHP_SELF"), PH_NOISY | PH_READONLY, "stub/globals/server.zep", 12);
 	zend_print_zval(&_1, 0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals_Server, f2)
diff --git a/ext/stub/globals/serverrequestfactory.zep.c b/ext/stub/globals/serverrequestfactory.zep.c
index aed248712a..395fd41844 100644
--- a/ext/stub/globals/serverrequestfactory.zep.c
+++ b/ext/stub/globals/serverrequestfactory.zep.c
@@ -31,6 +31,7 @@ ZEPHIR_INIT_CLASS(Stub_Globals_ServerRequestFactory)
  */
 PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *server_param = NULL, *get_param = NULL, *post_param = NULL, *cookies_param = NULL, *files_param = NULL, _COOKIE, _FILES, _GET, _POST, _SERVER, _0, _2, _3, _4, _5;
@@ -66,6 +67,8 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 		Z_PARAM_ARRAY_OR_NULL(cookies)
 		Z_PARAM_ARRAY_OR_NULL(files)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 	zephir_get_global(&_POST, SL("_POST"));
 	zephir_get_global(&_GET, SL("_GET"));
@@ -73,39 +76,39 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	zephir_get_global(&_COOKIE, SL("_COOKIE"));
 	zephir_fetch_params(1, 0, 5, &server_param, &get_param, &post_param, &cookies_param, &files_param);
 	if (!server_param) {
-		ZVAL_NULL(&server);
+		ZEPHIR_INIT_VAR(&server);
 	} else {
 		zephir_get_arrval(&server, server_param);
 	}
 	if (!get_param) {
-		ZVAL_NULL(&get);
+		ZEPHIR_INIT_VAR(&get);
 	} else {
 		zephir_get_arrval(&get, get_param);
 	}
 	if (!post_param) {
-		ZVAL_NULL(&post);
+		ZEPHIR_INIT_VAR(&post);
 	} else {
 		zephir_get_arrval(&post, post_param);
 	}
 	if (!cookies_param) {
-		ZVAL_NULL(&cookies);
+		ZEPHIR_INIT_VAR(&cookies);
 	} else {
 		zephir_get_arrval(&cookies, cookies_param);
 	}
 	if (!files_param) {
-		ZVAL_NULL(&files);
+		ZEPHIR_INIT_VAR(&files);
 	} else {
 		zephir_get_arrval(&files, files_param);
 	}
-	ZVAL_NULL(&globalCookies);
+	ZEPHIR_INIT_VAR(&globalCookies);
 	array_init(&globalCookies);
-	ZVAL_NULL(&globalFiles);
+	ZEPHIR_INIT_VAR(&globalFiles);
 	array_init(&globalFiles);
-	ZVAL_NULL(&globalGet);
+	ZEPHIR_INIT_VAR(&globalGet);
 	array_init(&globalGet);
-	ZVAL_NULL(&globalPost);
+	ZEPHIR_INIT_VAR(&globalPost);
 	array_init(&globalPost);
-	ZVAL_NULL(&globalServer);
+	ZEPHIR_INIT_VAR(&globalServer);
 	array_init(&globalServer);
 	if (!(ZEPHIR_IS_EMPTY(&_COOKIE))) {
 		ZEPHIR_CPY_WRT(&globalCookies, &_COOKIE);
@@ -143,7 +146,7 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	zephir_array_update_string(return_value, SL("cookies"), &cookies, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(return_value, SL("get"), &get, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(return_value, SL("post"), &post, PH_COPY | PH_SEPARATE);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -152,6 +155,7 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
  */
 PHP_METHOD(Stub_Globals_ServerRequestFactory, checkNullArray)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval super;
 	zval *source, source_sub, *super_param = NULL;
 
@@ -161,12 +165,14 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, checkNullArray)
 		Z_PARAM_ZVAL(source)
 		Z_PARAM_ARRAY(super)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &source, &super_param);
 	zephir_get_arrval(&super, super_param);
 	if (UNEXPECTED(Z_TYPE_P(source) == IS_NULL)) {
 		RETURN_CTOR(&super);
 	}
 	RETVAL_ZVAL(source, 1, 0);
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/globals/session/base.zep.c b/ext/stub/globals/session/base.zep.c
index a803b5f728..50abeddde5 100644
--- a/ext/stub/globals/session/base.zep.c
+++ b/ext/stub/globals/session/base.zep.c
@@ -28,6 +28,7 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Session_Base)
 
 PHP_METHOD(Stub_Globals_Session_Base, set)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, *value, value_sub, _SESSION;
 	zval index;
 
@@ -38,16 +39,19 @@ PHP_METHOD(Stub_Globals_Session_Base, set)
 		Z_PARAM_STR(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 	zephir_fetch_params(1, 2, 0, &index_param, &value);
 	zephir_get_strval(&index, index_param);
 	zephir_array_update_zval(&_SESSION, &index, value, PH_COPY | PH_SEPARATE);
 	RETVAL_ZVAL(&_SESSION, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, remove)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *index_param = NULL, _SESSION;
 	zval index;
 
@@ -56,14 +60,18 @@ PHP_METHOD(Stub_Globals_Session_Base, remove)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
 	zephir_array_unset(&_SESSION, &index, PH_SEPARATE);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, __set)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *index_param = NULL, *value, value_sub;
 	zval index;
@@ -75,15 +83,18 @@ PHP_METHOD(Stub_Globals_Session_Base, __set)
 		Z_PARAM_STR(index)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &index_param, &value);
 	zephir_get_strval(&index, index_param);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "set", NULL, 0, &index, value);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, __unset)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *index_param = NULL;
 	zval index;
@@ -93,16 +104,20 @@ PHP_METHOD(Stub_Globals_Session_Base, __unset)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &index_param);
 	zephir_get_strval(&index, index_param);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "remove", NULL, 0, &index);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Globals_Session_Base, removeSessionData)
 {
 	zend_string *_4;
 	zend_ulong _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval _SESSION, key, _0, *_1, _2;
 
@@ -110,9 +125,11 @@ PHP_METHOD(Stub_Globals_Session_Base, removeSessionData)
 	ZVAL_UNDEF(&key);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SESSION, SL("_SESSION"));
 
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_is_iterable(&_SESSION, 1, "stub/globals/session/base.zep", 36);
 	if (Z_TYPE_P(&_SESSION) == IS_ARRAY) {
 		ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(&_SESSION), _3, _4, _1)
@@ -148,6 +165,6 @@ PHP_METHOD(Stub_Globals_Session_Base, removeSessionData)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZEPHIR_INIT_NVAR(&key);
 	RETVAL_ZVAL(&_SESSION, 1, 0);
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/globals/session/child.zep.c b/ext/stub/globals/session/child.zep.c
index 48212cb8c9..d57cf6df47 100644
--- a/ext/stub/globals/session/child.zep.c
+++ b/ext/stub/globals/session/child.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Globals_Session_Child)
@@ -25,10 +26,14 @@ ZEPHIR_INIT_CLASS(Stub_Globals_Session_Child)
 
 PHP_METHOD(Stub_Globals_Session_Child, destroy)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "removesessiondata", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/instance.zep.c b/ext/stub/instance.zep.c
index a5d9702163..e6e2a1685f 100644
--- a/ext/stub/instance.zep.c
+++ b/ext/stub/instance.zep.c
@@ -63,13 +63,17 @@ PHP_METHOD(Stub_Instance, __construct)
 PHP_METHOD(Stub_Instance, testIssue1339)
 {
 	zval parameters, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&parameters);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&parameters);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&parameters);
 	zephir_create_array(&parameters, 11, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, stub_arithmetic_ce);
 	if (zephir_has_constructor(&_0)) {
 		ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 0);
@@ -158,11 +162,12 @@ PHP_METHOD(Stub_Instance, testIssue1339)
 	ZVAL_STRING(&_0, "Stub\\Instance");
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance_params(return_value, &_0, &parameters);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Instance, testInstanceCreate)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className_param = NULL;
 	zval className;
@@ -171,10 +176,12 @@ PHP_METHOD(Stub_Instance, testInstanceCreate)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(className)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className_param);
 	zephir_get_strval(&className, className_param);
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(return_value, &className);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/instanceoff.zep.c b/ext/stub/instanceoff.zep.c
index b5131708ed..1c920a2121 100644
--- a/ext/stub/instanceoff.zep.c
+++ b/ext/stub/instanceoff.zep.c
@@ -31,9 +31,13 @@ ZEPHIR_INIT_CLASS(Stub_Instanceoff)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf1)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
 	RETURN_MM_BOOL(zephir_is_instance_of(&a, SL("stdClass")));
 }
@@ -41,10 +45,14 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf1)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf2)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
@@ -57,9 +65,13 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf2)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf3)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init(&a);
 	RETURN_MM_BOOL(zephir_instance_of_ev(&a, stub_unknownclass_ce));
 }
@@ -98,10 +110,14 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf5)
 PHP_METHOD(Stub_Instanceoff, testInstanceOf6)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
@@ -125,6 +141,7 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf7)
 
 PHP_METHOD(Stub_Instanceoff, testInstanceOf8)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *test_param = NULL, a;
 	zval test;
@@ -134,9 +151,11 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf8)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(test)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &test_param);
 	zephir_get_strval(&test, test_param);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_instanceoff_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
@@ -148,6 +167,7 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf8)
 
 PHP_METHOD(Stub_Instanceoff, testInstanceOf9)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval test;
 	zval *a, a_sub, *test_param = NULL;
 
@@ -157,6 +177,8 @@ PHP_METHOD(Stub_Instanceoff, testInstanceOf9)
 		Z_PARAM_OBJECT(a)
 		Z_PARAM_STR(test)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &test_param);
 	zephir_get_strval(&test, test_param);
 	RETURN_MM_BOOL(zephir_is_instance_of(a, Z_STRVAL_P(&test), Z_STRLEN_P(&test)));
diff --git a/ext/stub/interfaces/implementinterface.zep.c b/ext/stub/interfaces/implementinterface.zep.c
index d0841ecb97..0d0fc12b97 100644
--- a/ext/stub/interfaces/implementinterface.zep.c
+++ b/ext/stub/interfaces/implementinterface.zep.c
@@ -28,6 +28,7 @@ ZEPHIR_INIT_CLASS(Stub_Interfaces_ImplementInterface)
 
 PHP_METHOD(Stub_Interfaces_ImplementInterface, get)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *obj, obj_sub;
 
@@ -35,10 +36,12 @@ PHP_METHOD(Stub_Interfaces_ImplementInterface, get)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(obj, stub_interfaces_interfaceint_ce)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &obj);
 	ZEPHIR_RETURN_CALL_METHOD(obj, "get", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Interfaces_ImplementInterface, getVoid)
diff --git a/ext/stub/internalclasses.zep.c b/ext/stub/internalclasses.zep.c
index 9609d532c6..7ef9207c14 100644
--- a/ext/stub/internalclasses.zep.c
+++ b/ext/stub/internalclasses.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_InternalClasses)
@@ -26,11 +27,15 @@ ZEPHIR_INIT_CLASS(Stub_InternalClasses)
 PHP_METHOD(Stub_InternalClasses, testStaticCall)
 {
 	zend_class_entry *_0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	_0 = zephir_fetch_class_str_ex(SL("Phalcon\\Di"), ZEND_FETCH_CLASS_AUTO);
 	ZEPHIR_RETURN_CALL_CE_STATIC(_0, "getdefault", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_InternalClasses, testStaticPropertyFetch)
diff --git a/ext/stub/invoke.zep.c b/ext/stub/invoke.zep.c
index d4ad33ce25..84308c5d2c 100644
--- a/ext/stub/invoke.zep.c
+++ b/ext/stub/invoke.zep.c
@@ -28,13 +28,18 @@ ZEPHIR_INIT_CLASS(Stub_Invoke)
 PHP_METHOD(Stub_Invoke, __construct)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "aaa");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("a"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Invoke, __invoke)
@@ -51,15 +56,19 @@ PHP_METHOD(Stub_Invoke, __invoke)
 PHP_METHOD(Stub_Invoke, test)
 {
 	zval func;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&func);
-	ZVAL_NULL(&func);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&func);
 	object_init_ex(&func, stub_invoke_ce);
 	ZEPHIR_CALL_METHOD(NULL, &func, "__construct", NULL, 49);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(&func, NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/invokes/abstractinvoker.zep.c b/ext/stub/invokes/abstractinvoker.zep.c
index 90ecf058e1..322331a6bd 100644
--- a/ext/stub/invokes/abstractinvoker.zep.c
+++ b/ext/stub/invokes/abstractinvoker.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvoker)
@@ -26,14 +27,18 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvoker)
 PHP_METHOD(Stub_Invokes_AbstractInvoker, __toString)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("text"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "renderarrayelements", NULL, 0, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Invokes_AbstractInvoker, __invoke)
diff --git a/ext/stub/invokes/abstractinvokercomplex.zep.c b/ext/stub/invokes/abstractinvokercomplex.zep.c
index 2476aa592a..3a650429a8 100644
--- a/ext/stub/invokes/abstractinvokercomplex.zep.c
+++ b/ext/stub/invokes/abstractinvokercomplex.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvokerComplex)
@@ -26,14 +27,18 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractInvokerComplex)
 PHP_METHOD(Stub_Invokes_AbstractInvokerComplex, __toString)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("text"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "renderarrayelementscomplex", NULL, 0, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Invokes_AbstractInvokerComplex, __invoke)
diff --git a/ext/stub/invokes/abstractprotected.zep.c b/ext/stub/invokes/abstractprotected.zep.c
index 99cae3786c..8ced3199e3 100644
--- a/ext/stub/invokes/abstractprotected.zep.c
+++ b/ext/stub/invokes/abstractprotected.zep.c
@@ -30,6 +30,7 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_AbstractProtected)
 
 PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL, ret;
 	zval text, _0;
 
@@ -39,9 +40,11 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_VS(&_0, &text, "1");
 	ZEPHIR_CPY_WRT(&ret, &_0);
 	RETURN_CCTOR(&ret);
@@ -49,6 +52,7 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod1)
 
 PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL, ret;
 	zval text, _0;
 
@@ -58,9 +62,11 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CONCAT_VS(&_0, &text, "2");
 	ZEPHIR_CPY_WRT(&ret, &_0);
 	RETURN_CCTOR(&ret);
@@ -69,6 +75,7 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, protectedMethod2)
 PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElements)
 {
 	zval _0, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *text_param = NULL, _1;
 	zval text;
@@ -81,25 +88,28 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElements)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
 	zephir_array_fast_append(&_0, this_ptr);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "protectedMethod2");
 	zephir_array_fast_append(&_0, &_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	zephir_create_array(&_2, 1, 0);
 	zephir_array_fast_append(&_2, &text);
 	ZEPHIR_CALL_USER_FUNC_ARRAY(return_value, &_0, &_2);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElementsComplex)
 {
 	zval elements, _0, _2, _6$$3, _10$$4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *text_param = NULL, item, _1, *_3, _4, _5$$3, _7$$3, _8$$3, _9$$4, _11$$4, _12$$4;
 	zval text, result;
@@ -124,17 +134,19 @@ PHP_METHOD(Stub_Invokes_AbstractProtected, renderArrayElementsComplex)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
-	ZVAL_NULL(&result);
-	ZVAL_NULL(&elements);
+	ZEPHIR_INIT_VAR(&result);
+	ZEPHIR_INIT_VAR(&elements);
 	zephir_create_array(&elements, 2, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "protectedMethod1");
 	zephir_array_fast_append(&_0, &_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	zephir_create_array(&_2, 1, 0);
 	zephir_array_fast_append(&_2, &text);
 	zephir_array_fast_append(&_0, &_2);
diff --git a/ext/stub/invokes/invokeprotected.zep.c b/ext/stub/invokes/invokeprotected.zep.c
index deaf15551a..3ab667916c 100644
--- a/ext/stub/invokes/invokeprotected.zep.c
+++ b/ext/stub/invokes/invokeprotected.zep.c
@@ -26,6 +26,7 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_InvokeProtected)
 
 PHP_METHOD(Stub_Invokes_InvokeProtected, __construct)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL;
 	zval text;
 	zval *this_ptr = getThis();
@@ -34,8 +35,11 @@ PHP_METHOD(Stub_Invokes_InvokeProtected, __construct)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("text"), &text);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/invokes/invokeprotectedcomplex.zep.c b/ext/stub/invokes/invokeprotectedcomplex.zep.c
index 185e685a93..4bc256ca29 100644
--- a/ext/stub/invokes/invokeprotectedcomplex.zep.c
+++ b/ext/stub/invokes/invokeprotectedcomplex.zep.c
@@ -26,6 +26,7 @@ ZEPHIR_INIT_CLASS(Stub_Invokes_InvokeProtectedComplex)
 
 PHP_METHOD(Stub_Invokes_InvokeProtectedComplex, __construct)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *text_param = NULL;
 	zval text;
 	zval *this_ptr = getThis();
@@ -34,8 +35,11 @@ PHP_METHOD(Stub_Invokes_InvokeProtectedComplex, __construct)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(text)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &text_param);
 	zephir_get_strval(&text, text_param);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("text"), &text);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/issettest.zep.c b/ext/stub/issettest.zep.c
index 7ca437a348..b3d775c286 100644
--- a/ext/stub/issettest.zep.c
+++ b/ext/stub/issettest.zep.c
@@ -61,6 +61,7 @@ PHP_METHOD(Stub_IssetTest, testIssetArray2)
 
 PHP_METHOD(Stub_IssetTest, testIssetArray3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval b;
 	zval *a, a_sub, *b_param = NULL;
 
@@ -70,6 +71,8 @@ PHP_METHOD(Stub_IssetTest, testIssetArray3)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_STR(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b_param);
 	zephir_get_strval(&b, b_param);
 	RETURN_MM_BOOL(zephir_array_isset(a, &b));
@@ -140,9 +143,14 @@ PHP_METHOD(Stub_IssetTest, testIssetProperty3)
 PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty1)
 {
 	zval g;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&g);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	zephir_memory_observe(&g);
 	zephir_read_property(&g, this_ptr, ZEND_STRL("s"), PH_NOISY_CC);
 	if (zephir_array_isset_string(&g, SL("a"))) {
 		RETURN_MM_BOOL(1);
@@ -152,6 +160,7 @@ PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty1)
 
 PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *inp, inp_sub, g;
 
 	ZVAL_UNDEF(&inp_sub);
@@ -159,7 +168,10 @@ PHP_METHOD(Stub_IssetTest, testIssetDynamicProperty2)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(inp)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &inp);
+	zephir_memory_observe(&g);
 	zephir_read_property(&g, inp, ZEND_STRL("s"), PH_NOISY_CC);
 	if (zephir_array_isset_string(&g, SL("a"))) {
 		RETURN_MM_BOOL(1);
@@ -171,21 +183,25 @@ zend_object *zephir_init_properties_Stub_IssetTest(zend_class_entry *class_type)
 {
 		zval _1$$3;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("s"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			zephir_create_array(&_1$$3, 1, 0);
 			add_assoc_stringl_ex(&_1$$3, SL("a"), SL("true"));
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("s"), &_1$$3);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/issue1134.zep.c b/ext/stub/issue1134.zep.c
index 597c786d39..595f4ae867 100644
--- a/ext/stub/issue1134.zep.c
+++ b/ext/stub/issue1134.zep.c
@@ -30,6 +30,7 @@ ZEPHIR_INIT_CLASS(Stub_Issue1134)
 
 PHP_METHOD(Stub_Issue1134, __construct)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *config_param = NULL;
 	zval config;
 	zval *this_ptr = getThis();
@@ -39,18 +40,22 @@ PHP_METHOD(Stub_Issue1134, __construct)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(config)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &config_param);
 	if (!config_param) {
-		ZVAL_NULL(&config);
+		ZEPHIR_INIT_VAR(&config);
 		array_init(&config);
 	} else {
 		zephir_get_arrval(&config, config_param);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &config);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Issue1134, arrayWithFilledDefaultValue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someDefaultData_param = NULL;
 	zval someDefaultData;
 
@@ -59,9 +64,11 @@ PHP_METHOD(Stub_Issue1134, arrayWithFilledDefaultValue)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(someDefaultData)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &someDefaultData_param);
 	if (!someDefaultData_param) {
-		ZVAL_NULL(&someDefaultData);
+		ZEPHIR_INIT_VAR(&someDefaultData);
 		array_init(&someDefaultData);
 	} else {
 		zephir_get_arrval(&someDefaultData, someDefaultData_param);
diff --git a/ext/stub/issue1521.zep.c b/ext/stub/issue1521.zep.c
index ffd187025a..796f4122df 100644
--- a/ext/stub/issue1521.zep.c
+++ b/ext/stub/issue1521.zep.c
@@ -28,10 +28,14 @@ ZEPHIR_INIT_CLASS(Stub_Issue1521)
 PHP_METHOD(Stub_Issue1521, test)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
 	add_assoc_stringl_ex(&_0, SL("merchantNumber"), SL("0818217122"));
 	add_assoc_stringl_ex(&_0, SL("zero"), SL("0"));
diff --git a/ext/stub/issue2165/issue.zep.c b/ext/stub/issue2165/issue.zep.c
index 5f66b98253..54b2b02e21 100644
--- a/ext/stub/issue2165/issue.zep.c
+++ b/ext/stub/issue2165/issue.zep.c
@@ -37,6 +37,7 @@ ZEPHIR_INIT_CLASS(Stub_Issue2165_Issue)
 
 PHP_METHOD(Stub_Issue2165_Issue, build)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0;
 	zval a;
@@ -47,9 +48,11 @@ PHP_METHOD(Stub_Issue2165_Issue, build)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &a_param);
 	if (!a_param) {
-		ZVAL_NULL(&a);
+		ZEPHIR_INIT_VAR(&a);
 		array_init(&a);
 	} else {
 		zephir_get_arrval(&a, a_param);
@@ -58,13 +61,14 @@ PHP_METHOD(Stub_Issue2165_Issue, build)
 	ZVAL_BOOL(&_0, 1);
 	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 50, &a, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, __construct)
 {
 	zend_string *_6$$3;
 	zend_ulong _5$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_2 = NULL, *_10 = NULL, *_13 = NULL, *_18 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, m, n;
 	zend_bool validate, _16$$6, _22$$8, _35$$12, _40$$14;
@@ -115,6 +119,8 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(validate)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &a_param, &validate_param);
 	zephir_get_arrval(&a, a_param);
 	if (!validate_param) {
@@ -154,6 +160,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 					ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_13, 53, &_12$$5);
 					zephir_check_call_status();
 					zephir_throw_exception_debug(&_7$$5, "stub/issue2165/issue.zep", 33);
+					ZEPHIR_MM_RESTORE();
 					return;
 				}
 				zephir_is_iterable(&rowA, 0, "stub/issue2165/issue.zep", 44);
@@ -178,6 +185,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							ZEPHIR_CALL_METHOD(NULL, &_19$$7, "__construct", &_13, 53, &_21$$7);
 							zephir_check_call_status();
 							zephir_throw_exception_debug(&_19$$7, "stub/issue2165/issue.zep", 40);
+							ZEPHIR_MM_RESTORE();
 							return;
 						}
 					} ZEND_HASH_FOREACH_END();
@@ -208,6 +216,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_13, 53, &_26$$9);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_24$$9, "stub/issue2165/issue.zep", 40);
+								ZEPHIR_MM_RESTORE();
 								return;
 							}
 						ZEPHIR_CALL_METHOD(NULL, &rowA, "next", NULL, 0);
@@ -245,6 +254,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						ZEPHIR_CALL_METHOD(NULL, &_28$$11, "__construct", &_13, 53, &_32$$11);
 						zephir_check_call_status();
 						zephir_throw_exception_debug(&_28$$11, "stub/issue2165/issue.zep", 33);
+						ZEPHIR_MM_RESTORE();
 						return;
 					}
 					zephir_is_iterable(&rowA, 0, "stub/issue2165/issue.zep", 44);
@@ -269,6 +279,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								ZEPHIR_CALL_METHOD(NULL, &_37$$13, "__construct", &_13, 53, &_39$$13);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_37$$13, "stub/issue2165/issue.zep", 40);
+								ZEPHIR_MM_RESTORE();
 								return;
 							}
 						} ZEND_HASH_FOREACH_END();
@@ -299,6 +310,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 									ZEPHIR_CALL_METHOD(NULL, &_42$$15, "__construct", &_13, 53, &_44$$15);
 									zephir_check_call_status();
 									zephir_throw_exception_debug(&_42$$15, "stub/issue2165/issue.zep", 40);
+									ZEPHIR_MM_RESTORE();
 									return;
 								}
 							ZEPHIR_CALL_METHOD(NULL, &rowA, "next", NULL, 0);
@@ -323,10 +335,12 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 	ZVAL_UNDEF(&_46);
 	ZVAL_LONG(&_46, n);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("n"), &_46);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, quick)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0;
 	zval a;
@@ -337,9 +351,11 @@ PHP_METHOD(Stub_Issue2165_Issue, quick)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &a_param);
 	if (!a_param) {
-		ZVAL_NULL(&a);
+		ZEPHIR_INIT_VAR(&a);
 		array_init(&a);
 	} else {
 		zephir_get_arrval(&a, a_param);
@@ -348,11 +364,12 @@ PHP_METHOD(Stub_Issue2165_Issue, quick)
 	ZVAL_BOOL(&_0, 0);
 	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 50, &a, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, ones)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *m_param = NULL, *n_param = NULL, _0, _1, _2;
 	zend_long m, n, ZEPHIR_LAST_CALL_STATUS;
 
@@ -363,18 +380,21 @@ PHP_METHOD(Stub_Issue2165_Issue, ones)
 		Z_PARAM_LONG(m)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &m_param, &n_param);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, m);
 	ZVAL_LONG(&_2, n);
 	ZEPHIR_RETURN_CALL_SELF("fill", NULL, 0, &_0, &_1, &_2);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, fill)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_8 = NULL, *_17 = NULL;
 	zend_long m, n, ZEPHIR_LAST_CALL_STATUS;
 	zval *value, value_sub, *m_param = NULL, *n_param = NULL, _1, _14, _15, _16, _18, _2$$3, _3$$3, _4$$3, _5$$4, _6$$4, _7$$4, _9$$4, _10$$5, _11$$5, _12$$5, _13$$5;
@@ -401,6 +421,8 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		Z_PARAM_LONG(m)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &value, &m_param, &n_param);
 	_0 = !(Z_TYPE_P(value) == IS_LONG);
 	if (_0) {
@@ -409,41 +431,44 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		_0 = !zephir_is_true(&_1);
 	}
 	if (UNEXPECTED(_0)) {
-		ZVAL_NULL(&_2$$3);
+		ZEPHIR_INIT_VAR(&_2$$3);
 		object_init_ex(&_2$$3, spl_ce_InvalidArgumentException);
-		ZVAL_NULL(&_3$$3);
+		ZEPHIR_INIT_VAR(&_3$$3);
 		zephir_gettype(&_3$$3, value);
-		ZVAL_NULL(&_4$$3);
+		ZEPHIR_INIT_VAR(&_4$$3);
 		ZEPHIR_CONCAT_SSVS(&_4$$3, "Value must be an", " integer or floating point number, ", &_3$$3, " given.");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 53, &_4$$3);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_2$$3, "stub/issue2165/issue.zep", 68);
+		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	if (UNEXPECTED(m < 1)) {
-		ZVAL_NULL(&_5$$4);
+		ZEPHIR_INIT_VAR(&_5$$4);
 		object_init_ex(&_5$$4, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_6$$4, m);
 		ZEPHIR_CALL_FUNCTION(&_7$$4, "strval", &_8, 52, &_6$$4);
 		zephir_check_call_status();
-		ZVAL_NULL(&_9$$4);
+		ZEPHIR_INIT_VAR(&_9$$4);
 		ZEPHIR_CONCAT_SSVS(&_9$$4, "M must be", " greater than 0, ", &_7$$4, " given.");
 		ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 53, &_9$$4);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_5$$4, "stub/issue2165/issue.zep", 73);
+		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	if (UNEXPECTED(n < 1)) {
-		ZVAL_NULL(&_10$$5);
+		ZEPHIR_INIT_VAR(&_10$$5);
 		object_init_ex(&_10$$5, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_11$$5, n);
 		ZEPHIR_CALL_FUNCTION(&_12$$5, "strval", &_8, 52, &_11$$5);
 		zephir_check_call_status();
-		ZVAL_NULL(&_13$$5);
+		ZEPHIR_INIT_VAR(&_13$$5);
 		ZEPHIR_CONCAT_SSVS(&_13$$5, "N must be", " greater than 0, ", &_12$$5, " given.");
 		ZEPHIR_CALL_METHOD(NULL, &_10$$5, "__construct", NULL, 53, &_13$$5);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_10$$5, "stub/issue2165/issue.zep", 78);
+		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZVAL_LONG(&_14, 0);
@@ -456,30 +481,35 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_SELF("quick", NULL, 0, &_18);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, reciprocal)
 {
 	zval _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("m"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("n"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CALL_SELF(&_0, "ones", NULL, 0, &_1, &_2);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_0, "dividematrix", NULL, 0, this_ptr);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Issue2165_Issue, divideMatrix)
 {
 	zval c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *b, b_sub;
 
@@ -488,11 +518,13 @@ PHP_METHOD(Stub_Issue2165_Issue, divideMatrix)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_OBJECT_OF_CLASS(b, stub_issue2165_issue_ce)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	array_init(&c);
 	ZEPHIR_RETURN_CALL_SELF("quick", NULL, 0, &c);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/issue663.zep.c b/ext/stub/issue663.zep.c
index 05f24544ba..b893c65ca7 100644
--- a/ext/stub/issue663.zep.c
+++ b/ext/stub/issue663.zep.c
@@ -29,6 +29,7 @@ ZEPHIR_INIT_CLASS(Stub_Issue663)
 PHP_METHOD(Stub_Issue663, is_array_assoc)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zval *arr, arr_sub;
@@ -37,6 +38,8 @@ PHP_METHOD(Stub_Issue663, is_array_assoc)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr);
 	_0 = !(Z_TYPE_P(arr) == IS_ARRAY);
 	if (!(_0)) {
@@ -47,13 +50,14 @@ PHP_METHOD(Stub_Issue663, is_array_assoc)
 	}
 	ZEPHIR_RETURN_CALL_STATIC("is_array_assoc_internal", &_1, 55, arr);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Issue663, is_array_assoc_internal)
 {
 	zend_bool _0;
 	zend_long count = 0, i = 0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arr_param = NULL;
 	zval arr;
 
@@ -61,6 +65,8 @@ PHP_METHOD(Stub_Issue663, is_array_assoc_internal)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(arr)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr_param);
 	zephir_get_arrval(&arr, arr_param);
 	count = zephir_fast_count_int(&arr);
@@ -89,6 +95,7 @@ PHP_METHOD(Stub_Issue663, is_array_assoc_internal)
 PHP_METHOD(Stub_Issue663, is_array_indexed)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_2 = NULL;
 	zval *arr, arr_sub, _1;
@@ -98,6 +105,8 @@ PHP_METHOD(Stub_Issue663, is_array_indexed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arr)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr);
 	_0 = !(Z_TYPE_P(arr) == IS_ARRAY);
 	if (!(_0)) {
diff --git a/ext/stub/issue887.zep.c b/ext/stub/issue887.zep.c
index 8e1e96f42b..32ae199025 100644
--- a/ext/stub/issue887.zep.c
+++ b/ext/stub/issue887.zep.c
@@ -31,12 +31,17 @@ ZEPHIR_INIT_CLASS(Stub_Issue887)
 PHP_METHOD(Stub_Issue887, __construct)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("data"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Issue887, add)
@@ -63,9 +68,14 @@ PHP_METHOD(Stub_Issue887, fetch_array)
 PHP_METHOD(Stub_Issue887, fetch_object)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("data"), PH_NOISY_CC);
 	zephir_convert_to_object(&_0);
 	RETURN_CCTOR(&_0);
diff --git a/ext/stub/issue914.zep.c b/ext/stub/issue914.zep.c
index 22b5cbed16..323c873352 100644
--- a/ext/stub/issue914.zep.c
+++ b/ext/stub/issue914.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Issue914)
@@ -25,8 +26,13 @@ ZEPHIR_INIT_CLASS(Stub_Issue914)
 
 PHP_METHOD(Stub_Issue914, __construct)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_PARENT(NULL, stub_issue914_ce, getThis(), "__construct", NULL, 0);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/issues.zep.c b/ext/stub/issues.zep.c
index fd6e9a6690..b740ee6a3d 100644
--- a/ext/stub/issues.zep.c
+++ b/ext/stub/issues.zep.c
@@ -40,6 +40,7 @@ PHP_METHOD(Stub_Issues, setAdapter)
 
 PHP_METHOD(Stub_Issues, someMethod)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *methodName, methodName_sub, _0;
 	zval *this_ptr = getThis();
@@ -49,11 +50,13 @@ PHP_METHOD(Stub_Issues, someMethod)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(methodName)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &methodName);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("adapter"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_RETURN_CALL_METHOD_ZVAL(&_0, methodName, NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Issues, test)
diff --git a/ext/stub/json.zep.c b/ext/stub/json.zep.c
index 01d6cce674..e32e124cb8 100644
--- a/ext/stub/json.zep.c
+++ b/ext/stub/json.zep.c
@@ -29,26 +29,34 @@ ZEPHIR_INIT_CLASS(Stub_Json)
 PHP_METHOD(Stub_Json, testEncodeObject)
 {
 	zval obj;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&obj);
-	ZVAL_NULL(&obj);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&obj);
 	zephir_create_array(&obj, 3, 0);
 	add_assoc_stringl_ex(&obj, SL("a"), SL("hello"));
 	add_assoc_stringl_ex(&obj, SL("b"), SL("world"));
 	add_assoc_long_ex(&obj, SL("c"), 128);
 	zephir_json_encode(return_value, &obj, 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Json, testEncodeArray)
 {
 	zval arr, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&arr);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&arr);
 	zephir_create_array(&arr, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&arr, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -58,19 +66,23 @@ PHP_METHOD(Stub_Json, testEncodeArray)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&arr, &_0);
 	zephir_json_encode(return_value, &arr, 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Json, testEncodeOptions)
 {
 	zval arr, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&arr);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&arr);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&arr);
 	zephir_create_array(&arr, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "<foo>");
 	zephir_array_fast_append(&arr, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -84,40 +96,52 @@ PHP_METHOD(Stub_Json, testEncodeOptions)
 	zephir_array_fast_append(&arr, &_0);
 	ZVAL_LONG(&_1, 1);
 	zephir_json_encode(return_value, &arr, zephir_get_intval(&_1) );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Json, testDecodeObject)
 {
 	zval obj;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&obj);
-	ZVAL_NULL(&obj);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&obj);
 	ZVAL_STRING(&obj, "{\"a\":\"hello\",\"b\":\"world\",\"c\":128}");
 	zephir_json_decode(return_value, &obj, 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Json, testDecodeObject2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, obj;
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&obj);
-	ZVAL_NULL(&obj);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&obj);
 	ZVAL_STRING(&obj, "{\"a\":\"hello\",\"b\":\"world\",\"c\":128}");
 	zephir_json_decode(return_value, &obj, zephir_get_intval(&__$true) );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Json, testDecodeArray)
 {
 	zval arr;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&arr);
-	ZVAL_NULL(&arr);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&arr);
 	ZVAL_STRING(&arr, "[1,2,3]");
 	zephir_json_decode(return_value, &arr, 0 );
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
index d5141213aa..0c76f049c1 100644
--- a/ext/stub/mcall.zep.c
+++ b/ext/stub/mcall.zep.c
@@ -103,33 +103,46 @@ PHP_METHOD(Stub_Mcall, testMethod7)
 
 PHP_METHOD(Stub_Mcall, testCall1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 56);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -140,14 +153,17 @@ PHP_METHOD(Stub_Mcall, testCall4)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -158,14 +174,17 @@ PHP_METHOD(Stub_Mcall, testCall5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall6)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -176,14 +195,17 @@ PHP_METHOD(Stub_Mcall, testCall6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 57, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall7)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, _0, _2;
@@ -197,17 +219,20 @@ PHP_METHOD(Stub_Mcall, testCall7)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod4", &_1, 0, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "testmethod4", &_1, 0, a, b);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_2);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall8)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, _0, _2;
@@ -221,17 +246,20 @@ PHP_METHOD(Stub_Mcall, testCall8)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod5", &_1, 0, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_2, this_ptr, "testmethod5", &_1, 0, a, b);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_2);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall9)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub, _0, _1;
 	zval *this_ptr = getThis();
@@ -244,44 +272,59 @@ PHP_METHOD(Stub_Mcall, testCall9)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod6", NULL, 57, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_1);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall10)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall11)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall12)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 56);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall13)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -292,14 +335,17 @@ PHP_METHOD(Stub_Mcall, testCall13)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall14)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -310,14 +356,17 @@ PHP_METHOD(Stub_Mcall, testCall14)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall15)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 	zval *this_ptr = getThis();
@@ -328,14 +377,17 @@ PHP_METHOD(Stub_Mcall, testCall15)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 57, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall16)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *c, c_sub, *d, d_sub;
 	zval *this_ptr = getThis();
@@ -346,14 +398,17 @@ PHP_METHOD(Stub_Mcall, testCall16)
 		Z_PARAM_ZVAL(c)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &c, &d);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, c, d);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall17)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *c, c_sub, *d, d_sub;
 	zval *this_ptr = getThis();
@@ -364,19 +419,25 @@ PHP_METHOD(Stub_Mcall, testCall17)
 		Z_PARAM_ZVAL(c)
 		Z_PARAM_ZVAL(d)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &c, &d);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod4", NULL, 0, c, d);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCall18)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 58);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testMethod19)
@@ -395,6 +456,7 @@ PHP_METHOD(Stub_Mcall, testMethod19)
 PHP_METHOD(Stub_Mcall, testCall20)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
@@ -407,6 +469,8 @@ PHP_METHOD(Stub_Mcall, testCall20)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	j = 0;
 	_2 = k;
@@ -447,6 +511,7 @@ PHP_METHOD(Stub_Mcall, testMethod21)
 PHP_METHOD(Stub_Mcall, testCall22)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
@@ -459,6 +524,8 @@ PHP_METHOD(Stub_Mcall, testCall22)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	j = 0;
 	_2 = k;
@@ -485,6 +552,7 @@ PHP_METHOD(Stub_Mcall, testCall22)
 
 PHP_METHOD(Stub_Mcall, optionalRequereString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param_param = NULL;
 	zval param;
 
@@ -492,6 +560,8 @@ PHP_METHOD(Stub_Mcall, optionalRequereString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(param)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &param_param);
 	if (UNEXPECTED(Z_TYPE_P(param_param) != IS_STRING && Z_TYPE_P(param_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param' must be of the type string"));
@@ -500,13 +570,14 @@ PHP_METHOD(Stub_Mcall, optionalRequereString)
 	if (EXPECTED(Z_TYPE_P(param_param) == IS_STRING)) {
 		zephir_get_strval(&param, param_param);
 	} else {
-		ZVAL_NULL(&param);
+		ZEPHIR_INIT_VAR(&param);
 	}
 	RETURN_CTOR(&param);
 }
 
 PHP_METHOD(Stub_Mcall, optionalParameterString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param_param = NULL;
 	zval param;
 
@@ -515,9 +586,11 @@ PHP_METHOD(Stub_Mcall, optionalParameterString)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(param)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &param_param);
 	if (!param_param) {
-		ZVAL_NULL(&param);
+		ZEPHIR_INIT_VAR(&param);
 		ZVAL_STRING(&param, "test string");
 	} else {
 		zephir_get_strval(&param, param_param);
@@ -527,6 +600,7 @@ PHP_METHOD(Stub_Mcall, optionalParameterString)
 
 PHP_METHOD(Stub_Mcall, optionalParameterStringNull)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param_param = NULL;
 	zval param;
 
@@ -536,9 +610,11 @@ PHP_METHOD(Stub_Mcall, optionalParameterStringNull)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(param)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &param_param);
 	if (!param_param) {
-		ZVAL_NULL(&param);
+		ZEPHIR_INIT_VAR(&param);
 	} else {
 		zephir_get_strval(&param, param_param);
 	}
@@ -666,6 +742,7 @@ PHP_METHOD(Stub_Mcall, optionalParameterBooleanNull)
  */
 PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultEmptyArray)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *driverOptions_param = NULL;
 	zval driverOptions;
 
@@ -674,9 +751,11 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultEmptyArray)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &driverOptions_param);
 	if (!driverOptions_param) {
-		ZVAL_NULL(&driverOptions);
+		ZEPHIR_INIT_VAR(&driverOptions);
 		array_init(&driverOptions);
 	} else {
 		zephir_get_arrval(&driverOptions, driverOptions_param);
@@ -686,6 +765,7 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultEmptyArray)
 
 PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultNullValue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *driverOptions_param = NULL;
 	zval driverOptions;
 
@@ -695,9 +775,11 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultNullValue)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY_OR_NULL(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &driverOptions_param);
 	if (!driverOptions_param) {
-		ZVAL_NULL(&driverOptions);
+		ZEPHIR_INIT_VAR(&driverOptions);
 	} else {
 		zephir_get_arrval(&driverOptions, driverOptions_param);
 	}
@@ -706,6 +788,7 @@ PHP_METHOD(Stub_Mcall, testArrayParamWithDefaultNullValue)
 
 PHP_METHOD(Stub_Mcall, testArrayParam)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *driverOptions_param = NULL;
 	zval driverOptions;
 
@@ -713,6 +796,8 @@ PHP_METHOD(Stub_Mcall, testArrayParam)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(driverOptions)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &driverOptions_param);
 	zephir_get_arrval(&driverOptions, driverOptions_param);
 	RETURN_CTOR(&driverOptions);
@@ -753,60 +838,72 @@ PHP_METHOD(Stub_Mcall, bb)
 PHP_METHOD(Stub_Mcall, testCallablePass)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_oo_ooparams_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_12__closure_ce, SL("__invoke"));
 	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 60, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, testCallableArrayThisMethodPass)
 {
 	zval _0;
 	zval a, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_oo_ooparams_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
 	zephir_array_fast_append(&_0, this_ptr);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "bb");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 60, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall, aa)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	object_init_ex(&a, stub_mcall_ce);
 	if (zephir_has_constructor(&a)) {
 		ZEPHIR_CALL_METHOD(NULL, &a, "__construct", NULL, 0);
@@ -815,7 +912,7 @@ PHP_METHOD(Stub_Mcall, aa)
 
 	ZEPHIR_RETURN_CALL_METHOD(&a, "bb", NULL, 61);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -824,6 +921,7 @@ PHP_METHOD(Stub_Mcall, aa)
 PHP_METHOD(Stub_Mcall, issue1136)
 {
 	zval _finfo, _0, _1, _2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_finfo);
@@ -831,16 +929,19 @@ PHP_METHOD(Stub_Mcall, issue1136)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_GET_CONSTANT(&_0, "PHP_VERSION");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "8.0.0");
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, ">=");
 	ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 62, &_0, &_1, &_2);
 	zephir_check_call_status();
 	if (zephir_is_true(&_3)) {
-		ZVAL_NULL(&_finfo);
+		ZEPHIR_INIT_VAR(&_finfo);
 		object_init_ex(&_finfo, zephir_get_internal_ce(SL("finfo")));
 		ZEPHIR_CALL_METHOD(NULL, &_finfo, "__construct", NULL, 0);
 		zephir_check_call_status();
diff --git a/ext/stub/mcall/caller.zep.c b/ext/stub/mcall/caller.zep.c
index bca429cc0c..a410c8a126 100644
--- a/ext/stub/mcall/caller.zep.c
+++ b/ext/stub/mcall/caller.zep.c
@@ -26,6 +26,7 @@ ZEPHIR_INIT_CLASS(Stub_Mcall_Caller)
 
 PHP_METHOD(Stub_Mcall_Caller, start)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *f, f_sub;
 
@@ -33,10 +34,12 @@ PHP_METHOD(Stub_Mcall_Caller, start)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(f)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &f);
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(f, NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Mcall_Caller, perform)
diff --git a/ext/stub/mcallchained.zep.c b/ext/stub/mcallchained.zep.c
index ce4d73f0e0..457322fee5 100644
--- a/ext/stub/mcallchained.zep.c
+++ b/ext/stub/mcallchained.zep.c
@@ -49,65 +49,81 @@ PHP_METHOD(Stub_McallChained, testMethod3)
 PHP_METHOD(Stub_McallChained, testChained1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_0, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_McallChained, testChained2)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod3", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_1, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_McallChained, testChained3)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 64);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod2", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_1, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_McallChained, testChained4)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_update_property_zval(this_ptr, ZEND_STRL("temp"), this_ptr);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("temp"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(&_1, "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/mcalldynamic.zep.c b/ext/stub/mcalldynamic.zep.c
index 14855f3674..e950c69837 100644
--- a/ext/stub/mcalldynamic.zep.c
+++ b/ext/stub/mcalldynamic.zep.c
@@ -38,21 +38,26 @@ PHP_METHOD(Stub_McallDynamic, testMethod1)
 PHP_METHOD(Stub_McallDynamic, testMagicCall1)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(&_0, this_ptr, "method1", NULL, 0);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "method1", NULL, 0);
 	zephir_check_call_status();
 	zephir_add_function(return_value, &_0, &_1);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_McallDynamic, __call)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *method, method_sub, *arguments, arguments_sub, realMethod;
 	zval *this_ptr = getThis();
@@ -64,12 +69,14 @@ PHP_METHOD(Stub_McallDynamic, __call)
 		Z_PARAM_ZVAL(method)
 		Z_PARAM_ZVAL(arguments)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &method, &arguments);
-	ZVAL_NULL(&realMethod);
+	ZEPHIR_INIT_VAR(&realMethod);
 	ZEPHIR_CONCAT_SV(&realMethod, "test", method);
 	ZEPHIR_RETURN_CALL_METHOD_ZVAL(this_ptr, &realMethod, NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -78,11 +85,15 @@ PHP_METHOD(Stub_McallDynamic, __call)
 PHP_METHOD(Stub_McallDynamic, testCallAnonymousFunctionWithContext)
 {
 	zval result, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&result);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_13__closure_ce, SL("__invoke"));
 	ZEPHIR_CALL_CE_STATIC(&result, stub_mcall_caller_ce, "start", NULL, 0, &_0);
diff --git a/ext/stub/mcallinternal.zep.c b/ext/stub/mcallinternal.zep.c
index 4d9ba84cbe..957303df3e 100644
--- a/ext/stub/mcallinternal.zep.c
+++ b/ext/stub/mcallinternal.zep.c
@@ -32,8 +32,12 @@ ZEPHIR_INIT_CLASS(Stub_McallInternal)
 void zep_Stub_McallInternal_a(int ht, zend_execute_data *execute_data, zval *return_value, zval *this_ptr, int return_value_used)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -69,9 +73,13 @@ void zep_Stub_McallInternal_c(int ht, zend_execute_data *execute_data, zval *ret
 PHP_METHOD(Stub_McallInternal, e)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
 	RETURN_MM_LONG(zephir_fast_strlen_ev(&_0));
 }
@@ -80,10 +88,14 @@ PHP_METHOD(Stub_McallInternal, d)
 {
 	zval _3$$3;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a, i = 0, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 0;
 	_2 = 1000000;
 	_1 = 0;
@@ -111,11 +123,15 @@ PHP_METHOD(Stub_McallInternal, f)
 {
 	zval _3$$3;
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a, i = 0, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 0;
 	_2 = 1000000;
 	_1 = 0;
@@ -144,12 +160,16 @@ PHP_METHOD(Stub_McallInternal, g)
 	zval _3$$3, _4$$3, _5$$3;
 	zend_bool _0;
 	long i = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
 	ZVAL_UNDEF(&_5$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 0;
 	_2 = 1000;
 	_1 = 0;
@@ -195,12 +215,16 @@ PHP_METHOD(Stub_McallInternal, callFibonacci)
 	zend_bool _0;
 	long i;
 	double p;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
 	ZVAL_UNDEF(&_5$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	p = (double) (0);
 	i = 0;
 	_2 = 10000000;
@@ -235,10 +259,14 @@ void zep_Stub_McallInternal_test1956(int ht, zend_execute_data *execute_data, zv
 
 PHP_METHOD(Stub_McallInternal, issue1956)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_INTERNAL_METHOD_P0(this_ptr, zep_Stub_McallInternal_test1956);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/methodabstract.zep.c b/ext/stub/methodabstract.zep.c
index f57abda735..0655eafb25 100644
--- a/ext/stub/methodabstract.zep.c
+++ b/ext/stub/methodabstract.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_MethodAbstract)
@@ -26,9 +27,14 @@ ZEPHIR_INIT_CLASS(Stub_MethodAbstract)
 
 PHP_METHOD(Stub_MethodAbstract, testInterfaceMetho)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "testmethod", NULL, 0);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/methodargs.zep.c b/ext/stub/methodargs.zep.c
index 4aa99f4593..87f8a25efc 100644
--- a/ext/stub/methodargs.zep.c
+++ b/ext/stub/methodargs.zep.c
@@ -117,6 +117,7 @@ PHP_METHOD(Stub_MethodArgs, setResourceStrict)
  */
 PHP_METHOD(Stub_MethodArgs, methodOptionalValueWithDefaultStaticConstantAccess)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *method = NULL, method_sub;
 
 	ZVAL_UNDEF(&method_sub);
@@ -124,14 +125,16 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalValueWithDefaultStaticConstantAccess)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(method)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &method);
 	if (!method) {
 		method = &method_sub;
-		ZVAL_NULL(method);
+		ZEPHIR_INIT_VAR(method);
 		ZVAL_STRING(method, "get");
 	}
 	RETVAL_ZVAL(method, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -140,6 +143,7 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalValueWithDefaultStaticConstantAccess)
  */
 PHP_METHOD(Stub_MethodArgs, methodOptionalStringValueWithDefaultStaticConstantAccess)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *parameter_param = NULL;
 	zval parameter;
 
@@ -148,9 +152,11 @@ PHP_METHOD(Stub_MethodArgs, methodOptionalStringValueWithDefaultStaticConstantAc
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(parameter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &parameter_param);
 	if (!parameter_param) {
-		ZVAL_NULL(&parameter);
+		ZEPHIR_INIT_VAR(&parameter);
 		ZVAL_STRING(&parameter, "get");
 	} else {
 		zephir_get_strval(&parameter, parameter_param);
diff --git a/ext/stub/nativearray.zep.c b/ext/stub/nativearray.zep.c
index 394c524a84..3dce329270 100644
--- a/ext/stub/nativearray.zep.c
+++ b/ext/stub/nativearray.zep.c
@@ -33,9 +33,13 @@ ZEPHIR_INIT_CLASS(Stub_NativeArray)
 PHP_METHOD(Stub_NativeArray, testArray1)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	RETURN_CCTOR(&a);
 }
@@ -43,12 +47,16 @@ PHP_METHOD(Stub_NativeArray, testArray1)
 PHP_METHOD(Stub_NativeArray, testArray2)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -63,12 +71,16 @@ PHP_METHOD(Stub_NativeArray, testArray2)
 PHP_METHOD(Stub_NativeArray, testArray3)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, 1.1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -82,12 +94,16 @@ PHP_METHOD(Stub_NativeArray, testArray3)
 
 PHP_METHOD(Stub_NativeArray, testArray4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, __$true, a;
 
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_fast_append(&a, &__$false);
 	zephir_array_fast_append(&a, &__$true);
@@ -97,11 +113,15 @@ PHP_METHOD(Stub_NativeArray, testArray4)
 
 PHP_METHOD(Stub_NativeArray, testArray5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_fast_append(&a, &__$null);
 	zephir_array_fast_append(&a, &__$null);
@@ -112,12 +132,16 @@ PHP_METHOD(Stub_NativeArray, testArray5)
 PHP_METHOD(Stub_NativeArray, testArray6)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "x");
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -133,15 +157,19 @@ PHP_METHOD(Stub_NativeArray, testArray7)
 {
 	zend_long a = 0, b = 0, c = 0;
 	zval d, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	b = 2;
 	c = 3;
-	ZVAL_NULL(&d);
+	ZEPHIR_INIT_VAR(&d);
 	zephir_create_array(&d, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_array_fast_append(&d, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -157,15 +185,19 @@ PHP_METHOD(Stub_NativeArray, testArray8)
 {
 	double a = 0, b = 0, c = 0;
 	zval d, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = (double) (1);
 	b = (double) (2);
 	c = (double) (3);
-	ZVAL_NULL(&d);
+	ZEPHIR_INIT_VAR(&d);
 	zephir_create_array(&d, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, a);
 	zephir_array_fast_append(&d, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -181,15 +213,19 @@ PHP_METHOD(Stub_NativeArray, testArray9)
 {
 	zend_bool a = 0, b = 0, c = 0;
 	zval d, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	b = 0;
 	c = 1;
-	ZVAL_NULL(&d);
+	ZEPHIR_INIT_VAR(&d);
 	zephir_create_array(&d, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_array_fast_append(&d, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -205,18 +241,22 @@ PHP_METHOD(Stub_NativeArray, testArray10)
 {
 	zval a, b, c;
 	zval d;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello1");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello2");
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "hello3");
-	ZVAL_NULL(&d);
+	ZEPHIR_INIT_VAR(&d);
 	zephir_create_array(&d, 3, 0);
 	zephir_array_fast_append(&d, &a);
 	zephir_array_fast_append(&d, &b);
@@ -227,14 +267,18 @@ PHP_METHOD(Stub_NativeArray, testArray10)
 PHP_METHOD(Stub_NativeArray, testArray11)
 {
 	zval a, b, c, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -243,7 +287,7 @@ PHP_METHOD(Stub_NativeArray, testArray11)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	zephir_create_array(&b, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 4);
@@ -254,7 +298,7 @@ PHP_METHOD(Stub_NativeArray, testArray11)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 6);
 	zephir_array_fast_append(&b, &_0);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	zephir_create_array(&c, 2, 0);
 	zephir_array_fast_append(&c, &a);
 	zephir_array_fast_append(&c, &b);
@@ -264,14 +308,18 @@ PHP_METHOD(Stub_NativeArray, testArray11)
 PHP_METHOD(Stub_NativeArray, testArray12)
 {
 	zval a, b, c, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -280,10 +328,10 @@ PHP_METHOD(Stub_NativeArray, testArray12)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	zephir_create_array(&b, 1, 0);
 	zephir_array_fast_append(&b, &a);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	zephir_create_array(&c, 1, 0);
 	zephir_array_fast_append(&c, &b);
 	RETURN_CCTOR(&c);
@@ -292,9 +340,13 @@ PHP_METHOD(Stub_NativeArray, testArray12)
 PHP_METHOD(Stub_NativeArray, testArray13)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_index_stringl(&a, 1, SL("hello1"));
 	add_index_stringl(&a, 2, SL("hello2"));
@@ -305,9 +357,13 @@ PHP_METHOD(Stub_NativeArray, testArray13)
 PHP_METHOD(Stub_NativeArray, testArray14)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("hello1"), 1);
 	add_assoc_long_ex(&a, SL("hello2"), 2);
@@ -317,12 +373,16 @@ PHP_METHOD(Stub_NativeArray, testArray14)
 
 PHP_METHOD(Stub_NativeArray, testArray15)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, a;
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_string(&a, SL("hello1"), &__$true, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&a, SL("hello2"), &__$false, PH_COPY | PH_SEPARATE);
@@ -333,9 +393,13 @@ PHP_METHOD(Stub_NativeArray, testArray15)
 PHP_METHOD(Stub_NativeArray, testArray16)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_double_ex(&a, SL("hello1"), 1.0);
 	add_assoc_double_ex(&a, SL("hello2"), 2.0);
@@ -345,11 +409,15 @@ PHP_METHOD(Stub_NativeArray, testArray16)
 
 PHP_METHOD(Stub_NativeArray, testArray17)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_string(&a, SL("hello1"), &__$null, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&a, SL("hello2"), &__$null, PH_COPY | PH_SEPARATE);
@@ -360,9 +428,13 @@ PHP_METHOD(Stub_NativeArray, testArray17)
 PHP_METHOD(Stub_NativeArray, testArray18)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_stringl_ex(&a, SL("hello1"), SL("a"));
 	add_assoc_stringl_ex(&a, SL("hello2"), SL("b"));
@@ -372,12 +444,16 @@ PHP_METHOD(Stub_NativeArray, testArray18)
 
 PHP_METHOD(Stub_NativeArray, testArray19)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, a;
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &__$true, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &__$false, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -388,9 +464,13 @@ PHP_METHOD(Stub_NativeArray, testArray19)
 PHP_METHOD(Stub_NativeArray, testArray20)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_index_double(&a, 0, 1.0);
 	add_index_double(&a, 1, 2.0);
@@ -400,11 +480,15 @@ PHP_METHOD(Stub_NativeArray, testArray20)
 
 PHP_METHOD(Stub_NativeArray, testArray21)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &__$null, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &__$null, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -415,9 +499,13 @@ PHP_METHOD(Stub_NativeArray, testArray21)
 PHP_METHOD(Stub_NativeArray, testArray22)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_index_long(&a, 0, 4);
 	add_index_long(&a, 1, 5);
@@ -429,13 +517,17 @@ PHP_METHOD(Stub_NativeArray, testArray23)
 {
 	zend_long b = 0;
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	b = 0;
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, b);
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -451,13 +543,17 @@ PHP_METHOD(Stub_NativeArray, testArray24)
 {
 	double b = 0;
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	b =  (0.0);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, b);
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -473,13 +569,17 @@ PHP_METHOD(Stub_NativeArray, testArray25)
 {
 	zend_bool b = 0;
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	b = 0;
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, b);
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -494,12 +594,16 @@ PHP_METHOD(Stub_NativeArray, testArray25)
 PHP_METHOD(Stub_NativeArray, testArray26)
 {
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_NULL(&b);
-	ZVAL_NULL(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -511,12 +615,16 @@ PHP_METHOD(Stub_NativeArray, testArray27)
 {
 	zval b;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -528,12 +636,16 @@ PHP_METHOD(Stub_NativeArray, testArray28)
 {
 	zval b;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_update_long(&a, 1, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
@@ -545,10 +657,14 @@ PHP_METHOD(Stub_NativeArray, testArray29)
 {
 	long b = 0;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	b = 1;
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
 	add_index_stringl(&a, b, SL("hello"));
 	RETURN_CCTOR(&a);
@@ -558,12 +674,16 @@ PHP_METHOD(Stub_NativeArray, testArray30)
 {
 	zval b;
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
 	add_assoc_stringl_ex(&a, Z_STRVAL_P(&b), Z_STRLEN_P(&b), SL("hello"));
 	RETURN_CCTOR(&a);
@@ -572,13 +692,17 @@ PHP_METHOD(Stub_NativeArray, testArray30)
 PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 {
 	zval a, b, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -587,6 +711,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &a, 0, PH_NOISY, "stub/nativearray.zep", 245);
 	RETURN_CCTOR(&b);
 }
@@ -594,14 +719,19 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess1)
 PHP_METHOD(Stub_NativeArray, testArrayAccess2)
 {
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_string(&b, &a, SL("a"), PH_NOISY, "stub/nativearray.zep", 255);
 	RETURN_CCTOR(&b);
 }
@@ -610,13 +740,17 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess3)
 {
 	long c = 0;
 	zval a, b, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -626,6 +760,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess3)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
 	c = 0;
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &a, c, PH_NOISY, "stub/nativearray.zep", 267);
 	RETURN_CCTOR(&b);
 }
@@ -634,17 +769,22 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess4)
 {
 	zval c;
 	zval a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "a");
+	zephir_memory_observe(&b);
 	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 279);
 	RETURN_CCTOR(&b);
 }
@@ -652,17 +792,22 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess4)
 PHP_METHOD(Stub_NativeArray, testArrayAccess5)
 {
 	zval a, b, c;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "a");
+	zephir_memory_observe(&b);
 	zephir_array_fetch(&b, &a, &c, PH_NOISY, "stub/nativearray.zep", 290);
 	RETURN_CCTOR(&b);
 }
@@ -670,19 +815,23 @@ PHP_METHOD(Stub_NativeArray, testArrayAccess5)
 PHP_METHOD(Stub_NativeArray, testArrayAccess6)
 {
 	zval a, b, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
 	zephir_array_fetch_string(&_0, &a, SL("a"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 300);
 	zephir_array_fetch_string(&_1, &a, SL("b"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 300);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	zephir_add_function(&b, &_0, &_1);
 	RETURN_CCTOR(&b);
 }
@@ -691,19 +840,24 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess1)
 {
 	zval _0;
 	zval a, b, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
 	add_index_stringl(&_0, 0, SL("a"));
 	add_index_stringl(&_0, 1, SL("b"));
 	zephir_array_update_long(&a, 0, &_0, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
 	zephir_array_fetch_long(&_1, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 310);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_1, 0, PH_NOISY, "stub/nativearray.zep", 310);
 	RETURN_CCTOR(&b);
 }
@@ -712,17 +866,21 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
 {
 	zval _0;
 	zval a, b, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "a");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -730,6 +888,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess2)
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_2, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 320);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_2, 1, PH_NOISY, "stub/nativearray.zep", 320);
 	RETURN_CCTOR(&b);
 }
@@ -738,6 +897,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 {
 	zval _0, _1;
 	zval a, b, _2, _3, _4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
@@ -746,13 +906,16 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 2, 0);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "a");
 	zephir_array_fast_append(&_1, &_2);
 	ZEPHIR_INIT_NVAR(&_2);
@@ -762,6 +925,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess3)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 330);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 330);
 	RETURN_CCTOR(&b);
 }
@@ -770,6 +934,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 {
 	zval _0, _1;
 	zval a, b, _2, _3, _4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
@@ -778,13 +943,16 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 	ZVAL_UNDEF(&_4);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 2, 0);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "a");
 	zephir_array_fast_append(&_1, &_2);
 	ZEPHIR_INIT_NVAR(&_2);
@@ -794,6 +962,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess4)
 	zephir_array_fast_append(&a, &_0);
 	zephir_array_fetch_long(&_3, &a, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
 	zephir_array_fetch_long(&_4, &_3, 0, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 340);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_long(&b, &_4, 1, PH_NOISY, "stub/nativearray.zep", 340);
 	RETURN_CCTOR(&b);
 }
@@ -802,6 +971,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 {
 	zval _0, _1;
 	zval a, b, _2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
@@ -809,11 +979,14 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 2, 0);
 	add_assoc_long_ex(&_1, SL("c"), 0);
 	add_assoc_long_ex(&_1, SL("d"), 1);
@@ -821,6 +994,7 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 	zephir_array_update_string(&a, SL("a"), &_0, PH_COPY | PH_SEPARATE);
 	zephir_array_fetch_string(&_2, &a, SL("a"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
 	zephir_array_fetch_string(&_3, &_2, SL("b"), PH_NOISY | PH_READONLY, "stub/nativearray.zep", 350);
+	zephir_memory_observe(&b);
 	zephir_array_fetch_string(&b, &_3, SL("c"), PH_NOISY, "stub/nativearray.zep", 350);
 	RETURN_CCTOR(&b);
 }
@@ -828,12 +1002,16 @@ PHP_METHOD(Stub_NativeArray, testArrayMultipleAccess5)
 PHP_METHOD(Stub_NativeArray, testArrayUpdate1)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -852,12 +1030,16 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate2)
 {
 	zend_long b = 0;
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -877,13 +1059,17 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate3)
 {
 	zend_long b = 0;
 	zval a, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -897,7 +1083,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate3)
 	ZVAL_LONG(&_0, 4);
 	zephir_array_update_long(&a, b, &_0, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	b = 1;
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 5);
 	zephir_array_update_long(&a, b, &_1, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	RETURN_CCTOR(&a);
@@ -906,15 +1092,19 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate3)
 PHP_METHOD(Stub_NativeArray, testArrayUpdate4)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
 	add_assoc_long_ex(&a, SL("a"), 1);
 	add_assoc_long_ex(&a, SL("b"), 2);
 	add_assoc_long_ex(&a, SL("c"), 3);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 4);
 	zephir_array_update_string(&a, SL("a"), &_0, PH_COPY | PH_SEPARATE);
 	RETURN_CCTOR(&a);
@@ -924,15 +1114,19 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 {
 	zval _1, _2, _3;
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&a, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -941,7 +1135,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&a, &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -953,7 +1147,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&_1, &_0);
 	zephir_array_update_long(&a, 0, &_1, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	zephir_create_array(&_2, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -965,7 +1159,7 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&_2, &_0);
 	zephir_array_update_long(&a, 1, &_2, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	zephir_create_array(&_3, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -983,15 +1177,19 @@ PHP_METHOD(Stub_NativeArray, testArrayUpdate5)
 PHP_METHOD(Stub_NativeArray, testArrayAppend1)
 {
 	zval _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, _0;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello");
 	zephir_array_append(&a, &_0, PH_SEPARATE, "stub/nativearray.zep", 402);
 	zephir_array_append(&a, &__$null, PH_SEPARATE, "stub/nativearray.zep", 402);
@@ -1004,7 +1202,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend1)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 5);
 	zephir_array_append(&a, &_0, PH_SEPARATE, "stub/nativearray.zep", 402);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 1);
@@ -1026,22 +1224,26 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend2)
 	zend_bool d;
 	zval b;
 	zval a, c, g, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&g);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "hello");
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_NULL(&c);
 	d = 0;
 	e =  (1.10);
 	f = 5;
-	ZVAL_NULL(&g);
+	ZEPHIR_INIT_VAR(&g);
 	zephir_create_array(&g, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&g, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -1050,7 +1252,7 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend2)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, 3);
 	zephir_array_fast_append(&g, &_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_append(&a, &b, PH_SEPARATE, "stub/nativearray.zep", 409);
 	zephir_array_append(&a, &c, PH_SEPARATE, "stub/nativearray.zep", 409);
@@ -1069,11 +1271,15 @@ PHP_METHOD(Stub_NativeArray, testArrayAppend2)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("ss"), 4, SL("x"), SL("y"));
 	RETURN_CCTOR(&a);
@@ -1081,11 +1287,15 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate1)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sss"), 6, SL("x"), SL("y"), SL("z"));
 	RETURN_CCTOR(&a);
@@ -1093,11 +1303,15 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate2)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("ll"), 2, 0, 1);
 	RETURN_CCTOR(&a);
@@ -1105,11 +1319,15 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate3)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("lll"), 3, 0, 1, 2);
 	RETURN_CCTOR(&a);
@@ -1117,11 +1335,15 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate4)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sls"), 5, SL("a"), 1, SL("c"));
 	RETURN_CCTOR(&a);
@@ -1129,11 +1351,15 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate5)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate6)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("lsl"), 4, 0, SL("b"), 2);
 	RETURN_CCTOR(&a);
@@ -1141,12 +1367,16 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate6)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate7)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, __$false, a;
 
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$true, SL("sls"), 5, SL("a"), 1, SL("c"));
 	zephir_array_update_multi(&a, &__$false, SL("lsl"), 4, 0, SL("b"), 2);
@@ -1155,13 +1385,17 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate7)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate8)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sl"), 3, SL("a"), 0);
 	zephir_array_update_multi(&a, &__$true, SL("sl"), 3, SL("a"), 1);
@@ -1171,13 +1405,17 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate8)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate9)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sl"), 3, SL("a"), 0);
 	zephir_array_update_multi(&a, &__$true, SL("sl"), 3, SL("a"), 1);
@@ -1187,13 +1425,17 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate9)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate10)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$true, __$false, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_BOOL(&__$true, 1);
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("sl"), 3, SL("a"), 0);
 	zephir_array_update_multi(&a, &__$true, SL("sl"), 3, SL("a"), 1);
@@ -1203,17 +1445,21 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate10)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate11)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, b, c;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "y");
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "x");
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("zz"), 2, &b, &c);
 	RETURN_CCTOR(&a);
@@ -1221,6 +1467,7 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate11)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate12)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, b, c, d;
 
 	ZVAL_NULL(&__$null);
@@ -1228,13 +1475,16 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate12)
 	ZVAL_UNDEF(&b);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&d);
-	ZVAL_NULL(&b);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "y");
-	ZVAL_NULL(&c);
+	ZEPHIR_INIT_VAR(&c);
 	ZVAL_STRING(&c, "x");
-	ZVAL_NULL(&d);
+	ZEPHIR_INIT_VAR(&d);
 	ZVAL_STRING(&d, "z");
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	zephir_array_update_multi(&a, &__$null, SL("zzz"), 3, &b, &c, &d);
 	RETURN_CCTOR(&a);
@@ -1243,6 +1493,7 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate12)
 PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate13)
 {
 	zval b, c, d, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, a;
 
 	ZVAL_NULL(&__$null);
@@ -1252,21 +1503,24 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate13)
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&d);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&d);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&d);
 	zephir_create_array(&d, 3, 0);
 	zephir_array_update_string(&d, SL("x"), &__$null, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&d, SL("y"), &__$null, PH_COPY | PH_SEPARATE);
 	zephir_array_update_string(&d, SL("z"), &__$null, PH_COPY | PH_SEPARATE);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	zephir_create_array(&b, 3, 0);
 	add_assoc_long_ex(&b, SL("a"), 1);
 	add_assoc_long_ex(&b, SL("b"), 2);
 	zephir_array_update_string(&b, SL("c"), &d, PH_COPY | PH_SEPARATE);
 	ZEPHIR_CPY_WRT(&c, &b);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 2, 0);
 	zephir_array_update_long(&a, 0, &b, PH_COPY ZEPHIR_DEBUG_PARAMS_DUMMY);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 3, 0);
 	add_assoc_long_ex(&_0, SL("a"), 1);
 	add_assoc_long_ex(&_0, SL("b"), 2);
@@ -1278,14 +1532,18 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayUpdate13)
 
 PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a, b;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "y");
 	zephir_array_update_multi(&a, &__$null, SL("lsza"), 5, 0, SL("hello"), &b);
 	RETURN_CCTOR(&a);
@@ -1295,15 +1553,19 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend2)
 {
 	zval x;
 	zend_long b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, a;
 
 	ZVAL_NULL(&__$null);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&x);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	b = 100;
-	ZVAL_NULL(&x);
+	ZEPHIR_INIT_VAR(&x);
 	ZVAL_STRING(&x, "hello");
 	zephir_array_update_multi(&a, &__$null, SL("lslza"), 6, 0, SL("hello"), b, &x);
 	RETURN_CCTOR(&a);
@@ -1312,6 +1574,7 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend2)
 PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend3)
 {
 	zval _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$null, __$false, a, b, _0, _1, _3;
 
 	ZVAL_NULL(&__$null);
@@ -1322,21 +1585,24 @@ PHP_METHOD(Stub_NativeArray, testMultipleArrayAppend3)
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "y");
 	zephir_array_update_multi(&a, &__$null, SL("lsz"), 4, 0, SL("hello"), &b);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 100);
 	zephir_array_update_multi(&a, &_0, SL("lsza"), 5, 0, SL("hello"), &b);
 	zephir_array_update_multi(&a, &__$false, SL("lsza"), 5, 0, SL("hello"), &b);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_DOUBLE(&_1, 1.2);
 	zephir_array_update_multi(&a, &_1, SL("lsza"), 5, 0, SL("hello"), &b);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	zephir_create_array(&_2, 3, 0);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_LONG(&_3, 1);
 	zephir_array_fast_append(&_2, &_3);
 	ZEPHIR_INIT_NVAR(&_3);
@@ -1364,6 +1630,7 @@ PHP_METHOD(Stub_NativeArray, testArrayKeys)
 
 PHP_METHOD(Stub_NativeArray, testImplodeArray)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param, param_sub, _0;
 
 	ZVAL_UNDEF(&param_sub);
@@ -1371,11 +1638,13 @@ PHP_METHOD(Stub_NativeArray, testImplodeArray)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(param)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_array_keys(&_0, param);
 	zephir_fast_join_str(return_value, SL("|"), &_0);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1384,10 +1653,14 @@ PHP_METHOD(Stub_NativeArray, testImplodeArray)
 PHP_METHOD(Stub_NativeArray, issue110)
 {
 	zval byteUnits, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&byteUnits);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&byteUnits);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&byteUnits);
 	zephir_create_array(&byteUnits, 9, 0);
 	add_assoc_long_ex(&byteUnits, SL("B"), 0);
 	add_assoc_long_ex(&byteUnits, SL("K"), 10);
@@ -1398,14 +1671,15 @@ PHP_METHOD(Stub_NativeArray, issue110)
 	add_assoc_long_ex(&byteUnits, SL("MB"), 20);
 	add_assoc_long_ex(&byteUnits, SL("GB"), 30);
 	add_assoc_long_ex(&byteUnits, SL("TB"), 40);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_array_keys(&_0, &byteUnits);
 	zephir_fast_join_str(return_value, SL("|"), &_0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_NativeArray, issue264)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *tokens_param = NULL;
 	zval tokens;
 
@@ -1413,6 +1687,8 @@ PHP_METHOD(Stub_NativeArray, issue264)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(tokens)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &tokens_param);
 	zephir_get_arrval(&tokens, tokens_param);
 	RETURN_MM_BOOL(!(zephir_array_isset_long(&tokens, 1)));
@@ -1420,6 +1696,7 @@ PHP_METHOD(Stub_NativeArray, issue264)
 
 PHP_METHOD(Stub_NativeArray, issue743a)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *current743a_param = NULL, _0;
 	zval current743a;
 
@@ -1428,9 +1705,11 @@ PHP_METHOD(Stub_NativeArray, issue743a)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current743a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current743a_param);
 	zephir_get_arrval(&current743a, current743a_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "ok");
 	zephir_array_update_multi(&current743a, &_0, SL("ls"), 3, 42, SL("str"));
 	RETURN_CTOR(&current743a);
@@ -1438,6 +1717,7 @@ PHP_METHOD(Stub_NativeArray, issue743a)
 
 PHP_METHOD(Stub_NativeArray, issue743b)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *current_param = NULL, _0;
 	zval current;
 
@@ -1446,9 +1726,11 @@ PHP_METHOD(Stub_NativeArray, issue743b)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current_param);
 	zephir_get_arrval(&current, current_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "ok");
 	zephir_array_update_multi(&current, &_0, SL("sl"), 3, SL("str"), 42);
 	RETURN_CTOR(&current);
@@ -1456,6 +1738,7 @@ PHP_METHOD(Stub_NativeArray, issue743b)
 
 PHP_METHOD(Stub_NativeArray, issue743c)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *current_param = NULL, key, _0;
 	zval current;
 
@@ -1465,11 +1748,13 @@ PHP_METHOD(Stub_NativeArray, issue743c)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(current)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &current_param);
 	zephir_get_arrval(&current, current_param);
-	ZVAL_NULL(&key);
+	ZEPHIR_INIT_VAR(&key);
 	ZVAL_STRING(&key, "hey");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "ok");
 	zephir_array_update_multi(&current, &_0, SL("sz"), 3, SL("str"), &key);
 	RETURN_CTOR(&current);
@@ -1482,6 +1767,7 @@ PHP_METHOD(Stub_NativeArray, issue709)
 {
 	zend_bool works, _0, _7$$3;
 	zval c, arr, _3$$3, _4$$3, _5$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zephir_fcall_cache_entry *_6 = NULL;
 
@@ -1490,6 +1776,9 @@ PHP_METHOD(Stub_NativeArray, issue709)
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
 	ZVAL_UNDEF(&_5$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	works = 1;
 	_2 = 50;
 	_1 = 0;
@@ -1532,6 +1821,7 @@ PHP_METHOD(Stub_NativeArray, issue709)
 
 PHP_METHOD(Stub_NativeArray, Issue1140)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *prefix_param = NULL, *baseDir_param = NULL, _0, _2, _3, _1$$3;
 	zval prefix, baseDir;
@@ -1547,12 +1837,14 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 		Z_PARAM_STR(prefix)
 		Z_PARAM_STR(baseDir)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &prefix_param, &baseDir_param);
 	zephir_get_strval(&prefix, prefix_param);
 	zephir_get_strval(&baseDir, baseDir_param);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("prefixes"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_array_isset(&_0, &prefix))) {
-		ZVAL_NULL(&_1$$3);
+		ZEPHIR_INIT_VAR(&_1$$3);
 		array_init(&_1$$3);
 		zephir_update_property_array(this_ptr, SL("prefixes"), &prefix, &_1$$3);
 	}
@@ -1568,12 +1860,16 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 PHP_METHOD(Stub_NativeArray, Issue1159)
 {
 	zval myvar, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&myvar);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&myvar);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&myvar);
 	ZVAL_LONG(&myvar, 1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
 	zephir_array_fast_append(&_0, &myvar);
 	ZEPHIR_CPY_WRT(&myvar, &_0);
@@ -1583,20 +1879,24 @@ PHP_METHOD(Stub_NativeArray, Issue1159)
 zend_object *zephir_init_properties_Stub_NativeArray(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("prefixes"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("prefixes"), &_1$$3);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/oo.zep.c b/ext/stub/oo.zep.c
index c9fdd4a066..7e4f7df775 100644
--- a/ext/stub/oo.zep.c
+++ b/ext/stub/oo.zep.c
@@ -32,9 +32,13 @@ ZEPHIR_INIT_CLASS(Stub_Oo)
 PHP_METHOD(Stub_Oo, testInstance1)
 {
 	zval o;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&o);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init(&o);
 	RETURN_CCTOR(&o);
 }
@@ -42,10 +46,14 @@ PHP_METHOD(Stub_Oo, testInstance1)
 PHP_METHOD(Stub_Oo, testInstance2)
 {
 	zval o;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstruct_ce);
 	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67);
 	zephir_check_call_status();
@@ -55,10 +63,14 @@ PHP_METHOD(Stub_Oo, testInstance2)
 PHP_METHOD(Stub_Oo, testInstance3)
 {
 	zval o;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_oonoconstruct_ce);
 	if (zephir_has_constructor(&o)) {
 		ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 0);
@@ -71,16 +83,20 @@ PHP_METHOD(Stub_Oo, testInstance3)
 PHP_METHOD(Stub_Oo, testInstance4)
 {
 	zval o, a, b;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&b);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "a");
-	ZVAL_NULL(&b);
+	ZEPHIR_INIT_VAR(&b);
 	ZVAL_STRING(&b, "b");
-	ZVAL_NULL(&o);
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &a, &b);
 	zephir_check_call_status();
@@ -90,16 +106,20 @@ PHP_METHOD(Stub_Oo, testInstance4)
 PHP_METHOD(Stub_Oo, testInstance5)
 {
 	zval o, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "a");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "b");
 	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
 	zephir_check_call_status();
@@ -109,12 +129,16 @@ PHP_METHOD(Stub_Oo, testInstance5)
 PHP_METHOD(Stub_Oo, testInstance6)
 {
 	zval o, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
@@ -126,12 +150,16 @@ PHP_METHOD(Stub_Oo, testInstance6)
 PHP_METHOD(Stub_Oo, testInstance7)
 {
 	zval o, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_BOOL(&_0, 0);
 	ZVAL_BOOL(&_1, 1);
@@ -143,12 +171,16 @@ PHP_METHOD(Stub_Oo, testInstance7)
 PHP_METHOD(Stub_Oo, testInstance8)
 {
 	zval o, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_DOUBLE(&_0, 1.2);
 	ZVAL_DOUBLE(&_1, 7.30);
@@ -160,9 +192,13 @@ PHP_METHOD(Stub_Oo, testInstance8)
 PHP_METHOD(Stub_Oo, testInstance9)
 {
 	zval o;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
@@ -171,9 +207,13 @@ PHP_METHOD(Stub_Oo, testInstance9)
 PHP_METHOD(Stub_Oo, testInstance10)
 {
 	zval o;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamicb_ce, "getnew", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
@@ -182,12 +222,16 @@ PHP_METHOD(Stub_Oo, testInstance10)
 PHP_METHOD(Stub_Oo, testInstance11)
 {
 	zval o, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
@@ -199,9 +243,13 @@ PHP_METHOD(Stub_Oo, testInstance11)
 PHP_METHOD(Stub_Oo, testInstance12)
 {
 	zval o;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&o);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_CE_STATIC(&o, stub_oo_oodynamica_ce, "call1", NULL, 0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
@@ -212,6 +260,7 @@ PHP_METHOD(Stub_Oo, createInstancesInLoop)
 	zend_class_entry *_5$$3, *_9$$4;
 	zval result, _0;
 	zval className, instance, fqcn, _1, *_2, _3, _4$$3, _6$$3, _7$$3, _8$$4, _10$$4, _11$$4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&className);
@@ -227,11 +276,14 @@ PHP_METHOD(Stub_Oo, createInstancesInLoop)
 	ZVAL_UNDEF(&_11$$4);
 	ZVAL_UNDEF(&result);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&result);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&result);
 	array_init(&result);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 2, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "OoDynamicA");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
diff --git a/ext/stub/oo/concretestatic.zep.c b/ext/stub/oo/concretestatic.zep.c
index 9012554963..1ba0c62a8c 100644
--- a/ext/stub/oo/concretestatic.zep.c
+++ b/ext/stub/oo/concretestatic.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Oo_ConcreteStatic)
@@ -31,18 +32,26 @@ PHP_METHOD(Stub_Oo_ConcreteStatic, parentFunction)
 
 PHP_METHOD(Stub_Oo_ConcreteStatic, childFunction)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("parentfunction", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_ConcreteStatic, callParentFunction)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_PARENT(stub_oo_concretestatic_ce, getThis(), "getcalledclass", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_ConcreteStatic, simpleStaticIntReturn)
diff --git a/ext/stub/oo/deprecatedmethods.zep.c b/ext/stub/oo/deprecatedmethods.zep.c
index 45c3c4cc83..6978548236 100644
--- a/ext/stub/oo/deprecatedmethods.zep.c
+++ b/ext/stub/oo/deprecatedmethods.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Oo_DeprecatedMethods)
@@ -31,11 +32,15 @@ PHP_METHOD(Stub_Oo_DeprecatedMethods, publicDeprecated)
 
 PHP_METHOD(Stub_Oo_DeprecatedMethods, normalMethod)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 69);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_DeprecatedMethods, privateDeprecated)
diff --git a/ext/stub/oo/dynamicprop.zep.c b/ext/stub/oo/dynamicprop.zep.c
index 73d3c8762e..06980bafee 100644
--- a/ext/stub/oo/dynamicprop.zep.c
+++ b/ext/stub/oo/dynamicprop.zep.c
@@ -32,6 +32,7 @@ ZEPHIR_INIT_CLASS(Stub_Oo_DynamicProp)
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -41,6 +42,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -49,15 +52,17 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyInt)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 10);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, __$true;
 	zval property;
 	zval *this_ptr = getThis();
@@ -67,6 +72,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -75,13 +82,15 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolTrue)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	zephir_update_property_zval_zval(this_ptr, &property, &__$true);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, __$false;
 	zval property;
 	zval *this_ptr = getThis();
@@ -91,6 +100,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -99,13 +110,15 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyBoolFalse)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	zephir_update_property_zval_zval(this_ptr, &property, &__$false);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -115,6 +128,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -123,16 +138,18 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyString)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "string");
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 {
 	char a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -142,6 +159,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -150,17 +169,19 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyChar)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	a = 'A';
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 {
 	unsigned char a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -170,6 +191,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -178,16 +201,18 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyUChar)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	a = 'A';
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, __$null;
 	zval property;
 	zval *this_ptr = getThis();
@@ -197,6 +222,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -205,14 +232,16 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyNull)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	zephir_update_property_zval_zval(this_ptr, &property, &__$null);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 {
 	zend_long a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -222,6 +251,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -230,16 +261,18 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableInt)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	a = 10;
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, a;
 	zval property;
 	zval *this_ptr = getThis();
@@ -249,6 +282,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -257,16 +292,18 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableString)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "test");
 	zephir_update_property_zval_zval(this_ptr, &property, &a);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 {
 	zend_bool a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -276,6 +313,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -284,17 +323,19 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolTrue)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	a = 1;
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 {
 	zend_bool a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *property_param = NULL, _0;
 	zval property;
 	zval *this_ptr = getThis();
@@ -304,6 +345,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(property)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &property_param);
 	if (UNEXPECTED(Z_TYPE_P(property_param) != IS_STRING && Z_TYPE_P(property_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'property' must be of the type string"));
@@ -312,27 +355,34 @@ PHP_METHOD(Stub_Oo_DynamicProp, setPropertyVariableBoolFalse)
 	if (EXPECTED(Z_TYPE_P(property_param) == IS_STRING)) {
 		zephir_get_strval(&property, property_param);
 	} else {
-		ZVAL_NULL(&property);
+		ZEPHIR_INIT_VAR(&property);
 	}
 	a = 0;
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_update_property_zval_zval(this_ptr, &property, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringProperty)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "works");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("test"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value_param = NULL;
 	zval value;
 	zval *this_ptr = getThis();
@@ -341,6 +391,8 @@ PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	if (UNEXPECTED(Z_TYPE_P(value_param) != IS_STRING && Z_TYPE_P(value_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'value' must be of the type string"));
@@ -349,19 +401,25 @@ PHP_METHOD(Stub_Oo_DynamicProp, setExistingStringPropertyString)
 	if (EXPECTED(Z_TYPE_P(value_param) == IS_STRING)) {
 		zephir_get_strval(&value, value_param);
 	} else {
-		ZVAL_NULL(&value);
+		ZEPHIR_INIT_VAR(&value);
 	}
 	zephir_update_property_zval(this_ptr, ZEND_STRL("eproperty"), &value);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_DynamicProp, setNonExistingStringProperty)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "works");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("property"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/oo/extendpdoclass.zep.c b/ext/stub/oo/extendpdoclass.zep.c
index 621d052b28..5989152c0d 100644
--- a/ext/stub/oo/extendpdoclass.zep.c
+++ b/ext/stub/oo/extendpdoclass.zep.c
@@ -30,6 +30,7 @@ ZEPHIR_INIT_CLASS(Stub_Oo_ExtendPdoClass)
 PHP_METHOD(Stub_Oo_ExtendPdoClass, __construct)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *dsn_param = NULL, *username_param = NULL, *password_param = NULL, *attrs = NULL, attrs_sub, _1;
 	zval dsn, username, password;
@@ -48,32 +49,35 @@ PHP_METHOD(Stub_Oo_ExtendPdoClass, __construct)
 		Z_PARAM_STR_OR_NULL(password)
 		Z_PARAM_ZVAL(attrs)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 3, &dsn_param, &username_param, &password_param, &attrs);
 	zephir_get_strval(&dsn, dsn_param);
 	if (!username_param) {
-		ZVAL_NULL(&username);
+		ZEPHIR_INIT_VAR(&username);
 	} else {
 		zephir_get_strval(&username, username_param);
 	}
 	if (!password_param) {
-		ZVAL_NULL(&password);
+		ZEPHIR_INIT_VAR(&password);
 	} else {
 		zephir_get_strval(&password, password_param);
 	}
 	if (!attrs) {
 		attrs = &attrs_sub;
-		ZVAL_NULL(attrs);
+		ZEPHIR_INIT_VAR(attrs);
 		array_init(attrs);
 	} else {
 		ZEPHIR_SEPARATE_PARAM(attrs);
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "Stub\\PdoStatement");
 	zephir_array_fast_append(&_0, &_1);
 	zephir_array_update_long(attrs, 13, &_0, PH_COPY | PH_SEPARATE ZEPHIR_DEBUG_PARAMS_DUMMY);
 	ZEPHIR_CALL_PARENT(NULL, stub_oo_extendpdoclass_ce, getThis(), "__construct", NULL, 0, &dsn, &username, &password, attrs);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/oo/oodestruct.zep.c b/ext/stub/oo/oodestruct.zep.c
index 4a03c5f468..87cef0ed75 100644
--- a/ext/stub/oo/oodestruct.zep.c
+++ b/ext/stub/oo/oodestruct.zep.c
@@ -120,6 +120,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 {
 	zend_bool _30$$13;
 	zend_class_entry *_26$$11 = NULL, *_22$$12 = NULL, *_32$$14 = NULL;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long width, height, ZEPHIR_LAST_CALL_STATUS;
 	zval *file_param = NULL, *width_param = NULL, *height_param = NULL, __$true, imageinfo, _0, _1, _2$$4, _3$$4, _4$$4, _9$$4, _28$$4, _29$$4, _5$$5, _6$$5, _7$$5, _8$$5, _10$$6, _11$$6, _12$$7, _13$$7, _14$$8, _15$$8, _16$$9, _17$$9, _18$$10, _19$$10, _20$$11, _25$$11, _27$$11, _21$$12, _23$$12, _24$$12, _35$$13, _36$$13, _37$$13, _38$$13, _39$$13, _40$$13, _31$$14, _33$$14, _34$$14;
 	zval file;
@@ -172,6 +173,8 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		Z_PARAM_LONG_OR_NULL(width, is_null_true)
 		Z_PARAM_LONG_OR_NULL(height, is_null_true)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &file_param, &width_param, &height_param);
 	if (UNEXPECTED(Z_TYPE_P(file_param) != IS_STRING && Z_TYPE_P(file_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'file' must be of the type string"));
@@ -180,7 +183,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 	if (EXPECTED(Z_TYPE_P(file_param) == IS_STRING)) {
 		zephir_get_strval(&file, file_param);
 	} else {
-		ZVAL_NULL(&file);
+		ZEPHIR_INIT_VAR(&file);
 	}
 	if (!width_param) {
 		width = 0;
@@ -254,35 +257,37 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 			}
 			zephir_read_property(&_20$$11, this_ptr, ZEND_STRL("mime"), PH_NOISY_CC | PH_READONLY);
 			if (zephir_is_true(&_20$$11)) {
-				ZVAL_NULL(&_21$$12);
+				ZEPHIR_INIT_VAR(&_21$$12);
 				if (!_22$$12) {
 				_22$$12 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 				}
 				object_init_ex(&_21$$12, _22$$12);
 				if (zephir_has_constructor(&_21$$12)) {
 					zephir_read_property(&_23$$12, this_ptr, ZEND_STRL("mime"), PH_NOISY_CC | PH_READONLY);
-					ZVAL_NULL(&_24$$12);
+					ZEPHIR_INIT_VAR(&_24$$12);
 					ZEPHIR_CONCAT_SVS(&_24$$12, "Installed GD does not support ", &_23$$12, " images");
 					ZEPHIR_CALL_METHOD(NULL, &_21$$12, "__construct", NULL, 0, &_24$$12);
 					zephir_check_call_status();
 				}
 
 				zephir_throw_exception_debug(&_21$$12, "stub/oo/oodestruct.zep", 93);
+				ZEPHIR_MM_RESTORE();
 				return;
 			}
-			ZVAL_NULL(&_25$$11);
+			ZEPHIR_INIT_VAR(&_25$$11);
 			if (!_26$$11) {
 			_26$$11 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 			}
 			object_init_ex(&_25$$11, _26$$11);
 			if (zephir_has_constructor(&_25$$11)) {
-				ZVAL_NULL(&_27$$11);
+				ZEPHIR_INIT_VAR(&_27$$11);
 				ZVAL_STRING(&_27$$11, "Installed GD does not support such images");
 				ZEPHIR_CALL_METHOD(NULL, &_25$$11, "__construct", NULL, 0, &_27$$11);
 				zephir_check_call_status();
 			}
 
 			zephir_throw_exception_debug(&_25$$11, "stub/oo/oodestruct.zep", 98);
+			ZEPHIR_MM_RESTORE();
 			return;
 		} while(0);
 
@@ -296,20 +301,21 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 			_30$$13 = !height;
 		}
 		if (UNEXPECTED(_30$$13)) {
-			ZVAL_NULL(&_31$$14);
+			ZEPHIR_INIT_VAR(&_31$$14);
 			if (!_32$$14) {
 			_32$$14 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 			}
 			object_init_ex(&_31$$14, _32$$14);
 			if (zephir_has_constructor(&_31$$14)) {
 				zephir_read_property(&_33$$14, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-				ZVAL_NULL(&_34$$14);
+				ZEPHIR_INIT_VAR(&_34$$14);
 				ZEPHIR_CONCAT_SV(&_34$$14, "Failed to create image from file ", &_33$$14);
 				ZEPHIR_CALL_METHOD(NULL, &_31$$14, "__construct", NULL, 0, &_34$$14);
 				zephir_check_call_status();
 			}
 
 			zephir_throw_exception_debug(&_31$$14, "stub/oo/oodestruct.zep", 107);
+			ZEPHIR_MM_RESTORE();
 			return;
 		}
 		ZVAL_LONG(&_35$$13, width);
@@ -335,32 +341,39 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		ZVAL_UNDEF(&_39$$13);
 		ZVAL_LONG(&_39$$13, 3);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("type"), &_39$$13);
-		ZVAL_NULL(&_40$$13);
+		ZEPHIR_INIT_VAR(&_40$$13);
 		ZEPHIR_INIT_NVAR(&_40$$13);
 		ZVAL_STRING(&_40$$13, "image/png");
 		zephir_update_property_zval(this_ptr, ZEND_STRL("mime"), &_40$$13);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_OoDestruct, __destruct)
 {
 	zval image, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&image);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
 	ZEPHIR_CPY_WRT(&image, &_0);
 	if (Z_TYPE_P(&image) == IS_RESOURCE) {
 		ZEPHIR_CALL_FUNCTION(NULL, "imagedestroy", NULL, 0, &image);
 		zephir_check_call_status();
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_OoDestruct, check)
 {
 	zend_class_entry *_2$$4 = NULL, *_8$$5 = NULL;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$true, version, _0, _4, _5, _6, _10, _1$$4, _3$$4, _7$$5, _9$$5;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
@@ -375,48 +388,53 @@ PHP_METHOD(Stub_Oo_OoDestruct, check)
 	ZVAL_UNDEF(&_3$$4);
 	ZVAL_UNDEF(&_7$$5);
 	ZVAL_UNDEF(&_9$$5);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_static_property_ce(&_0, stub_oo_oodestruct_ce, SL("checked"), PH_NOISY_CC | PH_READONLY);
 	if (zephir_is_true(&_0)) {
 		RETURN_MM_BOOL(1);
 	}
 	if (UNEXPECTED(!((zephir_function_exists_ex(ZEND_STRL("gd_info")) == SUCCESS)))) {
-		ZVAL_NULL(&_1$$4);
+		ZEPHIR_INIT_VAR(&_1$$4);
 		if (!_2$$4) {
 		_2$$4 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 		}
 		object_init_ex(&_1$$4, _2$$4);
 		if (zephir_has_constructor(&_1$$4)) {
-			ZVAL_NULL(&_3$$4);
+			ZEPHIR_INIT_VAR(&_3$$4);
 			ZVAL_STRING(&_3$$4, "GD is either not installed or not enabled, check your configuration");
 			ZEPHIR_CALL_METHOD(NULL, &_1$$4, "__construct", NULL, 0, &_3$$4);
 			zephir_check_call_status();
 		}
 
 		zephir_throw_exception_debug(&_1$$4, "stub/oo/oodestruct.zep", 146);
+		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	ZEPHIR_CALL_SELF(&version, "getversion", NULL, 0);
 	zephir_check_call_status();
-	ZVAL_NULL(&_4);
+	ZEPHIR_INIT_VAR(&_4);
 	ZVAL_STRING(&_4, "2.0.1");
-	ZVAL_NULL(&_5);
+	ZEPHIR_INIT_VAR(&_5);
 	ZVAL_STRING(&_5, ">=");
 	ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 62, &version, &_4, &_5);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_6))) {
-		ZVAL_NULL(&_7$$5);
+		ZEPHIR_INIT_VAR(&_7$$5);
 		if (!_8$$5) {
 		_8$$5 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 		}
 		object_init_ex(&_7$$5, _8$$5);
 		if (zephir_has_constructor(&_7$$5)) {
-			ZVAL_NULL(&_9$$5);
+			ZEPHIR_INIT_VAR(&_9$$5);
 			ZEPHIR_CONCAT_SV(&_9$$5, "Requires GD version '2.0.1' or greater, you have ", &version);
 			ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", NULL, 0, &_9$$5);
 			zephir_check_call_status();
 		}
 
 		zephir_throw_exception_debug(&_7$$5, "stub/oo/oodestruct.zep", 154);
+		ZEPHIR_MM_RESTORE();
 		return;
 	}
 	zephir_update_static_property_ce(stub_oo_oodestruct_ce, ZEND_STRL("checked"), &__$true);
@@ -428,6 +446,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 {
 	zend_class_entry *_1$$3 = NULL;
 	zval version, info, matches, _3, _4, _0$$3, _2$$3, _5$$5, _6$$5, _7$$5, _8$$5;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&version);
@@ -441,25 +460,29 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 	ZVAL_UNDEF(&_6$$5);
 	ZVAL_UNDEF(&_7$$5);
 	ZVAL_UNDEF(&_8$$5);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	if (UNEXPECTED(!((zephir_function_exists_ex(ZEND_STRL("gd_info")) == SUCCESS)))) {
-		ZVAL_NULL(&_0$$3);
+		ZEPHIR_INIT_VAR(&_0$$3);
 		if (!_1$$3) {
 		_1$$3 = zephir_fetch_class_str_ex(SL("Stub\\Oo\\Exception"), ZEND_FETCH_CLASS_AUTO);
 		}
 		object_init_ex(&_0$$3, _1$$3);
 		if (zephir_has_constructor(&_0$$3)) {
-			ZVAL_NULL(&_2$$3);
+			ZEPHIR_INIT_VAR(&_2$$3);
 			ZVAL_STRING(&_2$$3, "GD is either not installed or not enabled, check your configuration");
 			ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 0, &_2$$3);
 			zephir_check_call_status();
 		}
 
 		zephir_throw_exception_debug(&_0$$3, "stub/oo/oodestruct.zep", 171);
+		ZEPHIR_MM_RESTORE();
 		return;
 	}
+	ZEPHIR_INIT_VAR(&version);
 	ZVAL_NULL(&version);
-	ZVAL_NULL(&version);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "GD_VERSION");
 	ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 73, &_3);
 	zephir_check_call_status();
@@ -469,13 +492,13 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 	} else {
 		ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 74);
 		zephir_check_call_status();
-		ZVAL_NULL(&matches);
+		ZEPHIR_INIT_VAR(&matches);
 		ZVAL_NULL(&matches);
 		zephir_array_fetch_string(&_5$$5, &info, SL("GD Version"), PH_NOISY | PH_READONLY, "stub/oo/oodestruct.zep", 182);
-		ZVAL_NULL(&_6$$5);
+		ZEPHIR_INIT_VAR(&_6$$5);
 		ZVAL_STRING(&_6$$5, "/\\d+\\.\\d+(?:\\.\\d+)?/");
-		ZVAL_NULL(&_7$$5);
-		ZVAL_NULL(&_8$$5);
+		ZEPHIR_INIT_VAR(&_7$$5);
+		ZEPHIR_INIT_VAR(&_8$$5);
 		ZVAL_STRING(&_8$$5, "/\\d+\\.\\d+(?:\\.\\d+)?/");
 		zephir_preg_match(&_7$$5, &_8$$5, &_5$$5, &matches, 0, 0 , 0 );
 		if (zephir_is_true(&_7$$5)) {
diff --git a/ext/stub/oo/oodynamica.zep.c b/ext/stub/oo/oodynamica.zep.c
index 2c814a618a..a1e14d5340 100644
--- a/ext/stub/oo/oodynamica.zep.c
+++ b/ext/stub/oo/oodynamica.zep.c
@@ -32,14 +32,18 @@ PHP_METHOD(Stub_Oo_OoDynamicA, getNew)
 {
 	zend_class_entry *_1;
 	zval className, fullClassName, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&fullClassName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&className);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&className);
 	zephir_get_called_class(&className);
-	ZVAL_NULL(&fullClassName);
+	ZEPHIR_INIT_VAR(&fullClassName);
 	ZEPHIR_CONCAT_SV(&fullClassName, "\\", &className);
 	zephir_fetch_safe_class(&_0, &fullClassName);
 	_1 = zephir_fetch_class_str_ex(Z_STRVAL_P(&_0), Z_STRLEN_P(&_0), ZEND_FETCH_CLASS_AUTO);
@@ -52,23 +56,31 @@ PHP_METHOD(Stub_Oo_OoDynamicA, getNew)
 		zephir_check_call_status();
 	}
 
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicA, call2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("getnew", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicA, call1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("call2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_OoDynamicA, execute)
diff --git a/ext/stub/oo/oonativeimplements.zep.c b/ext/stub/oo/oonativeimplements.zep.c
index 4a14c44e65..602484046e 100644
--- a/ext/stub/oo/oonativeimplements.zep.c
+++ b/ext/stub/oo/oonativeimplements.zep.c
@@ -148,6 +148,7 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, serialize)
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, unserialize)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *serialized_param = NULL;
 	zval serialized;
 
@@ -155,6 +156,8 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, unserialize)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(serialized)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &serialized_param);
 	zephir_get_strval(&serialized, serialized_param);
 }
@@ -168,6 +171,7 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, __serialize)
 
 PHP_METHOD(Stub_Oo_OoNativeImplements, __unserialize)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *data_param = NULL;
 	zval data;
 
@@ -175,6 +179,8 @@ PHP_METHOD(Stub_Oo_OoNativeImplements, __unserialize)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(data)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &data_param);
 	zephir_get_arrval(&data, data_param);
 }
diff --git a/ext/stub/oo/ooparams.zep.c b/ext/stub/oo/ooparams.zep.c
index 44036ccae6..19e38ac962 100644
--- a/ext/stub/oo/ooparams.zep.c
+++ b/ext/stub/oo/ooparams.zep.c
@@ -14,8 +14,8 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
+#include "kernel/operators.h"
 #include "ext/spl/spl_exceptions.h"
 #include "kernel/exception.h"
 
@@ -32,26 +32,34 @@ ZEPHIR_INIT_CLASS(Stub_Oo_OoParams)
 
 PHP_METHOD(Stub_Oo_OoParams, createThisClassWithoutWriteCurrentNamespace)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	object_init_ex(return_value, stub_oo_ooparams_ce);
 	if (zephir_has_constructor(return_value)) {
 		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_OoParams, createOtherClassWithoutWriteCurrentNamespace)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	object_init_ex(return_value, stub_oo_oodynamica_ce);
 	if (zephir_has_constructor(return_value)) {
 		ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 0);
 		zephir_check_call_status();
 	}
 
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setAge)
@@ -81,6 +89,7 @@ PHP_METHOD(Stub_Oo_OoParams, setAverage)
 
 PHP_METHOD(Stub_Oo_OoParams, setName)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL;
 	zval name;
 
@@ -88,6 +97,8 @@ PHP_METHOD(Stub_Oo_OoParams, setName)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
 	RETURN_CTOR(&name);
@@ -107,6 +118,7 @@ PHP_METHOD(Stub_Oo_OoParams, setEnabled)
 
 PHP_METHOD(Stub_Oo_OoParams, setList)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someList_param = NULL;
 	zval someList;
 
@@ -114,6 +126,8 @@ PHP_METHOD(Stub_Oo_OoParams, setList)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someList_param);
 	zephir_get_arrval(&someList, someList_param);
 	RETURN_CTOR(&someList);
@@ -156,18 +170,23 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictAverage)
 PHP_METHOD(Stub_Oo_OoParams, setStrictNameFromZephirLand)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 12345);
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "setstrictname", NULL, 0, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_OoParams, setStrictName)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL;
 	zval name;
 
@@ -175,6 +194,8 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictName)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	if (UNEXPECTED(Z_TYPE_P(name_param) != IS_STRING && Z_TYPE_P(name_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'name' must be of the type string"));
@@ -183,7 +204,7 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictName)
 	if (EXPECTED(Z_TYPE_P(name_param) == IS_STRING)) {
 		zephir_get_strval(&name, name_param);
 	} else {
-		ZVAL_NULL(&name);
+		ZEPHIR_INIT_VAR(&name);
 	}
 	RETURN_CTOR(&name);
 }
@@ -202,6 +223,7 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictEnabled)
 
 PHP_METHOD(Stub_Oo_OoParams, setStrictList)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someList_param = NULL;
 	zval someList;
 
@@ -209,8 +231,10 @@ PHP_METHOD(Stub_Oo_OoParams, setStrictList)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someList_param);
-	ZVAL_COPY(&someList, someList_param);
+	ZEPHIR_OBS_COPY_OR_DUP(&someList, someList_param);
 	RETURN_CTOR(&someList);
 }
 
@@ -251,6 +275,7 @@ PHP_METHOD(Stub_Oo_OoParams, setAverageDefault)
 
 PHP_METHOD(Stub_Oo_OoParams, setNameDefault)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL;
 	zval name;
 
@@ -259,9 +284,11 @@ PHP_METHOD(Stub_Oo_OoParams, setNameDefault)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &name_param);
 	if (!name_param) {
-		ZVAL_NULL(&name);
+		ZEPHIR_INIT_VAR(&name);
 		ZVAL_STRING(&name, "peter");
 	} else {
 		zephir_get_strval(&name, name_param);
@@ -288,6 +315,7 @@ PHP_METHOD(Stub_Oo_OoParams, setEnabledDefault)
 
 PHP_METHOD(Stub_Oo_OoParams, setListDefault)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someList_param = NULL;
 	zval someList;
 
@@ -296,9 +324,11 @@ PHP_METHOD(Stub_Oo_OoParams, setListDefault)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(someList)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &someList_param);
 	if (!someList_param) {
-		ZVAL_NULL(&someList);
+		ZEPHIR_INIT_VAR(&someList);
 		array_init(&someList);
 	} else {
 		zephir_get_arrval(&someList, someList_param);
diff --git a/ext/stub/oo/propertyaccess.zep.c b/ext/stub/oo/propertyaccess.zep.c
index b343e60494..9df13a7228 100644
--- a/ext/stub/oo/propertyaccess.zep.c
+++ b/ext/stub/oo/propertyaccess.zep.c
@@ -31,6 +31,7 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 {
 	zval _0, _6;
 	zval test, test1, _1, _2, _3, _4, _5, _7, _8, _9, _10;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&test);
@@ -46,11 +47,14 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	ZVAL_UNDEF(&_10);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_6);
-	ZVAL_NULL(&test);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&test);
 	object_init(&test);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 5, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "1");
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -72,9 +76,10 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	zephir_read_property(&_4, &test, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_fetch_long(&_5, &_4, 1, PH_NOISY | PH_READONLY, "stub/oo/propertyaccess.zep", 18);
 	zephir_update_property_zval(&test, ZEND_STRL("test3"), &_5);
-	ZVAL_NULL(&_6);
+	ZEPHIR_INIT_VAR(&_6);
 	zephir_create_array(&_6, 4, 0);
 	zephir_read_property(&_7, &test, ZEND_STRL("test"), PH_NOISY_CC | PH_READONLY);
+	zephir_memory_observe(&_8);
 	zephir_array_fetch_long(&_8, &_7, 1, PH_NOISY, "stub/oo/propertyaccess.zep", 19);
 	zephir_array_fast_append(&_6, &_8);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -91,7 +96,9 @@ PHP_METHOD(Stub_Oo_PropertyAccess, __construct)
 	zephir_read_property(&_9, this_ptr, ZEND_STRL("a"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_10, &_9, ZEND_STRL("test2"), PH_NOISY_CC | PH_READONLY);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("b"), &_10);
+	zephir_memory_observe(&test1);
 	zephir_read_property(&test1, this_ptr, ZEND_STRL("a"), PH_NOISY_CC);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
diff --git a/ext/stub/oo/scopes/abstractclass.zep.c b/ext/stub/oo/scopes/abstractclass.zep.c
index 620a195973..e1dda42688 100644
--- a/ext/stub/oo/scopes/abstractclass.zep.c
+++ b/ext/stub/oo/scopes/abstractclass.zep.c
@@ -28,6 +28,7 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_AbstractClass)
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClass, setProperty)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, *value, value_sub;
 	zval name;
 	zval *this_ptr = getThis();
@@ -38,6 +39,8 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClass, setProperty)
 		Z_PARAM_STR(name)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &name_param, &value);
 	zephir_get_strval(&name, name_param);
 	zephir_update_property_zval_zval(this_ptr, &name, value);
diff --git a/ext/stub/oo/scopes/abstractclassmagic.zep.c b/ext/stub/oo/scopes/abstractclassmagic.zep.c
index ffd5aad71a..887fcafcbd 100644
--- a/ext/stub/oo/scopes/abstractclassmagic.zep.c
+++ b/ext/stub/oo/scopes/abstractclassmagic.zep.c
@@ -30,6 +30,7 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_AbstractClassMagic)
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __set)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, *value, value_sub, _0, _1;
 	zval name;
 	zval *this_ptr = getThis();
@@ -42,6 +43,8 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __set)
 		Z_PARAM_STR(name)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &name_param, &value);
 	zephir_get_strval(&name, name_param);
 	zephir_update_property_zval_zval(this_ptr, &name, value);
@@ -49,10 +52,12 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __set)
 	ZVAL_UNDEF(&_1);
 	ZVAL_LONG(&_1, (zephir_get_numberval(&_0) + 1));
 	zephir_update_property_zval(this_ptr, ZEND_STRL("setCount"), &_1);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __get)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *name_param = NULL, _0;
 	zval name;
 	zval *this_ptr = getThis();
@@ -62,8 +67,11 @@ PHP_METHOD(Stub_Oo_Scopes_AbstractClassMagic, __get)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name_param);
 	zephir_get_strval(&name, name_param);
+	zephir_memory_observe(&_0);
 	zephir_read_property_zval(&_0, this_ptr, &name, PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/oo/scopes/hasprivatemethod.zep.c b/ext/stub/oo/scopes/hasprivatemethod.zep.c
index 42f40b9537..f24a21cc92 100644
--- a/ext/stub/oo/scopes/hasprivatemethod.zep.c
+++ b/ext/stub/oo/scopes/hasprivatemethod.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_HasPrivateMethod)
@@ -25,11 +26,15 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_HasPrivateMethod)
 
 PHP_METHOD(Stub_Oo_Scopes_HasPrivateMethod, callPrivateMethod)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "isprivate", NULL, 1);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Oo_Scopes_HasPrivateMethod, isPrivate)
diff --git a/ext/stub/oo/scopes/privatescopetester.zep.c b/ext/stub/oo/scopes/privatescopetester.zep.c
index 1a11f62267..cdc82de197 100644
--- a/ext/stub/oo/scopes/privatescopetester.zep.c
+++ b/ext/stub/oo/scopes/privatescopetester.zep.c
@@ -28,11 +28,15 @@ ZEPHIR_INIT_CLASS(Stub_Oo_Scopes_PrivateScopeTester)
 
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, run)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "callprivatemethod", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -40,6 +44,7 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, run)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval property;
 	zval *obj, obj_sub, *property_param = NULL, *value, value_sub, _0;
 
@@ -52,10 +57,13 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
 		Z_PARAM_STR(property)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &obj, &property_param, &value);
 	ZEPHIR_SEPARATE_PARAM(obj);
 	zephir_get_strval(&property, property_param);
 	zephir_update_property_zval_zval(obj, &property, value);
+	zephir_memory_observe(&_0);
 	zephir_read_property_zval(&_0, obj, &property, PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
@@ -65,6 +73,7 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyObj)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className_param = NULL, *property_param = NULL, *value, value_sub, obj;
 	zval className, property;
@@ -78,10 +87,12 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
 		Z_PARAM_STR(property)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &className_param, &property_param, &value);
 	zephir_get_strval(&className, className_param);
 	zephir_get_strval(&property, property_param);
-	ZVAL_NULL(&obj);
+	ZEPHIR_INIT_VAR(&obj);
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(&obj, &className);
 	zephir_check_call_status();
 	zephir_update_property_zval_zval(&obj, &property, value);
@@ -93,6 +104,7 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, setPropertyNew)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *obj, obj_sub;
 
@@ -100,10 +112,12 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(obj)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &obj);
 	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 75, obj);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -111,6 +125,7 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
  */
 PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getNewVars)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className_param = NULL, _0;
 	zval className;
@@ -121,13 +136,15 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getNewVars)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(className)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className_param);
 	zephir_get_strval(&className, className_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_LAST_CALL_STATUS = zephir_create_instance(&_0, &className);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "getobjvars", NULL, 0, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/openssl.zep.c b/ext/stub/openssl.zep.c
index 535748f098..006e1d7168 100644
--- a/ext/stub/openssl.zep.c
+++ b/ext/stub/openssl.zep.c
@@ -28,6 +28,7 @@ ZEPHIR_INIT_CLASS(Stub_Openssl)
 
 PHP_METHOD(Stub_Openssl, randomPseudoBytes)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *length_param = NULL, _0;
 	zend_long length, ZEPHIR_LAST_CALL_STATUS;
 
@@ -35,17 +36,20 @@ PHP_METHOD(Stub_Openssl, randomPseudoBytes)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(length)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &length_param);
 	ZVAL_LONG(&_0, length);
 	ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 76, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Openssl, randomPseudoBytesLoop)
 {
 	zend_bool _0;
 	zval arr, i, _3$$3, _4$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zephir_fcall_cache_entry *_5 = NULL;
 
@@ -53,9 +57,12 @@ PHP_METHOD(Stub_Openssl, randomPseudoBytesLoop)
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
-	ZVAL_NULL(&i);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&i);
 	ZVAL_LONG(&i, 0);
-	ZVAL_NULL(&arr);
+	ZEPHIR_INIT_VAR(&arr);
 	array_init(&arr);
 	_2 = 10;
 	_1 = 1;
@@ -83,6 +90,7 @@ PHP_METHOD(Stub_Openssl, randomPseudoBytesLoop)
 
 PHP_METHOD(Stub_Openssl, opensslEncrypt)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *data_param = NULL, _0, _1, _2, _3;
 	zval data;
@@ -95,17 +103,19 @@ PHP_METHOD(Stub_Openssl, opensslEncrypt)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(data)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &data_param);
 	zephir_get_strval(&data, data_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "AES-256-CBC");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "passphrase");
 	ZVAL_LONG(&_2, 1);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "1234567890123456");
 	ZEPHIR_RETURN_CALL_FUNCTION("openssl_encrypt", NULL, 77, &data, &_0, &_1, &_2, &_3);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/operator.zep.c b/ext/stub/operator.zep.c
index daab08a486..7bd17196cc 100644
--- a/ext/stub/operator.zep.c
+++ b/ext/stub/operator.zep.c
@@ -43,6 +43,7 @@ PHP_METHOD(Stub_Operator, testIdentical)
 PHP_METHOD(Stub_Operator, testIdenticalIfComplex)
 {
 	zend_bool b = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *input, input_sub, a, _0;
 
 	ZVAL_UNDEF(&input_sub);
@@ -51,8 +52,10 @@ PHP_METHOD(Stub_Operator, testIdenticalIfComplex)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(input)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &input);
-	ZVAL_NULL(&a);
+	ZEPHIR_INIT_VAR(&a);
 	zephir_create_array(&a, 1, 0);
 	zephir_array_update_string(&a, SL("1"), input, PH_COPY | PH_SEPARATE);
 	b = 0;
@@ -90,6 +93,7 @@ PHP_METHOD(Stub_Operator, testIdenticalFalseVar)
 PHP_METHOD(Stub_Operator, testBoolComparison)
 {
 	zend_bool var1, var2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *varTrue, varTrue_sub, *varFalse, varFalse_sub, _0;
 
 	ZVAL_UNDEF(&varTrue_sub);
@@ -99,11 +103,13 @@ PHP_METHOD(Stub_Operator, testBoolComparison)
 		Z_PARAM_ZVAL(varTrue)
 		Z_PARAM_ZVAL(varFalse)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &varTrue, &varFalse);
 	var1 = 1;
 	var2 = 0;
 	zephir_create_array(return_value, 8, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_BOOL(&_0, ZEPHIR_IS_BOOL_VALUE(varTrue, var1));
 	zephir_array_fast_append(return_value, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -127,12 +133,13 @@ PHP_METHOD(Stub_Operator, testBoolComparison)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_BOOL(&_0, !ZEPHIR_IS_BOOL_IDENTICAL(varFalse, var1));
 	zephir_array_fast_append(return_value, &_0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Operator, testNewInstanceOperator)
 {
 	zend_class_entry *_1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *className, className_sub, _0;
 
@@ -141,6 +148,8 @@ PHP_METHOD(Stub_Operator, testNewInstanceOperator)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(className)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &className);
 	zephir_fetch_safe_class(&_0, className);
 	_1 = zephir_fetch_class_str_ex(Z_STRVAL_P(&_0), Z_STRLEN_P(&_0), ZEND_FETCH_CLASS_AUTO);
@@ -153,6 +162,6 @@ PHP_METHOD(Stub_Operator, testNewInstanceOperator)
 		zephir_check_call_status();
 	}
 
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/optimizers/acos.zep.c b/ext/stub/optimizers/acos.zep.c
index 7f69299982..0d2f1e2b47 100644
--- a/ext/stub/optimizers/acos.zep.c
+++ b/ext/stub/optimizers/acos.zep.c
@@ -14,8 +14,8 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
+#include "kernel/operators.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
@@ -28,43 +28,56 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
 PHP_METHOD(Stub_Optimizers_ACos, testInt)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	ZVAL_LONG(&_0, a);
 	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVar)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	ZVAL_LONG(&_0, a);
 	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntValue1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
 	zend_long a, ZEPHIR_LAST_CALL_STATUS;
 
@@ -72,15 +85,18 @@ PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	ZVAL_LONG(&_0, a);
 	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
 
@@ -88,9 +104,11 @@ PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, a);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/optimizers/arraymerge.zep.c b/ext/stub/optimizers/arraymerge.zep.c
index 9436a3cc02..625944f2ac 100644
--- a/ext/stub/optimizers/arraymerge.zep.c
+++ b/ext/stub/optimizers/arraymerge.zep.c
@@ -27,6 +27,7 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ArrayMerge)
 
 PHP_METHOD(Stub_Optimizers_ArrayMerge, mergeTwoRequiredArrays)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arr1_param = NULL, *arr2_param = NULL;
 	zval arr1, arr2;
 
@@ -36,10 +37,12 @@ PHP_METHOD(Stub_Optimizers_ArrayMerge, mergeTwoRequiredArrays)
 		Z_PARAM_ARRAY(arr1)
 		Z_PARAM_ARRAY(arr2)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arr1_param, &arr2_param);
 	zephir_get_arrval(&arr1, arr1_param);
 	zephir_get_arrval(&arr2, arr2_param);
 	zephir_fast_array_merge(return_value, &arr1, &arr2);
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/optimizers/asin.zep.c b/ext/stub/optimizers/asin.zep.c
index 751b902e05..77f2353825 100644
--- a/ext/stub/optimizers/asin.zep.c
+++ b/ext/stub/optimizers/asin.zep.c
@@ -14,8 +14,8 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
-#include "kernel/operators.h"
 #include "kernel/memory.h"
+#include "kernel/operators.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
@@ -28,43 +28,56 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
 PHP_METHOD(Stub_Optimizers_ASin, testInt)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	ZVAL_LONG(&_0, a);
 	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVar)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, a;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
 	ZVAL_LONG(&_0, a);
 	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntValue1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
 	zend_long a, ZEPHIR_LAST_CALL_STATUS;
 
@@ -72,15 +85,18 @@ PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	ZVAL_LONG(&_0, a);
 	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
 
@@ -88,9 +104,11 @@ PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
 	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, a);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/optimizers/isscalar.zep.c b/ext/stub/optimizers/isscalar.zep.c
index 8e8f5d30f3..396fd24fed 100644
--- a/ext/stub/optimizers/isscalar.zep.c
+++ b/ext/stub/optimizers/isscalar.zep.c
@@ -59,9 +59,13 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testBoolVar)
 PHP_METHOD(Stub_Optimizers_IsScalar, testStringVar)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "test string");
 	RETURN_MM_BOOL(zephir_is_scalar(&a));
 }
@@ -69,9 +73,13 @@ PHP_METHOD(Stub_Optimizers_IsScalar, testStringVar)
 PHP_METHOD(Stub_Optimizers_IsScalar, testEmptyArrayVar)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	array_init(&a);
 	RETURN_MM_BOOL(zephir_is_scalar(&a));
 }
diff --git a/ext/stub/optimizers/strreplace.zep.c b/ext/stub/optimizers/strreplace.zep.c
index 8408234234..584f880136 100644
--- a/ext/stub/optimizers/strreplace.zep.c
+++ b/ext/stub/optimizers/strreplace.zep.c
@@ -33,24 +33,28 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1055)
 {
 	zval _1, _3;
 	zval _0, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_3);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "aa");
 	zephir_array_fast_append(&_0, &_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	zephir_create_array(&_2, 1, 0);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "aaa");
 	zephir_array_fast_append(&_2, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "bla bla aa aaa askks");
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	zephir_fast_str_replace(&_3, &_0, &_2, &_1);
 	RETURN_CCTOR(&_3);
 }
@@ -58,16 +62,20 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1055)
 PHP_METHOD(Stub_Optimizers_StrReplace, issue1087)
 {
 	zval filtered, sanitize, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&filtered);
 	ZVAL_UNDEF(&sanitize);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&filtered);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&filtered);
 	ZVAL_STRING(&filtered, "test_test");
-	ZVAL_NULL(&sanitize);
+	ZEPHIR_INIT_VAR(&sanitize);
 	zephir_create_array(&sanitize, 8, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "/");
 	zephir_array_fast_append(&sanitize, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -92,7 +100,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue1087)
 	ZVAL_STRING(&_0, "&");
 	zephir_array_fast_append(&sanitize, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "");
 	zephir_fast_str_replace(&_0, &sanitize, &_1, &filtered);
 	ZEPHIR_CPY_WRT(&filtered, &_0);
@@ -104,14 +112,18 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732A)
 	zval subject;
 	zval _0;
 	zval search, replace;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&search);
 	ZVAL_UNDEF(&replace);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&subject);
-	ZVAL_NULL(&search);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&search);
 	zephir_create_array(&search, 5, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "A");
 	zephir_array_fast_append(&search, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -126,7 +138,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732A)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "E");
 	zephir_array_fast_append(&search, &_0);
-	ZVAL_NULL(&replace);
+	ZEPHIR_INIT_VAR(&replace);
 	zephir_create_array(&replace, 5, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "B");
@@ -143,7 +155,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732A)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "F");
 	zephir_array_fast_append(&replace, &_0);
-	ZVAL_NULL(&subject);
+	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "A");
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_fast_str_replace(&_0, &search, &replace, &subject);
@@ -155,15 +167,19 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	zval subject;
 	zval _0;
 	zval patterns, replacements;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&patterns);
 	ZVAL_UNDEF(&replacements);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&subject);
-	ZVAL_NULL(&patterns);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&patterns);
 	zephir_create_array(&patterns, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "/quick/");
 	zephir_array_fast_append(&patterns, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -172,7 +188,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "/fox/");
 	zephir_array_fast_append(&patterns, &_0);
-	ZVAL_NULL(&replacements);
+	ZEPHIR_INIT_VAR(&replacements);
 	zephir_create_array(&replacements, 3, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "bear");
@@ -183,10 +199,10 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "slow");
 	zephir_array_fast_append(&replacements, &_0);
-	ZVAL_NULL(&subject);
+	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "The quick brown fox jumped over the lazy dog.");
 	ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 78, &patterns, &replacements, &subject);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/pregmatch.zep.c b/ext/stub/pregmatch.zep.c
index 7369bcdc7d..0f2eeab924 100644
--- a/ext/stub/pregmatch.zep.c
+++ b/ext/stub/pregmatch.zep.c
@@ -30,39 +30,47 @@ ZEPHIR_INIT_CLASS(Stub_Pregmatch)
 PHP_METHOD(Stub_Pregmatch, testWithoutReturnAndMatches)
 {
 	zval pattern, subject, _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&pattern);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZVAL_NULL(&subject);
+	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_preg_match(&_1, &pattern, &subject, &_0, 0, 0 , 0 );
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	zephir_preg_match(return_value, &pattern, &subject, &_2, 0, 0 , 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Pregmatch, testWithoutReturns)
 {
 	zval pattern, subject, matches, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&matches);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
-	ZVAL_NULL(&matches);
-	ZVAL_NULL(&pattern);
+	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZVAL_NULL(&subject);
+	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_preg_match(&_0, &pattern, &subject, &matches, 0, 0 , 0 );
 	RETURN_CCTOR(&matches);
 }
@@ -70,17 +78,21 @@ PHP_METHOD(Stub_Pregmatch, testWithoutReturns)
 PHP_METHOD(Stub_Pregmatch, testWithoutMatches)
 {
 	zval pattern, subject, matched, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&matched);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&pattern);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZVAL_NULL(&subject);
+	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&matched);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&matched);
 	zephir_preg_match(&matched, &pattern, &subject, &_0, 0, 0 , 0 );
 	RETURN_CCTOR(&matched);
 }
@@ -88,41 +100,50 @@ PHP_METHOD(Stub_Pregmatch, testWithoutMatches)
 PHP_METHOD(Stub_Pregmatch, testPregMatchAll)
 {
 	zval pattern, subject, results;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&results);
-	ZVAL_NULL(&pattern);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZVAL_NULL(&subject);
+	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "abcdef");
-	ZVAL_NULL(&results);
+	ZEPHIR_INIT_VAR(&results);
 	array_init(&results);
 	zephir_preg_match(return_value, &pattern, &subject, &results, 1, 0 , 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Pregmatch, testPregMatchFallback)
 {
 	zval pattern, subject, matches;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&pattern);
 	ZVAL_UNDEF(&subject);
 	ZVAL_UNDEF(&matches);
-	ZVAL_NULL(&matches);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
 	ZEPHIR_INIT_NVAR(&matches);
 	array_init(&matches);
-	ZVAL_NULL(&pattern);
+	ZEPHIR_INIT_VAR(&pattern);
 	ZVAL_STRING(&pattern, "/def$/");
-	ZVAL_NULL(&subject);
+	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "abcdef");
 	zephir_preg_match(return_value, &pattern, &subject, &matches, 0, 0 , 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Pregmatch, testPregMatch2Params)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *pattern, pattern_sub, *subject, subject_sub, _0;
 
 	ZVAL_UNDEF(&pattern_sub);
@@ -132,10 +153,12 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch2Params)
 		Z_PARAM_ZVAL(pattern)
 		Z_PARAM_ZVAL(subject)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &pattern, &subject);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_preg_match(return_value, pattern, subject, &_0, 0, 0 , 0 );
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Pregmatch, testPregMatch3Params)
@@ -200,6 +223,7 @@ PHP_METHOD(Stub_Pregmatch, testPregMatch5Params)
  */
 PHP_METHOD(Stub_Pregmatch, testPregMatchSaveMatches)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *pattern_param = NULL, matches, _0;
 	zval str, pattern;
 
@@ -211,18 +235,21 @@ PHP_METHOD(Stub_Pregmatch, testPregMatchSaveMatches)
 		Z_PARAM_STR(str)
 		Z_PARAM_STR(pattern)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &str_param, &pattern_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&pattern, pattern_param);
+	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
-	ZVAL_NULL(&matches);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_preg_match(&_0, &pattern, &str, &matches, 0, 0 , 0 );
 	RETURN_CCTOR(&matches);
 }
 
 PHP_METHOD(Stub_Pregmatch, testMatchAll)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *flags, flags_sub, text, matches, _0, _1, _2;
 
 	ZVAL_UNDEF(&flags_sub);
@@ -234,15 +261,17 @@ PHP_METHOD(Stub_Pregmatch, testMatchAll)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(flags)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &flags);
-	ZVAL_NULL(&matches);
+	ZEPHIR_INIT_VAR(&matches);
 	array_init(&matches);
-	ZVAL_NULL(&text);
+	ZEPHIR_INIT_VAR(&text);
 	ZVAL_STRING(&text, "test1,test2");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "/(test[0-9]+)/");
-	ZVAL_NULL(&_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_1);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "/(test[0-9]+)/");
 	zephir_preg_match(&_1, &_2, &text, &matches, 1, zephir_get_intval(flags) , 0 );
 	RETURN_CCTOR(&matches);
@@ -251,6 +280,7 @@ PHP_METHOD(Stub_Pregmatch, testMatchAll)
 PHP_METHOD(Stub_Pregmatch, testMatchAllInZep)
 {
 	zval m1, m2, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_1 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
@@ -258,6 +288,9 @@ PHP_METHOD(Stub_Pregmatch, testMatchAllInZep)
 	ZVAL_UNDEF(&m1);
 	ZVAL_UNDEF(&m2);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 1);
 	ZEPHIR_CALL_METHOD(&m1, this_ptr, "testmatchall", &_1, 0, &_0);
 	zephir_check_call_status();
@@ -267,6 +300,6 @@ PHP_METHOD(Stub_Pregmatch, testMatchAllInZep)
 	zephir_create_array(return_value, 2, 0);
 	zephir_array_fast_append(return_value, &m1);
 	zephir_array_fast_append(return_value, &m2);
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/properties/app.zep.c b/ext/stub/properties/app.zep.c
index e27454998a..b8af2f122c 100644
--- a/ext/stub/properties/app.zep.c
+++ b/ext/stub/properties/app.zep.c
@@ -37,12 +37,17 @@ PHP_METHOD(Stub_Properties_App, getInstance)
 PHP_METHOD(Stub_Properties_App, __construct)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_CE_STATIC(&_0, stub_properties_staticprivateproperties_ce, "getinstance", NULL, 0);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("instance"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/properties/extendspublicproperties.zep.c b/ext/stub/properties/extendspublicproperties.zep.c
index dc908d5388..4335b268ab 100644
--- a/ext/stub/properties/extendspublicproperties.zep.c
+++ b/ext/stub/properties/extendspublicproperties.zep.c
@@ -33,6 +33,7 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 {
 		zval _1$$3, _2$$3, _4$$4, _6$$5, _11$$7;
 	zval _0, _3, _5, _8, _10, _7$$5, _9$$6, _12$$7;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_5);
@@ -48,15 +49,17 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 	ZVAL_UNDEF(&_11$$7);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("someArrayWithSubArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			zephir_create_array(&_1$$3, 4, 0);
-			ZVAL_NULL(&_2$$3);
+			ZEPHIR_INIT_VAR(&_2$$3);
 			zephir_create_array(&_2$$3, 1, 0);
 			add_assoc_stringl_ex(&_2$$3, SL("class"), SL("alert alert-success"));
 			zephir_array_update_string(&_1$$3, SL("success"), &_2$$3, PH_COPY | PH_SEPARATE);
@@ -76,7 +79,7 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 		}
 		zephir_read_property_ex(&_3, this_ptr, ZEND_STRL("someArrayWithSpecifyKeys"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_3) == IS_NULL) {
-			ZVAL_NULL(&_4$$4);
+			ZEPHIR_INIT_VAR(&_4$$4);
 			zephir_create_array(&_4$$4, 3, 0);
 			add_assoc_stringl_ex(&_4$$4, SL("a"), SL("A"));
 			add_assoc_stringl_ex(&_4$$4, SL("b"), SL("B"));
@@ -85,9 +88,9 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 		}
 		zephir_read_property_ex(&_5, this_ptr, ZEND_STRL("someArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_5) == IS_NULL) {
-			ZVAL_NULL(&_6$$5);
+			ZEPHIR_INIT_VAR(&_6$$5);
 			zephir_create_array(&_6$$5, 4, 0);
-			ZVAL_NULL(&_7$$5);
+			ZEPHIR_INIT_VAR(&_7$$5);
 			ZVAL_LONG(&_7$$5, 1);
 			zephir_array_fast_append(&_6$$5, &_7$$5);
 			ZEPHIR_INIT_NVAR(&_7$$5);
@@ -103,19 +106,20 @@ zend_object *zephir_init_properties_Stub_Properties_ExtendsPublicProperties(zend
 		}
 		zephir_read_property_ex(&_8, this_ptr, ZEND_STRL("someEmptyArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_8) == IS_NULL) {
-			ZVAL_NULL(&_9$$6);
+			ZEPHIR_INIT_VAR(&_9$$6);
 			array_init(&_9$$6);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someEmptyArray"), &_9$$6);
 		}
 		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("someGetterSetterArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_10) == IS_NULL) {
-			ZVAL_NULL(&_11$$7);
+			ZEPHIR_INIT_VAR(&_11$$7);
 			zephir_create_array(&_11$$7, 1, 0);
-			ZVAL_NULL(&_12$$7);
+			ZEPHIR_INIT_VAR(&_12$$7);
 			ZVAL_STRING(&_12$$7, "holy");
 			zephir_array_fast_append(&_11$$7, &_12$$7);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someGetterSetterArray"), &_11$$7);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/getobjectvars.zep.c b/ext/stub/properties/getobjectvars.zep.c
index 3ea555a040..ceb5cb3a65 100644
--- a/ext/stub/properties/getobjectvars.zep.c
+++ b/ext/stub/properties/getobjectvars.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/fcall.h"
 #include "kernel/object.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Properties_GetObjectVars)
@@ -31,10 +32,14 @@ ZEPHIR_INIT_CLASS(Stub_Properties_GetObjectVars)
  */
 PHP_METHOD(Stub_Properties_GetObjectVars, issue1245)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 75, this_ptr);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/properties/propertyarray.zep.c b/ext/stub/properties/propertyarray.zep.c
index df4206750f..e1f503efaf 100644
--- a/ext/stub/properties/propertyarray.zep.c
+++ b/ext/stub/properties/propertyarray.zep.c
@@ -47,21 +47,27 @@ PHP_METHOD(Stub_Properties_PropertyArray, __construct)
 {
 	zval _1;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 1, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someArray"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Properties_PropertyArray, appendSome)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *value, value_sub;
 	zval *this_ptr = getThis();
 
@@ -70,9 +76,12 @@ PHP_METHOD(Stub_Properties_PropertyArray, appendSome)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
 	zephir_cast_to_string(&_0, value);
 	zephir_update_property_array_append(this_ptr, SL("someArray"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Properties_PropertyArray, setOtherArray)
@@ -97,6 +106,7 @@ PHP_METHOD(Stub_Properties_PropertyArray, getOtherArray)
 PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 {
 	zval info, headers, _0$$3, _2$$3, _3$$3, _5$$5;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_1 = NULL, *_4 = NULL, *_6 = NULL;
 	zval *this_ptr = getThis();
@@ -107,7 +117,10 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 	ZVAL_UNDEF(&_2$$3);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_5$$5);
-	ZVAL_NULL(&headers);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&headers);
 	array_init(&headers);
 	while (1) {
 		if (!(1)) {
@@ -141,6 +154,7 @@ zend_object *zephir_init_properties_Stub_Properties_PropertyArray(zend_class_ent
 {
 		zval _3$$4;
 	zval _0, _2, _5, _1$$3, _4$$4, _6$$5;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_5);
@@ -150,21 +164,23 @@ zend_object *zephir_init_properties_Stub_Properties_PropertyArray(zend_class_ent
 	ZVAL_UNDEF(&_3$$4);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("otherArray"), &_1$$3);
 		}
 		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("someArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_2) == IS_NULL) {
-			ZVAL_NULL(&_3$$4);
+			ZEPHIR_INIT_VAR(&_3$$4);
 			zephir_create_array(&_3$$4, 4, 0);
-			ZVAL_NULL(&_4$$4);
+			ZEPHIR_INIT_VAR(&_4$$4);
 			ZVAL_LONG(&_4$$4, 1);
 			zephir_array_fast_append(&_3$$4, &_4$$4);
 			ZEPHIR_INIT_NVAR(&_4$$4);
@@ -180,10 +196,11 @@ zend_object *zephir_init_properties_Stub_Properties_PropertyArray(zend_class_ent
 		}
 		zephir_read_property_ex(&_5, this_ptr, ZEND_STRL("someEmptyArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_5) == IS_NULL) {
-			ZVAL_NULL(&_6$$5);
+			ZEPHIR_INIT_VAR(&_6$$5);
 			array_init(&_6$$5);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someEmptyArray"), &_6$$5);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/propertyupdate.zep.c b/ext/stub/properties/propertyupdate.zep.c
index 0bf5f7f599..e7f318c90f 100644
--- a/ext/stub/properties/propertyupdate.zep.c
+++ b/ext/stub/properties/propertyupdate.zep.c
@@ -27,12 +27,17 @@ ZEPHIR_INIT_CLASS(Stub_Properties_PropertyUpdate)
 PHP_METHOD(Stub_Properties_PropertyUpdate, update1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "aaa");
 	zephir_update_property_array_append(this_ptr, SL("p1"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/properties/protectedproperties.zep.c b/ext/stub/properties/protectedproperties.zep.c
index b348b13a6c..11639eaad6 100644
--- a/ext/stub/properties/protectedproperties.zep.c
+++ b/ext/stub/properties/protectedproperties.zep.c
@@ -95,6 +95,7 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeVar)
  */
 PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeArrayVar)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *someArrayVar_param = NULL;
 	zval someArrayVar;
 	zval *this_ptr = getThis();
@@ -103,6 +104,8 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, setSomeArrayVar)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(someArrayVar)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &someArrayVar_param);
 	zephir_get_arrval(&someArrayVar, someArrayVar_param);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("someArrayVar"), &someArrayVar);
@@ -200,20 +203,24 @@ PHP_METHOD(Stub_Properties_ProtectedProperties, getSomeString)
 zend_object *zephir_init_properties_Stub_Properties_ProtectedProperties(zend_class_entry *class_type)
 {
 		zval _0, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1$$3);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("someArrayVar"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someArrayVar"), &_1$$3);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/publicproperties.zep.c b/ext/stub/properties/publicproperties.zep.c
index 02ae672545..8d79f41965 100644
--- a/ext/stub/properties/publicproperties.zep.c
+++ b/ext/stub/properties/publicproperties.zep.c
@@ -100,9 +100,14 @@ PHP_METHOD(Stub_Properties_PublicProperties, getSomeGetterSetterArray)
 PHP_METHOD(Stub_Properties_PublicProperties, test394Issue)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	zephir_memory_observe(&_0);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("someTrue"), PH_NOISY_CC);
 	RETURN_CCTOR(&_0);
 }
@@ -111,6 +116,7 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 {
 		zval _3$$4, _4$$4, _6$$5, _8$$6;
 	zval _0, _2, _5, _7, _10, _1$$3, _9$$6, _11$$7;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_5);
@@ -125,21 +131,23 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 	ZVAL_UNDEF(&_8$$6);
 	
 
+		ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+		zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	
 	{
 		zval local_this_ptr, *this_ptr = &local_this_ptr;
 		ZEPHIR_CREATE_OBJECT(this_ptr, class_type);
 		zephir_read_property_ex(&_0, this_ptr, ZEND_STRL("someGetterSetterArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_0) == IS_NULL) {
-			ZVAL_NULL(&_1$$3);
+			ZEPHIR_INIT_VAR(&_1$$3);
 			array_init(&_1$$3);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someGetterSetterArray"), &_1$$3);
 		}
 		zephir_read_property_ex(&_2, this_ptr, ZEND_STRL("someArrayWithSubArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_2) == IS_NULL) {
-			ZVAL_NULL(&_3$$4);
+			ZEPHIR_INIT_VAR(&_3$$4);
 			zephir_create_array(&_3$$4, 4, 0);
-			ZVAL_NULL(&_4$$4);
+			ZEPHIR_INIT_VAR(&_4$$4);
 			zephir_create_array(&_4$$4, 1, 0);
 			add_assoc_stringl_ex(&_4$$4, SL("class"), SL("alert alert-success"));
 			zephir_array_update_string(&_3$$4, SL("success"), &_4$$4, PH_COPY | PH_SEPARATE);
@@ -159,7 +167,7 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 		}
 		zephir_read_property_ex(&_5, this_ptr, ZEND_STRL("someArrayWithSpecifyKeys"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_5) == IS_NULL) {
-			ZVAL_NULL(&_6$$5);
+			ZEPHIR_INIT_VAR(&_6$$5);
 			zephir_create_array(&_6$$5, 3, 0);
 			add_assoc_stringl_ex(&_6$$5, SL("a"), SL("A"));
 			add_assoc_stringl_ex(&_6$$5, SL("b"), SL("B"));
@@ -168,9 +176,9 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 		}
 		zephir_read_property_ex(&_7, this_ptr, ZEND_STRL("someArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_7) == IS_NULL) {
-			ZVAL_NULL(&_8$$6);
+			ZEPHIR_INIT_VAR(&_8$$6);
 			zephir_create_array(&_8$$6, 4, 0);
-			ZVAL_NULL(&_9$$6);
+			ZEPHIR_INIT_VAR(&_9$$6);
 			ZVAL_LONG(&_9$$6, 1);
 			zephir_array_fast_append(&_8$$6, &_9$$6);
 			ZEPHIR_INIT_NVAR(&_9$$6);
@@ -186,10 +194,11 @@ zend_object *zephir_init_properties_Stub_Properties_PublicProperties(zend_class_
 		}
 		zephir_read_property_ex(&_10, this_ptr, ZEND_STRL("someEmptyArray"), PH_NOISY_CC | PH_READONLY);
 		if (Z_TYPE_P(&_10) == IS_NULL) {
-			ZVAL_NULL(&_11$$7);
+			ZEPHIR_INIT_VAR(&_11$$7);
 			array_init(&_11$$7);
 			zephir_update_property_zval_ex(this_ptr, ZEND_STRL("someEmptyArray"), &_11$$7);
 		}
+		ZEPHIR_MM_RESTORE();
 		return Z_OBJ_P(this_ptr);
 	}
 }
diff --git a/ext/stub/properties/staticprivateproperties.zep.c b/ext/stub/properties/staticprivateproperties.zep.c
index 3ab8ddfd60..b2a370da66 100644
--- a/ext/stub/properties/staticprivateproperties.zep.c
+++ b/ext/stub/properties/staticprivateproperties.zep.c
@@ -28,10 +28,15 @@ ZEPHIR_INIT_CLASS(Stub_Properties_StaticPrivateProperties)
 PHP_METHOD(Stub_Properties_StaticPrivateProperties, getInstance)
 {
 	zval localInstance, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&localInstance);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	zephir_memory_observe(&localInstance);
 	zephir_read_static_property_ce(&localInstance, stub_properties_staticprivateproperties_ce, SL("instance"), PH_NOISY_CC);
 	if (UNEXPECTED(Z_TYPE_P(&localInstance) != IS_OBJECT)) {
 		ZEPHIR_INIT_NVAR(&localInstance);
diff --git a/ext/stub/properties/staticpropertyarray.zep.c b/ext/stub/properties/staticpropertyarray.zep.c
index 5059055691..9a3947ef41 100644
--- a/ext/stub/properties/staticpropertyarray.zep.c
+++ b/ext/stub/properties/staticpropertyarray.zep.c
@@ -40,11 +40,15 @@ void zephir_init_static_properties_Stub_Properties_StaticPropertyArray()
 {
 	zval _1;
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_create_array(&_0, 4, 0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_LONG(&_1, 1);
 	zephir_array_fast_append(&_0, &_1);
 	ZEPHIR_INIT_NVAR(&_1);
@@ -60,5 +64,6 @@ void zephir_init_static_properties_Stub_Properties_StaticPropertyArray()
 	ZEPHIR_INIT_NVAR(&_1);
 	array_init(&_1);
 	zephir_update_static_property_ce(stub_properties_staticpropertyarray_ce, ZEND_STRL("someEmptyArray"), &_1);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/properties/staticprotectedproperties.zep.c b/ext/stub/properties/staticprotectedproperties.zep.c
index 355656c3b9..5d8c45021f 100644
--- a/ext/stub/properties/staticprotectedproperties.zep.c
+++ b/ext/stub/properties/staticprotectedproperties.zep.c
@@ -154,9 +154,14 @@ PHP_METHOD(Stub_Properties_StaticProtectedProperties, getSomeString)
 PHP_METHOD(Stub_Properties_StaticProtectedProperties, compareStaticNull)
 {
 	zval someNull, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&someNull);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	zephir_memory_observe(&_0);
 	zephir_read_static_property_ce(&_0, stub_properties_staticprotectedproperties_ce, SL("someNull"), PH_NOISY_CC);
 	ZEPHIR_CPY_WRT(&someNull, &_0);
 	if (Z_TYPE_P(&someNull) == IS_NULL) {
diff --git a/ext/stub/properties/staticpublicproperties.zep.c b/ext/stub/properties/staticpublicproperties.zep.c
index 4c77714600..ddddcccb63 100644
--- a/ext/stub/properties/staticpublicproperties.zep.c
+++ b/ext/stub/properties/staticpublicproperties.zep.c
@@ -81,9 +81,13 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub)
 PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub2)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "2string");
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &_0);
@@ -91,6 +95,7 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub2)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "2string");
 	zephir_sub_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someSub"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub3)
@@ -124,11 +129,16 @@ PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub4)
 PHP_METHOD(Stub_Properties_StaticPublicProperties, testAddAndSub5)
 {
 	zval v;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&v);
-	ZVAL_NULL(&v);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&v);
 	ZVAL_STRING(&v, "1");
 	zephir_add_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someAdd"), &v);
 	zephir_sub_static_property_ce(stub_properties_staticpublicproperties_ce, ZEND_STRL("someSub"), &v);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/quantum.zep.c b/ext/stub/quantum.zep.c
index fe427ce746..4ef3cc46a4 100644
--- a/ext/stub/quantum.zep.c
+++ b/ext/stub/quantum.zep.c
@@ -35,6 +35,7 @@ PHP_METHOD(Stub_Quantum, harmos)
 {
 	zval _8$$4, _10$$4, _11$$4;
 	zend_bool _12, _15$$5, _34$$5, _50$$5;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_5 = NULL, *_55 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i = 0, j = 0, n = 0, _13, _14, _16$$5, _17$$5, _35$$5, _36$$5;
 	zval *x_param = NULL, psr, psi, p2, v, paramater, fp, tmp, _0, _1, _2$$4, _3$$4, _4$$4, _6$$4, _7$$4, _9$$4, _18$$6, _19$$6, _20$$6, _21$$6, _22$$6, _23$$6, _24$$6, _25$$6, _26$$6, _27$$6, _28$$6, _29$$6, _30$$6, _31$$6, _32$$6, _33$$6, _37$$7, _38$$7, _39$$7, _40$$7, _41$$7, _42$$7, _43$$7, _44$$7, _45$$7, _46$$7, _47$$7, _48$$7, _49$$7, _51$$9, _52$$9, _53$$9, _54$$9, _56$$8, _57$$10, _58$$10, _59$$10;
@@ -98,14 +99,16 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(x)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &x_param);
 	x = zephir_get_doubleval(x_param);
 	dx =  (0.02);
 	k0 =  ((3.0 * 3.14159265358979323846));
 	dt =  (zephir_safe_div_double_long((dx * dx), 4.0));
-	ZVAL_NULL(&paramater);
+	ZEPHIR_INIT_VAR(&paramater);
 	zephir_create_array(&paramater, 4, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_DOUBLE(&_0, dx);
 	zephir_array_fast_append(&paramater, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -118,17 +121,17 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZVAL_DOUBLE(&_0, x);
 	zephir_array_fast_append(&paramater, &_0);
 	i = 0;
-	ZVAL_NULL(&psr);
+	ZEPHIR_INIT_VAR(&psr);
 	array_init(&psr);
-	ZVAL_NULL(&psi);
+	ZEPHIR_INIT_VAR(&psi);
 	array_init(&psi);
-	ZVAL_NULL(&p2);
+	ZEPHIR_INIT_VAR(&p2);
 	array_init(&p2);
-	ZVAL_NULL(&v);
+	ZEPHIR_INIT_VAR(&v);
 	array_init(&v);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "harmos.txt");
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "w");
 	ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 35, &_0, &_1);
 	zephir_check_call_status();
@@ -172,7 +175,7 @@ PHP_METHOD(Stub_Quantum, harmos)
 	}
 	i = 1;
 	j = 1;
-	ZVAL_NULL(&tmp);
+	ZEPHIR_INIT_VAR(&tmp);
 	zephir_create_array(&tmp, 1, 0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_DOUBLE(&_0, 2.0);
diff --git a/ext/stub/range.zep.c b/ext/stub/range.zep.c
index 445133d67c..d8eceb832f 100644
--- a/ext/stub/range.zep.c
+++ b/ext/stub/range.zep.c
@@ -32,12 +32,16 @@ PHP_METHOD(Stub_Range, inclusive1)
 {
 	zval _3;
 	zval _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
 	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 83, &_0, &_1);
@@ -50,12 +54,16 @@ PHP_METHOD(Stub_Range, exclusive1)
 {
 	zval _3;
 	zval _0, _1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
 	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 83, &_0, &_1);
diff --git a/ext/stub/reflection.zep.c b/ext/stub/reflection.zep.c
index 788259168d..a1f26dfb97 100644
--- a/ext/stub/reflection.zep.c
+++ b/ext/stub/reflection.zep.c
@@ -28,11 +28,15 @@ ZEPHIR_INIT_CLASS(Stub_Reflection)
 PHP_METHOD(Stub_Reflection, getReflectionClass)
 {
 	zval r;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&r);
-	ZVAL_NULL(&r);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionclass")));
 	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 84, this_ptr);
 	zephir_check_call_status();
@@ -42,13 +46,17 @@ PHP_METHOD(Stub_Reflection, getReflectionClass)
 PHP_METHOD(Stub_Reflection, getReflectionFunction)
 {
 	zval r, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&r);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&r);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionfunction")));
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "abs");
 	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 85, &_0);
 	zephir_check_call_status();
diff --git a/ext/stub/regexdna.zep.c b/ext/stub/regexdna.zep.c
index 3e016e275b..9be456af9f 100644
--- a/ext/stub/regexdna.zep.c
+++ b/ext/stub/regexdna.zep.c
@@ -35,6 +35,7 @@ ZEPHIR_INIT_CLASS(Stub_RegexDNA)
 
 PHP_METHOD(Stub_RegexDNA, process)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zval *path, path_sub, variants, vIUB, vIUBnew, stuffToRemove, contents, initialLength, regex, codeLength, discard, _0, _1, _2, *_4, _5, _6$$3, _7$$3, _8$$4, _9$$4;
@@ -60,12 +61,14 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
+	ZEPHIR_INIT_VAR(&discard);
 	ZVAL_NULL(&discard);
-	ZVAL_NULL(&discard);
-	ZVAL_NULL(&variants);
+	ZEPHIR_INIT_VAR(&variants);
 	zephir_create_array(&variants, 9, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "agggtaaa|tttaccct");
 	zephir_array_fast_append(&variants, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -92,9 +95,9 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "agggtaa[cgt]|[acg]ttaccct");
 	zephir_array_fast_append(&variants, &_0);
-	ZVAL_NULL(&vIUB);
+	ZEPHIR_INIT_VAR(&vIUB);
 	array_init(&vIUB);
-	ZVAL_NULL(&vIUBnew);
+	ZEPHIR_INIT_VAR(&vIUBnew);
 	array_init(&vIUBnew);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "/B/S");
@@ -162,22 +165,22 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "(c|t)");
 	zephir_array_append(&vIUBnew, &_0, PH_SEPARATE, "stub/regexdna.zep", 39);
-	ZVAL_NULL(&stuffToRemove);
+	ZEPHIR_INIT_VAR(&stuffToRemove);
 	ZVAL_STRING(&stuffToRemove, "^>.*$|\n");
 	ZEPHIR_INIT_NVAR(&discard);
 	ZVAL_NULL(&discard);
-	ZVAL_NULL(&contents);
+	ZEPHIR_INIT_VAR(&contents);
 	zephir_file_get_contents(&contents, path);
-	ZVAL_NULL(&initialLength);
+	ZEPHIR_INIT_VAR(&initialLength);
 	ZVAL_LONG(&initialLength, zephir_fast_strlen_ev(&contents));
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_CONCAT_SVS(&_1, "/", &stuffToRemove, "/mS");
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "");
 	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 78, &_1, &_0, &contents);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&contents, &_2);
-	ZVAL_NULL(&codeLength);
+	ZEPHIR_INIT_VAR(&codeLength);
 	ZVAL_LONG(&codeLength, zephir_fast_strlen_ev(&contents));
 	zephir_is_iterable(&variants, 0, "stub/regexdna.zep", 58);
 	if (Z_TYPE_P(&variants) == IS_ARRAY) {
@@ -228,5 +231,6 @@ PHP_METHOD(Stub_RegexDNA, process)
 	php_printf("%c", '\n');
 	php_printf("%d", zephir_fast_strlen_ev(&contents));
 	php_printf("%c", '\n');
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/requires.zep.c b/ext/stub/requires.zep.c
index 5c7ec81b84..1dcaf18c6e 100644
--- a/ext/stub/requires.zep.c
+++ b/ext/stub/requires.zep.c
@@ -31,6 +31,7 @@ ZEPHIR_INIT_CLASS(Stub_Requires)
 
 PHP_METHOD(Stub_Requires, requireExternal1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *path, path_sub, _0;
 
 	ZVAL_UNDEF(&path_sub);
@@ -38,6 +39,8 @@ PHP_METHOD(Stub_Requires, requireExternal1)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
 	ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&_0);
 	if (zephir_require_zval_ret(&_0, path) == FAILURE) {
@@ -63,6 +66,7 @@ PHP_METHOD(Stub_Requires, requireExternal2)
 
 PHP_METHOD(Stub_Requires, requireExternal3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *path, path_sub, external3, _0;
 	zval *this_ptr = getThis();
@@ -73,9 +77,13 @@ PHP_METHOD(Stub_Requires, requireExternal3)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(path)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path);
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&external3);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_CREATE_SYMBOL_TABLE();
+	
+	ZEPHIR_INIT_VAR(&external3);
 	object_init_ex(&external3, stub_requires_external3_ce);
 	if (zephir_has_constructor(&external3)) {
 		ZEPHIR_CALL_METHOD(NULL, &external3, "__construct", NULL, 0);
@@ -104,6 +112,7 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 {
 	zend_string *_4$$3;
 	zend_ulong _3$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *templatePath_param = NULL, *params, params_sub, _0, key, value, _7, *_1$$3, _2$$3, _5$$4, _6$$5;
 	zval templatePath;
@@ -121,6 +130,8 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 		Z_PARAM_STR(templatePath)
 		Z_PARAM_ZVAL(params)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &templatePath_param, &params);
 	if (UNEXPECTED(Z_TYPE_P(templatePath_param) != IS_STRING && Z_TYPE_P(templatePath_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'templatePath' must be of the type string"));
@@ -129,9 +140,11 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 	if (EXPECTED(Z_TYPE_P(templatePath_param) == IS_STRING)) {
 		zephir_get_strval(&templatePath, templatePath_param);
 	} else {
-		ZVAL_NULL(&templatePath);
+		ZEPHIR_INIT_VAR(&templatePath);
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_CREATE_SYMBOL_TABLE();
+	
 	if (Z_TYPE_P(params) == IS_ARRAY) {
 		zephir_is_iterable(params, 0, "stub/requires.zep", 47);
 		if (Z_TYPE_P(params) == IS_ARRAY) {
@@ -183,6 +196,7 @@ PHP_METHOD(Stub_Requires, renderTemplate)
 
 PHP_METHOD(Stub_Requires, requireOnce)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *path_param = NULL, _0;
 	zval path;
 
@@ -191,6 +205,8 @@ PHP_METHOD(Stub_Requires, requireOnce)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(path)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &path_param);
 	zephir_get_strval(&path, path_param);
 	ZEPHIR_OBSERVE_OR_NULLIFY_PPZV(&_0);
diff --git a/ext/stub/requires/external3.zep.c b/ext/stub/requires/external3.zep.c
index b3d317f9df..e0bf6d3b7e 100644
--- a/ext/stub/requires/external3.zep.c
+++ b/ext/stub/requires/external3.zep.c
@@ -31,6 +31,7 @@ ZEPHIR_INIT_CLASS(Stub_Requires_External3)
 
 PHP_METHOD(Stub_Requires_External3, req)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *path, path_sub, *requires, requires_sub, _0;
 
@@ -41,6 +42,8 @@ PHP_METHOD(Stub_Requires_External3, req)
 		Z_PARAM_ZVAL(path)
 		Z_PARAM_ZVAL(requires)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &path, &requires);
 	ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 87);
 	zephir_check_call_status();
@@ -51,5 +54,6 @@ PHP_METHOD(Stub_Requires_External3, req)
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(NULL, requires, "setcontent", NULL, 0, &_0);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/resourcetest.zep.c b/ext/stub/resourcetest.zep.c
index c00ea31491..b21752b247 100644
--- a/ext/stub/resourcetest.zep.c
+++ b/ext/stub/resourcetest.zep.c
@@ -27,9 +27,13 @@ ZEPHIR_INIT_CLASS(Stub_ResourceTest)
 PHP_METHOD(Stub_ResourceTest, testLetStatementSTDIN)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	RETURN_CCTOR(&a);
 }
@@ -37,9 +41,13 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDIN)
 PHP_METHOD(Stub_ResourceTest, testLetStatementSTDOUT)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDOUT");
 	RETURN_CCTOR(&a);
 }
@@ -47,9 +55,13 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDOUT)
 PHP_METHOD(Stub_ResourceTest, testLetStatementSTDERR)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDERR");
 	RETURN_CCTOR(&a);
 }
@@ -57,12 +69,16 @@ PHP_METHOD(Stub_ResourceTest, testLetStatementSTDERR)
 PHP_METHOD(Stub_ResourceTest, testTypeOffResource)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_gettype(&_0, &a);
 	RETURN_CCTOR(&_0);
 }
@@ -70,9 +86,13 @@ PHP_METHOD(Stub_ResourceTest, testTypeOffResource)
 PHP_METHOD(Stub_ResourceTest, testIsResource)
 {
 	zval a;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&a);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	RETURN_MM_BOOL(Z_TYPE_P(&a) == IS_RESOURCE);
 }
@@ -80,14 +100,19 @@ PHP_METHOD(Stub_ResourceTest, testIsResource)
 PHP_METHOD(Stub_ResourceTest, testFunctionsForSTDIN)
 {
 	zval a, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	ZVAL_LONG(&_0, 1);
 	ZEPHIR_CALL_FUNCTION(NULL, "stream_set_blocking", NULL, 89, &a, &_0);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/returns.zep.c b/ext/stub/returns.zep.c
index f1c70a36a4..3f9667bdcf 100644
--- a/ext/stub/returns.zep.c
+++ b/ext/stub/returns.zep.c
@@ -54,6 +54,7 @@ PHP_METHOD(Stub_Returns, testReturnCast4)
 
 PHP_METHOD(Stub_Returns, returnWithParameter)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *parameter_param = NULL;
 	zval parameter;
 
@@ -61,6 +62,8 @@ PHP_METHOD(Stub_Returns, returnWithParameter)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(parameter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &parameter_param);
 	zephir_get_strval(&parameter, parameter_param);
 	RETURN_MM_STRING("Return back");
diff --git a/ext/stub/router.zep.c b/ext/stub/router.zep.c
index dd89075379..8f3ce19a48 100644
--- a/ext/stub/router.zep.c
+++ b/ext/stub/router.zep.c
@@ -85,6 +85,7 @@ ZEPHIR_INIT_CLASS(Stub_Router)
 PHP_METHOD(Stub_Router, __construct)
 {
 	zval _1$$3, _4$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_3 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *defaultRoutes_param = NULL, routes, _6, _0$$3, _2$$3, _5$$3;
@@ -102,41 +103,44 @@ PHP_METHOD(Stub_Router, __construct)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_BOOL(defaultRoutes)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &defaultRoutes_param);
 	if (!defaultRoutes_param) {
 		defaultRoutes = 1;
 	} else {
 		}
-	ZVAL_NULL(&routes);
+	ZEPHIR_INIT_VAR(&routes);
 	array_init(&routes);
 	if (defaultRoutes == 1) {
-		ZVAL_NULL(&_0$$3);
+		ZEPHIR_INIT_VAR(&_0$$3);
 		object_init_ex(&_0$$3, stub_router_route_ce);
-		ZVAL_NULL(&_1$$3);
+		ZEPHIR_INIT_VAR(&_1$$3);
 		zephir_create_array(&_1$$3, 1, 0);
 		add_assoc_long_ex(&_1$$3, SL("controller"), 1);
-		ZVAL_NULL(&_2$$3);
+		ZEPHIR_INIT_VAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "#^/([a-zA-Z0-9\\_\\-]+)[/]{0,1}$#");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", &_3, 90, &_2$$3, &_1$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "stub/router.zep", 89);
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		object_init_ex(&_2$$3, stub_router_route_ce);
-		ZVAL_NULL(&_4$$3);
+		ZEPHIR_INIT_VAR(&_4$$3);
 		zephir_create_array(&_4$$3, 3, 0);
 		add_assoc_long_ex(&_4$$3, SL("controller"), 1);
 		add_assoc_long_ex(&_4$$3, SL("action"), 2);
 		add_assoc_long_ex(&_4$$3, SL("params"), 3);
-		ZVAL_NULL(&_5$$3);
+		ZEPHIR_INIT_VAR(&_5$$3);
 		ZVAL_STRING(&_5$$3, "#^/([a-zA-Z0-9\\_\\-]+)/([a-zA-Z0-9\\.\\_]+)(/.*)*$#");
 		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 90, &_5$$3, &_4$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "stub/router.zep", 95);
 	}
-	ZVAL_NULL(&_6);
+	ZEPHIR_INIT_VAR(&_6);
 	array_init(&_6);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_params"), &_6);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_routes"), &routes);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -175,6 +179,7 @@ PHP_METHOD(Stub_Router, getDI)
  */
 PHP_METHOD(Stub_Router, getRewriteUri)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval _GET, _SERVER, url, urlParts, realUri, _0;
 	zval *this_ptr = getThis();
 
@@ -184,11 +189,14 @@ PHP_METHOD(Stub_Router, getRewriteUri)
 	ZVAL_UNDEF(&urlParts);
 	ZVAL_UNDEF(&realUri);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_get_global(&_SERVER, SL("_SERVER"));
 	zephir_get_global(&_GET, SL("_GET"));
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_uriSource"), PH_NOISY_CC | PH_READONLY);
 	if (!(zephir_is_true(&_0))) {
+		zephir_memory_observe(&url);
 		if (zephir_array_isset_string_fetch(&url, &_GET, SL("_url"), 0)) {
 			if (!(zephir_is_true(&url))) {
 				RETURN_CCTOR(&url);
@@ -197,7 +205,7 @@ PHP_METHOD(Stub_Router, getRewriteUri)
 	} else {
 		ZEPHIR_OBS_NVAR(&url);
 		if (zephir_array_isset_string_fetch(&url, &_SERVER, SL("REQUEST_URI"), 0)) {
-			ZVAL_NULL(&urlParts);
+			ZEPHIR_INIT_VAR(&urlParts);
 			zephir_fast_explode_str(&urlParts, SL("?"), &url, LONG_MAX);
 			zephir_array_fetch_long(&realUri, &urlParts, 0, PH_NOISY | PH_READONLY, "stub/router.zep", 142);
 			if (!(zephir_is_true(&realUri))) {
@@ -416,6 +424,7 @@ PHP_METHOD(Stub_Router, handle)
 {
 	zend_string *_12$$28, *_21$$62;
 	zend_ulong _11$$28, _20$$62;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *uri = NULL, uri_sub, __$true, __$false, __$null, realUri, request, currentHostName, routeFound, parts, params, matches, notFoundPaths, vnamespace, module, controller, action, paramsStr, strParams, paramsMerge, route, methods, dependencyInjector, hostname, regexHostName, matched, pattern, handledUri, beforeMatch, paths, converters, part, position, matchPosition, _0, _1, *_2, _3, _4$$9, _5$$9, _6$$8, _7$$13, _8$$17, *_9$$28, _10$$28, _13$$43, _14$$43, _15$$42, _16$$47, _17$$51, *_18$$62, _19$$62, _22$$82, _23$$85, _24$$88, _25$$91, _26$$92, _27$$96, _28$$96, _29$$96, _30$$96, _31$$96;
 	zval *this_ptr = getThis();
@@ -483,6 +492,8 @@ PHP_METHOD(Stub_Router, handle)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(uri)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &uri);
 	if (!uri) {
 		uri = &uri_sub;
@@ -501,17 +512,17 @@ PHP_METHOD(Stub_Router, handle)
 	} else {
 		ZEPHIR_CPY_WRT(&handledUri, &realUri);
 	}
+	ZEPHIR_INIT_VAR(&request);
 	ZVAL_NULL(&request);
-	ZVAL_NULL(&request);
-	ZVAL_NULL(&currentHostName);
+	ZEPHIR_INIT_VAR(&currentHostName);
 	ZVAL_NULL(&currentHostName);
-	ZVAL_NULL(&routeFound);
+	ZEPHIR_INIT_VAR(&routeFound);
 	ZVAL_BOOL(&routeFound, 0);
-	ZVAL_NULL(&parts);
+	ZEPHIR_INIT_VAR(&parts);
 	array_init(&parts);
-	ZVAL_NULL(&params);
+	ZEPHIR_INIT_VAR(&params);
 	array_init(&params);
-	ZVAL_NULL(&matches);
+	ZEPHIR_INIT_VAR(&matches);
 	ZVAL_NULL(&matches);
 	if (0) {
 		zephir_update_property_zval(this_ptr, ZEND_STRL("_wasMatched"), &__$true);
@@ -861,6 +872,7 @@ PHP_METHOD(Stub_Router, handle)
 		}
 	}
 	if (!(zephir_is_true(&routeFound))) {
+		zephir_memory_observe(&notFoundPaths);
 		zephir_read_property(&notFoundPaths, this_ptr, ZEND_STRL("_notFoundPaths"), PH_NOISY_CC);
 		if (Z_TYPE_P(&notFoundPaths) != IS_NULL) {
 			ZEPHIR_CPY_WRT(&parts, &notFoundPaths);
@@ -869,6 +881,7 @@ PHP_METHOD(Stub_Router, handle)
 		}
 	}
 	if (zephir_is_true(&routeFound)) {
+		zephir_memory_observe(&vnamespace);
 		if (zephir_array_isset_string_fetch(&vnamespace, &parts, SL("namespace"), 0)) {
 			if (!(zephir_is_numeric(&vnamespace))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_namespace"), &vnamespace);
@@ -878,6 +891,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_22$$82, this_ptr, ZEND_STRL("_defaultNamespace"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_namespace"), &_22$$82);
 		}
+		zephir_memory_observe(&module);
 		if (zephir_array_isset_string_fetch(&module, &parts, SL("module"), 0)) {
 			if (!(zephir_is_numeric(&module))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_module"), &module);
@@ -887,6 +901,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_23$$85, this_ptr, ZEND_STRL("_defaultModule"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_module"), &_23$$85);
 		}
+		zephir_memory_observe(&controller);
 		if (zephir_array_isset_string_fetch(&controller, &parts, SL("controller"), 0)) {
 			if (!(zephir_is_numeric(&controller))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_controller"), &controller);
@@ -896,6 +911,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_24$$88, this_ptr, ZEND_STRL("_defaultController"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_controller"), &_24$$88);
 		}
+		zephir_memory_observe(&action);
 		if (zephir_array_isset_string_fetch(&action, &parts, SL("action"), 0)) {
 			if (!(zephir_is_numeric(&action))) {
 				zephir_update_property_zval(this_ptr, ZEND_STRL("_action"), &action);
@@ -905,9 +921,10 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_read_property(&_25$$91, this_ptr, ZEND_STRL("_defaultAction"), PH_NOISY_CC | PH_READONLY);
 			zephir_update_property_zval(this_ptr, ZEND_STRL("_action"), &_25$$91);
 		}
+		zephir_memory_observe(&paramsStr);
 		if (zephir_array_isset_string_fetch(&paramsStr, &parts, SL("params"), 0)) {
 			ZVAL_LONG(&_26$$92, 1);
-			ZVAL_NULL(&strParams);
+			ZEPHIR_INIT_VAR(&strParams);
 			zephir_substr(&strParams, &paramsStr, 1 , 0, ZEPHIR_SUBSTR_NO_LENGTH);
 			if (zephir_is_true(&strParams)) {
 				ZEPHIR_INIT_NVAR(&params);
@@ -916,7 +933,7 @@ PHP_METHOD(Stub_Router, handle)
 			zephir_array_unset_string(&parts, SL("params"), PH_SEPARATE);
 		}
 		if (zephir_fast_count_int(&params)) {
-			ZVAL_NULL(&paramsMerge);
+			ZEPHIR_INIT_VAR(&paramsMerge);
 			zephir_fast_array_merge(&paramsMerge, &params, &parts);
 		} else {
 			ZEPHIR_CPY_WRT(&paramsMerge, &parts);
@@ -934,6 +951,7 @@ PHP_METHOD(Stub_Router, handle)
 		zephir_read_property(&_31$$96, this_ptr, ZEND_STRL("_defaultParams"), PH_NOISY_CC | PH_READONLY);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("_params"), &_31$$96);
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -950,6 +968,7 @@ PHP_METHOD(Stub_Router, handle)
  */
 PHP_METHOD(Stub_Router, add)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, *httpMethods = NULL, httpMethods_sub, __$null, route;
 	zval *this_ptr = getThis();
@@ -966,6 +985,8 @@ PHP_METHOD(Stub_Router, add)
 		Z_PARAM_ZVAL_OR_NULL(paths)
 		Z_PARAM_ZVAL_OR_NULL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &pattern, &paths, &httpMethods);
 	if (!paths) {
 		paths = &paths_sub;
@@ -975,7 +996,7 @@ PHP_METHOD(Stub_Router, add)
 		httpMethods = &httpMethods_sub;
 		httpMethods = &__$null;
 	}
-	ZVAL_NULL(&route);
+	ZEPHIR_INIT_VAR(&route);
 	object_init_ex(&route, stub_router_route_ce);
 	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 90, pattern, paths, httpMethods);
 	zephir_check_call_status();
@@ -992,6 +1013,7 @@ PHP_METHOD(Stub_Router, add)
  */
 PHP_METHOD(Stub_Router, addGet)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1006,16 +1028,18 @@ PHP_METHOD(Stub_Router, addGet)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "GET");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1027,6 +1051,7 @@ PHP_METHOD(Stub_Router, addGet)
  */
 PHP_METHOD(Stub_Router, addPost)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1041,16 +1066,18 @@ PHP_METHOD(Stub_Router, addPost)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "POST");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1062,6 +1089,7 @@ PHP_METHOD(Stub_Router, addPost)
  */
 PHP_METHOD(Stub_Router, addPut)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1076,16 +1104,18 @@ PHP_METHOD(Stub_Router, addPut)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "PUT");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1097,6 +1127,7 @@ PHP_METHOD(Stub_Router, addPut)
  */
 PHP_METHOD(Stub_Router, addPatch)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1111,16 +1142,18 @@ PHP_METHOD(Stub_Router, addPatch)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "PATCH");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1132,6 +1165,7 @@ PHP_METHOD(Stub_Router, addPatch)
  */
 PHP_METHOD(Stub_Router, addDelete)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1146,16 +1180,18 @@ PHP_METHOD(Stub_Router, addDelete)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "DELETE");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1167,6 +1203,7 @@ PHP_METHOD(Stub_Router, addDelete)
  */
 PHP_METHOD(Stub_Router, addOptions)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1181,16 +1218,18 @@ PHP_METHOD(Stub_Router, addOptions)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "OPTIONS");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1202,6 +1241,7 @@ PHP_METHOD(Stub_Router, addOptions)
  */
 PHP_METHOD(Stub_Router, addHead)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, _0;
 	zval *this_ptr = getThis();
@@ -1216,16 +1256,18 @@ PHP_METHOD(Stub_Router, addHead)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
 		paths = &__$null;
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "HEAD");
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "add", NULL, 0, pattern, paths, &_0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -1236,6 +1278,7 @@ PHP_METHOD(Stub_Router, addHead)
  */
 PHP_METHOD(Stub_Router, mount)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *group, group_sub, groupRoutes, beforeMatch, hostname, routes, route, *_0$$5, _1$$5, *_2$$8, _3$$8, _4$$11;
 	zval *this_ptr = getThis();
@@ -1252,6 +1295,8 @@ PHP_METHOD(Stub_Router, mount)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(group)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &group);
 	if (Z_TYPE_P(group) != IS_OBJECT) {
 		ZEPHIR_THROW_EXCEPTION_DEBUG_STR(stub_router_exception_ce, "The group of routes is not valid", "stub/router.zep", 677);
@@ -1325,9 +1370,10 @@ PHP_METHOD(Stub_Router, mount)
 		}
 		ZEPHIR_INIT_NVAR(&route);
 	}
+	zephir_memory_observe(&routes);
 	zephir_read_property(&routes, this_ptr, ZEND_STRL("_routes"), PH_NOISY_CC);
 	if (Z_TYPE_P(&routes) == IS_ARRAY) {
-		ZVAL_NULL(&_4$$11);
+		ZEPHIR_INIT_VAR(&_4$$11);
 		zephir_fast_array_merge(&_4$$11, &routes, &groupRoutes);
 		zephir_update_property_zval(this_ptr, ZEND_STRL("_routes"), &_4$$11);
 	} else {
@@ -1368,12 +1414,17 @@ PHP_METHOD(Stub_Router, notFound)
 PHP_METHOD(Stub_Router, clear)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_routes"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -1483,6 +1534,7 @@ PHP_METHOD(Stub_Router, getRoutes)
  */
 PHP_METHOD(Stub_Router, getRouteById)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *id, id_sub, route, _0, *_1, _2, _3$$3, _4$$5;
 	zval *this_ptr = getThis();
@@ -1496,6 +1548,8 @@ PHP_METHOD(Stub_Router, getRouteById)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(id)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &id);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_routes"), PH_NOISY_CC | PH_READONLY);
 	zephir_is_iterable(&_0, 0, "stub/router.zep", 844);
@@ -1542,6 +1596,7 @@ PHP_METHOD(Stub_Router, getRouteById)
  */
 PHP_METHOD(Stub_Router, getRouteByName)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *name, name_sub, route, _0, *_1, _2, _3$$3, _4$$5;
 	zval *this_ptr = getThis();
@@ -1555,6 +1610,8 @@ PHP_METHOD(Stub_Router, getRouteByName)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(name)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &name);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_routes"), PH_NOISY_CC | PH_READONLY);
 	zephir_is_iterable(&_0, 0, "stub/router.zep", 862);
diff --git a/ext/stub/router/route.zep.c b/ext/stub/router/route.zep.c
index 10f1d2d73f..fb33f7447f 100644
--- a/ext/stub/router/route.zep.c
+++ b/ext/stub/router/route.zep.c
@@ -52,6 +52,7 @@ ZEPHIR_INIT_CLASS(Stub_Router_Route)
  */
 PHP_METHOD(Stub_Router_Route, __construct)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, *httpMethods = NULL, httpMethods_sub, __$null;
 	zval *this_ptr = getThis();
@@ -67,6 +68,8 @@ PHP_METHOD(Stub_Router_Route, __construct)
 		Z_PARAM_ZVAL_OR_NULL(paths)
 		Z_PARAM_ZVAL_OR_NULL(httpMethods)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 2, &pattern, &paths, &httpMethods);
 	if (!paths) {
 		paths = &paths_sub;
@@ -79,6 +82,7 @@ PHP_METHOD(Stub_Router_Route, __construct)
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "reconfigure", NULL, 0, pattern, paths);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_methods"), httpMethods);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -89,6 +93,7 @@ PHP_METHOD(Stub_Router_Route, __construct)
  */
 PHP_METHOD(Stub_Router_Route, compilePattern)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *pattern = NULL, pattern_sub, idPattern, _0$$4, _1$$4, _2$$5, _3$$5, _4$$6, _5$$6, _6$$7, _7$$7, _8$$8, _9$$8, _10$$8, _11$$9, _12$$9, _13$$9;
 
 	ZVAL_UNDEF(&pattern_sub);
@@ -110,53 +115,55 @@ PHP_METHOD(Stub_Router_Route, compilePattern)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(pattern)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &pattern);
 	ZEPHIR_SEPARATE_PARAM(pattern);
 	if (zephir_memnstr_str(pattern, SL(":"), "stub/router/route.zep", 56)) {
-		ZVAL_NULL(&idPattern);
+		ZEPHIR_INIT_VAR(&idPattern);
 		ZVAL_STRING(&idPattern, "/([a-zA-Z0-9\\_\\-]+)");
 		if (zephir_memnstr_str(pattern, SL("/:module"), "stub/router/route.zep", 62)) {
-			ZVAL_NULL(&_0$$4);
-			ZVAL_NULL(&_1$$4);
+			ZEPHIR_INIT_VAR(&_0$$4);
+			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "/:module");
 			zephir_fast_str_replace(&_0$$4, &_1$$4, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_0$$4);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:controller"), "stub/router/route.zep", 67)) {
-			ZVAL_NULL(&_2$$5);
-			ZVAL_NULL(&_3$$5);
+			ZEPHIR_INIT_VAR(&_2$$5);
+			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "/:controller");
 			zephir_fast_str_replace(&_2$$5, &_3$$5, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_2$$5);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:namespace"), "stub/router/route.zep", 72)) {
-			ZVAL_NULL(&_4$$6);
-			ZVAL_NULL(&_5$$6);
+			ZEPHIR_INIT_VAR(&_4$$6);
+			ZEPHIR_INIT_VAR(&_5$$6);
 			ZVAL_STRING(&_5$$6, "/:namespace");
 			zephir_fast_str_replace(&_4$$6, &_5$$6, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_4$$6);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:action"), "stub/router/route.zep", 77)) {
-			ZVAL_NULL(&_6$$7);
-			ZVAL_NULL(&_7$$7);
+			ZEPHIR_INIT_VAR(&_6$$7);
+			ZEPHIR_INIT_VAR(&_7$$7);
 			ZVAL_STRING(&_7$$7, "/:action");
 			zephir_fast_str_replace(&_6$$7, &_7$$7, &idPattern, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_6$$7);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:params"), "stub/router/route.zep", 82)) {
-			ZVAL_NULL(&_8$$8);
-			ZVAL_NULL(&_9$$8);
+			ZEPHIR_INIT_VAR(&_8$$8);
+			ZEPHIR_INIT_VAR(&_9$$8);
 			ZVAL_STRING(&_9$$8, "/:params");
-			ZVAL_NULL(&_10$$8);
+			ZEPHIR_INIT_VAR(&_10$$8);
 			ZVAL_STRING(&_10$$8, "(/.*)*");
 			zephir_fast_str_replace(&_8$$8, &_9$$8, &_10$$8, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_8$$8);
 		}
 		if (zephir_memnstr_str(pattern, SL("/:int"), "stub/router/route.zep", 87)) {
-			ZVAL_NULL(&_11$$9);
-			ZVAL_NULL(&_12$$9);
+			ZEPHIR_INIT_VAR(&_11$$9);
+			ZEPHIR_INIT_VAR(&_12$$9);
 			ZVAL_STRING(&_12$$9, "/:int");
-			ZVAL_NULL(&_13$$9);
+			ZEPHIR_INIT_VAR(&_13$$9);
 			ZVAL_STRING(&_13$$9, "/([0-9]+)");
 			zephir_fast_str_replace(&_11$$9, &_12$$9, &_13$$9, pattern);
 			ZEPHIR_CPY_WRT(pattern, &_11$$9);
@@ -164,14 +171,14 @@ PHP_METHOD(Stub_Router_Route, compilePattern)
 	}
 	if (zephir_memnstr_str(pattern, SL("("), "stub/router/route.zep", 93)) {
 		ZEPHIR_CONCAT_SVS(return_value, "#^", pattern, "$#");
-		return;
+		RETURN_MM();
 	}
 	if (zephir_memnstr_str(pattern, SL("["), "stub/router/route.zep", 98)) {
 		ZEPHIR_CONCAT_SVS(return_value, "#^", pattern, "$#");
-		return;
+		RETURN_MM();
 	}
 	RETVAL_ZVAL(pattern, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -210,6 +217,7 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	zend_bool notValid, _6$$12, _7$$12, _8$$12, _9$$12, _10$$12, _11$$12, _12$$12, _13$$12, _14$$12, _15$$12, _16$$12, _17$$12, _25$$18;
 	zend_long tmp = 0, cursor = 0, cursorVar = 0, marker = 0, bracketCount, parenthesesCount, foundPattern, intermediate, numberMatches;
 	char ch = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *pattern_param = NULL, matches, _1$$11, _2$$11, _3$$11, _18$$16, _19$$16, _20$$16, _22$$16, _23$$16, _27$$19, _28$$28;
 	zval pattern, route, item, variable, regexp, _4$$11, _21$$16, _24$$16, _29$$29;
 
@@ -236,6 +244,8 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(pattern)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &pattern_param);
 	zephir_get_strval(&pattern, pattern_param);
 	notValid = 0;
@@ -247,9 +257,9 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	if (zephir_fast_strlen_ev(&pattern) <= 0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZVAL_NULL(&matches);
+	ZEPHIR_INIT_VAR(&matches);
 	array_init(&matches);
-	ZVAL_NULL(&route);
+	ZEPHIR_INIT_VAR(&route);
 	for (_0 = 0; _0 < Z_STRLEN_P(&pattern); _0++) {
 		cursor = _0; 
 		ch = ZEPHIR_STRING_OFFSET(&pattern, _0);
@@ -425,7 +435,7 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
 	zephir_create_array(return_value, 2, 0);
 	zephir_array_fast_append(return_value, &route);
 	zephir_array_fast_append(return_value, &matches);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -436,6 +446,7 @@ PHP_METHOD(Stub_Router_Route, extractNamedParams)
  */
 PHP_METHOD(Stub_Router_Route, reConfigure)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _0$$5;
 	zval *pattern, pattern_sub, *paths = NULL, paths_sub, __$null, moduleName, controllerName, actionName, parts, routePaths, realClassName, namespaceName, pcrePattern, compiledPattern, extracted, _1$$10, _2$$19, _3$$19;
 	zval *this_ptr = getThis();
@@ -462,6 +473,8 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(paths)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &pattern, &paths);
 	if (!paths) {
 		paths = &paths_sub;
@@ -473,13 +486,13 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 	}
 	if (Z_TYPE_P(paths) != IS_NULL) {
 		if (Z_TYPE_P(paths) == IS_STRING) {
+			ZEPHIR_INIT_VAR(&moduleName);
 			ZVAL_NULL(&moduleName);
-			ZVAL_NULL(&moduleName);
+			ZEPHIR_INIT_VAR(&controllerName);
 			ZVAL_NULL(&controllerName);
-			ZVAL_NULL(&controllerName);
-			ZVAL_NULL(&actionName);
+			ZEPHIR_INIT_VAR(&actionName);
 			ZVAL_NULL(&actionName);
-			ZVAL_NULL(&parts);
+			ZEPHIR_INIT_VAR(&parts);
 			zephir_fast_explode_str(&parts, SL("::"), paths, LONG_MAX);
 			do {
 				_0$$5 = zephir_fast_count_int(&parts);
@@ -506,16 +519,16 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 				}
 			} while(0);
 
-			ZVAL_NULL(&routePaths);
+			ZEPHIR_INIT_VAR(&routePaths);
 			array_init(&routePaths);
 			if (Z_TYPE_P(&moduleName) != IS_NULL) {
 				zephir_array_update_string(&routePaths, SL("module"), &moduleName, PH_COPY | PH_SEPARATE);
 			}
 			if (Z_TYPE_P(&controllerName) != IS_NULL) {
 				if (zephir_memnstr_str(&controllerName, SL("\\"), "stub/router/route.zep", 310)) {
-					ZVAL_NULL(&realClassName);
+					ZEPHIR_INIT_VAR(&realClassName);
 					zephir_get_class_ns(&realClassName, &controllerName, 0);
-					ZVAL_NULL(&namespaceName);
+					ZEPHIR_INIT_VAR(&namespaceName);
 					zephir_get_ns_class(&namespaceName, &controllerName, 0);
 					if (zephir_is_true(&namespaceName)) {
 						zephir_array_update_string(&routePaths, SL("namespace"), &namespaceName, PH_COPY | PH_SEPARATE);
@@ -523,7 +536,7 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 				} else {
 					ZEPHIR_CPY_WRT(&realClassName, &controllerName);
 				}
-				ZVAL_NULL(&_1$$10);
+				ZEPHIR_INIT_VAR(&_1$$10);
 				zephir_uncamelize(&_1$$10, &realClassName, NULL );
 				zephir_array_update_string(&routePaths, SL("controller"), &_1$$10, PH_COPY | PH_SEPARATE);
 			}
@@ -545,8 +558,9 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 		if (zephir_memnstr_str(pattern, SL("{"), "stub/router/route.zep", 348)) {
 			ZEPHIR_CALL_METHOD(&extracted, this_ptr, "extractnamedparams", NULL, 0, pattern);
 			zephir_check_call_status();
+			zephir_memory_observe(&pcrePattern);
 			zephir_array_fetch_long(&pcrePattern, &extracted, 0, PH_NOISY, "stub/router/route.zep", 351);
-			ZVAL_NULL(&_2$$19);
+			ZEPHIR_INIT_VAR(&_2$$19);
 			zephir_array_fetch_long(&_3$$19, &extracted, 1, PH_NOISY | PH_READONLY, "stub/router/route.zep", 352);
 			zephir_fast_array_merge(&_2$$19, &routePaths, &_3$$19);
 			ZEPHIR_CPY_WRT(&routePaths, &_2$$19);
@@ -561,6 +575,7 @@ PHP_METHOD(Stub_Router_Route, reConfigure)
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_pattern"), pattern);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_compiledPattern"), &compiledPattern);
 	zephir_update_property_zval(this_ptr, ZEND_STRL("_paths"), &routePaths);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -687,6 +702,7 @@ PHP_METHOD(Stub_Router_Route, getReversedPaths)
 	zend_string *_4;
 	zend_ulong _3;
 	zval reversed, path, position, _0, *_1, _2;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
@@ -695,7 +711,10 @@ PHP_METHOD(Stub_Router_Route, getReversedPaths)
 	ZVAL_UNDEF(&position);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&reversed);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&reversed);
 	array_init(&reversed);
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_paths"), PH_NOISY_CC | PH_READONLY);
 	zephir_is_iterable(&_0, 0, "stub/router/route.zep", 478);
diff --git a/ext/stub/scall.zep.c b/ext/stub/scall.zep.c
index 47eb4fad13..11d1fcaac8 100644
--- a/ext/stub/scall.zep.c
+++ b/ext/stub/scall.zep.c
@@ -100,31 +100,44 @@ PHP_METHOD(Stub_Scall, testMethod7)
 
 PHP_METHOD(Stub_Scall, testCall1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("testmethod1", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 91);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 
@@ -134,14 +147,17 @@ PHP_METHOD(Stub_Scall, testCall4)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_SELF("testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 
@@ -151,14 +167,17 @@ PHP_METHOD(Stub_Scall, testCall5)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_SELF("testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall6)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zval *a, a_sub, *b, b_sub;
@@ -169,39 +188,54 @@ PHP_METHOD(Stub_Scall, testCall6)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 92, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall7)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("testmethod1", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall8)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall9)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 91);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall10)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 
@@ -211,14 +245,17 @@ PHP_METHOD(Stub_Scall, testCall10)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_SELF("testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall11)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 
@@ -228,14 +265,17 @@ PHP_METHOD(Stub_Scall, testCall11)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_SELF("testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall12)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zephir_fcall_cache_entry *_0 = NULL;
 	zval *a, a_sub, *b, b_sub;
@@ -246,34 +286,48 @@ PHP_METHOD(Stub_Scall, testCall12)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 92, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall13)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall14)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_PARENT(stub_scall_ce, getThis(), "testmethod2", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testCall15)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_SELF("testmethod7", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, testMethod16)
@@ -292,6 +346,7 @@ PHP_METHOD(Stub_Scall, testMethod16)
 PHP_METHOD(Stub_Scall, testCall17)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
@@ -303,6 +358,8 @@ PHP_METHOD(Stub_Scall, testCall17)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	j = 0;
 	_2 = k;
@@ -330,6 +387,7 @@ PHP_METHOD(Stub_Scall, testCall17)
 PHP_METHOD(Stub_Scall, testCall18)
 {
 	zend_bool _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1;
 	zephir_fcall_cache_entry *_4 = NULL;
 	zval *k_param = NULL, *p, p_sub, _3$$3;
@@ -341,6 +399,8 @@ PHP_METHOD(Stub_Scall, testCall18)
 		Z_PARAM_LONG(k)
 		Z_PARAM_ZVAL(p)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &k_param, &p);
 	j = 0;
 	_2 = k;
@@ -375,18 +435,22 @@ PHP_METHOD(Stub_Scall, interpolatedStaticReturn)
 {
 	zend_class_entry *_0;
 	zval className, methodName;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&methodName);
-	ZVAL_NULL(&className);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&className);
 	ZVAL_STRING(&className, "Stub\\Scall");
-	ZVAL_NULL(&methodName);
+	ZEPHIR_INIT_VAR(&methodName);
 	ZVAL_STRING(&methodName, "testMethodStatic");
 	_0 = zephir_fetch_class(&className);
 	ZEPHIR_RETURN_CALL_CE_STATIC_ZVAL(_0, methodName, NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scall, interpolatedStaticEcho)
@@ -394,18 +458,23 @@ PHP_METHOD(Stub_Scall, interpolatedStaticEcho)
 	zend_class_entry *_1;
 	zval _0;
 	zval className, methodName;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&className);
 	ZVAL_UNDEF(&methodName);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&className);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&className);
 	ZVAL_STRING(&className, "Stub\\Scall");
-	ZVAL_NULL(&methodName);
+	ZEPHIR_INIT_VAR(&methodName);
 	ZVAL_STRING(&methodName, "testMethodStatic");
 	_1 = zephir_fetch_class(&className);
 	ZEPHIR_CALL_CE_STATIC_ZVAL(&_0, _1, methodName, NULL, 0);
 	zephir_check_call_status();
 	zend_print_zval(&_0, 0);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/scallexternal.zep.c b/ext/stub/scallexternal.zep.c
index c5f3af9c71..323a281bcb 100644
--- a/ext/stub/scallexternal.zep.c
+++ b/ext/stub/scallexternal.zep.c
@@ -31,14 +31,19 @@ ZEPHIR_INIT_CLASS(Stub_ScallExternal)
 
 PHP_METHOD(Stub_ScallExternal, testCall1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod1", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_ScallExternal, testCall2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *b, b_sub;
 
@@ -48,10 +53,12 @@ PHP_METHOD(Stub_ScallExternal, testCall2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
 	ZEPHIR_RETURN_CALL_CE_STATIC(stub_scall_ce, "testmethod4", NULL, 0, a, b);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_ScallExternal, testMethod3)
diff --git a/ext/stub/scalllateconstruct.zep.c b/ext/stub/scalllateconstruct.zep.c
index a8edd6e535..34f091a45b 100644
--- a/ext/stub/scalllateconstruct.zep.c
+++ b/ext/stub/scalllateconstruct.zep.c
@@ -30,10 +30,15 @@ ZEPHIR_INIT_CLASS(Stub_ScallLateConstruct)
 
 PHP_METHOD(Stub_ScallLateConstruct, __construct)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "testpublicinit", NULL, 0);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ScallLateConstruct, testStaticInit)
@@ -45,13 +50,18 @@ PHP_METHOD(Stub_ScallLateConstruct, testStaticInit)
 PHP_METHOD(Stub_ScallLateConstruct, testPublicInit)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_CALL_SELF(&_0, "teststaticinit", NULL, 0);
 	zephir_check_call_status();
 	zephir_update_property_zval(this_ptr, ZEND_STRL("protectedVar"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_ScallLateConstruct, varValue)
diff --git a/ext/stub/scallparent.zep.c b/ext/stub/scallparent.zep.c
index ffb7825f2c..020e853d70 100644
--- a/ext/stub/scallparent.zep.c
+++ b/ext/stub/scallparent.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
+#include "kernel/memory.h"
 
 
 /**
@@ -40,10 +41,14 @@ PHP_METHOD(Stub_ScallParent, testMethod2)
 
 PHP_METHOD(Stub_ScallParent, testCallStatic)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZEPHIR_RETURN_CALL_STATIC("testmethodstatic", NULL, 0);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_ScallParent, testMethodStatic)
diff --git a/ext/stub/scope.zep.c b/ext/stub/scope.zep.c
index 54cde08791..295a7de575 100644
--- a/ext/stub/scope.zep.c
+++ b/ext/stub/scope.zep.c
@@ -35,6 +35,7 @@ PHP_METHOD(Stub_Scope, getStr)
 
 PHP_METHOD(Stub_Scope, getDyStr)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *g_param = NULL, _0;
 	zend_long g;
 
@@ -42,33 +43,40 @@ PHP_METHOD(Stub_Scope, getDyStr)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(g)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &g_param);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, g);
 	ZEPHIR_CONCAT_SV(return_value, "internal_", &_0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scope, test1)
 {
 	zval ret, k, k$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, r;
 	zephir_fcall_cache_entry *_0 = NULL;
 
 	ZVAL_UNDEF(&ret);
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&k$$3);
-	ZVAL_NULL(&ret);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "");
 	ZEPHIR_CALL_SELF(&k, "getstr", &_0, 93);
 	zephir_check_call_status();
 	r = 1;
 	if (r == 1) {
-		ZVAL_NULL(&k$$3);
+		ZEPHIR_INIT_VAR(&k$$3);
 		ZVAL_STRING(&k$$3, "test");
 		zephir_concat_self(&ret, &k$$3);
 	}
 	ZEPHIR_CONCAT_VV(return_value, &ret, &k);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scope, test2)
@@ -76,14 +84,18 @@ PHP_METHOD(Stub_Scope, test2)
 	zend_bool _0;
 	zval k, c, _5, _3$$3, _4$$3;
 	zend_long p, _1, _2, p$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	p = 15;
-	ZVAL_NULL(&k);
+	ZEPHIR_INIT_VAR(&k);
 	ZVAL_STRING(&k, "");
 	_2 = 3;
 	_1 = 0;
@@ -109,24 +121,28 @@ PHP_METHOD(Stub_Scope, test2)
 		}
 	}
 	zephir_create_array(return_value, 2, 0);
-	ZVAL_NULL(&_5);
+	ZEPHIR_INIT_VAR(&_5);
 	ZVAL_LONG(&_5, p);
 	zephir_array_fast_append(return_value, &_5);
 	zephir_array_fast_append(return_value, &k);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Scope, test3)
 {
 	zend_bool _0;
 	zval k, c, str$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, _1, _2;
 	zephir_fcall_cache_entry *_3 = NULL;
 
 	ZVAL_UNDEF(&k);
 	ZVAL_UNDEF(&c);
 	ZVAL_UNDEF(&str$$3);
-	ZVAL_NULL(&k);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&k);
 	ZVAL_STRING(&k, "");
 	_2 = 3;
 	_1 = 0;
diff --git a/ext/stub/sort.zep.c b/ext/stub/sort.zep.c
index 6d1685d41b..e32ffc41dc 100644
--- a/ext/stub/sort.zep.c
+++ b/ext/stub/sort.zep.c
@@ -29,6 +29,7 @@ ZEPHIR_INIT_CLASS(Stub_Sort)
 PHP_METHOD(Stub_Sort, quick)
 {
 	zend_bool _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_8 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i = 0, length = 0, pivot = 0, item = 0, _2, _3;
 	zval *arr_param = NULL, left, right, _0, _7, _10, _11, _4$$4, _5$$5, _6$$6;
@@ -49,17 +50,20 @@ PHP_METHOD(Stub_Sort, quick)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(arr)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arr_param);
 	zephir_get_arrval(&arr, arr_param);
 	length = zephir_fast_count_int(&arr);
 	if (length <= 1) {
 		RETURN_CTOR(&arr);
 	}
+	zephir_memory_observe(&_0);
 	zephir_array_fetch_long(&_0, &arr, 0, PH_NOISY, "stub/sort.zep", 18);
 	pivot = zephir_get_intval(&_0);
-	ZVAL_NULL(&left);
+	ZEPHIR_INIT_VAR(&left);
 	array_init(&left);
-	ZVAL_NULL(&right);
+	ZEPHIR_INIT_VAR(&right);
 	array_init(&right);
 	_3 = (length - 1);
 	_2 = 1;
@@ -91,15 +95,15 @@ PHP_METHOD(Stub_Sort, quick)
 	}
 	ZEPHIR_CALL_METHOD(&_7, this_ptr, "quick", &_8, 95, &left);
 	zephir_check_call_status();
-	ZVAL_NULL(&_9);
+	ZEPHIR_INIT_VAR(&_9);
 	zephir_create_array(&_9, 1, 0);
-	ZVAL_NULL(&_10);
+	ZEPHIR_INIT_VAR(&_10);
 	ZVAL_LONG(&_10, pivot);
 	zephir_array_fast_append(&_9, &_10);
 	ZEPHIR_CALL_METHOD(&_11, this_ptr, "quick", &_8, 95, &right);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_FUNCTION("array_merge", NULL, 96, &_7, &_9, &_11);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/spectralnorm.zep.c b/ext/stub/spectralnorm.zep.c
index 229890ebe2..95801b83ef 100644
--- a/ext/stub/spectralnorm.zep.c
+++ b/ext/stub/spectralnorm.zep.c
@@ -34,6 +34,7 @@ ZEPHIR_INIT_CLASS(Stub_SpectralNorm)
 
 PHP_METHOD(Stub_SpectralNorm, Ax)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *i, i_sub, *j, j_sub, _0, _1;
 
 	ZVAL_UNDEF(&i_sub);
@@ -44,16 +45,20 @@ PHP_METHOD(Stub_SpectralNorm, Ax)
 		Z_PARAM_ZVAL(i)
 		Z_PARAM_ZVAL(j)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &i, &j);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_add_function(&_0, i, j);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_add_function(&_1, i, j);
-	RETURN_MM_DOUBLE(zephir_safe_div_long_double((double) 1, ((zephir_safe_div_long_long((zephir_get_numberval(&_0) * ((zephir_get_numberval(&_1) + 1))), 2) + zephir_get_numberval(i)) + (double) (1))));
+	RETURN_MM_DOUBLE(zephir_safe_div_long_double((double) 1, ((zephir_safe_div_long_long((zephir_get_numberval(&_0) * (zephir_get_numberval(&_1) + 1)), 2) + zephir_get_numberval(i)) + (double) (1))));
 }
 
 PHP_METHOD(Stub_SpectralNorm, Au)
 {
 	zend_bool _0, _3$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL, *_15 = NULL;
 	zval *n_param = NULL, *u, u_sub, *v, v_sub, _13$$3, _14$$3, _6$$4, _7$$4, _8$$4, _10$$4, _12$$4;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS, t = 0, i = 0, j = 0, _1, _2, _4$$3, _5$$3;
@@ -73,6 +78,8 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 		Z_PARAM_OBJECT_OF_CLASS(u, spl_ce_SplFixedArray)
 		Z_PARAM_OBJECT_OF_CLASS(v, spl_ce_SplFixedArray)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &n_param, &u, &v);
 	_2 = (n - 1);
 	_1 = 0;
@@ -121,11 +128,13 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 			zephir_check_call_status();
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SpectralNorm, Atu)
 {
 	zend_bool _0, _3$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_9 = NULL, *_11 = NULL, *_15 = NULL;
 	zval *n_param = NULL, *u, u_sub, *v, v_sub, _13$$3, _14$$3, _6$$4, _7$$4, _8$$4, _10$$4, _12$$4;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS, t = 0, i = 0, j = 0, _1, _2, _4$$3, _5$$3;
@@ -145,6 +154,8 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 		Z_PARAM_OBJECT_OF_CLASS(u, spl_ce_SplFixedArray)
 		Z_PARAM_OBJECT_OF_CLASS(v, spl_ce_SplFixedArray)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &n_param, &u, &v);
 	_2 = (n - 1);
 	_1 = 0;
@@ -193,10 +204,12 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 			zephir_check_call_status();
 		}
 	}
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SpectralNorm, AtAu)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *n, n_sub, *u, u_sub, *v, v_sub, *w, w_sub;
 	zval *this_ptr = getThis();
@@ -211,16 +224,20 @@ PHP_METHOD(Stub_SpectralNorm, AtAu)
 		Z_PARAM_ZVAL(v)
 		Z_PARAM_ZVAL(w)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 4, 0, &n, &u, &v, &w);
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "au", NULL, 98, n, u, w);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(NULL, this_ptr, "atu", NULL, 99, n, w, v);
 	zephir_check_call_status();
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SpectralNorm, process)
 {
 	zend_bool _1, _7, _12;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL, *_11 = NULL, *_17 = NULL;
 	zval *n_param = NULL, u, v, w, _0, _4$$3, _5$$3, _10$$4, _15$$5, _16$$5, _18$$5, _19$$5, _20$$5;
 	zend_long n, ZEPHIR_LAST_CALL_STATUS, i = 0, vv, vBv, _2, _3, _8, _9, _13, _14;
@@ -241,20 +258,22 @@ PHP_METHOD(Stub_SpectralNorm, process)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(n)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &n_param);
 	vv = 0;
 	vBv = 0;
-	ZVAL_NULL(&u);
+	ZEPHIR_INIT_VAR(&u);
 	object_init_ex(&u, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
 	ZEPHIR_CALL_METHOD(NULL, &u, "__construct", NULL, 100, &_0);
 	zephir_check_call_status();
-	ZVAL_NULL(&v);
+	ZEPHIR_INIT_VAR(&v);
 	object_init_ex(&v, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
 	ZEPHIR_CALL_METHOD(NULL, &v, "__construct", NULL, 100, &_0);
 	zephir_check_call_status();
-	ZVAL_NULL(&w);
+	ZEPHIR_INIT_VAR(&w);
 	object_init_ex(&w, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
 	ZEPHIR_CALL_METHOD(NULL, &w, "__construct", NULL, 100, &_0);
diff --git a/ext/stub/spl.zep.c b/ext/stub/spl.zep.c
index 8c662a08f7..394bf586fe 100644
--- a/ext/stub/spl.zep.c
+++ b/ext/stub/spl.zep.c
@@ -31,6 +31,7 @@ ZEPHIR_INIT_CLASS(Stub_Spl)
  */
 PHP_METHOD(Stub_Spl, issue1212)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *file_param = NULL;
 	zval file;
@@ -39,11 +40,13 @@ PHP_METHOD(Stub_Spl, issue1212)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(file)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &file_param);
 	zephir_get_strval(&file, file_param);
 	object_init_ex(return_value, spl_ce_SplFileObject);
 	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 104, &file);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/spropertyaccess.zep.c b/ext/stub/spropertyaccess.zep.c
index ba7b1c50d6..9694f7348c 100644
--- a/ext/stub/spropertyaccess.zep.c
+++ b/ext/stub/spropertyaccess.zep.c
@@ -41,31 +41,38 @@ ZEPHIR_INIT_CLASS(Stub_SPropertyAccess)
 PHP_METHOD(Stub_SPropertyAccess, __construct)
 {
 	zval _0, _1, _2, _3, _4;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
 	ZVAL_UNDEF(&_4);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "abc");
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("a"), &_0);
 	zephir_read_static_property_ce(&_0, stub_spropertyaccess_ce, SL("a"), PH_NOISY_CC | PH_READONLY);
 	ZVAL_LONG(&_1, 0);
 	ZVAL_LONG(&_2, 1);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	zephir_substr(&_3, &_0, 0 , 1 , 0);
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("b"), &_3);
+	zephir_memory_observe(&_4);
 	zephir_read_static_property_ce(&_4, stub_spropertyaccess_ce, SL("b"), PH_NOISY_CC);
 	zephir_update_static_property_ce(stub_scallexternal_ce, ZEND_STRL("sproperty"), &_4);
 	ZEPHIR_OBS_NVAR(&_4);
 	zephir_read_static_property_ce(&_4, stub_scallexternal_ce, SL("sproperty"), PH_NOISY_CC);
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("b"), &_4);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *delimiter = NULL, delimiter_sub, __$null;
 
 	ZVAL_UNDEF(&delimiter_sub);
@@ -75,6 +82,8 @@ PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &delimiter);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
@@ -87,11 +96,12 @@ PHP_METHOD(Stub_SPropertyAccess, testArgumentWithUnderscore)
 		zephir_read_static_property_ce(delimiter, stub_spropertyaccess_ce, SL("_delimiterWithUnderscore"), PH_NOISY_CC);
 	}
 	RETVAL_ZVAL(delimiter, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_SPropertyAccess, testArgument)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *delimiter = NULL, delimiter_sub, __$null, _0$$3;
 
 	ZVAL_UNDEF(&delimiter_sub);
@@ -102,6 +112,8 @@ PHP_METHOD(Stub_SPropertyAccess, testArgument)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &delimiter);
 	if (!delimiter) {
 		delimiter = &delimiter_sub;
@@ -110,11 +122,12 @@ PHP_METHOD(Stub_SPropertyAccess, testArgument)
 		ZEPHIR_SEPARATE_PARAM(delimiter);
 	}
 	if (ZEPHIR_IS_EMPTY(delimiter)) {
+		zephir_memory_observe(&_0$$3);
 		zephir_read_static_property_ce(&_0$$3, stub_spropertyaccess_ce, SL("delimiter"), PH_NOISY_CC);
 		ZEPHIR_CPY_WRT(delimiter, &_0$$3);
 	}
 	RETVAL_ZVAL(delimiter, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_SPropertyAccess, mutateStringVarInsideCycle)
@@ -122,11 +135,15 @@ PHP_METHOD(Stub_SPropertyAccess, mutateStringVarInsideCycle)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval i, _5, _3$$3, _4$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	_2 = 3;
 	_1 = 0;
 	_0 = 0;
@@ -230,12 +247,16 @@ PHP_METHOD(Stub_SPropertyAccess, mutateArrayVarInsideCycle)
 	zend_long _1, _2;
 	zend_bool _0;
 	zval i, j, _5, _3$$3, _4$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&i);
 	ZVAL_UNDEF(&j);
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_3$$3);
 	ZVAL_UNDEF(&_4$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	_2 = 3;
 	_1 = 0;
 	_0 = 0;
@@ -267,9 +288,14 @@ PHP_METHOD(Stub_SPropertyAccess, mutateArrayVarInsideCycle)
 void zephir_init_static_properties_Stub_SPropertyAccess()
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 		ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	array_init(&_0);
 	zephir_update_static_property_ce(stub_spropertyaccess_ce, ZEND_STRL("arrayVar"), &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
diff --git a/ext/stub/statements.zep.c b/ext/stub/statements.zep.c
index d3971e88fa..792537292d 100644
--- a/ext/stub/statements.zep.c
+++ b/ext/stub/statements.zep.c
@@ -42,6 +42,7 @@ ZEPHIR_INIT_CLASS(Stub_Statements)
 PHP_METHOD(Stub_Statements, testPropertyAcccessAvoidTmpReuse)
 {
 	zval result1, result2, result3, result4, _0, _1, _2, _3, _4, _5, _6, _7;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&result1);
@@ -56,22 +57,26 @@ PHP_METHOD(Stub_Statements, testPropertyAcccessAvoidTmpReuse)
 	ZVAL_UNDEF(&_5);
 	ZVAL_UNDEF(&_6);
 	ZVAL_UNDEF(&_7);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZVAL_NULL(&result1);
+	ZEPHIR_INIT_VAR(&result1);
 	zephir_fast_strpos(&result1, &_0, &_1, 0 );
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_3, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZVAL_NULL(&result2);
+	ZEPHIR_INIT_VAR(&result2);
 	zephir_fast_strpos(&result2, &_2, &_3, 0 );
 	zephir_read_property(&_4, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_5, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZVAL_NULL(&result3);
+	ZEPHIR_INIT_VAR(&result3);
 	zephir_fast_strpos(&result3, &_4, &_5, 0 );
 	zephir_read_property(&_6, this_ptr, ZEND_STRL("tmp2"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_7, this_ptr, ZEND_STRL("tmp1"), PH_NOISY_CC | PH_READONLY);
-	ZVAL_NULL(&result4);
+	ZEPHIR_INIT_VAR(&result4);
 	zephir_fast_strpos(&result4, &_6, &_7, 0 );
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Statements, testElseIf)
@@ -135,6 +140,7 @@ PHP_METHOD(Stub_Statements, testElseIf2)
 
 PHP_METHOD(Stub_Statements, test544Issue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_8 = NULL;
 	zval *step_param = NULL, _0, _1, _2$$3, _3$$3, _4$$3, _5$$3, _6$$3, _7$$3, _9$$3, _10$$3, _11$$3, _12$$4, _13$$4, _14$$5, _15$$5;
 	zend_long step, ZEPHIR_LAST_CALL_STATUS, filledWidth = 0, unfilledWidth = 0;
@@ -158,6 +164,8 @@ PHP_METHOD(Stub_Statements, test544Issue)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(step)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &step_param);
 	if (UNEXPECTED(Z_TYPE_P(step_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'step' must be of the type int"));
@@ -182,24 +190,25 @@ PHP_METHOD(Stub_Statements, test544Issue)
 		ZEPHIR_CALL_FUNCTION(&_11$$3, "str_repeat", &_8, 23, &_9$$3, &_10$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_7$$3, &_6$$3, &_11$$3);
-		return;
+		RETURN_MM();
 	} else if (ZEPHIR_IS_LONG_IDENTICAL(&_1, step)) {
 		zephir_read_property(&_12$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 23, &_12$$4, &_13$$4);
 		zephir_check_call_status();
-		return;
+		RETURN_MM();
 	} else {
 		zephir_read_property(&_14$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_15$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 23, &_14$$5, &_15$$5);
 		zephir_check_call_status();
-		return;
+		RETURN_MM();
 	}
 }
 
 PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL;
 	zval *step_param = NULL, _0, _1$$3, _2$$3, _3$$3, _4$$3, _5$$3, _7$$3, _8$$3, _9$$3, _10$$4, _11$$4, _12$$5, _13$$5;
 	zend_long step, ZEPHIR_LAST_CALL_STATUS, filledWidth = 0, unfilledWidth = 0, totalSteps = 0;
@@ -221,6 +230,8 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(step)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &step_param);
 	if (UNEXPECTED(Z_TYPE_P(step_param) != IS_LONG)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'step' must be of the type int"));
@@ -244,19 +255,19 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 		ZEPHIR_CALL_FUNCTION(&_9$$3, "str_repeat", &_6, 23, &_7$$3, &_8$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_5$$3, &_4$$3, &_9$$3);
-		return;
+		RETURN_MM();
 	} else if (step == totalSteps) {
 		zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 23, &_10$$4, &_11$$4);
 		zephir_check_call_status();
-		return;
+		RETURN_MM();
 	} else {
 		zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 23, &_12$$5, &_13$$5);
 		zephir_check_call_status();
-		return;
+		RETURN_MM();
 	}
 }
 
diff --git a/ext/stub/strings.zep.c b/ext/stub/strings.zep.c
index ae8c252750..913f5864cb 100644
--- a/ext/stub/strings.zep.c
+++ b/ext/stub/strings.zep.c
@@ -32,6 +32,7 @@ ZEPHIR_INIT_CLASS(Stub_Strings)
 
 PHP_METHOD(Stub_Strings, camelize)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null;
 	zval str;
 
@@ -44,6 +45,8 @@ PHP_METHOD(Stub_Strings, camelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
@@ -51,11 +54,12 @@ PHP_METHOD(Stub_Strings, camelize)
 		delimiter = &__$null;
 	}
 	zephir_camelize(return_value, &str, delimiter);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Strings, uncamelize)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *str_param = NULL, *delimiter = NULL, delimiter_sub, __$null;
 	zval str;
 
@@ -68,6 +72,8 @@ PHP_METHOD(Stub_Strings, uncamelize)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL_OR_NULL(delimiter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &str_param, &delimiter);
 	zephir_get_strval(&str, str_param);
 	if (!delimiter) {
@@ -75,7 +81,7 @@ PHP_METHOD(Stub_Strings, uncamelize)
 		delimiter = &__$null;
 	}
 	zephir_uncamelize(return_value, &str, delimiter);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Strings, testTrim)
@@ -393,23 +399,31 @@ PHP_METHOD(Stub_Strings, testEchoMultilineString)
 PHP_METHOD(Stub_Strings, testTrimMultilineString)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "\n            Hello world\n        ");
 	zephir_fast_trim(return_value, &_0, NULL , ZEPHIR_TRIM_BOTH);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Strings, testWellEscapedMultilineString)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "\n            \\\"\\}\\$hello\\$\\\"\'\n        ");
 	zephir_fast_trim(return_value, &_0, NULL , ZEPHIR_TRIM_BOTH);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Strings, testInternedString1)
@@ -421,11 +435,15 @@ PHP_METHOD(Stub_Strings, testInternedString1)
 PHP_METHOD(Stub_Strings, testInternedString2)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, " hello ");
 	zephir_fast_trim(&_0, &_1, NULL , ZEPHIR_TRIM_BOTH);
 	RETURN_CCTOR(&_0);
@@ -434,6 +452,7 @@ PHP_METHOD(Stub_Strings, testInternedString2)
 PHP_METHOD(Stub_Strings, strToHex)
 {
 	unsigned char _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS, i;
 	zephir_fcall_cache_entry *_4 = NULL, *_6 = NULL;
 	zval *value_param = NULL, _0, _2$$3, _3$$3, _5$$3;
@@ -448,10 +467,12 @@ PHP_METHOD(Stub_Strings, strToHex)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_STR(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value_param);
 	zephir_get_strval(&value, value_param);
 	i = 0;
-	ZVAL_NULL(&ret);
+	ZEPHIR_INIT_VAR(&ret);
 	while (1) {
 		if (!(i < zephir_fast_strlen_ev(&value))) {
 			break;
@@ -472,6 +493,7 @@ PHP_METHOD(Stub_Strings, strToHex)
 PHP_METHOD(Stub_Strings, issue1267)
 {
 	zval _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_5 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *value = NULL, value_sub, x, _0, _2, _3, _4, _6, _7;
@@ -488,12 +510,14 @@ PHP_METHOD(Stub_Strings, issue1267)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &value);
 	ZEPHIR_SEPARATE_PARAM(value);
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_create_array(&_1, 3, 0);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, "\\");
 	zephir_array_fast_append(&_1, &_2);
 	ZEPHIR_INIT_NVAR(&_2);
@@ -514,18 +538,19 @@ PHP_METHOD(Stub_Strings, issue1267)
 	ZEPHIR_CALL_FUNCTION(&_4, "strip_tags", &_5, 106, value);
 	zephir_check_call_status();
 	zephir_stripslashes(&_0, &_4);
-	ZVAL_NULL(&x);
+	ZEPHIR_INIT_VAR(&x);
 	zephir_fast_trim(&x, &_0, NULL , ZEPHIR_TRIM_BOTH);
-	ZVAL_NULL(&_6);
+	ZEPHIR_INIT_VAR(&_6);
 	ZEPHIR_CALL_FUNCTION(&_7, "strip_tags", &_5, 106, value);
 	zephir_check_call_status();
 	zephir_stripcslashes(&_6, &_7);
 	zephir_fast_trim(return_value, &_6, NULL , ZEPHIR_TRIM_BOTH);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Strings, issue2186)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
 
@@ -535,9 +560,11 @@ PHP_METHOD(Stub_Strings, issue2186)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
@@ -546,6 +573,7 @@ PHP_METHOD(Stub_Strings, issue2186)
 
 PHP_METHOD(Stub_Strings, issue2186SegFault)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
 
@@ -555,9 +583,11 @@ PHP_METHOD(Stub_Strings, issue2186SegFault)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
@@ -569,6 +599,7 @@ PHP_METHOD(Stub_Strings, issue2186SegFault)
 
 PHP_METHOD(Stub_Strings, issue2186SegFaultCall)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *val_param = NULL;
 	zval val;
@@ -580,19 +611,22 @@ PHP_METHOD(Stub_Strings, issue2186SegFaultCall)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "issue2186child1", NULL, 0, &val);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Strings, issue2186Child1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *val_param = NULL;
 	zval val;
@@ -604,19 +638,22 @@ PHP_METHOD(Stub_Strings, issue2186Child1)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "issue2186child2", NULL, 0, &val);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Strings, issue2186Child2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL, output;
 	zval val, _0$$3;
 
@@ -628,16 +665,18 @@ PHP_METHOD(Stub_Strings, issue2186Child2)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 		zephir_get_strval(&val, val_param);
 	}
-	ZVAL_NULL(&output);
+	ZEPHIR_INIT_VAR(&output);
 	ZVAL_STRING(&output, "");
 	if (!(ZEPHIR_IS_EMPTY(&val))) {
-		ZVAL_NULL(&_0$$3);
+		ZEPHIR_INIT_VAR(&_0$$3);
 		ZEPHIR_CONCAT_VS(&_0$$3, &val, " all ok");
 		ZEPHIR_CPY_WRT(&output, &_0$$3);
 	}
@@ -649,6 +688,7 @@ PHP_METHOD(Stub_Strings, issue2186Child2)
  */
 PHP_METHOD(Stub_Strings, issue2234Strict)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
 
@@ -658,9 +698,11 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -669,7 +711,7 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	}
 	}
 	RETURN_MM_BOOL(ZEPHIR_IS_NULL(&val));
@@ -680,6 +722,7 @@ PHP_METHOD(Stub_Strings, issue2234Strict)
  */
 PHP_METHOD(Stub_Strings, issue2234StrictParent)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *val_param = NULL;
 	zval val;
@@ -691,9 +734,11 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -702,12 +747,12 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	}
 	}
 	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "issue2234strictchild", NULL, 0, &val);
 	zephir_check_call_status();
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -715,6 +760,7 @@ PHP_METHOD(Stub_Strings, issue2234StrictParent)
  */
 PHP_METHOD(Stub_Strings, issue2234StrictChild)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
 
@@ -724,9 +770,11 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -735,7 +783,7 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	}
 	}
 	RETURN_CTOR(&val);
@@ -746,6 +794,7 @@ PHP_METHOD(Stub_Strings, issue2234StrictChild)
  */
 PHP_METHOD(Stub_Strings, nullableStringReturnType)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *val_param = NULL;
 	zval val;
 
@@ -755,9 +804,11 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &val_param);
 	if (!val_param) {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	} else {
 	if (UNEXPECTED(Z_TYPE_P(val_param) != IS_STRING && Z_TYPE_P(val_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'val' must be of the type string"));
@@ -766,7 +817,7 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
 	if (EXPECTED(Z_TYPE_P(val_param) == IS_STRING)) {
 		zephir_get_strval(&val, val_param);
 	} else {
-		ZVAL_NULL(&val);
+		ZEPHIR_INIT_VAR(&val);
 	}
 	}
 	if (!ZEPHIR_IS_NULL(&val)) {
@@ -780,6 +831,7 @@ PHP_METHOD(Stub_Strings, nullableStringReturnType)
  */
 PHP_METHOD(Stub_Strings, issue2299NullableStringCondition)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *roleName_param = NULL;
 	zval roleName;
 
@@ -789,9 +841,11 @@ PHP_METHOD(Stub_Strings, issue2299NullableStringCondition)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(roleName)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &roleName_param);
 	if (!roleName_param) {
-		ZVAL_NULL(&roleName);
+		ZEPHIR_INIT_VAR(&roleName);
 	} else {
 		zephir_get_strval(&roleName, roleName_param);
 	}
diff --git a/ext/stub/stubs.zep.c b/ext/stub/stubs.zep.c
index 7cef78637a..2b5801c064 100644
--- a/ext/stub/stubs.zep.c
+++ b/ext/stub/stubs.zep.c
@@ -126,17 +126,22 @@ PHP_METHOD(Stub_Stubs, testVariableLength)
 {
 	zval _0, _1;
 	zval data;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&data);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&data);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&data);
 	array_init(&data);
-	ZVAL_NULL(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_0);
+	ZEPHIR_INIT_VAR(&_1);
 	zephir_get_args(&_1);
 	zephir_fast_array_merge(&_0, &data, &_1);
 	ZEPHIR_CPY_WRT(&data, &_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Stubs, testMultiReturnTypeWithMixedInDocAndEmptyInSignature1)
diff --git a/ext/stub/ternary.zep.c b/ext/stub/ternary.zep.c
index 564dcf7919..6d2e4fe847 100644
--- a/ext/stub/ternary.zep.c
+++ b/ext/stub/ternary.zep.c
@@ -33,9 +33,13 @@ ZEPHIR_INIT_CLASS(Stub_Ternary)
 PHP_METHOD(Stub_Ternary, testTernary1)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	if (100) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (1 + 100));
@@ -48,6 +52,7 @@ PHP_METHOD(Stub_Ternary, testTernary1)
 
 PHP_METHOD(Stub_Ternary, testTernary2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *b_param = NULL, _0;
 	zend_bool b;
 
@@ -55,8 +60,10 @@ PHP_METHOD(Stub_Ternary, testTernary2)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(b)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &b_param);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	if (b) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_STRING(&_0, "foo");
@@ -69,6 +76,7 @@ PHP_METHOD(Stub_Ternary, testTernary2)
 
 PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *y, y_sub, _0, _1;
 
@@ -80,8 +88,10 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(y)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &y);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	if (100) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (1 + 100));
@@ -101,6 +111,7 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex1)
 
 PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub, *y, y_sub, _0, _1;
 
@@ -112,8 +123,10 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 		Z_PARAM_ZVAL(a)
 		Z_PARAM_ZVAL(y)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &y);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	if (100) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (1 + 100));
@@ -133,6 +146,7 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex2)
 
 PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
 
 	ZVAL_UNDEF(&a_sub);
@@ -140,8 +154,10 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	if (Z_TYPE_P(a) == IS_RESOURCE) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_STRING(&_0, "unknown");
@@ -150,7 +166,7 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 		ZVAL_BOOL(&_0, 0);
 	}
 	zephir_gettype(return_value, &_0);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -159,20 +175,24 @@ PHP_METHOD(Stub_Ternary, testTernaryComplex3)
 PHP_METHOD(Stub_Ternary, testTernaryWithPromotedTemporaryVariable)
 {
 	zval var2, var3, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&var2);
 	ZVAL_UNDEF(&var3);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&var2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&var2);
 	zephir_create_array(&var2, 2, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "_b_");
 	zephir_array_fast_append(&var2, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "_c_");
 	zephir_array_fast_append(&var2, &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	if (zephir_array_isset_long(&var2, 1)) {
 		ZEPHIR_OBS_NVAR(&_1);
 		zephir_array_fetch_long(&_1, &var2, 1, PH_NOISY, "stub/ternary.zep", 44);
@@ -180,7 +200,7 @@ PHP_METHOD(Stub_Ternary, testTernaryWithPromotedTemporaryVariable)
 		ZEPHIR_INIT_NVAR(&_1);
 		ZVAL_STRING(&_1, "");
 	}
-	ZVAL_NULL(&var3);
+	ZEPHIR_INIT_VAR(&var3);
 	zephir_fast_explode_str(&var3, SL("_"), &_1, LONG_MAX);
 	RETURN_CCTOR(&var3);
 }
@@ -191,9 +211,13 @@ PHP_METHOD(Stub_Ternary, testTernaryWithPromotedTemporaryVariable)
 PHP_METHOD(Stub_Ternary, testTernaryAfterLetVariable)
 {
 	zval s;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&s);
-	ZVAL_NULL(&s);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&s);
 	ZVAL_LONG(&s, 23);
 	if (1 == 1) {
 		ZEPHIR_INIT_NVAR(&s);
@@ -207,6 +231,7 @@ PHP_METHOD(Stub_Ternary, testTernaryAfterLetVariable)
 
 PHP_METHOD(Stub_Ternary, testShortTernary)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a, a_sub, _0;
 
 	ZVAL_UNDEF(&a_sub);
@@ -214,8 +239,10 @@ PHP_METHOD(Stub_Ternary, testShortTernary)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	if (!(zephir_is_true(a))) {
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_BOOL(&_0, 0);
@@ -227,6 +254,7 @@ PHP_METHOD(Stub_Ternary, testShortTernary)
 
 PHP_METHOD(Stub_Ternary, testShortTernaryComplex)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *left, left_sub, *value, value_sub, _0;
 
 	ZVAL_UNDEF(&left_sub);
@@ -236,8 +264,10 @@ PHP_METHOD(Stub_Ternary, testShortTernaryComplex)
 		Z_PARAM_ZVAL(left)
 		Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &left, &value);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	if (!(zephir_is_true(left))) {
 		ZEPHIR_CPY_WRT(&_0, value);
 	} else {
diff --git a/ext/stub/trytest.zep.c b/ext/stub/trytest.zep.c
index c47e3c7435..744e0363e5 100644
--- a/ext/stub/trytest.zep.c
+++ b/ext/stub/trytest.zep.c
@@ -37,17 +37,22 @@ PHP_METHOD(Stub_TryTest, testThrow1)
 PHP_METHOD(Stub_TryTest, testThrow2)
 {
 	zval message, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&message);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&message);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&message);
 	ZVAL_STRING(&message, "error");
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, zend_ce_exception);
 	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &message);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/trytest.zep", 16);
+	ZEPHIR_MM_RESTORE();
 	return;
 }
 
@@ -63,15 +68,18 @@ PHP_METHOD(Stub_TryTest, testTry1)
 PHP_METHOD(Stub_TryTest, testTry2)
 {
 	zval _0$$3, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
-		ZVAL_NULL(&_0$$3);
+		ZEPHIR_INIT_VAR(&_0$$3);
 		object_init_ex(&_0$$3, zend_ce_exception);
-		ZVAL_NULL(&_1$$3);
+		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
@@ -85,17 +93,20 @@ PHP_METHOD(Stub_TryTest, testTry2)
 PHP_METHOD(Stub_TryTest, testTry3)
 {
 	zval _0$$3, _1$$3, _2, _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
 	ZVAL_UNDEF(&_2);
 	ZVAL_UNDEF(&_3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
-		ZVAL_NULL(&_0$$3);
+		ZEPHIR_INIT_VAR(&_0$$3);
 		object_init_ex(&_0$$3, zend_ce_exception);
-		ZVAL_NULL(&_1$$3);
+		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
@@ -104,10 +115,10 @@ PHP_METHOD(Stub_TryTest, testTry3)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_2);
+		ZEPHIR_INIT_VAR(&_2);
 		ZVAL_OBJ(&_2, EG(exception));
 		Z_ADDREF_P(&_2);
-		ZVAL_NULL(&_3);
+		ZEPHIR_INIT_VAR(&_3);
 		if (zephir_is_instance_of(&_2, SL("Exception"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_3, &_2);
@@ -119,6 +130,7 @@ PHP_METHOD(Stub_TryTest, testTry3)
 
 PHP_METHOD(Stub_TryTest, testTry4)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0$$4, _1$$4, _2$$5, _3$$5, _4, _5, _6;
 	zend_bool a;
@@ -133,13 +145,15 @@ PHP_METHOD(Stub_TryTest, testTry4)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	/* try_start_1: */
 
 		if (a) {
-			ZVAL_NULL(&_0$$4);
+			ZEPHIR_INIT_VAR(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZVAL_NULL(&_1$$4);
+			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -147,9 +161,9 @@ PHP_METHOD(Stub_TryTest, testTry4)
 			goto try_end_1;
 
 		} else {
-			ZVAL_NULL(&_2$$5);
+			ZEPHIR_INIT_VAR(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZVAL_NULL(&_3$$5);
+			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -161,11 +175,11 @@ PHP_METHOD(Stub_TryTest, testTry4)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_4);
+		ZEPHIR_INIT_VAR(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
-		ZVAL_NULL(&_5);
-		ZVAL_NULL(&_6);
+		ZEPHIR_INIT_VAR(&_5);
+		ZEPHIR_INIT_VAR(&_6);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_5, &_4);
@@ -183,6 +197,7 @@ PHP_METHOD(Stub_TryTest, testTry4)
 
 PHP_METHOD(Stub_TryTest, testTry5)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, _0$$4, _1$$4, _2$$5, _3$$5, _4, _5;
 	zend_bool a;
@@ -196,13 +211,15 @@ PHP_METHOD(Stub_TryTest, testTry5)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	/* try_start_1: */
 
 		if (a) {
-			ZVAL_NULL(&_0$$4);
+			ZEPHIR_INIT_VAR(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZVAL_NULL(&_1$$4);
+			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -210,9 +227,9 @@ PHP_METHOD(Stub_TryTest, testTry5)
 			goto try_end_1;
 
 		} else {
-			ZVAL_NULL(&_2$$5);
+			ZEPHIR_INIT_VAR(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZVAL_NULL(&_3$$5);
+			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -224,10 +241,10 @@ PHP_METHOD(Stub_TryTest, testTry5)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_4);
+		ZEPHIR_INIT_VAR(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
-		ZVAL_NULL(&_5);
+		ZEPHIR_INIT_VAR(&_5);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
 			zend_clear_exception();
 			ZEPHIR_CPY_WRT(&_5, &_4);
@@ -245,6 +262,7 @@ PHP_METHOD(Stub_TryTest, testTry5)
 
 PHP_METHOD(Stub_TryTest, testTry6)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, e, _4, _0$$4, _1$$4, _2$$5, _3$$5;
 	zend_bool a;
@@ -258,13 +276,15 @@ PHP_METHOD(Stub_TryTest, testTry6)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	/* try_start_1: */
 
 		if (a) {
-			ZVAL_NULL(&_0$$4);
+			ZEPHIR_INIT_VAR(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZVAL_NULL(&_1$$4);
+			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -272,9 +292,9 @@ PHP_METHOD(Stub_TryTest, testTry6)
 			goto try_end_1;
 
 		} else {
-			ZVAL_NULL(&_2$$5);
+			ZEPHIR_INIT_VAR(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZVAL_NULL(&_3$$5);
+			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -286,7 +306,7 @@ PHP_METHOD(Stub_TryTest, testTry6)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_4);
+		ZEPHIR_INIT_VAR(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
@@ -306,6 +326,7 @@ PHP_METHOD(Stub_TryTest, testTry6)
 
 PHP_METHOD(Stub_TryTest, testTry7)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a_param = NULL, e, _4, _0$$4, _1$$4, _2$$5, _3$$5;
 	zend_bool a;
@@ -319,13 +340,15 @@ PHP_METHOD(Stub_TryTest, testTry7)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_BOOL(a)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &a_param);
 	/* try_start_1: */
 
 		if (a) {
-			ZVAL_NULL(&_0$$4);
+			ZEPHIR_INIT_VAR(&_0$$4);
 			object_init_ex(&_0$$4, zend_ce_exception);
-			ZVAL_NULL(&_1$$4);
+			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -333,9 +356,9 @@ PHP_METHOD(Stub_TryTest, testTry7)
 			goto try_end_1;
 
 		} else {
-			ZVAL_NULL(&_2$$5);
+			ZEPHIR_INIT_VAR(&_2$$5);
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
-			ZVAL_NULL(&_3$$5);
+			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
 			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
@@ -347,7 +370,7 @@ PHP_METHOD(Stub_TryTest, testTry7)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_4);
+		ZEPHIR_INIT_VAR(&_4);
 		ZVAL_OBJ(&_4, EG(exception));
 		Z_ADDREF_P(&_4);
 		if (zephir_is_instance_of(&_4, SL("RuntimeException"))) {
@@ -367,15 +390,18 @@ PHP_METHOD(Stub_TryTest, testTry7)
 PHP_METHOD(Stub_TryTest, testTry8)
 {
 	zval _0$$3, _1$$3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0$$3);
 	ZVAL_UNDEF(&_1$$3);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
-		ZVAL_NULL(&_0$$3);
+		ZEPHIR_INIT_VAR(&_0$$3);
 		object_init_ex(&_0$$3, zend_ce_exception);
-		ZVAL_NULL(&_1$$3);
+		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error 1!");
 		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
@@ -405,11 +431,14 @@ PHP_METHOD(Stub_TryTest, someMethod2)
 PHP_METHOD(Stub_TryTest, testTry9)
 {
 	zval e, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod1", NULL, 108);
@@ -419,7 +448,7 @@ PHP_METHOD(Stub_TryTest, testTry9)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_0);
+		ZEPHIR_INIT_VAR(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("RuntimeException"))) {
@@ -434,11 +463,14 @@ PHP_METHOD(Stub_TryTest, testTry9)
 PHP_METHOD(Stub_TryTest, testTry10)
 {
 	zval e, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&e);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
 		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod2", NULL, 109);
@@ -448,7 +480,7 @@ PHP_METHOD(Stub_TryTest, testTry10)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_0);
+		ZEPHIR_INIT_VAR(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("RuntimeException"))) {
@@ -463,9 +495,12 @@ PHP_METHOD(Stub_TryTest, testTry10)
 PHP_METHOD(Stub_TryTest, testTry11)
 {
 	zval ex, _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&ex);
 	ZVAL_UNDEF(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
 		RETURN_MM_STRING("test");
@@ -473,7 +508,7 @@ PHP_METHOD(Stub_TryTest, testTry11)
 	try_end_1:
 
 	if (EG(exception)) {
-		ZVAL_NULL(&_0);
+		ZEPHIR_INIT_VAR(&_0);
 		ZVAL_OBJ(&_0, EG(exception));
 		Z_ADDREF_P(&_0);
 		if (zephir_is_instance_of(&_0, SL("Exception"))) {
diff --git a/ext/stub/typeinstances.zep.c b/ext/stub/typeinstances.zep.c
index 2eaaf176d3..86febcb95f 100644
--- a/ext/stub/typeinstances.zep.c
+++ b/ext/stub/typeinstances.zep.c
@@ -33,11 +33,15 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString1)
 {
 	zval _2;
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 24);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
 	zephir_check_call_status();
@@ -49,11 +53,15 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString2)
 {
 	zval _2;
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, -24);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
 	zephir_check_call_status();
@@ -65,11 +73,15 @@ PHP_METHOD(Stub_TypeInstances, testInstanceOfString3)
 {
 	zval _2;
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	ZVAL_LONG(&_0, 0);
 	ZEPHIR_CALL_FUNCTION(&_1, "create_string", NULL, 0, &_0);
 	zephir_check_call_status();
diff --git a/ext/stub/typeoff.zep.c b/ext/stub/typeoff.zep.c
index bfc3fe930c..a365e0b793 100644
--- a/ext/stub/typeoff.zep.c
+++ b/ext/stub/typeoff.zep.c
@@ -30,9 +30,13 @@ ZEPHIR_INIT_CLASS(Stub_Typeoff)
 PHP_METHOD(Stub_Typeoff, testNativeStringFalse)
 {
 	zval testVar;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&testVar);
-	ZVAL_NULL(&testVar);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&testVar);
 	ZVAL_STRING(&testVar, "sdfsdf");
 	RETURN_MM_BOOL(1 == 0);
 }
@@ -40,9 +44,13 @@ PHP_METHOD(Stub_Typeoff, testNativeStringFalse)
 PHP_METHOD(Stub_Typeoff, testNativeStringTrue)
 {
 	zval testVar;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&testVar);
-	ZVAL_NULL(&testVar);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&testVar);
 	ZVAL_STRING(&testVar, "sdfsdf");
 	RETURN_MM_BOOL(1 == 1);
 }
@@ -78,9 +86,13 @@ PHP_METHOD(Stub_Typeoff, testNativeBoolTrue)
 PHP_METHOD(Stub_Typeoff, testNotBoolTrue)
 {
 	zval testVar;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&testVar);
-	ZVAL_NULL(&testVar);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&testVar);
 	ZVAL_STRING(&testVar, "");
 	ZEPHIR_INIT_NVAR(&testVar);
 	ZVAL_BOOL(&testVar, 1);
@@ -97,9 +109,13 @@ PHP_METHOD(Stub_Typeoff, testNativeBoolFalse)
 PHP_METHOD(Stub_Typeoff, testArrayFalse)
 {
 	zval testVar;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&testVar);
-	ZVAL_NULL(&testVar);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&testVar);
 	array_init(&testVar);
 	RETURN_MM_BOOL(Z_TYPE_P(&testVar) == IS_STRING);
 }
@@ -107,9 +123,13 @@ PHP_METHOD(Stub_Typeoff, testArrayFalse)
 PHP_METHOD(Stub_Typeoff, testArrayTrue)
 {
 	zval testVar;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&testVar);
-	ZVAL_NULL(&testVar);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&testVar);
 	array_init(&testVar);
 	RETURN_MM_BOOL(Z_TYPE_P(&testVar) == IS_ARRAY);
 }
@@ -117,20 +137,26 @@ PHP_METHOD(Stub_Typeoff, testArrayTrue)
 PHP_METHOD(Stub_Typeoff, testClassPropertyAccess)
 {
 	zval _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *this_ptr = getThis();
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "test string");
 	zephir_update_property_zval(this_ptr, ZEND_STRL("property"), &_0);
+	zephir_memory_observe(&_1);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("property"), PH_NOISY_CC);
 	RETURN_MM_BOOL(Z_TYPE_P(&_1) == IS_STRING);
 }
 
 PHP_METHOD(Stub_Typeoff, testUnknownTypeOf)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *u, u_sub, _0;
 
 	ZVAL_UNDEF(&u_sub);
@@ -138,8 +164,10 @@ PHP_METHOD(Stub_Typeoff, testUnknownTypeOf)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(u)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &u);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	zephir_gettype(&_0, u);
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/types/mixedtype.zep.c b/ext/stub/types/mixedtype.zep.c
index fae5935bda..e9a0565ea3 100644
--- a/ext/stub/types/mixedtype.zep.c
+++ b/ext/stub/types/mixedtype.zep.c
@@ -136,6 +136,7 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedTwo)
 
 PHP_METHOD(Stub_Types_MixedType, paramMixedWithMulti)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *mixedVal;
 	zval stringVal;
 	zval *intVal_param = NULL, *stringVal_param = NULL, mixedVal_sub, _0;
@@ -149,15 +150,17 @@ PHP_METHOD(Stub_Types_MixedType, paramMixedWithMulti)
 		Z_PARAM_STR(stringVal)
 		Z_PARAM_ZVAL(mixedVal)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 3, 0, &intVal_param, &stringVal_param, &mixedVal);
 	zephir_get_strval(&stringVal, stringVal_param);
 	zephir_create_array(return_value, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, intVal);
 	zephir_array_fast_append(return_value, &_0);
 	zephir_array_fast_append(return_value, &stringVal);
 	zephir_array_fast_append(return_value, mixedVal);
-	return;
+	RETURN_MM();
 }
 
 /**
@@ -180,6 +183,7 @@ PHP_METHOD(Stub_Types_MixedType, paramAndReturnMixed)
 PHP_METHOD(Stub_Types_MixedType, castToStringMixedAndReturnMixed)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val;
 
@@ -188,6 +192,8 @@ PHP_METHOD(Stub_Types_MixedType, castToStringMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 	zephir_cast_to_string(&_0, val);
 	RETURN_CTOR(&_0);
@@ -196,6 +202,7 @@ PHP_METHOD(Stub_Types_MixedType, castToStringMixedAndReturnMixed)
 PHP_METHOD(Stub_Types_MixedType, castToStringInternallyMixedAndReturnMixed)
 {
 	zval _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
 
@@ -204,11 +211,13 @@ PHP_METHOD(Stub_Types_MixedType, castToStringInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 	zephir_cast_to_string(&_0, val);
 	ZEPHIR_CPY_WRT(val, &_0);
 	RETVAL_ZVAL(val, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToIntMixedAndReturnMixed)
@@ -227,6 +236,7 @@ PHP_METHOD(Stub_Types_MixedType, castToIntMixedAndReturnMixed)
 PHP_METHOD(Stub_Types_MixedType, castToIntInternallyMixedAndReturnMixed)
 {
 	zend_long _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
 
@@ -234,12 +244,14 @@ PHP_METHOD(Stub_Types_MixedType, castToIntInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 	_0 = zephir_get_intval(val);
 	ZEPHIR_INIT_NVAR(val);
 	ZVAL_LONG(val, _0);
 	RETVAL_ZVAL(val, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToBoolMixedAndReturnMixed)
@@ -258,6 +270,7 @@ PHP_METHOD(Stub_Types_MixedType, castToBoolMixedAndReturnMixed)
 PHP_METHOD(Stub_Types_MixedType, castToBoolInternallyMixedAndReturnMixed)
 {
 	double _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
 
@@ -265,12 +278,14 @@ PHP_METHOD(Stub_Types_MixedType, castToBoolInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 	_0 = zephir_get_boolval(val);
 	ZEPHIR_INIT_NVAR(val);
 	ZVAL_BOOL(val, _0);
 	RETVAL_ZVAL(val, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Types_MixedType, castToFloatMixedAndReturnMixed)
@@ -289,6 +304,7 @@ PHP_METHOD(Stub_Types_MixedType, castToFloatMixedAndReturnMixed)
 PHP_METHOD(Stub_Types_MixedType, castToFloatInternallyMixedAndReturnMixed)
 {
 	double _0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval val_sub;
 	zval *val = NULL;
 
@@ -296,12 +312,14 @@ PHP_METHOD(Stub_Types_MixedType, castToFloatInternallyMixedAndReturnMixed)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(val)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &val);
 	_0 = zephir_get_doubleval(val);
 	ZEPHIR_INIT_NVAR(val);
 	ZVAL_DOUBLE(val, _0);
 	RETVAL_ZVAL(val, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 /**
diff --git a/ext/stub/unsettest.zep.c b/ext/stub/unsettest.zep.c
index ae7ba0fed3..ad0125da48 100644
--- a/ext/stub/unsettest.zep.c
+++ b/ext/stub/unsettest.zep.c
@@ -83,21 +83,25 @@ PHP_METHOD(Stub_Unsettest, testUnsetValueFromProperty)
 
 PHP_METHOD(Stub_Unsettest, testUnsetFromArray)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arrayParameter, arrayParameter_sub;
 
 	ZVAL_UNDEF(&arrayParameter_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(arrayParameter)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &arrayParameter);
 	ZEPHIR_SEPARATE_PARAM(arrayParameter);
 	zephir_array_unset_long(arrayParameter, 0, PH_SEPARATE);
 	RETVAL_ZVAL(arrayParameter, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Unsettest, testUnsetFromArrayByIndexVar)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *arrayParameter, arrayParameter_sub, *index, index_sub;
 
 	ZVAL_UNDEF(&arrayParameter_sub);
@@ -106,11 +110,13 @@ PHP_METHOD(Stub_Unsettest, testUnsetFromArrayByIndexVar)
 		Z_PARAM_ZVAL(arrayParameter)
 		Z_PARAM_ZVAL(index)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arrayParameter, &index);
 	ZEPHIR_SEPARATE_PARAM(arrayParameter);
 	zephir_array_unset(arrayParameter, index, PH_SEPARATE);
 	RETVAL_ZVAL(arrayParameter, 1, 0);
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_Unsettest, testUnsetProperty)
@@ -123,16 +129,20 @@ PHP_METHOD(Stub_Unsettest, testUnsetProperty)
 PHP_METHOD(Stub_Unsettest, testStdClassUnset)
 {
 	zval simpleObject, _0, _1;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&simpleObject);
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
-	ZVAL_NULL(&simpleObject);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&simpleObject);
 	object_init(&simpleObject);
 	ZVAL_UNDEF(&_0);
 	ZVAL_LONG(&_0, 12345);
 	zephir_update_property_zval(&simpleObject, ZEND_STRL("property1"), &_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "test");
 	zephir_update_property_zval(&simpleObject, ZEND_STRL("property2"), &_1);
@@ -145,6 +155,7 @@ PHP_METHOD(Stub_Unsettest, testStdClassUnset)
 
 PHP_METHOD(Stub_Unsettest, testUnsetTypedArray)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval key;
 	zval *arr_param = NULL, *key_param = NULL;
 	zval arr;
@@ -155,6 +166,8 @@ PHP_METHOD(Stub_Unsettest, testUnsetTypedArray)
 		Z_PARAM_ARRAY(arr)
 		Z_PARAM_STR(key)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &arr_param, &key_param);
 	zephir_get_arrval(&arr, arr_param);
 	zephir_get_strval(&key, key_param);
diff --git a/ext/stub/usetest.zep.c b/ext/stub/usetest.zep.c
index e41a033a45..1201799f4e 100644
--- a/ext/stub/usetest.zep.c
+++ b/ext/stub/usetest.zep.c
@@ -14,6 +14,7 @@
 #include "kernel/main.h"
 #include "kernel/object.h"
 #include "kernel/fcall.h"
+#include "kernel/memory.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_UseTest)
@@ -40,7 +41,11 @@ PHP_METHOD(Stub_UseTest, count)
 PHP_METHOD(Stub_UseTest, testUseClass1)
 {
 	zend_class_entry *_0 = NULL;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Oo\\OoConstruct"), ZEND_FETCH_CLASS_AUTO);
 	}
@@ -50,13 +55,17 @@ PHP_METHOD(Stub_UseTest, testUseClass1)
 		zephir_check_call_status();
 	}
 
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_UseTest, testUseClass2)
 {
 	zend_class_entry *_0 = NULL;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Strings"), ZEND_FETCH_CLASS_AUTO);
 	}
@@ -66,13 +75,17 @@ PHP_METHOD(Stub_UseTest, testUseClass2)
 		zephir_check_call_status();
 	}
 
-	return;
+	RETURN_MM();
 }
 
 PHP_METHOD(Stub_UseTest, testUseNamespaceAlias)
 {
 	zend_class_entry *_0 = NULL;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	if (!_0) {
 	_0 = zephir_fetch_class_str_ex(SL("Oo\\OoConstruct"), ZEND_FETCH_CLASS_AUTO);
 	}
@@ -82,6 +95,6 @@ PHP_METHOD(Stub_UseTest, testUseNamespaceAlias)
 		zephir_check_call_status();
 	}
 
-	return;
+	RETURN_MM();
 }
 
diff --git a/ext/stub/vars.zep.c b/ext/stub/vars.zep.c
index cb2614c169..2f46b94447 100644
--- a/ext/stub/vars.zep.c
+++ b/ext/stub/vars.zep.c
@@ -33,6 +33,7 @@ PHP_METHOD(Stub_Vars, testParam)
 {
 	zend_string *_4;
 	zend_ulong _3;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zephir_fcall_cache_entry *_6 = NULL;
 	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *config_param = NULL, k, v, _0, *_1, _2, _5$$3, _7$$4;
@@ -48,8 +49,10 @@ PHP_METHOD(Stub_Vars, testParam)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ARRAY(config)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &config_param);
-	ZVAL_COPY(&config, config_param);
+	ZEPHIR_OBS_COPY_OR_DUP(&config, config_param);
 	zephir_array_fetch_string(&_0, &config, SL("dir"), PH_NOISY | PH_READONLY, "stub/vars.zep", 8);
 	zephir_is_iterable(&_0, 0, "stub/vars.zep", 11);
 	if (Z_TYPE_P(&_0) == IS_ARRAY) {
@@ -94,17 +97,21 @@ PHP_METHOD(Stub_Vars, testParam)
 
 PHP_METHOD(Stub_Vars, testVarDump)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, a, ar, _0;
 
 	ZVAL_BOOL(&__$false, 0);
 	ZVAL_UNDEF(&a);
 	ZVAL_UNDEF(&ar);
 	ZVAL_UNDEF(&_0);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
-	ZVAL_NULL(&ar);
+	ZEPHIR_INIT_VAR(&ar);
 	zephir_create_array(&ar, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&ar, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
@@ -113,10 +120,12 @@ PHP_METHOD(Stub_Vars, testVarDump)
 	zephir_array_fast_append(&ar, &__$false);
 	zephir_var_dump(&ar);
 	zephir_var_dump(&a);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testVarDump2)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *ret, ret_sub, _0;
 
 	ZVAL_UNDEF(&ret_sub);
@@ -124,15 +133,19 @@ PHP_METHOD(Stub_Vars, testVarDump2)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(ret)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &ret);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_BOOL(&_0, ZEPHIR_IS_LONG(ret, 1));
 	zephir_var_dump(&_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testVarExport)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval __$false, a, ar, ret, _0, _1, _2;
 
 	ZVAL_BOOL(&__$false, 0);
@@ -142,23 +155,26 @@ PHP_METHOD(Stub_Vars, testVarExport)
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
 	ZVAL_UNDEF(&_2);
-	ZVAL_NULL(&a);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
+	ZEPHIR_INIT_VAR(&a);
 	ZVAL_STRING(&a, "hello");
-	ZVAL_NULL(&ar);
+	ZEPHIR_INIT_VAR(&ar);
 	zephir_create_array(&ar, 3, 0);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_LONG(&_0, 1);
 	zephir_array_fast_append(&ar, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "world");
 	zephir_array_fast_append(&ar, &_0);
 	zephir_array_fast_append(&ar, &__$false);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_CPY_WRT(&_1, &ar);
 	zephir_var_export(&_1);
-	ZVAL_NULL(&ret);
+	ZEPHIR_INIT_VAR(&ret);
 	zephir_var_export_ex(&ret, &ar);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZEPHIR_CPY_WRT(&_2, &a);
 	zephir_var_export(&_2);
 	ZEPHIR_INIT_NVAR(&ret);
@@ -168,6 +184,7 @@ PHP_METHOD(Stub_Vars, testVarExport)
 
 PHP_METHOD(Stub_Vars, test88Issue)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param1_param = NULL, *param2_param = NULL, _0, _1, _2, _3;
 	zval param1, param2;
 
@@ -183,6 +200,8 @@ PHP_METHOD(Stub_Vars, test88Issue)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR_OR_NULL(param2)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &param1_param, &param2_param);
 	if (UNEXPECTED(Z_TYPE_P(param1_param) != IS_STRING && Z_TYPE_P(param1_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param1' must be of the type string"));
@@ -191,29 +210,31 @@ PHP_METHOD(Stub_Vars, test88Issue)
 	if (EXPECTED(Z_TYPE_P(param1_param) == IS_STRING)) {
 		zephir_get_strval(&param1, param1_param);
 	} else {
-		ZVAL_NULL(&param1);
+		ZEPHIR_INIT_VAR(&param1);
 	}
 	if (!param2_param) {
-		ZVAL_NULL(&param2);
+		ZEPHIR_INIT_VAR(&param2);
 	} else {
 		zephir_get_strval(&param2, param2_param);
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CPY_WRT(&_0, &param1);
 	zephir_var_dump(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_CPY_WRT(&_1, &param2);
 	zephir_var_dump(&_1);
-	ZVAL_NULL(&_2);
+	ZEPHIR_INIT_VAR(&_2);
 	ZEPHIR_CPY_WRT(&_2, &param1);
 	zephir_var_export(&_2);
-	ZVAL_NULL(&_3);
+	ZEPHIR_INIT_VAR(&_3);
 	ZEPHIR_CPY_WRT(&_3, &param2);
 	zephir_var_export(&_3);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *param1_param = NULL, *param2_param = NULL, _0;
 	zval param1, param2;
 
@@ -225,6 +246,8 @@ PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(param2)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 1, &param1_param, &param2_param);
 	if (UNEXPECTED(Z_TYPE_P(param1_param) != IS_STRING && Z_TYPE_P(param1_param) != IS_NULL)) {
 		zephir_throw_exception_string(spl_ce_InvalidArgumentException, SL("Parameter 'param1' must be of the type string"));
@@ -233,17 +256,18 @@ PHP_METHOD(Stub_Vars, test88IssueParam2InitString)
 	if (EXPECTED(Z_TYPE_P(param1_param) == IS_STRING)) {
 		zephir_get_strval(&param1, param1_param);
 	} else {
-		ZVAL_NULL(&param1);
+		ZEPHIR_INIT_VAR(&param1);
 	}
 	if (!param2_param) {
-		ZVAL_NULL(&param2);
+		ZEPHIR_INIT_VAR(&param2);
 		ZVAL_STRING(&param2, "test string");
 	} else {
 		zephir_get_strval(&param2, param2_param);
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CPY_WRT(&_0, &param2);
 	zephir_var_export(&_0);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testVarDump2param)
@@ -281,6 +305,7 @@ PHP_METHOD(Stub_Vars, testVarDump3param)
 
 PHP_METHOD(Stub_Vars, testCountOptimizerVarDumpAndExport)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *testVar, testVar_sub, _0, _1;
 
 	ZVAL_UNDEF(&testVar_sub);
@@ -289,19 +314,23 @@ PHP_METHOD(Stub_Vars, testCountOptimizerVarDumpAndExport)
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(testVar)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &testVar);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, zephir_fast_count_int(testVar));
 	zephir_var_dump(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_LONG(&_1, zephir_fast_count_int(testVar));
 	zephir_var_export(&_1);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testArrayTypeVarDumpAndExport)
 {
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *testVar_param = NULL, _0, _1;
 	zval testVar;
 
@@ -312,19 +341,22 @@ PHP_METHOD(Stub_Vars, testArrayTypeVarDumpAndExport)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ARRAY(testVar)
 	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 0, 1, &testVar_param);
 	if (!testVar_param) {
-		ZVAL_NULL(&testVar);
+		ZEPHIR_INIT_VAR(&testVar);
 		array_init(&testVar);
 	} else {
 		zephir_get_arrval(&testVar, testVar_param);
 	}
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_CPY_WRT(&_0, &testVar);
 	zephir_var_dump(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_CPY_WRT(&_1, &testVar);
 	zephir_var_export(&_1);
+	ZEPHIR_MM_RESTORE();
 }
 
 /**
@@ -334,54 +366,69 @@ PHP_METHOD(Stub_Vars, testIntVarDump)
 {
 	zval _0, _1;
 	zend_long a = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_LONG(&_0, a);
 	zephir_var_dump(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_LONG(&_1, a);
 	zephir_var_export(&_1);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testDoubleVarDump)
 {
 	zval _0, _1;
 	double a = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = (double) (1);
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_DOUBLE(&_0, a);
 	zephir_var_dump(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_DOUBLE(&_1, a);
 	zephir_var_export(&_1);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testBoolVarDump)
 {
 	zval _0, _1;
 	zend_bool a = 0;
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 
 	ZVAL_UNDEF(&_0);
 	ZVAL_UNDEF(&_1);
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+
 	a = 1;
-	ZVAL_NULL(&_0);
+	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_BOOL(&_0, a);
 	zephir_var_dump(&_0);
-	ZVAL_NULL(&_1);
+	ZEPHIR_INIT_VAR(&_1);
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_BOOL(&_1, a);
 	zephir_var_export(&_1);
+	ZEPHIR_MM_RESTORE();
 }
 
 PHP_METHOD(Stub_Vars, testGetDefinedVars)

From df3dabcdd022fe80294e65d70d09a0de5411bbf3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 12:57:48 +0000
Subject: [PATCH 327/375] Adjust return types generation

---
 src/Stubs/Generator.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Stubs/Generator.php b/src/Stubs/Generator.php
index 9265fee031..f6f9b91c5d 100644
--- a/src/Stubs/Generator.php
+++ b/src/Stubs/Generator.php
@@ -300,11 +300,12 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
 
         $return = '';
         $returnTypes = [];
+        $methodReturnTypes = $method->getReturnTypes();
         if ($method->hasReturnTypes()) {
-            if (array_key_exists('variable', $method->getReturnTypes())) {
+            if (array_key_exists('variable', $methodReturnTypes) || array_key_exists('mixed', $methodReturnTypes)) {
                 $returnTypes[] = 'mixed';
             } else {
-                if (array_key_exists('object', $method->getReturnTypes())) {
+                if (array_key_exists('object', $methodReturnTypes)) {
                     $returnTypes[] = key($method->getReturnClassTypes());
                 }
 
@@ -326,7 +327,7 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
                     $returnTypes[] = 'string';
                 }
 
-                if (array_key_exists('array', $method->getReturnTypes())) {
+                if (array_key_exists('array', $methodReturnTypes)) {
                     $returnTypes[] = 'array';
                 }
 
@@ -335,6 +336,7 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
                 }
             }
 
+            $returnTypes = array_filter($returnTypes);
             $return = join('|', $returnTypes);
         } elseif ($method->isVoid()) {
             $return = 'void';

From f6477c4b6b117538c70fb36f003cad9ae3d20ec8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 13:03:05 +0000
Subject: [PATCH 328/375] Fix 'object' return type generation

---
 src/Stubs/Generator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Stubs/Generator.php b/src/Stubs/Generator.php
index f6f9b91c5d..984a70d619 100644
--- a/src/Stubs/Generator.php
+++ b/src/Stubs/Generator.php
@@ -306,7 +306,7 @@ protected function buildMethod(Method $method, bool $isInterface, string $indent
                 $returnTypes[] = 'mixed';
             } else {
                 if (array_key_exists('object', $methodReturnTypes)) {
-                    $returnTypes[] = key($method->getReturnClassTypes());
+                    $returnTypes[] = key($method->getReturnClassTypes()) ?: 'object';
                 }
 
                 if ($method->areReturnTypesIntCompatible()) {

From 5f28f8586d6b945543cc397ca1d1e6edbd184f97 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 14:52:11 +0000
Subject: [PATCH 329/375] Fix `GetClassLowerOptimizer` class

---
 .../FunctionCall/GetClassLowerOptimizer.php   | 22 +------------------
 .../FunctionCall/GetClassOptimizer.php        | 19 +++++++---------
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
index 3c3b6a368a..bee6bdf45d 100644
--- a/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassLowerOptimizer.php
@@ -13,30 +13,10 @@
 
 namespace Zephir\Optimizers\FunctionCall;
 
-use Zephir\Exception\CompilerException;
-
-use function count;
-
 /**
- * GetClassLowerOptimizer.
- *
  * Optimizes calls to 'get_class_lower' using internal function
  */
 class GetClassLowerOptimizer extends GetClassOptimizer
 {
-    /**
-     * @param array $expression
-     *
-     * @return void
-     */
-    protected function checkParameters(array $expression): void
-    {
-        $numberParameters = count($expression['parameters']);
-        if (1 != $numberParameters) {
-            throw new CompilerException(
-                "'get_class_lower' only accepts one parameter",
-                $expression
-            );
-        }
-    }
+    protected bool $lower = true;
 }
diff --git a/src/Optimizers/FunctionCall/GetClassOptimizer.php b/src/Optimizers/FunctionCall/GetClassOptimizer.php
index 55aa04be6c..6813368e90 100644
--- a/src/Optimizers/FunctionCall/GetClassOptimizer.php
+++ b/src/Optimizers/FunctionCall/GetClassOptimizer.php
@@ -16,26 +16,21 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 use function count;
 
 /**
- * GetClassOptimizer.
- *
  * Optimizes calls to 'get_class' using internal function
  */
 class GetClassOptimizer extends OptimizerAbstract
 {
+    protected bool $lower = false;
+
     /**
-     * @param array              $expression
-     * @param Call               $call
-     * @param CompilationContext $context
-     *
-     * @return bool|CompiledExpression|mixed
-     *
-     * @throws CompilerException
+     * @throws Exception
      */
     public function optimize(array $expression, Call $call, CompilationContext $context)
     {
@@ -45,7 +40,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
 
         $this->checkParameters($expression);
 
-        /*
+        /**
          * Process the expected symbol to be returned
          */
         $call->processExpectedReturn($context);
@@ -96,8 +91,10 @@ protected function getOutput(
         string $symbol,
         array $resolvedParams
     ): void {
+        $lower = $this->lower ? 1 : 0;
+
         $context->codePrinter->output(
-            'zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', 0);'
+            'zephir_get_class(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $lower . ');'
         );
     }
 }

From 1adf171956b1975c0182667516117c0db825f8d8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 15:05:21 +0000
Subject: [PATCH 330/375] Adjust black box tests

---
 tests/fixtures/stubs/issues/expected/Issue_1778.php | 2 +-
 tests/fixtures/stubs/issues/expected/Issue_1922.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/fixtures/stubs/issues/expected/Issue_1778.php b/tests/fixtures/stubs/issues/expected/Issue_1778.php
index 6ed24c84f9..8f6f2bde96 100644
--- a/tests/fixtures/stubs/issues/expected/Issue_1778.php
+++ b/tests/fixtures/stubs/issues/expected/Issue_1778.php
@@ -44,7 +44,7 @@ public function __construct(\Psr\Http\Message\RequestInterface $request, array $
      * @return mixed|null
      * @param string $key
      */
-    public function getVar(string $key)
+    public function getVar(string $key): mixed
     {
     }
 }
diff --git a/tests/fixtures/stubs/issues/expected/Issue_1922.php b/tests/fixtures/stubs/issues/expected/Issue_1922.php
index 1f7cb564ba..d81aee1799 100644
--- a/tests/fixtures/stubs/issues/expected/Issue_1922.php
+++ b/tests/fixtures/stubs/issues/expected/Issue_1922.php
@@ -10,7 +10,7 @@ class Issue_1922
      * @param string $key
      * @return mixed|null
      */
-    public function getVar(string $key)
+    public function getVar(string $key): mixed
     {
     }
 }

From 2a985200ec7dc25ab5265a47683983f81b377697 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 15:14:07 +0000
Subject: [PATCH 331/375] Adjust black box tests

---
 tests/fixtures/stubs/issues/expected/Issue_2026.php |  4 ++--
 tests/fixtures/stubs/issues/expected/Issue_2092.php |  2 +-
 tests/fixtures/stubs/issues/stubs/issue_2026.zep    | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/fixtures/stubs/issues/expected/Issue_2026.php b/tests/fixtures/stubs/issues/expected/Issue_2026.php
index e095174297..e3d2f3a48b 100644
--- a/tests/fixtures/stubs/issues/expected/Issue_2026.php
+++ b/tests/fixtures/stubs/issues/expected/Issue_2026.php
@@ -27,7 +27,7 @@ public function getClassCollection(): array
      *
      * @return array|bool|\StdClass[]
      */
-    public function getClassCollectionOrBool()
+    public function getClassCollectionOrBool(): array|bool
     {
     }
 
@@ -37,7 +37,7 @@ public function getClassCollectionOrBool()
      *
      * @return array|bool|\Stubs\Events\EventManager[]
      */
-    public function getInterfaceCollectionOrBool()
+    public function getInterfaceCollectionOrBool(): array|bool
     {
     }
 
diff --git a/tests/fixtures/stubs/issues/expected/Issue_2092.php b/tests/fixtures/stubs/issues/expected/Issue_2092.php
index 95aa9e1589..3f8c0cc74b 100644
--- a/tests/fixtures/stubs/issues/expected/Issue_2092.php
+++ b/tests/fixtures/stubs/issues/expected/Issue_2092.php
@@ -18,7 +18,7 @@ class Issue_2092
      *
      * @return ManagerInterface|null
      */
-    public function getInternalEventsManager(): ?ManagerInterface
+    public function getInternalEventsManager(): ManagerInterface|null
     {
     }
 }
diff --git a/tests/fixtures/stubs/issues/stubs/issue_2026.zep b/tests/fixtures/stubs/issues/stubs/issue_2026.zep
index 609ea592bb..82ec6b344d 100644
--- a/tests/fixtures/stubs/issues/stubs/issue_2026.zep
+++ b/tests/fixtures/stubs/issues/stubs/issue_2026.zep
@@ -9,9 +9,9 @@ class Issue_2026
 {
     /**
      * Expects:
-     *  return array|\StdClass[]
+     *  return array|\stdClass[]
      */
-    public function getClassCollection() -> <\StdClass[]>
+    public function getClassCollection() -> <\stdClass[]>
     {
         return [
             new \StdClass()
@@ -20,9 +20,9 @@ class Issue_2026
 
     /**
      * Expects:
-     *  return array|bool|\StdClass[]
+     *  return array|bool|\stdClass[]
      */
-    public function getClassCollectionOrBool() -> <\StdClass[]> | bool
+    public function getClassCollectionOrBool() -> <\stdClass[]> | bool
     {
         return [
             new \StdClass()
@@ -53,9 +53,9 @@ class Issue_2026
 
     /**
      * Expects:
-     *  return array|\Stubs\Events\EventManager[]|\StdClass[]
+     *  return array|\Stubs\Events\EventManager[]|\stdClass[]
      */
-    public function getMixedCollectionOrArray() -> <EventManager[]> | <\StdClass[]> | array
+    public function getMixedCollectionOrArray() -> <EventManager[]> | <\stdClass[]> | array
     {
         return [
             new EventManager()

From 36514f2d49831065fd031830c31417026ed899fc Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 15:17:46 +0000
Subject: [PATCH 332/375] Fix CS

---
 src/Class/Method/Method.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Class/Method/Method.php b/src/Class/Method/Method.php
index ec5c839175..29eb09245c 100644
--- a/src/Class/Method/Method.php
+++ b/src/Class/Method/Method.php
@@ -33,8 +33,8 @@
 use Zephir\Passes\StaticTypeInference;
 use Zephir\StatementsBlock;
 use Zephir\SymbolTable;
-
 use Zephir\Variable\Variable;
+
 use function array_diff;
 use function array_key_exists;
 use function array_keys;
@@ -1249,8 +1249,8 @@ public function compile(CompilationContext $compilationContext): void
             }
 
             // #define ZEPHIR_MM_GROW()
-            $codePrinter->preOutput("\t".'zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);');
-            $codePrinter->preOutput("\t".'ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);');
+            $codePrinter->preOutput("\t" . 'zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);');
+            $codePrinter->preOutput("\t" . 'ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);');
         }
 
         /**
@@ -1414,13 +1414,14 @@ public function compile(CompilationContext $compilationContext): void
              */
             $lastType = $this->statements->getLastStatementType();
 
-            if ('return' !== $lastType &&
+            if (
+                'return' !== $lastType &&
                 'throw' !== $lastType &&
                 !$this->hasChildReturnStatementType($statement)
             ) {
                 if ($symbolTable->getMustGrownStack()) {
                     $compilationContext->headersManager->add('kernel/memory');
-                    $codePrinter->output("\t".'ZEPHIR_MM_RESTORE();');
+                    $codePrinter->output("\t" . 'ZEPHIR_MM_RESTORE();');
                 }
 
                 /**

From c5ea2bb4cdd1904fe21c3146828290b4b5b001c5 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 15:19:56 +0000
Subject: [PATCH 333/375] Adjust black box tests

---
 tests/fixtures/stubs/issues/expected/Issue_2026.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fixtures/stubs/issues/expected/Issue_2026.php b/tests/fixtures/stubs/issues/expected/Issue_2026.php
index e3d2f3a48b..9125efa5e4 100644
--- a/tests/fixtures/stubs/issues/expected/Issue_2026.php
+++ b/tests/fixtures/stubs/issues/expected/Issue_2026.php
@@ -10,7 +10,6 @@
 class Issue_2026
 {
 
-
     /**
      * Expects:
      *  return array|\StdClass[]

From 429f71cd46402f612aecde9a4053fd5b9b7888ec Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 15:30:32 +0000
Subject: [PATCH 334/375] Adjust black box tests

---
 tests/fixtures/stubs/issues/expected/Issue_2026.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/fixtures/stubs/issues/expected/Issue_2026.php b/tests/fixtures/stubs/issues/expected/Issue_2026.php
index 9125efa5e4..5e8c127779 100644
--- a/tests/fixtures/stubs/issues/expected/Issue_2026.php
+++ b/tests/fixtures/stubs/issues/expected/Issue_2026.php
@@ -12,9 +12,9 @@ class Issue_2026
 
     /**
      * Expects:
-     *  return array|\StdClass[]
+     *  return array|\stdClass[]
      *
-     * @return array|\StdClass[]
+     * @return array|\stdClass[]
      */
     public function getClassCollection(): array
     {
@@ -22,9 +22,9 @@ public function getClassCollection(): array
 
     /**
      * Expects:
-     *  return array|bool|\StdClass[]
+     *  return array|bool|\stdClass[]
      *
-     * @return array|bool|\StdClass[]
+     * @return array|bool|\stdClass[]
      */
     public function getClassCollectionOrBool(): array|bool
     {
@@ -52,9 +52,9 @@ public function getInterfaceCollectionOrArray(): array
 
     /**
      * Expects:
-     *  return array|\Stubs\Events\EventManager[]|\StdClass[]
+     *  return array|\Stubs\Events\EventManager[]|\stdClass[]
      *
-     * @return array|\Stubs\Events\EventManager[]|\StdClass[]
+     * @return array|\Stubs\Events\EventManager[]|\stdClass[]
      */
     public function getMixedCollectionOrArray(): array
     {

From fcc472d622041c9aac791675ed7fe687e1109bd6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 15:31:21 +0000
Subject: [PATCH 335/375] Fix CS

---
 src/Variable/Variable.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Variable/Variable.php b/src/Variable/Variable.php
index ecdebbfec9..06eb122263 100644
--- a/src/Variable/Variable.php
+++ b/src/Variable/Variable.php
@@ -428,7 +428,7 @@ public function initComplexLiteralVariant(CompilationContext $compilationContext
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&' . $this->getName() . ');');
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&'.$this->getName().');');
+                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&' . $this->getName() . ');');
                 }
             }
 
@@ -493,7 +493,7 @@ public function initVariant(CompilationContext $compilationContext): void
                     $this->mustInitNull = true;
                     $compilationContext->codePrinter->output('ZEPHIR_INIT_NVAR(&' . $this->getName() . ');');
                 } else {
-                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&'.$this->getName().');');
+                    $compilationContext->codePrinter->output('ZEPHIR_INIT_VAR(&' . $this->getName() . ');');
                 }
             }
 
@@ -799,7 +799,7 @@ public function observeVariant(CompilationContext $compilationContext): void
                 $this->mustInitNull = true;
                 $compilationContext->codePrinter->output('ZEPHIR_OBS_NVAR(' . $symbol . ');');
             } else {
-                $compilationContext->codePrinter->output('zephir_memory_observe('.$symbol.');');
+                $compilationContext->codePrinter->output('zephir_memory_observe(' . $symbol . ');');
             }
 
             ++$this->variantInits;

From 254df48dda42de38bf1c3bbbac4f59a3b5728e5c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Dec 2023 15:37:37 +0000
Subject: [PATCH 336/375] Fix fixture

---
 tests/fixtures/stubs/issues/expected/Issue_2026.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/fixtures/stubs/issues/expected/Issue_2026.php b/tests/fixtures/stubs/issues/expected/Issue_2026.php
index 5e8c127779..295601152f 100644
--- a/tests/fixtures/stubs/issues/expected/Issue_2026.php
+++ b/tests/fixtures/stubs/issues/expected/Issue_2026.php
@@ -10,6 +10,7 @@
 class Issue_2026
 {
 
+
     /**
      * Expects:
      *  return array|\stdClass[]
@@ -26,7 +27,7 @@ public function getClassCollection(): array
      *
      * @return array|bool|\stdClass[]
      */
-    public function getClassCollectionOrBool(): array|bool
+    public function getClassCollectionOrBool(): bool|array
     {
     }
 
@@ -36,7 +37,7 @@ public function getClassCollectionOrBool(): array|bool
      *
      * @return array|bool|\Stubs\Events\EventManager[]
      */
-    public function getInterfaceCollectionOrBool(): array|bool
+    public function getInterfaceCollectionOrBool(): bool|array
     {
     }
 

From 336219c746e8889f44de91af52f3839f48834f3a Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 6 Jan 2024 20:22:35 +0000
Subject: [PATCH 337/375] Add types

---
 src/StatementsBlock.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/StatementsBlock.php b/src/StatementsBlock.php
index ab47e4296d..b91d357a3a 100644
--- a/src/StatementsBlock.php
+++ b/src/StatementsBlock.php
@@ -47,17 +47,13 @@
  */
 class StatementsBlock
 {
-    protected $debug = false;
-    /**
-     * @var array|null
-     */
-    protected $lastStatement;
-    protected $loop = false;
-
-    protected $mutateGatherer;
+    protected bool $loop = false;
+    protected bool $debug = false;
+    protected ?array $lastStatement = null;
+    protected ?MutateGathererPass $mutateGatherer = null;
     protected ?bool $unreachable = null;
 
-    public function __construct(protected $statements)
+    public function __construct(protected array $statements)
     {
         $debug = false;
         if (getenv('ZEPHIR_DEBUG')) {
@@ -125,7 +121,7 @@ public function compile(
         }
 
         foreach ($statements as $statement) {
-            /*
+            /**
              * TODO: Generate GDB hints
              */
             if ($this->debug) {

From 17ba043b53d976b10f889350880990892d74d419 Mon Sep 17 00:00:00 2001
From: Ayesh Karunaratne <ayesh@aye.sh>
Date: Mon, 8 Jan 2024 18:59:28 +0700
Subject: [PATCH 338/375] [PHP 8.4] Change `PHP_DEBUG` constant usage to
 `ZEND_DEBUG_BUILD`

In PHP 8.4, the type of `PHP_DEBUG` changes from `int` to `bool`.
See [PHP.Watch: PHP 8.4: `PHP_ZTS` and `PHP_DEBUG` constant value type changed from `int` to `bool`](https://php.watch/versions/8.4/PHP_ZTS-PHP_DEBUG-const-type-change).

This changes the constants to `ZEND_DEBUG_BUILD`, which contains the same value but as a `bool` across all PHP versions.
---
 CHANGELOG.md     | 1 +
 src/Compiler.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06ff17c4a4..782c367ccc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Added
 - Added support of PHP `8.3` [#2407](https://github.com/zephir-lang/zephir/issues/2407)
 - Added support of multiple return types in stubs
+- Changed `PHP_DEBUG` const usage to `ZEND_DEBUG_BUILD`
 
 ### Changed
 - Changed minimal PHP version to `8.0` [#2407](https://github.com/zephir-lang/zephir/issues/2407)
diff --git a/src/Compiler.php b/src/Compiler.php
index a60fa72b2e..4f912f8a66 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -98,7 +98,7 @@
 use const INFO_GENERAL;
 use const PHP_EOL;
 use const PHP_INT_SIZE;
-use const PHP_ZTS;
+use const ZEND_THREAD_SAFE;
 use const SORT_STRING;
 use const STDERR;
 
@@ -2043,7 +2043,7 @@ private function getWindowsReleaseDir(): string
 
     private function isZts(): bool
     {
-        if (defined('PHP_ZTS') && PHP_ZTS === 1) {
+        if (defined('ZEND_THREAD_SAFE') && ZEND_THREAD_SAFE === true) {
             return true;
         }
 

From 63c84ce2493fa6fe3b94f003417a550fa8bbcfa6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 7 Feb 2024 22:55:57 +0000
Subject: [PATCH 339/375] #2405 - Suppress callable deprecations

---
 kernel/fcall.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/fcall.c b/kernel/fcall.c
index cfcc025bed..8a84d0e9cc 100644
--- a/kernel/fcall.c
+++ b/kernel/fcall.c
@@ -371,7 +371,7 @@ int zephir_call_user_function(
 
 		char *is_callable_error = NULL;
 		zend_execute_data *frame = EG(current_execute_data);
-		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
+		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fcic, &is_callable_error)) {
 			if (is_callable_error) {
 				zend_error(E_WARNING, "%s", is_callable_error);
 				efree(is_callable_error);
@@ -591,7 +591,7 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 	}
 
 	zend_execute_data *frame = EG(current_execute_data);
-	if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
+	if (!zend_is_callable_at_frame(handler, NULL, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fci_cache, &is_callable_error)) {
 		if (is_callable_error) {
 			zend_error(E_WARNING, "%s", is_callable_error);
 			efree(is_callable_error);

From 707c1fc312e631d94b510c3ad016b98e9e28e88e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 7 Feb 2024 23:05:24 +0000
Subject: [PATCH 340/375] #2405 - Add condition to check PHP version

---
 kernel/fcall.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/kernel/fcall.c b/kernel/fcall.c
index 8a84d0e9cc..81cd9117b2 100644
--- a/kernel/fcall.c
+++ b/kernel/fcall.c
@@ -371,7 +371,11 @@ int zephir_call_user_function(
 
 		char *is_callable_error = NULL;
 		zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
 		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fcic, &is_callable_error)) {
+#else
+		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
+#endif
 			if (is_callable_error) {
 				zend_error(E_WARNING, "%s", is_callable_error);
 				efree(is_callable_error);
@@ -591,7 +595,12 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 	}
 
 	zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
 	if (!zend_is_callable_at_frame(handler, NULL, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fci_cache, &is_callable_error)) {
+#else
+	if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
+#endif
+	}
 		if (is_callable_error) {
 			zend_error(E_WARNING, "%s", is_callable_error);
 			efree(is_callable_error);

From 7543e179693cf3f608203557ab791fd9954183d8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Wed, 7 Feb 2024 23:09:09 +0000
Subject: [PATCH 341/375] #2405 - Fix syntax error

---
 kernel/fcall.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/fcall.c b/kernel/fcall.c
index 81cd9117b2..40b1f98f60 100644
--- a/kernel/fcall.c
+++ b/kernel/fcall.c
@@ -600,7 +600,6 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 #else
 	if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
 #endif
-	}
 		if (is_callable_error) {
 			zend_error(E_WARNING, "%s", is_callable_error);
 			efree(is_callable_error);

From a8f2ca121bfe2d22417db9aefe7dc680f168dcb3 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 24 Feb 2024 23:12:05 +0000
Subject: [PATCH 342/375] Update 'actions/checkout' version

---
 .github/workflows/release.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index eca84a4562..d3f466f32a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,8 +14,7 @@ jobs:
       BOX_VERSION: 4.2.0
 
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 5
 

From c93a109d99717e7dcc5d7a22f16212368637efd7 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Mar 2024 22:57:50 +0000
Subject: [PATCH 343/375] Update composer.lock

---
 composer.lock | 321 ++++++++++++++++++++++++++------------------------
 1 file changed, 167 insertions(+), 154 deletions(-)

diff --git a/composer.lock b/composer.lock
index 950d4095f3..d016270366 100644
--- a/composer.lock
+++ b/composer.lock
@@ -263,16 +263,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.32",
+            "version": "v5.4.36",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7"
+                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
-                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
+                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
                 "shasum": ""
             },
             "require": {
@@ -342,7 +342,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.32"
+                "source": "https://github.com/symfony/console/tree/v5.4.36"
             },
             "funding": [
                 {
@@ -358,7 +358,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-18T18:23:04+00:00"
+            "time": "2024-02-20T16:33:57+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -429,16 +429,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.26",
+            "version": "v5.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac"
+                "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac",
-                "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
+                "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
                 "shasum": ""
             },
             "require": {
@@ -494,7 +494,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35"
             },
             "funding": [
                 {
@@ -510,7 +510,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-06T06:34:20+00:00"
+            "time": "2024-01-23T13:51:25+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -593,16 +593,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                 "shasum": ""
             },
             "require": {
@@ -616,9 +616,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -655,7 +652,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -671,20 +668,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "875e90aeea2777b6f135677f618529449334a612"
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
                 "shasum": ""
             },
             "require": {
@@ -695,9 +692,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -736,7 +730,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -752,20 +746,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                 "shasum": ""
             },
             "require": {
@@ -776,9 +770,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -820,7 +811,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -836,20 +827,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                 "shasum": ""
             },
             "require": {
@@ -863,9 +854,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -903,7 +891,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -919,20 +907,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5"
+                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fe2f306d1d9d346a7fee353d0d5012e401e984b5",
-                "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
+                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
                 "shasum": ""
             },
             "require": {
@@ -940,9 +928,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -982,7 +967,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -998,20 +983,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                 "shasum": ""
             },
             "require": {
@@ -1019,9 +1004,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -1065,7 +1047,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -1081,7 +1063,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -1383,25 +1365,27 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.17.1",
+            "version": "v5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -1409,7 +1393,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -1433,26 +1417,27 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
             },
-            "time": "2023-08-13T19:53:39+00:00"
+            "time": "2024-03-05T20:51:40+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -1493,9 +1478,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -1550,23 +1541,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.29",
+            "version": "9.2.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -1616,7 +1607,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
             },
             "funding": [
                 {
@@ -1624,7 +1615,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-19T04:57:46+00:00"
+            "time": "2024-03-02T06:37:42+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1971,16 +1962,16 @@
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
@@ -2015,7 +2006,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -2023,7 +2014,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
             "name": "sebastian/code-unit",
@@ -2212,20 +2203,20 @@
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -2257,7 +2248,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -2265,20 +2256,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
@@ -2323,7 +2314,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -2331,7 +2322,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -2398,16 +2389,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
                 "shasum": ""
             },
             "require": {
@@ -2463,7 +2454,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
             },
             "funding": [
                 {
@@ -2471,20 +2462,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2024-03-02T06:33:00+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.6",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
                 "shasum": ""
             },
             "require": {
@@ -2527,7 +2518,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
             },
             "funding": [
                 {
@@ -2535,24 +2526,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-02T09:26:13+00:00"
+            "time": "2024-03-02T06:35:11+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -2584,7 +2575,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -2592,7 +2583,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -2771,16 +2762,16 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
                 "shasum": ""
             },
             "require": {
@@ -2792,7 +2783,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -2813,8 +2804,7 @@
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
             },
             "funding": [
                 {
@@ -2822,7 +2812,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
             "name": "sebastian/type",
@@ -2935,16 +2925,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
                 "shasum": ""
             },
             "require": {
@@ -2954,11 +2944,11 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
             "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
+                "bin/phpcbf",
+                "bin/phpcs"
             ],
             "type": "library",
             "extra": {
@@ -2973,35 +2963,58 @@
             "authors": [
                 {
                     "name": "Greg Sherwood",
-                    "role": "lead"
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
                 "standards",
                 "static analysis"
             ],
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
-            "time": "2023-02-22T23:07:41+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-02-16T15:06:51+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -3030,7 +3043,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -3038,7 +3051,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-20T00:12:19+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         }
     ],
     "aliases": [],

From a74f902be274f69b54adac54136e7219cdc1db48 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Mar 2024 23:26:58 +0000
Subject: [PATCH 344/375] Merge properties into constructor

---
 .../Operators/UnaryOperatorBuilder.php        | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/Builder/Operators/UnaryOperatorBuilder.php b/src/Builder/Operators/UnaryOperatorBuilder.php
index 48247e27af..b156648a61 100644
--- a/src/Builder/Operators/UnaryOperatorBuilder.php
+++ b/src/Builder/Operators/UnaryOperatorBuilder.php
@@ -21,24 +21,16 @@
  */
 class UnaryOperatorBuilder extends AbstractOperatorBuilder
 {
-    /**
-     * Left Expression
-     *
-     * @var mixed
-     */
-    protected $leftExpression;
-    /**
-     * Operator name
-     */
-    protected string $operator;
-
-    public function __construct(string $operator, $leftExpression, string $file = null, int $line = 0, int $char = 0)
-    {
-        $this->operator       = $operator;
-        $this->leftExpression = $leftExpression;
-        $this->file           = $file;
-        $this->line           = $line;
-        $this->char           = $char;
+    public function __construct(
+        protected string $operator,
+        protected $leftExpression,
+        string $file = null,
+        int $line = 0, int
+        $char = 0,
+    ) {
+        $this->file = $file;
+        $this->line = $line;
+        $this->char = $char;
     }
 
     public function get(): array

From 072d85c407da9595ec9e056e8959e37b36fdaa25 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 23 Mar 2024 23:58:20 +0000
Subject: [PATCH 345/375] Replace static 'interface' string with
 `TYPE_INTERFACE` constant

---
 src/Class/Definition/Definition.php | 2 +-
 src/Compiler.php                    | 2 +-
 src/CompilerFile.php                | 6 +++---
 src/Stubs/Generator.php             | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Class/Definition/Definition.php b/src/Class/Definition/Definition.php
index 6ff79d7114..6865fbb3d9 100644
--- a/src/Class/Definition/Definition.php
+++ b/src/Class/Definition/Definition.php
@@ -1237,7 +1237,7 @@ public function isFinal(): bool
      */
     public function isInterface(): bool
     {
-        return 'interface' === $this->type;
+        return Definition::TYPE_INTERFACE === $this->type;
     }
 
     /**
diff --git a/src/Compiler.php b/src/Compiler.php
index a60fa72b2e..b4cfe2a206 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1488,7 +1488,7 @@ public function isExtensionGlobal(string $name): bool
     public function isInterface(string $className): bool
     {
         foreach ($this->definitions as $key => $value) {
-            if (!strcasecmp($key, $className) && 'interface' === $value->getType()) {
+            if (!strcasecmp($key, $className) && Definition::TYPE_INTERFACE === $value->getType()) {
                 return true;
             }
         }
diff --git a/src/CompilerFile.php b/src/CompilerFile.php
index 0c730fcb44..5f7a48ee7f 100644
--- a/src/CompilerFile.php
+++ b/src/CompilerFile.php
@@ -332,7 +332,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager): voi
         foreach ($this->ir as $topStatement) {
             switch ($topStatement['type']) {
                 case 'class':
-                case 'interface':
+                case Definition::TYPE_INTERFACE:
                     if ($interface || $class) {
                         throw new CompilerException('More than one class defined in the same file', $topStatement);
                     }
@@ -652,7 +652,7 @@ public function preCompile(Compiler $compiler): void
                     $lastComment        = null;
                     break;
 
-                case 'interface':
+                case Definition::TYPE_INTERFACE:
                     if ($class || $interface) {
                         throw new CompilerException(
                             'More than one class/interface defined in the same file',
@@ -855,7 +855,7 @@ public function preCompileInterface($namespace, $topStatement, $docblock): void
             $classDefinition->setImplementsInterfaces($topStatement['extends']);
         }
 
-        $classDefinition->setType('interface');
+        $classDefinition->setType(Definition::TYPE_INTERFACE);
 
         if (is_array($docblock)) {
             $classDefinition->setDocBlock($docblock['value']);
diff --git a/src/Stubs/Generator.php b/src/Stubs/Generator.php
index 984a70d619..7ac972c232 100644
--- a/src/Stubs/Generator.php
+++ b/src/Stubs/Generator.php
@@ -183,7 +183,7 @@ protected function buildClass(Definition $class, string $indent, string $banner)
                 }
             }
 
-            $keyword = 'interface' == $class->getType() ? ' extends ' : ' implements ';
+            $keyword = Definition::TYPE_INTERFACE === $class->getType() ? ' extends ' : ' implements ';
             $source  .= $keyword . implode(', ', $interfaces);
         }
 
@@ -220,7 +220,7 @@ protected function buildClass(Definition $class, string $indent, string $banner)
                 continue;
             }
 
-            $methods[] = $this->buildMethod($method, 'interface' === $class->getType(), $indent) . PHP_EOL;
+            $methods[] = $this->buildMethod($method, Definition::TYPE_INTERFACE === $class->getType(), $indent) . PHP_EOL;
         }
 
         $source .= implode(PHP_EOL, $methods);

From 9f72477f2a5eab9e8b639ad1c4a7c4f6266afc19 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 5 Apr 2024 15:04:29 -0500
Subject: [PATCH 346/375] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 377f967784..d31ca75cad 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Zephir licensed under the MIT License. See the [LICENSE](./LICENSE) file for mor
 [docs]:             https://docs.zephir-lang.com
 [zephir]:           https://github.com/zephir-lang/zephir
 [facebook]:         https://www.facebook.com/groups/zephir.language
-[discord]:          https://phalcon.link/discord
+[discord]:          https://phalcon.io/discord
 [discussions]:      https://github.com/zephir-lang/zephir/discussions
 [zephir logo]:      https://assets.phalconphp.com/zephir/zephir_logo-105x36.svg
 [web site]:         https://zephir-lang.com

From c68f9cde9734a5cef7586a27f788acf2e8a910b0 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Fri, 5 Apr 2024 15:05:50 -0500
Subject: [PATCH 347/375] Update CODE_OF_CONDUCT.md

---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 3727d09f87..2b121feee2 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -19,7 +19,7 @@ disagree.
 ## Conflict
 
 If ever conflict arises, please bring it to the attention of the maintainers 
-privately. You can always find us on our [Discord](https://phalcon.link/discord) 
+privately. You can always find us on our [Discord](https://phalcon.io/discord) 
 server or you can send us an email at team@phalcon.io 
 
 The core team maintains the final decision on any conflict that may arise.

From 9ea99e88468748cb82492c2cf6ff97d9cb12ca8e Mon Sep 17 00:00:00 2001
From: Chris Lloyd <chrislloyd403@gmail.com>
Date: Sat, 11 May 2024 18:40:34 +0100
Subject: [PATCH 348/375] Get the class using its name, not just its namespace
 name

---
 src/Class/Entry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index b5cf44b89e..5e055cdf8a 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -108,7 +108,7 @@ public function get(): string
                 );
             }
 
-            $classNamespace = explode(self::NAMESPACE_SEPARATOR, $reflection->getNamespaceName());
+            $classNamespace = explode(self::NAMESPACE_SEPARATOR, $reflection->getName());
         } else {
             $className      = $this->classname;
             $classNamespace = explode(self::NAMESPACE_SEPARATOR, $className);

From a070984bba852d7968f4df2fe4164685b1ebaef8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 17:34:05 +0100
Subject: [PATCH 349/375] Update 'actions/checkout' version

---
 .github/workflows/main.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5e1fa33c89..d3ca286ed9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,8 +26,7 @@ jobs:
     name: Static Code Analysis
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -87,7 +86,7 @@ jobs:
           #- { php: '8.2', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 5
 
@@ -208,8 +207,7 @@ jobs:
       - "build-and-test"
 
     steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v3"
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2
 

From 9126026bda83f9cb294fc1a630237a2010d22a1c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 17:35:44 +0100
Subject: [PATCH 350/375] Remove redundant 'version'

---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 4a5ce2fe56..bd2b5a34d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,5 @@
 # For local development only.
 
-version: '3'
-
 services:
   zephir-8.0:
     container_name: zephir-8.0

From 404489b597a8bba443b58c05ddb17018f9872da8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 17:36:29 +0100
Subject: [PATCH 351/375] Move type to new line

---
 src/Builder/Operators/UnaryOperatorBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Builder/Operators/UnaryOperatorBuilder.php b/src/Builder/Operators/UnaryOperatorBuilder.php
index b156648a61..f0844101a9 100644
--- a/src/Builder/Operators/UnaryOperatorBuilder.php
+++ b/src/Builder/Operators/UnaryOperatorBuilder.php
@@ -25,8 +25,8 @@ public function __construct(
         protected string $operator,
         protected $leftExpression,
         string $file = null,
-        int $line = 0, int
-        $char = 0,
+        int $line = 0,
+        int $char = 0,
     ) {
         $this->file = $file;
         $this->line = $line;

From 9c1534bea6511edd98794e92a5d33e51887a191c Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 18:11:01 +0100
Subject: [PATCH 352/375] Change tag of 'shivammathur/setup-php' action

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d3ca286ed9..86283cfcb6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
           fetch-depth: 1
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@a36e1e52ff4a1c9e9c9be31551ee4712a6cb6bd0
+        uses: shivammathur/setup-php@v2
         env:
           PHP_CS_FIXER_VERSION: 3.37.0
         with:

From 457c16a19f591ccbffbfc6d0ca1763d37fa8a720 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 18:22:53 +0100
Subject: [PATCH 353/375] Remove 'ext-json' from requirements

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 54516e2823..2f4548bfe7 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,6 @@
         "php": ">=8.0",
         "ext-ctype": "*",
         "ext-hash": "*",
-        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pcre": "*",
         "ext-xml": "*",

From 611c088d521365b058dfba9f6761d73558416d01 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 18:23:08 +0100
Subject: [PATCH 354/375] Update composer.lock

---
 composer.lock | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/composer.lock b/composer.lock
index d016270366..70824a14e3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "monolog/monolog",
-            "version": "2.9.2",
+            "version": "2.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
+                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215",
+                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215",
                 "shasum": ""
             },
             "require": {
@@ -38,8 +38,8 @@
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
                 "phpspec/prophecy": "^1.15",
-                "phpstan/phpstan": "^0.12.91",
-                "phpunit/phpunit": "^8.5.14",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.5.38 || ^9.6.19",
                 "predis/predis": "^1.1 || ^2.0",
                 "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": "^7",
@@ -94,7 +94,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
+                "source": "https://github.com/Seldaek/monolog/tree/2.9.3"
             },
             "funding": [
                 {
@@ -106,7 +106,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:25:26+00:00"
+            "time": "2024-04-12T20:52:51+00:00"
         },
         {
             "name": "psr/container",
@@ -263,16 +263,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.36",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e"
+                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
-                "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/f3e591c48688a0cfa1a3296205926c05e84b22b1",
+                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1",
                 "shasum": ""
             },
             "require": {
@@ -342,7 +342,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.36"
+                "source": "https://github.com/symfony/console/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -358,7 +358,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-20T16:33:57+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -429,16 +429,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.35",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38"
+                "reference": "d40fae9fd85c762b6ba378152fdd1157a85d7e4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
-                "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d40fae9fd85c762b6ba378152fdd1157a85d7e4f",
+                "reference": "d40fae9fd85c762b6ba378152fdd1157a85d7e4f",
                 "shasum": ""
             },
             "require": {
@@ -494,7 +494,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -510,7 +510,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -2925,16 +2925,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.9.0",
+            "version": "3.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
-                "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
                 "shasum": ""
             },
             "require": {
@@ -3001,7 +3001,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-02-16T15:06:51+00:00"
+            "time": "2024-05-22T21:24:41+00:00"
         },
         {
             "name": "theseer/tokenizer",

From 3580126998bd2c279f31c5bbd4e0558a6bdb1ed5 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 22:25:38 +0100
Subject: [PATCH 355/375] Simplify composer install step

---
 .github/workflows/main.yml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 86283cfcb6..55694158d3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,22 +113,8 @@ jobs:
           phpts: ${{ matrix.ts }}
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-#      - name: Get composer cache directory
-#        id: composer-cache
-#        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-#      - name: Set Up Composer Cache
-#        uses: actions/cache@v3
-#        with:
-#          path: ${{ steps.composer-cache.outputs.dir }}
-#          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-#          restore-keys: ${{ runner.os }}-composer-
-
       - name: Install Project Dependencies
-        run: |
-          echo "::group::Install composer dependencies"
-          composer install --prefer-dist --no-interaction --no-ansi --no-progress
-          echo "::endgroup::"
+        run: composer install --prefer-dist --no-interaction --no-ansi --no-progress
 
       - name: Fast Commands Test
         run: php zephir --help

From 20a6ee2dd7dc03a15202309eed719a0d4c3a2b2e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 22:44:23 +0100
Subject: [PATCH 356/375] Remove unused parameter `calleeDefinition`

---
 src/Call.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Call.php b/src/Call.php
index 9919fbdb18..8e97d584d2 100644
--- a/src/Call.php
+++ b/src/Call.php
@@ -373,20 +373,12 @@ public function getResolvedDynamicTypes(): array
      * Resolve parameters getting aware that the target function/method could retain or change
      * the parameters.
      *
-     * @param array              $parameters
-     * @param CompilationContext $compilationContext
-     * @param array              $expression
-     * @param null               $calleeDefinition
-     *
-     * @return array
-     *
      * @throws Exception
      */
     public function getResolvedParams(
         array $parameters,
         CompilationContext $compilationContext,
         array $expression,
-        $calleeDefinition = null
     ): array {
         $codePrinter = $compilationContext->codePrinter;
         $exprParams  = $this->getResolvedParamsAsExpr($parameters, $compilationContext, $expression);

From 99ccc1f641b5932318a8ee8a8bd3bbaa89203b95 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 22:48:41 +0100
Subject: [PATCH 357/375] Add return type

---
 src/Operators/Arithmetical/DivOperator.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Operators/Arithmetical/DivOperator.php b/src/Operators/Arithmetical/DivOperator.php
index 1b6a408c85..e88824dd9c 100644
--- a/src/Operators/Arithmetical/DivOperator.php
+++ b/src/Operators/Arithmetical/DivOperator.php
@@ -13,8 +13,10 @@
 
 namespace Zephir\Operators\Arithmetical;
 
+use ReflectionException;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Exception;
 use Zephir\Exception\CompilerException;
 
 /**
@@ -29,10 +31,10 @@ class DivOperator extends ArithmeticalBaseOperator
     /**
      * Compiles the arithmetical division operation.
      *
-     * @param array              $expression
-     * @param CompilationContext $compilationContext
+     * @throws ReflectionException
+     * @throws Exception
      */
-    public function compile($expression, CompilationContext $compilationContext)
+    public function compile($expression, CompilationContext $compilationContext): CompiledExpression|bool
     {
         [$left, $right] = $this->preCompileChecks($expression, $compilationContext);
 

From 9b222914c16db01b5a6229b6915bd1e053ca7f1b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 22:53:39 +0100
Subject: [PATCH 358/375] Simplify condition

---
 src/Optimizers/EvalExpression.php | 61 ++++++++++++++-----------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/Optimizers/EvalExpression.php b/src/Optimizers/EvalExpression.php
index 329939e679..2d8a49764f 100644
--- a/src/Optimizers/EvalExpression.php
+++ b/src/Optimizers/EvalExpression.php
@@ -159,46 +159,41 @@ public function optimize($exprRaw, CompilationContext $compilationContext)
                     $exprRaw
                 );
                 $possibleValue = $variableRight->getPossibleValue();
-                if (is_object($possibleValue)) {
+                if ($possibleValue instanceof LiteralCompiledExpression) {
                     $possibleValueBranch = $variableRight->getPossibleValueBranch();
                     if ($possibleValueBranch instanceof Branch) {
                         /**
                          * Check if the possible value was assigned in the root branch
                          */
                         if (Branch::TYPE_ROOT == $possibleValueBranch->getType()) {
-                            if ($possibleValue instanceof LiteralCompiledExpression) {
-                                switch ($possibleValue->getType()) {
-                                    case 'null':
+                            switch ($possibleValue->getType()) {
+                                case 'null':
+                                    $this->unreachable = true;
+                                    break;
+
+                                case 'bool':
+                                    if ('0' == $possibleValue->getBooleanCode()) {
+                                        $this->unreachable = true;
+                                    } else {
+                                        $this->unreachableElse = true;
+                                    }
+                                    break;
+
+                                case 'int':
+                                    if (!(int)$possibleValue->getCode()) {
+                                        $this->unreachable = true;
+                                    } else {
+                                        $this->unreachableElse = true;
+                                    }
+                                    break;
+
+                                case 'double':
+                                    if (!(float)$possibleValue->getCode()) {
                                         $this->unreachable = true;
-                                        break;
-
-                                    case 'bool':
-                                        if ('0' == $possibleValue->getBooleanCode()) {
-                                            $this->unreachable = true;
-                                        } else {
-                                            $this->unreachableElse = true;
-                                        }
-                                        break;
-
-                                    case 'int':
-                                        if (!(int)$possibleValue->getCode()) {
-                                            $this->unreachable = true;
-                                        } else {
-                                            $this->unreachableElse = true;
-                                        }
-                                        break;
-
-                                    case 'double':
-                                        if (!(float)$possibleValue->getCode()) {
-                                            $this->unreachable = true;
-                                        } else {
-                                            $this->unreachableElse = true;
-                                        }
-                                        break;
-
-                                    default:
-                                        // echo $possibleValue->getType();
-                                }
+                                    } else {
+                                        $this->unreachableElse = true;
+                                    }
+                                    break;
                             }
                         }
                     }

From f017358f14a6df1c8257fb139b262c3a089f11dc Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sat, 1 Jun 2024 22:55:41 +0100
Subject: [PATCH 359/375] Remove redundant comments

---
 src/AliasManager.php | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/AliasManager.php b/src/AliasManager.php
index 99b8e81d20..53bf1eb8cf 100644
--- a/src/AliasManager.php
+++ b/src/AliasManager.php
@@ -29,8 +29,6 @@ final class AliasManager
 
     /**
      * Adds a renaming in a "use" to the alias manager.
-     *
-     * @param array $useStatement
      */
     public function add(array $useStatement): void
     {
@@ -43,10 +41,6 @@ public function add(array $useStatement): void
 
     /**
      * Returns the class name according to an existing alias.
-     *
-     * @param string $alias
-     *
-     * @return string
      */
     public function getAlias(string $alias): string
     {
@@ -57,8 +51,6 @@ public function getAlias(string $alias): string
      * Returns alias by fully qualified class name.
      *
      * @param string $className - fully qualified class name
-     *
-     * @return string
      */
     public function getAliasForClassName(string $className): string
     {
@@ -73,8 +65,6 @@ public function getAliasForClassName(string $className): string
 
     /**
      * Returns key-value pair of aliases.
-     *
-     * @return array
      */
     public function getAliases(): array
     {
@@ -83,10 +73,6 @@ public function getAliases(): array
 
     /**
      * Checks if a class name is an existing alias.
-     *
-     * @param string $alias
-     *
-     * @return bool
      */
     public function isAlias(string $alias): bool
     {
@@ -97,8 +83,6 @@ public function isAlias(string $alias): bool
      * Check if class name has explicit alias in `use` declaration.
      *
      * @param string $className - fully qualified class name
-     *
-     * @return bool
      */
     public function isAliasPresentFor(string $className): bool
     {
@@ -114,10 +98,6 @@ public function isAliasPresentFor(string $className): bool
      * Check if class name use an aliasing in use statement.
      *
      * ex: use Events\ManagerInterface as EventsManagerInterface;
-     *
-     * @param string $alias
-     *
-     * @return bool
      */
     public function isUseStatementAliased(string $alias): bool
     {
@@ -132,8 +112,6 @@ public function isUseStatementAliased(string $alias): bool
      * Extract implicit alias from use statement.
      *
      * @param string $className - FQCN or simple class name from use statement
-     *
-     * @return string
      */
     private function implicitAlias(string $className): string
     {

From bcaf4b805d44eee01685b82571b3e13648a147b9 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 2 Jun 2024 15:23:57 +0100
Subject: [PATCH 360/375] Change version of 'shivammathur/setup-php' to
 'develop'

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d3f466f32a..2c50576426 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 5
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@develop
         with:
           php-version: '8.2'
           extensions: intl, zip, zlib

From 9feda24605ca0765a0d2b4b62fa8dfccda2223e6 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 2 Jun 2024 17:57:06 +0100
Subject: [PATCH 361/375] Remove redundant comments

---
 src/Documentation/Docblock.php      | 33 ++++-------------------------
 src/Documentation/FileInterface.php |  9 --------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/Documentation/Docblock.php b/src/Documentation/Docblock.php
index ccb6df4f22..4210cc201a 100644
--- a/src/Documentation/Docblock.php
+++ b/src/Documentation/Docblock.php
@@ -27,34 +27,21 @@ class Docblock
      * @var Annotation[]
      */
     protected array $annotations = [];
-    /**
-     * @var string
-     */
+
     protected string $description;
-    /**
-     * @var string
-     */
+
     protected string $summary;
 
-    /**
-     * @return string
-     */
     public function __toString()
     {
         return $this->generate();
     }
 
-    /**
-     * @param Annotation $annotation
-     */
     public function addAnnotation(Annotation $annotation): void
     {
         $this->annotations[] = $annotation;
     }
 
-    /**
-     * @return string
-     */
     public function generate(): string
     {
         $docBlock         = '**';
@@ -112,17 +99,11 @@ public function getAnnotationsByType(string $type): array
         return $annotation;
     }
 
-    /**
-     * @return string
-     */
     public function getDescription(): string
     {
         return $this->description;
     }
 
-    /**
-     * @return string
-     */
     public function getSummary(): string
     {
         return $this->summary;
@@ -131,22 +112,16 @@ public function getSummary(): string
     /**
      * @param Annotation[] $annotations
      */
-    public function setAnnotations(array $annotations)
+    public function setAnnotations(array $annotations): void
     {
         $this->annotations = $annotations;
     }
 
-    /**
-     * @param string $description
-     */
-    public function setDescription(string $description)
+    public function setDescription(string $description): void
     {
         $this->description = $description;
     }
 
-    /**
-     * @param string $summary
-     */
     public function setSummary(string $summary): void
     {
         $this->summary = $summary;
diff --git a/src/Documentation/FileInterface.php b/src/Documentation/FileInterface.php
index 3e3e28cd09..74040c9df6 100644
--- a/src/Documentation/FileInterface.php
+++ b/src/Documentation/FileInterface.php
@@ -15,18 +15,9 @@
 
 interface FileInterface
 {
-    /**
-     * @return array
-     */
     public function getData(): array;
 
-    /**
-     * @return string
-     */
     public function getOutputFile(): string;
 
-    /**
-     * @return string
-     */
     public function getTemplateName(): string;
 }

From cb1359a65feebdaec6c731aae5301b20255cdfd8 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 2 Jun 2024 17:57:13 +0100
Subject: [PATCH 362/375] Revert "Change version of 'shivammathur/setup-php' to
 'develop'"

This reverts commit bcaf4b805d44eee01685b82571b3e13648a147b9.
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2c50576426..d3f466f32a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
           fetch-depth: 5
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@develop
+        uses: shivammathur/setup-php@v2
         with:
           php-version: '8.2'
           extensions: intl, zip, zlib

From 02d088e7d66b924d38b492a1edf9e3852142c691 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 2 Jun 2024 18:05:33 +0100
Subject: [PATCH 363/375] #2396 - Add test cases with default param value

---
 stub/oo/ooparams.zep                | 15 +++++++++++++++
 tests/Extension/Oo/OoParamsTest.php |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/stub/oo/ooparams.zep b/stub/oo/ooparams.zep
index 256f0d32a7..de253ca6ad 100644
--- a/stub/oo/ooparams.zep
+++ b/stub/oo/ooparams.zep
@@ -126,4 +126,19 @@ class OoParams
 	{
 		return parameter;
 	}
+
+	public function getDefaultParamValue(int i = 0)
+	{
+	    return i;
+	}
+
+	public function getDefaultParamValue1(int i = 1)
+    {
+        return i;
+    }
+
+    public function getDefaultParamValueStr(string str = "default")
+    {
+        return str;
+    }
 }
diff --git a/tests/Extension/Oo/OoParamsTest.php b/tests/Extension/Oo/OoParamsTest.php
index 34c65a190a..757e3c54bc 100644
--- a/tests/Extension/Oo/OoParamsTest.php
+++ b/tests/Extension/Oo/OoParamsTest.php
@@ -43,6 +43,10 @@ public function testOoParams(): void
 
         $this->assertSame($this->test->setList([1, 2, 3, 4, 5]), [1, 2, 3, 4, 5]);
         $this->assertSame($this->test->setList([]), []);
+
+        $this->assertSame(0, $this->test->getDefaultParamValue());
+        $this->assertSame(1, $this->test->getDefaultParamValue1());
+        $this->assertSame('default', $this->test->getDefaultParamValueStr());
     }
 
     public function setObjectClassCast(): void

From f84784b223b7e54592377950a13a4604dcbfdd5e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 3 Jun 2024 22:29:55 +0100
Subject: [PATCH 364/375] Remove redundant comments

---
 src/StatementsBlock.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/StatementsBlock.php b/src/StatementsBlock.php
index b91d357a3a..0c46d5137e 100644
--- a/src/StatementsBlock.php
+++ b/src/StatementsBlock.php
@@ -376,10 +376,6 @@ public function getLastStatementType()
 
     /**
      * Create/Returns a mutate gatherer pass for this block.
-     *
-     * @param bool $pass
-     *
-     * @return MutateGathererPass
      */
     public function getMutateGatherer(bool $pass = false): MutateGathererPass
     {
@@ -396,8 +392,6 @@ public function getMutateGatherer(bool $pass = false): MutateGathererPass
 
     /**
      * Returns the statements in the block.
-     *
-     * @return array
      */
     public function getStatements(): array
     {
@@ -406,8 +400,6 @@ public function getStatements(): array
 
     /**
      * Checks whether the block is empty or not.
-     *
-     * @return bool
      */
     public function isEmpty(): bool
     {
@@ -416,10 +408,6 @@ public function isEmpty(): bool
 
     /**
      * Sets whether the statements block belongs to a loop.
-     *
-     * @param bool $loop
-     *
-     * @return StatementsBlock
      */
     public function isLoop(bool $loop): static
     {
@@ -430,8 +418,6 @@ public function isLoop(bool $loop): static
 
     /**
      * Setter for statements.
-     *
-     * @param array $statements
      */
     public function setStatements(array $statements): void
     {

From 6a8030421f13036b58c52fff32deee9ce6a13857 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Mon, 3 Jun 2024 22:41:34 +0100
Subject: [PATCH 365/375] Revert class namespace extraction

---
 src/Class/Entry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index 5e055cdf8a..b5cf44b89e 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -108,7 +108,7 @@ public function get(): string
                 );
             }
 
-            $classNamespace = explode(self::NAMESPACE_SEPARATOR, $reflection->getName());
+            $classNamespace = explode(self::NAMESPACE_SEPARATOR, $reflection->getNamespaceName());
         } else {
             $className      = $this->classname;
             $classNamespace = explode(self::NAMESPACE_SEPARATOR, $className);

From 2e2f732c1d6ff76d904682c15cda6dc637674ef4 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 4 Jun 2024 09:50:24 +0100
Subject: [PATCH 366/375] Change to v2

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 55694158d3..1a0ecbfd0b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -91,7 +91,7 @@ jobs:
           fetch-depth: 5
 
       - name: Install PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@develop
+        uses: shivammathur/setup-php@v2
         with:
           php-version: '${{ matrix.php }}'
           extensions: mbstring, fileinfo, gmp, sqlite, pdo_sqlite, psr-${{ env.PSR_VERSION }}, zip, mysqli, zephir_parser-${{ env.ZEPHIR_PARSER_VERSION }}

From c72f6dafdecf178eceaf363a2766861597555e33 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 4 Jun 2024 09:51:34 +0100
Subject: [PATCH 367/375] Bump `ZEPHIR_PARSER_VERSION` to `1.6.1`

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1a0ecbfd0b..d9e329e16c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ on:
 
 env:
   RE2C_VERSION: 2.2
-  ZEPHIR_PARSER_VERSION: 1.6.0
+  ZEPHIR_PARSER_VERSION: 1.6.1
   PSR_VERSION: 1.2.0
   CACHE_DIR: .cache
 

From 1657b1d3a73ff9029c0df9b8cf3fe1c051e387aa Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Tue, 4 Jun 2024 10:50:03 +0100
Subject: [PATCH 368/375] Add condition to check thread safe (ts) in MacOS
 build

---
 .github/workflows/build-macos-ext/action.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos-ext/action.yml b/.github/workflows/build-macos-ext/action.yml
index f379ed0fe8..e603f7e95a 100644
--- a/.github/workflows/build-macos-ext/action.yml
+++ b/.github/workflows/build-macos-ext/action.yml
@@ -56,4 +56,8 @@ runs:
       shell: bash
       run: |
         cp ./ext/modules/stub.so "$(php -r 'echo ini_get("extension_dir");')/stub.so"
-        echo "extension=stub.so" > /usr/local/etc/php/${{ matrix.php }}/conf.d/99-stub.ini
+        if [ "${{ matrix.ts }}" = "ts" ]; then
+            echo "extension=stub.so" > /usr/local/etc/php/${{ matrix.php }}-zts/conf.d/99-stub.ini
+        else
+          echo "extension=stub.so" > /usr/local/etc/php/${{ matrix.php }}/conf.d/99-stub.ini
+        fi

From b0dd977ec987e945e67be73309d77fb2ab95e346 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 9 Jun 2024 21:01:55 +0100
Subject: [PATCH 369/375] Revert "Revert class namespace extraction"

This reverts commit 6a8030421f13036b58c52fff32deee9ce6a13857.
---
 src/Class/Entry.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Class/Entry.php b/src/Class/Entry.php
index b5cf44b89e..5e055cdf8a 100644
--- a/src/Class/Entry.php
+++ b/src/Class/Entry.php
@@ -108,7 +108,7 @@ public function get(): string
                 );
             }
 
-            $classNamespace = explode(self::NAMESPACE_SEPARATOR, $reflection->getNamespaceName());
+            $classNamespace = explode(self::NAMESPACE_SEPARATOR, $reflection->getName());
         } else {
             $className      = $this->classname;
             $classNamespace = explode(self::NAMESPACE_SEPARATOR, $className);

From 4a3e847aa030afb81ef1bbde2483afc033f3998c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 22:49:14 +0000
Subject: [PATCH 370/375] Bump actions/download-artifact from 3 to 4.1.7 in
 /.github/workflows

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d9e329e16c..72a910f99a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -218,7 +218,7 @@ jobs:
           mkdir -p reports
 
       - name: "Download coverage files"
-        uses: "actions/download-artifact@v3"
+        uses: "actions/download-artifact@v4.1.7"
         with:
           path: "reports"
 

From d0160080b4b81c85e0039ff748118ea3d82bc982 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Sep 2024 20:44:40 +0100
Subject: [PATCH 371/375] Update composer.lock

---
 composer.lock | 184 +++++++++++++++++++++++++-------------------------
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/composer.lock b/composer.lock
index 70824a14e3..44d636e648 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b2471ed2d66bc4e86d3c83993063d763",
+    "content-hash": "5aed9ef439169bbcb782874f47e36e51",
     "packages": [
         {
             "name": "monolog/monolog",
@@ -263,16 +263,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.39",
+            "version": "v5.4.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1"
+                "reference": "5b5a0aa66e3296e303e22490f90f521551835a83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/f3e591c48688a0cfa1a3296205926c05e84b22b1",
-                "reference": "f3e591c48688a0cfa1a3296205926c05e84b22b1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5b5a0aa66e3296e303e22490f90f521551835a83",
+                "reference": "5b5a0aa66e3296e303e22490f90f521551835a83",
                 "shasum": ""
             },
             "require": {
@@ -342,7 +342,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.39"
+                "source": "https://github.com/symfony/console/tree/v5.4.44"
             },
             "funding": [
                 {
@@ -358,7 +358,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T08:26:06+00:00"
+            "time": "2024-09-20T07:56:40+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -429,16 +429,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.39",
+            "version": "v5.4.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "d40fae9fd85c762b6ba378152fdd1157a85d7e4f"
+                "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d40fae9fd85c762b6ba378152fdd1157a85d7e4f",
-                "reference": "d40fae9fd85c762b6ba378152fdd1157a85d7e4f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a54e2a8a114065f31020d6a89ede83e34c3b27a4",
+                "reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4",
                 "shasum": ""
             },
             "require": {
@@ -494,7 +494,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.39"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.40"
             },
             "funding": [
                 {
@@ -510,7 +510,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T08:26:06+00:00"
+            "time": "2024-05-31T14:33:22+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -593,20 +593,20 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
-                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -652,7 +652,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -668,24 +668,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
-                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -730,7 +730,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -746,24 +746,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
-                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
@@ -811,7 +811,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -827,24 +827,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
-                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -891,7 +891,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -907,24 +907,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
+                "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
@@ -967,7 +967,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -983,24 +983,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
@@ -1047,7 +1047,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -1063,7 +1063,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-29T20:11:03+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -1306,16 +1306,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
                 "shasum": ""
             },
             "require": {
@@ -1323,11 +1323,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -1353,7 +1354,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
             },
             "funding": [
                 {
@@ -1361,20 +1362,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-06-12T14:39:25+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.0.2",
+            "version": "v5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13"
+                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13",
-                "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+                "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
                 "shasum": ""
             },
             "require": {
@@ -1385,7 +1386,7 @@
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -1417,9 +1418,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
             },
-            "time": "2024-03-05T20:51:40+00:00"
+            "time": "2024-09-29T13:56:26+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -1541,35 +1542,35 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.31",
+            "version": "9.2.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
-                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.18 || ^5.0",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
                 "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "sebastian/code-unit-reverse-lookup": "^2.0.3",
+                "sebastian/complexity": "^2.0.3",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/lines-of-code": "^1.0.4",
+                "sebastian/version": "^3.0.2",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.6"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -1578,7 +1579,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "9.2.x-dev"
                 }
             },
             "autoload": {
@@ -1607,7 +1608,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
             },
             "funding": [
                 {
@@ -1615,7 +1616,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-02T06:37:42+00:00"
+            "time": "2024-08-22T04:23:01+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2925,16 +2926,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.10.1",
+            "version": "3.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
+                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
-                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c",
+                "reference": "62d32998e820bddc40f99f8251958aed187a5c9c",
                 "shasum": ""
             },
             "require": {
@@ -3001,7 +3002,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-05-22T21:24:41+00:00"
+            "time": "2024-09-18T10:38:58+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -3063,7 +3064,6 @@
         "php": ">=8.0",
         "ext-ctype": "*",
         "ext-hash": "*",
-        "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pcre": "*",
         "ext-xml": "*",

From 416f3950555a27f1bf34467401db5b8f1524b09b Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Sep 2024 20:45:48 +0100
Subject: [PATCH 372/375] Temporary disable 'Qodana Scan' step

---
 .github/workflows/main.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 72a910f99a..920330e4db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -197,12 +197,12 @@ jobs:
         with:
           fetch-depth: 2
 
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2023.2
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
-        with:
-          args: --baseline,./qodana.sarif.json
+#      - name: 'Qodana Scan'
+#        uses: JetBrains/qodana-action@v2023.2
+#        env:
+#          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
+#        with:
+#          args: --baseline,./qodana.sarif.json
 
 #      - name: 'Qodana Scan'
 #        run: |

From 19a861663fa412ddb609f9855ea55f6a2e6ad7c9 Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Sep 2024 20:50:58 +0100
Subject: [PATCH 373/375] Sync ext/ directory

---
 ext/kernel/fcall.c                          |  8 +++
 ext/stub/builtin/intmethods.zep.c           | 34 ++++--------
 ext/stub/builtin/stringmethods.zep.c        | 24 ++++-----
 ext/stub/closures.zep.c                     |  2 +-
 ext/stub/exceptions.zep.c                   | 12 ++---
 ext/stub/factorial.zep.c                    |  2 +-
 ext/stub/fcall.zep.c                        | 28 +++++-----
 ext/stub/fibonnaci.zep.c                    |  8 +--
 ext/stub/flow.zep.c                         |  8 +--
 ext/stub/flow/switchflow.zep.c              |  2 +-
 ext/stub/functions.zep.c                    |  4 +-
 ext/stub/globals/serverrequestfactory.zep.c | 10 ++--
 ext/stub/instance.zep.c                     |  2 +-
 ext/stub/invoke.zep.c                       |  2 +-
 ext/stub/issue2165/issue.zep.c              | 48 ++++++++---------
 ext/stub/issue663.zep.c                     |  4 +-
 ext/stub/mcall.zep.c                        | 24 ++++-----
 ext/stub/mcallchained.zep.c                 |  2 +-
 ext/stub/nativearray.zep.c                  |  4 +-
 ext/stub/oo.zep.c                           | 14 ++---
 ext/stub/oo/deprecatedmethods.zep.c         |  2 +-
 ext/stub/oo/oodestruct.zep.c                | 12 ++---
 ext/stub/oo/ooparams.zep.c                  | 57 +++++++++++++++++++++
 ext/stub/oo/ooparams.zep.h                  | 18 +++++++
 ext/stub/oo/scopes/privatescopetester.zep.c |  2 +-
 ext/stub/openssl.zep.c                      |  6 +--
 ext/stub/optimizers/acos.zep.c              | 55 +++++---------------
 ext/stub/optimizers/asin.zep.c              | 55 +++++---------------
 ext/stub/optimizers/strreplace.zep.c        |  2 +-
 ext/stub/properties/getobjectvars.zep.c     |  2 +-
 ext/stub/properties/propertyarray.zep.c     |  6 +--
 ext/stub/quantum.zep.c                      |  6 +--
 ext/stub/range.zep.c                        |  4 +-
 ext/stub/reflection.zep.c                   |  4 +-
 ext/stub/regexdna.zep.c                     |  4 +-
 ext/stub/requires.zep.c                     |  2 +-
 ext/stub/requires/external3.zep.c           |  4 +-
 ext/stub/resourcetest.zep.c                 |  2 +-
 ext/stub/router.zep.c                       |  6 +--
 ext/stub/scall.zep.c                        |  8 +--
 ext/stub/scope.zep.c                        |  4 +-
 ext/stub/sort.zep.c                         |  6 +--
 ext/stub/spectralnorm.zep.c                 | 32 ++++++------
 ext/stub/spl.zep.c                          |  2 +-
 ext/stub/statements.zep.c                   | 16 +++---
 ext/stub/strings.zep.c                      |  8 +--
 ext/stub/trytest.zep.c                      | 28 +++++-----
 ext/stub/vars.zep.c                         |  4 +-
 48 files changed, 306 insertions(+), 293 deletions(-)

diff --git a/ext/kernel/fcall.c b/ext/kernel/fcall.c
index cfcc025bed..40b1f98f60 100644
--- a/ext/kernel/fcall.c
+++ b/ext/kernel/fcall.c
@@ -371,7 +371,11 @@ int zephir_call_user_function(
 
 		char *is_callable_error = NULL;
 		zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fcic, &is_callable_error)) {
+#else
 		if (obj_ce || !zend_is_callable_at_frame(&callable, fci.object, frame, 0, &fcic, &is_callable_error)) {
+#endif
 			if (is_callable_error) {
 				zend_error(E_WARNING, "%s", is_callable_error);
 				efree(is_callable_error);
@@ -591,7 +595,11 @@ int zephir_call_user_func_array_noex(zval *return_value, zval *handler, zval *pa
 	}
 
 	zend_execute_data *frame = EG(current_execute_data);
+#if PHP_VERSION_ID >= 80200
+	if (!zend_is_callable_at_frame(handler, NULL, frame, IS_CALLABLE_SUPPRESS_DEPRECATIONS, &fci_cache, &is_callable_error)) {
+#else
 	if (!zend_is_callable_at_frame(handler, NULL, frame, 0, &fci_cache, &is_callable_error)) {
+#endif
 		if (is_callable_error) {
 			zend_error(E_WARNING, "%s", is_callable_error);
 			efree(is_callable_error);
diff --git a/ext/stub/builtin/intmethods.zep.c b/ext/stub/builtin/intmethods.zep.c
index 6b1948973e..c4ae1d8ea6 100644
--- a/ext/stub/builtin/intmethods.zep.c
+++ b/ext/stub/builtin/intmethods.zep.c
@@ -224,42 +224,30 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getTan)
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAsin)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *num_param = NULL, _0, _1;
-	zend_long num, ZEPHIR_LAST_CALL_STATUS;
+	zval *num_param = NULL, _0;
+	zend_long num;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-	zephir_fetch_params(1, 1, 0, &num_param);
+	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
-	ZEPHIR_CALL_FUNCTION(&_1, "asin", NULL, 14, &_0);
-	zephir_check_call_status();
-	RETURN_CCTOR(&_1);
+	RETURN_DOUBLE(asin(num));
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAcos)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zval *num_param = NULL, _0, _1;
-	zend_long num, ZEPHIR_LAST_CALL_STATUS;
+	zval *num_param = NULL, _0;
+	zend_long num;
 
 	ZVAL_UNDEF(&_0);
-	ZVAL_UNDEF(&_1);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(num)
 	ZEND_PARSE_PARAMETERS_END();
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-	zephir_fetch_params(1, 1, 0, &num_param);
+	zephir_fetch_params_without_memory_grow(1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
-	ZEPHIR_CALL_FUNCTION(&_1, "acos", NULL, 15, &_0);
-	zephir_check_call_status();
-	RETURN_CCTOR(&_1);
+	RETURN_DOUBLE(acos(num));
 }
 
 PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
@@ -277,7 +265,7 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getAtan)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &num_param);
 	ZVAL_LONG(&_0, num);
-	ZEPHIR_CALL_FUNCTION(&_1, "atan", NULL, 16, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "atan", NULL, 14, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
@@ -307,13 +295,13 @@ PHP_METHOD(Stub_BuiltIn_IntMethods, getLog)
 		}
 	if (base == -1) {
 		ZVAL_LONG(&_0$$3, num);
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "log", NULL, 17, &_0$$3);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "log", NULL, 15, &_0$$3);
 		zephir_check_call_status();
 		RETURN_CCTOR(&_1$$3);
 	}
 	ZVAL_LONG(&_2, num);
 	ZVAL_LONG(&_3, base);
-	ZEPHIR_CALL_FUNCTION(&_4, "log", NULL, 17, &_2, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "log", NULL, 15, &_2, &_3);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_4);
 }
diff --git a/ext/stub/builtin/stringmethods.zep.c b/ext/stub/builtin/stringmethods.zep.c
index 61b4a26800..f6877962bc 100644
--- a/ext/stub/builtin/stringmethods.zep.c
+++ b/ext/stub/builtin/stringmethods.zep.c
@@ -347,7 +347,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getLowerFirst)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "lcfirst", NULL, 18, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "lcfirst", NULL, 16, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -391,7 +391,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getFormatted)
 	zephir_get_strval(&str, str_param);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello %s!");
-	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 19, &_0, &str);
+	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 17, &_0, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
@@ -432,7 +432,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSha1)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "sha1", NULL, 20, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "sha1", NULL, 18, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -453,7 +453,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getNl2br)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "nl2br", NULL, 21, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "nl2br", NULL, 19, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -474,7 +474,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getParsedCsv)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "str_getcsv", NULL, 22, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_getcsv", NULL, 20, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -527,7 +527,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getRepeatted)
 	zephir_fetch_params(1, 2, 0, &str_param, &count_param);
 	zephir_get_strval(&str, str_param);
 	ZVAL_LONG(&_0, count);
-	ZEPHIR_CALL_FUNCTION(&_1, "str_repeat", NULL, 23, &str, &_0);
+	ZEPHIR_CALL_FUNCTION(&_1, "str_repeat", NULL, 21, &str, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_1);
 }
@@ -548,7 +548,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getShuffled)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "str_shuffle", NULL, 24, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_shuffle", NULL, 22, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -572,7 +572,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getSplited)
 	zephir_fetch_params(1, 2, 0, &str_param, &del_param);
 	zephir_get_strval(&str, str_param);
 	zephir_get_strval(&del, del_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 25, &str, &del);
+	ZEPHIR_CALL_FUNCTION(&_0, "str_split", NULL, 23, &str, &del);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -596,7 +596,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompare)
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "strcmp", NULL, 26, &left, &right);
+	ZEPHIR_CALL_FUNCTION(&_0, "strcmp", NULL, 24, &left, &right);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -620,7 +620,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getCompareLocale)
 	zephir_fetch_params(1, 2, 0, &left_param, &right_param);
 	zephir_get_strval(&left, left_param);
 	zephir_get_strval(&right, right_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "strcoll", NULL, 27, &left, &right);
+	ZEPHIR_CALL_FUNCTION(&_0, "strcoll", NULL, 25, &left, &right);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -641,7 +641,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getReversed)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 28, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "strrev", NULL, 26, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
@@ -662,7 +662,7 @@ PHP_METHOD(Stub_BuiltIn_StringMethods, getHtmlSpecialChars)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &str_param);
 	zephir_get_strval(&str, str_param);
-	ZEPHIR_CALL_FUNCTION(&_0, "htmlspecialchars", NULL, 29, &str);
+	ZEPHIR_CALL_FUNCTION(&_0, "htmlspecialchars", NULL, 27, &str);
 	zephir_check_call_status();
 	RETURN_CCTOR(&_0);
 }
diff --git a/ext/stub/closures.zep.c b/ext/stub/closures.zep.c
index 8bc03b1add..b59df9f75c 100644
--- a/ext/stub/closures.zep.c
+++ b/ext/stub/closures.zep.c
@@ -182,7 +182,7 @@ PHP_METHOD(Stub_Closures, issue1036Call)
 
 	zephir_read_property(&_0, this_ptr, ZEND_STRL("_function"), PH_NOISY_CC | PH_READONLY);
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("_argument"), PH_NOISY_CC | PH_READONLY);
-	ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 30, &_0, &_1);
+	ZEPHIR_RETURN_CALL_FUNCTION("call_user_func", NULL, 28, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/exceptions.zep.c b/ext/stub/exceptions.zep.c
index 1fda29a5ef..94f1bb0d66 100644
--- a/ext/stub/exceptions.zep.c
+++ b/ext/stub/exceptions.zep.c
@@ -58,7 +58,7 @@ PHP_METHOD(Stub_Exceptions, testException2)
 	ZVAL_STRING(&msg, "hello2");
 	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, stub_exception_ce);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &msg);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/exceptions.zep", 23);
 	ZEPHIR_MM_RESTORE();
@@ -80,7 +80,7 @@ PHP_METHOD(Stub_Exceptions, testException3)
 	ZVAL_STRING(&msg, "hello3");
 	ZEPHIR_INIT_VAR(&ex);
 	object_init_ex(&ex, stub_exception_ce);
-	ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 31, &msg);
+	ZEPHIR_CALL_METHOD(NULL, &ex, "__construct", NULL, 29, &msg);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&ex, "stub/exceptions.zep", 31);
 	ZEPHIR_MM_RESTORE();
@@ -100,7 +100,7 @@ PHP_METHOD(Stub_Exceptions, getException)
 	object_init_ex(return_value, stub_exception_ce);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello4");
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 31, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 29, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -138,7 +138,7 @@ PHP_METHOD(Stub_Exceptions, testException5)
 	object_init_ex(&exception, stub_exception_ce);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "hello5");
-	ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 31, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &exception, "__construct", NULL, 29, &_0);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&exception, "stub/exceptions.zep", 49);
 	ZEPHIR_MM_RESTORE();
@@ -200,7 +200,7 @@ PHP_METHOD(Stub_Exceptions, testExceptionSprintf)
 	zephir_get_strval(&name, name_param);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "Hello, %s");
-	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 19, &_0, &name);
+	ZEPHIR_CALL_FUNCTION(&_1, "sprintf", NULL, 17, &_0, &name);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_1, "stub/exceptions.zep", 68);
 	ZEPHIR_MM_RESTORE();
@@ -392,7 +392,7 @@ PHP_METHOD(Stub_Exceptions, issue1325)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(&status, this_ptr, "donoopexception", NULL, 32);
+		ZEPHIR_CALL_METHOD(&status, this_ptr, "donoopexception", NULL, 30);
 		zephir_check_call_status_or_jump(try_end_1);
 
 	try_end_1:
diff --git a/ext/stub/factorial.zep.c b/ext/stub/factorial.zep.c
index 6b08b14048..004bc240d3 100644
--- a/ext/stub/factorial.zep.c
+++ b/ext/stub/factorial.zep.c
@@ -84,7 +84,7 @@ PHP_METHOD(Stub_Factorial, intRecursiveFactorial)
 		ZVAL_LONG(&_0, 1);
 	} else {
 		ZVAL_LONG(&_3, (num - 1));
-		ZEPHIR_CALL_METHOD(&_2, this_ptr, "intrecursivefactorial", NULL, 33, &_3);
+		ZEPHIR_CALL_METHOD(&_2, this_ptr, "intrecursivefactorial", NULL, 31, &_3);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_0);
 		ZVAL_LONG(&_0, (num * zephir_get_numberval(&_2)));
diff --git a/ext/stub/fcall.zep.c b/ext/stub/fcall.zep.c
index 0dcfea74e0..9086587406 100644
--- a/ext/stub/fcall.zep.c
+++ b/ext/stub/fcall.zep.c
@@ -70,7 +70,7 @@ PHP_METHOD(Stub_Fcall, testCall2)
 	while (1) {
 		ZVAL_LONG(&_0$$3, 0);
 		ZVAL_LONG(&_1$$3, 100);
-		ZEPHIR_RETURN_CALL_FUNCTION("mt_rand", &_2, 34, &_0$$3, &_1$$3);
+		ZEPHIR_RETURN_CALL_FUNCTION("mt_rand", &_2, 32, &_0$$3, &_1$$3);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -96,18 +96,18 @@ PHP_METHOD(Stub_Fcall, testCall3)
 	ZVAL_STRING(&_0, "inputfile.txt");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "r");
-	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 35, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 33, &_0, &_1);
 	zephir_check_call_status();
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "outputfile.txt");
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 35, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 33, &_0, &_1);
 	zephir_check_call_status();
 	if (zephir_is_true(&handle)) {
 		while (1) {
 			ZVAL_LONG(&_3$$4, 4096);
-			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 36, &handle, &_3$$4);
+			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 34, &handle, &_3$$4);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_FALSE_IDENTICAL(&buffer)) {
 				break;
@@ -140,18 +140,18 @@ PHP_METHOD(Stub_Fcall, testCall4)
 	ZVAL_STRING(&_0, "r");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "inputfile.txt");
-	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 35, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle, "fopen", &_2, 33, &_0, &_1);
 	zephir_check_call_status();
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "outputfile.txt");
 	ZEPHIR_INIT_NVAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 35, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&handle2, "fopen", &_2, 33, &_0, &_1);
 	zephir_check_call_status();
 	if (zephir_is_true(&handle)) {
 		while (1) {
 			ZVAL_LONG(&_3$$4, 4096);
-			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 36, &handle, &_3$$4);
+			ZEPHIR_CALL_FUNCTION(&buffer, "fgets", &_4, 34, &handle, &_3$$4);
 			zephir_check_call_status();
 			if (ZEPHIR_IS_FALSE_IDENTICAL(&buffer)) {
 				break;
@@ -179,7 +179,7 @@ PHP_METHOD(Stub_Fcall, testCall5)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-	ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 23, a, b);
+	ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", NULL, 21, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -191,7 +191,7 @@ PHP_METHOD(Stub_Fcall, testCall6)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 37);
+	ZEPHIR_RETURN_CALL_FUNCTION("rand", NULL, 35);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -203,7 +203,7 @@ PHP_METHOD(Stub_Fcall, testCall7)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 38);
+	ZEPHIR_CALL_FUNCTION(NULL, "memory_get_usage", NULL, 36);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
@@ -251,7 +251,7 @@ PHP_METHOD(Stub_Fcall, testCall8)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-	ZEPHIR_CALL_FUNCTION(&x, "str_repeat", NULL, 23, a, b);
+	ZEPHIR_CALL_FUNCTION(&x, "str_repeat", NULL, 21, a, b);
 	zephir_check_call_status();
 	RETURN_CCTOR(&x);
 }
@@ -301,7 +301,7 @@ PHP_METHOD(Stub_Fcall, testStrtokVarBySlash)
 	zephir_fetch_params(1, 1, 0, &value);
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "/");
-	ZEPHIR_RETURN_CALL_FUNCTION("strtok", NULL, 39, value, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("strtok", NULL, 37, value, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -462,7 +462,7 @@ PHP_FUNCTION(g_stub_zephir_global_method_test) {
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "teststrtokvarbyslash", NULL, 40, str);
+	ZEPHIR_RETURN_CALL_METHOD(&_0, "teststrtokvarbyslash", NULL, 38, str);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -499,7 +499,7 @@ PHP_FUNCTION(f_Stub_zephir_namespaced_method_test) {
 	}
 
 	ZVAL_LONG(&_1, 5);
-	ZEPHIR_RETURN_CALL_METHOD(&_0, "testcall5", NULL, 41, str, &_1);
+	ZEPHIR_RETURN_CALL_METHOD(&_0, "testcall5", NULL, 39, str, &_1);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/fibonnaci.zep.c b/ext/stub/fibonnaci.zep.c
index 97e83659e4..2b51a1f97b 100644
--- a/ext/stub/fibonnaci.zep.c
+++ b/ext/stub/fibonnaci.zep.c
@@ -166,10 +166,10 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciRecursive)
 			RETURN_MM_LONG(1);
 		} else {
 			ZVAL_LONG(&_1$$6, (n - 1));
-			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccirecursive", &_2, 42, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccirecursive", &_2, 40, &_1$$6);
 			zephir_check_call_status();
 			ZVAL_LONG(&_1$$6, (n - 2));
-			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccirecursive", &_2, 42, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccirecursive", &_2, 40, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
 			RETURN_MM();
@@ -201,10 +201,10 @@ PHP_METHOD(Stub_Fibonnaci, fibonacciFinalRecursive)
 			RETURN_MM_LONG(1);
 		} else {
 			ZVAL_LONG(&_1$$6, (n - 1));
-			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccifinalrecursive", &_2, 43, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_0$$6, this_ptr, "fibonaccifinalrecursive", &_2, 41, &_1$$6);
 			zephir_check_call_status();
 			ZVAL_LONG(&_1$$6, (n - 2));
-			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccifinalrecursive", &_2, 43, &_1$$6);
+			ZEPHIR_CALL_METHOD(&_3$$6, this_ptr, "fibonaccifinalrecursive", &_2, 41, &_1$$6);
 			zephir_check_call_status();
 			zephir_add_function(return_value, &_0$$6, &_3$$6);
 			RETURN_MM();
diff --git a/ext/stub/flow.zep.c b/ext/stub/flow.zep.c
index 93af47654d..b6a0697bf0 100644
--- a/ext/stub/flow.zep.c
+++ b/ext/stub/flow.zep.c
@@ -596,13 +596,13 @@ PHP_METHOD(Stub_Flow, testWhileNextTest)
 	array_init(&returnValue);
 	while (1) {
 		ZEPHIR_MAKE_REF(variable);
-		ZEPHIR_CALL_FUNCTION(&_0, "next", &_1, 44, variable);
+		ZEPHIR_CALL_FUNCTION(&_0, "next", &_1, 42, variable);
 		ZEPHIR_UNREF(variable);
 		zephir_check_call_status();
 		if (!(zephir_is_true(&_0))) {
 			break;
 		}
-		ZEPHIR_CALL_FUNCTION(&_2$$3, "current", &_3, 45, variable);
+		ZEPHIR_CALL_FUNCTION(&_2$$3, "current", &_3, 43, variable);
 		zephir_check_call_status();
 		zephir_array_append(&returnValue, &_2$$3, PH_SEPARATE, "stub/flow.zep", 420);
 	}
@@ -629,11 +629,11 @@ PHP_METHOD(Stub_Flow, testWhileDoNextTest)
 	ZEPHIR_INIT_VAR(&returnValue);
 	array_init(&returnValue);
 	do {
-		ZEPHIR_CALL_FUNCTION(&_0$$3, "current", &_1, 45, variable);
+		ZEPHIR_CALL_FUNCTION(&_0$$3, "current", &_1, 43, variable);
 		zephir_check_call_status();
 		zephir_array_append(&returnValue, &_0$$3, PH_SEPARATE, "stub/flow.zep", 430);
 		ZEPHIR_MAKE_REF(variable);
-		ZEPHIR_CALL_FUNCTION(&_2, "next", &_3, 44, variable);
+		ZEPHIR_CALL_FUNCTION(&_2, "next", &_3, 42, variable);
 		ZEPHIR_UNREF(variable);
 		zephir_check_call_status();
 	} while (zephir_is_true(&_2));
diff --git a/ext/stub/flow/switchflow.zep.c b/ext/stub/flow/switchflow.zep.c
index 6cb6f83fe9..2952fef9a2 100644
--- a/ext/stub/flow/switchflow.zep.c
+++ b/ext/stub/flow/switchflow.zep.c
@@ -221,7 +221,7 @@ PHP_METHOD(Stub_Flow_SwitchFlow, testSwitch13)
 	zephir_fetch_params(1, 1, 0, &a_param);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_FUNCTION(&_2, "mt_rand", NULL, 34, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "mt_rand", NULL, 32, &_0, &_1);
 	zephir_check_call_status();
 	do {
 		if (ZEPHIR_IS_LONG(&_2, 100)) {
diff --git a/ext/stub/functions.zep.c b/ext/stub/functions.zep.c
index 337bcb96c9..23147cb73f 100644
--- a/ext/stub/functions.zep.c
+++ b/ext/stub/functions.zep.c
@@ -45,7 +45,7 @@ PHP_METHOD(Stub_Functions, filterVar1)
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
-	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 46, &ret, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 44, &ret, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(ZEPHIR_IS_FALSE_IDENTICAL(&_2));
 }
@@ -70,7 +70,7 @@ PHP_METHOD(Stub_Functions, filterVar2)
 	ZVAL_STRING(&ret, "0");
 	ZVAL_LONG(&_0, 259);
 	ZVAL_LONG(&_1, 20480);
-	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 46, &ret, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "filter_var", NULL, 44, &ret, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(ZEPHIR_IS_FALSE(&_2));
 }
diff --git a/ext/stub/globals/serverrequestfactory.zep.c b/ext/stub/globals/serverrequestfactory.zep.c
index 395fd41844..c4409290d8 100644
--- a/ext/stub/globals/serverrequestfactory.zep.c
+++ b/ext/stub/globals/serverrequestfactory.zep.c
@@ -125,19 +125,19 @@ PHP_METHOD(Stub_Globals_ServerRequestFactory, load)
 	if (!(ZEPHIR_IS_EMPTY(&_SERVER))) {
 		ZEPHIR_CPY_WRT(&globalServer, &_SERVER);
 	}
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", &_1, 47, &server, &globalServer);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "checknullarray", &_1, 45, &server, &globalServer);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&server, &_0);
-	ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", &_1, 47, &files, &globalFiles);
+	ZEPHIR_CALL_METHOD(&_2, this_ptr, "checknullarray", &_1, 45, &files, &globalFiles);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&files, &_2);
-	ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", &_1, 47, &cookies, &globalCookies);
+	ZEPHIR_CALL_METHOD(&_3, this_ptr, "checknullarray", &_1, 45, &cookies, &globalCookies);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&cookies, &_3);
-	ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", &_1, 47, &get, &globalGet);
+	ZEPHIR_CALL_METHOD(&_4, this_ptr, "checknullarray", &_1, 45, &get, &globalGet);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&get, &_4);
-	ZEPHIR_CALL_METHOD(&_5, this_ptr, "checknullarray", &_1, 47, &post, &globalPost);
+	ZEPHIR_CALL_METHOD(&_5, this_ptr, "checknullarray", &_1, 45, &post, &globalPost);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&post, &_5);
 	zephir_create_array(return_value, 5, 0);
diff --git a/ext/stub/instance.zep.c b/ext/stub/instance.zep.c
index e6e2a1685f..96a81b9dc7 100644
--- a/ext/stub/instance.zep.c
+++ b/ext/stub/instance.zep.c
@@ -83,7 +83,7 @@ PHP_METHOD(Stub_Instance, testIssue1339)
 	zephir_array_fast_append(&parameters, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	object_init_ex(&_0, stub_arrayobject_ce);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 48);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 46);
 	zephir_check_call_status();
 	zephir_array_fast_append(&parameters, &_0);
 	ZEPHIR_INIT_NVAR(&_0);
diff --git a/ext/stub/invoke.zep.c b/ext/stub/invoke.zep.c
index 84308c5d2c..64bf4694c1 100644
--- a/ext/stub/invoke.zep.c
+++ b/ext/stub/invoke.zep.c
@@ -65,7 +65,7 @@ PHP_METHOD(Stub_Invoke, test)
 
 	ZEPHIR_INIT_VAR(&func);
 	object_init_ex(&func, stub_invoke_ce);
-	ZEPHIR_CALL_METHOD(NULL, &func, "__construct", NULL, 49);
+	ZEPHIR_CALL_METHOD(NULL, &func, "__construct", NULL, 47);
 	zephir_check_call_status();
 	ZEPHIR_RETURN_CALL_ZVAL_FUNCTION(&func, NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/issue2165/issue.zep.c b/ext/stub/issue2165/issue.zep.c
index 54b2b02e21..5c7f6a4310 100644
--- a/ext/stub/issue2165/issue.zep.c
+++ b/ext/stub/issue2165/issue.zep.c
@@ -59,7 +59,7 @@ PHP_METHOD(Stub_Issue2165_Issue, build)
 	}
 	object_init_ex(return_value, stub_issue2165_issue_ce);
 	ZVAL_BOOL(&_0, 1);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 50, &a, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 48, &a, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -128,11 +128,11 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 	} else {
 		}
 	m = zephir_fast_count_int(&a);
-	ZEPHIR_CALL_FUNCTION(&_0, "current", NULL, 45, &a);
+	ZEPHIR_CALL_FUNCTION(&_0, "current", NULL, 43, &a);
 	zephir_check_call_status();
 	n = zephir_fast_count_int(&_0);
 	if (validate) {
-		ZEPHIR_CALL_FUNCTION(&_1$$3, "array_values", &_2, 51, &a);
+		ZEPHIR_CALL_FUNCTION(&_1$$3, "array_values", &_2, 49, &a);
 		zephir_check_call_status();
 		ZEPHIR_CPY_WRT(&a, &_1$$3);
 		zephir_is_iterable(&a, 0, "stub/issue2165/issue.zep", 46);
@@ -151,13 +151,13 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 					ZEPHIR_INIT_NVAR(&_7$$5);
 					object_init_ex(&_7$$5, spl_ce_InvalidArgumentException);
 					ZVAL_LONG(&_8$$5, n);
-					ZEPHIR_CALL_FUNCTION(&_9$$5, "strval", &_10, 52, &_8$$5);
+					ZEPHIR_CALL_FUNCTION(&_9$$5, "strval", &_10, 50, &_8$$5);
 					zephir_check_call_status();
 					ZEPHIR_INIT_NVAR(&_11$$5);
 					ZVAL_LONG(&_11$$5, zephir_fast_count_int(&rowA));
 					ZEPHIR_INIT_NVAR(&_12$$5);
 					ZEPHIR_CONCAT_SSVSVSSVS(&_12$$5, "The number of columns", " must be equal for all rows, ", &_9$$5, " needed but ", &_11$$5, " given", " at row offset ", &i, ".");
-					ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_13, 53, &_12$$5);
+					ZEPHIR_CALL_METHOD(NULL, &_7$$5, "__construct", &_13, 51, &_12$$5);
 					zephir_check_call_status();
 					zephir_throw_exception_debug(&_7$$5, "stub/issue2165/issue.zep", 33);
 					ZEPHIR_MM_RESTORE();
@@ -171,7 +171,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						ZVAL_COPY(&valueA, _14$$4);
 						_16$$6 = !(Z_TYPE_P(&valueA) == IS_LONG);
 						if (_16$$6) {
-							ZEPHIR_CALL_FUNCTION(&_17$$6, "is_float", &_18, 54, &valueA);
+							ZEPHIR_CALL_FUNCTION(&_17$$6, "is_float", &_18, 52, &valueA);
 							zephir_check_call_status();
 							_16$$6 = !zephir_is_true(&_17$$6);
 						}
@@ -182,7 +182,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							zephir_gettype(&_20$$7, &valueA);
 							ZEPHIR_INIT_NVAR(&_21$$7);
 							ZEPHIR_CONCAT_SSVS(&_21$$7, "Matrix element must", " be an integer or floating point number, ", &_20$$7, " given.");
-							ZEPHIR_CALL_METHOD(NULL, &_19$$7, "__construct", &_13, 53, &_21$$7);
+							ZEPHIR_CALL_METHOD(NULL, &_19$$7, "__construct", &_13, 51, &_21$$7);
 							zephir_check_call_status();
 							zephir_throw_exception_debug(&_19$$7, "stub/issue2165/issue.zep", 40);
 							ZEPHIR_MM_RESTORE();
@@ -202,7 +202,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						zephir_check_call_status();
 							_22$$8 = !(Z_TYPE_P(&valueA) == IS_LONG);
 							if (_22$$8) {
-								ZEPHIR_CALL_FUNCTION(&_23$$8, "is_float", &_18, 54, &valueA);
+								ZEPHIR_CALL_FUNCTION(&_23$$8, "is_float", &_18, 52, &valueA);
 								zephir_check_call_status();
 								_22$$8 = !zephir_is_true(&_23$$8);
 							}
@@ -213,7 +213,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								zephir_gettype(&_25$$9, &valueA);
 								ZEPHIR_INIT_NVAR(&_26$$9);
 								ZEPHIR_CONCAT_SSVS(&_26$$9, "Matrix element must", " be an integer or floating point number, ", &_25$$9, " given.");
-								ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_13, 53, &_26$$9);
+								ZEPHIR_CALL_METHOD(NULL, &_24$$9, "__construct", &_13, 51, &_26$$9);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_24$$9, "stub/issue2165/issue.zep", 40);
 								ZEPHIR_MM_RESTORE();
@@ -224,7 +224,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 					}
 				}
 				ZEPHIR_INIT_NVAR(&valueA);
-				ZEPHIR_CALL_FUNCTION(&_27$$4, "array_values", &_2, 51, &rowA);
+				ZEPHIR_CALL_FUNCTION(&_27$$4, "array_values", &_2, 49, &rowA);
 				zephir_check_call_status();
 				zephir_array_append(&rowA, &_27$$4, PH_SEPARATE, "stub/issue2165/issue.zep", 44);
 			} ZEND_HASH_FOREACH_END();
@@ -245,13 +245,13 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						ZEPHIR_INIT_NVAR(&_28$$11);
 						object_init_ex(&_28$$11, spl_ce_InvalidArgumentException);
 						ZVAL_LONG(&_29$$11, n);
-						ZEPHIR_CALL_FUNCTION(&_30$$11, "strval", &_10, 52, &_29$$11);
+						ZEPHIR_CALL_FUNCTION(&_30$$11, "strval", &_10, 50, &_29$$11);
 						zephir_check_call_status();
 						ZEPHIR_INIT_NVAR(&_31$$11);
 						ZVAL_LONG(&_31$$11, zephir_fast_count_int(&rowA));
 						ZEPHIR_INIT_NVAR(&_32$$11);
 						ZEPHIR_CONCAT_SSVSVSSVS(&_32$$11, "The number of columns", " must be equal for all rows, ", &_30$$11, " needed but ", &_31$$11, " given", " at row offset ", &i, ".");
-						ZEPHIR_CALL_METHOD(NULL, &_28$$11, "__construct", &_13, 53, &_32$$11);
+						ZEPHIR_CALL_METHOD(NULL, &_28$$11, "__construct", &_13, 51, &_32$$11);
 						zephir_check_call_status();
 						zephir_throw_exception_debug(&_28$$11, "stub/issue2165/issue.zep", 33);
 						ZEPHIR_MM_RESTORE();
@@ -265,7 +265,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							ZVAL_COPY(&valueA, _33$$10);
 							_35$$12 = !(Z_TYPE_P(&valueA) == IS_LONG);
 							if (_35$$12) {
-								ZEPHIR_CALL_FUNCTION(&_36$$12, "is_float", &_18, 54, &valueA);
+								ZEPHIR_CALL_FUNCTION(&_36$$12, "is_float", &_18, 52, &valueA);
 								zephir_check_call_status();
 								_35$$12 = !zephir_is_true(&_36$$12);
 							}
@@ -276,7 +276,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 								zephir_gettype(&_38$$13, &valueA);
 								ZEPHIR_INIT_NVAR(&_39$$13);
 								ZEPHIR_CONCAT_SSVS(&_39$$13, "Matrix element must", " be an integer or floating point number, ", &_38$$13, " given.");
-								ZEPHIR_CALL_METHOD(NULL, &_37$$13, "__construct", &_13, 53, &_39$$13);
+								ZEPHIR_CALL_METHOD(NULL, &_37$$13, "__construct", &_13, 51, &_39$$13);
 								zephir_check_call_status();
 								zephir_throw_exception_debug(&_37$$13, "stub/issue2165/issue.zep", 40);
 								ZEPHIR_MM_RESTORE();
@@ -296,7 +296,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 							zephir_check_call_status();
 								_40$$14 = !(Z_TYPE_P(&valueA) == IS_LONG);
 								if (_40$$14) {
-									ZEPHIR_CALL_FUNCTION(&_41$$14, "is_float", &_18, 54, &valueA);
+									ZEPHIR_CALL_FUNCTION(&_41$$14, "is_float", &_18, 52, &valueA);
 									zephir_check_call_status();
 									_40$$14 = !zephir_is_true(&_41$$14);
 								}
@@ -307,7 +307,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 									zephir_gettype(&_43$$15, &valueA);
 									ZEPHIR_INIT_NVAR(&_44$$15);
 									ZEPHIR_CONCAT_SSVS(&_44$$15, "Matrix element must", " be an integer or floating point number, ", &_43$$15, " given.");
-									ZEPHIR_CALL_METHOD(NULL, &_42$$15, "__construct", &_13, 53, &_44$$15);
+									ZEPHIR_CALL_METHOD(NULL, &_42$$15, "__construct", &_13, 51, &_44$$15);
 									zephir_check_call_status();
 									zephir_throw_exception_debug(&_42$$15, "stub/issue2165/issue.zep", 40);
 									ZEPHIR_MM_RESTORE();
@@ -318,7 +318,7 @@ PHP_METHOD(Stub_Issue2165_Issue, __construct)
 						}
 					}
 					ZEPHIR_INIT_NVAR(&valueA);
-					ZEPHIR_CALL_FUNCTION(&_45$$10, "array_values", &_2, 51, &rowA);
+					ZEPHIR_CALL_FUNCTION(&_45$$10, "array_values", &_2, 49, &rowA);
 					zephir_check_call_status();
 					zephir_array_append(&rowA, &_45$$10, PH_SEPARATE, "stub/issue2165/issue.zep", 44);
 				ZEPHIR_CALL_METHOD(NULL, &a, "next", NULL, 0);
@@ -362,7 +362,7 @@ PHP_METHOD(Stub_Issue2165_Issue, quick)
 	}
 	object_init_ex(return_value, stub_issue2165_issue_ce);
 	ZVAL_BOOL(&_0, 0);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 50, &a, &_0);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 48, &a, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -426,7 +426,7 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 	zephir_fetch_params(1, 3, 0, &value, &m_param, &n_param);
 	_0 = !(Z_TYPE_P(value) == IS_LONG);
 	if (_0) {
-		ZEPHIR_CALL_FUNCTION(&_1, "is_float", NULL, 54, value);
+		ZEPHIR_CALL_FUNCTION(&_1, "is_float", NULL, 52, value);
 		zephir_check_call_status();
 		_0 = !zephir_is_true(&_1);
 	}
@@ -437,7 +437,7 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		zephir_gettype(&_3$$3, value);
 		ZEPHIR_INIT_VAR(&_4$$3);
 		ZEPHIR_CONCAT_SSVS(&_4$$3, "Value must be an", " integer or floating point number, ", &_3$$3, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 53, &_4$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", NULL, 51, &_4$$3);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_2$$3, "stub/issue2165/issue.zep", 68);
 		ZEPHIR_MM_RESTORE();
@@ -447,11 +447,11 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		ZEPHIR_INIT_VAR(&_5$$4);
 		object_init_ex(&_5$$4, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_6$$4, m);
-		ZEPHIR_CALL_FUNCTION(&_7$$4, "strval", &_8, 52, &_6$$4);
+		ZEPHIR_CALL_FUNCTION(&_7$$4, "strval", &_8, 50, &_6$$4);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_9$$4);
 		ZEPHIR_CONCAT_SSVS(&_9$$4, "M must be", " greater than 0, ", &_7$$4, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 53, &_9$$4);
+		ZEPHIR_CALL_METHOD(NULL, &_5$$4, "__construct", NULL, 51, &_9$$4);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_5$$4, "stub/issue2165/issue.zep", 73);
 		ZEPHIR_MM_RESTORE();
@@ -461,11 +461,11 @@ PHP_METHOD(Stub_Issue2165_Issue, fill)
 		ZEPHIR_INIT_VAR(&_10$$5);
 		object_init_ex(&_10$$5, spl_ce_InvalidArgumentException);
 		ZVAL_LONG(&_11$$5, n);
-		ZEPHIR_CALL_FUNCTION(&_12$$5, "strval", &_8, 52, &_11$$5);
+		ZEPHIR_CALL_FUNCTION(&_12$$5, "strval", &_8, 50, &_11$$5);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&_13$$5);
 		ZEPHIR_CONCAT_SSVS(&_13$$5, "N must be", " greater than 0, ", &_12$$5, " given.");
-		ZEPHIR_CALL_METHOD(NULL, &_10$$5, "__construct", NULL, 53, &_13$$5);
+		ZEPHIR_CALL_METHOD(NULL, &_10$$5, "__construct", NULL, 51, &_13$$5);
 		zephir_check_call_status();
 		zephir_throw_exception_debug(&_10$$5, "stub/issue2165/issue.zep", 78);
 		ZEPHIR_MM_RESTORE();
diff --git a/ext/stub/issue663.zep.c b/ext/stub/issue663.zep.c
index b893c65ca7..caa6f3f215 100644
--- a/ext/stub/issue663.zep.c
+++ b/ext/stub/issue663.zep.c
@@ -48,7 +48,7 @@ PHP_METHOD(Stub_Issue663, is_array_assoc)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZEPHIR_RETURN_CALL_STATIC("is_array_assoc_internal", &_1, 55, arr);
+	ZEPHIR_RETURN_CALL_STATIC("is_array_assoc_internal", &_1, 53, arr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -115,7 +115,7 @@ PHP_METHOD(Stub_Issue663, is_array_indexed)
 	if (_0) {
 		RETURN_MM_BOOL(0);
 	}
-	ZEPHIR_CALL_STATIC(&_1, "is_array_assoc_internal", &_2, 55, arr);
+	ZEPHIR_CALL_STATIC(&_1, "is_array_assoc_internal", &_2, 53, arr);
 	zephir_check_call_status();
 	RETURN_MM_BOOL(!zephir_is_true(&_1));
 }
diff --git a/ext/stub/mcall.zep.c b/ext/stub/mcall.zep.c
index 0c76f049c1..86661f0dde 100644
--- a/ext/stub/mcall.zep.c
+++ b/ext/stub/mcall.zep.c
@@ -135,7 +135,7 @@ PHP_METHOD(Stub_Mcall, testCall3)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 56);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 54);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -198,7 +198,7 @@ PHP_METHOD(Stub_Mcall, testCall6)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 57, a, b);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 55, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -275,7 +275,7 @@ PHP_METHOD(Stub_Mcall, testCall9)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod6", NULL, 57, a, b);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod6", NULL, 55, a, b);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, this_ptr, "testmethod5", NULL, 0, a, b);
 	zephir_check_call_status();
@@ -317,7 +317,7 @@ PHP_METHOD(Stub_Mcall, testCall12)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 56);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod3", NULL, 54);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -380,7 +380,7 @@ PHP_METHOD(Stub_Mcall, testCall15)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 57, a, b);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod6", NULL, 55, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -435,7 +435,7 @@ PHP_METHOD(Stub_Mcall, testCall18)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 58);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "testmethod7", NULL, 56);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -542,7 +542,7 @@ PHP_METHOD(Stub_Mcall, testCall22)
 				_0 = 1;
 			}
 			i = _1;
-			ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "testmethod21", &_4, 59, p, p);
+			ZEPHIR_CALL_METHOD(&_3$$3, this_ptr, "testmethod21", &_4, 57, p, p);
 			zephir_check_call_status();
 			j += zephir_get_numberval(&_3$$3);
 		}
@@ -856,7 +856,7 @@ PHP_METHOD(Stub_Mcall, testCallablePass)
 	ZEPHIR_INIT_VAR(&_0);
 	ZEPHIR_INIT_NVAR(&_0);
 	zephir_create_closure_ex(&_0, NULL, stub_12__closure_ce, SL("__invoke"));
-	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 60, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 58, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -888,7 +888,7 @@ PHP_METHOD(Stub_Mcall, testCallableArrayThisMethodPass)
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "bb");
 	zephir_array_fast_append(&_0, &_1);
-	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 60, &_0);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "setcallable", NULL, 58, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -910,7 +910,7 @@ PHP_METHOD(Stub_Mcall, aa)
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_RETURN_CALL_METHOD(&a, "bb", NULL, 61);
+	ZEPHIR_RETURN_CALL_METHOD(&a, "bb", NULL, 59);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -938,7 +938,7 @@ PHP_METHOD(Stub_Mcall, issue1136)
 	ZVAL_STRING(&_1, "8.0.0");
 	ZEPHIR_INIT_VAR(&_2);
 	ZVAL_STRING(&_2, ">=");
-	ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 62, &_0, &_1, &_2);
+	ZEPHIR_CALL_FUNCTION(&_3, "version_compare", NULL, 60, &_0, &_1, &_2);
 	zephir_check_call_status();
 	if (zephir_is_true(&_3)) {
 		ZEPHIR_INIT_VAR(&_finfo);
@@ -946,7 +946,7 @@ PHP_METHOD(Stub_Mcall, issue1136)
 		ZEPHIR_CALL_METHOD(NULL, &_finfo, "__construct", NULL, 0);
 		zephir_check_call_status();
 	} else {
-		ZEPHIR_CALL_FUNCTION(&_finfo, "finfo_open", NULL, 63);
+		ZEPHIR_CALL_FUNCTION(&_finfo, "finfo_open", NULL, 61);
 		zephir_check_call_status();
 	}
 	RETURN_CCTOR(&_finfo);
diff --git a/ext/stub/mcallchained.zep.c b/ext/stub/mcallchained.zep.c
index 457322fee5..4013d642fd 100644
--- a/ext/stub/mcallchained.zep.c
+++ b/ext/stub/mcallchained.zep.c
@@ -97,7 +97,7 @@ PHP_METHOD(Stub_McallChained, testChained3)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 64);
+	ZEPHIR_CALL_METHOD(&_0, this_ptr, "testmethod3", NULL, 62);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(&_1, &_0, "testmethod2", NULL, 0);
 	zephir_check_call_status();
diff --git a/ext/stub/nativearray.zep.c b/ext/stub/nativearray.zep.c
index 3dce329270..8fa90993d9 100644
--- a/ext/stub/nativearray.zep.c
+++ b/ext/stub/nativearray.zep.c
@@ -1803,7 +1803,7 @@ PHP_METHOD(Stub_NativeArray, issue709)
 			ZEPHIR_INIT_NVAR(&_3$$3);
 			ZVAL_LONG(&_3$$3, 2);
 			zephir_array_fast_append(&arr, &_3$$3);
-			ZEPHIR_CALL_FUNCTION(&_5$$3, "array_rand", &_6, 65, &arr);
+			ZEPHIR_CALL_FUNCTION(&_5$$3, "array_rand", &_6, 63, &arr);
 			zephir_check_call_status();
 			zephir_array_fetch(&_4$$3, &arr, &_5$$3, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 626);
 			ZEPHIR_CPY_WRT(&arr, &_4$$3);
@@ -1851,7 +1851,7 @@ PHP_METHOD(Stub_NativeArray, Issue1140)
 	zephir_read_property(&_2, this_ptr, ZEND_STRL("prefixes"), PH_NOISY_CC | PH_READONLY);
 	zephir_array_fetch(&_3, &_2, &prefix, PH_NOISY | PH_READONLY, "stub/nativearray.zep", 639);
 	ZEPHIR_MAKE_REF(&_3);
-	ZEPHIR_CALL_FUNCTION(NULL, "array_push", NULL, 66, &_3, &baseDir);
+	ZEPHIR_CALL_FUNCTION(NULL, "array_push", NULL, 64, &_3, &baseDir);
 	ZEPHIR_UNREF(&_3);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "prefixes");
diff --git a/ext/stub/oo.zep.c b/ext/stub/oo.zep.c
index 7e4f7df775..b23305aa5a 100644
--- a/ext/stub/oo.zep.c
+++ b/ext/stub/oo.zep.c
@@ -55,7 +55,7 @@ PHP_METHOD(Stub_Oo, testInstance2)
 
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstruct_ce);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 67);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 65);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -98,7 +98,7 @@ PHP_METHOD(Stub_Oo, testInstance4)
 	ZVAL_STRING(&b, "b");
 	ZEPHIR_INIT_VAR(&o);
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &a, &b);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66, &a, &b);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -121,7 +121,7 @@ PHP_METHOD(Stub_Oo, testInstance5)
 	ZVAL_STRING(&_0, "a");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "b");
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -142,7 +142,7 @@ PHP_METHOD(Stub_Oo, testInstance6)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -163,7 +163,7 @@ PHP_METHOD(Stub_Oo, testInstance7)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_BOOL(&_0, 0);
 	ZVAL_BOOL(&_1, 1);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -184,7 +184,7 @@ PHP_METHOD(Stub_Oo, testInstance8)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_DOUBLE(&_0, 1.2);
 	ZVAL_DOUBLE(&_1, 7.30);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
@@ -235,7 +235,7 @@ PHP_METHOD(Stub_Oo, testInstance11)
 	object_init_ex(&o, stub_oo_ooconstructparams_ce);
 	ZVAL_LONG(&_0, 1);
 	ZVAL_LONG(&_1, 2);
-	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 68, &_0, &_1);
+	ZEPHIR_CALL_METHOD(NULL, &o, "__construct", NULL, 66, &_0, &_1);
 	zephir_check_call_status();
 	RETURN_CCTOR(&o);
 }
diff --git a/ext/stub/oo/deprecatedmethods.zep.c b/ext/stub/oo/deprecatedmethods.zep.c
index 6978548236..299dbf1684 100644
--- a/ext/stub/oo/deprecatedmethods.zep.c
+++ b/ext/stub/oo/deprecatedmethods.zep.c
@@ -38,7 +38,7 @@ PHP_METHOD(Stub_Oo_DeprecatedMethods, normalMethod)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 69);
+	ZEPHIR_RETURN_CALL_METHOD(this_ptr, "privatedeprecated", NULL, 67);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/oo/oodestruct.zep.c b/ext/stub/oo/oodestruct.zep.c
index 87cef0ed75..e20803e54a 100644
--- a/ext/stub/oo/oodestruct.zep.c
+++ b/ext/stub/oo/oodestruct.zep.c
@@ -202,11 +202,11 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 	zephir_read_property(&_1, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
 	if ((zephir_file_exists(&_1) == SUCCESS)) {
 		zephir_read_property(&_2$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 70, &_2$$4);
+		ZEPHIR_CALL_FUNCTION(&_3$$4, "realpath", NULL, 68, &_2$$4);
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("realpath"), &_3$$4);
 		zephir_read_property(&_4$$4, this_ptr, ZEND_STRL("file"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 71, &_4$$4);
+		ZEPHIR_CALL_FUNCTION(&imageinfo, "getimagesize", NULL, 69, &_4$$4);
 		zephir_check_call_status();
 		if (zephir_is_true(&imageinfo)) {
 			zephir_array_fetch_long(&_5$$5, &imageinfo, 0, PH_NOISY | PH_READONLY, "stub/oo/oodestruct.zep", 62);
@@ -324,7 +324,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, __construct)
 		zephir_check_call_status();
 		zephir_update_property_zval(this_ptr, ZEND_STRL("image"), &_37$$13);
 		zephir_read_property(&_35$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 72, &_35$$13, &__$true);
+		ZEPHIR_CALL_FUNCTION(NULL, "imagealphablending", NULL, 70, &_35$$13, &__$true);
 		zephir_check_call_status();
 		zephir_read_property(&_36$$13, this_ptr, ZEND_STRL("image"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_BOOL(&_38$$13, 1);
@@ -418,7 +418,7 @@ PHP_METHOD(Stub_Oo_OoDestruct, check)
 	ZVAL_STRING(&_4, "2.0.1");
 	ZEPHIR_INIT_VAR(&_5);
 	ZVAL_STRING(&_5, ">=");
-	ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 62, &version, &_4, &_5);
+	ZEPHIR_CALL_FUNCTION(&_6, "version_compare", NULL, 60, &version, &_4, &_5);
 	zephir_check_call_status();
 	if (UNEXPECTED(!zephir_is_true(&_6))) {
 		ZEPHIR_INIT_VAR(&_7$$5);
@@ -484,13 +484,13 @@ PHP_METHOD(Stub_Oo_OoDestruct, getVersion)
 	ZVAL_NULL(&version);
 	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "GD_VERSION");
-	ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 73, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "defined", NULL, 71, &_3);
 	zephir_check_call_status();
 	if (zephir_is_true(&_4)) {
 		ZEPHIR_INIT_NVAR(&version);
 		ZEPHIR_GET_CONSTANT(&version, "GD_VERSION");
 	} else {
-		ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 74);
+		ZEPHIR_CALL_FUNCTION(&info, "gd_info", NULL, 72);
 		zephir_check_call_status();
 		ZEPHIR_INIT_VAR(&matches);
 		ZVAL_NULL(&matches);
diff --git a/ext/stub/oo/ooparams.zep.c b/ext/stub/oo/ooparams.zep.c
index 19e38ac962..367ced1259 100644
--- a/ext/stub/oo/ooparams.zep.c
+++ b/ext/stub/oo/ooparams.zep.c
@@ -413,3 +413,60 @@ PHP_METHOD(Stub_Oo_OoParams, setObjectClassCast)
 	return;
 }
 
+PHP_METHOD(Stub_Oo_OoParams, getDefaultParamValue)
+{
+	zval *i_param = NULL;
+	zend_long i;
+
+	ZEND_PARSE_PARAMETERS_START(0, 1)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_LONG(i)
+	ZEND_PARSE_PARAMETERS_END();
+	zephir_fetch_params_without_memory_grow(0, 1, &i_param);
+	if (!i_param) {
+		i = 0;
+	} else {
+		}
+	RETURN_LONG(i);
+}
+
+PHP_METHOD(Stub_Oo_OoParams, getDefaultParamValue1)
+{
+	zval *i_param = NULL;
+	zend_long i;
+
+	ZEND_PARSE_PARAMETERS_START(0, 1)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_LONG(i)
+	ZEND_PARSE_PARAMETERS_END();
+	zephir_fetch_params_without_memory_grow(0, 1, &i_param);
+	if (!i_param) {
+		i = 1;
+	} else {
+		}
+	RETURN_LONG(i);
+}
+
+PHP_METHOD(Stub_Oo_OoParams, getDefaultParamValueStr)
+{
+	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
+	zval *str_param = NULL;
+	zval str;
+
+	ZVAL_UNDEF(&str);
+	ZEND_PARSE_PARAMETERS_START(0, 1)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_STR(str)
+	ZEND_PARSE_PARAMETERS_END();
+	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
+	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
+	zephir_fetch_params(1, 0, 1, &str_param);
+	if (!str_param) {
+		ZEPHIR_INIT_VAR(&str);
+		ZVAL_STRING(&str, "default");
+	} else {
+		zephir_get_strval(&str, str_param);
+	}
+	RETURN_CTOR(&str);
+}
+
diff --git a/ext/stub/oo/ooparams.zep.h b/ext/stub/oo/ooparams.zep.h
index 6293f97ca9..2b0da8b11e 100644
--- a/ext/stub/oo/ooparams.zep.h
+++ b/ext/stub/oo/ooparams.zep.h
@@ -27,6 +27,9 @@ PHP_METHOD(Stub_Oo_OoParams, setObject);
 PHP_METHOD(Stub_Oo_OoParams, setCallable);
 PHP_METHOD(Stub_Oo_OoParams, setResource);
 PHP_METHOD(Stub_Oo_OoParams, setObjectClassCast);
+PHP_METHOD(Stub_Oo_OoParams, getDefaultParamValue);
+PHP_METHOD(Stub_Oo_OoParams, getDefaultParamValue1);
+PHP_METHOD(Stub_Oo_OoParams, getDefaultParamValueStr);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_createthisclasswithoutwritecurrentnamespace, 0, 0, 0)
 ZEND_END_ARG_INFO()
@@ -121,6 +124,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_setobjectclasscast, 0, 0, 1)
 	ZEND_ARG_OBJ_INFO(0, parameter, Stub\\Oo\\Param, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_getdefaultparamvalue, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, i, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_getdefaultparamvalue1, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, i, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stub_oo_ooparams_getdefaultparamvaluestr, 0, 0, 0)
+	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
 ZEPHIR_INIT_FUNCS(stub_oo_ooparams_method_entry) {
 PHP_ME(Stub_Oo_OoParams, createThisClassWithoutWriteCurrentNamespace, arginfo_stub_oo_ooparams_createthisclasswithoutwritecurrentnamespace, ZEND_ACC_PUBLIC)
 PHP_ME(Stub_Oo_OoParams, createOtherClassWithoutWriteCurrentNamespace, arginfo_stub_oo_ooparams_createotherclasswithoutwritecurrentnamespace, ZEND_ACC_PUBLIC)
@@ -146,5 +161,8 @@ PHP_ME(Stub_Oo_OoParams, setStrictNameFromZephirLand, arginfo_stub_oo_ooparams_s
 	PHP_ME(Stub_Oo_OoParams, setCallable, arginfo_stub_oo_ooparams_setcallable, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setResource, arginfo_stub_oo_ooparams_setresource, ZEND_ACC_PUBLIC)
 	PHP_ME(Stub_Oo_OoParams, setObjectClassCast, arginfo_stub_oo_ooparams_setobjectclasscast, ZEND_ACC_PUBLIC)
+	PHP_ME(Stub_Oo_OoParams, getDefaultParamValue, arginfo_stub_oo_ooparams_getdefaultparamvalue, ZEND_ACC_PUBLIC)
+	PHP_ME(Stub_Oo_OoParams, getDefaultParamValue1, arginfo_stub_oo_ooparams_getdefaultparamvalue1, ZEND_ACC_PUBLIC)
+	PHP_ME(Stub_Oo_OoParams, getDefaultParamValueStr, arginfo_stub_oo_ooparams_getdefaultparamvaluestr, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
diff --git a/ext/stub/oo/scopes/privatescopetester.zep.c b/ext/stub/oo/scopes/privatescopetester.zep.c
index cdc82de197..68baa73b4b 100644
--- a/ext/stub/oo/scopes/privatescopetester.zep.c
+++ b/ext/stub/oo/scopes/privatescopetester.zep.c
@@ -115,7 +115,7 @@ PHP_METHOD(Stub_Oo_Scopes_PrivateScopeTester, getObjVars)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &obj);
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 75, obj);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 73, obj);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/openssl.zep.c b/ext/stub/openssl.zep.c
index 006e1d7168..1212cde035 100644
--- a/ext/stub/openssl.zep.c
+++ b/ext/stub/openssl.zep.c
@@ -40,7 +40,7 @@ PHP_METHOD(Stub_Openssl, randomPseudoBytes)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 1, 0, &length_param);
 	ZVAL_LONG(&_0, length);
-	ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 76, &_0);
+	ZEPHIR_RETURN_CALL_FUNCTION("openssl_random_pseudo_bytes", NULL, 74, &_0);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -80,7 +80,7 @@ PHP_METHOD(Stub_Openssl, randomPseudoBytesLoop)
 			ZEPHIR_INIT_NVAR(&i);
 			ZVAL_LONG(&i, _1);
 			ZVAL_LONG(&_3$$3, 10);
-			ZEPHIR_CALL_FUNCTION(&_4$$3, "openssl_random_pseudo_bytes", &_5, 76, &_3$$3);
+			ZEPHIR_CALL_FUNCTION(&_4$$3, "openssl_random_pseudo_bytes", &_5, 74, &_3$$3);
 			zephir_check_call_status();
 			zephir_array_append(&arr, &_4$$3, PH_SEPARATE, "stub/openssl.zep", 16);
 		}
@@ -114,7 +114,7 @@ PHP_METHOD(Stub_Openssl, opensslEncrypt)
 	ZVAL_LONG(&_2, 1);
 	ZEPHIR_INIT_VAR(&_3);
 	ZVAL_STRING(&_3, "1234567890123456");
-	ZEPHIR_RETURN_CALL_FUNCTION("openssl_encrypt", NULL, 77, &data, &_0, &_1, &_2, &_3);
+	ZEPHIR_RETURN_CALL_FUNCTION("openssl_encrypt", NULL, 75, &data, &_0, &_1, &_2, &_3);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/optimizers/acos.zep.c b/ext/stub/optimizers/acos.zep.c
index 0d2f1e2b47..171a7a19d9 100644
--- a/ext/stub/optimizers/acos.zep.c
+++ b/ext/stub/optimizers/acos.zep.c
@@ -12,10 +12,11 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/fcall.h"
+#include "math.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/memory.h"
+#include "kernel/math.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
@@ -28,87 +29,57 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ACos)
 PHP_METHOD(Stub_Optimizers_ACos, testInt)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, a;
+	zend_long a;
 
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(acos(a));
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVar)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, a;
+	zend_long a;
 
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(acos(a));
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntValue1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(acos(0));
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testIntParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
-	zend_long a, ZEPHIR_LAST_CALL_STATUS;
+	zend_long a;
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-	zephir_fetch_params(1, 1, 0, &a_param);
+	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(acos(a));
 }
 
 PHP_METHOD(Stub_Optimizers_ACos, testVarParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-	zephir_fetch_params(1, 1, 0, &a);
-	ZEPHIR_RETURN_CALL_FUNCTION("acos", NULL, 15, a);
-	zephir_check_call_status();
-	RETURN_MM();
+	zephir_fetch_params_without_memory_grow(1, 0, &a);
+	RETURN_DOUBLE(zephir_acos(a));
 }
 
diff --git a/ext/stub/optimizers/asin.zep.c b/ext/stub/optimizers/asin.zep.c
index 77f2353825..9ba7f7ac4c 100644
--- a/ext/stub/optimizers/asin.zep.c
+++ b/ext/stub/optimizers/asin.zep.c
@@ -12,10 +12,11 @@
 #include <Zend/zend_interfaces.h>
 
 #include "kernel/main.h"
-#include "kernel/fcall.h"
+#include "math.h"
 #include "kernel/object.h"
-#include "kernel/memory.h"
 #include "kernel/operators.h"
+#include "kernel/memory.h"
+#include "kernel/math.h"
 
 
 ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
@@ -28,87 +29,57 @@ ZEPHIR_INIT_CLASS(Stub_Optimizers_ASin)
 PHP_METHOD(Stub_Optimizers_ASin, testInt)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, a;
+	zend_long a;
 
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(asin(a));
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVar)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS, a;
+	zend_long a;
 
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	a = 1;
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(asin(a));
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntValue1)
 {
 	zval _0;
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
 
 	ZVAL_UNDEF(&_0);
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-
 	ZVAL_LONG(&_0, 0);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(asin(0));
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testIntParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
 	zval *a_param = NULL, _0;
-	zend_long a, ZEPHIR_LAST_CALL_STATUS;
+	zend_long a;
 
 	ZVAL_UNDEF(&_0);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_LONG(a)
 	ZEND_PARSE_PARAMETERS_END();
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-	zephir_fetch_params(1, 1, 0, &a_param);
+	zephir_fetch_params_without_memory_grow(1, 0, &a_param);
 	ZVAL_LONG(&_0, a);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, &_0);
-	zephir_check_call_status();
-	RETURN_MM();
+	RETURN_DOUBLE(asin(a));
 }
 
 PHP_METHOD(Stub_Optimizers_ASin, testVarParameter)
 {
-	zephir_method_globals *ZEPHIR_METHOD_GLOBALS_PTR = NULL;
-	zend_long ZEPHIR_LAST_CALL_STATUS;
 	zval *a, a_sub;
 
 	ZVAL_UNDEF(&a_sub);
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_ZVAL(a)
 	ZEND_PARSE_PARAMETERS_END();
-	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
-	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
-	zephir_fetch_params(1, 1, 0, &a);
-	ZEPHIR_RETURN_CALL_FUNCTION("asin", NULL, 14, a);
-	zephir_check_call_status();
-	RETURN_MM();
+	zephir_fetch_params_without_memory_grow(1, 0, &a);
+	RETURN_DOUBLE(zephir_asin(a));
 }
 
diff --git a/ext/stub/optimizers/strreplace.zep.c b/ext/stub/optimizers/strreplace.zep.c
index 584f880136..ce7fbba702 100644
--- a/ext/stub/optimizers/strreplace.zep.c
+++ b/ext/stub/optimizers/strreplace.zep.c
@@ -201,7 +201,7 @@ PHP_METHOD(Stub_Optimizers_StrReplace, issue732B)
 	zephir_array_fast_append(&replacements, &_0);
 	ZEPHIR_INIT_VAR(&subject);
 	ZVAL_STRING(&subject, "The quick brown fox jumped over the lazy dog.");
-	ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 78, &patterns, &replacements, &subject);
+	ZEPHIR_RETURN_CALL_FUNCTION("preg_replace", NULL, 76, &patterns, &replacements, &subject);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/properties/getobjectvars.zep.c b/ext/stub/properties/getobjectvars.zep.c
index ceb5cb3a65..79cdf286a4 100644
--- a/ext/stub/properties/getobjectvars.zep.c
+++ b/ext/stub/properties/getobjectvars.zep.c
@@ -38,7 +38,7 @@ PHP_METHOD(Stub_Properties_GetObjectVars, issue1245)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 75, this_ptr);
+	ZEPHIR_RETURN_CALL_FUNCTION("get_object_vars", NULL, 73, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/properties/propertyarray.zep.c b/ext/stub/properties/propertyarray.zep.c
index e1f503efaf..309ae7e943 100644
--- a/ext/stub/properties/propertyarray.zep.c
+++ b/ext/stub/properties/propertyarray.zep.c
@@ -128,12 +128,12 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 		}
 		zephir_read_property(&_0$$3, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 		ZEPHIR_MAKE_REF(&_0$$3);
-		ZEPHIR_CALL_FUNCTION(&info, "array_shift", &_1, 79, &_0$$3);
+		ZEPHIR_CALL_FUNCTION(&info, "array_shift", &_1, 77, &_0$$3);
 		ZEPHIR_UNREF(&_0$$3);
 		zephir_check_call_status();
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "header");
-		ZEPHIR_CALL_FUNCTION(&_3$$3, "stripos", &_4, 80, &info, &_2$$3);
+		ZEPHIR_CALL_FUNCTION(&_3$$3, "stripos", &_4, 78, &info, &_2$$3);
 		zephir_check_call_status();
 		if (!ZEPHIR_IS_FALSE_IDENTICAL(&_3$$3)) {
 			zephir_array_append(&headers, &info, PH_SEPARATE, "stub/properties/propertyarray.zep", 51);
@@ -141,7 +141,7 @@ PHP_METHOD(Stub_Properties_PropertyArray, testIssues1831)
 		} else {
 			zephir_read_property(&_5$$5, this_ptr, ZEND_STRL("otherArray"), PH_NOISY_CC | PH_READONLY);
 			ZEPHIR_MAKE_REF(&_5$$5);
-			ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", &_6, 81, &_5$$5, &info);
+			ZEPHIR_CALL_FUNCTION(NULL, "array_unshift", &_6, 79, &_5$$5, &info);
 			ZEPHIR_UNREF(&_5$$5);
 			zephir_check_call_status();
 			break;
diff --git a/ext/stub/quantum.zep.c b/ext/stub/quantum.zep.c
index 4ef3cc46a4..4c3c966001 100644
--- a/ext/stub/quantum.zep.c
+++ b/ext/stub/quantum.zep.c
@@ -133,7 +133,7 @@ PHP_METHOD(Stub_Quantum, harmos)
 	ZVAL_STRING(&_0, "harmos.txt");
 	ZEPHIR_INIT_VAR(&_1);
 	ZVAL_STRING(&_1, "w");
-	ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 35, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&fp, "fopen", NULL, 33, &_0, &_1);
 	zephir_check_call_status();
 	if (!(zephir_is_true(&fp))) {
 		RETURN_MM_LONG(1);
@@ -338,13 +338,13 @@ PHP_METHOD(Stub_Quantum, harmos)
 					ZVAL_STRING(&_52$$9, "%16.8lf %16.8lf %16.8lf \n");
 					ZVAL_DOUBLE(&_53$$9, ((double) i * dx));
 					ZVAL_DOUBLE(&_54$$9, ((double) n * dt));
-					ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 82, &fp, &_52$$9, &_53$$9, &_54$$9, &_51$$9);
+					ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 80, &fp, &_52$$9, &_53$$9, &_54$$9, &_51$$9);
 					zephir_check_call_status();
 					i = (i + 10);
 				}
 				ZEPHIR_INIT_NVAR(&_56$$8);
 				ZVAL_STRING(&_56$$8, "\n");
-				ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 82, &fp, &_56$$8);
+				ZEPHIR_CALL_FUNCTION(NULL, "fprintf", &_55, 80, &fp, &_56$$8);
 				zephir_check_call_status();
 			}
 			j = 1;
diff --git a/ext/stub/range.zep.c b/ext/stub/range.zep.c
index d8eceb832f..6a620c55ec 100644
--- a/ext/stub/range.zep.c
+++ b/ext/stub/range.zep.c
@@ -44,7 +44,7 @@ PHP_METHOD(Stub_Range, inclusive1)
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
-	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 83, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 81, &_0, &_1);
 	zephir_check_call_status();
 	zephir_get_arrval(&_3, &_2);
 	RETURN_CTOR(&_3);
@@ -66,7 +66,7 @@ PHP_METHOD(Stub_Range, exclusive1)
 
 	ZVAL_LONG(&_0, 0);
 	ZVAL_LONG(&_1, 10);
-	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 83, &_0, &_1);
+	ZEPHIR_CALL_FUNCTION(&_2, "range", NULL, 81, &_0, &_1);
 	zephir_check_call_status();
 	zephir_get_arrval(&_3, &_2);
 	RETURN_CTOR(&_3);
diff --git a/ext/stub/reflection.zep.c b/ext/stub/reflection.zep.c
index a1f26dfb97..9e212d3da8 100644
--- a/ext/stub/reflection.zep.c
+++ b/ext/stub/reflection.zep.c
@@ -38,7 +38,7 @@ PHP_METHOD(Stub_Reflection, getReflectionClass)
 
 	ZEPHIR_INIT_VAR(&r);
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionclass")));
-	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 84, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 82, this_ptr);
 	zephir_check_call_status();
 	RETURN_CCTOR(&r);
 }
@@ -58,7 +58,7 @@ PHP_METHOD(Stub_Reflection, getReflectionFunction)
 	object_init_ex(&r, zephir_get_internal_ce(SL("reflectionfunction")));
 	ZEPHIR_INIT_VAR(&_0);
 	ZVAL_STRING(&_0, "abs");
-	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 85, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &r, "__construct", NULL, 83, &_0);
 	zephir_check_call_status();
 	RETURN_CCTOR(&r);
 }
diff --git a/ext/stub/regexdna.zep.c b/ext/stub/regexdna.zep.c
index 9be456af9f..fba938b101 100644
--- a/ext/stub/regexdna.zep.c
+++ b/ext/stub/regexdna.zep.c
@@ -177,7 +177,7 @@ PHP_METHOD(Stub_RegexDNA, process)
 	ZEPHIR_CONCAT_SVS(&_1, "/", &stuffToRemove, "/mS");
 	ZEPHIR_INIT_NVAR(&_0);
 	ZVAL_STRING(&_0, "");
-	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 78, &_1, &_0, &contents);
+	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 76, &_1, &_0, &contents);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&contents, &_2);
 	ZEPHIR_INIT_VAR(&codeLength);
@@ -221,7 +221,7 @@ PHP_METHOD(Stub_RegexDNA, process)
 		}
 	}
 	ZEPHIR_INIT_NVAR(&regex);
-	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 78, &vIUB, &vIUBnew, &contents);
+	ZEPHIR_CALL_FUNCTION(&_2, "preg_replace", &_3, 76, &vIUB, &vIUBnew, &contents);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(&contents, &_2);
 	php_printf("%c", '\n');
diff --git a/ext/stub/requires.zep.c b/ext/stub/requires.zep.c
index 1dcaf18c6e..3932f8b87b 100644
--- a/ext/stub/requires.zep.c
+++ b/ext/stub/requires.zep.c
@@ -90,7 +90,7 @@ PHP_METHOD(Stub_Requires, requireExternal3)
 		zephir_check_call_status();
 	}
 
-	ZEPHIR_CALL_METHOD(NULL, &external3, "req", NULL, 86, path, this_ptr);
+	ZEPHIR_CALL_METHOD(NULL, &external3, "req", NULL, 84, path, this_ptr);
 	zephir_check_call_status();
 	RETURN_MM_MEMBER(getThis(), "content");
 }
diff --git a/ext/stub/requires/external3.zep.c b/ext/stub/requires/external3.zep.c
index e0bf6d3b7e..f694653d28 100644
--- a/ext/stub/requires/external3.zep.c
+++ b/ext/stub/requires/external3.zep.c
@@ -45,12 +45,12 @@ PHP_METHOD(Stub_Requires_External3, req)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &path, &requires);
-	ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 87);
+	ZEPHIR_CALL_FUNCTION(NULL, "ob_clean", NULL, 85);
 	zephir_check_call_status();
 	if (zephir_require_zval(path) == FAILURE) {
 		RETURN_MM_NULL();
 	}
-	ZEPHIR_CALL_FUNCTION(&_0, "ob_get_contents", NULL, 88);
+	ZEPHIR_CALL_FUNCTION(&_0, "ob_get_contents", NULL, 86);
 	zephir_check_call_status();
 	ZEPHIR_CALL_METHOD(NULL, requires, "setcontent", NULL, 0, &_0);
 	zephir_check_call_status();
diff --git a/ext/stub/resourcetest.zep.c b/ext/stub/resourcetest.zep.c
index b21752b247..8e02c752fa 100644
--- a/ext/stub/resourcetest.zep.c
+++ b/ext/stub/resourcetest.zep.c
@@ -111,7 +111,7 @@ PHP_METHOD(Stub_ResourceTest, testFunctionsForSTDIN)
 	ZEPHIR_INIT_VAR(&a);
 	ZEPHIR_GET_CONSTANT(&a, "STDIN");
 	ZVAL_LONG(&_0, 1);
-	ZEPHIR_CALL_FUNCTION(NULL, "stream_set_blocking", NULL, 89, &a, &_0);
+	ZEPHIR_CALL_FUNCTION(NULL, "stream_set_blocking", NULL, 87, &a, &_0);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
diff --git a/ext/stub/router.zep.c b/ext/stub/router.zep.c
index 8f3ce19a48..b5e2954eea 100644
--- a/ext/stub/router.zep.c
+++ b/ext/stub/router.zep.c
@@ -120,7 +120,7 @@ PHP_METHOD(Stub_Router, __construct)
 		add_assoc_long_ex(&_1$$3, SL("controller"), 1);
 		ZEPHIR_INIT_VAR(&_2$$3);
 		ZVAL_STRING(&_2$$3, "#^/([a-zA-Z0-9\\_\\-]+)[/]{0,1}$#");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", &_3, 90, &_2$$3, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", &_3, 88, &_2$$3, &_1$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_0$$3, PH_SEPARATE, "stub/router.zep", 89);
 		ZEPHIR_INIT_NVAR(&_2$$3);
@@ -132,7 +132,7 @@ PHP_METHOD(Stub_Router, __construct)
 		add_assoc_long_ex(&_4$$3, SL("params"), 3);
 		ZEPHIR_INIT_VAR(&_5$$3);
 		ZVAL_STRING(&_5$$3, "#^/([a-zA-Z0-9\\_\\-]+)/([a-zA-Z0-9\\.\\_]+)(/.*)*$#");
-		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 90, &_5$$3, &_4$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_2$$3, "__construct", &_3, 88, &_5$$3, &_4$$3);
 		zephir_check_call_status();
 		zephir_array_append(&routes, &_2$$3, PH_SEPARATE, "stub/router.zep", 95);
 	}
@@ -998,7 +998,7 @@ PHP_METHOD(Stub_Router, add)
 	}
 	ZEPHIR_INIT_VAR(&route);
 	object_init_ex(&route, stub_router_route_ce);
-	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 90, pattern, paths, httpMethods);
+	ZEPHIR_CALL_METHOD(NULL, &route, "__construct", NULL, 88, pattern, paths, httpMethods);
 	zephir_check_call_status();
 	zephir_update_property_array_append(this_ptr, SL("_routes"), &route);
 	RETURN_CCTOR(&route);
diff --git a/ext/stub/scall.zep.c b/ext/stub/scall.zep.c
index 11d1fcaac8..1ca54d6405 100644
--- a/ext/stub/scall.zep.c
+++ b/ext/stub/scall.zep.c
@@ -130,7 +130,7 @@ PHP_METHOD(Stub_Scall, testCall3)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 91);
+	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 89);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -191,7 +191,7 @@ PHP_METHOD(Stub_Scall, testCall6)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 92, a, b);
+	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 90, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -228,7 +228,7 @@ PHP_METHOD(Stub_Scall, testCall9)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 
-	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 91);
+	ZEPHIR_RETURN_CALL_SELF("testmethod3", &_0, 89);
 	zephir_check_call_status();
 	RETURN_MM();
 }
@@ -289,7 +289,7 @@ PHP_METHOD(Stub_Scall, testCall12)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 2, 0, &a, &b);
-	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 92, a, b);
+	ZEPHIR_RETURN_CALL_SELF("testmethod6", &_0, 90, a, b);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/scope.zep.c b/ext/stub/scope.zep.c
index 295a7de575..4d1e033ac0 100644
--- a/ext/stub/scope.zep.c
+++ b/ext/stub/scope.zep.c
@@ -67,7 +67,7 @@ PHP_METHOD(Stub_Scope, test1)
 
 	ZEPHIR_INIT_VAR(&ret);
 	ZVAL_STRING(&ret, "");
-	ZEPHIR_CALL_SELF(&k, "getstr", &_0, 93);
+	ZEPHIR_CALL_SELF(&k, "getstr", &_0, 91);
 	zephir_check_call_status();
 	r = 1;
 	if (r == 1) {
@@ -159,7 +159,7 @@ PHP_METHOD(Stub_Scope, test3)
 			}
 			ZEPHIR_INIT_NVAR(&c);
 			ZVAL_LONG(&c, _1);
-			ZEPHIR_CALL_SELF(&str$$3, "getdystr", &_3, 94, &c);
+			ZEPHIR_CALL_SELF(&str$$3, "getdystr", &_3, 92, &c);
 			zephir_check_call_status();
 			zephir_concat_self(&k, &str$$3);
 		}
diff --git a/ext/stub/sort.zep.c b/ext/stub/sort.zep.c
index e32ffc41dc..406ad82633 100644
--- a/ext/stub/sort.zep.c
+++ b/ext/stub/sort.zep.c
@@ -93,16 +93,16 @@ PHP_METHOD(Stub_Sort, quick)
 			}
 		}
 	}
-	ZEPHIR_CALL_METHOD(&_7, this_ptr, "quick", &_8, 95, &left);
+	ZEPHIR_CALL_METHOD(&_7, this_ptr, "quick", &_8, 93, &left);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&_9);
 	zephir_create_array(&_9, 1, 0);
 	ZEPHIR_INIT_VAR(&_10);
 	ZVAL_LONG(&_10, pivot);
 	zephir_array_fast_append(&_9, &_10);
-	ZEPHIR_CALL_METHOD(&_11, this_ptr, "quick", &_8, 95, &right);
+	ZEPHIR_CALL_METHOD(&_11, this_ptr, "quick", &_8, 93, &right);
 	zephir_check_call_status();
-	ZEPHIR_RETURN_CALL_FUNCTION("array_merge", NULL, 96, &_7, &_9, &_11);
+	ZEPHIR_RETURN_CALL_FUNCTION("array_merge", NULL, 94, &_7, &_9, &_11);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/spectralnorm.zep.c b/ext/stub/spectralnorm.zep.c
index 95801b83ef..3b306b0cb5 100644
--- a/ext/stub/spectralnorm.zep.c
+++ b/ext/stub/spectralnorm.zep.c
@@ -112,7 +112,7 @@ PHP_METHOD(Stub_SpectralNorm, Au)
 					j = _4$$3;
 					ZVAL_LONG(&_7$$4, i);
 					ZVAL_LONG(&_8$$4, j);
-					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 97, &_7$$4, &_8$$4);
+					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 95, &_7$$4, &_8$$4);
 					zephir_check_call_status();
 					ZVAL_LONG(&_7$$4, j);
 					ZEPHIR_CALL_METHOD(&_10$$4, u, "offsetget", &_11, 0, &_7$$4);
@@ -188,7 +188,7 @@ PHP_METHOD(Stub_SpectralNorm, Atu)
 					j = _4$$3;
 					ZVAL_LONG(&_7$$4, j);
 					ZVAL_LONG(&_8$$4, i);
-					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 97, &_7$$4, &_8$$4);
+					ZEPHIR_CALL_METHOD(&_6$$4, this_ptr, "ax", &_9, 95, &_7$$4, &_8$$4);
 					zephir_check_call_status();
 					ZVAL_LONG(&_7$$4, j);
 					ZEPHIR_CALL_METHOD(&_10$$4, u, "offsetget", &_11, 0, &_7$$4);
@@ -227,9 +227,9 @@ PHP_METHOD(Stub_SpectralNorm, AtAu)
 	ZEPHIR_METHOD_GLOBALS_PTR = pecalloc(1, sizeof(zephir_method_globals), 0);
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	zephir_fetch_params(1, 4, 0, &n, &u, &v, &w);
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "au", NULL, 98, n, u, w);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "au", NULL, 96, n, u, w);
 	zephir_check_call_status();
-	ZEPHIR_CALL_METHOD(NULL, this_ptr, "atu", NULL, 99, n, w, v);
+	ZEPHIR_CALL_METHOD(NULL, this_ptr, "atu", NULL, 97, n, w, v);
 	zephir_check_call_status();
 	ZEPHIR_MM_RESTORE();
 }
@@ -266,17 +266,17 @@ PHP_METHOD(Stub_SpectralNorm, process)
 	ZEPHIR_INIT_VAR(&u);
 	object_init_ex(&u, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &u, "__construct", NULL, 100, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &u, "__construct", NULL, 98, &_0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&v);
 	object_init_ex(&v, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &v, "__construct", NULL, 100, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &v, "__construct", NULL, 98, &_0);
 	zephir_check_call_status();
 	ZEPHIR_INIT_VAR(&w);
 	object_init_ex(&w, spl_ce_SplFixedArray);
 	ZVAL_LONG(&_0, n);
-	ZEPHIR_CALL_METHOD(NULL, &w, "__construct", NULL, 100, &_0);
+	ZEPHIR_CALL_METHOD(NULL, &w, "__construct", NULL, 98, &_0);
 	zephir_check_call_status();
 	_3 = (n - 1);
 	_2 = 0;
@@ -294,15 +294,15 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			i = _2;
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &u, "offsetset", &_6, 101, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &u, "offsetset", &_6, 99, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &v, "offsetset", &_6, 101, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &v, "offsetset", &_6, 99, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 			ZVAL_LONG(&_4$$3, i);
 			ZVAL_LONG(&_5$$3, 1);
-			ZEPHIR_CALL_METHOD(NULL, &w, "offsetset", &_6, 101, &_4$$3, &_5$$3);
+			ZEPHIR_CALL_METHOD(NULL, &w, "offsetset", &_6, 99, &_4$$3, &_5$$3);
 			zephir_check_call_status();
 		}
 	}
@@ -321,10 +321,10 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			}
 			i = _8;
 			ZVAL_LONG(&_10$$4, n);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 102, &_10$$4, &u, &v, &w);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 100, &_10$$4, &u, &v, &w);
 			zephir_check_call_status();
 			ZVAL_LONG(&_10$$4, n);
-			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 102, &_10$$4, &v, &u, &w);
+			ZEPHIR_CALL_METHOD(NULL, this_ptr, "atau", &_11, 100, &_10$$4, &v, &u, &w);
 			zephir_check_call_status();
 		}
 	}
@@ -343,19 +343,19 @@ PHP_METHOD(Stub_SpectralNorm, process)
 			}
 			i = _13;
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_15$$5, &u, "offsetget", &_17, 103, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_15$$5, &u, "offsetget", &_17, 101, &_16$$5);
 			zephir_check_call_status();
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 103, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 101, &_16$$5);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_19$$5);
 			mul_function(&_19$$5, &_15$$5, &_18$$5);
 			vBv += zephir_get_numberval(&_19$$5);
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_15$$5, &v, "offsetget", &_17, 103, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_15$$5, &v, "offsetget", &_17, 101, &_16$$5);
 			zephir_check_call_status();
 			ZVAL_LONG(&_16$$5, i);
-			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 103, &_16$$5);
+			ZEPHIR_CALL_METHOD(&_18$$5, &v, "offsetget", &_17, 101, &_16$$5);
 			zephir_check_call_status();
 			ZEPHIR_INIT_NVAR(&_20$$5);
 			mul_function(&_20$$5, &_15$$5, &_18$$5);
diff --git a/ext/stub/spl.zep.c b/ext/stub/spl.zep.c
index 394bf586fe..ed4c33e3d2 100644
--- a/ext/stub/spl.zep.c
+++ b/ext/stub/spl.zep.c
@@ -45,7 +45,7 @@ PHP_METHOD(Stub_Spl, issue1212)
 	zephir_fetch_params(1, 1, 0, &file_param);
 	zephir_get_strval(&file, file_param);
 	object_init_ex(return_value, spl_ce_SplFileObject);
-	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 104, &file);
+	ZEPHIR_CALL_METHOD(NULL, return_value, "__construct", NULL, 102, &file);
 	zephir_check_call_status();
 	RETURN_MM();
 }
diff --git a/ext/stub/statements.zep.c b/ext/stub/statements.zep.c
index 792537292d..fe6c63cc72 100644
--- a/ext/stub/statements.zep.c
+++ b/ext/stub/statements.zep.c
@@ -182,25 +182,25 @@ PHP_METHOD(Stub_Statements, test544Issue)
 		unfilledWidth = (((zephir_get_numberval(&_4$$3) - 1)) - filledWidth);
 		zephir_read_property(&_5$$3, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_6$$3, filledWidth);
-		ZEPHIR_CALL_FUNCTION(&_7$$3, "str_repeat", &_8, 23, &_5$$3, &_6$$3);
+		ZEPHIR_CALL_FUNCTION(&_7$$3, "str_repeat", &_8, 21, &_5$$3, &_6$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_6$$3, this_ptr, ZEND_STRL("arrow"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_9$$3, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_10$$3, unfilledWidth);
-		ZEPHIR_CALL_FUNCTION(&_11$$3, "str_repeat", &_8, 23, &_9$$3, &_10$$3);
+		ZEPHIR_CALL_FUNCTION(&_11$$3, "str_repeat", &_8, 21, &_9$$3, &_10$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_7$$3, &_6$$3, &_11$$3);
 		RETURN_MM();
 	} else if (ZEPHIR_IS_LONG_IDENTICAL(&_1, step)) {
 		zephir_read_property(&_12$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 23, &_12$$4, &_13$$4);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 21, &_12$$4, &_13$$4);
 		zephir_check_call_status();
 		RETURN_MM();
 	} else {
 		zephir_read_property(&_14$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_15$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 23, &_14$$5, &_15$$5);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_8, 21, &_14$$5, &_15$$5);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
@@ -247,25 +247,25 @@ PHP_METHOD(Stub_Statements, test544IssueWithVariable)
 		unfilledWidth = (((zephir_get_numberval(&_2$$3) - 1)) - filledWidth);
 		zephir_read_property(&_3$$3, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_4$$3, filledWidth);
-		ZEPHIR_CALL_FUNCTION(&_5$$3, "str_repeat", &_6, 23, &_3$$3, &_4$$3);
+		ZEPHIR_CALL_FUNCTION(&_5$$3, "str_repeat", &_6, 21, &_3$$3, &_4$$3);
 		zephir_check_call_status();
 		zephir_read_property(&_4$$3, this_ptr, ZEND_STRL("arrow"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_7$$3, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		ZVAL_LONG(&_8$$3, unfilledWidth);
-		ZEPHIR_CALL_FUNCTION(&_9$$3, "str_repeat", &_6, 23, &_7$$3, &_8$$3);
+		ZEPHIR_CALL_FUNCTION(&_9$$3, "str_repeat", &_6, 21, &_7$$3, &_8$$3);
 		zephir_check_call_status();
 		ZEPHIR_CONCAT_VVV(return_value, &_5$$3, &_4$$3, &_9$$3);
 		RETURN_MM();
 	} else if (step == totalSteps) {
 		zephir_read_property(&_10$$4, this_ptr, ZEND_STRL("filledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_11$$4, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 23, &_10$$4, &_11$$4);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 21, &_10$$4, &_11$$4);
 		zephir_check_call_status();
 		RETURN_MM();
 	} else {
 		zephir_read_property(&_12$$5, this_ptr, ZEND_STRL("unfilledChar"), PH_NOISY_CC | PH_READONLY);
 		zephir_read_property(&_13$$5, this_ptr, ZEND_STRL("width"), PH_NOISY_CC | PH_READONLY);
-		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 23, &_12$$5, &_13$$5);
+		ZEPHIR_RETURN_CALL_FUNCTION("str_repeat", &_6, 21, &_12$$5, &_13$$5);
 		zephir_check_call_status();
 		RETURN_MM();
 	}
diff --git a/ext/stub/strings.zep.c b/ext/stub/strings.zep.c
index 913f5864cb..aae4f25fa6 100644
--- a/ext/stub/strings.zep.c
+++ b/ext/stub/strings.zep.c
@@ -480,7 +480,7 @@ PHP_METHOD(Stub_Strings, strToHex)
 		_1$$3 = ZEPHIR_STRING_OFFSET(&value, i);
 		ZEPHIR_INIT_NVAR(&_2$$3);
 		ZVAL_STRINGL(&_2$$3, &_1$$3, 1);
-		ZEPHIR_CALL_FUNCTION(&_3$$3, "ord", &_4, 105, &_2$$3);
+		ZEPHIR_CALL_FUNCTION(&_3$$3, "ord", &_4, 103, &_2$$3);
 		zephir_check_call_status();
 		ZEPHIR_CALL_FUNCTION(&_5$$3, "dechex", &_6, 11, &_3$$3);
 		zephir_check_call_status();
@@ -531,17 +531,17 @@ PHP_METHOD(Stub_Strings, issue1267)
 	zephir_fast_str_replace(&_0, &_1, &_2, value);
 	ZEPHIR_CPY_WRT(value, &_0);
 	ZVAL_LONG(&_3, 516);
-	ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 46, value, &_3);
+	ZEPHIR_CALL_FUNCTION(&_4, "filter_var", NULL, 44, value, &_3);
 	zephir_check_call_status();
 	ZEPHIR_CPY_WRT(value, &_4);
 	ZEPHIR_INIT_NVAR(&_0);
-	ZEPHIR_CALL_FUNCTION(&_4, "strip_tags", &_5, 106, value);
+	ZEPHIR_CALL_FUNCTION(&_4, "strip_tags", &_5, 104, value);
 	zephir_check_call_status();
 	zephir_stripslashes(&_0, &_4);
 	ZEPHIR_INIT_VAR(&x);
 	zephir_fast_trim(&x, &_0, NULL , ZEPHIR_TRIM_BOTH);
 	ZEPHIR_INIT_VAR(&_6);
-	ZEPHIR_CALL_FUNCTION(&_7, "strip_tags", &_5, 106, value);
+	ZEPHIR_CALL_FUNCTION(&_7, "strip_tags", &_5, 104, value);
 	zephir_check_call_status();
 	zephir_stripcslashes(&_6, &_7);
 	zephir_fast_trim(return_value, &_6, NULL , ZEPHIR_TRIM_BOTH);
diff --git a/ext/stub/trytest.zep.c b/ext/stub/trytest.zep.c
index 744e0363e5..7bcfd628e3 100644
--- a/ext/stub/trytest.zep.c
+++ b/ext/stub/trytest.zep.c
@@ -49,7 +49,7 @@ PHP_METHOD(Stub_TryTest, testThrow2)
 	ZVAL_STRING(&message, "error");
 	ZEPHIR_INIT_VAR(&_0);
 	object_init_ex(&_0, zend_ce_exception);
-	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 31, &message);
+	ZEPHIR_CALL_METHOD(NULL, &_0, "__construct", NULL, 29, &message);
 	zephir_check_call_status();
 	zephir_throw_exception_debug(&_0, "stub/trytest.zep", 16);
 	ZEPHIR_MM_RESTORE();
@@ -81,7 +81,7 @@ PHP_METHOD(Stub_TryTest, testTry2)
 		object_init_ex(&_0$$3, zend_ce_exception);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 27);
 		goto try_end_1;
@@ -108,7 +108,7 @@ PHP_METHOD(Stub_TryTest, testTry3)
 		object_init_ex(&_0$$3, zend_ce_exception);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 34);
 		goto try_end_1;
@@ -155,7 +155,7 @@ PHP_METHOD(Stub_TryTest, testTry4)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 29, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 46);
 			goto try_end_1;
@@ -165,7 +165,7 @@ PHP_METHOD(Stub_TryTest, testTry4)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 105, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 48);
 			goto try_end_1;
@@ -221,7 +221,7 @@ PHP_METHOD(Stub_TryTest, testTry5)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 29, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 63);
 			goto try_end_1;
@@ -231,7 +231,7 @@ PHP_METHOD(Stub_TryTest, testTry5)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 105, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 65);
 			goto try_end_1;
@@ -286,7 +286,7 @@ PHP_METHOD(Stub_TryTest, testTry6)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 29, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 80);
 			goto try_end_1;
@@ -296,7 +296,7 @@ PHP_METHOD(Stub_TryTest, testTry6)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 105, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 82);
 			goto try_end_1;
@@ -350,7 +350,7 @@ PHP_METHOD(Stub_TryTest, testTry7)
 			object_init_ex(&_0$$4, zend_ce_exception);
 			ZEPHIR_INIT_VAR(&_1$$4);
 			ZVAL_STRING(&_1$$4, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 31, &_1$$4);
+			ZEPHIR_CALL_METHOD(NULL, &_0$$4, "__construct", NULL, 29, &_1$$4);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_0$$4, "stub/trytest.zep", 99);
 			goto try_end_1;
@@ -360,7 +360,7 @@ PHP_METHOD(Stub_TryTest, testTry7)
 			object_init_ex(&_2$$5, spl_ce_RuntimeException);
 			ZEPHIR_INIT_VAR(&_3$$5);
 			ZVAL_STRING(&_3$$5, "error!");
-			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 107, &_3$$5);
+			ZEPHIR_CALL_METHOD(NULL, &_2$$5, "__construct", NULL, 105, &_3$$5);
 			zephir_check_call_status_or_jump(try_end_1);
 			zephir_throw_exception_debug(&_2$$5, "stub/trytest.zep", 101);
 			goto try_end_1;
@@ -403,7 +403,7 @@ PHP_METHOD(Stub_TryTest, testTry8)
 		object_init_ex(&_0$$3, zend_ce_exception);
 		ZEPHIR_INIT_VAR(&_1$$3);
 		ZVAL_STRING(&_1$$3, "error 1!");
-		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 31, &_1$$3);
+		ZEPHIR_CALL_METHOD(NULL, &_0$$3, "__construct", NULL, 29, &_1$$3);
 		zephir_check_call_status_or_jump(try_end_1);
 		zephir_throw_exception_debug(&_0$$3, "stub/trytest.zep", 111);
 		goto try_end_1;
@@ -441,7 +441,7 @@ PHP_METHOD(Stub_TryTest, testTry9)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod1", NULL, 108);
+		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod1", NULL, 106);
 		zephir_check_call_status_or_jump(try_end_1);
 		RETURN_MM_STRING("not catched");
 
@@ -473,7 +473,7 @@ PHP_METHOD(Stub_TryTest, testTry10)
 	zephir_memory_grow_stack(ZEPHIR_METHOD_GLOBALS_PTR, __func__);
 	/* try_start_1: */
 
-		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod2", NULL, 109);
+		ZEPHIR_CALL_METHOD(NULL, this_ptr, "somemethod2", NULL, 107);
 		zephir_check_call_status_or_jump(try_end_1);
 		RETURN_MM_STRING("not catched");
 
diff --git a/ext/stub/vars.zep.c b/ext/stub/vars.zep.c
index 2f46b94447..cb9858fdd5 100644
--- a/ext/stub/vars.zep.c
+++ b/ext/stub/vars.zep.c
@@ -66,7 +66,7 @@ PHP_METHOD(Stub_Vars, testParam)
 			}
 			ZEPHIR_INIT_NVAR(&v);
 			ZVAL_COPY(&v, _1);
-			ZEPHIR_CALL_FUNCTION(&_5$$3, "realpath", &_6, 70, &v);
+			ZEPHIR_CALL_FUNCTION(&_5$$3, "realpath", &_6, 68, &v);
 			zephir_check_call_status();
 			zephir_array_update_multi(&config, &_5$$3, SL("sz"), 3, SL("dir"), &k);
 		} ZEND_HASH_FOREACH_END();
@@ -83,7 +83,7 @@ PHP_METHOD(Stub_Vars, testParam)
 			zephir_check_call_status();
 			ZEPHIR_CALL_METHOD(&v, &_0, "current", NULL, 0);
 			zephir_check_call_status();
-				ZEPHIR_CALL_FUNCTION(&_7$$4, "realpath", &_6, 70, &v);
+				ZEPHIR_CALL_FUNCTION(&_7$$4, "realpath", &_6, 68, &v);
 				zephir_check_call_status();
 				zephir_array_update_multi(&config, &_7$$4, SL("sz"), 3, SL("dir"), &k);
 			ZEPHIR_CALL_METHOD(NULL, &_0, "next", NULL, 0);

From 60b7a7d5056df702d4b37de2250321145ae821db Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Sep 2024 20:55:44 +0100
Subject: [PATCH 374/375] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 782c367ccc..5b30620411 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
+
+## [0.18.0] - 2024-09-29
 ### Added
 - Added support of PHP `8.3` [#2407](https://github.com/zephir-lang/zephir/issues/2407)
 - Added support of multiple return types in stubs

From b50a0533bd3cc08cb8113d9c9d0f50c2a7c94e6e Mon Sep 17 00:00:00 2001
From: Anton Vasiliev <1695147@gmail.com>
Date: Sun, 29 Sep 2024 20:57:13 +0100
Subject: [PATCH 375/375] Refactor code

---
 src/MethodCall.php | 66 ++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/src/MethodCall.php b/src/MethodCall.php
index 770f396635..582562246b 100644
--- a/src/MethodCall.php
+++ b/src/MethodCall.php
@@ -400,7 +400,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                     );
                                 }
 
-                                /*
+                                /**
                                  * Try to produce an exception if a method is called with a wrong number of parameters
                                  * We only check extension parameters if methods are extension methods
                                  * Internal methods may have invalid Reflection information
@@ -448,7 +448,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                     }
                                 }
 
-                                /*
+                                /**
                                  * The method is checked in the first class that implements the method
                                  * We could probably have collisions here
                                  */
@@ -497,45 +497,43 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             $this->reflection = $method;
         }
 
-        /*
+        /**
          * Transfer the return type-hint to the returned variable
          */
-        if ($isExpecting) {
-            if (isset($method)) {
-                if ($method instanceof Method) {
-                    if ($method->isVoid()) {
-                        throw new CompilerException(
-                            sprintf(
-                                "Method '%s::%s' is marked as '%s' and it does not return anything",
-                                $classDefinition->getCompleteName(),
-                                $expression['name'],
-                                Types::T_VOID
-                            ),
-                            $expression
-                        );
-                    }
+        if ($isExpecting && isset($method)) {
+            if ($method instanceof Method) {
+                if ($method->isVoid()) {
+                    throw new CompilerException(
+                        sprintf(
+                            "Method '%s::%s' is marked as '%s' and it does not return anything",
+                            $classDefinition->getCompleteName(),
+                            $expression['name'],
+                            Types::T_VOID
+                        ),
+                        $expression
+                    );
+                }
 
-                    $returnClassTypes = $method->getReturnClassTypes();
+                $returnClassTypes = $method->getReturnClassTypes();
 
-                    if (null !== $returnClassTypes) {
-                        $symbolVariable->setDynamicTypes('object');
-                        foreach ($returnClassTypes as &$returnClassType) {
-                            $returnClassType = $compilationContext->getFullName($returnClassType);
-                        }
-                        $symbolVariable->setClassTypes($returnClassTypes);
+                if (null !== $returnClassTypes) {
+                    $symbolVariable->setDynamicTypes('object');
+                    foreach ($returnClassTypes as &$returnClassType) {
+                        $returnClassType = $compilationContext->getFullName($returnClassType);
                     }
+                    $symbolVariable->setClassTypes($returnClassTypes);
+                }
 
-                    $returnTypes = $method->getReturnTypes();
-                    if (null !== $returnTypes) {
-                        foreach ($returnTypes as $dataType => $returnType) {
-                            $symbolVariable->setDynamicTypes($dataType);
-                        }
+                $returnTypes = $method->getReturnTypes();
+                if (null !== $returnTypes) {
+                    foreach ($returnTypes as $dataType => $returnType) {
+                        $symbolVariable->setDynamicTypes($dataType);
                     }
                 }
             }
         }
 
-        /*
+        /**
          * Some parameters in internal methods receive parameters as references
          */
         if (isset($expression['parameters'])) {
@@ -555,17 +553,17 @@ public function compile(Expression $expr, CompilationContext $compilationContext
             }
         }
 
-        /*
+        /**
          * Include fcall header
          */
         $compilationContext->headersManager->add('kernel/fcall');
 
-        /*
+        /**
          * Call methods must grown the stack
          */
         $compilationContext->symbolTable->mustGrownStack(true);
 
-        /*
+        /**
          * Mark references
          */
         $params = [];
@@ -597,7 +595,7 @@ public function compile(Expression $expr, CompilationContext $compilationContext
                                 continue;
                             }
 
-                            /*
+                            /**
                              * If the passed parameter is different to the expected type we show a warning
                              */
                             if ($resolvedTypes[$n] != $parameter['data-type']) {